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

Author: blink1073

.evergreen/config.yml

@@ -2081,10 +2081,10 @@ axes:
         batchtime: 10080  # 7 days
       - id: rhel8
         display_name: "RHEL 8.x"
-        run_on: rhel87-small
+        run_on: rhel8.8-small
         batchtime: 10080  # 7 days
-      - id: rhel92-fips
-        display_name: "RHEL 9.2 FIPS"
+      - id: rhel9-fips
+        display_name: "RHEL 9 FIPS"
         run_on: rhel92-fips
         batchtime: 10080  # 7 days
       - id: ubuntu-22.04
@@ -2095,24 +2095,24 @@ axes:
         display_name: "Ubuntu 20.04"
         run_on: ubuntu2004-small
         batchtime: 10080  # 7 days
-      - id: rhel83-zseries
-        display_name: "RHEL 8.3 (zSeries)"
-        run_on: rhel83-zseries-small
+      - id: rhel8-zseries
+        display_name: "RHEL 8 (zSeries)"
+        run_on: rhel8-zseries-small
         batchtime: 10080  # 7 days
         variables:
           SKIP_HATCH: true
-      - id: rhel81-power8
-        display_name: "RHEL 8.1 (POWER8)"
-        run_on: rhel81-power8-small
+      - id: rhel8-power8
+        display_name: "RHEL 8 (POWER8)"
+        run_on: rhel8-power-small
         batchtime: 10080  # 7 days
         variables:
           SKIP_HATCH: true
-      - id: rhel82-arm64
-        display_name: "RHEL 8.2 (ARM64)"
+      - id: rhel8-arm64
+        display_name: "RHEL 8 (ARM64)"
         run_on: rhel82-arm64-small
         batchtime: 10080  # 7 days
         variables:
-      - id: windows-64-vsMulti-small
+      - id: windows
         display_name: "Windows 64"
         run_on: windows-64-vsMulti-small
         batchtime: 10080  # 7 days
@@ -2470,7 +2470,7 @@ buildvariants:
 - matrix_name: "tests-fips"
   matrix_spec:
     platform:
-      - rhel92-fips
+      - rhel9-fips
     auth: "auth"
     ssl: "ssl"
   display_name: "${platform} ${auth} ${ssl}"
@@ -2547,9 +2547,9 @@ buildvariants:
 - matrix_name: "test-different-cpu-architectures"
   matrix_spec:
     platform:
-      - rhel83-zseries  # Added in 5.0.8 (SERVER-44074)
-      - rhel81-power8 # Added in 4.2.7 (SERVER-44072)
-      - rhel82-arm64 # Added in 4.4.2 (SERVER-48282)
+      - rhel8-zseries  # Added in 5.0.8 (SERVER-44074)
+      - rhel8-power8 # Added in 4.2.7 (SERVER-44072)
+      - rhel8-arm64 # Added in 4.4.2 (SERVER-48282)
     auth-ssl: "*"
   display_name: "${platform} ${auth-ssl}"
   tasks:
@@ -2606,7 +2606,7 @@ buildvariants:
 
 - matrix_name: "tests-pyopenssl-windows"
   matrix_spec:
-    platform: windows-64-vsMulti-small
+    platform: windows
     python-version-windows: "*"
     auth: "auth"
     ssl: "ssl"
@@ -2698,15 +2698,15 @@ buildvariants:
 
 - matrix_name: "tests-windows-python-version"
   matrix_spec:
-    platform: windows-64-vsMulti-small
+    platform: windows
     python-version-windows: "*"
     auth-ssl: "*"
   display_name: "${platform} ${python-version-windows} ${auth-ssl}"
   tasks: *all-server-versions
 
 - matrix_name: "tests-windows-python-version-32-bit"
   matrix_spec:
-    platform: windows-64-vsMulti-small
+    platform: windows
     python-version-windows-32: "*"
     auth-ssl: "*"
   display_name: "${platform} ${python-version-windows-32} ${auth-ssl}"
@@ -2724,7 +2724,7 @@ buildvariants:
 
 - matrix_name: "tests-windows-encryption"
   matrix_spec:
-    platform: windows-64-vsMulti-small
+    platform: windows
     python-version-windows: "*"
     auth-ssl: "*"
     encryption: "*"
@@ -2733,7 +2733,7 @@ buildvariants:
   rules:
     - if:
         encryption: ["encryption", "encryption_crypt_shared"]
-        platform: windows-64-vsMulti-small
+        platform: windows
         python-version-windows: "*"
         auth-ssl: "*"
       then:
