[py-svn] r37044 - in py/dist/py/test/rsession: . testing

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sat Jan 20 00:25:42 2007
New Revision: 37044

Modified:
   py/dist/py/test/rsession/testing/test_webjs.py
   py/dist/py/test/rsession/web.py
Log:
more fixes to the 2.3-pypy combination


Modified: py/dist/py/test/rsession/testing/test_webjs.py
==============================================================================
--- py/dist/py/test/rsession/testing/test_webjs.py	(original)
+++ py/dist/py/test/rsession/testing/test_webjs.py	Sat Jan 20 00:25:42 2007
@@ -1,17 +1,17 @@
 import py
+
 try:
     import pypy
     from pypy.translator.js.modules import dom
-    from py.__.test.rsession.rsession import session_options
-    from py.__.test.rsession.rsession import session_options
-    from py.__.test.rsession import webjs
-    from py.__.test.rsession.web import exported_methods
     from pypy.translator.js.tester import schedule_callbacks
-except ImportError:
+    from py.__.test.rsession.rsession import session_options
+    dom.Window # check whether dom was properly imported or is just a 
+               # leftover in sys.modules
+except (ImportError, AttributeError):
     py.test.skip('PyPy not found')
 
-    from py.__.test.rsession import webjs
-    from py.__.test.rsession.web import exported_methods
+from py.__.test.rsession import webjs
+from py.__.test.rsession.web import exported_methods
 here = py.magic.autopath().dirpath()
 
 def setup_module(mod):

Modified: py/dist/py/test/rsession/web.py
==============================================================================
--- py/dist/py/test/rsession/web.py	(original)
+++ py/dist/py/test/rsession/web.py	Sat Jan 20 00:25:42 2007
@@ -37,7 +37,7 @@
 
     commproxy.USE_MOCHIKIT = False
     IMPORTED_PYPY = True
-except ImportError:
+except (ImportError, NameError):
     class BasicExternal(object):
         pass