Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3k
Changeset: r59392:7a16ec72229e
Date: 2012-12-10 23:14 +0100
http://bitbucket.org/pypy/pypy/changeset/7a16ec72229e/

Log:    We put _importlib.pypy.so in a weird place, help test_imporlib find
        it.

diff --git a/lib-python/3.2/importlib/test/extension/util.py 
b/lib-python/3.2/importlib/test/extension/util.py
--- a/lib-python/3.2/importlib/test/extension/util.py
+++ b/lib-python/3.2/importlib/test/extension/util.py
@@ -15,7 +15,15 @@
             if os.path.exists(os.path.join(PATH, FILENAME)):
                 raise StopIteration
     else:
-        PATH = EXT = FILENAME = FILEPATH = None
+        # Try a direct import
+        try:
+            import _testcapi
+        except ImportError:
+            PATH = EXT = FILENAME = FILEPATH = None
+        else:
+            FILEPATH = _testcapi.__file__
+            PATH, FILENAME = os.path.split(FILEPATH)
+            _, EXT = os.path.splitext(FILEPATH)
 except StopIteration:
     pass
 del _file_exts
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to