diff --git a/py/test/report/testing/test_web.py b/py/test/report/testing/test_web.py index 4c7c0ff62..88c9bb103 100644 --- a/py/test/report/testing/test_web.py +++ b/py/test/report/testing/test_web.py @@ -15,14 +15,14 @@ def setup_module(mod): mod.commproxy.USE_MOCHIKIT = False mod.rpython2javascript = rpython2javascript mod.commproxy = mod.commproxy - from py.__.test.dsession.web import TestHandler as _TestHandler - from py.__.test.dsession.web import MultiQueue + from py.__.test.report.web import TestHandler as _TestHandler + from py.__.test.report.web import MultiQueue mod._TestHandler = _TestHandler mod.MultiQueue = MultiQueue def test_js_generate(): - from py.__.test.dsession import webjs - from py.__.test.dsession.web import FUNCTION_LIST, IMPORTED_PYPY + from py.__.test.report import webjs + from py.__.test.report.web import FUNCTION_LIST, IMPORTED_PYPY source = rpython2javascript(webjs, FUNCTION_LIST, use_pdb=False) assert source diff --git a/py/test/report/testing/test_webjs.py b/py/test/report/testing/test_webjs.py index 92c3a333a..dddf909f0 100644 --- a/py/test/report/testing/test_webjs.py +++ b/py/test/report/testing/test_webjs.py @@ -12,8 +12,8 @@ def check(mod): mod.dom = dom mod.schedule_callbacks = schedule_callbacks - from py.__.test.dsession import webjs - from py.__.test.dsession.web import exported_methods + from py.__.test.report import webjs + from py.__.test.report.web import exported_methods mod.webjs = webjs mod.exported_methods = exported_methods mod.here = py.magic.autopath().dirpath() @@ -28,8 +28,8 @@ def setup_module(mod): mod.dom = dom dom.window = dom.Window(html) dom.document = dom.window.document - from py.__.test.dsession import webjs - from py.__.test.dsession.web import exported_methods + from py.__.test.report import webjs + from py.__.test.report.web import exported_methods mod.webjs = webjs mod.exported_methods = exported_methods diff --git a/py/test/report/web.py b/py/test/report/web.py index 1d673b174..f452925ca 100644 --- a/py/test/report/web.py +++ b/py/test/report/web.py @@ -14,10 +14,8 @@ import sys import socket import py -from py.__.test.dsession.dsession import RSession -from py.__.test import event -from py.__.test import collect -from py.__.test.dsession.webdata import json +from py.test import collect +from py.__.test.report.webdata import json DATADIR = py.path.local(__file__).dirpath("webdata") FUNCTION_LIST = ["main", "show_skip", "show_traceback", "show_info", "hide_info", diff --git a/py/test/report/webjs.py b/py/test/report/webjs.py index c4b24e5de..a98821455 100644 --- a/py/test/report/webjs.py +++ b/py/test/report/webjs.py @@ -3,7 +3,7 @@ """ import py -from py.__.test.dsession.web import exported_methods +from py.__.test.report.web import exported_methods try: from pypy.translator.js.modules import dom from pypy.translator.js.helper import __show_traceback