diff options
Diffstat (limited to 'tests/modeltests/timezones/tests.py')
| -rw-r--r-- | tests/modeltests/timezones/tests.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/modeltests/timezones/tests.py b/tests/modeltests/timezones/tests.py index aadb8ba842..a38e4b3f75 100644 --- a/tests/modeltests/timezones/tests.py +++ b/tests/modeltests/timezones/tests.py @@ -20,6 +20,7 @@ from django.http import HttpRequest from django.template import Context, RequestContext, Template, TemplateSyntaxError from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature from django.test.utils import override_settings +from django.utils import six from django.utils import timezone from django.utils.tzinfo import FixedOffset from django.utils.unittest import skipIf, skipUnless @@ -690,8 +691,8 @@ class TemplateTests(TestCase): } } - for k1, dt in datetimes.iteritems(): - for k2, tpl in templates.iteritems(): + for k1, dt in six.iteritems(datetimes): + for k2, tpl in six.iteritems(templates): ctx = Context({'dt': dt, 'ICT': ICT}) actual = tpl.render(ctx) expected = results[k1][k2] @@ -703,8 +704,8 @@ class TemplateTests(TestCase): results['ict']['notag'] = t('ict', 'eat', 'utc', 'ict') with self.settings(USE_TZ=False): - for k1, dt in datetimes.iteritems(): - for k2, tpl in templates.iteritems(): + for k1, dt in six.iteritems(datetimes): + for k2, tpl in six.iteritems(templates): ctx = Context({'dt': dt, 'ICT': ICT}) actual = tpl.render(ctx) expected = results[k1][k2] |