Mailman 3 November 2014 - Python-checkins

cpython (2.7): #22751: fix test___all__ warning about modified environment in the tests.
by ezio.melotti 02 Nov '14

02 Nov '14

https://hg.python.org/cpython/rev/16dfefe67c1f changeset: 93349:16dfefe67c1f branch: 2.7 parent: 93345:62ce0f623154 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sun Nov 02 19:08:35 2014 +0200 summary: #22751: fix test___all__ warning about modified environment in the tests. Patch by Michael Cetrulo. files: Lib/test/test___all__.py | 7 ++++--- Misc/ACKS | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py --- a/Lib/test/test___all__.py +++ b/Lib/test/test___all__.py @@ -75,13 +75,14 @@ # rlcompleter needs special consideration; it imports readline which # initializes GNU readline which calls setlocale(LC_CTYPE, "")... :-( + import locale + locale_tuple = locale.getlocale(locale.LC_CTYPE) try: import rlcompleter - import locale except ImportError: pass - else: - locale.setlocale(locale.LC_CTYPE, 'C') + finally: + locale.setlocale(locale.LC_CTYPE, locale_tuple) ignored = [] failed_imports = [] diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -218,6 +218,7 @@ Matej Cepl Carl Cerecke Octavian Cerna +Michael Cetrulo Dave Chambers Pascal Chambon John Chandler -- Repository URL: https://hg.python.org/cpython

1 0

peps: Fix commas and whitespace in PEP 473.
by ezio.melotti 02 Nov '14

02 Nov '14

https://hg.python.org/peps/rev/8e9097a145dd changeset: 5592:8e9097a145dd user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sun Nov 02 18:13:45 2014 +0200 summary: Fix commas and whitespace in PEP 473. files: pep-0473.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pep-0473.txt b/pep-0473.txt --- a/pep-0473.txt +++ b/pep-0473.txt @@ -14,7 +14,7 @@ ======== Exceptions like ``AttributeError``, ``IndexError``, ``KeyError``, -``LookupError``, ``NameError``, , ``TypeError`` and ``ValueError`` do not +``LookupError``, ``NameError``, ``TypeError``, and ``ValueError`` do not provide all information required by programmers to debug and better understand what caused them. Furthermore, in some cases the messages even have slightly different formats, @@ -47,7 +47,7 @@ A similar proposal [2]_ has been implemented for ``ImportError`` and in the same fashion this idea has received support [3]_. Additionally, almost 10 years ago Guido asked in [11]_ to have a clean API to access the affected objects in -Exceptions like ``KeyError``, ``AttributeError``, ``NameError`` and +Exceptions like ``KeyError``, ``AttributeError``, ``NameError``, and ``IndexError``. Similar issues and proposals ideas have been written in the last year. Some other issues have been created, but despite receiving support they finally get abandoned. References to the created issues are listed below: @@ -157,7 +157,7 @@ ======== Extend the exceptions ``AttributeError``, ``IndexError``, ``KeyError``, -``LookupError``, ``NameError``, , ``TypeError`` and ``ValueError`` with the +``LookupError``, ``NameError``, ``TypeError``, and ``ValueError`` with the following: * ``AttributeError``: target :sup:`w`, attribute -- Repository URL: https://hg.python.org/peps

1 0

Daily reference leaks (ef15b51d59fb): sum=3
by solipsis＠pitrou.net 02 Nov '14

02 Nov '14

results for ef15b51d59fb on branch "default" -------------------------------------------- test_functools leaked [0, 0, 3] memory blocks, sum=3 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogLigs4a', '-x']

1 0

cpython (merge 3.4 -> default): Issue #17896: Move Windows external lib sources from .. to externals.
by zach.ware 02 Nov '14

02 Nov '14

