From 0d6d17dc965c8b0a421a5aa1b32af7a77e1e04b9 Mon Sep 17 00:00:00 2001
From: fijal <none@none>
Date: Fri, 9 Feb 2007 19:33:00 +0100
Subject: [PATCH] [svn r38302] Kill _dist_import_pypy

--HG--
branch : trunk
---
 py/test/defaultconftest.py             | 1 -
 py/test/rsession/testing/test_web.py   | 2 --
 py/test/rsession/testing/test_webjs.py | 2 --
 py/test/rsession/web.py                | 5 -----
 4 files changed, 10 deletions(-)

diff --git a/py/test/defaultconftest.py b/py/test/defaultconftest.py
index d6551c227..058c1b177 100644
--- a/py/test/defaultconftest.py
+++ b/py/test/defaultconftest.py
@@ -24,7 +24,6 @@ if hasattr(py.std.os, 'nice'):
     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 = []
 
 # ===================================================
diff --git a/py/test/rsession/testing/test_web.py b/py/test/rsession/testing/test_web.py
index 2e757dca2..661d4f6bf 100644
--- a/py/test/rsession/testing/test_web.py
+++ b/py/test/rsession/testing/test_web.py
@@ -13,8 +13,6 @@ except ImportError:
     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
diff --git a/py/test/rsession/testing/test_webjs.py b/py/test/rsession/testing/test_webjs.py
index 6bd6772e2..2f77171cf 100644
--- a/py/test/rsession/testing/test_webjs.py
+++ b/py/test/rsession/testing/test_webjs.py
@@ -21,8 +21,6 @@ def setup_module(mod):
     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
diff --git a/py/test/rsession/web.py b/py/test/rsession/web.py
index 45ef22de4..0a367b400 100644
--- a/py/test/rsession/web.py
+++ b/py/test/rsession/web.py
@@ -24,11 +24,6 @@ FUNCTION_LIST = ["main", "show_skip", "show_traceback", "show_info", "hide_info"
     "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