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

Merge pull request #160 from wangym5106/master

Browse Source 
Keep global statements in fixed order
This commit is contained in:
R. Bernstein
2018-02-24 10:34:50 -05:00
committed by GitHub
parent 8463221527 3545c7dc6f
commit cb24973147
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
uncompyle6/semantics/aligner.py
View File

@@ -128,8 +128,8 @@ def align_deparse_code(version, co, out=sys.stderr, showasm=False, showast=False
# What we've been waiting for: Generate Python source from the parse tree!
deparsed.gen_source(deparsed.ast, co.co_name, customize)
for g in deparsed.mod_globs:
deparsed.write('# global %s ## Warning: Unused global' % g)
for g in sorted(deparsed.mod_globs):
deparsed.write('# global %s ## Warning: Unused global\n' % g)
if deparsed.ERROR:
raise SourceWalkerError("Deparsing stopped due to parse error")

4
uncompyle6/semantics/fragments.py
View File

@@ -1768,8 +1768,8 @@ def deparse_code(version, co, out=StringIO(), showasm=False, showast=False,
deparsed.set_pos_info(deparsed.ast, 0, len(deparsed.text))
deparsed.fixup_parents(deparsed.ast, None)
for g in deparsed.mod_globs:
deparsed.write('# global %s ## Warning: Unused global' % g)
for g in sorted(deparsed.mod_globs):
deparsed.write('# global %s ## Warning: Unused global\n' % g)
if deparsed.ast_errors:
deparsed.write("# NOTE: have decompilation errors.\n")

6
uncompyle6/semantics/make_function.py
View File

@@ -256,7 +256,7 @@ def make_function3_annotate(self, node, is_lambda, nested=1,
assert ast == 'stmts'
all_globals = find_all_globals(ast, set())
for g in ((all_globals & self.mod_globs) | find_globals(ast, set())):
for g in sorted((all_globals & self.mod_globs) | find_globals(ast, set())):
self.println(self.indent, 'global ', g)
self.mod_globs -= all_globals
has_none = 'None' in code.co_names
@@ -409,7 +409,7 @@ def make_function2(self, node, is_lambda, nested=1, codeNode=None):
assert ast == 'stmts'
all_globals = find_all_globals(ast, set())
for g in ((all_globals & self.mod_globs) | find_globals(ast, set())):
for g in sorted((all_globals & self.mod_globs) | find_globals(ast, set())):
self.println(self.indent, 'global ', g)
self.mod_globs -= all_globals
has_none = 'None' in code.co_names
@@ -655,7 +655,7 @@ def make_function3(self, node, is_lambda, nested=1, codeNode=None):
assert ast == 'stmts'
all_globals = find_all_globals(ast, set())
for g in ((all_globals & self.mod_globs) | find_globals(ast, set())):
for g in sorted((all_globals & self.mod_globs) | find_globals(ast, set())):
self.println(self.indent, 'global ', g)
self.mod_globs -= all_globals
has_none = 'None' in code.co_names

6
uncompyle6/semantics/pysource.py
View File

@@ -2517,7 +2517,7 @@ class SourceWalker(GenericASTTraversal, object):
# Add "global" declaration statements at the top
# of the function
for g in find_globals(ast, set()):
for g in sorted(find_globals(ast, set())):
self.println(indent, 'global ', g)
old_name = self.name
@@ -2674,8 +2674,8 @@ def deparse_code(version, co, out=sys.stdout, showasm=None, showast=False,
# What we've been waiting for: Generate source from Syntax Tree!
deparsed.gen_source(deparsed.ast, co.co_name, customize)
for g in deparsed.mod_globs:
deparsed.write('# global %s ## Warning: Unused global' % g)
for g in sorted(deparsed.mod_globs):
deparsed.write('# global %s ## Warning: Unused global\n' % g)
if deparsed.ast_errors:
deparsed.write("# NOTE: have internal decompilation grammar errors.\n")