mongodb/mongo-python-driver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:mongodb/mongo-python-driver

Browse Source
This commit is contained in:
Steven Silvester 2024-09-19 03:42:29 -05:00
commit 16031223de
No known key found for this signature in database
GPG Key ID: B1BF5EC3A8B32F91
34 changed files with 188 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/api/pymongo/asynchronous/change_stream.rst
View File

@ -1,5 +1,10 @@
:mod:`change_stream` -- Watch changes on a collection, database, or cluster
===========================================================================
.. warning:: This API is currently in beta, meaning the classes, methods,
and behaviors described within may change before the full release.
If you come across any bugs during your use of this API,
please file a Jira ticket in the "Python Driver" project at https://jira.mongodb.org/browse/PYTHON.
.. automodule:: pymongo.asynchronous.change_stream
:members:

5
doc/api/pymongo/asynchronous/client_session.rst
View File

@ -1,5 +1,10 @@
:mod:`client_session` -- Logical sessions for sequential operations
===================================================================
.. warning:: This API is currently in beta, meaning the classes, methods,
and behaviors described within may change before the full release.
If you come across any bugs during your use of this API,
please file a Jira ticket in the "Python Driver" project at https://jira.mongodb.org/browse/PYTHON.
.. automodule:: pymongo.asynchronous.client_session
:members:

5
doc/api/pymongo/asynchronous/collection.rst
View File

@ -1,6 +1,11 @@
:mod:`collection` -- Collection level operations
================================================
.. warning:: This API is currently in beta, meaning the classes, methods,
and behaviors described within may change before the full release.
If you come across any bugs during your use of this API,
please file a Jira ticket in the "Python Driver" project at https://jira.mongodb.org/browse/PYTHON.
.. automodule:: pymongo.asynchronous.collection
:synopsis: Collection level operations

5
doc/api/pymongo/asynchronous/command_cursor.rst
View File

@ -1,6 +1,11 @@
:mod:`command_cursor` -- Tools for iterating over MongoDB command results
=========================================================================
.. warning:: This API is currently in beta, meaning the classes, methods,
and behaviors described within may change before the full release.
If you come across any bugs during your use of this API,
please file a Jira ticket in the "Python Driver" project at https://jira.mongodb.org/browse/PYTHON.
.. automodule:: pymongo.asynchronous.command_cursor
:synopsis: Tools for iterating over MongoDB command results
:members:

5
doc/api/pymongo/asynchronous/cursor.rst
View File

@ -1,6 +1,11 @@
:mod:`cursor` -- Tools for iterating over MongoDB query results
===============================================================
.. warning:: This API is currently in beta, meaning the classes, methods,
and behaviors described within may change before the full release.
If you come across any bugs during your use of this API,
please file a Jira ticket in the "Python Driver" project at https://jira.mongodb.org/browse/PYTHON.
.. automodule:: pymongo.asynchronous.cursor
:synopsis: Tools for iterating over MongoDB query results

5
doc/api/pymongo/asynchronous/database.rst
View File

@ -1,6 +1,11 @@
:mod:`database` -- Database level operations
============================================
.. warning:: This API is currently in beta, meaning the classes, methods,
and behaviors described within may change before the full release.
If you come across any bugs during your use of this API,
please file a Jira ticket in the "Python Driver" project at https://jira.mongodb.org/browse/PYTHON.
.. automodule:: pymongo.asynchronous.database
:synopsis: Database level operations

5
doc/api/pymongo/asynchronous/index.rst
View File

@ -1,6 +1,11 @@
:mod:`pymongo async` -- Async Python driver for MongoDB
=======================================================
.. warning:: This API is currently in beta, meaning the classes, methods,
and behaviors described within may change before the full release.
If you come across any bugs during your use of this API,
please file a Jira ticket in the "Python Driver" project at https://jira.mongodb.org/browse/PYTHON.
.. automodule:: pymongo.asynchronous
:synopsis: Asynchronous Python driver for MongoDB

5
doc/api/pymongo/asynchronous/mongo_client.rst
View File

