Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.8.x] Fixed model_regress test failure on non-ASCII path; refs #24717.

Browse Source 
Backport of 29e90f3ae0b0b72bbdf342e0136414bff917c6a6 from master
This commit is contained in:
Tim Graham 2015-04-30 07:11:47 -04:00
parent bf4dc5733f
commit 556b1c8ad3
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/model_regress/test_pickle.py
View File

@ -8,7 +8,7 @@ import warnings
from django.core.files.temp import NamedTemporaryFile from django.core.files.temp import NamedTemporaryFile
from django.db import DJANGO_VERSION_PICKLE_KEY, models from django.db import DJANGO_VERSION_PICKLE_KEY, models
from django.test import TestCase, mock from django.test import TestCase, mock
from django.utils._os import upath from django.utils._os import npath, upath
from django.utils.encoding import force_text from django.utils.encoding import force_text
from django.utils.version import get_version from django.utils.version import get_version
@ -90,7 +90,7 @@ print(article.headline)"""
model_regress_path = os.path.abspath(model_regress_dir) model_regress_path = os.path.abspath(model_regress_dir)
tests_path = os.path.split(model_regress_path)[0] tests_path = os.path.split(model_regress_path)[0]
pythonpath = os.environ.get('PYTHONPATH', '') pythonpath = os.environ.get('PYTHONPATH', '')
pythonpath = os.pathsep.join([tests_path, pythonpath]) pythonpath = npath(os.pathsep.join([tests_path, pythonpath]))
with mock.patch.dict('os.environ', {'PYTHONPATH': pythonpath}): with mock.patch.dict('os.environ', {'PYTHONPATH': pythonpath}):
try: try: