summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-05-17 09:54:34 -0700
committerTim Graham <timograham@gmail.com>2014-05-17 13:31:09 -0400
commit8b874730086aa11570d08aa63ca74b4b888fb989 (patch)
treeb2704da60ea2acead80c35b45ba38900083a3cf7 /django/utils
parentbc2bfbadcc2b914613547abdc87241b2ae33fac2 (diff)
[1.7.x] Fixed several flake8 errors, including one where a test wouldn't be run
Backport of b6b873d2ada0d7c2a616d11f161a7688df15f45f from master
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/timezone.py2
1 files changed, 1 insertions, 1 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)