Author: Armin Rigo <[email protected]>
Branch:
Changeset: r50336:998ae4038c2f
Date: 2011-12-10 10:46 +0100
http://bitbucket.org/pypy/pypy/changeset/998ae4038c2f/
Log: fixes for test_app_main.
diff --git a/pypy/translator/goal/app_main.py b/pypy/translator/goal/app_main.py
--- a/pypy/translator/goal/app_main.py
+++ b/pypy/translator/goal/app_main.py
@@ -672,7 +672,7 @@
def pypy_initial_path(s):
from pypy.module.sys.state import getinitialpath
try:
- return getinitialpath(s)
+ return getinitialpath(None, s)
except OSError:
return None
diff --git a/pypy/translator/goal/test2/test_app_main.py
b/pypy/translator/goal/test2/test_app_main.py
--- a/pypy/translator/goal/test2/test_app_main.py
+++ b/pypy/translator/goal/test2/test_app_main.py
@@ -821,6 +821,8 @@
newpath = app_main.get_library_path('/tmp/pypy-c') # stdlib not
found
assert newpath == sys.path
newpath = app_main.get_library_path(self.fake_exe)
+ if newpath[0].endswith('__extensions__'):
+ newpath = newpath[1:]
# we get at least 'expected_path', and maybe more (e.g.plat-linux2)
assert newpath[:len(self.expected_path)] == self.expected_path
finally:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
