use PyObject_GetAttr & ignore exceptions

Author: skirpichev

Objects/descrobject.c

@@ -130,8 +130,7 @@ classmethod_get(PyObject *self, PyObject *obj, PyObject *type)
     if (descr->d_method->ml_flags & METH_METHOD) {
         cls = descr->d_common.d_type;
     }
-    PyObject *mod;
-    PyObject_GetOptionalAttr((PyObject*)type, &_Py_ID(__module__), &mod);
+    PyObject *mod = PyObject_GetAttr((PyObject*)type, &_Py_ID(__module__));
     PyErr_Clear();
     PyObject *result = PyCMethod_New(descr->d_method, type, mod, cls);
     Py_XDECREF(mod);

Objects/typeobject.c

@@ -6653,8 +6653,8 @@ type_add_method(PyTypeObject *type, PyMethodDef *meth)
         descr = PyDescr_NewClassMethod(type, meth);
     }
     else if (meth->ml_flags & METH_STATIC) {
-        PyObject *mod;
-        PyObject_GetOptionalAttr((PyObject*)type, &_Py_ID(__module__), &mod);
+        PyObject *mod = PyObject_GetAttr((PyObject*)type, &_Py_ID(__module__));
+        PyErr_Clear();
         PyObject *cfunc = PyCFunction_NewEx(meth, (PyObject*)type, mod);
         Py_XDECREF(mod);
         if (cfunc == NULL) {