From: Alexandre Vassalotti Date: Tue, 4 Dec 2007 05:56:11 +0000 (+0000) Subject: Remove a few tab characters introduced by r59314. X-Git-Tag: v3.0a2~34 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a74169b7c13bb081380a463541e80b7ba6934abd;p=thirdparty%2FPython%2Fcpython.git Remove a few tab characters introduced by r59314. --- diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 021925a0e4ad..c0f4e8120129 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -2602,12 +2602,12 @@ bytes_extend(PyBytesObject *self, PyObject *arg) buf_size = _PyObject_LengthHint(arg); /* The length of the argument is unknown or invalid. */ if (buf_size < 0) { - if (PyErr_Occurred() + if (PyErr_Occurred() && !PyErr_ExceptionMatches(PyExc_TypeError) && !PyErr_ExceptionMatches(PyExc_AttributeError)) { Py_DECREF(it); - return NULL; - } + return NULL; + } PyErr_Clear(); buf_size = 32; /* arbitrary */ }