Various fixes again

tests/fields/__init__.py

@@ -1,3 +1,3 @@
 from fields import *
 from file_tests import *
-from geo import *
+from geo import *

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)

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):
 

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):