Author: Matti Picus <matti.pi...@gmail.com> Branch: py3.5 Changeset: r95258:c5417c0faf2d Date: 2018-10-28 08:48 +0200 http://bitbucket.org/pypy/pypy/changeset/c5417c0faf2d/
Log: merge default into py3.5, ignoring backported thread lock diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/whatsnew-head.rst @@ -39,3 +39,15 @@ .. branch: fix-readme-typo +.. branch: avoid_shell_injection_in_shutil + +Backport CPython fix for possible shell injection issue in `distutils.spawn`, +https://bugs.python.org/issue34540 + +.. branch: cffi_dlopen_unicode + +Enable use of unicode file names in `dlopen` + +.. branch: rlock-in-rpython + +Backport CPython fix for `thread.RLock` diff --git a/pypy/module/cpyext/test/test_misc.py b/pypy/module/cpyext/test/test_misc.py --- a/pypy/module/cpyext/test/test_misc.py +++ b/pypy/module/cpyext/test/test_misc.py @@ -16,7 +16,7 @@ '''), ], prologue=''' static long my_flag = 0; - static int my_callback(void) { my_flag++; } + static int my_callback(void) { return ++my_flag; } ''') try: diff --git a/pypy/module/pwd/interp_pwd.py b/pypy/module/pwd/interp_pwd.py --- a/pypy/module/pwd/interp_pwd.py +++ b/pypy/module/pwd/interp_pwd.py @@ -37,7 +37,8 @@ passwd_p = lltype.Ptr(config['passwd']) def external(name, args, result, **kwargs): - return rffi.llexternal(name, args, result, compilation_info=eci, **kwargs) + return rffi.llexternal(name, args, result, compilation_info=eci, + releasegil=False, **kwargs) c_getpwuid = external("getpwuid", [uid_t], passwd_p) c_getpwnam = external("getpwnam", [rffi.CCHARP], passwd_p) _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
