merge

8 files changed, 85 insertions, 80 deletions

diff --git a/psutil/__init__.py b/psutil/__init__.py
index 6b797c76..fd9c9d83 100644
--- a/psutil/__init__.py
+++ b/psutil/__init__.py
@@ -25,42 +25,47 @@ try:
 except ImportError:
     pwd = None
 
-from psutil._common import memoize
-from psutil._compat import callable, long
-from psutil._compat import PY3 as _PY3
-from psutil._common import (deprecated_method as _deprecated_method,
-                            deprecated as _deprecated,
-                            sdiskio as _nt_sys_diskio,
-                            snetio as _nt_sys_netio)
-
-from psutil._common import (STATUS_RUNNING,  # NOQA
-                            STATUS_SLEEPING,
-                            STATUS_DISK_SLEEP,
-                            STATUS_STOPPED,
-                            STATUS_TRACING_STOP,
-                            STATUS_ZOMBIE,
-                            STATUS_DEAD,
-                            STATUS_WAKING,
-                            STATUS_LOCKED,
-                            STATUS_IDLE,  # bsd
-                            STATUS_WAITING,  # bsd
-                            STATUS_LOCKED)  # bsd
-
-from psutil._common import (CONN_ESTABLISHED,
-                            CONN_SYN_SENT,
-                            CONN_SYN_RECV,
-                            CONN_FIN_WAIT1,
-                            CONN_FIN_WAIT2,
-                            CONN_TIME_WAIT,
-                            CONN_CLOSE,
-                            CONN_CLOSE_WAIT,
-                            CONN_LAST_ACK,
-                            CONN_LISTEN,
-                            CONN_CLOSING,
-                            CONN_NONE)
+from ._common import memoize
+from ._compat import callable, long
+from ._compat import PY3 as _PY3
+from ._common import (
+    deprecated_method as _deprecated_method,
+    deprecated as _deprecated,
+    sdiskio as _nt_sys_diskio,
+    snetio as _nt_sys_netio
+)
+
+from ._common import (
+    STATUS_RUNNING,  # NOQA
+    STATUS_SLEEPING,
+    STATUS_DISK_SLEEP,
+    STATUS_STOPPED,
+    STATUS_TRACING_STOP,
+    STATUS_ZOMBIE,
+    STATUS_DEAD,
+    STATUS_WAKING,
+    STATUS_LOCKED,
+    STATUS_IDLE,  # bsd
+    STATUS_WAITING,  # bsd
+)  # bsd
+
+from ._common import (
+    CONN_ESTABLISHED,
+    CONN_SYN_SENT,
+    CONN_SYN_RECV,
+    CONN_FIN_WAIT1,
+    CONN_FIN_WAIT2,
+    CONN_TIME_WAIT,
+    CONN_CLOSE,
+    CONN_CLOSE_WAIT,
+    CONN_LAST_ACK,
+    CONN_LISTEN,
+    CONN_CLOSING,
+    CONN_NONE
+)
 
 if sys.platform.startswith("linux"):
-    import psutil._pslinux as _psplatform
+    from . import _pslinux as _psplatform
     from psutil._pslinux import (phymem_buffers,  # NOQA
                                  cached_phymem)
 
@@ -70,7 +75,7 @@ if sys.platform.startswith("linux"):
                                  IOPRIO_CLASS_IDLE)
     # Linux >= 2.6.36
     if _psplatform.HAS_PRLIMIT:
