Mailman 3 June 2021 - Python-checkins

bpo-44022: Improve the regression test. (GH-26503)
by miss-islington June 3, 2021

June 3, 2021

https://github.com/python/cpython/commit/98e5a7975d99b58d511f171816ecdfb13d… commit: 98e5a7975d99b58d511f171816ecdfb13d5cca18 branch: 3.10 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-06-02T21:04:20-07:00 summary: bpo-44022: Improve the regression test. (GH-26503) It wasn't actually detecting the regression due to the assertion being too lenient. (cherry picked from commit e60ab843cbb016fb6ff8b4f418641ac05a9b2fcc) Co-authored-by: Gregory P. Smith <greg(a)krypto.org> files: M Lib/test/test_httplib.py diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py index e9272569ecc53..8265b8d1d6d2d 100644 --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -1186,7 +1186,12 @@ def test_overflowing_header_limit_after_100(self): 'r\n' * 32768 ) resp = client.HTTPResponse(FakeSocket(body)) - self.assertRaises(client.HTTPException, resp.begin) + with self.assertRaises(client.HTTPException) as cm: + resp.begin() + # We must assert more because other reasonable errors that we + # do not want can also be HTTPException derived. + self.assertIn('got more than ', str(cm.exception)) + self.assertIn('headers', str(cm.exception)) def test_overflowing_chunked_line(self): body = (

1 0

Add bpo-42914 to What's New (GH-25124)
by miss-islington June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/4846ea95d1a121df5e8081e2a290f63d14… commit: 4846ea95d1a121df5e8081e2a290f63d1419cad8 branch: main author: Wm. Keith van der Meulen <keith(a)wkeithvan.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-06-02T20:45:34-07:00 summary: Add bpo-42914 to What's New (GH-25124) BPO-42914 was not added to the What's New in #24864. This includes it in the "Improved Modules" section. Automerge-Triggered-By: GH:gpshead files: M Doc/whatsnew/3.10.rst M Misc/ACKS diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst index 5b5903cb059356..92247e153627d0 100644 --- a/Doc/whatsnew/3.10.rst +++ b/Doc/whatsnew/3.10.rst @@ -1137,6 +1137,9 @@ identification from `freedesktop.org os-release pprint ------ +:func:`pprint.pprint` now accepts a new ``underscore_numbers`` keyword argument. +(Contributed by sblondon in :issue:`42914`.) + :mod:`pprint` can now pretty-print :class:`dataclasses.dataclass` instances. (Contributed by Lewis Gaul in :issue:`43080`.) diff --git a/Misc/ACKS b/Misc/ACKS index b023bcb6d72fd3..0cb738b3a12ee4 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1821,6 +1821,7 @@ Andi Vajda Case Van Horsen John Mark Vandenberg Kyle VanderBeek +Wm. Keith van der Meulen Eric N. Vander Weele Andrew Vant Atul Varma

1 0

bpo-44022: Improve the regression test. (GH-26503)
by gpshead June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/e60ab843cbb016fb6ff8b4f418641ac05a… commit: e60ab843cbb016fb6ff8b4f418641ac05a9b2fcc branch: main author: Gregory P. Smith <greg(a)krypto.org> committer: gpshead <greg(a)krypto.org> date: 2021-06-02T20:43:38-07:00 summary: bpo-44022: Improve the regression test. (GH-26503) It wasn't actually detecting the regression due to the assertion being too lenient. files: M Lib/test/test_httplib.py diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py index e9272569ecc53..8265b8d1d6d2d 100644 --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -1186,7 +1186,12 @@ def test_overflowing_header_limit_after_100(self): 'r\n' * 32768 ) resp = client.HTTPResponse(FakeSocket(body)) - self.assertRaises(client.HTTPException, resp.begin) + with self.assertRaises(client.HTTPException) as cm: + resp.begin() + # We must assert more because other reasonable errors that we + # do not want can also be HTTPException derived. + self.assertIn('got more than ', str(cm.exception)) + self.assertIn('headers', str(cm.exception)) def test_overflowing_chunked_line(self): body = (

