Merged revisions 72907 via svnmerge from

benjaminp · benjaminp · commit 94c65d9a8ff8 · 2009-05-25T03:10:48.000Z
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72907 | benjamin.peterson | 2009-05-24 21:40:21 -0500 (Sun, 24 May 2009) | 1 line

  handle errors from _PyObject_LookupSpecial when __get__ fails
........
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
@@ -1595,7 +1595,11 @@ def __init__(self, impl):
             def __get__(self, obj, owner):
                 record.append(1)
                 return self.impl.__get__(obj, owner)
-
+        class MyException(Exception):
+            pass
+        class ErrDescr(object):
+            def __get__(self, obj, owner):
+                raise MyException
 
         for name, runner, meth_impl, ok, env in specials:
             class X(Checker):
@@ -1614,6 +1618,18 @@ class X(Checker):
             runner(X())
             self.assertEqual(record, [1], name)
 
+            class X(Checker):
+                pass
+            for attr, obj in env.items():
+                setattr(X, attr, obj)
+            setattr(X, name, ErrDescr())
+            try:
+                runner(X())
+            except MyException:
+                pass
+            else:
+                self.fail("{0!r} didn't raise".format(name))
+
     def test_specials(self):
         # Testing special operators...
         # Test operators like __hash__ for which a built-in default exists
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -90,8 +90,12 @@ _PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)
 
 	/* try o.__length_hint__() */
         hintmeth = _PyObject_LookupSpecial(o, "__length_hint__", &hintstrobj);
-	if (hintmeth == NULL)
-		return defaultvalue;
+	if (hintmeth == NULL) {
+		if (PyErr_Occurred())
+			return -1;
+		else
+			return defaultvalue;
+	}
 	ro = PyObject_CallFunctionObjArgs(hintmeth, NULL);
 	Py_DECREF(hintmeth);
 	if (ro == NULL) {
@@ -2592,6 +2596,8 @@ PyObject_IsInstance(PyObject *inst, PyObject *cls)
 		}
 		return ok;
 	}
+	else if (PyErr_Occurred())
+		return -1;
 	return recursive_isinstance(inst, cls);
 }
 
@@ -2655,6 +2661,8 @@ PyObject_IsSubclass(PyObject *derived, PyObject *cls)
 		}
 		return ok;
 	}
+	else if (PyErr_Occurred())
+		return -1;
 	return recursive_issubclass(derived, cls);
 }
 
diff --git a/Objects/enumobject.c b/Objects/enumobject.c
@@ -238,6 +238,8 @@ reversed_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 		Py_DECREF(reversed_meth);
 		return res;
 	}
+	else if (PyErr_Occurred())
+		return NULL;
 
 	if (!PySequence_Check(seq)) {
 		PyErr_SetString(PyExc_TypeError,
diff --git a/Objects/object.c b/Objects/object.c
@@ -497,6 +497,8 @@ PyObject_Bytes(PyObject *v)
             }
             return result;
 	}
+	else if (PyErr_Occurred())
+		return NULL;
 	return PyBytes_FromObject(v);
 }
 
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -652,10 +652,12 @@ sys_getsizeof(PyObject *self, PyObject *args, PyObject *kwds)
 
 	method = _PyObject_LookupSpecial(o, "__sizeof__",
 					 &str__sizeof__);
-	if (method == NULL)
-		PyErr_Format(PyExc_TypeError,
-			     "Type %.100s doesn't define __sizeof__",
-			     Py_TYPE(o)->tp_name);
+	if (method == NULL) {
+		if (!PyErr_Occurred())
+			PyErr_Format(PyExc_TypeError,
+				     "Type %.100s doesn't define __sizeof__",
+				     Py_TYPE(o)->tp_name);
+	}
 	else {
 		res = PyObject_CallFunctionObjArgs(method, NULL);
 		Py_DECREF(method);

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,12 @@ _PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)`
`90`	`90`
`91`	`91`	`/* try o.__length_hint__() */`
`92`	`92`	`hintmeth = _PyObject_LookupSpecial(o, "__length_hint__", &hintstrobj);`
`93`		`- if (hintmeth == NULL)`
`94`		`- return defaultvalue;`
	`93`	`+ if (hintmeth == NULL) {`
	`94`	`+ if (PyErr_Occurred())`
	`95`	`+ return -1;`
	`96`	`+ else`
	`97`	`+ return defaultvalue;`
	`98`	`+ }`
`95`	`99`	`ro = PyObject_CallFunctionObjArgs(hintmeth, NULL);`
`96`	`100`	`Py_DECREF(hintmeth);`
`97`	`101`	`if (ro == NULL) {`
`@@ -2592,6 +2596,8 @@ PyObject_IsInstance(PyObject inst, PyObject cls)`
`2592`	`2596`	`}`
`2593`	`2597`	`return ok;`
`2594`	`2598`	`}`
	`2599`	`+ else if (PyErr_Occurred())`
	`2600`	`+ return -1;`
`2595`	`2601`	`return recursive_isinstance(inst, cls);`
`2596`	`2602`	`}`
`2597`	`2603`
`@@ -2655,6 +2661,8 @@ PyObject_IsSubclass(PyObject derived, PyObject cls)`
`2655`	`2661`	`}`
`2656`	`2662`	`return ok;`
`2657`	`2663`	`}`
	`2664`	`+ else if (PyErr_Occurred())`
	`2665`	`+ return -1;`
`2658`	`2666`	`return recursive_issubclass(derived, cls);`
`2659`	`2667`	`}`
`2660`	`2668`
Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,8 @@ reversed_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`238`	`238`	`Py_DECREF(reversed_meth);`
`239`	`239`	`return res;`
`240`	`240`	`}`
	`241`	`+ else if (PyErr_Occurred())`
	`242`	`+ return NULL;`
`241`	`243`
`242`	`244`	`if (!PySequence_Check(seq)) {`
`243`	`245`	`PyErr_SetString(PyExc_TypeError,`
Original file line number	Diff line number	Diff line change
`@@ -497,6 +497,8 @@ PyObject_Bytes(PyObject *v)`
`497`	`497`	`}`
`498`	`498`	`return result;`
`499`	`499`	`}`
	`500`	`+ else if (PyErr_Occurred())`
	`501`	`+ return NULL;`
`500`	`502`	`return PyBytes_FromObject(v);`
`501`	`503`	`}`
`502`	`504`