SublimeCodeIntel
diff --git a/‎SublimeCodeIntel.py‎
Lines changed: 2 additions & 9 deletions b/‎SublimeCodeIntel.py‎
Lines changed: 2 additions & 9 deletions
diff --git a/‎libs/__init__.py‎ b/‎libs/__init__.py‎
diff --git a/‎libs/codeintel.py‎
Lines changed: 2 additions & 2 deletions b/‎libs/codeintel.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎libs/process.py‎
Lines changed: 4 additions & 1 deletion b/‎libs/process.py‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎libs/win32_named_pipe.py‎
Lines changed: 1 addition & 1 deletion b/‎libs/win32_named_pipe.py‎
Lines changed: 1 addition & 1 deletion
@@ -29,16 +29,9 @@
 from __future__ import absolute_import, unicode_literals, print_function
 
 NAME = "SublimeCodeIntel"
-VERSION = "3.0.0-beta.38"
+VERSION = "3.0.0-beta.39"
 
 import os
-import sys
-__file__ = os.path.normpath(os.path.abspath(__file__))
-__path__ = os.path.dirname(__file__)
-python_sitelib_path = os.path.join(os.path.normpath(__path__), 'libs')
-if python_sitelib_path not in sys.path:
-    sys.path.insert(0, python_sitelib_path)
-
 import re
 import logging
 import textwrap
@@ -48,7 +41,7 @@
 import sublime
 import sublime_plugin
 
-from codeintel import CodeIntel, CodeIntelBuffer, logger as codeintel_logger, logger_level as codeintel_logger_level
+from .libs.codeintel import CodeIntel, CodeIntelBuffer, logger as codeintel_logger, logger_level as codeintel_logger_level
 from .settings import Settings, SettingTogglerCommandMixin
 
 logger_name = 'CodeIntel'
 
@@ -323,7 +323,7 @@ def cleanup(self):
 
 
 if sys.platform.startswith("win"):
-    from win32_named_pipe import Win32Pipe
+    from .win32_named_pipe import Win32Pipe
 
     class _PipeConnection(Win32Pipe):
         """This is a wrapper around our Win32Pipe class to expose the expected
@@ -585,7 +585,7 @@ def find_command(self):
                     return codeintel_command
 
     def init_child(self):
-        import process
+        from . import process
         assert threading.current_thread().name != "MainThread", \
             "CodeIntelManager.init_child should run on background thread!"
         self.log.debug("initializing child process")
 
@@ -117,7 +117,10 @@ def subprocess_import(attr):
 
 # Check if this is Windows NT and above.
 if sys.platform == "win32" and sys.getwindowsversion()[3] == 2:
-    import winprocess
+    try:
+        from . import winprocess
+    except:
+        import winprocess
 
     try:
         # These subprocess variables have moved around between Python versions.
 
@@ -212,7 +212,7 @@ def read(self, count):
                                        True):
                 raise ctypes.WinError(ctypes.get_last_error())
             assert read.value == count
-            return str(buf.value)
+            return buf.value
         finally:
             CloseHandle(overlapped.hEvent)