]> granicus.if.org Git - python/log
python
9 years agoIssue #22619: Added negative limit support in the traceback module.
Serhiy Storchaka [Sun, 3 May 2015 10:19:46 +0000 (13:19 +0300)]
Issue #22619: Added negative limit support in the traceback module.
Based on patch by Dmitry Kazakov.

9 years agoUpdates documentation for installing Python on Windows.
Steve Dower [Sun, 3 May 2015 05:28:58 +0000 (22:28 -0700)]
Updates documentation for installing Python on Windows.

9 years agoReplaces use of WinRAR to generate ZIP file with Python script
Steve Dower [Sun, 3 May 2015 04:38:26 +0000 (21:38 -0700)]
Replaces use of WinRAR to generate ZIP file with Python script

9 years agomerge 3.4 (#24094)
Benjamin Peterson [Sun, 3 May 2015 02:37:13 +0000 (22:37 -0400)]
merge 3.4 (#24094)

9 years agomerge 3.3 (#24094)
Benjamin Peterson [Sun, 3 May 2015 02:36:26 +0000 (22:36 -0400)]
merge 3.3 (#24094)

9 years agoremove merge markers
Benjamin Peterson [Sun, 3 May 2015 02:34:31 +0000 (22:34 -0400)]
remove merge markers

9 years agojust sort the items tuple directly (closes #24094)
Benjamin Peterson [Sun, 3 May 2015 02:28:04 +0000 (22:28 -0400)]
just sort the items tuple directly (closes #24094)

9 years agoAsyncio issue 222 / PR 231 (Victor Stinner) -- fix @coroutine functions without __nam...
Guido van Rossum [Sun, 3 May 2015 01:45:51 +0000 (18:45 -0700)]
Asyncio issue 222 / PR 231 (Victor Stinner) -- fix @coroutine functions without __name__. (Merged from 3.4 branch.)

9 years agoAsyncio issue 222 / PR 231 (Victor Stinner) -- fix @coroutine functions without __name__.
Guido van Rossum [Sun, 3 May 2015 01:38:24 +0000 (18:38 -0700)]
Asyncio issue 222 / PR 231 (Victor Stinner) -- fix @coroutine functions without __name__.

9 years agoIssue #23911: Move path-based bootstrap code to a separate frozen module.
Eric Snow [Sun, 3 May 2015 01:15:18 +0000 (19:15 -0600)]
Issue #23911: Move path-based bootstrap code to a separate frozen module.

9 years agoMakes embedded distribution a plain ZIP file and corrects pyd exclusion.
Steve Dower [Sat, 2 May 2015 22:32:14 +0000 (15:32 -0700)]
Makes embedded distribution a plain ZIP file and corrects pyd exclusion.

9 years agoFixes Python failing to run during Windows release build
Steve Dower [Sat, 2 May 2015 22:23:27 +0000 (15:23 -0700)]
Fixes Python failing to run during Windows release build

9 years agoUpdate Windows installer for new CRT version.
Steve Dower [Sat, 2 May 2015 22:22:51 +0000 (15:22 -0700)]
Update Windows installer for new CRT version.

9 years agoMerge: #24108: Update fnmatch.translate example to show correct output.
R David Murray [Sat, 2 May 2015 19:08:50 +0000 (15:08 -0400)]
Merge: #24108: Update fnmatch.translate example to show correct output.

9 years ago#24108: Update fnmatch.translate example to show correct output.
R David Murray [Sat, 2 May 2015 19:08:22 +0000 (15:08 -0400)]
#24108: Update fnmatch.translate example to show correct output.

Patch by Merlijn van Deen.

9 years agoMerge: #24081: Remove obsolete caveat from import docs.
R David Murray [Sat, 2 May 2015 18:58:32 +0000 (14:58 -0400)]
Merge: #24081: Remove obsolete caveat from import docs.

9 years ago#24081: Remove obsolete caveat from import docs.
R David Murray [Sat, 2 May 2015 18:57:54 +0000 (14:57 -0400)]
#24081: Remove obsolete caveat from import docs.

Per Eric Snow's research, this changed in Python 2.4 in changeset 331e60d8ce,
but these docs were not updated.

Patch by Peter Viktorin.

9 years agomerge
Raymond Hettinger [Sat, 2 May 2015 17:45:21 +0000 (10:45 -0700)]
merge

9 years agoDefer deleted item decref until after the deque is restored to a consistent state.
Raymond Hettinger [Sat, 2 May 2015 17:44:17 +0000 (10:44 -0700)]
Defer deleted item decref until after the deque is restored to a consistent state.

9 years agomerge
Raymond Hettinger [Sat, 2 May 2015 17:07:08 +0000 (10:07 -0700)]
merge

9 years agoIssues #24099, #24100, and #24101: Fix free-after-use bug in heapq.
Raymond Hettinger [Sat, 2 May 2015 17:00:22 +0000 (10:00 -0700)]
Issues #24099, #24100, and #24101: Fix free-after-use bug in heapq.

9 years agoFixed a typo.
Serhiy Storchaka [Sat, 2 May 2015 16:25:02 +0000 (19:25 +0300)]
Fixed a typo.

9 years agoFixed a typo.
Serhiy Storchaka [Sat, 2 May 2015 16:24:41 +0000 (19:24 +0300)]
Fixed a typo.

9 years agoCloses #24060: Merged documentation update from 3.4.
Vinay Sajip [Sat, 2 May 2015 08:47:28 +0000 (09:47 +0100)]
Closes #24060: Merged documentation update from 3.4.

9 years agoIssue #24060: Made logging.Formatter documentation a little clearer.
Vinay Sajip [Sat, 2 May 2015 08:46:05 +0000 (09:46 +0100)]
Issue #24060: Made logging.Formatter documentation a little clearer.

9 years agomerge 3.4
Benjamin Peterson [Thu, 30 Apr 2015 21:38:14 +0000 (17:38 -0400)]
merge 3.4

9 years agoupdate links
Benjamin Peterson [Thu, 30 Apr 2015 21:37:11 +0000 (17:37 -0400)]
update links

9 years agoIssue #23910: Optimize property() getter calls. Patch by Joe Jevnik
Raymond Hettinger [Thu, 30 Apr 2015 15:08:13 +0000 (08:08 -0700)]
Issue #23910: Optimize property() getter calls.  Patch by Joe Jevnik

9 years ago - merge 3.4
doko@ubuntu.com [Thu, 30 Apr 2015 11:44:43 +0000 (13:44 +0200)]
 - merge 3.4

9 years ago - remove unused EXTRAPLATDIR macro in Makefile.pre.in
doko@ubuntu.com [Thu, 30 Apr 2015 11:44:18 +0000 (13:44 +0200)]
 - remove unused EXTRAPLATDIR macro in Makefile.pre.in

9 years agomerge 3.4
Benjamin Peterson [Wed, 29 Apr 2015 22:00:57 +0000 (18:00 -0400)]
merge 3.4

9 years agoimprove phrasing
Benjamin Peterson [Wed, 29 Apr 2015 22:00:44 +0000 (18:00 -0400)]
improve phrasing

9 years agoIssue #24077: merge from 3.4
Ned Deily [Wed, 29 Apr 2015 21:53:34 +0000 (14:53 -0700)]
Issue #24077: merge from 3.4

9 years agoIssue #24077: Fix typo in man page for -I command option: -s, not -S.
Ned Deily [Wed, 29 Apr 2015 21:51:43 +0000 (14:51 -0700)]
Issue #24077: Fix typo in man page for -I command option: -s, not -S.

9 years agoremove deleted method
Benjamin Peterson [Tue, 28 Apr 2015 04:04:53 +0000 (00:04 -0400)]
remove deleted method

9 years agoremove the concept of an unoptimized function scope from the compiler, since it can...
Benjamin Peterson [Tue, 28 Apr 2015 01:44:22 +0000 (21:44 -0400)]
remove the concept of an unoptimized function scope from the compiler, since it can't happen anymore

9 years agoMerge 3.4
Andrew Svetlov [Mon, 27 Apr 2015 14:49:16 +0000 (17:49 +0300)]
Merge 3.4

9 years agoIssue #21354: PyCFunction_New function is exposed by python DLL again.
Andrew Svetlov [Mon, 27 Apr 2015 14:48:50 +0000 (17:48 +0300)]
Issue #21354: PyCFunction_New function is exposed by python DLL again.

9 years agoIssue #24062: Fix os.stat links. Patch by July Tikhonov.
Berker Peksag [Mon, 27 Apr 2015 10:53:54 +0000 (13:53 +0300)]
Issue #24062: Fix os.stat links. Patch by July Tikhonov.

9 years agoIssue #24062: Fix os.stat links. Patch by July Tikhonov.
Berker Peksag [Mon, 27 Apr 2015 10:53:28 +0000 (13:53 +0300)]
Issue #24062: Fix os.stat links. Patch by July Tikhonov.

9 years agomerge 3.4 (#24058)
Benjamin Peterson [Sun, 26 Apr 2015 19:56:23 +0000 (15:56 -0400)]
merge 3.4 (#24058)

9 years agoremove extern definition, since it's in a header file (closes #24058)
Benjamin Peterson [Sun, 26 Apr 2015 19:55:06 +0000 (15:55 -0400)]
remove extern definition, since it's in a header file (closes #24058)

9 years agoAdd missing newline in NEWS
Antoine Pitrou [Sun, 26 Apr 2015 16:48:28 +0000 (18:48 +0200)]
Add missing newline in NEWS

9 years agoIssue #23996: Avoid a crash when a delegated generator raises an unnormalized StopIte...
Antoine Pitrou [Sun, 26 Apr 2015 16:48:16 +0000 (18:48 +0200)]
Issue #23996: Avoid a crash when a delegated generator raises an unnormalized StopIteration exception.  Patch by Stefan Behnel.

9 years agoIssue #23996: Avoid a crash when a delegated generator raises an unnormalized StopIte...
Antoine Pitrou [Sun, 26 Apr 2015 16:46:40 +0000 (18:46 +0200)]
Issue #23996: Avoid a crash when a delegated generator raises an unnormalized StopIteration exception.  Patch by Stefan Behnel.

9 years agoIssue #23356: Simplify convert_arg_line_to_args example.
Berker Peksag [Sun, 26 Apr 2015 09:10:27 +0000 (12:10 +0300)]
Issue #23356: Simplify convert_arg_line_to_args example.

Patch by py.user.

9 years agoIssue #23356: Simplify convert_arg_line_to_args example.
Berker Peksag [Sun, 26 Apr 2015 09:09:54 +0000 (12:09 +0300)]
Issue #23356: Simplify convert_arg_line_to_args example.

Patch by py.user.

9 years agoSilence a gcc "may be used uninitialized" compiler warning. Not true.
Gregory P. Smith [Sun, 26 Apr 2015 06:51:39 +0000 (23:51 -0700)]
Silence a gcc "may be used uninitialized" compiler warning.  Not true.
Initializing retval prevents the naive warning.

9 years agoFix computation of max_fd on OpenBSD. Issue #23852.
Gregory P. Smith [Sun, 26 Apr 2015 06:44:02 +0000 (23:44 -0700)]
Fix computation of max_fd on OpenBSD.  Issue #23852.

9 years agoFix computation of max_fd on OpenBSD. Issue #23852.
Gregory P. Smith [Sun, 26 Apr 2015 06:43:34 +0000 (23:43 -0700)]
Fix computation of max_fd on OpenBSD.  Issue #23852.

9 years agoUse assertEqual rather than assertEquals to avoid the deprecation warning.
Gregory P. Smith [Sun, 26 Apr 2015 05:05:53 +0000 (05:05 +0000)]
Use assertEqual rather than assertEquals to avoid the deprecation warning.

9 years agoAdd missing PyAPI_FUNC macro's to the public functions as other .c files do
Gregory P. Smith [Sun, 26 Apr 2015 04:59:52 +0000 (04:59 +0000)]
Add missing PyAPI_FUNC macro's to the public functions as other .c files do
in hopes that this fixes the windows extension module link error for modules
trying to call _Py_strhex functions.  issue9951.

9 years agoSwitch binascii over to using the common _Py_strhex implementation for its hex
Gregory P. Smith [Sun, 26 Apr 2015 00:42:13 +0000 (00:42 +0000)]
Switch binascii over to using the common _Py_strhex implementation for its hex
and hexlify functions.  issue9951.

9 years agoAdd the files missing from c9f1630cf2b1 for issue9951.
Gregory P. Smith [Sun, 26 Apr 2015 00:41:00 +0000 (00:41 +0000)]
Add the files missing from c9f1630cf2b1 for issue9951.

hg status should be my friend more often...

9 years agoIssue9951: update _hashopenssl and md5module to use _Py_strhex().
Gregory P. Smith [Sat, 25 Apr 2015 23:42:38 +0000 (23:42 +0000)]
Issue9951: update _hashopenssl and md5module to use _Py_strhex().
Also update _posixsubprocess to use Py_hexdigits instead of its own constant.

9 years agoImplements issue #9951: Adds a hex() method to bytes, bytearray, & memoryview.
Gregory P. Smith [Sat, 25 Apr 2015 23:22:26 +0000 (23:22 +0000)]
Implements issue #9951: Adds a hex() method to bytes, bytearray, & memoryview.

Also updates a few internal implementations of the same thing to use the
new built-in code.

Contributed by Arnon Yaari.

9 years agomerge 3.4 (#24057)
Benjamin Peterson [Sat, 25 Apr 2015 18:16:25 +0000 (14:16 -0400)]
merge 3.4 (#24057)

9 years agofix relative link (closes #24057)
Benjamin Peterson [Sat, 25 Apr 2015 18:15:16 +0000 (14:15 -0400)]
fix relative link (closes #24057)

9 years ago(Merge 3.4) Issue #9246: On POSIX, os.getcwd() now supports paths longer than
Victor Stinner [Fri, 24 Apr 2015 22:21:52 +0000 (00:21 +0200)]
(Merge 3.4) Issue #9246: On POSIX, os.getcwd() now supports paths longer than
1025 bytes. Patch written by William Orr.

9 years agoIssue #9246: On POSIX, os.getcwd() now supports paths longer than 1025 bytes
Victor Stinner [Fri, 24 Apr 2015 22:16:10 +0000 (00:16 +0200)]
Issue #9246: On POSIX, os.getcwd() now supports paths longer than 1025 bytes

Patch written by William Orr.

9 years agomerge 3.4 (#24049)
Benjamin Peterson [Fri, 24 Apr 2015 16:02:53 +0000 (12:02 -0400)]
merge 3.4 (#24049)

9 years agoremove dead *-import checking code (closes #24049)
Benjamin Peterson [Fri, 24 Apr 2015 16:02:29 +0000 (12:02 -0400)]
remove dead *-import checking code (closes #24049)

9 years agoIssue #24007: Argument Clinic now writes the format of PyArg_Parse*() at the
Serhiy Storchaka [Thu, 23 Apr 2015 21:40:51 +0000 (00:40 +0300)]
Issue #24007: Argument Clinic now writes the format of PyArg_Parse*() at the
same line as function name.

9 years agomerge 3.4 (#24044)
Benjamin Peterson [Thu, 23 Apr 2015 21:06:45 +0000 (17:06 -0400)]
merge 3.4 (#24044)

9 years agomerge 3.3 (#24044)
Benjamin Peterson [Thu, 23 Apr 2015 21:06:33 +0000 (17:06 -0400)]
merge 3.3 (#24044)

9 years agomerge 3.2 (#24044)
Benjamin Peterson [Thu, 23 Apr 2015 21:05:07 +0000 (17:05 -0400)]
merge 3.2 (#24044)

9 years agoproperly handle malloc failure (closes #24044)
Benjamin Peterson [Thu, 23 Apr 2015 21:04:36 +0000 (17:04 -0400)]
properly handle malloc failure (closes #24044)

Patch by Christian Heimes.

9 years agoIssue #24031: make patchcheck now supports git checkouts, too.
Christian Heimes [Thu, 23 Apr 2015 09:25:41 +0000 (11:25 +0200)]
Issue #24031: make patchcheck now supports git checkouts, too.

9 years agoIssue #24031: make patchcheck now supports git checkouts, too.
Christian Heimes [Thu, 23 Apr 2015 09:24:14 +0000 (11:24 +0200)]
Issue #24031: make patchcheck now supports git checkouts, too.

9 years agoIssue #23713: Fixed fragility of test_imap_unordered_handle_iterable_exception.
Serhiy Storchaka [Thu, 23 Apr 2015 08:36:40 +0000 (11:36 +0300)]
Issue #23713: Fixed fragility of test_imap_unordered_handle_iterable_exception.
Patch by Davin Potts.

9 years agoIssue #23713: Fixed fragility of test_imap_unordered_handle_iterable_exception.
Serhiy Storchaka [Thu, 23 Apr 2015 08:35:59 +0000 (11:35 +0300)]
Issue #23713: Fixed fragility of test_imap_unordered_handle_iterable_exception.
Patch by Davin Potts.

9 years agoUse more precise Tcl version checks in tests.
Serhiy Storchaka [Thu, 23 Apr 2015 07:58:15 +0000 (10:58 +0300)]
Use more precise Tcl version checks in tests.

9 years agoUse more precise Tcl version checks in tests.
Serhiy Storchaka [Thu, 23 Apr 2015 07:57:40 +0000 (10:57 +0300)]
Use more precise Tcl version checks in tests.

9 years agoIssue #24029: Document the name binding behavior for submodule imports.
Barry Warsaw [Wed, 22 Apr 2015 22:38:26 +0000 (18:38 -0400)]
Issue #24029: Document the name binding behavior for submodule imports.

9 years agoIssue #24029: Document the name binding behavior for submodule imports.
Barry Warsaw [Wed, 22 Apr 2015 22:36:44 +0000 (18:36 -0400)]
Issue #24029: Document the name binding behavior for submodule imports.

9 years agoIssue #24029: Document the name binding behavior for submodule imports.
Barry Warsaw [Wed, 22 Apr 2015 22:29:16 +0000 (18:29 -0400)]
Issue #24029: Document the name binding behavior for submodule imports.

9 years agoNext attempt: fix .gitignore for Unix and OSX. Sorry RDM!
Christian Heimes [Wed, 22 Apr 2015 21:55:29 +0000 (23:55 +0200)]
Next attempt: fix .gitignore for Unix and OSX. Sorry RDM!

9 years agoNext attempt: fix .gitignore for Unix and OSX. Sorry RDM!
Christian Heimes [Wed, 22 Apr 2015 21:54:44 +0000 (23:54 +0200)]
Next attempt: fix .gitignore for Unix and OSX. Sorry RDM!

9 years agoIssue #23887: urllib.error.HTTPError now has a proper repr() representation.
Facundo Batista [Wed, 22 Apr 2015 21:35:54 +0000 (18:35 -0300)]
Issue #23887: urllib.error.HTTPError now has a proper repr() representation.

9 years agoFix .gitignore for 'python' binary.
Christian Heimes [Wed, 22 Apr 2015 20:16:01 +0000 (22:16 +0200)]
Fix .gitignore for 'python' binary.

9 years agoFix .gitignore for 'python' binary.
Christian Heimes [Wed, 22 Apr 2015 20:15:44 +0000 (22:15 +0200)]
Fix .gitignore for 'python' binary.

9 years agomerge 3.4 (#22785)
Benjamin Peterson [Wed, 22 Apr 2015 13:16:27 +0000 (09:16 -0400)]
merge 3.4 (#22785)

9 years agoimproved range docstring (closes #22785)
Benjamin Peterson [Wed, 22 Apr 2015 13:16:07 +0000 (09:16 -0400)]
improved range docstring (closes #22785)

Patch by Ned Batchelder.

9 years ago - move NEWS item to 3.5
doko@ubuntu.com [Wed, 22 Apr 2015 12:49:27 +0000 (14:49 +0200)]
 - move NEWS item to 3.5

9 years agoIssue #21483: Skip test_timestamp_overflow on NFS.
Berker Peksag [Wed, 22 Apr 2015 08:32:19 +0000 (11:32 +0300)]
Issue #21483: Skip test_timestamp_overflow on NFS.

Patch by Isaac Schwabacher.

9 years agoMerge heads
Serhiy Storchaka [Wed, 22 Apr 2015 08:01:38 +0000 (11:01 +0300)]
Merge heads

9 years agoIssue #16840. Turn off bignum support in tkinter with with Tcl earlier than 8.5.8
Serhiy Storchaka [Wed, 22 Apr 2015 07:59:32 +0000 (10:59 +0300)]
Issue #16840. Turn off bignum support in tkinter with with Tcl earlier than 8.5.8
(tclTomMath.h was broken) and non-final Tcl 8.6.
Removed TK_VERSION_HEX.

9 years agoIssue #16840. Turn off bignum support in tkinter with with Tcl earlier than 8.5.8
Serhiy Storchaka [Wed, 22 Apr 2015 07:53:08 +0000 (10:53 +0300)]
Issue #16840. Turn off bignum support in tkinter with with Tcl earlier than 8.5.8
(tclTomMath.h was broken) and non-final Tcl 8.6.

9 years agoIssue #23917: Fall back to sequential compilation when ProcessPoolExecutor doesn...
Berker Peksag [Wed, 22 Apr 2015 06:39:19 +0000 (09:39 +0300)]
Issue #23917: Fall back to sequential compilation when ProcessPoolExecutor doesn't exist.

Patch by Claudiu Popa.

9 years agoFixed full Tcl version parsing in tests for pre-final versions.
Serhiy Storchaka [Wed, 22 Apr 2015 05:36:41 +0000 (08:36 +0300)]
Fixed full Tcl version parsing in tests for pre-final versions.

9 years agoFixed full Tcl version parsing in tests for pre-final versions.
Serhiy Storchaka [Wed, 22 Apr 2015 05:36:03 +0000 (08:36 +0300)]
Fixed full Tcl version parsing in tests for pre-final versions.

9 years agoMerge from 3.4
Andrew Kuchling [Tue, 21 Apr 2015 23:44:54 +0000 (19:44 -0400)]
Merge from 3.4

9 years ago#15183: clarify timeit documentation to say that setup statement isn't timed
Andrew Kuchling [Tue, 21 Apr 2015 23:43:33 +0000 (19:43 -0400)]
#15183: clarify timeit documentation to say that setup statement isn't timed

9 years agoIssue #23008: Fixed resolving attributes with boolean value is False in pydoc.
Serhiy Storchaka [Tue, 21 Apr 2015 18:11:13 +0000 (21:11 +0300)]
Issue #23008: Fixed resolving attributes with boolean value is False in pydoc.

9 years agoIssue #23008: Fixed resolving attributes with boolean value is False in pydoc.
Serhiy Storchaka [Tue, 21 Apr 2015 18:09:48 +0000 (21:09 +0300)]
Issue #23008: Fixed resolving attributes with boolean value is False in pydoc.

9 years agomerge 3.4 (#24022)
Benjamin Peterson [Tue, 21 Apr 2015 16:07:06 +0000 (12:07 -0400)]
merge 3.4 (#24022)

9 years agodo not call into python api if an exception is set (#24022)
Benjamin Peterson [Tue, 21 Apr 2015 16:05:19 +0000 (12:05 -0400)]
do not call into python api if an exception is set (#24022)

9 years agoGet rid of unused-but-set-variable warning. len and len2 should be equal and len2...
Christian Heimes [Tue, 21 Apr 2015 08:57:41 +0000 (10:57 +0200)]
Get rid of unused-but-set-variable warning. len and len2 should be equal and len2 is technically more correct, too.

9 years ago#17445: difflib: add diff_bytes(), to compare bytes rather than str
Greg Ward [Tue, 21 Apr 2015 00:21:21 +0000 (20:21 -0400)]
#17445: difflib: add diff_bytes(), to compare bytes rather than str

Some applications (e.g. traditional Unix diff, version control
systems) neither know nor care about the encodings of the files they
are comparing. They are textual, but to the diff utility they are just
bytes. This worked fine under Python 2, because all of the hardcoded
strings in difflib.py are ASCII, so could safely be combined with
old-style u'' strings. But it stopped working in 3.x.

The solution is to use surrogate escapes for a lossless
bytes->str->bytes roundtrip. That means {unified,context}_diff() can
continue to just handle strings without worrying about bytes. Callers
who have to deal with bytes will need to change to using diff_bytes().

Use case: Mercurial's test runner uses difflib to compare current hg
output with known good output. But Mercurial's output is just bytes,
since it can contain:
  * file contents (arbitrary unknown encoding)
  * filenames (arbitrary unknown encoding)
  * usernames and commit messages (usually UTF-8, but not guaranteed
    because old versions of Mercurial did not enforce it)
  * user messages (locale encoding)

Since the output of any given hg command can include text in multiple
encodings, it is hopeless to try to treat it as decodable Unicode
text. It's just bytes, all the way down.

This is an elaboration of a patch by Terry Reedy.

9 years agomerge 3.4 (#23989)
Benjamin Peterson [Mon, 20 Apr 2015 22:22:21 +0000 (18:22 -0400)]
merge 3.4 (#23989)