keep parse_uri as is and have it call two different functions instead

Author: sleepyStick

pymongo/asynchronous/mongo_client.py

@@ -778,7 +778,7 @@ def __init__(
             # it must be a URI,
             # https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_host_names
             if "/" in entity:
-                res = uri_parser.parse_uri(
+                res = uri_parser._validate_uri(
                     entity,
                     port,
                     validate=True,
@@ -933,7 +933,7 @@ def _resolve_uri(self):
                     timeout = common.validate_timeout_or_none_or_zero(
                         keyword_opts.cased_key("connecttimeoutms"), timeout
                     )
-                res = uri_parser.parse_uri_lookups(
+                res = uri_parser._lookup_uri(
                     entity,
                     self._port,
                     validate=True,

pymongo/synchronous/mongo_client.py

@@ -776,7 +776,7 @@ def __init__(
             # it must be a URI,
             # https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_host_names
             if "/" in entity:
-                res = uri_parser.parse_uri(
+                res = uri_parser._validate_uri(
                     entity,
                     port,
                     validate=True,
@@ -931,7 +931,7 @@ def _resolve_uri(self):
                     timeout = common.validate_timeout_or_none_or_zero(
                         keyword_opts.cased_key("connecttimeoutms"), timeout
                     )
-                res = uri_parser.parse_uri_lookups(
+                res = uri_parser._lookup_uri(
                     entity,
                     self._port,
                     validate=True,

pymongo/uri_parser.py

@@ -427,6 +427,8 @@ def parse_uri(
     validate: bool = True,
     warn: bool = False,
     normalize: bool = True,
+    connect_timeout: Optional[float] = None,
+    srv_service_name: Optional[str] = None,
     srv_max_hosts: Optional[int] = None,
 ) -> dict[str, Any]:
     """Parse and validate a MongoDB URI.
@@ -482,6 +484,30 @@ def parse_uri(
     .. versionchanged:: 3.1
         ``warn`` added so invalid options can be ignored.
     """
+    result = _validate_uri(uri, default_port, validate, warn, normalize, srv_max_hosts)
+    result.update(
+        _lookup_uri(
+            uri,
+            default_port,
+            validate,
+            warn,
+            normalize,
+            connect_timeout,
+            srv_service_name,
+            srv_max_hosts,
+        )
+    )
+    return result
+
+
+def _validate_uri(
+    uri: str,
+    default_port: Optional[int] = DEFAULT_PORT,
+    validate: bool = True,
+    warn: bool = False,
+    normalize: bool = True,
+    srv_max_hosts: Optional[int] = None,
+):
     if uri.startswith(SCHEME):
         is_srv = False
         scheme_free = uri[SCHEME_LEN:]
@@ -570,7 +596,7 @@ def parse_uri(
     }
 
 
-def parse_uri_lookups(
+def _lookup_uri(
     uri: str,
     default_port: Optional[int] = DEFAULT_PORT,
     validate: bool = True,

test/asynchronous/test_dns.py

@@ -33,7 +33,7 @@
 
 from pymongo.common import validate_read_preference_tags
 from pymongo.errors import ConfigurationError
-from pymongo.uri_parser import parse_uri, parse_uri_lookups, split_hosts
+from pymongo.uri_parser import parse_uri, split_hosts
 
 _IS_SYNC = False
 
@@ -110,7 +110,6 @@ async def run_test(self):
 
         if seeds or num_seeds:
             result = parse_uri(uri, validate=True)
-            result.update(parse_uri_lookups(uri, validate=True))
             if seeds is not None:
                 self.assertEqual(sorted(result["nodelist"]), sorted(seeds))
             if num_seeds is not None:
@@ -142,16 +141,12 @@ async def run_test(self):
                     # Our test certs don't support the SRV hosts used in these
                     # tests.
                     copts["tlsAllowInvalidHostnames"] = True
-                print(uri)
-                print(copts)
                 client = self.simple_client(uri, **copts)
-                await client.aconnect()
                 if client._options.connect:
                     await client.aconnect()
                 if num_seeds is not None:
                     self.assertEqual(len(client._topology_settings.seeds), num_seeds)
                 if hosts is not None:
-                    print(client.nodes)
                     await async_wait_until(
                         lambda: hosts == client.nodes, "match test hosts to client nodes"
                     )
@@ -166,7 +161,6 @@ async def run_test(self):
         else:
             try:
                 parse_uri(uri)
-                parse_uri_lookups(uri)
             except (ConfigurationError, ValueError):
                 pass
             else:

test/test_dns.py

@@ -33,7 +33,7 @@
 
 from pymongo.common import validate_read_preference_tags
 from pymongo.errors import ConfigurationError
-from pymongo.uri_parser import parse_uri, parse_uri_lookups, split_hosts
+from pymongo.uri_parser import parse_uri, split_hosts
 
 _IS_SYNC = True
 
@@ -110,7 +110,6 @@ def run_test(self):
 
         if seeds or num_seeds:
             result = parse_uri(uri, validate=True)
-            result.update(parse_uri_lookups(uri, validate=True))
             if seeds is not None:
                 self.assertEqual(sorted(result["nodelist"]), sorted(seeds))
             if num_seeds is not None:
@@ -142,16 +141,12 @@ def run_test(self):
                     # Our test certs don't support the SRV hosts used in these
                     # tests.
                     copts["tlsAllowInvalidHostnames"] = True
-                print(uri)
-                print(copts)
                 client = self.simple_client(uri, **copts)
-                client._connect()
                 if client._options.connect:
                     client._connect()
                 if num_seeds is not None:
                     self.assertEqual(len(client._topology_settings.seeds), num_seeds)
                 if hosts is not None:
-                    print(client.nodes)
                     wait_until(lambda: hosts == client.nodes, "match test hosts to client nodes")
                 if num_hosts is not None:
                     wait_until(
@@ -164,7 +159,6 @@ def run_test(self):
         else:
             try:
                 parse_uri(uri)
-                parse_uri_lookups(uri)
             except (ConfigurationError, ValueError):
                 pass
             else: