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/staticfiles_tests/settings.py | 4 +--- tests/staticfiles_tests/test_liveserver.py | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'tests/staticfiles_tests') diff --git a/tests/staticfiles_tests/settings.py b/tests/staticfiles_tests/settings.py index c9bf851db7..0c944b8191 100644 --- a/tests/staticfiles_tests/settings.py +++ b/tests/staticfiles_tests/settings.py @@ -1,8 +1,6 @@ import os.path -from django.utils._os import upath - -TEST_ROOT = os.path.dirname(upath(__file__)) +TEST_ROOT = os.path.dirname(__file__) TEST_SETTINGS = { 'MEDIA_URL': '/media/', diff --git a/tests/staticfiles_tests/test_liveserver.py b/tests/staticfiles_tests/test_liveserver.py index 717de5cf64..f45a95ba89 100644 --- a/tests/staticfiles_tests/test_liveserver.py +++ b/tests/staticfiles_tests/test_liveserver.py @@ -10,9 +10,8 @@ from urllib.request import urlopen from django.contrib.staticfiles.testing import StaticLiveServerTestCase from django.core.exceptions import ImproperlyConfigured from django.test import modify_settings, override_settings -from django.utils._os import upath -TEST_ROOT = os.path.dirname(upath(__file__)) +TEST_ROOT = os.path.dirname(__file__) TEST_SETTINGS = { 'MEDIA_URL': '/media/', 'STATIC_URL': '/static/', -- cgit v1.3