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

Get ready for release 2.12.0

Browse Source
This commit is contained in:
rocky
2017-09-20 19:02:56 -04:00
parent 96ca68a6fe
commit dfbd60231b
6 changed files with 131 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
ChangeLog
View File

@@ -1,6 +1,79 @@
2017-09-20 rocky <rb@dustyfeet.com>
* uncompyle6/semantics/fragments.py,
uncompyle6/semantics/pysource.py: Tidy pysource and fragments a
little more
2017-09-20 rocky <rb@dustyfeet.com>
* uncompyle6/semantics/consts.py: Tidy/regularize table entry
formatting
2017-09-20 rocky <rb@dustyfeet.com>
* test/test_pythonlib.py, uncompyle6/semantics/pysource.py: Small
fixes test_pyenvlib.py: it is sys.exit(), not exit() pysource.py:
reinstate nod type of async_func_call
2017-09-20 rocky <rb@dustyfeet.com>
* uncompyle6/semantics/consts.py, uncompyle6/semantics/pysource.py:
More small doc changes
2017-09-20 rocky <rb@dustyfeet.com>
* pytest/test_pysource.py, uncompyle6/semantics/pysource.py: Update
Table-driven info... Start a pysource unit test.
2017-09-17 rocky <rb@dustyfeet.com>
* uncompyle6/semantics/fragments.py,
uncompyle6/semantics/pysource.py: engine -> template_engine
2017-09-13 rocky <rb@dustyfeet.com>
* test/Makefile: Need weak-verification on 3.4 for now
2017-09-10 rocky <rb@dustyfeet.com>
* uncompyle6/semantics/fragments.py: Revert one of the changes
pending a better fix
2017-09-10 rocky <rb@dustyfeet.com>
* uncompyle6/semantics/fragments.py,
uncompyle6/semantics/pysource.py: More semantic action cleanup
2017-09-10 rocky <rb@dustyfeet.com>
* uncompyle6/scanners/scanner3.py, uncompyle6/scanners/tok.py: Match
Python 3.4's terms a little names better
2017-09-09 rocky <rb@dustyfeet.com>
* uncompyle6/scanners/tok.py: Revert last revert
2017-09-09 rocky <rb@dustyfeet.com>
* uncompyle6/scanners/tok.py: Revert last change
2017-09-09 rocky <rb@dustyfeet.com>
* uncompyle6/scanners/tok.py: New-style Python classes only, please.
2017-08-31 rocky <rb@dustyfeet.com> 2017-08-31 rocky <rb@dustyfeet.com>
* NEWS, README.rst, uncompyle6/parsers/parse37.py, * uncompyle6/scanner.py, uncompyle6/scanners/scanner37.py: Skeletal
support for Python 3.7 Largely failing though.
2017-08-31 rocky <rb@dustyfeet.com>
* README.rst: Remove python versions tag I think it's messing up Pypi's very fussy formatting
2017-08-31 rocky <rb@dustyfeet.com>
* ChangeLog, NEWS, README.rst, __pkginfo__.py,
uncompyle6/parsers/parse37.py,
uncompyle6/semantics/make_function.py, uncompyle6/version.py: Get uncompyle6/semantics/make_function.py, uncompyle6/version.py: Get
ready for release 2.11.5 ready for release 2.11.5

11
NEWS
View File

@@ -1,3 +1,14 @@
uncompyle6 2.12.0 2017-09-25
- Use xdis 3.6.0 or greater now
- Small semantic table cleanups
- Python 3.4's terms a little names better
- Slightly more Python 3.7, but still failing a lot
uncompyle6 2.11.5 2017-08-31
- Skeletal support for Python 3.7
uncompyle6 2.11.4 2017-08-15 uncompyle6 2.11.4 2017-08-15
* scanner and parser now allow 3-part version string lookups, * scanner and parser now allow 3-part version string lookups,

2
__pkginfo__.py
View File

@@ -40,7 +40,7 @@ entry_points = {
]} ]}
ftp_url = None ftp_url = None
install_requires = ['spark-parser >= 1.6.1, < 1.7.0', install_requires = ['spark-parser >= 1.6.1, < 1.7.0',
'xdis >= 3.5.5, < 3.6.0', 'six'] 'xdis >= 3.6.0, < 3.7.0', 'six']
license = 'MIT' license = 'MIT'
mailing_list = 'python-debugger@googlegroups.com' mailing_list = 'python-debugger@googlegroups.com'
modname = 'uncompyle6' modname = 'uncompyle6'

42
uncompyle6/semantics/fragments.py
View File

