From 4e729feaa647547f25debb1cb63dec989dc41a20 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 20 Jan 2017 08:01:02 -0500 Subject: Refs #23919 -- Removed django.utils._os.upath()/npath()/abspathu() usage. These functions do nothing on Python 3. --- tests/template_tests/syntax_tests/i18n/base.py | 3 +-- tests/template_tests/utils.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/template_tests') diff --git a/tests/template_tests/syntax_tests/i18n/base.py b/tests/template_tests/syntax_tests/i18n/base.py index 690e5d3933..61d2bbdb1c 100644 --- a/tests/template_tests/syntax_tests/i18n/base.py +++ b/tests/template_tests/syntax_tests/i18n/base.py @@ -2,10 +2,9 @@ import os from django.conf import settings from django.test import SimpleTestCase -from django.utils._os import upath from django.utils.translation import activate, get_language -here = os.path.dirname(os.path.dirname(os.path.abspath(upath(__file__)))) +here = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) pdir = os.path.split(os.path.split(os.path.abspath(here))[0])[0] extended_locale_paths = settings.LOCALE_PATHS + [ os.path.join(pdir, 'i18n', 'other', 'locale'), diff --git a/tests/template_tests/utils.py b/tests/template_tests/utils.py index 8ee66a6523..e2a9305b5e 100644 --- a/tests/template_tests/utils.py +++ b/tests/template_tests/utils.py @@ -3,10 +3,9 @@ import os from django.template.engine import Engine from django.test.utils import override_settings -from django.utils._os import upath from django.utils.safestring import mark_safe -ROOT = os.path.dirname(os.path.abspath(upath(__file__))) +ROOT = os.path.dirname(os.path.abspath(__file__)) TEMPLATE_DIR = os.path.join(ROOT, 'templates') -- cgit v1.3