From b6b873d2ada0d7c2a616d11f161a7688df15f45f Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 17 May 2014 09:54:34 -0700 Subject: Fixed several flake8 errors, including one where a test wouldn't be run --- tests/invalid_models_tests/test_ordinary_fields.py | 4 ++-- tests/utils_tests/test_timezone.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/invalid_models_tests/test_ordinary_fields.py b/tests/invalid_models_tests/test_ordinary_fields.py index 176a932c49..cd71f47469 100644 --- a/tests/invalid_models_tests/test_ordinary_fields.py +++ b/tests/invalid_models_tests/test_ordinary_fields.py @@ -6,7 +6,7 @@ import unittest from django.core.checks import Error, Warning as DjangoWarning from django.db import connection, models from django.test.utils import override_settings -from django.utils.timezone import make_aware, now +from django.utils.timezone import now from .base import IsolatedModelsTestCase @@ -207,7 +207,7 @@ class DateFieldTests(IsolatedModelsTestCase): field1 = models.DateTimeField(auto_now=True, auto_now_add=False, default=now) field2 = models.DateTimeField(auto_now=False, auto_now_add=True, default=now) field3 = models.DateTimeField(auto_now=True, auto_now_add=True, default=None) - + expected = [] checks = [] for i in range(4): 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))) -- cgit v1.3