Mailman 3 November 2016 - Python-checkins

cpython (merge 3.6 -> default): Closes #27781: Removes special cases for the experimental aspect of PEP 529
by steve.dower Nov. 7, 2016

Nov. 7, 2016

https://hg.python.org/cpython/rev/b8233c779ff7 changeset: 104944:b8233c779ff7 parent: 104942:e60c1aef639a parent: 104943:b26c8104e54f user: Steve Dower <steve.dower(a)microsoft.com> date: Sun Nov 06 19:35:24 2016 -0800 summary: Closes #27781: Removes special cases for the experimental aspect of PEP 529 files: Doc/whatsnew/3.6.rst | 5 ----- Lib/test/test_os.py | 9 ++------- Misc/NEWS | 4 ++-- Objects/unicodeobject.c | 11 +---------- 4 files changed, 5 insertions(+), 24 deletions(-) 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 @@ -356,11 +356,6 @@ See :pep:`529` for more information and discussion of code modifications that may be required. -.. note:: - - This change is considered experimental for 3.6.0 beta releases. The default - encoding may change before the final release. - .. _whatsnew-pep487: PEP 487: Simpler customization of class creation diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -2860,13 +2860,8 @@ func(name, *func_args) except OSError as err: self.assertIs(err.filename, name, str(func)) - except RuntimeError as err: - if sys.platform != 'win32': - raise - - # issue27781: undecodable bytes currently raise RuntimeError - # by 3.6.0b4 this will become UnicodeDecodeError or nothing - self.assertIsInstance(err.__context__, UnicodeDecodeError) + except UnicodeDecodeError: + pass else: self.fail("No exception thrown by {}".format(func)) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -3278,7 +3278,7 @@ - Issue #24774: Fix docstring in http.server.test. Patch from Chiu-Hsiang Hsu. - Issue #21159: Improve message in configparser.InterpolationMissingOptionError. - Patch from �?ukasz Langa. + Patch from Łukasz Langa. - Issue #20362: Honour TestCase.longMessage correctly in assertRegex. Patch from Ilia Kurenkov. @@ -5206,7 +5206,7 @@ Based on patch by Martin Panter. - Issue #17293: uuid.getnode() now determines MAC address on AIX using netstat. - Based on patch by Aivars Kalv�?ns. + Based on patch by Aivars Kalvāns. - Issue #22769: Fixed ttk.Treeview.tag_has() when called without arguments. diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -3832,18 +3832,9 @@ cannot only rely on it: check also interp->fscodec_initialized for subinterpreters. */ if (Py_FileSystemDefaultEncoding && interp->fscodec_initialized) { - PyObject *res = PyUnicode_Decode(s, size, + return PyUnicode_Decode(s, size, Py_FileSystemDefaultEncoding, Py_FileSystemDefaultEncodeErrors); -#ifdef MS_WINDOWS - if (!res && PyErr_ExceptionMatches(PyExc_UnicodeDecodeError)) { - _PyErr_FormatFromCause(PyExc_RuntimeError, - "filesystem path bytes were not correctly encoded with '%s'. " - "Please report this at http://bugs.python.org/issue27781", - Py_FileSystemDefaultEncoding); - } -#endif - return res; } else { return PyUnicode_DecodeLocaleAndSize(s, size, Py_FileSystemDefaultEncodeErrors); -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.6): issue #28622: Remove redundant variable annotation test from test_grammar. Ivan
by guido.van.rossum Nov. 7, 2016

Nov. 7, 2016

https://hg.python.org/cpython/rev/048f82c86928 changeset: 104941:048f82c86928 branch: 3.6 parent: 104939:1f84be591d56 user: Guido van Rossum <guido(a)python.org> date: Sun Nov 06 18:25:39 2016 -0800 summary: issue #28622: Remove redundant variable annotation test from test_grammar. Ivan L. files: Lib/test/test_grammar.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py --- a/Lib/test/test_grammar.py +++ b/Lib/test/test_grammar.py @@ -359,9 +359,6 @@ self.assertEqual(ann_module.M.__annotations__, {'123': 123, 'o': type}) self.assertEqual(ann_module2.__annotations__, {}) - self.assertEqual(typing.get_type_hints(ann_module2.CV, - ann_module2.__dict__), - ChainMap({'var': typing.ClassVar[ann_module2.CV]}, {})) def test_var_annot_in_module(self): # check that functions fail the same way when executed -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): issue #28622: Remove redundant variable annotation test from test_grammar. Ivan
by guido.van.rossum Nov. 7, 2016