https://hg.python.org/cpython/rev/64a54f0c87d7 changeset: 93347:64a54f0c87d7 parent: 93344:e119343bc3ec parent: 93346:b5e9bc4352e1 user: Zachary Ware <zachary.ware(a)gmail.com> date: Sat Nov 01 22:48:24 2014 -0500 summary: Issue #17896: Move Windows external lib sources from .. to externals. files: .gitignore | 1 + .hgignore | 1 + Lib/tkinter/_fix.py | 4 ++-- Misc/NEWS | 3 +++ PCbuild/get_externals.bat | 3 ++- PCbuild/pyproject.props | 2 +- PCbuild/readme.txt | 2 +- Tools/buildbot/test-amd64.bat | 2 +- Tools/buildbot/test.bat | 2 +- 9 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -80,4 +80,5 @@ TAGS .coverage coverage/ +externals/ htmlcov/ diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -93,6 +93,7 @@ Programs/_testembed .coverage coverage/ +externals/ htmlcov/ *.gcda *.gcno diff --git a/Lib/tkinter/_fix.py b/Lib/tkinter/_fix.py --- a/Lib/tkinter/_fix.py +++ b/Lib/tkinter/_fix.py @@ -48,8 +48,8 @@ prefix = os.path.join(sys.base_prefix,"tcl") if not os.path.exists(prefix): - # devdir/../tcltk/lib - prefix = os.path.join(sys.base_prefix, os.path.pardir, "tcltk", "lib") + # devdir/externals/tcltk/lib + prefix = os.path.join(sys.base_prefix, "externals", "tcltk", "lib") prefix = os.path.abspath(prefix) # if this does not exist, no further search is needed if os.path.exists(prefix): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1385,6 +1385,9 @@ Windows ------- +- Issue #17896: The Windows build scripts now expect external library sources + to be in ``PCbuild\..\externals`` rather than ``PCbuild\..\..``. + - Issue #17717: The Windows build scripts now use a copy of NASM pulled from svn.python.org to build OpenSSL. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -2,7 +2,8 @@ setlocal rem Simple script to fetch source for external libraries -pushd "%~dp0..\.." +if not exist "%~dp0..\externals" mkdir "%~dp0..\externals" +pushd "%~dp0..\externals" if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/ diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -16,7 +16,7 @@ <PyDllName>python35$(PyDebugExt)</PyDllName> <PythonExe>$(OutDir)python$(PyDebugExt).exe</PythonExe> <KillPythonExe>$(OutDir)kill_python$(PyDebugExt).exe</KillPythonExe> - <externalsDir>..\..</externalsDir> + <externalsDir>..\externals</externalsDir> <sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir> <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir> <lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -278,7 +278,7 @@ directory. This script extracts all the external sub-projects from http://svn.python.org/projects/external via Subversion (so you'll need svn.exe on your PATH) and places them -in ..\.. (relative to this directory). +in ..\externals (relative to this directory). It is also possible to download sources from each project's homepage, though you may have to change folder names or pass the names to MSBuild diff --git a/Tools/buildbot/test-amd64.bat b/Tools/buildbot/test-amd64.bat --- a/Tools/buildbot/test-amd64.bat +++ b/Tools/buildbot/test-amd64.bat @@ -2,6 +2,6 @@ setlocal rem The following line should be removed before #20035 is closed -set TCL_LIBRARY=%~dp0..\..\..\tcltk64\lib\tcl8.6 +set TCL_LIBRARY=%~dp0..\..\externals\tcltk64\lib\tcl8.6 call "%~dp0..\..\PCbuild\rt.bat" -d -q -x64 -uall -rwW -n --timeout=3600 %* diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat --- a/Tools/buildbot/test.bat +++ b/Tools/buildbot/test.bat @@ -2,6 +2,6 @@ setlocal rem The following line should be removed before #20035 is closed -set TCL_LIBRARY=%~dp0..\..\..\tcltk\lib\tcl8.6 +set TCL_LIBRARY=%~dp0..\..\externals\tcltk\lib\tcl8.6 call "%~dp0..\..\PCbuild\rt.bat" -d -q -uall -rwW -n --timeout=3600 %* -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Issue #17896: Move Windows external lib sources from .. to externals.
by zach.ware 02 Nov '14

02 Nov '14

