refactor: Remove Python 2 vestiges

tiran · tiran · commit f48101097eb0 · 2023-11-03T08:22:30.000+01:00
The C code had a few version checks for Python 2. python-ldap requires
Python &gt;= 3.6.

Signed-off-by: Christian Heimes &lt;cheimes@redhat.com&gt;
diff --git a/Modules/LDAPObject.c b/Modules/LDAPObject.c
@@ -270,13 +270,8 @@ attrs_from_List(PyObject *attrlist, char ***attrsp)
 
     if (attrlist == Py_None) {
         /* None means a NULL attrlist */
-#if PY_MAJOR_VERSION == 2
-    }
-    else if (PyBytes_Check(attrlist)) {
-#else
     }
     else if (PyUnicode_Check(attrlist)) {
-#endif
         /* caught by John Benninghoff <johnb@netscape.com> */
         LDAPerror_TypeError
             ("attrs_from_List(): expected *list* of strings, not a string",
@@ -287,11 +282,7 @@ attrs_from_List(PyObject *attrlist, char ***attrsp)
         PyObject *item = NULL;
         Py_ssize_t i, len, strlen;
 
-#if PY_MAJOR_VERSION >= 3
         const char *str;
-#else
-        char *str;
-#endif
 
         seq = PySequence_Fast(attrlist, "expected list of strings or None");
         if (seq == NULL)
@@ -309,24 +300,12 @@ attrs_from_List(PyObject *attrlist, char ***attrsp)
             item = PySequence_Fast_GET_ITEM(seq, i);
             if (item == NULL)
                 goto error;
-#if PY_MAJOR_VERSION == 2
-            /* Encoded in Python to UTF-8 */
-            if (!PyBytes_Check(item)) {
-                LDAPerror_TypeError
-                    ("attrs_from_List(): expected bytes in list", item);
-                goto error;
-            }
-            if (PyBytes_AsStringAndSize(item, &str, &strlen) == -1) {
-                goto error;
-            }
-#else
             if (!PyUnicode_Check(item)) {
                 LDAPerror_TypeError
                     ("attrs_from_List(): expected string in list", item);
                 goto error;
             }
             str = PyUnicode_AsUTF8AndSize(item, &strlen);
-#endif
             /* Make a copy. PyBytes_AsString* / PyUnicode_AsUTF8* return
              * internal values that must be treated like const char. Python
              * 3.7 actually returns a const char.
@@ -515,7 +494,7 @@ l_ldap_add_ext(LDAPObject *self, PyObject *args)
     if (ldaperror != LDAP_SUCCESS)
         return LDAPerror(self->ldap);
 
-    return PyInt_FromLong(msgid);
+    return PyLong_FromLong(msgid);
 }
 
 /* ldap_simple_bind */
@@ -566,7 +545,7 @@ l_ldap_simple_bind(LDAPObject *self, PyObject *args)
     if (ldaperror != LDAP_SUCCESS)
         return LDAPerror(self->ldap);
 
-    return PyInt_FromLong(msgid);
+    return PyLong_FromLong(msgid);
 }
 
 #ifdef HAVE_SASL
@@ -724,7 +703,7 @@ l_ldap_sasl_bind_s(LDAPObject *self, PyObject *args)
     }
     else if (ldaperror != LDAP_SUCCESS)
         return LDAPerror(self->ldap);
-    return PyInt_FromLong(ldaperror);
+    return PyLong_FromLong(ldaperror);
 }
 
 static PyObject *
@@ -751,15 +730,9 @@ l_ldap_sasl_interactive_bind_s(LDAPObject *self, PyObject *args)
      * unsigned int, we need to use the "I" flag if we're running Python 2.3+ and a
      * "i" otherwise.
      */
-#if (PY_MAJOR_VERSION == 2) && (PY_MINOR_VERSION < 3)
-    if (!PyArg_ParseTuple
-        (args, "sOOOi:sasl_interactive_bind_s", &who, &SASLObject,
-         &serverctrls, &clientctrls, &sasl_flags))
-#else
     if (!PyArg_ParseTuple
         (args, "sOOOI:sasl_interactive_bind_s", &who, &SASLObject,
          &serverctrls, &clientctrls, &sasl_flags))
