Skip to content

Commit 30f4ac1

Browse files
committed
always add |
1 parent 5e47df3 commit 30f4ac1

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

pymongo/pool_options.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -392,18 +392,20 @@ def _update_metadata(self, driver: DriverInfo) -> None:
392392
return
393393

394394
metadata = copy.deepcopy(self.__metadata)
395-
if driver.name:
396-
metadata["driver"]["name"] = "{}|{}".format(
397-
metadata["driver"]["name"],
398-
driver.name,
399-
)
400-
if driver.version:
401-
metadata["driver"]["version"] = "{}|{}".format(
402-
metadata["driver"]["version"],
403-
driver.version,
404-
)
405-
if driver.platform:
406-
metadata["platform"] = "{}|{}".format(metadata["platform"], driver.platform)
395+
396+
name = driver.name if driver.name else ""
397+
version = driver.version if driver.version else ""
398+
platform = driver.platform if driver.platform else ""
399+
400+
metadata["driver"]["name"] = "{}|{}".format(
401+
metadata["driver"]["name"],
402+
name,
403+
)
404+
metadata["driver"]["version"] = "{}|{}".format(
405+
metadata["driver"]["version"],
406+
version,
407+
)
408+
metadata["platform"] = "{}|{}".format(metadata["platform"], platform)
407409

408410
self.__metadata = metadata
409411

test/asynchronous/test_client_metadata.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,14 @@ async def check_metadata_added(
112112
self.assertEqual(version, new_version)
113113
self.assertEqual(platform, new_platform)
114114
else:
115-
self.assertEqual(new_name, f"{name}|{add_name}" if add_name is not None else name)
115+
self.assertEqual(new_name, f"{name}|{add_name}" if add_name is not None else f"{name}|")
116116
self.assertEqual(
117117
new_version,
118-
f"{version}|{add_version}" if add_version is not None else version,
118+
f"{version}|{add_version}" if add_version is not None else f"{version}|",
119119
)
120120
self.assertEqual(
121121
new_platform,
122-
f"{platform}|{add_platform}" if add_platform is not None else platform,
122+
f"{platform}|{add_platform}" if add_platform is not None else f"{platform}|",
123123
)
124124

125125
metadata.pop("driver")

test/test_client_metadata.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,14 @@ def check_metadata_added(
112112
self.assertEqual(version, new_version)
113113
self.assertEqual(platform, new_platform)
114114
else:
115-
self.assertEqual(new_name, f"{name}|{add_name}" if add_name is not None else name)
115+
self.assertEqual(new_name, f"{name}|{add_name}" if add_name is not None else f"{name}|")
116116
self.assertEqual(
117117
new_version,
118-
f"{version}|{add_version}" if add_version is not None else version,
118+
f"{version}|{add_version}" if add_version is not None else f"{version}|",
119119
)
120120
self.assertEqual(
121121
new_platform,
122-
f"{platform}|{add_platform}" if add_platform is not None else platform,
122+
f"{platform}|{add_platform}" if add_platform is not None else f"{platform}|",
123123
)
124124

125125
metadata.pop("driver")

0 commit comments

Comments
 (0)