summaryrefslogtreecommitdiff
path: root/django/utils/dateparse.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-01-07 12:11:46 +0100
committerClaude Paroz <claude@2xlibre.net>2017-01-18 21:33:28 +0100
commit2b281cc35ed9d997614ca3c416928d7fabfef1ad (patch)
treed3e73cf44b15139aa9f1f53e398942ba64f5e190 /django/utils/dateparse.py
parent7b2f2e74adb36a4334e83130f6abc2f79d395235 (diff)
Refs #23919 -- Removed most of remaining six usage
Thanks Tim Graham for the review.
Diffstat (limited to 'django/utils/dateparse.py')
-rw-r--r--django/utils/dateparse.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/django/utils/dateparse.py b/django/utils/dateparse.py
index b2020b5281..d091100a0d 100644
--- a/django/utils/dateparse.py
+++ b/django/utils/dateparse.py
@@ -8,7 +8,6 @@
import datetime
import re
-from django.utils import six
from django.utils.timezone import get_fixed_timezone, utc
date_re = re.compile(
@@ -60,7 +59,7 @@ def parse_date(value):
"""
match = date_re.match(value)
if match:
- kw = {k: int(v) for k, v in six.iteritems(match.groupdict())}
+ kw = {k: int(v) for k, v in match.groupdict().items()}
return datetime.date(**kw)
@@ -78,7 +77,7 @@ def parse_time(value):
kw = match.groupdict()
if kw['microsecond']:
kw['microsecond'] = kw['microsecond'].ljust(6, '0')
- kw = {k: int(v) for k, v in six.iteritems(kw) if v is not None}
+ kw = {k: int(v) for k, v in kw.items() if v is not None}
return datetime.time(**kw)
@@ -105,7 +104,7 @@ def parse_datetime(value):
if tzinfo[0] == '-':
offset = -offset
tzinfo = get_fixed_timezone(offset)
- kw = {k: int(v) for k, v in six.iteritems(kw) if v is not None}
+ kw = {k: int(v) for k, v in kw.items() if v is not None}
kw['tzinfo'] = tzinfo
return datetime.datetime(**kw)
@@ -127,5 +126,5 @@ def parse_duration(value):
kw['microseconds'] = kw['microseconds'].ljust(6, '0')
if kw.get('seconds') and kw.get('microseconds') and kw['seconds'].startswith('-'):
kw['microseconds'] = '-' + kw['microseconds']
- kw = {k: float(v) for k, v in six.iteritems(kw) if v is not None}
+ kw = {k: float(v) for k, v in kw.items() if v is not None}
return sign * datetime.timedelta(**kw)