summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-04-18 15:26:02 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-04-18 15:26:02 (GMT)
commit447f0cc38673cfea3a6ede5aaf11e80e8e8181b2 (patch)
treee19181c6426dfeb0db7e1eb0b8d5ec34bae57406
parent6e3358a1d59acfd9507cd9a7b4513319b99d21ab (diff)
parent2c1414661da660d3df71911026eb6c45e8677f60 (diff)
downloadcpython-447f0cc38673cfea3a6ede5aaf11e80e8e8181b2.zip
cpython-447f0cc38673cfea3a6ede5aaf11e80e8e8181b2.tar.gz
cpython-447f0cc38673cfea3a6ede5aaf11e80e8e8181b2.tar.bz2
merge 3.2
-rw-r--r--Misc/NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 0e55a24..06fcf2a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -19,7 +19,7 @@ Core and Builtins
- Issue #14592: Attempting a relative import w/o __package__ or __name__ set in
globals raises a KeyError.
-- Issue #14607: Fix defaults keyword-only arguments which started with ``__``.
+- Issue #14607: Fix keyword-only arguments which started with ``__``.
- Issue #10854: The ImportError raised when an extension module on Windows
fails to import now uses the new path and name attributes from