[pypy-commit] pypy default: try fix issue 844 by breaking a circular import which appears on mac: ctypes.util --> macholib.dyld --> os.path.expanduser --> posixpath --> pwd --> ctypes_support --> ctypes.util

[antocuni]

Author: Antonio Cuni <anto.c...@gmail.com>
Branch: 
Changeset: r46924:cf154677dac2
Date: 2011-08-30 18:06 +0200
http://bitbucket.org/pypy/pypy/changeset/cf154677dac2/

Log:    try fix issue 844 by breaking a circular import which appears on
        mac: ctypes.util --> macholib.dyld --> os.path.expanduser -->
        posixpath --> pwd --> ctypes_support --> ctypes.util

diff --git a/lib-python/modified-2.7/ctypes/util.py 
b/lib-python/modified-2.7/ctypes/util.py
--- a/lib-python/modified-2.7/ctypes/util.py
+++ b/lib-python/modified-2.7/ctypes/util.py
@@ -72,8 +72,8 @@
         return name
 
 if os.name == "posix" and sys.platform == "darwin":
-    from ctypes.macholib.dyld import dyld_find as _dyld_find
     def find_library(name):
+        from ctypes.macholib.dyld import dyld_find as _dyld_find
         possible = ['lib%s.dylib' % name,
                     '%s.dylib' % name,
                     '%s.framework/%s' % (name, name)]
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit