diff options
author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-07-20 21:14:27 +0200 |
---|---|---|
committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-08-07 12:00:22 +0200 |
commit | ee191715eae73362768184aa95206cf61bac5d38 (patch) | |
tree | f6ffc0bf4dfaea9f91cf8536ba2aeb9a69a81a6d /django/utils/dateparse.py | |
parent | fa3f0aa021bea85b9196ef154a32c7bb1023a1e9 (diff) | |
download | django-ee191715eae73362768184aa95206cf61bac5d38.tar.gz |
[py3] Fixed access to dict keys/values/items.
Diffstat (limited to 'django/utils/dateparse.py')
-rw-r--r-- | django/utils/dateparse.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/django/utils/dateparse.py b/django/utils/dateparse.py index 532bb259c3..032eb493b6 100644 --- a/django/utils/dateparse.py +++ b/django/utils/dateparse.py @@ -7,6 +7,7 @@ import datetime import re +from django.utils import six from django.utils.timezone import utc from django.utils.tzinfo import FixedOffset @@ -34,7 +35,7 @@ def parse_date(value): """ match = date_re.match(value) if match: - kw = dict((k, int(v)) for k, v in match.groupdict().iteritems()) + kw = dict((k, int(v)) for k, v in six.iteritems(match.groupdict())) return datetime.date(**kw) def parse_time(value): @@ -53,7 +54,7 @@ def parse_time(value): kw = match.groupdict() if kw['microsecond']: kw['microsecond'] = kw['microsecond'].ljust(6, '0') - kw = dict((k, int(v)) for k, v in kw.iteritems() if v is not None) + kw = dict((k, int(v)) for k, v in six.iteritems(kw) if v is not None) return datetime.time(**kw) def parse_datetime(value): @@ -80,6 +81,6 @@ def parse_datetime(value): if tzinfo[0] == '-': offset = -offset tzinfo = FixedOffset(offset) - kw = dict((k, int(v)) for k, v in kw.iteritems() if v is not None) + kw = dict((k, int(v)) for k, v in six.iteritems(kw) if v is not None) kw['tzinfo'] = tzinfo return datetime.datetime(**kw) |