Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r60318:bb983e5cb781
Date: 2013-01-21 13:35 -0800
http://bitbucket.org/pypy/pypy/changeset/bb983e5cb781/
Log: fix imports
diff --git a/pypy/interpreter/test2/test_app_main.py
b/pypy/interpreter/test2/test_app_main.py
--- a/pypy/interpreter/test2/test_app_main.py
+++ b/pypy/interpreter/test2/test_app_main.py
@@ -86,7 +86,7 @@
@contextmanager
def setpythonpath():
old_pythonpath = os.getenv('PYTHONPATH')
- rootdir = os.path.dirname(autopath.pypydir)
+ rootdir = os.path.dirname(pypydir)
os.putenv('PYTHONPATH', rootdir)
try:
yield
@@ -857,7 +857,7 @@
class TestAppMain:
def test_print_info(self):
- from rpython.translator.goal import app_main
+ from pypy.interpreter import app_main
import sys, cStringIO
prev_so = sys.stdout
prev_ti = getattr(sys, 'pypy_translation_info', 'missing')
diff --git a/pypy/module/_ssl/test/test_ssl.py
b/pypy/module/_ssl/test/test_ssl.py
--- a/pypy/module/_ssl/test/test_ssl.py
+++ b/pypy/module/_ssl/test/test_ssl.py
@@ -1,4 +1,4 @@
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
class AppTestSSL:
spaceconfig = dict(usemodules=('_ssl', '_socket', 'binascii'))
diff --git a/pypy/module/cpyext/test/test_bytesobject.py
b/pypy/module/cpyext/test/test_bytesobject.py
--- a/pypy/module/cpyext/test/test_bytesobject.py
+++ b/pypy/module/cpyext/test/test_bytesobject.py
@@ -1,4 +1,4 @@
-from pypy.rpython.lltypesystem import rffi, lltype
+from rpython.rtyper.lltypesystem import rffi, lltype
from pypy.module.cpyext.test.test_api import BaseApiTest
from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
from pypy.module.cpyext.bytesobject import new_empty_str, PyBytesObject
diff --git a/pypy/module/imp/test/test_app.py b/pypy/module/imp/test/test_app.py
--- a/pypy/module/imp/test/test_app.py
+++ b/pypy/module/imp/test/test_app.py
@@ -1,5 +1,5 @@
from __future__ import with_statement
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
class AppTestImpModule:
diff --git a/pypy/module/imp/test/test_import.py
b/pypy/module/imp/test/test_import.py
--- a/pypy/module/imp/test/test_import.py
+++ b/pypy/module/imp/test/test_import.py
@@ -1040,8 +1040,8 @@
stream.close()
def test_annotation(self):
- from pypy.annotation.annrpython import RPythonAnnotator
- from pypy.annotation import model as annmodel
+ from rpython.annotator.annrpython import RPythonAnnotator
+ from rpython.annotator import model as annmodel
def f():
return importing.make_compiled_pathname('abc/foo.py')
a = RPythonAnnotator()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
