Address comments

Author: NoahStapp

pymongo/asynchronous/mongo_client.py

@@ -830,10 +830,7 @@ def __init__(
         # Username and password passed as kwargs override user info in URI.
         username = opts.get("username", username)
         password = opts.get("password", password)
-        if _IS_SYNC:
-            self._options = options = ClientOptions(username, password, dbase, opts, False)
-        else:
-            self._options = options = ClientOptions(username, password, dbase, opts, True)
+        self._options = options = ClientOptions(username, password, dbase, opts, not _IS_SYNC)
 
         self._default_database_name = dbase
         self._lock = _ALock(_create_lock())

pymongo/client_options.py

@@ -148,7 +148,7 @@ def _parse_pool_options(
     password: str,
     database: Optional[str],
     options: Mapping[str, Any],
-    async_client: bool,
+    is_async: bool,
 ) -> PoolOptions:
     """Parse connection pool options."""
     credentials = _parse_credentials(username, password, database, options)
@@ -187,7 +187,7 @@ def _parse_pool_options(
         server_api=server_api,
         load_balanced=load_balanced,
         credentials=credentials,
-        async_client=async_client,
+        is_async=is_async,
     )
 
 
@@ -205,7 +205,7 @@ def __init__(
         password: str,
         database: Optional[str],
         options: Mapping[str, Any],
-        async_client: bool = False,
+        is_async: bool = False,
     ):
         self.__options = options
         self.__codec_options = _parse_codec_options(options)
@@ -216,9 +216,7 @@ def __init__(
         self.__server_selection_timeout = options.get(
             "serverselectiontimeoutms", common.SERVER_SELECTION_TIMEOUT
         )
-        self.__pool_options = _parse_pool_options(
-            username, password, database, options, async_client
-        )
+        self.__pool_options = _parse_pool_options(username, password, database, options, is_async)
         self.__read_preference = _parse_read_preference(options)
         self.__replica_set_name = options.get("replicaset")
         self.__write_concern = _parse_write_concern(options)

pymongo/pool_options.py

@@ -331,7 +331,7 @@ def __init__(
         server_api: Optional[ServerApi] = None,
         load_balanced: Optional[bool] = None,
         credentials: Optional[MongoCredential] = None,
-        async_client: Optional[bool] = False,
+        is_async: Optional[bool] = False,
     ):
         self.__max_pool_size = max_pool_size
         self.__min_pool_size = min_pool_size
@@ -351,8 +351,6 @@ def __init__(
         self.__load_balanced = load_balanced
         self.__credentials = credentials
         self.__metadata = copy.deepcopy(_METADATA)
-        if async_client:
-            self.__metadata["driver"]["name"] = "AsyncPyMongo"
 
         if appname:
             self.__metadata["application"] = {"name": appname}
@@ -365,6 +363,11 @@ def __init__(
         #    },
         #    'platform': 'CPython 3.8.0|MyPlatform'
         # }
+        if is_async:
+            self.__metadata["driver"]["name"] = "{}|{}".format(
+                self.__metadata["driver"]["name"],
+                "async",
+            )
         if driver:
             if driver.name:
                 self.__metadata["driver"]["name"] = "{}|{}".format(

pymongo/synchronous/mongo_client.py

@@ -829,10 +829,7 @@ def __init__(
         # Username and password passed as kwargs override user info in URI.
         username = opts.get("username", username)
         password = opts.get("password", password)
-        if _IS_SYNC:
-            self._options = options = ClientOptions(username, password, dbase, opts, False)
-        else:
-            self._options = options = ClientOptions(username, password, dbase, opts, True)
+        self._options = options = ClientOptions(username, password, dbase, opts, not _IS_SYNC)
 
         self._default_database_name = dbase
         self._lock = _create_lock()

test/asynchronous/test_client.py

@@ -341,7 +341,7 @@ async def test_read_preference(self):
 
     def test_metadata(self):
         metadata = copy.deepcopy(_METADATA)
-        metadata["driver"]["name"] = "AsyncPyMongo"
+        metadata["driver"]["name"] = "PyMongo|async"
         metadata["application"] = {"name": "foobar"}
         client = AsyncMongoClient("mongodb://foo:27017/?appname=foobar&connect=false")
         options = client.options
@@ -360,7 +360,7 @@ def test_metadata(self):
         self.assertRaises(TypeError, AsyncMongoClient, driver="abc")
         self.assertRaises(TypeError, AsyncMongoClient, driver=("Foo", "1", "a"))
         # Test appending to driver info.
-        metadata["driver"]["name"] = "AsyncPyMongo|FooDriver"
+        metadata["driver"]["name"] = "PyMongo|async|FooDriver"
         metadata["driver"]["version"] = "{}|1.2.3".format(_METADATA["driver"]["version"])
         client = AsyncMongoClient(
             "foo",
@@ -404,7 +404,7 @@ def test_metadata(self):
     @mock.patch.dict("os.environ", {ENV_VAR_K8S: "1"})
     def test_container_metadata(self):
         metadata = copy.deepcopy(_METADATA)
-        metadata["driver"]["name"] = "AsyncPyMongo"
+        metadata["driver"]["name"] = "PyMongo|async"
         metadata["env"] = {}
         metadata["env"]["container"] = {"orchestrator": "kubernetes"}
         client = AsyncMongoClient("mongodb://foo:27017/?appname=foobar&connect=false")
@@ -1940,7 +1940,7 @@ def test_sigstop_sigcont(self):
     async def _test_handshake(self, env_vars, expected_env):
         with patch.dict("os.environ", env_vars):
             metadata = copy.deepcopy(_METADATA)
-            metadata["driver"]["name"] = "AsyncPyMongo"
+            metadata["driver"]["name"] = "PyMongo|async"
             if expected_env is not None:
                 metadata["env"] = expected_env
 

tools/synchro.py

@@ -95,7 +95,7 @@
     "async-transactions-ref": "transactions-ref",
     "async-snapshot-reads-ref": "snapshot-reads-ref",
     "default_async": "default",
-    "AsyncPyMongo": "PyMongo",
+    "PyMongo|async": "PyMongo",
 }
 
 docstring_replacements: dict[tuple[str, str], str] = {