Ticket #13328: patch_v3_13328_with_tests.2.diff

django/db/models/fields/__init__.py

@@ -132 +132 @@
         memodict[id(self)] = obj
         return obj
 
+    def __getstate__(self):
+        obj_dict = self.__dict__.copy()
+        del obj_dict['default']
+        return obj_dict
+
+    def __setstate__(self, data):
+        self.__dict__.update(data)
+
+        # Restore the default
+        self.default = self._model._meta.get_field_by_name(self.name)[0].default
+
+
     def to_python(self, value):
         """
         Converts the input value into the expected Python data type, raising
@@ -233 +245 @@
 
     def contribute_to_class(self, cls, name):
         self.set_attributes_from_name(name)
+        self._model = cls
         cls._meta.add_field(self)
         if self.choices:
             setattr(cls, 'get_%s_display' % self.name, curry(cls._get_FIELD_display, field=self))

tests/regressiontests/queryset_pickle/models.py

@@ +1 @@
+import datetime
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
+class Numbers(object):
+
+    @classmethod
+    def get_number(self):
+        return 2
+
 class Group(models.Model):
     name = models.CharField(_('name'), max_length=100)
 
 class Event(models.Model):
     group = models.ForeignKey(Group)
+
+class Happening(models.Model):
+    when = models.DateTimeField(blank=True, default=datetime.datetime.now)
+    name = models.CharField(blank=True, max_length=100, default=lambda:"test")
+    number = models.IntegerField(blank=True, default=Numbers.get_number)

tests/regressiontests/queryset_pickle/tests.py

@@ -1 +1 @@
 import pickle
+import datetime
 
 from django.test import TestCase
 
-from models import Group, Event
-
+from models import Group, Event, Happening
 
 class PickleabilityTestCase(TestCase):
     def assert_pickles(self, qs):
@@ -12 +12 @@
     def test_related_field(self):
         g = Group.objects.create(name="Ponies Who Own Maybachs")
         self.assert_pickles(Event.objects.filter(group=g.id))
+
+    def test_datetime_callable_default_all(self):
+        self.assert_pickles(Happening.objects.all())
+
+    def test_datetime_callable_default_filter(self):
+        self.assert_pickles(Happening.objects.filter(when=datetime.datetime.now()))
+
+    def test_lambda_as_default(self):
+        self.assert_pickles(Happening.objects.filter(name="test"))
+
+    def test_callable_as_default(self):
+        self.assert_pickles(Happening.objects.filter(number=1))