https://hg.python.org/cpython/rev/b5e9bc4352e1 changeset: 93346:b5e9bc4352e1 branch: 3.4 parent: 93343:121517deb318 user: Zachary Ware <zachary.ware(a)gmail.com> date: Sat Nov 01 22:39:21 2014 -0500 summary: Issue #17896: Move Windows external lib sources from .. to externals. files: .gitignore | 1 + .hgignore | 1 + Lib/tkinter/_fix.py | 4 ++-- Misc/NEWS | 3 +++ PCbuild/build_ssl.py | 2 +- PCbuild/pyproject.props | 2 +- PCbuild/readme.txt | 13 +++++++------ PCbuild/rt.bat | 2 +- Tools/buildbot/external-common.bat | 3 ++- 9 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -70,4 +70,5 @@ TAGS .coverage coverage/ +externals/ htmlcov/ diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -92,6 +92,7 @@ Modules/_testembed .coverage coverage/ +externals/ htmlcov/ *.gcda *.gcno diff --git a/Lib/tkinter/_fix.py b/Lib/tkinter/_fix.py --- a/Lib/tkinter/_fix.py +++ b/Lib/tkinter/_fix.py @@ -48,8 +48,8 @@ prefix = os.path.join(sys.base_prefix,"tcl") if not os.path.exists(prefix): - # devdir/../tcltk/lib - prefix = os.path.join(sys.base_prefix, os.path.pardir, "tcltk", "lib") + # devdir/externals/tcltk/lib + prefix = os.path.join(sys.base_prefix, "externals", "tcltk", "lib") prefix = os.path.abspath(prefix) # if this does not exist, no further search is needed if os.path.exists(prefix): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -128,6 +128,9 @@ Windows ------- +- Issue #17896: The Windows build scripts now expect external library sources + to be in ``PCbuild\..\externals`` rather than ``PCbuild\..\..``. + - Issue #17717: The Windows build scripts now use a copy of NASM pulled from svn.python.org to build OpenSSL. diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -68,7 +68,7 @@ propfile = (os.path.join(os.path.dirname(__file__), 'pyproject.props')) with open(propfile, encoding='utf-8-sig') as f: m = re.search('openssl-([^<]+)<', f.read()) - return "..\..\openssl-"+m.group(1) + return "..\externals\openssl-"+m.group(1) def create_makefile64(makefile, m32): diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -16,7 +16,7 @@ <PyDllName>python34$(PyDebugExt)</PyDllName> <PythonExe>$(OutDir)python$(PyDebugExt).exe</PythonExe> <KillPythonExe>$(OutDir)kill_python$(PyDebugExt).exe</KillPythonExe> - <externalsDir>..\..</externalsDir> + <externalsDir>..\externals</externalsDir> <sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir> <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir> <lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -224,9 +224,10 @@ Unlike the other external libraries listed above, Tk must be built separately before the _tkinter module can be built. This means that - a pre-built Tcl/Tk installation is expected in ..\..\tcltk (tcltk64 - for 64-bit) relative to this directory. See "Getting External - Sources" below for the easiest method to ensure Tcl/Tk is built. + a pre-built Tcl/Tk installation is expected in ..\externals\tcltk + (tcltk64 for 64-bit) relative to this directory. See "Getting + External Sources" below for the easiest method to ensure Tcl/Tk is + built. Getting External Sources @@ -246,12 +247,12 @@ This extracts all the external sub-projects from http://svn.python.org/projects/external via Subversion (so you'll need an svn.exe on your PATH) and places them -in ..\.. (relative to this directory). +in ..\externals (relative to this directory). It is also possible to download sources from each project's homepage, though you may have to change the names of some folders in order to make things work. For instance, if you were to download a version 5.0.7 of -XZ Utils, you would need to extract the archive into ..\..\xz-5.0.5 +XZ Utils, you would need to extract the archive into ..\externals\xz-5.0.5 anyway, since that is where the solution is set to look for xz. The same is true for all other external projects. @@ -268,7 +269,7 @@ So for a release build, you'd call it as: nmake -f makefile.vc MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install -Note that the above command is called from within ..\..\tcl-8.6.1.0\win +Note that the above command is called from within ..\externals\tcl-8.6.1.0\win (relative to this directory); don't forget to build Tk as well as Tcl! This will be cleaned up in the future; http://bugs.python.org/issue15968 diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat --- a/PCbuild/rt.bat +++ b/PCbuild/rt.bat @@ -38,7 +38,7 @@ if "%1"=="-d" (set suffix=_d) & shift & goto CheckOpts if "%1"=="-x64" (set prefix=amd64) & (set tcltk=tcltk64) & shift & goto CheckOpts -PATH %PATH%;%~dp0..\..\%tcltk%\bin +PATH %PATH%;%~dp0..\externals\%tcltk%\bin set exe=%prefix%\python%suffix% set cmd=%exe% %dashO% -Wd -E -bb ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 if defined qmode goto Qmode 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 @@ -1,7 +1,8 @@ @rem Common file shared between external.bat and external-amd64.bat. Responsible for @rem fetching external components into the root\.. buildbot directories. -cd .. +if not exist externals mkdir externals +cd externals @rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment @rem the following, check it in, then check it out, comment it out, then check it back in. @rem if exist bzip2-1.0.6 rd /s/q bzip2-1.0.6 -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #17896: Move Windows external lib sources from .. to externals.
by zach.ware 02 Nov '14

