From 29e90f3ae0b0b72bbdf342e0136414bff917c6a6 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Thu, 30 Apr 2015 07:11:47 -0400
Subject: [PATCH] Fixed model_regress test failure on non-ASCII path; refs
#24717.
---
tests/model_regress/test_pickle.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/model_regress/test_pickle.py b/tests/model_regress/test_pickle.py
index c7804d805e..517646c407 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: