Author: Armin Rigo <[email protected]>
Branch:
Changeset: r59895:1f11f9231b68
Date: 2013-01-09 20:40 +0100
http://bitbucket.org/pypy/pypy/changeset/1f11f9231b68/
Log: Remove the 'from stdlib_opcode import bytecode_spec' from this file.
diff --git a/pypy/objspace/flow/test/test_objspace.py
b/pypy/objspace/flow/test/test_objspace.py
--- a/pypy/objspace/flow/test/test_objspace.py
+++ b/pypy/objspace/flow/test/test_objspace.py
@@ -8,18 +8,17 @@
from pypy.objspace.flow.objspace import FlowObjSpace
from pypy.objspace.flow.flowcontext import FlowingError, FlowSpaceFrame
from pypy import conftest
-from pypy.tool.stdlib_opcode import bytecode_spec, host_bytecode_spec
+from pypy.tool.stdlib_opcode import host_bytecode_spec
import os
import operator
is_operator = getattr(operator, 'is_', operator.eq) # it's not there 2.2
@contextmanager
-def patching_opcodes(*opcodes):
+def patching_opcodes(**opcodes):
meth_names = host_bytecode_spec.method_names
- opnums = [bytecode_spec.opmap[name] for name in opcodes]
old_name = {}
- for name, num in zip(opcodes, opnums):
+ for name, num in opcodes.items():
old_name[num] = meth_names[num]
meth_names[num] = name
yield
@@ -898,7 +897,7 @@
""" Tests code generated by pypy-c compiled with CALL_METHOD
bytecode
"""
- with patching_opcodes('CALL_METHOD', 'LOOKUP_METHOD'):
+ with patching_opcodes(CALL_METHOD=202, LOOKUP_METHOD=201):
class X:
def m(self):
return 3
@@ -922,7 +921,7 @@
""" Tests code generated by pypy-c compiled with BUILD_LIST_FROM_ARG
bytecode
"""
- with patching_opcodes('BUILD_LIST_FROM_ARG'):
+ with patching_opcodes(BUILD_LIST_FROM_ARG=203):
def f():
return [i for i in "abc"]
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
