Author: aaugustin
Date: 2012-01-02 12:45:09 -0800 (Mon, 02 Jan 2012)
New Revision: 17332
Modified:
django/trunk/django/utils/timezone.py
django/trunk/tests/modeltests/timezones/tests.py
Log:
Fixed a stupid bug in the implementation of timezone.make_aware.
Modified: django/trunk/django/utils/timezone.py
===================================================================
--- django/trunk/django/utils/timezone.py 2012-01-02 20:09:58 UTC (rev
17331)
+++ django/trunk/django/utils/timezone.py 2012-01-02 20:45:09 UTC (rev
17332)
@@ -267,5 +267,5 @@
value = value.astimezone(timezone)
if hasattr(timezone, 'normalize'):
# available for pytz time zones
- return timezone.normalize(value)
+ value = timezone.normalize(value)
return value.replace(tzinfo=None)
Modified: django/trunk/tests/modeltests/timezones/tests.py
===================================================================
--- django/trunk/tests/modeltests/timezones/tests.py 2012-01-02 20:09:58 UTC
(rev 17331)
+++ django/trunk/tests/modeltests/timezones/tests.py 2012-01-02 20:45:09 UTC
(rev 17332)
@@ -953,3 +953,30 @@
self.assertContains(response, t.created.astimezone(ICT).isoformat())
AdminTests = override_settings(DATETIME_FORMAT='c', USE_L10N=False,
USE_TZ=True)(AdminTests)
+
+
+class UtilitiesTests(BaseDateTimeTests):
+
+ def test_make_aware(self):
+ self.assertEqual(
+ timezone.make_aware(datetime.datetime(2011, 9, 1, 13, 20, 30),
EAT),
+ datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT)
+ )
+ self.assertEqual(
+ timezone.make_aware(datetime.datetime(2011, 9, 1, 10, 20, 30),
UTC),
+ datetime.datetime(2011, 9, 1, 10, 20, 30, tzinfo=UTC)
+ )
+
+ def test_make_naive(self):
+ self.assertEqual(
+ timezone.make_naive(datetime.datetime(2011, 9, 1, 13, 20, 30,
tzinfo=EAT), EAT),
+ datetime.datetime(2011, 9, 1, 13, 20, 30)
+ )
+ self.assertEqual(
+ timezone.make_naive(datetime.datetime(2011, 9, 1, 13, 20, 30,
tzinfo=EAT), UTC),
+ datetime.datetime(2011, 9, 1, 10, 20, 30)
+ )
+ self.assertEqual(
+ timezone.make_naive(datetime.datetime(2011, 9, 1, 10, 20, 30,
tzinfo=UTC), UTC),
+ datetime.datetime(2011, 9, 1, 10, 20, 30)
+ )
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
