diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-12-09 22:42:29 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-12-09 22:42:29 (GMT) |
| commit | 720682efd1a98dcd70a829c2a06f5fd07638af26 (patch) | |
| tree | 1947fc42f08d8c6b6d361a930c5e9f916a5edf88 | |
| parent | a9e9abb8efcb94a19687bd584e57a1232c51d7c2 (diff) | |
| parent | 5126df602cd4911c3578173b2c2686ddfaa59478 (diff) | |
| download | cpython-720682efd1a98dcd70a829c2a06f5fd07638af26.zip cpython-720682efd1a98dcd70a829c2a06f5fd07638af26.tar.gz cpython-720682efd1a98dcd70a829c2a06f5fd07638af26.tar.bz2 | |
Merge 3.2
| -rw-r--r-- | Modules/arraymodule.c | 2 | ||||
| -rw-r--r-- | Python/_warnings.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c index bb0d72b..76a3a65 100644 --- 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 index a494dd9..458e346 100644 --- 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; |