Refs #23919 -- Removed django.utils._os.upath()/npath()/abspathu() usage.

These functions do nothing on Python 3.

4 files changed, 10 insertions, 14 deletions

diff --git a/tests/utils_tests/test_archive.py b/tests/utils_tests/test_archive.py
index f50e18d75c..d58d211ae5 100644
--- a/tests/utils_tests/test_archive.py
+++ b/tests/utils_tests/test_archive.py
@@ -5,10 +5,9 @@ import sys
 import tempfile
 import unittest
 
-from django.utils._os import upath
 from django.utils.archive import Archive, extract
 
-TEST_DIR = os.path.join(os.path.dirname(upath(__file__)), 'archives')
+TEST_DIR = os.path.join(os.path.dirname(__file__), 'archives')
 
 
 class ArchiveTester:
diff --git a/tests/utils_tests/test_autoreload.py b/tests/utils_tests/test_autoreload.py
index 4036df8dd8..6925da1834 100644
--- a/tests/utils_tests/test_autoreload.py
+++ b/tests/utils_tests/test_autoreload.py
@@ -11,7 +11,6 @@ from django.contrib import admin
 from django.test import SimpleTestCase, mock, override_settings
 from django.test.utils import extend_sys_path
 from django.utils import autoreload
-from django.utils._os import npath
 from django.utils.translation import trans_real
 
 LOCALE_PATH = os.path.join(os.path.dirname(__file__), 'locale')
@@ -26,23 +25,23 @@ class TestFilenameGenerator(SimpleTestCase):
     def assertFileFound(self, filename):
         self.clear_autoreload_caches()
         # Test uncached access
-        self.assertIn(npath(filename), autoreload.gen_filenames())
+        self.assertIn(filename, autoreload.gen_filenames())
         # Test cached access
-        self.assertIn(npath(filename), autoreload.gen_filenames())
+        self.assertIn(filename, autoreload.gen_filenames())
 
     def assertFileNotFound(self, filename):
         self.clear_autoreload_caches()
         # Test uncached access
-        self.assertNotIn(npath(filename), autoreload.gen_filenames())
+        self.assertNotIn(filename, autoreload.gen_filenames())
         # Test cached access
-        self.assertNotIn(npath(filename), autoreload.gen_filenames())
+        self.assertNotIn(filename, autoreload.gen_filenames())
 
     def assertFileFoundOnlyNew(self, filename):
         self.clear_autoreload_caches()
         # Test uncached access
-        self.assertIn(npath(filename), autoreload.gen_filenames(only_new=True))
+        self.assertIn(filename, autoreload.gen_filenames(only_new=True))
         # Test cached access
-        self.assertNotIn(npath(filename), autoreload.gen_filenames(only_new=True))
+        self.assertNotIn(filename, autoreload.gen_filenames(only_new=True))
 
     def test_django_locales(self):
         """
@@ -122,7 +121,7 @@ class TestFilenameGenerator(SimpleTestCase):
         with extend_sys_path(dirname):
             import_module('test_only_new_module')
         filenames = set(autoreload.gen_filenames(only_new=True))
-        self.assertEqual(filenames, {npath(filename)})
+        self.assertEqual(filenames, {filename})
 
     def test_deleted_removed(self):
         """
diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py
index 5ffccdae83..c2a64699cb 100644
--- a/tests/utils_tests/test_html.py
+++ b/tests/utils_tests/test_html.py
@@ -3,7 +3,6 @@ from datetime import datetime
 
 from django.test import SimpleTestCase
 from django.utils import html, safestring
-from django.utils._os import upath
 from django.utils.encoding import force_text
 from django.utils.functional import lazystr
 
@@ -98,7 +97,7 @@ class TestUtilsHtml(SimpleTestCase):
 
         # Test with more lengthy content (also catching performance regressions)
         for filename in ('strip_tags1.html', 'strip_tags2.txt'):
-            path = os.path.join(os.path.dirname(upath(__file__)), 'files', filename)
+            path = os.path.join(os.path.dirname(__file__), 'files', filename)
             with open(path, 'r') as fp:
                 content = force_text(fp.read())
                 start = datetime.now()
diff --git a/tests/utils_tests/test_module_loading.py b/tests/utils_tests/test_module_loading.py
index 8e6806e8d5..ad1135aa19 100644
--- a/tests/utils_tests/test_module_loading.py
+++ b/tests/utils_tests/test_module_loading.py
@@ -7,7 +7,6 @@ from zipimport import zipimporter
 
 from django.test import SimpleTestCase, TestCase, modify_settings
 from django.test.utils import extend_sys_path
-from django.utils._os import upath
 from django.utils.module_loading import (
     autodiscover_modules, import_string, module_has_submodule,
 )
@@ -58,7 +57,7 @@ class DefaultLoader(unittest.TestCase):
 
 class EggLoader(unittest.TestCase):
     def setUp(self):
-        self.egg_dir = '%s/eggs' % os.path.dirname(upath(__file__))
+        self.egg_dir = '%s/eggs' % os.path.dirname(__file__)
 
     def tearDown(self):
         sys.path_importer_cache.clear()