diff --git a/bson/__init__.py b/bson/__init__.py index 298112d73..4a511f53c 100644 --- a/bson/__init__.py +++ b/bson/__init__.py @@ -928,15 +928,6 @@ def decode_all(data, codec_options=DEFAULT_CODEC_OPTIONS): Replaced `as_class`, `tz_aware`, and `uuid_subtype` options with `codec_options`. - - .. versionchanged:: 2.7 - Added `compile_re` option. If set to False, PyMongo represented BSON - regular expressions as :class:`~bson.regex.Regex` objects instead of - attempting to compile BSON regular expressions as Python native - regular expressions, thus preventing errors for some incompatible - patterns, see `PYTHON-500`_. - - .. _PYTHON-500: https://jira.mongodb.org/browse/PYTHON-500 """ data, view = get_data_and_view(data) if not isinstance(codec_options, CodecOptions): @@ -1191,15 +1182,6 @@ class BSON(bytes): Replaced `as_class`, `tz_aware`, and `uuid_subtype` options with `codec_options`. - - .. versionchanged:: 2.7 - Added `compile_re` option. If set to False, PyMongo represented BSON - regular expressions as :class:`~bson.regex.Regex` objects instead of - attempting to compile BSON regular expressions as Python native - regular expressions, thus preventing errors for some incompatible - patterns, see `PYTHON-500`_. - - .. _PYTHON-500: https://jira.mongodb.org/browse/PYTHON-500 """ return decode(self, codec_options) diff --git a/bson/binary.py b/bson/binary.py index 7110fede2..39bc69c04 100644 --- a/bson/binary.py +++ b/bson/binary.py @@ -49,9 +49,6 @@ UUID_SUBTYPE = 4 This is the new BSON binary subtype for UUIDs. The current default is :data:`OLD_UUID_SUBTYPE`. - -.. versionchanged:: 2.1 - Changed to subtype 4. """ diff --git a/bson/json_util.py b/bson/json_util.py index 7b42d5668..05fa0e2ec 100644 --- a/bson/json_util.py +++ b/bson/json_util.py @@ -84,25 +84,6 @@ but it will be faster as there is less recursion. Extended JSON converter for Python built on top of `libbson `_. `python-bsonjs` works best with PyMongo when using :class:`~bson.raw_bson.RawBSONDocument`. - -.. versionchanged:: 2.8 - The output format for :class:`~bson.timestamp.Timestamp` has changed from - '{"t": , "i": }' to '{"$timestamp": {"t": , "i": }}'. - This new format will be decoded to an instance of - :class:`~bson.timestamp.Timestamp`. The old format will continue to be - decoded to a python dict as before. Encoding to the old format is no longer - supported as it was never correct and loses type information. - Added support for $numberLong and $undefined - new in MongoDB 2.6 - and - parsing $date in ISO-8601 format. - -.. versionchanged:: 2.7 - Preserves order when rendering SON, Timestamp, Code, Binary, and DBRef - instances. - -.. versionchanged:: 2.3 - Added dumps and loads helpers to automatically handle conversion to and - from json and supports :class:`~bson.binary.Binary` and - :class:`~bson.code.Code` """ import base64 @@ -401,10 +382,6 @@ def dumps(obj, *args, **kwargs): .. versionchanged:: 3.4 Accepts optional parameter `json_options`. See :class:`JSONOptions`. - - .. versionchanged:: 2.7 - Preserves order when rendering SON, Timestamp, Code, Binary, and DBRef - instances. """ json_options = kwargs.pop("json_options", DEFAULT_JSON_OPTIONS) return json.dumps(_json_convert(obj, json_options), *args, **kwargs) diff --git a/bson/max_key.py b/bson/max_key.py index 7e89dd70d..efdf5c78b 100644 --- a/bson/max_key.py +++ b/bson/max_key.py @@ -17,11 +17,7 @@ class MaxKey(object): - """MongoDB internal MaxKey type. - - .. versionchanged:: 2.7 - ``MaxKey`` now implements comparison operators. - """ + """MongoDB internal MaxKey type.""" _type_marker = 127 diff --git a/bson/min_key.py b/bson/min_key.py index b03520e9c..7d2b3a6dd 100644 --- a/bson/min_key.py +++ b/bson/min_key.py @@ -17,11 +17,7 @@ class MinKey(object): - """MongoDB internal MinKey type. - - .. versionchanged:: 2.7 - ``MinKey`` now implements comparison operators. - """ + """MongoDB internal MinKey type.""" _type_marker = 255 diff --git a/pymongo/collection.py b/pymongo/collection.py index 33959ebb9..7ddcb9699 100644 --- a/pymongo/collection.py +++ b/pymongo/collection.py @@ -138,12 +138,6 @@ class Collection(common.BaseObject): collection.__my_collection__ - .. versionchanged:: 2.2 - Removed deprecated argument: options - - .. versionadded:: 2.1 - uuid_subtype attribute - .. mongodoc:: collections """ super(Collection, self).__init__( @@ -1382,19 +1376,6 @@ class Collection(common.BaseObject): expression object. Soft deprecated the ``manipulate`` option. - .. versionchanged:: 2.7 - Added ``compile_re`` option. If set to False, PyMongo represented - BSON regular expressions as :class:`~bson.regex.Regex` objects - instead of attempting to compile BSON regular expressions as Python - native regular expressions, thus preventing errors for some - incompatible patterns, see `PYTHON-500`_. - - .. versionchanged:: 2.3 - Added the ``tag_sets`` and ``secondary_acceptable_latency_ms`` - parameters. - - .. _PYTHON-500: https://jira.mongodb.org/browse/PYTHON-500 - .. mongodoc:: find """ @@ -2072,13 +2053,6 @@ class Collection(common.BaseObject): .. versionchanged:: 3.0 The :meth:`aggregate` method always returns a CommandCursor. The pipeline argument must be a list. - .. versionchanged:: 2.7 - When the cursor option is used, return - :class:`~pymongo.command_cursor.CommandCursor` instead of - :class:`~pymongo.cursor.Cursor`. - .. versionchanged:: 2.6 - Added cursor support. - .. versionadded:: 2.3 .. seealso:: :doc:`/examples/aggregation` diff --git a/pymongo/cursor.py b/pymongo/cursor.py index 7370a585a..5608c71b2 100644 --- a/pymongo/cursor.py +++ b/pymongo/cursor.py @@ -879,9 +879,6 @@ class Cursor(object): :Parameters: - `index`: index to hint on (as an index specifier) - - .. versionchanged:: 2.8 - The :meth:`~hint` method accepts the name of the index. """ self.__check_okay_to_chain() self.__set_hint(index) diff --git a/pymongo/database.py b/pymongo/database.py index 61d87611d..ea9d4a1dd 100644 --- a/pymongo/database.py +++ b/pymongo/database.py @@ -299,9 +299,6 @@ class Database(common.BaseObject): .. versionchanged:: 3.0 Added the codec_options, read_preference, and write_concern options. - .. versionchanged:: 2.2 - Removed deprecated argument: options - .. _create collection command: https://docs.mongodb.com/manual/reference/command/create """ @@ -588,21 +585,6 @@ class Database(common.BaseObject): BSON regular expression to a Python regular expression object. Added the `codec_options` parameter. - .. versionchanged:: 2.7 - Added `compile_re` option. If set to False, PyMongo represented BSON - regular expressions as :class:`~bson.regex.Regex` objects instead of - attempting to compile BSON regular expressions as Python native - regular expressions, thus preventing errors for some incompatible - patterns, see `PYTHON-500`_. - - .. versionchanged:: 2.3 - Added `tag_sets` and `secondary_acceptable_latency_ms` options. - .. versionchanged:: 2.2 - Added support for `as_class` - the class you want to use for - the resulting documents - - .. _PYTHON-500: https://jira.mongodb.org/browse/PYTHON-500 - .. mongodoc:: commands """ if read_preference is None: diff --git a/pymongo/uri_parser.py b/pymongo/uri_parser.py index 6801900c9..95327eed8 100644 --- a/pymongo/uri_parser.py +++ b/pymongo/uri_parser.py @@ -44,9 +44,6 @@ def parse_userinfo(userinfo): :Paramaters: - `userinfo`: A string of the form : - - .. versionchanged:: 2.2 - Now uses `urllib.unquote_plus` so `+` characters must be escaped. """ if '@' in userinfo or userinfo.count(':') > 1: raise InvalidURI("Username and password must be escaped according to "