address comments part 1

Author: sleepyStick

pymongo/asynchronous/mongo_client.py

@@ -757,6 +757,7 @@ def __init__(
             raise TypeError(f"port must be an instance of int, not {type(port)}")
         self._host = host
         self._port = port
+        self._topology = None
 
         # _pool_class, _monitor_class, and _condition_class are for deep
         # customization of PyMongo, e.g. Motor.
@@ -1229,20 +1230,20 @@ def eq_props(self):
 
     def __eq__(self, other: Any) -> bool:
         if isinstance(other, self.__class__):
-            if hasattr(self, "_topology") and hasattr(other, "_topology"):
-                return self._topology == other._topology
-            else:
+            if self._topology is None:
                 return self.eq_props() == other.eq_props()
+            else:
+                return self._topology == other._topology
         return NotImplemented
 
     def __ne__(self, other: Any) -> bool:
         return not self == other
 
     def __hash__(self) -> int:
-        if hasattr(self, "_topology"):
-            return hash(self._topology)
-        else:
+        if self._topology is None:
             raise hash(self.eq_props())
+        else:
+            return hash(self._topology)
 
     def _repr_helper(self) -> str:
         def option_repr(option: str, value: Any) -> str:
@@ -1258,16 +1259,16 @@ def option_repr(option: str, value: Any) -> str:
             return f"{option}={value!r}"
 
         # Host first...
-        if hasattr(self, "_topology"):
+        if self._topology is None:
+            options = ["host={self._host}", "port={self._port}"]
+        else:
             options = [
                 "host=%r"
                 % [
                     "%s:%d" % (host, port) if port is not None else host
                     for host, port in self._topology_settings.seeds
                 ]
             ]
-        else:
-            options = ["host={self._host}", "port={self._port}"]
         # ... then everything in self._constructor_args...
         options.extend(
             option_repr(key, self._options._options[key]) for key in self._constructor_args
@@ -1673,7 +1674,7 @@ async def close(self) -> None:
         .. versionchanged:: 3.6
            End all server sessions created by this client.
         """
-        if hasattr(self, "_topology"):
+        if self._topology is not None:
             session_ids = self._topology.pop_all_sessions()
             if session_ids:
                 await self._end_sessions(session_ids)

pymongo/asynchronous/uri_parser.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import sys
 from typing import Any, Optional
 from urllib.parse import unquote_plus
 
@@ -171,14 +170,3 @@ async def _parse_srv(
         "nodelist": nodes,
         "options": options,
     }
-
-
-if __name__ == "__main__":
-    import pprint
-
-    try:
-        if _IS_SYNC:
-            pprint.pprint(parse_uri(sys.argv[1]))  # noqa: T203
-    except InvalidURI as exc:
-        print(exc)  # noqa: T201
-    sys.exit(0)

pymongo/srv_resolver.py

@@ -1,4 +1,4 @@
-# Copyright 2025-present MongoDB, Inc.
+# Copyright 2019-present MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

pymongo/synchronous/mongo_client.py

@@ -755,6 +755,7 @@ def __init__(
             raise TypeError(f"port must be an instance of int, not {type(port)}")
         self._host = host
         self._port = port
+        self._topology = None
 
         # _pool_class, _monitor_class, and _condition_class are for deep
         # customization of PyMongo, e.g. Motor.
@@ -1227,20 +1228,20 @@ def eq_props(self):
 
     def __eq__(self, other: Any) -> bool:
         if isinstance(other, self.__class__):
-            if hasattr(self, "_topology") and hasattr(other, "_topology"):
-                return self._topology == other._topology
-            else:
+            if self._topology is None:
                 return self.eq_props() == other.eq_props()
+            else:
+                return self._topology == other._topology
         return NotImplemented
 
     def __ne__(self, other: Any) -> bool:
         return not self == other
 
     def __hash__(self) -> int:
-        if hasattr(self, "_topology"):
-            return hash(self._topology)
-        else:
+        if self._topology is None:
             raise hash(self.eq_props())
+        else:
+            return hash(self._topology)
 
     def _repr_helper(self) -> str:
         def option_repr(option: str, value: Any) -> str:
@@ -1256,16 +1257,16 @@ def option_repr(option: str, value: Any) -> str:
             return f"{option}={value!r}"
 
         # Host first...
-        if hasattr(self, "_topology"):
+        if self._topology is None:
+            options = ["host={self._host}", "port={self._port}"]
+        else:
             options = [
                 "host=%r"
                 % [
                     "%s:%d" % (host, port) if port is not None else host
                     for host, port in self._topology_settings.seeds
                 ]
             ]
-        else:
-            options = ["host={self._host}", "port={self._port}"]
         # ... then everything in self._constructor_args...
         options.extend(
             option_repr(key, self._options._options[key]) for key in self._constructor_args
@@ -1667,7 +1668,7 @@ def close(self) -> None:
         .. versionchanged:: 3.6
            End all server sessions created by this client.
         """
-        if hasattr(self, "_topology"):
+        if self._topology is not None:
             session_ids = self._topology.pop_all_sessions()
             if session_ids:
                 self._end_sessions(session_ids)

pymongo/synchronous/uri_parser.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import sys
 from typing import Any, Optional
 from urllib.parse import unquote_plus
 
@@ -171,14 +170,3 @@ def _parse_srv(
         "nodelist": nodes,
         "options": options,
     }
-
-
-if __name__ == "__main__":
-    import pprint
-
-    try:
-        if _IS_SYNC:
-            pprint.pprint(parse_uri(sys.argv[1]))  # noqa: T203
-    except InvalidURI as exc:
-        print(exc)  # noqa: T201
-    sys.exit(0)

pymongo/uri_parser.py

@@ -1,4 +1,4 @@
-# Copyright 2025-present MongoDB, Inc.
+# Copyright 2011-present MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,9 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Re-import of synchronous Uri Parser API for compatibility."""
+"""Re-import of synchronous URI Parser API for compatibility."""
 from __future__ import annotations
 
+import sys
+
+from pymongo.errors import InvalidURI
 from pymongo.synchronous.uri_parser import *  # noqa: F403
 from pymongo.synchronous.uri_parser import __doc__ as original_doc
 from pymongo.uri_parser_shared import *  # noqa: F403
@@ -29,3 +32,12 @@
     "split_hosts",
     "parse_uri",
 ]
+
+if __name__ == "__main__":
+    import pprint
+
+    try:
+        pprint.pprint(parse_uri(sys.argv[1]))  # noqa: F405, T203
+    except InvalidURI as exc:
+        print(exc)  # noqa: T201
+    sys.exit(0)