summaryrefslogtreecommitdiff
path: root/django/utils/tzinfo.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/utils/tzinfo.py')
-rw-r--r--django/utils/tzinfo.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/django/utils/tzinfo.py b/django/utils/tzinfo.py
index 25efd20222..6d09082a9e 100644
--- a/django/utils/tzinfo.py
+++ b/django/utils/tzinfo.py
@@ -2,12 +2,14 @@
from __future__ import unicode_literals
-from datetime import timedelta, tzinfo
import time
import warnings
+from datetime import timedelta, tzinfo
from django.utils.deprecation import RemovedInDjango19Warning
-from django.utils.encoding import force_str, force_text, DEFAULT_LOCALE_ENCODING
+from django.utils.encoding import (
+ DEFAULT_LOCALE_ENCODING, force_str, force_text,
+)
warnings.warn(
"django.utils.tzinfo will be removed in Django 1.9. "