From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 4 Mar 2013 14:48:30 +0000 (-0500)
Subject: merge 3.3 (#17328)
X-Git-Tag: v3.4.0a1~1280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42f382facd09e4ae9e2a3a082c35bd7e3ce33931;p=python

merge 3.3 (#17328)
---

42f382facd09e4ae9e2a3a082c35bd7e3ce33931
diff --cc Misc/NEWS
index 2f24d0b891,958cc1a7d4..80d139a279
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,9 -12,8 +10,11 @@@ What's New in Python 3.4.0 Alpha 1
  Core and Builtins
  -----------------
  
 +- Issue #17032: The "global" in the "NameError: global name 'x' is not defined"
 +  error message has been removed.  Patch by Ram Rachum.
 +
+ - Issue #17328: Fix possible refleak in dict.setdefault.
+ 
  - Issue #17223: array module: Fix a crasher when converting an array containing
    invalid characters (outside range [U+0000; U+10ffff]) to Unicode:
    repr(array), str(array) and array.tounicode(). Patch written by Manuel Jacob.