diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2020-10-08 21:51:12 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2020-10-08 21:51:12 +0200 |
| commit | 44818fa06eb2bed76844e9873b77bafaa56c1813 (patch) | |
| tree | eedf08b554fa7e732177a24b1f7e27dfd834e5f0 | |
| parent | 5b519a2469ad21a5913035031c99029018dda4c1 (diff) | |
| parent | d3bb5d4d36ae752beecf9cb1d559c81c9a53a9c0 (diff) | |
| download | psutil-44818fa06eb2bed76844e9873b77bafaa56c1813.tar.gz | |
Merge branch 'master' of github.com:giampaolo/psutil
| -rw-r--r-- | psutil/_pslinux.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py index 4dc3a0ab..3c9ff281 100644 --- a/psutil/_pslinux.py +++ b/psutil/_pslinux.py @@ -843,10 +843,6 @@ class Connections: else: ip = socket.inet_ntop(family, base64.b16decode(ip)) else: # IPv6 - # old version - let's keep it, just in case... - # ip = ip.decode('hex') - # return socket.inet_ntop(socket.AF_INET6, - # ''.join(ip[i:i+4][::-1] for i in range(0, 16, 4))) ip = base64.b16decode(ip) try: # see: https://github.com/giampaolo/psutil/issues/201 |