02 Nov '14

https://hg.python.org/cpython/rev/62ce0f623154 changeset: 93345:62ce0f623154 branch: 2.7 parent: 93342:bd4dc351d670 user: Zachary Ware <zachary.ware(a)gmail.com> date: Sat Nov 01 22:34:09 2014 -0500 summary: Issue #17896: Move Windows external lib sources from .. to externals. files: .gitignore | 1 + .hgignore | 1 + Lib/lib-tk/FixTk.py | 4 +- Misc/NEWS | 3 + PCbuild/build_ssl.py | 2 +- PCbuild/pyproject.vsprops | 2 +- PCbuild/readme.txt | 40 ++--------------- PCbuild/rt.bat | 2 +- Tools/buildbot/external-common.bat | 5 +- 9 files changed, 18 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -43,4 +43,5 @@ tags .coverage coverage/ +externals/ htmlcov/ diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -61,4 +61,5 @@ PCbuild/Win32-temp-* .coverage coverage/ +externals/ htmlcov/ diff --git a/Lib/lib-tk/FixTk.py b/Lib/lib-tk/FixTk.py --- a/Lib/lib-tk/FixTk.py +++ b/Lib/lib-tk/FixTk.py @@ -48,8 +48,8 @@ prefix = os.path.join(sys.prefix,"tcl") if not os.path.exists(prefix): - # devdir/../tcltk/lib - prefix = os.path.join(sys.prefix, os.path.pardir, "tcltk", "lib") + # devdir/externals/tcltk/lib + prefix = os.path.join(sys.prefix, "externals", "tcltk", "lib") prefix = os.path.abspath(prefix) # if this does not exist, no further search is needed if os.path.exists(prefix): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -307,6 +307,9 @@ Windows ------- +- Issue #17896: The Windows build scripts now expect external library sources + to be in ``PCbuild\..\externals`` rather than ``PCbuild\..\..``. + - Issue #17717: The Windows build scripts now use a copy of NASM pulled from svn.python.org to build OpenSSL. diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -69,7 +69,7 @@ propfile = (os.path.join(os.path.dirname(__file__), 'pyproject.vsprops')) with open(propfile) as f: m = re.search('openssl-([^"]+)"', f.read()) - return "..\..\openssl-"+m.group(1) + return "..\externals\openssl-"+m.group(1) def create_makefile64(makefile, m32): diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -46,7 +46,7 @@ /> <UserMacro Name="externalsDir" - Value="..\.." + Value="..\externals" /> <UserMacro Name="bsddb47Dir" diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -112,9 +112,9 @@ Wraps the Tk windowing system. Unlike _bsddb and _sqlite3, there's no corresponding tcltk.vcproj-type project that builds Tcl/Tk from vcproj's within our pcbuild.sln, which means this module expects to find a - pre-built Tcl/Tk in either ..\..\tcltk for 32-bit or ..\..\tcltk64 for - 64-bit (relative to this directory). See below for instructions to build - Tcl/Tk. + pre-built Tcl/Tk in either ..\externals\tcltk for 32-bit or + ..\externals\tcltk64 for 64-bit (relative to this directory). See below + for instructions to build Tcl/Tk. bz2 Python wrapper for the libbz2 compression library. Homepage http://sources.redhat.com/bzip2/ @@ -186,8 +186,8 @@ This extracts all the external subprojects from http://svn.python.org/external via Subversion (so you'll need an svn.exe on your PATH) and places them in -..\.. (relative to this directory). The external(-amd64).bat scripts will -also build a debug build of Tcl/Tk; there aren't any equivalent batch files +..\externals (relative to this directory). The external(-amd64).bat scripts +will also build a debug build of Tcl/Tk; there aren't any equivalent batch files for building release versions of Tcl/Tk lying around in the Tools\buildbot directory. If you need to build a release version of Tcl/Tk it isn't hard though, take a look at the relevant external(-amd64).bat file and find the @@ -208,36 +208,6 @@ _bsddb.vcproj and sqlite3.vcproj files, which will remove the need for Tcl/Tk to be built separately via a batch file. -XXX trent.nelson 02-Apr-08: - Having the external subprojects in ..\.. relative to this directory is a - bit of a nuisance when you're working on py3k and trunk in parallel and - your directory layout mimics that of Python's subversion layout, e.g.: - - C:\..\svn.python.org\projects\python\trunk - C:\..\svn.python.org\projects\python\branches\py3k - C:\..\svn.python.org\projects\python\branches\release25-maint - - I'd like to change things so that external subprojects are fetched from - ..\external instead of ..\.., then provide some helper scripts or batch - files that would set up a new ..\external directory with svn checkouts of - the relevant branches in http://svn.python.org/projects/external/, or - alternatively, use junctions to link ..\external with a pre-existing - externals directory being used by another branch. i.e. if I'm usually - working on trunk (and have previously created trunk\external via the - provided batch file), and want to do some work on py3k, I'd set up a - junction as follows (using the directory structure above as an example): - - C:\..\python\trunk\external <- already exists and has built versions - of the external subprojects - - C:\..\python\branches\py3k>linkd.exe external ..\..\trunk\external - Link created at: external - - Only a slight tweak would be needed to the buildbots such that bots - building trunk and py3k could make use of the same facility. (2.5.x - builds need to be kept separate as they're using Visual Studio 7.1.) -/XXX trent.nelson 02-Apr-08 - Building for Itanium -------------------- diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat --- a/PCbuild/rt.bat +++ b/PCbuild/rt.bat @@ -38,7 +38,7 @@ if "%1"=="-d" (set suffix=_d) & shift & goto CheckOpts if "%1"=="-x64" (set prefix=amd64) & (set tcltk=tcltk64) & shift & goto CheckOpts -PATH %PATH%;%~dp0..\..\%tcltk%\bin +PATH %PATH%;%~dp0..\externals\%tcltk%\bin set exe=%prefix%\python%suffix% set cmd=%exe% %dashO% -Wd -3 -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 if defined qmode goto Qmode 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 @@ -1,7 +1,8 @@ @rem Common file shared between external.bat and external-amd64.bat. Responsible for -@rem fetching external components into the root\.. buildbot directories. +@rem fetching external components into the root\externals directory. -cd .. +if not exist externals mkdir externals +cd externals @rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment @rem the following, check it in, then check it out, comment it out, then check it back in. @rem if exist bzip2-1.0.6 rd /s/q bzip2-1.0.6 -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #22770: Prevent some Tk segfaults on OS X when running gui tests.
by ned.deily 02 Nov '14

