Mailman 3 August 2012 - Python-checkins

cpython (3.2): Issue #8847: Disable COMDAT folding in Windows PGO builds.
by martin.v.loewis Aug. 1, 2012

Aug. 1, 2012

http://hg.python.org/cpython/rev/2638ce032151 changeset: 78366:2638ce032151 branch: 3.2 parent: 78348:47536beb7453 user: Martin v. Löwis <martin(a)v.loewis.de> date: Wed Aug 01 10:32:11 2012 +0200 summary: Issue #8847: Disable COMDAT folding in Windows PGO builds. Analysis by Victor Stinner. Patch by Stefan Krah. files: Lib/test/test_list.py | 8 ++++++++ Lib/test/test_tuple.py | 8 ++++++++ Misc/NEWS | 2 ++ PCbuild/pginstrument.vsprops | 2 +- 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_list.py b/Lib/test/test_list.py --- a/Lib/test/test_list.py +++ b/Lib/test/test_list.py @@ -70,6 +70,14 @@ check(1000000) + def test_no_comdat_folding(self): + # Issue 8847: In the PGO build, the MSVC linker's COMDAT folding + # optimization causes failures in code that relies on distinct + # function addresses. + class L(list): pass + with self.assertRaises(TypeError): + (3,) + L([1,2]) + def test_main(verbose=None): support.run_unittest(ListTest) diff --git a/Lib/test/test_tuple.py b/Lib/test/test_tuple.py --- a/Lib/test/test_tuple.py +++ b/Lib/test/test_tuple.py @@ -164,6 +164,14 @@ check(10) # check our checking code check(1000000) + def test_no_comdat_folding(self): + # Issue 8847: In the PGO build, the MSVC linker's COMDAT folding + # optimization causes failures in code that relies on distinct + # function addresses. + class T(tuple): pass + with self.assertRaises(TypeError): + [3,] + T((1,2)) + def test_main(): support.run_unittest(TupleTest) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -425,6 +425,8 @@ Build ----- +- Issue #8847: Disable COMDAT folding in Windows PGO builds. + - Issue #14197: For OS X framework builds, ensure links to the shared library are created with the proper ABI suffix. diff --git a/PCbuild/pginstrument.vsprops b/PCbuild/pginstrument.vsprops --- a/PCbuild/pginstrument.vsprops +++ b/PCbuild/pginstrument.vsprops @@ -22,7 +22,7 @@ <Tool Name="VCLinkerTool" OptimizeReferences="2" - EnableCOMDATFolding="2" + EnableCOMDATFolding="1" LinkTimeCodeGeneration="2" ProfileGuidedDatabase="$(SolutionDir)$(PlatformName)-pgi\$(TargetName).pgd" ImportLibrary="$(OutDirPGI)\$(TargetName).lib" -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #8847: Disable COMDAT folding in Windows PGO builds.
by martin.v.loewis Aug. 1, 2012

Aug. 1, 2012

http://hg.python.org/cpython/rev/5a8c5631463f changeset: 78365:5a8c5631463f branch: 2.7 parent: 78350:8f1a8e80f330 user: Martin v. Löwis <martin(a)v.loewis.de> date: Wed Aug 01 10:05:27 2012 +0200 summary: Issue #8847: Disable COMDAT folding in Windows PGO builds. files: Misc/NEWS | 2 ++ PCbuild/pginstrument.vsprops | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -315,6 +315,8 @@ Build ----- +- Issue #8847: Disable COMDAT folding in Windows PGO builds. + - Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. - Issue #8767: Restore building with --disable-unicode. diff --git a/PCbuild/pginstrument.vsprops b/PCbuild/pginstrument.vsprops --- a/PCbuild/pginstrument.vsprops +++ b/PCbuild/pginstrument.vsprops @@ -22,7 +22,7 @@ <Tool Name="VCLinkerTool" OptimizeReferences="2" - EnableCOMDATFolding="2" + EnableCOMDATFolding="1" LinkTimeCodeGeneration="2" ProfileGuidedDatabase="$(SolutionDir)$(PlatformName)-pgi\$(TargetName).pgd" ImportLibrary="$(OutDirPGI)\$(TargetName).lib" -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge default -> default): merge heads
by benjamin.peterson Aug. 1, 2012

Aug. 1, 2012

