[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/220efaf42216
changeset:   76397:220efaf42216
parent:      76394:0695f5d028a7
parent:      76396:d368cc86dbc9
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Apr 18 11:26:02 2012 -0400
summary:
  merge 3.2

files:
  Misc/NEWS |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -19,7 +19,7 @@
 - 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

-- 
Repository URL: http://hg.python.org/cpython