Mailman 3 February 2021 - Python-checkins

bpo-43293: Doc: move note about GIL to top of threading module (GH-24622)
by pablogsal 24 Feb '21

24 Feb '21

https://github.com/python/cpython/commit/32181be6081f6c70a1e0bd0540050805c8… commit: 32181be6081f6c70a1e0bd0540050805c8e88e83 branch: master author: Guanzhong Chen <quantum2048(a)gmail.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-02-24T18:39:38Z summary: bpo-43293: Doc: move note about GIL to top of threading module (GH-24622) The note about the GIL was buried pretty deep in the threading documentation, and this made it hard for first time users to discover why their attempts at using threading to parallelizing their application did not work. In this commit, the note is moved to the top of the module documention for visibility. files: M Doc/library/threading.rst diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index 690735469d0bf..bb982f2edcf1b 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -21,6 +21,19 @@ level :mod:`_thread` module. See also the :mod:`queue` module. supported by this module. +.. impl-detail:: + + In CPython, due to the :term:`Global Interpreter Lock + <global interpreter lock>`, only one thread + can execute Python code at once (even though certain performance-oriented + libraries might overcome this limitation). + If you want your application to make better use of the computational + resources of multi-core machines, you are advised to use + :mod:`multiprocessing` or :class:`concurrent.futures.ProcessPoolExecutor`. + However, threading is still an appropriate model if you want to run + multiple I/O-bound tasks simultaneously. + + This module defines the following functions: @@ -424,19 +437,6 @@ since it is impossible to detect the termination of alien threads. property instead. -.. impl-detail:: - - In CPython, due to the :term:`Global Interpreter Lock - <global interpreter lock>`, only one thread - can execute Python code at once (even though certain performance-oriented - libraries might overcome this limitation). - If you want your application to make better use of the computational - resources of multi-core machines, you are advised to use - :mod:`multiprocessing` or :class:`concurrent.futures.ProcessPoolExecutor`. - However, threading is still an appropriate model if you want to run - multiple I/O-bound tasks simultaneously. - - .. _lock-objects: Lock Objects

1 0

[3.8] bpo-41841: prepare for 3.8.9 (GH-24635)
by terryjreedy 24 Feb '21

24 Feb '21

https://github.com/python/cpython/commit/653e17b2cb35e6cd48e2bdca0c1b27b38b… commit: 653e17b2cb35e6cd48e2bdca0c1b27b38bed7170 branch: 3.8 author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: terryjreedy <tjreedy(a)udel.edu> date: 2021-02-23T21:34:25-05:00 summary: [3.8] bpo-41841: prepare for 3.8.9 (GH-24635) files: M Lib/idlelib/NEWS.txt diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 103bf971232a6..1764bb4cd4aa7 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,12 +1,16 @@ -What's New in IDLE 3.8.8 -Released on 2021-02-15? -====================================== +What's New in IDLE 3.8.9 +Released on 2021-05-03? +========================= bpo-43283: Document why printing to IDLE's Shell is often slower than printing to a system terminal and that it can be made faster by pre-formatting a single string before printing. +What's New in IDLE 3.8.8 +Released on 2021-02-19 +====================================== + bpo-23544: Disable Debug=>Stack Viewer when user code is running or Debugger is active, to prevent hang or crash. Patch by Zackery Spytz.

1 0

[3.9] bpo-41841: revise header (GH-24634)
by terryjreedy 24 Feb '21

24 Feb '21

https://github.com/python/cpython/commit/d81a20454eae1868059e45d54e0270e3b4… commit: d81a20454eae1868059e45d54e0270e3b4d2e409 branch: 3.9 author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: terryjreedy <tjreedy(a)udel.edu> date: 2021-02-23T21:32:20-05:00 summary: [3.9] bpo-41841: revise header (GH-24634) files: M Lib/idlelib/NEWS.txt diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 8374f7a582043..f68e144d25610 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,6 +1,6 @@ -What's New in IDLE 3.9.2 -Released on 2021-02-15? -====================================== +What's New in IDLE 3.9.z +(since 3.9.0) +========================= bpo-43283: Document why printing to IDLE's Shell is often slower than @@ -18,11 +18,6 @@ bpo-33065: Fix problem debugging user classes with __repr__ method. bpo-32631: Finish zzdummy example extension module: make menu entries work; add docstrings and tests with 100% coverage. - -What's New in IDLE 3.9.1 -Released on 2020-12-07 -====================================== - bpo-42508: Keep IDLE running on macOS. Remove obsolete workaround that prevented running files with shortcuts when using new universal2 installers built on macOS 11.

