diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-17 09:54:34 -0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-05-17 13:31:09 -0400 |
| commit | 8b874730086aa11570d08aa63ca74b4b888fb989 (patch) | |
| tree | b2704da60ea2acead80c35b45ba38900083a3cf7 | |
| parent | bc2bfbadcc2b914613547abdc87241b2ae33fac2 (diff) | |
[1.7.x] Fixed several flake8 errors, including one where a test wouldn't be run
Backport of b6b873d2ada0d7c2a616d11f161a7688df15f45f from master
| -rw-r--r-- | django/utils/timezone.py | 2 | ||||
| -rw-r--r-- | tests/utils_tests/test_timezone.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/utils/timezone.py b/django/utils/timezone.py index 0c44d4fd4d..c0ea04c7d8 100644 --- a/django/utils/timezone.py +++ b/django/utils/timezone.py @@ -360,7 +360,7 @@ def make_aware(value, timezone): # Check that we won't overwrite the timezone of an aware datetime. if is_aware(value): raise ValueError( - "make_aware expects a naive datetime, got %s" % value) + "make_aware expects a naive datetime, got %s" % value) # This may be wrong around DST changes! return value.replace(tzinfo=timezone) diff --git a/tests/utils_tests/test_timezone.py b/tests/utils_tests/test_timezone.py index aec58e394f..ae78d68103 100644 --- a/tests/utils_tests/test_timezone.py +++ b/tests/utils_tests/test_timezone.py @@ -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))) |