diff options
| author | Claude Paroz <claude@2xlibre.net> | 2016-12-29 16:27:49 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2017-01-18 20:18:46 +0100 |
| commit | 7b2f2e74adb36a4334e83130f6abc2f79d395235 (patch) | |
| tree | 313387ba6a6f1311b43cf5fb4f2576d2d6c4f805 /django/template/library.py | |
| parent | f6acd1d271122d66de8061e75ae26137ddf02658 (diff) | |
Refs #23919 -- Removed six.<various>_types usage
Thanks Tim Graham and Simon Charette for the reviews.
Diffstat (limited to 'django/template/library.py')
| -rw-r--r-- | django/template/library.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/django/template/library.py b/django/template/library.py index 8a6c98ee09..b7e3cad532 100644 --- a/django/template/library.py +++ b/django/template/library.py @@ -1,7 +1,6 @@ import functools from importlib import import_module -from django.utils import six from django.utils.html import conditional_escape from django.utils.inspect import getargspec from django.utils.itercompat import is_iterable @@ -220,7 +219,7 @@ class InclusionNode(TagHelperNode): t = self.filename elif isinstance(getattr(self.filename, 'template', None), Template): t = self.filename.template - elif not isinstance(self.filename, six.string_types) and is_iterable(self.filename): + elif not isinstance(self.filename, str) and is_iterable(self.filename): t = context.template.engine.select_template(self.filename) else: t = context.template.engine.get_template(self.filename) |
