From 8d7e048a8b428bebe82be735a84570f9250441e6 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sat, 8 Mar 2014 20:58:19 +0100 Subject: [PATCH] Improved compatibility in admin_scripts tests Environment keys/values need to use native strings on some plateforms. Thanks anubhav joshi for detecting the issue and helping shaping the patch. --- tests/admin_scripts/tests.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index f59c337114f..6ebac74fc3b 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -24,7 +24,7 @@ from django.core.exceptions import ImproperlyConfigured from django.core.management import BaseCommand, CommandError, call_command from django.db import connection from django.utils.encoding import force_text -from django.utils._os import upath +from django.utils._os import npath, upath from django.utils.six import StringIO from django.test import LiveServerTestCase, TestCase from django.test.runner import DiscoverRunner @@ -138,8 +138,9 @@ class AdminScriptTestCase(unittest.TestCase): del test_environ['DJANGO_SETTINGS_MODULE'] python_path = [base_dir, django_dir, tests_dir] python_path.extend(ext_backend_base_dirs) - test_environ[python_path_var_name] = os.pathsep.join(python_path) - test_environ['PYTHONWARNINGS'] = '' + # Use native strings for better compatibility + test_environ[str(python_path_var_name)] = npath(os.pathsep.join(python_path)) + test_environ[str('PYTHONWARNINGS')] = str('') # Move to the test directory and run os.chdir(test_dir)