-        from _psutil_linux import (RLIM_INFINITY,  # NOQA
+        from ._psutil_linux import (RLIM_INFINITY,  # NOQA
                                    RLIMIT_AS,
                                    RLIMIT_CORE,
                                    RLIMIT_CPU,
@@ -85,7 +90,7 @@ if sys.platform.startswith("linux"):
         # Kinda ugly but considerably faster than using hasattr() and
         # setattr() against the module object (we are at import time:
         # speed matters).
-        import _psutil_linux
+        from . import _psutil_linux
         try:
             RLIMIT_MSGQUEUE = _psutil_linux.RLIMIT_MSGQUEUE
         except AttributeError:
@@ -109,8 +114,8 @@ if sys.platform.startswith("linux"):
         del _psutil_linux
 
 elif sys.platform.startswith("win32"):
-    import psutil._pswindows as _psplatform
-    from _psutil_windows import (ABOVE_NORMAL_PRIORITY_CLASS,  # NOQA
+    from . import _pswindows as _psplatform
+    from ._psutil_windows import (ABOVE_NORMAL_PRIORITY_CLASS,  # NOQA
                                  BELOW_NORMAL_PRIORITY_CLASS,
                                  HIGH_PRIORITY_CLASS,
                                  IDLE_PRIORITY_CLASS,
@@ -119,14 +124,14 @@ elif sys.platform.startswith("win32"):
     from psutil._pswindows import CONN_DELETE_TCB  # NOQA
 
 elif sys.platform.startswith("darwin"):
-    import psutil._psosx as _psplatform
+    from . import _psosx as _psplatform
 
 elif sys.platform.startswith("freebsd"):
-    import psutil._psbsd as _psplatform
+    from . import _psbsd as _psplatform
 
 elif sys.platform.startswith("sunos"):
-    import psutil._pssunos as _psplatform
-    from psutil._pssunos import (CONN_IDLE,  # NOQA
+    from . import _pssunos as _psplatform
+    from ._pssunos import (CONN_IDLE,  # NOQA
                                  CONN_BOUND)
 
 else:
diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py
index 9ce67441..72147fd8 100644
--- a/psutil/_psbsd.py
+++ b/psutil/_psbsd.py
@@ -12,12 +12,12 @@ import os
 import sys
 from collections import namedtuple
 
-from psutil import _common
-from psutil import _psposix
-from psutil._common import (conn_tmap, usage_percent, sockfam_to_enum,
-                            socktype_to_enum)
-import _psutil_bsd as cext
-import _psutil_posix
+from . import _common
+from . import _psposix
+from ._common import (conn_tmap, usage_percent, sockfam_to_enum,
+                      socktype_to_enum)
+from . import _psutil_bsd as cext
+from . import _psutil_posix
 
 
 __extra__all__ = []
diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py
index 6bde29eb..ba691b17 100644
--- a/psutil/_pslinux.py
+++ b/psutil/_pslinux.py
@@ -19,12 +19,12 @@ import sys
 import warnings
 from collections import namedtuple, defaultdict
 
-from psutil import _common
-from psutil import _psposix
-from psutil._common import (isfile_strict, usage_percent, deprecated)
-from psutil._compat import PY3
-import _psutil_linux as cext
-import _psutil_posix
+from . import _common
+from . import _psposix
+from ._common import (isfile_strict, usage_percent, deprecated)
+from ._compat import PY3
+from . import _psutil_linux as cext
+from . import _psutil_posix
 
 
 __extra__all__ = [
diff --git a/psutil/_psosx.py b/psutil/_psosx.py
index 94cd3f61..849a6d09 100644
--- a/psutil/_psosx.py
+++ b/psutil/_psosx.py
@@ -11,12 +11,12 @@ import functools
 import os
 from collections import namedtuple
 
-from psutil import _common
-from psutil import _psposix
-from psutil._common import (conn_tmap, usage_percent, isfile_strict,
-                            sockfam_to_enum, socktype_to_enum)
-import _psutil_osx as cext
-import _psutil_posix
+from . import _common
+from . import _psposix
+from ._common import (conn_tmap, usage_percent, isfile_strict,
+                      sockfam_to_enum, socktype_to_enum)
+from . import _psutil_osx as cext
+from . import _psutil_posix
 
 
 __extra__all__ = []
diff --git a/psutil/_psposix.py b/psutil/_psposix.py
index 1f7dc96e..5bb16a38 100644
--- a/psutil/_psposix.py
+++ b/psutil/_psposix.py
@@ -12,8 +12,8 @@ import os
 import sys
 import time
 
-from psutil._common import sdiskusage, usage_percent, memoize
-from psutil._compat import PY3, unicode
+from ._common import sdiskusage, usage_percent, memoize
+from ._compat import PY3, unicode
 
 
 class TimeoutExpired(Exception):
diff --git a/psutil/_pssunos.py b/psutil/_pssunos.py
index ab8a6357..8b3edb8c 100644
--- a/psutil/_pssunos.py
+++ b/psutil/_pssunos.py
@@ -13,13 +13,13 @@ import subprocess
 import sys
 from collections import namedtuple
 
-from psutil import _common
-from psutil import _psposix
-from psutil._common import (usage_percent, isfile_strict, sockfam_to_enum,
-                            socktype_to_enum)
-from psutil._compat import PY3
-import _psutil_posix
-import _psutil_sunos as cext
+from . import _common
+from . import _psposix
+from ._common import (usage_percent, isfile_strict, sockfam_to_enum,
+                      socktype_to_enum)
+from ._compat import PY3
+from . import _psutil_posix
+from . import _psutil_sunos as cext
 
 
 __extra__all__ = ["CONN_IDLE", "CONN_BOUND"]
diff --git a/psutil/_pswindows.py b/psutil/_pswindows.py
index 847f2b62..3324e73a 100644
--- a/psutil/_pswindows.py
+++ b/psutil/_pswindows.py
@@ -11,11 +11,11 @@ import functools
 import os
 from collections import namedtuple
 
-from psutil import _common
-from psutil._common import (conn_tmap, usage_percent, isfile_strict,
-                            sockfam_to_enum, socktype_to_enum)
-from psutil._compat import PY3, xrange, lru_cache
-import _psutil_windows as cext
+from . import _common
+from ._common import (conn_tmap, usage_percent, isfile_strict,
+                      sockfam_to_enum, socktype_to_enum)
+from ._compat import PY3, xrange, lru_cache
+from . import _psutil_windows as cext
 
 # process priority constants, import from __init__.py:
 # http://msdn.microsoft.com/en-us/library/ms686219(v=vs.85).aspx
diff --git a/setup.py b/setup.py
index 2cbf5bee..dcc83987 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ VERSION_MACRO = ('PSUTIL_VERSION', int(VERSION.replace('.', '')))
 # POSIX
 if os.name == 'posix':
     posix_extension = Extension(
-        '_psutil_posix',
+        'psutil._psutil_posix',
         sources=['psutil/_psutil_posix.c'],
     )
 # Windows
@@ -58,7 +58,7 @@ if sys.platform.startswith("win32"):
         return '0x0%s' % ((maj * 100) + min)
 
     extensions = [Extension(
-        '_psutil_windows',
+        'psutil._psutil_windows',
         sources=[
             'psutil/_psutil_windows.c',
             'psutil/_psutil_common.c',
@@ -85,7 +85,7 @@ if sys.platform.startswith("win32"):
 # OS X
 elif sys.platform.startswith("darwin"):
     extensions = [Extension(
-        '_psutil_osx',
+        'psutil._psutil_osx',
         sources=[
             'psutil/_psutil_osx.c',
             'psutil/_psutil_common.c',
@@ -101,7 +101,7 @@ elif sys.platform.startswith("darwin"):
 # FreeBSD
 elif sys.platform.startswith("freebsd"):
     extensions = [Extension(
-        '_psutil_bsd',
+        'psutil._psutil_bsd',
         sources=[
             'psutil/_psutil_bsd.c',
             'psutil/_psutil_common.c',
@@ -114,7 +114,7 @@ elif sys.platform.startswith("freebsd"):
 # Linux
 elif sys.platform.startswith("linux"):
     extensions = [Extension(
-        '_psutil_linux',
+        'psutil._psutil_linux',
         sources=['psutil/_psutil_linux.c'],
         define_macros=[VERSION_MACRO]),
         posix_extension,
@@ -122,7 +122,7 @@ elif sys.platform.startswith("linux"):
 # Solaris
 elif sys.platform.lower().startswith('sunos'):
     extensions = [Extension(
-        '_psutil_sunos',
+        'psutil._psutil_sunos',
         sources=['psutil/_psutil_sunos.c'],
         define_macros=[VERSION_MACRO],
         libraries=['kstat', 'nsl'],),