Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #17294 -- Supported nullable DateTimeFields when time zone supp…

…ort is enabled. Thanks pressureman for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 866c229f52df29f6b7b07463548532aae421fe42 1 parent e954a03
@aaugustin aaugustin authored
View
2  django/db/models/fields/__init__.py
@@ -786,7 +786,7 @@ def pre_save(self, model_instance, add):
def get_prep_value(self, value):
value = self.to_python(value)
- if settings.USE_TZ and timezone.is_naive(value):
+ if value is not None and settings.USE_TZ and timezone.is_naive(value):
# For backwards compatibility, interpret naive datetimes in local
# time. This won't work during DST change, but we can't do much
# about it, so we let the exceptions percolate up the call stack.
View
3  django/utils/timezone.py
@@ -228,6 +228,9 @@ def now():
else:
return datetime.now()
+# By design, these four functions don't perform any checks on their arguments.
+# The caller should ensure that they don't receive an invalid value like None.
+
def is_aware(value):
"""
Determines if a given datetime.datetime is aware.
View
3  tests/modeltests/timezones/models.py
@@ -3,6 +3,9 @@
class Event(models.Model):
dt = models.DateTimeField()
+class MaybeEvent(models.Model):
+ dt = models.DateTimeField(blank=True, null=True)
+
class Timestamp(models.Model):
created = models.DateTimeField(auto_now_add=True)
updated = models.DateTimeField(auto_now=True)
View
7 tests/modeltests/timezones/tests.py
@@ -25,7 +25,7 @@
from django.utils.unittest import skipIf
from .forms import EventForm, EventSplitForm, EventModelForm
-from .models import Event, Timestamp
+from .models import Event, MaybeEvent, Timestamp
# These tests use the EAT (Eastern Africa Time) and ICT (Indochina Time)
@@ -403,6 +403,11 @@ def test_query_dates(self):
datetime.datetime(2011, 1, 1, tzinfo=UTC)],
transform=lambda d: d)
+ def test_null_datetime(self):
+ # Regression for #17294
+ e = MaybeEvent.objects.create()
+ self.assertEqual(e.dt, None)
+
NewDatabaseTests = override_settings(USE_TZ=True)(NewDatabaseTests)
Please sign in to comment.
Something went wrong with that request. Please try again.