Skip to content

Commit f804c8e

Browse files
committed
Release notes and other doc fixes for 2.6.
1 parent 88e3121 commit f804c8e

File tree

7 files changed

+43
-14
lines changed

7 files changed

+43
-14
lines changed

doc/api/pymongo/connection.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
.. autoattribute:: document_class
2727
.. autoattribute:: tz_aware
2828
.. autoattribute:: max_bson_size
29+
.. autoattribute:: max_message_size
2930
.. autoattribute:: read_preference
3031
.. autoattribute:: tag_sets
3132
.. autoattribute:: secondary_acceptable_latency_ms

doc/api/pymongo/cursor.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
.. automodule:: pymongo.cursor
55
:synopsis: Tools for iterating over MongoDB query results
66

7-
.. autoclass:: pymongo.cursor.Cursor
7+
.. autoclass:: pymongo.cursor.Cursor(collection, spec=None, fields=None, skip=0, limit=0, timeout=True, snapshot=False, tailable=False, sort=None, max_scan=None, as_class=None, slave_okay=False, await_data=False, partial=False, manipulate=True, read_preference=ReadPreference.PRIMARY, tag_sets=[{}], secondary_acceptable_latency_ms=None, exhaust=False, network_timeout=None)
88
:members:
99

1010
.. describe:: c[index]

doc/api/pymongo/mongo_client.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
.. autoattribute:: document_class
2727
.. autoattribute:: tz_aware
2828
.. autoattribute:: max_bson_size
29+
.. autoattribute:: max_message_size
2930
.. autoattribute:: read_preference
3031
.. autoattribute:: tag_sets
3132
.. autoattribute:: secondary_acceptable_latency_ms

doc/api/pymongo/mongo_replica_set_client.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
.. autoattribute:: document_class
2727
.. autoattribute:: tz_aware
2828
.. autoattribute:: max_bson_size
29+
.. autoattribute:: max_message_size
2930
.. autoattribute:: auto_start_request
3031
.. autoattribute:: read_preference
3132
.. autoattribute:: tag_sets

doc/api/pymongo/replica_set_connection.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
.. autoattribute:: document_class
2727
.. autoattribute:: tz_aware
2828
.. autoattribute:: max_bson_size
29+
.. autoattribute:: max_message_size
2930
.. autoattribute:: auto_start_request
3031
.. autoattribute:: read_preference
3132
.. autoattribute:: tag_sets

doc/changelog.rst

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,38 @@
11
Changelog
22
=========
33

4-
Changes in Version 2.5.2+
5-
-------------------------
4+
Changes in Version 2.6
5+
----------------------
66

7-
Important new features:
7+
Version 2.6 includes some frequently requested improvements and adds
8+
support for some early MongoDB 2.6 features.
89

9-
- The `max_pool_size` option for :class:`~pymongo.mongo_client.MongoClient` and
10-
:class:`~pymongo.mongo_replica_set_client.MongoReplicaSetClient` now actually
11-
caps the number of sockets the pool will open concurrently. Connection or
12-
query attempts when the pool has reached `max_pool_size` block waiting for a
13-
socket to be returned to the pool. If ``waitQueueTimeoutMS`` is set, an
14-
operation that blocks waiting for a socket will raise
15-
:exc:`~pymongo.errors.ConnectionFailure` after the timeout. By default
16-
``waitQueueTimeoutMS`` is not set.
10+
Special thanks go to Justin Patrin for his work on the connection pool
11+
in this release.
1712

18-
.. warning:: SIGNIFICANT BEHAVIOR CHANGE in 2.5.2+. Previously, `max_pool_size`
13+
Important new features:
14+
15+
- The ``max_pool_size`` option for :class:`~pymongo.mongo_client.MongoClient`
16+
and :class:`~pymongo.mongo_replica_set_client.MongoReplicaSetClient` now
17+
actually caps the number of sockets the pool will open concurrently.
18+
Once the pool has reached :attr:`~pymongo.mongo_client.MongoClient.max_pool_size`
19+
operations will block waiting for a socket to become available. If
20+
``waitQueueTimeoutMS`` is set, an operation that blocks waiting for a socket
21+
will raise :exc:`~pymongo.errors.ConnectionFailure` after the timeout. By
22+
default ``waitQueueTimeoutMS`` is not set.
23+
See :ref:`connection-pooling` for more information.
24+
- The :meth:`~pymongo.collection.Collection.insert` method automatically splits
25+
large batches of documents into multiple insert messages based on
26+
:attr:`~pymongo.mongo_client.MongoClient.max_message_size`
27+
- Support for the exhaust cursor flag.
28+
See :meth:`~pymongo.collection.Collection.find` for details and caveats.
29+
- Support for the PLAIN and MONGODB-X509 authentication mechanisms.
30+
See :doc:`the authentication docs </examples/authentication>` for more
31+
information.
32+
- Support aggregation output as a :class:`~pymongo.cursor.Cursor`. See
33+
:meth:`~pymongo.collection.Collection.aggregate` for details.
34+
35+
.. warning:: SIGNIFICANT BEHAVIOR CHANGE in 2.6. Previously, `max_pool_size`
1936
would limit only the idle sockets the pool would hold onto, not the
2037
number of open sockets. The default has also changed, from 10 to 100.
2138
If you pass a value for ``max_pool_size`` make sure it is large enough for
@@ -25,6 +42,14 @@ Important new features:
2542

2643
See :ref:`connection-pooling` for more information.
2744

45+
Issues Resolved
46+
...............
47+
48+
See the `PyMongo 2.6 release notes in JIRA`_ for the list of resolved issues
49+
in this release.
50+
51+
.. _PyMongo 2.6 release notes in JIRA: https://jira.mongodb.org/browse/PYTHON/fixforversion/12380
52+
2853
Changes in Version 2.5.2
2954
------------------------
3055

pymongo/collection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1090,9 +1090,9 @@ def aggregate(self, pipeline, **kwargs):
10901090
for doc in cursor:
10911091
print doc
10921092
1093-
.. versionadded:: 2.3
10941093
.. versionchanged:: 2.6
10951094
Added cursor support.
1095+
.. versionadded:: 2.3
10961096
10971097
.. _aggregate command:
10981098
http://docs.mongodb.org/manual/applications/aggregation

0 commit comments

Comments
 (0)