1 0

[3.9] bpo-43568: Relax distutils MACOSX_DEPLOYMENT_TARGET check (GH-25827) (GH-26001)
by ned-deily June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/991693a217363243b0bd33887852d6b395… commit: 991693a217363243b0bd33887852d6b3959b99a1 branch: 3.9 author: Joshua Root <jmr(a)macports.org> committer: ned-deily <nad(a)python.org> date: 2021-06-02T20:25:15-04:00 summary: [3.9] bpo-43568: Relax distutils MACOSX_DEPLOYMENT_TARGET check (GH-25827) (GH-26001) Only complain if the config target is >= 10.3 and the current target is < 10.3. The check was originally added to ensure that incompatible LDSHARED flags are not used, because '-undefined dynamic_lookup' is used when building for 10.3 and later, and is not supported on older OS versions. Apart from that, there should be no problem in general with using an older target. In particular, this allows targeting macOS 11.0 when Python was built for a newer minor version like 11.3. (manually cherry picked from part of commit 8703178) files: A Misc/NEWS.d/next/macOS/2021-06-02-19-21-13.bpo-43568.viomLm.rst M Lib/distutils/spawn.py diff --git a/Lib/distutils/spawn.py b/Lib/distutils/spawn.py index 0d1bd0391e6f11..31df3f7faca552 100644 --- a/Lib/distutils/spawn.py +++ b/Lib/distutils/spawn.py @@ -59,13 +59,17 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0): if _cfg_target: _cfg_target_split = [int(x) for x in _cfg_target.split('.')] if _cfg_target: - # ensure that the deployment target of build process is not less - # than that used when the interpreter was built. This ensures - # extension modules are built with correct compatibility values + # Ensure that the deployment target of the build process is not + # less than 10.3 if the interpreter was built for 10.3 or later. + # This ensures extension modules are built with correct + # compatibility values, specifically LDSHARED which can use + # '-undefined dynamic_lookup' which only works on >= 10.3. cur_target = os.environ.get('MACOSX_DEPLOYMENT_TARGET', _cfg_target) - if _cfg_target_split > [int(x) for x in cur_target.split('.')]: + cur_target_split = [int(x) for x in cur_target.split('.')] + if _cfg_target_split[:2] >= [10, 3] and cur_target_split[:2] < [10, 3]: my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: ' - 'now "%s" but "%s" during configure' + 'now "%s" but "%s" during configure;' + 'must use 10.3 or later' % (cur_target, _cfg_target)) raise DistutilsPlatformError(my_msg) env = dict(os.environ, diff --git a/Misc/NEWS.d/next/macOS/2021-06-02-19-21-13.bpo-43568.viomLm.rst b/Misc/NEWS.d/next/macOS/2021-06-02-19-21-13.bpo-43568.viomLm.rst new file mode 100644 index 00000000000000..57757ba1ed0509 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2021-06-02-19-21-13.bpo-43568.viomLm.rst @@ -0,0 +1,2 @@ +Relax unnecessarily restrictive MACOSX_DEPLOYMENT_TARGET check when building +extension modules for macOS. Patch by Joshua Root.

1 0

bpo-44282: Fix occasional test_incremental_editing failures on buildbots (GH-26491) (GH-26499)
by vstinner June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/9c89d62073fa0bcfe68e59add5b55fbcbf… commit: 9c89d62073fa0bcfe68e59add5b55fbcbf7672ab branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: vstinner <vstinner(a)python.org> date: 2021-06-03T02:14:41+02:00 summary: bpo-44282: Fix occasional test_incremental_editing failures on buildbots (GH-26491) (GH-26499) Signed-off-by: Tal Einat <532281+taleinat(a)users.noreply.github.com> (cherry picked from commit adef445dc34685648bd0ea1c125df2ef143912ed) Co-authored-by: Tal Einat <532281+taleinat(a)users.noreply.github.com> files: M Lib/idlelib/idle_test/test_colorizer.py M Lib/idlelib/idle_test/test_sidebar.py M Lib/idlelib/idle_test/tkinter_testing_utils.py diff --git a/Lib/idlelib/idle_test/test_colorizer.py b/Lib/idlelib/idle_test/test_colorizer.py index 498480a74e3551..b0b120e75a1553 100644 --- a/Lib/idlelib/idle_test/test_colorizer.py +++ b/Lib/idlelib/idle_test/test_colorizer.py @@ -551,7 +551,7 @@ def test_long_multiline_string(self): ''') self._assert_highlighting(source, {'STRING': [('1.0', '5.4')]}) - @run_in_tk_mainloop + @run_in_tk_mainloop(delay=50) def test_incremental_editing(self): text = self.text eq = self.assertEqual diff --git a/Lib/idlelib/idle_test/test_sidebar.py b/Lib/idlelib/idle_test/test_sidebar.py index 43e8137d7079c9..53ac3eb27335d7 100644 --- a/Lib/idlelib/idle_test/test_sidebar.py +++ b/Lib/idlelib/idle_test/test_sidebar.py @@ -510,19 +510,19 @@ def test_initial_state(self): ) self.assert_sidebar_lines_synced() - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_single_empty_input(self): self.do_input('\n') yield self.assert_sidebar_lines_end_with(['>>>', '>>>']) - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_single_line_statement(self): self.do_input('1\n') yield self.assert_sidebar_lines_end_with(['>>>', None, '>>>']) - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_multi_line_statement(self): # Block statements are not indented because IDLE auto-indents. self.do_input(dedent('''\ @@ -540,14 +540,14 @@ def test_multi_line_statement(self): '>>>', ]) - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_single_long_line_wraps(self): self.do_input('1' * 200 + '\n') yield self.assert_sidebar_lines_end_with(['>>>', None, '>>>']) self.assert_sidebar_lines_synced() - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_squeeze_multi_line_output(self): shell = self.shell text = shell.text @@ -567,7 +567,7 @@ def test_squeeze_multi_line_output(self): self.assert_sidebar_lines_end_with(['>>>', None, None, None, '>>>']) self.assert_sidebar_lines_synced() - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_interrupt_recall_undo_redo(self): text = self.shell.text # Block statements are not indented because IDLE auto-indents. @@ -613,7 +613,7 @@ def test_interrupt_recall_undo_redo(self): ['>>>', '...', '...', '...', None, '>>>'] ) - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_very_long_wrapped_line(self): with swap_attr(self.shell, 'squeezer', None): self.do_input('x = ' + '1'*10_000 + '\n') @@ -678,7 +678,7 @@ def get_sidebar_colors(): sidebar.update_colors() self.assertEqual(get_sidebar_colors(), test_colors) - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_mousewheel(self): sidebar = self.shell.shell_sidebar text = self.shell.text @@ -703,7 +703,7 @@ def test_mousewheel(self): yield self.assertIsNotNone(text.dlineinfo(text.index(f'{last_lineno}.0'))) - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_copy(self): sidebar = self.shell.shell_sidebar text = self.shell.text @@ -728,7 +728,7 @@ def test_copy(self): copied_text = text.clipboard_get() self.assertEqual(copied_text, selected_text) - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_copy_with_prompts(self): sidebar = self.shell.shell_sidebar text = self.shell.text diff --git a/Lib/idlelib/idle_test/tkinter_testing_utils.py b/Lib/idlelib/idle_test/tkinter_testing_utils.py index a9f8386e2cd9f6..a89839bbe38add 100644 --- a/Lib/idlelib/idle_test/tkinter_testing_utils.py +++ b/Lib/idlelib/idle_test/tkinter_testing_utils.py @@ -2,7 +2,7 @@ import functools -def run_in_tk_mainloop(test_method): +def run_in_tk_mainloop(delay=1): """Decorator for running a test method with a real Tk mainloop. This starts a Tk mainloop before running the test, and stops it @@ -13,44 +13,50 @@ def run_in_tk_mainloop(test_method): using "yield" to allow the mainloop to process events and "after" callbacks, and then continue the test from that point. + The delay argument is passed into root.after(...) calls as the number + of ms to wait before passing execution back to the generator function. + This also assumes that the test class has a .root attribute, which is a tkinter.Tk object. For example (from test_sidebar.py): - @run_test_with_tk_mainloop + @run_test_with_tk_mainloop() def test_single_empty_input(self): self.do_input('\n') yield self.assert_sidebar_lines_end_with(['>>>', '>>>']) """ - @functools.wraps(test_method) - def new_test_method(self): - test_generator = test_method(self) - root = self.root - # Exceptions raised by self.assert...() need to be raised - # outside of the after() callback in order for the test - # harness to capture them. - exception = None - def after_callback(): - nonlocal exception - try: - next(test_generator) - except StopIteration: - root.quit() - except Exception as exc: - exception = exc - root.quit() - else: - # Schedule the Tk mainloop to call this function again, - # using a robust method of ensuring that it gets a - # chance to process queued events before doing so. - # See: https://stackoverflow.com/q/18499082#comment65004099_38817470 - root.after(1, root.after_idle, after_callback) - root.after(0, root.after_idle, after_callback) - root.mainloop() - - if exception: - raise exception - - return new_test_method + def decorator(test_method): + @functools.wraps(test_method) + def new_test_method(self): + test_generator = test_method(self) + root = self.root + # Exceptions raised by self.assert...() need to be raised + # outside of the after() callback in order for the test + # harness to capture them. + exception = None + def after_callback(): + nonlocal exception + try: + next(test_generator) + except StopIteration: + root.quit() + except Exception as exc: + exception = exc + root.quit() + else: + # Schedule the Tk mainloop to call this function again, + # using a robust method of ensuring that it gets a + # chance to process queued events before doing so. + # See: https://stackoverflow.com/q/18499082#comment65004099_38817470 + root.after(delay, root.after_idle, after_callback) + root.after(0, root.after_idle, after_callback) + root.mainloop() + + if exception: + raise exception + + return new_test_method + + return decorator

1 0

bpo-44282: Fix occasional test_incremental_editing failures on buildbots (GH-26491)
by vstinner June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/adef445dc34685648bd0ea1c125df2ef14… commit: adef445dc34685648bd0ea1c125df2ef143912ed branch: main author: Tal Einat <532281+taleinat(a)users.noreply.github.com> committer: vstinner <vstinner(a)python.org> date: 2021-06-03T01:53:41+02:00 summary: bpo-44282: Fix occasional test_incremental_editing failures on buildbots (GH-26491) Signed-off-by: Tal Einat <532281+taleinat(a)users.noreply.github.com> files: M Lib/idlelib/idle_test/test_colorizer.py M Lib/idlelib/idle_test/test_sidebar.py M Lib/idlelib/idle_test/tkinter_testing_utils.py diff --git a/Lib/idlelib/idle_test/test_colorizer.py b/Lib/idlelib/idle_test/test_colorizer.py index 498480a74e3551..b0b120e75a1553 100644 --- a/Lib/idlelib/idle_test/test_colorizer.py +++ b/Lib/idlelib/idle_test/test_colorizer.py @@ -551,7 +551,7 @@ def test_long_multiline_string(self): ''') self._assert_highlighting(source, {'STRING': [('1.0', '5.4')]}) - @run_in_tk_mainloop + @run_in_tk_mainloop(delay=50) def test_incremental_editing(self): text = self.text eq = self.assertEqual diff --git a/Lib/idlelib/idle_test/test_sidebar.py b/Lib/idlelib/idle_test/test_sidebar.py index 43e8137d7079c9..53ac3eb27335d7 100644 --- a/Lib/idlelib/idle_test/test_sidebar.py +++ b/Lib/idlelib/idle_test/test_sidebar.py @@ -510,19 +510,19 @@ def test_initial_state(self): ) self.assert_sidebar_lines_synced() - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_single_empty_input(self): self.do_input('\n') yield self.assert_sidebar_lines_end_with(['>>>', '>>>']) - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_single_line_statement(self): self.do_input('1\n') yield self.assert_sidebar_lines_end_with(['>>>', None, '>>>']) - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_multi_line_statement(self): # Block statements are not indented because IDLE auto-indents. self.do_input(dedent('''\ @@ -540,14 +540,14 @@ def test_multi_line_statement(self): '>>>', ]) - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_single_long_line_wraps(self): self.do_input('1' * 200 + '\n') yield self.assert_sidebar_lines_end_with(['>>>', None, '>>>']) self.assert_sidebar_lines_synced() - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_squeeze_multi_line_output(self): shell = self.shell text = shell.text @@ -567,7 +567,7 @@ def test_squeeze_multi_line_output(self): self.assert_sidebar_lines_end_with(['>>>', None, None, None, '>>>']) self.assert_sidebar_lines_synced() - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_interrupt_recall_undo_redo(self): text = self.shell.text # Block statements are not indented because IDLE auto-indents. @@ -613,7 +613,7 @@ def test_interrupt_recall_undo_redo(self): ['>>>', '...', '...', '...', None, '>>>'] ) - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_very_long_wrapped_line(self): with swap_attr(self.shell, 'squeezer', None): self.do_input('x = ' + '1'*10_000 + '\n') @@ -678,7 +678,7 @@ def get_sidebar_colors(): sidebar.update_colors() self.assertEqual(get_sidebar_colors(), test_colors) - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_mousewheel(self): sidebar = self.shell.shell_sidebar text = self.shell.text @@ -703,7 +703,7 @@ def test_mousewheel(self): yield self.assertIsNotNone(text.dlineinfo(text.index(f'{last_lineno}.0'))) - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_copy(self): sidebar = self.shell.shell_sidebar text = self.shell.text @@ -728,7 +728,7 @@ def test_copy(self): copied_text = text.clipboard_get() self.assertEqual(copied_text, selected_text) - @run_in_tk_mainloop + @run_in_tk_mainloop() def test_copy_with_prompts(self): sidebar = self.shell.shell_sidebar text = self.shell.text diff --git a/Lib/idlelib/idle_test/tkinter_testing_utils.py b/Lib/idlelib/idle_test/tkinter_testing_utils.py index a9f8386e2cd9f6..a89839bbe38add 100644 --- a/Lib/idlelib/idle_test/tkinter_testing_utils.py +++ b/Lib/idlelib/idle_test/tkinter_testing_utils.py @@ -2,7 +2,7 @@ import functools -def run_in_tk_mainloop(test_method): +def run_in_tk_mainloop(delay=1): """Decorator for running a test method with a real Tk mainloop. This starts a Tk mainloop before running the test, and stops it @@ -13,44 +13,50 @@ def run_in_tk_mainloop(test_method): using "yield" to allow the mainloop to process events and "after" callbacks, and then continue the test from that point. + The delay argument is passed into root.after(...) calls as the number + of ms to wait before passing execution back to the generator function. + This also assumes that the test class has a .root attribute, which is a tkinter.Tk object. For example (from test_sidebar.py): - @run_test_with_tk_mainloop + @run_test_with_tk_mainloop() def test_single_empty_input(self): self.do_input('\n') yield self.assert_sidebar_lines_end_with(['>>>', '>>>']) """ - @functools.wraps(test_method) - def new_test_method(self): - test_generator = test_method(self) - root = self.root - # Exceptions raised by self.assert...() need to be raised - # outside of the after() callback in order for the test - # harness to capture them. - exception = None - def after_callback(): - nonlocal exception - try: - next(test_generator) - except StopIteration: - root.quit() - except Exception as exc: - exception = exc - root.quit() - else: - # Schedule the Tk mainloop to call this function again, - # using a robust method of ensuring that it gets a - # chance to process queued events before doing so. - # See: https://stackoverflow.com/q/18499082#comment65004099_38817470 - root.after(1, root.after_idle, after_callback) - root.after(0, root.after_idle, after_callback) - root.mainloop() - - if exception: - raise exception - - return new_test_method + def decorator(test_method): + @functools.wraps(test_method) + def new_test_method(self): + test_generator = test_method(self) + root = self.root + # Exceptions raised by self.assert...() need to be raised + # outside of the after() callback in order for the test + # harness to capture them. + exception = None + def after_callback(): + nonlocal exception + try: + next(test_generator) + except StopIteration: + root.quit() + except Exception as exc: + exception = exc + root.quit() + else: + # Schedule the Tk mainloop to call this function again, + # using a robust method of ensuring that it gets a + # chance to process queued events before doing so. + # See: https://stackoverflow.com/q/18499082#comment65004099_38817470 + root.after(delay, root.after_idle, after_callback) + root.after(0, root.after_idle, after_callback) + root.mainloop() + + if exception: + raise exception + + return new_test_method + + return decorator