@ -1,6 +1,11 @@
:mod:`mongo_client` -- Tools for connecting to MongoDB
======================================================
.. warning:: This API is currently in beta, meaning the classes, methods,
and behaviors described within may change before the full release.
If you come across any bugs during your use of this API,
please file a Jira ticket in the "Python Driver" project at https://jira.mongodb.org/browse/PYTHON.
.. automodule:: pymongo.asynchronous.mongo_client
:synopsis: Tools for connecting to MongoDB

9
doc/changelog.rst
View File

@ -7,11 +7,18 @@ Changes in Version 4.9.0
.. warning:: Driver support for MongoDB 3.6 reached end of life in April 2024.
PyMongo 4.9 will be the last release to support MongoDB 3.6.
.. warning:: PyMongo 4.9 refactors a large portion of internal APIs to support the new asynchronous API beta.
As a result, versions of Motor older than 3.6 are not compatible with PyMongo 4.9.
Existing users of these versions must either upgrade to Motor 3.6 and PyMongo 4.9,
or cap their PyMongo version to ``< 4.9``.
Any applications that use private APIs may also break as a result of these internal changes.
PyMongo 4.9 brings a number of improvements including:
- Added support for MongoDB 8.0.
- Added support for Python 3.13.
- A new asynchronous API with full asyncio support.
- A new beta asynchronous API with full asyncio support.
This new asynchronous API is a work-in-progress that may change during the beta period before the full release.
- Added support for In-Use Encryption range queries with MongoDB 8.0.
Added :attr:`~pymongo.encryption.Algorithm.RANGE`.
``sparsity`` and ``trim_factor`` are now optional in :class:`~pymongo.encryption_options.RangeOpts`.

2
pymongo/_version.py
View File

@ -18,7 +18,7 @@ from __future__ import annotations
import re
from typing import List, Tuple, Union
__version__ = "4.9.0.dev0"
__version__ = "4.10.0.dev0"
def get_version_tuple(version: str) -> Tuple[Union[int, str], ...]:

4
pymongo/asynchronous/bulk.py
View File

