]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #25034: Merge from 3.4.
authorEric V. Smith <eric@trueblade.com>
Tue, 29 Sep 2015 14:30:04 +0000 (10:30 -0400)
committerEric V. Smith <eric@trueblade.com>
Tue, 29 Sep 2015 14:30:04 +0000 (10:30 -0400)
1  2 
Lib/string.py
Lib/test/test_string.py
Misc/ACKS
Misc/NEWS

diff --cc Lib/string.py
Simple merge
Simple merge
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
index d352296beb0907e96573b8f9b7dae1b0400cc3d0,0a2411da432f3ea92c3a7853825847ee27e51a40..5a7784466c2d70d2720adc73a178c9f67efee6a0
+++ b/Misc/NEWS
@@@ -21,11 -78,11 +21,14 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #25034: Fix string.Formatter problem with auto-numbering and
+   nested format_specs. Patch by Anthon van der Neut.
  - Issue #25233: Rewrite the guts of asyncio.Queue to be more understandable and correct.
  
 +- Issue #25203: Failed readline.set_completer_delims() no longer left the
 +  module in inconsistent state.
 +
  - Issue #23600: Default implementation of tzinfo.fromutc() was returning
    wrong results in some cases.