Mailman 3 May 2016 - Python-checkins

cpython: Improved docs for issue27033. Based on comments by R. David Murray.
by serhiy.storchaka May 29, 2016

May 29, 2016

https://hg.python.org/cpython/rev/9abde519cc1e changeset: 101563:9abde519cc1e user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun May 29 23:43:24 2016 +0300 summary: Improved docs for issue27033. Based on comments by R. David Murray. files: Doc/library/smtpd.rst | 10 +++++----- Doc/whatsnew/3.6.rst | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst --- a/Doc/library/smtpd.rst +++ b/Doc/library/smtpd.rst @@ -52,8 +52,8 @@ cannot be set to ``True`` at the same time. *decode_data* specifies whether the data portion of the SMTP transaction - should be decoded using UTF-8. The default is ``False``. When - *decode_data* is not set to ``True`` the server advertises the ``8BITMIME`` + should be decoded using UTF-8. When *decode_data* is ``False`` (the + default), the server advertises the ``8BITMIME`` extension (:rfc:`6152`), accepts the ``BODY=8BITMIME`` parameter to the ``MAIL`` command, and when present passes it to :meth:`process_message` in the ``kwargs['mail_options']`` list. *decode_data* and *enable_SMTPUTF8* @@ -70,7 +70,7 @@ format). If the *decode_data* constructor keyword is set to ``True``, the *data* - parameter will be a unicode string. If it is set to ``False``, it + argument will be a unicode string. If it is set to ``False``, it will be a bytes object. *kwargs* is a dictionary containing additional information. It is empty @@ -107,8 +107,8 @@ .. versionadded:: 3.5 The *decode_data* and *enable_SMTPUTF8* constructor parameters, and the - *kwargs* parameter to :meth:`process_message` when one or more of these is - specified. + *kwargs* parameter to :meth:`process_message` when *decode_data* is + ``False``. .. versionchanged:: 3.6 *decode_data* is now ``False`` by default. diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst --- a/Doc/whatsnew/3.6.rst +++ b/Doc/whatsnew/3.6.rst @@ -640,6 +640,14 @@ an error (e.g. EBADF) was reported by the underlying system call. See :issue:`26685`. +* The *decode_data* argument for :class:`smtpd.SMTPChannel` and + :class:`smtpd.SMTPServer` constructors is now ``False`` by default. + This means that the argument passed to + :meth:`~smtpd.SMTPServer.process_message` is now a bytes object by + default, and ``process_message()`` will be passed keyword arguments. + Code that has already been updated in accordance with the deprecation + warning generated by 3.5 will not be affected. + Changes in the C API -------------------- -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge default -> default): Merge heads
by terry.reedy May 29, 2016

May 29, 2016

https://hg.python.org/cpython/rev/d251106cf095 changeset: 101562:d251106cf095 parent: 101560:169551a8d5d1 parent: 101561:0bbcb4cd64ba user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Sun May 29 12:47:38 2016 -0400 summary: Merge heads files: -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Null merge
by terry.reedy May 29, 2016

May 29, 2016

https://hg.python.org/cpython/rev/0bbcb4cd64ba changeset: 101561:0bbcb4cd64ba parent: 101556:c95864a37ee2 parent: 101557:f383eaf207ca user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Sun May 29 12:42:46 2016 -0400 summary: Null merge files: -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Issue #27125: Merge typo fixes from 3.5
by martin.panter May 29, 2016

May 29, 2016

