Skip to content

Commit 8380a65

Browse files
committed
Lock for thread suspension, code-formatting.
1 parent 29500d6 commit 8380a65

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+182
-195
lines changed

_pydev_bundle/_pydev_calltip_util.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
License: Apache 2.0
33
Author: Yuli Fitterman
44
"""
5+
56
import types
67

78
from _pydevd_bundle.pydevd_constants import IS_JYTHON

_pydev_bundle/fsnotify/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ def start_watching(): # Called from thread
3737
3838
Note: changes are only reported for files (added/modified/deleted), not directories.
3939
"""
40+
4041
import sys
4142
from os.path import basename
4243
from _pydev_bundle import pydev_log, _pydev_saved_modules

_pydev_bundle/pydev_ipython_console_011.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# eg: Completing a magic when user typed it without the leading % causes the % to be inserted
1111
# to the left of what should be the first colon.
1212
"""Interface to TerminalInteractiveShell for PyDev Interactive Console frontend
13-
for IPython 0.11 to 1.0+.
13+
for IPython 0.11 to 1.0+.
1414
"""
1515

1616
from __future__ import print_function

_pydevd_bundle/pydevd_additional_thread_info_regular.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def _get_related_thread(self):
140140
return None
141141

142142
if thread._ident is None: # Can this happen?
143-
pydev_log.critical("thread._ident is None in _get_related_thread!")
143+
pydev_log.critical("thread._ident is None in _get_related_thread! - thread: %s", thread)
144144
return None
145145

146146
if threading._active.get(thread._ident) is not thread:

_pydevd_bundle/pydevd_comm.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
""" pydevd - a debugging daemon
1+
"""pydevd - a debugging daemon
22
This is the daemon you launch for python remote debugging.
33
44
Protocol:
@@ -1528,13 +1528,14 @@ def build_exception_info_response(dbg, thread_id, thread, request_seq, set_addit
15281528
if line_col_info.end_lineno is not None and lineno < line_col_info.end_lineno:
15291529
line_text = "\n".join(linecache.getlines(filename_in_utf8)[lineno : line_col_info.end_lineno + 1])
15301530
frame_summary = traceback.FrameSummary(
1531-
filename_in_utf8,
1532-
lineno,
1533-
method_name,
1534-
line=line_text,
1535-
end_lineno=line_col_info.end_lineno,
1536-
colno=line_col_info.colno,
1537-
end_colno=line_col_info.end_colno)
1531+
filename_in_utf8,
1532+
lineno,
1533+
method_name,
1534+
line=line_text,
1535+
end_lineno=line_col_info.end_lineno,
1536+
colno=line_col_info.colno,
1537+
end_colno=line_col_info.end_colno,
1538+
)
15381539
stack_summary.append(frame_summary)
15391540
else:
15401541
frame_summary = traceback.FrameSummary(filename_in_utf8, lineno, method_name, line=line_text)

_pydevd_bundle/pydevd_console.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
"""An helper file for the pydev debugger (REPL) console
2-
"""
1+
"""An helper file for the pydev debugger (REPL) console"""
2+
33
import sys
44
import traceback
55
from _pydevd_bundle.pydevconsole_code import InteractiveConsole, _EvalAwaitInNewEventLoop

_pydevd_bundle/pydevd_cython.c

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_pydevd_bundle/pydevd_cython.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ cdef class PyDBAdditionalThreadInfo:
146146
return None
147147

148148
if thread._ident is None: # Can this happen?
149-
pydev_log.critical("thread._ident is None in _get_related_thread!")
149+
pydev_log.critical("thread._ident is None in _get_related_thread! - thread: %s", thread)
150150
return None
151151

152152
if threading._active.get(thread._ident) is not thread:

_pydevd_bundle/pydevd_dont_trace.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""
22
Support for a tag that allows skipping over functions while debugging.
33
"""
4+
45
import linecache
56
import re
67

_pydevd_bundle/pydevd_frame_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,9 @@ def __str__(self):
297297
__repr__ = __str__
298298

299299

300-
_cause_message = "\nThe above exception was the direct cause " "of the following exception:\n\n"
300+
_cause_message = "\nThe above exception was the direct cause of the following exception:\n\n"
301301

302-
_context_message = "\nDuring handling of the above exception, " "another exception occurred:\n\n"
302+
_context_message = "\nDuring handling of the above exception, another exception occurred:\n\n"
303303

304304

305305
def create_frames_list_from_exception_cause(trace_obj, frame, exc_type, exc_desc, memo):

0 commit comments

Comments
 (0)