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

lint

Browse source
This commit is contained in:
Eric Snow 2018-03-20 00:49:14 +00:00
parent b076906e02
commit 86baf5a0f8
4 changed files with 66 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ptvsd/safe_repr.py
View file

@ -34,7 +34,7 @@ class SafeRepr(object):
string_types = (str, unicode)
set_info = (set, 'set([', '])', False)
frozenset_info = (frozenset, 'frozenset([', '])', False)
int_types = (int, long)
int_types = (int, long) # noqa
# Collection types are recursively iterated for each limit in
# maxcollection.
@ -95,16 +95,19 @@ class SafeRepr(object):
for t, prefix, suffix, comma in self.collection_types:
if isinstance(obj, t) and has_obj_repr(t):
return self._repr_iter(obj, level, prefix, suffix, comma, convert_to_hex=convert_to_hex)
return self._repr_iter(obj, level, prefix, suffix, comma,
convert_to_hex=convert_to_hex)
for t, prefix, suffix, item_prefix, item_sep, item_suffix in self.dict_types: # noqa
if isinstance(obj, t) and has_obj_repr(t):
return self._repr_dict(obj, level, prefix, suffix,
item_prefix, item_sep, item_suffix, convert_to_hex=convert_to_hex)
item_prefix, item_sep, item_suffix,
convert_to_hex=convert_to_hex)
for t in self.string_types:
if isinstance(obj, t) and has_obj_repr(t):
return self._repr_str(obj, level, convert_to_hex=convert_to_hex)
return self._repr_str(obj, level,
convert_to_hex=convert_to_hex)
if self._is_long_iter(obj):
return self._repr_long_iter(obj, convert_to_hex=convert_to_hex)
@ -184,7 +187,7 @@ class SafeRepr(object):
yield '...'
break
for p in self._repr(item, 100 if item is obj else level + 1, convert_to_hex=convert_to_hex):
for p in self._repr(item, 100 if item is obj else level + 1, convert_to_hex=convert_to_hex): # noqa
yield p
else:
if comma_after_single_element:
@ -243,7 +246,7 @@ class SafeRepr(object):
except Exception:
yield '<?>'
else:
for p in self._repr(item, 100 if item is obj else level + 1, convert_to_hex=convert_to_hex):
for p in self._repr(item, 100 if item is obj else level + 1, convert_to_hex=convert_to_hex): # noqa
yield p
yield item_suffix
@ -251,13 +254,16 @@ class SafeRepr(object):
def _repr_str(self, obj, level, convert_to_hex=False):
return self._repr_obj(obj, level,
self.maxstring_inner, self.maxstring_outer, convert_to_hex=convert_to_hex)
self.maxstring_inner, self.maxstring_outer,
convert_to_hex=convert_to_hex)
def _repr_other(self, obj, level, convert_to_hex=False):
return self._repr_obj(obj, level,
self.maxother_inner, self.maxother_outer, convert_to_hex=convert_to_hex)
self.maxother_inner, self.maxother_outer,
convert_to_hex=convert_to_hex)
def _repr_obj(self, obj, level, limit_inner, limit_outer, convert_to_hex=False):
def _repr_obj(self, obj, level, limit_inner, limit_outer,
convert_to_hex=False):
try:
if isinstance(obj, self.int_types) and convert_to_hex:
obj_repr = hex(obj)

6
ptvsd/untangle.py
View file

@ -185,10 +185,12 @@ def parse(filename, **parser_features):
parser.setFeature(getattr(handler, feature), value)
sax_handler = Handler()
parser.setContentHandler(sax_handler)
is_filename = False
try:
is_filename = is_string(filename) and (os.path.exists(filename) or is_url(filename))
if is_string(filename):
is_filename = os.path.exists(filename) or is_url(filename)
except ValueError:
is_filename = False
pass
if is_filename:
parser.parse(filename)
else:

65
ptvsd/wrapper.py
View file

