Snapshot idea/138.1696 from git://git.jetbrains.org/idea/community.git
Change-Id: I50c97b83a815ce635e49a38380ba5b8765e4b16a
diff --git a/python/helpers/pydev/pycompletionserver.py b/python/helpers/pydev/pycompletionserver.py
index 2fdd539..0b11cb6 100644
--- a/python/helpers/pydev/pycompletionserver.py
+++ b/python/helpers/pydev/pycompletionserver.py
@@ -37,10 +37,7 @@
import _pydev_imports_tipper
-if pydevd_constants.USE_LIB_COPY:
- import _pydev_socket as socket
-else:
- import socket
+from _pydev_imps import _pydev_socket as socket
import sys
if sys.platform == "darwin":
@@ -65,10 +62,7 @@
import traceback
-if pydevd_constants.USE_LIB_COPY:
- import _pydev_time as time
-else:
- import time
+from _pydev_imps import _pydev_time as time
try:
import StringIO
@@ -93,7 +87,7 @@
# f = open('c:/temp/test.txt', 'a')
# print_ >> f, s
# f.close()
-
+
import pydev_localhost
HOST = pydev_localhost.get_localhost() # Symbolic name meaning the local host
@@ -203,7 +197,7 @@
def connectToServer(self):
- import socket
+ from _pydev_imps import _pydev_socket as socket
self.socket = s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
try: