Author: Aaron Gallagher <habna...@google.com>
Branch:
Changeset: r85088:e2dc439cb4fe
Date: 2016-06-10 15:16 -0700
http://bitbucket.org/pypy/pypy/changeset/e2dc439cb4fe/
Log: Restore mode=-1 default on dlopen.
diff --git a/rpython/rlib/rdynload.py b/rpython/rlib/rdynload.py
--- a/rpython/rlib/rdynload.py
+++ b/rpython/rlib/rdynload.py
@@ -153,10 +153,12 @@
mode |= RTLD_LOCAL
return mode
- def dlopen(name, mode):
+ def dlopen(name, mode=-1):
""" Wrapper around C-level dlopen
"""
- if (mode & (RTLD_LAZY | RTLD_NOW)) == 0:
+ if mode == -1:
+ mode = _dlopen_default_mode()
+ elif (mode & (RTLD_LAZY | RTLD_NOW)) == 0:
mode |= RTLD_NOW
res = c_dlopen(name, rffi.cast(rffi.INT, mode))
if not res:
@@ -201,7 +203,7 @@
"""
return 0
- def dlopen(name, mode):
+ def dlopen(name, mode=-1):
# mode is unused on windows, but a consistant signature
res = rwin32.LoadLibrary(name)
if not res:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
