summaryrefslogtreecommitdiff
path: root/django/__init__.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-03-04 15:47:49 +0100
committerClaude Paroz <claude@2xlibre.net>2017-03-04 18:18:21 +0100
commit8346680e1ca4a8ddc8190baf3f5f944f6418d5cf (patch)
treeed12bc1d1077a65c1b32d410bc267266f6e3e4f9 /django/__init__.py
parent86de930f413e0ad902e11d78ac988e6743202ea6 (diff)
Refs #27795 -- Removed unneeded force_text calls
Thanks Tim Graham for the review.
Diffstat (limited to 'django/__init__.py')
-rw-r--r--django/__init__.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/__init__.py b/django/__init__.py
index 4da99681ee..ee35e129a1 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -14,12 +14,11 @@ def setup(set_prefix=True):
from django.apps import apps
from django.conf import settings
from django.urls import set_script_prefix
- from django.utils.encoding import force_text
from django.utils.log import configure_logging
configure_logging(settings.LOGGING_CONFIG, settings.LOGGING)
if set_prefix:
set_script_prefix(
- '/' if settings.FORCE_SCRIPT_NAME is None else force_text(settings.FORCE_SCRIPT_NAME)
+ '/' if settings.FORCE_SCRIPT_NAME is None else settings.FORCE_SCRIPT_NAME
)
apps.populate(settings.INSTALLED_APPS)