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

Whitespace normalization.

Browse source
This commit is contained in:
Georg Brandl 2005-08-31 22:21:15 +00:00
parent 7847405a76
commit 99d7e4e8eb
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Python/bltinmodule.c
View file

@ -529,7 +529,7 @@ builtin_eval(PyObject *self, PyObject *args)
return NULL; return NULL;
} }
if (globals != Py_None && !PyDict_Check(globals)) { if (globals != Py_None && !PyDict_Check(globals)) {
PyErr_SetString(PyExc_TypeError, PyMapping_Check(globals) ? PyErr_SetString(PyExc_TypeError, PyMapping_Check(globals) ?
"globals must be a real dict; try eval(expr, {}, mapping)" "globals must be a real dict; try eval(expr, {}, mapping)"
: "globals must be a dict"); : "globals must be a dict");
return NULL; return NULL;
@ -1198,11 +1198,11 @@ min_max(PyObject *args, PyObject *kwds, int op)
if (kwds != NULL && PyDict_Check(kwds) && PyDict_Size(kwds)) { if (kwds != NULL && PyDict_Check(kwds) && PyDict_Size(kwds)) {
keyfunc = PyDict_GetItemString(kwds, "key"); keyfunc = PyDict_GetItemString(kwds, "key");
if (PyDict_Size(kwds)!=1 || keyfunc == NULL) { if (PyDict_Size(kwds)!=1 || keyfunc == NULL) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"%s() got an unexpected keyword argument", name); "%s() got an unexpected keyword argument", name);
return NULL; return NULL;
} }
} }
it = PyObject_GetIter(v); it = PyObject_GetIter(v);
if (it == NULL) if (it == NULL)
@ -1916,7 +1916,7 @@ builtin_sorted(PyObject *self, PyObject *args, PyObject *kwds)
Py_DECREF(newlist); Py_DECREF(newlist);
return NULL; return NULL;
} }
newargs = PyTuple_GetSlice(args, 1, 4); newargs = PyTuple_GetSlice(args, 1, 4);
if (newargs == NULL) { if (newargs == NULL) {
Py_DECREF(newlist); Py_DECREF(newlist);
@ -2548,21 +2548,21 @@ filterunicode(PyObject *func, PyObject *strobj)
if (ok) { if (ok) {
int reslen; int reslen;
if (!PyUnicode_Check(item)) { if (!PyUnicode_Check(item)) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"can't filter unicode to unicode:" "can't filter unicode to unicode:"
" __getitem__ returned different type"); " __getitem__ returned different type");
Py_DECREF(item); Py_DECREF(item);
goto Fail_1; goto Fail_1;
} }
reslen = PyUnicode_GET_SIZE(item); reslen = PyUnicode_GET_SIZE(item);
if (reslen == 1) if (reslen == 1)
PyUnicode_AS_UNICODE(result)[j++] = PyUnicode_AS_UNICODE(result)[j++] =
PyUnicode_AS_UNICODE(item)[0]; PyUnicode_AS_UNICODE(item)[0];
else { else {
/* do we need more space? */ /* do we need more space? */
int need = j + reslen + len - i - 1; int need = j + reslen + len - i - 1;
if (need > outlen) { if (need > outlen) {
/* overallocate, /* overallocate,
to avoid reallocations */ to avoid reallocations */
if (need < 2 * outlen) if (need < 2 * outlen)
need = 2 * outlen; need = 2 * outlen;