mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Refs #23919 -- Removed most of remaining six usage

Browse Source 
Thanks Tim Graham for the review.
This commit is contained in:
Claude Paroz
2017-01-07 12:11:46 +01:00
parent 7b2f2e74ad
commit 2b281cc35e
180 changed files with 421 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/timezones/tests.py
View File

@@ -23,7 +23,7 @@ from django.test import (
)
from django.test.utils import requires_tz_support
from django.urls import reverse
from django.utils import six, timezone
from django.utils import timezone
from django.utils.timezone import timedelta
from .forms import (
@@ -888,8 +888,8 @@ class TemplateTests(SimpleTestCase):
}
}
for k1, dt in six.iteritems(datetimes):
for k2, tpl in six.iteritems(templates):
for k1, dt in datetimes.items():
for k2, tpl in templates.items():
ctx = Context({'dt': dt, 'ICT': ICT})
actual = tpl.render(ctx)
expected = results[k1][k2]
@@ -901,8 +901,8 @@ class TemplateTests(SimpleTestCase):
results['ict']['notag'] = t('ict', 'eat', 'utc', 'ict')
with self.settings(USE_TZ=False):
for k1, dt in six.iteritems(datetimes):
for k2, tpl in six.iteritems(templates):
for k1, dt in datetimes.items():
for k2, tpl in templates.items():
ctx = Context({'dt': dt, 'ICT': ICT})
actual = tpl.render(ctx)
expected = results[k1][k2]