Skip to content

Commit e1f28af

Browse files
committed
Version bump to v2.0.0-beta.36
+ Fix imports + Fix Windows pipe mode
1 parent 86f63aa commit e1f28af

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

codeintel/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '2.0.0-beta.35'
1+
__version__ = '2.0.0-beta.36'

codeintel/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ def cleanup(self):
323323

324324

325325
if sys.platform.startswith("win"):
326-
from win32_named_pipe import Win32Pipe
326+
from .win32_named_pipe import Win32Pipe
327327

328328
class _PipeConnection(Win32Pipe):
329329
"""This is a wrapper around our Win32Pipe class to expose the expected
@@ -585,7 +585,7 @@ def find_command(self):
585585
return codeintel_command
586586

587587
def init_child(self):
588-
import process
588+
from . import process
589589
assert threading.current_thread().name != "MainThread", \
590590
"CodeIntelManager.init_child should run on background thread!"
591591
self.log.debug("initializing child process")

codeintel/process.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,10 @@ def subprocess_import(attr):
117117

118118
# Check if this is Windows NT and above.
119119
if sys.platform == "win32" and sys.getwindowsversion()[3] == 2:
120-
import winprocess
120+
try:
121+
from . import winprocess
122+
except:
123+
import winprocess
121124

122125
try:
123126
# These subprocess variables have moved around between Python versions.

codeintel/win32_named_pipe.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def read(self, count):
212212
True):
213213
raise ctypes.WinError(ctypes.get_last_error())
214214
assert read.value == count
215-
return str(buf.value)
215+
return buf.value
216216
finally:
217217
CloseHandle(overlapped.hEvent)
218218

0 commit comments

Comments
 (0)