diff --git a/uncompyle6/disas.py b/uncompyle6/disas.py index d71eb2e6..866caf77 100644 --- a/uncompyle6/disas.py +++ b/uncompyle6/disas.py @@ -78,7 +78,7 @@ def disassemble_file(filename, outstream=None): try to find the corresponding compiled object. """ filename = check_object_path(filename) - version, co = uncompyle6.load_module(filename) + version, magic_int, co = uncompyle6.load_module(filename) if type(co) == list: for con in co: disco(version, con, outstream) diff --git a/uncompyle6/opcodes/opcode_23.py b/uncompyle6/opcodes/opcode_23.py index e10cfcfb..485ea13a 100755 --- a/uncompyle6/opcodes/opcode_23.py +++ b/uncompyle6/opcodes/opcode_23.py @@ -3,10 +3,6 @@ opcode module - potentially shared between dis and other modules which operate on bytecodes (e.g. peephole optimizers). """ -__all__ = ["cmp_op", "hasconst", "hasname", "hasjrel", "hasjabs", - "haslocal", "hascompare", "hasfree", "opname", "opmap", - "HAVE_ARGUMENT", "EXTENDED_ARG"] - cmp_op = ('<', '<=', '==', '!=', '>', '>=', 'in', 'not in', 'is', 'is not', 'exception match', 'BAD') @@ -20,7 +16,7 @@ hasfree = [] opmap = {} opname = [''] * 256 -for op in range(256): opname[op] = '<' + repr(op) + '>' +for op in range(256): opname[op] = '<%r>' % (op,) del op def def_op(name, op):