From: Brandt Bucher <brandtbucher@gmail.com>
Date: Thu, 12 Mar 2020 04:06:46 +0000 (-0700)
Subject: Simplify defaultdict.__or__ (#18931)
X-Git-Tag: v3.9.0a5~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1dd3794b19cfec448e5a55d8d01efd6bdb5a1169;p=thirdparty%2FPython%2Fcpython.git

Simplify defaultdict.__or__ (#18931)
---

diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index d0a381deabf5..fd0e4edcddfd 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -2133,12 +2133,8 @@ defdict_repr(defdictobject *dd)
 static PyObject*
 defdict_or(PyObject* left, PyObject* right)
 {
-    int left_is_self = PyObject_IsInstance(left, (PyObject*)&defdict_type);
-    if (left_is_self < 0) {
-        return NULL;
-    }
     PyObject *self, *other;
-    if (left_is_self) {
+    if (PyObject_TypeCheck(left, &defdict_type)) {
         self = left;
         other = right;
     }