PYTHON-3072 Use _Address in more places (mongodb#871)

Author: ShaneHarvey

pymongo/command_cursor.py

@@ -22,7 +22,7 @@
 from pymongo.errors import ConnectionFailure, InvalidOperation, OperationFailure
 from pymongo.message import _CursorAddress, _GetMore, _RawBatchGetMore
 from pymongo.response import PinnedResponse
-from pymongo.typings import _DocumentType
+from pymongo.typings import _Address, _DocumentType
 
 if TYPE_CHECKING:
     from pymongo.client_session import ClientSession
@@ -38,7 +38,7 @@ def __init__(
         self,
         collection: "Collection[_DocumentType]",
         cursor_info: Mapping[str, Any],
-        address: Optional[Tuple[str, Optional[int]]],
+        address: Optional[_Address],
         batch_size: int = 0,
         max_await_time_ms: Optional[int] = None,
         session: Optional["ClientSession"] = None,
@@ -254,7 +254,7 @@ def cursor_id(self) -> int:
         return self.__id
 
     @property
-    def address(self) -> Optional[Tuple[str, Optional[int]]]:
+    def address(self) -> Optional[_Address]:
         """The (host, port) of the server used, or None.
 
         .. versionadded:: 3.0
@@ -309,7 +309,7 @@ def __init__(
         self,
         collection: "Collection[_DocumentType]",
         cursor_info: Mapping[str, Any],
-        address: Optional[Tuple[str, Optional[int]]],
+        address: Optional[_Address],
         batch_size: int = 0,
         max_await_time_ms: Optional[int] = None,
         session: Optional["ClientSession"] = None,

pymongo/mongo_client.py

@@ -86,7 +86,7 @@
 from pymongo.settings import TopologySettings
 from pymongo.topology import Topology, _ErrorContext
 from pymongo.topology_description import TOPOLOGY_TYPE, TopologyDescription
-from pymongo.typings import _CollationIn, _DocumentType, _Pipeline
+from pymongo.typings import _Address, _CollationIn, _DocumentType, _Pipeline
 from pymongo.uri_parser import (
     _check_options,
     _handle_option_deprecations,
@@ -1061,7 +1061,7 @@ def is_mongos(self) -> bool:
         return self._server_property("server_type") == SERVER_TYPE.Mongos
 
     @property
-    def nodes(self) -> FrozenSet[Tuple[str, Optional[int]]]:
+    def nodes(self) -> FrozenSet[_Address]:
         """Set of all currently connected servers.
 
         .. warning:: When connected to a replica set the value of :attr:`nodes`

pymongo/uri_parser.py

@@ -40,6 +40,7 @@
 )
 from pymongo.errors import ConfigurationError, InvalidURI
 from pymongo.srv_resolver import _HAVE_DNSPYTHON, _SrvResolver
+from pymongo.typings import _Address
 
 SCHEME = "mongodb://"
 SCHEME_LEN = len(SCHEME)
@@ -114,9 +115,7 @@ def parse_ipv6_literal_host(
     return entity[1:i], entity[i + 2 :]
 
 
-def parse_host(
-    entity: str, default_port: Optional[int] = DEFAULT_PORT
-) -> Tuple[str, Optional[int]]:
+def parse_host(entity: str, default_port: Optional[int] = DEFAULT_PORT) -> _Address:
     """Validates a host string
 
     Returns a 2-tuple of host followed by port where port is default_port
@@ -363,9 +362,7 @@ def split_options(
     return options
 
 
-def split_hosts(
-    hosts: str, default_port: Optional[int] = DEFAULT_PORT
-) -> List[Tuple[str, Optional[int]]]:
+def split_hosts(hosts: str, default_port: Optional[int] = DEFAULT_PORT) -> List[_Address]:
     """Takes a string of the form host1[:port],host2[:port]... and
     splits it into (host, port) tuples. If [:port] isn't present the
     default_port is used.