Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r98508:af773c2ddf27
Date: 2020-01-10 13:11 +0100
http://bitbucket.org/pypy/pypy/changeset/af773c2ddf27/
Log: Follow-up for 11a00b95fd59: fix regression shown in
interpreter/test/test_raises
diff --git a/pypy/module/__builtin__/abstractinst.py
b/pypy/module/__builtin__/abstractinst.py
--- a/pypy/module/__builtin__/abstractinst.py
+++ b/pypy/module/__builtin__/abstractinst.py
@@ -223,6 +223,10 @@
space.type(w_cls2) is space.w_type):
return BaseObjSpace.exception_issubclass_w(space, w_cls1, w_cls2)
#
+ if (not exception_is_valid_class_w(space, w_cls2) or
+ not exception_is_valid_class_w(space, w_cls1)):
+ return False
+ #
# The rest is the rare slow case. Use the general logic of issubclass()
# (issue #3149). CPython 3.x doesn't do that, but there is a many-years
# issue report: https://bugs.python.org/issue12029. In PyPy3 we try to
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
