flake8 tweaks to tests.queryset.visitor
This commit is contained in:
		@@ -1,14 +1,12 @@
 | 
				
			|||||||
import sys
 | 
					import datetime
 | 
				
			||||||
sys.path[0:0] = [""]
 | 
					import re
 | 
				
			||||||
 | 
					 | 
				
			||||||
import unittest
 | 
					import unittest
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from bson import ObjectId
 | 
					from bson import ObjectId
 | 
				
			||||||
from datetime import datetime
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
from mongoengine import *
 | 
					from mongoengine import *
 | 
				
			||||||
from mongoengine.queryset import Q
 | 
					 | 
				
			||||||
from mongoengine.errors import InvalidQueryError
 | 
					from mongoengine.errors import InvalidQueryError
 | 
				
			||||||
 | 
					from mongoengine.queryset import Q
 | 
				
			||||||
 | 
					
 | 
				
			||||||
__all__ = ("QTest",)
 | 
					__all__ = ("QTest",)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -132,12 +130,12 @@ class QTest(unittest.TestCase):
 | 
				
			|||||||
        TestDoc(x=10).save()
 | 
					        TestDoc(x=10).save()
 | 
				
			||||||
        TestDoc(y=True).save()
 | 
					        TestDoc(y=True).save()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        self.assertEqual(query,
 | 
					        self.assertEqual(query, {
 | 
				
			||||||
        {'$and': [
 | 
					            '$and': [
 | 
				
			||||||
            {'$or': [{'x': {'$gt': 0}}, {'x': {'$exists': False}}]},
 | 
					                {'$or': [{'x': {'$gt': 0}}, {'x': {'$exists': False}}]},
 | 
				
			||||||
            {'$or': [{'x': {'$lt': 100}}, {'y': True}]}
 | 
					                {'$or': [{'x': {'$lt': 100}}, {'y': True}]}
 | 
				
			||||||
        ]})
 | 
					            ]
 | 
				
			||||||
 | 
					        })
 | 
				
			||||||
        self.assertEqual(2, TestDoc.objects(q1 & q2).count())
 | 
					        self.assertEqual(2, TestDoc.objects(q1 & q2).count())
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def test_or_and_or_combination(self):
 | 
					    def test_or_and_or_combination(self):
 | 
				
			||||||
@@ -157,15 +155,14 @@ class QTest(unittest.TestCase):
 | 
				
			|||||||
        q2 = (Q(x__lt=100) & (Q(y=False) | Q(y__exists=False)))
 | 
					        q2 = (Q(x__lt=100) & (Q(y=False) | Q(y__exists=False)))
 | 
				
			||||||
        query = (q1 | q2).to_query(TestDoc)
 | 
					        query = (q1 | q2).to_query(TestDoc)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        self.assertEqual(query,
 | 
					        self.assertEqual(query, {
 | 
				
			||||||
            {'$or': [
 | 
					            '$or': [
 | 
				
			||||||
                {'$and': [{'x': {'$gt': 0}},
 | 
					                {'$and': [{'x': {'$gt': 0}},
 | 
				
			||||||
                          {'$or': [{'y': True}, {'y': {'$exists': False}}]}]},
 | 
					                          {'$or': [{'y': True}, {'y': {'$exists': False}}]}]},
 | 
				
			||||||
                {'$and': [{'x': {'$lt': 100}},
 | 
					                {'$and': [{'x': {'$lt': 100}},
 | 
				
			||||||
                          {'$or': [{'y': False}, {'y': {'$exists': False}}]}]}
 | 
					                          {'$or': [{'y': False}, {'y': {'$exists': False}}]}]}
 | 
				
			||||||
            ]}
 | 
					            ]
 | 
				
			||||||
        )
 | 
					        })
 | 
				
			||||||
 | 
					 | 
				
			||||||
        self.assertEqual(2, TestDoc.objects(q1 | q2).count())
 | 
					        self.assertEqual(2, TestDoc.objects(q1 | q2).count())
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def test_multiple_occurence_in_field(self):
 | 
					    def test_multiple_occurence_in_field(self):
 | 
				
			||||||
