[pypy-svn] r9149 - pypy/branch/dist-interpapp/pypy/module/test

[hpk at codespeak.net]

Author: hpk
Date: Sat Feb 12 01:02:18 2005
New Revision: 9149

Modified:
   pypy/branch/dist-interpapp/pypy/module/test/test_import.py
Log:
fix test to more sanely use appdef/app2interp logic. 



Modified: pypy/branch/dist-interpapp/pypy/module/test/test_import.py
==============================================================================
--- pypy/branch/dist-interpapp/pypy/module/test/test_import.py	(original)
+++ pypy/branch/dist-interpapp/pypy/module/test/test_import.py	Sat Feb 12 01:02:18 2005
@@ -2,21 +2,23 @@
 from pypy.interpreter import gateway
 import os
 
-
-def _setup(dn=os.path.abspath(os.path.join(os.path.dirname(__file__), 'impsubdir'))):
-    import sys
-    sys.path.append(dn)
-    return sys.modules.copy()
-
-_setup = gateway.app2interp_temp(_setup,'setup')
-
-def _teardown(saved_modules):
-    import sys
-    sys.path.pop()
-    sys.modules.clear()
-    sys.modules.update(saved_modules)
-
-_teardown = gateway.app2interp_temp(_teardown,'teardown')
+def _setup(space): 
+    dn=os.path.abspath(os.path.join(os.path.dirname(__file__), 'impsubdir'))
+    return space.appexec([space.wrap(dn)], """
+        (dn): 
+            import sys
+            sys.path.append(dn)
+            return sys.modules.copy()
+    """)
+
+def _teardown(space, w_saved_modules):
+    space.appexec([w_saved_modules], """
+        (saved_modules): 
+            import sys
+            sys.path.pop()
+            sys.modules.clear()
+            sys.modules.update(saved_modules)
+    """)
 
 class AppTestImport: