Commit 8b874730 authored by Alex Gaynor's avatar Alex Gaynor Committed by Tim Graham
Browse files

[1.7.x] Fixed several flake8 errors, including one where a test wouldn't be run 

Backport of b6b873d2 from master
parent bc2bfbad

tests/utils_tests/test_timezone.py

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ class TimezoneTests(unittest.TestCase): 
            timezone.make_naive(datetime.datetime(2011, 9, 1, 13, 20, 30), EAT)



    @unittest.skipIf(pytz is None, "this test requires pytz")

    def test_make_aware(self):

    def test_make_aware2(self):

        self.assertEqual(

            timezone.make_aware(datetime.datetime(2011, 9, 1, 12, 20, 30), CET),

            CET.localize(datetime.datetime(2011, 9, 1, 12, 20, 30)))

django/utils/timezone.py

+1 −1

File changed.

Contains only whitespace changes.