diff --git a/README.rst b/README.rst index 142554259..a673bad91 100644 --- a/README.rst +++ b/README.rst @@ -16,6 +16,8 @@ is a `gridfs `_ implementation on top of ``pymongo``. +PyMongo 3.3.0.dev0 supports MongoDB 2.4, 2.6, 3.0, and 3.2 + Support / Feedback ================== diff --git a/doc/examples/aggregation.rst b/doc/examples/aggregation.rst index ff2f5dd6f..e0cf14bf4 100644 --- a/doc/examples/aggregation.rst +++ b/doc/examples/aggregation.rst @@ -151,9 +151,8 @@ documents that will be mapped over: {u'_id': u'cat', u'value': 1.0} {u'_id': u'dog', u'value': 1.0} -With MongoDB 1.8.0 or newer you can use :class:`~bson.son.SON` or -:class:`collections.OrderedDict` to specify a different database to store the -result collection: +You can use :class:`~bson.son.SON` or :class:`collections.OrderedDict` to +specify a different database to store the result collection: .. doctest:: diff --git a/doc/examples/authentication.rst b/doc/examples/authentication.rst index 04abce414..2909a1ff1 100644 --- a/doc/examples/authentication.rst +++ b/doc/examples/authentication.rst @@ -88,7 +88,7 @@ MONGODB-X509 The MONGODB-X509 mechanism authenticates a username derived from the distinguished subject name of the X.509 certificate presented by the driver during SSL negotiation. This authentication method requires the use of SSL -connections with certificate validation and is available in MongoDB 2.5.1 +connections with certificate validation and is available in MongoDB 2.6 and newer:: >>> import ssl @@ -202,7 +202,7 @@ SASL PLAIN (RFC 4616) --------------------- .. versionadded:: 2.6 -MongoDB Enterprise Edition versions 2.5.0 and newer support the SASL PLAIN +MongoDB Enterprise Edition version 2.6 and newer support the SASL PLAIN authentication mechanism, initially intended for delegating authentication to an LDAP server. Using the PLAIN mechanism is very similar to MONGODB-CR. These examples use the $external virtual database for LDAP support:: diff --git a/pymongo/collection.py b/pymongo/collection.py index 5a202aee8..24cb410aa 100644 --- a/pymongo/collection.py +++ b/pymongo/collection.py @@ -1360,11 +1360,10 @@ class Collection(common.BaseObject): See the MongoDB documentation for a full list of supported options by server version. - .. warning:: `dropDups` is not supported by MongoDB 2.7.5 or newer. The + .. warning:: `dropDups` is not supported by MongoDB 3.0 or newer. The option is silently ignored by the server and unique index builds using the option will fail if a duplicate value is detected. - .. note:: `expireAfterSeconds` requires server version **>= 2.2** .. note:: `partialFilterExpression` requires server version **>= 3.2** :Parameters: diff --git a/pymongo/database.py b/pymongo/database.py index 3f22f7f24..208c2e203 100644 --- a/pymongo/database.py +++ b/pymongo/database.py @@ -559,11 +559,6 @@ class Database(common.BaseObject): Returns a dict of validation info. Raises CollectionInvalid if validation fails. - With MongoDB < 1.9 the result dict will include a `result` key - with a string value that represents the validation results. With - MongoDB >= 1.9 the `result` key no longer exists and the results - are split into individual fields in the result dict. - :Parameters: - `name_or_collection`: A Collection object or the name of a collection to validate. @@ -572,7 +567,7 @@ class Database(common.BaseObject): - `full`: Have the server do a more thorough scan of the collection. Use with `scandata` for a thorough scan of the structure of the collection and the individual - documents. Ignored in MongoDB versions before 1.9. + documents. """ name = name_or_collection if isinstance(name, Collection):