[Python-checkins] r86583 - python/branches/py3k/Objects/abstract.c
benjamin.peterson
python-checkins at python.org
Sat Nov 20 18:21:08 CET 2010
Author: benjamin.peterson
Date: Sat Nov 20 18:21:08 2010
New Revision: 86583
Log:
code style
Modified:
python/branches/py3k/Objects/abstract.c
Modified: python/branches/py3k/Objects/abstract.c
==============================================================================
--- python/branches/py3k/Objects/abstract.c (original)
+++ python/branches/py3k/Objects/abstract.c Sat Nov 20 18:21:08 2010
@@ -2500,12 +2500,10 @@
if (retval == 0) {
PyObject *c = PyObject_GetAttr(inst, __class__);
if (c == NULL) {
- if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
+ if (PyErr_ExceptionMatches(PyExc_AttributeError))
PyErr_Clear();
- }
- else {
+ else
retval = -1;
- }
}
else {
if (c != (PyObject *)(inst->ob_type) &&
@@ -2523,12 +2521,10 @@
return -1;
icls = PyObject_GetAttr(inst, __class__);
if (icls == NULL) {
- if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
+ if (PyErr_ExceptionMatches(PyExc_AttributeError))
PyErr_Clear();
- }
- else {
+ else
retval = -1;
- }
}
else {
retval = abstract_issubclass(icls, cls);
More information about the Python-checkins
mailing list