Skip to content

Commit 8b1f869

Browse files
author
Marcus Baker
committed
fix: CON-112 - Removing import * statements
1 parent bf965a7 commit 8b1f869

File tree

9 files changed

+169
-81
lines changed

9 files changed

+169
-81
lines changed

tests/connection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import mongoengine.connection
55

6-
from mongoengine import *
6+
from mongoengine import connect, register_connection
77
from mongoengine.connection import (
88
get_db, get_connection, register_db, ConnectionError)
99

tests/dereference.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import unittest
22

3-
from mongoengine import *
3+
from mongoengine import (
4+
StringField, ListField, MapField, DictField,
5+
ReferenceField, GenericReferenceField,
6+
Document, EmbeddedDocument, EmbeddedDocumentField)
47
from mongoengine.connection import get_db, register_db, connect
58
from mongoengine.tests import query_counter
69

@@ -271,8 +274,7 @@ class Group(Document):
271274

272275
with query_counter() as q:
273276
self.assertEqual(q, 0)
274-
275-
group_obj = Group.objects.first()
277+
Group.objects.first()
276278
self.assertEqual(q, 1)
277279

278280
# Document select_related
@@ -334,8 +336,7 @@ class Group(Document):
334336

335337
with query_counter() as q:
336338
self.assertEqual(q, 0)
337-
338-
group_obj = Group.objects.first()
339+
Group.objects.first()
339340
self.assertEqual(q, 1)
340341

341342
# Document select_related
@@ -518,8 +519,7 @@ class Group(Document):
518519

519520
with query_counter() as q:
520521
self.assertEqual(q, 0)
521-
522-
group_obj = Group.objects.first()
522+
Group.objects.first()
523523
self.assertEqual(q, 1)
524524

525525
# Document select_related

tests/django_compatibility.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import unittest
44
from distutils.version import StrictVersion
55

6-
from mongoengine import *
6+
from mongoengine import connect, Q, IntField, StringField, Document
77
from mongoengine.connection import register_db
88
from mongoengine.django.shortcuts import get_document_or_404
99

@@ -102,7 +102,7 @@ class Page(Document):
102102

103103
paginator = Paginator(Page.objects.all(), 2)
104104

105-
t = Template("{% for i in page.object_list %}{{ i.name }}:{% endfor %}")
105+
t = Template("{% for i in page.object_list %}{{ i.name }}:{% endfor %}") # noqa
106106
for p in paginator.page_range:
107107
d = {"page": paginator.page(p)}
108108
end = p * 2

tests/document.py

Lines changed: 81 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@
99

1010
from fixtures import Base, PickleEmbedded, PickleTest
1111

12-
from mongoengine import *
12+
from mongoengine import (
13+
connect, Q, CASCADE, NULLIFY, DENY,
14+
ValidationError, InvalidCollectionError, OperationError,
15+
StringField, IntField, BooleanField, DateTimeField, EmailField,
16+
ListField, MapField, DictField,
17+
ReferenceField, GenericReferenceField,
18+
Document, DynamicDocument, EmbeddedDocument, EmbeddedDocumentField)
1319
from mongoengine.base import NotRegistered, InvalidDocumentError
1420
from mongoengine.queryset import InvalidQueryError
1521
from mongoengine.connection import get_db, register_db
@@ -177,10 +183,18 @@ def test_get_superclasses(self):
177183
"""
178184
class Animal(Document):
179185
meta = {'allow_inheritance': True}
180-
class Fish(Animal): pass
181-
class Mammal(Animal): pass
182-
class Human(Mammal): pass
183-
class Dog(Mammal): pass
186+
187+
class Fish(Animal):
188+
pass
189+
190+
class Mammal(Animal):
191+
pass
192+
193+
class Human(Mammal):
194+
pass
195+
196+
class Dog(Mammal):
197+
pass
184198

185199
mammal_superclasses = {'Animal': Animal}
186200
self.assertEqual(Mammal._superclasses, mammal_superclasses)
@@ -195,11 +209,20 @@ def test_external_superclasses(self):
195209
"""Ensure that the correct list of sub and super classes is assembled.
196210
when importing part of the model
197211
"""
198-
class Animal(Base): pass
199-
class Fish(Animal): pass
200-
class Mammal(Animal): pass
201-
class Human(Mammal): pass
202-
class Dog(Mammal): pass
212+
class Animal(Base):
213+
pass
214+
215+
class Fish(Animal):
216+
pass
217+
218+
class Mammal(Animal):
219+
pass
220+
221+
class Human(Mammal):
222+
pass
223+
224+
class Dog(Mammal):
225+
pass
203226

204227
mammal_superclasses = {'Base': Base, 'Base.Animal': Animal}
205228
self.assertEqual(Mammal._superclasses, mammal_superclasses)
@@ -229,10 +252,18 @@ def test_polymorphic_queries(self):
229252
"""
230253
class Animal(Document):
231254
meta = {'allow_inheritance': True}
232-
class Fish(Animal): pass
233-
class Mammal(Animal): pass
234-
class Human(Mammal): pass
235-
class Dog(Mammal): pass
255+
256+
class Fish(Animal):
257+
pass
258+
259+
class Mammal(Animal):
260+
pass
261+
262+
class Human(Mammal):
263+
pass
264+
265+
class Dog(Mammal):
266+
pass
236267

