Inline uses of _Py_ID().

Modules/_abc.c

@@ -114,8 +114,7 @@ static _abc_data *
 _get_impl(PyObject *module, PyObject *self)
 {
     _abcmodule_state *state = get_abc_state(module);
-    PyObject *attr = _Py_ID(_abc_impl);
-    PyObject *impl = PyObject_GetAttr(self, attr);
+    PyObject *impl = PyObject_GetAttr(self, _Py_ID(_abc_impl));
     if (impl == NULL) {
         return NULL;
     }
@@ -304,8 +303,7 @@ compute_abstract_methods(PyObject *self)
     PyObject *ns = NULL, *items = NULL, *bases = NULL;  // Py_XDECREF()ed on error.
 
     /* Stage 1: direct abstract methods. */
-    PyObject *attr = _Py_ID(__dict__);
-    ns = PyObject_GetAttr(self, attr);
+    ns = PyObject_GetAttr(self, _Py_ID(__dict__));
     if (!ns) {
         goto error;
     }
@@ -349,8 +347,7 @@ compute_abstract_methods(PyObject *self)
     }
 
     /* Stage 2: inherited abstract methods. */
-    attr = _Py_ID(__bases__);
-    bases = PyObject_GetAttr(self, attr);
+    bases = PyObject_GetAttr(self, _Py_ID(__bases__));
     if (!bases) {
         goto error;
     }
@@ -359,12 +356,12 @@ compute_abstract_methods(PyObject *self)
         goto error;
     }
 
