summaryrefslogtreecommitdiff
path: root/tests/admin_scripts
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-01-20 10:20:53 +0100
committerClaude Paroz <claude@2xlibre.net>2017-01-20 14:13:55 +0100
commit042b7350a080cc964f913faf1cf7f0097f650a58 (patch)
tree4ad77d8fc8ae016770afe01a543a6042fa02357a /tests/admin_scripts
parent4e729feaa647547f25debb1cb63dec989dc41a20 (diff)
Refs #23919 -- Removed unneeded str() calls
Diffstat (limited to 'tests/admin_scripts')
-rw-r--r--tests/admin_scripts/tests.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
index 25e6487a0f..bccefc2d19 100644
--- a/tests/admin_scripts/tests.py
+++ b/tests/admin_scripts/tests.py
@@ -145,14 +145,13 @@ class AdminScriptTestCase(unittest.TestCase):
# Set the test environment
if settings_file:
- test_environ['DJANGO_SETTINGS_MODULE'] = str(settings_file)
+ test_environ['DJANGO_SETTINGS_MODULE'] = settings_file
elif 'DJANGO_SETTINGS_MODULE' in test_environ:
del test_environ['DJANGO_SETTINGS_MODULE']
python_path = [base_dir, django_dir, tests_dir]
python_path.extend(ext_backend_base_dirs)
- # Use native strings for better compatibility
- test_environ[str(python_path_var_name)] = os.pathsep.join(python_path)
- test_environ[str('PYTHONWARNINGS')] = str('')
+ test_environ[python_path_var_name] = os.pathsep.join(python_path)
+ test_environ['PYTHONWARNINGS'] = ''
# Move to the test directory and run
os.chdir(self.test_dir)