-#endif
         return NULL;
 
     if (not_valid(self))
@@ -803,7 +776,7 @@ l_ldap_sasl_interactive_bind_s(LDAPObject *self, PyObject *args)
 
     if (msgid != LDAP_SUCCESS)
         return LDAPerror(self->ldap);
-    return PyInt_FromLong(msgid);
+    return PyLong_FromLong(msgid);
 }
 #endif
 
@@ -852,7 +825,7 @@ l_ldap_cancel(LDAPObject *self, PyObject *args)
     if (ldaperror != LDAP_SUCCESS)
         return LDAPerror(self->ldap);
 
-    return PyInt_FromLong(msgid);
+    return PyLong_FromLong(msgid);
 }
 
 #endif
@@ -906,7 +879,7 @@ l_ldap_compare_ext(LDAPObject *self, PyObject *args)
     if (ldaperror != LDAP_SUCCESS)
         return LDAPerror(self->ldap);
 
-    return PyInt_FromLong(msgid);
+    return PyLong_FromLong(msgid);
 }
 
 /* ldap_delete_ext */
@@ -952,7 +925,7 @@ l_ldap_delete_ext(LDAPObject *self, PyObject *args)
     if (ldaperror != LDAP_SUCCESS)
         return LDAPerror(self->ldap);
 
-    return PyInt_FromLong(msgid);
+    return PyLong_FromLong(msgid);
 }
 
 /* ldap_modify_ext */
@@ -1009,7 +982,7 @@ l_ldap_modify_ext(LDAPObject *self, PyObject *args)
     if (ldaperror != LDAP_SUCCESS)
         return LDAPerror(self->ldap);
 
-    return PyInt_FromLong(msgid);
+    return PyLong_FromLong(msgid);
 }
 
 /* ldap_rename */
@@ -1059,7 +1032,7 @@ l_ldap_rename(LDAPObject *self, PyObject *args)
     if (ldaperror != LDAP_SUCCESS)
         return LDAPerror(self->ldap);
 
-    return PyInt_FromLong(msgid);
+    return PyLong_FromLong(msgid);
 }
 
 /* ldap_result4 */
@@ -1275,7 +1248,7 @@ l_ldap_search_ext(LDAPObject *self, PyObject *args)
     if (ldaperror != LDAP_SUCCESS)
         return LDAPerror(self->ldap);
 
-    return PyInt_FromLong(msgid);
+    return PyLong_FromLong(msgid);
 }
 
 /* ldap_whoami_s (available since OpenLDAP 2.1.13) */
@@ -1445,7 +1418,7 @@ l_ldap_passwd(LDAPObject *self, PyObject *args)
     if (ldaperror != LDAP_SUCCESS)
         return LDAPerror(self->ldap);
 
-    return PyInt_FromLong(msgid);
+    return PyLong_FromLong(msgid);
 }
 
 /* ldap_extended_operation */
@@ -1496,7 +1469,7 @@ l_ldap_extended_operation(LDAPObject *self, PyObject *args)
     if (ldaperror != LDAP_SUCCESS)
         return LDAPerror(self->ldap);
 
-    return PyInt_FromLong(msgid);
+    return PyLong_FromLong(msgid);
 }
 
 /* methods */
diff --git a/Modules/constants.c b/Modules/constants.c
@@ -105,20 +105,20 @@ LDAPraise_for_message(LDAP *l, LDAPMessage *m)
         }
 
         if (msgtype > 0) {
-            pyresult = PyInt_FromLong(msgtype);
+            pyresult = PyLong_FromLong(msgtype);
             if (pyresult)
                 PyDict_SetItemString(info, "msgtype", pyresult);
             Py_XDECREF(pyresult);
         }
 
         if (msgid >= 0) {
-            pyresult = PyInt_FromLong(msgid);
+            pyresult = PyLong_FromLong(msgid);
             if (pyresult)
                 PyDict_SetItemString(info, "msgid", pyresult);
             Py_XDECREF(pyresult);
         }
 
-        pyresult = PyInt_FromLong(errnum);
+        pyresult = PyLong_FromLong(errnum);
         if (pyresult)
             PyDict_SetItemString(info, "result", pyresult);
         Py_XDECREF(pyresult);
@@ -129,7 +129,7 @@ LDAPraise_for_message(LDAP *l, LDAPMessage *m)
         Py_XDECREF(str);
 
         if (myerrno != 0) {
-            pyerrno = PyInt_FromLong(myerrno);
+            pyerrno = PyLong_FromLong(myerrno);
             if (pyerrno)
                 PyDict_SetItemString(info, "errno", pyerrno);
             Py_XDECREF(pyerrno);
diff --git a/Modules/ldapmodule.c b/Modules/ldapmodule.c
@@ -2,12 +2,6 @@
 
 #include "pythonldap.h"
 
-#if PY_MAJOR_VERSION >= 3
-PyMODINIT_FUNC PyInit__ldap(void);
-#else
-PyMODINIT_FUNC init_ldap(void);
-#endif
-
 #define _STR(x)        #x
 #define STR(x) _STR(x)
 
@@ -28,27 +22,24 @@ static PyMethodDef methods[] = {
     {NULL, NULL}
 };
 
+static struct PyModuleDef ldap_moduledef = {
+    PyModuleDef_HEAD_INIT,
+    "_ldap",        /* m_name */
+    "",             /* m_doc */
+    -1,             /* m_size */
+    methods,        /* m_methods */
+};
+
 /* module initialisation */
 
-/* Common initialization code */
-PyObject *
-init_ldap_module(void)
+PyMODINIT_FUNC
+PyInit__ldap()
 {
     PyObject *m, *d;
 
     /* Create the module and add the functions */
-#if PY_MAJOR_VERSION >= 3
-    static struct PyModuleDef ldap_moduledef = {
-        PyModuleDef_HEAD_INIT,
-        "_ldap",        /* m_name */
-        "",             /* m_doc */
-        -1,             /* m_size */
-        methods,        /* m_methods */
-    };
     m = PyModule_Create(&ldap_moduledef);
-#else
-    m = Py_InitModule("_ldap", methods);
-#endif
+
     /* Initialize LDAP class */
     if (PyType_Ready(&LDAP_Type) < 0) {
         Py_DECREF(m);
@@ -73,17 +64,3 @@ init_ldap_module(void)
 
     return m;
 }
-
-#if PY_MAJOR_VERSION < 3
-PyMODINIT_FUNC
-init_ldap()
-{
-    init_ldap_module();
-}
-#else
-PyMODINIT_FUNC
-PyInit__ldap()
-{
-    return init_ldap_module();
-}
-#endif
diff --git a/Modules/options.c b/Modules/options.c
@@ -368,7 +368,7 @@ LDAP_get_option(LDAPObject *self, int option)
         res = LDAP_int_get_option(self, option, &intval);
         if (res != LDAP_OPT_SUCCESS)
             return option_error(res, "ldap_get_option");
-        return PyInt_FromLong(intval);
+        return PyLong_FromLong(intval);
 
 #ifdef LDAP_OPT_TCP_USER_TIMEOUT
     case LDAP_OPT_TCP_USER_TIMEOUT:
diff --git a/Modules/pythonldap.h b/Modules/pythonldap.h
@@ -17,12 +17,6 @@
 #include <ldap.h>
 #include <ldap_features.h>
 
-/* Py2/3 compatibility */
-#if PY_VERSION_HEX >= 0x03000000
-/* In Python 3, alias PyInt to PyLong */
-#define PyInt_FromLong PyLong_FromLong
-#endif
-
 #if LDAP_VENDOR_VERSION < 20400
 #error Current python-ldap requires OpenLDAP 2.4.x
 #endif
