Address review

Author: NoahStapp

pymongo/asynchronous/mongo_client.py

@@ -59,7 +59,6 @@
     cast,
 )
 
-import pymongo.uri_parser_shared
 from bson.codec_options import DEFAULT_CODEC_OPTIONS, CodecOptions, TypeRegistry
 from bson.timestamp import Timestamp
 from pymongo import _csot, common, helpers_shared, periodic_executor
@@ -121,6 +120,7 @@
     _handle_option_deprecations,
     _handle_security_options,
     _normalize_options,
+    _validate_uri,
     split_hosts,
 )
 from pymongo.write_concern import DEFAULT_WRITE_CONCERN, WriteConcern
@@ -786,7 +786,7 @@ def __init__(
             # it must be a URI,
             # https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_host_names
             if "/" in entity:
-                res = pymongo.uri_parser_shared._validate_uri(
+                res = _validate_uri(
                     entity,
                     port,
                     validate=True,

pymongo/asynchronous/srv_resolver.py

@@ -61,7 +61,9 @@ async def _resolve(*args: Any, **kwargs: Any) -> resolver.Answer:
         if hasattr(asyncresolver, "resolve"):
             # dnspython >= 2
             return await asyncresolver.resolve(*args, **kwargs)  # type:ignore[return-value]
-        raise ConfigurationError("Upgrade to dnspython version >= 2.0")
+        raise ConfigurationError(
+            "Upgrade to dnspython version >= 2.0 to use AsyncMongoClient with mongodb+srv:// connections."
+        )
 
 
 _INVALID_HOST_MSG = (

pymongo/synchronous/mongo_client.py

@@ -58,7 +58,6 @@
     cast,
 )
 
-import pymongo.uri_parser_shared
 from bson.codec_options import DEFAULT_CODEC_OPTIONS, CodecOptions, TypeRegistry
 from bson.timestamp import Timestamp
 from pymongo import _csot, common, helpers_shared, periodic_executor
@@ -120,6 +119,7 @@
     _handle_option_deprecations,
     _handle_security_options,
     _normalize_options,
+    _validate_uri,
     split_hosts,
 )
 from pymongo.write_concern import DEFAULT_WRITE_CONCERN, WriteConcern
@@ -784,7 +784,7 @@ def __init__(
             # it must be a URI,
             # https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_host_names
             if "/" in entity:
-                res = pymongo.uri_parser_shared._validate_uri(
+                res = _validate_uri(
                     entity,
                     port,
                     validate=True,

pymongo/synchronous/srv_resolver.py

@@ -61,7 +61,9 @@ def _resolve(*args: Any, **kwargs: Any) -> resolver.Answer:
         if hasattr(asyncresolver, "resolve"):
             # dnspython >= 2
             return asyncresolver.resolve(*args, **kwargs)  # type:ignore[return-value]
-        raise ConfigurationError("Upgrade to dnspython version >= 2.0")
+        raise ConfigurationError(
+            "Upgrade to dnspython version >= 2.0 to use MongoClient with mongodb+srv:// connections."
+        )
 
 
 _INVALID_HOST_MSG = (

test/test_default_exports.py

@@ -69,7 +69,6 @@ def test_bson(self):
 
     def test_pymongo_imports(self):
         import pymongo
-        from pymongo.asynchronous.uri_parser import parse_uri
         from pymongo.auth import MECHANISMS
         from pymongo.auth_oidc import (
             OIDCCallback,
@@ -199,9 +198,10 @@ def test_pymongo_imports(self):
         from pymongo.server_api import ServerApi, ServerApiVersion
         from pymongo.server_description import ServerDescription
         from pymongo.topology_description import TopologyDescription
-        from pymongo.uri_parser_shared import (
+        from pymongo.uri_parser import (
             parse_host,
             parse_ipv6_literal_host,
+            parse_uri,
             parse_userinfo,
             split_hosts,
             split_options,