https://hg.python.org/cpython/rev/169551a8d5d1 changeset: 101560:169551a8d5d1 parent: 101556:c95864a37ee2 parent: 101559:f7c85accbde9 user: Martin Panter <vadmium+py(a)gmail.com> date: Sun May 29 09:05:06 2016 +0000 summary: Issue #27125: Merge typo fixes from 3.5 Also merge changes from Issue #27117; no actual code changes to 3.6. files: Doc/library/collections.rst | 2 +- Doc/library/multiprocessing.rst | 2 +- Doc/library/os.rst | 2 +- Doc/library/shlex.rst | 3 ++- Doc/library/typing.rst | 2 +- Doc/whatsnew/2.6.rst | 2 +- Lib/collections/__init__.py | 3 ++- Lib/email/message.py | 2 +- Lib/test/test_httplib.py | 4 ++-- Lib/tkinter/tix.py | 2 +- Misc/HISTORY | 4 ++-- Objects/object.c | 2 +- README | 2 +- 13 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -56,7 +56,7 @@ dictionary is provided so that a new chain always has at least one mapping. The underlying mappings are stored in a list. That list is public and can - accessed or updated using the *maps* attribute. There is no other state. + be accessed or updated using the *maps* attribute. There is no other state. Lookups search the underlying mappings successively until a key is found. In contrast, writes, updates, and deletions only operate on the first mapping. diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -2484,7 +2484,7 @@ If authentication is requested but no authentication key is specified then the return value of ``current_process().authkey`` is used (see -:class:`~multiprocessing.Process`). This value will automatically inherited by +:class:`~multiprocessing.Process`). This value will be automatically inherited by any :class:`~multiprocessing.Process` object that the current process creates. This means that (by default) all processes of a multi-process program will share a single authentication key which can be used when setting up connections diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -3507,7 +3507,7 @@ .. data:: SCHED_RESET_ON_FORK - This flag can OR'ed with any other scheduling policy. When a process with + This flag can be OR'ed with any other scheduling policy. When a process with this flag set forks, its child's scheduling policy and priority are reset to the default. diff --git a/Doc/library/shlex.rst b/Doc/library/shlex.rst --- a/Doc/library/shlex.rst +++ b/Doc/library/shlex.rst @@ -244,7 +244,8 @@ This attribute is ``None`` by default. If you assign a string to it, that string will be recognized as a lexical-level inclusion request similar to the ``source`` keyword in various shells. That is, the immediately following token - will opened as a filename and input taken from that stream until EOF, at which + will be opened as a filename and input will + be taken from that stream until EOF, at which point the :meth:`~io.IOBase.close` method of that stream will be called and the input source will again become the original input stream. Source requests may be stacked any number of levels deep. diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -156,7 +156,7 @@ class LinkedList(Sized, Generic[T]): ... -When inheriting from generic classes, some type variables could fixed:: +When inheriting from generic classes, some type variables could be fixed:: from typing import TypeVar, Mapping diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -3154,7 +3154,7 @@ :func:`macostools.touched` function to be removed because it depended on the :mod:`macfs` module. (:issue:`1490190`) -* Many other Mac OS modules have been deprecated and will removed in +* Many other Mac OS modules have been deprecated and will be removed in Python 3.0: :mod:`_builtinSuites`, :mod:`aepack`, diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -850,7 +850,8 @@ to create a single, updateable view. The underlying mappings are stored in a list. That list is public and can - accessed or updated using the *maps* attribute. There is no other state. + be accessed or updated using the *maps* attribute. There is no other + state. Lookups search the underlying mappings successively until a key is found. In contrast, writes, updates, and deletions only operate on the first diff --git a/Lib/email/message.py b/Lib/email/message.py --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -710,7 +710,7 @@ message, it will be set to "text/plain" and the new parameter and value will be appended as per RFC 2045. - An alternate header can specified in the header argument, and all + An alternate header can be specified in the header argument, and all parameters will be quoted as necessary unless requote is False. If charset is specified, the parameter will be encoded according to RFC diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -255,8 +255,8 @@ self.assertIn(b'\xa0NonbreakSpace: value', conn._buffer) def test_ipv6host_header(self): - # Default host header on IPv6 transaction should wrapped by [] if - # its actual IPv6 address + # Default host header on IPv6 transaction should be wrapped by [] if + # it is an IPv6 address expected = b'GET /foo HTTP/1.1\r\nHost: [2001::]:81\r\n' \ b'Accept-Encoding: identity\r\n\r\n' conn = client.HTTPConnection('[2001::]:81') diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py --- a/Lib/tkinter/tix.py +++ b/Lib/tkinter/tix.py @@ -1048,7 +1048,7 @@ class LabelEntry(TixWidget): """LabelEntry - Entry field with label. Packages an entry widget - and a label into one mega widget. It can beused be used to simplify + and a label into one mega widget. It can be used be used to simplify the creation of ``entry-form'' type of interface. Subwidgets Class diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -6633,7 +6633,7 @@ PyErr_Format, on machines with HAVE_LONG_LONG defined. - Issue #6151: Made PyDescr_COMMON conform to standard C (like PyObject_HEAD in - PEP 3123). The PyDescr_TYPE and PyDescr_NAME macros should be should used for + PEP 3123). The PyDescr_TYPE and PyDescr_NAME macros should be used for accessing the d_type and d_name members of structures using PyDescr_COMMON. - Issue #6405: Remove duplicate type declarations in descrobject.h. @@ -16065,7 +16065,7 @@ - All standard iterators now ensure that, once StopIteration has been raised, all future calls to next() on the same iterator will also raise StopIteration. There used to be various counterexamples to - this behavior, which could caused confusion or subtle program + this behavior, which could have caused confusion or subtle program breakage, without any benefits. (Note that this is still an iterator's responsibility; the iterator framework does not enforce this.) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1853,7 +1853,7 @@ /* These methods are used to control infinite recursion in repr, str, print, etc. Container objects that may recursively contain themselves, - e.g. builtin dictionaries and lists, should used Py_ReprEnter() and + e.g. builtin dictionaries and lists, should use Py_ReprEnter() and Py_ReprLeave() to avoid infinite recursion. Py_ReprEnter() returns 0 the first time it is called for a particular diff --git a/README b/README --- a/README +++ b/README @@ -58,7 +58,7 @@ If ran, the "profile-opt" rule will do several steps. First, the entire Python directory is cleaned of temporary files that -may resulted in a previous compilation. +may have resulted in a previous compilation. Then, an instrumented version of the interpreter is built, using suitable compiler flags for each flavour. Note that this is just an intermediary -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #27125: Fix various errors like “will [be] inherited”
by martin.panter May 29, 2016

