Ticket #21523: patch_21523.diff

django/db/models/fields/__init__.py

@@ -693 +693 @@
         if isinstance(value, datetime.date):
             return value
 
+        # handle objects that are neither dates nor strings, but which
+        # return a parseable date string, e.g. a mock date class.
+        value = smart_text(value)
+
         try:
             parsed = parse_date(value)
             if parsed is not None:
@@ -784 +788 @@
                 value = timezone.make_aware(value, default_timezone)
             return value
 
+
+        # handle objects that are neither dates nor strings, but which
+        # return a parseable date string, e.g. a mock date class.
+        value = smart_text(value)
+
         try:
             parsed = parse_datetime(value)
             if parsed is not None:

tests/regressiontests/model_fields/tests.py

@@ -1 +1 @@
 from __future__ import absolute_import, unicode_literals
 
+import mock
 import datetime
 from decimal import Decimal
 
@@ -127 +128 @@
         b = Bar.objects.create(b="bcd")
         self.assertEqual(b.a, a)
 
+from datetime import date as real_date # used to test mocking dates.
 class DateTimeFieldTests(unittest.TestCase):
+    
+    class FakeDate(real_date):
+        "An object that is *not* a date, but which could be parsed as such."
+        def __new__(cls, *args, **kwargs):
+            return real_date.__new__(real_date, *args, **kwargs)
+
     def test_datetimefield_to_python_usecs(self):
         """DateTimeField.to_python should support usecs"""
         f = models.DateTimeField()
@@ -144 +152 @@
         self.assertEqual(f.to_python('01:02:03.999999'),
                          datetime.time(1, 2, 3, 999999))
 
+    @mock.patch('datetime.date', FakeDate)
+    def test_datefield_to_python_can_be_mocked(self):
+        """DateField.to_python should support mock dates."""
+        self.assertEqual(models.DateField().to_python(
+                DateTimeFieldTests.FakeDate.today()),
+            datetime.date.today())
+
 class BooleanFieldTests(unittest.TestCase):
     def _test_get_db_prep_lookup(self, f):
         from django.db import connection