Merge 3.2

florentx · florentx · commit 720682efd1a9 · 2011-12-09T23:42:29.000+01:00
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
@@ -2619,7 +2619,7 @@ PyDoc_STRVAR(arraytype_doc,
 \n\
 Return a new array whose items are restricted by typecode, and\n\
 initialized from the optional initializer value, which must be a list,\n\
-string. or iterable over elements of the appropriate type.\n\
+string or iterable over elements of the appropriate type.\n\
 \n\
 Arrays represent basic values and behave very much like lists, except\n\
 the type of objects stored in them is constrained.\n\
diff --git a/Python/_warnings.c b/Python/_warnings.c
@@ -895,7 +895,6 @@ create_filter(PyObject *category, const char *action)
 static PyObject *
 init_filters(void)
 {
-    /* Don't silence DeprecationWarning if -3 was used. */
     PyObject *filters = PyList_New(5);
     unsigned int pos = 0;  /* Post-incremented in each use. */
     unsigned int x;

Original file line number	Diff line number	Diff line change
`@@ -895,7 +895,6 @@ create_filter(PyObject category, const char action)`
`895`	`895`	`static PyObject *`
`896`	`896`	`init_filters(void)`
`897`	`897`	`{`
`898`		`- /* Don't silence DeprecationWarning if -3 was used. */`
`899`	`898`	`PyObject *filters = PyList_New(5);`
`900`	`899`	`unsigned int pos = 0; /* Post-incremented in each use. */`
`901`	`900`	`unsigned int x;`