fix typing

Author: sleepyStick

pymongo/asynchronous/mongo_client.py

@@ -742,16 +742,16 @@ def __init__(
             **kwargs,
         }
 
+        if host is None:
+            host = self.HOST
+        if isinstance(host, str):
+            host = [host]
+        if port is None:
+            port = self.PORT
+        if not isinstance(port, int):
+            raise TypeError(f"port must be an instance of int, not {type(port)}")
         self._host = host
         self._port = port
-        if self._host is None:
-            self._host = self.HOST
-        if isinstance(self._host, str):
-            self._host = [self._host]
-        if self._port is None:
-            self._port = self.PORT
-        if not isinstance(self._port, int):
-            raise TypeError(f"port must be an instance of int, not {type(port)}")
 
         # _pool_class, _monitor_class, and _condition_class are for deep
         # customization of PyMongo, e.g. Motor.
@@ -762,7 +762,7 @@ def __init__(
         # Parse options passed as kwargs.
         keyword_opts = common._CaseInsensitiveDictionary(kwargs)
         keyword_opts["document_class"] = doc_class
-        self._resolve_uri_info = {"keyword_opts": keyword_opts}
+        self._resolve_uri_info: dict[str, Any] = {"keyword_opts": keyword_opts}
 
         seeds = set()
         username = None
@@ -824,6 +824,8 @@ def __init__(
         opts = self._normalize_and_validate_options(opts, seeds)
 
         # Username and password passed as kwargs override user info in URI.
+        username = opts.get("username", username)
+        password = opts.get("password", password)
         self._options = options = ClientOptions(username, password, dbase, opts, _IS_SYNC)
 
         self._default_database_name = dbase
@@ -887,15 +889,7 @@ def __init__(
             # This will be used later if we fork.
             AsyncMongoClient._clients[self._topology._topology_id] = self
 
-    def _normalize_and_validate_options(self, opts, seeds):
-        # Handle security-option conflicts in combined options.
-        opts = _handle_security_options(opts)
-        # Normalize combined options.
-        opts = _normalize_options(opts)
-        _check_options(seeds, opts)
-        return opts
-
-    def _resolve_uri(self):
+    def _resolve_uri(self) -> None:
         keyword_opts = self._resolve_uri_info["keyword_opts"]
         seeds = set()
         opts = common._CaseInsensitiveDictionary()
@@ -953,7 +947,7 @@ def _resolve_uri(self):
                 srv_service_name = opts.get("srvServiceName", common.SRV_SERVICE_NAME)
 
             srv_max_hosts = srv_max_hosts or opts.get("srvmaxhosts")
-            opts = self._normalize_and_validate_opts(opts, seeds)
+            opts = self._normalize_and_validate_options(opts, seeds)
 
             # Username and password passed as kwargs override user info in URI.
             username = opts.get("username", self._resolve_uri_info["username"])
@@ -991,15 +985,21 @@ def _resolve_uri(self):
 
             self._topology = Topology(self._topology_settings)
 
-    def _normalize_and_validate_opts(self, opts, seeds):
+    def _normalize_and_validate_options(
+        self, opts: common._CaseInsensitiveDictionary, seeds: set[tuple[str, int | None]]
+    ) -> common._CaseInsensitiveDictionary:
         # Handle security-option conflicts in combined options.
         opts = _handle_security_options(opts)
         # Normalize combined options.
         opts = _normalize_options(opts)
         _check_options(seeds, opts)
         return opts
 
-    def _validate_kwargs_and_update_opts(self, keyword_opts, opts):
+    def _validate_kwargs_and_update_opts(
+        self,
+        keyword_opts: common._CaseInsensitiveDictionary,
+        opts: common._CaseInsensitiveDictionary,
+    ) -> common._CaseInsensitiveDictionary:
         # Handle deprecated options in kwarg options.
         keyword_opts = _handle_option_deprecations(keyword_opts)
         # Validate kwarg options.

pymongo/synchronous/mongo_client.py

@@ -740,16 +740,16 @@ def __init__(
             **kwargs,
         }
 
+        if host is None:
+            host = self.HOST
+        if isinstance(host, str):
+            host = [host]
+        if port is None:
+            port = self.PORT
+        if not isinstance(port, int):
+            raise TypeError(f"port must be an instance of int, not {type(port)}")
         self._host = host
         self._port = port
-        if self._host is None:
-            self._host = self.HOST
-        if isinstance(self._host, str):
-            self._host = [self._host]
-        if self._port is None:
-            self._port = self.PORT
-        if not isinstance(self._port, int):
-            raise TypeError(f"port must be an instance of int, not {type(port)}")
 
         # _pool_class, _monitor_class, and _condition_class are for deep
         # customization of PyMongo, e.g. Motor.
@@ -760,7 +760,7 @@ def __init__(
         # Parse options passed as kwargs.
         keyword_opts = common._CaseInsensitiveDictionary(kwargs)
         keyword_opts["document_class"] = doc_class
-        self._resolve_uri_info = {"keyword_opts": keyword_opts}
+        self._resolve_uri_info: dict[str, Any] = {"keyword_opts": keyword_opts}
 
         seeds = set()
         username = None
@@ -822,6 +822,8 @@ def __init__(
         opts = self._normalize_and_validate_options(opts, seeds)
 
         # Username and password passed as kwargs override user info in URI.
+        username = opts.get("username", username)
+        password = opts.get("password", password)
         self._options = options = ClientOptions(username, password, dbase, opts, _IS_SYNC)
 
         self._default_database_name = dbase
@@ -885,15 +887,7 @@ def __init__(
             # This will be used later if we fork.
             MongoClient._clients[self._topology._topology_id] = self
 
-    def _normalize_and_validate_options(self, opts, seeds):
-        # Handle security-option conflicts in combined options.
-        opts = _handle_security_options(opts)
-        # Normalize combined options.
-        opts = _normalize_options(opts)
-        _check_options(seeds, opts)
-        return opts
-
-    def _resolve_uri(self):
+    def _resolve_uri(self) -> None:
         keyword_opts = self._resolve_uri_info["keyword_opts"]
         seeds = set()
         opts = common._CaseInsensitiveDictionary()
@@ -951,7 +945,7 @@ def _resolve_uri(self):
                 srv_service_name = opts.get("srvServiceName", common.SRV_SERVICE_NAME)
 
             srv_max_hosts = srv_max_hosts or opts.get("srvmaxhosts")
-            opts = self._normalize_and_validate_opts(opts, seeds)
+            opts = self._normalize_and_validate_options(opts, seeds)
 
             # Username and password passed as kwargs override user info in URI.
             username = opts.get("username", self._resolve_uri_info["username"])
@@ -989,15 +983,21 @@ def _resolve_uri(self):
 
             self._topology = Topology(self._topology_settings)
 
-    def _normalize_and_validate_opts(self, opts, seeds):
+    def _normalize_and_validate_options(
+        self, opts: common._CaseInsensitiveDictionary, seeds: set[tuple[str, int | None]]
+    ) -> common._CaseInsensitiveDictionary:
         # Handle security-option conflicts in combined options.
         opts = _handle_security_options(opts)
         # Normalize combined options.
         opts = _normalize_options(opts)
         _check_options(seeds, opts)
         return opts
 
-    def _validate_kwargs_and_update_opts(self, keyword_opts, opts):
+    def _validate_kwargs_and_update_opts(
+        self,
+        keyword_opts: common._CaseInsensitiveDictionary,
+        opts: common._CaseInsensitiveDictionary,
+    ) -> common._CaseInsensitiveDictionary:
         # Handle deprecated options in kwarg options.
         keyword_opts = _handle_option_deprecations(keyword_opts)
         # Validate kwarg options.

pymongo/uri_parser.py

@@ -507,7 +507,7 @@ def _validate_uri(
     warn: bool = False,
     normalize: bool = True,
     srv_max_hosts: Optional[int] = None,
-):
+) -> dict[str, Any]:
     if uri.startswith(SCHEME):
         is_srv = False
         scheme_free = uri[SCHEME_LEN:]