Skip to content

Commit a025199

Browse files
committed
Merge branch 'master' of github.com:MongoEngine/mongoengine into remove_useless_cls_var
2 parents a4fff15 + 87babaa commit a025199

File tree

7 files changed

+47
-190
lines changed

7 files changed

+47
-190
lines changed

docs/guide/gridfs.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
GridFS
33
======
44

5-
.. versionadded:: 0.4
6-
75
Writing
86
-------
97

mongoengine/base/fields.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
class BaseField:
1616
"""A base class for fields in a MongoDB document. Instances of this class
1717
may be added to subclasses of `Document` to define a document's schema.
18-
19-
.. versionchanged:: 0.5 - added verbose and help text
2018
"""
2119

2220
name = None # set in TopLevelDocumentMetaclass
@@ -264,8 +262,6 @@ class ComplexBaseField(BaseField):
264262
Allows for nesting of embedded documents inside complex types.
265263
Handles the lazy dereferencing of a queryset by lazily dereferencing all
266264
items in a list / dict rather than one at a time.
267-
268-
.. versionadded:: 0.5
269265
"""
270266

271267
def __init__(self, field=None, **kwargs):
@@ -522,8 +518,6 @@ def validate(self, value):
522518

523519
class GeoJsonBaseField(BaseField):
524520
"""A geo json field storing a geojson style object.
525-
526-
.. versionadded:: 0.8
527521
"""
528522

529523
_geo_index = pymongo.GEOSPHERE

mongoengine/connection.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ def _get_connection_settings(
7474
: param kwargs: ad-hoc parameters to be passed into the pymongo driver,
7575
for example maxpoolsize, tz_aware, etc. See the documentation
7676
for pymongo's `MongoClient` for a full list.
77-
78-
.. versionchanged:: 0.10.6 - added mongomock support
7977
"""
8078
conn_settings = {
8179
"name": name or db or DEFAULT_DATABASE_NAME,
@@ -201,8 +199,6 @@ def register_connection(
201199
: param kwargs: ad-hoc parameters to be passed into the pymongo driver,
202200
for example maxpoolsize, tz_aware, etc. See the documentation
203201
for pymongo's `MongoClient` for a full list.
204-
205-
.. versionchanged:: 0.10.6 - added mongomock support
206202
"""
207203
conn_settings = _get_connection_settings(
208204
db=db,
@@ -386,8 +382,6 @@ def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):
386382
387383
See the docstring for `register_connection` for more details about all
388384
supported kwargs.
389-
390-
.. versionchanged:: 0.6 - added multiple database support.
391385
"""
392386
if alias in _connections:
393387
prev_conn_setting = _connection_settings[alias]

mongoengine/document.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -366,15 +366,6 @@ def save(
366366
meta['cascade'] = True. Also you can pass different kwargs to
367367
the cascade save using cascade_kwargs which overwrites the
368368
existing kwargs with custom values.
369-
.. versionchanged:: 0.8.5
370-
Optional save_condition that only overwrites existing documents
371-
if the condition is satisfied in the current db record.
372-
.. versionchanged:: 0.10
373-
:class:`OperationError` exception raised if save_condition fails.
374-
.. versionchanged:: 0.10.1
375-
:class: save_condition failure now raises a `SaveConditionError`
376-
.. versionchanged:: 0.10.7
377-
Add signal_kwargs argument
378369
"""
379370
signal_kwargs = signal_kwargs or {}
380371

@@ -629,9 +620,6 @@ def delete(self, signal_kwargs=None, **write_concern):
629620
For example, ``save(..., w: 2, fsync: True)`` will
630621
wait until at least two servers have recorded the write and
631622
will force an fsync on the primary server.
632-
633-
.. versionchanged:: 0.10.7
634-
Add signal_kwargs argument
635623
"""
636624
signal_kwargs = signal_kwargs or {}
637625
signals.pre_delete.send(self.__class__, document=self, **signal_kwargs)
@@ -713,8 +701,6 @@ def switch_collection(self, collection_name, keep_created=True):
713701
def select_related(self, max_depth=1):
714702
"""Handles dereferencing of :class:`~bson.dbref.DBRef` objects to
715703
a maximum depth in order to cut down the number queries to mongodb.
716-
717-
.. versionadded:: 0.5
718704
"""
719705
DeReference = _import_class("DeReference")
720706
DeReference()([self], max_depth + 1)
@@ -725,10 +711,6 @@ def reload(self, *fields, **kwargs):
725711
726712
:param fields: (optional) args list of fields to reload
727713
:param max_depth: (optional) depth of dereferencing to follow
728-
729-
.. versionadded:: 0.1.2
730-
.. versionchanged:: 0.6 Now chainable
731-
.. versionchanged:: 0.9 Can provide specific fields to reload
732714
"""
733715
max_depth = 1
734716
if fields and isinstance(fields[0], int):
@@ -830,9 +812,6 @@ def drop_collection(cls):
830812
831813
Raises :class:`OperationError` if the document has no collection set
832814
(i.g. if it is `abstract`)
833-
834-
.. versionchanged:: 0.10.7
835-
:class:`OperationError` exception raised if no collection available
836815
"""
837816
coll_name = cls._get_collection_name()
838817
if not coll_name:
@@ -1087,8 +1066,6 @@ class MapReduceDocument:
10871066
an ``ObjectId`` found in the given ``collection``,
10881067
the object can be accessed via the ``object`` property.
10891068
:param value: The result(s) for this key.
1090-
1091-
.. versionadded:: 0.3
10921069
"""
10931070

10941071
def __init__(self, document, collection, key, value):

0 commit comments

Comments
 (0)