summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-03-16 14:35:38 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-03-16 14:35:38 (GMT)
commitde394543b4d31c0226fd8700475adccf6a3eb934 (patch)
tree07bd78cd2fa7643f72b20f7fededc6da15ee45f3 /Misc
parent6e335250987a1b200c4d68979586677fbcd00f4e (diff)
parent16d84ac355c532a1e7d25cf75e0b577923de2856 (diff)
downloadcpython-de394543b4d31c0226fd8700475adccf6a3eb934.zip
cpython-de394543b4d31c0226fd8700475adccf6a3eb934.tar.gz
cpython-de394543b4d31c0226fd8700475adccf6a3eb934.tar.bz2
merge 3.2 (#14334)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 7843459..470ab42 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ Core and Builtins
- Give the ast.AST class a __dict__.
+- Issue #14334: Prevent in a segfault in type.__getattribute__ when it was not
+ passed strings.
+
- Issue #1469629: Allow cycles through an object's __dict__ slot to be
collected. (For example if ``x.__dict__ is x``).