Nov. 7, 2016

https://hg.python.org/cpython/rev/e60c1aef639a changeset: 104942:e60c1aef639a parent: 104940:cc71f2c5aa68 parent: 104941:048f82c86928 user: Guido van Rossum <guido(a)python.org> date: Sun Nov 06 18:26:08 2016 -0800 summary: issue #28622: Remove redundant variable annotation test from test_grammar. Ivan L. (3.6->3.7) files: Lib/test/test_grammar.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py --- a/Lib/test/test_grammar.py +++ b/Lib/test/test_grammar.py @@ -359,9 +359,6 @@ self.assertEqual(ann_module.M.__annotations__, {'123': 123, 'o': type}) self.assertEqual(ann_module2.__annotations__, {}) - self.assertEqual(typing.get_type_hints(ann_module2.CV, - ann_module2.__dict__), - ChainMap({'var': typing.ClassVar[ann_module2.CV]}, {})) def test_var_annot_in_module(self): # check that functions fail the same way when executed -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): merge 3.6
by benjamin.peterson Nov. 6, 2016

Nov. 6, 2016

https://hg.python.org/cpython/rev/cc71f2c5aa68 changeset: 104940:cc71f2c5aa68 parent: 104937:442453fa3370 parent: 104939:1f84be591d56 user: Benjamin Peterson <benjamin(a)python.org> date: Sun Nov 06 13:01:23 2016 -0800 summary: merge 3.6 files: Objects/object.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1598,6 +1598,15 @@ if (PyType_Ready(&PyDict_Type) < 0) Py_FatalError("Can't initialize dict type"); + if (PyType_Ready(&PyDictKeys_Type) < 0) + Py_FatalError("Can't initialize dict keys type"); + + if (PyType_Ready(&PyDictValues_Type) < 0) + Py_FatalError("Can't initialize dict values type"); + + if (PyType_Ready(&PyDictItems_Type) < 0) + Py_FatalError("Can't initialize dict items type"); + if (PyType_Ready(&PyODict_Type) < 0) Py_FatalError("Can't initialize OrderedDict type"); -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): make sure dict view types are initialized
by benjamin.peterson Nov. 6, 2016

Nov. 6, 2016

https://hg.python.org/cpython/rev/ec96d06462a2 changeset: 104938:ec96d06462a2 branch: 3.5 parent: 104933:db6d556365d7 user: Benjamin Peterson <benjamin(a)python.org> date: Sun Nov 06 13:01:07 2016 -0800 summary: make sure dict view types are initialized files: Objects/object.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1607,6 +1607,15 @@ if (PyType_Ready(&PyDict_Type) < 0) Py_FatalError("Can't initialize dict type"); + if (PyType_Ready(&PyDictKeys_Type) < 0) + Py_FatalError("Can't initialize dict keys type"); + + if (PyType_Ready(&PyDictValues_Type) < 0) + Py_FatalError("Can't initialize dict values type"); + + if (PyType_Ready(&PyDictItems_Type) < 0) + Py_FatalError("Can't initialize dict items type"); + if (PyType_Ready(&PyODict_Type) < 0) Py_FatalError("Can't initialize OrderedDict type"); -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> 3.6): merge 3.5
by benjamin.peterson Nov. 6, 2016

Nov. 6, 2016

