Version bump to v2.0.0-beta.31

+ Fix windows imports under Python 3

Author: Kronuz

codeintel/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.0-beta.30'
+__version__ = '2.0.0-beta.31'

codeintel/process.py

@@ -88,10 +88,7 @@ def __init__(self, msg, errno=-1):
         self.errno = errno
 
 
-# Check if this is Windows NT and above.
-if sys.platform == "win32" and sys.getwindowsversion()[3] == 2:
-
-    import winprocess
+if sys.platform.startswith("win"):
     import subprocess
 
     # In Python 3 on Windows, a lot of the functions previously
@@ -106,6 +103,16 @@ def subprocess_import(attr):
                 return value
         raise ImportError
 
+    GetStdHandle = subprocess_import('GetStdHandle')
+    STD_INPUT_HANDLE = subprocess_import('STD_INPUT_HANDLE')
+    STD_OUTPUT_HANDLE = subprocess_import('STD_OUTPUT_HANDLE')
+    STD_ERROR_HANDLE = subprocess_import('STD_ERROR_HANDLE')
+
+
+# Check if this is Windows NT and above.
+if sys.platform == "win32" and sys.getwindowsversion()[3] == 2:
+    import winprocess
+
     try:
         # These subprocess variables have moved around between Python versions.
         list2cmdline = subprocess_import('list2cmdline')
@@ -389,16 +396,14 @@ def _needToHackAroundStdHandles(cls):
             if sys.platform != "win32":
                 cls.__needToHackAroundStdHandles = False
             else:
-                from _subprocess import GetStdHandle, STD_INPUT_HANDLE
                 stdin_handle = GetStdHandle(STD_INPUT_HANDLE)
                 if stdin_handle is not None:
                     cls.__needToHackAroundStdHandles = True
                 else:
                     cls.__needToHackAroundStdHandles = False
         return cls.__needToHackAroundStdHandles
 
-    @classmethod
-    def _isFileObjInheritable(cls, fileobj, stream_name):
+    def _isFileObjInheritable(self, fileobj, stream_name):
         """Check if a given file-like object (or whatever else subprocess.Popen
         takes as a handle/stream) can be correctly inherited by a child process.
         This just duplicates the code in subprocess.Popen._get_handles to make
@@ -408,7 +413,6 @@ def _isFileObjInheritable(cls, fileobj, stream_name):
         @param fileobj The object being used as a fd/handle/whatever
         @param stream_name The name of the stream, "stdin", "stdout", or "stderr"
         """
-        import _subprocess
         import ctypes
         import msvcrt
         new_handle = None
@@ -423,11 +427,11 @@ def _isFileObjInheritable(cls, fileobj, stream_name):
         try:
             if fileobj is None:
                 std_handle = {
-                    "stdin": _subprocess.STD_INPUT_HANDLE,
-                    "stdout": _subprocess.STD_OUTPUT_HANDLE,
-                    "stderr": _subprocess.STD_ERROR_HANDLE,
+                    "stdin": STD_INPUT_HANDLE,
+                    "stdout": STD_OUTPUT_HANDLE,
+                    "stderr": STD_ERROR_HANDLE,
                 }[stream_name]
-                handle = _subprocess.GetStdHandle(std_handle)
+                handle = GetStdHandle(std_handle)
                 if handle is None:
                     # subprocess.Popen._get_handles creates a new pipe here
                     # we don't have to worry about things we create