From: Eric V. Smith <eric@trueblade.com>
Date: Tue, 29 Sep 2015 14:30:47 +0000 (-0400)
Subject: Issue #25034: Merge from 3.5.
X-Git-Tag: v3.6.0a1~1396
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dcada3bcfbaa35930a55bf67e5d6393f444f68a;p=python

Issue #25034: Merge from 3.5.
---

6dcada3bcfbaa35930a55bf67e5d6393f444f68a
diff --cc Misc/NEWS
index ceac0a355c,5a7784466c..5fb3be1617
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -190,8 -21,14 +190,11 @@@ 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.