Victor's review

Author: StanFromIreland

Modules/zlibmodule.c

@@ -2015,6 +2015,27 @@ zlib_crc32_combine_impl(PyObject *module, unsigned int crc1,
     return crc32_combine(crc1, crc2, len);
 }
 
+static PyObject *
+zlib_getattr(PyObject *self, PyObject *args)
+{
+    PyObject *name;
+    if (!PyArg_UnpackTuple(args, "__getattr__", 1, 1, &name)) {
+        return NULL;
+    }
+
+    if (PyUnicode_Check(name) && PyUnicode_EqualToUTF8(name, "__version__")) {
+        if (PyErr_WarnEx(PyExc_DeprecationWarning,
+                         "'__version__' is deprecated and slated for removal in Python 3.20",
+                         1) < 0) {
+            return NULL;
+        }
+        return PyUnicode_FromString("1.0");
+    }
+
+    PyErr_Format(PyExc_AttributeError, "module 'zlib' has no attribute %R", name);
+    return NULL;
+}
+
 static PyMethodDef zlib_methods[] =
 {
     ZLIB_ADLER32_METHODDEF
@@ -2025,6 +2046,7 @@ static PyMethodDef zlib_methods[] =
     ZLIB_CRC32_COMBINE_METHODDEF
     ZLIB_DECOMPRESS_METHODDEF
     ZLIB_DECOMPRESSOBJ_METHODDEF
+    {"__getattr__", zlib_getattr, METH_VARARGS, "Module __getattr__"},
     {NULL, NULL}
 };
 
@@ -2137,29 +2159,6 @@ zlib_free(void *mod)
     zlib_clear((PyObject *)mod);
 }
 
-static PyObject *
-zlib_getattr(PyObject *self, PyObject *args)
-{
-    PyObject *name;
-    if (!PyArg_UnpackTuple(args, "__getattr__", 1, 1, &name)) {
-        return NULL;
-    }
-
-    if (PyUnicode_Check(name)) {
-        const char *name_str = PyUnicode_AsUTF8(name);
-        if (name_str && strcmp(name_str, "__version__") == 0) {
-            if (PyErr_WarnEx(PyExc_DeprecationWarning,
-                             "'__version__' is deprecated and slated for removal in Python 3.20",
-                             1) < 0) {
-                return NULL;
-            }
-            return PyUnicode_FromString("1.0");
-        }
-    }
-
-    PyErr_Format(PyExc_AttributeError, "module 'zlib' has no attribute %R", name);
-    return NULL;
-}
 
 static int
 zlib_exec(PyObject *mod)
@@ -2245,17 +2244,6 @@ zlib_exec(PyObject *mod)
         return -1;
     }
 #endif
-    static PyMethodDef getattr_method = {"__getattr__", zlib_getattr, METH_VARARGS, "Module __getattr__"};
-    PyObject *getattr_func = PyCFunction_New(&getattr_method, mod);
-    if (getattr_func == NULL) {
-        return -1;
-    }
-
-    if (PyModule_AddObjectRef(mod, "__getattr__", getattr_func) < 0) {
-        Py_DECREF(getattr_func);
-        return -1;
-    }
-    Py_DECREF(getattr_func);
     return 0;
 }