From 0aeb1ca408c6e3cf15eaf51aabddfbe72fb3e72a Mon Sep 17 00:00:00 2001 From: Matthieu Rigal Date: Wed, 24 Jun 2015 00:50:36 +0200 Subject: [PATCH] Various fixes again --- docs/_themes/sphinx_rtd_theme/footer.html | 2 +- docs/guide/querying.rst | 2 +- mongoengine/base/datastructures.py | 2 +- mongoengine/base/document.py | 16 +++++------ mongoengine/base/fields.py | 6 ++-- mongoengine/base/metaclasses.py | 21 +++++++------- mongoengine/dereference.py | 8 +++--- mongoengine/document.py | 3 +- mongoengine/errors.py | 2 +- mongoengine/fields.py | 19 ++++++------- mongoengine/queryset/base.py | 34 +++++++++++------------ mongoengine/queryset/queryset.py | 2 +- mongoengine/queryset/transform.py | 4 +-- tests/document/delta.py | 10 +++---- tests/document/dynamic.py | 5 ++-- tests/document/indexes.py | 2 +- tests/document/instance.py | 4 +-- tests/fields/__init__.py | 2 +- tests/fields/fields.py | 15 +++++----- tests/fields/file_tests.py | 8 +++--- tests/fields/geo.py | 4 +-- tests/test_datastructures.py | 6 +++- 22 files changed, 88 insertions(+), 89 deletions(-) diff --git a/docs/_themes/sphinx_rtd_theme/footer.html b/docs/_themes/sphinx_rtd_theme/footer.html index e42d753f..1fa05eaa 100755 --- a/docs/_themes/sphinx_rtd_theme/footer.html +++ b/docs/_themes/sphinx_rtd_theme/footer.html @@ -2,7 +2,7 @@ {% if next or prev %}
{% if next %} - Next + Next {% endif %} {% if prev %} Previous diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst index 688fc9e9..f2e71b04 100644 --- a/docs/guide/querying.rst +++ b/docs/guide/querying.rst @@ -598,7 +598,7 @@ Some variables are made available in the scope of the Javascript function: The following example demonstrates the intended usage of :meth:`~mongoengine.queryset.QuerySet.exec_js` by defining a function that sums -over a field on a document (this functionality is already available throught +over a field on a document (this functionality is already available through :meth:`~mongoengine.queryset.QuerySet.sum` but is shown here for sake of example):: diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py index 8c71c587..e4d2b392 100644 --- a/mongoengine/base/datastructures.py +++ b/mongoengine/base/datastructures.py @@ -443,7 +443,7 @@ class StrictDict(object): class SemiStrictDict(StrictDict): - __slots__ = ('_extras') + __slots__ = ('_extras', ) _classes = {} def __getattr__(self, attr): diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py index 747d3970..ee807cb4 100644 --- a/mongoengine/base/document.py +++ b/mongoengine/base/document.py @@ -149,7 +149,6 @@ class BaseDocument(object): # Handle dynamic data only if an initialised dynamic document if self._dynamic and not self._dynamic_lock: - field = None if not hasattr(self, name) and not name.startswith('_'): DynamicField = _import_class("DynamicField") field = DynamicField(db_field=name) @@ -182,8 +181,8 @@ class BaseDocument(object): except AttributeError: self__initialised = False # Check if the user has created a new instance of a class - if (self._is_document and self__initialised - and self__created and name == self._meta.get('id_field')): + if (self._is_document and self__initialised and + self__created and name == self._meta.get('id_field')): super(BaseDocument, self).__setattr__('_created', False) super(BaseDocument, self).__setattr__(name, value) @@ -327,7 +326,7 @@ class BaseDocument(object): if value is not None: - if isinstance(field, (EmbeddedDocumentField)): + if isinstance(field, EmbeddedDocumentField): if fields: key = '%s.' % field_name embedded_fields = [ @@ -416,7 +415,8 @@ class BaseDocument(object): def to_json(self, *args, **kwargs): """Converts a document to JSON. - :param use_db_field: Set to True by default but enables the output of the json structure with the field names and not the mongodb store db_names in case of set to False + :param use_db_field: Set to True by default but enables the output of the json structure with the field names + and not the mongodb store db_names in case of set to False """ use_db_field = kwargs.pop('use_db_field', True) return json_util.dumps(self.to_mongo(use_db_field), *args, **kwargs) @@ -577,7 +577,7 @@ class BaseDocument(object): if (hasattr(field, 'field') and isinstance(field.field, ReferenceField)): continue - elif (isinstance(field, SortedListField) and field._ordering): + elif isinstance(field, SortedListField) and field._ordering: # if ordering is affected whole list is changed if any(map(lambda d: field._ordering in d._changed_fields, data)): changed_fields.append(db_field_name) @@ -627,7 +627,7 @@ class BaseDocument(object): if value or isinstance(value, (numbers.Number, bool)): continue - # If we've set a value that ain't the default value dont unset it. + # If we've set a value that ain't the default value don't unset it. default = None if (self._dynamic and len(parts) and parts[0] in self._dynamic_fields): @@ -979,7 +979,7 @@ class BaseDocument(object): if hasattr(getattr(field, 'field', None), 'lookup_member'): new_field = field.field.lookup_member(field_name) elif cls._dynamic and (isinstance(field, DynamicField) or - getattr(getattr(field, 'document_type'), '_dynamic')): + getattr(getattr(field, 'document_type'), '_dynamic')): new_field = DynamicField(db_field=field_name) else: # Look up subfield on the previous field or raise diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py index 02934d47..21a24358 100644 --- a/mongoengine/base/fields.py +++ b/mongoengine/base/fields.py @@ -112,7 +112,7 @@ class BaseField(object): """Descriptor for assigning a value to a field in a document. """ - # If setting to None and theres a default + # If setting to None and there is a default # Then set the value to the default value if value is None: if self.null: @@ -259,8 +259,8 @@ class ComplexBaseField(BaseField): instance._data[self.name] = value if (self._auto_dereference and instance._initialised and - isinstance(value, (BaseList, BaseDict)) - and not value._dereferenced): + isinstance(value, (BaseList, BaseDict)) and + not value._dereferenced): value = _dereference( value, max_depth=1, instance=instance, name=self.name ) diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py index 664c849e..b5981aae 100644 --- a/mongoengine/base/metaclasses.py +++ b/mongoengine/base/metaclasses.py @@ -110,7 +110,7 @@ class DocumentMetaclass(type): for base in flattened_bases: if (not getattr(base, '_is_base_cls', True) and not getattr(base, '_meta', {}).get('abstract', True)): - # Collate heirarchy for _cls and _subclasses + # Collate hierarchy for _cls and _subclasses class_name.append(base.__name__) if hasattr(base, '_meta'): @@ -183,7 +183,7 @@ class DocumentMetaclass(type): "CachedReferenceFields is not allowed in EmbeddedDocuments") if not f.document_type: raise InvalidDocumentError( - "Document is not avaiable to sync") + "Document is not available to sync") if f.auto_sync: f.start_listener() @@ -245,7 +245,7 @@ class DocumentMetaclass(type): EmbeddedDocument = _import_class('EmbeddedDocument') DictField = _import_class('DictField') CachedReferenceField = _import_class('CachedReferenceField') - return (Document, EmbeddedDocument, DictField, CachedReferenceField) + return Document, EmbeddedDocument, DictField, CachedReferenceField class TopLevelDocumentMetaclass(DocumentMetaclass): @@ -301,8 +301,8 @@ class TopLevelDocumentMetaclass(DocumentMetaclass): # Prevent classes setting collection different to their parents # If parent wasn't an abstract class - if (parent_doc_cls and 'collection' in attrs.get('_meta', {}) - and not parent_doc_cls._meta.get('abstract', True)): + if (parent_doc_cls and 'collection' in attrs.get('_meta', {}) and + not parent_doc_cls._meta.get('abstract', True)): msg = "Trying to set a collection on a subclass (%s)" % name warnings.warn(msg, SyntaxWarning) del attrs['_meta']['collection'] @@ -408,14 +408,15 @@ class TopLevelDocumentMetaclass(DocumentMetaclass): return new_class - def get_auto_id_names(self): + @classmethod + def get_auto_id_names(cls, new_class): id_name, id_db_name = ('id', '_id') - if id_name not in self._fields and \ - id_db_name not in (v.db_field for v in self._fields.values()): + if id_name not in new_class._fields and \ + id_db_name not in (v.db_field for v in new_class._fields.values()): return id_name, id_db_name id_basename, id_db_basename, i = 'auto_id', '_auto_id', 0 - while id_name in self._fields or \ - id_db_name in (v.db_field for v in self._fields.values()): + while id_name in new_class._fields or \ + id_db_name in (v.db_field for v in new_class._fields.values()): id_name = '{0}_{1}'.format(id_basename, i) id_db_name = '{0}_{1}'.format(id_db_basename, i) i += 1 diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py index 4449acb6..7fcc2ad2 100644 --- a/mongoengine/dereference.py +++ b/mongoengine/dereference.py @@ -100,7 +100,7 @@ class DeReference(object): if isinstance(item, (Document, EmbeddedDocument)): for field_name, field in item._fields.iteritems(): v = item._data.get(field_name, None) - if isinstance(v, (DBRef)): + if isinstance(v, DBRef): reference_map.setdefault(field.document_type, set()).add(v.id) elif isinstance(v, (dict, SON)) and '_ref' in v: reference_map.setdefault(get_document(v['_cls']), set()).add(v['_ref'].id) @@ -111,7 +111,7 @@ class DeReference(object): if isinstance(field_cls, (Document, TopLevelDocumentMetaclass)): key = field_cls reference_map.setdefault(key, set()).update(refs) - elif isinstance(item, (DBRef)): + elif isinstance(item, DBRef): reference_map.setdefault(item.collection, set()).add(item.id) elif isinstance(item, (dict, SON)) and '_ref' in item: reference_map.setdefault(get_document(item['_cls']), set()).add(item['_ref'].id) @@ -219,12 +219,12 @@ class DeReference(object): elif isinstance(v, (Document, EmbeddedDocument)): for field_name, field in v._fields.iteritems(): v = data[k]._data.get(field_name, None) - if isinstance(v, (DBRef)): + if isinstance(v, DBRef): data[k]._data[field_name] = self.object_map.get( (v.collection, v.id), v) elif isinstance(v, (dict, SON)) and '_ref' in v: data[k]._data[field_name] = self.object_map.get( - (v['_ref'].collection , v['_ref'].id), v) + (v['_ref'].collection, v['_ref'].id), v) elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth: item_name = "{0}.{1}.{2}".format(name, k, field_name) data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=item_name) diff --git a/mongoengine/document.py b/mongoengine/document.py index 07f85f16..c5498750 100644 --- a/mongoengine/document.py +++ b/mongoengine/document.py @@ -3,7 +3,6 @@ import pymongo import re from pymongo.read_preferences import ReadPreference -from bson import ObjectId from bson.dbref import DBRef from mongoengine import signals from mongoengine.common import _import_class @@ -61,7 +60,7 @@ class EmbeddedDocument(BaseDocument): dictionary. """ - __slots__ = ('_instance') + __slots__ = ('_instance', ) # The __metaclass__ attribute is removed by 2to3 when running with Python3 # my_metaclass is defined so that metaclass can be queried in Python 2 & 3 diff --git a/mongoengine/errors.py b/mongoengine/errors.py index ba33b57f..b7fb7632 100644 --- a/mongoengine/errors.py +++ b/mongoengine/errors.py @@ -126,7 +126,7 @@ class ValidationError(AssertionError): def generate_key(value, prefix=''): if isinstance(value, list): value = ' '.join([generate_key(k) for k in value]) - if isinstance(value, dict): + elif isinstance(value, dict): value = ' '.join( [generate_key(v, k) for k, v in value.iteritems()]) diff --git a/mongoengine/fields.py b/mongoengine/fields.py index 4a50593e..bc16d1b6 100644 --- a/mongoengine/fields.py +++ b/mongoengine/fields.py @@ -667,7 +667,6 @@ class DynamicField(BaseField): return StringField().prepare_query_value(op, value) return super(DynamicField, self).prepare_query_value(op, self.to_mongo(value)) - def validate(self, value, clean=True): if hasattr(value, "validate"): value.validate(clean=clean) @@ -698,9 +697,10 @@ class ListField(ComplexBaseField): def prepare_query_value(self, op, value): if self.field: - if op in ('set', 'unset') and (not isinstance(value, basestring) - and not isinstance(value, BaseDocument) - and hasattr(value, '__iter__')): + if op in ('set', 'unset') and ( + not isinstance(value, basestring) and + not isinstance(value, BaseDocument) and + hasattr(value, '__iter__')): return [self.field.prepare_query_value(op, v) for v in value] return self.field.prepare_query_value(op, value) return super(ListField, self).prepare_query_value(op, value) @@ -718,12 +718,10 @@ class EmbeddedDocumentListField(ListField): """ - def __init__(self, document_type, *args, **kwargs): + def __init__(self, document_type, **kwargs): """ :param document_type: The type of :class:`~mongoengine.EmbeddedDocument` the list will hold. - :param args: Arguments passed directly into the parent - :class:`~mongoengine.ListField`. :param kwargs: Keyword arguments passed directly into the parent :class:`~mongoengine.ListField`. """ @@ -975,7 +973,6 @@ class ReferenceField(BaseField): super(ReferenceField, self).prepare_query_value(op, value) return self.to_mongo(value) - def validate(self, value): if not isinstance(value, (self.document_type, DBRef)): @@ -1100,7 +1097,7 @@ class CachedReferenceField(BaseField): def validate(self, value): - if not isinstance(value, (self.document_type)): + if not isinstance(value, self.document_type): self.error("A CachedReferenceField only accepts documents") if isinstance(value, Document) and value.id is None: @@ -1419,7 +1416,7 @@ class FileField(BaseField): def __set__(self, instance, value): key = self.name if ((hasattr(value, 'read') and not - isinstance(value, GridFSProxy)) or isinstance(value, str_types)): + isinstance(value, GridFSProxy)) or isinstance(value, str_types)): # using "FileField() = file/string" notation grid_file = instance._data.get(self.name) # If a file already exists, delete it @@ -1553,7 +1550,7 @@ class ImageGridFsProxy(GridFSProxy): if out and out.thumbnail_id: self.fs.delete(out.thumbnail_id) - return super(ImageGridFsProxy, self).delete(*args, **kwargs) + return super(ImageGridFsProxy, self).delete() def _put_thumbnail(self, thumbnail, format, progressive, **kwargs): w, h = thumbnail.size diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py index a8f55bfd..50b2ee19 100644 --- a/mongoengine/queryset/base.py +++ b/mongoengine/queryset/base.py @@ -86,8 +86,8 @@ class BaseQuerySet(object): self.only_fields = [] self._max_time_ms = None - def __call__(self, q_obj=None, class_check=True, slave_okay=False, - read_preference=None, **query): + def __call__(self, q_obj=None, class_check=True, read_preference=None, + **query): """Filter the selected documents by calling the :class:`~mongoengine.queryset.QuerySet` with a query. @@ -97,9 +97,7 @@ class BaseQuerySet(object): objects, only the last one will be used :param class_check: If set to False bypass class name check when querying collection - :param slave_okay: if True, allows this query to be run against a - replica secondary. - :params read_preference: if set, overrides connection-level + :param read_preference: if set, overrides connection-level read_preference from `ReplicaSetConnection`. :param query: Django-style query keyword arguments """ @@ -204,7 +202,8 @@ class BaseQuerySet(object): :param language: The language that determines the list of stop words for the search and the rules for the stemmer and tokenizer. If not specified, the search uses the default language of the index. - For supported languages, see `Text Search Languages `. + For supported languages, see + `Text Search Languages `. """ queryset = self.clone() if queryset._search_text: @@ -270,7 +269,7 @@ class BaseQuerySet(object): def insert(self, doc_or_docs, load_bulk=True, write_concern=None): """bulk insert documents - :param docs_or_doc: a document or list of documents to be inserted + :param doc_or_docs: a document or list of documents to be inserted :param load_bulk (optional): If True returns the list of document instances :param write_concern: Extra keyword arguments are passed down to @@ -405,8 +404,8 @@ class BaseQuerySet(object): if rule == CASCADE: ref_q = document_cls.objects(**{field_name + '__in': self}) ref_q_count = ref_q.count() - if (doc != document_cls and ref_q_count > 0 - or (doc == document_cls and ref_q_count > 0)): + if (doc != document_cls and ref_q_count > 0 or + (doc == document_cls and ref_q_count > 0)): ref_q.delete(write_concern=write_concern) elif rule == NULLIFY: document_cls.objects(**{field_name + '__in': self}).update( @@ -527,7 +526,7 @@ class BaseQuerySet(object): try: if IS_PYMONGO_3: if full_response: - msg = ("With PyMongo 3+, it is not possible anymore to get the full response.") + msg = "With PyMongo 3+, it is not possible anymore to get the full response." warnings.warn(msg, DeprecationWarning) if remove: result = queryset._collection.find_one_and_delete( @@ -619,7 +618,8 @@ class BaseQuerySet(object): return self def using(self, alias): - """This method is for controlling which database the QuerySet will be evaluated against if you are using more than one database. + """This method is for controlling which database the QuerySet will be + evaluated against if you are using more than one database. :param alias: The database alias @@ -966,7 +966,7 @@ class BaseQuerySet(object): """Instead of returning Document instances, return raw values from pymongo. - :param coerce_type: Field types (if applicable) would be use to + :param coerce_types: Field types (if applicable) would be use to coerce types. """ queryset = self.clone() @@ -1258,8 +1258,8 @@ class BaseQuerySet(object): the aggregation framework instead of map-reduce. """ result = self._document._get_collection().aggregate([ - { '$match': self._query }, - { '$group': { '_id': 'sum', 'total': { '$sum': '$' + field } } } + {'$match': self._query}, + {'$group': {'_id': 'sum', 'total': {'$sum': '$' + field}}} ]) if IS_PYMONGO_3: result = list(result) @@ -1334,8 +1334,8 @@ class BaseQuerySet(object): uses the aggregation framework instead of map-reduce. """ result = self._document._get_collection().aggregate([ - { '$match': self._query }, - { '$group': { '_id': 'avg', 'total': { '$avg': '$' + field } } } + {'$match': self._query}, + {'$group': {'_id': 'avg', 'total': {'$avg': '$' + field}}} ]) if IS_PYMONGO_3: result = list(result) @@ -1637,7 +1637,7 @@ class BaseQuerySet(object): ret.append(subfield) found = True break - except LookUpError, e: + except LookUpError: pass if not found: diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py index 1056de9b..6e5f7220 100644 --- a/mongoengine/queryset/queryset.py +++ b/mongoengine/queryset/queryset.py @@ -160,4 +160,4 @@ class QuerySetNoDeRef(QuerySet): """Special no_dereference QuerySet""" def __dereference(items, max_depth=1, instance=None, name=None): - return items \ No newline at end of file + return items diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py index 43542ac4..03f3acf0 100644 --- a/mongoengine/queryset/transform.py +++ b/mongoengine/queryset/transform.py @@ -44,8 +44,8 @@ def query(_doc_cls=None, **query): if len(parts) > 1 and parts[-1] in MATCH_OPERATORS: op = parts.pop() - #if user escape field name by __ - if len(parts) > 1 and parts[-1]=="": + # Allw to escape operator-like field name by __ + if len(parts) > 1 and parts[-1] == "": parts.pop() negate = False diff --git a/tests/document/delta.py b/tests/document/delta.py index de940577..cd37f415 100644 --- a/tests/document/delta.py +++ b/tests/document/delta.py @@ -253,13 +253,13 @@ class DeltaTest(unittest.TestCase): self.assertEqual(doc.embedded_field.list_field[2].list_field, [1, 2, {'hello': 'world'}]) - del(doc.embedded_field.list_field[2].list_field[2]['hello']) + del doc.embedded_field.list_field[2].list_field[2]['hello'] self.assertEqual(doc._delta(), ({}, {'embedded_field.list_field.2.list_field.2.hello': 1})) doc.save() doc = doc.reload(10) - del(doc.embedded_field.list_field[2].list_field) + del doc.embedded_field.list_field[2].list_field self.assertEqual(doc._delta(), ({}, {'embedded_field.list_field.2.list_field': 1})) @@ -593,13 +593,13 @@ class DeltaTest(unittest.TestCase): self.assertEqual(doc.embedded_field.list_field[2].list_field, [1, 2, {'hello': 'world'}]) - del(doc.embedded_field.list_field[2].list_field[2]['hello']) + del doc.embedded_field.list_field[2].list_field[2]['hello'] self.assertEqual(doc._delta(), ({}, {'db_embedded_field.db_list_field.2.db_list_field.2.hello': 1})) doc.save() doc = doc.reload(10) - del(doc.embedded_field.list_field[2].list_field) + del doc.embedded_field.list_field[2].list_field self.assertEqual(doc._delta(), ({}, {'db_embedded_field.db_list_field.2.db_list_field': 1})) @@ -615,7 +615,7 @@ class DeltaTest(unittest.TestCase): SON([('_cls', 'Person'), ('name', 'James'), ('age', 34)]), {})) p.doc = 123 - del(p.doc) + del p.doc self.assertEqual(p._delta(), ( SON([('_cls', 'Person'), ('name', 'James'), ('age', 34)]), {})) diff --git a/tests/document/dynamic.py b/tests/document/dynamic.py index b2947df4..e4289bd2 100644 --- a/tests/document/dynamic.py +++ b/tests/document/dynamic.py @@ -72,7 +72,7 @@ class DynamicTest(unittest.TestCase): obj = collection.find_one() self.assertEqual(sorted(obj.keys()), ['_cls', '_id', 'misc', 'name']) - del(p.misc) + del p.misc p.save() p = self.Person.objects.get() @@ -340,7 +340,7 @@ class DynamicTest(unittest.TestCase): person = Person.objects.first() person.attrval = "This works" - person["phone"] = "555-1212" # but this should too + person["phone"] = "555-1212" # but this should too # Same thing two levels deep person["address"]["city"] = "Lundenne" @@ -356,7 +356,6 @@ class DynamicTest(unittest.TestCase): self.assertEqual(Person.objects.first().address.city, "Londinium") - person = Person.objects.first() person["age"] = 35 person.save() diff --git a/tests/document/indexes.py b/tests/document/indexes.py index dcc71e5b..db1b4562 100644 --- a/tests/document/indexes.py +++ b/tests/document/indexes.py @@ -143,7 +143,7 @@ class IndexesTest(unittest.TestCase): meta = { 'indexes': [ { - 'fields': ('title',), + 'fields': ('title',), }, ], 'allow_inheritance': True, diff --git a/tests/document/instance.py b/tests/document/instance.py index fceec02f..ea7d5668 100644 --- a/tests/document/instance.py +++ b/tests/document/instance.py @@ -1897,11 +1897,11 @@ class InstanceTest(unittest.TestCase): self.assertEqual(BlogPost.objects.count(), 0) def test_reverse_delete_rule_cascade_triggers_pre_delete_signal(self): - ''' ensure the pre_delete signal is triggered upon a cascading deletion + """ ensure the pre_delete signal is triggered upon a cascading deletion setup a blog post with content, an author and editor delete the author which triggers deletion of blogpost via cascade blog post's pre_delete signal alters an editor attribute - ''' + """ class Editor(self.Person): review_queue = IntField(default=0) diff --git a/tests/fields/__init__.py b/tests/fields/__init__.py index be70aaaa..8e0640db 100644 --- a/tests/fields/__init__.py +++ b/tests/fields/__init__.py @@ -1,3 +1,3 @@ from fields import * from file_tests import * -from geo import * \ No newline at end of file +from geo import * diff --git a/tests/fields/fields.py b/tests/fields/fields.py index 9b682fac..011a54d4 100644 --- a/tests/fields/fields.py +++ b/tests/fields/fields.py @@ -946,7 +946,7 @@ class FieldTest(unittest.TestCase): BlogPost.drop_collection() def test_reverse_list_sorting(self): - '''Ensure that a reverse sorted list field properly sorts values''' + """Ensure that a reverse sorted list field properly sorts values""" class Category(EmbeddedDocument): count = IntField() @@ -1334,7 +1334,6 @@ class FieldTest(unittest.TestCase): def test_atomic_update_dict_field(self): """Ensure that the entire DictField can be atomically updated.""" - class Simple(Document): mapping = DictField(field=ListField(IntField(required=True))) @@ -1349,7 +1348,7 @@ class FieldTest(unittest.TestCase): self.assertEqual({"ints": [3, 4]}, e.mapping) def create_invalid_mapping(): - e.update(set__mapping={"somestrings": ["foo", "bar",]}) + e.update(set__mapping={"somestrings": ["foo", "bar", ]}) self.assertRaises(ValueError, create_invalid_mapping) @@ -1460,7 +1459,7 @@ class FieldTest(unittest.TestCase): class Action(EmbeddedDocument): operation = StringField() - object = StringField() + object = StringField() class Log(Document): name = StringField() @@ -3774,7 +3773,7 @@ class EmbeddedDocumentListFieldTestCase(unittest.TestCase): class A(Document): my_list = ListField(EmbeddedDocumentField(EmbeddedWithUnique)) - a1 = A(my_list=[]).save() + A(my_list=[]).save() self.assertRaises(NotUniqueError, lambda: A(my_list=[]).save()) class EmbeddedWithSparseUnique(EmbeddedDocument): @@ -3783,9 +3782,8 @@ class EmbeddedDocumentListFieldTestCase(unittest.TestCase): class B(Document): my_list = ListField(EmbeddedDocumentField(EmbeddedWithSparseUnique)) - b1 = B(my_list=[]).save() - b2 = B(my_list=[]).save() - + B(my_list=[]).save() + B(my_list=[]).save() def test_filtered_delete(self): """ @@ -3824,6 +3822,7 @@ class EmbeddedDocumentListFieldTestCase(unittest.TestCase): and doesn't interfere with the rest of field functionalities. """ custom_data = {'a': 'a_value', 'b': [1, 2]} + class CustomData(Document): a_field = IntField() c_field = IntField(custom_data=custom_data) diff --git a/tests/fields/file_tests.py b/tests/fields/file_tests.py index 4bd1b164..7c5abeac 100644 --- a/tests/fields/file_tests.py +++ b/tests/fields/file_tests.py @@ -12,7 +12,7 @@ import gridfs from nose.plugins.skip import SkipTest from mongoengine import * from mongoengine.connection import get_db -from mongoengine.python_support import PY3, b, StringIO +from mongoengine.python_support import b, StringIO try: from PIL import Image @@ -112,7 +112,7 @@ class FileTest(unittest.TestCase): result.the_file.delete() # Ensure deleted file returns None - self.assertTrue(result.the_file.read() == None) + self.assertTrue(result.the_file.read() is None) def test_file_fields_stream_after_none(self): """Ensure that a file field can be written to after it has been saved as @@ -138,7 +138,7 @@ class FileTest(unittest.TestCase): result = StreamFile.objects.first() self.assertTrue(streamfile == result) self.assertEqual(result.the_file.read(), text + more_text) - #self.assertEqual(result.the_file.content_type, content_type) + # self.assertEqual(result.the_file.content_type, content_type) result.the_file.seek(0) self.assertEqual(result.the_file.tell(), 0) self.assertEqual(result.the_file.read(len(text)), text) @@ -148,7 +148,7 @@ class FileTest(unittest.TestCase): result.the_file.delete() # Ensure deleted file returns None - self.assertTrue(result.the_file.read() == None) + self.assertTrue(result.the_file.read() is None) def test_file_fields_set(self): diff --git a/tests/fields/geo.py b/tests/fields/geo.py index a0d2237a..c3f41481 100644 --- a/tests/fields/geo.py +++ b/tests/fields/geo.py @@ -115,7 +115,7 @@ class GeoFieldTest(unittest.TestCase): expected = "Invalid LineString:\nBoth values (%s) in point must be float or int" % repr(coord[0]) self._test_for_expected_error(Location, coord, expected) - Location(loc=[[1, 2], [3, 4], [5, 6], [1,2]]).validate() + Location(loc=[[1, 2], [3, 4], [5, 6], [1, 2]]).validate() def test_polygon_validation(self): class Location(Document): @@ -226,7 +226,7 @@ class GeoFieldTest(unittest.TestCase): expected = "Invalid MultiLineString:\nBoth values (%s) in point must be float or int" % repr(coord[0][0]) self._test_for_expected_error(Location, coord, expected) - Location(loc=[[[1, 2], [3, 4], [5, 6], [1,2]]]).validate() + Location(loc=[[[1, 2], [3, 4], [5, 6], [1, 2]]]).validate() def test_multipolygon_validation(self): class Location(Document): diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py index c761a41e..716df651 100644 --- a/tests/test_datastructures.py +++ b/tests/test_datastructures.py @@ -1,11 +1,14 @@ import unittest from mongoengine.base.datastructures import StrictDict, SemiStrictDict + class TestStrictDict(unittest.TestCase): def strict_dict_class(self, *args, **kwargs): return StrictDict.create(*args, **kwargs) + def setUp(self): self.dtype = self.strict_dict_class(("a", "b", "c")) + def test_init(self): d = self.dtype(a=1, b=1, c=1) self.assertEqual((d.a, d.b, d.c), (1, 1, 1)) @@ -38,8 +41,9 @@ class TestStrictDict(unittest.TestCase): def test_setattr_raises_on_nonexisting_attr(self): d = self.dtype() + def _f(): - d.x=1 + d.x = 1 self.assertRaises(AttributeError, _f) def test_setattr_getattr_special(self):