[py-svn] r38302 - in py/trunk/py/test: . rsession rsession/testing

[fijal at codespeak.net]

Author: fijal
Date: Fri Feb  9 19:33:00 2007
New Revision: 38302

Modified:
   py/trunk/py/test/defaultconftest.py
   py/trunk/py/test/rsession/testing/test_web.py
   py/trunk/py/test/rsession/testing/test_webjs.py
   py/trunk/py/test/rsession/web.py
Log:
Kill _dist_import_pypy


Modified: py/trunk/py/test/defaultconftest.py
==============================================================================
--- py/trunk/py/test/defaultconftest.py	(original)
+++ py/trunk/py/test/defaultconftest.py	Fri Feb  9 19:33:00 2007
@@ -24,7 +24,6 @@
     dist_nicelevel = py.std.os.nice(0) # nice py.test works
 else:
     dist_nicelevel = 0
-_dist_import_pypy = False # used for regenerating JS application 
 dist_rsync_ignore = []
 
 # ===================================================

Modified: py/trunk/py/test/rsession/testing/test_web.py
==============================================================================
--- py/trunk/py/test/rsession/testing/test_web.py	(original)
+++ py/trunk/py/test/rsession/testing/test_web.py	Fri Feb  9 19:33:00 2007
@@ -13,8 +13,6 @@
     py.test.skip("PyPy not found")
 
 def setup_module(mod):
-    config = py.test.config._reparse([])
-    config._overwrite('_dist_import_pypy', True)
     from py.__.test.rsession.web import TestHandler as _TestHandler
     from py.__.test.rsession.web import MultiQueue
     mod._TestHandler = _TestHandler

Modified: py/trunk/py/test/rsession/testing/test_webjs.py
==============================================================================
--- py/trunk/py/test/rsession/testing/test_webjs.py	(original)
+++ py/trunk/py/test/rsession/testing/test_webjs.py	Fri Feb  9 19:33:00 2007
@@ -21,8 +21,6 @@
     mod.dom = dom
     dom.window = dom.Window(html)
     dom.document = dom.window.document
-    config = py.test.config._reparse([])
-    config._overwrite('_dist_import_pypy', True)
     from py.__.test.rsession import webjs
     from py.__.test.rsession.web import exported_methods
     mod.webjs = webjs

Modified: py/trunk/py/test/rsession/web.py
==============================================================================
--- py/trunk/py/test/rsession/web.py	(original)
+++ py/trunk/py/test/rsession/web.py	Fri Feb  9 19:33:00 2007
@@ -24,11 +24,6 @@
     "show_host", "hide_host", "hide_messagebox", "opt_scroll"]
 
 try:
-    try:
-        if not py.test.config.getvalue('_dist_import_pypy'):
-            raise ImportError
-    except AttributeError:
-        pass
     from pypy.rpython.ootypesystem.bltregistry import MethodDesc, BasicExternal,\
                                                       described
     from pypy.translator.js.main import rpython2javascript