02 Nov '14

https://hg.python.org/cpython/rev/bd4dc351d670 changeset: 93342:bd4dc351d670 branch: 2.7 parent: 93338:28d18fdc52c4 user: Ned Deily <nad(a)acm.org> date: Sat Nov 01 19:26:45 2014 -0700 summary: Issue #22770: Prevent some Tk segfaults on OS X when running gui tests. When running tests in subprocesses with the regrtest -j option, a bug in Cocoa Tk can result in a Tcl segfault. Avoid the problem by forcing Tk to fully initialize as an OS X gui process before destroying the Tcl instance and creating another. (Original patch by Serhiy Storchaka) files: Lib/test/test_support.py | 5 ++--- Misc/NEWS | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -326,12 +326,11 @@ reason = "cannot run without OS X gui process" # check on every platform whether tkinter can actually do anything - # but skip the test on OS X because it can cause segfaults in Cocoa Tk - # when running regrtest with the -j option (multiple threads/subprocesses) - if (not reason) and (sys.platform != 'darwin'): + if not reason: try: from Tkinter import Tk root = Tk() + root.update() root.destroy() except Exception as e: err_string = str(e) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -277,6 +277,8 @@ - Issue #21976: Fix test_ssl to accept LibreSSL version strings. Thanks to William Orr. +- Issue #22770: Prevent some Tk segfaults on OS X when running gui tests. + Build ----- -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): Issue #22770: merge from 3.4
by ned.deily 02 Nov '14

