mirror of
https://github.com/django/django.git
synced 2024-12-23 01:25:58 +00:00
Fixed model_regress test failure on non-ASCII path; refs #24717.
This commit is contained in:
parent
63f9b633f9
commit
29e90f3ae0
@ -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:
|
||||||
|
Loading…
Reference in New Issue
Block a user