[pypy-svn] r59379 - in pypy/trunk/pypy: annotation/test bin config doc/config lang/gameboy/tool lang/js lang/prolog/interpreter lang/scheme lang/smalltalk/tool lib/test2 module/__builtin__/test module/_codecs/test module/_sre/test module/sys/test rlib/parsing/test rlib/rsdl/test rpython/microbench tool tool/algo/test tool/pytest tool/test translator translator/benchmark translator/c translator/c/test translator/cli/test translator/goal translator/goal/test2 translator/js translator/js/examples translator/js/examples/bnb translator/microbench/pybench translator/sandbox translator/sandbox/test translator/test translator/tool
fijal at codespeak.net
fijal at codespeak.net
Fri Oct 24 17:19:50 CEST 2008
Author: fijal
Date: Fri Oct 24 17:19:47 2008
New Revision: 59379
Modified:
pypy/trunk/pypy/annotation/test/autopath.py
pypy/trunk/pypy/bin/autopath.py
pypy/trunk/pypy/config/autopath.py
pypy/trunk/pypy/doc/config/autopath.py
pypy/trunk/pypy/lang/gameboy/tool/autopath.py
pypy/trunk/pypy/lang/js/autopath.py
pypy/trunk/pypy/lang/prolog/interpreter/autopath.py
pypy/trunk/pypy/lang/scheme/autopath.py
pypy/trunk/pypy/lang/smalltalk/tool/autopath.py
pypy/trunk/pypy/lib/test2/autopath.py
pypy/trunk/pypy/module/__builtin__/test/autopath.py
pypy/trunk/pypy/module/_codecs/test/autopath.py
pypy/trunk/pypy/module/_sre/test/autopath.py
pypy/trunk/pypy/module/sys/test/autopath.py
pypy/trunk/pypy/rlib/parsing/test/autopath.py
pypy/trunk/pypy/rlib/rsdl/test/autopath.py
pypy/trunk/pypy/rpython/microbench/autopath.py
pypy/trunk/pypy/tool/algo/test/autopath.py
pypy/trunk/pypy/tool/autopath.py
pypy/trunk/pypy/tool/pytest/autopath.py
pypy/trunk/pypy/tool/test/autopath.py
pypy/trunk/pypy/translator/autopath.py
pypy/trunk/pypy/translator/benchmark/autopath.py
pypy/trunk/pypy/translator/c/autopath.py
pypy/trunk/pypy/translator/c/test/autopath.py
pypy/trunk/pypy/translator/cli/test/autopath.py
pypy/trunk/pypy/translator/goal/autopath.py
pypy/trunk/pypy/translator/goal/test2/autopath.py
pypy/trunk/pypy/translator/js/autopath.py
pypy/trunk/pypy/translator/js/examples/autopath.py
pypy/trunk/pypy/translator/js/examples/bnb/autopath.py
pypy/trunk/pypy/translator/microbench/pybench/autopath.py
pypy/trunk/pypy/translator/sandbox/autopath.py
pypy/trunk/pypy/translator/sandbox/test/autopath.py
pypy/trunk/pypy/translator/test/autopath.py
pypy/trunk/pypy/translator/tool/autopath.py
Log:
fix autopath to import py only *after* sys.path has been augmented
Modified: pypy/trunk/pypy/annotation/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/annotation/test/autopath.py (original)
+++ pypy/trunk/pypy/annotation/test/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/bin/autopath.py
==============================================================================
--- pypy/trunk/pypy/bin/autopath.py (original)
+++ pypy/trunk/pypy/bin/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/config/autopath.py
==============================================================================
--- pypy/trunk/pypy/config/autopath.py (original)
+++ pypy/trunk/pypy/config/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/doc/config/autopath.py
==============================================================================
--- pypy/trunk/pypy/doc/config/autopath.py (original)
+++ pypy/trunk/pypy/doc/config/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/lang/gameboy/tool/autopath.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/tool/autopath.py (original)
+++ pypy/trunk/pypy/lang/gameboy/tool/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/lang/js/autopath.py
==============================================================================
--- pypy/trunk/pypy/lang/js/autopath.py (original)
+++ pypy/trunk/pypy/lang/js/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/lang/prolog/interpreter/autopath.py
==============================================================================
--- pypy/trunk/pypy/lang/prolog/interpreter/autopath.py (original)
+++ pypy/trunk/pypy/lang/prolog/interpreter/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/lang/scheme/autopath.py
==============================================================================
--- pypy/trunk/pypy/lang/scheme/autopath.py (original)
+++ pypy/trunk/pypy/lang/scheme/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/lang/smalltalk/tool/autopath.py
==============================================================================
--- pypy/trunk/pypy/lang/smalltalk/tool/autopath.py (original)
+++ pypy/trunk/pypy/lang/smalltalk/tool/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/lib/test2/autopath.py
==============================================================================
--- pypy/trunk/pypy/lib/test2/autopath.py (original)
+++ pypy/trunk/pypy/lib/test2/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/module/__builtin__/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/module/__builtin__/test/autopath.py (original)
+++ pypy/trunk/pypy/module/__builtin__/test/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/module/_codecs/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/module/_codecs/test/autopath.py (original)
+++ pypy/trunk/pypy/module/_codecs/test/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/module/_sre/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/module/_sre/test/autopath.py (original)
+++ pypy/trunk/pypy/module/_sre/test/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/module/sys/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/module/sys/test/autopath.py (original)
+++ pypy/trunk/pypy/module/sys/test/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/rlib/parsing/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/rlib/parsing/test/autopath.py (original)
+++ pypy/trunk/pypy/rlib/parsing/test/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/rlib/rsdl/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/rlib/rsdl/test/autopath.py (original)
+++ pypy/trunk/pypy/rlib/rsdl/test/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/rpython/microbench/autopath.py
==============================================================================
--- pypy/trunk/pypy/rpython/microbench/autopath.py (original)
+++ pypy/trunk/pypy/rpython/microbench/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/tool/algo/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/tool/algo/test/autopath.py (original)
+++ pypy/trunk/pypy/tool/algo/test/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/tool/autopath.py
==============================================================================
--- pypy/trunk/pypy/tool/autopath.py (original)
+++ pypy/trunk/pypy/tool/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/tool/pytest/autopath.py
==============================================================================
--- pypy/trunk/pypy/tool/pytest/autopath.py (original)
+++ pypy/trunk/pypy/tool/pytest/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/tool/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/tool/test/autopath.py (original)
+++ pypy/trunk/pypy/tool/test/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/autopath.py (original)
+++ pypy/trunk/pypy/translator/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/benchmark/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/benchmark/autopath.py (original)
+++ pypy/trunk/pypy/translator/benchmark/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/c/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/c/autopath.py (original)
+++ pypy/trunk/pypy/translator/c/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/c/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/c/test/autopath.py (original)
+++ pypy/trunk/pypy/translator/c/test/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/cli/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/cli/test/autopath.py (original)
+++ pypy/trunk/pypy/translator/cli/test/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/goal/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/goal/autopath.py (original)
+++ pypy/trunk/pypy/translator/goal/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/goal/test2/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/goal/test2/autopath.py (original)
+++ pypy/trunk/pypy/translator/goal/test2/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/js/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/js/autopath.py (original)
+++ pypy/trunk/pypy/translator/js/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/js/examples/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/js/examples/autopath.py (original)
+++ pypy/trunk/pypy/translator/js/examples/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/js/examples/bnb/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/js/examples/bnb/autopath.py (original)
+++ pypy/trunk/pypy/translator/js/examples/bnb/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/microbench/pybench/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/microbench/pybench/autopath.py (original)
+++ pypy/trunk/pypy/translator/microbench/pybench/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/sandbox/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/sandbox/autopath.py (original)
+++ pypy/trunk/pypy/translator/sandbox/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/sandbox/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/sandbox/test/autopath.py (original)
+++ pypy/trunk/pypy/translator/sandbox/test/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/test/autopath.py (original)
+++ pypy/trunk/pypy/translator/test/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
Modified: pypy/trunk/pypy/translator/tool/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/tool/autopath.py (original)
+++ pypy/trunk/pypy/translator/tool/autopath.py Fri Oct 24 17:19:47 2008
@@ -21,8 +21,6 @@
"""
-import py
-
def __dirinfo(part):
""" return (partdir, this_dir) and insert parent of partdir
into sys.path. If the parent directories don't have the part
@@ -129,6 +127,7 @@
# set guaranteed attributes
pypydir, this_dir = __dirinfo('pypy')
+import py
libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
More information about the Pypy-commit
mailing list