02 Nov '14

https://hg.python.org/cpython/rev/e119343bc3ec changeset: 93344:e119343bc3ec parent: 93341:ef15b51d59fb parent: 93343:121517deb318 user: Ned Deily <nad(a)acm.org> date: Sat Nov 01 19:33:25 2014 -0700 summary: Issue #22770: merge from 3.4 files: Lib/test/support/__init__.py | 5 ++--- Misc/NEWS | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -461,12 +461,11 @@ reason = "cannot run without OS X gui process" # check on every platform whether tkinter can actually do anything - # but skip the test on OS X because it can cause segfaults in Cocoa Tk - # when running regrtest with the -j option (multiple threads/subprocesses) - if (not reason) and (sys.platform != 'darwin'): + if not reason: try: from tkinter import Tk root = Tk() + root.update() root.destroy() except Exception as e: err_string = str(e) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1342,6 +1342,8 @@ - Issue #21093: Prevent failures of ctypes test_macholib on OS X if a copy of libz exists in $HOME/lib or /usr/local/lib. +- Issue #22770: Prevent some Tk segfaults on OS X when running gui tests. + Tools/Demos ----------- -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Issue #22770: Prevent some Tk segfaults on OS X when running gui tests.
by ned.deily 02 Nov '14

02 Nov '14

https://hg.python.org/cpython/rev/121517deb318 changeset: 93343:121517deb318 branch: 3.4 parent: 93339:f7ed3e058fca user: Ned Deily <nad(a)acm.org> date: Sat Nov 01 19:29:22 2014 -0700 summary: Issue #22770: Prevent some Tk segfaults on OS X when running gui tests. When running tests in subprocesses with the regrtest -j option, a bug in Cocoa Tk can result in a Tcl segfault. Avoid the problem by forcing Tk to fully initialize as an OS X gui process before destroying the Tcl instance and creating another. (Original patch by Serhiy Storchaka) files: Lib/test/support/__init__.py | 5 ++--- Misc/NEWS | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -461,12 +461,11 @@ reason = "cannot run without OS X gui process" # check on every platform whether tkinter can actually do anything - # but skip the test on OS X because it can cause segfaults in Cocoa Tk - # when running regrtest with the -j option (multiple threads/subprocesses) - if (not reason) and (sys.platform != 'darwin'): + if not reason: try: from tkinter import Tk root = Tk() + root.update() root.destroy() except Exception as e: err_string = str(e) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -113,6 +113,8 @@ - Issue #21456: Skip two tests in test_urllib2net.py if _ssl module not present. Patch by Remi Pointel. +- Issue #22770: Prevent some Tk segfaults on OS X when running gui tests. + Build ----- -- Repository URL: https://hg.python.org/cpython

1 0