-    attr = _Py_ID(__abstractmethods__);
     for (Py_ssize_t pos = 0; pos < PyTuple_GET_SIZE(bases); pos++) {
         PyObject *item = PyTuple_GET_ITEM(bases, pos);  // borrowed
         PyObject *base_abstracts, *iter;
 
-        if (_PyObject_LookupAttr(item, attr, &base_abstracts) < 0) {
+        if (_PyObject_LookupAttr(item, _Py_ID(__abstractmethods__),
+                                 &base_abstracts) < 0) {
             goto error;
         }
         if (base_abstracts == NULL) {
@@ -404,7 +401,7 @@ compute_abstract_methods(PyObject *self)
         }
     }
 
-    if (PyObject_SetAttr(self, attr, abstracts) < 0) {
+    if (PyObject_SetAttr(self, _Py_ID(__abstractmethods__), abstracts) < 0) {
         goto error;
     }
 
@@ -443,8 +440,7 @@ _abc__abc_init(PyObject *module, PyObject *self)
     if (data == NULL) {
         return NULL;
     }
-    PyObject *attr = _Py_ID(_abc_impl);
-    if (PyObject_SetAttr(self, attr, data) < 0) {
+    if (PyObject_SetAttr(self, _Py_ID(_abc_impl), data) < 0) {
         Py_DECREF(data);
         return NULL;
     }
@@ -455,8 +451,8 @@ _abc__abc_init(PyObject *module, PyObject *self)
      * their special status w.r.t. pattern matching. */
     if (PyType_Check(self)) {
         PyTypeObject *cls = (PyTypeObject *)self;
-        PyObject *attr = _Py_ID(__abc_tpflags__);
-        PyObject *flags = PyDict_GetItemWithError(cls->tp_dict, attr);
+        PyObject *flags = PyDict_GetItemWithError(cls->tp_dict,
+                                                  _Py_ID(__abc_tpflags__));
         if (flags == NULL) {
             if (PyErr_Occurred()) {
                 return NULL;
@@ -474,7 +470,7 @@ _abc__abc_init(PyObject *module, PyObject *self)
                 }
                 ((PyTypeObject *)self)->tp_flags |= (val & COLLECTION_FLAGS);
             }
-            if (PyDict_DelItem(cls->tp_dict, attr) < 0) {
+            if (PyDict_DelItem(cls->tp_dict, _Py_ID(__abc_tpflags__)) < 0) {
                 return NULL;
             }
         }
@@ -590,8 +586,7 @@ _abc__abc_instancecheck_impl(PyObject *module, PyObject *self,
         return NULL;
     }
 
-    PyObject *attr = _Py_ID(__class__);
-    subclass = PyObject_GetAttr(instance, attr);
+    subclass = PyObject_GetAttr(instance, _Py_ID(__class__));
     if (subclass == NULL) {
         Py_DECREF(impl);
         return NULL;
@@ -607,7 +602,6 @@ _abc__abc_instancecheck_impl(PyObject *module, PyObject *self,
         goto end;
     }
     subtype = (PyObject *)Py_TYPE(instance);
-    attr = _Py_ID(__subclasscheck__);
     if (subtype == subclass) {
         if (impl->_abc_negative_cache_version == get_abc_state(module)->abc_invalidation_counter) {
             incache = _in_weak_set(impl->_abc_negative_cache, subclass);
@@ -621,10 +615,12 @@ _abc__abc_instancecheck_impl(PyObject *module, PyObject *self,
             }
         }
         /* Fall back to the subclass check. */
-        result = PyObject_CallMethodOneArg(self, attr, subclass);
+        result = PyObject_CallMethodOneArg(self, _Py_ID(__subclasscheck__),
+                                           subclass);
         goto end;
     }
-    result = PyObject_CallMethodOneArg(self, attr, subclass);
+    result = PyObject_CallMethodOneArg(self, _Py_ID(__subclasscheck__),
+                                       subclass);
     if (result == NULL) {
         goto end;
     }
@@ -636,7 +632,8 @@ _abc__abc_instancecheck_impl(PyObject *module, PyObject *self,
         break;
     case 0:
         Py_DECREF(result);
-        result = PyObject_CallMethodOneArg(self, attr, subtype);
+        result = PyObject_CallMethodOneArg(self, _Py_ID(__subclasscheck__),
+                                           subtype);
         break;
     case 1:  // Nothing to do.
         break;
@@ -719,8 +716,8 @@ _abc__abc_subclasscheck_impl(PyObject *module, PyObject *self,
     }
 
     /* 3. Check the subclass hook. */
-    PyObject *attr = _Py_ID(__subclasshook__);
-    ok = PyObject_CallMethodOneArg((PyObject *)self, attr, subclass);
+    ok = PyObject_CallMethodOneArg(
+            (PyObject *)self, _Py_ID(__subclasshook__), subclass);
     if (ok == NULL) {
         goto end;
     }

Modules/_collectionsmodule.c

@@ -1349,8 +1349,7 @@ deque_reduce(dequeobject *deque, PyObject *Py_UNUSED(ignored))
 {
     PyObject *dict, *it;
 
-    PyObject *attr = _Py_ID(__dict__);
-    if (_PyObject_LookupAttr((PyObject *)deque, attr, &dict) < 0) {
+    if (_PyObject_LookupAttr((PyObject *)deque, _Py_ID(__dict__), &dict) < 0) {
         return NULL;
     }
     if (dict == NULL) {
@@ -2071,8 +2070,7 @@ defdict_reduce(defdictobject *dd, PyObject *Py_UNUSED(ignored))
         args = PyTuple_Pack(1, dd->default_factory);
     if (args == NULL)
         return NULL;
-    PyObject *attr = _Py_ID(items);
-    items = PyObject_CallMethodNoArgs((PyObject *)dd, attr);
+    items = PyObject_CallMethodNoArgs((PyObject *)dd, _Py_ID(items));
     if (items == NULL) {
         Py_DECREF(args);
         return NULL;
@@ -2327,13 +2325,10 @@ _collections__count_elements_impl(PyObject *module, PyObject *mapping,
     /* Only take the fast path when get() and __setitem__()
      * have not been overridden.
      */
-    PyObject *attr = _Py_ID(get);
-    mapping_get = _PyType_Lookup(Py_TYPE(mapping), attr);
-    dict_get = _PyType_Lookup(&PyDict_Type, attr);
-    attr = _Py_ID(__setitem__);
-    mapping_setitem = _PyType_Lookup(Py_TYPE(mapping), attr);
-    attr = _Py_ID(__setitem__);
-    dict_setitem = _PyType_Lookup(&PyDict_Type, attr);
+    mapping_get = _PyType_Lookup(Py_TYPE(mapping), _Py_ID(get));
+    dict_get = _PyType_Lookup(&PyDict_Type, _Py_ID(get));
+    mapping_setitem = _PyType_Lookup(Py_TYPE(mapping), _Py_ID(__setitem__));
+    dict_setitem = _PyType_Lookup(&PyDict_Type, _Py_ID(__setitem__));
 
     if (mapping_get != NULL && mapping_get == dict_get &&
         mapping_setitem != NULL && mapping_setitem == dict_setitem &&
@@ -2382,8 +2377,7 @@ _collections__count_elements_impl(PyObject *module, PyObject *mapping,
         }
     }
     else {
-        attr = _Py_ID(get);
-        bound_get = PyObject_GetAttr(mapping, attr);
+        bound_get = PyObject_GetAttr(mapping, _Py_ID(get));
         if (bound_get == NULL)
             goto done;
 

Modules/_io/_iomodule.c

@@ -240,7 +240,6 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode,
     long isatty = 0;
 
     PyObject *raw, *modeobj = NULL, *buffer, *wrapper, *result = NULL, *path_or_fd = NULL;
-    PyObject *attr;
 
     is_number = PyNumber_Check(file);
 
@@ -377,8 +376,7 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode,
 
     /* buffering */
     if (buffering < 0) {
-        attr = _Py_ID(isatty);
-        PyObject *res = PyObject_CallMethodNoArgs(raw, attr);
+        PyObject *res = PyObject_CallMethodNoArgs(raw, _Py_ID(isatty));
         if (res == NULL)
             goto error;
         isatty = PyLong_AsLong(res);
@@ -396,8 +394,7 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode,
 
     if (buffering < 0) {
         PyObject *blksize_obj;
-        attr = _Py_ID(_blksize);
-        blksize_obj = PyObject_GetAttr(raw, attr);
+        blksize_obj = PyObject_GetAttr(raw, _Py_ID(_blksize));
         if (blksize_obj == NULL)
             goto error;
         buffering = PyLong_AsLong(blksize_obj);
@@ -464,8 +461,7 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode,
     result = wrapper;
     Py_DECREF(buffer);
 
-    attr = _Py_ID(mode);
-    if (PyObject_SetAttr(wrapper, attr, modeobj) < 0)
+    if (PyObject_SetAttr(wrapper, _Py_ID(mode), modeobj) < 0)
         goto error;
     Py_DECREF(modeobj);
     return result;
@@ -474,8 +470,7 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode,
     if (result != NULL) {
         PyObject *exc, *val, *tb, *close_result;
         PyErr_Fetch(&exc, &val, &tb);
-        attr = _Py_ID(close);
-        close_result = PyObject_CallMethodNoArgs(result, attr);
+        close_result = PyObject_CallMethodNoArgs(result, _Py_ID(close));
         _PyErr_ChainExceptions(exc, val, tb);
         Py_XDECREF(close_result);
         Py_DECREF(result);

Modules/_io/bufferedio.c

@@ -422,8 +422,7 @@ buffered_dealloc_warn(buffered *self, PyObject *source)
 {
     if (self->ok && self->raw) {
         PyObject *r;
-        PyObject *attr = _Py_ID(_dealloc_warn);
-        r = PyObject_CallMethodOneArg(self->raw, attr, source);
+        r = PyObject_CallMethodOneArg(self->raw, _Py_ID(_dealloc_warn), source);
         if (r)
             Py_DECREF(r);
         else
@@ -569,16 +568,14 @@ static PyObject *
 buffered_name_get(buffered *self, void *context)
 {
     CHECK_INITIALIZED(self)
-    PyObject *attr = _Py_ID(name);
-    return PyObject_GetAttr(self->raw, attr);
+    return PyObject_GetAttr(self->raw, _Py_ID(name));
 }
 
 static PyObject *
 buffered_mode_get(buffered *self, void *context)
 {
     CHECK_INITIALIZED(self)
-    PyObject *attr = _Py_ID(mode);
-    return PyObject_GetAttr(self->raw, attr);
+    return PyObject_GetAttr(self->raw, _Py_ID(mode));
 }
 
 /* Lower-level APIs */
@@ -1369,8 +1366,7 @@ buffered_repr(buffered *self)
 {
     PyObject *nameobj, *res;
 
-    PyObject *attr = _Py_ID(name);
-    if (_PyObject_LookupAttr((PyObject *) self, attr, &nameobj) < 0) {
+    if (_PyObject_LookupAttr((PyObject *) self, _Py_ID(name), &nameobj) < 0) {
         if (!PyErr_ExceptionMatches(PyExc_ValueError)) {
             return NULL;
         }
@@ -2165,78 +2161,67 @@ _forward_call(buffered *self, PyObject *name, PyObject *args)
 static PyObject *
 bufferedrwpair_read(rwpair *self, PyObject *args)
 {
-    PyObject *attr = _Py_ID(read);
-    return _forward_call(self->reader, attr, args);
+    return _forward_call(self->reader, _Py_ID(read), args);
 }
 
 static PyObject *
 bufferedrwpair_peek(rwpair *self, PyObject *args)
 {
-    PyObject *attr = _Py_ID(peek);
-    return _forward_call(self->reader, attr, args);
+    return _forward_call(self->reader, _Py_ID(peek), args);
 }
 
 static PyObject *
 bufferedrwpair_read1(rwpair *self, PyObject *args)
 {
-    PyObject *attr = _Py_ID(read1);
-    return _forward_call(self->reader, attr, args);
+    return _forward_call(self->reader, _Py_ID(read1), args);
 }
 
 static PyObject *
 bufferedrwpair_readinto(rwpair *self, PyObject *args)
 {
-    PyObject *attr = _Py_ID(readinto);
-    return _forward_call(self->reader, attr, args);
+    return _forward_call(self->reader, _Py_ID(readinto), args);
 }
 
 static PyObject *
 bufferedrwpair_readinto1(rwpair *self, PyObject *args)
 {
-    PyObject *attr = _Py_ID(readinto1);
-    return _forward_call(self->reader, attr, args);
+    return _forward_call(self->reader, _Py_ID(readinto1), args);
 }
 
 static PyObject *
 bufferedrwpair_write(rwpair *self, PyObject *args)
 {
-    PyObject *attr = _Py_ID(write);
-    return _forward_call(self->writer, attr, args);
+    return _forward_call(self->writer, _Py_ID(write), args);
 }
 
 static PyObject *
 bufferedrwpair_flush(rwpair *self, PyObject *Py_UNUSED(ignored))
 {
-    PyObject *attr = _Py_ID(flush);
-    return _forward_call(self->writer, attr, NULL);
+    return _forward_call(self->writer, _Py_ID(flush), NULL);
 }
 
 static PyObject *
 bufferedrwpair_readable(rwpair *self, PyObject *Py_UNUSED(ignored))
 {
-    PyObject *attr = _Py_ID(readable);
-    return _forward_call(self->reader, attr, NULL);
+    return _forward_call(self->reader, _Py_ID(readable), NULL);
 }
 
 static PyObject *
 bufferedrwpair_writable(rwpair *self, PyObject *Py_UNUSED(ignored))
 {
-    PyObject *attr = _Py_ID(writable);
-    return _forward_call(self->writer, attr, NULL);
+    return _forward_call(self->writer, _Py_ID(writable), NULL);
 }
 
 static PyObject *
 bufferedrwpair_close(rwpair *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *exc = NULL, *val, *tb;
-    PyObject *attr = _Py_ID(close);
-    PyObject *ret = _forward_call(self->writer, attr, NULL);
+    PyObject *ret = _forward_call(self->writer, _Py_ID(close), NULL);
     if (ret == NULL)
         PyErr_Fetch(&exc, &val, &tb);
     else
         Py_DECREF(ret);
-    attr = _Py_ID(close);
-    ret = _forward_call(self->reader, attr, NULL);
+    ret = _forward_call(self->reader, _Py_ID(close), NULL);
     if (exc != NULL) {
         _PyErr_ChainExceptions(exc, val, tb);
         Py_CLEAR(ret);
@@ -2247,17 +2232,15 @@ bufferedrwpair_close(rwpair *self, PyObject *Py_UNUSED(ignored))
 static PyObject *
 bufferedrwpair_isatty(rwpair *self, PyObject *Py_UNUSED(ignored))
 {
-    PyObject *attr = _Py_ID(isatty);
-    PyObject *ret = _forward_call(self->writer, attr, NULL);
+    PyObject *ret = _forward_call(self->writer, _Py_ID(isatty), NULL);
 
     if (ret != Py_False) {
         /* either True or exception */
         return ret;
     }
     Py_DECREF(ret);
 
-    attr = _Py_ID(isatty);
-    return _forward_call(self->reader, attr, NULL);
+    return _forward_call(self->reader, _Py_ID(isatty), NULL);
 }
 
 static PyObject *