May 29, 2016

https://hg.python.org/cpython/rev/f7c85accbde9 changeset: 101559:f7c85accbde9 branch: 3.5 parent: 101557:f383eaf207ca user: Martin Panter <vadmium+py(a)gmail.com> date: Sun May 29 04:13:35 2016 +0000 summary: Issue #27125: Fix various errors like “will [be] inherited” files: Doc/library/collections.rst | 2 +- Doc/library/multiprocessing.rst | 2 +- Doc/library/os.rst | 2 +- Doc/library/shlex.rst | 3 ++- Doc/library/typing.rst | 2 +- Doc/whatsnew/2.6.rst | 2 +- Lib/collections/__init__.py | 3 ++- Lib/email/message.py | 2 +- Lib/test/test_httplib.py | 4 ++-- Lib/tkinter/tix.py | 2 +- Misc/HISTORY | 4 ++-- Objects/object.c | 2 +- README | 2 +- 13 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -56,7 +56,7 @@ dictionary is provided so that a new chain always has at least one mapping. The underlying mappings are stored in a list. That list is public and can - accessed or updated using the *maps* attribute. There is no other state. + be accessed or updated using the *maps* attribute. There is no other state. Lookups search the underlying mappings successively until a key is found. In contrast, writes, updates, and deletions only operate on the first mapping. diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -2478,7 +2478,7 @@ If authentication is requested but no authentication key is specified then the return value of ``current_process().authkey`` is used (see -:class:`~multiprocessing.Process`). This value will automatically inherited by +:class:`~multiprocessing.Process`). This value will be automatically inherited by any :class:`~multiprocessing.Process` object that the current process creates. This means that (by default) all processes of a multi-process program will share a single authentication key which can be used when setting up connections diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -3486,7 +3486,7 @@ .. data:: SCHED_RESET_ON_FORK - This flag can OR'ed with any other scheduling policy. When a process with + This flag can be OR'ed with any other scheduling policy. When a process with this flag set forks, its child's scheduling policy and priority are reset to the default. diff --git a/Doc/library/shlex.rst b/Doc/library/shlex.rst --- a/Doc/library/shlex.rst +++ b/Doc/library/shlex.rst @@ -244,7 +244,8 @@ This attribute is ``None`` by default. If you assign a string to it, that string will be recognized as a lexical-level inclusion request similar to the ``source`` keyword in various shells. That is, the immediately following token - will opened as a filename and input taken from that stream until EOF, at which + will be opened as a filename and input will + be taken from that stream until EOF, at which point the :meth:`~io.IOBase.close` method of that stream will be called and the input source will again become the original input stream. Source requests may be stacked any number of levels deep. diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -156,7 +156,7 @@ class LinkedList(Sized, Generic[T]): ... -When inheriting from generic classes, some type variables could fixed:: +When inheriting from generic classes, some type variables could be fixed:: from typing import TypeVar, Mapping diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -3154,7 +3154,7 @@ :func:`macostools.touched` function to be removed because it depended on the :mod:`macfs` module. (:issue:`1490190`) -* Many other Mac OS modules have been deprecated and will removed in +* Many other Mac OS modules have been deprecated and will be removed in Python 3.0: :mod:`_builtinSuites`, :mod:`aepack`, diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -850,7 +850,8 @@ to create a single, updateable view. The underlying mappings are stored in a list. That list is public and can - accessed or updated using the *maps* attribute. There is no other state. + be accessed or updated using the *maps* attribute. There is no other + state. Lookups search the underlying mappings successively until a key is found. In contrast, writes, updates, and deletions only operate on the first diff --git a/Lib/email/message.py b/Lib/email/message.py --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -710,7 +710,7 @@ message, it will be set to "text/plain" and the new parameter and value will be appended as per RFC 2045. - An alternate header can specified in the header argument, and all + An alternate header can be specified in the header argument, and all parameters will be quoted as necessary unless requote is False. If charset is specified, the parameter will be encoded according to RFC diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -255,8 +255,8 @@ self.assertIn(b'\xa0NonbreakSpace: value', conn._buffer) def test_ipv6host_header(self): - # Default host header on IPv6 transaction should wrapped by [] if - # its actual IPv6 address + # Default host header on IPv6 transaction should be wrapped by [] if + # it is an IPv6 address expected = b'GET /foo HTTP/1.1\r\nHost: [2001::]:81\r\n' \ b'Accept-Encoding: identity\r\n\r\n' conn = client.HTTPConnection('[2001::]:81') diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py --- a/Lib/tkinter/tix.py +++ b/Lib/tkinter/tix.py @@ -1052,7 +1052,7 @@ class LabelEntry(TixWidget): """LabelEntry - Entry field with label. Packages an entry widget - and a label into one mega widget. It can beused be used to simplify + and a label into one mega widget. It can be used be used to simplify the creation of ``entry-form'' type of interface. Subwidgets Class diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -6633,7 +6633,7 @@ PyErr_Format, on machines with HAVE_LONG_LONG defined. - Issue #6151: Made PyDescr_COMMON conform to standard C (like PyObject_HEAD in - PEP 3123). The PyDescr_TYPE and PyDescr_NAME macros should be should used for + PEP 3123). The PyDescr_TYPE and PyDescr_NAME macros should be used for accessing the d_type and d_name members of structures using PyDescr_COMMON. - Issue #6405: Remove duplicate type declarations in descrobject.h. @@ -16065,7 +16065,7 @@ - All standard iterators now ensure that, once StopIteration has been raised, all future calls to next() on the same iterator will also raise StopIteration. There used to be various counterexamples to - this behavior, which could caused confusion or subtle program + this behavior, which could have caused confusion or subtle program breakage, without any benefits. (Note that this is still an iterator's responsibility; the iterator framework does not enforce this.) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1865,7 +1865,7 @@ /* These methods are used to control infinite recursion in repr, str, print, etc. Container objects that may recursively contain themselves, - e.g. builtin dictionaries and lists, should used Py_ReprEnter() and + e.g. builtin dictionaries and lists, should use Py_ReprEnter() and Py_ReprLeave() to avoid infinite recursion. Py_ReprEnter() returns 0 the first time it is called for a particular diff --git a/README b/README --- a/README +++ b/README @@ -58,7 +58,7 @@ If ran, the "profile-opt" rule will do several steps. First, the entire Python directory is cleaned of temporary files that -may resulted in a previous compilation. +may have resulted in a previous compilation. Then, an instrumented version of the interpreter is built, using suitable compiler flags for each flavour. Note that this is just an intermediary -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #27125: Fix various errors like “will [be] inherited”
by martin.panter May 29, 2016