cpython: 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/ef15b51d59fb changeset: 93341:ef15b51d59fb user: Zachary Ware <zachary.ware(a)gmail.com> date: Sat Nov 01 18:42:46 2014 -0500 summary: Issue #17717: Pull NASM from svn.python.org for OpenSSL build. files: Misc/NEWS | 3 +++ PCbuild/get_externals.bat | 8 +++++--- PCbuild/pyproject.props | 4 ++++ PCbuild/readme.txt | 8 ++++---- PCbuild/ssl.vcxproj | 8 ++++++++ 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1383,6 +1383,9 @@ Windows ------- +- Issue #17717: The Windows build scripts now use a copy of NASM pulled from + svn.python.org to build OpenSSL. + - Issue #21907: Improved the batch scripts provided for building Python. - Issue #22644: The bundled version of OpenSSL has been updated to 1.0.1j. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -20,6 +20,7 @@ for /D %%d in ( bzip2-* db-* + nasm-* openssl-* tcl-* tcltk* @@ -51,6 +52,7 @@ for %%e in ( bzip2-1.0.6 + nasm-2.11.06 openssl-1.0.1j tcl-8.6.1.0 tk-8.6.1.0 @@ -87,9 +89,9 @@ echo.**WARNING**: the cleaning options unconditionally remove any directory echo.that is a child of echo. %CD% -echo.and matches wildcard patterns beginning with bzip2-, db-, openssl-, tcl-, -echo.tcltk, tk-, tix-, sqlite-, or xz-, and as such has the potential to be -echo.very destructive if you are not aware of what it is doing. Use with +echo.and matches wildcard patterns beginning with bzip2-, db-, nasm-, openssl-, +echo.tcl-, tcltk, tk-, tix-, sqlite-, or xz-, and as such has the potential +echo.to be very destructive if you are not aware of what it is doing. Use with echo.caution! popd exit /b -1 diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -20,6 +20,7 @@ <sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir> <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir> <lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir> + <nasmDir>$(externalsDir)\nasm-2.11.06</nasmDir> <opensslDir>$(externalsDir)\openssl-1.0.1j</opensslDir> <tclDir>$(externalsDir)\tcl-8.6.1.0</tclDir> <tkDir>$(externalsDir)\tk-8.6.1.0</tkDir> @@ -77,6 +78,9 @@ <BuildMacro Include="lzmaDir"> <Value>$(lzmaDir)</Value> </BuildMacro> + <BuildMacro Include="nasmDir"> + <Value>$(nasmDir)</Value> + </BuildMacro> <BuildMacro Include="opensslDir"> <Value>$(opensslDir)</Value> </BuildMacro> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -3,9 +3,8 @@ 1. Install Microsoft Visual C++ 2010 SP1, any edition. 2. Install Subversion, and make sure 'svn.exe' is on your PATH. -3. Install NASM, and make sure 'nasm.exe' is on your PATH. -4. Run "build.bat -e" to build Python in 32-bit Release configuration. -5. (Optional, but recommended) Run the test suite with "rt.bat -q". +3. Run "build.bat -e" to build Python in 32-bit Release configuration. +4. (Optional, but recommended) Run the test suite with "rt.bat -q". Building Python using Microsoft Visual C++ @@ -225,7 +224,8 @@ 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. get_externals.py also downloads a snapshot of NASM, and the + ssl sub-project includes that version of nasm.exe on PATH. The ssl sub-project expects your OpenSSL sources to have already been configured and be ready to build. If you get your sources diff --git a/PCbuild/ssl.vcxproj b/PCbuild/ssl.vcxproj --- a/PCbuild/ssl.vcxproj +++ b/PCbuild/ssl.vcxproj @@ -119,6 +119,7 @@ <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" copy /Y crypto\buildinf_x86.h crypto\buildinf.h copy /Y crypto\opensslconf_x86.h crypto\opensslconf.h @@ -133,6 +134,7 @@ <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath> <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies> <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" nasm -f win64 -DNEAR -Ox -g ms\\uptable.asm || echo nasm failed! && exit copy /Y crypto\buildinf_amd64.h crypto\buildinf.h @@ -148,6 +150,7 @@ <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath> <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies> <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" copy /Y crypto\buildinf_x86.h crypto\buildinf.h copy /Y crypto\opensslconf_x86.h crypto\opensslconf.h @@ -162,6 +165,7 @@ <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath> <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies> <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" nasm -f win64 -DNEAR -Ox -g ms\\uptable.asm || echo nasm failed! && exit copy /Y crypto\buildinf_amd64.h crypto\buildinf.h @@ -177,6 +181,7 @@ <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath> <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies> <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'"> +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" copy /Y crypto\buildinf_x86.h crypto\buildinf.h copy /Y crypto\opensslconf_x86.h crypto\opensslconf.h @@ -191,6 +196,7 @@ <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath> <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies> <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'"> +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" nasm -f win64 -DNEAR -Ox -g ms\\uptable.asm || echo nasm failed! && exit copy /Y crypto\buildinf_amd64.h crypto\buildinf.h @@ -206,6 +212,7 @@ <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath> <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies> <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'"> +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" copy /Y crypto\buildinf_x86.h crypto\buildinf.h copy /Y crypto\opensslconf_x86.h crypto\opensslconf.h @@ -220,6 +227,7 @@ <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath> <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies> <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'"> +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" nasm -f win64 -DNEAR -Ox -g ms\\uptable.asm || echo nasm failed! && exit copy /Y crypto\buildinf_amd64.h crypto\buildinf.h -- Repository URL: https://hg.python.org/cpython

1 0