[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[victor.stinner]

https://hg.python.org/cpython/rev/1f003062d830
changeset:   99980:1f003062d830
parent:      99977:a7953ee29f1c
parent:      99979:bf997b22df06
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Jan 19 08:50:56 2016 +0100
summary:
  Merge 3.5

files:
  Lib/test/bytecode_helper.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/test/bytecode_helper.py b/Lib/test/bytecode_helper.py
--- a/Lib/test/bytecode_helper.py
+++ b/Lib/test/bytecode_helper.py
@@ -32,8 +32,8 @@
         """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'

-- 
Repository URL: https://hg.python.org/cpython