May 29, 2016

https://hg.python.org/cpython/rev/c817d1b5b937 changeset: 101558:c817d1b5b937 branch: 2.7 parent: 101549:3ff84a3eeb6b user: Martin Panter <vadmium+py(a)gmail.com> date: Sun May 29 08:13:58 2016 +0000 summary: Issue #27125: Fix various errors like “will [be] inherited” files: Demo/tkinter/guido/canvasevents.py | 2 +- Doc/c-api/allocation.rst | 2 +- Doc/library/multiprocessing.rst | 4 ++-- Doc/library/shlex.rst | 3 ++- Doc/whatsnew/2.6.rst | 2 +- Lib/email/message.py | 2 +- Lib/lib-tk/Tix.py | 2 +- Lib/rfc822.py | 2 +- Lib/test/test_httplib.py | 4 ++-- Misc/HISTORY | 2 +- Objects/object.c | 2 +- README | 2 +- 12 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Demo/tkinter/guido/canvasevents.py b/Demo/tkinter/guido/canvasevents.py --- a/Demo/tkinter/guido/canvasevents.py +++ b/Demo/tkinter/guido/canvasevents.py @@ -24,7 +24,7 @@ depends on the object; for simple objects, it may be their center. Objects have mouse sensitivity. They can be clicked, dragged and - double-clicked. The behavior may actually determined by the pile + double-clicked. The behavior may actually be determined by the pile they are in. All instance attributes are public since the derived class may diff --git a/Doc/c-api/allocation.rst b/Doc/c-api/allocation.rst --- a/Doc/c-api/allocation.rst +++ b/Doc/c-api/allocation.rst @@ -98,7 +98,7 @@ Create a new module object based on a name and table of functions, returning the new module object. If *doc* is non-*NULL*, it will be used to define the docstring for the module. If *self* is non-*NULL*, it will - passed to the functions of the module as their (otherwise *NULL*) first + be passed to the functions of the module as their (otherwise *NULL*) first parameter. (This was added as an experimental feature, and there are no known uses in the current version of Python.) For *apiver*, the only value which should be passed is defined by the constant diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -2137,9 +2137,9 @@ authentication key. (Demonstrating that both ends are using the same key does **not** involve sending the key over the connection.) -If authentication is requested but do authentication key is specified then the +If authentication is requested but no authentication key is specified then the return value of ``current_process().authkey`` is used (see -:class:`~multiprocessing.Process`). This value will automatically inherited by +:class:`~multiprocessing.Process`). This value will be automatically inherited by any :class:`~multiprocessing.Process` object that the current process creates. This means that (by default) all processes of a multi-process program will share a single authentication key which can be used when setting up connections diff --git a/Doc/library/shlex.rst b/Doc/library/shlex.rst --- a/Doc/library/shlex.rst +++ b/Doc/library/shlex.rst @@ -231,7 +231,8 @@ This attribute is ``None`` by default. If you assign a string to it, that string will be recognized as a lexical-level inclusion request similar to the ``source`` keyword in various shells. That is, the immediately following token - will opened as a filename and input taken from that stream until EOF, at which + will be opened as a filename and input will + be taken from that stream until EOF, at which point the :meth:`~io.IOBase.close` method of that stream will be called and the input source will again become the original input stream. Source requests may be stacked any number of levels deep. diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -3150,7 +3150,7 @@ :func:`macostools.touched` function to be removed because it depended on the :mod:`macfs` module. (:issue:`1490190`) -* Many other Mac OS modules have been deprecated and will removed in +* Many other Mac OS modules have been deprecated and will be removed in Python 3.0: :mod:`_builtinSuites`, :mod:`aepack`, diff --git a/Lib/email/message.py b/Lib/email/message.py --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -579,7 +579,7 @@ message, it will be set to "text/plain" and the new parameter and value will be appended as per RFC 2045. - An alternate header can specified in the header argument, and all + An alternate header can be specified in the header argument, and all parameters will be quoted as necessary unless requote is False. If charset is specified, the parameter will be encoded according to RFC diff --git a/Lib/lib-tk/Tix.py b/Lib/lib-tk/Tix.py --- a/Lib/lib-tk/Tix.py +++ b/Lib/lib-tk/Tix.py @@ -1052,7 +1052,7 @@ class LabelEntry(TixWidget): """LabelEntry - Entry field with label. Packages an entry widget - and a label into one mega widget. It can beused be used to simplify + and a label into one mega widget. It can be used be used to simplify the creation of ``entry-form'' type of interface. Subwidgets Class diff --git a/Lib/rfc822.py b/Lib/rfc822.py --- a/Lib/rfc822.py +++ b/Lib/rfc822.py @@ -961,7 +961,7 @@ According to RFC 1123, day and month names must always be in English. If not for that, this code could use strftime(). It - can't because strftime() honors the locale and could generated + can't because strftime() honors the locale and could generate non-English names. """ if timeval is None: diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -213,8 +213,8 @@ self.assertIn(b'\xa0NonbreakSpace: value', conn._buffer) def test_ipv6host_header(self): - # Default host header on IPv6 transaction should wrapped by [] if - # its actual IPv6 address + # Default host header on IPv6 transaction should be wrapped by [] if + # it is an IPv6 address expected = 'GET /foo HTTP/1.1\r\nHost: [2001::]:81\r\n' \ 'Accept-Encoding: identity\r\n\r\n' conn = httplib.HTTPConnection('[2001::]:81') diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -5148,7 +5148,7 @@ - All standard iterators now ensure that, once StopIteration has been raised, all future calls to next() on the same iterator will also raise StopIteration. There used to be various counterexamples to - this behavior, which could caused confusion or subtle program + this behavior, which could have caused confusion or subtle program breakage, without any benefits. (Note that this is still an iterator's responsibility; the iterator framework does not enforce this.) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -2358,7 +2358,7 @@ /* These methods are used to control infinite recursion in repr, str, print, etc. Container objects that may recursively contain themselves, - e.g. builtin dictionaries and lists, should used Py_ReprEnter() and + e.g. builtin dictionaries and lists, should use Py_ReprEnter() and Py_ReprLeave() to avoid infinite recursion. Py_ReprEnter() returns 0 the first time it is called for a particular diff --git a/README b/README --- a/README +++ b/README @@ -197,7 +197,7 @@ If ran, the "profile-opt" rule will do several steps. First, the entire Python directory is cleaned of temporary files that -may resulted in a previous compilation. +may have resulted in a previous compilation. Then, an instrumented version of the interpreter is built, using suitable compiler flags for each flavour. Note that this is just an intermediary -- Repository URL: https://hg.python.org/cpython