237268
Animal.drop_collection()
238269

@@ -294,8 +325,12 @@ class Employee(self.Person):
294325
# Ensure that MRO error is not raised
295326
class A(Document):
296327
meta = {'allow_inheritance': True}
297-
class B(A): pass
298-
class C(B): pass
328+
329+
class B(A):
330+
pass
331+
332+
class C(B):
333+
pass
299334

300335
def test_allow_inheritance(self):
301336
"""Ensure that inheritance may be disabled on simple classes and that
@@ -768,6 +803,7 @@ def test_save(self):
768803
self.assertEqual(person_obj['name'], 'Test User')
769804
self.assertEqual(person_obj['age'], 30)
770805
self.assertEqual(person_obj['_id'], person.id)
806+
771807
# Test skipping validation on save
772808
class Recipient(Document):
773809
email = EmailField(required=True)
@@ -1047,7 +1083,6 @@ class Page(EmbeddedDocument):
10471083
class Site(Document):
10481084
page = EmbeddedDocumentField(Page)
10491085

1050-
10511086
Site.drop_collection()
10521087
site = Site(page=Page(log_message="Warning: Dummy message"))
10531088
site.save()
@@ -1253,12 +1288,14 @@ class Doc(Document):
12531288
({'embedded_field.list_field.2.string_field': 'world'}, {}))
12541289
doc.save()
12551290
doc = doc.reload(10)
1256-
self.assertEquals(doc.embedded_field.list_field[2].string_field, 'world')
1291+
self.assertEquals(doc.embedded_field.list_field[2].string_field,
1292+
'world')
12571293

12581294
# Test multiple assignments
12591295
doc.embedded_field.list_field[2].string_field = 'hello world'
12601296
doc.embedded_field.list_field[2] = doc.embedded_field.list_field[2]
1261-
self.assertEquals(doc._get_changed_fields(), ['embedded_field.list_field'])
1297+
self.assertEquals(doc._get_changed_fields(),
1298+
['embedded_field.list_field'])
12621299
self.assertEquals(
12631300
doc.embedded_field._delta(),
12641301
({'list_field': [
@@ -1314,12 +1351,16 @@ class Doc(Document):
13141351
[1, 2, {'hello': 'world'}])
13151352

13161353
del(doc.embedded_field.list_field[2].list_field[2]['hello'])
1317-
self.assertEquals(doc._delta(), ({'embedded_field.list_field.2.list_field': [1, 2, {}]}, {}))
1354+
self.assertEquals(
1355+
doc._delta(),
1356+
({'embedded_field.list_field.2.list_field': [1, 2, {}]}, {}))
13181357
doc.save()
13191358
doc = doc.reload(10)
13201359

13211360
del(doc.embedded_field.list_field[2].list_field)
1322-
self.assertEquals(doc._delta(), ({}, {'embedded_field.list_field.2.list_field': 1}))
1361+
self.assertEquals(
1362+
doc._delta(),
1363+
({}, {'embedded_field.list_field.2.list_field': 1}))
13231364

13241365
doc.save()
13251366
doc = doc.reload(10)
@@ -1413,7 +1454,8 @@ class Doc(Document):
14131454
int_field = IntField(db_field='db_int_field')
14141455
dict_field = DictField(db_field='db_dict_field')
14151456
list_field = ListField(db_field='db_list_field')
1416-
embedded_field = EmbeddedDocumentField(Embedded, db_field='db_embedded_field')
1457+
embedded_field = EmbeddedDocumentField(
1458+
Embedded, db_field='db_embedded_field')
14171459

14181460
Doc.drop_collection()
14191461
doc = Doc()
@@ -1943,8 +1985,10 @@ def test_reverse_delete_rule_cascade_and_nullify_complex_field(self):
19431985

19441986
class BlogPost(Document):
19451987
content = StringField()
1946-
authors = ListField(ReferenceField(self.Person, reverse_delete_rule=CASCADE))
1947-
reviewers = ListField(ReferenceField(self.Person, reverse_delete_rule=NULLIFY))
1988+
authors = ListField(ReferenceField(self.Person,
1989+
reverse_delete_rule=CASCADE))
1990+
reviewers = ListField(ReferenceField(self.Person,
1991+
reverse_delete_rule=NULLIFY))
19481992

19491993
self.Person.drop_collection()
19501994
BlogPost.drop_collection()
@@ -1973,8 +2017,10 @@ def test_invalid_reverse_delete_rules_raise_errors(self):
19732017
def throw_invalid_document_error():
19742018
class Blog(Document):
19752019
content = StringField()
1976-
authors = MapField(ReferenceField(self.Person, reverse_delete_rule=CASCADE))
1977-
reviewers = DictField(field=ReferenceField(self.Person, reverse_delete_rule=NULLIFY))
2020+
authors = MapField(ReferenceField(self.Person,
2021+
reverse_delete_rule=CASCADE))
2022+
reviewers = DictField(field=ReferenceField(
2023+
self.Person, reverse_delete_rule=NULLIFY))
19782024

19792025
self.assertRaises(InvalidDocumentError, throw_invalid_document_error)
19802026

@@ -2043,8 +2089,8 @@ class BlogPost(Document):
20432089
post.save()
20442090

20452091
# Delete the Person should be denied
2046-
self.assertRaises(OperationError, author.delete) # Should raise denied error
2047-
self.assertEqual(len(BlogPost.objects), 1) # No objects may have been deleted
2092+
self.assertRaises(OperationError, author.delete) # Should raise denied
2093+
self.assertEqual(len(BlogPost.objects), 1) # No objects deleted?
20482094
self.assertEqual(len(self.Person.objects), 1)
20492095

20502096
# Other users, that don't have BlogPosts must be removable, like normal
@@ -2364,15 +2410,16 @@ def __str__(self):
23642410
u",".join([str(b) for b in
23652411
Book.objects.filter(Q(extra__a=bob) |
23662412
Q(author=bob) |
2367-
Q(extra__b=bob))]) ,
2413+
Q(extra__b=bob))]),
23682414
"1,2,3,4")
23692415

23702416
# Susan & Karl related books
2371-
self.assertEqual(u",".join([str(b) for b in Book.objects.filter(
2372-
Q(extra__a__all=[karl, susan] ) |
2373-
Q(author__all=[karl, susan ] ) |
2374-
Q(extra__b__all=[karl.to_dbref(), susan.to_dbref()] )
2375-
) ] ) , "1" )
2417+
self.assertEqual(
2418+
u",".join([str(b) for b in Book.objects.filter(
2419+
Q(extra__a__all=[karl, susan]) |
2420+
Q(author__all=[karl, susan]) |
2421+
Q(extra__b__all=[karl.to_dbref(), susan.to_dbref()]))]),
2422+
"1")
23762423

23772424
# $Where
23782425
self.assertEqual(
@@ -2422,6 +2469,5 @@ def __init__(self, id, name):
24222469
self.assertTrue(a != somethingElse)
24232470

24242471

2425-
24262472
if __name__ == '__main__':
24272473
unittest.main()

tests/dynamic_document.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import unittest
22

3-
from mongoengine import *
3+
from mongoengine import (
4+
connect, StringField, IntField,
5+
DynamicDocument, DynamicEmbeddedDocument)
46
from mongoengine.connection import get_db, register_db
57

68

@@ -189,7 +191,8 @@ class Doc(DynamicDocument):
189191
self.assertEquals(doc.embedded_field.string_field, "hello")
190192
self.assertEquals(doc.embedded_field.int_field, 1)
191193
self.assertEquals(doc.embedded_field.dict_field, {'hello': 'world'})
192-
self.assertEquals(doc.embedded_field.list_field, ['1', 2, {'hello': 'world'}])
194+
self.assertEquals(doc.embedded_field.list_field,
195+
['1', 2, {'hello': 'world'}])
193196

194197
def test_complex_embedded_documents(self):
195198
"""Test complex dynamic embedded documents setups"""

0 commit comments

Comments
 (0)