Mailman 3 July 2011 - Python-checkins

cpython (2.7): #12531: Fix spaces.
by ezio.melotti July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/952e83a8bc78 changeset: 71643:952e83a8bc78 branch: 2.7 parent: 71637:402f94edf11b user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sat Jul 30 21:31:22 2011 +0300 summary: #12531: Fix spaces. files: Doc/reference/expressions.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -741,7 +741,7 @@ If the syntax ``*expression`` appears in the function call, ``expression`` must 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 +*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*. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): #12531: Fix spaces and markup.
by ezio.melotti July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/8862ec62f9ee changeset: 71641:8862ec62f9ee branch: 3.2 parent: 71634:99e9816b7d8b user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sat Jul 30 21:25:22 2011 +0300 summary: #12531: Fix spaces and markup. files: Doc/reference/expressions.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -673,7 +673,7 @@ If the syntax ``*expression`` appears in the function call, ``expression`` must 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*, +*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*. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): #12531: merge with 3.2.
by ezio.melotti July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/b47c9982506c changeset: 71642:b47c9982506c parent: 71640:6af7cb290a24 parent: 71641:8862ec62f9ee user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sat Jul 30 21:26:40 2011 +0300 summary: #12531: merge with 3.2. files: Doc/reference/expressions.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -673,7 +673,7 @@ If the syntax ``*expression`` appears in the function call, ``expression`` must 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*, +*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*. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: transition move technically correct to obviously so
by benjamin.peterson July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/6af7cb290a24 changeset: 71640:6af7cb290a24 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jul 30 12:26:27 2011 -0500 summary: transition move technically correct to obviously so files: Doc/library/stdtypes.rst | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2706,7 +2706,7 @@ This object is returned by functions that don't explicitly return a value. It supports no special operations. There is exactly one null object, named -``None`` (a built-in name). Calling ``type(None)`` produces the same singleton. +``None`` (a built-in name). ``type(None)()`` produces the same singleton. It is written as ``None``. @@ -2718,7 +2718,7 @@ This object is commonly used by slicing (see :ref:`slicings`). It supports no special operations. There is exactly one ellipsis object, named -:const:`Ellipsis` (a built-in name). Calling ``type(Ellipsis)`` produces the +:const:`Ellipsis` (a built-in name). ``type(Ellipsis)()`` produces the :const:`Ellipsis` singleton. It is written as ``Ellipsis`` or ``...``. @@ -2729,8 +2729,8 @@ This object is returned from comparisons and binary operations when they are asked to operate on types they don't support. See :ref:`comparisons` for more -information. There is exactly one ``NotImplemented`` object. Calling -``type(NotImplemented)`` produces the singleton instance. +information. There is exactly one ``NotImplemented`` object. +``type(NotImplemented)()`` produces the singleton instance. It is written as ``NotImplemented``. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue 12647: Add __bool__() method to the None object.
by raymond.hettinger July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/ccce01988603 changeset: 71542:ccce01988603 user: Raymond Hettinger <python(a)rcn.com> date: Thu Jul 28 09:55:13 2011 -0700 summary: Issue 12647: Add __bool__() method to the None object. files: Lib/test/test_descr.py | 3 - Misc/NEWS | 4 ++ Objects/object.c | 46 ++++++++++++++++++++++++++++- 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -2068,9 +2068,6 @@ # Two essentially featureless objects, just inheriting stuff from # object. self.assertEqual(dir(NotImplemented), dir(Ellipsis)) - if support.check_impl_detail(): - # None differs in PyPy: it has a __nonzero__ - self.assertEqual(dir(None), dir(Ellipsis)) # Nasty test case for proxied objects class Wrapper(object): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,10 @@ - Verify the types of AST strings and identifiers provided by the user before compiling them. +- Issue #12647: The None object now has a __bool__() method that returns False. + Formerly, bool(None) returned False only because of special case logic + in PyObject_IsTrue(). + - Issue #12579: str.format_map() now raises a ValueError if used on a format string that contains positional fields. Initial patch by Julian Berman. diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1255,7 +1255,7 @@ } /* -None is as a non-NULL undefined value. +None is a non-NULL undefined value. There is (and should be!) no way to create other objects of this type, so there is exactly one (which is indestructible, by the way). */ @@ -1277,6 +1277,48 @@ Py_FatalError("deallocating None"); } +static int +none_bool(PyObject *v) +{ + return 0; +} + +static PyNumberMethods none_as_number = { + 0, /* nb_add */ + 0, /* nb_subtract */ + 0, /* nb_multiply */ + 0, /* nb_remainder */ + 0, /* nb_divmod */ + 0, /* nb_power */ + 0, /* nb_negative */ + 0, /* nb_positive */ + 0, /* nb_absolute */ + (inquiry)none_bool, /* nb_bool */ + 0, /* nb_invert */ + 0, /* nb_lshift */ + 0, /* nb_rshift */ + 0, /* nb_and */ + 0, /* nb_xor */ + 0, /* nb_or */ + 0, /* nb_int */ + 0, /* nb_reserved */ + 0, /* nb_float */ + 0, /* nb_inplace_add */ + 0, /* nb_inplace_subtract */ + 0, /* nb_inplace_multiply */ + 0, /* nb_inplace_remainder */ + 0, /* nb_inplace_power */ + 0, /* nb_inplace_lshift */ + 0, /* nb_inplace_rshift */ + 0, /* nb_inplace_and */ + 0, /* nb_inplace_xor */ + 0, /* nb_inplace_or */ + 0, /* nb_floor_divide */ + 0, /* nb_true_divide */ + 0, /* nb_inplace_floor_divide */ + 0, /* nb_inplace_true_divide */ + 0, /* nb_index */ +}; static PyTypeObject PyNone_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) @@ -1289,7 +1331,7 @@ 0, /*tp_setattr*/ 0, /*tp_reserved*/ none_repr, /*tp_repr*/ - 0, /*tp_as_number*/ + &none_as_number, /*tp_as_number*/ 0, /*tp_as_sequence*/ 0, /*tp_as_mapping*/ 0, /*tp_hash */ -- Repository URL: http://hg.python.org/cpython

