Mailman 3 November 2012 - Python-checkins

cpython: Add Bruno Dupuis
by benjamin.peterson 30 Nov '12

30 Nov '12

http://hg.python.org/cpython/rev/6fdc5e3daa8c changeset: 80667:6fdc5e3daa8c parent: 80660:ce3f0399ea33 user: Benjamin Peterson <benjamin(a)python.org> date: Fri Nov 30 16:15:24 2012 -0500 summary: Add Bruno Dupuis files: Misc/ACKS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -309,6 +309,7 @@ Robin Dunn Luke Dunstan Virgil Dupras +Bruno Dupuis Andy Dustman Gary Duzan Eugene Dvurechenski -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Add Bruno Dupuis
by benjamin.peterson 30 Nov '12

30 Nov '12

http://hg.python.org/cpython/rev/1e614dae8448 changeset: 80666:1e614dae8448 branch: 2.7 user: Benjamin Peterson <benjamin(a)python.org> date: Fri Nov 30 16:15:24 2012 -0500 summary: Add Bruno Dupuis files: Misc/ACKS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -257,6 +257,7 @@ Robin Dunn Luke Dunstan Virgil Dupras +Bruno Dupuis Andy Dustman Gary Duzan Eugene Dvurechenski -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): fix spelling
by benjamin.peterson 30 Nov '12

30 Nov '12

http://hg.python.org/cpython/rev/f44372b595c8 changeset: 80665:f44372b595c8 branch: 2.7 user: Benjamin Peterson <benjamin(a)python.org> date: Fri Nov 30 16:13:14 2012 -0500 summary: fix spelling files: Lib/test/test_posixpath.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py --- a/Lib/test/test_posixpath.py +++ b/Lib/test/test_posixpath.py @@ -153,8 +153,9 @@ ), True ) - # If we don't have links, assume that os.stat() doesn't return resonable - # inode information and thus, that samestat() doesn't work + # If we don't have links, assume that os.stat() doesn't return + # reasonable inode information and thus, that samestat() doesn't + # work. if hasattr(os, "symlink"): os.symlink(test_support.TESTFN + "1", test_support.TESTFN + "2") self.assertIs( -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Remove redundant check for symlink. (closes #6036)
by benjamin.peterson 30 Nov '12

30 Nov '12

http://hg.python.org/cpython/rev/980b13df6ccd changeset: 80664:980b13df6ccd branch: 2.7 user: Benjamin Peterson <benjamin(a)python.org> date: Fri Nov 30 16:12:15 2012 -0500 summary: Remove redundant check for symlink. (closes #6036) Patch by Bruno Dupuis. files: Lib/test/test_posixpath.py | 27 +++++++++++++------------ 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py --- a/Lib/test/test_posixpath.py +++ b/Lib/test/test_posixpath.py @@ -110,8 +110,10 @@ ), True ) - # If we don't have links, assume that os.stat doesn't return resonable - # inode information and thus, that samefile() doesn't work + + # If we don't have links, assume that os.stat doesn't return + # reasonable inode information and thus, that samefile() doesn't + # work. if hasattr(os, "symlink"): os.symlink( test_support.TESTFN + "1", @@ -152,18 +154,17 @@ True ) # If we don't have links, assume that os.stat() doesn't return resonable - # inode information and thus, that samefile() doesn't work + # inode information and thus, that samestat() doesn't work if hasattr(os, "symlink"): - if hasattr(os, "symlink"): - os.symlink(test_support.TESTFN + "1", test_support.TESTFN + "2") - self.assertIs( - posixpath.samestat( - os.stat(test_support.TESTFN + "1"), - os.stat(test_support.TESTFN + "2") - ), - True - ) - os.remove(test_support.TESTFN + "2") + os.symlink(test_support.TESTFN + "1", test_support.TESTFN + "2") + self.assertIs( + posixpath.samestat( + os.stat(test_support.TESTFN + "1"), + os.stat(test_support.TESTFN + "2") + ), + True + ) + os.remove(test_support.TESTFN + "2") f = open(test_support.TESTFN + "2", "wb") f.write("bar") f.close() -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (ce3f0399ea33): sum=2
by solipsis＠pitrou.net 30 Nov '12

30 Nov '12

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

1 0

