Author: Armin Rigo <[email protected]>
Branch: cffi-1.0
Changeset: r1894:d4d01f78d16e
Date: 2015-04-30 09:42 +0200
http://bitbucket.org/cffi/cffi/changeset/d4d01f78d16e/
Log: hg merge default
diff --git a/cffi/vengine_cpy.py b/cffi/vengine_cpy.py
--- a/cffi/vengine_cpy.py
+++ b/cffi/vengine_cpy.py
@@ -141,19 +141,23 @@
def load_library(self, flags=None):
# XXX review all usages of 'self' here!
# import it as a new extension module
- if hasattr(sys, "getdlopenflags"):
- previous_flags = sys.getdlopenflags()
+ imp.acquire_lock()
try:
- if hasattr(sys, "setdlopenflags") and flags is not None:
- sys.setdlopenflags(flags)
- module = imp.load_dynamic(self.verifier.get_module_name(),
- self.verifier.modulefilename)
- except ImportError as e:
- error = "importing %r: %s" % (self.verifier.modulefilename, e)
- raise ffiplatform.VerificationError(error)
+ if hasattr(sys, "getdlopenflags"):
+ previous_flags = sys.getdlopenflags()
+ try:
+ if hasattr(sys, "setdlopenflags") and flags is not None:
+ sys.setdlopenflags(flags)
+ module = imp.load_dynamic(self.verifier.get_module_name(),
+ self.verifier.modulefilename)
+ except ImportError as e:
+ error = "importing %r: %s" % (self.verifier.modulefilename, e)
+ raise ffiplatform.VerificationError(error)
+ finally:
+ if hasattr(sys, "setdlopenflags"):
+ sys.setdlopenflags(previous_flags)
finally:
- if hasattr(sys, "setdlopenflags"):
- sys.setdlopenflags(previous_flags)
+ imp.release_lock()
#
# call loading_cpy_struct() to get the struct layout inferred by
# the C compiler
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
