[pypy-svn] r10483 - in pypy/branch/pycollect-dist-pypy/pypy: tool translator/test

[hpk at codespeak.net]

Author: hpk
Date: Sat Apr  9 12:46:42 2005
New Revision: 10483

Modified:
   pypy/branch/pycollect-dist-pypy/pypy/tool/pytestsupport.py
   pypy/branch/pycollect-dist-pypy/pypy/translator/test/test_pyrextrans.py
Log:
finally, use plain imports 


Modified: pypy/branch/pycollect-dist-pypy/pypy/tool/pytestsupport.py
==============================================================================
--- pypy/branch/pycollect-dist-pypy/pypy/tool/pytestsupport.py	(original)
+++ pypy/branch/pycollect-dist-pypy/pypy/tool/pytestsupport.py	Sat Apr  9 12:46:42 2005
@@ -6,8 +6,6 @@
 from pypy.interpreter.error import OperationError
 import pypy
 
-optionpath = py.path.extpy(py.path.local(pypy.__file__).dirpath('conftest.py'), 
-                       'option') 
 # ____________________________________________________________
 
 class AppFrame(py.code.Frame):
@@ -102,7 +100,8 @@
                 source = str(source).strip()
             except py.error.ENOENT: 
                 source = None
-            if source and not optionpath.resolve().nomagic: 
+            from pypy import conftest 
+            if source and not conftest.option.nomagic: 
                 msg = exprinfo.interpret(source, runner, should_fail=True)
                 space.setattr(w_self, space.wrap('args'),
                             space.newtuple([space.wrap(msg)]))

Modified: pypy/branch/pycollect-dist-pypy/pypy/translator/test/test_pyrextrans.py
==============================================================================
--- pypy/branch/pycollect-dist-pypy/pypy/translator/test/test_pyrextrans.py	(original)
+++ pypy/branch/pycollect-dist-pypy/pypy/translator/test/test_pyrextrans.py	Sat Apr  9 12:46:42 2005
@@ -7,9 +7,7 @@
 from pypy.translator.tool.buildpyxmodule import skip_missing_compiler
 from pypy.translator.translator import Translator
 
-import pypy, py
-optionpath = py.path.extpy(py.path.local(pypy.__file__).dirpath('conftest.py'), 
-                  'option') 
+from pypy import conftest 
 #from pypy.conftest import option
 
 from pypy.translator.test import snippet 
@@ -26,7 +24,7 @@
         try: func = func.im_func
         except AttributeError: pass
 
-        dot = optionpath.resolve().verbose > 0 and 1 or 0 
+        dot = conftest.option.verbose > 0 and 1 or 0 
         options = {
             'simplify' : 1,
             'dot' : dot,