@@ -2795,7 +2795,7 @@ buildvariants:
 
 - matrix_name: "tests-windows-enterprise-auth"
   matrix_spec:
-    platform: windows-64-vsMulti-small
+    platform: windows
     python-version-windows: "*"
     auth: "auth"
   display_name: "Enterprise ${auth} ${platform} ${python-version-windows}"
@@ -2907,7 +2907,7 @@ buildvariants:
 
 - matrix_name: "ocsp-test-windows"
   matrix_spec:
-    platform: windows-64-vsMulti-small
+    platform: windows
     python-version-windows: ["3.8", "3.10"]
     mongodb-version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"]
     auth: "noauth"
@@ -2932,7 +2932,7 @@ buildvariants:
 
 - matrix_name: "oidc-auth-test"
   matrix_spec:
-    platform: [ rhel8, macos, windows-64-vsMulti-small ]
+    platform: [ rhel8, macos, windows ]
   display_name: "OIDC Auth ${platform}"
   tasks:
     - name: testoidc_task_group
@@ -2981,7 +2981,7 @@ buildvariants:
 
 - matrix_name: "aws-auth-test-windows"
   matrix_spec:
-    platform: [windows-64-vsMulti-small]
+    platform: [windows]
     python-version-windows: "*"
   display_name: "MONGODB-AWS Auth ${platform} ${python-version-windows}"
   tasks:

CONTRIBUTING.md

@@ -163,13 +163,10 @@ hatch run lint:build-manual
 
 ## Documentation
 
