mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-29 00:26:07 +00:00
Code Issues 32 Releases Wiki Activity

Refs #27795 -- Removed unneeded force_text calls

Browse Source 
Thanks Tim Graham for the review.
This commit is contained in:
Claude Paroz
2017-03-04 15:47:49 +01:00
parent 86de930f41
commit 8346680e1c
42 changed files with 75 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
django/__init__.py
View File

@@ -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)