@@ -8,8 +8,8 @@ Creates Python source code from an uncompyle6 abstract syntax tree,
and indexes fragments which can be accessed by instruction offset and indexes fragments which can be accessed by instruction offset
address. address.
See the comments in pysource for information on the abstract sytax tree See https://github.com/rocky/python-uncompyle6/wiki/Table-driven-semantic-actions.
and how semantic actions are written. for a more complete explanation, nicely marked up and with examples.
We add some format specifiers here not used in pysource We add some format specifiers here not used in pysource
@@ -421,10 +421,10 @@ class FragmentsWalker(pysource.SourceWalker, object):
self.write(self.indent, 'if ') self.write(self.indent, 'if ')
self.preorder(node[0]) self.preorder(node[0])
self.println(':') self.println(':')
self.indentMore() self.indent_more()
node[1].parent = node node[1].parent = node
self.preorder(node[1]) self.preorder(node[1])
self.indentLess() self.indent_less()
if_ret_at_end = False if_ret_at_end = False
if len(node[2][0]) >= 3: if len(node[2][0]) >= 3:
@@ -443,17 +443,17 @@ class FragmentsWalker(pysource.SourceWalker, object):
prev_stmt_is_if_ret = False prev_stmt_is_if_ret = False
if not past_else and not if_ret_at_end: if not past_else and not if_ret_at_end:
self.println(self.indent, 'else:') self.println(self.indent, 'else:')
self.indentMore() self.indent_more()
past_else = True past_else = True
n.parent = node n.parent = node
self.preorder(n) self.preorder(n)
if not past_else or if_ret_at_end: if not past_else or if_ret_at_end:
self.println(self.indent, 'else:') self.println(self.indent, 'else:')
self.indentMore() self.indent_more()
node[2][1].parent = node node[2][1].parent = node
self.preorder(node[2][1]) self.preorder(node[2][1])
self.set_pos_info(node, start, len(self.f.getvalue())) self.set_pos_info(node, start, len(self.f.getvalue()))
self.indentLess() self.indent_less()
self.prune() self.prune()
def n_elifelsestmtr(self, node): def n_elifelsestmtr(self, node):
@@ -470,20 +470,20 @@ class FragmentsWalker(pysource.SourceWalker, object):
node[0].parent = node node[0].parent = node
self.preorder(node[0]) self.preorder(node[0])
self.println(':') self.println(':')
self.indentMore() self.indent_more()
node[1].parent = node node[1].parent = node
self.preorder(node[1]) self.preorder(node[1])
self.indentLess() self.indent_less()
for n in node[2][0]: for n in node[2][0]:
n[0].type = 'elifstmt' n[0].type = 'elifstmt'
n.parent = node n.parent = node
self.preorder(n) self.preorder(n)
self.println(self.indent, 'else:') self.println(self.indent, 'else:')
self.indentMore() self.indent_more()
node[2][1].parent = node node[2][1].parent = node
self.preorder(node[2][1]) self.preorder(node[2][1])
self.indentLess() self.indent_less()
self.set_pos_info(node, start, len(self.f.getvalue())) self.set_pos_info(node, start, len(self.f.getvalue()))
self.prune() self.prune()
@@ -527,7 +527,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
self.write(func_name) self.write(func_name)
self.set_pos_info(code_node, start, len(self.f.getvalue())) self.set_pos_info(code_node, start, len(self.f.getvalue()))
self.indentMore() self.indent_more()
start = len(self.f.getvalue()) start = len(self.f.getvalue())
self.make_function(node, isLambda=False, codeNode=code_node) self.make_function(node, isLambda=False, codeNode=code_node)
@@ -537,7 +537,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
self.write('\n\n') self.write('\n\n')
else: else:
self.write('\n\n\n') self.write('\n\n\n')
self.indentLess() self.indent_less()
self.prune() # stop recursing self.prune() # stop recursing
def n_list_compr(self, node): def n_list_compr(self, node):
@@ -977,9 +977,9 @@ class FragmentsWalker(pysource.SourceWalker, object):
self.println(':') self.println(':')
# class body # class body
self.indentMore() self.indent_more()
self.build_class(subclass) self.build_class(subclass)
self.indentLess() self.indent_less()
self.currentclass = cclass self.currentclass = cclass
self.set_pos_info(node, start, len(self.f.getvalue())) self.set_pos_info(node, start, len(self.f.getvalue()))
@@ -1316,7 +1316,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
p = self.prec p = self.prec
self.prec = 100 self.prec = 100
self.indentMore(INDENT_PER_LEVEL) self.indent_more(INDENT_PER_LEVEL)
line_seperator = ',\n' + self.indent line_seperator = ',\n' + self.indent
sep = INDENT_PER_LEVEL[:-1] sep = INDENT_PER_LEVEL[:-1]
start = len(self.f.getvalue()) start = len(self.f.getvalue())
@@ -1393,7 +1393,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
n.parent = node n.parent = node
self.set_pos_info(n, start, finish) self.set_pos_info(n, start, finish)
self.set_pos_info(node, start, finish) self.set_pos_info(node, start, finish)
self.indentLess(INDENT_PER_LEVEL) self.indent_less(INDENT_PER_LEVEL)
self.prec = p self.prec = p
self.prune() self.prune()
@@ -1429,7 +1429,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
else: else:
flat_elems.append(elem) flat_elems.append(elem)
self.indentMore(INDENT_PER_LEVEL) self.indent_more(INDENT_PER_LEVEL)
if len(node) > 3: if len(node) > 3:
line_separator = ',\n' + self.indent line_separator = ',\n' + self.indent
else: else:
@@ -1454,7 +1454,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
n.parent = node.parent n.parent = node.parent
self.set_pos_info(n, start, finish) self.set_pos_info(n, start, finish)
self.set_pos_info(node, start, finish) self.set_pos_info(node, start, finish)
self.indentLess(INDENT_PER_LEVEL) self.indent_less(INDENT_PER_LEVEL)
self.prec = p self.prec = p
self.prune() self.prune()
@@ -1498,8 +1498,8 @@ class FragmentsWalker(pysource.SourceWalker, object):
self.write('%') self.write('%')
self.set_pos_info(node, start, len(self.f.getvalue())) self.set_pos_info(node, start, len(self.f.getvalue()))
elif typ == '+': self.indentMore() elif typ == '+': self.indent_more()
elif typ == '-': self.indentLess() elif typ == '-': self.indent_less()
elif typ == '|': self.write(self.indent) elif typ == '|': self.write(self.indent)
# no longer used, since BUILD_TUPLE_n is pretty printed: # no longer used, since BUILD_TUPLE_n is pretty printed:
elif typ == 'r': recurse_node = True elif typ == 'r': recurse_node = True