cpython (2.7): Backport from 3.2: improve argument/parameter documentation (issue #15990).
by chris.jerdonek 30 Nov '12

30 Nov '12

http://hg.python.org/cpython/rev/f44b8d69e5fc changeset: 80663:f44b8d69e5fc branch: 2.7 user: Chris Jerdonek <chris.jerdonek(a)gmail.com> date: Thu Nov 29 19:03:37 2012 -0800 summary: Backport from 3.2: improve argument/parameter documentation (issue #15990). The corresponding 3.x commits are 69d5d834c5cb, 40fd26a4206b, and 74d8a2a20c52. files: Doc/faq/programming.rst | 21 +++++++ Doc/glossary.rst | 85 ++++++++++++++++++++++------ Misc/NEWS | 2 + 3 files changed, 90 insertions(+), 18 deletions(-) diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -469,6 +469,27 @@ apply(g, (x,)+args, kwargs) +.. _faq-argument-vs-parameter: + +What is the difference between arguments and parameters? +-------------------------------------------------------- + +:term:`Parameters <parameter>` are defined by the names that appear in a +function definition, whereas :term:`arguments <argument>` are the values +actually passed to a function when calling it. Parameters define what types of +arguments a function can accept. For example, given the function definition:: + + def func(foo, bar=None, **kwargs): + pass + +*foo*, *bar* and *kwargs* are parameters of ``func``. However, when calling +``func``, for example:: + + func(42, bar=314, extra=somevar) + +the values ``42``, ``314``, and ``somevar`` are arguments. + + How do I write a function with output parameters (call by reference)? --------------------------------------------------------------------- diff --git a/Doc/glossary.rst b/Doc/glossary.rst --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -39,16 +39,34 @@ create your own ABCs with the :mod:`abc` module. argument - A value passed to a function or method, assigned to a named local - variable in the function body. A function or method may have both - positional arguments and keyword arguments in its definition. - Positional and keyword arguments may be variable-length: ``*`` accepts - or passes (if in the function definition or call) several positional - arguments in a list, while ``**`` does the same for keyword arguments - in a dictionary. + A value passed to a :term:`function` (or :term:`method`) when calling the + function. There are two types of arguments: - Any expression may be used within the argument list, and the evaluated - value is passed to the local variable. + * :dfn:`keyword argument`: an argument preceded by an identifier (e.g. + ``name=``) in a function call or passed as a value in a dictionary + preceded by ``**``. For example, ``3`` and ``5`` are both keyword + arguments in the following calls to :func:`complex`:: + + complex(real=3, imag=5) + complex(**{'real': 3, 'imag': 5}) + + * :dfn:`positional argument`: an argument that is not a keyword argument. + Positional arguments can appear at the beginning of an argument list + and/or be passed as elements of an :term:`iterable` preceded by ``*``. + For example, ``3`` and ``5`` are both positional arguments in the + following calls:: + + complex(3, 5) + complex(*(3, 5)) + + Arguments are assigned to the named local variables in a function body. + See the :ref:`calls` section for the rules governing this assignment. + Syntactically, any expression can be used to represent an argument; the + evaluated value is assigned to the local variable. + + See also the :term:`parameter` glossary entry and the FAQ question on + :ref:`the difference between arguments and parameters + <faq-argument-vs-parameter>`. attribute A value associated with an object which is referenced by name using @@ -412,10 +430,7 @@ <sortinghowto>` for examples of how to create and use key functions. keyword argument - Arguments which are preceded with a ``variable_name=`` in the call. - The variable name designates the local name in the function to which the - value is assigned. ``**`` is used to accept or pass a dictionary of - keyword arguments. See :term:`argument`. + See :term:`argument`. lambda An anonymous inline function consisting of a single :term:`expression` @@ -537,12 +552,46 @@ (methods). Also the ultimate base class of any :term:`new-style class`. + parameter + A named entity in a :term:`function` (or method) definition that + specifies an :term:`argument` (or in some cases, arguments) that the + function can accept. There are four types of parameters: + + * :dfn:`positional-or-keyword`: specifies an argument that can be passed + either :term:`positionally <argument>` or as a :term:`keyword argument + <argument>`. This is the default kind of parameter, for example *foo* + and *bar* in the following:: + + def func(foo, bar=None): ... + + * :dfn:`positional-only`: specifies an argument that can be supplied only + by position. Python has no syntax for defining positional-only + parameters. However, some built-in functions have positional-only + parameters (e.g. :func:`abs`). + + * :dfn:`var-positional`: specifies that an arbitrary sequence of + positional arguments can be provided (in addition to any positional + arguments already accepted by other parameters). Such a parameter can + be defined by prepending the parameter name with ``*``, for example + *args* in the following:: + + def func(*args, **kwargs): ... + + * :dfn:`var-keyword`: specifies that arbitrarily many keyword arguments + can be provided (in addition to any keyword arguments already accepted + by other parameters). Such a parameter can be defined by prepending + the parameter name with ``**``, for example *kwargs* in the example + above. + + Parameters can specify both optional and required arguments, as well as + default values for some optional arguments. + + See also the :term:`argument` glossary entry, the FAQ question on + :ref:`the difference between arguments and parameters + <faq-argument-vs-parameter>`, and the :ref:`function` section. + positional argument - The arguments assigned to local names inside a function or method, - determined by the order in which they were given in the call. ``*`` is - used to either accept multiple positional arguments (when in the - definition), or pass several arguments as a list to a function. See - :term:`argument`. + See :term:`argument`. Python 3000 Nickname for the Python 3.x release line (coined long ago when the release diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -594,6 +594,8 @@ Documentation ------------- +- Issue #15990: Improve argument/parameter documentation. + - Issue #16400: Update the description of which versions of a given package PyPI displays. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 2.7 -> 2.7): merge heads
by andrew.svetlov 29 Nov '12

29 Nov '12

http://hg.python.org/cpython/rev/40b71097d255 changeset: 80662:40b71097d255 branch: 2.7 parent: 80659:c704130f9221 parent: 80661:94de77bd0b4b user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Thu Nov 29 19:52:21 2012 +0200 summary: merge heads files: Doc/library/imp.rst | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst --- a/Doc/library/imp.rst +++ b/Doc/library/imp.rst @@ -237,6 +237,17 @@ using shared libraries is highly system dependent, and not all systems support it.) + .. impl-detail:: + + The import internals identify extension modules by filename, so doing + ``foo = load_dynamic("foo", "mod.so")`` and + ``bar = load_dynamic("bar", "mod.so")`` will result in both foo and bar + referring to the same module, regardless of whether or not + ``mod.so`` exports an ``initbar`` function. On systems which + support them, symlinks can be used to import multiple modules from + the same shared library, as each reference to the module will use + a different file name. + .. function:: load_source(name, pathname[, file]) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #16194: document imp.load_dynamic problems
by andrew.svetlov 29 Nov '12

29 Nov '12

http://hg.python.org/cpython/rev/94de77bd0b4b changeset: 80661:94de77bd0b4b branch: 2.7 parent: 80651:ea4bdf5a2e69 user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Thu Nov 29 19:51:28 2012 +0200 summary: Issue #16194: document imp.load_dynamic problems when read several extension modules from the same binary object file. files: Doc/library/imp.rst | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst --- a/Doc/library/imp.rst +++ b/Doc/library/imp.rst @@ -237,6 +237,17 @@ using shared libraries is highly system dependent, and not all systems support it.) + .. impl-detail:: + + The import internals identify extension modules by filename, so doing + ``foo = load_dynamic("foo", "mod.so")`` and + ``bar = load_dynamic("bar", "mod.so")`` will result in both foo and bar + referring to the same module, regardless of whether or not + ``mod.so`` exports an ``initbar`` function. On systems which + support them, symlinks can be used to import multiple modules from + the same shared library, as each reference to the module will use + a different file name. + .. function:: load_source(name, pathname[, file]) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): merge 3.3 (#16573)
by benjamin.peterson 29 Nov '12

29 Nov '12

http://hg.python.org/cpython/rev/ce3f0399ea33 changeset: 80660:ce3f0399ea33 parent: 80653:efedd0f62a7e parent: 80658:cff7995ca7e8 user: Benjamin Peterson <benjamin(a)python.org> date: Thu Nov 29 10:58:43 2012 -0500 summary: merge 3.3 (#16573) files: Lib/lib2to3/fixer_util.py | 12 ++++++------ Lib/lib2to3/tests/test_fixers.py | 12 ++++++++++++ Misc/NEWS | 4 ++++ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Lib/lib2to3/fixer_util.py b/Lib/lib2to3/fixer_util.py --- a/Lib/lib2to3/fixer_util.py +++ b/Lib/lib2to3/fixer_util.py @@ -165,7 +165,7 @@ consuming_calls = set(["sorted", "list", "set", "any", "all", "tuple", "sum", - "min", "max"]) + "min", "max", "enumerate"]) def attr_chain(obj, attr): """Follow an attribute chain. @@ -192,14 +192,14 @@ p1 = """ power< ( 'iter' | 'list' | 'tuple' | 'sorted' | 'set' | 'sum' | - 'any' | 'all' | (any* trailer< '.' 'join' >) ) + 'any' | 'all' | 'enumerate' | (any* trailer< '.' 'join' >) ) trailer< '(' node=any ')' > any* > """ p2 = """ power< - 'sorted' + ( 'sorted' | 'enumerate' ) trailer< '(' arglist<node=any any*> ')' > any* > @@ -207,14 +207,14 @@ pats_built = False def in_special_context(node): """ Returns true if node is in an environment where all that is required - of it is being itterable (ie, it doesn't matter if it returns a list - or an itterator). + of it is being iterable (ie, it doesn't matter if it returns a list + or an iterator). See test_map_nochange in test_fixers.py for some examples and tests. """ global p0, p1, p2, pats_built if not pats_built: + p0 = patcomp.compile_pattern(p0) p1 = patcomp.compile_pattern(p1) - p0 = patcomp.compile_pattern(p0) p2 = patcomp.compile_pattern(p2) pats_built = True patterns = [p0, p1, p2] diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py --- a/Lib/lib2to3/tests/test_fixers.py +++ b/Lib/lib2to3/tests/test_fixers.py @@ -2981,6 +2981,10 @@ self.unchanged(a) a = """sorted(filter(f, 'abc'), key=blah)[0]""" self.unchanged(a) + a = """enumerate(filter(f, 'abc'))""" + self.unchanged(a) + a = """enumerate(filter(f, 'abc'), start=1)""" + self.unchanged(a) a = """for i in filter(f, 'abc'): pass""" self.unchanged(a) a = """[x for x in filter(f, 'abc')]""" @@ -3089,6 +3093,10 @@ self.unchanged(a) a = """sorted(map(f, 'abc'), key=blah)[0]""" self.unchanged(a) + a = """enumerate(map(f, 'abc'))""" + self.unchanged(a) + a = """enumerate(map(f, 'abc'), start=1)""" + self.unchanged(a) a = """for i in map(f, 'abc'): pass""" self.unchanged(a) a = """[x for x in map(f, 'abc')]""" @@ -3152,6 +3160,10 @@ self.unchanged(a) a = """sorted(zip(a, b), key=blah)[0]""" self.unchanged(a) + a = """enumerate(zip(a, b))""" + self.unchanged(a) + a = """enumerate(zip(a, b), start=1)""" + self.unchanged(a) a = """for i in zip(a, b): pass""" self.unchanged(a) a = """[x for x in zip(a, b)]""" diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -143,6 +143,10 @@ - Issue #16333: use (",", ": ") as default separator when indent is specified to avoid trailing whitespace. Patch by Serhiy Storchaka. +- Issue #16573: In 2to3, treat enumerate() like a consuming call, so superfluous + list() calls aren't added to filter(), map(), and zip() which are directly + passed enumerate(). + - Issue #16549: Make json.tool work again on Python 3 and add tests. Initial patch by Berker Peksag and Serhiy Storchaka. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): add changelog
by benjamin.peterson 29 Nov '12

29 Nov '12

http://hg.python.org/cpython/rev/c704130f9221 changeset: 80659:c704130f9221 branch: 2.7 parent: 80656:2bb604a691de user: Benjamin Peterson <benjamin(a)python.org> date: Thu Nov 29 10:57:01 2012 -0500 summary: add changelog files: Misc/NEWS | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -154,6 +154,10 @@ Library ------- +- Issue #16573: In 2to3, treat enumerate() like a consuming call, so superfluous + list() calls aren't added to filter(), map(), and zip() which are directly + passed enumerate(). + - Issue #16476: Fix json.tool to avoid including trailing whitespace. - Issue #1160: Fix compiling large regular expressions on UCS2 builds. -- Repository URL: http://hg.python.org/cpython

1 0