summaryrefslogtreecommitdiff
path: root/tests/staticfiles_tests/cases.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2016-12-29 16:27:49 +0100
committerClaude Paroz <claude@2xlibre.net>2017-01-18 20:18:46 +0100
commit7b2f2e74adb36a4334e83130f6abc2f79d395235 (patch)
tree313387ba6a6f1311b43cf5fb4f2576d2d6c4f805 /tests/staticfiles_tests/cases.py
parentf6acd1d271122d66de8061e75ae26137ddf02658 (diff)
Refs #23919 -- Removed six.<various>_types usage
Thanks Tim Graham and Simon Charette for the reviews.
Diffstat (limited to 'tests/staticfiles_tests/cases.py')
-rw-r--r--tests/staticfiles_tests/cases.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/staticfiles_tests/cases.py b/tests/staticfiles_tests/cases.py
index f278e6a974..069402c6f6 100644
--- a/tests/staticfiles_tests/cases.py
+++ b/tests/staticfiles_tests/cases.py
@@ -7,7 +7,6 @@ from django.conf import settings
from django.core.management import call_command
from django.template import Context, Template
from django.test import SimpleTestCase, override_settings
-from django.utils import six
from django.utils.encoding import force_text
from .settings import TEST_SETTINGS
@@ -30,7 +29,7 @@ class BaseStaticFilesMixin(object):
self._get_file(filepath)
def render_template(self, template, **kwargs):
- if isinstance(template, six.string_types):
+ if isinstance(template, str):
template = Template(template)
return template.render(Context(**kwargs)).strip()
@@ -72,7 +71,7 @@ class CollectionTestCase(BaseStaticFilesMixin, SimpleTestCase):
self.patched_settings.enable()
self.run_collectstatic()
# Same comment as in runtests.teardown.
- self.addCleanup(shutil.rmtree, six.text_type(temp_dir))
+ self.addCleanup(shutil.rmtree, temp_dir)
def tearDown(self):
self.patched_settings.disable()