Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

move var declaration to top of block to fix compilation on Windows, fixes a7ec0a1b0f7c

This commit is contained in:
Christian Heimes 2012-10-06 17:13:29 +02:00
parent 2649105cdd
commit 6314d164c9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Objects/abstract.c
View File

@ -78,8 +78,10 @@ _PyObject_HasLen(PyObject *o) {
Py_ssize_t Py_ssize_t
PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue) PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)
{ {
PyObject *hint;
Py_ssize_t res;
_Py_IDENTIFIER(__length_hint__); _Py_IDENTIFIER(__length_hint__);
Py_ssize_t res = PyObject_Length(o); res = PyObject_Length(o);
if (res < 0 && PyErr_Occurred()) { if (res < 0 && PyErr_Occurred()) {
if (!PyErr_ExceptionMatches(PyExc_TypeError)) { if (!PyErr_ExceptionMatches(PyExc_TypeError)) {
return -1; return -1;
@ -89,7 +91,7 @@ PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)
else { else {
return res; return res;
} }
PyObject *hint = _PyObject_LookupSpecial(o, &PyId___length_hint__); hint = _PyObject_LookupSpecial(o, &PyId___length_hint__);
if (hint == NULL) { if (hint == NULL) {
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
return -1; return -1;