Mailman 3 November 2014 - Python-checkins

cpython (3.4): Issue #17717: Pull NASM from svn.python.org for OpenSSL build.
by zach.ware 01 Nov '14

01 Nov '14

https://hg.python.org/cpython/rev/f7ed3e058fca changeset: 93339:f7ed3e058fca branch: 3.4 parent: 93333:f6a906541476 user: Zachary Ware <zachary.ware(a)gmail.com> date: Sat Nov 01 17:11:08 2014 -0500 summary: Issue #17717: Pull NASM from svn.python.org for OpenSSL build. files: Misc/NEWS | 3 +++ PCbuild/build_ssl.py | 11 +++++++++++ PCbuild/readme.txt | 4 +++- Tools/buildbot/external-common.bat | 4 ++++ 4 files changed, 21 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -126,6 +126,9 @@ Windows ------- +- Issue #17717: The Windows build scripts now use a copy of NASM pulled from + svn.python.org to build OpenSSL. + - Issue #22644: The bundled version of OpenSSL has been updated to 1.0.1j. What's New in Python 3.4.2? diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -182,6 +182,17 @@ if ssl_dir is None: sys.exit(1) + # add our copy of NASM to PATH. It will be on the same level as openssl + for dir in os.listdir(os.path.join(ssl_dir, os.pardir)): + if dir.startswith('nasm'): + nasm_dir = os.path.join(ssl_dir, os.pardir, dir) + nasm_dir = os.path.abspath(nasm_dir) + os.environ['PATH'] += os.pathsep.join(['', nasm_dir]) + break + else: + print('NASM was not found, make sure it is on PATH') + + old_cd = os.getcwd() try: os.chdir(ssl_dir) diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -182,7 +182,9 @@ to be somewhere on your PATH. More recent versions of OpenSSL may need a later version of NASM. If OpenSSL's self tests don't pass, you should first try to update NASM and do a full rebuild of - OpenSSL. + OpenSSL. If you use the Tools\buildbot\external(-amd64).bat method + for getting sources, it also downloads a version of NASM which the + ssl build script will add to PATH. If you like to use the official sources instead of the files from python.org's subversion repository, Perl is required to build the diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -20,6 +20,10 @@ svn export http://svn.python.org/projects/external/bzip2-1.0.6 ) +@rem NASM, for OpenSSL build +@rem if exist nasm-2.11.06 rd /s/q nasm-2.11.06 +if not exist nasm-2.11.06 svn export http://svn.python.org/projects/external/nasm-2.11.06 + @rem OpenSSL if not exist openssl-1.0.1j ( rd /s/q openssl-1.0.1i -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): Null merge with 3.4
by zach.ware 01 Nov '14

01 Nov '14

https://hg.python.org/cpython/rev/58b1426981c4 changeset: 93340:58b1426981c4 parent: 93337:c2a3865a59f4 parent: 93339:f7ed3e058fca user: Zachary Ware <zachary.ware(a)gmail.com> date: Sat Nov 01 18:33:52 2014 -0500 summary: Null merge with 3.4 files: -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #17717: Pull NASM from svn.python.org for OpenSSL build.
by zach.ware 01 Nov '14

01 Nov '14

