Ticket #19357: 19357-wip.patch

django/contrib/auth/tests/context_processors.py

@@ -63 +63 @@
 @skipIfCustomUser
 @override_settings(
     TEMPLATE_DIRS=(
-            os.path.join(os.path.dirname(__file__), 'templates'),
+            os.path.join(os.path.dirname(__file__), str('templates')),
         ),
     USE_TZ=False,                           # required for loading the fixture
     PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',),
@@ -110 +110 @@
         self.assertContains(response, "Has auth permissions")
         self.assertContains(response, "Has auth.add_permission permissions")
         self.assertNotContains(response, "nonexisting")
-    
+
     def test_perm_in_perms_attrs(self):
         u = User.objects.create_user(username='normal', password='secret')
         u.user_permissions.add(

django/contrib/auth/tests/forms.py

@@ -322 +322 @@
         self.assertEqual(form.cleaned_data['email'], email)
 
     def test_custom_email_subject(self):
-        template_path = os.path.join(os.path.dirname(__file__), 'templates')
+        template_path = os.path.join(os.path.dirname(__file__), str('templates'))
         with self.settings(TEMPLATE_DIRS=(template_path,)):
             data = {'email': 'testclient@example.com'}
             form = PasswordResetForm(data)

django/contrib/auth/tests/views.py

@@ -27 +27 @@
     LANGUAGE_CODE='en',
     TEMPLATE_LOADERS=global_settings.TEMPLATE_LOADERS,
     TEMPLATE_DIRS=(
-        os.path.join(os.path.dirname(__file__), 'templates'),
+        os.path.join(os.path.dirname(__file__), str('templates')),
     ),
     USE_TZ=False,
     PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',),

django/contrib/flatpages/tests/csrf.py

@@ -16 +16 @@
         'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
     ),
     TEMPLATE_DIRS=(
-        os.path.join(os.path.dirname(__file__), 'templates'),
+        os.path.join(os.path.dirname(__file__), str('templates')),
     ),
     SITE_ID=1,
 )

django/contrib/flatpages/tests/middleware.py

@@ -17 +17 @@
         'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
     ),
     TEMPLATE_DIRS=(
-        os.path.join(os.path.dirname(__file__), 'templates'),
+        os.path.join(os.path.dirname(__file__), str('templates')),
     ),
     SITE_ID=1,
 )
@@ -95 +95 @@
         'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
     ),
     TEMPLATE_DIRS=(
-        os.path.join(os.path.dirname(__file__), 'templates'),
+        os.path.join(os.path.dirname(__file__), str('templates')),
     ),
     SITE_ID=1,
 )

django/contrib/flatpages/tests/templatetags.py

@@ -16 +16 @@
         'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
     ),
     TEMPLATE_DIRS=(
-        os.path.join(os.path.dirname(__file__), 'templates'),
+        os.path.join(os.path.dirname(__file__), str('templates')),
     ),
     SITE_ID=1,
 )

django/contrib/flatpages/tests/views.py

@@ -17 +17 @@
         # no 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware'
     ),
     TEMPLATE_DIRS=(
-        os.path.join(os.path.dirname(__file__), 'templates'),
+        os.path.join(os.path.dirname(__file__), str('templates')),
     ),
     SITE_ID=1,
 )
@@ -84 +84 @@
         # no 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware'
     ),
     TEMPLATE_DIRS=(
-        os.path.join(os.path.dirname(__file__), 'templates'),
+        os.path.join(os.path.dirname(__file__), str('templates')),
     ),
     SITE_ID=1,
 )

django/contrib/formtools/tests/__init__.py

@@ -36 +36 @@
 
 @override_settings(
     TEMPLATE_DIRS=(
-        os.path.join(os.path.dirname(__file__), 'templates'),
+        os.path.join(os.path.dirname(__file__), str('templates')),
     ),
 )
 class PreviewTests(TestCase):
@@ -214 +214 @@
 @override_settings(
     SECRET_KEY="123",
     TEMPLATE_DIRS=(
-        os.path.join(os.path.dirname(__file__), 'templates'),
+        os.path.join(os.path.dirname(__file__), str('templates')),
     ),
 )
 class WizardTests(TestCase):

django/contrib/formtools/tests/wizard/wizardtests/tests.py

@@ -74 +74 @@
 
         # ticket #19025: `form` should be included in context
         form = response.context_data['wizard']['form']
-        self.assertEqual(response.context_data['form'], form)            
+        self.assertEqual(response.context_data['form'], form)
 
     def test_form_finish(self):
         response = self.client.get(self.wizard_url)
@@ -291 +291 @@
         self.wizard_step_data[0]['form1-user'] = self.testuser.pk
 
     def test_template(self):
-        templates = os.path.join(os.path.dirname(__file__), 'templates')
+        templates = os.path.join(os.path.dirname(__file__), str('templates'))
         with self.settings(
                 TEMPLATE_DIRS=list(settings.TEMPLATE_DIRS) + [templates]):
             response = self.client.get(self.wizard_url)

django/contrib/gis/tests/geo3d/tests.py

@@ -12 +12 @@
     InterstateProj3D, Point2D, Point3D, MultiPoint3D, Polygon2D, Polygon3D)
 
 
-data_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'data'))
-city_file = os.path.join(data_path, 'cities', 'cities.shp')
-vrt_file = os.path.join(data_path, 'test_vrt', 'test_vrt.vrt')
+data_path = os.path.realpath(os.path.join(os.path.dirname(__file__), str('..'), str('data')))
+city_file = os.path.join(data_path, str('cities'), str('cities.shp'))
+vrt_file = os.path.join(data_path, str('test_vrt'), str('test_vrt.vrt'))
 
 # The coordinates of each city, with Z values corresponding to their
 # altitude in meters.

django/contrib/gis/tests/geogapp/tests.py

@@ -61 +61 @@
         from django.contrib.gis.utils import LayerMapping
 
         # Getting the shapefile and mapping dictionary.
-        shp_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'data'))
-        co_shp = os.path.join(shp_path, 'counties', 'counties.shp')
+        shp_path = os.path.realpath(os.path.join(os.path.dirname(__file__), str('..'), str('data')))
+        co_shp = os.path.join(shp_path, str('counties'), str('counties.shp'))
         co_mapping = {'name' : 'Name',
                       'state' : 'State',
                       'mpoly' : 'MULTIPOLYGON',

django/contrib/gis/tests/layermap/tests.py

@@ -19 +19 @@
     city_mapping, co_mapping, cofeat_mapping, inter_mapping)
 
 
