fix tox issue by adding 'develop' option; also reindent imports as they were beforemindw-move_extension_2_pkg

7 files changed, 38 insertions, 42 deletions

diff --git a/psutil/__init__.py b/psutil/__init__.py
index fd9c9d83..f52ef04f 100644
--- a/psutil/__init__.py
+++ b/psutil/__init__.py
@@ -28,41 +28,36 @@ except ImportError:
 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 (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
 )
 
-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
-)
+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"):
     from . import _pslinux as _psplatform
diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py
index 72147fd8..006d3b3e 100644
--- a/psutil/_psbsd.py
+++ b/psutil/_psbsd.py
@@ -14,10 +14,10 @@ from collections import namedtuple
 
 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
+from ._common import (conn_tmap, usage_percent, sockfam_to_enum,
+                      socktype_to_enum)
 
 
 __extra__all__ = []
diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py
index ba691b17..4d8e6e4b 100644
--- a/psutil/_pslinux.py
+++ b/psutil/_pslinux.py
@@ -21,10 +21,10 @@ from collections import namedtuple, defaultdict
 
 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
+from ._common import (isfile_strict, usage_percent, deprecated)
+from ._compat import PY3
 
 
 __extra__all__ = [
diff --git a/psutil/_psosx.py b/psutil/_psosx.py
index 849a6d09..419e931c 100644
--- a/psutil/_psosx.py
+++ b/psutil/_psosx.py
@@ -13,10 +13,10 @@ from collections import namedtuple
 
 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
+from ._common import (conn_tmap, usage_percent, isfile_strict,
+                      sockfam_to_enum, socktype_to_enum)
 
 
 __extra__all__ = []
diff --git a/psutil/_pssunos.py b/psutil/_pssunos.py
index 8b3edb8c..85f665fb 100644
--- a/psutil/_pssunos.py
+++ b/psutil/_pssunos.py
@@ -15,11 +15,11 @@ from collections import namedtuple
 
 from . import _common
 from . import _psposix
+from . import _psutil_posix
+from . import _psutil_sunos as cext
 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 3324e73a..ea536955 100644
--- a/psutil/_pswindows.py
+++ b/psutil/_pswindows.py
@@ -12,10 +12,10 @@ import os
 from collections import namedtuple
 
 from . import _common
+from . import _psutil_windows as cext
 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/tox.ini b/tox.ini
index dcbabeb4..d5ee51ae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,6 +18,7 @@ commands =
     git ls-files | grep \\.py$ | xargs flake8
 # suppress "WARNING: 'git' command found but not installed in testenv
 whitelist_externals = git
+usedevelop = True
 
 [testenv:py26]
 deps =