[pypy-svn] r25341 - in pypy/dist/pypy: annotation/test bin doc/revreport interpreter interpreter/pyparser/test interpreter/test lib/test2 module/__builtin__/test module/_codecs/test module/_sre/test module/sys/test objspace/flow/test objspace/std objspace/std/test objspace/test tool tool/algo/test tool/pytest tool/test translator translator/asm translator/asm/ppcgen translator/asm/ppcgen/test translator/asm/test translator/c translator/c/test translator/goal translator/java translator/java/test translator/llvm/demo translator/llvm/pyllvm translator/llvm/pythonllvm translator/pyrex translator/pyrex/test translator/test translator/tool translator/tool/pygame
hpk at codespeak.net
hpk at codespeak.net
Wed Apr 5 11:08:23 CEST 2006
Author: hpk
Date: Wed Apr 5 11:08:21 2006
New Revision: 25341
Modified:
pypy/dist/pypy/annotation/test/autopath.py
pypy/dist/pypy/bin/autopath.py
pypy/dist/pypy/doc/revreport/autopath.py
pypy/dist/pypy/interpreter/autopath.py
pypy/dist/pypy/interpreter/pyparser/test/autopath.py
pypy/dist/pypy/interpreter/test/autopath.py
pypy/dist/pypy/lib/test2/autopath.py
pypy/dist/pypy/module/__builtin__/test/autopath.py
pypy/dist/pypy/module/_codecs/test/autopath.py
pypy/dist/pypy/module/_sre/test/autopath.py
pypy/dist/pypy/module/sys/test/autopath.py
pypy/dist/pypy/objspace/flow/test/autopath.py
pypy/dist/pypy/objspace/std/autopath.py
pypy/dist/pypy/objspace/std/test/autopath.py
pypy/dist/pypy/objspace/test/autopath.py
pypy/dist/pypy/tool/algo/test/autopath.py
pypy/dist/pypy/tool/autopath.py
pypy/dist/pypy/tool/pytest/autopath.py
pypy/dist/pypy/tool/test/autopath.py
pypy/dist/pypy/translator/asm/autopath.py
pypy/dist/pypy/translator/asm/ppcgen/autopath.py
pypy/dist/pypy/translator/asm/ppcgen/test/autopath.py
pypy/dist/pypy/translator/asm/test/autopath.py
pypy/dist/pypy/translator/autopath.py
pypy/dist/pypy/translator/c/autopath.py
pypy/dist/pypy/translator/c/test/autopath.py
pypy/dist/pypy/translator/goal/autopath.py
pypy/dist/pypy/translator/java/autopath.py
pypy/dist/pypy/translator/java/test/autopath.py
pypy/dist/pypy/translator/llvm/demo/autopath.py
pypy/dist/pypy/translator/llvm/pyllvm/autopath.py
pypy/dist/pypy/translator/llvm/pythonllvm/autopath.py
pypy/dist/pypy/translator/pyrex/autopath.py
pypy/dist/pypy/translator/pyrex/test/autopath.py
pypy/dist/pypy/translator/test/autopath.py
pypy/dist/pypy/translator/tool/autopath.py
pypy/dist/pypy/translator/tool/pygame/autopath.py
Log:
don't magically remove pypy subdirectories from sys.path
(might lead to problems if you are in a CWD directory that
has modules with exact CPython names but those should
be fixed or you need to run from somewhere else, autopath
should not have to care for this)
Modified: pypy/dist/pypy/annotation/test/autopath.py
==============================================================================
--- pypy/dist/pypy/annotation/test/autopath.py (original)
+++ pypy/dist/pypy/annotation/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/bin/autopath.py
==============================================================================
--- pypy/dist/pypy/bin/autopath.py (original)
+++ pypy/dist/pypy/bin/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/doc/revreport/autopath.py
==============================================================================
--- pypy/dist/pypy/doc/revreport/autopath.py (original)
+++ pypy/dist/pypy/doc/revreport/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/interpreter/autopath.py
==============================================================================
--- pypy/dist/pypy/interpreter/autopath.py (original)
+++ pypy/dist/pypy/interpreter/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/interpreter/pyparser/test/autopath.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyparser/test/autopath.py (original)
+++ pypy/dist/pypy/interpreter/pyparser/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/interpreter/test/autopath.py
==============================================================================
--- pypy/dist/pypy/interpreter/test/autopath.py (original)
+++ pypy/dist/pypy/interpreter/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/lib/test2/autopath.py
==============================================================================
--- pypy/dist/pypy/lib/test2/autopath.py (original)
+++ pypy/dist/pypy/lib/test2/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/module/__builtin__/test/autopath.py
==============================================================================
--- pypy/dist/pypy/module/__builtin__/test/autopath.py (original)
+++ pypy/dist/pypy/module/__builtin__/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/module/_codecs/test/autopath.py
==============================================================================
--- pypy/dist/pypy/module/_codecs/test/autopath.py (original)
+++ pypy/dist/pypy/module/_codecs/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/module/_sre/test/autopath.py
==============================================================================
--- pypy/dist/pypy/module/_sre/test/autopath.py (original)
+++ pypy/dist/pypy/module/_sre/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/module/sys/test/autopath.py
==============================================================================
--- pypy/dist/pypy/module/sys/test/autopath.py (original)
+++ pypy/dist/pypy/module/sys/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/objspace/flow/test/autopath.py
==============================================================================
--- pypy/dist/pypy/objspace/flow/test/autopath.py (original)
+++ pypy/dist/pypy/objspace/flow/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/objspace/std/autopath.py
==============================================================================
--- pypy/dist/pypy/objspace/std/autopath.py (original)
+++ pypy/dist/pypy/objspace/std/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/objspace/std/test/autopath.py
==============================================================================
--- pypy/dist/pypy/objspace/std/test/autopath.py (original)
+++ pypy/dist/pypy/objspace/std/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/objspace/test/autopath.py
==============================================================================
--- pypy/dist/pypy/objspace/test/autopath.py (original)
+++ pypy/dist/pypy/objspace/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/tool/algo/test/autopath.py
==============================================================================
--- pypy/dist/pypy/tool/algo/test/autopath.py (original)
+++ pypy/dist/pypy/tool/algo/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/tool/autopath.py
==============================================================================
--- pypy/dist/pypy/tool/autopath.py (original)
+++ pypy/dist/pypy/tool/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/tool/pytest/autopath.py
==============================================================================
--- pypy/dist/pypy/tool/pytest/autopath.py (original)
+++ pypy/dist/pypy/tool/pytest/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/tool/test/autopath.py
==============================================================================
--- pypy/dist/pypy/tool/test/autopath.py (original)
+++ pypy/dist/pypy/tool/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/asm/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/asm/autopath.py (original)
+++ pypy/dist/pypy/translator/asm/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/asm/ppcgen/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/autopath.py (original)
+++ pypy/dist/pypy/translator/asm/ppcgen/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/asm/ppcgen/test/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/test/autopath.py (original)
+++ pypy/dist/pypy/translator/asm/ppcgen/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/asm/test/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/asm/test/autopath.py (original)
+++ pypy/dist/pypy/translator/asm/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/autopath.py (original)
+++ pypy/dist/pypy/translator/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/c/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/c/autopath.py (original)
+++ pypy/dist/pypy/translator/c/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/c/test/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/autopath.py (original)
+++ pypy/dist/pypy/translator/c/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/goal/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/goal/autopath.py (original)
+++ pypy/dist/pypy/translator/goal/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/java/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/java/autopath.py (original)
+++ pypy/dist/pypy/translator/java/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/java/test/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/java/test/autopath.py (original)
+++ pypy/dist/pypy/translator/java/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/llvm/demo/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/demo/autopath.py (original)
+++ pypy/dist/pypy/translator/llvm/demo/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/llvm/pyllvm/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/pyllvm/autopath.py (original)
+++ pypy/dist/pypy/translator/llvm/pyllvm/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/llvm/pythonllvm/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/pythonllvm/autopath.py (original)
+++ pypy/dist/pypy/translator/llvm/pythonllvm/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/pyrex/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/pyrex/autopath.py (original)
+++ pypy/dist/pypy/translator/pyrex/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/pyrex/test/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/pyrex/test/autopath.py (original)
+++ pypy/dist/pypy/translator/pyrex/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/test/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/test/autopath.py (original)
+++ pypy/dist/pypy/translator/test/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/tool/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/tool/autopath.py (original)
+++ pypy/dist/pypy/translator/tool/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
Modified: pypy/dist/pypy/translator/tool/pygame/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/tool/pygame/autopath.py (original)
+++ pypy/dist/pypy/translator/tool/pygame/autopath.py Wed Apr 5 11:08:21 2006
@@ -41,15 +41,7 @@
else:
raise EnvironmentError, "'%s' missing in '%r'" % (partdir, this_dir)
- checkpaths = sys.path[:]
pypy_root = os.path.join(head, '')
-
- while checkpaths:
- orig = checkpaths.pop()
- fullorig = os.path.join(os.path.realpath(orig), '')
- if fullorig.startswith(pypy_root):
- if os.path.exists(os.path.join(fullorig, '__init__.py')):
- sys.path.remove(orig)
try:
sys.path.remove(head)
except ValueError:
More information about the Pypy-commit
mailing list