Mailman 3 July 2011 - Python-checkins

cpython (3.2): Make indentation comply with our style guide and the rest of the file
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/fc75798f292e changeset: 71553:fc75798f292e branch: 3.2 user: Éric Araujo <merwok(a)netwok.org> date: Tue Jul 26 16:54:24 2011 +0200 summary: Make indentation comply with our style guide and the rest of the file files: Doc/tutorial/classes.rst | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -598,24 +598,24 @@ Name mangling is helpful for letting subclasses override methods without breaking intraclass method calls. For example:: - class Mapping: - def __init__(self, iterable): - self.items_list = [] - self.__update(iterable) + class Mapping: + def __init__(self, iterable): + self.items_list = [] + self.__update(iterable) - def update(self, iterable): - for item in iterable: - self.items_list.append(item) + def update(self, iterable): + for item in iterable: + self.items_list.append(item) - __update = update # private copy of original update() method + __update = update # private copy of original update() method - class MappingSubclass(Mapping): + class MappingSubclass(Mapping): - def update(self, keys, values): - # provides new signature for update() - # but does not break __init__() - for item in zip(keys, values): - self.items_list.append(item) + def update(self, keys, values): + # provides new signature for update() + # but does not break __init__() + for item in zip(keys, values): + self.items_list.append(item) Note that the mangling rules are designed mostly to avoid accidents; it still is possible to access or modify a variable that is considered private. This can -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Fix “anyways” (following R. David Murray in 4d5a546b6186)
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/a17c9f7686e5 changeset: 71552:a17c9f7686e5 branch: 3.2 user: Éric Araujo <merwok(a)netwok.org> date: Tue Jul 26 16:53:17 2011 +0200 summary: Fix “anyways” (following R. David Murray in 4d5a546b6186) files: Doc/install/index.rst | 2 +- Doc/library/ossaudiodev.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/install/index.rst b/Doc/install/index.rst --- a/Doc/install/index.rst +++ b/Doc/install/index.rst @@ -72,7 +72,7 @@ do the obvious thing with it: run it if it's an executable installer, ``rpm --install`` it if it's an RPM, etc. You don't need to run Python or a setup script, you don't need to compile anything---you might not even need to read any -instructions (although it's always a good idea to do so anyways). +instructions (although it's always a good idea to do so anyway). Of course, things will not always be that easy. You might be interested in a module distribution that doesn't have an easy-to-use installer for your diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst --- a/Doc/library/ossaudiodev.rst +++ b/Doc/library/ossaudiodev.rst @@ -14,7 +14,7 @@ ALSA is in the standard kernel as of 2.5.x. Presumably if you use ALSA, you'll have to make sure its OSS compatibility layer is active to use ossaudiodev, but you're gonna need it for the vast - majority of Linux audio apps anyways. + majority of Linux audio apps anyway. Sounds like things are also complicated for other BSDs. In response to my python-dev query, Thomas Wouters said: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Remove duplicates of cmp_to_key (#12542, reviewed by Raymond Hettinger)
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/fefb7d355361 changeset: 71550:fefb7d355361 branch: 3.2 parent: 71500:d11a1a373f58 user: Éric Araujo <merwok(a)netwok.org> date: Tue Jul 26 15:13:47 2011 +0200 summary: Remove duplicates of cmp_to_key (#12542, reviewed by Raymond Hettinger) files: Lib/test/list_tests.py | 16 +++++----------- Lib/test/test_sort.py | 23 ++++++++--------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/Lib/test/list_tests.py b/Lib/test/list_tests.py --- a/Lib/test/list_tests.py +++ b/Lib/test/list_tests.py @@ -4,17 +4,10 @@ import sys import os +from functools import cmp_to_key from test import support, seq_tests -def CmpToKey(mycmp): - 'Convert a cmp= function into a key= function' - class K(object): - def __init__(self, obj): - self.obj = obj - def __lt__(self, other): - return mycmp(self.obj, other.obj) == -1 - return K class CommonTest(seq_tests.CommonTest): @@ -443,7 +436,7 @@ return 1 else: # a > b return -1 - u.sort(key=CmpToKey(revcmp)) + u.sort(key=cmp_to_key(revcmp)) self.assertEqual(u, self.type2test([2,1,0,-1,-2])) # The following dumps core in unpatched Python 1.5: @@ -456,7 +449,7 @@ else: # xmod > ymod return 1 z = self.type2test(range(12)) - z.sort(key=CmpToKey(myComparison)) + z.sort(key=cmp_to_key(myComparison)) self.assertRaises(TypeError, z.sort, 2) @@ -468,7 +461,8 @@ return -1 else: # x > y return 1 - self.assertRaises(ValueError, z.sort, key=CmpToKey(selfmodifyingComparison)) + self.assertRaises(ValueError, z.sort, + key=cmp_to_key(selfmodifyingComparison)) self.assertRaises(TypeError, z.sort, 42, 42, 42, 42) diff --git a/Lib/test/test_sort.py b/Lib/test/test_sort.py --- a/Lib/test/test_sort.py +++ b/Lib/test/test_sort.py @@ -2,18 +2,11 @@ import random import sys import unittest +from functools import cmp_to_key verbose = support.verbose nerrors = 0 -def CmpToKey(mycmp): - 'Convert a cmp= function into a key= function' - class K(object): - def __init__(self, obj): - self.obj = obj - def __lt__(self, other): - return mycmp(self.obj, other.obj) == -1 - return K def check(tag, expected, raw, compare=None): global nerrors @@ -23,7 +16,7 @@ orig = raw[:] # save input in case of error if compare: - raw.sort(key=CmpToKey(compare)) + raw.sort(key=cmp_to_key(compare)) else: raw.sort() @@ -108,7 +101,7 @@ print(" Checking against an insane comparison function.") print(" If the implementation isn't careful, this may segfault.") s = x[:] - s.sort(key=CmpToKey(lambda a, b: int(random.random() * 3) - 1)) + s.sort(key=cmp_to_key(lambda a, b: int(random.random() * 3) - 1)) check("an insane function left some permutation", x, s) if len(x) >= 2: @@ -165,12 +158,12 @@ L.pop() return (x > y) - (x < y) L = [1,2] - self.assertRaises(ValueError, L.sort, key=CmpToKey(mutating_cmp)) + self.assertRaises(ValueError, L.sort, key=cmp_to_key(mutating_cmp)) def mutating_cmp(x, y): L.append(3) del L[:] return (x > y) - (x < y) - self.assertRaises(ValueError, L.sort, key=CmpToKey(mutating_cmp)) + self.assertRaises(ValueError, L.sort, key=cmp_to_key(mutating_cmp)) memorywaster = [memorywaster] #============================================================================== @@ -185,7 +178,7 @@ def my_cmp(x, y): xlower, ylower = x.lower(), y.lower() return (xlower > ylower) - (xlower < ylower) - copy.sort(key=CmpToKey(my_cmp)) + copy.sort(key=cmp_to_key(my_cmp)) def test_baddecorator(self): data = 'The quick Brown fox Jumped over The lazy Dog'.split() @@ -261,8 +254,8 @@ def my_cmp_reversed(x, y): x0, y0 = x[0], y[0] return (y0 > x0) - (y0 < x0) - data.sort(key=CmpToKey(my_cmp), reverse=True) - copy1.sort(key=CmpToKey(my_cmp_reversed)) + data.sort(key=cmp_to_key(my_cmp), reverse=True) + copy1.sort(key=cmp_to_key(my_cmp_reversed)) self.assertEqual(data, copy1) copy2.sort(key=lambda x: x[0], reverse=True) self.assertEqual(data, copy2) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Fix reST references
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/d67a708d7371 changeset: 71551:d67a708d7371 branch: 3.2 user: Éric Araujo <merwok(a)netwok.org> date: Tue Jul 26 15:14:35 2011 +0200 summary: Fix reST references files: Doc/glossary.rst | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Doc/glossary.rst b/Doc/glossary.rst --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -431,7 +431,8 @@ mapping A container object that supports arbitrary key lookups and implements the - methods specified in the :class:`Mapping` or :class:`MutableMapping` + methods specified in the :class:`~collections.Mapping` or + :class:`~collections.MutableMapping` :ref:`abstract base classes <collections-abstract-base-classes>`. Examples include :class:`dict`, :class:`collections.defaultdict`, :class:`collections.OrderedDict` and :class:`collections.Counter`. -- Repository URL: http://hg.python.org/cpython

1 0

peps: PEP 400: add the alternative suggested by Marc-Andre Lemburg.
by victor.stinner July 29, 2011

July 29, 2011

http://hg.python.org/peps/rev/6cf74732766a changeset: 3916:6cf74732766a user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Fri Jul 29 14:24:42 2011 +0200 summary: PEP 400: add the alternative suggested by Marc-Andre Lemburg. files: pep-0400.txt | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/pep-0400.txt b/pep-0400.txt --- a/pep-0400.txt +++ b/pep-0400.txt @@ -210,6 +210,14 @@ .. _Appendix A: +Alternative Approache +===================== + +An alternative to the deprecation of the codecs.Stream* classes is to rename +codecs.open() to codecs.open_stream(), and to create a new codecs.open() +function reusing open() and so io.TextIOWrapper. + + Appendix A: Issues with stateful codecs ======================================= -- Repository URL: http://hg.python.org/peps

1 0

cpython (2.7): Issue #12531: add index entries to documentation of * and ** in function calls
by eli.bendersky July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/8328fe952303 changeset: 71549:8328fe952303 branch: 2.7 parent: 71546:56e7b42089c8 user: Eli Bendersky <eliben(a)gmail.com> date: Fri Jul 29 14:45:08 2011 +0300 summary: Issue #12531: add index entries to documentation of * and ** in function calls files: Doc/reference/expressions.rst | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -735,12 +735,15 @@ and the argument values as corresponding values), or a (new) empty dictionary if there were no excess keyword arguments. +.. index:: + single: *; in function calls + If the syntax ``*expression`` appears in the function call, ``expression`` must -evaluate to a sequence. Elements from this sequence are treated as if they were -additional positional arguments; if there are positional arguments *x1*,..., -*xN*, and ``expression`` evaluates to a sequence *y1*, ..., *yM*, this is -equivalent to a call with M+N positional arguments *x1*, ..., *xN*, *y1*, ..., -*yM*. +evaluate to an iterable. Elements from this iterable are treated as if they +were additional positional arguments; if there are positional arguments +*x1*,...,*xN*, and ``expression`` evaluates to a sequence *y1*, ..., *yM*, this +is equivalent to a call with M+N positional arguments *x1*, ..., *xN*, *y1*, +..., *yM*. A consequence of this is that although the ``*expression`` syntax may appear *after* some keyword arguments, it is processed *before* the keyword arguments @@ -761,6 +764,9 @@ It is unusual for both keyword arguments and the ``*expression`` syntax to be used in the same call, so in practice this confusion does not arise. +.. index:: + single: **; in function calls + If the syntax ``**expression`` appears in the function call, ``expression`` must evaluate to a mapping, the contents of which are treated as additional keyword arguments. In the case of a keyword appearing in both ``expression`` and as an -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue 12514: Use try/finally to assure that timeit restores GC when done.
by raymond.hettinger July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/1cdb281a78ce changeset: 71547:1cdb281a78ce branch: 3.2 parent: 71544:9846f6463f23 user: Raymond Hettinger <python(a)rcn.com> date: Fri Jul 29 00:02:04 2011 -0700 summary: Issue 12514: Use try/finally to assure that timeit restores GC when done. files: Lib/timeit.py | 8 +++++--- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Lib/timeit.py b/Lib/timeit.py --- a/Lib/timeit.py +++ b/Lib/timeit.py @@ -191,9 +191,11 @@ it = [None] * number gcold = gc.isenabled() gc.disable() - timing = self.inner(it, self.timer) - if gcold: - gc.enable() + try: + timing = self.inner(it, self.timer) + finally: + if gcold: + gc.enable() return timing def repeat(self, repeat=default_repeat, number=default_number): diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -722,6 +722,7 @@ Marc Recht John Redford Terry Reedy +Gareth Rees Steve Reeves Lennart Regebro Ofir Reichenberg diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -39,6 +39,9 @@ - Issue #12603: Fix pydoc.synopsis() on files with non-negative st_mtime. +- Issue #12514: Use try/finally to assure the timeit module restores garbage + collections when it is done. + - Issue #12607: In subprocess, fix issue where if stdin, stdout or stderr is given as a low fd, it gets overwritten. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue 12514: Use try/finally to assure that timeit restores GC when done.
by raymond.hettinger July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/7df53f5788a4 changeset: 71548:7df53f5788a4 parent: 71545:80a3bf889cf6 parent: 71547:1cdb281a78ce user: Raymond Hettinger <python(a)rcn.com> date: Fri Jul 29 00:08:19 2011 -0700 summary: Issue 12514: Use try/finally to assure that timeit restores GC when done. files: Lib/timeit.py | 8 +++++--- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Lib/timeit.py b/Lib/timeit.py --- a/Lib/timeit.py +++ b/Lib/timeit.py @@ -191,9 +191,11 @@ it = [None] * number gcold = gc.isenabled() gc.disable() - timing = self.inner(it, self.timer) - if gcold: - gc.enable() + try: + timing = self.inner(it, self.timer) + finally: + if gcold: + gc.enable() return timing def repeat(self, repeat=default_repeat, number=default_number): diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -771,6 +771,7 @@ Marc Recht John Redford Terry Reedy +Gareth Rees Steve Reeves Lennart Regebro Ofir Reichenberg diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -246,6 +246,9 @@ - Issue #12603: Fix pydoc.synopsis() on files with non-negative st_mtime. +- Issue #12514: Use try/finally to assure the timeit module restores garbage + collections when it is done. + - Issue #12607: In subprocess, fix issue where if stdin, stdout or stderr is given as a low fd, it gets overwritten. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue 12514: Use try/finally to assure that timeit restores GC when done.
by raymond.hettinger July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/56e7b42089c8 changeset: 71546:56e7b42089c8 branch: 2.7 parent: 71539:f15442543e24 user: Raymond Hettinger <python(a)rcn.com> date: Thu Jul 28 23:56:38 2011 -0700 summary: Issue 12514: Use try/finally to assure that timeit restores GC when done. files: Lib/timeit.py | 8 +++++--- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Lib/timeit.py b/Lib/timeit.py --- a/Lib/timeit.py +++ b/Lib/timeit.py @@ -191,9 +191,11 @@ it = [None] * number gcold = gc.isenabled() gc.disable() - timing = self.inner(it, self.timer) - if gcold: - gc.enable() + try: + timing = self.inner(it, self.timer) + finally: + if gcold: + gc.enable() return timing def repeat(self, repeat=default_repeat, number=default_number): diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -672,6 +672,7 @@ Marc Recht John Redford Terry Reedy +Gareth Rees Steve Reeves Lennart Regebro Ofir Reichenberg diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -39,6 +39,9 @@ - Issue #12603: Fix pydoc.synopsis() on files with non-negative st_mtime. +- Issue #12514: Use try/finally to assure the timeit module restores garbage + collections when it is done. + - Issue #12607: In subprocess, fix issue where if stdin, stdout or stderr is given as a low fd, it gets overwritten. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge from 3.2: Issue #12644: document the '%a' conversion in the old string
by eli.bendersky July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/80a3bf889cf6 changeset: 71545:80a3bf889cf6 parent: 71543:536fccc75f5a parent: 71544:9846f6463f23 user: Eli Bendersky <eliben(a)gmail.com> date: Fri Jul 29 09:33:50 2011 +0300 summary: Merge from 3.2: Issue #12644: document the '%a' conversion in the old string formatting operations. Patch prepared together with Ezio Melotti files: Doc/library/stdtypes.rst | 9 ++++++--- 1 files changed, 6 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 @@ -1464,7 +1464,7 @@ object to convert comes after the minimum field width and optional precision. #. Precision (optional), given as a ``'.'`` (dot) followed by the precision. If - specified as ``'*'`` (an asterisk), the actual width is read from the next + specified as ``'*'`` (an asterisk), the actual precision is read from the next element of the tuple in *values*, and the value to convert comes after the precision. @@ -1546,9 +1546,12 @@ | ``'r'`` | String (converts any Python object using | \(5) | | | :func:`repr`). | | +------------+-----------------------------------------------------+-------+ -| ``'s'`` | String (converts any Python object using | | +| ``'s'`` | String (converts any Python object using | \(5) | | | :func:`str`). | | +------------+-----------------------------------------------------+-------+ +| ``'a'`` | String (converts any Python object using | \(5) | +| | :func:`ascii`). | | ++------------+-----------------------------------------------------+-------+ | ``'%'`` | No argument is converted, results in a ``'%'`` | | | | character in the result. | | +------------+-----------------------------------------------------+-------+ @@ -1581,7 +1584,7 @@ decimal point and defaults to 6. (5) - The precision determines the maximal number of characters used. + If precision is ``N``, the output is truncated to ``N`` characters. (7) -- Repository URL: http://hg.python.org/cpython

1 0