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

[benjamin.peterson]

http://hg.python.org/cpython/rev/da12cb2461d1
changeset:   76740:da12cb2461d1
parent:      76737:0ea729cc2a0b
parent:      76738:b8c1cabcd115
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu May 03 18:44:33 2012 -0400
summary:
  merge 3.2 (#14717)

files:
  Objects/genobject.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/genobject.c b/Objects/genobject.c
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -137,7 +137,7 @@
 }
 
 PyDoc_STRVAR(close_doc,
-"close(arg) -> raise GeneratorExit inside generator.");
+"close() -> raise GeneratorExit inside generator.");
 
 /*
  *   This helper function is used by gen_close and gen_throw to

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