fix #656: fix __all__ + add test for 'from psutil import *'

giampaolo · Jul 15, 2015 · e434c7d · e434c7d
1 parent ac8c957
commit e434c7d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/psutil/__init__.py b/psutil/__init__.py
@@ -136,7 +136,7 @@
     "Error", "NoSuchProcess", "ZombieProcess", "AccessDenied",
     "TimeoutExpired",
     # constants
-    "version_info", "__3n__",
+    "version_info", "__version__",
     "STATUS_RUNNING", "STATUS_IDLE", "STATUS_SLEEPING", "STATUS_DISK_SLEEP",
     "STATUS_STOPPED", "STATUS_TRACING_STOP", "STATUS_ZOMBIE", "STATUS_DEAD",
     "STATUS_WAKING", "STATUS_LOCKED", "STATUS_WAITING", "STATUS_LOCKED",

diff --git a/test/test_psutil.py b/test/test_psutil.py
@@ -2752,6 +2752,9 @@ def test__all__(self):
                         if (fun.__doc__ is not None and
                                 'deprecated' not in fun.__doc__.lower()):
                             self.fail('%r not in psutil.__all__' % name)
+        # import 'start' will break if __all__ is inconsistent, see:
+        # https://github.com/giampaolo/psutil/issues/656
+        from psutil import *  # NOQA
 
     def test_memoize(self):
         from psutil._common import memoize