]> granicus.if.org Git - python/commitdiff
Issue #19938: Re-enabled test_bug_1333982 in test_dis, which had been
authorZachary Ware <zachary.ware@gmail.com>
Thu, 26 Dec 2013 15:55:24 +0000 (09:55 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Thu, 26 Dec 2013 15:55:24 +0000 (09:55 -0600)
disabled since 3.0 due to the changes in listcomp handling.

1  2 
Lib/test/test_dis.py
Misc/NEWS

index eb6ac3c81f626afb298f1bc236185adf7d99353e,b86cc86856808da46a4df81920e61e558e8435bd..d1229fba6dbe65355f9e97988aeb2a5f87c9b243
@@@ -7,23 -6,7 +7,24 @@@ import unittes
  import sys
  import dis
  import io
+ import re
 +import types
 +import contextlib
 +
 +def get_tb():
 +    def _error():
 +        try:
 +            1 / 0
 +        except Exception as e:
 +            tb = e.__traceback__
 +        return tb
 +
 +    tb = _error()
 +    while tb.tb_next:
 +        tb = tb.tb_next
 +    return tb
 +
 +TRACEBACK_CODE = get_tb().tb_frame.f_code
  
  class _C:
      def __init__(self, x):
@@@ -106,27 -89,26 +107,26 @@@ def bug1333982(x=[])
      pass
  
  dis_bug1333982 = """\
-- %-4d         0 LOAD_CONST               1 (0)
-               3 JUMP_IF_TRUE            33 (to 39)
-               6 POP_TOP
-               7 LOAD_GLOBAL              0 (AssertionError)
-              10 BUILD_LIST               0
-              13 LOAD_FAST                0 (x)
-              16 GET_ITER
-         >>   17 FOR_ITER                12 (to 32)
-              20 STORE_FAST               1 (s)
-              23 LOAD_FAST                1 (s)
-              26 LIST_APPEND              2
-              29 JUMP_ABSOLUTE           17
-  %-4d   >>   32 LOAD_CONST               2 (1)
-              35 BINARY_ADD
-              36 RAISE_VARARGS            2
-         >>   39 POP_TOP
-  %-4d        40 LOAD_CONST               0 (None)
-              43 RETURN_VALUE
++%3d           0 LOAD_CONST               1 (0)
+               3 POP_JUMP_IF_TRUE        35
+               6 LOAD_GLOBAL              0 (AssertionError)
+               9 LOAD_CONST               2 (<code object <listcomp> at 0x..., file "%s", line %d>)
+              12 LOAD_CONST               3 ('bug1333982.<locals>.<listcomp>')
+              15 MAKE_FUNCTION            0
+              18 LOAD_FAST                0 (x)
+              21 GET_ITER
+              22 CALL_FUNCTION            1 (1 positional, 0 keyword pair)
 - %-4d        25 LOAD_CONST               4 (1)
++%3d          25 LOAD_CONST               4 (1)
+              28 BINARY_ADD
+              29 CALL_FUNCTION            1 (1 positional, 0 keyword pair)
+              32 RAISE_VARARGS            1
 - %-4d   >>   35 LOAD_CONST               0 (None)
++%3d     >>   35 LOAD_CONST               0 (None)
+              38 RETURN_VALUE
  """ % (bug1333982.__code__.co_firstlineno + 1,
+        __file__,
+        bug1333982.__code__.co_firstlineno + 1,
         bug1333982.__code__.co_firstlineno + 2,
         bug1333982.__code__.co_firstlineno + 3)
  
@@@ -239,13 -182,27 +239,19 @@@ class DisTests(unittest.TestCase)
                  dis.dis(func)
              else:
                  dis.disassemble(func, lasti)
 -        finally:
 -            sys.stdout = save_stdout
 -        # Trim trailing blanks (if any).
 -        return [line.rstrip() for line in s.getvalue().splitlines()]
 +        return output.getvalue()
  
      def get_disassemble_as_string(self, func, lasti=-1):
 -        return '\n'.join(self.get_disassembly(func, lasti, False))
 +        return self.get_disassembly(func, lasti, False)
 +
++    def strip_addresses(self, text):
++        return re.sub(r'\b0x[0-9A-Fa-f]+\b', '0x...', text)
      def do_disassembly_test(self, func, expected):
-         self.assertEqual(self.get_disassembly(func), expected)
 -        lines = self.get_disassembly(func)
 -        expected = expected.splitlines()
 -        if expected == lines:
 -            return
 -        else:
 -            lines = [re.sub('0x[0-9A-Fa-f]+', '0x...', l) for l in lines]
 -            if expected == lines:
 -                return
 -        self.fail(
 -                "events did not match expectation:\n" +
 -                "\n".join(difflib.ndiff(expected,
 -                                        lines)))
++        got = self.get_disassembly(func)
++        if got != expected:
++            got = self.strip_addresses(got)
++        self.assertEqual(got, expected)
  
      def test_opmap(self):
          self.assertEqual(dis.opmap["NOP"], 9)
@@@ -502,334 -451,5 +503,330 @@@ class CodeInfoTests(unittest.TestCase)
          self.assertEqual(dis.pretty_flags(0), '0x0')
  
  
- def test_main():
-     run_unittest(DisTests, DisWithFileTests, CodeInfoTests,
-                  InstructionTests, BytecodeTests)
 +# Fodder for instruction introspection tests
 +#   Editing any of these may require recalculating the expected output
 +def outer(a=1, b=2):
 +    def f(c=3, d=4):
 +        def inner(e=5, f=6):
 +            print(a, b, c, d, e, f)
 +        print(a, b, c, d)
 +        return inner
 +    print(a, b, '', 1, [], {}, "Hello world!")
 +    return f
 +
 +def jumpy():
 +    # This won't actually run (but that's OK, we only disassemble it)
 +    for i in range(10):
 +        print(i)
 +        if i < 4:
 +            continue
 +        if i > 6:
 +            break
 +    else:
 +        print("I can haz else clause?")
 +    while i:
 +        print(i)
 +        i -= 1
 +        if i > 6:
 +            continue
 +        if i < 4:
 +            break
 +    else:
 +        print("Who let lolcatz into this test suite?")
 +    try:
 +        1 / 0
 +    except ZeroDivisionError:
 +        print("Here we go, here we go, here we go...")
 +    else:
 +        with i as dodgy:
 +            print("Never reach this")
 +    finally:
 +        print("OK, now we're done")
 +
 +# End fodder for opinfo generation tests
 +expected_outer_line = 1
 +_line_offset = outer.__code__.co_firstlineno - 1
 +code_object_f = outer.__code__.co_consts[3]
 +expected_f_line = code_object_f.co_firstlineno - _line_offset
 +code_object_inner = code_object_f.co_consts[3]
 +expected_inner_line = code_object_inner.co_firstlineno - _line_offset
 +expected_jumpy_line = 1
 +
 +# The following lines are useful to regenerate the expected results after
 +# either the fodder is modified or the bytecode generation changes
 +# After regeneration, update the references to code_object_f and
 +# code_object_inner before rerunning the tests
 +
 +#_instructions = dis.get_instructions(outer, first_line=expected_outer_line)
 +#print('expected_opinfo_outer = [\n  ',
 +      #',\n  '.join(map(str, _instructions)), ',\n]', sep='')
 +#_instructions = dis.get_instructions(outer(), first_line=expected_outer_line)
 +#print('expected_opinfo_f = [\n  ',
 +      #',\n  '.join(map(str, _instructions)), ',\n]', sep='')
 +#_instructions = dis.get_instructions(outer()(), first_line=expected_outer_line)
 +#print('expected_opinfo_inner = [\n  ',
 +      #',\n  '.join(map(str, _instructions)), ',\n]', sep='')
 +#_instructions = dis.get_instructions(jumpy, first_line=expected_jumpy_line)
 +#print('expected_opinfo_jumpy = [\n  ',
 +      #',\n  '.join(map(str, _instructions)), ',\n]', sep='')
 +
 +
 +Instruction = dis.Instruction
 +expected_opinfo_outer = [
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=3, argrepr='3', offset=0, starts_line=2, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=3, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CLOSURE', opcode=135, arg=0, argval='a', argrepr='a', offset=6, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CLOSURE', opcode=135, arg=1, argval='b', argrepr='b', offset=9, starts_line=None, is_jump_target=False),
 +  Instruction(opname='BUILD_TUPLE', opcode=102, arg=2, argval=2, argrepr='', offset=12, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=code_object_f, argrepr=repr(code_object_f), offset=15, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='outer.<locals>.f', argrepr="'outer.<locals>.f'", offset=18, starts_line=None, is_jump_target=False),
 +  Instruction(opname='MAKE_CLOSURE', opcode=134, arg=2, argval=2, argrepr='', offset=21, starts_line=None, is_jump_target=False),
 +  Instruction(opname='STORE_FAST', opcode=125, arg=2, argval='f', argrepr='f', offset=24, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=27, starts_line=7, is_jump_target=False),
 +  Instruction(opname='LOAD_DEREF', opcode=136, arg=0, argval='a', argrepr='a', offset=30, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_DEREF', opcode=136, arg=1, argval='b', argrepr='b', offset=33, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval='', argrepr="''", offset=36, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval=1, argrepr='1', offset=39, starts_line=None, is_jump_target=False),
 +  Instruction(opname='BUILD_LIST', opcode=103, arg=0, argval=0, argrepr='', offset=42, starts_line=None, is_jump_target=False),
 +  Instruction(opname='BUILD_MAP', opcode=105, arg=0, argval=0, argrepr='', offset=45, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval='Hello world!', argrepr="'Hello world!'", offset=48, starts_line=None, is_jump_target=False),
 +  Instruction(opname='CALL_FUNCTION', opcode=131, arg=7, argval=7, argrepr='7 positional, 0 keyword pair', offset=51, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=54, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='f', argrepr='f', offset=55, starts_line=8, is_jump_target=False),
 +  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=58, starts_line=None, is_jump_target=False),
 +]
 +
 +expected_opinfo_f = [
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=5, argrepr='5', offset=0, starts_line=3, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=6, argrepr='6', offset=3, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CLOSURE', opcode=135, arg=2, argval='a', argrepr='a', offset=6, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CLOSURE', opcode=135, arg=3, argval='b', argrepr='b', offset=9, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CLOSURE', opcode=135, arg=0, argval='c', argrepr='c', offset=12, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CLOSURE', opcode=135, arg=1, argval='d', argrepr='d', offset=15, starts_line=None, is_jump_target=False),
 +  Instruction(opname='BUILD_TUPLE', opcode=102, arg=4, argval=4, argrepr='', offset=18, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=code_object_inner, argrepr=repr(code_object_inner), offset=21, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='outer.<locals>.f.<locals>.inner', argrepr="'outer.<locals>.f.<locals>.inner'", offset=24, starts_line=None, is_jump_target=False),
 +  Instruction(opname='MAKE_CLOSURE', opcode=134, arg=2, argval=2, argrepr='', offset=27, starts_line=None, is_jump_target=False),
 +  Instruction(opname='STORE_FAST', opcode=125, arg=2, argval='inner', argrepr='inner', offset=30, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=33, starts_line=5, is_jump_target=False),
 +  Instruction(opname='LOAD_DEREF', opcode=136, arg=2, argval='a', argrepr='a', offset=36, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_DEREF', opcode=136, arg=3, argval='b', argrepr='b', offset=39, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_DEREF', opcode=136, arg=0, argval='c', argrepr='c', offset=42, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_DEREF', opcode=136, arg=1, argval='d', argrepr='d', offset=45, starts_line=None, is_jump_target=False),
 +  Instruction(opname='CALL_FUNCTION', opcode=131, arg=4, argval=4, argrepr='4 positional, 0 keyword pair', offset=48, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=51, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='inner', argrepr='inner', offset=52, starts_line=6, is_jump_target=False),
 +  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=55, starts_line=None, is_jump_target=False),
 +]
 +
 +expected_opinfo_inner = [
 +  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=0, starts_line=4, is_jump_target=False),
 +  Instruction(opname='LOAD_DEREF', opcode=136, arg=0, argval='a', argrepr='a', offset=3, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_DEREF', opcode=136, arg=1, argval='b', argrepr='b', offset=6, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_DEREF', opcode=136, arg=2, argval='c', argrepr='c', offset=9, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_DEREF', opcode=136, arg=3, argval='d', argrepr='d', offset=12, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='e', argrepr='e', offset=15, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_FAST', opcode=124, arg=1, argval='f', argrepr='f', offset=18, starts_line=None, is_jump_target=False),
 +  Instruction(opname='CALL_FUNCTION', opcode=131, arg=6, argval=6, argrepr='6 positional, 0 keyword pair', offset=21, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=24, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=25, starts_line=None, is_jump_target=False),
 +  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=28, starts_line=None, is_jump_target=False),
 +]
 +
 +expected_opinfo_jumpy = [
 +  Instruction(opname='SETUP_LOOP', opcode=120, arg=74, argval=77, argrepr='to 77', offset=0, starts_line=3, is_jump_target=False),
 +  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='range', argrepr='range', offset=3, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=10, argrepr='10', offset=6, starts_line=None, is_jump_target=False),
 +  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=9, starts_line=None, is_jump_target=False),
 +  Instruction(opname='GET_ITER', opcode=68, arg=None, argval=None, argrepr='', offset=12, starts_line=None, is_jump_target=False),
 +  Instruction(opname='FOR_ITER', opcode=93, arg=50, argval=66, argrepr='to 66', offset=13, starts_line=None, is_jump_target=True),
 +  Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=16, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=19, starts_line=4, is_jump_target=False),
 +  Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=22, starts_line=None, is_jump_target=False),
 +  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=25, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=28, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=29, starts_line=5, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=32, starts_line=None, is_jump_target=False),
 +  Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=35, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=47, argval=47, argrepr='', offset=38, starts_line=None, is_jump_target=False),
 +  Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=13, argval=13, argrepr='', offset=41, starts_line=6, is_jump_target=False),
 +  Instruction(opname='JUMP_FORWARD', opcode=110, arg=0, argval=47, argrepr='to 47', offset=44, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=47, starts_line=7, is_jump_target=True),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=50, starts_line=None, is_jump_target=False),
 +  Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=53, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=13, argval=13, argrepr='', offset=56, starts_line=None, is_jump_target=False),
 +  Instruction(opname='BREAK_LOOP', opcode=80, arg=None, argval=None, argrepr='', offset=59, starts_line=8, is_jump_target=False),
 +  Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=13, argval=13, argrepr='', offset=60, starts_line=None, is_jump_target=False),
 +  Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=13, argval=13, argrepr='', offset=63, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=66, starts_line=None, is_jump_target=True),
 +  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=67, starts_line=10, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='I can haz else clause?', argrepr="'I can haz else clause?'", offset=70, starts_line=None, is_jump_target=False),
 +  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=73, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=76, starts_line=None, is_jump_target=False),
 +  Instruction(opname='SETUP_LOOP', opcode=120, arg=74, argval=154, argrepr='to 154', offset=77, starts_line=11, is_jump_target=True),
 +  Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=80, starts_line=None, is_jump_target=True),
 +  Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=143, argval=143, argrepr='', offset=83, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=86, starts_line=12, is_jump_target=False),
 +  Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=89, starts_line=None, is_jump_target=False),
 +  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=92, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=95, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=96, starts_line=13, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=99, starts_line=None, is_jump_target=False),
 +  Instruction(opname='INPLACE_SUBTRACT', opcode=56, arg=None, argval=None, argrepr='', offset=102, starts_line=None, is_jump_target=False),
 +  Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=103, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=106, starts_line=14, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=109, starts_line=None, is_jump_target=False),
 +  Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=112, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=124, argval=124, argrepr='', offset=115, starts_line=None, is_jump_target=False),
 +  Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=80, argval=80, argrepr='', offset=118, starts_line=15, is_jump_target=False),
 +  Instruction(opname='JUMP_FORWARD', opcode=110, arg=0, argval=124, argrepr='to 124', offset=121, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=124, starts_line=16, is_jump_target=True),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=127, starts_line=None, is_jump_target=False),
 +  Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=130, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=80, argval=80, argrepr='', offset=133, starts_line=None, is_jump_target=False),
 +  Instruction(opname='BREAK_LOOP', opcode=80, arg=None, argval=None, argrepr='', offset=136, starts_line=17, is_jump_target=False),
 +  Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=80, argval=80, argrepr='', offset=137, starts_line=None, is_jump_target=False),
 +  Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=80, argval=80, argrepr='', offset=140, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=143, starts_line=None, is_jump_target=True),
 +  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=144, starts_line=19, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=147, starts_line=None, is_jump_target=False),
 +  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=150, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=153, starts_line=None, is_jump_target=False),
 +  Instruction(opname='SETUP_FINALLY', opcode=122, arg=72, argval=229, argrepr='to 229', offset=154, starts_line=20, is_jump_target=True),
 +  Instruction(opname='SETUP_EXCEPT', opcode=121, arg=12, argval=172, argrepr='to 172', offset=157, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=160, starts_line=21, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=0, argrepr='0', offset=163, starts_line=None, is_jump_target=False),
 +  Instruction(opname='BINARY_TRUE_DIVIDE', opcode=27, arg=None, argval=None, argrepr='', offset=166, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=167, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=168, starts_line=None, is_jump_target=False),
 +  Instruction(opname='JUMP_FORWARD', opcode=110, arg=28, argval=200, argrepr='to 200', offset=169, starts_line=None, is_jump_target=False),
 +  Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=172, starts_line=22, is_jump_target=True),
 +  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=2, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=173, starts_line=None, is_jump_target=False),
 +  Instruction(opname='COMPARE_OP', opcode=107, arg=10, argval='exception match', argrepr='exception match', offset=176, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=199, argval=199, argrepr='', offset=179, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=182, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=183, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=184, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=185, starts_line=23, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=8, argval='Here we go, here we go, here we go...', argrepr="'Here we go, here we go, here we go...'", offset=188, starts_line=None, is_jump_target=False),
 +  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=191, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=194, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=195, starts_line=None, is_jump_target=False),
 +  Instruction(opname='JUMP_FORWARD', opcode=110, arg=26, argval=225, argrepr='to 225', offset=196, starts_line=None, is_jump_target=False),
 +  Instruction(opname='END_FINALLY', opcode=88, arg=None, argval=None, argrepr='', offset=199, starts_line=None, is_jump_target=True),
 +  Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=200, starts_line=25, is_jump_target=True),
 +  Instruction(opname='SETUP_WITH', opcode=143, arg=17, argval=223, argrepr='to 223', offset=203, starts_line=None, is_jump_target=False),
 +  Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=206, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=209, starts_line=26, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Never reach this', argrepr="'Never reach this'", offset=212, starts_line=None, is_jump_target=False),
 +  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=215, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=218, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=219, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=220, starts_line=None, is_jump_target=False),
 +  Instruction(opname='WITH_CLEANUP', opcode=81, arg=None, argval=None, argrepr='', offset=223, starts_line=None, is_jump_target=True),
 +  Instruction(opname='END_FINALLY', opcode=88, arg=None, argval=None, argrepr='', offset=224, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=225, starts_line=None, is_jump_target=True),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=226, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=229, starts_line=28, is_jump_target=True),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=232, starts_line=None, is_jump_target=False),
 +  Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=235, starts_line=None, is_jump_target=False),
 +  Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=238, starts_line=None, is_jump_target=False),
 +  Instruction(opname='END_FINALLY', opcode=88, arg=None, argval=None, argrepr='', offset=239, starts_line=None, is_jump_target=False),
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=240, starts_line=None, is_jump_target=False),
 +  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=243, starts_line=None, is_jump_target=False),
 +]
 +
 +# One last piece of inspect fodder to check the default line number handling
 +def simple(): pass
 +expected_opinfo_simple = [
 +  Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=0, starts_line=simple.__code__.co_firstlineno, is_jump_target=False),
 +  Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=3, starts_line=None, is_jump_target=False)
 +]
 +
 +
 +class InstructionTests(BytecodeTestCase):
 +
 +    def test_default_first_line(self):
 +        actual = dis.get_instructions(simple)
 +        self.assertEqual(list(actual), expected_opinfo_simple)
 +
 +    def test_first_line_set_to_None(self):
 +        actual = dis.get_instructions(simple, first_line=None)
 +        self.assertEqual(list(actual), expected_opinfo_simple)
 +
 +    def test_outer(self):
 +        actual = dis.get_instructions(outer, first_line=expected_outer_line)
 +        self.assertEqual(list(actual), expected_opinfo_outer)
 +
 +    def test_nested(self):
 +        with captured_stdout():
 +            f = outer()
 +        actual = dis.get_instructions(f, first_line=expected_f_line)
 +        self.assertEqual(list(actual), expected_opinfo_f)
 +
 +    def test_doubly_nested(self):
 +        with captured_stdout():
 +            inner = outer()()
 +        actual = dis.get_instructions(inner, first_line=expected_inner_line)
 +        self.assertEqual(list(actual), expected_opinfo_inner)
 +
 +    def test_jumpy(self):
 +        actual = dis.get_instructions(jumpy, first_line=expected_jumpy_line)
 +        self.assertEqual(list(actual), expected_opinfo_jumpy)
 +
 +# get_instructions has its own tests above, so can rely on it to validate
 +# the object oriented API
 +class BytecodeTests(unittest.TestCase):
 +    def test_instantiation(self):
 +        # Test with function, method, code string and code object
 +        for obj in [_f, _C(1).__init__, "a=1", _f.__code__]:
 +            with self.subTest(obj=obj):
 +                b = dis.Bytecode(obj)
 +                self.assertIsInstance(b.codeobj, types.CodeType)
 +
 +        self.assertRaises(TypeError, dis.Bytecode, object())
 +
 +    def test_iteration(self):
 +        for obj in [_f, _C(1).__init__, "a=1", _f.__code__]:
 +            with self.subTest(obj=obj):
 +                via_object = list(dis.Bytecode(obj))
 +                via_generator = list(dis.get_instructions(obj))
 +                self.assertEqual(via_object, via_generator)
 +
 +    def test_explicit_first_line(self):
 +        actual = dis.Bytecode(outer, first_line=expected_outer_line)
 +        self.assertEqual(list(actual), expected_opinfo_outer)
 +
 +    def test_source_line_in_disassembly(self):
 +        # Use the line in the source code
 +        actual = dis.Bytecode(simple).dis()[:3]
 +        expected = "{:>3}".format(simple.__code__.co_firstlineno)
 +        self.assertEqual(actual, expected)
 +        # Use an explicit first line number
 +        actual = dis.Bytecode(simple, first_line=350).dis()[:3]
 +        self.assertEqual(actual, "350")
 +
 +    def test_info(self):
 +        self.maxDiff = 1000
 +        for x, expected in CodeInfoTests.test_pairs:
 +            b = dis.Bytecode(x)
 +            self.assertRegex(b.info(), expected)
 +
 +    def test_disassembled(self):
 +        actual = dis.Bytecode(_f).dis()
 +        self.assertEqual(actual, dis_f)
 +
 +    def test_from_traceback(self):
 +        tb = get_tb()
 +        b = dis.Bytecode.from_traceback(tb)
 +        while tb.tb_next: tb = tb.tb_next
 +
 +        self.assertEqual(b.current_offset, tb.tb_lasti)
 +
 +    def test_from_traceback_dis(self):
 +        tb = get_tb()
 +        b = dis.Bytecode.from_traceback(tb)
 +        self.assertEqual(b.dis(), dis_traceback)
 +
  if __name__ == "__main__":
-     test_main()
+     unittest.main()
diff --cc Misc/NEWS
index de47cf01a84db0523aecdf06822d938f9b738330,547f108241fb09eb5455ee6e33f7bc5acbcfe3ef..f323b5866f5b1f708d67a34112cb541b5dfd87a6
+++ b/Misc/NEWS
@@@ -253,8 -182,13 +253,11 @@@ IDL
  Tests
  -----
  
+ - Issue #19938: Re-enabled test_bug_1333982 in test_dis, which had been
+   disabled since 3.0 due to the changes in listcomp handling.
  - Issue #19320: test_tcl no longer fails when wantobjects is false.
  
 -- Issue #19683: Removed empty tests from test_minidom.  Patch by Ajitesh Gupta.
 -
  - Issue #19919: Fix flacky SSL test. connect_ex() sometimes returns
    EWOULDBLOCK on Windows or VMs hosted on Windows.