mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Don't try to stop threads as it has little sense in general and causes exception in Python 3.4 (PY-12317).
This commit is contained in:
@@ -184,7 +184,6 @@ class PyDBCheckAliveThread(PyDBDaemonThread):
|
||||
except:
|
||||
traceback.print_exc()
|
||||
|
||||
self.stop()
|
||||
self.killReceived = True
|
||||
return
|
||||
|
||||
|
||||
@@ -94,7 +94,6 @@ except:
|
||||
from urllib.parse import quote #@Reimport @UnresolvedImport
|
||||
|
||||
import pydevd_vars
|
||||
import pydev_log
|
||||
import pydevd_tracing
|
||||
import pydevd_vm_type
|
||||
import pydevd_file_utils
|
||||
@@ -106,12 +105,6 @@ from pydevd_utils import quote_smart as quote
|
||||
from pydevd_tracing import GetExceptionTracebackStr
|
||||
import pydevconsole
|
||||
|
||||
try:
|
||||
_Thread_stop = threading.Thread._Thread__stop
|
||||
except AttributeError:
|
||||
_Thread_stop = threading.Thread._stop # _stop in Python 3
|
||||
|
||||
|
||||
|
||||
CMD_RUN = 101
|
||||
CMD_LIST_THREADS = 102
|
||||
@@ -258,9 +251,6 @@ class PyDBDaemonThread(threading.Thread):
|
||||
#that was not working very well because jython gave some socket errors
|
||||
self.killReceived = True
|
||||
|
||||
def stop(self):
|
||||
_Thread_stop(self)
|
||||
|
||||
def stopTrace(self):
|
||||
if self.dontTraceMe:
|
||||
pydevd_tracing.SetTrace(None) # no debugging on this thread
|
||||
@@ -372,7 +362,6 @@ class WriterThread(PyDBDaemonThread):
|
||||
self.sock.close()
|
||||
except:
|
||||
pass
|
||||
self.stop() #mark thread as stopped to unblock joined threads for sure (they can hang otherwise)
|
||||
|
||||
return #break if queue is empty and killReceived
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user