summaryrefslogtreecommitdiff
path: root/tests/admin_widgets/tests.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-10-07 21:06:49 -0400
committerTim Graham <timograham@gmail.com>2016-10-27 08:53:20 -0400
commit414ad25b090a63eaaf297b1164c8f7d814a710a2 (patch)
treee3d0e6fdffee0793baad41a339c2d63db742c33a /tests/admin_widgets/tests.py
parentd84ffcc22b2a0dbc0a44a67d56da7e3647e2f87a (diff)
downloaddjango-414ad25b090a63eaaf297b1164c8f7d814a710a2.tar.gz
Fixed #27327 -- Simplified time zone handling by requiring pytz.
Diffstat (limited to 'tests/admin_widgets/tests.py')
-rw-r--r--tests/admin_widgets/tests.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py
index 057771bfa4..443e6c6e18 100644
--- a/tests/admin_widgets/tests.py
+++ b/tests/admin_widgets/tests.py
@@ -5,7 +5,8 @@ import gettext
import os
from datetime import datetime, timedelta
from importlib import import_module
-from unittest import skipIf
+
+import pytz
from django import forms
from django.conf import settings
@@ -23,11 +24,6 @@ from django.utils import six, translation
from . import models
from .widgetadmin import site as widget_admin_site
-try:
- import pytz
-except ImportError:
- pytz = None
-
class TestDataMixin(object):
@@ -794,7 +790,6 @@ class DateTimePickerSeleniumTests(AdminWidgetSeleniumTestCase):
self.wait_for_text('#calendarin0 caption', expected_caption)
-@skipIf(pytz is None, "this test requires pytz")
@override_settings(TIME_ZONE='Asia/Singapore')
class DateTimePickerShortcutsSeleniumTests(AdminWidgetSeleniumTestCase):