-To contribute to the [API
-documentation](https://pymongo.readthedocs.io/en/stable/) just make your
-changes to the inline documentation of the appropriate [source
-code](https://github.com/mongodb/mongo-python-driver) or [rst
-file](https://github.com/mongodb/mongo-python-driver/tree/master/doc) in
-a branch and submit a [pull
-request](https://help.github.com/articles/using-pull-requests). You
+To contribute to the [API documentation](https://pymongo.readthedocs.io/en/stable/) just make your
+changes to the inline documentation of the appropriate [source code](https://github.com/mongodb/mongo-python-driver) or
+[rst file](https://github.com/mongodb/mongo-python-driver/tree/master/doc) in
+a branch and submit a [pull request](https://help.github.com/articles/using-pull-requests). You
 might also use the GitHub
 [Edit](https://github.com/blog/844-forking-with-the-edit-button) button.
 

README.md

@@ -3,7 +3,7 @@
 [![PyPI Version](https://img.shields.io/pypi/v/pymongo)](https://pypi.org/project/pymongo)
 [![Python Versions](https://img.shields.io/pypi/pyversions/pymongo)](https://pypi.org/project/pymongo)
 [![Monthly Downloads](https://static.pepy.tech/badge/pymongo/month)](https://pepy.tech/project/pymongo)
-[![Documentation Status](https://readthedocs.org/projects/pymongo/badge/?version=stable)](http://pymongo.readthedocs.io/en/stable/?badge=stable)
+[![API Documentation Status](https://readthedocs.org/projects/pymongo/badge/?version=stable)](http://pymongo.readthedocs.io/en/stable/api?badge=stable)
 
 ## About
 

bson/_cbsonmodule.c

@@ -306,7 +306,7 @@ static PyObject* datetime_from_millis(long long millis) {
             if (evalue) {
                 PyObject* err_msg = PyObject_Str(evalue);
                 if (err_msg) {
-                    PyObject* appendage = PyUnicode_FromString(" (Consider Using CodecOptions(datetime_conversion=DATETIME_AUTO) or MongoClient(datetime_conversion='DATETIME_AUTO')). See: https://pymongo.readthedocs.io/en/stable/examples/datetimes.html#handling-out-of-range-datetimes");
+                    PyObject* appendage = PyUnicode_FromString(" (Consider Using CodecOptions(datetime_conversion=DATETIME_AUTO) or MongoClient(datetime_conversion='DATETIME_AUTO')). See: https://www.mongodb.com/docs/languages/python/pymongo-driver/current/data-formats/dates-and-times/#handling-out-of-range-datetimes");
                     if (appendage) {
                         PyObject* msg = PyUnicode_Concat(err_msg, appendage);
                         if (msg) {

bson/datetime_ms.py

@@ -31,7 +31,7 @@
 _DATETIME_ERROR_SUGGESTION = (
     "(Consider Using CodecOptions(datetime_conversion=DATETIME_AUTO)"
     " or MongoClient(datetime_conversion='DATETIME_AUTO'))."
-    " See: https://pymongo.readthedocs.io/en/stable/examples/datetimes.html#handling-out-of-range-datetimes"
+    " See: https://www.mongodb.com/docs/languages/python/pymongo-driver/current/data-formats/dates-and-times/#handling-out-of-range-datetimes"
 )
 
 

doc/changelog.rst

@@ -93,6 +93,10 @@ Unavoidable breaking changes
 - Since we are now using ``hatch`` as our build backend, we no longer have a usable ``setup.py`` file
   and require installation using ``pip``.  Attempts to invoke the ``setup.py`` file will raise an exception.
   Additionally, ``pip`` >= 21.3 is now required for editable installs.
+- We no longer support the ``srv`` extra, since ``dnspython`` is included as a dependency in PyMongo 4.7+.
+  Instead of ``pip install pymongo[srv]``, use ``pip install pymongo``.
+- We no longer support the ``tls`` extra, which was only valid for Python 2.
+  Instead of ``pip install pymongo[tls]``, use ``pip install pymongo``.
 
 Issues Resolved
 ...............

doc/index.rst

@@ -1,6 +1,11 @@
 PyMongo |release| Documentation
 ===============================
 
+.. note:: The PyMongo documentation has been migrated to the
+   `MongoDB Documentation site <https://www.mongodb.com/docs/languages/python/pymongo-driver/current>`_.
+   As of PyMongo 4.10, the ReadTheDocs site will contain the detailed changelog and API docs, while the
+   rest of the documentation will only appear on the MongoDB Documentation site.
+
 Overview
 --------
 **PyMongo** is a Python distribution containing tools for working with
@@ -95,8 +100,6 @@ pull request.
 Changes
 -------
 See the :doc:`changelog` for a full list of changes to PyMongo.
-For older versions of the documentation please see the
-`archive list <http://api.mongodb.org/python/>`_.
 
 About This Documentation
 ------------------------

pymongo/asynchronous/command_cursor.py

@@ -29,6 +29,7 @@
 )
 
 from bson import CodecOptions, _convert_raw_document_lists_to_streams
+from pymongo import _csot
 from pymongo.asynchronous.cursor import _ConnectionManager
 from pymongo.cursor_shared import _CURSOR_CLOSED_ERRORS
 from pymongo.errors import ConnectionFailure, InvalidOperation, OperationFailure
@@ -77,6 +78,7 @@ def __init__(
         self._address = address
         self._batch_size = batch_size
         self._max_await_time_ms = max_await_time_ms
+        self._timeout = self._collection.database.client.options.timeout
         self._session = session
         self._explicit_session = explicit_session
         self._killed = self._id == 0
@@ -385,6 +387,7 @@ async def __aenter__(self) -> AsyncCommandCursor[_DocumentType]:
     async def __aexit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> None:
         await self.close()
 
+    @_csot.apply
     async def to_list(self, length: Optional[int] = None) -> list[_DocumentType]:
         """Converts the contents of this cursor to a list more efficiently than ``[doc async for doc in cursor]``.
 

pymongo/asynchronous/cursor.py

@@ -36,7 +36,7 @@
 from bson import RE_TYPE, _convert_raw_document_lists_to_streams
 from bson.code import Code
 from bson.son import SON
-from pymongo import helpers_shared
+from pymongo import _csot, helpers_shared
 from pymongo.asynchronous.helpers import anext
 from pymongo.collation import validate_collation_or_none
 from pymongo.common import (
@@ -196,6 +196,7 @@ def __init__(
         self._explain = False
         self._comment = comment
         self._max_time_ms = max_time_ms
+        self._timeout = self._collection.database.client.options.timeout
         self._max_await_time_ms: Optional[int] = None
         self._max: Optional[Union[dict[Any, Any], _Sort]] = max
         self._min: Optional[Union[dict[Any, Any], _Sort]] = min
@@ -1290,6 +1291,7 @@ async def __aenter__(self) -> AsyncCursor[_DocumentType]:
     async def __aexit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> None:
         await self.close()
 
+    @_csot.apply
     async def to_list(self, length: Optional[int] = None) -> list[_DocumentType]:
         """Converts the contents of this cursor to a list more efficiently than ``[doc async for doc in cursor]``.
 

pymongo/asynchronous/mongo_client.py

@@ -1193,7 +1193,6 @@ def __del__(self) -> None:
                     ),
                     ResourceWarning,
                     stacklevel=2,
-                    source=self,
                 )
         except AttributeError:
             pass