summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-09-04 06:12:27 (GMT)
committerGeorg Brandl <georg@python.org>2011-09-04 06:12:27 (GMT)
commitfd164c207f188e952125a0ce21a1fdec2b78170d (patch)
tree7e4a14aeb095125d5053066fbf387e6302219862
parent9fd5374d4e7d75bfdaa862df15d0f3fbee5b18ca (diff)
parente3bb2cfb7ad8325dbf98312592221efc6e7625f2 (diff)
downloadcpython-fd164c207f188e952125a0ce21a1fdec2b78170d.zip
cpython-fd164c207f188e952125a0ce21a1fdec2b78170d.tar.gz
cpython-fd164c207f188e952125a0ce21a1fdec2b78170d.tar.bz2
Merge with 3.2.
-rw-r--r--Misc/NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 662efe7..2389bf5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -53,7 +53,7 @@ Core and Builtins
- Issue #11627: Fix segfault when __new__ on a exception returns a
non-exception class.
-- Issue #12149: Update the method cache after a type's dictionnary gets
+- Issue #12149: Update the method cache after a type's dictionary gets
cleared by the garbage collector. This fixes a segfault when an instance
and its type get caught in a reference cycle, and the instance's
deallocator calls one of the methods on the type (e.g. when subclassing