Merge branch 'master' into PYTHON-5814

Author: sleepyStick

test/asynchronous/test_encryption.py

@@ -2922,7 +2922,7 @@ async def encrypt_and_cast(i):
                 EncryptionError, "expected matching 'min' and value type. Got range option"
             ):
                 await self.client_encryption.encrypt(
-                    6 if cast_func is int else float(6),
+                    6 if cast_func is not int else float(6),
                     key_id=self.key1_id,
                     algorithm=Algorithm.RANGE,
                     contention_factor=0,

test/asynchronous/test_pooling.py

@@ -346,13 +346,13 @@ async def test_no_wait_queue_timeout(self):
         async with pool.checkout() as s1:
             t = SocketGetter(self.c, pool)
             await t.start()
-            while t.state != "get_socket":  # noqa: ASYNC110
+            while t.state != "get_socket":  # noqa: ASYNC110, RUF100
                 await asyncio.sleep(0.1)
 
             await asyncio.sleep(1)
             self.assertEqual(t.state, "get_socket")
 
-        while t.state != "connection":  # noqa: ASYNC110
+        while t.state != "connection":  # noqa: ASYNC110, RUF100
             await asyncio.sleep(0.1)
 
         self.assertEqual(t.state, "connection")
@@ -521,7 +521,7 @@ async def test_pool_backpressure_preserves_existing_connections(self):
         await coll.insert_many([{"x": 1} for _ in range(10)])
         t = SocketGetter(self.c, pool)
         await t.start()
-        while t.state != "connection":  # noqa: ASYNC110
+        while t.state != "connection":  # noqa: ASYNC110, RUF100
             await asyncio.sleep(0.1)
 
         assert not t.sock.conn_closed()

test/asynchronous/utils_spec_runner.py

@@ -160,7 +160,7 @@ async def _create_tests(self):
             dirname = os.path.split(dirpath)[-1]
 
             for filename in filenames:
-                with open(os.path.join(dirpath, filename)) as scenario_stream:  # noqa: ASYNC230
+                with open(os.path.join(dirpath, filename)) as scenario_stream:  # noqa: ASYNC230, RUF100
                     # Use tz_aware=False to match how CodecOptions decodes
                     # dates.
                     opts = json_util.JSONOptions(tz_aware=False)

test/handshake/unified/opmsg-not-supported.json

@@ -1275,6 +1275,18 @@ def test_binary_length_accounts_for_header(self):
         with self.assertRaises(InvalidBSON):
             decode(payload)
 
+    def test_large_list_encoding(self):
+        # gen_list_name yields pre-cached names for indices 0-999 then
+        # generates on the fly for 1000+. Encode a list that crosses that
+        # boundary and verify the round-trip is correct.
+        values = list(range(1002))
+        decoded = decode(encode({"a": values}))
+        self.assertEqual(decoded["a"], values)
+        # Spot-check elements on both sides of the cache/on-demand boundary.
+        self.assertEqual(decoded["a"][999], 999)
+        self.assertEqual(decoded["a"][1000], 1000)
+        self.assertEqual(decoded["a"][1001], 1001)
+
 
 class TestCodecOptions(unittest.TestCase):
     def test_document_class(self):
@@ -1746,6 +1758,40 @@ def test_array_of_documents_to_buffer(self):
         with self.assertRaises(InvalidBSON):
             _array_of_documents_to_buffer(buf)
 
+    def test_datetime_ms_hash(self):
+        # Equal values must have equal hashes.
+        self.assertEqual(hash(DatetimeMS(0)), hash(DatetimeMS(0)))
+        self.assertEqual(hash(DatetimeMS(-1)), hash(DatetimeMS(-1)))
+        self.assertEqual(hash(DatetimeMS(2**62)), hash(DatetimeMS(2**62)))
+        # Usable as a dict key.
+        d = {DatetimeMS(0): "epoch", DatetimeMS(1): "one"}
+        self.assertEqual(d[DatetimeMS(0)], "epoch")
+        self.assertEqual(d[DatetimeMS(1)], "one")
+        # Usable in a set.
+        s = {DatetimeMS(0), DatetimeMS(1), DatetimeMS(0)}
+        self.assertEqual(len(s), 2)
+
+    def test_datetime_ms_repr(self):
+        self.assertEqual(repr(DatetimeMS(0)), "DatetimeMS(0)")
+        self.assertEqual(repr(DatetimeMS(-1)), "DatetimeMS(-1)")
+        self.assertEqual(repr(DatetimeMS(2**62)), f"DatetimeMS({2**62})")
+        # repr round-trips through eval.
+        for value in (0, 1, -1, 2**32):
+            obj = DatetimeMS(value)
+            self.assertEqual(eval(repr(obj)), obj)
+
+    def test_datetime_ms_invalid_type(self):
+        # Non-int, non-datetime arguments must raise TypeError.
+        for bad in ("2024-01-01", 3.14, [], None, b"bytes"):
+            with self.assertRaises(TypeError):
+                DatetimeMS(bad)  # type: ignore[arg-type]
+        # Out-of-range int must raise OverflowError directly, not only
+        # when encoding.
+        with self.assertRaises(OverflowError):
+            DatetimeMS(2**63)
+        with self.assertRaises(OverflowError):
+            DatetimeMS(-(2**63) - 1)
+
 
 class TestLongLongToString(unittest.TestCase):
     def test_long_long_to_string(self):

test/test_bson.py

@@ -193,7 +193,7 @@ def test_doesnt_update_established_connections(self):
         )
 
         # send initial metadata
-        name, version, platform, _ = self.send_ping_and_get_metadata(client, True)
+        name, version, platform, _metadata = self.send_ping_and_get_metadata(client, True)
         self.assertIsNotNone(name)
         self.assertIsNotNone(version)
         self.assertIsNotNone(platform)

test/test_client_metadata.py

@@ -346,13 +346,13 @@ def test_no_wait_queue_timeout(self):
         with pool.checkout() as s1:
             t = SocketGetter(self.c, pool)
             t.start()
-            while t.state != "get_socket":
+            while t.state != "get_socket":  # noqa: ASYNC110, RUF100
                 time.sleep(0.1)
 
             time.sleep(1)
             self.assertEqual(t.state, "get_socket")
 
-        while t.state != "connection":
+        while t.state != "connection":  # noqa: ASYNC110, RUF100
             time.sleep(0.1)
 
         self.assertEqual(t.state, "connection")
@@ -519,7 +519,7 @@ def test_pool_backpressure_preserves_existing_connections(self):
         coll.insert_many([{"x": 1} for _ in range(10)])
         t = SocketGetter(self.c, pool)
         t.start()
-        while t.state != "connection":
+        while t.state != "connection":  # noqa: ASYNC110, RUF100
             time.sleep(0.1)
 
         assert not t.sock.conn_closed()

test/test_pooling.py

@@ -160,7 +160,7 @@ def _create_tests(self):
             dirname = os.path.split(dirpath)[-1]
 
             for filename in filenames:
-                with open(os.path.join(dirpath, filename)) as scenario_stream:  # noqa: RUF100
+                with open(os.path.join(dirpath, filename)) as scenario_stream:  # noqa: ASYNC230, RUF100
                     # Use tz_aware=False to match how CodecOptions decodes
                     # dates.
                     opts = json_util.JSONOptions(tz_aware=False)

test/utils_spec_runner.py

@@ -171,22 +171,14 @@
 if not Path.exists(Path(_gridfs_dest_base)):
     Path.mkdir(Path(_gridfs_dest_base))
 
-async_files = [
-    _pymongo_base + str(f)
-    for f in Path.iterdir(Path(_pymongo_base))
-    if (Path(_pymongo_base) / f).is_file()
-]
+async_files = [_pymongo_base + f.name for f in Path(_pymongo_base).iterdir() if f.is_file()]
 
-gridfs_files = [
-    _gridfs_base + str(f)
-    for f in Path.iterdir(Path(_gridfs_base))
-    if (Path(_gridfs_base) / f).is_file()
-]
+gridfs_files = [_gridfs_base + f.name for f in Path(_gridfs_base).iterdir() if f.is_file()]
 
 
 def async_only_test(f: Path) -> bool:
     """Return True for async tests that should not be converted to sync."""
-    return str(f) in [
+    return f.name in [
         "test_locks.py",
         "test_concurrency.py",
         "test_async_cancellation.py",
@@ -197,9 +189,9 @@ def async_only_test(f: Path) -> bool:
 
 
 test_files = [
-    _test_base + str(f)
-    for f in Path.iterdir(Path(_test_base))
-    if (Path(_test_base) / f).is_file() and not async_only_test(f)
+    _test_base + f.name
+    for f in Path(_test_base).iterdir()
+    if f.is_file() and not async_only_test(f)
 ]
 
 # Add each asynchronized test here as part of the converting PR
@@ -453,15 +445,11 @@ def main() -> None:
     unasync_directory(test_files, _test_base, _test_dest_base, replacements)
 
     sync_files = [
-        _pymongo_dest_base + str(f)
-        for f in Path.iterdir(Path(_pymongo_dest_base))
-        if (Path(_pymongo_dest_base) / f).is_file()
+        _pymongo_dest_base + f.name for f in Path(_pymongo_dest_base).iterdir() if f.is_file()
     ]
 
     sync_gridfs_files = [
-        _gridfs_dest_base + str(f)
-        for f in Path.iterdir(Path(_gridfs_dest_base))
-        if (Path(_gridfs_dest_base) / f).is_file()
+        _gridfs_dest_base + f.name for f in Path(_gridfs_dest_base).iterdir() if f.is_file()
     ]
     sync_test_files = [
         _test_dest_base + f for f in converted_tests if (Path(_test_dest_base) / f).is_file()