mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge 3.2

Browse source
This commit is contained in:
Florent Xicluna 2011-12-09 23:42:29 +01:00
commit 720682efd1
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/arraymodule.c
View file

@ -2619,7 +2619,7 @@ PyDoc_STRVAR(arraytype_doc,
\n\ \n\
Return a new array whose items are restricted by typecode, and\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\ 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\ \n\
Arrays represent basic values and behave very much like lists, except\n\ Arrays represent basic values and behave very much like lists, except\n\
the type of objects stored in them is constrained.\n\ the type of objects stored in them is constrained.\n\

1
Python/_warnings.c
View file

@ -895,7 +895,6 @@ create_filter(PyObject *category, const char *action)
static PyObject * static PyObject *
init_filters(void) init_filters(void)
{ {
/* Don't silence DeprecationWarning if -3 was used. */
PyObject *filters = PyList_New(5); PyObject *filters = PyList_New(5);
unsigned int pos = 0; /* Post-incremented in each use. */ unsigned int pos = 0; /* Post-incremented in each use. */
unsigned int x; unsigned int x;