mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #17263 -- Added a warning when a naive datetime reaches the database layer while time zone support is enabled.

Browse Source 
After this commit, timezones.AdminTests will raise warnings because the sessions contrib app hasn't been upgraded to support time zones yet.
This will be fixed in an upcoming commit.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Aymeric Augustin
2011-11-19 23:27:20 +00:00
parent 9b8e211dd3
commit 9c30d48b45
4 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/modeltests/timezones/fixtures/users.xml → tests/modeltests/timezones/fixtures/tz_users.xml
View File

@@ -9,9 +9,9 @@
<field type="BooleanField" name="is_staff">True</field>
<field type="BooleanField" name="is_active">True</field>
<field type="BooleanField" name="is_superuser">True</field>
<field type="DateTimeField" name="last_login">2007-05-30 13:20:10</field>
<field type="DateTimeField" name="date_joined">2007-05-30 13:20:10</field>
<field type="DateTimeField" name="last_login">2001-01-01 00:00:00+00:00</field>
<field type="DateTimeField" name="date_joined">2001-01-01 00:00:00+00:00</field>
<field to="auth.group" name="groups" rel="ManyToManyRel"></field>
<field to="auth.permission" name="user_permissions" rel="ManyToManyRel"></field>
</object>
</django-objects>
</django-objects>

23
tests/modeltests/timezones/tests.py
View File

@@ -3,6 +3,7 @@ from __future__ import with_statement
import datetime
import os
import time
import warnings
try:
import pytz
@@ -238,7 +239,11 @@ class NewDatabaseTests(BaseDateTimeTests):
def test_naive_datetime(self):
dt = datetime.datetime(2011, 9, 1, 13, 20, 30)
Event.objects.create(dt=dt)
with warnings.catch_warnings(record=True) as recorded:
Event.objects.create(dt=dt)
self.assertEqual(len(recorded), 1)
msg = str(recorded[0].message)
self.assertTrue(msg.startswith("DateTimeField received a naive datetime"))
event = Event.objects.get()
# naive datetimes are interpreted in local time
self.assertEqual(event.dt, dt.replace(tzinfo=EAT))
@@ -246,7 +251,11 @@ class NewDatabaseTests(BaseDateTimeTests):
@skipUnlessDBFeature('supports_microsecond_precision')
def test_naive_datetime_with_microsecond(self):
dt = datetime.datetime(2011, 9, 1, 13, 20, 30, 405060)
Event.objects.create(dt=dt)
with warnings.catch_warnings(record=True) as recorded:
Event.objects.create(dt=dt)
self.assertEqual(len(recorded), 1)
msg = str(recorded[0].message)
self.assertTrue(msg.startswith("DateTimeField received a naive datetime"))
event = Event.objects.get()
# naive datetimes are interpreted in local time
self.assertEqual(event.dt, dt.replace(tzinfo=EAT))
@@ -254,7 +263,11 @@ class NewDatabaseTests(BaseDateTimeTests):
@skipIfDBFeature('supports_microsecond_precision')
def test_naive_datetime_with_microsecond_unsupported(self):
dt = datetime.datetime(2011, 9, 1, 13, 20, 30, 405060)
Event.objects.create(dt=dt)
with warnings.catch_warnings(record=True) as recorded:
Event.objects.create(dt=dt)
self.assertEqual(len(recorded), 1)
msg = str(recorded[0].message)
self.assertTrue(msg.startswith("DateTimeField received a naive datetime"))
event = Event.objects.get()
# microseconds are lost during a round-trip in the database
# naive datetimes are interpreted in local time
@@ -294,7 +307,7 @@ class NewDatabaseTests(BaseDateTimeTests):
self.assertEqual(event.dt, dt)
def test_auto_now_and_auto_now_add(self):
now = datetime.datetime.utcnow().replace(tzinfo=UTC)
now = timezone.now()
past = now - datetime.timedelta(seconds=2)
future = now + datetime.timedelta(seconds=2)
Timestamp.objects.create()
@@ -824,7 +837,7 @@ NewFormsTests = override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=Tr
class AdminTests(BaseDateTimeTests):
urls = 'modeltests.timezones.urls'
fixtures = ['users.xml']
fixtures = ['tz_users.xml']
def setUp(self):
self.client.login(username='super', password='secret')