Commits

Alexander Hesse committed 31d1f61

Fixed imports

Comments (0)

Files changed (4)

 
 """
 
-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
 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",

pypy/module/_sre/test/test_app_sre.py

 """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

rpython/annotator/model.py

 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

rpython/jit/backend/x86/tool/viewcode.py

 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