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

Author: blink1073

.evergreen/run-tests.sh

@@ -31,9 +31,6 @@ set -o xtrace
 AUTH=${AUTH:-noauth}
 SSL=${SSL:-nossl}
 TEST_ARGS="${*:1}"
-PYTHON=$(which python)
-# TODO: Remove when we drop PyPy 3.8 support.
-OLD_PYPY=$(python -c "import sys; print(sys.implementation.name.lower() == 'pypy' and sys.implementation.version < (7, 3, 12))")
 
 export PIP_QUIET=1  # Quiet by default
 export PIP_PREFER_BINARY=1 # Prefer binary dists by default
@@ -113,10 +110,6 @@ fi
 
 if [ "$COMPRESSORS" = "snappy" ]; then
     python -m pip install '.[snappy]'
-    if [ "$OLD_PYPY" == "True" ]; then
-        pip install "python-snappy<0.7.0"
-    fi
-    PYTHON=python
 elif [ "$COMPRESSORS" = "zstd" ]; then
     python -m pip install zstandard
 fi
@@ -237,7 +230,7 @@ if [ -n "$PERF_TEST" ]; then
     TEST_ARGS="test/performance/perf_test.py"
 fi
 
-echo "Running $AUTH tests over $SSL with python $PYTHON"
+echo "Running $AUTH tests over $SSL with python $(which python)"
 python -c 'import sys; print(sys.version)'
 
 
@@ -246,7 +239,7 @@ python -c 'import sys; print(sys.version)'
 
 # Run the tests with coverage if requested and coverage is installed.
 # Only cover CPython. PyPy reports suspiciously low coverage.
-PYTHON_IMPL=$($PYTHON -c "import platform; print(platform.python_implementation())")
+PYTHON_IMPL=$(python -c "import platform; print(platform.python_implementation())")
 if [ -n "$COVERAGE" ] && [ "$PYTHON_IMPL" = "CPython" ]; then
     # Keep in sync with combine-coverage.sh.
     # coverage >=5 is needed for relative_files=true.

doc/changelog.rst

@@ -1,6 +1,22 @@
 Changelog
 =========
 
+Changes in Version 4.9.0
+-------------------------
+
+PyMongo 4.9 brings a number of improvements including:
+
+- A new asynchronous API with full asyncio support.
+
+Issues Resolved
+...............
+
+See the `PyMongo 4.9 release notes in JIRA`_ for the list of resolved issues
+in this release.
+
+.. _PyMongo 4.9 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=39940
+
+
 Changes in Version 4.8.0
 -------------------------
 
@@ -10,14 +26,21 @@ PyMongo 4.8 brings a number of improvements including:
 
 - The handshake metadata for "os.name" on Windows has been simplified to "Windows" to improve import time.
 - The repr of ``bson.binary.Binary`` is now redacted when the subtype is SENSITIVE_SUBTYPE(8).
-- A new asynchronous API with full asyncio support.
 
 Unavoidable breaking changes
 ............................
 
 - Since we are now using ``hatch`` as our build backend, we no longer have a ``setup.py`` file
   and require installation using ``pip``.
 
+Issues Resolved
+...............
+
+See the `PyMongo 4.8 release notes in JIRA`_ for the list of resolved issues
+in this release.
+
+.. _PyMongo 4.8 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=37057
+
 Changes in Version 4.7.3
 -------------------------
 

pymongo/_version.py

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

pymongo/asynchronous/encryption.py

@@ -456,13 +456,10 @@ class Algorithm(str, enum.Enum):
 
     .. versionadded:: 4.2
     """
-    RANGEPREVIEW = "RangePreview"
-    """RangePreview.
+    RANGE = "Range"
+    """Range.
 
-    .. note:: Support for Range queries is in beta.
-       Backwards-breaking changes may be made before the final release.
-
-    .. versionadded:: 4.4
+    .. versionadded:: 4.8
     """
 
 
@@ -475,11 +472,9 @@ class QueryType(str, enum.Enum):
     EQUALITY = "equality"
     """Used to encrypt a value for an equality query."""
 
-    RANGEPREVIEW = "rangePreview"
+    RANGE = "range"
     """Used to encrypt a value for a range query.
 
-    .. note:: Support for Range queries is in beta.
-       Backwards-breaking changes may be made before the final release.
 """
 
 
