[pypy-commit] pypy split-rpython: Fixed imports

[Aquana]

Author: Alexander Hesse <webmaster at aquanasoft.de>
Branch: split-rpython
Changeset: r59711:31d1f6120bd2
Date: 2013-01-05 08:35 +0100
http://bitbucket.org/pypy/pypy/changeset/31d1f6120bd2/

Log:	Fixed imports

diff --git a/pypy/bin/py.py b/pypy/bin/py.py
--- a/pypy/bin/py.py
+++ b/pypy/bin/py.py
@@ -6,10 +6,10 @@
 
 """
 
-try:
-    import autopath
-except ImportError:
-    pass
+import os, sys
+import time
+
+sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..')))
 
 import pypy
 from pypy.tool import option
@@ -18,8 +18,7 @@
 from pypy.config.config import OptionDescription, BoolOption, StrOption
 from pypy.config.config import Config, to_optparse
 from pypy.config import pypyoption
-import os, sys
-import time
+
 
 cmdline_optiondescr = OptionDescription("interactive", "the options of py.py", [
     BoolOption("verbose", "show verbose interpreter-level traceback",
diff --git a/pypy/module/_sre/test/test_app_sre.py b/pypy/module/_sre/test/test_app_sre.py
--- a/pypy/module/_sre/test/test_app_sre.py
+++ b/pypy/module/_sre/test/test_app_sre.py
@@ -1,4 +1,5 @@
 """Regular expression tests specific to _sre.py and accumulated during TDD."""
+import os
 import py
 from py.test import raises, skip
 from pypy.interpreter.gateway import app2interp_temp
diff --git a/rpython/annotator/model.py b/rpython/annotator/model.py
--- a/rpython/annotator/model.py
+++ b/rpython/annotator/model.py
@@ -30,7 +30,7 @@
 from __future__ import absolute_import
 
 from types import BuiltinFunctionType, MethodType, FunctionType
-import pypy
+import rpython
 from pypy.tool import descriptor
 from rpython.tool.pairtype import pair, extendabletype
 from rpython.rlib.rarithmetic import r_uint, r_ulonglong, base_int
diff --git a/rpython/jit/backend/x86/tool/viewcode.py b/rpython/jit/backend/x86/tool/viewcode.py
--- a/rpython/jit/backend/x86/tool/viewcode.py
+++ b/rpython/jit/backend/x86/tool/viewcode.py
@@ -23,7 +23,7 @@
 tmpfile = str(udir.join('dump.tmp'))
 
 # hack hack
-import pypy.tool
+import rpython.tool
 mod = new.module('rpython.tool.udir')
 mod.udir = udir
 sys.modules['rpython.tool.udir'] = mod