1 0

bpo-42151: don't set specified_attributes=1 in pure Python ElementTree (GH-22987)
by corona10 24 Feb '21

24 Feb '21

https://github.com/python/cpython/commit/1f433406bd46fbd00b88223ad64daea6bc… commit: 1f433406bd46fbd00b88223ad64daea6bc9eaadc branch: master author: Felix C. Stegerman <flx(a)obfusk.net> committer: corona10 <donghee.na92(a)gmail.com> date: 2021-02-24T11:25:31+09:00 summary: bpo-42151: don't set specified_attributes=1 in pure Python ElementTree (GH-22987) files: A Misc/NEWS.d/next/Library/2020-10-26-18-01-09.bpo-42151.et5f7s.rst M Lib/test/test_xml_etree.py M Lib/xml/etree/ElementTree.py diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index fd4a38527fde0..fcb1f7fdfbbde 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -108,6 +108,19 @@ <document>&entity;</document> """ +ATTLIST_XML = """\ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE Foo [ +<!ELEMENT foo (bar*)> +<!ELEMENT bar (#PCDATA)*> +<!ATTLIST bar xml:lang CDATA "eng"> +<!ENTITY qux "quux"> +]> +<foo> +<bar>&qux;</bar> +</foo> +""" + def checkwarnings(*filters, quiet=False): def decorator(test): def newtest(*args, **kwargs): @@ -1354,6 +1367,12 @@ def test_tree_write_attribute_order(self): self.assertEqual(serialize(root, method='html'), '<cirriculum status="public" company="example"></cirriculum>') + def test_attlist_default(self): + # Test default attribute values; See BPO 42151. + root = ET.fromstring(ATTLIST_XML) + self.assertEqual(root[0].attrib, + {'{http://www.w3.org/XML/1998/namespace}lang': 'eng'}) + class XMLPullParserTest(unittest.TestCase): diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py index 7a269001d6e18..168418e466c45 100644 --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -1560,7 +1560,6 @@ def __init__(self, *, target=None, encoding=None): # Configure pyexpat: buffering, new-style attribute handling. parser.buffer_text = 1 parser.ordered_attributes = 1 - parser.specified_attributes = 1 self._doctype = None self.entity = {} try: @@ -1580,7 +1579,6 @@ def _setevents(self, events_queue, events_to_report): for event_name in events_to_report: if event_name == "start": parser.ordered_attributes = 1 - parser.specified_attributes = 1 def handler(tag, attrib_in, event=event_name, append=append, start=self._start): append((event, start(tag, attrib_in))) diff --git a/Misc/NEWS.d/next/Library/2020-10-26-18-01-09.bpo-42151.et5f7s.rst b/Misc/NEWS.d/next/Library/2020-10-26-18-01-09.bpo-42151.et5f7s.rst new file mode 100644 index 0000000000000..6361f2c088d2d --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-10-26-18-01-09.bpo-42151.et5f7s.rst @@ -0,0 +1,3 @@ +Make the pure Python implementation of :mod:`xml.etree.ElementTree` behave +the same as the C implementation (:mod:`_elementree`) regarding default +attribute values (by not setting ``specified_attributes=1``).

1 0

bpo-41841: Revise header (GH-24633)
by terryjreedy 24 Feb '21

24 Feb '21

https://github.com/python/cpython/commit/b9fe16a02717e89a2141311de1e36161af… commit: b9fe16a02717e89a2141311de1e36161af4de9a9 branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: terryjreedy <tjreedy(a)udel.edu> date: 2021-02-23T21:24:33-05:00 summary: bpo-41841: Revise header (GH-24633) files: M Lib/idlelib/NEWS.txt diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 30d5b2f15f91e..ca4280ff4cff8 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,6 +1,7 @@ -What's New in IDLE 3.10.0 (since 3.9.0) +What's New in IDLE 3.10.0 +(since 3.9.0) Released on 2021-10-04? -====================================== +========================= bpo-43283: Document why printing to IDLE's Shell is often slower than

1 0

bpo-43283: Add IDLE doc paragraph about print speed (GH-24615) (GH-24632)
by terryjreedy 24 Feb '21

24 Feb '21

