WIP+fixup: move feature detection to runtime

mistotebe · mistotebe · commit 059f0d7ed7d2 · 2023-10-05T12:42:28.000+01:00
diff --git a/Lib/ldap/ldapobject.py b/Lib/ldap/ldapobject.py
@@ -176,9 +176,7 @@ def connect(self):
     connect() -> None
         Establishes LDAP connection if needed.
     """
-    if _ldap.VENDOR_VERSION >= 20500:
-        return self._ldap_call(self._l.connect)
-    raise NotImplementedError
+    return self._ldap_call(self._l.connect)
 
   def abandon_ext(self,msgid,serverctrls=None,clientctrls=None):
     """
diff --git a/Modules/LDAPObject.c b/Modules/LDAPObject.c
@@ -1507,12 +1507,21 @@ l_ldap_extended_operation(LDAPObject *self, PyObject *args)
 
 /* ldap_connect */
 
-#if LDAP_VENDOR_VERSION >= 20500
 static PyObject *
 l_ldap_connect(LDAPObject *self, PyObject Py_UNUSED(args))
 {
     int ldaperror;
 
+#if LDAP_VENDOR_VERSION >= 20500
+    if (ldap_version_info.ldapai_vendor_version < 20500)
+#endif
+    {
+        PyErr_SetString(PyExc_NotImplementedError,
+            "loaded libldap doesn't support this feature");
+        return NULL;
+    }
+
+#if LDAP_VENDOR_VERSION >= 20500
     if (not_valid(self))
         return NULL;
 
@@ -1525,8 +1534,8 @@ l_ldap_connect(LDAPObject *self, PyObject Py_UNUSED(args))
 
     Py_INCREF(Py_None);
     return Py_None;
-}
 #endif
+}
 
 /* methods */
 
@@ -1557,9 +1566,7 @@ static PyMethodDef methods[] = {
     {"cancel", (PyCFunction)l_ldap_cancel, METH_VARARGS},
 #endif
     {"extop", (PyCFunction)l_ldap_extended_operation, METH_VARARGS},
-#if LDAP_VENDOR_VERSION >= 20500
     {"connect", (PyCFunction)l_ldap_connect, METH_NOARGS},
-#endif
     {NULL, NULL}
 };
 