https://hg.python.org/cpython/rev/28d18fdc52c4 changeset: 93338:28d18fdc52c4 branch: 2.7 parent: 93332:ea7b64406396 user: Zachary Ware <zachary.ware(a)gmail.com> date: Sat Nov 01 17:11:08 2014 -0500 summary: Issue #17717: Pull NASM from svn.python.org for OpenSSL build. files: Misc/NEWS | 3 +++ PCbuild/build_ssl.py | 11 +++++++++++ PCbuild/readme.txt | 4 +++- Tools/buildbot/external-common.bat | 4 ++++ 4 files changed, 21 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -305,6 +305,9 @@ Windows ------- +- Issue #17717: The Windows build scripts now use a copy of NASM pulled from + svn.python.org to build OpenSSL. + - Issue #22644: The bundled version of OpenSSL has been updated to 1.0.1j. diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -170,6 +170,17 @@ if ssl_dir is None: sys.exit(1) + # add our copy of NASM to PATH. It will be on the same level as openssl + for dir in os.listdir(os.path.join(ssl_dir, os.pardir)): + if dir.startswith('nasm'): + nasm_dir = os.path.join(ssl_dir, os.pardir, dir) + nasm_dir = os.path.abspath(nasm_dir) + os.environ['PATH'] += os.pathsep.join(['', nasm_dir]) + break + else: + print('NASM was not found, make sure it is on PATH') + + old_cd = os.getcwd() try: os.chdir(ssl_dir) diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -144,7 +144,9 @@ You must install the NASM assembler from http://nasm.sf.net - for x86 builds. Put nasm.exe anywhere in your PATH. + for x86 builds. Put nasm.exe anywhere in your PATH. If you use the + Tools\buildbot\external(-amd64).bat method for getting sources, it also + downloads a version of NASM, which the ssl build script will add to PATH. You can also install ActivePerl from http://www.activestate.com/activeperl/ diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -37,6 +37,10 @@ if exist db-4.4.20 rd /s/q db-4.4.20 if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0 +@rem NASM, for OpenSSL build +@rem if exist nasm-2.11.06 rd /s/q nasm-2.11.06 +if not exist nasm-2.11.06 svn export http://svn.python.org/projects/external/nasm-2.11.06 + @rem OpenSSL if exist openssl-1.0.1i rd /s/q openssl-1.0.1i if not exist openssl-1.0.1j svn export http://svn.python.org/projects/external/openssl-1.0.1j -- Repository URL: https://hg.python.org/cpython

1 0

cpython: #22732 ctypes tests don't set correct restype for intptr_t functions
by steve.dower 01 Nov '14

01 Nov '14

https://hg.python.org/cpython/rev/a944fe09fae8 changeset: 93336:a944fe09fae8 user: Steve Dower <steve.dower(a)microsoft.com> date: Sat Nov 01 15:14:27 2014 -0700 summary: #22732 ctypes tests don't set correct restype for intptr_t functions files: Lib/ctypes/test/test_pointers.py | 5 ++++- Lib/ctypes/test/test_prototypes.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Lib/ctypes/test/test_pointers.py b/Lib/ctypes/test/test_pointers.py --- a/Lib/ctypes/test/test_pointers.py +++ b/Lib/ctypes/test/test_pointers.py @@ -24,7 +24,10 @@ def test_pass_pointers(self): dll = CDLL(_ctypes_test.__file__) func = dll._testfunc_p_p - func.restype = c_long + if sizeof(c_longlong) == sizeof(c_void_p): + func.restype = c_longlong + else: + func.restype = c_long i = c_int(12345678) ## func.argtypes = (POINTER(c_int),) diff --git a/Lib/ctypes/test/test_prototypes.py b/Lib/ctypes/test/test_prototypes.py --- a/Lib/ctypes/test/test_prototypes.py +++ b/Lib/ctypes/test/test_prototypes.py @@ -69,7 +69,10 @@ def test_int_pointer_arg(self): func = testdll._testfunc_p_p - func.restype = c_long + if sizeof(c_longlong) == sizeof(c_void_p): + func.restype = c_longlong + else: + func.restype = c_long self.assertEqual(0, func(0)) ci = c_int(0) -- Repository URL: https://hg.python.org/cpython

1 0

cpython: #22734 marshal needs a lower stack depth for debug builds on Windows
by steve.dower 01 Nov '14

01 Nov '14

https://hg.python.org/cpython/rev/c2a3865a59f4 changeset: 93337:c2a3865a59f4 user: Steve Dower <steve.dower(a)microsoft.com> date: Sat Nov 01 15:15:16 2014 -0700 summary: #22734 marshal needs a lower stack depth for debug builds on Windows files: Lib/test/test_marshal.py | 2 +- Python/marshal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py --- a/Lib/test/test_marshal.py +++ b/Lib/test/test_marshal.py @@ -188,7 +188,7 @@ head = last = [] # The max stack depth should match the value in Python/marshal.c. if os.name == 'nt' and hasattr(sys, 'gettotalrefcount'): - MAX_MARSHAL_STACK_DEPTH = 1500 + MAX_MARSHAL_STACK_DEPTH = 1000 else: MAX_MARSHAL_STACK_DEPTH = 2000 for i in range(MAX_MARSHAL_STACK_DEPTH - 2): diff --git a/Python/marshal.c b/Python/marshal.c --- a/Python/marshal.c +++ b/Python/marshal.c @@ -19,7 +19,7 @@ * On Windows debug builds, reduce this value. */ #if defined(MS_WINDOWS) && defined(_DEBUG) -#define MAX_MARSHAL_STACK_DEPTH 1500 +#define MAX_MARSHAL_STACK_DEPTH 1000 #else #define MAX_MARSHAL_STACK_DEPTH 2000 #endif -- Repository URL: https://hg.python.org/cpython