http://hg.python.org/cpython/rev/c58f65e22fe9 changeset: 78364:c58f65e22fe9 parent: 78363:cbfb915424fd parent: 78362:a16403affccd user: Benjamin Peterson <benjamin(a)python.org> date: Tue Jul 31 21:50:11 2012 -0700 summary: merge heads files: Lib/webbrowser.py | 17 +++++++---------- Misc/NEWS | 3 +++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -232,17 +232,14 @@ stdout=(self.redirect_stdout and inout or None), stderr=inout, start_new_session=True) if remote: - # wait five seconds. If the subprocess is not finished, the + # wait at most five seconds. If the subprocess is not finished, the # remote invocation has (hopefully) started a new instance. - time.sleep(1) - rc = p.poll() - if rc is None: - time.sleep(4) - rc = p.poll() - if rc is None: - return True - # if remote call failed, open() will try direct invocation - return not rc + try: + rc = p.wait(5) + # if remote call failed, open() will try direct invocation + return not rc + except subprocess.TimeoutExpired: + return True elif self.background: if p.poll() is None: return True diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -72,6 +72,9 @@ Library ------- +- Issue #15499: Launching a webbrowser in Unix used to sleep for a few + seconds. Original patch by Anton Barkovsky. + - Issue #15463: the faulthandler module truncates strings to 500 characters, instead of 100, to be able to display long file paths -- Repository URL: http://hg.python.org/cpython

1 0

cpython: construct fields in the right order (closes #15517)
by benjamin.peterson Aug. 1, 2012

Aug. 1, 2012

http://hg.python.org/cpython/rev/cbfb915424fd changeset: 78363:cbfb915424fd parent: 78361:b213894e0859 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Jul 31 21:41:56 2012 -0700 summary: construct fields in the right order (closes #15517) Patch from Taihyun Hwang. files: Misc/ACKS | 2 +- Parser/asdl.py | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -476,6 +476,7 @@ Jim Hugunin Greg Humphreys Eric Huss +Taihyun Hwang Jeremy Hylton Gerhard Häring Fredrik Håård @@ -1174,4 +1175,3 @@ Kai Zhu Tarek Ziadé Peter Åstrand - diff --git a/Parser/asdl.py b/Parser/asdl.py --- a/Parser/asdl.py +++ b/Parser/asdl.py @@ -156,15 +156,11 @@ if id.value != "attributes": raise ASDLSyntaxError(id.lineno, msg="expected attributes, found %s" % id) - if attributes: - attributes.reverse() return Sum(sum, attributes) def p_product(self, info): " product ::= ( fields ) " _0, fields, _1 = info - # XXX can't I just construct things in the right order? - fields.reverse() return Product(fields) def p_sum_0(self, constructor): @@ -188,8 +184,6 @@ def p_constructor_1(self, info): " constructor ::= Id ( fields ) " id, _0, fields, _1 = info - # XXX can't I just construct things in the right order? - fields.reverse() return Constructor(id, fields) def p_fields_0(self, field): @@ -197,8 +191,8 @@ return [field[0]] def p_fields_1(self, info): - " fields ::= field , fields " - field, _, fields = info + " fields ::= fields , field " + fields, _, field = info return fields + [field] def p_field_0(self, type_): -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (b213894e0859): sum=0
by solipsis＠pitrou.net Aug. 1, 2012

Aug. 1, 2012

results for b213894e0859 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogE2tNjp', '-x']

1 0

cpython: Closes #15499: Sleep is hardcoded in webbrowser.UnixBrowser
by jesus.cea Aug. 1, 2012

Aug. 1, 2012

http://hg.python.org/cpython/rev/a16403affccd changeset: 78362:a16403affccd user: Jesus Cea <jcea(a)jcea.es> date: Wed Aug 01 03:57:52 2012 +0200 summary: Closes #15499: Sleep is hardcoded in webbrowser.UnixBrowser files: Lib/webbrowser.py | 17 +++++++---------- Misc/NEWS | 3 +++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -232,17 +232,14 @@ stdout=(self.redirect_stdout and inout or None), stderr=inout, start_new_session=True) if remote: - # wait five seconds. If the subprocess is not finished, the + # wait at most five seconds. If the subprocess is not finished, the # remote invocation has (hopefully) started a new instance. - time.sleep(1) - rc = p.poll() - if rc is None: - time.sleep(4) - rc = p.poll() - if rc is None: - return True - # if remote call failed, open() will try direct invocation - return not rc + try: + rc = p.wait(5) + # if remote call failed, open() will try direct invocation + return not rc + except subprocess.TimeoutExpired: + return True elif self.background: if p.poll() is None: return True diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -72,6 +72,9 @@ Library ------- +- Issue #15499: Launching a webbrowser in Unix used to sleep for a few + seconds. Original patch by Anton Barkovsky. + - Issue #15463: the faulthandler module truncates strings to 500 characters, instead of 100, to be able to display long file paths -- Repository URL: http://hg.python.org/cpython

1 0