@@ -215,19 +212,19 @@ class QTest(unittest.TestCase):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        BlogPost.drop_collection()
 | 
					        BlogPost.drop_collection()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        post1 = BlogPost(title='Test 1', publish_date=datetime(2010, 1, 8), published=False)
 | 
					        post1 = BlogPost(title='Test 1', publish_date=datetime.datetime(2010, 1, 8), published=False)
 | 
				
			||||||
        post1.save()
 | 
					        post1.save()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        post2 = BlogPost(title='Test 2', publish_date=datetime(2010, 1, 15), published=True)
 | 
					        post2 = BlogPost(title='Test 2', publish_date=datetime.datetime(2010, 1, 15), published=True)
 | 
				
			||||||
        post2.save()
 | 
					        post2.save()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        post3 = BlogPost(title='Test 3', published=True)
 | 
					        post3 = BlogPost(title='Test 3', published=True)
 | 
				
			||||||
        post3.save()
 | 
					        post3.save()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        post4 = BlogPost(title='Test 4', publish_date=datetime(2010, 1, 8))
 | 
					        post4 = BlogPost(title='Test 4', publish_date=datetime.datetime(2010, 1, 8))
 | 
				
			||||||
        post4.save()
 | 
					        post4.save()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        post5 = BlogPost(title='Test 1', publish_date=datetime(2010, 1, 15))
 | 
					        post5 = BlogPost(title='Test 1', publish_date=datetime.datetime(2010, 1, 15))
 | 
				
			||||||
        post5.save()
 | 
					        post5.save()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        post6 = BlogPost(title='Test 1', published=False)
 | 
					        post6 = BlogPost(title='Test 1', published=False)
 | 
				
			||||||
@@ -250,7 +247,7 @@ class QTest(unittest.TestCase):
 | 
				
			|||||||
        self.assertTrue(all(obj.id in posts for obj in published_posts))
 | 
					        self.assertTrue(all(obj.id in posts for obj in published_posts))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # Check Q object combination
 | 
					        # Check Q object combination
 | 
				
			||||||
        date = datetime(2010, 1, 10)
 | 
					        date = datetime.datetime(2010, 1, 10)
 | 
				
			||||||
        q = BlogPost.objects(Q(publish_date__lte=date) | Q(published=True))
 | 
					        q = BlogPost.objects(Q(publish_date__lte=date) | Q(published=True))
 | 
				
			||||||
        posts = [post.id for post in q]
 | 
					        posts = [post.id for post in q]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -273,8 +270,10 @@ class QTest(unittest.TestCase):
 | 
				
			|||||||
        # Test invalid query objs
 | 
					        # Test invalid query objs
 | 
				
			||||||
        def wrong_query_objs():
 | 
					        def wrong_query_objs():
 | 
				
			||||||
            self.Person.objects('user1')
 | 
					            self.Person.objects('user1')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        def wrong_query_objs_filter():
 | 
					        def wrong_query_objs_filter():
 | 
				
			||||||
            self.Person.objects('user1')
 | 
					            self.Person.objects('user1')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        self.assertRaises(InvalidQueryError, wrong_query_objs)
 | 
					        self.assertRaises(InvalidQueryError, wrong_query_objs)
 | 
				
			||||||
        self.assertRaises(InvalidQueryError, wrong_query_objs_filter)
 | 
					        self.assertRaises(InvalidQueryError, wrong_query_objs_filter)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -284,7 +283,6 @@ class QTest(unittest.TestCase):
 | 
				
			|||||||
        person = self.Person(name='Guido van Rossum')
 | 
					        person = self.Person(name='Guido van Rossum')
 | 
				
			||||||
        person.save()
 | 
					        person.save()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        import re
 | 
					 | 
				
			||||||
        obj = self.Person.objects(Q(name=re.compile('^Gui'))).first()
 | 
					        obj = self.Person.objects(Q(name=re.compile('^Gui'))).first()
 | 
				
			||||||
        self.assertEqual(obj, person)
 | 
					        self.assertEqual(obj, person)
 | 
				
			||||||
        obj = self.Person.objects(Q(name=re.compile('^gui'))).first()
 | 
					        obj = self.Person.objects(Q(name=re.compile('^gui'))).first()
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user