Merge 3.5

This commit is contained in:
Victor Stinner 2016-01-19 08:50:56 +01:00
commit 70c6a13613
1 changed files with 2 additions and 2 deletions

View File

@ -32,8 +32,8 @@ class BytecodeTestCase(unittest.TestCase):
"""Throws AssertionError if op is found"""
for instr in dis.get_instructions(x):
if instr.opname == opname:
disassembly = self.get_disassembly_as_string(co)
if opargval is _UNSPECIFIED:
disassembly = self.get_disassembly_as_string(x)
if argval is _UNSPECIFIED:
msg = '%s occurs in bytecode:\n%s' % (opname, disassembly)
elif instr.argval == argval:
msg = '(%s,%r) occurs in bytecode:\n%s'