https://github.com/python/cpython/commit/bdf0fece5bbc2fc9fffbf0f314c7022e24… commit: bdf0fece5bbc2fc9fffbf0f314c7022e24e747df branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: terryjreedy <tjreedy(a)udel.edu> date: 2021-02-23T20:47:06-05:00 summary: bpo-43283: Add IDLE doc paragraph about print speed (GH-24615) (GH-24632) Printing to IDLE's Shell is often slower than printing to a system terminal, but it can be made faster by pre-formatting a single string before printing. (cherry picked from commit 2827e8a177c2a6584fada594bca6829c53a2872f) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: A Misc/NEWS.d/next/IDLE/2021-02-21-16-30-10.bpo-43283.DLBwYn.rst M Doc/library/idle.rst M Lib/idlelib/NEWS.txt M Lib/idlelib/help.html diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index fc45e3161bc6d..2b9bd4b5daaa7 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -726,6 +726,15 @@ with objects that get input from and send output to the Shell window. The original values stored in ``sys.__stdin__``, ``sys.__stdout__``, and ``sys.__stderr__`` are not touched, but may be ``None``. +Sending print output from one process to a text widget in another is +slower than printing to a system terminal in the same process. +This has the most effect when printing multiple arguments, as the string +for each argument, each separator, the newline are sent separately. +For development, this is usually not a problem, but if one wants to +print faster in IDLE, format and join together everything one wants +displayed together and then print a single string. Both format strings +and :meth:`str.join` can help combine fields and lines. + IDLE's standard stream replacements are not inherited by subprocesses created in the execution process, whether directly by user code or by modules such as multiprocessing. If such subprocess use ``input`` from diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index cf80b9efe2389..103bf971232a6 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -3,6 +3,10 @@ Released on 2021-02-15? ====================================== +bpo-43283: Document why printing to IDLE's Shell is often slower than +printing to a system terminal and that it can be made faster by +pre-formatting a single string before printing. + bpo-23544: Disable Debug=>Stack Viewer when user code is running or Debugger is active, to prevent hang or crash. Patch by Zackery Spytz. diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html index 1eefa506e2c8d..924042d25b7ba 100644 --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -679,6 +679,14 @@ <h3>Running user code<a class="headerlink" href="#running-user-code" title="Perm with objects that get input from and send output to the Shell window. The original values stored in <code class="docutils literal notranslate">sys.__stdin__</code>, <code class="docutils literal notranslate">sys.__stdout__</code>, and <code class="docutils literal notranslate">sys.__stderr__</code> are not touched, but may be <code class="docutils literal notranslate">None</code>. +Sending print output from one process to a text widget in another is +slower than printing to a system terminal in the same process. +This has the most effect when printing multiple arguments, as the string +for each argument, each separator, the newline are sent separately. +For development, this is usually not a problem, but if one wants to +print faster in IDLE, format and join together everything one wants +displayed together and then print a single string. Both format strings +and <a class="reference internal" href="stdtypes.html#str.join" title="str.join"><code class="xref py py-meth docutils literal notranslate">str.join()</code></a> can help combine fields and lines. IDLE’s standard stream replacements are not inherited by subprocesses created in the execution process, whether directly by user code or by modules such as multiprocessing. If such subprocess use <code class="docutils literal notranslate">input</code> from @@ -982,7 +990,7 @@ <h3>Navigation</h3> - Last updated on Feb 21, 2021. + Last updated on Feb 23, 2021. <a href="https://docs.python.org/3/bugs.html">Found a bug</a>? diff --git a/Misc/NEWS.d/next/IDLE/2021-02-21-16-30-10.bpo-43283.DLBwYn.rst b/Misc/NEWS.d/next/IDLE/2021-02-21-16-30-10.bpo-43283.DLBwYn.rst new file mode 100644 index 0000000000000..7a627af412a8e --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2021-02-21-16-30-10.bpo-43283.DLBwYn.rst @@ -0,0 +1,3 @@ +Document why printing to IDLE's Shell is often slower than printing to a +system terminal and that it can be made faster by pre-formatting a single +string before printing.

1 0

bpo-43283: Add IDLE doc paragraph about print speed (GH-24615)
by miss-islington 24 Feb '21

24 Feb '21