1 0

bpo-44285: getpath.c: Assert that env_file is NULL during an error check (GH-26486) (GH-26496)
by vstinner June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/85b587a38dcf5d0ef1e275510001e22425… commit: 85b587a38dcf5d0ef1e275510001e22425d65977 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: vstinner <vstinner(a)python.org> date: 2021-06-03T01:50:55+02:00 summary: bpo-44285: getpath.c: Assert that env_file is NULL during an error check (GH-26486) (GH-26496) This was flagged by a static analyzer, but the logic of why this is NULL on error is hard to follow for humans as well. (cherry picked from commit bdb56902a3bfe12b10f85a941d5dd0eae739f1a8) Co-authored-by: stratakis <cstratak(a)redhat.com> files: M Modules/getpath.c diff --git a/Modules/getpath.c b/Modules/getpath.c index 40358190a71b87..728ecad052e142 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -1263,6 +1263,7 @@ calculate_read_pyenv(PyCalculatePath *calculate) status = calculate_open_pyenv(calculate, &env_file); if (_PyStatus_EXCEPTION(status)) { + assert(env_file == NULL); return status; } if (env_file == NULL) {

1 0

bpo-44285: getpath.c: Assert that env_file is NULL during an error check (GH-26486)
by miss-islington June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/0e9af8cae314e4b0e770fe48d5f7b5f540… commit: 0e9af8cae314e4b0e770fe48d5f7b5f540c0b257 branch: 3.10 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-06-02T16:50:38-07:00 summary: bpo-44285: getpath.c: Assert that env_file is NULL during an error check (GH-26486) This was flagged by a static analyzer, but the logic of why this is NULL on error is hard to follow for humans as well. (cherry picked from commit bdb56902a3bfe12b10f85a941d5dd0eae739f1a8) Co-authored-by: stratakis <cstratak(a)redhat.com> files: M Modules/getpath.c diff --git a/Modules/getpath.c b/Modules/getpath.c index 44453f29df703a..363d62a0657ebd 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -1263,6 +1263,7 @@ calculate_read_pyenv(PyCalculatePath *calculate) status = calculate_open_pyenv(calculate, &env_file); if (_PyStatus_EXCEPTION(status)) { + assert(env_file == NULL); return status; } if (env_file == NULL) {

1 0

bpo-43921: Fix test_ssl.test_pha_required_nocert() (GH-26489)
by miss-islington June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/e5e93e6145090a636e67766a53b758d7ac… commit: e5e93e6145090a636e67766a53b758d7ac78e3ad branch: 3.10 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-06-02T16:48:40-07:00 summary: bpo-43921: Fix test_ssl.test_pha_required_nocert() (GH-26489) Fix test_pha_required_nocert() of test_ssl: catch two more EOF cases (when the recv() method returns an empty string). (cherry picked from commit 320eaa7f42b413cd5e5436ec92d4dc5ba150395f) Co-authored-by: Victor Stinner <vstinner(a)python.org> files: A Misc/NEWS.d/next/Tests/2021-06-02-17-41-42.bpo-43921.xP7yZ4.rst M Lib/test/test_ssl.py diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 00d5eff81537d1..fbd0131ea4f410 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -4464,11 +4464,18 @@ def msg_cb(conn, direction, version, content_type, msg_type, data): '(certificate required|EOF occurred)' ): # receive CertificateRequest - self.assertEqual(s.recv(1024), b'OK\n') + data = s.recv(1024) + if not data: + raise ssl.SSLError(1, "EOF occurred") + self.assertEqual(data, b'OK\n') + # send empty Certificate + Finish s.write(b'HASCERT') + # receive alert - s.recv(1024) + data = s.recv(1024) + if not data: + raise ssl.SSLError(1, "EOF occurred") def test_pha_optional(self): if support.verbose: diff --git a/Misc/NEWS.d/next/Tests/2021-06-02-17-41-42.bpo-43921.xP7yZ4.rst b/Misc/NEWS.d/next/Tests/2021-06-02-17-41-42.bpo-43921.xP7yZ4.rst new file mode 100644 index 00000000000000..83146c78524671 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2021-06-02-17-41-42.bpo-43921.xP7yZ4.rst @@ -0,0 +1,2 @@ +Fix test_pha_required_nocert() of test_ssl: catch two more EOF cases (when +the ``recv()`` method returns an empty string). Patch by Victor Stinner.

1 0

bpo-43921: Fix test_ssl.test_pha_required_nocert() (GH-26489)
by vstinner June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/320eaa7f42b413cd5e5436ec92d4dc5ba1… commit: 320eaa7f42b413cd5e5436ec92d4dc5ba150395f branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2021-06-02T22:25:26+02:00 summary: bpo-43921: Fix test_ssl.test_pha_required_nocert() (GH-26489) Fix test_pha_required_nocert() of test_ssl: catch two more EOF cases (when the recv() method returns an empty string). files: A Misc/NEWS.d/next/Tests/2021-06-02-17-41-42.bpo-43921.xP7yZ4.rst M Lib/test/test_ssl.py diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 0d38d7756fdc72..2df62329411889 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -4460,11 +4460,18 @@ def msg_cb(conn, direction, version, content_type, msg_type, data): '(certificate required|EOF occurred)' ): # receive CertificateRequest - self.assertEqual(s.recv(1024), b'OK\n') + data = s.recv(1024) + if not data: + raise ssl.SSLError(1, "EOF occurred") + self.assertEqual(data, b'OK\n') + # send empty Certificate + Finish s.write(b'HASCERT') + # receive alert - s.recv(1024) + data = s.recv(1024) + if not data: + raise ssl.SSLError(1, "EOF occurred") def test_pha_optional(self): if support.verbose: diff --git a/Misc/NEWS.d/next/Tests/2021-06-02-17-41-42.bpo-43921.xP7yZ4.rst b/Misc/NEWS.d/next/Tests/2021-06-02-17-41-42.bpo-43921.xP7yZ4.rst new file mode 100644 index 00000000000000..83146c78524671 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2021-06-02-17-41-42.bpo-43921.xP7yZ4.rst @@ -0,0 +1,2 @@ +Fix test_pha_required_nocert() of test_ssl: catch two more EOF cases (when +the ``recv()`` method returns an empty string). Patch by Victor Stinner.

1 0