Allow passing None as uri argument to ldap.initialize()

steffen-kiess · steffen-kiess · commit c4892e9b2f0b · 2022-09-02T14:56:30.000+02:00
OpenLDAP allows passing NULL to ldap_initialize(). In this case the
default URI from ldap.conf will be used. Allow passing None as uri
argument to ldap.initialize().
diff --git a/Doc/reference/ldap.rst b/Doc/reference/ldap.rst
@@ -29,7 +29,7 @@ Functions
 
 This module defines the following functions:
 
-.. py:function:: initialize(uri [, trace_level=0 [, trace_file=sys.stdout [, trace_stack_limit=None, [fileno=None]]]]) -> LDAPObject object
+.. py:function:: initialize([uri=None [, trace_level=0 [, trace_file=sys.stdout [, trace_stack_limit=None, [fileno=None]]]]]) -> LDAPObject object
 
    Initializes a new connection object for accessing the given LDAP server,
    and return an :class:`~ldap.ldapobject.LDAPObject` used to perform operations
@@ -38,7 +38,8 @@ This module defines the following functions:
    The *uri* parameter may be a comma- or whitespace-separated list of URIs
    containing only the schema, the host, and the port fields. Note that
    when using multiple URIs you cannot determine to which URI your client
-   gets connected.
+   gets connected. If *uri* is :py:const:`None`, the default URIs from
+   ``ldap.conf`` or :py:const:`OPT_URI` global option will be used.
 
    If *fileno* parameter is given then the file descriptor will be used to
    connect to an LDAP server. The *fileno* must either be a socket file
diff --git a/Lib/ldap/ldapobject.py b/Lib/ldap/ldapobject.py
@@ -67,7 +67,7 @@ class SimpleLDAPObject:
   }
 
   def __init__(
-    self,uri,
+    self,uri=None,
     trace_level=0,trace_file=None,trace_stack_limit=5,bytes_mode=None,
     bytes_strictness=None, fileno=None
   ):
@@ -844,7 +844,7 @@ class ReconnectLDAPObject(SimpleLDAPObject):
   }
 
   def __init__(
-    self,uri,
+    self,uri=None,
     trace_level=0,trace_file=None,trace_stack_limit=5,bytes_mode=None,
     bytes_strictness=None, retry_max=1, retry_delay=60.0, fileno=None
   ):
diff --git a/Modules/functions.c b/Modules/functions.c
@@ -17,7 +17,7 @@ l_ldap_initialize(PyObject *unused, PyObject *args)
     int ret;
     PyThreadState *save;
 
-    if (!PyArg_ParseTuple(args, "s:initialize", &uri))
+    if (!PyArg_ParseTuple(args, "z:initialize", &uri))
         return NULL;
 
     save = PyEval_SaveThread();
