[pypy-commit] pypy split-rpython: Fixed a few missing renames

[Aquana]

Author: Alexander Hesse <webmaster at aquanasoft.de>
Branch: split-rpython
Changeset: r60004:47c0f36f9b99
Date: 2013-01-12 21:49 +0100
http://bitbucket.org/pypy/pypy/changeset/47c0f36f9b99/

Log:	Fixed a few missing renames

diff --git a/rpython/rtyper/lltypesystem/ll2ctypes.py b/rpython/rtyper/lltypesystem/ll2ctypes.py
--- a/rpython/rtyper/lltypesystem/ll2ctypes.py
+++ b/rpython/rtyper/lltypesystem/ll2ctypes.py
@@ -785,7 +785,7 @@
                     return callback_internal(*cargs)
                 except:
                     import sys
-                    #if conftest.option.usepdb:
+                    #if option.usepdb:
                     #    import pdb; pdb.post_mortem(sys.exc_traceback)
                     global _callback_exc_info
                     _callback_exc_info = sys.exc_info()
diff --git a/rpython/rtyper/test/test_llinterp.py b/rpython/rtyper/test/test_llinterp.py
--- a/rpython/rtyper/test/test_llinterp.py
+++ b/rpython/rtyper/test/test_llinterp.py
@@ -43,7 +43,7 @@
     a = t.buildannotator(policy=policy)
     timelog("annotating", a.build_types, func, argtypes, main_entry_point=True)
     if viewbefore == 'auto':
-        viewbefore = getattr(conftest.option, 'view', False)
+        viewbefore = getattr(option, 'view', False)
     if viewbefore:
         a.simplify()
         t.view()
@@ -98,7 +98,7 @@
         if len(_lastinterpreted) >= 4: 
             del _tcache[_lastinterpreted.pop(0)]
     if view == 'auto':
-        view = getattr(conftest.option, 'view', False)
+        view = getattr(option, 'view', False)
     if view:
         t.view()
     return interp, graph
diff --git a/rpython/rtyper/test/test_rvirtualizable2.py b/rpython/rtyper/test/test_rvirtualizable2.py
--- a/rpython/rtyper/test/test_rvirtualizable2.py
+++ b/rpython/rtyper/test/test_rvirtualizable2.py
@@ -163,7 +163,7 @@
         op_getfield = block.operations[-1]
         assert op_getfield.opname in ('getfield', 'oogetfield')
         funcptr = self.replace_force_virtualizable(rtyper, [graph])
-        if getattr(conftest.option, 'view', False):
+        if getattr(option, 'view', False):
             graph.show()
         op_promote = block.operations[-2]
         op_getfield = block.operations[-1]
diff --git a/rpython/translator/c/test/test_newgc.py b/rpython/translator/c/test/test_newgc.py
--- a/rpython/translator/c/test/test_newgc.py
+++ b/rpython/translator/c/test/test_newgc.py
@@ -68,7 +68,7 @@
         for fullname in dir(cls):
             if not fullname.startswith('define'):
                 continue
-            keyword = conftest.option.keyword
+            keyword = option.keyword
             if keyword.startswith('test_'):
                 keyword = keyword[len('test_'):]
                 if keyword not in fullname: