]> granicus.if.org Git - python/log
python
12 years agoIssue #16602: When a weakref's target was part of a long deallocation chain, the...
Antoine Pitrou [Sat, 8 Dec 2012 20:18:50 +0000 (21:18 +0100)]
Issue #16602: When a weakref's target was part of a long deallocation chain, the object could remain reachable through its weakref even though its refcount had dropped to zero.

Thanks to Eugene Toder for diagnosing and reporting the issue.

12 years agoIssue #16602: When a weakref's target was part of a long deallocation chain, the...
Antoine Pitrou [Sat, 8 Dec 2012 20:17:03 +0000 (21:17 +0100)]
Issue #16602: When a weakref's target was part of a long deallocation chain, the object could remain reachable through its weakref even though its refcount had dropped to zero.

Thanks to Eugene Toder for diagnosing and reporting the issue.

12 years agoIssue #16602: When a weakref's target was part of a long deallocation chain, the...
Antoine Pitrou [Sat, 8 Dec 2012 20:15:26 +0000 (21:15 +0100)]
Issue #16602: When a weakref's target was part of a long deallocation chain, the object could remain reachable through its weakref even though its refcount had dropped to zero.

Thanks to Eugene Toder for diagnosing and reporting the issue.

12 years agoDrop double newlines printed in some file iteration examples.
Andrew Svetlov [Sat, 8 Dec 2012 15:59:58 +0000 (17:59 +0200)]
Drop double newlines printed in some file iteration examples.

Patch by Steven Kryskalla.

12 years agoDrop double newlines printed in some file iteration examples.
Andrew Svetlov [Sat, 8 Dec 2012 15:59:23 +0000 (17:59 +0200)]
Drop double newlines printed in some file iteration examples.

Patch by Steven Kryskalla.

12 years agoDrop double newlines printed in some file iteration examples.
Andrew Svetlov [Sat, 8 Dec 2012 15:59:03 +0000 (17:59 +0200)]
Drop double newlines printed in some file iteration examples.

Patch by Steven Kryskalla.

