]> granicus.if.org Git - python/log
python
8 years agoIssue #27989: Tweak inspect.formatannotation() to improve pydoc rendering of function...
Guido van Rossum [Sat, 22 Oct 2016 14:56:58 +0000 (07:56 -0700)]
Issue #27989: Tweak inspect.formatannotation() to improve pydoc rendering of function annotations. Ivan L. (3.5->3.6)

8 years agoIssue #27989: Tweak inspect.formatannotation() to improve pydoc rendering of function...
Guido van Rossum [Sat, 22 Oct 2016 14:55:18 +0000 (07:55 -0700)]
Issue #27989: Tweak inspect.formatannotation() to improve pydoc rendering of function annotations. Ivan L.

8 years agoIssue #28435: Merge urllib test fixes from 3.5 into 3.6
Martin Panter [Sat, 22 Oct 2016 03:21:36 +0000 (03:21 +0000)]
Issue #28435: Merge urllib test fixes from 3.5 into 3.6

8 years agoIssue #28435: Avoid no_proxy environment variable interfering with tests
Martin Panter [Sat, 22 Oct 2016 01:42:06 +0000 (01:42 +0000)]
Issue #28435: Avoid no_proxy environment variable interfering with tests

Patch by Piotr Szczepaniak.

8 years agoIssue #26620: Fix ResourceWarning in test_urllib2_localnet
Martin Panter [Sat, 22 Oct 2016 01:28:21 +0000 (01:28 +0000)]
Issue #26620: Fix ResourceWarning in test_urllib2_localnet

* Use context manager on urllib objects to ensure that they are closed on error
* Use self.addCleanup() to cleanup resources even if a test is interrupted
  with CTRL+c

This backports a patch by Victor Stinner.

8 years agoTwo minor typing.py fixes (upstream #305) (3.5->3.6)
Guido van Rossum [Sat, 22 Oct 2016 00:30:30 +0000 (17:30 -0700)]
Two minor typing.py fixes (upstream #305) (3.5->3.6)

8 years agoTwo minor typing.py fixes (upstream #305)
Guido van Rossum [Sat, 22 Oct 2016 00:30:29 +0000 (17:30 -0700)]
Two minor typing.py fixes (upstream #305)

8 years agoIssue #28482: Skip a few test_typing tests if asyncio unavailable (3.5->3.6)
Guido van Rossum [Fri, 21 Oct 2016 23:12:50 +0000 (16:12 -0700)]
Issue #28482: Skip a few test_typing tests if asyncio unavailable (3.5->3.6)

8 years agoIssue #28482: Skip a few test_typing tests if asyncio unavailable
Guido van Rossum [Fri, 21 Oct 2016 23:12:17 +0000 (16:12 -0700)]
Issue #28482: Skip a few test_typing tests if asyncio unavailable

8 years agoMerge 3.5 (issue #26796)
Yury Selivanov [Fri, 21 Oct 2016 21:41:23 +0000 (17:41 -0400)]
Merge 3.5 (issue #26796)

8 years agoIssue #26796: Don't configure the number of workers for default threadpool executor.
Yury Selivanov [Fri, 21 Oct 2016 21:40:42 +0000 (17:40 -0400)]
Issue #26796: Don't configure the number of workers for default threadpool executor.

Initial patch by Hans Lawrenz.

8 years agoFix indent (merge)
Guido van Rossum [Fri, 21 Oct 2016 21:31:18 +0000 (14:31 -0700)]
Fix indent (merge)

8 years agoFix indent
Guido van Rossum [Fri, 21 Oct 2016 21:30:50 +0000 (14:30 -0700)]
Fix indent

8 years agoSync typing.py from upstream (3.5->3.6)
Guido van Rossum [Fri, 21 Oct 2016 21:28:29 +0000 (14:28 -0700)]
Sync typing.py from upstream (3.5->3.6)

8 years agoSync typing.py from upstream
Guido van Rossum [Fri, 21 Oct 2016 21:27:58 +0000 (14:27 -0700)]
Sync typing.py from upstream

8 years agoMerge 3.5 (issue #26923)
Yury Selivanov [Fri, 21 Oct 2016 21:23:35 +0000 (17:23 -0400)]
Merge 3.5 (issue #26923)

8 years agoIssue #26923: Fix asyncio.Gather to refuse being cancelled once all children are...
Yury Selivanov [Fri, 21 Oct 2016 21:22:17 +0000 (17:22 -0400)]
Issue #26923: Fix asyncio.Gather to refuse being cancelled once all children are done.

Patch by Johannes Ebke.

8 years agoIssue #28500: Fix asyncio to handle async gens GC from another thread.
Yury Selivanov [Fri, 21 Oct 2016 21:13:40 +0000 (17:13 -0400)]
Issue #28500: Fix asyncio to handle async gens GC from another thread.

8 years agoMerge (issue #25152)
Brett Cannon [Fri, 21 Oct 2016 19:54:02 +0000 (12:54 -0700)]
Merge (issue #25152)

8 years agoIssue #25152: Mention the deprecation of pyvenv
Brett Cannon [Fri, 21 Oct 2016 19:53:40 +0000 (12:53 -0700)]
Issue #25152: Mention the deprecation of pyvenv

8 years agoMerge (issue #28396)
Brett Cannon [Fri, 21 Oct 2016 19:15:48 +0000 (12:15 -0700)]
Merge (issue #28396)

8 years agoIssue #28396: Remove any mention of .pyo files from the man page.
Brett Cannon [Fri, 21 Oct 2016 19:15:14 +0000 (12:15 -0700)]
Issue #28396: Remove any mention of .pyo files from the man page.

Thanks to Ville Skyttä for the patch.

8 years agoIssue #28214: Improved exception reporting for problematic __set_name__
Serhiy Storchaka [Fri, 21 Oct 2016 14:13:31 +0000 (17:13 +0300)]
Issue #28214: Improved exception reporting for problematic __set_name__
attributes.

8 years agoIssue #28410: Added _PyErr_FormatFromCause() -- the helper for raising
Serhiy Storchaka [Fri, 21 Oct 2016 14:09:17 +0000 (17:09 +0300)]
Issue #28410: Added _PyErr_FormatFromCause() -- the helper for raising
new exception with setting current exception as __cause__.

_PyErr_FormatFromCause(exception, format, args...) is equivalent to Python

    raise exception(format % args) from sys.exc_info()[1]

8 years agoIssue #28410: Keep the traceback of original exception in _PyErr_ChainExceptions().
Serhiy Storchaka [Fri, 21 Oct 2016 13:20:43 +0000 (16:20 +0300)]
Issue #28410: Keep the traceback of original exception in _PyErr_ChainExceptions().

8 years agoIssue #28410: Keep the traceback of original exception in _PyErr_ChainExceptions().
Serhiy Storchaka [Fri, 21 Oct 2016 13:19:59 +0000 (16:19 +0300)]
Issue #28410: Keep the traceback of original exception in _PyErr_ChainExceptions().

8 years agoIssue #18219: Optimize csv.DictWriter for large number of columns.
INADA Naoki [Fri, 21 Oct 2016 10:47:57 +0000 (19:47 +0900)]
Issue #18219: Optimize csv.DictWriter for large number of columns.

Patch by Mariatta Wijaya.

8 years agomark dtrace stubs as static inline; remove stubs
Benjamin Peterson [Fri, 21 Oct 2016 05:37:00 +0000 (22:37 -0700)]
mark dtrace stubs as static inline; remove stubs

C99 inline semantics don't work everywhere. (https://bugs.python.org/issue28092)
We don't want these to have external visibility anyway.

8 years agoIssue #28448: Fix C implemented asyncio.Future didn't work on Windows
INADA Naoki [Fri, 21 Oct 2016 03:30:15 +0000 (12:30 +0900)]
Issue #28448: Fix C implemented asyncio.Future didn't work on Windows

8 years agoIssue #28484: Skip tests if GIL is not used or multithreading is disabled
Martin Panter [Thu, 20 Oct 2016 21:45:49 +0000 (21:45 +0000)]
Issue #28484: Skip tests if GIL is not used or multithreading is disabled

8 years agoIssue #24381: Avoid unused function warning when building bundled macOS libffi.
Ned Deily [Thu, 20 Oct 2016 19:38:27 +0000 (15:38 -0400)]
Issue #24381: Avoid unused function warning when building bundled macOS libffi.
Patch by Vajrasky Kok.

8 years agoIssue #26010: Document CO_* constants
Yury Selivanov [Thu, 20 Oct 2016 17:06:30 +0000 (13:06 -0400)]
Issue #26010: Document CO_* constants

8 years agoIssue #28471: Avoid ResourceWarning by detaching test socket
Martin Panter [Thu, 20 Oct 2016 07:44:29 +0000 (07:44 +0000)]
Issue #28471: Avoid ResourceWarning by detaching test socket

8 years agoIssue #28493: Fix typos in _asynciomodule.c
Yury Selivanov [Thu, 20 Oct 2016 20:33:19 +0000 (16:33 -0400)]
Issue #28493: Fix typos in _asynciomodule.c

Thanks to Stéphane Wirtel!

8 years agoIssue #26010: fix typos; rewording
Yury Selivanov [Thu, 20 Oct 2016 20:30:51 +0000 (16:30 -0400)]
Issue #26010: fix typos; rewording

8 years agoIssue #28492: Fix how StopIteration is raised in _asyncio.Future
Yury Selivanov [Thu, 20 Oct 2016 19:54:20 +0000 (15:54 -0400)]
Issue #28492: Fix how StopIteration is raised in _asyncio.Future

8 years agoIssue #24381: merge from 3.5
Ned Deily [Thu, 20 Oct 2016 19:40:22 +0000 (15:40 -0400)]
Issue #24381: merge from 3.5

8 years agoMerge 3.5 + document CO_ASYNC_GENERATOR; issue #26010
Yury Selivanov [Thu, 20 Oct 2016 17:11:34 +0000 (13:11 -0400)]
Merge 3.5 + document CO_ASYNC_GENERATOR; issue #26010

8 years agoIssue #28480: Adjust or skip tests if multithreading is disabled
Martin Panter [Thu, 20 Oct 2016 05:10:44 +0000 (05:10 +0000)]
Issue #28480: Adjust or skip tests if multithreading is disabled

8 years agoIssue #28480: Avoid label at end of compound statement --without-threads
Martin Panter [Thu, 20 Oct 2016 00:48:23 +0000 (00:48 +0000)]
Issue #28480: Avoid label at end of compound statement --without-threads

Based on patch by Masayuki Yamamoto.

8 years agoClose #28479: Fix reST syntax in windows.rst
Victor Stinner [Wed, 19 Oct 2016 22:45:50 +0000 (00:45 +0200)]
Close #28479: Fix reST syntax in windows.rst

Patch written by Julien Palard.

8 years agoIssue #19795: Fixed formatting a table.
Serhiy Storchaka [Wed, 19 Oct 2016 16:37:44 +0000 (19:37 +0300)]
Issue #19795: Fixed formatting a table.

8 years agoIssue #19795: Fixed formatting a table.
Serhiy Storchaka [Wed, 19 Oct 2016 16:37:20 +0000 (19:37 +0300)]
Issue #19795: Fixed formatting a table.

8 years agoIssue #19795: Improved more markups of True/False.
Serhiy Storchaka [Wed, 19 Oct 2016 15:36:51 +0000 (18:36 +0300)]
Issue #19795: Improved more markups of True/False.

8 years agoIssue #19795: Improved more markups of True/False.
Serhiy Storchaka [Wed, 19 Oct 2016 15:30:05 +0000 (18:30 +0300)]
Issue #19795: Improved more markups of True/False.

8 years agoIssue #19795: Fixed markup errors.
Serhiy Storchaka [Wed, 19 Oct 2016 15:12:05 +0000 (18:12 +0300)]
Issue #19795: Fixed markup errors.

8 years agoIssue #19795: Fixed markup errors.
Serhiy Storchaka [Wed, 19 Oct 2016 15:11:24 +0000 (18:11 +0300)]
Issue #19795: Fixed markup errors.

8 years agoIssue #19795: Mark up True and False as literal text instead of bold.
Serhiy Storchaka [Wed, 19 Oct 2016 13:44:47 +0000 (16:44 +0300)]
Issue #19795: Mark up True and False as literal text instead of bold.

8 years agoIssue #19795: Mark up True and False as literal text instead of bold.
Serhiy Storchaka [Wed, 19 Oct 2016 13:43:42 +0000 (16:43 +0300)]
Issue #19795: Mark up True and False as literal text instead of bold.

8 years agoIssue #19795: Mark up None as literal text.
Serhiy Storchaka [Wed, 19 Oct 2016 13:37:13 +0000 (16:37 +0300)]
Issue #19795: Mark up None as literal text.

8 years agoIssue #19795: Mark up None as literal text.
Serhiy Storchaka [Wed, 19 Oct 2016 13:29:26 +0000 (16:29 +0300)]
Issue #19795: Mark up None as literal text.

8 years agoIssue #26944: Fix test_posix for Android where 'id -G' is entirely wrong
Xavier de Gaye [Wed, 19 Oct 2016 09:00:26 +0000 (11:00 +0200)]
Issue #26944: Fix test_posix for Android where 'id -G' is entirely wrong
or missing the effective gid.

8 years agoalways use double quotes for SystemTap string literals (closes #28472)
Benjamin Peterson [Wed, 19 Oct 2016 06:33:03 +0000 (23:33 -0700)]
always use double quotes for SystemTap string literals (closes #28472)

Patch by Roman Podoliaka.

8 years agobold arguments
Benjamin Peterson [Wed, 19 Oct 2016 06:14:08 +0000 (23:14 -0700)]
bold arguments

8 years agoIssue #28471: Fix crash (GIL state related) in socket.setblocking
Yury Selivanov [Tue, 18 Oct 2016 20:03:52 +0000 (16:03 -0400)]
Issue #28471: Fix crash (GIL state related) in socket.setblocking

8 years agoMerge 3.5
Victor Stinner [Tue, 18 Oct 2016 13:48:14 +0000 (15:48 +0200)]
Merge 3.5

8 years agoIssue #23782: Fixed possible memory leak in _PyTraceback_Add() and exception
Serhiy Storchaka [Tue, 18 Oct 2016 10:26:25 +0000 (13:26 +0300)]
Issue #23782: Fixed possible memory leak in _PyTraceback_Add() and exception
loss in PyTraceBack_Here().

8 years agoIssue #23782: Fixed possible memory leak in _PyTraceback_Add() and exception
Serhiy Storchaka [Tue, 18 Oct 2016 10:23:18 +0000 (13:23 +0300)]
Issue #23782: Fixed possible memory leak in _PyTraceback_Add() and exception
loss in PyTraceBack_Here().

8 years agoIssue #28452: Remove _asyncio._init_module function
INADA Naoki [Tue, 18 Oct 2016 02:48:14 +0000 (11:48 +0900)]
Issue #28452: Remove _asyncio._init_module function

8 years agoMerge from 3.5
Berker Peksag [Mon, 17 Oct 2016 21:35:09 +0000 (00:35 +0300)]
Merge from 3.5

8 years agoFix default value of StreamReader.readuntil()
Berker Peksag [Mon, 17 Oct 2016 21:34:46 +0000 (00:34 +0300)]
Fix default value of StreamReader.readuntil()

Reported by Sam Lunt on docs@p.o.

8 years agoMerge 3.6: Issue #28409: regrtest: fix the parser of command line arguments.
Victor Stinner [Mon, 17 Oct 2016 16:13:46 +0000 (18:13 +0200)]
Merge 3.6: Issue #28409: regrtest: fix the parser of command line arguments.

8 years agoIssue #28409: regrtest: fix the parser of command line arguments.
Victor Stinner [Mon, 17 Oct 2016 16:11:03 +0000 (18:11 +0200)]
Issue #28409: regrtest: fix the parser of command line arguments.

8 years agoIssue #28455: Merge from 3.5
Berker Peksag [Mon, 17 Oct 2016 03:14:48 +0000 (06:14 +0300)]
Issue #28455: Merge from 3.5

8 years agoIssue #28455: Clarify example of overriding the convert_arg_line_to_args method
Berker Peksag [Mon, 17 Oct 2016 03:14:17 +0000 (06:14 +0300)]
Issue #28455: Clarify example of overriding the convert_arg_line_to_args method

Patch by Mariatta Wijaya.

8 years agomerge 3.5 (#28454)
Benjamin Peterson [Sun, 16 Oct 2016 22:42:24 +0000 (15:42 -0700)]
merge 3.5 (#28454)

8 years agoremove extra PyErr_Format arguments (closes #28454)
Benjamin Peterson [Sun, 16 Oct 2016 22:41:46 +0000 (15:41 -0700)]
remove extra PyErr_Format arguments (closes #28454)

Patch from Xiang Zhang.

8 years agoIssue #28432: Merge from 3.5
Berker Peksag [Sun, 16 Oct 2016 21:46:37 +0000 (00:46 +0300)]
Issue #28432: Merge from 3.5

8 years agoIssue #28432: Fix first parameter name in PyUnicode_EncodeLocale documentation
Berker Peksag [Sun, 16 Oct 2016 21:45:56 +0000 (00:45 +0300)]
Issue #28432: Fix first parameter name in PyUnicode_EncodeLocale documentation

Patch by Xiang Zhang.

8 years agoIssue #27896: Allow passing sphinx options to Doc/Makefile
Victor Stinner [Sun, 16 Oct 2016 17:14:23 +0000 (19:14 +0200)]
Issue #27896: Allow passing sphinx options to Doc/Makefile

Patch written by Julien Palard.

8 years agoRemove spurious article.
Ned Deily [Sat, 15 Oct 2016 19:13:20 +0000 (15:13 -0400)]
Remove spurious article.

8 years agoRemove spurious article.
Ned Deily [Sat, 15 Oct 2016 19:12:03 +0000 (15:12 -0400)]
Remove spurious article.

8 years agoIssue #28428: Rename _futures module to _asyncio.
INADA Naoki [Sat, 15 Oct 2016 06:39:19 +0000 (15:39 +0900)]
Issue #28428: Rename _futures module to _asyncio.

It will have more speedup functions or classes other than asyncio.Future.

8 years agoIssue #27800: Merge RE repetition doc from 3.5 into 3.6
Martin Panter [Sat, 15 Oct 2016 01:39:01 +0000 (01:39 +0000)]
Issue #27800: Merge RE repetition doc from 3.5 into 3.6

8 years agoIssue #27800: Document limitation and workaround for multiple RE repetitions
Martin Panter [Sat, 15 Oct 2016 01:18:16 +0000 (01:18 +0000)]
Issue #27800: Document limitation and workaround for multiple RE repetitions

8 years agoIssue #23231: Merge codecs doc from 3.5 into 3.6
Martin Panter [Sat, 15 Oct 2016 01:04:08 +0000 (01:04 +0000)]
Issue #23231: Merge codecs doc from 3.5 into 3.6

8 years agoIssue #23231: Document codecs.iterencode(), iterdecode() shortcomings
Martin Panter [Sat, 15 Oct 2016 00:56:47 +0000 (00:56 +0000)]
Issue #23231: Document codecs.iterencode(), iterdecode() shortcomings

8 years ago[merge from 3.5] Issue28438 - Fix the link for pkgutil.get_data doc.
Senthil Kumaran [Fri, 14 Oct 2016 05:59:36 +0000 (22:59 -0700)]
[merge from 3.5] Issue28438 - Fix the link for pkgutil.get_data doc.

Patch contributed by Xiang Zhang.

8 years agoIssue28438 - Fix the link for pkgutil.get_data doc. Patch contributed by Xiang Zhang.
Senthil Kumaran [Fri, 14 Oct 2016 05:58:47 +0000 (22:58 -0700)]
Issue28438 - Fix the link for pkgutil.get_data doc. Patch contributed by Xiang Zhang.

8 years agoIssue #18844: Add more tests
Raymond Hettinger [Fri, 14 Oct 2016 05:19:38 +0000 (01:19 -0400)]
Issue #18844:  Add more tests

8 years agoIssue #18789: Update XML vulnerability table to use Safe/Vulnerable instead of No...
Guido van Rossum [Thu, 13 Oct 2016 21:32:33 +0000 (14:32 -0700)]
Issue #18789: Update XML vulnerability table to use Safe/Vulnerable instead of No/Yes. (3.5->3.6)

8 years agoIssue #18789: Update XML vulnerability table to use Safe/Vulnerable instead of No...
Guido van Rossum [Thu, 13 Oct 2016 21:31:50 +0000 (14:31 -0700)]
Issue #18789: Update XML vulnerability table to use Safe/Vulnerable instead of No/Yes.

8 years agoIssue #26869: Document unittest.TestCase.longMessage. (Mariatta) (3.5->3.6)
Guido van Rossum [Thu, 13 Oct 2016 21:24:23 +0000 (14:24 -0700)]
Issue #26869: Document unittest.TestCase.longMessage. (Mariatta) (3.5->3.6)

8 years agoIssue #26869: Document unittest.TestCase.longMessage. (Mariatta)
Guido van Rossum [Thu, 13 Oct 2016 21:23:01 +0000 (14:23 -0700)]
Issue #26869: Document unittest.TestCase.longMessage. (Mariatta)

8 years agoIssue #21443: Show how to change log level for asyncio. (Merge 3.5->3.6)
Guido van Rossum [Thu, 13 Oct 2016 20:57:17 +0000 (13:57 -0700)]
Issue #21443: Show how to change log level for asyncio. (Merge 3.5->3.6)

8 years agoIssue #21443: Show how to change log level for asyncio.
Guido van Rossum [Thu, 13 Oct 2016 20:56:40 +0000 (13:56 -0700)]
Issue #21443: Show how to change log level for asyncio.

8 years agoCheck return value of _PyDict_SetItemId()
Christian Heimes [Thu, 13 Oct 2016 19:10:31 +0000 (21:10 +0200)]
Check return value of _PyDict_SetItemId()

8 years agoIssue #24452: Make webbrowser support Chrome on Mac OS X (merge 3.5->3.6)
Guido van Rossum [Thu, 13 Oct 2016 18:22:52 +0000 (11:22 -0700)]
Issue #24452: Make webbrowser support Chrome on Mac OS X (merge 3.5->3.6)

8 years agoIssue #24452: Make webbrowser support Chrome on Mac OS X.
Guido van Rossum [Thu, 13 Oct 2016 18:17:27 +0000 (11:17 -0700)]
Issue #24452: Make webbrowser support Chrome on Mac OS X.

8 years agoIssue #20766: Merge with 3.5.
Xavier de Gaye [Wed, 12 Oct 2016 18:16:05 +0000 (20:16 +0200)]
Issue #20766: Merge with 3.5.

8 years agoIssue #20766: Fix references leaked by pdb in the handling of SIGINT handlers.
Xavier de Gaye [Wed, 12 Oct 2016 18:13:24 +0000 (20:13 +0200)]
Issue #20766: Fix references leaked by pdb in the handling of SIGINT handlers.

8 years agoFix _Py_normalize_encoding() command
Victor Stinner [Wed, 12 Oct 2016 11:57:45 +0000 (13:57 +0200)]
Fix _Py_normalize_encoding() command

It's not exactly the same than encodings.normalize_encoding(): the C function
also converts to lowercase.

8 years agova_end vargs2 once (closes #28417)
Benjamin Peterson [Wed, 12 Oct 2016 06:00:58 +0000 (23:00 -0700)]
va_end vargs2 once (closes #28417)

8 years agoIssue #18844: Fix-up examples for random.choices(). Remove over-specified test.
Raymond Hettinger [Wed, 12 Oct 2016 05:42:10 +0000 (01:42 -0400)]
Issue #18844:  Fix-up examples for random.choices().  Remove over-specified test.

8 years ago - Modules/Setup.dist: Add the _blake2 module
doko@ubuntu.com [Tue, 11 Oct 2016 06:06:26 +0000 (08:06 +0200)]
 - Modules/Setup.dist: Add the _blake2 module

8 years ago - dictobject.c: Make dict_merge symbol a static symbol
doko@ubuntu.com [Tue, 11 Oct 2016 06:04:02 +0000 (08:04 +0200)]
 - dictobject.c: Make dict_merge symbol a static symbol

8 years agoprefix freegrammar (closes #28413)
Benjamin Peterson [Tue, 11 Oct 2016 06:21:02 +0000 (23:21 -0700)]
prefix freegrammar (closes #28413)

8 years agoIssue #28208: Update Windows build to use SQLite 3.14.2.0
Zachary Ware [Tue, 11 Oct 2016 03:36:21 +0000 (22:36 -0500)]
Issue #28208: Update Windows build to use SQLite 3.14.2.0

8 years agoIssue #28248: Merge with 3.5
Zachary Ware [Tue, 11 Oct 2016 03:22:27 +0000 (22:22 -0500)]
Issue #28248: Merge with 3.5

8 years agoIssue #28248: Merge with 3.4
Zachary Ware [Tue, 11 Oct 2016 03:11:12 +0000 (22:11 -0500)]
Issue #28248: Merge with 3.4