1 0

Daily reference leaks (c95864a37ee2): sum=5
by solipsis＠pitrou.net May 29, 2016

May 29, 2016

results for c95864a37ee2 on branch "default" -------------------------------------------- test_asyncio leaked [3, 0, 0] memory blocks, sum=3 test_collections leaked [-2, 0, 0] references, sum=-2 test_collections leaked [3, 0, -4] memory blocks, sum=-1 test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_spawn leaked [-1, -1, 2] memory blocks, sum=0 test_smtplib leaked [1, 0, 0] references, sum=1 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogdZTIC1', '--timeout', '7200']

1 0

cpython (3.5): Issue #27117: Make ColorDelegator htest and turtledemo work with dark theme.
by terry.reedy May 29, 2016

May 29, 2016

https://hg.python.org/cpython/rev/f383eaf207ca changeset: 101557:f383eaf207ca branch: 3.5 parent: 101554:ef89ecb6debc user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Sun May 29 01:40:30 2016 -0400 summary: Issue #27117: Make ColorDelegator htest and turtledemo work with dark theme. Factor out code for configuring text widget colors to a new function. files: Lib/idlelib/ColorDelegator.py | 25 +++++++++++++++++++++++ Lib/idlelib/EditorWindow.py | 17 +------------- Lib/turtledemo/__main__.py | 5 +++- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/Lib/idlelib/ColorDelegator.py b/Lib/idlelib/ColorDelegator.py --- a/Lib/idlelib/ColorDelegator.py +++ b/Lib/idlelib/ColorDelegator.py @@ -2,6 +2,7 @@ import re import keyword import builtins +from tkinter import TkVersion from idlelib.Delegator import Delegator from idlelib.configHandler import idleConf @@ -32,6 +33,28 @@ prog = re.compile(make_pat(), re.S) idprog = re.compile(r"\s+(\w+)", re.S) +def color_config(text): # Called from htest, Editor, and Turtle Demo. + '''Set color opitons of Text widget. + + Should be called whenever ColorDelegator is called. + ''' + # Not automatic because ColorDelegator does not know 'text'. + theme = idleConf.CurrentTheme() + normal_colors = idleConf.GetHighlight(theme, 'normal') + cursor_color = idleConf.GetHighlight(theme, 'cursor', fgBg='fg') + select_colors = idleConf.GetHighlight(theme, 'hilite') + text.config( + foreground=normal_colors['foreground'], + background=normal_colors['background'], + insertbackground=cursor_color, + selectforeground=select_colors['foreground'], + selectbackground=select_colors['background'], + ) + if TkVersion >= 8.5: + text.config( + inactiveselectbackground=select_colors['background']) + + class ColorDelegator(Delegator): def __init__(self): @@ -233,6 +256,7 @@ for tag in self.tagdefs: self.tag_remove(tag, "1.0", "end") + def _color_delegator(parent): # htest # from tkinter import Toplevel, Text from idlelib.Percolator import Percolator @@ -247,6 +271,7 @@ text.insert("insert", source) text.focus_set() + color_config(text) p = Percolator(text) d = ColorDelegator() p.insertfilter(d) diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -90,7 +90,7 @@ class EditorWindow(object): from idlelib.Percolator import Percolator - from idlelib.ColorDelegator import ColorDelegator + from idlelib.ColorDelegator import ColorDelegator, color_config from idlelib.UndoDelegator import UndoDelegator from idlelib.IOBinding import IOBinding, filesystemencoding, encoding from idlelib import Bindings @@ -742,20 +742,7 @@ # Called from self.filename_change_hook and from configDialog.py self._rmcolorizer() self._addcolorizer() - theme = idleConf.CurrentTheme() - normal_colors = idleConf.GetHighlight(theme, 'normal') - cursor_color = idleConf.GetHighlight(theme, 'cursor', fgBg='fg') - select_colors = idleConf.GetHighlight(theme, 'hilite') - self.text.config( - foreground=normal_colors['foreground'], - background=normal_colors['background'], - insertbackground=cursor_color, - selectforeground=select_colors['foreground'], - selectbackground=select_colors['background'], - ) - if TkVersion >= 8.5: - self.text.config( - inactiveselectbackground=select_colors['background']) + EditorWindow.color_config(self.text) IDENTCHARS = string.ascii_letters + string.digits + "_" diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py --- a/Lib/turtledemo/__main__.py +++ b/Lib/turtledemo/__main__.py @@ -89,8 +89,8 @@ import os from tkinter import * +from idlelib.ColorDelegator import ColorDelegator, color_config from idlelib.Percolator import Percolator -from idlelib.ColorDelegator import ColorDelegator from idlelib.textView import view_text from turtledemo import __doc__ as about_turtledemo @@ -124,6 +124,8 @@ ('About turtle module', turtle.__doc__), ) + + class DemoWindow(object): def __init__(self, filename=None): @@ -204,6 +206,7 @@ self.text_frame = text_frame = Frame(root) self.text = text = Text(text_frame, name='text', padx=5, wrap='none', width=45) + color_config(text) self.vbar = vbar = Scrollbar(text_frame, name='vbar') vbar['command'] = text.yview -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #27117: Make colorizer htest and turtledemo work with dark theme.
by terry.reedy May 29, 2016