12 years agoMerge from 3.3 (issue #16267)
Nick Coghlan [Sat, 8 Dec 2012 12:57:21 +0000 (22:57 +1000)]
Merge from 3.3 (issue #16267)

12 years agoClose issue #16267: better docs for @abstractmethod composition
Nick Coghlan [Sat, 8 Dec 2012 12:56:02 +0000 (22:56 +1000)]
Close issue #16267: better docs for @abstractmethod composition

12 years agoMerge from 3.3 (Issue #15209)
Nick Coghlan [Sat, 8 Dec 2012 12:24:23 +0000 (22:24 +1000)]
Merge from 3.3 (Issue #15209)

12 years agoIssue #15209: Clarify exception chaining description
Nick Coghlan [Sat, 8 Dec 2012 11:39:24 +0000 (21:39 +1000)]
Issue #15209: Clarify exception chaining description

- not allowed when implicitly re-raised the current exception
- last exception raised is always displayed last
- attempt to make it clearer when/if cause and context are shown

12 years agoMerge debug output removal with 3.3.
Ezio Melotti [Sat, 8 Dec 2012 10:30:58 +0000 (12:30 +0200)]
Merge debug output removal with 3.3.

12 years agoMerge debug output removal with 3.2.
Ezio Melotti [Sat, 8 Dec 2012 10:30:44 +0000 (12:30 +0200)]
Merge debug output removal with 3.2.

12 years agoRemove debug output from example.
Ezio Melotti [Sat, 8 Dec 2012 10:29:40 +0000 (12:29 +0200)]
Remove debug output from example.

12 years agoIssue #16628: Fix a memory leak in ctypes.resize().
Antoine Pitrou [Sat, 8 Dec 2012 10:07:46 +0000 (11:07 +0100)]
Issue #16628: Fix a memory leak in ctypes.resize().

12 years agoIssue #16628: Fix a memory leak in ctypes.resize().
Antoine Pitrou [Sat, 8 Dec 2012 10:07:16 +0000 (11:07 +0100)]
Issue #16628: Fix a memory leak in ctypes.resize().

12 years agoIssue #16628: Fix a memory leak in ctypes.resize().
Antoine Pitrou [Sat, 8 Dec 2012 10:05:50 +0000 (11:05 +0100)]
Issue #16628: Fix a memory leak in ctypes.resize().

12 years agoadd fixer for reload() -> imp.reload() (closes #11797)\n\nPatch by Laurie Clark-Micha...
Benjamin Peterson [Sat, 8 Dec 2012 03:44:10 +0000 (22:44 -0500)]
add fixer for reload() -> imp.reload() (closes #11797)\n\nPatch by Laurie Clark-Michalek and Berker Peksag

12 years agoIssue #16495: remove extraneous NULL encoding check from bytes_decode().
Chris Jerdonek [Fri, 7 Dec 2012 23:51:53 +0000 (15:51 -0800)]
Issue #16495: remove extraneous NULL encoding check from bytes_decode().

The NULL encoding check in bytes_decode() was unnecessary because this case
is already taken care of by the call to _Py_normalize_encoding() inside
PyUnicode_Decode().

12 years agoImprove OrderedDict equality test.
Raymond Hettinger [Fri, 7 Dec 2012 18:18:22 +0000 (10:18 -0800)]
Improve OrderedDict equality test.

12 years agoassert than we never try to deal with True, False, or None as a name
Benjamin Peterson [Thu, 6 Dec 2012 22:49:58 +0000 (17:49 -0500)]
assert than we never try to deal with True, False, or None as a name

12 years agocreate NameConstant AST class for None, True, and False literals (closes #16619)
Benjamin Peterson [Thu, 6 Dec 2012 22:41:04 +0000 (17:41 -0500)]
create NameConstant AST class for None, True, and False literals (closes #16619)

12 years agoSpecify which I/O ABC methods have implementations in the docs.
Andrew Svetlov [Thu, 6 Dec 2012 10:21:22 +0000 (12:21 +0200)]
Specify which I/O ABC methods have implementations in the docs.

12 years agoSpecify which I/O ABC methods have implementations in the docs.
Andrew Svetlov [Thu, 6 Dec 2012 10:21:12 +0000 (12:21 +0200)]
Specify which I/O ABC methods have implementations in the docs.

12 years agoSpecify which I/O ABC methods have implementations in the docs.
Andrew Svetlov [Thu, 6 Dec 2012 10:20:56 +0000 (12:20 +0200)]
Specify which I/O ABC methods have implementations in the docs.

12 years agoUpdate comment: SAVE_EXC_STATE and SWAP_EXC_STATE macroses are saave_exc_state and...
Andrew Svetlov [Wed, 5 Dec 2012 15:59:29 +0000 (17:59 +0200)]
Update comment: SAVE_EXC_STATE and SWAP_EXC_STATE macroses are saave_exc_state and swap_exc_state functions now.

12 years agoUpdate comment: SAVE_EXC_STATE and SWAP_EXC_STATE macroses are saave_exc_state and...
Andrew Svetlov [Wed, 5 Dec 2012 15:59:10 +0000 (17:59 +0200)]
Update comment: SAVE_EXC_STATE and SWAP_EXC_STATE macroses are saave_exc_state and swap_exc_state functions now.

12 years agoMerge: skip pdb test for #13120 if threading is not available.
Andrew Svetlov [Wed, 5 Dec 2012 13:07:10 +0000 (15:07 +0200)]
Merge: skip pdb test for #13120 if threading is not available.

12 years agoMerge: skip pdb test for #13120 if threading is not available.
Andrew Svetlov [Wed, 5 Dec 2012 13:06:54 +0000 (15:06 +0200)]
Merge: skip pdb test for #13120 if threading is not available.

12 years agoSkip pdb test for #13120 if threading is not available.
Andrew Svetlov [Wed, 5 Dec 2012 13:06:23 +0000 (15:06 +0200)]
Skip pdb test for #13120 if threading is not available.

12 years agoMerge 3.3
Andrew Svetlov [Wed, 5 Dec 2012 09:12:50 +0000 (11:12 +0200)]
Merge 3.3

12 years agoFix typo.
Andrew Svetlov [Wed, 5 Dec 2012 09:12:14 +0000 (11:12 +0200)]
Fix typo.

12 years agoIssue #15627: This is simply an update to the name of a new method recently added
Eric Snow [Wed, 5 Dec 2012 07:43:43 +0000 (23:43 -0800)]
Issue #15627: This is simply an update to the name of a new method recently added
to importlib.abc.SourceLoader.

12 years agoMerge issue #13120: Allow to call pdb.set_trace() from thread.
Andrew Svetlov [Tue, 4 Dec 2012 19:10:20 +0000 (21:10 +0200)]
Merge issue #13120: Allow to call pdb.set_trace() from thread.

Patch by Ilya Sandler.

12 years agoIssue #13120: Allow to call pdb.set_trace() from thread.
Andrew Svetlov [Tue, 4 Dec 2012 19:08:28 +0000 (21:08 +0200)]
Issue #13120: Allow to call pdb.set_trace() from thread.

Patch by Ilya Sandler.

12 years agoIssue #16444: test more bytes in support.TESTFN_UNDECODABLE to support more Windows...
Victor Stinner [Tue, 4 Dec 2012 10:55:04 +0000 (11:55 +0100)]
Issue #16444: test more bytes in support.TESTFN_UNDECODABLE to support more Windows code pages

12 years agoMerge issue #13120: Allow to call pdb.set_trace() from thread.
Andrew Svetlov [Tue, 4 Dec 2012 19:10:55 +0000 (21:10 +0200)]
Merge issue #13120: Allow to call pdb.set_trace() from thread.

Patch by Ilya Sandler.

12 years agoCleanup unicodeobject.c
Victor Stinner [Tue, 4 Dec 2012 08:30:24 +0000 (09:30 +0100)]
Cleanup unicodeobject.c

 * Remove micro-optization:
   (errors == "surrogateescape" || strcmp(errors, "surrogateescape") == 0).
   Only use strcmp()
 * Initialize 'arg' members in unicode_format_arg() to help the compiler to
   diagnose real bugs and also make the code simpler to read

12 years agoIssue #16455: On FreeBSD and Solaris, if the locale is C, the
Victor Stinner [Tue, 4 Dec 2012 00:34:47 +0000 (01:34 +0100)]
Issue #16455: On FreeBSD and Solaris, if the locale is C, the
ASCII/surrogateescape codec is now used, instead of the locale encoding, to
decode the command line arguments. This change fixes inconsistencies with
os.fsencode() and os.fsdecode() because these operating systems announces an
ASCII locale encoding, whereas the ISO-8859-1 encoding is used in practice.

12 years agoFix test splitting in previous commit.
Antoine Pitrou [Mon, 3 Dec 2012 20:09:27 +0000 (21:09 +0100)]
Fix test splitting in previous commit.

12 years agoFix test splitting in previous commit.
Antoine Pitrou [Mon, 3 Dec 2012 20:09:08 +0000 (21:09 +0100)]
Fix test splitting in previous commit.

12 years agoFix test splitting in previous commit.
Antoine Pitrou [Mon, 3 Dec 2012 20:08:43 +0000 (21:08 +0100)]
Fix test splitting in previous commit.

12 years agoSplit the bigmem re test in two separate tests with different memory requirements.
Antoine Pitrou [Mon, 3 Dec 2012 19:56:27 +0000 (20:56 +0100)]
Split the bigmem re test in two separate tests with different memory requirements.

12 years agoSplit the bigmem re test in two separate tests with different memory requirements.
Antoine Pitrou [Mon, 3 Dec 2012 19:55:56 +0000 (20:55 +0100)]
Split the bigmem re test in two separate tests with different memory requirements.

12 years agoSplit the bigmem re test in two separate tests with different memory requirements.
Antoine Pitrou [Mon, 3 Dec 2012 19:53:12 +0000 (20:53 +0100)]
Split the bigmem re test in two separate tests with different memory requirements.

12 years agoMerge issue #16583: Prevent nesting SystemExit in tkinter.CallWrapper
Andrew Svetlov [Mon, 3 Dec 2012 14:13:48 +0000 (16:13 +0200)]
Merge issue #16583: Prevent nesting SystemExit in tkinter.CallWrapper

12 years agoMerge issue #16583: Prevent nesting SystemExit in tkinter.CallWrapper
Andrew Svetlov [Mon, 3 Dec 2012 14:13:34 +0000 (16:13 +0200)]
Merge issue #16583: Prevent nesting SystemExit in tkinter.CallWrapper

12 years agoIssue #16583: Prevent nesting SystemExit in tkinter.CallWrapper
Andrew Svetlov [Mon, 3 Dec 2012 14:13:07 +0000 (16:13 +0200)]
Issue #16583: Prevent nesting SystemExit in tkinter.CallWrapper

12 years ago(Null merge 3.3)
Victor Stinner [Mon, 3 Dec 2012 13:12:50 +0000 (14:12 +0100)]
(Null merge 3.3)

12 years ago(Null merge 3.2)
Victor Stinner [Mon, 3 Dec 2012 13:12:22 +0000 (14:12 +0100)]
(Null merge 3.2)

12 years agoIssue #16416: Fix compilation error
Victor Stinner [Mon, 3 Dec 2012 13:11:57 +0000 (14:11 +0100)]
Issue #16416: Fix compilation error

12 years ago(Merge 3.2) Issue #16416: On Mac OS X, operating system data are now always
Victor Stinner [Mon, 3 Dec 2012 11:48:53 +0000 (12:48 +0100)]
(Merge 3.2) Issue #16416: On Mac OS X, operating system data are now always
encoded/decoded to/from UTF-8/surrogateescape, instead of the locale encoding
(which may be ASCII if no locale environment variable is set), to avoid
inconsistencies with os.fsencode() and os.fsdecode() functions which are
already using UTF-8/surrogateescape.

12 years agoIssue #16416: On Mac OS X, operating system data are now always
Victor Stinner [Mon, 3 Dec 2012 11:47:59 +0000 (12:47 +0100)]
Issue #16416: On Mac OS X, operating system data are now always
encoded/decoded to/from UTF-8/surrogateescape, instead of the locale encoding
(which may be ASCII if no locale environment variable is set), to avoid
inconsistencies with os.fsencode() and os.fsdecode() functions which are
already using UTF-8/surrogateescape.

12 years agoIssue #16562: Optimize dict equality testing.
Antoine Pitrou [Sun, 2 Dec 2012 18:10:07 +0000 (19:10 +0100)]
Issue #16562: Optimize dict equality testing.
Patch by Serhiy Storchaka (reviewed by Martin and Raymond).

12 years agomerge 3.3
Benjamin Peterson [Sun, 2 Dec 2012 18:04:44 +0000 (13:04 -0500)]
merge 3.3

12 years agomore test to more general test file, so it can test more things
Benjamin Peterson [Sun, 2 Dec 2012 18:04:37 +0000 (13:04 -0500)]
more test to more general test file, so it can test more things

12 years agomerge 3.3
Benjamin Peterson [Sun, 2 Dec 2012 17:37:09 +0000 (12:37 -0500)]
merge 3.3

12 years agoloosen test now that bytes are allowed
Benjamin Peterson [Sun, 2 Dec 2012 17:37:04 +0000 (12:37 -0500)]
loosen test now that bytes are allowed

12 years agomerge 3.3
Benjamin Peterson [Sun, 2 Dec 2012 16:33:14 +0000 (11:33 -0500)]
merge 3.3

12 years agodocument UnicodeError attributes
Benjamin Peterson [Sun, 2 Dec 2012 16:33:06 +0000 (11:33 -0500)]
document UnicodeError attributes

12 years agodocument that encoding error handlers may return bytes (#16585)
Benjamin Peterson [Sun, 2 Dec 2012 16:26:10 +0000 (11:26 -0500)]
document that encoding error handlers may return bytes (#16585)

12 years agomerge 3.3 (#16585)
Benjamin Peterson [Sun, 2 Dec 2012 16:21:02 +0000 (11:21 -0500)]
merge 3.3 (#16585)

12 years agosupport encoding error handlers that return bytes (closes #16585)
Benjamin Peterson [Sun, 2 Dec 2012 16:20:28 +0000 (11:20 -0500)]
support encoding error handlers that return bytes (closes #16585)

12 years agomerge 3.3
Benjamin Peterson [Sun, 2 Dec 2012 15:53:48 +0000 (10:53 -0500)]
merge 3.3

12 years agounicode -> str
Benjamin Peterson [Sun, 2 Dec 2012 15:53:41 +0000 (10:53 -0500)]
unicode -> str

12 years agoIssue 10052: null merge from 3.3
Mark Dickinson [Sun, 2 Dec 2012 13:22:32 +0000 (13:22 +0000)]
Issue 10052: null merge from 3.3

12 years agoIssue 10052: merge fix from 3.2.
Mark Dickinson [Sun, 2 Dec 2012 13:21:37 +0000 (13:21 +0000)]
Issue 10052: merge fix from 3.2.

12 years agoIssue 10052: fix failed uint32_t / uint64_t / int32_t / int64_t detection on some...
Mark Dickinson [Sun, 2 Dec 2012 13:20:22 +0000 (13:20 +0000)]
Issue 10052: fix failed uint32_t / uint64_t / int32_t / int64_t detection on some platforms.

12 years agoIssue 10052: fix failed uint32_t / uint64_t / int32_t / int64_t detection on some...
Mark Dickinson [Sun, 2 Dec 2012 12:11:38 +0000 (12:11 +0000)]
Issue 10052: fix failed uint32_t / uint64_t / int32_t / int64_t detection on some platforms.

12 years agoIssue #10182: The re module doesn't truncate indices to 32 bits anymore.
Antoine Pitrou [Sun, 2 Dec 2012 11:55:12 +0000 (12:55 +0100)]
Issue #10182: The re module doesn't truncate indices to 32 bits anymore.
Patch by Serhiy Storchaka.

12 years agoIssue #10182: The re module doesn't truncate indices to 32 bits anymore.
Antoine Pitrou [Sun, 2 Dec 2012 11:54:28 +0000 (12:54 +0100)]
Issue #10182: The re module doesn't truncate indices to 32 bits anymore.
Patch by Serhiy Storchaka.

12 years agoIssue #10182: The re module doesn't truncate indices to 32 bits anymore.
Antoine Pitrou [Sun, 2 Dec 2012 11:52:36 +0000 (12:52 +0100)]
Issue #10182: The re module doesn't truncate indices to 32 bits anymore.
Patch by Serhiy Storchaka.

12 years agoIssue #16588: Silence unused-but-set warnings in Python/thread_pthread.h
Christian Heimes [Sun, 2 Dec 2012 07:39:23 +0000 (08:39 +0100)]
Issue #16588: Silence unused-but-set warnings in Python/thread_pthread.h

12 years agoIssue #16588: Silence unused-but-set warnings in Python/thread_pthread.h
Christian Heimes [Sun, 2 Dec 2012 07:38:42 +0000 (08:38 +0100)]
Issue #16588: Silence unused-but-set warnings in Python/thread_pthread.h

12 years agoIssue #16588: Silence unused-but-set warnings in Python/thread_pthread.h
Christian Heimes [Sun, 2 Dec 2012 07:37:00 +0000 (08:37 +0100)]
Issue #16588: Silence unused-but-set warnings in Python/thread_pthread.h

12 years agonull merge
Christian Heimes [Sun, 2 Dec 2012 07:26:02 +0000 (08:26 +0100)]
null merge

12 years agoIssue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf
Christian Heimes [Sun, 2 Dec 2012 07:23:05 +0000 (08:23 +0100)]
Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf

12 years ago- Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf
Christian Heimes [Sun, 2 Dec 2012 07:14:50 +0000 (08:14 +0100)]
- Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf

12 years agoIssue #16592: stringlib_bytes_join doesn't raise MemoryError on allocation failure
Christian Heimes [Sun, 2 Dec 2012 06:56:42 +0000 (07:56 +0100)]
Issue #16592: stringlib_bytes_join doesn't raise MemoryError on allocation failure

12 years agoHave BSD 'make -s' do the right thing, thanks to Daniel Shahaf
Christian Heimes [Sun, 2 Dec 2012 06:37:35 +0000 (07:37 +0100)]
Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf

12 years agoIssue #16590: remove obsolete compatibility code from the _json module.
Antoine Pitrou [Sat, 1 Dec 2012 18:34:16 +0000 (19:34 +0100)]
Issue #16590: remove obsolete compatibility code from the _json module.
Patch by Serhiy Storchaka.

12 years agoAdd Bruno Dupuis
Benjamin Peterson [Fri, 30 Nov 2012 21:15:24 +0000 (16:15 -0500)]
Add Bruno Dupuis

12 years agomerge 3.3 (#16573)
Benjamin Peterson [Thu, 29 Nov 2012 15:58:43 +0000 (10:58 -0500)]
merge 3.3 (#16573)

12 years agomerge 3.2
Benjamin Peterson [Thu, 29 Nov 2012 15:57:11 +0000 (10:57 -0500)]
merge 3.2

12 years agoadd changelog
Benjamin Peterson [Thu, 29 Nov 2012 15:57:01 +0000 (10:57 -0500)]
add changelog

12 years agomerge 3.2 (#16573)
Benjamin Peterson [Thu, 29 Nov 2012 15:56:11 +0000 (10:56 -0500)]
merge 3.2 (#16573)

12 years agoenumerate only requires an iterable (closes #16573)
Benjamin Peterson [Thu, 29 Nov 2012 15:55:22 +0000 (10:55 -0500)]
enumerate only requires an iterable (closes #16573)

Patch by Jonathan Kotta.

12 years agoMerge: remove redundant sentence from c-api docs (issue #16323)
Andrew Svetlov [Thu, 29 Nov 2012 13:23:46 +0000 (15:23 +0200)]
Merge: remove redundant sentence from c-api docs (issue #16323)

12 years agoRemove redundant sentence from c-api docs (issue #16323)
Andrew Svetlov [Thu, 29 Nov 2012 13:23:15 +0000 (15:23 +0200)]
Remove redundant sentence from c-api docs (issue #16323)

12 years agoMerge issue #16477: Close tarfile internal handlers in case of exception.
Andrew Svetlov [Thu, 29 Nov 2012 12:21:39 +0000 (14:21 +0200)]
Merge issue #16477: Close tarfile internal handlers in case of exception.

Patch by Serhiy Storchaka.

12 years agoMerge issue #16477: Close tarfile internal handlers in case of exception.
Andrew Svetlov [Thu, 29 Nov 2012 12:21:23 +0000 (14:21 +0200)]
Merge issue #16477: Close tarfile internal handlers in case of exception.

Patch by Serhiy Storchaka.

12 years agoIssue #16477: Close tarfile internal handlers in case of exception.
Andrew Svetlov [Thu, 29 Nov 2012 12:20:47 +0000 (14:20 +0200)]
Issue #16477: Close tarfile internal handlers in case of exception.

Patch by Serhiy Storchaka.

12 years ago#16549: merge with 3.3.
Ezio Melotti [Thu, 29 Nov 2012 03:10:45 +0000 (05:10 +0200)]
#16549: merge with 3.3.

12 years ago#16549: merge with 3.2.
Ezio Melotti [Thu, 29 Nov 2012 03:10:31 +0000 (05:10 +0200)]
#16549: merge with 3.2.

12 years ago#16549: fix test failures on Windows.
Ezio Melotti [Thu, 29 Nov 2012 03:10:07 +0000 (05:10 +0200)]
#16549: fix test failures on Windows.

12 years ago#16333: add Misc/NEWS entry for e63ac05ccfa8.
Ezio Melotti [Thu, 29 Nov 2012 00:33:21 +0000 (02:33 +0200)]
#16333: add Misc/NEWS entry for e63ac05ccfa8.

12 years ago#16476: null merge with 3.3.
Ezio Melotti [Thu, 29 Nov 2012 00:27:26 +0000 (02:27 +0200)]
#16476: null merge with 3.3.

12 years ago#16476: merge with 3.2.
Ezio Melotti [Thu, 29 Nov 2012 00:26:15 +0000 (02:26 +0200)]
#16476: merge with 3.2.

12 years ago#16476: Fix json.tool to avoid including trailing whitespace.
Ezio Melotti [Thu, 29 Nov 2012 00:25:03 +0000 (02:25 +0200)]
#16476: Fix json.tool to avoid including trailing whitespace.

12 years ago#16549: merge with 3.3.
Ezio Melotti [Thu, 29 Nov 2012 00:18:34 +0000 (02:18 +0200)]
#16549: merge with 3.3.

12 years ago#16549: merge with 3.2.
Ezio Melotti [Thu, 29 Nov 2012 00:16:58 +0000 (02:16 +0200)]
#16549: merge with 3.2.