46
uncompyle6/semantics/pysource.py
View File

@@ -350,7 +350,7 @@ class SourceWalker(GenericASTTraversal, object):
# MAKE_FUNCTION .. # MAKE_FUNCTION ..
code = node[-3] code = node[-3]
self.indentMore() self.indent_more()
for annotate_last in range(len(node)-1, -1, -1): for annotate_last in range(len(node)-1, -1, -1):
if node[annotate_last] == 'annotate_tuple': if node[annotate_last] == 'annotate_tuple':
break break
@@ -370,7 +370,7 @@ class SourceWalker(GenericASTTraversal, object):
self.write('\n\n') self.write('\n\n')
else: else:
self.write('\n\n\n') self.write('\n\n\n')
self.indentLess() self.indent_less()
self.prune() # stop recursing self.prune() # stop recursing
self.n_mkfunc_annotate = n_mkfunc_annotate self.n_mkfunc_annotate = n_mkfunc_annotate
@@ -550,10 +550,10 @@ class SourceWalker(GenericASTTraversal, object):
super(SourceWalker, self).preorder(node) super(SourceWalker, self).preorder(node)
self.set_pos_info(node) self.set_pos_info(node)
def indentMore(self, indent=TAB): def indent_more(self, indent=TAB):
self.indent += indent self.indent += indent
def indentLess(self, indent=TAB): def indent_less(self, indent=TAB):
self.indent = self.indent[:-len(indent)] self.indent = self.indent[:-len(indent)]
def traverse(self, node, indent=None, isLambda=False): def traverse(self, node, indent=None, isLambda=False):
@@ -871,9 +871,9 @@ class SourceWalker(GenericASTTraversal, object):
self.write(self.indent, 'if ') self.write(self.indent, 'if ')
self.preorder(node[0]) self.preorder(node[0])
self.println(':') self.println(':')
self.indentMore() self.indent_more()
self.preorder(node[1]) self.preorder(node[1])
self.indentLess() self.indent_less()
if_ret_at_end = False if_ret_at_end = False
if len(return_stmts_node[0]) >= 3: if len(return_stmts_node[0]) >= 3:
@@ -892,14 +892,14 @@ class SourceWalker(GenericASTTraversal, object):
prev_stmt_is_if_ret = False prev_stmt_is_if_ret = False
if not past_else and not if_ret_at_end: if not past_else and not if_ret_at_end:
self.println(self.indent, 'else:') self.println(self.indent, 'else:')
self.indentMore() self.indent_more()
past_else = True past_else = True
self.preorder(n) self.preorder(n)
if not past_else or if_ret_at_end: if not past_else or if_ret_at_end:
self.println(self.indent, 'else:') self.println(self.indent, 'else:')
self.indentMore() self.indent_more()
self.preorder(return_stmts_node[1]) self.preorder(return_stmts_node[1])
self.indentLess() self.indent_less()
self.prune() self.prune()
n_ifelsestmtr2 = n_ifelsestmtr n_ifelsestmtr2 = n_ifelsestmtr
@@ -921,17 +921,17 @@ class SourceWalker(GenericASTTraversal, object):
self.write(self.indent, 'elif ') self.write(self.indent, 'elif ')
self.preorder(node[0]) self.preorder(node[0])
self.println(':') self.println(':')
self.indentMore() self.indent_more()
self.preorder(node[1]) self.preorder(node[1])
self.indentLess() self.indent_less()
for n in return_stmts_node[0]: for n in return_stmts_node[0]:
n[0].type = 'elifstmt' n[0].type = 'elifstmt'
self.preorder(n) self.preorder(n)
self.println(self.indent, 'else:') self.println(self.indent, 'else:')
self.indentMore() self.indent_more()
self.preorder(return_stmts_node[1]) self.preorder(return_stmts_node[1])
self.indentLess() self.indent_less()
self.prune() self.prune()
def n_import_as(self, node): def n_import_as(self, node):
@@ -972,14 +972,14 @@ class SourceWalker(GenericASTTraversal, object):
func_name = code_node.attr.co_name func_name = code_node.attr.co_name
self.write(func_name) self.write(func_name)
self.indentMore() self.indent_more()
self.make_function(node, isLambda=False, codeNode=code_node) self.make_function(node, isLambda=False, codeNode=code_node)
if len(self.param_stack) > 1: if len(self.param_stack) > 1:
self.write('\n\n') self.write('\n\n')
else: else:
self.write('\n\n\n') self.write('\n\n\n')
self.indentLess() self.indent_less()
self.prune() # stop recursing self.prune() # stop recursing
def make_function(self, node, isLambda, nested=1, def make_function(self, node, isLambda, nested=1,
@@ -1450,9 +1450,9 @@ class SourceWalker(GenericASTTraversal, object):
self.println(':') self.println(':')
# class body # class body
self.indentMore() self.indent_more()
self.build_class(subclass_code) self.build_class(subclass_code)
self.indentLess() self.indent_less()
self.currentclass = cclass self.currentclass = cclass
if len(self.param_stack) > 1: if len(self.param_stack) > 1:
@@ -1523,7 +1523,7 @@ class SourceWalker(GenericASTTraversal, object):
p = self.prec p = self.prec
self.prec = 100 self.prec = 100
self.indentMore(INDENT_PER_LEVEL) self.indent_more(INDENT_PER_LEVEL)
sep = INDENT_PER_LEVEL[:-1] sep = INDENT_PER_LEVEL[:-1]
self.write('{') self.write('{')
line_number = self.line_number line_number = self.line_number
@@ -1661,7 +1661,7 @@ class SourceWalker(GenericASTTraversal, object):
if sep.startswith(",\n"): if sep.startswith(",\n"):
self.write(sep[1:]) self.write(sep[1:])
self.write('}') self.write('}')
self.indentLess(INDENT_PER_LEVEL) self.indent_less(INDENT_PER_LEVEL)
self.prec = p self.prec = p
self.prune() self.prune()
@@ -1712,7 +1712,7 @@ class SourceWalker(GenericASTTraversal, object):
else: else:
flat_elems.append(elem) flat_elems.append(elem)
self.indentMore(INDENT_PER_LEVEL) self.indent_more(INDENT_PER_LEVEL)
sep = '' sep = ''
for elem in flat_elems: for elem in flat_elems:
@@ -1737,7 +1737,7 @@ class SourceWalker(GenericASTTraversal, object):
if lastnode.attr == 1 and lastnodetype.startswith('BUILD_TUPLE'): if lastnode.attr == 1 and lastnodetype.startswith('BUILD_TUPLE'):
self.write(',') self.write(',')
self.write(endchar) self.write(endchar)
self.indentLess(INDENT_PER_LEVEL) self.indent_less(INDENT_PER_LEVEL)
self.prec = p self.prec = p
self.prune() self.prune()
@@ -1812,10 +1812,10 @@ class SourceWalker(GenericASTTraversal, object):
if typ == '%': self.write('%') if typ == '%': self.write('%')
elif typ == '+': elif typ == '+':
self.line_number += 1 self.line_number += 1
self.indentMore() self.indent_more()
elif typ == '-': elif typ == '-':
self.line_number += 1 self.line_number += 1
self.indentLess() self.indent_less()
elif typ == '|': elif typ == '|':
self.line_number += 1 self.line_number += 1
self.write(self.indent) self.write(self.indent)

2
uncompyle6/version.py
View File

@@ -1,3 +1,3 @@
# This file is suitable for sourcing inside bash as # This file is suitable for sourcing inside bash as
# well as importing into Python # well as importing into Python
VERSION='2.11.5' VERSION='2.12.0'