From 51065e7a4dda96943dadfcbdfcca6111dfa1f9f5 Mon Sep 17 00:00:00 2001
From: flosch <flori@n-schlachter.de>
Date: Sun, 25 Jul 2010 18:33:33 +0200
Subject: [PATCH] Closes #46 by instantiating a new default instance for every
 field by request.

---
 mongoengine/base.py   | 5 ++++-
 mongoengine/fields.py | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mongoengine/base.py b/mongoengine/base.py
index 086c7874..10ff1219 100644
--- a/mongoengine/base.py
+++ b/mongoengine/base.py
@@ -52,7 +52,10 @@ class BaseField(object):
         # Get value from document instance if available, if not use default
         value = instance._data.get(self.name)
         if value is None:
-            value = self.default
+            if callable(self.default): # fixes #46
+                value = self.default()
+            else:
+                value = self.default
             # Allow callable default values
             if callable(value):
                 value = value()
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f84f751b..670e3cd3 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):