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

[florent.xicluna]

http://hg.python.org/cpython/rev/b7c5e30582d1
changeset:   73913:b7c5e30582d1
parent:      73909:9fe28f52eaaa
parent:      73912:ee0c9ca09c84
user:        Florent Xicluna <florent.xicluna at gmail.com>
date:        Fri Dec 09 23:42:29 2011 +0100
summary:
  Merge 3.2

files:
  Modules/arraymodule.c |  2 +-
  Python/_warnings.c    |  1 -
  2 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -2619,7 +2619,7 @@
 \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
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -895,7 +895,6 @@
 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;

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