move extension into package - without relative imports.

psutil/__init__.py

@@ -70,7 +70,7 @@
                                  IOPRIO_CLASS_IDLE)
     # Linux >= 2.6.36
     if _psplatform.HAS_PRLIMIT:
-        from _psutil_linux import (RLIM_INFINITY,  # NOQA
+        from psutil._psutil_linux import (RLIM_INFINITY,  # NOQA
                                    RLIMIT_AS,
                                    RLIMIT_CORE,
                                    RLIMIT_CPU,
@@ -85,7 +85,7 @@
         # 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 psutil import _psutil_linux
         try:
             RLIMIT_MSGQUEUE = _psutil_linux.RLIMIT_MSGQUEUE
         except AttributeError:
@@ -110,12 +110,12 @@
 
 elif sys.platform.startswith("win32"):
     from psutil import _pswindows as _psplatform
-    from _psutil_windows import (ABOVE_NORMAL_PRIORITY_CLASS,  # NOQA
-                                 BELOW_NORMAL_PRIORITY_CLASS,
-                                 HIGH_PRIORITY_CLASS,
-                                 IDLE_PRIORITY_CLASS,
-                                 NORMAL_PRIORITY_CLASS,
-                                 REALTIME_PRIORITY_CLASS)
+    from psutil._psutil_windows import (ABOVE_NORMAL_PRIORITY_CLASS,  # NOQA
+                                        BELOW_NORMAL_PRIORITY_CLASS,
+                                        HIGH_PRIORITY_CLASS,
+                                        IDLE_PRIORITY_CLASS,
+                                        NORMAL_PRIORITY_CLASS,
+                                        REALTIME_PRIORITY_CLASS)
     from psutil._pswindows import CONN_DELETE_TCB  # NOQA
 
 elif sys.platform.startswith("darwin"):

psutil/_psbsd.py

@@ -16,8 +16,8 @@
 from psutil import _psposix
 from psutil._common import conn_tmap, usage_percent, sockfam_to_enum
 from psutil._common import socktype_to_enum
-import _psutil_bsd as cext
-import _psutil_posix
+import psutil._psutil_bsd as cext
+import psutil._psutil_posix as cext_posix
 
 
 __extra__all__ = []
@@ -341,11 +341,11 @@ def wait(self, timeout=None):
 
     @wrap_exceptions
     def nice_get(self):
-        return _psutil_posix.getpriority(self.pid)
+        return cext_posix.getpriority(self.pid)
 
     @wrap_exceptions
     def nice_set(self, value):
-        return _psutil_posix.setpriority(self.pid, value)
+        return cext_posix.setpriority(self.pid, value)
 
     @wrap_exceptions
     def status(self):

psutil/_pslinux.py

@@ -23,8 +23,8 @@
 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
+import psutil._psutil_linux as cext
+import psutil._psutil_posix as cext_posix
 
 
 __extra__all__ = [
@@ -941,11 +941,11 @@ def nice_get(self):
         #   return int(data.split()[18])
 
         # Use C implementation
-        return _psutil_posix.getpriority(self.pid)
+        return cext_posix.getpriority(self.pid)
 
     @wrap_exceptions
     def nice_set(self, value):
-        return _psutil_posix.setpriority(self.pid, value)
+        return cext_posix.setpriority(self.pid, value)
 
     @wrap_exceptions
     def cpu_affinity_get(self):

psutil/_psosx.py

@@ -15,8 +15,8 @@
 from psutil import _psposix
 from psutil._common import conn_tmap, usage_percent, isfile_strict
 from psutil._common import sockfam_to_enum, socktype_to_enum
-import _psutil_osx as cext
-import _psutil_posix
+import psutil._psutil_osx as cext
+import psutil._psutil_posix as cext_posix
 
 
 __extra__all__ = []
@@ -317,11 +317,11 @@ def wait(self, timeout=None):
 
     @wrap_exceptions
     def nice_get(self):
-        return _psutil_posix.getpriority(self.pid)
+        return cext_posix.getpriority(self.pid)
 
     @wrap_exceptions
     def nice_set(self, value):
-        return _psutil_posix.setpriority(self.pid, value)
+        return cext_posix.setpriority(self.pid, value)
 
     @wrap_exceptions
     def status(self):

psutil/_pssunos.py

@@ -18,8 +18,8 @@
 from psutil._common import isfile_strict, socktype_to_enum, sockfam_to_enum
 from psutil._common import usage_percent
 from psutil._compat import PY3
-import _psutil_posix
-import _psutil_sunos as cext
+import psutil._psutil_posix as cext_posix
+import psutil._psutil_sunos as cext
 
 
 __extra__all__ = ["CONN_IDLE", "CONN_BOUND"]
@@ -295,7 +295,7 @@ def nice_get(self):
         # Note: tested on Solaris 11; on Open Solaris 5 everything is
         # fine.
         try:
-            return _psutil_posix.getpriority(self.pid)
+            return cext_posix.getpriority(self.pid)
         except EnvironmentError as err:
             if err.errno in (errno.ENOENT, errno.ESRCH):
                 if pid_exists(self.pid):
@@ -310,7 +310,7 @@ def nice_set(self, value):
             # The process actually exists though, as it has a name,
             # creation time, etc.
             raise AccessDenied(self.pid, self._name)
-        return _psutil_posix.setpriority(self.pid, value)
+        return cext_posix.setpriority(self.pid, value)
 
     @wrap_exceptions
     def ppid(self):

psutil/_pswindows.py

@@ -15,7 +15,7 @@
 from psutil._common import conn_tmap, usage_percent, isfile_strict
 from psutil._common import sockfam_to_enum, socktype_to_enum
 from psutil._compat import PY3, xrange, lru_cache
-import _psutil_windows as cext
+import psutil._psutil_windows as cext
 
 
 # process priority constants, import from __init__.py:

setup.py

@@ -47,7 +47,7 @@ def get_description():
 # POSIX
 if os.name == 'posix':
     posix_extension = Extension(
-        '_psutil_posix',
+        'psutil._psutil_posix',
         sources=['psutil/_psutil_posix.c'],
     )
 # Windows
@@ -58,7 +58,7 @@ def get_winver():
         return '0x0%s' % ((maj * 100) + min)
 
     extensions = [Extension(
-        '_psutil_windows',
+        'psutil._psutil_windows',
         sources=[
             'psutil/_psutil_windows.c',
             'psutil/_psutil_common.c',
@@ -86,7 +86,7 @@ def get_winver():
 # OS X
 elif sys.platform.startswith("darwin"):
     extensions = [Extension(
-        '_psutil_osx',
+        'psutil._psutil_osx',
         sources=[
             'psutil/_psutil_osx.c',
             'psutil/_psutil_common.c',
@@ -102,7 +102,7 @@ def get_winver():
 # FreeBSD
 elif sys.platform.startswith("freebsd"):
     extensions = [Extension(
-        '_psutil_bsd',
+        'psutil._psutil_bsd',
         sources=[
             'psutil/_psutil_bsd.c',
             'psutil/_psutil_common.c',
@@ -115,15 +115,15 @@ def get_winver():
 # Linux
 elif sys.platform.startswith("linux"):
     extensions = [Extension(
-        '_psutil_linux',
+        'psutil._psutil_linux',
         sources=['psutil/_psutil_linux.c'],
         define_macros=[VERSION_MACRO]),
         posix_extension,
     ]
 # 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'],),