Commits

Philip Jenvey committed bb983e5

fix imports

Comments (0)

Files changed (5)

pypy/interpreter/test2/test_app_main.py

 @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
 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')

pypy/module/_ssl/test/test_ssl.py

-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
 
 class AppTestSSL:
     spaceconfig = dict(usemodules=('_ssl', '_socket', 'binascii'))

pypy/module/cpyext/test/test_bytesobject.py

-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

pypy/module/imp/test/test_app.py

 from __future__ import with_statement
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
 
 
 class AppTestImpModule:

pypy/module/imp/test/test_import.py

                     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()