[pypy-svn] r10302 - in pypy/dist/pypy: annotation/test documentation/revreport interpreter interpreter/test lib/test2 module/test objspace/flow/test objspace/std objspace/std/test objspace/test tool/test translator translator/genc translator/genc/test translator/java translator/java/test translator/llvm translator/llvm/test translator/test translator/tool translator/tool/pygame
sanxiyn at codespeak.net
sanxiyn at codespeak.net
Mon Apr 4 19:24:26 CEST 2005
Author: sanxiyn
Date: Mon Apr 4 19:24:25 2005
New Revision: 10302
Modified:
pypy/dist/pypy/annotation/test/autopath.py
pypy/dist/pypy/documentation/revreport/autopath.py
pypy/dist/pypy/interpreter/autopath.py
pypy/dist/pypy/interpreter/test/autopath.py
pypy/dist/pypy/lib/test2/autopath.py
pypy/dist/pypy/module/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/test/autopath.py
pypy/dist/pypy/translator/autopath.py
pypy/dist/pypy/translator/genc/autopath.py
pypy/dist/pypy/translator/genc/test/autopath.py
pypy/dist/pypy/translator/java/autopath.py
pypy/dist/pypy/translator/java/test/autopath.py
pypy/dist/pypy/translator/llvm/autopath.py
pypy/dist/pypy/translator/llvm/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:
regenerate
Modified: pypy/dist/pypy/annotation/test/autopath.py
==============================================================================
--- pypy/dist/pypy/annotation/test/autopath.py (original)
+++ pypy/dist/pypy/annotation/test/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/documentation/revreport/autopath.py
==============================================================================
--- pypy/dist/pypy/documentation/revreport/autopath.py (original)
+++ pypy/dist/pypy/documentation/revreport/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/interpreter/autopath.py
==============================================================================
--- pypy/dist/pypy/interpreter/autopath.py (original)
+++ pypy/dist/pypy/interpreter/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/interpreter/test/autopath.py
==============================================================================
--- pypy/dist/pypy/interpreter/test/autopath.py (original)
+++ pypy/dist/pypy/interpreter/test/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/lib/test2/autopath.py
==============================================================================
--- pypy/dist/pypy/lib/test2/autopath.py (original)
+++ pypy/dist/pypy/lib/test2/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/module/test/autopath.py
==============================================================================
--- pypy/dist/pypy/module/test/autopath.py (original)
+++ pypy/dist/pypy/module/test/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
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 Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/objspace/std/autopath.py
==============================================================================
--- pypy/dist/pypy/objspace/std/autopath.py (original)
+++ pypy/dist/pypy/objspace/std/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
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 Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/objspace/test/autopath.py
==============================================================================
--- pypy/dist/pypy/objspace/test/autopath.py (original)
+++ pypy/dist/pypy/objspace/test/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/tool/test/autopath.py
==============================================================================
--- pypy/dist/pypy/tool/test/autopath.py (original)
+++ pypy/dist/pypy/tool/test/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/translator/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/autopath.py (original)
+++ pypy/dist/pypy/translator/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/translator/genc/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/genc/autopath.py (original)
+++ pypy/dist/pypy/translator/genc/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/translator/genc/test/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/genc/test/autopath.py (original)
+++ pypy/dist/pypy/translator/genc/test/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/translator/java/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/java/autopath.py (original)
+++ pypy/dist/pypy/translator/java/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
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 Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/translator/llvm/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/autopath.py (original)
+++ pypy/dist/pypy/translator/llvm/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/translator/llvm/test/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/autopath.py (original)
+++ pypy/dist/pypy/translator/llvm/test/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/translator/test/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/test/autopath.py (original)
+++ pypy/dist/pypy/translator/test/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
Modified: pypy/dist/pypy/translator/tool/autopath.py
==============================================================================
--- pypy/dist/pypy/translator/tool/autopath.py (original)
+++ pypy/dist/pypy/translator/tool/autopath.py Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
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 Mon Apr 4 19:24:25 2005
@@ -46,8 +46,10 @@
while checkpaths:
orig = checkpaths.pop()
- if os.path.join(os.path.realpath(orig), '').startswith(pypy_root):
- sys.path.remove(orig)
+ 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)
sys.path.insert(0, head)
munged = {}
More information about the Pypy-commit
mailing list