Revert "Switch from netifaces to psutil"

jstasiak · jstasiak · commit 6349d197b442 · 2015-12-01T10:03:08.000+01:00
psutil doesn't seem to work on pypy3: Traceback (most recent call last): File "/home/travis/virtualenv/pypy3-2.4.0/site-packages/nose/failure.py", line 39, in runTest raise self.exc_val.with_traceback(self.tb) File "/home/travis/virtualenv/pypy3-2.4.0/site-packages/nose/loader.py", line 414, in loadTestsFromName addr.filename, addr.module) File "/home/travis/virtualenv/pypy3-2.4.0/site-packages/nose/importer.py", line 47, in importFromPath return self.importFromDir(dir_path, fqname) File "/home/travis/virtualenv/pypy3-2.4.0/site-packages/nose/importer.py", line 94, in importFromDir mod = load_module(part_fqname, fh, filename, desc) File "/home/travis/build/jstasiak/python-zeroconf/test_zeroconf.py", line 17, in <module> import zeroconf as r File "/home/travis/build/jstasiak/python-zeroconf/zeroconf.py", line 35, in <module> import psutil File "/home/travis/virtualenv/pypy3-2.4.0/site-packages/psutil/__init__.py", line 62, in <module> from . import _pslinux as _psplatform File "/home/travis/virtualenv/pypy3-2.4.0/site-packages/psutil/_pslinux.py", line 23, in <module> from . import _psutil_linux as cext ImportError: unable to load extension module '/home/travis/virtualenv/pypy3-2.4.0/site-packages/psutil/_psutil_linux.pypy3-24.so': /home/travis/virtualenv/pypy3-2.4.0/site-packages/psutil/_psutil_linux.pypy3-24.so: undefined symbol: PyModule_GetState Additionally netifaces turns out to be possible to install on Python 3, therefore making it necessary to investigate the original issue. This reverts commit dd907f2.
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -7,8 +7,8 @@ flake8-blind-except
 # Upper bound because of https://github.com/public/flake8-import-order/issues/42
 flake8-import-order>=0.4.0, <0.6.0
 mock
+netifaces
 nose
 pep8==1.5.7
 pep8-naming
-psutil
 six
diff --git a/setup.py b/setup.py
@@ -52,7 +52,7 @@
     ],
     install_requires=[
         'enum-compat',
-        'psutil',
+        'netifaces',
         'six',
     ],
 )
diff --git a/zeroconf.py b/zeroconf.py
@@ -32,7 +32,7 @@
 import time
 from functools import reduce
 
-import psutil
+import netifaces
 from six import binary_type, indexbytes, int2byte, iteritems, text_type
 from six.moves import xrange
 
@@ -1272,11 +1272,10 @@ class ServiceStateChange(enum.Enum):
 
 def get_all_addresses(address_family):
     return list(set(
-        nic.address
-        for iface, nics in psutil.net_if_addrs().items()
-        for nic in nics
-        if nic.family == address_family and
-        nic.netmask != HOST_ONLY_NETWORK_MASK
+        addr['addr']
+        for iface in netifaces.interfaces()
+        for addr in netifaces.ifaddresses(iface).get(address_family, [])
+        if addr.get('netmask') != HOST_ONLY_NETWORK_MASK
     ))
 
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`],`
`53`	`53`	`install_requires=[`
`54`	`54`	`'enum-compat',`
`55`		`- 'psutil',`
	`55`	`+ 'netifaces',`
`56`	`56`	`'six',`
`57`	`57`	`],`
`58`	`58`	`)`