fix flake8 warnings
This commit is contained in:
parent
eabb8f60f5
commit
8a1a68ea7c
@ -1,17 +1,17 @@
|
|||||||
fail_fast: false
|
fail_fast: false
|
||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/ambv/black
|
- repo: https://github.com/ambv/black
|
||||||
rev: 20.8b1
|
rev: 20.8b1
|
||||||
hooks:
|
hooks:
|
||||||
- id: black
|
- id: black
|
||||||
- repo: https://gitlab.com/pycqa/flake8
|
- repo: https://gitlab.com/pycqa/flake8
|
||||||
rev: 3.8.0a2
|
rev: 3.8.0a2
|
||||||
hooks:
|
hooks:
|
||||||
- id: flake8
|
- id: flake8
|
||||||
additional_dependencies:
|
additional_dependencies:
|
||||||
- flake8-import-order
|
- flake8-import-order
|
||||||
- repo: https://github.com/asottile/pyupgrade
|
- repo: https://github.com/asottile/pyupgrade
|
||||||
rev: v2.7.4
|
rev: v2.7.4
|
||||||
hooks:
|
hooks:
|
||||||
- id: pyupgrade
|
- id: pyupgrade
|
||||||
args: [--py36-plus]
|
args: [--py36-plus]
|
||||||
|
@ -45,7 +45,7 @@ def test_basic():
|
|||||||
|
|
||||||
print(
|
print(
|
||||||
"Doc setattr: %.3fus"
|
"Doc setattr: %.3fus"
|
||||||
% (timeit(lambda: setattr(b, "name", "New name"), 10000) * 10 ** 6)
|
% (timeit(lambda: setattr(b, "name", "New name"), 10000) * 10 ** 6) # noqa B010
|
||||||
)
|
)
|
||||||
|
|
||||||
print("Doc to mongo: %.3fus" % (timeit(b.to_mongo, 1000) * 10 ** 6))
|
print("Doc to mongo: %.3fus" % (timeit(b.to_mongo, 1000) * 10 ** 6))
|
||||||
|
@ -42,7 +42,7 @@ master_doc = "index"
|
|||||||
|
|
||||||
# General information about the project.
|
# General information about the project.
|
||||||
project = "MongoEngine"
|
project = "MongoEngine"
|
||||||
copyright = "2009, MongoEngine Authors"
|
copyright = "2009, MongoEngine Authors" # noqa: A001
|
||||||
|
|
||||||
# The version info for the project you're documenting, acts as replacement for
|
# The version info for the project you're documenting, acts as replacement for
|
||||||
# |version| and |release|, also used in various other places throughout the
|
# |version| and |release|, also used in various other places throughout the
|
||||||
|
@ -10,12 +10,12 @@ from mongoengine import signals
|
|||||||
# mongoengine, e.g. instead of `from mongoengine.connection import connect`,
|
# mongoengine, e.g. instead of `from mongoengine.connection import connect`,
|
||||||
# users can simply use `from mongoengine import connect`, or even
|
# users can simply use `from mongoengine import connect`, or even
|
||||||
# `from mongoengine import *` and then `connect('testdb')`.
|
# `from mongoengine import *` and then `connect('testdb')`.
|
||||||
from mongoengine.connection import *
|
from mongoengine.connection import * # noqa: F401
|
||||||
from mongoengine.document import *
|
from mongoengine.document import * # noqa: F401
|
||||||
from mongoengine.errors import *
|
from mongoengine.errors import * # noqa: F401
|
||||||
from mongoengine.fields import *
|
from mongoengine.fields import * # noqa: F401
|
||||||
from mongoengine.queryset import *
|
from mongoengine.queryset import * # noqa: F401
|
||||||
from mongoengine.signals import *
|
from mongoengine.signals import * # noqa: F401
|
||||||
|
|
||||||
|
|
||||||
__all__ = (
|
__all__ = (
|
||||||
|
@ -180,9 +180,7 @@ class BaseList(list):
|
|||||||
def _mark_as_changed(self, key=None):
|
def _mark_as_changed(self, key=None):
|
||||||
if hasattr(self._instance, "_mark_as_changed"):
|
if hasattr(self._instance, "_mark_as_changed"):
|
||||||
if key is not None:
|
if key is not None:
|
||||||
self._instance._mark_as_changed(
|
self._instance._mark_as_changed(f"{self._name}.{key % len(self)}")
|
||||||
"{}.{}".format(self._name, key % len(self))
|
|
||||||
)
|
|
||||||
else:
|
else:
|
||||||
self._instance._mark_as_changed(self._name)
|
self._instance._mark_as_changed(self._name)
|
||||||
|
|
||||||
|
@ -89,9 +89,7 @@ class BaseDocument:
|
|||||||
list(self._fields.keys()) + ["id", "pk", "_cls", "_text_score"]
|
list(self._fields.keys()) + ["id", "pk", "_cls", "_text_score"]
|
||||||
)
|
)
|
||||||
if _undefined_fields:
|
if _undefined_fields:
|
||||||
msg = ('The fields "{}" do not exist on the document "{}"').format(
|
msg = f'The fields "{_undefined_fields}" do not exist on the document "{self._class_name}"'
|
||||||
_undefined_fields, self._class_name
|
|
||||||
)
|
|
||||||
raise FieldDoesNotExist(msg)
|
raise FieldDoesNotExist(msg)
|
||||||
|
|
||||||
if self.STRICT and not self._dynamic:
|
if self.STRICT and not self._dynamic:
|
||||||
@ -231,10 +229,10 @@ class BaseDocument:
|
|||||||
setattr(self, k, data[k])
|
setattr(self, k, data[k])
|
||||||
if "_fields_ordered" in data:
|
if "_fields_ordered" in data:
|
||||||
if self._dynamic:
|
if self._dynamic:
|
||||||
setattr(self, "_fields_ordered", data["_fields_ordered"])
|
self._fields_ordered = data["_fields_ordered"]
|
||||||
else:
|
else:
|
||||||
_super_fields_ordered = type(self)._fields_ordered
|
_super_fields_ordered = type(self)._fields_ordered
|
||||||
setattr(self, "_fields_ordered", _super_fields_ordered)
|
self._fields_ordered = _super_fields_ordered
|
||||||
|
|
||||||
dynamic_fields = data.get("_dynamic_fields") or SON()
|
dynamic_fields = data.get("_dynamic_fields") or SON()
|
||||||
for k in dynamic_fields.keys():
|
for k in dynamic_fields.keys():
|
||||||
@ -576,7 +574,7 @@ class BaseDocument:
|
|||||||
else:
|
else:
|
||||||
iterator = data.items()
|
iterator = data.items()
|
||||||
|
|
||||||
for index_or_key, value in iterator:
|
for _index_or_key, value in iterator:
|
||||||
if hasattr(value, "_get_changed_fields") and not isinstance(
|
if hasattr(value, "_get_changed_fields") and not isinstance(
|
||||||
value, Document
|
value, Document
|
||||||
): # don't follow references
|
): # don't follow references
|
||||||
@ -999,9 +997,7 @@ class BaseDocument:
|
|||||||
"PolygonField",
|
"PolygonField",
|
||||||
)
|
)
|
||||||
|
|
||||||
geo_field_types = tuple(
|
geo_field_types = tuple(_import_class(field) for field in geo_field_type_names)
|
||||||
[_import_class(field) for field in geo_field_type_names]
|
|
||||||
)
|
|
||||||
|
|
||||||
for field in cls._fields.values():
|
for field in cls._fields.values():
|
||||||
if not isinstance(field, geo_field_types):
|
if not isinstance(field, geo_field_types):
|
||||||
|
@ -337,7 +337,7 @@ class TopLevelDocumentMetaclass(DocumentMetaclass):
|
|||||||
# allow_inheritance to False. If the base Document allows inheritance,
|
# allow_inheritance to False. If the base Document allows inheritance,
|
||||||
# none of its subclasses can override allow_inheritance to False.
|
# none of its subclasses can override allow_inheritance to False.
|
||||||
simple_class = all(
|
simple_class = all(
|
||||||
[b._meta.get("abstract") for b in flattened_bases if hasattr(b, "_meta")]
|
b._meta.get("abstract") for b in flattened_bases if hasattr(b, "_meta")
|
||||||
)
|
)
|
||||||
if (
|
if (
|
||||||
not simple_class
|
not simple_class
|
||||||
|
@ -51,10 +51,10 @@ class DeReference:
|
|||||||
doc_type = doc_type.document_type
|
doc_type = doc_type.document_type
|
||||||
is_list = not hasattr(items, "items")
|
is_list = not hasattr(items, "items")
|
||||||
|
|
||||||
if is_list and all([i.__class__ == doc_type for i in items]):
|
if is_list and all(i.__class__ == doc_type for i in items):
|
||||||
return items
|
return items
|
||||||
elif not is_list and all(
|
elif not is_list and all(
|
||||||
[i.__class__ == doc_type for i in items.values()]
|
i.__class__ == doc_type for i in items.values()
|
||||||
):
|
):
|
||||||
return items
|
return items
|
||||||
elif not field.dbref:
|
elif not field.dbref:
|
||||||
|
@ -1743,7 +1743,7 @@ class GridFSProxy:
|
|||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
gridout = self.get()
|
gridout = self.get()
|
||||||
filename = getattr(gridout, "filename") if gridout else "<no file>"
|
filename = gridout.filename if gridout else "<no file>"
|
||||||
return f"<{self.__class__.__name__}: {filename} ({self.grid_id})>"
|
return f"<{self.__class__.__name__}: {filename} ({self.grid_id})>"
|
||||||
|
|
||||||
def __eq__(self, other):
|
def __eq__(self, other):
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[flake8]
|
[flake8]
|
||||||
ignore=E501,F401,F403,F405,I201,I202,W504, W605, W503
|
ignore=E501,F403,F405,I201,I202,W504,W605,W503,B007
|
||||||
exclude=build,dist,docs,venv,venv3,.tox,.eggs,tests
|
exclude=build,dist,docs,venv,venv3,.tox,.eggs,tests
|
||||||
max-complexity=47
|
max-complexity=47
|
||||||
application-import-names=mongoengine,tests
|
application-import-names=mongoengine,tests
|
||||||
|
2
setup.py
2
setup.py
@ -7,7 +7,7 @@ from setuptools.command.test import test as TestCommand
|
|||||||
|
|
||||||
# Hack to silence atexit traceback in newer python versions
|
# Hack to silence atexit traceback in newer python versions
|
||||||
try:
|
try:
|
||||||
import multiprocessing
|
import multiprocessing # noqa: F401
|
||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ class TestClassMethods(unittest.TestCase):
|
|||||||
"""Ensure that document may be defined using fields."""
|
"""Ensure that document may be defined using fields."""
|
||||||
assert ["_cls", "age", "id", "name"] == sorted(self.Person._fields.keys())
|
assert ["_cls", "age", "id", "name"] == sorted(self.Person._fields.keys())
|
||||||
assert ["IntField", "ObjectIdField", "StringField", "StringField"] == sorted(
|
assert ["IntField", "ObjectIdField", "StringField", "StringField"] == sorted(
|
||||||
[x.__class__.__name__ for x in self.Person._fields.values()]
|
x.__class__.__name__ for x in self.Person._fields.values()
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_get_db(self):
|
def test_get_db(self):
|
||||||
|
@ -280,7 +280,7 @@ class TestInheritance(MongoDBTestCase):
|
|||||||
C.ensure_indexes()
|
C.ensure_indexes()
|
||||||
|
|
||||||
assert sorted(
|
assert sorted(
|
||||||
[idx["key"] for idx in C._get_collection().index_information().values()]
|
idx["key"] for idx in C._get_collection().index_information().values()
|
||||||
) == sorted([[("_cls", 1), ("b", 1)], [("_id", 1)], [("_cls", 1), ("a", 1)]])
|
) == sorted([[("_cls", 1), ("b", 1)], [("_id", 1)], [("_cls", 1), ("a", 1)]])
|
||||||
|
|
||||||
def test_polymorphic_queries(self):
|
def test_polymorphic_queries(self):
|
||||||
@ -467,7 +467,7 @@ class TestInheritance(MongoDBTestCase):
|
|||||||
assert city.pk is None
|
assert city.pk is None
|
||||||
# TODO: expected error? Shouldn't we create a new error type?
|
# TODO: expected error? Shouldn't we create a new error type?
|
||||||
with pytest.raises(KeyError):
|
with pytest.raises(KeyError):
|
||||||
setattr(city, "pk", 1)
|
city.pk = 1
|
||||||
|
|
||||||
def test_allow_inheritance_embedded_document(self):
|
def test_allow_inheritance_embedded_document(self):
|
||||||
"""Ensure embedded documents respect inheritance."""
|
"""Ensure embedded documents respect inheritance."""
|
||||||
@ -499,13 +499,8 @@ class TestInheritance(MongoDBTestCase):
|
|||||||
class DateUpdatedDocument(Document):
|
class DateUpdatedDocument(Document):
|
||||||
meta = {"allow_inheritance": True, "abstract": True}
|
meta = {"allow_inheritance": True, "abstract": True}
|
||||||
|
|
||||||
try:
|
class MyDocument(DateCreatedDocument, DateUpdatedDocument):
|
||||||
|
pass
|
||||||
class MyDocument(DateCreatedDocument, DateUpdatedDocument):
|
|
||||||
pass
|
|
||||||
|
|
||||||
except Exception:
|
|
||||||
assert False, "Couldn't create MyDocument class"
|
|
||||||
|
|
||||||
def test_abstract_documents(self):
|
def test_abstract_documents(self):
|
||||||
"""Ensure that a document superclass can be marked as abstract
|
"""Ensure that a document superclass can be marked as abstract
|
||||||
|
@ -210,10 +210,7 @@ class TestValidatorError(MongoDBTestCase):
|
|||||||
child.reference = parent
|
child.reference = parent
|
||||||
|
|
||||||
# Saving the child should not raise a ValidationError
|
# Saving the child should not raise a ValidationError
|
||||||
try:
|
child.save()
|
||||||
child.save()
|
|
||||||
except ValidationError as e:
|
|
||||||
self.fail("ValidationError raised: %s" % e.message)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
@ -60,7 +60,7 @@ class ComplexDateTimeFieldTest(MongoDBTestCase):
|
|||||||
assert log == log1
|
assert log == log1
|
||||||
|
|
||||||
# Test string padding
|
# Test string padding
|
||||||
microsecond = map(int, [math.pow(10, x) for x in range(6)])
|
microsecond = map(int, (math.pow(10, x) for x in range(6)))
|
||||||
mm = dd = hh = ii = ss = [1, 10]
|
mm = dd = hh = ii = ss = [1, 10]
|
||||||
|
|
||||||
for values in itertools.product([2014], mm, dd, hh, ii, ss, microsecond):
|
for values in itertools.product([2014], mm, dd, hh, ii, ss, microsecond):
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
import sys
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from mongoengine import *
|
from mongoengine import Document, EmailField, ValidationError
|
||||||
from tests.utils import MongoDBTestCase
|
from tests.utils import MongoDBTestCase
|
||||||
|
|
||||||
|
|
||||||
|
@ -1357,9 +1357,9 @@ class TestField(MongoDBTestCase):
|
|||||||
foo.delete()
|
foo.delete()
|
||||||
bar = Bar.objects.get()
|
bar = Bar.objects.get()
|
||||||
with pytest.raises(DoesNotExist):
|
with pytest.raises(DoesNotExist):
|
||||||
getattr(bar, "ref")
|
bar.ref
|
||||||
with pytest.raises(DoesNotExist):
|
with pytest.raises(DoesNotExist):
|
||||||
getattr(bar, "generic_ref")
|
bar.generic_ref
|
||||||
|
|
||||||
# When auto_dereference is disabled, there is no trouble returning DBRef
|
# When auto_dereference is disabled, there is no trouble returning DBRef
|
||||||
bar = Bar.objects.get()
|
bar = Bar.objects.get()
|
||||||
|
@ -11,7 +11,7 @@ from mongoengine import *
|
|||||||
from mongoengine.connection import get_db
|
from mongoengine.connection import get_db
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from PIL import Image
|
from PIL import Image # noqa: F401
|
||||||
|
|
||||||
HAS_PIL = True
|
HAS_PIL = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
@ -166,8 +166,8 @@ class TestSequenceField(MongoDBTestCase):
|
|||||||
ids = [i.id for i in Person.objects]
|
ids = [i.id for i in Person.objects]
|
||||||
assert ids == list(range(1, 11))
|
assert ids == list(range(1, 11))
|
||||||
|
|
||||||
id = [i.id for i in Animal.objects]
|
_id = [i.id for i in Animal.objects]
|
||||||
assert id == list(range(1, 11))
|
assert _id == list(range(1, 11))
|
||||||
|
|
||||||
c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
|
c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
|
||||||
assert c["next"] == 10
|
assert c["next"] == 10
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
import pickle
|
import pickle
|
||||||
import unittest
|
|
||||||
|
|
||||||
from mongoengine import Document, IntField, StringField
|
from mongoengine import Document, IntField, StringField
|
||||||
from mongoengine.connection import connect
|
|
||||||
from tests.utils import MongoDBTestCase
|
from tests.utils import MongoDBTestCase
|
||||||
|
|
||||||
|
|
||||||
@ -22,14 +20,11 @@ class TestQuerysetPickable(MongoDBTestCase):
|
|||||||
self.john = Person.objects.create(name="John", age=21)
|
self.john = Person.objects.create(name="John", age=21)
|
||||||
|
|
||||||
def test_picke_simple_qs(self):
|
def test_picke_simple_qs(self):
|
||||||
|
|
||||||
qs = Person.objects.all()
|
qs = Person.objects.all()
|
||||||
|
|
||||||
pickle.dumps(qs)
|
pickle.dumps(qs)
|
||||||
|
|
||||||
def _get_loaded(self, qs):
|
def _get_loaded(self, qs):
|
||||||
s = pickle.dumps(qs)
|
s = pickle.dumps(qs)
|
||||||
|
|
||||||
return pickle.loads(s)
|
return pickle.loads(s)
|
||||||
|
|
||||||
def test_unpickle(self):
|
def test_unpickle(self):
|
||||||
|
@ -5,7 +5,6 @@ from decimal import Decimal
|
|||||||
|
|
||||||
from bson import DBRef, ObjectId
|
from bson import DBRef, ObjectId
|
||||||
import pymongo
|
import pymongo
|
||||||
from pymongo.read_concern import ReadConcern
|
|
||||||
from pymongo.read_preferences import ReadPreference
|
from pymongo.read_preferences import ReadPreference
|
||||||
from pymongo.results import UpdateResult
|
from pymongo.results import UpdateResult
|
||||||
import pytest
|
import pytest
|
||||||
@ -449,7 +448,7 @@ class TestQueryset(unittest.TestCase):
|
|||||||
|
|
||||||
# test iterating over the result set
|
# test iterating over the result set
|
||||||
cnt = 0
|
cnt = 0
|
||||||
for a in A.objects.batch_size(10):
|
for _ in A.objects.batch_size(10):
|
||||||
cnt += 1
|
cnt += 1
|
||||||
assert cnt == 100
|
assert cnt == 100
|
||||||
|
|
||||||
@ -457,7 +456,7 @@ class TestQueryset(unittest.TestCase):
|
|||||||
qs = A.objects.all()
|
qs = A.objects.all()
|
||||||
qs = qs.limit(10).batch_size(20).skip(91)
|
qs = qs.limit(10).batch_size(20).skip(91)
|
||||||
cnt = 0
|
cnt = 0
|
||||||
for a in qs:
|
for _ in qs:
|
||||||
cnt += 1
|
cnt += 1
|
||||||
assert cnt == 9
|
assert cnt == 9
|
||||||
|
|
||||||
@ -1146,7 +1145,7 @@ class TestQueryset(unittest.TestCase):
|
|||||||
people2 = [person for person in queryset]
|
people2 = [person for person in queryset]
|
||||||
|
|
||||||
# Check that it still works even if iteration is interrupted.
|
# Check that it still works even if iteration is interrupted.
|
||||||
for person in queryset:
|
for _person in queryset:
|
||||||
break
|
break
|
||||||
people3 = [person for person in queryset]
|
people3 = [person for person in queryset]
|
||||||
|
|
||||||
@ -1182,7 +1181,7 @@ class TestQueryset(unittest.TestCase):
|
|||||||
assert "[<Doc: 1>, <Doc: 2>, <Doc: 3>]" == "%s" % docs
|
assert "[<Doc: 1>, <Doc: 2>, <Doc: 3>]" == "%s" % docs
|
||||||
|
|
||||||
assert docs.count(with_limit_and_skip=True) == 3
|
assert docs.count(with_limit_and_skip=True) == 3
|
||||||
for doc in docs:
|
for _ in docs:
|
||||||
assert ".. queryset mid-iteration .." == repr(docs)
|
assert ".. queryset mid-iteration .." == repr(docs)
|
||||||
|
|
||||||
def test_regex_query_shortcuts(self):
|
def test_regex_query_shortcuts(self):
|
||||||
@ -3171,10 +3170,10 @@ class TestQueryset(unittest.TestCase):
|
|||||||
|
|
||||||
Test.drop_collection()
|
Test.drop_collection()
|
||||||
|
|
||||||
for i in range(50):
|
for _ in range(50):
|
||||||
Test(val=1).save()
|
Test(val=1).save()
|
||||||
|
|
||||||
for i in range(20):
|
for _ in range(20):
|
||||||
Test(val=2).save()
|
Test(val=2).save()
|
||||||
|
|
||||||
freqs = Test.objects.item_frequencies("val", map_reduce=False, normalize=True)
|
freqs = Test.objects.item_frequencies("val", map_reduce=False, normalize=True)
|
||||||
@ -3207,7 +3206,7 @@ class TestQueryset(unittest.TestCase):
|
|||||||
|
|
||||||
for i, weight in enumerate(ages):
|
for i, weight in enumerate(ages):
|
||||||
self.Person(
|
self.Person(
|
||||||
name="test meta%i", person_meta=self.PersonMeta(weight=weight)
|
name=f"test meta{i}", person_meta=self.PersonMeta(weight=weight)
|
||||||
).save()
|
).save()
|
||||||
|
|
||||||
assert (
|
assert (
|
||||||
@ -3246,7 +3245,7 @@ class TestQueryset(unittest.TestCase):
|
|||||||
|
|
||||||
# test summing over a filtered queryset
|
# test summing over a filtered queryset
|
||||||
assert self.Person.objects.filter(age__gte=50).sum("age") == sum(
|
assert self.Person.objects.filter(age__gte=50).sum("age") == sum(
|
||||||
[a for a in ages if a >= 50]
|
a for a in ages if a >= 50
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_sum_over_db_field(self):
|
def test_sum_over_db_field(self):
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
import unittest
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from mongoengine import Document
|
from mongoengine import Document
|
||||||
|
@ -180,11 +180,11 @@ class TestContextManagers:
|
|||||||
|
|
||||||
with no_dereference(Group) as Group:
|
with no_dereference(Group) as Group:
|
||||||
group = Group.objects.first()
|
group = Group.objects.first()
|
||||||
assert all([not isinstance(m, User) for m in group.members])
|
assert all(not isinstance(m, User) for m in group.members)
|
||||||
assert not isinstance(group.ref, User)
|
assert not isinstance(group.ref, User)
|
||||||
assert not isinstance(group.generic, User)
|
assert not isinstance(group.generic, User)
|
||||||
|
|
||||||
assert all([isinstance(m, User) for m in group.members])
|
assert all(isinstance(m, User) for m in group.members)
|
||||||
assert isinstance(group.ref, User)
|
assert isinstance(group.ref, User)
|
||||||
assert isinstance(group.generic, User)
|
assert isinstance(group.generic, User)
|
||||||
|
|
||||||
|
@ -421,7 +421,7 @@ class TestStrictDict(unittest.TestCase):
|
|||||||
d.a = 1
|
d.a = 1
|
||||||
assert d.a == 1
|
assert d.a == 1
|
||||||
with pytest.raises(AttributeError):
|
with pytest.raises(AttributeError):
|
||||||
getattr(d, "b")
|
d.b
|
||||||
|
|
||||||
def test_setattr_raises_on_nonexisting_attr(self):
|
def test_setattr_raises_on_nonexisting_attr(self):
|
||||||
d = self.dtype()
|
d = self.dtype()
|
||||||
|
@ -49,7 +49,7 @@ class FieldTest(unittest.TestCase):
|
|||||||
len(group_obj.members)
|
len(group_obj.members)
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
# Document select_related
|
# Document select_related
|
||||||
@ -58,7 +58,7 @@ class FieldTest(unittest.TestCase):
|
|||||||
|
|
||||||
group_obj = Group.objects.first().select_related()
|
group_obj = Group.objects.first().select_related()
|
||||||
assert q == 2
|
assert q == 2
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
# Queryset select_related
|
# Queryset select_related
|
||||||
@ -67,7 +67,7 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_objs = Group.objects.select_related()
|
group_objs = Group.objects.select_related()
|
||||||
assert q == 2
|
assert q == 2
|
||||||
for group_obj in group_objs:
|
for group_obj in group_objs:
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
User.drop_collection()
|
User.drop_collection()
|
||||||
@ -99,14 +99,14 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first()
|
group_obj = Group.objects.first()
|
||||||
assert q == 1
|
assert q == 1
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
assert group_obj._data["members"]._dereferenced
|
assert group_obj._data["members"]._dereferenced
|
||||||
|
|
||||||
# verifies that no additional queries gets executed
|
# verifies that no additional queries gets executed
|
||||||
# if we re-iterate over the ListField once it is
|
# if we re-iterate over the ListField once it is
|
||||||
# dereferenced
|
# dereferenced
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
assert group_obj._data["members"]._dereferenced
|
assert group_obj._data["members"]._dereferenced
|
||||||
|
|
||||||
@ -117,7 +117,7 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first().select_related()
|
group_obj = Group.objects.first().select_related()
|
||||||
|
|
||||||
assert q == 2
|
assert q == 2
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
# Queryset select_related
|
# Queryset select_related
|
||||||
@ -126,7 +126,7 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_objs = Group.objects.select_related()
|
group_objs = Group.objects.select_related()
|
||||||
assert q == 2
|
assert q == 2
|
||||||
for group_obj in group_objs:
|
for group_obj in group_objs:
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
def test_list_item_dereference_orphan_dbref(self):
|
def test_list_item_dereference_orphan_dbref(self):
|
||||||
@ -158,14 +158,14 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first()
|
group_obj = Group.objects.first()
|
||||||
assert q == 1
|
assert q == 1
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
assert group_obj._data["members"]._dereferenced
|
assert group_obj._data["members"]._dereferenced
|
||||||
|
|
||||||
# verifies that no additional queries gets executed
|
# verifies that no additional queries gets executed
|
||||||
# if we re-iterate over the ListField once it is
|
# if we re-iterate over the ListField once it is
|
||||||
# dereferenced
|
# dereferenced
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
assert group_obj._data["members"]._dereferenced
|
assert group_obj._data["members"]._dereferenced
|
||||||
|
|
||||||
@ -505,10 +505,10 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first()
|
group_obj = Group.objects.first()
|
||||||
assert q == 1
|
assert q == 1
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for m in group_obj.members:
|
for m in group_obj.members:
|
||||||
@ -521,10 +521,10 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first().select_related()
|
group_obj = Group.objects.first().select_related()
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for m in group_obj.members:
|
for m in group_obj.members:
|
||||||
@ -538,10 +538,10 @@ class FieldTest(unittest.TestCase):
|
|||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for group_obj in group_objs:
|
for group_obj in group_objs:
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for m in group_obj.members:
|
for m in group_obj.members:
|
||||||
@ -592,11 +592,11 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first()
|
group_obj = Group.objects.first()
|
||||||
assert q == 1
|
assert q == 1
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
assert group_obj._data["members"]._dereferenced
|
assert group_obj._data["members"]._dereferenced
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
assert group_obj._data["members"]._dereferenced
|
assert group_obj._data["members"]._dereferenced
|
||||||
|
|
||||||
@ -648,10 +648,10 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first()
|
group_obj = Group.objects.first()
|
||||||
assert q == 1
|
assert q == 1
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for m in group_obj.members:
|
for m in group_obj.members:
|
||||||
@ -664,10 +664,10 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first().select_related()
|
group_obj = Group.objects.first().select_related()
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for m in group_obj.members:
|
for m in group_obj.members:
|
||||||
@ -681,10 +681,10 @@ class FieldTest(unittest.TestCase):
|
|||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for group_obj in group_objs:
|
for group_obj in group_objs:
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for m in group_obj.members:
|
for m in group_obj.members:
|
||||||
@ -723,10 +723,10 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first()
|
group_obj = Group.objects.first()
|
||||||
assert q == 1
|
assert q == 1
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
for k, m in group_obj.members.items():
|
for _, m in group_obj.members.items():
|
||||||
assert isinstance(m, User)
|
assert isinstance(m, User)
|
||||||
|
|
||||||
# Document select_related
|
# Document select_related
|
||||||
@ -736,7 +736,7 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first().select_related()
|
group_obj = Group.objects.first().select_related()
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
for k, m in group_obj.members.items():
|
for k, m in group_obj.members.items():
|
||||||
@ -750,7 +750,7 @@ class FieldTest(unittest.TestCase):
|
|||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
for group_obj in group_objs:
|
for group_obj in group_objs:
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
for k, m in group_obj.members.items():
|
for k, m in group_obj.members.items():
|
||||||
@ -801,10 +801,10 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first()
|
group_obj = Group.objects.first()
|
||||||
assert q == 1
|
assert q == 1
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for k, m in group_obj.members.items():
|
for k, m in group_obj.members.items():
|
||||||
@ -817,10 +817,10 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first().select_related()
|
group_obj = Group.objects.first().select_related()
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for k, m in group_obj.members.items():
|
for k, m in group_obj.members.items():
|
||||||
@ -834,10 +834,10 @@ class FieldTest(unittest.TestCase):
|
|||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for group_obj in group_objs:
|
for group_obj in group_objs:
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for k, m in group_obj.members.items():
|
for k, m in group_obj.members.items():
|
||||||
@ -852,7 +852,7 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first()
|
group_obj = Group.objects.first()
|
||||||
assert q == 1
|
assert q == 1
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 1
|
assert q == 1
|
||||||
assert group_obj.members == {}
|
assert group_obj.members == {}
|
||||||
|
|
||||||
@ -891,10 +891,10 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first()
|
group_obj = Group.objects.first()
|
||||||
assert q == 1
|
assert q == 1
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
for k, m in group_obj.members.items():
|
for k, m in group_obj.members.items():
|
||||||
@ -907,10 +907,10 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first().select_related()
|
group_obj = Group.objects.first().select_related()
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
for k, m in group_obj.members.items():
|
for k, m in group_obj.members.items():
|
||||||
@ -924,13 +924,13 @@ class FieldTest(unittest.TestCase):
|
|||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
for group_obj in group_objs:
|
for group_obj in group_objs:
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 2
|
assert q == 2
|
||||||
|
|
||||||
for k, m in group_obj.members.items():
|
for _, m in group_obj.members.items():
|
||||||
assert isinstance(m, UserA)
|
assert isinstance(m, UserA)
|
||||||
|
|
||||||
UserA.drop_collection()
|
UserA.drop_collection()
|
||||||
@ -978,13 +978,13 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first()
|
group_obj = Group.objects.first()
|
||||||
assert q == 1
|
assert q == 1
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for k, m in group_obj.members.items():
|
for _, m in group_obj.members.items():
|
||||||
assert "User" in m.__class__.__name__
|
assert "User" in m.__class__.__name__
|
||||||
|
|
||||||
# Document select_related
|
# Document select_related
|
||||||
@ -994,13 +994,13 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first().select_related()
|
group_obj = Group.objects.first().select_related()
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for k, m in group_obj.members.items():
|
for _, m in group_obj.members.items():
|
||||||
assert "User" in m.__class__.__name__
|
assert "User" in m.__class__.__name__
|
||||||
|
|
||||||
# Queryset select_related
|
# Queryset select_related
|
||||||
@ -1011,13 +1011,13 @@ class FieldTest(unittest.TestCase):
|
|||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for group_obj in group_objs:
|
for group_obj in group_objs:
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 4
|
assert q == 4
|
||||||
|
|
||||||
for k, m in group_obj.members.items():
|
for _, m in group_obj.members.items():
|
||||||
assert "User" in m.__class__.__name__
|
assert "User" in m.__class__.__name__
|
||||||
|
|
||||||
Group.objects.delete()
|
Group.objects.delete()
|
||||||
@ -1029,7 +1029,7 @@ class FieldTest(unittest.TestCase):
|
|||||||
group_obj = Group.objects.first()
|
group_obj = Group.objects.first()
|
||||||
assert q == 1
|
assert q == 1
|
||||||
|
|
||||||
[m for m in group_obj.members]
|
_ = [m for m in group_obj.members]
|
||||||
assert q == 1
|
assert q == 1
|
||||||
|
|
||||||
UserA.drop_collection()
|
UserA.drop_collection()
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
import re
|
import re
|
||||||
import unittest
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user