Snapshot idea/138.1980 from git://git.jetbrains.org/idea/community.git
Change-Id: Ib567c9c152d770212a7a3db20fbf591c210920bd
diff --git a/python/helpers/pydev/pydevconsole.py b/python/helpers/pydev/pydevconsole.py
index 2f07a82..8d4375f 100644
--- a/python/helpers/pydev/pydevconsole.py
+++ b/python/helpers/pydev/pydevconsole.py
@@ -1,3 +1,5 @@
+from _pydev_imps._pydev_thread import start_new_thread
+
try:
from code import InteractiveConsole
except ImportError:
@@ -9,12 +11,7 @@
import os
import sys
-from pydevd_constants import USE_LIB_COPY
-
-if USE_LIB_COPY:
- import _pydev_threading as threading
-else:
- import threading
+import _pydev_threading as threading
import traceback
import fix_getpass
@@ -61,13 +58,14 @@
self.code_fragment = code_fragment
self.more = None
- @staticmethod
+
def symbol_for_fragment(code_fragment):
if code_fragment.is_single_line:
symbol = 'single'
else:
symbol = 'exec' # Jython doesn't support this
return symbol
+ symbol_for_fragment = staticmethod(symbol_for_fragment)
def run(self):
text = self.code_fragment.text
@@ -228,7 +226,7 @@
#=======================================================================================================================
# _DoExit
#=======================================================================================================================
-def _DoExit(*args):
+def DoExit(*args):
'''
We have to override the exit because calling sys.exit will only actually exit the main thread,
and as we're in a Xml-rpc server, that won't work.
@@ -300,15 +298,11 @@
def StartServer(host, port, client_port):
#replace exit (see comments on method)
#note that this does not work in jython!!! (sys method can't be replaced).
- sys.exit = _DoExit
+ sys.exit = DoExit
interpreter = InterpreterInterface(host, client_port, threading.currentThread())
- server_thread = threading.Thread(target=start_server,
- name='ServerThread',
- args=(host, port, interpreter))
- server_thread.setDaemon(True)
- server_thread.start()
+ start_new_thread(start_server,(host, port, interpreter))
process_exec_queue(interpreter)