From f4ba1a908761d798da7fc2916187694160b2a4b1 Mon Sep 17 00:00:00 2001 From: Mysterie Date: Thu, 10 Jan 2013 14:02:02 +0100 Subject: [PATCH] Patch bug on LOAD_CLOSURE --- uncompyle2/scanner25.py | 2 +- uncompyle2/scanner26.py | 2 +- uncompyle2/scanner27.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/uncompyle2/scanner25.py b/uncompyle2/scanner25.py index baf103d9..25d545ac 100755 --- a/uncompyle2/scanner25.py +++ b/uncompyle2/scanner25.py @@ -169,7 +169,7 @@ class Scanner25(scan.Scanner): # Now all values loaded via LOAD_CLOSURE are packed into # a tuple before calling MAKE_CLOSURE. if op == BUILD_TUPLE and \ - self.code[offset-3] == LOAD_CLOSURE: + self.code[self.prev[offset]] == LOAD_CLOSURE: continue else: op_name = '%s_%d' % (op_name, oparg) diff --git a/uncompyle2/scanner26.py b/uncompyle2/scanner26.py index 7f093e19..89b15971 100755 --- a/uncompyle2/scanner26.py +++ b/uncompyle2/scanner26.py @@ -170,7 +170,7 @@ class Scanner26(scan.Scanner): # Now all values loaded via LOAD_CLOSURE are packed into # a tuple before calling MAKE_CLOSURE. if op == BUILD_TUPLE and \ - self.code[offset-3] == LOAD_CLOSURE: + self.code[self.prev[offset]] == LOAD_CLOSURE: continue else: op_name = '%s_%d' % (op_name, oparg) diff --git a/uncompyle2/scanner27.py b/uncompyle2/scanner27.py index 48fee726..c67968a4 100755 --- a/uncompyle2/scanner27.py +++ b/uncompyle2/scanner27.py @@ -157,7 +157,7 @@ class Scanner27(scan.Scanner): # Now all values loaded via LOAD_CLOSURE are packed into # a tuple before calling MAKE_CLOSURE. if op == BUILD_TUPLE and \ - code[offset-3] == LOAD_CLOSURE: + code[self.prev[offset]] == LOAD_CLOSURE: continue else: op_name = '%s_%d' % (op_name, oparg)