Fixed #16734 -- Set script prefix even outside of requests

Thanks Tim Graham for the review.

1 files changed, 10 insertions, 1 deletions

diff --git a/django/__init__.py b/django/__init__.py
index 3025f721bd..c9c3ecf17a 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.utils.version import get_version
 
 VERSION = (1, 10, 0, 'alpha', 0)
@@ -5,14 +7,21 @@ VERSION = (1, 10, 0, 'alpha', 0)
 __version__ = get_version(VERSION)
 
 
-def setup():
+def setup(set_prefix=True):
     """
     Configure the settings (this happens as a side effect of accessing the
     first setting), configure logging and populate the app registry.
+    Set the thread-local urlresolvers script prefix if `set_prefix` is True.
     """
     from django.apps import apps
     from django.conf import settings
+    from django.core.urlresolvers 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)
+        )
     apps.populate(settings.INSTALLED_APPS)