@@ -836,10 +831,14 @@ async def encrypt(
             when the algorithm is :attr:`Algorithm.INDEXED`.  An integer value
             *must* be given when the :attr:`Algorithm.INDEXED` algorithm is
             used.
-        :param range_opts: Experimental only, not intended for public use.
+        :param range_opts: Index options for `range` queries. See
+            :class:`RangeOpts` for some valid options.
 
         :return: The encrypted value, a :class:`~bson.binary.Binary` with subtype 6.
 
+        .. versionchanged:: 4.8
+           Added the `range_opts` parameter.
+
         .. versionchanged:: 4.7
            ``key_id`` can now be passed in as a :class:`uuid.UUID`.
 
@@ -888,10 +887,14 @@ async def encrypt_expression(
             when the algorithm is :attr:`Algorithm.INDEXED`.  An integer value
             *must* be given when the :attr:`Algorithm.INDEXED` algorithm is
             used.
-        :param range_opts: Experimental only, not intended for public use.
+        :param range_opts: Index options for `range` queries. See
+            :class:`RangeOpts` for some valid options.
 
         :return: The encrypted expression, a :class:`~bson.RawBSONDocument`.
 
+        .. versionchanged:: 4.8
+           Added the `range_opts` parameter.
+
         .. versionchanged:: 4.7
            ``key_id`` can now be passed in as a :class:`uuid.UUID`.
 

pymongo/asynchronous/encryption_options.py

@@ -231,20 +231,20 @@ def __init__(
 
 
 class RangeOpts:
-    """Options to configure encrypted queries using the rangePreview algorithm."""
+    """Options to configure encrypted queries using the range algorithm."""
 
     def __init__(
         self,
         sparsity: int,
+        trim_factor: int,
         min: Optional[Any] = None,
         max: Optional[Any] = None,
         precision: Optional[int] = None,
     ) -> None:
-        """Options to configure encrypted queries using the rangePreview algorithm.
-
-        .. note:: This feature is experimental only, and not intended for public use.
+        """Options to configure encrypted queries using the range algorithm.
 
         :param sparsity: An integer.
+        :param trim_factor: An integer.
         :param min: A BSON scalar value corresponding to the type being queried.
         :param max: A BSON scalar value corresponding to the type being queried.
         :param precision: An integer, may only be set for double or decimal128 types.
@@ -254,13 +254,15 @@ def __init__(
         self.min = min
         self.max = max
         self.sparsity = sparsity
+        self.trim_factor = trim_factor
         self.precision = precision
 
     @property
     def document(self) -> dict[str, Any]:
         doc = {}
         for k, v in [
             ("sparsity", int64.Int64(self.sparsity)),
+            ("trimFactor", self.trim_factor),
             ("precision", self.precision),
             ("min", self.min),
             ("max", self.max),

pymongo/asynchronous/mongo_client.py

@@ -854,6 +854,7 @@ def __init__(
             server_monitoring_mode=options.server_monitoring_mode,
         )
 
+        self._opened = False
         self._init_background()
 
         if _IS_SYNC and connect:
@@ -895,13 +896,14 @@ async def target() -> bool:
         # this closure. When the client is freed, stop the executor soon.
         self_ref: Any = weakref.ref(self, executor.close)
         self._kill_cursors_executor = executor
+        self._opened = False
 
     def _should_pin_cursor(self, session: Optional[ClientSession]) -> Optional[bool]:
         return self._options.load_balanced and not (session and session.in_transaction)
 
     def _after_fork(self) -> None:
         """Resets topology in a child after successfully forking."""
-        self._init_background()
+        self._init_background(self._topology._pid)
         # Reset the session pool to avoid duplicate sessions in the child process.
         self._topology._session_pool.reset()
 
@@ -1382,7 +1384,9 @@ async def _server_property(self, attr_name: str) -> Any:
         the server may change. In such cases, store a local reference to a
         ServerDescription first, then use its properties.
         """
-        server = await self._topology.select_server(writable_server_selector, _Op.TEST)
+        server = await (await self._get_topology()).select_server(
+            writable_server_selector, _Op.TEST
+        )
 
         return getattr(server.description, attr_name)
 
@@ -1528,9 +1532,11 @@ async def _get_topology(self) -> Topology:
         If this client was created with "connect=False", calling _get_topology
         launches the connection process in the background.
         """
-        await self._topology.open()
-        async with self._lock:
-            self._kill_cursors_executor.open()
+        if not self._opened:
+            await self._topology.open()
+            async with self._lock:
+                self._kill_cursors_executor.open()
+            self._opened = True
         return self._topology
 
     @contextlib.asynccontextmanager
@@ -1631,9 +1637,9 @@ async def _conn_from_server(
         # always send primaryPreferred when directly connected to a repl set
         # member.
         # Thread safe: if the type is single it cannot change.
-        topology = await self._get_topology()
-        single = topology.description.topology_type == TOPOLOGY_TYPE.Single
-
+        # NOTE: We already opened the Topology when selecting a server so there's no need
+        # to call _get_topology() again.
+        single = self._topology.description.topology_type == TOPOLOGY_TYPE.Single
         async with self._checkout(server, session) as conn:
             if single:
                 if conn.is_repl and not (session and session.in_transaction):
@@ -1652,7 +1658,6 @@ async def _conn_for_reads(
         operation: str,
     ) -> AsyncContextManager[tuple[Connection, _ServerMode]]:
         assert read_preference is not None, "read_preference must not be None"
-        _ = await self._get_topology()
         server = await self._select_server(read_preference, session, operation)
         return self._conn_from_server(read_preference, server, session)
 

pymongo/asynchronous/pool.py

@@ -216,13 +216,14 @@ def _set_keepalive_times(sock: socket.socket) -> None:
         "version": platform.mac_ver()[0],
     }
 elif sys.platform == "win32":
+    _ver = sys.getwindowsversion()
     _METADATA["os"] = {
-        "type": platform.system(),
-        # "Windows XP", "Windows 7", "Windows 10", etc.
-        "name": " ".join((platform.system(), platform.release())),
-        "architecture": platform.machine(),
-        # Windows patch level (e.g. 5.1.2600-SP3)
-        "version": "-".join(platform.win32_ver()[1:3]),
+        "type": "Windows",
+        "name": "Windows",
+        # Avoid using platform calls, see PYTHON-4455.
+        "architecture": os.environ.get("PROCESSOR_ARCHITECTURE") or platform.machine(),
+        # Windows patch level (e.g. 10.0.17763-SP0).
+        "version": ".".join(map(str, _ver[:3])) + f"-SP{_ver[-1] or '0'}",
     }
 elif sys.platform.startswith("java"):
     _name, _ver, _arch = platform.java_ver()[-1]

pymongo/ssl_support.py

@@ -15,6 +15,7 @@
 """Support for SSL in PyMongo."""
 from __future__ import annotations
 
+import warnings
 from typing import Optional
 
 from pymongo.errors import ConfigurationError
@@ -23,7 +24,17 @@
 
 try:
     import pymongo.pyopenssl_context as _ssl
-except ImportError:
+except (ImportError, AttributeError) as exc:
+    if isinstance(exc, AttributeError):
+        warnings.warn(
+            "Failed to use the installed version of PyOpenSSL. "
+            "Falling back to stdlib ssl, disabling OCSP support. "
+            "This is likely caused by incompatible versions "
+            "of PyOpenSSL < 23.2.0 and cryptography >= 42.0.0. "
+            "Try updating PyOpenSSL >= 23.2.0 to enable OCSP.",
+            UserWarning,
+            stacklevel=2,
+        )
     try:
         import pymongo.ssl_context as _ssl  # type: ignore[no-redef]
     except ImportError:

pymongo/synchronous/encryption.py

@@ -454,13 +454,10 @@ class Algorithm(str, enum.Enum):
 
     .. versionadded:: 4.2
     """
-    RANGEPREVIEW = "RangePreview"
-    """RangePreview.
+    RANGE = "Range"
+    """Range.
 
-    .. note:: Support for Range queries is in beta.
-       Backwards-breaking changes may be made before the final release.
-
-    .. versionadded:: 4.4
+    .. versionadded:: 4.8
     """
 
 
@@ -473,11 +470,9 @@ class QueryType(str, enum.Enum):
     EQUALITY = "equality"
     """Used to encrypt a value for an equality query."""
 
-    RANGEPREVIEW = "rangePreview"
+    RANGE = "range"
     """Used to encrypt a value for a range query.
 
-    .. note:: Support for Range queries is in beta.
-       Backwards-breaking changes may be made before the final release.
 """
 
 
@@ -834,10 +829,14 @@ def encrypt(
             when the algorithm is :attr:`Algorithm.INDEXED`.  An integer value
             *must* be given when the :attr:`Algorithm.INDEXED` algorithm is
             used.
-        :param range_opts: Experimental only, not intended for public use.
+        :param range_opts: Index options for `range` queries. See
+            :class:`RangeOpts` for some valid options.
 
         :return: The encrypted value, a :class:`~bson.binary.Binary` with subtype 6.
 
+        .. versionchanged:: 4.8
+           Added the `range_opts` parameter.
+
         .. versionchanged:: 4.7
            ``key_id`` can now be passed in as a :class:`uuid.UUID`.
 
@@ -886,10 +885,14 @@ def encrypt_expression(
             when the algorithm is :attr:`Algorithm.INDEXED`.  An integer value
             *must* be given when the :attr:`Algorithm.INDEXED` algorithm is
             used.
-        :param range_opts: Experimental only, not intended for public use.
+        :param range_opts: Index options for `range` queries. See
+            :class:`RangeOpts` for some valid options.
 
         :return: The encrypted expression, a :class:`~bson.RawBSONDocument`.
 
+        .. versionchanged:: 4.8
+           Added the `range_opts` parameter.
+
         .. versionchanged:: 4.7
            ``key_id`` can now be passed in as a :class:`uuid.UUID`.