@ -313,8 +313,6 @@ class _AsyncBulk:
if isinstance(exc, (NotPrimaryError, OperationFailure)):
await client._process_response(exc.details, bwc.session) # type: ignore[arg-type]
raise
finally:
bwc.start_time = datetime.datetime.now()
return reply # type: ignore[return-value]
async def unack_write(
@ -403,8 +401,6 @@ class _AsyncBulk:
assert bwc.start_time is not None
bwc._fail(request_id, failure, duration)
raise
finally:
bwc.start_time = datetime.datetime.now()
return result # type: ignore[return-value]
async def _execute_batch_unack(

6
pymongo/asynchronous/client_bulk.py
View File

@ -319,8 +319,6 @@ class _AsyncClientBulk:
await self.client._process_response(exc.details, bwc.session) # type: ignore[arg-type]
else:
await self.client._process_response({}, bwc.session) # type: ignore[arg-type]
finally:
bwc.start_time = datetime.datetime.now()
return reply # type: ignore[return-value]
async def unack_write(
@ -410,9 +408,7 @@ class _AsyncClientBulk:
bwc._fail(request_id, failure, duration)
# Top-level error will be embedded in ClientBulkWriteException.
reply = {"error": exc}
finally:
bwc.start_time = datetime.datetime.now()
return result # type: ignore[return-value]
return reply
async def _execute_batch_unack(
self,

2
pymongo/asynchronous/mongo_client.py
View File

@ -177,6 +177,8 @@ class AsyncMongoClient(common.BaseObject, Generic[_DocumentType]):
For more details, see the relevant section of the PyMongo 4.x migration guide:
:ref:`pymongo4-migration-direct-connection`.
.. warning:: This API is currently in beta, meaning the classes, methods, and behaviors described within may change before the full release.
The client object is thread-safe and has connection-pooling built in.
If an operation fails because of a network error,
:class:`~pymongo.errors.ConnectionFailure` is raised and the client

104
pymongo/network_layer.py
View File

@ -64,65 +64,69 @@ async def async_sendall(sock: Union[socket.socket, _sslConn], buf: bytes) -> Non
loop = asyncio.get_event_loop()
try:
if _HAVE_SSL and isinstance(sock, (SSLSocket, _sslConn)):
if sys.platform == "win32":
await asyncio.wait_for(_async_sendall_ssl_windows(sock, buf), timeout=timeout)
else:
await asyncio.wait_for(_async_sendall_ssl(sock, buf, loop), timeout=timeout)
await asyncio.wait_for(_async_sendall_ssl(sock, buf, loop), timeout=timeout)
else:
await asyncio.wait_for(loop.sock_sendall(sock, buf), timeout=timeout) # type: ignore[arg-type]
except asyncio.TimeoutError as exc:
# Convert the asyncio.wait_for timeout error to socket.timeout which pool.py understands.
raise socket.timeout("timed out") from exc
finally:
sock.settimeout(timeout)
async def _async_sendall_ssl(
sock: Union[socket.socket, _sslConn], buf: bytes, loop: AbstractEventLoop
) -> None:
view = memoryview(buf)
fd = sock.fileno()
sent = 0
if sys.platform != "win32":
def _is_ready(fut: Future) -> None:
loop.remove_writer(fd)
loop.remove_reader(fd)
if fut.done():
return
fut.set_result(None)
async def _async_sendall_ssl(
sock: Union[socket.socket, _sslConn], buf: bytes, loop: AbstractEventLoop
) -> None:
view = memoryview(buf)
fd = sock.fileno()
sent = 0
while sent < len(buf):
try:
sent += sock.send(view[sent:])
except BLOCKING_IO_ERRORS as exc:
fd = sock.fileno()
# Check for closed socket.
if fd == -1:
raise SSLError("Underlying socket has been closed") from None
if isinstance(exc, BLOCKING_IO_READ_ERROR):
fut = loop.create_future()
loop.add_reader(fd, _is_ready, fut)
await fut
if isinstance(exc, BLOCKING_IO_WRITE_ERROR):
fut = loop.create_future()
loop.add_writer(fd, _is_ready, fut)
await fut
if _HAVE_PYOPENSSL and isinstance(exc, BLOCKING_IO_LOOKUP_ERROR):
fut = loop.create_future()
loop.add_reader(fd, _is_ready, fut)
loop.add_writer(fd, _is_ready, fut)
await fut
def _is_ready(fut: Future) -> None:
loop.remove_writer(fd)
loop.remove_reader(fd)
if fut.done():
return
fut.set_result(None)
# The default Windows asyncio event loop does not support loop.add_reader/add_writer: https://docs.python.org/3/library/asyncio-platforms.html#asyncio-platform-support
async def _async_sendall_ssl_windows(sock: Union[socket.socket, _sslConn], buf: bytes) -> None:
view = memoryview(buf)
total_length = len(buf)
total_sent = 0
while total_sent < total_length:
try:
sent = sock.send(view[total_sent:])
except BLOCKING_IO_ERRORS:
await asyncio.sleep(0.5)
sent = 0
total_sent += sent
while sent < len(buf):
try:
sent += sock.send(view[sent:])
except BLOCKING_IO_ERRORS as exc:
fd = sock.fileno()
# Check for closed socket.
if fd == -1:
raise SSLError("Underlying socket has been closed") from None
if isinstance(exc, BLOCKING_IO_READ_ERROR):
fut = loop.create_future()
loop.add_reader(fd, _is_ready, fut)
await fut
if isinstance(exc, BLOCKING_IO_WRITE_ERROR):
fut = loop.create_future()
loop.add_writer(fd, _is_ready, fut)
await fut
if _HAVE_PYOPENSSL and isinstance(exc, BLOCKING_IO_LOOKUP_ERROR):
fut = loop.create_future()
loop.add_reader(fd, _is_ready, fut)
loop.add_writer(fd, _is_ready, fut)
await fut
else:
# The default Windows asyncio event loop does not support loop.add_reader/add_writer:
# https://docs.python.org/3/library/asyncio-platforms.html#asyncio-platform-support
async def _async_sendall_ssl(
sock: Union[socket.socket, _sslConn], buf: bytes, dummy: AbstractEventLoop
) -> None:
view = memoryview(buf)
total_length = len(buf)
total_sent = 0
while total_sent < total_length:
try:
sent = sock.send(view[total_sent:])
except BLOCKING_IO_ERRORS:
await asyncio.sleep(0.5)
sent = 0
total_sent += sent
def sendall(sock: Union[socket.socket, _sslConn], buf: bytes) -> None:

4
pymongo/synchronous/bulk.py
View File

@ -313,8 +313,6 @@ class _Bulk:
if isinstance(exc, (NotPrimaryError, OperationFailure)):
client._process_response(exc.details, bwc.session) # type: ignore[arg-type]
raise
finally:
bwc.start_time = datetime.datetime.now()
return reply # type: ignore[return-value]
def unack_write(
@ -403,8 +401,6 @@ class _Bulk:
assert bwc.start_time is not None
bwc._fail(request_id, failure, duration)
raise
finally:
bwc.start_time = datetime.datetime.now()
return result # type: ignore[return-value]
def _execute_batch_unack(

6
pymongo/synchronous/client_bulk.py
View File

@ -319,8 +319,6 @@ class _ClientBulk:
self.client._process_response(exc.details, bwc.session) # type: ignore[arg-type]
else:
self.client._process_response({}, bwc.session) # type: ignore[arg-type]
finally:
bwc.start_time = datetime.datetime.now()
return reply # type: ignore[return-value]
def unack_write(
@ -410,9 +408,7 @@ class _ClientBulk:
bwc._fail(request_id, failure, duration)
# Top-level error will be embedded in ClientBulkWriteException.
reply = {"error": exc}
finally:
bwc.start_time = datetime.datetime.now()
return result # type: ignore[return-value]
return reply
def _execute_batch_unack(
self,

1
test/asynchronous/test_encryption.py
View File

@ -380,6 +380,7 @@ class TestClientSimple(AsyncEncryptionIntegrationTest):
is_greenthread_patched(),
"gevent and eventlet do not support POSIX-style forking.",
)
@unittest.skipIf("PyPy" in sys.version, "PYTHON-4738 fails often on PyPy")
@async_client_context.require_sync
async def test_fork(self):
opts = AutoEncryptionOpts(KMS_PROVIDERS, "keyvault.datakeys")

34
test/atlas/test_connection.py
View File

@ -19,6 +19,7 @@ import os
import sys
import unittest
from collections import defaultdict
from test import PyMongoTestCase
import pytest
@ -46,38 +47,37 @@ URIS = {
}
def connect(uri):
if not uri:
raise Exception("Must set env variable to test.")
client = pymongo.MongoClient(uri)
# No TLS error
client.admin.command("ping")
# No auth error
client.test.test.count_documents({})
class TestAtlasConnect(PyMongoTestCase):
def connect(self, uri):
if not uri:
raise Exception("Must set env variable to test.")
client = self.simple_client(uri)
# No TLS error
client.admin.command("ping")
# No auth error
client.test.test.count_documents({})
class TestAtlasConnect(unittest.TestCase):
@unittest.skipUnless(HAS_SNI, "Free tier requires SNI support")
def test_free_tier(self):
connect(URIS["ATLAS_FREE"])
self.connect(URIS["ATLAS_FREE"])
def test_replica_set(self):
connect(URIS["ATLAS_REPL"])
self.connect(URIS["ATLAS_REPL"])
def test_sharded_cluster(self):
connect(URIS["ATLAS_SHRD"])
self.connect(URIS["ATLAS_SHRD"])
def test_tls_11(self):
connect(URIS["ATLAS_TLS11"])
self.connect(URIS["ATLAS_TLS11"])
def test_tls_12(self):
connect(URIS["ATLAS_TLS12"])
self.connect(URIS["ATLAS_TLS12"])
def test_serverless(self):
connect(URIS["ATLAS_SERVERLESS"])
self.connect(URIS["ATLAS_SERVERLESS"])
def connect_srv(self, uri):
connect(uri)
self.connect(uri)
self.assertIn("mongodb+srv://", uri)
@unittest.skipUnless(HAS_SNI, "Free tier requires SNI support")

7
test/mockupdb/test_auth_recovering_member.py
View File

@ -14,6 +14,7 @@
from __future__ import annotations
import unittest
from test import PyMongoTestCase
import pytest
@ -30,7 +31,7 @@ from pymongo.errors import ServerSelectionTimeoutError
pytestmark = pytest.mark.mockupdb
class TestAuthRecoveringMember(unittest.TestCase):
class TestAuthRecoveringMember(PyMongoTestCase):
def test_auth_recovering_member(self):
# Test that we don't attempt auth against a recovering RS member.
server = MockupDB()
@ -48,12 +49,10 @@ class TestAuthRecoveringMember(unittest.TestCase):
server.run()
self.addCleanup(server.stop)
client = MongoClient(
client = self.simple_client(
server.uri, replicaSet="rs", serverSelectionTimeoutMS=100, socketTimeoutMS=100
)
self.addCleanup(client.close)
# Should see there's no primary or secondary and raise selection timeout
# error. If it raises AutoReconnect we know it actually tried the
# server, and that's wrong.

9
test/mockupdb/test_cluster_time.py
View File

@ -16,6 +16,7 @@
from __future__ import annotations
import unittest
from test import PyMongoTestCase
import pytest
@ -34,7 +35,7 @@ from pymongo.errors import OperationFailure
pytestmark = pytest.mark.mockupdb
class TestClusterTime(unittest.TestCase):
class TestClusterTime(PyMongoTestCase):
def cluster_time_conversation(self, callback, replies, max_wire_version=6):
cluster_time = Timestamp(0, 0)
server = MockupDB()
@ -52,8 +53,7 @@ class TestClusterTime(unittest.TestCase):
server.run()
self.addCleanup(server.stop)
client = MongoClient(server.uri)
self.addCleanup(client.close)
client = self.simple_client(server.uri)
with going(callback, client):
for reply in replies:
@ -118,8 +118,7 @@ class TestClusterTime(unittest.TestCase):
server.run()
self.addCleanup(server.stop)
client = MongoClient(server.uri, heartbeatFrequencyMS=500)
self.addCleanup(client.close)
client = self.simple_client(server.uri, heartbeatFrequencyMS=500)
request = server.receives("ismaster")
# No $clusterTime in first ismaster, only in subsequent ones

9
test/mockupdb/test_cursor_namespace.py
View File

@ -16,6 +16,7 @@
from __future__ import annotations
import unittest
from test import PyMongoTestCase
import pytest
@ -32,7 +33,7 @@ from pymongo import MongoClient
pytestmark = pytest.mark.mockupdb
class TestCursorNamespace(unittest.TestCase):
class TestCursorNamespace(PyMongoTestCase):
server: MockupDB
client: MongoClient
@ -40,7 +41,7 @@ class TestCursorNamespace(unittest.TestCase):
def setUpClass(cls):
cls.server = MockupDB(auto_ismaster={"maxWireVersion": 6})
cls.server.run()
cls.client = MongoClient(cls.server.uri)
cls.client = cls.unmanaged_simple_client(cls.server.uri)
@classmethod
def tearDownClass(cls):
@ -88,7 +89,7 @@ class TestCursorNamespace(unittest.TestCase):
self._test_cursor_namespace(op, "listIndexes")
class TestKillCursorsNamespace(unittest.TestCase):
class TestKillCursorsNamespace(PyMongoTestCase):
server: MockupDB
client: MongoClient
@ -96,7 +97,7 @@ class TestKillCursorsNamespace(unittest.TestCase):
def setUpClass(cls):
cls.server = MockupDB(auto_ismaster={"maxWireVersion": 6})
cls.server.run()
cls.client = MongoClient(cls.server.uri)
cls.client = cls.unmanaged_simple_client(cls.server.uri)
@classmethod
def tearDownClass(cls):

6
test/mockupdb/test_getmore_sharded.py
View File

@ -17,6 +17,7 @@ from __future__ import annotations
import unittest
from queue import Queue
from test import PyMongoTestCase
import pytest
@ -33,7 +34,7 @@ from pymongo import MongoClient
pytestmark = pytest.mark.mockupdb
class TestGetmoreSharded(unittest.TestCase):
class TestGetmoreSharded(PyMongoTestCase):
def test_getmore_sharded(self):
servers = [MockupDB(), MockupDB()]
@ -47,11 +48,10 @@ class TestGetmoreSharded(unittest.TestCase):
server.run()
self.addCleanup(server.stop)
client = MongoClient(
client = self.simple_client(
"mongodb://%s:%d,%s:%d"
% (servers[0].host, servers[0].port, servers[1].host, servers[1].port)
)
self.addCleanup(client.close)
collection = client.db.collection
cursor = collection.find()
with going(next, cursor):

6
test/mockupdb/test_initial_ismaster.py
View File

@ -15,6 +15,7 @@ from __future__ import annotations
import time
import unittest
from test import PyMongoTestCase
import pytest
@ -31,15 +32,14 @@ from pymongo import MongoClient
pytestmark = pytest.mark.mockupdb
class TestInitialIsMaster(unittest.TestCase):
class TestInitialIsMaster(PyMongoTestCase):
def test_initial_ismaster(self):
server = MockupDB()
server.run()
self.addCleanup(server.stop)
start = time.time()
client = MongoClient(server.uri)
self.addCleanup(client.close)
client = self.simple_client(server.uri)
# A single ismaster is enough for the client to be connected.
self.assertFalse(client.nodes)

7
test/mockupdb/test_list_indexes.py
View File

@ -16,6 +16,7 @@
from __future__ import annotations
import unittest
from test import PyMongoTestCase
import pytest
@ -28,18 +29,16 @@ except ImportError:
from bson import SON
from pymongo import MongoClient
pytestmark = pytest.mark.mockupdb
class TestListIndexes(unittest.TestCase):
class TestListIndexes(PyMongoTestCase):
def test_list_indexes_command(self):
server = MockupDB(auto_ismaster={"maxWireVersion": 6})
server.run()
self.addCleanup(server.stop)
client = MongoClient(server.uri)
self.addCleanup(client.close)
client = self.simple_client(server.uri)
with going(client.test.collection.list_indexes) as cursor:
request = server.receives(listIndexes="collection", namespace="test")
request.reply({"cursor": {"firstBatch": [{"name": "index_0"}], "id": 123}})

9
test/mockupdb/test_max_staleness.py
View File

@ -14,6 +14,7 @@
from __future__ import annotations
import unittest
from test import PyMongoTestCase
import pytest
@ -30,7 +31,7 @@ from pymongo import MongoClient
pytestmark = pytest.mark.mockupdb
class TestMaxStalenessMongos(unittest.TestCase):
class TestMaxStalenessMongos(PyMongoTestCase):
def test_mongos(self):
mongos = MockupDB()
mongos.autoresponds("ismaster", maxWireVersion=6, ismaster=True, msg="isdbgrid")
@ -40,8 +41,7 @@ class TestMaxStalenessMongos(unittest.TestCase):
# No maxStalenessSeconds.
uri = "mongodb://localhost:%d/?readPreference=secondary" % mongos.port
client = MongoClient(uri)
self.addCleanup(client.close)
client = self.simple_client(uri)
with going(client.db.coll.find_one) as future:
request = mongos.receives()
self.assertNotIn("maxStalenessSeconds", request.doc["$readPreference"])
@ -60,8 +60,7 @@ class TestMaxStalenessMongos(unittest.TestCase):
"&maxStalenessSeconds=1" % mongos.port
)
client = MongoClient(uri)
self.addCleanup(client.close)
client = self.simple_client(uri)
with going(client.db.coll.find_one) as future:
request = mongos.receives()
self.assertEqual(1, request.doc["$readPreference"]["maxStalenessSeconds"])

5
test/mockupdb/test_mixed_version_sharded.py
View File

@ -18,6 +18,7 @@ from __future__ import annotations
import time
import unittest
from queue import Queue
from test import PyMongoTestCase
import pytest
@ -35,7 +36,7 @@ from pymongo import MongoClient
pytestmark = pytest.mark.mockupdb
class TestMixedVersionSharded(unittest.TestCase):
class TestMixedVersionSharded(PyMongoTestCase):
def setup_server(self, upgrade):
self.mongos_old, self.mongos_new = MockupDB(), MockupDB()
@ -62,7 +63,7 @@ class TestMixedVersionSharded(unittest.TestCase):
self.mongos_new.address_string,
)
self.client = MongoClient(self.mongoses_uri)
self.client = self.simple_client(self.mongoses_uri)
def tearDown(self):
if hasattr(self, "client") and self.client:

5
test/mockupdb/test_op_msg.py
View File

@ -15,6 +15,7 @@ from __future__ import annotations
import unittest
from collections import namedtuple
from test import PyMongoTestCase
import pytest
@ -273,7 +274,7 @@ else:
operations_312 = []
class TestOpMsg(unittest.TestCase):
class TestOpMsg(PyMongoTestCase):
server: MockupDB
client: MongoClient
@ -281,7 +282,7 @@ class TestOpMsg(unittest.TestCase):
def setUpClass(cls):
cls.server = MockupDB(auto_ismaster=True, max_wire_version=8)
cls.server.run()
cls.client = MongoClient(cls.server.uri)
cls.client = cls.unmanaged_simple_client(cls.server.uri)
@classmethod
def tearDownClass(cls):

11
test/mockupdb/test_op_msg_read_preference.py
View File

@ -16,6 +16,7 @@ from __future__ import annotations
import copy
import itertools
import unittest
from test import PyMongoTestCase
from typing import Any
import pytest
@ -39,7 +40,7 @@ from pymongo.read_preferences import (
pytestmark = pytest.mark.mockupdb
class OpMsgReadPrefBase(unittest.TestCase):
class OpMsgReadPrefBase(PyMongoTestCase):
single_mongod = False
primary: MockupDB
secondary: MockupDB
@ -53,8 +54,7 @@ class OpMsgReadPrefBase(unittest.TestCase):
setattr(cls, test_name, test)
def setup_client(self, read_preference):
client = MongoClient(self.primary.uri, read_preference=read_preference)
self.addCleanup(client.close)
client = self.simple_client(self.primary.uri, read_preference=read_preference)
return client
@ -115,12 +115,13 @@ class TestOpMsgReplicaSet(OpMsgReadPrefBase):
setattr(cls, test_name, test)
def setup_client(self, read_preference):
client = MongoClient(self.primary.uri, replicaSet="rs", read_preference=read_preference)
client = self.simple_client(
self.primary.uri, replicaSet="rs", read_preference=read_preference
)
# Run a command on a secondary to discover the topology. This ensures
# that secondaryPreferred commands will select the secondary.
client.admin.command("ismaster", read_preference=ReadPreference.SECONDARY)
self.addCleanup(client.close)
return client

6
test/mockupdb/test_query_read_pref_sharded.py
View File

@ -16,6 +16,7 @@
from __future__ import annotations
import unittest
from test import PyMongoTestCase
import pytest
@ -40,7 +41,7 @@ from pymongo.read_preferences import (
pytestmark = pytest.mark.mockupdb
class TestQueryAndReadModeSharded(unittest.TestCase):
class TestQueryAndReadModeSharded(PyMongoTestCase):
def test_query_and_read_mode_sharded_op_msg(self):
"""Test OP_MSG sends non-primary $readPreference and never $query."""
server = MockupDB()
@ -50,8 +51,7 @@ class TestQueryAndReadModeSharded(unittest.TestCase):
server.run()
self.addCleanup(server.stop)
client = MongoClient(server.uri)
self.addCleanup(client.close)
client = self.simple_client(server.uri)
read_prefs = (
Primary(),

5
test/mockupdb/test_reset_and_request_check.py
View File

@ -16,6 +16,7 @@ from __future__ import annotations
import itertools
import time
import unittest
from test import PyMongoTestCase
import pytest
@ -37,7 +38,7 @@ from pymongo.server_type import SERVER_TYPE
pytestmark = pytest.mark.mockupdb
class TestResetAndRequestCheck(unittest.TestCase):
class TestResetAndRequestCheck(PyMongoTestCase):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.ismaster_time = 0.0
@ -58,7 +59,7 @@ class TestResetAndRequestCheck(unittest.TestCase):
kwargs = {"socketTimeoutMS": 100}
# Disable retryable reads when pymongo supports it.
kwargs["retryReads"] = False
self.client = MongoClient(self.server.uri, **kwargs) # type: ignore
self.client = self.simple_client(self.server.uri, **kwargs) # type: ignore
wait_until(lambda: self.client.nodes, "connect to standalone")
def tearDown(self):

1
test/test_encryption.py
View File

@ -380,6 +380,7 @@ class TestClientSimple(EncryptionIntegrationTest):
is_greenthread_patched(),
"gevent and eventlet do not support POSIX-style forking.",
)
@unittest.skipIf("PyPy" in sys.version, "PYTHON-4738 fails often on PyPy")
@client_context.require_sync
def test_fork(self):
opts = AutoEncryptionOpts(KMS_PROVIDERS, "keyvault.datakeys")

10
test/test_index_management.py
View File

@ -25,11 +25,10 @@ import pytest
sys.path[0:0] = [""]
from test import IntegrationTest, unittest
from test import IntegrationTest, PyMongoTestCase, unittest
from test.unified_format import generate_test_classes
from test.utils import AllowListEventListener, EventListener
from pymongo import MongoClient
from pymongo.errors import OperationFailure
from pymongo.operations import SearchIndexModel
from pymongo.read_concern import ReadConcern
@ -47,8 +46,7 @@ class TestCreateSearchIndex(IntegrationTest):
if not os.environ.get("TEST_INDEX_MANAGEMENT"):
raise unittest.SkipTest("Skipping index management tests")
listener = AllowListEventListener("createSearchIndexes")
client = MongoClient(event_listeners=[listener])
self.addCleanup(client.close)
client = self.simple_client(event_listeners=[listener])
coll = client.test.test
coll.drop()
definition = dict(mappings=dict(dynamic=True))
@ -79,7 +77,7 @@ class TestCreateSearchIndex(IntegrationTest):
)
class SearchIndexIntegrationBase(unittest.TestCase):
class SearchIndexIntegrationBase(PyMongoTestCase):
db_name = "test_search_index_base"
@classmethod
@ -91,7 +89,7 @@ class SearchIndexIntegrationBase(unittest.TestCase):
username = os.environ["DB_USER"]
password = os.environ["DB_PASSWORD"]
cls.listener = listener = EventListener()
cls.client = MongoClient(
cls.client = cls.unmanaged_simple_client(
url, username=username, password=password, event_listeners=[listener]
)
cls.client.drop_database(_NAME)

11
test/test_retryable_reads.py
View File

@ -43,7 +43,6 @@ from pymongo.monitoring import (
ConnectionCheckOutFailedReason,
PoolClearedEvent,
)
from pymongo.synchronous.mongo_client import MongoClient
# Location of JSON test specifications.
_TEST_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "retryable_reads", "legacy")
@ -51,19 +50,19 @@ _TEST_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "retryabl
class TestClientOptions(PyMongoTestCase):
def test_default(self):
client = MongoClient(connect=False)
client = self.simple_client(connect=False)
self.assertEqual(client.options.retry_reads, True)
def test_kwargs(self):
client = MongoClient(retryReads=True, connect=False)
client = self.simple_client(retryReads=True, connect=False)
self.assertEqual(client.options.retry_reads, True)
client = MongoClient(retryReads=False, connect=False)
client = self.simple_client(retryReads=False, connect=False)
self.assertEqual(client.options.retry_reads, False)
def test_uri(self):
client = MongoClient("mongodb://h/?retryReads=true", connect=False)
client = self.simple_client("mongodb://h/?retryReads=true", connect=False)
self.assertEqual(client.options.retry_reads, True)
client = MongoClient("mongodb://h/?retryReads=false", connect=False)
client = self.simple_client("mongodb://h/?retryReads=false", connect=False)
self.assertEqual(client.options.retry_reads, False)

11
tools/synchro.py
View File

@ -119,6 +119,10 @@ docstring_replacements: dict[tuple[str, str], str] = {
be passed as options for the create collection command.""",
}
docstring_removals: set[str] = {
".. warning:: This API is currently in beta, meaning the classes, methods, and behaviors described within may change before the full release."
}
type_replacements = {"_Condition": "threading.Condition"}
import_replacements = {"test.synchronous": "test"}
@ -322,7 +326,12 @@ def translate_docstrings(lines: list[str]) -> list[str]:
docstring_replacements[k], # type: ignore[index]
)
return lines
for line in docstring_removals:
if line in lines[i]:
lines[i] = "DOCSTRING_REMOVED"
lines[i + 1] = "DOCSTRING_REMOVED"
return [line for line in lines if line != "DOCSTRING_REMOVED"]
def unasync_directory(files: list[str], src: str, dest: str, replacements: dict[str, str]) -> None: