move extension into the package

psutil/_psbsd.py

@@ -12,11 +12,11 @@
 import sys
 from collections import namedtuple
 
-from psutil import _common
-from psutil import _psposix
-from psutil._common import conn_tmap, usage_percent
-import _psutil_bsd as cext
-import _psutil_posix
+from . import _common
+from . import _psposix
+from ._common import conn_tmap, usage_percent
+from . import _psutil_bsd as cext
+from . import _psutil_posix
 
 
 __extra__all__ = []

psutil/_pslinux.py

@@ -19,12 +19,12 @@
 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__ = [

psutil/_psosx.py

@@ -11,11 +11,11 @@
 import os
 from collections import namedtuple
 
-from psutil import _common
-from psutil import _psposix
-from psutil._common import conn_tmap, usage_percent, isfile_strict
-import _psutil_osx as cext
-import _psutil_posix
+from . import _common
+from . import _psposix
+from ._common import conn_tmap, usage_percent, isfile_strict
+from . import _psutil_osx as cext
+from . import _psutil_posix
 
 
 __extra__all__ = []

psutil/_psposix.py

@@ -12,8 +12,8 @@
 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):

psutil/_pssunos.py

@@ -13,12 +13,12 @@
 import sys
 from collections import namedtuple
 
-from psutil import _common
-from psutil import _psposix
-from psutil._common import usage_percent, isfile_strict
-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
+from ._compat import PY3
+from . import _psutil_posix
+from . import _psutil_sunos as cext
 
 
 __extra__all__ = ["CONN_IDLE", "CONN_BOUND"]

psutil/_pswindows.py

@@ -11,10 +11,10 @@
 import os
 from collections import namedtuple
 
-from psutil import _common
-from psutil._common import conn_tmap, usage_percent, isfile_strict
-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
+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

setup.py

@@ -11,11 +11,7 @@
 
 import os
 import sys
-try:
-    from setuptools import setup, Extension
-except ImportError:
-    from distutils.core import setup, Extension
-
+from setuptools import setup, Extension
 
 HERE = os.path.abspath(os.path.dirname(__file__))
 
@@ -47,7 +43,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 +54,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',
@@ -85,7 +81,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',
@@ -101,7 +97,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',
@@ -114,15 +110,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'],),
@@ -134,6 +130,7 @@ def get_winver():
 
 def main():
     setup_args = dict(
+        zip_safe=False,
         name='psutil',
         version=VERSION,
         description=__doc__.replace('\n', '').strip(),