innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #22625 -- Normalized make_aware/naive errors. 

Also added tests for is/make_aware/naive.

Thanks Tom Michaelis for the report.
This commit is contained in:
Aymeric Augustin 2014-05-16 22:52:10 +02:00
parent 1efb2e73bf
commit fa89acf1d0
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/utils/timezone.py
View File

@ -351,6 +351,8 @@ def make_aware(value, timezone):
""" """
Makes a naive datetime.datetime in a given time zone aware. Makes a naive datetime.datetime in a given time zone aware.
""" """
if is_aware(value):
raise ValueError("make_aware expects a naive value, got %s" % value)
if hasattr(timezone, 'localize'): if hasattr(timezone, 'localize'):
# available for pytz time zones # available for pytz time zones
return timezone.localize(value, is_dst=None) return timezone.localize(value, is_dst=None)
@ -363,6 +365,8 @@ def make_naive(value, timezone):
""" """
Makes an aware datetime.datetime naive in a given time zone. Makes an aware datetime.datetime naive in a given time zone.
""" """
if is_naive(value):
raise ValueError("make_naive expects an aware value, got %s" % value)
value = value.astimezone(timezone) value = value.astimezone(timezone)
if hasattr(timezone, 'normalize'): if hasattr(timezone, 'normalize'):
# available for pytz time zones # available for pytz time zones

25
tests/utils_tests/test_timezone.py
View File

@ -71,3 +71,28 @@ class TimezoneTests(unittest.TestCase):
def test_pickling_unpickling(self): def test_pickling_unpickling(self):
self.assertIsInstance(pickle.loads(pickle.dumps(timezone.UTC())), timezone.UTC) self.assertIsInstance(pickle.loads(pickle.dumps(timezone.UTC())), timezone.UTC)
self.assertIsInstance(pickle.loads(pickle.dumps(timezone.LocalTimezone())), timezone.LocalTimezone) self.assertIsInstance(pickle.loads(pickle.dumps(timezone.LocalTimezone())), timezone.LocalTimezone)
def test_is_aware(self):
self.assertTrue(timezone.is_aware(datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT)))
self.assertFalse(timezone.is_aware(datetime.datetime(2011, 9, 1, 13, 20, 30)))
def test_is_naive(self):
self.assertFalse(timezone.is_naive(datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT)))
self.assertTrue(timezone.is_naive(datetime.datetime(2011, 9, 1, 13, 20, 30)))
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))
with self.assertRaises(ValueError):
timezone.make_aware(datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT), EAT)
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, 17, 20, 30, tzinfo=ICT), EAT),
datetime.datetime(2011, 9, 1, 13, 20, 30))
with self.assertRaises(ValueError):
timezone.make_naive(datetime.datetime(2011, 9, 1, 13, 20, 30), EAT)