diff options
| author | Tim Graham <timograham@gmail.com> | 2016-10-07 21:06:49 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-10-27 08:53:20 -0400 |
| commit | 414ad25b090a63eaaf297b1164c8f7d814a710a2 (patch) | |
| tree | e3d0e6fdffee0793baad41a339c2d63db742c33a /tests/humanize_tests | |
| parent | d84ffcc22b2a0dbc0a44a67d56da7e3647e2f87a (diff) | |
| download | django-414ad25b090a63eaaf297b1164c8f7d814a710a2.tar.gz | |
Fixed #27327 -- Simplified time zone handling by requiring pytz.
Diffstat (limited to 'tests/humanize_tests')
| -rw-r--r-- | tests/humanize_tests/tests.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/humanize_tests/tests.py b/tests/humanize_tests/tests.py index 22ae426954..a3cc512239 100644 --- a/tests/humanize_tests/tests.py +++ b/tests/humanize_tests/tests.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import datetime from decimal import Decimal -from unittest import skipIf from django.contrib.humanize.templatetags import humanize from django.template import Context, Template, defaultfilters @@ -12,12 +11,6 @@ from django.utils.html import escape from django.utils.timezone import get_fixed_timezone, utc from django.utils.translation import ugettext as _ -try: - import pytz -except ImportError: - pytz = None - - # Mock out datetime in some tests so they don't fail occasionally when they # run too slow. Use a fixed datetime for datetime.now(). DST change in # America/Chicago (the default time zone) happened on March 11th in 2012. @@ -174,7 +167,6 @@ class HumanizeTests(SimpleTestCase): # As 24h of difference they will never be the same self.assertNotEqual(naturalday_one, naturalday_two) - @skipIf(pytz is None, "this test requires pytz") def test_naturalday_uses_localtime(self): # Regression for #18504 # This is 2012-03-08HT19:30:00-06:00 in America/Chicago |