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

These functions do nothing on Python 3.

3 files changed, 8 insertions, 15 deletions

diff --git a/tests/forms_tests/field_tests/test_filepathfield.py b/tests/forms_tests/field_tests/test_filepathfield.py
index 71164b5b7a..cbdf97b4c2 100644
--- a/tests/forms_tests/field_tests/test_filepathfield.py
+++ b/tests/forms_tests/field_tests/test_filepathfield.py
@@ -2,7 +2,6 @@ import os.path
 
 from django.forms import FilePathField, ValidationError, forms
 from django.test import SimpleTestCase
-from django.utils._os import upath
 
 
 def fix_os_paths(x):
@@ -19,13 +18,11 @@ def fix_os_paths(x):
 class FilePathFieldTest(SimpleTestCase):
 
     def test_filepathfield_1(self):
-        path = os.path.abspath(upath(forms.__file__))
-        path = os.path.dirname(path) + '/'
+        path = os.path.dirname(os.path.abspath(forms.__file__)) + '/'
         self.assertTrue(fix_os_paths(path).endswith('/django/forms/'))
 
     def test_filepathfield_2(self):
-        path = upath(forms.__file__)
-        path = os.path.dirname(os.path.abspath(path)) + '/'
+        path = os.path.dirname(os.path.abspath(forms.__file__)) + '/'
         f = FilePathField(path=path)
         f.choices = [p for p in f.choices if p[0].endswith('.py')]
         f.choices.sort()
@@ -49,8 +46,7 @@ class FilePathFieldTest(SimpleTestCase):
         self.assertTrue(fix_os_paths(f.clean(path + 'fields.py')).endswith('/django/forms/fields.py'))
 
     def test_filepathfield_3(self):
-        path = upath(forms.__file__)
-        path = os.path.dirname(os.path.abspath(path)) + '/'
+        path = os.path.dirname(os.path.abspath(forms.__file__)) + '/'
         f = FilePathField(path=path, match=r'^.*?\.py$')
         f.choices.sort()
         expected = [
@@ -69,8 +65,7 @@ class FilePathFieldTest(SimpleTestCase):
             self.assertTrue(got[0].endswith(exp[0]))
 
     def test_filepathfield_4(self):
-        path = os.path.abspath(upath(forms.__file__))
-        path = os.path.dirname(path) + '/'
+        path = os.path.dirname(os.path.abspath(forms.__file__)) + '/'
         f = FilePathField(path=path, recursive=True, match=r'^.*?\.py$')
         f.choices.sort()
         expected = [
@@ -89,7 +84,7 @@ class FilePathFieldTest(SimpleTestCase):
             self.assertTrue(got[0].endswith(exp[0]))
 
     def test_filepathfield_folders(self):
-        path = os.path.abspath(os.path.join(upath(__file__), '..', '..')) + '/tests/filepath_test_files/'
+        path = os.path.abspath(os.path.join(__file__, '..', '..')) + '/tests/filepath_test_files/'
         f = FilePathField(path=path, allow_folders=True, allow_files=False)
         f.choices.sort()
         expected = [
diff --git a/tests/forms_tests/field_tests/test_imagefield.py b/tests/forms_tests/field_tests/test_imagefield.py
index 326735bf60..6fb4bed03c 100644
--- a/tests/forms_tests/field_tests/test_imagefield.py
+++ b/tests/forms_tests/field_tests/test_imagefield.py
@@ -4,7 +4,6 @@ import unittest
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.forms import ImageField
 from django.test import SimpleTestCase
-from django.utils._os import upath
 
 try:
     from PIL import Image
@@ -13,7 +12,7 @@ except ImportError:
 
 
 def get_img_path(path):
-    return os.path.join(os.path.abspath(os.path.join(upath(__file__), '..', '..')), 'tests', path)
+    return os.path.join(os.path.abspath(os.path.join(__file__, '..', '..')), 'tests', path)
 
 
 @unittest.skipUnless(Image, "Pillow is required to test ImageField")
diff --git a/tests/forms_tests/tests/test_renderers.py b/tests/forms_tests/tests/test_renderers.py
index df9c9cf367..47452fa489 100644
--- a/tests/forms_tests/tests/test_renderers.py
+++ b/tests/forms_tests/tests/test_renderers.py
@@ -5,7 +5,6 @@ from django.forms.renderers import (
     BaseRenderer, DjangoTemplates, Jinja2, TemplatesSetting,
 )
 from django.test import SimpleTestCase
-from django.utils._os import upath
 
 try:
     import jinja2
@@ -23,12 +22,12 @@ class SharedTests:
         tpl = renderer.get_template('forms_tests/custom_widget.html')
         expected_path = os.path.abspath(
             os.path.join(
-                upath(os.path.dirname(__file__)),
+                os.path.dirname(__file__),
                 '..',
                 self.expected_widget_dir + '/forms_tests/custom_widget.html',
             )
         )
-        self.assertEqual(upath(tpl.origin.name), expected_path)
+        self.assertEqual(tpl.origin.name, expected_path)
 
 
 class BaseTemplateRendererTests(SimpleTestCase):