Mailman 3 January 2012 - Python-checkins

cpython (2.7): #13852: some small doc fixes.
by georg.brandl Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/e2b98a332070 changeset: 74622:e2b98a332070 branch: 2.7 parent: 74619:ed6d9249da0c user: Georg Brandl <georg(a)python.org> date: Wed Jan 25 22:36:25 2012 +0100 summary: #13852: some small doc fixes. files: Doc/library/functools.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst --- a/Doc/library/functools.rst +++ b/Doc/library/functools.rst @@ -1,8 +1,8 @@ -:mod:`functools` --- Higher order functions and operations on callable objects +:mod:`functools` --- Higher-order functions and operations on callable objects ============================================================================== .. module:: functools - :synopsis: Higher order functions and operations on callable objects. + :synopsis: Higher-order functions and operations on callable objects. .. moduleauthor:: Peter Harris <scav(a)blueyonder.co.uk> .. moduleauthor:: Raymond Hettinger <python(a)rcn.com> .. moduleauthor:: Nick Coghlan <ncoghlan(a)gmail.com> @@ -29,7 +29,7 @@ tool for programs being converted to Python 3 where comparison functions are no longer supported. - A compare function is any callable that accept two arguments, compares them, + A comparison function is any callable that accept two arguments, compares them, and returns a negative number for less-than, zero for equality, or a positive number for greater-than. A key function is a callable that accepts one argument and returns another value that indicates the position in the desired -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge default -> default): merge heads
by benjamin.peterson Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/2701a2bb19c5 changeset: 74621:2701a2bb19c5 parent: 74620:e17a28b631a8 parent: 74615:a5f8611ce81d user: Benjamin Peterson <benjamin(a)python.org> date: Wed Jan 25 16:32:36 2012 -0500 summary: merge heads files: Lib/test/test_zlib.py | 12 ++++++------ Misc/NEWS | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py --- a/Lib/test/test_zlib.py +++ b/Lib/test/test_zlib.py @@ -16,12 +16,12 @@ class VersionTestCase(unittest.TestCase): def test_library_version(self): - # On the build system, ZLIB_RUNTIME_VERSION should match ZLIB_VERSION. - # ZLIB_RUNTIME_VERSION is the actual library version while ZLIB_VERSION - # is the version from the header file. On the build system, the headers - # should match with the library exactly. At runtime, only the first - # digit is required to match. - self.assertEqual(zlib.ZLIB_RUNTIME_VERSION, zlib.ZLIB_VERSION) + # Test that the major version of the actual library in use matches the + # major version that we were compiled against. We can't guarantee that + # the minor versions will match (even on the machine on which the module + # was compiled), and the API is stable between minor versions, so + # testing only the major verions avoids spurious failures. + self.assertEqual(zlib.ZLIB_RUNTIME_VERSION[0], zlib.ZLIB_VERSION[0]) class ChecksumTestCase(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -461,6 +461,9 @@ Library ------- +- Issue #13862: Fix spurious failure in test_zlib due to runtime/compile time + minor versions not matching. + - Issue #12804: Fix test_socket and test_urllib2net failures when running tests on a system without internet access. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): merge 3.2
by benjamin.peterson Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/e17a28b631a8 changeset: 74620:e17a28b631a8 parent: 74614:fec45282dc28 parent: 74617:2790c3ff475b user: Benjamin Peterson <benjamin(a)python.org> date: Wed Jan 25 16:31:56 2012 -0500 summary: merge 3.2 files: Doc/library/stdtypes.rst | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -383,12 +383,12 @@ .. _bitstring-ops: -Bit-string Operations on Integer Types +Bitwise Operations on Integer Types -------------------------------------- .. index:: triple: operations on; integer; types - pair: bit-string; operations + pair: bitwise; operations pair: shifting; operations pair: masking; operations operator: ^ @@ -396,15 +396,15 @@ operator: << operator: >> -Integers support additional operations that make sense only for bit-strings. -Negative numbers are treated as their 2's complement value (this assumes a -sufficiently large number of bits that no overflow occurs during the operation). +Bitwise operations only make sense for integers. Negative numbers are treated +as their 2's complement value (this assumes a sufficiently large number of bits +that no overflow occurs during the operation). The priorities of the binary bitwise operations are all lower than the numeric operations and higher than the comparisons; the unary operation ``~`` has the same priority as the other unary numeric operations (``+`` and ``-``). -This table lists the bit-string operations sorted in ascending priority +This table lists the bitwise operations sorted in ascending priority (operations in the same box have the same priority): +------------+--------------------------------+----------+ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): kill extra word
by benjamin.peterson Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/ed6d9249da0c changeset: 74619:ed6d9249da0c branch: 2.7 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Jan 25 16:30:18 2012 -0500 summary: kill extra word files: Doc/library/stdtypes.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -414,9 +414,9 @@ operator: << operator: >> -Bitwise operations only make sense only for integers. Negative numbers are -treated as their 2's complement value (this assumes a sufficiently large number -of bits that no overflow occurs during the operation). +Bitwise operations only make sense for integers. Negative numbers are treated +as their 2's complement value (this assumes a sufficiently large number of bits +that no overflow occurs during the operation). The priorities of the binary bitwise operations are all lower than the numeric operations and higher than the comparisons; the unary operation ``~`` has the -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): say bitwise (because I have no idea what a bit-string is)
by benjamin.peterson Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/6af7eb71cd49 changeset: 74618:6af7eb71cd49 branch: 2.7 parent: 74610:e8a525de2bac user: Benjamin Peterson <benjamin(a)python.org> date: Wed Jan 25 16:29:03 2012 -0500 summary: say bitwise (because I have no idea what a bit-string is) files: Doc/library/stdtypes.rst | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -401,12 +401,12 @@ .. _bitstring-ops: -Bit-string Operations on Integer Types +Bitwise Operations on Integer Types -------------------------------------- .. index:: triple: operations on; integer; types - pair: bit-string; operations + pair: bitwise; operations pair: shifting; operations pair: masking; operations operator: ^ @@ -414,16 +414,20 @@ operator: << operator: >> -Plain and long integer types support additional operations that make sense only -for bit-strings. Negative numbers are treated as their 2's complement value -(for long integers, this assumes a sufficiently large number of bits that no -overflow occurs during the operation). +Bitwise operations only make sense only for integers. Negative numbers are +treated as their 2's complement value (this assumes a sufficiently large number +of bits that no overflow occurs during the operation). The priorities of the binary bitwise operations are all lower than the numeric operations and higher than the comparisons; the unary operation ``~`` has the same priority as the other unary numeric operations (``+`` and ``-``). +<<<<<<< local This table lists the bit-string operations sorted in ascending priority: +======= +This table lists the bitwise operations sorted in ascending priority +(operations in the same box have the same priority): +>>>>>>> other +------------+--------------------------------+----------+ | Operation | Result | Notes | -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): kill extra word
by benjamin.peterson Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/2790c3ff475b changeset: 74617:2790c3ff475b branch: 3.2 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Jan 25 16:30:18 2012 -0500 summary: kill extra word files: Doc/library/stdtypes.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -392,9 +392,9 @@ operator: << operator: >> -Bitwise operations only make sense only for integers. Negative numbers are -treated as their 2's complement value (this assumes a sufficiently large number -of bits that no overflow occurs during the operation). +Bitwise operations only make sense for integers. Negative numbers are treated +as their 2's complement value (this assumes a sufficiently large number of bits +that no overflow occurs during the operation). The priorities of the binary bitwise operations are all lower than the numeric operations and higher than the comparisons; the unary operation ``~`` has the -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): say bitwise (because I have no idea what a bit-string is)
by benjamin.peterson Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/3e55733fc534 changeset: 74616:3e55733fc534 branch: 3.2 parent: 74613:e506848d6381 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Jan 25 16:29:03 2012 -0500 summary: say bitwise (because I have no idea what a bit-string is) files: Doc/library/stdtypes.rst | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -379,12 +379,12 @@ .. _bitstring-ops: -Bit-string Operations on Integer Types +Bitwise Operations on Integer Types -------------------------------------- .. index:: triple: operations on; integer; types - pair: bit-string; operations + pair: bitwise; operations pair: shifting; operations pair: masking; operations operator: ^ @@ -392,15 +392,15 @@ operator: << operator: >> -Integers support additional operations that make sense only for bit-strings. -Negative numbers are treated as their 2's complement value (this assumes a -sufficiently large number of bits that no overflow occurs during the operation). +Bitwise operations only make sense only for integers. Negative numbers are +treated as their 2's complement value (this assumes a sufficiently large number +of bits that no overflow occurs during the operation). The priorities of the binary bitwise operations are all lower than the numeric operations and higher than the comparisons; the unary operation ``~`` has the same priority as the other unary numeric operations (``+`` and ``-``). -This table lists the bit-string operations sorted in ascending priority +This table lists the bitwise operations sorted in ascending priority (operations in the same box have the same priority): +------------+--------------------------------+----------+ -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #13862: Relax zlib version test to avoid spurious failures.
by nadeem.vawda Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/a5f8611ce81d changeset: 74615:a5f8611ce81d user: Nadeem Vawda <nadeem.vawda(a)gmail.com> date: Wed Jan 25 23:16:50 2012 +0200 summary: Issue #13862: Relax zlib version test to avoid spurious failures. files: Lib/test/test_zlib.py | 12 ++++++------ Misc/NEWS | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py --- a/Lib/test/test_zlib.py +++ b/Lib/test/test_zlib.py @@ -16,12 +16,12 @@ class VersionTestCase(unittest.TestCase): def test_library_version(self): - # On the build system, ZLIB_RUNTIME_VERSION should match ZLIB_VERSION. - # ZLIB_RUNTIME_VERSION is the actual library version while ZLIB_VERSION - # is the version from the header file. On the build system, the headers - # should match with the library exactly. At runtime, only the first - # digit is required to match. - self.assertEqual(zlib.ZLIB_RUNTIME_VERSION, zlib.ZLIB_VERSION) + # Test that the major version of the actual library in use matches the + # major version that we were compiled against. We can't guarantee that + # the minor versions will match (even on the machine on which the module + # was compiled), and the API is stable between minor versions, so + # testing only the major verions avoids spurious failures. + self.assertEqual(zlib.ZLIB_RUNTIME_VERSION[0], zlib.ZLIB_VERSION[0]) class ChecksumTestCase(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -461,6 +461,9 @@ Library ------- +- Issue #13862: Fix spurious failure in test_zlib due to runtime/compile time + minor versions not matching. + - Issue #12804: Fix test_socket and test_urllib2net failures when running tests on a system without internet access. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Closes #13859: Merged fix from 3.2 - thanks to Matt Joiner for spotting this
by vinay.sajip Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/fec45282dc28 changeset: 74614:fec45282dc28 parent: 74612:2b62348a1c03 parent: 74613:e506848d6381 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Wed Jan 25 17:49:45 2012 +0000 summary: Closes #13859: Merged fix from 3.2 - thanks to Matt Joiner for spotting this and the patch. files: Lib/logging/__init__.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2001-2011 by Vinay Sajip. All Rights Reserved. +# Copyright 2001-2012 by Vinay Sajip. All Rights Reserved. # # Permission to use, copy, modify, and distribute this software and its # documentation for any purpose and without fee is hereby granted, @@ -288,7 +288,7 @@ # for an example try: self.processName = mp.current_process().name - except StandardError: #pragma: no cover + except Exception: #pragma: no cover pass if logProcesses and hasattr(os, 'getpid'): self.process = os.getpid() -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Closes #13859: Replaced reference to StandardError with reference to Exception.
by vinay.sajip Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/e506848d6381 changeset: 74613:e506848d6381 branch: 3.2 parent: 74611:c79d0a7ac79d user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Wed Jan 25 17:41:13 2012 +0000 summary: Closes #13859: Replaced reference to StandardError with reference to Exception. Thanks to Matt Joiner for spotting this and submitting a patch. files: Lib/logging/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -294,7 +294,7 @@ # for an example try: self.processName = mp.current_process().name - except StandardError: + except Exception: pass if logProcesses and hasattr(os, 'getpid'): self.process = os.getpid() -- Repository URL: http://hg.python.org/cpython

1 0