https://hg.python.org/cpython/rev/1f84be591d56 changeset: 104939:1f84be591d56 branch: 3.6 parent: 104936:d05d312161f2 parent: 104938:ec96d06462a2 user: Benjamin Peterson <benjamin(a)python.org> date: Sun Nov 06 13:01:15 2016 -0800 summary: merge 3.5 files: Objects/object.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1598,6 +1598,15 @@ if (PyType_Ready(&PyDict_Type) < 0) Py_FatalError("Can't initialize dict type"); + if (PyType_Ready(&PyDictKeys_Type) < 0) + Py_FatalError("Can't initialize dict keys type"); + + if (PyType_Ready(&PyDictValues_Type) < 0) + Py_FatalError("Can't initialize dict values type"); + + if (PyType_Ready(&PyDictItems_Type) < 0) + Py_FatalError("Can't initialize dict items type"); + if (PyType_Ready(&PyODict_Type) < 0) Py_FatalError("Can't initialize OrderedDict type"); -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): Issue #21590: Merge from 3.6
by berker.peksag Nov. 6, 2016

Nov. 6, 2016

https://hg.python.org/cpython/rev/442453fa3370 changeset: 104937:442453fa3370 parent: 104935:6ec669efeea5 parent: 104936:d05d312161f2 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sun Nov 06 21:45:45 2016 +0300 summary: Issue #21590: Merge from 3.6 files: Doc/howto/instrumentation.rst | 49 ++++++++++------------ 1 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Doc/howto/instrumentation.rst b/Doc/howto/instrumentation.rst --- a/Doc/howto/instrumentation.rst +++ b/Doc/howto/instrumentation.rst @@ -1,3 +1,5 @@ +.. highlight:: shell-session + .. _instrumentation: =============================================== @@ -20,9 +22,6 @@ making it easier to monitor what the CPython processes on a system are doing. -.. I'm using ".. code-block:: c" for SystemTap scripts, as "c" is syntactically - the closest match that Sphinx supports - .. impl-detail:: DTrace markers are implementation details of the CPython interpreter. @@ -40,14 +39,16 @@ On a Linux machine, this can be done via:: - yum install systemtap-sdt-devel + $ yum install systemtap-sdt-devel or:: - sudo apt-get install systemtap-sdt-dev + $ sudo apt-get install systemtap-sdt-dev -CPython must then be configured `--with-dtrace`:: +CPython must then be configured ``--with-dtrace``: + +.. code-block:: none checking for --with-dtrace... yes @@ -71,22 +72,18 @@ On Linux, you can verify if the SystemTap static markers are present in the built binary by seeing if it contains a ".note.stapsdt" section. -.. code-block:: bash +:: $ readelf -S ./python | grep .note.stapsdt [30] .note.stapsdt NOTE 0000000000000000 00308d78 If you've built Python as a shared library (with --enable-shared), you -need to look instead within the shared library. For example: - -.. code-block:: bash +need to look instead within the shared library. For example:: $ readelf -S libpython3.3dm.so.1.0 | grep .note.stapsdt [29] .note.stapsdt NOTE 0000000000000000 00365b68 -Sufficiently modern readelf can print the metadata: - -.. code-block:: bash +Sufficiently modern readelf can print the metadata:: $ readelf -n ./python @@ -136,7 +133,7 @@ a function called "start". In other words, import-time function invocations are not going to be listed: -.. code-block:: c +.. code-block:: none self int indent; @@ -170,13 +167,13 @@ self->trace = 0; } -It can be invoked like this: - -.. code-block:: bash +It can be invoked like this:: $ sudo dtrace -q -s call_stack.d -c "python3.6 script.py" -The output looks like this:: +The output looks like this: + +.. code-block:: none 156641360502280 function-entry:call_stack.py:start:23 156641360518804 function-entry: call_stack.py:function_1:1 @@ -208,7 +205,7 @@ For example, this SystemTap script can be used to show the call/return hierarchy of a Python script: -.. code-block:: c +.. code-block:: none probe process("python").mark("function__entry") { filename = user_string($arg1); @@ -228,15 +225,15 @@ thread_indent(-1), funcname, filename, lineno); } -It can be invoked like this: - -.. code-block:: bash +It can be invoked like this:: $ stap \ show-call-hierarchy.stp \ -c "./python test.py" -The output looks like this:: +The output looks like this: + +.. code-block:: none 11408 python(8274): => __contains__ in Lib/_abcoll.py:362 11414 python(8274): => __getitem__ in Lib/os.py:425 @@ -325,7 +322,7 @@ Here is a tapset file, based on a non-shared build of CPython: -.. code-block:: c +.. code-block:: none /* Provide a higher-level wrapping around the function__entry and @@ -369,7 +366,7 @@ example given above of tracing the Python function-call hierarchy, without needing to directly name the static markers: -.. code-block:: c +.. code-block:: none probe python.function.entry { @@ -388,7 +385,7 @@ running CPython code, showing the top 20 most frequently-entered bytecode frames, each second, across the whole system: -.. code-block:: c +.. code-block:: none global fn_calls; -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.6): Issue #21590: Silence Sphinx warnings in instrumentation.rst
by berker.peksag Nov. 6, 2016

