mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 16 Releases Wiki Activity

fixed admin_scripts tests on python 3.3

This commit is contained in:
Florian Apolloner 2013-02-26 15:38:11 +01:00
parent 0dc7ff6b7a
commit 1535fcfdba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/admin_scripts/tests.py
View File

@ -105,7 +105,7 @@ class AdminScriptTestCase(unittest.TestCase):
def run_test(self, script, args, settings_file=None, apps=None): def run_test(self, script, args, settings_file=None, apps=None):
project_dir = test_dir project_dir = test_dir
base_dir = os.path.dirname(project_dir) base_dir = os.path.dirname(test_dir)
import django import django
django_dir = os.path.dirname(os.path.dirname(django.__file__)) django_dir = os.path.dirname(os.path.dirname(django.__file__))
tests_dir = os.path.join(django_dir, 'tests') tests_dir = os.path.join(django_dir, 'tests')
@ -126,7 +126,7 @@ class AdminScriptTestCase(unittest.TestCase):
os.environ['DJANGO_SETTINGS_MODULE'] = settings_file os.environ['DJANGO_SETTINGS_MODULE'] = settings_file
elif 'DJANGO_SETTINGS_MODULE' in os.environ: elif 'DJANGO_SETTINGS_MODULE' in os.environ:
del os.environ['DJANGO_SETTINGS_MODULE'] del os.environ['DJANGO_SETTINGS_MODULE']
python_path = [project_dir, base_dir, django_dir, tests_dir] python_path = [base_dir, django_dir, tests_dir]
python_path.extend(ext_backend_base_dirs) python_path.extend(ext_backend_base_dirs)
os.environ[python_path_var_name] = os.pathsep.join(python_path) os.environ[python_path_var_name] = os.pathsep.join(python_path)