1 0

cpython: #22731 test_capi test fails because of mismatched newlines
by steve.dower 01 Nov '14

01 Nov '14

https://hg.python.org/cpython/rev/edb270e5c9c3 changeset: 93335:edb270e5c9c3 user: Steve Dower <steve.dower(a)microsoft.com> date: Sat Nov 01 15:11:05 2014 -0700 summary: #22731 test_capi test fails because of mismatched newlines files: Lib/test/test_capi.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -304,12 +304,13 @@ cmd.extend(args) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + stderr=subprocess.PIPE, + universal_newlines=True) (out, err) = p.communicate() self.assertEqual(p.returncode, 0, "bad returncode %d, stderr is %r" % (p.returncode, err)) - return out.decode("latin1"), err.decode("latin1") + return out, err def test_subinterps(self): # This is just a "don't crash" test @@ -339,7 +340,7 @@ expected_errors = sys.__stdout__.errors expected_stdin_encoding = sys.__stdin__.encoding expected_pipe_encoding = self._get_default_pipe_encoding() - expected_output = os.linesep.join([ + expected_output = '\n'.join([ "--- Use defaults ---", "Expected encoding: default", "Expected errors: default", -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Brought excluded code into the scope of a try block in SysLogHandler.emit().
by vinay.sajip 01 Nov '14

01 Nov '14

https://hg.python.org/cpython/rev/f6a906541476 changeset: 93333:f6a906541476 branch: 3.4 parent: 93329:232520144c6c user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Sat Nov 01 19:58:47 2014 +0000 summary: Brought excluded code into the scope of a try block in SysLogHandler.emit(). files: Lib/logging/handlers.py | 28 ++++++++++++++-------------- Misc/NEWS | 3 +++ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -879,21 +879,21 @@ The record is formatted, and then sent to the syslog server. If exception information is present, it is NOT sent to the server. """ - msg = self.format(record) - if self.ident: - msg = self.ident + msg - if self.append_nul: - msg += '\000' + try: + msg = self.format(record) + if self.ident: + msg = self.ident + msg + if self.append_nul: + msg += '\000' - # We need to convert record level to lowercase, maybe this will - # change in the future. - prio = '<%d>' % self.encodePriority(self.facility, - self.mapPriority(record.levelname)) - prio = prio.encode('utf-8') - # Message is a string. Convert to bytes as required by RFC 5424 - msg = msg.encode('utf-8') - msg = prio + msg - try: + # We need to convert record level to lowercase, maybe this will + # change in the future. + prio = '<%d>' % self.encodePriority(self.facility, + self.mapPriority(record.levelname)) + prio = prio.encode('utf-8') + # Message is a string. Convert to bytes as required by RFC 5424 + msg = msg.encode('utf-8') + msg = prio + msg if self.unixsocket: try: self.socket.send(msg) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -33,6 +33,9 @@ Library ------- +- Issue #22776: Brought excluded code into the scope of a try block in + SysLogHandler.emit(). + - Issue #22665: Add missing get_terminal_size and SameFileError to shutil.__all__. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): Closes #22776: Merged fix from 3.4.
by vinay.sajip 01 Nov '14

01 Nov '14

https://hg.python.org/cpython/rev/54549f9b2ecc changeset: 93334:54549f9b2ecc parent: 93331:149490bbd260 parent: 93333:f6a906541476 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Sat Nov 01 20:00:56 2014 +0000 summary: Closes #22776: Merged fix from 3.4. files: Lib/logging/handlers.py | 28 ++++++++++++++-------------- Misc/NEWS | 3 +++ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -879,21 +879,21 @@ The record is formatted, and then sent to the syslog server. If exception information is present, it is NOT sent to the server. """ - msg = self.format(record) - if self.ident: - msg = self.ident + msg - if self.append_nul: - msg += '\000' + try: + msg = self.format(record) + if self.ident: + msg = self.ident + msg + if self.append_nul: + msg += '\000' - # We need to convert record level to lowercase, maybe this will - # change in the future. - prio = '<%d>' % self.encodePriority(self.facility, - self.mapPriority(record.levelname)) - prio = prio.encode('utf-8') - # Message is a string. Convert to bytes as required by RFC 5424 - msg = msg.encode('utf-8') - msg = prio + msg - try: + # We need to convert record level to lowercase, maybe this will + # change in the future. + prio = '<%d>' % self.encodePriority(self.facility, + self.mapPriority(record.levelname)) + prio = prio.encode('utf-8') + # Message is a string. Convert to bytes as required by RFC 5424 + msg = msg.encode('utf-8') + msg = prio + msg if self.unixsocket: try: self.socket.send(msg) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -180,6 +180,9 @@ Library ------- +- Issue #22776: Brought excluded code into the scope of a try block in + SysLogHandler.emit(). + - Issue #22665: Add missing get_terminal_size and SameFileError to shutil.__all__. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Brought excluded code into the scope of a try block in SysLogHandler.emit().
by vinay.sajip 01 Nov '14

01 Nov '14

https://hg.python.org/cpython/rev/ea7b64406396 changeset: 93332:ea7b64406396 branch: 2.7 parent: 93326:3f13f1620d70 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Sat Nov 01 19:56:13 2014 +0000 summary: Brought excluded code into the scope of a try block in SysLogHandler.emit(). files: Lib/logging/handlers.py | 22 +++++++++++----------- Misc/NEWS | 3 +++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -840,18 +840,18 @@ The record is formatted, and then sent to the syslog server. If exception information is present, it is NOT sent to the server. """ - msg = self.format(record) + '\000' - """ - We need to convert record level to lowercase, maybe this will - change in the future. - """ - prio = '<%d>' % self.encodePriority(self.facility, - self.mapPriority(record.levelname)) - # Message is a string. Convert to bytes as required by RFC 5424 - if type(msg) is unicode: - msg = msg.encode('utf-8') - msg = prio + msg try: + msg = self.format(record) + '\000' + """ + We need to convert record level to lowercase, maybe this will + change in the future. + """ + prio = '<%d>' % self.encodePriority(self.facility, + self.mapPriority(record.levelname)) + # Message is a string. Convert to bytes as required by RFC 5424 + if type(msg) is unicode: + msg = msg.encode('utf-8') + msg = prio + msg if self.unixsocket: try: self.socket.send(msg) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -37,6 +37,9 @@ Library ------- +- Issue #22776: Brought excluded code into the scope of a try block in + SysLogHandler.emit(). + - Issue #17381: Fixed ranges handling in case-insensitive regular expressions. - Issue #19329: Optimized compiling charsets in regular expressions. -- Repository URL: https://hg.python.org/cpython

1 0

cpython: standardize Enum docs by referring to 'special methods' instead of __dunder__
by ethan.furman 01 Nov '14

01 Nov '14

https://hg.python.org/cpython/rev/149490bbd260 changeset: 93331:149490bbd260 user: Ethan Furman <ethan(a)stoneleaf.us> date: Sat Nov 01 07:40:22 2014 -0700 summary: standardize Enum docs by referring to 'special methods' instead of __dunder__ methods files: Doc/library/enum.rst | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst --- a/Doc/library/enum.rst +++ b/Doc/library/enum.rst @@ -314,11 +314,11 @@ >>> str(Mood.funky) 'my custom str! 1' -The rules for what is allowed are as follows: _sunder_ names (starting and -ending with a single underscore) are reserved by enum and cannot be used; -all other attributes defined within an enumeration will become members of this -enumeration, with the exception of *__dunder__* names and descriptors (methods -are also descriptors). +The rules for what is allowed are as follows: names that start and end with a +with a single underscore are reserved by enum and cannot be used; all other +attributes defined within an enumeration will become members of this +enumeration, with the exception of special methods (:meth:`__str__`, +:meth:`__add__`, etc.) and descriptors (methods are also descriptors). Note: if your enumeration defines :meth:`__new__` and/or :meth:`__init__` then whatever value(s) were given to the enum member will be passed into those -- Repository URL: https://hg.python.org/cpython

1 0