Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .evergreen/scripts/generate_config_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ class Host:
"rhel82-arm64-small",
"amazon2023-arm64-latest-large-m8g",
],
strict=True,
):
HOSTS[name] = Host(name, run_on, name, dict())

Expand Down
2 changes: 1 addition & 1 deletion pymongo/auth_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def _build_credentials_tuple(

def _xor(fir: bytes, sec: bytes) -> bytes:
"""XOR two byte strings together."""
return b"".join([bytes([x ^ y]) for x, y in zip(fir, sec)])
return b"".join([bytes([x ^ y]) for x, y in zip(fir, sec, strict=True)])


def _parse_scram_response(response: bytes) -> dict[bytes, bytes]:
Expand Down
4 changes: 3 additions & 1 deletion pymongo/message.py
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,9 @@ def _check_doc_size_limits(
total_ops_length = 0
total_ns_length = 0

for idx, ((real_op_type, op_doc), namespace) in enumerate(zip(operations, namespaces)):
for idx, ((real_op_type, op_doc), namespace) in enumerate(
zip(operations, namespaces, strict=True)
):
op_type = real_op_type
# Check insert/replace document size if unacknowledged.
if real_op_type == "insert":
Expand Down
2 changes: 1 addition & 1 deletion pymongo/pool_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ def _truncate_metadata(metadata: MutableMapping[str, Any]) -> None:
# driver) are dropped first since they cost nothing.
name_str = driver.get("name", "")
version_str = driver.get("version", "")
raw_pairs = list(zip(name_str.split("|"), version_str.split("|")))
raw_pairs = list(zip(name_str.split("|"), version_str.split("|"), strict=True))
pairs = [(name, version) for name, version in raw_pairs if name or version]
new_name = "|".join(name for name, _ in pairs)
new_version = "|".join(version for _, version in pairs)
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ ignore = [
"ASYNC109", # Async function with a `timeout` parameter (CSOT timeouts are not `asyncio.timeout`)
"UP042", # `str, Enum` should be `StrEnum` (changes `__str__` semantics)
"UP017", # `timezone.utc` preferred over `datetime.UTC` (keep existing style)
"B905", # `zip()` without an explicit `strict=` parameter
]
unfixable = [
"RUF100", # Unused noqa
Expand Down
4 changes: 2 additions & 2 deletions test/asynchronous/test_bulk.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def assertEqualResponse(self, expected, actual):
% (len(expected_upserts), len(actual_upserts)),
)

for e, a in zip(expected_upserts, actual_upserts):
for e, a in zip(expected_upserts, actual_upserts, strict=True):
self.assertEqualUpsert(e, a)

elif key == "writeErrors":
Expand All @@ -76,7 +76,7 @@ def assertEqualResponse(self, expected, actual):
% (len(expected_errors), len(actual_errors)),
)

for e, a in zip(expected_errors, actual_errors):
for e, a in zip(expected_errors, actual_errors, strict=True):
self.assertEqualWriteError(e, a)

else:
Expand Down
2 changes: 1 addition & 1 deletion test/asynchronous/test_change_stream.py
Original file line number Diff line number Diff line change
Expand Up @@ -1090,7 +1090,7 @@ def assert_list_contents_are_subset(self, superlist, sublist):
element in superlist.
"""
self.assertEqual(len(superlist), len(sublist))
for sup, sub in zip(superlist, sublist):
for sup, sub in zip(superlist, sublist, strict=True):
if isinstance(sub, dict):
self.assert_dict_is_subset(sup, sub)
continue
Expand Down
2 changes: 1 addition & 1 deletion test/asynchronous/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,7 @@ async def test_list_databases(self):
self.assertGreater(len(helper_docs), 0)
self.assertEqual(len(helper_docs), len(cmd_docs))
# PYTHON-3529 Some fields may change between calls, just compare names.
for helper_doc, cmd_doc in zip(helper_docs, cmd_docs):
for helper_doc, cmd_doc in zip(helper_docs, cmd_docs, strict=True):
self.assertIs(type(helper_doc), dict)
self.assertEqual(helper_doc.keys(), cmd_doc.keys())
client = await self.async_rs_or_single_client(document_class=SON)
Expand Down
2 changes: 1 addition & 1 deletion test/asynchronous/test_connection_monitoring.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def actual_events(self, ignore):
def check_events(self, events, ignore):
"""Check the events of a test."""
actual_events = self.actual_events(ignore)
for actual, expected in zip(actual_events, events):
for actual, expected in zip(actual_events, events, strict=False):
self.logs.append(f"Checking event actual: {actual!r} vs expected: {expected!r}")
self.check_event(actual, expected)

Expand Down
16 changes: 8 additions & 8 deletions test/asynchronous/test_cursor.py
Original file line number Diff line number Diff line change
Expand Up @@ -1037,38 +1037,38 @@ def test_getitem_slice_index(self):
self.assertRaises(IndexError, lambda: self.db.coll.find()[-1:])
self.assertRaises(IndexError, lambda: self.db.coll.find()[1:2:2])

for a, b in zip(count(0), self.db.coll.find()): # type: ignore[call-overload]
for a, b in zip(count(0), self.db.coll.find(), strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

self.assertEqual(100, len(list(self.db.coll.find()[0:]))) # type: ignore[call-overload]
for a, b in zip(count(0), self.db.coll.find()[0:]): # type: ignore[call-overload]
for a, b in zip(count(0), self.db.coll.find()[0:], strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

self.assertEqual(80, len(list(self.db.coll.find()[20:]))) # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[20:]): # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[20:], strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

for a, b in zip(count(99), self.db.coll.find()[99:]): # type: ignore[call-overload]
for a, b in zip(count(99), self.db.coll.find()[99:], strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

for _i in self.db.coll.find()[1000:]:
self.fail()

self.assertEqual(5, len(list(self.db.coll.find()[20:25]))) # type: ignore[call-overload]
self.assertEqual(5, len(list(self.db.coll.find()[20:25]))) # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[20:25]): # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[20:25], strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

self.assertEqual(80, len(list(self.db.coll.find()[40:45][20:]))) # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[40:45][20:]): # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[40:45][20:], strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

self.assertEqual(80, len(list(self.db.coll.find()[40:45].limit(0).skip(20)))) # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[40:45].limit(0).skip(20)): # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[40:45].limit(0).skip(20), strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

self.assertEqual(80, len(list(self.db.coll.find().limit(10).skip(40)[20:]))) # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find().limit(10).skip(40)[20:]): # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find().limit(10).skip(40)[20:], strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

self.assertEqual(1, len(list(self.db.coll.find()[:1]))) # type: ignore[call-overload]
Expand Down
8 changes: 6 additions & 2 deletions test/asynchronous/test_custom_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,9 @@ def _generate_multidocument_bson_stream(self):
@no_type_check
def test_decode_iter(self):
expected, bson_data = self._generate_multidocument_bson_stream()
for expected_doc, decoded_doc in zip(expected, decode_iter(bson_data, self.codecopts)):
for expected_doc, decoded_doc in zip(
expected, decode_iter(bson_data, self.codecopts), strict=True
):
self.assertEqual(expected_doc, decoded_doc)

@no_type_check
Expand All @@ -191,7 +193,9 @@ def test_decode_file_iter(self):
fileobj.write(bson_data)
fileobj.seek(0)

for expected_doc, decoded_doc in zip(expected, decode_file_iter(fileobj, self.codecopts)):
for expected_doc, decoded_doc in zip(
expected, decode_file_iter(fileobj, self.codecopts), strict=True
):
self.assertEqual(expected_doc, decoded_doc)

fileobj.close()
Expand Down
3 changes: 2 additions & 1 deletion test/asynchronous/test_encryption.py
Original file line number Diff line number Diff line change
Expand Up @@ -2908,7 +2908,7 @@ async def run_expression_find(
await self.encrypted_client.db.explicit_encryption.find(find_payload).to_list(),
key=lambda x: x["_id"],
)
for elem, expected in zip(sorted_find, expected_elems):
for elem, expected in zip(sorted_find, expected_elems, strict=True):
self.assertEqual(elem[f"encrypted{name}"], expected)

async def run_test_cases(self, name, range_opts, cast_func):
Expand Down Expand Up @@ -3313,6 +3313,7 @@ async def test_mixed_null_keyids(self):
for val, key in zip(
["123-45-6789", "11/22/1963", "My secret", "New Mexico, 87104"],
[field["keyId"] for field in ef["fields"]],
strict=True,
)
]
await coll.insert_one(
Expand Down
2 changes: 1 addition & 1 deletion test/asynchronous/test_heartbeat_monitoring.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ async def _check_with_socket(self, *args, **kwargs):
)

# zip gives us len(expected_results) pairs.
for expected, actual in zip(expected_results, listener.events):
for expected, actual in zip(expected_results, listener.events, strict=False):
self.assertEqual(expected, actual.__class__.__name__)
self.assertEqual(actual.connection_id, responses[0])
if expected != "ServerHeartbeatStartedEvent":
Expand Down
8 changes: 4 additions & 4 deletions test/asynchronous/test_monitoring.py
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ async def test_insert_many(self):
count = 0
operation_id = started[0].operation_id
self.assertIsInstance(operation_id, int)
for start, succeed in zip(started, succeeded):
for start, succeed in zip(started, succeeded, strict=True):
self.assertIsInstance(start, monitoring.CommandStartedEvent)
cmd = sanitize_cmd(start.command)
self.assertEqual(["insert", "ordered", "documents"], list(cmd.keys()))
Expand Down Expand Up @@ -875,7 +875,7 @@ async def test_insert_many_unacknowledged(self):
documents = []
operation_id = started[0].operation_id
self.assertIsInstance(operation_id, int)
for start, succeed in zip(started, succeeded):
for start, succeed in zip(started, succeeded, strict=True):
self.assertIsInstance(start, monitoring.CommandStartedEvent)
cmd = sanitize_cmd(start.command)
cmd.pop("writeConcern", None)
Expand Down Expand Up @@ -918,7 +918,7 @@ async def test_bulk_write(self):
succeeded = self.listener.succeeded_events
self.assertEqual(0, len(self.listener.failed_events))
operation_id = started[0].operation_id
pairs = list(zip(started, succeeded))
pairs = list(zip(started, succeeded, strict=True))
self.assertEqual(3, len(pairs))
for start, succeed in pairs:
self.assertIsInstance(start, monitoring.CommandStartedEvent)
Expand Down Expand Up @@ -1034,7 +1034,7 @@ async def test_write_errors(self):
succeeded = self.listener.succeeded_events
self.assertEqual(0, len(self.listener.failed_events))
operation_id = started[0].operation_id
pairs = list(zip(started, succeeded))
pairs = list(zip(started, succeeded, strict=True))
errors = []
for start, succeed in pairs:
self.assertIsInstance(start, monitoring.CommandStartedEvent)
Expand Down
2 changes: 1 addition & 1 deletion test/asynchronous/test_read_preferences.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ async def test_zero_latency(self):
# Generate unique ping times.
while len(ping_times) < len(self.client.nodes):
ping_times.add(random.random())
for ping_time, host in zip(ping_times, self.client.nodes):
for ping_time, host in zip(ping_times, self.client.nodes, strict=True):
ServerDescription._host_to_round_trip_time[host] = ping_time
try:
client = await connected(
Expand Down
6 changes: 4 additions & 2 deletions test/asynchronous/unified_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,9 @@ def process_error(self, exception, spec):
)
actual_write_concern_errors = exception.details.get("writeConcernErrors", [])
self.assertEqual(len(write_concern_errors), len(actual_write_concern_errors))
for expected_wce, actual_wce in zip(write_concern_errors, actual_write_concern_errors):
for expected_wce, actual_wce in zip(
write_concern_errors, actual_write_concern_errors, strict=True
):
# Use the spec's WriteConcernError field names.
formatted_actual_wce = {
"code": actual_wce.get("code", ""),
Expand Down Expand Up @@ -1466,7 +1468,7 @@ def format_logs(log_list):
len(actual_logs),
f"expected {client['messages']} but got {actual_logs}",
)
for expected_msg, actual_msg in zip(client["messages"], actual_logs):
for expected_msg, actual_msg in zip(client["messages"], actual_logs, strict=True):
expected_data, actual_data = expected_msg.pop("data"), actual_msg.pop("data")

if "failureIsRedacted" in expected_msg:
Expand Down
4 changes: 2 additions & 2 deletions test/test_bulk.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def assertEqualResponse(self, expected, actual):
% (len(expected_upserts), len(actual_upserts)),
)

for e, a in zip(expected_upserts, actual_upserts):
for e, a in zip(expected_upserts, actual_upserts, strict=True):
self.assertEqualUpsert(e, a)

elif key == "writeErrors":
Expand All @@ -76,7 +76,7 @@ def assertEqualResponse(self, expected, actual):
% (len(expected_errors), len(actual_errors)),
)

for e, a in zip(expected_errors, actual_errors):
for e, a in zip(expected_errors, actual_errors, strict=True):
self.assertEqualWriteError(e, a)

else:
Expand Down
2 changes: 1 addition & 1 deletion test/test_change_stream.py
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,7 @@ def assert_list_contents_are_subset(self, superlist, sublist):
element in superlist.
"""
self.assertEqual(len(superlist), len(sublist))
for sup, sub in zip(superlist, sublist):
for sup, sub in zip(superlist, sublist, strict=True):
if isinstance(sub, dict):
self.assert_dict_is_subset(sup, sub)
continue
Expand Down
2 changes: 1 addition & 1 deletion test/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -1287,7 +1287,7 @@ def test_list_databases(self):
self.assertGreater(len(helper_docs), 0)
self.assertEqual(len(helper_docs), len(cmd_docs))
# PYTHON-3529 Some fields may change between calls, just compare names.
for helper_doc, cmd_doc in zip(helper_docs, cmd_docs):
for helper_doc, cmd_doc in zip(helper_docs, cmd_docs, strict=True):
self.assertIs(type(helper_doc), dict)
self.assertEqual(helper_doc.keys(), cmd_doc.keys())
client = self.rs_or_single_client(document_class=SON)
Expand Down
2 changes: 1 addition & 1 deletion test/test_connection_monitoring.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def actual_events(self, ignore):
def check_events(self, events, ignore):
"""Check the events of a test."""
actual_events = self.actual_events(ignore)
for actual, expected in zip(actual_events, events):
for actual, expected in zip(actual_events, events, strict=False):
self.logs.append(f"Checking event actual: {actual!r} vs expected: {expected!r}")
self.check_event(actual, expected)

Expand Down
16 changes: 8 additions & 8 deletions test/test_cursor.py
Original file line number Diff line number Diff line change
Expand Up @@ -1030,38 +1030,38 @@ def test_getitem_slice_index(self):
self.assertRaises(IndexError, lambda: self.db.coll.find()[-1:])
self.assertRaises(IndexError, lambda: self.db.coll.find()[1:2:2])

for a, b in zip(count(0), self.db.coll.find()): # type: ignore[call-overload]
for a, b in zip(count(0), self.db.coll.find(), strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

self.assertEqual(100, len(list(self.db.coll.find()[0:]))) # type: ignore[call-overload]
for a, b in zip(count(0), self.db.coll.find()[0:]): # type: ignore[call-overload]
for a, b in zip(count(0), self.db.coll.find()[0:], strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

self.assertEqual(80, len(list(self.db.coll.find()[20:]))) # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[20:]): # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[20:], strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

for a, b in zip(count(99), self.db.coll.find()[99:]): # type: ignore[call-overload]
for a, b in zip(count(99), self.db.coll.find()[99:], strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

for _i in self.db.coll.find()[1000:]:
self.fail()

self.assertEqual(5, len(list(self.db.coll.find()[20:25]))) # type: ignore[call-overload]
self.assertEqual(5, len(list(self.db.coll.find()[20:25]))) # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[20:25]): # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[20:25], strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

self.assertEqual(80, len(list(self.db.coll.find()[40:45][20:]))) # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[40:45][20:]): # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[40:45][20:], strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

self.assertEqual(80, len(list(self.db.coll.find()[40:45].limit(0).skip(20)))) # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[40:45].limit(0).skip(20)): # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find()[40:45].limit(0).skip(20), strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

self.assertEqual(80, len(list(self.db.coll.find().limit(10).skip(40)[20:]))) # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find().limit(10).skip(40)[20:]): # type: ignore[call-overload]
for a, b in zip(count(20), self.db.coll.find().limit(10).skip(40)[20:], strict=False): # type: ignore[call-overload]
self.assertEqual(a, b["i"])

self.assertEqual(1, len(list(self.db.coll.find()[:1]))) # type: ignore[call-overload]
Expand Down
8 changes: 6 additions & 2 deletions test/test_custom_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,9 @@ def _generate_multidocument_bson_stream(self):
@no_type_check
def test_decode_iter(self):
expected, bson_data = self._generate_multidocument_bson_stream()
for expected_doc, decoded_doc in zip(expected, decode_iter(bson_data, self.codecopts)):
for expected_doc, decoded_doc in zip(
expected, decode_iter(bson_data, self.codecopts), strict=True
):
self.assertEqual(expected_doc, decoded_doc)

@no_type_check
Expand All @@ -191,7 +193,9 @@ def test_decode_file_iter(self):
fileobj.write(bson_data)
fileobj.seek(0)

for expected_doc, decoded_doc in zip(expected, decode_file_iter(fileobj, self.codecopts)):
for expected_doc, decoded_doc in zip(
expected, decode_file_iter(fileobj, self.codecopts), strict=True
):
self.assertEqual(expected_doc, decoded_doc)

fileobj.close()
Expand Down
3 changes: 2 additions & 1 deletion test/test_encryption.py
Original file line number Diff line number Diff line change
Expand Up @@ -2892,7 +2892,7 @@ def run_expression_find(
self.encrypted_client.db.explicit_encryption.find(find_payload).to_list(),
key=lambda x: x["_id"],
)
for elem, expected in zip(sorted_find, expected_elems):
for elem, expected in zip(sorted_find, expected_elems, strict=True):
self.assertEqual(elem[f"encrypted{name}"], expected)

def run_test_cases(self, name, range_opts, cast_func):
Expand Down Expand Up @@ -3295,6 +3295,7 @@ def test_mixed_null_keyids(self):
for val, key in zip(
["123-45-6789", "11/22/1963", "My secret", "New Mexico, 87104"],
[field["keyId"] for field in ef["fields"]],
strict=True,
)
]
coll.insert_one(
Expand Down
Loading
Loading