Deprecated 'name' arg for fields in favour of 'db_field'

tests/document.py

@@ -1,5 +1,5 @@
 import unittest
-import datetime
+from datetime import datetime
 import pymongo
 
 from mongoengine import *
@@ -199,7 +199,7 @@ class DocumentTest(unittest.TestCase):
         """Ensure that capped collections work properly.
         """
         class Log(Document):
-            date = DateTimeField(default=datetime.datetime.now)
+            date = DateTimeField(default=datetime.now)
             meta = {
                 'max_documents': 10,
                 'max_size': 90000,
@@ -225,7 +225,7 @@ class DocumentTest(unittest.TestCase):
         # Check that the document cannot be redefined with different options
         def recreate_log_document():
             class Log(Document):
-                date = DateTimeField(default=datetime.datetime.now)
+                date = DateTimeField(default=datetime.now)
                 meta = {
                     'max_documents': 11,
                 }
@@ -239,7 +239,7 @@ class DocumentTest(unittest.TestCase):
         """Ensure that indexes are used when meta[indexes] is specified.
         """
         class BlogPost(Document):
-            date = DateTimeField(name='addDate', default=datetime.datetime.now)
+            date = DateTimeField(db_field='addDate', default=datetime.now)
             category = StringField()
             tags = ListField(StringField())
             meta = {
@@ -297,7 +297,7 @@ class DocumentTest(unittest.TestCase):
         self.assertRaises(OperationError, post2.save)
 
         class Date(EmbeddedDocument):
-            year = IntField(name='yr')
+            year = IntField(db_field='yr')
 
         class BlogPost(Document):
             title = StringField()
@@ -328,7 +328,7 @@ class DocumentTest(unittest.TestCase):
 
         User.drop_collection()
 
-        self.assertEqual(User._fields['username'].name, '_id')
+        self.assertEqual(User._fields['username'].db_field, '_id')
         self.assertEqual(User._meta['id_field'], 'username')
 
         def create_invalid_user():
@@ -423,7 +423,7 @@ class DocumentTest(unittest.TestCase):
         comment.date = 4
         self.assertRaises(ValidationError, comment.validate)
 
-        comment.date = datetime.datetime.now()
+        comment.date = datetime.now()
         comment.validate()
 
     def test_save(self):

tests/queryset.py

@@ -62,7 +62,7 @@ class QuerySetTest(unittest.TestCase):
         results = list(people)
         self.assertTrue(isinstance(results[0], self.Person))
         self.assertTrue(isinstance(results[0].id, (pymongo.objectid.ObjectId,
-                                                    str, unicode)))
+                                                   str, unicode)))
         self.assertEqual(results[0].name, "User A")
         self.assertEqual(results[0].age, 20)
         self.assertEqual(results[1].name, "User B")
@@ -346,7 +346,7 @@ class QuerySetTest(unittest.TestCase):
 
         # Check polymorphism still works
         class Employee(self.Person):
-            salary = IntField(name='wage')
+            salary = IntField(db_field='wage')
 
         employee = Employee(name='test employee', age=40, salary=30000)
         employee.save()
@@ -517,11 +517,12 @@ class QuerySetTest(unittest.TestCase):
         """Ensure that field substitutions occur properly in exec_js functions.
         """
         class Comment(EmbeddedDocument):
-            content = StringField(name='body')
+            content = StringField(db_field='body')
 
         class BlogPost(Document):
-            name = StringField(name='doc-name')
-            comments = ListField(EmbeddedDocumentField(Comment), name='cmnts')
+            name = StringField(db_field='doc-name')
+            comments = ListField(EmbeddedDocumentField(Comment), 
+                                 db_field='cmnts')
 
         BlogPost.drop_collection()
 
@@ -796,7 +797,7 @@ class QuerySetTest(unittest.TestCase):
         """
         class BlogPost(Document):
             hits = IntField()
-            tags = ListField(StringField(), name='blogTags')
+            tags = ListField(StringField(), db_field='blogTags')
 
         BlogPost.drop_collection()
 
@@ -881,12 +882,12 @@ class QuerySetTest(unittest.TestCase):
         """Ensure that the correct field name is used when querying.
         """
         class Comment(EmbeddedDocument):
-            content = StringField(name='commentContent')
+            content = StringField(db_field='commentContent')
 
         class BlogPost(Document):
-            title = StringField(name='postTitle')
+            title = StringField(db_field='postTitle')
             comments = ListField(EmbeddedDocumentField(Comment),
-                                 name='postComments')
+                                 db_field='postComments')
 
 
         BlogPost.drop_collection()