Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2016-12-04 13:40:06 -05:00
39 changed files with 348 additions and 155 deletions

View File

@@ -53,7 +53,6 @@ def uncompyle(
is_pypy=is_pypy)
def uncompyle_file(filename, outstream=None, showasm=None, showast=False,
showgrammar=False):
"""
@@ -65,7 +64,6 @@ def uncompyle_file(filename, outstream=None, showasm=None, showast=False,
(version, timestamp, magic_int, co, is_pypy,
source_size) = load_module(filename, code_objects)
if type(co) == list:
for con in co:
uncompyle(version, con, outstream, showasm, showast,
@@ -193,6 +191,8 @@ def main(in_base, out_base, files, codes, outfile=None,
print(e)
verify_failed_files += 1
os.rename(outfile, outfile + '_unverified')
sys.stderr.write("### Error Verifying %s\n" % filename)
sys.stderr.write(str(e) + "\n")
if not outfile:
sys.stder.write("### Error Verifiying %s" %
filename)