Nov. 6, 2016

https://hg.python.org/cpython/rev/d05d312161f2 changeset: 104936:d05d312161f2 branch: 3.6 parent: 104934:f82e348946e3 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sun Nov 06 21:45:16 2016 +0300 summary: Issue #21590: Silence Sphinx warnings in instrumentation.rst WARNING: Could not lex literal_block as "c". Highlighting skipped. Patch by SilentGhost. files: Doc/howto/instrumentation.rst | 49 ++++++++++------------ 1 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Doc/howto/instrumentation.rst b/Doc/howto/instrumentation.rst --- a/Doc/howto/instrumentation.rst +++ b/Doc/howto/instrumentation.rst @@ -1,3 +1,5 @@ +.. highlight:: shell-session + .. _instrumentation: =============================================== @@ -20,9 +22,6 @@ making it easier to monitor what the CPython processes on a system are doing. -.. I'm using ".. code-block:: c" for SystemTap scripts, as "c" is syntactically - the closest match that Sphinx supports - .. impl-detail:: DTrace markers are implementation details of the CPython interpreter. @@ -40,14 +39,16 @@ On a Linux machine, this can be done via:: - yum install systemtap-sdt-devel + $ yum install systemtap-sdt-devel or:: - sudo apt-get install systemtap-sdt-dev + $ sudo apt-get install systemtap-sdt-dev -CPython must then be configured `--with-dtrace`:: +CPython must then be configured ``--with-dtrace``: + +.. code-block:: none checking for --with-dtrace... yes @@ -71,22 +72,18 @@ On Linux, you can verify if the SystemTap static markers are present in the built binary by seeing if it contains a ".note.stapsdt" section. -.. code-block:: bash +:: $ readelf -S ./python | grep .note.stapsdt [30] .note.stapsdt NOTE 0000000000000000 00308d78 If you've built Python as a shared library (with --enable-shared), you -need to look instead within the shared library. For example: - -.. code-block:: bash +need to look instead within the shared library. For example:: $ readelf -S libpython3.3dm.so.1.0 | grep .note.stapsdt [29] .note.stapsdt NOTE 0000000000000000 00365b68 -Sufficiently modern readelf can print the metadata: - -.. code-block:: bash +Sufficiently modern readelf can print the metadata:: $ readelf -n ./python @@ -136,7 +133,7 @@ a function called "start". In other words, import-time function invocations are not going to be listed: -.. code-block:: c +.. code-block:: none self int indent; @@ -170,13 +167,13 @@ self->trace = 0; } -It can be invoked like this: - -.. code-block:: bash +It can be invoked like this:: $ sudo dtrace -q -s call_stack.d -c "python3.6 script.py" -The output looks like this:: +The output looks like this: + +.. code-block:: none 156641360502280 function-entry:call_stack.py:start:23 156641360518804 function-entry: call_stack.py:function_1:1 @@ -208,7 +205,7 @@ For example, this SystemTap script can be used to show the call/return hierarchy of a Python script: -.. code-block:: c +.. code-block:: none probe process("python").mark("function__entry") { filename = user_string($arg1); @@ -228,15 +225,15 @@ thread_indent(-1), funcname, filename, lineno); } -It can be invoked like this: - -.. code-block:: bash +It can be invoked like this:: $ stap \ show-call-hierarchy.stp \ -c "./python test.py" -The output looks like this:: +The output looks like this: + +.. code-block:: none 11408 python(8274): => __contains__ in Lib/_abcoll.py:362 11414 python(8274): => __getitem__ in Lib/os.py:425 @@ -325,7 +322,7 @@ Here is a tapset file, based on a non-shared build of CPython: -.. code-block:: c +.. code-block:: none /* Provide a higher-level wrapping around the function__entry and @@ -369,7 +366,7 @@ example given above of tracing the Python function-call hierarchy, without needing to directly name the static markers: -.. code-block:: c +.. code-block:: none probe python.function.entry { @@ -388,7 +385,7 @@ running CPython code, showing the top 20 most frequently-entered bytecode frames, each second, across the whole system: -.. code-block:: c +.. code-block:: none global fn_calls; -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #21864: Remove outdated section about exceptions from the tutorial
by berker.peksag Nov. 6, 2016

Nov. 6, 2016

https://hg.python.org/cpython/rev/db6d556365d7 changeset: 104933:db6d556365d7 branch: 3.5 parent: 104930:bce18f5c0bc4 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sun Nov 06 21:15:01 2016 +0300 summary: Issue #21864: Remove outdated section about exceptions from the tutorial Move the still relevant parts of it to the previous chapter, "Errors and Exceptions". files: Doc/tutorial/classes.rst | 49 ---------------------------- Doc/tutorial/errors.rst | 32 +++++++++++++++++- 2 files changed, 31 insertions(+), 50 deletions(-) diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -744,55 +744,6 @@ corresponding to the method. -.. _tut-exceptionclasses: - -Exceptions Are Classes Too -========================== - -User-defined exceptions are identified by classes as well. Using this mechanism -it is possible to create extensible hierarchies of exceptions. - -There are two new valid (semantic) forms for the :keyword:`raise` statement:: - - raise Class - - raise Instance - -In the first form, ``Class`` must be an instance of :class:`type` or of a -class derived from it. The first form is a shorthand for:: - - raise Class() - -A class in an :keyword:`except` clause is compatible with an exception if it is -the same class or a base class thereof (but not the other way around --- an -except clause listing a derived class is not compatible with a base class). For -example, the following code will print B, C, D in that order:: - - class B(Exception): - pass - class C(B): - pass - class D(C): - pass - - for cls in [B, C, D]: - try: - raise cls() - except D: - print("D") - except C: - print("C") - except B: - print("B") - -Note that if the except clauses were reversed (with ``except B`` first), it -would have printed B, B, B --- the first matching except clause is triggered. - -When an error message is printed for an unhandled exception, the exception's -class name is printed, then a colon and a space, and finally the instance -converted to a string using the built-in function :func:`str`. - - .. _tut-iterators: Iterators diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -120,6 +120,33 @@ ... except (RuntimeError, TypeError, NameError): ... pass +A class in an :keyword:`except` clause is compatible with an exception if it is +the same class or a base class thereof (but not the other way around --- an +except clause listing a derived class is not compatible with a base class). For +example, the following code will print B, C, D in that order:: + + class B(Exception): + pass + + class C(B): + pass + + class D(C): + pass + + for cls in [B, C, D]: + try: + raise cls() + except D: + print("D") + except C: + print("C") + except B: + print("B") + +Note that if the except clauses were reversed (with ``except B`` first), it +would have printed B, B, B --- the first matching except clause is triggered. + The last except clause may omit the exception name(s), to serve as a wildcard. Use this with extreme caution, since it is easy to mask a real programming error in this way! It can also be used to print an error message and then re-raise @@ -219,7 +246,10 @@ The sole argument to :keyword:`raise` indicates the exception to be raised. This must be either an exception instance or an exception class (a class that -derives from :class:`Exception`). +derives from :class:`Exception`). If an exception class is passed, it will +be implicitly instantiated by calling its constructor with no arguments:: + + raise ValueError # shorthand for 'raise ValueError()' If you need to determine whether an exception was raised but don't intend to handle it, a simpler form of the :keyword:`raise` statement allows you to -- Repository URL: https://hg.python.org/cpython

1 0