summaryrefslogtreecommitdiff
path: root/django/utils/dateformat.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/utils/dateformat.py')
-rw-r--r--django/utils/dateformat.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py
index 1640f9ae5a..f4de4e7f7c 100644
--- a/django/utils/dateformat.py
+++ b/django/utils/dateformat.py
@@ -12,16 +12,18 @@ Usage:
"""
from __future__ import unicode_literals
-import re
-import time
import calendar
import datetime
+import re
+import time
-from django.utils.dates import MONTHS, MONTHS_3, MONTHS_ALT, MONTHS_AP, WEEKDAYS, WEEKDAYS_ABBR
-from django.utils.translation import ugettext as _
-from django.utils.encoding import force_text
from django.utils import six
+from django.utils.dates import (
+ MONTHS, MONTHS_3, MONTHS_ALT, MONTHS_AP, WEEKDAYS, WEEKDAYS_ABBR,
+)
+from django.utils.encoding import force_text
from django.utils.timezone import get_default_timezone, is_aware, is_naive
+from django.utils.translation import ugettext as _
re_formatchars = re.compile(r'(?<!\\)([aAbBcdDeEfFgGhHiIjlLmMnNoOPrsStTUuwWyYzZ])')
re_escaped = re.compile(r'\\(.)')