3 2

cpython: we can call singleton types now
by benjamin.peterson July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/4a07b772f0e0 changeset: 71639:4a07b772f0e0 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jul 30 10:03:09 2011 -0500 summary: we can call singleton types now files: Doc/library/stdtypes.rst | 8 +++++--- 1 files changed, 5 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 @@ -2706,7 +2706,7 @@ This object is returned by functions that don't explicitly return a value. It supports no special operations. There is exactly one null object, named -``None`` (a built-in name). +``None`` (a built-in name). Calling ``type(None)`` produces the same singleton. It is written as ``None``. @@ -2718,7 +2718,8 @@ This object is commonly used by slicing (see :ref:`slicings`). It supports no special operations. There is exactly one ellipsis object, named -:const:`Ellipsis` (a built-in name). +:const:`Ellipsis` (a built-in name). Calling ``type(Ellipsis)`` produces the +:const:`Ellipsis` singleton. It is written as ``Ellipsis`` or ``...``. @@ -2728,7 +2729,8 @@ This object is returned from comparisons and binary operations when they are asked to operate on types they don't support. See :ref:`comparisons` for more -information. +information. There is exactly one ``NotImplemented`` object. Calling +``type(NotImplemented)`` produces the singleton instance. It is written as ``NotImplemented``. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): merge 3.2
by benjamin.peterson July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/895831b940bd changeset: 71638:895831b940bd parent: 71632:8d1a046441ea parent: 71634:99e9816b7d8b user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jul 30 10:00:02 2011 -0500 summary: merge 3.2 files: Doc/library/stdtypes.rst | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2723,6 +2723,16 @@ It is written as ``Ellipsis`` or ``...``. +The NotImplemented Object +------------------------- + +This object is returned from comparisons and binary operations when they are +asked to operate on types they don't support. See :ref:`comparisons` for more +information. + +It is written as ``NotImplemented``. + + Boolean Values -------------- -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): note Ellipsis syntax
by benjamin.peterson July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/402f94edf11b changeset: 71637:402f94edf11b branch: 2.7 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jul 30 09:59:12 2011 -0500 summary: note Ellipsis syntax files: Doc/library/stdtypes.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2930,7 +2930,7 @@ supports no special operations. There is exactly one ellipsis object, named :const:`Ellipsis` (a built-in name). -It is written as ``Ellipsis``. +It is written as ``Ellipsis`` or ``...``. The NotImplemented Object -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): add space
by benjamin.peterson July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/5a9272785d5f changeset: 71636:5a9272785d5f branch: 2.7 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jul 30 09:58:59 2011 -0500 summary: add space files: Doc/library/stdtypes.rst | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2932,6 +2932,7 @@ It is written as ``Ellipsis``. + The NotImplemented Object ------------------------- -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): document NotImplemented
by benjamin.peterson July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/1446c126d6f2 changeset: 71635:1446c126d6f2 branch: 2.7 parent: 71628:5a248fcfa112 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jul 30 09:57:24 2011 -0500 summary: document NotImplemented files: Doc/library/stdtypes.rst | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2932,6 +2932,15 @@ It is written as ``Ellipsis``. +The NotImplemented Object +------------------------- + +This object is returned from comparisons and binary operations when they are +asked to operate on types they don't support. See :ref:`comparisons` for more +information. + +It is written as ``NotImplemented``. + Boolean Values -------------- -- Repository URL: http://hg.python.org/cpython

1 0