mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-03 05:13:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[py3] Replaced basestring by six.string_types.

Browse source
This commit is contained in:
Aymeric Augustin 2012-07-20 14:22:00 +02:00
parent cacd845996
commit 3cb2457f46
73 changed files with 230 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/regressiontests/staticfiles_tests/tests.py
View file

@ -20,6 +20,7 @@ from django.test.utils import override_settings
from django.utils.encoding import smart_unicode
from django.utils.functional import empty
from django.utils._os import rmtree_errorhandler
from django.utils import six
from django.contrib.staticfiles import finders, storage
@ -83,7 +84,7 @@ class BaseStaticFilesTestCase(object):
self.assertRaises(IOError, self._get_file, filepath)
def render_template(self, template, **kwargs):
if isinstance(template, basestring):
if isinstance(template, six.string_types):
template = loader.get_template_from_string(template)
return template.render(Context(kwargs)).strip()