https://github.com/python/cpython/commit/e202f1e4dbe02fbcae9f6afed863b7221b… commit: e202f1e4dbe02fbcae9f6afed863b7221b39c984 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-02-23T17:03:37-08:00 summary: bpo-43283: Add IDLE doc paragraph about print speed (GH-24615) Printing to IDLE's Shell is often slower than printing to a system terminal, but it can be made faster by pre-formatting a single string before printing. (cherry picked from commit 2827e8a177c2a6584fada594bca6829c53a2872f) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: A Misc/NEWS.d/next/IDLE/2021-02-21-16-30-10.bpo-43283.DLBwYn.rst M Doc/library/idle.rst M Lib/idlelib/NEWS.txt M Lib/idlelib/help.html diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index fc45e3161bc6d..2b9bd4b5daaa7 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -726,6 +726,15 @@ with objects that get input from and send output to the Shell window. The original values stored in ``sys.__stdin__``, ``sys.__stdout__``, and ``sys.__stderr__`` are not touched, but may be ``None``. +Sending print output from one process to a text widget in another is +slower than printing to a system terminal in the same process. +This has the most effect when printing multiple arguments, as the string +for each argument, each separator, the newline are sent separately. +For development, this is usually not a problem, but if one wants to +print faster in IDLE, format and join together everything one wants +displayed together and then print a single string. Both format strings +and :meth:`str.join` can help combine fields and lines. + IDLE's standard stream replacements are not inherited by subprocesses created in the execution process, whether directly by user code or by modules such as multiprocessing. If such subprocess use ``input`` from diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 4bc4aefd1ac35..8374f7a582043 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -3,6 +3,10 @@ Released on 2021-02-15? ====================================== +bpo-43283: Document why printing to IDLE's Shell is often slower than +printing to a system terminal and that it can be made faster by +pre-formatting a single string before printing. + bpo-23544: Disable Debug=>Stack Viewer when user code is running or Debugger is active, to prevent hang or crash. Patch by Zackery Spytz. diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html index 1eefa506e2c8d..924042d25b7ba 100644 --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -679,6 +679,14 @@ <h3>Running user code<a class="headerlink" href="#running-user-code" title="Perm with objects that get input from and send output to the Shell window. The original values stored in <code class="docutils literal notranslate">sys.__stdin__</code>, <code class="docutils literal notranslate">sys.__stdout__</code>, and <code class="docutils literal notranslate">sys.__stderr__</code> are not touched, but may be <code class="docutils literal notranslate">None</code>. +Sending print output from one process to a text widget in another is +slower than printing to a system terminal in the same process. +This has the most effect when printing multiple arguments, as the string +for each argument, each separator, the newline are sent separately. +For development, this is usually not a problem, but if one wants to +print faster in IDLE, format and join together everything one wants +displayed together and then print a single string. Both format strings +and <a class="reference internal" href="stdtypes.html#str.join" title="str.join"><code class="xref py py-meth docutils literal notranslate">str.join()</code></a> can help combine fields and lines. IDLE’s standard stream replacements are not inherited by subprocesses created in the execution process, whether directly by user code or by modules such as multiprocessing. If such subprocess use <code class="docutils literal notranslate">input</code> from @@ -982,7 +990,7 @@ <h3>Navigation</h3> - Last updated on Feb 21, 2021. + Last updated on Feb 23, 2021. <a href="https://docs.python.org/3/bugs.html">Found a bug</a>? diff --git a/Misc/NEWS.d/next/IDLE/2021-02-21-16-30-10.bpo-43283.DLBwYn.rst b/Misc/NEWS.d/next/IDLE/2021-02-21-16-30-10.bpo-43283.DLBwYn.rst new file mode 100644 index 0000000000000..7a627af412a8e --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2021-02-21-16-30-10.bpo-43283.DLBwYn.rst @@ -0,0 +1,3 @@ +Document why printing to IDLE's Shell is often slower than printing to a +system terminal and that it can be made faster by pre-formatting a single +string before printing.

1 0

bpo-43283: Add IDLE doc paragraph about print speed (GH-24615)
by terryjreedy 24 Feb '21

24 Feb '21

https://github.com/python/cpython/commit/2827e8a177c2a6584fada594bca6829c53… commit: 2827e8a177c2a6584fada594bca6829c53a2872f branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: terryjreedy <tjreedy(a)udel.edu> date: 2021-02-23T19:39:51-05:00 summary: bpo-43283: Add IDLE doc paragraph about print speed (GH-24615) Printing to IDLE's Shell is often slower than printing to a system terminal, but it can be made faster by pre-formatting a single string before printing. files: A Misc/NEWS.d/next/IDLE/2021-02-21-16-30-10.bpo-43283.DLBwYn.rst M Doc/library/idle.rst M Lib/idlelib/NEWS.txt M Lib/idlelib/help.html diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index fc45e3161bc6d..2b9bd4b5daaa7 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -726,6 +726,15 @@ with objects that get input from and send output to the Shell window. The original values stored in ``sys.__stdin__``, ``sys.__stdout__``, and ``sys.__stderr__`` are not touched, but may be ``None``. +Sending print output from one process to a text widget in another is +slower than printing to a system terminal in the same process. +This has the most effect when printing multiple arguments, as the string +for each argument, each separator, the newline are sent separately. +For development, this is usually not a problem, but if one wants to +print faster in IDLE, format and join together everything one wants +displayed together and then print a single string. Both format strings +and :meth:`str.join` can help combine fields and lines. + IDLE's standard stream replacements are not inherited by subprocesses created in the execution process, whether directly by user code or by modules such as multiprocessing. If such subprocess use ``input`` from diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 840fc622ca95e..30d5b2f15f91e 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -3,6 +3,10 @@ Released on 2021-10-04? ====================================== +bpo-43283: Document why printing to IDLE's Shell is often slower than +printing to a system terminal and that it can be made faster by +pre-formatting a single string before printing. + bpo-23544: Disable Debug=>Stack Viewer when user code is running or Debugger is active, to prevent hang or crash. Patch by Zackery Spytz. diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html index 1eefa506e2c8d..924042d25b7ba 100644 --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -679,6 +679,14 @@ <h3>Running user code<a class="headerlink" href="#running-user-code" title="Perm with objects that get input from and send output to the Shell window. The original values stored in <code class="docutils literal notranslate">sys.__stdin__</code>, <code class="docutils literal notranslate">sys.__stdout__</code>, and <code class="docutils literal notranslate">sys.__stderr__</code> are not touched, but may be <code class="docutils literal notranslate">None</code>. +Sending print output from one process to a text widget in another is +slower than printing to a system terminal in the same process. +This has the most effect when printing multiple arguments, as the string +for each argument, each separator, the newline are sent separately. +For development, this is usually not a problem, but if one wants to +print faster in IDLE, format and join together everything one wants +displayed together and then print a single string. Both format strings +and <a class="reference internal" href="stdtypes.html#str.join" title="str.join"><code class="xref py py-meth docutils literal notranslate">str.join()</code></a> can help combine fields and lines. IDLE’s standard stream replacements are not inherited by subprocesses created in the execution process, whether directly by user code or by modules such as multiprocessing. If such subprocess use <code class="docutils literal notranslate">input</code> from @@ -982,7 +990,7 @@ <h3>Navigation</h3> - Last updated on Feb 21, 2021. + Last updated on Feb 23, 2021. <a href="https://docs.python.org/3/bugs.html">Found a bug</a>? diff --git a/Misc/NEWS.d/next/IDLE/2021-02-21-16-30-10.bpo-43283.DLBwYn.rst b/Misc/NEWS.d/next/IDLE/2021-02-21-16-30-10.bpo-43283.DLBwYn.rst new file mode 100644 index 0000000000000..7a627af412a8e --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2021-02-21-16-30-10.bpo-43283.DLBwYn.rst @@ -0,0 +1,3 @@ +Document why printing to IDLE's Shell is often slower than printing to a +system terminal and that it can be made faster by pre-formatting a single +string before printing.

1 0

bpo-43146: fix None-handling in single-arg traceback.print_exception(None) (GH-24629)
by gvanrossum 23 Feb '21

23 Feb '21

https://github.com/python/cpython/commit/b798ab06937f8bb24b444a49dd42e11fff… commit: b798ab06937f8bb24b444a49dd42e11fff15e654 branch: master author: Irit Katriel <iritkatriel(a)yahoo.com> committer: gvanrossum <gvanrossum(a)gmail.com> date: 2021-02-23T09:43:04-08:00 summary: bpo-43146: fix None-handling in single-arg traceback.print_exception(None) (GH-24629) (The previous commit fixed print_exception(None, None, None).) files: A Misc/NEWS.d/next/Library/2021-02-23-17-20-16.bpo-43146.JAFplg.rst M Lib/test/test_traceback.py M Lib/traceback.py diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index 2261ea994209f..5bd969d62493a 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -234,6 +234,10 @@ def test_format_exception_only_exc(self): def test_exception_is_None(self): NONE_EXC_STRING = 'NoneType: None\n' + excfile = StringIO() + traceback.print_exception(None, file=excfile) + self.assertEqual(excfile.getvalue(), NONE_EXC_STRING) + excfile = StringIO() traceback.print_exception(None, None, None, file=excfile) self.assertEqual(excfile.getvalue(), NONE_EXC_STRING) @@ -243,6 +247,7 @@ def test_exception_is_None(self): self.assertEqual(excfile.getvalue(), NONE_EXC_STRING) self.assertEqual(traceback.format_exc(None), NONE_EXC_STRING) + self.assertEqual(traceback.format_exception(None), [NONE_EXC_STRING]) self.assertEqual( traceback.format_exception(None, None, None), [NONE_EXC_STRING]) self.assertEqual( diff --git a/Lib/traceback.py b/Lib/traceback.py index dfb296c5e7b17..8f908dd2e0944 100644 --- a/Lib/traceback.py +++ b/Lib/traceback.py @@ -91,7 +91,10 @@ def _parse_value_tb(exc, value, tb): if (value is _sentinel) != (tb is _sentinel): raise ValueError("Both or neither of value and tb must be given") if value is tb is _sentinel: - return exc, exc.__traceback__ + if exc is not None: + return exc, exc.__traceback__ + else: + return None, None return value, tb diff --git a/Misc/NEWS.d/next/Library/2021-02-23-17-20-16.bpo-43146.JAFplg.rst b/Misc/NEWS.d/next/Library/2021-02-23-17-20-16.bpo-43146.JAFplg.rst new file mode 100644 index 0000000000000..151edbe28d246 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-02-23-17-20-16.bpo-43146.JAFplg.rst @@ -0,0 +1 @@ +Handle None in single-arg versions of :func:`~traceback.print_exception` and :func:`~traceback.format_exception`. \ No newline at end of file

1 0

bpo-43146: fix regression in traceback.print_exception(None) (GH-24463)
by gvanrossum 23 Feb '21

23 Feb '21

https://github.com/python/cpython/commit/26f18b8540b49d592af66361f8df1a0395… commit: 26f18b8540b49d592af66361f8df1a03953d1768 branch: master author: Irit Katriel <iritkatriel(a)yahoo.com> committer: gvanrossum <gvanrossum(a)gmail.com> date: 2021-02-23T06:58:47-08:00 summary: bpo-43146: fix regression in traceback.print_exception(None) (GH-24463) files: A Misc/NEWS.d/next/Library/2021-02-06-21-21-35.bpo-43146.MHtb2v.rst M Lib/test/test_traceback.py M Lib/traceback.py diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index 33bdda026662c..2261ea994209f 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -232,6 +232,24 @@ def test_format_exception_only_exc(self): output = traceback.format_exception_only(Exception("projector")) self.assertEqual(output, ["Exception: projector\n"]) + def test_exception_is_None(self): + NONE_EXC_STRING = 'NoneType: None\n' + excfile = StringIO() + traceback.print_exception(None, None, None, file=excfile) + self.assertEqual(excfile.getvalue(), NONE_EXC_STRING) + + excfile = StringIO() + traceback.print_exc(None, file=excfile) + self.assertEqual(excfile.getvalue(), NONE_EXC_STRING) + + self.assertEqual(traceback.format_exc(None), NONE_EXC_STRING) + self.assertEqual( + traceback.format_exception(None, None, None), [NONE_EXC_STRING]) + self.assertEqual( + traceback.format_exception_only(None), [NONE_EXC_STRING]) + self.assertEqual( + traceback.format_exception_only(None, None), [NONE_EXC_STRING]) + class TracebackFormatTests(unittest.TestCase): diff --git a/Lib/traceback.py b/Lib/traceback.py index 090465a3584b7..dfb296c5e7b17 100644 --- a/Lib/traceback.py +++ b/Lib/traceback.py @@ -528,7 +528,9 @@ def __init__(self, exc_type, exc_value, exc_traceback, *, limit=None, cause = None if compact: - need_context = cause is None and not e.__suppress_context__ + need_context = (cause is None and + e is not None and + not e.__suppress_context__) else: need_context = True if (e and e.__context__ is not None diff --git a/Misc/NEWS.d/next/Library/2021-02-06-21-21-35.bpo-43146.MHtb2v.rst b/Misc/NEWS.d/next/Library/2021-02-06-21-21-35.bpo-43146.MHtb2v.rst new file mode 100644 index 0000000000000..8d213a4138ef0 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-02-06-21-21-35.bpo-43146.MHtb2v.rst @@ -0,0 +1 @@ +Fix recent regression in None argument handling in :mod:`~traceback` module functions. \ No newline at end of file

1 0