From 3b62cf80cde0b83715662ce9bb01053dc13a7060 Mon Sep 17 00:00:00 2001
From: Harry Marr <harry.marr@gmail.com>
Date: Mon, 30 Aug 2010 13:00:34 +0100
Subject: [PATCH] Fixed {Dict,List}Field default issue. Closes #46.

---
 mongoengine/fields.py |  6 +++---
 tests/fields.py       | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f84f751b..d8d310dd 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -263,7 +263,7 @@ class ListField(BaseField):
             raise ValidationError('Argument to ListField constructor must be '
                                   'a valid field')
         self.field = field
-        kwargs.setdefault('default', [])
+        kwargs.setdefault('default', lambda: [])
         super(ListField, self).__init__(**kwargs)
 
     def __get__(self, instance, owner):
@@ -356,7 +356,7 @@ class DictField(BaseField):
     def __init__(self, basecls=None, *args, **kwargs):
         self.basecls = basecls or BaseField
         assert issubclass(self.basecls, BaseField)
-        kwargs.setdefault('default', {})
+        kwargs.setdefault('default', lambda: {})
         super(DictField, self).__init__(*args, **kwargs)
 
     def validate(self, value):
@@ -623,4 +623,4 @@ class GeoPointField(BaseField):
             raise ValidationError('Value must be a two-dimensional point.')
         if (not isinstance(value[0], (float, int)) and
             not isinstance(value[1], (float, int))):
-            raise ValidationError('Both values in point must be float or int.')
\ No newline at end of file
+            raise ValidationError('Both values in point must be float or int.')
diff --git a/tests/fields.py b/tests/fields.py
index 136437b8..ef776d4a 100644
--- a/tests/fields.py
+++ b/tests/fields.py
@@ -693,5 +693,18 @@ class FieldTest(unittest.TestCase):
 
         Event.drop_collection()
 
+    def test_ensure_unique_default_instances(self):
+        """Ensure that every document has it's own unique default instance."""
+        class D(Document):
+            data = DictField()
+            data2 = DictField(default=lambda: {})
+
+        d1 = D()
+        d1.data['foo'] = 'bar'
+        d1.data2['foo'] = 'bar'
+        d2 = D()
+        self.assertEqual(d2.data, {})
+        self.assertEqual(d2.data2, {})
+
 if __name__ == '__main__':
     unittest.main()