[Python-checkins] cpython (merge default -> default): merge
alexander.belopolsky
python-checkins at python.org
Mon Sep 28 04:35:32 CEST 2015
https://hg.python.org/cpython/rev/0d44613b014f
changeset: 98337:0d44613b014f
parent: 98336:4879c10ce982
parent: 98333:48943533965e
user: Alexander Belopolsky <alexander.belopolsky at gmail.com>
date: Sun Sep 27 22:13:28 2015 -0400
summary:
merge
files:
Misc/NEWS | 6 ++++++
Modules/readline.c | 9 +++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,12 @@
Library
-------
+- Issue #23600: Default implementation of tzinfo.fromutc() was returning
+ wrong results in some cases.
+
+- Issue #25203: Failed readline.set_completer_delims() no longer left the
+ module in inconsistent state.
+
- Issue #25011: rlcomplete now omits private and special attribute names unless
the prefix starts with underscores.
diff --git a/Modules/readline.c b/Modules/readline.c
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -464,10 +464,11 @@
/* Keep a reference to the allocated memory in the module state in case
some other module modifies rl_completer_word_break_characters
(see issue #17289). */
- free(completer_word_break_characters);
- completer_word_break_characters = strdup(break_chars);
- if (completer_word_break_characters) {
- rl_completer_word_break_characters = completer_word_break_characters;
+ break_chars = strdup(break_chars);
+ if (break_chars) {
+ free(completer_word_break_characters);
+ completer_word_break_characters = break_chars;
+ rl_completer_word_break_characters = break_chars;
Py_RETURN_NONE;
}
else
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list