From: Petri Lehtinen <petri@digip.org>
Date: Mon, 24 Oct 2011 18:17:52 +0000 (+0300)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1071^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24bd5adcffb490a3f7523142cf663a03dfd5f5c5;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

24bd5adcffb490a3f7523142cf663a03dfd5f5c5
diff --cc Misc/NEWS
index e6ee12006daa,115ff696a6be..7f68030b25a1
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,10 -10,9 +10,13 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
+ - Issue #13018: Fix reference leaks in error paths in dictobject.c.
+   Patch by Suman Saha.
+ 
 +- Issue #13201: Define '==' and '!=' to compare range objects based on
 +  the sequence of values they define (instead of comparing based on
 +  object identity).
 +
  - Issue #1294232: In a few cases involving metaclass inheritance, the
    interpreter would sometimes invoke the wrong metaclass when building a new
    class object. These cases now behave correctly. Patch by Daniel Urban.