From 493835b8cd89174b113141fef7061ff71db247b9 Mon Sep 17 00:00:00 2001 From: rocky Date: Sun, 25 Feb 2018 21:27:09 -0500 Subject: [PATCH] bild_lines API changed. Adjust test for change --- pytest/test_fjt.py | 6 +++--- uncompyle6/scanners/scanner3.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pytest/test_fjt.py b/pytest/test_fjt.py index b436ab4e..4bea6b6c 100644 --- a/pytest/test_fjt.py +++ b/pytest/test_fjt.py @@ -28,7 +28,7 @@ def test_if_in_for(): if 2.7 <= PYTHON_VERSION <= 3.0 and not IS_PYPY: n = scan.setup_code(code) bytecode = Bytecode(code, scan.opc) - scan.build_lines_data(code, n) + scan.lines = scan.build_lines_data(code, n) scan.insts = list(bytecode) scan.offset2inst_index = {} for i, inst in enumerate(scan.insts): @@ -50,7 +50,7 @@ def test_if_in_for(): code = bug_loop.__code__ n = scan.setup_code(code) bytecode = Bytecode(code, scan.opc) - scan.build_lines_data(code, n) + scan.lines = scan.build_lines_data(code, n) scan.insts = list(bytecode) scan.build_prev_op(n) scan.offset2inst_index = {} @@ -71,7 +71,7 @@ def test_if_in_for(): elif 3.2 < PYTHON_VERSION <= 3.4: bytecode = Bytecode(code, scan.opc) scan.code = array('B', code.co_code) - scan.build_lines_data(code) + scan.lines = scan.build_lines_data(code) scan.build_prev_op() scan.insts = list(bytecode) scan.offset2inst_index = {} diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py index 659571fb..4d2c9d4c 100644 --- a/uncompyle6/scanners/scanner3.py +++ b/uncompyle6/scanners/scanner3.py @@ -402,7 +402,6 @@ class Scanner3(Scanner): # as CONTINUE, but that's okay since we add a grammar # rule for that. pattr = argval - # FIXME: 0 isn't always correct target = self.get_target(inst.offset) if target <= inst.offset: next_opname = self.insts[i+1].opname