summaryrefslogtreecommitdiff
path: root/django/utils/_os.py
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2018-09-25 08:27:36 -0700
committerTim Graham <timograham@gmail.com>2018-09-25 11:27:36 -0400
commitbb81c22d90e5eb168544670ead1a13aa9695fed5 (patch)
tree6bfaae0ecebfa41cc2c7505dfc7665bfca6793a2 /django/utils/_os.py
parent9a0e0d966a1a317b1b422b5e92949e6d1f33fc2f (diff)
Refs #27795 -- Removed force_bytes() usage in utils/_os.py.
Diffstat (limited to 'django/utils/_os.py')
-rw-r--r--django/utils/_os.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/django/utils/_os.py b/django/utils/_os.py
index f6a96b221b..81ab8e6e76 100644
--- a/django/utils/_os.py
+++ b/django/utils/_os.py
@@ -3,7 +3,6 @@ import tempfile
from os.path import abspath, dirname, join, normcase, sep
from django.core.exceptions import SuspiciousFileOperation
-from django.utils.encoding import force_text
# For backwards-compatibility in Django 2.0
abspathu = abspath
@@ -30,8 +29,6 @@ def safe_join(base, *paths):
Raise ValueError if the final path isn't located inside of the base path
component.
"""
- base = force_text(base)
- paths = [force_text(p) for p in paths]
final_path = abspath(join(base, *paths))
base_path = abspath(base)
# Ensure final_path starts with base_path (using normcase to ensure we