From: Eric V. Smith <eric@trueblade.com>
Date: Tue, 29 Sep 2015 14:30:04 +0000 (-0400)
Subject: Issue #25034: Merge from 3.4.
X-Git-Tag: v3.5.1rc1~245
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad4003c7fb9072c2697480ee84440408f7a49cd9;p=thirdparty%2FPython%2Fcpython.git

Issue #25034: Merge from 3.4.
---

ad4003c7fb9072c2697480ee84440408f7a49cd9
diff --cc Misc/NEWS
index d352296beb09,0a2411da432f..5a7784466c2d
--- a/Misc/NEWS
+++ 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.