@ -64,7 +64,11 @@ class SafeReprPresentationProvider(pydevd_extapi.StrPresentationProvider):
def get_str(self, val):
return self.safe_repr(val, self.convert_to_hex)
def set_format(self, fmt):
self.convert_to_hex = fmt['hex']
# Register our presentation provider as the first item on the list,
# so that we're in full control of presentation.
str_handlers = pydevd_extutil.EXTENSION_MANAGER_INSTANCE.type_to_instance.setdefault(pydevd_extapi.StrPresentationProvider, []) # noqa
@ -799,13 +803,19 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
}
self.send_response(request, scopes=[scope])
def _extract_format(self, args):
fmt = args.get('format', {})
fmt.setdefault('hex', False)
return fmt
@async_handler
def on_variables(self, request, args):
# TODO: docstring
vsc_var = int(args['variablesReference'])
pyd_var = self.var_map.to_pydevd(vsc_var)
safe_repr_provider.convert_to_hex = args.get('format', {}).get('hex', False)
safe_repr_provider.set_format(
self._extract_format(args))
if len(pyd_var) == 3:
cmd = pydevd_comm.CMD_GET_FRAME
@ -851,33 +861,35 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
eval_name = None
if len(pyd_var_parent) > 3:
# This means the current variable has a parent i.e, it is not a
# FRAME variable. These require evaluateName to work in VS
# FRAME variable. These require evaluateName to work in VS
# watch window
var = pyd_var_parent + (var_name,)
eval_name = var[3]
for s in var[4:]:
try:
# Check and get the dictionary key or list index.
# Note: this is best effort, keys that are object references
# will not work
# Note: this is best effort, keys that are object
# references will not work
i = self.__get_index_or_key(s)
eval_name += '[{}]'.format(i)
except:
except Exception:
eval_name += '.' + s
return eval_name
def __get_index_or_key(self, text):
# Dictionary resolver in pydevd provides key in '<repr> (<hash>)' format
result = re.match(r"(.*)\ \(([0-9]*)\)", text, re.IGNORECASE | re.UNICODE)
# Dictionary resolver in pydevd provides key
# in '<repr> (<hash>)' format
result = re.match(r"(.*)\ \(([0-9]*)\)", text,
re.IGNORECASE | re.UNICODE)
if result and len(result.groups()) == 2:
try:
# check if group 2 is a hash
int(result.group(2))
return result.group(1)
except:
except Exception:
pass
# In the result XML from pydevd list indexes appear
# In the result XML from pydevd list indexes appear
# as names. If the name is a number then it is a index.
return int(text)
@ -885,10 +897,10 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
def on_setVariable(self, request, args):
vsc_var = int(args['variablesReference'])
pyd_var = self.var_map.to_pydevd(vsc_var)
var_name = args['name']
var_value = args['value']
lhs_expr = self.__get_variable_evaluate_name(pyd_var, var_name)
if not lhs_expr:
lhs_expr = var_name
@ -899,7 +911,8 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
pyd_tid = str(pyd_var[0])
pyd_fid = str(pyd_var[1])
safe_repr_provider.convert_to_hex = args.get('format', {}).get('hex', False)
safe_repr_provider.set_format(
self._extract_format(args))
# VSC gives us variablesReference to the parent of the variable
# being set, and variable name; but pydevd wants the ID
@ -928,11 +941,11 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
}
if bool(xvar['isContainer']):
response['variablesReference'] = vsc_var
# Reset hex format since this is per request.
safe_repr_provider.convert_to_hex = False
self.send_response(request, **response)
@async_handler
def on_evaluate(self, request, args):
# pydevd message format doesn't permit tabs in expressions
@ -941,8 +954,9 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
vsc_fid = int(args['frameId'])
pyd_tid, pyd_fid = self.frame_map.to_pydevd(vsc_fid)
safe_repr_provider.convert_to_hex = args.get('format', {}).get('hex', False)
safe_repr_provider.set_format(
self._extract_format(args))
cmd_args = (pyd_tid, pyd_fid, 'LOCAL', expr, '1')
msg = '\t'.join(str(s) for s in cmd_args)
_, _, resp_args = yield self.pydevd_request(
@ -971,14 +985,18 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
xvar2 = xml2.var
result_type = unquote(xvar2['type'])
result = unquote(xvar2['value'])
except:
except Exception:
# if resp_args is not xml then it contains the error traceback
result_type = unquote(xvar['type'])
result = unquote(xvar['value'])
self.send_response(request,
result=None if result=='None' and result_type=='NoneType' else result,
self.send_response(
request,
result=(None
if result == 'None' and result_type == 'NoneType'
else result),
type=result_type,
variablesReference=0)
variablesReference=0,
)
return
pyd_var = (pyd_tid, pyd_fid, 'EXPRESSION', expr)
@ -989,7 +1007,7 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
}
if bool(xvar['isContainer']):
response['variablesReference'] = vsc_var
# Reset hex format since this is per request.
safe_repr_provider.convert_to_hex = False
self.send_response(request, **response)
@ -1383,4 +1401,3 @@ def start_client(host, port, addhandlers=True):
# These are the functions pydevd invokes to get a socket to the client.
pydevd_comm.start_server = start_server
pydevd_comm.start_client = start_client

9
setup.py
View file

@ -9,7 +9,8 @@ import os.path
import subprocess
import sys
from setuptools import setup, Extension
from setuptools import setup
if not os.getenv('SKIP_CYTHON_BUILD'):
print('Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)')
@ -18,6 +19,7 @@ if not os.getenv('SKIP_CYTHON_BUILD'):
ROOT = os.path.dirname(os.path.abspath(__file__))
# Add pydevd files as data files for this package. They are not treated
# as a package of their own, because we don't actually want to provide
# pydevd - just use our own copy internally.
@ -35,13 +37,14 @@ def get_pydevd_package_data():
if d.startswith('pydev') or d.startswith('_pydev')]
files[:] = [f
for f in files
if f.endswith('.py') and (f in ['setup_cython.py'] or 'pydev' in f)]
if f.endswith('.py') and (f in ['setup_cython.py'] or 'pydev' in f)] # noqa
dirs[:] = [d for d in dirs if d != '__pycache__']
for f in files:
yield os.path.join(root[len(ptvsd_prefix) + 1:], f)
PACKAGE_DATA = {
'ptvsd': list(get_pydevd_package_data()) + ['ThirdPartyNotices.txt']
'ptvsd': list(get_pydevd_package_data()) + ['ThirdPartyNotices.txt'],
}
setup(