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

Backport of b6b873d2 from master

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)
 

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)))