-shp_path = os.path.realpath(os.path.join(os.path.dirname(__file__), os.pardir, 'data'))
-city_shp = os.path.join(shp_path, 'cities', 'cities.shp')
-co_shp = os.path.join(shp_path, 'counties', 'counties.shp')
-inter_shp = os.path.join(shp_path, 'interstates', 'interstates.shp')
-invalid_shp = os.path.join(shp_path, 'invalid', 'emptypoints.shp')
+shp_path = os.path.realpath(os.path.join(os.path.dirname(__file__), os.pardir, str('data')))
+city_shp = os.path.join(shp_path, str('cities'), str('cities.shp'))
+co_shp = os.path.join(shp_path, str('counties'), str('counties.shp'))
+inter_shp = os.path.join(shp_path, str('interstates'), str('interstates.shp'))
+invalid_shp = os.path.join(shp_path, str('invalid'), str('emptypoints.shp'))
 
 # Dictionaries to hold what's expected in the county shapefile.
 NAMES  = ['Bexar', 'Galveston', 'Harris', 'Honolulu', 'Pueblo']

django/contrib/sitemaps/tests/http.py

@@ -29 +29 @@
         self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
 
     @override_settings(
-        TEMPLATE_DIRS=(os.path.join(os.path.dirname(__file__), 'templates'),)
+        TEMPLATE_DIRS=(os.path.join(os.path.dirname(__file__), str('templates')),)
     )
     def test_simple_sitemap_custom_index(self):
         "A simple sitemap index can be rendered with a custom template"
@@ -64 +64 @@
         self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
 
     @override_settings(
-        TEMPLATE_DIRS=(os.path.join(os.path.dirname(__file__), 'templates'),)
+        TEMPLATE_DIRS=(os.path.join(os.path.dirname(__file__), str('templates')),)
     )
     def test_simple_custom_sitemap(self):
         "A simple sitemap can be rendered with a custom template"

django/contrib/staticfiles/storage.py

@@ -106 +106 @@
         path, filename = os.path.split(clean_name)
         root, ext = os.path.splitext(filename)
         if file_hash is not None:
-            file_hash = ".%s" % file_hash
-        hashed_name = os.path.join(path, "%s%s%s" %
+            file_hash = str(".%s") % file_hash
+        hashed_name = os.path.join(path, str("%s%s%s") %
                                    (root, file_hash, ext))
         unparsed_name = list(parsed_name)
         unparsed_name[2] = hashed_name
@@ -288 +288 @@
     for the ``static`` directory of it.
     """
     prefix = None
-    source_dir = 'static'
+    source_dir = str('static')
 
     def __init__(self, app, *args, **kwargs):
         """

django/core/management/commands/compilemessages.py

@@ -14 +14 @@
             sample.startswith(codecs.BOM_UTF16_BE)
 
 def compile_messages(stderr, locale=None):
-    basedirs = [os.path.join('conf', 'locale'), 'locale']
+    basedirs = [os.path.join(str('conf'), str('locale')), str('locale')]
     if os.environ.get('DJANGO_SETTINGS_MODULE'):
         from django.conf import settings
         basedirs.extend(settings.LOCALE_PATHS)
@@ -27 +27 @@
 
     for basedir in basedirs:
         if locale:
-            basedir = os.path.join(basedir, locale, 'LC_MESSAGES')
+            basedir = os.path.join(basedir, locale, str('LC_MESSAGES'))
         for dirpath, dirnames, filenames in os.walk(basedir):
             for f in filenames:
                 if f.endswith('.po'):
-                    stderr.write('processing file %s in %s\n' % (f, dirpath))
+                    stderr.write(str('processing file %s in %s\n') % (f, dirpath))
                     fn = os.path.join(dirpath, f)
                     if has_bom(fn):
-                        raise CommandError("The %s file has a BOM (Byte Order Mark). Django only supports .po files encoded in UTF-8 and without any BOM." % fn)
+                        raise CommandError(str("The %s file has a BOM (Byte Order Mark). "
+                            "Django only supports .po files encoded in UTF-8 and without any BOM.") % fn)
                     pf = os.path.splitext(fn)[0]
                     # Store the names of the .mo and .po files in an environment
                     # variable, rather than doing a string replacement into the
                     # command, so that we can take advantage of shell quoting, to
                     # quote any malicious characters/escaping.
                     # See http://cyberelk.net/tim/articles/cmdline/ar01s02.html
-                    os.environ['djangocompilemo'] = pf + '.mo'
-                    os.environ['djangocompilepo'] = pf + '.po'
+                    os.environ['djangocompilemo'] = pf + str('.mo')
+                    os.environ['djangocompilepo'] = pf + str('.po')
                     if sys.platform == 'win32': # Different shell-variable syntax
                         cmd = 'msgfmt --check-format -o "%djangocompilemo%" "%djangocompilepo%"'
                     else:

django/core/management/commands/loaddata.py

@@ -14 +14 @@
 from django.db import (connections, router, transaction, DEFAULT_DB_ALIAS,
       IntegrityError, DatabaseError)
 from django.db.models import get_apps
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str, force_text
 from itertools import product
 
 try:
@@ -91 +91 @@
 
         compression_types = {
             None:   open,
-            'gz':   gzip.GzipFile,
-            'zip':  SingleZipReader
+            str('gz'):   gzip.GzipFile,
+            str('zip'):  SingleZipReader
         }
         if has_bz2:
-            compression_types['bz2'] = bz2.BZ2File
+            compression_types[str('bz2')] = bz2.BZ2File
 
         app_module_paths = []
         for app in get_apps():
@@ -107 +107 @@
                 # It's a models.py module
                 app_module_paths.append(app.__file__)
 
-        app_fixtures = [os.path.join(os.path.dirname(path), 'fixtures') for path in app_module_paths]
+        app_fixtures = [os.path.join(os.path.dirname(path), str('fixtures')) for path in app_module_paths]
 
         try:
             with connection.constraint_checks_disabled():
                 for fixture_label in fixture_labels:
-                    parts = fixture_label.split('.')
+                    parts = force_str(fixture_label).split(str('.'))
 
                     if len(parts) > 1 and parts[-1] in compression_types:
                         compression_formats = [parts[-1]]
@@ -124 +124 @@
                         fixture_name = parts[0]
                         formats = serializers.get_public_serializer_formats()
                     else:
-                        fixture_name, format = '.'.join(parts[:-1]), parts[-1]
+                        fixture_name, format = str('.').join(parts[:-1]), parts[-1]
                         if format in serializers.get_public_serializer_formats():
                             formats = [format]
                         else:
@@ -150 +150 @@
                         label_found = False
                         for combo in product([using, None], formats, compression_formats):
                             database, format, compression_format = combo
-                            file_name = '.'.join(
+                            file_name = str('.').join(
                                 p for p in [
                                     fixture_name, database, format, compression_format
                                 ]

django/core/management/sql.py

@@ -159 +159 @@
 
 def custom_sql_for_model(model, style, connection):
     opts = model._meta
-    app_dir = os.path.normpath(os.path.join(os.path.dirname(models.get_app(model._meta.app_label).__file__), 'sql'))
+    app_dir = os.path.normpath(os.path.join(os.path.dirname(models.get_app(model._meta.app_label).__file__), str('sql')))
     output = []
 
     # Post-creation SQL should come before any initial SQL data is loaded.
@@ -171 +171 @@
             output.extend(f.post_create_sql(style, model._meta.db_table))
 
     # Find custom SQL, if it's available.
-    backend_name = connection.settings_dict['ENGINE'].split('.')[-1]
-    sql_files = [os.path.join(app_dir, "%s.%s.sql" % (opts.object_name.lower(), backend_name)),
-                 os.path.join(app_dir, "%s.sql" % opts.object_name.lower())]
+    backend_name = str(connection.settings_dict['ENGINE'].split('.')[-1])
+    sql_files = [os.path.join(app_dir, str('%s.%s.sql') % (opts.object_name.lower(), backend_name)),
+                 os.path.join(app_dir, str('%s.sql') % opts.object_name.lower())]
     for sql_file in sql_files:
         if os.path.exists(sql_file):
             with codecs.open(sql_file, 'U', encoding=settings.FILE_CHARSET) as fp:

django/db/utils.py

@@ -27 +27 @@
     except ImportError as e_user:
         # The database backend wasn't found. Display a helpful error message
         # listing all possible (built-in) database backends.
-        backend_dir = os.path.join(os.path.dirname(__file__), 'backends')
+        backend_dir = os.path.join(os.path.dirname(__file__), str('backends'))
         try:
             builtin_backends = [
                 name for _, name, ispkg in pkgutil.iter_modules([backend_dir])

django/utils/translation/trans_real.py

@@ -103 +103 @@
     """
     global _translations
 
+    language = str(language)
+
     t = _translations.get(language, None)
     if t is not None:
         return t
 
     from django.conf import settings
 
-    globalpath = os.path.join(os.path.dirname(sys.modules[settings.__module__].__file__), 'locale')
+    globalpath = os.path.join(os.path.dirname(sys.modules[settings.__module__].__file__), str('locale'))
 
     def _fetch(lang, fallback=None):
 
@@ -123 +125 @@
 
         def _translation(path):
             try:
-                t = gettext_module.translation('django', path, [loc], DjangoTranslation)
+                t = gettext_module.translation(str('django'), path, [loc], DjangoTranslation)
                 t.set_language(lang)
                 return t
             except IOError:
@@ -151 +153 @@
 
         for appname in reversed(settings.INSTALLED_APPS):
             app = import_module(appname)
-            apppath = os.path.join(os.path.dirname(app.__file__), 'locale')
+            apppath = os.path.join(os.path.dirname(app.__file__), str('locale'))
 
             if os.path.isdir(apppath):
                 res = _merge(apppath)
@@ -337 +339 @@
     """
     from django.conf import settings
     globalpath = os.path.join(
-        os.path.dirname(sys.modules[settings.__module__].__file__), 'locale')
+        os.path.dirname(sys.modules[settings.__module__].__file__), str('locale'))
     return [globalpath] + list(settings.LOCALE_PATHS)
 
 def check_for_language(lang_code):
@@ -348 +350 @@
     or session and during format localization.
     """
     for path in all_locale_paths():
-        if gettext_module.find('django', path, [to_locale(lang_code)]) is not None:
+        if gettext_module.find(str('django'), path, [to_locale(lang_code)]) is not None:
             return True
     return False
 
@@ -426 +428 @@
             if lang.lower() not in supported:
                 continue
             for path in all_locale_paths():
-                if os.path.exists(os.path.join(path, dirname, 'LC_MESSAGES', 'django.mo')):
+                if os.path.exists(os.path.join(path, str(dirname), str('LC_MESSAGES'), str('django.mo'))):
                     _accepted[normalized] = lang
                     return lang
 

tests/modeltests/model_forms/tests.py

@@ -1282 +1282 @@
         # it comes to validation. This specifically tests that #6302 is fixed for
         # both file fields and image fields.
 
-        with open(os.path.join(os.path.dirname(__file__), "test.png"), 'rb') as fp:
+        with open(os.path.join(os.path.dirname(__file__), str('test.png')), 'rb') as fp:
             image_data = fp.read()
-        with open(os.path.join(os.path.dirname(__file__), "test2.png"), 'rb') as fp:
+        with open(os.path.join(os.path.dirname(__file__), str('test2.png')), 'rb') as fp:
             image_data2 = fp.read()
 
         f = ImageFileForm(

tests/regressiontests/admin_scripts/tests.py

@@ -27 +27 @@
     def write_settings(self, filename, apps=None, is_dir=False, sdict=None):
         test_dir = os.path.dirname(os.path.dirname(__file__))
         if is_dir:
-            settings_dir = os.path.join(test_dir, filename)
+            settings_dir = os.path.join(test_dir, str(filename))
             os.mkdir(settings_dir)
-            settings_file_path = os.path.join(settings_dir, '__init__.py')
+            settings_file_path = os.path.join(settings_dir, str('__init__.py'))
         else:
-            settings_file_path = os.path.join(test_dir, filename)
+            settings_file_path = os.path.join(test_dir, str(filename))
 
         with open(settings_file_path, 'w') as settings_file:
             settings_file.write('# Settings file automatically generated by regressiontests.admin_scripts test case\n')
@@ -57 +57 @@
                     settings_file.write("%s = %s\n" % (k, v))
 
     def remove_settings(self, filename, is_dir=False):
-        full_name = os.path.join(test_dir, filename)
+        full_name = os.path.join(test_dir, str(filename))
         if is_dir:
             shutil.rmtree(full_name)
         else:
@@ -68 +68 @@
         try:
             if sys.platform.startswith('java'):
                 # Jython produces module$py.class files
-                os.remove(re.sub(r'\.py$', '$py.class', full_name))
+                os.remove(re.sub(str(r'\.py$'), str('$py.class'), full_name))
             else:
                 # CPython produces module.pyc files
-                os.remove(full_name + 'c')
+                os.remove(full_name + str('c'))
         except OSError:
             pass
         # Also remove a __pycache__ directory, if it exists
-        cache_name = os.path.join(test_dir, '__pycache__')
+        cache_name = os.path.join(test_dir, str('__pycache__'))
         if os.path.isdir(cache_name):
             shutil.rmtree(cache_name)
 
@@ -135 +135 @@
 
     def run_django_admin(self, args, settings_file=None):
         bin_dir = os.path.abspath(os.path.dirname(bin.__file__))
-        return self.run_test(os.path.join(bin_dir, 'django-admin.py'), args, settings_file)
+        return self.run_test(os.path.join(bin_dir, str('django-admin.py')), args, settings_file)
 
     def run_manage(self, args, settings_file=None):
         def safe_remove(path):
@@ -145 +145 @@
                 pass
 
         conf_dir = os.path.dirname(conf.__file__)
-        template_manage_py = os.path.join(conf_dir, 'project_template', 'manage.py')
+        template_manage_py = os.path.join(conf_dir, str('project_template'), str('manage.py'))
 
-        test_manage_py = os.path.join(test_dir, 'manage.py')
+        test_manage_py = os.path.join(test_dir, str('manage.py'))
         shutil.copyfile(template_manage_py, test_manage_py)
 
         with open(test_manage_py, 'r') as fp:
@@ -554 +554 @@
     def test_setup_environ(self):
         "directory: startapp creates the correct directory"
         args = ['startapp', 'settings_test']
-        app_path = os.path.join(test_dir, 'settings_test')
+        app_path = os.path.join(test_dir, str('settings_test'))
         out, err = self.run_django_admin(args, 'regressiontests.settings')
         self.addCleanup(shutil.rmtree, app_path)
         self.assertNoOutput(err)
@@ -562 +562 @@
 
     def test_setup_environ_custom_template(self):
         "directory: startapp creates the correct directory with a custom template"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'app_template')
+        template_path = os.path.join(test_dir, str('admin_scripts'), str('custom_templates'), str('app_template'))
         args = ['startapp', '--template', template_path, 'custom_settings_test']
-        app_path = os.path.join(test_dir, 'custom_settings_test')
+        app_path = os.path.join(test_dir, str('custom_settings_test'))
         out, err = self.run_django_admin(args, 'regressiontests.settings')
         self.addCleanup(shutil.rmtree, app_path)
         self.assertNoOutput(err)
         self.assertTrue(os.path.exists(app_path))
-        self.assertTrue(os.path.exists(os.path.join(app_path, 'api.py')))
+        self.assertTrue(os.path.exists(os.path.join(app_path, str('api.py'))))
 
     def test_builtin_command(self):
         "directory: django-admin builtin commands fail with an error when no settings provided"
@@ -994 +994 @@
 
     def write_settings_with_import_error(self, filename, apps=None, is_dir=False, sdict=None):
         if is_dir:
-            settings_dir = os.path.join(test_dir, filename)
+            settings_dir = os.path.join(test_dir, str(filename))
             os.mkdir(settings_dir)
-            settings_file_path = os.path.join(settings_dir, '__init__.py')
+            settings_file_path = os.path.join(settings_dir, str('__init__.py'))
         else:
-            settings_file_path = os.path.join(test_dir, filename)
+            settings_file_path = os.path.join(test_dir, str(filename))
         with open(settings_file_path, 'w') as settings_file:
             settings_file.write('# Settings file automatically generated by regressiontests.admin_scripts test case\n')
             settings_file.write('# The next line will cause an import error:\nimport foo42bar\n')
@@ -1411 +1411 @@
     def test_simple_project(self):
         "Make sure the startproject management command creates a project"
         args = ['startproject', 'testproject']
-        testproject_dir = os.path.join(test_dir, 'testproject')
+        testproject_dir = os.path.join(test_dir, str('testproject'))
         self.addCleanup(shutil.rmtree, testproject_dir, True)
 
         out, err = self.run_django_admin(args)
@@ -1426 +1426 @@
     def test_invalid_project_name(self):
         "Make sure the startproject management command validates a project name"
         args = ['startproject', '7testproject']
-        testproject_dir = os.path.join(test_dir, '7testproject')
+        testproject_dir = os.path.join(test_dir, str('7testproject'))
         self.addCleanup(shutil.rmtree, testproject_dir, True)
 
         out, err = self.run_django_admin(args)
@@ -1436 +1436 @@
     def test_simple_project_different_directory(self):
         "Make sure the startproject management command creates a project in a specific directory"
         args = ['startproject', 'testproject', 'othertestproject']
-        testproject_dir = os.path.join(test_dir, 'othertestproject')
+        testproject_dir = os.path.join(test_dir, str('othertestproject'))
         os.mkdir(testproject_dir)
         self.addCleanup(shutil.rmtree, testproject_dir)
 
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
-        self.assertTrue(os.path.exists(os.path.join(testproject_dir, 'manage.py')))
+        self.assertTrue(os.path.exists(os.path.join(testproject_dir, str('manage.py'))))
 
         # running again..
         out, err = self.run_django_admin(args)
@@ -1451 +1451 @@
 
     def test_custom_project_template(self):
         "Make sure the startproject management command is able to use a different project template"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template')
+        template_path = os.path.join(test_dir, str('admin_scripts'), str('custom_templates'), str('project_template'))
         args = ['startproject', '--template', template_path, 'customtestproject']
-        testproject_dir = os.path.join(test_dir, 'customtestproject')
+        testproject_dir = os.path.join(test_dir, str('customtestproject'))
         self.addCleanup(shutil.rmtree, testproject_dir, True)
 
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertTrue(os.path.isdir(testproject_dir))
-        self.assertTrue(os.path.exists(os.path.join(testproject_dir, 'additional_dir')))
+        self.assertTrue(os.path.exists(os.path.join(testproject_dir, str('additional_dir'))))
 
     def test_template_dir_with_trailing_slash(self):
         "Ticket 17475: Template dir passed has a trailing path separator"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template' + os.sep)
+        template_path = os.path.join(test_dir, str('admin_scripts'), str('custom_templates'), str('project_template') + os.sep)
         args = ['startproject', '--template', template_path, 'customtestproject']
-        testproject_dir = os.path.join(test_dir, 'customtestproject')
+        testproject_dir = os.path.join(test_dir, str('customtestproject'))
         self.addCleanup(shutil.rmtree, testproject_dir, True)
 
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertTrue(os.path.isdir(testproject_dir))
-        self.assertTrue(os.path.exists(os.path.join(testproject_dir, 'additional_dir')))
+        self.assertTrue(os.path.exists(os.path.join(testproject_dir, str('additional_dir'))))
 
     def test_custom_project_template_from_tarball_by_path(self):
         "Make sure the startproject management command is able to use a different project template from a tarball"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template.tgz')
+        template_path = os.path.join(test_dir, str('admin_scripts'), str('custom_templates'), str('project_template.tgz'))
         args = ['startproject', '--template', template_path, 'tarballtestproject']
-        testproject_dir = os.path.join(test_dir, 'tarballtestproject')
+        testproject_dir = os.path.join(test_dir, str('tarballtestproject'))
         self.addCleanup(shutil.rmtree, testproject_dir, True)
 
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertTrue(os.path.isdir(testproject_dir))
-        self.assertTrue(os.path.exists(os.path.join(testproject_dir, 'run.py')))
+        self.assertTrue(os.path.exists(os.path.join(testproject_dir, str('run.py'))))
 
     def test_custom_project_template_from_tarball_to_alternative_location(self):
         "Startproject can use a project template from a tarball and create it in a specified location"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template.tgz')
+        template_path = os.path.join(test_dir, str('admin_scripts'), str('custom_templates'), str('project_template.tgz'))
         args = ['startproject', '--template', template_path, 'tarballtestproject', 'altlocation']
-        testproject_dir = os.path.join(test_dir, 'altlocation')
+        testproject_dir = os.path.join(test_dir, str('altlocation'))
         os.mkdir(testproject_dir)
         self.addCleanup(shutil.rmtree, testproject_dir)
 
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertTrue(os.path.isdir(testproject_dir))
-        self.assertTrue(os.path.exists(os.path.join(testproject_dir, 'run.py')))
+        self.assertTrue(os.path.exists(os.path.join(testproject_dir, str('run.py'))))
 
     def test_custom_project_template_from_tarball_by_url(self):
         "Make sure the startproject management command is able to use a different project template from a tarball via a url"
         template_url = '%s/admin_scripts/custom_templates/project_template.tgz' % self.live_server_url
 
         args = ['startproject', '--template', template_url, 'urltestproject']
-        testproject_dir = os.path.join(test_dir, 'urltestproject')
+        testproject_dir = os.path.join(test_dir, str('urltestproject'))
         self.addCleanup(shutil.rmtree, testproject_dir, True)
 
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertTrue(os.path.isdir(testproject_dir))
-        self.assertTrue(os.path.exists(os.path.join(testproject_dir, 'run.py')))
+        self.assertTrue(os.path.exists(os.path.join(testproject_dir, str('run.py'))))
 
     def test_project_template_tarball_url(self):
         "Startproject management command handles project template tar/zip balls from non-canonical urls"
         template_url = '%s/admin_scripts/custom_templates/project_template.tgz/' % self.live_server_url
 
         args = ['startproject', '--template', template_url, 'urltestproject']
-        testproject_dir = os.path.join(test_dir, 'urltestproject')
+        testproject_dir = os.path.join(test_dir, str('urltestproject'))
         self.addCleanup(shutil.rmtree, testproject_dir, True)
 
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertTrue(os.path.isdir(testproject_dir))
-        self.assertTrue(os.path.exists(os.path.join(testproject_dir, 'run.py')))
+        self.assertTrue(os.path.exists(os.path.join(testproject_dir, str('run.py'))))
 
     def test_file_without_extension(self):
         "Make sure the startproject management command is able to render custom files"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template')
+        template_path = os.path.join(test_dir, str('admin_scripts'), str('custom_templates'), str('project_template'))
         args = ['startproject', '--template', template_path, 'customtestproject', '-e', 'txt', '-n', 'Procfile']
-        testproject_dir = os.path.join(test_dir, 'customtestproject')
+        testproject_dir = os.path.join(test_dir, str('customtestproject'))
         self.addCleanup(shutil.rmtree, testproject_dir, True)
 
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertTrue(os.path.isdir(testproject_dir))
-        self.assertTrue(os.path.exists(os.path.join(testproject_dir, 'additional_dir')))
-        base_path = os.path.join(testproject_dir, 'additional_dir')
-        for f in ('Procfile', 'additional_file.py', 'requirements.txt'):
+        self.assertTrue(os.path.exists(os.path.join(testproject_dir, str('additional_dir'))))
+        base_path = os.path.join(testproject_dir, str('additional_dir'))
+        for f in (str('Procfile'), str('additional_file.py'), str('requirements.txt')):
             self.assertTrue(os.path.exists(os.path.join(base_path, f)))
             with open(os.path.join(base_path, f)) as fh:
                 self.assertEqual(fh.read(),
@@ -1544 +1544 @@
 
     def test_custom_project_template_context_variables(self):
         "Make sure template context variables are rendered with proper values"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template')
+        template_path = os.path.join(test_dir, str('admin_scripts'), str('custom_templates'), str('project_template'))
         args = ['startproject', '--template', template_path, 'another_project', 'project_dir']
-        testproject_dir = os.path.join(test_dir, 'project_dir')
+        testproject_dir = os.path.join(test_dir, str('project_dir'))
         os.mkdir(testproject_dir)
         self.addCleanup(shutil.rmtree, testproject_dir)
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
-        test_manage_py = os.path.join(testproject_dir, 'manage.py')
+        test_manage_py = os.path.join(testproject_dir, str('manage.py'))
         with open(test_manage_py, 'r') as fp:
             content = fp.read()
-            self.assertIn("project_name = 'another_project'", content)
-            self.assertIn("project_directory = '%s'" % testproject_dir, content)
+            self.assertIn(str("project_name = 'another_project'"), content)
+            self.assertIn(str("project_directory = '%s'") % testproject_dir, content)
 
     def test_no_escaping_of_project_variables(self):
         "Make sure template context variables are not html escaped"
         # We're using a custom command so we need the alternate settings
         self.write_settings('alternate_settings.py')
         self.addCleanup(self.remove_settings, 'alternate_settings.py')
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template')
+        template_path = os.path.join(test_dir, str('admin_scripts'), str('custom_templates'), str('project_template'))
         args = ['custom_startproject', '--template', template_path, 'another_project', 'project_dir', '--extra', '<&>', '--settings=alternate_settings']
-        testproject_dir = os.path.join(test_dir, 'project_dir')
+        testproject_dir = os.path.join(test_dir, str('project_dir'))
         os.mkdir(testproject_dir)
         self.addCleanup(shutil.rmtree, testproject_dir)
         out, err = self.run_manage(args)
         self.assertNoOutput(err)
-        test_manage_py = os.path.join(testproject_dir, 'additional_dir', 'extra.py')
+        test_manage_py = os.path.join(testproject_dir, str('additional_dir'), str('extra.py'))
         with open(test_manage_py, 'r') as fp:
             content = fp.read()
             self.assertIn("<&>", content)
@@ -1579 +1579 @@
         Make sure an exception is raised when the provided
         destination directory doesn't exist
         """
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template')
+        template_path = os.path.join(test_dir, str('admin_scripts'), str('custom_templates'), str('project_template'))
         args = ['startproject', '--template', template_path, 'yet_another_project', 'project_dir2']
-        testproject_dir = os.path.join(test_dir, 'project_dir2')
+        testproject_dir = os.path.join(test_dir, str('project_dir2'))
         out, err = self.run_django_admin(args)
         self.assertNoOutput(out)
         self.assertOutput(err, "Destination directory '%s' does not exist, please create it first." % testproject_dir)
@@ -1589 +1589 @@
 
     def test_custom_project_template_with_non_ascii_templates(self):
         "Ticket 18091: Make sure the startproject management command is able to render templates with non-ASCII content"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template')
+        template_path = os.path.join(test_dir, str('admin_scripts'), str('custom_templates'), str('project_template'))
         args = ['startproject', '--template', template_path, '--extension=txt', 'customtestproject']
         testproject_dir = os.path.join(test_dir, 'customtestproject')
         self.addCleanup(shutil.rmtree, testproject_dir, True)

tests/regressiontests/admin_views/tests.py

@@ -633 +633 @@
         Refs #17515.
         """
         template_dirs = settings.TEMPLATE_DIRS + (
-            os.path.join(os.path.dirname(__file__), 'templates'),)
+            os.path.join(os.path.dirname(__file__), str('templates')),)
         with self.settings(TEMPLATE_DIRS=template_dirs):
             response = self.client.get("/test_admin/admin/admin_views/color2/")
             self.assertTrue('custom_filter_template.html' in [t.name for t in response.templates])

tests/regressiontests/app_loading/tests.py

@@ -13 +13 @@
 
     def setUp(self):
         self.old_path = sys.path[:]
-        self.egg_dir = '%s/eggs' % os.path.dirname(__file__)
+        self.egg_dir = str('%s/eggs') % os.path.dirname(__file__)
 
         # This test adds dummy applications to the app cache. These
         # need to be removed in order to prevent bad interactions

tests/regressiontests/file_storage/tests.py

@@ -534 +534 @@
         from django.core.files import images
         images.open = catching_open
         try:
-            get_image_dimensions(os.path.join(os.path.dirname(__file__), "test1.png"))
+            get_image_dimensions(os.path.join(os.path.dirname(__file__), str('test1.png')))
         finally:
             del images.open
         self.assertTrue(FileWrapper._closed)
@@ -551 +551 @@
         """
         from django.core.files.images import ImageFile
 
-        img_path = os.path.join(os.path.dirname(__file__), "test.png")
+        img_path = os.path.join(os.path.dirname(__file__), str('test.png'))
         image = ImageFile(open(img_path, 'rb'))
         image_pil = Image.open(img_path)
         size_1, size_2 = get_image_dimensions(image), get_image_dimensions(image)

tests/regressiontests/fixtures_regress/tests.py

@@ -127 +127 @@
         """
         load_absolute_path = os.path.join(
             os.path.dirname(__file__),
-            'fixtures',
-            'absolute.json'
+            str('fixtures'),
+            str('absolute.json')
         )
         management.call_command(
             'loaddata',
@@ -390 +390 @@
 
     _cur_dir = os.path.dirname(os.path.abspath(__file__))
 
-    @override_settings(FIXTURE_DIRS=[os.path.join(_cur_dir, 'fixtures_1'),
-                                     os.path.join(_cur_dir, 'fixtures_2')])
+    @override_settings(FIXTURE_DIRS=[os.path.join(_cur_dir, str('fixtures_1')),
+                                     os.path.join(_cur_dir, str('fixtures_2'))])
     def test_loaddata_forward_refs_split_fixtures(self):
         """
         Regression for #17530 - should be able to cope with forward references

tests/regressiontests/forms/tests/fields.py

@@ -992 +992 @@
             self.assertTrue(got[0].endswith(exp[0]))
 
     def test_filepathfield_folders(self):
-        path = os.path.dirname(__file__) + '/filepath_test_files/'
+        path = os.path.dirname(__file__) + str('/filepath_test_files/')
         f = FilePathField(path=path, allow_folders=True, allow_files=False)
         f.choices.sort()
         expected = [

tests/regressiontests/httpwrappers/tests.py

@@ -483 +483 @@
 
 class FileCloseTests(TestCase):
     def test_response(self):
-        filename = os.path.join(os.path.dirname(__file__), 'abc.txt')
+        filename = os.path.join(os.path.dirname(__file__), str('abc.txt'))
 
         # file isn't closed until we close the response.
         file1 = open(filename)
@@ -516 +516 @@
         self.assertTrue(file2.closed)
 
     def test_streaming_response(self):
-        filename = os.path.join(os.path.dirname(__file__), 'abc.txt')
+        filename = os.path.join(os.path.dirname(__file__), str('abc.txt'))
 
         # file isn't closed until we close the response.
         file1 = open(filename)

tests/regressiontests/i18n/contenttypes/tests.py

@@ -13 +13 @@
 @override_settings(
     USE_I18N=True,
     LOCALE_PATHS=(
-        os.path.join(os.path.dirname(__file__), 'locale'),
+        os.path.join(os.path.dirname(__file__), str('locale')),
     ),
     LANGUAGE_CODE='en',
     LANGUAGES=(

tests/regressiontests/i18n/patterns/tests.py

@@ -13 +13 @@
 @override_settings(
     USE_I18N=True,
     LOCALE_PATHS=(
-        os.path.join(os.path.dirname(__file__), 'locale'),
+        os.path.join(os.path.dirname(__file__), str('locale')),
     ),
     TEMPLATE_DIRS=(
-        os.path.join(os.path.dirname(__file__), 'templates'),
+        os.path.join(os.path.dirname(__file__), str('templates')),
     ),
     LANGUAGE_CODE='en',
     LANGUAGES=(

tests/regressiontests/i18n/tests.py

@@ -46 +46 @@
 
 here = os.path.dirname(os.path.abspath(__file__))
 extended_locale_paths = settings.LOCALE_PATHS + (
-    os.path.join(here, 'other', 'locale'),
+    os.path.join(here, str('other'), str('locale')),
 )
 
 class TranslationTests(TestCase):
@@ -266 +266 @@
         self.assertEqual(trans_real.to_language('en_US'), 'en-us')
         self.assertEqual(trans_real.to_language('sr_Lat'), 'sr-lat')
 
-    @override_settings(LOCALE_PATHS=(os.path.join(here, 'other', 'locale'),))
+    @override_settings(LOCALE_PATHS=(os.path.join(here, str('other'), str('locale')),))
     def test_bad_placeholder_1(self):
         """
         Error in translation file should not crash template rendering
@@ -278 +278 @@
             rendered = t.render(Context({'person': 'James'}))
             self.assertEqual(rendered, 'My name is James.')
 
-    @override_settings(LOCALE_PATHS=(os.path.join(here, 'other', 'locale'),))
+    @override_settings(LOCALE_PATHS=(os.path.join(here, str('other'), str('locale')),))
     def test_bad_placeholder_2(self):
         """
         Error in translation file should not crash template rendering
@@ -666 +666 @@
         with self.settings(USE_L10N=True,
                 FORMAT_MODULE_PATH='regressiontests.i18n.other.locale'):
             with translation.override('de', deactivate=True):
-                old = "%r" % get_format_modules(reverse=True)
-                new = "%r" % get_format_modules(reverse=True) # second try
+                old = str("%r") % get_format_modules(reverse=True)
+                new = str("%r") % get_format_modules(reverse=True) # second try
                 self.assertEqual(new, old, 'Value returned by get_formats_modules() must be preserved between calls.')
 
     def test_localize_templatetag_and_filter(self):

tests/regressiontests/servers/tests.py

@@ -22 +22 @@
 TEST_ROOT = os.path.dirname(__file__)
 TEST_SETTINGS = {
     'MEDIA_URL': '/media/',
-    'MEDIA_ROOT': os.path.join(TEST_ROOT, 'media'),
+    'MEDIA_ROOT': os.path.join(TEST_ROOT, str('media')),
     'STATIC_URL': '/static/',
-    'STATIC_ROOT': os.path.join(TEST_ROOT, 'static'),
+    'STATIC_ROOT': os.path.join(TEST_ROOT, str('static')),
 }
 
 

tests/regressiontests/staticfiles_tests/tests.py

@@ -15 +15 @@
 from django.core.management import call_command
 from django.test import TestCase
 from django.test.utils import override_settings
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_text, force_str
 from django.utils.functional import empty
 from django.utils._os import rmtree_errorhandler
 from django.utils import six
@@ -27 +27 @@
     'DEBUG': True,
     'MEDIA_URL': '/media/',
     'STATIC_URL': '/static/',
-    'MEDIA_ROOT': os.path.join(TEST_ROOT, 'project', 'site_media', 'media'),
-    'STATIC_ROOT': os.path.join(TEST_ROOT, 'project', 'site_media', 'static'),
+    'MEDIA_ROOT': os.path.join(TEST_ROOT, str('project'), str('site_media'), str('media')),
+    'STATIC_ROOT': os.path.join(TEST_ROOT, str('project'), str('site_media'), str('static')),
     'STATICFILES_DIRS': (
-        os.path.join(TEST_ROOT, 'project', 'documents'),
-        ('prefix', os.path.join(TEST_ROOT, 'project', 'prefixed')),
+        os.path.join(TEST_ROOT, str('project'), str('documents')),
+        (str('prefix'), os.path.join(TEST_ROOT, str('project'), str('prefixed'))),
     ),
     'STATICFILES_FINDERS': (
         'django.contrib.staticfiles.finders.FileSystemFinder',
@@ -55 +55 @@
         # run and pick up changes in settings.STATICFILES_DIRS.
         finders._finders.clear()
 
-        testfiles_path = os.path.join(TEST_ROOT, 'apps', 'test', 'static', 'test')
+        testfiles_path = os.path.join(TEST_ROOT, str('apps'), str('test'), str('static'), str('test'))
         # To make sure SVN doesn't hangs itself with the non-ASCII characters
         # during checkout, we actually create one file dynamically.
-        self._nonascii_filepath = os.path.join(testfiles_path, '\u2297.txt')
+        self._nonascii_filepath = os.path.join(testfiles_path, force_str('\u2297.txt'))
         with codecs.open(self._nonascii_filepath, 'w', 'utf-8') as f:
             f.write("\u2297 in the app dir")
         # And also create the stupid hidden file to dwarf the setup.py's
         # package data handling.
-        self._hidden_filepath = os.path.join(testfiles_path, '.hidden')
+        self._hidden_filepath = os.path.join(testfiles_path, str('.hidden'))
         with codecs.open(self._hidden_filepath, 'w', 'utf-8') as f:
             f.write("should be ignored")
         self._backup_filepath = os.path.join(
-            TEST_ROOT, 'project', 'documents', 'test', 'backup~')
+            TEST_ROOT, str('project'), str('documents'), str('test'), str('backup~'))
         with codecs.open(self._backup_filepath, 'w', 'utf-8') as f:
             f.write("should be ignored")
 
@@ -134 +134 @@
 
     def _get_file(self, filepath):
         assert filepath, 'filepath is empty.'
-        filepath = os.path.join(settings.STATIC_ROOT, filepath)
+        filepath = os.path.join(settings.STATIC_ROOT, force_str(filepath))
         with codecs.open(filepath, "r", "utf-8") as f:
             return f.read()
 
@@ -207 +207 @@
         out.seek(0)
         lines = [l.strip() for l in out.readlines()]
         self.assertEqual(len(lines), 3)  # three because there is also the "Found <file> here" line
-        self.assertIn('project', lines[1])
-        self.assertIn('apps', lines[2])
+        self.assertIn(str('project'), lines[1])
+        self.assertIn(str('apps'), lines[2])
 
 
 class TestCollection(CollectionTestCase, TestDefaults):
@@ -292 +292 @@
 
     """
     def setUp(self):
-        self.orig_path = os.path.join(TEST_ROOT, 'apps', 'no_label', 'static', 'file2.txt')
+        self.orig_path = os.path.join(TEST_ROOT, str('apps'), str('no_label'), str('static'), str('file2.txt'))
         # get modification and access times for no_label/static/file2.txt
         self.orig_mtime = os.path.getmtime(self.orig_path)
         self.orig_atime = os.path.getatime(self.orig_path)
@@ -301 +301 @@
         # this file will have modification time older than no_label/static/file2.txt
         # anyway it should be taken to STATIC_ROOT because 'test' app is before
         # 'no_label' app in INSTALLED_APPS
-        self.testfile_path = os.path.join(TEST_ROOT, 'apps', 'test', 'static', 'file2.txt')
+        self.testfile_path = os.path.join(TEST_ROOT, str('apps'), str('test'), str('static'), str('file2.txt'))
         with open(self.testfile_path, 'w+') as f:
             f.write('duplicate of file2.txt')
         os.utime(self.testfile_path, (self.orig_atime - 1, self.orig_mtime - 1))
@@ -586 +586 @@
             """
             With ``--link``, symbolic links are created.
             """
-            self.assertTrue(os.path.islink(os.path.join(settings.STATIC_ROOT, 'test.txt')))
+            self.assertTrue(os.path.islink(os.path.join(settings.STATIC_ROOT, str('test.txt'))))
 
 
 class TestServeStatic(StaticFilesTestCase):
@@ -673 +673 @@
     def setUp(self):
         super(TestFileSystemFinder, self).setUp()
         self.finder = finders.FileSystemFinder()
-        test_file_path = os.path.join(TEST_ROOT, 'project', 'documents', 'test', 'file.txt')
-        self.find_first = (os.path.join('test', 'file.txt'), test_file_path)
-        self.find_all = (os.path.join('test', 'file.txt'), [test_file_path])
+        test_file_path = os.path.join(TEST_ROOT, str('project'), str('documents'), str('test'), str('file.txt'))
+        self.find_first = (os.path.join(str('test'), str('file.txt')), test_file_path)
+        self.find_all = (os.path.join(str('test'), str('file.txt')), [test_file_path])
 
 
 class TestAppDirectoriesFinder(StaticFilesTestCase, FinderTestCase):
@@ -685 +685 @@
     def setUp(self):
         super(TestAppDirectoriesFinder, self).setUp()
         self.finder = finders.AppDirectoriesFinder()
-        test_file_path = os.path.join(TEST_ROOT, 'apps', 'test', 'static', 'test', 'file1.txt')
-        self.find_first = (os.path.join('test', 'file1.txt'), test_file_path)
-        self.find_all = (os.path.join('test', 'file1.txt'), [test_file_path])
+        test_file_path = os.path.join(TEST_ROOT, str('apps'), str('test'), str('static'), str('test'), str('file1.txt'))
+        self.find_first = (os.path.join(str('test'), str('file1.txt')), test_file_path)
+        self.find_all = (os.path.join(str('test'), str('file1.txt')), [test_file_path])
 
 
 class TestDefaultStorageFinder(StaticFilesTestCase, FinderTestCase):
@@ -698 +698 @@
         super(TestDefaultStorageFinder, self).setUp()
         self.finder = finders.DefaultStorageFinder(
             storage=storage.StaticFilesStorage(location=settings.MEDIA_ROOT))
-        test_file_path = os.path.join(settings.MEDIA_ROOT, 'media-file.txt')
-        self.find_first = ('media-file.txt', test_file_path)
-        self.find_all = ('media-file.txt', [test_file_path])
+        test_file_path = os.path.join(settings.MEDIA_ROOT, str('media-file.txt'))
+        self.find_first = (str('media-file.txt'), test_file_path)
+        self.find_all = (str('media-file.txt'), [test_file_path])
 
 
 class TestMiscFinder(TestCase):

tests/regressiontests/templates/response.py

@@ -206 +206 @@
 
 @override_settings(
     TEMPLATE_CONTEXT_PROCESSORS=[test_processor_name],
-    TEMPLATE_DIRS=(os.path.join(os.path.dirname(__file__),'templates')),
+    TEMPLATE_DIRS=(os.path.join(os.path.dirname(__file__), str('templates'))),
 )
 class TemplateResponseTest(TestCase):
 

tests/regressiontests/templates/tests.py

@@ -1649 +1649 @@
     def setUp(self):
         self.old_path = sys.path[:]
         self.old_apps = settings.INSTALLED_APPS
-        self.egg_dir = '%s/eggs' % os.path.dirname(__file__)
+        self.egg_dir = str('%s/eggs') % os.path.dirname(__file__)
         self.old_tag_modules = template_base.templatetags_modules
         template_base.templatetags_modules = []
 

tests/regressiontests/test_client_regress/tests.py

@@ -21 +21 @@
 
 
 @override_settings(
-    TEMPLATE_DIRS=(os.path.join(os.path.dirname(__file__), 'templates'),)
+    TEMPLATE_DIRS=(os.path.join(os.path.dirname(__file__), str('templates')),)
 )
 class AssertContainsTests(TestCase):
     def test_contains(self):
@@ -629 +629 @@
                     template_loader.reset()
 
     @override_settings(
-        TEMPLATE_DIRS=(os.path.join(os.path.dirname(__file__), 'bad_templates'),)
+        TEMPLATE_DIRS=(os.path.join(os.path.dirname(__file__), str('bad_templates')),)
     )
     def test_bad_404_template(self):
         "Errors found when rendering 404 error templates are re-raised"

tests/regressiontests/utils/archive.py

@@ -6 +6 @@
 from django.utils.archive import Archive, extract
 
 
-TEST_DIR = os.path.join(os.path.dirname(__file__), 'archives')
+TEST_DIR = os.path.join(os.path.dirname(__file__), str('archives'))
 
 
 class ArchiveTester(object):

tests/regressiontests/utils/module_loading.py

@@ -50 +50 @@
 class EggLoader(unittest.TestCase):
     def setUp(self):
         self.old_path = sys.path[:]
-        self.egg_dir = '%s/eggs' % os.path.dirname(__file__)
+        self.egg_dir = str('%s/eggs') % os.path.dirname(__file__)
 
     def tearDown(self):
         sys.path = self.old_path