summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-01-19 07:50:56 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-01-19 07:50:56 (GMT)
commit70c6a1361304d21946e1e5f6504f5102140d0c9e (patch)
tree75b9d8e382cbadbdd5a9437dda5388b540f5263e
parent2c028492d46e058ceaf81c3ec3c806226bf39b0b (diff)
parent47b91b0a8112983e8aec5c26497b10aad7045a76 (diff)
downloadcpython-70c6a1361304d21946e1e5f6504f5102140d0c9e.zip
cpython-70c6a1361304d21946e1e5f6504f5102140d0c9e.tar.gz
cpython-70c6a1361304d21946e1e5f6504f5102140d0c9e.tar.bz2
Merge 3.5
-rw-r--r--Lib/test/bytecode_helper.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/bytecode_helper.py b/Lib/test/bytecode_helper.py
index 58b4209..347d603 100644
--- a/Lib/test/bytecode_helper.py
+++ b/Lib/test/bytecode_helper.py
@@ -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'