summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-04-30 07:11:47 -0400
committerTim Graham <timograham@gmail.com>2015-04-30 08:13:30 -0400
commit556b1c8ad3b1b92f943019bdb37e9c00a6292260 (patch)
treeb24131bb6fa3623716d68df07900ebc710416197
parentbf4dc5733fec86e7dfcdeddbcf4ce047c0b2f922 (diff)
[1.8.x] Fixed model_regress test failure on non-ASCII path; refs #24717.
Backport of 29e90f3ae0b0b72bbdf342e0136414bff917c6a6 from master
-rw-r--r--tests/model_regress/test_pickle.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/model_regress/test_pickle.py b/tests/model_regress/test_pickle.py
index 607f495f3e..baf53a1854 100644
--- a/tests/model_regress/test_pickle.py
+++ b/tests/model_regress/test_pickle.py
@@ -8,7 +8,7 @@ import warnings
from django.core.files.temp import NamedTemporaryFile
from django.db import DJANGO_VERSION_PICKLE_KEY, models
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.version import get_version
@@ -90,7 +90,7 @@ print(article.headline)"""
model_regress_path = os.path.abspath(model_regress_dir)
tests_path = os.path.split(model_regress_path)[0]
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}):
try: