mirrors/debugpy
1
0
Fork 0
mirror of https://github.com/microsoft/debugpy.git synced 2025-12-23 08:48:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into tpn

Browse source
This commit is contained in:
Steve Dower 2018-02-22 11:58:23 -08:00 • committed by GitHub
commit 4746d22ae1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ptvsd/pydevd/_pydevd_bundle/pydevd_frame.py
View file

@ -36,12 +36,10 @@ TRACE_PROPERTY = 'pydevd_traceproperty.py'
get_file_type = DONT_TRACE.get
def handle_breakpoint_condition(py_db, info, breakpoint, new_frame, default_return_value):
def handle_breakpoint_condition(py_db, info, breakpoint, new_frame):
condition = breakpoint.condition
try:
val = eval(condition, new_frame.f_globals, new_frame.f_locals)
if not val:
return default_return_value
return eval(condition, new_frame.f_globals, new_frame.f_locals)
except:
if type(condition) != type(''):
@ -559,10 +557,9 @@ class PyDBFrame:
if stop or exist_result:
condition = breakpoint.condition
if condition is not None:
result = handle_breakpoint_condition(main_debugger, info, breakpoint, new_frame,
self.trace_dispatch)
if result is not None:
return result
result = handle_breakpoint_condition(main_debugger, info, breakpoint, new_frame)
if not result:
return self.trace_dispatch
if breakpoint.expression is not None:
handle_breakpoint_expression(breakpoint, info, new_frame)

4
ptvsd/pydevd/_pydevd_frame_eval/pydevd_frame_tracing.py
View file

@ -28,7 +28,9 @@ def handle_breakpoint(frame, thread, global_debugger, breakpoint):
condition = breakpoint.condition
info = thread.additional_info
if condition is not None:
handle_breakpoint_condition(global_debugger, info, breakpoint, new_frame, False)
result = handle_breakpoint_condition(global_debugger, info, breakpoint, new_frame)
if not result:
return False
if breakpoint.expression is not None:
handle_breakpoint_expression(breakpoint, info, new_frame)

2
ptvsd/wrapper.py
View file

@ -479,7 +479,7 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
{
'filter': 'raised',
'label': 'Raised Exceptions',
'default': 'true'
'default': 'false'
},
{
'filter': 'uncaught',

5
setup.py
View file

@ -6,7 +6,7 @@
import os
import os.path
from setuptools import setup
from setuptools import setup, Extension
ROOT = os.path.dirname(os.path.abspath(__file__))
@ -40,4 +40,7 @@ setup(name='ptvsd',
'License :: OSI Approved :: MIT License'],
packages=['ptvsd'],
package_data={'ptvsd': list(get_pydevd_package_data()) + ['ThirdPartyNotices.txt']},
ext_modules=[Extension('ptvsd.pydevd._pydevd_bundle.pydevd_cython',
['ptvsd/pydevd/_pydevd_bundle/pydevd_cython.c'],
optional=True)],
)