May 29, 2016

https://hg.python.org/cpython/rev/c95864a37ee2 changeset: 101556:c95864a37ee2 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Sun May 29 01:40:22 2016 -0400 summary: Issue #27117: Make colorizer htest and turtledemo work with dark theme. Factor out code for configuring text widget colors to a new function. files: Lib/idlelib/colorizer.py | 25 +++++++++++++++++++++++++ Lib/idlelib/editor.py | 17 ++--------------- Lib/turtledemo/__main__.py | 5 ++++- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/Lib/idlelib/colorizer.py b/Lib/idlelib/colorizer.py --- a/Lib/idlelib/colorizer.py +++ b/Lib/idlelib/colorizer.py @@ -2,6 +2,7 @@ import re import keyword import builtins +from tkinter import TkVersion from idlelib.delegator import Delegator from idlelib.config import idleConf @@ -32,6 +33,28 @@ prog = re.compile(make_pat(), re.S) idprog = re.compile(r"\s+(\w+)", re.S) +def color_config(text): # Called from htest, Editor, and Turtle Demo. + '''Set color opitons of Text widget. + + Should be called whenever ColorDelegator is called. + ''' + # Not automatic because ColorDelegator does not know 'text'. + theme = idleConf.CurrentTheme() + normal_colors = idleConf.GetHighlight(theme, 'normal') + cursor_color = idleConf.GetHighlight(theme, 'cursor', fgBg='fg') + select_colors = idleConf.GetHighlight(theme, 'hilite') + text.config( + foreground=normal_colors['foreground'], + background=normal_colors['background'], + insertbackground=cursor_color, + selectforeground=select_colors['foreground'], + selectbackground=select_colors['background'], + ) + if TkVersion >= 8.5: + text.config( + inactiveselectbackground=select_colors['background']) + + class ColorDelegator(Delegator): def __init__(self): @@ -233,6 +256,7 @@ for tag in self.tagdefs: self.tag_remove(tag, "1.0", "end") + def _color_delegator(parent): # htest # from tkinter import Toplevel, Text from idlelib.percolator import Percolator @@ -247,6 +271,7 @@ text.insert("insert", source) text.focus_set() + color_config(text) p = Percolator(text) d = ColorDelegator() p.insertfilter(d) diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py --- a/Lib/idlelib/editor.py +++ b/Lib/idlelib/editor.py @@ -90,7 +90,7 @@ class EditorWindow(object): from idlelib.percolator import Percolator - from idlelib.colorizer import ColorDelegator + from idlelib.colorizer import ColorDelegator, color_config from idlelib.undo import UndoDelegator from idlelib.iomenu import IOBinding, filesystemencoding, encoding from idlelib import mainmenu @@ -742,20 +742,7 @@ # Called from self.filename_change_hook and from configdialog.py self._rmcolorizer() self._addcolorizer() - theme = idleConf.CurrentTheme() - normal_colors = idleConf.GetHighlight(theme, 'normal') - cursor_color = idleConf.GetHighlight(theme, 'cursor', fgBg='fg') - select_colors = idleConf.GetHighlight(theme, 'hilite') - self.text.config( - foreground=normal_colors['foreground'], - background=normal_colors['background'], - insertbackground=cursor_color, - selectforeground=select_colors['foreground'], - selectbackground=select_colors['background'], - ) - if TkVersion >= 8.5: - self.text.config( - inactiveselectbackground=select_colors['background']) + EditorWindow.color_config(self.text) IDENTCHARS = string.ascii_letters + string.digits + "_" diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py --- a/Lib/turtledemo/__main__.py +++ b/Lib/turtledemo/__main__.py @@ -89,8 +89,8 @@ import os from tkinter import * +from idlelib.colorizer import ColorDelegator, color_config from idlelib.percolator import Percolator -from idlelib.colorizer import ColorDelegator from idlelib.textview import view_text from turtledemo import __doc__ as about_turtledemo @@ -123,6 +123,8 @@ ('About turtle module', turtle.__doc__), ) + + class DemoWindow(object): def __init__(self, filename=None): @@ -203,6 +205,7 @@ self.text_frame = text_frame = Frame(root) self.text = text = Text(text_frame, name='text', padx=5, wrap='none', width=45) + color_config(text) self.vbar = vbar = Scrollbar(text_frame, name='vbar') vbar['command'] = text.yview -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Issue #27124: Merge binascii doc from 3.5
by martin.panter May 29, 2016

May 29, 2016

https://hg.python.org/cpython/rev/85e6da63d73f changeset: 101555:85e6da63d73f parent: 101553:113b64e74e72 parent: 101554:ef89ecb6debc user: Martin Panter <vadmium+py(a)gmail.com> date: Sun May 29 00:56:02 2016 +0000 summary: Issue #27124: Merge binascii doc from 3.5 files: Doc/library/binascii.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst --- a/Doc/library/binascii.rst +++ b/Doc/library/binascii.rst @@ -152,8 +152,8 @@ Return the binary data represented by the hexadecimal string *hexstr*. This function is the inverse of :func:`b2a_hex`. *hexstr* must contain an even number - of hexadecimal digits (which can be upper or lower case), otherwise a - :exc:`TypeError` is raised. + of hexadecimal digits (which can be upper or lower case), otherwise an + :exc:`Error` exception is raised. .. exception:: Error -- Repository URL: https://hg.python.org/cpython

1 0