[pypy-commit] cffi default: Fix failing tests

[rguillebert]

Author: Romain Guillebert <romain.py at gmail.com>
Branch: 
Changeset: r1589:f0241abbaab0
Date: 2014-10-21 15:38 +0200
http://bitbucket.org/cffi/cffi/changeset/f0241abbaab0/

Log:	Fix failing tests

diff --git a/cffi/vengine_cpy.py b/cffi/vengine_cpy.py
--- a/cffi/vengine_cpy.py
+++ b/cffi/vengine_cpy.py
@@ -138,12 +138,13 @@
         prnt()
         prnt('#endif')
 
-    def load_library(self, flags=0):
+    def load_library(self, flags=None):
         # XXX review all usages of 'self' here!
         # import it as a new extension module
         previous_flags = sys.getdlopenflags()
         try:
-            sys.setdlopenflags(flags)
+            if flags is not None:
+                sys.setdlopenflags(flags)
             module = imp.load_dynamic(self.verifier.get_module_name(),
                                       self.verifier.modulefilename)
         except ImportError as e:
diff --git a/cffi/verifier.py b/cffi/verifier.py
--- a/cffi/verifier.py
+++ b/cffi/verifier.py
@@ -16,7 +16,7 @@
 class Verifier(object):
 
     def __init__(self, ffi, preamble, tmpdir=None, modulename=None,
-                 ext_package=None, tag='', force_generic_engine=False, flags=0, **kwds):
+                 ext_package=None, tag='', force_generic_engine=False, flags=None, **kwds):
         self.ffi = ffi
         self.preamble = preamble
         if not modulename:
@@ -159,7 +159,10 @@
 
     def _load_library(self):
         assert self._has_module
-        return self._vengine.load_library(self.flags)
+        if self.flags is not None:
+            return self._vengine.load_library(self.flags)
+        else:
+            return self._vengine.load_library()
 
 # ____________________________________________________________