jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-04 09:22:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Important fragments bug fix...

Browse Source 
start, finish that had been adjusted wasn't getting reflected in final
returned deparsed.offsets dictionary. Redo keeping API compatibility,
i.e we still use namedtuple NodeInfo.
This commit is contained in:
rocky
2017-06-05 21:17:17 -04:00
parent eb92418224
commit 4615cda03f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
uncompyle6/semantics/fragments.py
View File

@@ -159,8 +159,9 @@ class FragmentsWalker(pysource.SourceWalker, object):
def set_pos_info(self, node, start, finish, name=None): def set_pos_info(self, node, start, finish, name=None):
if name is None: name = self.name if name is None: name = self.name
if hasattr(node, 'offset'): if hasattr(node, 'offset'):
self.offsets[name, node.offset] = \ node.start = start
NodeInfo(node = node, start = start, finish = finish) node.finish = finish
self.offsets[name, node.offset] = node
if hasattr(node, 'parent'): if hasattr(node, 'parent'):
assert node.parent != node assert node.parent != node
@@ -1090,7 +1091,6 @@ class FragmentsWalker(pysource.SourceWalker, object):
def traverse(self, node, indent=None, isLambda=False): def traverse(self, node, indent=None, isLambda=False):
'''Buulds up fragment which can be used inside a larger '''Buulds up fragment which can be used inside a larger
block of code''' block of code'''
self.param_stack.append(self.params) self.param_stack.append(self.params)
if indent is None: indent = self.indent if indent is None: indent = self.indent
p = self.pending_newlines p = self.pending_newlines
@@ -1658,6 +1658,11 @@ def deparse_code(version, co, out=StringIO(), showasm=False, showast=False,
if deparsed.ERROR: if deparsed.ERROR:
raise deparsed.ERROR raise deparsed.ERROR
# To keep the API consistent with previous releases, convert
# deparse.offset values into NodeInfo items
for tup, node in deparsed.offsets.items():
deparsed.offsets[tup] = NodeInfo(node = node, start = node.start,
finish = node.finish)
return deparsed return deparsed
from bisect import bisect_right from bisect import bisect_right
@@ -1692,6 +1697,7 @@ def deparse_code_around_offset(name, offset, version, co, out=StringIO(),
if __name__ == '__main__': if __name__ == '__main__':
from uncompyle6 import IS_PYPY
def deparse_test(co, is_pypy=IS_PYPY): def deparse_test(co, is_pypy=IS_PYPY):
sys_version = sys.version_info.major + (sys.version_info.minor / 10.0) sys_version = sys.version_info.major + (sys.version_info.minor / 10.0)
walk = deparse_code(sys_version, co, showasm=False, showast=False, walk = deparse_code(sys_version, co, showasm=False, showast=False,