Commit fc9e0606 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Fixed a stupid bug in the implementation of timezone.make_aware. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17332 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent b895b297

django/utils/timezone.py

+1 −1
Original line number Diff line number Diff line
@@ -267,5 +267,5 @@ def make_naive(value, timezone): 
    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)

tests/modeltests/timezones/tests.py

+27 −0
Original line number Diff line number Diff line
@@ -953,3 +953,30 @@ class AdminTests(BaseDateTimeTests): 
        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)

        )