Skip to content

[3.7] bpo-32999: Revert GH-6002 (fc7df0e6) (GH-6189) #6190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ilevkivskyi merged 1 commit into from
Mar 22, 2018
Merged

[3.7] bpo-32999: Revert GH-6002 (fc7df0e6) (GH-6189) #6190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 11 additions & 24 deletions Modules/_abc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ _Py_IDENTIFIER(__abstractmethods__);
_Py_IDENTIFIER(__class__);
_Py_IDENTIFIER(__dict__);
_Py_IDENTIFIER(__bases__);
_Py_IDENTIFIER(__mro__);
_Py_IDENTIFIER(_abc_impl);
_Py_IDENTIFIER(__subclasscheck__);
_Py_IDENTIFIER(__subclasshook__);
Expand Down Expand Up @@ -574,7 +573,7 @@ _abc__abc_subclasscheck_impl(PyObject *module, PyObject *self,
return NULL;
}

PyObject *ok, *mro = NULL, *subclasses = NULL, *result = NULL;
PyObject *ok, *subclasses = NULL, *result = NULL;
Py_ssize_t pos;
int incache;
_abc_data *impl = _get_impl(self);
Expand Down Expand Up @@ -643,31 +642,20 @@ _abc__abc_subclasscheck_impl(PyObject *module, PyObject *self,
}
Py_DECREF(ok);

/* 4. Check if it's a direct subclass.
*
* if cls in getattr(subclass, '__mro__', ()):
* cls._abc_cache.add(subclass)
* return True
*/
if (_PyObject_LookupAttrId(subclass, &PyId___mro__, &mro) < 0) {
goto end;
}
if (mro != NULL) {
if (!PyTuple_Check(mro)) {
// Python version supports non-tuple iterable. Keep it as
// implementation detail.
PyErr_SetString(PyExc_TypeError, "__mro__ is not a tuple");
/* 4. Check if it's a direct subclass. */
PyObject *mro = ((PyTypeObject *)subclass)->tp_mro;
assert(PyTuple_Check(mro));
for (pos = 0; pos < PyTuple_GET_SIZE(mro); pos++) {
PyObject *mro_item = PyTuple_GET_ITEM(mro, pos);
if (mro_item == NULL) {
goto end;
}
for (pos = 0; pos < PyTuple_GET_SIZE(mro); pos++) {
PyObject *mro_item = PyTuple_GET_ITEM(mro, pos);
if ((PyObject *)self == mro_item) {
if (_add_to_weak_set(&impl->_abc_cache, subclass) < 0) {
goto end;
}
result = Py_True;
if ((PyObject *)self == mro_item) {
if (_add_to_weak_set(&impl->_abc_cache, subclass) < 0) {
goto end;
}
result = Py_True;
goto end;
}
}

Expand Down Expand Up @@ -708,7 +696,6 @@ _abc__abc_subclasscheck_impl(PyObject *module, PyObject *self,

end:
Py_DECREF(impl);
Py_XDECREF(mro);
Py_XDECREF(subclasses);
Py_XINCREF(result);
return result;
Expand Down