merge 3.2 (#14717)

benjaminp · benjaminp · commit 9cd8853d4572 · 2012-05-03T18:44:33.000-04:00
diff --git a/Objects/genobject.c b/Objects/genobject.c
@@ -137,7 +137,7 @@ _PyGen_Send(PyGenObject *gen, PyObject *arg)
 }
 
 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

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ _PyGen_Send(PyGenObject gen, PyObject arg)`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`PyDoc_STRVAR(close_doc,`
`140`		`-"close(arg) -> raise GeneratorExit inside generator.");`
	`140`	`+"close() -> raise GeneratorExit inside generator.");`
`141`	`141`
`142`	`142`	`/*`
`143`	`143`	`* This helper function is used by gen_close and gen_throw to`