Mailman 3 November 2013 - Python-checkins

cpython (merge 3.3 -> default): Skip test_find_mac on Windows (issue #19804).
by serhiy.storchaka Nov. 27, 2013

Nov. 27, 2013

http://hg.python.org/cpython/rev/4d5c3cb08170 changeset: 87611:4d5c3cb08170 parent: 87608:ddbcb86afbdc parent: 87610:dfadce7635ce user: Serhiy Storchaka <storchaka(a)gmail.com> date: Wed Nov 27 08:58:13 2013 +0200 summary: Skip test_find_mac on Windows (issue #19804). This test requires the ifconfig executable on $PATH, /sbin/, or /usr/sbin. files: Lib/test/test_uuid.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -358,6 +358,7 @@ self.assertEqual(node1, node2) + @unittest.skipUnless(os.name == 'posix', 'requires Posix') def test_find_mac(self): data = '''\ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Skip test_find_mac on Windows (issue #19804).
by serhiy.storchaka Nov. 27, 2013

Nov. 27, 2013

http://hg.python.org/cpython/rev/dfadce7635ce changeset: 87610:dfadce7635ce branch: 3.3 parent: 87607:22e514e41fac user: Serhiy Storchaka <storchaka(a)gmail.com> date: Wed Nov 27 08:57:51 2013 +0200 summary: Skip test_find_mac on Windows (issue #19804). This test requires the ifconfig executable on $PATH, /sbin/, or /usr/sbin. files: Lib/test/test_uuid.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -358,6 +358,7 @@ self.assertEqual(node1, node2) + @unittest.skipUnless(os.name == 'posix', 'requires Posix') def test_find_mac(self): data = '''\ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Skip test_find_mac on Windows (issue #19804).
by serhiy.storchaka Nov. 27, 2013

Nov. 27, 2013

http://hg.python.org/cpython/rev/e5b7f140ae30 changeset: 87609:e5b7f140ae30 branch: 2.7 parent: 87599:cbf30e9aa586 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Wed Nov 27 08:57:33 2013 +0200 summary: Skip test_find_mac on Windows (issue #19804). This test requires the ifconfig executable on $PATH, /sbin/, or /usr/sbin. files: Lib/test/test_uuid.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -347,6 +347,7 @@ self.assertEqual(node1, node2) + @unittest.skipUnless(os.name == 'posix', 'requires Posix') def test_find_mac(self): data = '''\ -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (e27684eed3b6): sum=4
by solipsis＠pitrou.net Nov. 27, 2013

Nov. 27, 2013

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

1 0

cpython (merge 3.3 -> default): merge 3.3 (#19805)
by benjamin.peterson Nov. 27, 2013

Nov. 27, 2013

http://hg.python.org/cpython/rev/ddbcb86afbdc changeset: 87608:ddbcb86afbdc parent: 87606:e27684eed3b6 parent: 87607:22e514e41fac user: Benjamin Peterson <benjamin(a)python.org> date: Tue Nov 26 23:05:37 2013 -0600 summary: merge 3.3 (#19805) files: Doc/faq/programming.rst | 30 ++-------------------------- 1 files changed, 3 insertions(+), 27 deletions(-) diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1193,34 +1193,10 @@ Dictionaries ============ -How can I get a dictionary to display its keys in a consistent order? ---------------------------------------------------------------------- +How can I get a dictionary to store and display its keys in a consistent order? +------------------------------------------------------------------------------- -You can't. Dictionaries store their keys in an unpredictable order, so the -display order of a dictionary's elements will be similarly unpredictable. - -This can be frustrating if you want to save a printable version to a file, make -some changes and then compare it with some other printed dictionary. In this -case, use the ``pprint`` module to pretty-print the dictionary; the items will -be presented in order sorted by the key. - -A more complicated solution is to subclass ``dict`` to create a -``SortedDict`` class that prints itself in a predictable order. Here's one -simpleminded implementation of such a class:: - - class SortedDict(dict): - def __repr__(self): - keys = sorted(self.keys()) - result = ("{!r}: {!r}".format(k, self[k]) for k in keys) - return "{{{}}}".format(", ".join(result)) - - __str__ = __repr__ - -This will work for many common situations you might encounter, though it's far -from a perfect solution. The largest flaw is that if some values in the -dictionary are also dictionaries, their values won't be presented in any -particular order. - +Use :class:`collections.OrderedDict`. I want to do a complicated sort: can you do a Schwartzian Transform in Python? ------------------------------------------------------------------------------ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): recommend OrderedDict for this FAQ (closes #19805)
by benjamin.peterson Nov. 27, 2013

Nov. 27, 2013

http://hg.python.org/cpython/rev/22e514e41fac changeset: 87607:22e514e41fac branch: 3.3 parent: 87605:bab7dc2ffc16 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Nov 26 23:05:25 2013 -0600 summary: recommend OrderedDict for this FAQ (closes #19805) files: Doc/faq/programming.rst | 30 ++-------------------------- 1 files changed, 3 insertions(+), 27 deletions(-) diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1193,34 +1193,10 @@ Dictionaries ============ -How can I get a dictionary to display its keys in a consistent order? ---------------------------------------------------------------------- +How can I get a dictionary to store and display its keys in a consistent order? +------------------------------------------------------------------------------- -You can't. Dictionaries store their keys in an unpredictable order, so the -display order of a dictionary's elements will be similarly unpredictable. - -This can be frustrating if you want to save a printable version to a file, make -some changes and then compare it with some other printed dictionary. In this -case, use the ``pprint`` module to pretty-print the dictionary; the items will -be presented in order sorted by the key. - -A more complicated solution is to subclass ``dict`` to create a -``SortedDict`` class that prints itself in a predictable order. Here's one -simpleminded implementation of such a class:: - - class SortedDict(dict): - def __repr__(self): - keys = sorted(self.keys()) - result = ("{!r}: {!r}".format(k, self[k]) for k in keys) - return "{{{}}}".format(", ".join(result)) - - __str__ = __repr__ - -This will work for many common situations you might encounter, though it's far -from a perfect solution. The largest flaw is that if some values in the -dictionary are also dictionaries, their values won't be presented in any -particular order. - +Use :class:`collections.OrderedDict`. I want to do a complicated sort: can you do a Schwartzian Transform in Python? ------------------------------------------------------------------------------ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): merge 3.3 (#19729)
by benjamin.peterson Nov. 27, 2013

Nov. 27, 2013

http://hg.python.org/cpython/rev/e27684eed3b6 changeset: 87606:e27684eed3b6 parent: 87604:2c1e041cb504 parent: 87605:bab7dc2ffc16 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Nov 26 19:24:01 2013 -0600 summary: merge 3.3 (#19729) files: Lib/test/test_unicode.py | 2 ++ Misc/NEWS | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -973,6 +973,8 @@ self.assertRaises(ValueError, "{a{b}".format, 42) self.assertRaises(ValueError, "{[}".format, 42) + self.assertEqual("0x{:0{:d}X}".format(0x0,16), "0x0000000000000000") + def test_format_map(self): self.assertEqual(''.format_map({}), '') self.assertEqual('a'.format_map({}), 'a') diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,8 @@ Core and Builtins ----------------- +- Issue #19729: In str.format(), fix recursive expansion in format spec. + - Issue #19638: Fix possible crash / undefined behaviour from huge (more than 2 billion characters) input strings in _Py_dg_strtod. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): fix format spec recursive expansion (closes #19729)
by benjamin.peterson Nov. 27, 2013

Nov. 27, 2013

http://hg.python.org/cpython/rev/bab7dc2ffc16 changeset: 87605:bab7dc2ffc16 branch: 3.3 parent: 87603:ca600150205a user: Benjamin Peterson <benjamin(a)python.org> date: Tue Nov 26 19:22:36 2013 -0600 summary: fix format spec recursive expansion (closes #19729) files: Lib/test/test_unicode.py | 1 + Misc/NEWS | 2 ++ Objects/stringlib/unicode_format.h | 6 ++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -955,6 +955,7 @@ '') self.assertEqual("{[{}]}".format({"{}": 5}), "5") + self.assertEqual("0x{:0{:d}X}".format(0x0,16), "0x0000000000000000") def test_format_map(self): self.assertEqual(''.format_map({}), '') diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,8 @@ Core and Builtins ----------------- +- Issue #19729: In str.format(), fix recursive expansion in format spec. + - Issue #19638: Fix possible crash / undefined behaviour from huge (more than 2 billion characters) input strings in _Py_dg_strtod. diff --git a/Objects/stringlib/unicode_format.h b/Objects/stringlib/unicode_format.h --- a/Objects/stringlib/unicode_format.h +++ b/Objects/stringlib/unicode_format.h @@ -727,8 +727,10 @@ while (self->str.start < self->str.end) { switch (c = PyUnicode_READ_CHAR(self->str.str, self->str.start++)) { case ':': - hit_format_spec = 1; - count = 1; + if (!hit_format_spec) { + count = 1; + hit_format_spec = 1; + } break; case '{': /* the format spec needs to be recursively expanded. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #19788: kill_python(_d).exe is now run as a PreBuildEvent on the
by zach.ware Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/2c1e041cb504 changeset: 87604:2c1e041cb504 parent: 87602:dc1eeca2dfb0 parent: 87603:ca600150205a user: Zachary Ware <zachary.ware(a)gmail.com> date: Tue Nov 26 16:34:45 2013 -0600 summary: Issue #19788: kill_python(_d).exe is now run as a PreBuildEvent on the pythoncore sub-project. This should prevent build errors due a previous build's python(_d).exe still running. files: Misc/NEWS | 6 ++ PCbuild/pythoncore.vcxproj | 48 ++++++++++++++++++++++ Tools/buildbot/build-amd64.bat | 3 +- Tools/buildbot/build.bat | 3 +- 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -30,6 +30,12 @@ - Issue #19588: Fixed tests in test_random that were silently skipped most of the time. Patch by Julian Gindi. +Build +----- + +- Issue #19788: kill_python(_d).exe is now run as a PreBuildEvent on the + pythoncore sub-project. This should prevent build errors due a previous + build's python(_d).exe still running. What's New in Python 3.4.0 Beta 1? ================================== diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -181,6 +181,12 @@ <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <BaseAddress>0x1e000000</BaseAddress> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Midl> @@ -206,6 +212,12 @@ <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <BaseAddress>0x1e000000</BaseAddress> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -231,6 +243,12 @@ <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <BaseAddress>0x1e000000</BaseAddress> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Midl> @@ -259,6 +277,12 @@ <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <BaseAddress>0x1e000000</BaseAddress> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'"> <ClCompile> @@ -282,6 +306,12 @@ <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <BaseAddress>0x1e000000</BaseAddress> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'"> <Midl> @@ -308,6 +338,12 @@ <BaseAddress>0x1e000000</BaseAddress> <TargetMachine>MachineX64</TargetMachine> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'"> <ClCompile> @@ -331,6 +367,12 @@ <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <BaseAddress>0x1e000000</BaseAddress> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'"> <Midl> @@ -357,6 +399,12 @@ <BaseAddress>0x1e000000</BaseAddress> <TargetMachine>MachineX64</TargetMachine> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\Include\abstract.h" /> diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat --- a/Tools/buildbot/build-amd64.bat +++ b/Tools/buildbot/build-amd64.bat @@ -2,6 +2,5 @@ cmd /c Tools\buildbot\external-amd64.bat call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 cmd /c Tools\buildbot\clean-amd64.bat -msbuild PCbuild\kill_python.vcxproj /p:Configuration=Debug /p:PlatformTarget=x64 -PCbuild\amd64\kill_python_d.exe + msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=x64 diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat --- a/Tools/buildbot/build.bat +++ b/Tools/buildbot/build.bat @@ -2,7 +2,6 @@ cmd /c Tools\buildbot\external.bat call "%VS100COMNTOOLS%vsvars32.bat" cmd /c Tools\buildbot\clean.bat -msbuild PCbuild\kill_python.vcxproj /p:Configuration=Debug /p:PlatformTarget=x86 -PCbuild\kill_python_d.exe + msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32 -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #19788: kill_python(_d).exe is now run as a PreBuildEvent on the
by zach.ware Nov. 26, 2013

Nov. 26, 2013

http://hg.python.org/cpython/rev/ca600150205a changeset: 87603:ca600150205a branch: 3.3 parent: 87600:b8d606c62d68 user: Zachary Ware <zachary.ware(a)gmail.com> date: Tue Nov 26 16:32:59 2013 -0600 summary: Issue #19788: kill_python(_d).exe is now run as a PreBuildEvent on the pythoncore sub-project. This should prevent build errors due a previous build's python(_d).exe still running. files: Misc/NEWS | 4 + PCbuild/pythoncore.vcxproj | 48 ++++++++++++++++++++++ Tools/buildbot/build-amd64.bat | 3 +- Tools/buildbot/build.bat | 3 +- 4 files changed, 54 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -92,6 +92,10 @@ Build ----- +- Issue #19788: kill_python(_d).exe is now run as a PreBuildEvent on the + pythoncore sub-project. This should prevent build errors due a previous + build's python(_d).exe still running. + - Add workaround for VS 2010 nmake clean issue. VS 2010 doesn't set up PATH for nmake.exe correctly. diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -181,6 +181,12 @@ <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <BaseAddress>0x1e000000</BaseAddress> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Midl> @@ -206,6 +212,12 @@ <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <BaseAddress>0x1e000000</BaseAddress> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -231,6 +243,12 @@ <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <BaseAddress>0x1e000000</BaseAddress> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Midl> @@ -259,6 +277,12 @@ <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <BaseAddress>0x1e000000</BaseAddress> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'"> <ClCompile> @@ -282,6 +306,12 @@ <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <BaseAddress>0x1e000000</BaseAddress> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'"> <Midl> @@ -308,6 +338,12 @@ <BaseAddress>0x1e000000</BaseAddress> <TargetMachine>MachineX64</TargetMachine> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'"> <ClCompile> @@ -331,6 +367,12 @@ <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <BaseAddress>0x1e000000</BaseAddress> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'"> <Midl> @@ -357,6 +399,12 @@ <BaseAddress>0x1e000000</BaseAddress> <TargetMachine>MachineX64</TargetMachine> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe)</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\Include\abstract.h" /> diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat --- a/Tools/buildbot/build-amd64.bat +++ b/Tools/buildbot/build-amd64.bat @@ -2,6 +2,5 @@ cmd /c Tools\buildbot\external-amd64.bat call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 cmd /c Tools\buildbot\clean-amd64.bat -msbuild PCbuild\kill_python.vcxproj /p:Configuration=Debug /p:PlatformTarget=x64 -PCbuild\amd64\kill_python_d.exe + msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=x64 diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat --- a/Tools/buildbot/build.bat +++ b/Tools/buildbot/build.bat @@ -2,7 +2,6 @@ cmd /c Tools\buildbot\external.bat call "%VS100COMNTOOLS%vsvars32.bat" cmd /c Tools\buildbot\clean.bat -msbuild PCbuild\kill_python.vcxproj /p:Configuration=Debug /p:PlatformTarget=x86 -PCbuild\kill_python_d.exe + msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32 -- Repository URL: http://hg.python.org/cpython

1 0