test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Backport of b6b873d2ad from master
This commit is contained in:
Alex Gaynor 2014-05-17 09:54:34 -07:00 committed by Tim Graham
parent bc2bfbadcc
commit 8b87473008
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/utils/timezone.py
View File

@ -360,7 +360,7 @@ def make_aware(value, timezone):
# Check that we won't overwrite the timezone of an aware datetime. # Check that we won't overwrite the timezone of an aware datetime.
if is_aware(value): if is_aware(value):
raise ValueError( 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! # This may be wrong around DST changes!
return value.replace(tzinfo=timezone) return value.replace(tzinfo=timezone)

2
tests/utils_tests/test_timezone.py
View File

@ -109,7 +109,7 @@ class TimezoneTests(unittest.TestCase):
timezone.make_naive(datetime.datetime(2011, 9, 1, 13, 20, 30), EAT) timezone.make_naive(datetime.datetime(2011, 9, 1, 13, 20, 30), EAT)
@unittest.skipIf(pytz is None, "this test requires pytz") @unittest.skipIf(pytz is None, "this test requires pytz")
def test_make_aware(self): def test_make_aware2(self):
self.assertEqual( self.assertEqual(
timezone.make_aware(datetime.datetime(2011, 9, 1, 12, 20, 30), CET), timezone.make_aware(datetime.datetime(2011, 9, 1, 12, 20, 30), CET),
CET.localize(datetime.datetime(2011, 9, 1, 12, 20, 30))) CET.localize(datetime.datetime(2011, 9, 1, 12, 20, 30)))