From: Eric V. Smith <eric@trueblade.com>
Date: Mon, 18 Jul 2011 18:08:55 +0000 (-0400)
Subject: Merge from 3.2.
X-Git-Tag: v3.3.0a1~1878
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c12469df227a7ec8a268c9a6dae4f52c70c0635a;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.2.
---

c12469df227a7ec8a268c9a6dae4f52c70c0635a
diff --cc Misc/NEWS
index a456bf36c561,f444709ab50a..7632292e8dd4
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,8 -10,10 +10,12 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
+ - Issue #12579: str.format_map() now raises a ValueError if used on a
+   format string that contains positional fields. Initial patch by
+   Julian Berman.
+ 
 +- Issue #10271: Allow warnings.showwarning() be any callable.
 +
  - Issue #11627: Fix segfault when __new__ on a exception returns a non-exception
    class.