Changeset 3012

Timestamp:

05/30/06 21:09:07 (2 years ago)

Author:

adrian

Message:

Added support to django/contrib/auth/handlers/modpython.py for setting DJANGO_SETTINGS_MODULE via a PythonOption? instead of SetEnv?

Files:

• django/trunk/django/contrib/auth/handlers/modpython.py (modified) (2 diffs)
• django/trunk/docs/apache_auth.txt (modified) (1 diff)

django/trunk/django/contrib/auth/handlers/modpython.py

@@ -11 +11 @@
-    os.environ.update(req.subprocess_env)
-
-    from django.contrib.auth.models import User
-
-    # check for PythonOptions
-    _str_to_bool = lambda s: s.lower() in ('1', 'true', 'on', 'yes')
@@ -20 +18 @@
-    staff_only = _str_to_bool(options.get('DjangoRequireStaffStatus', "on"))
-    superuser_only = _str_to_bool(options.get('DjangoRequireSuperuserStatus', "off"))
+    settings_module = options.get('DJANGO_SETTINGS_MODULE', None)
+    if settings_module:
+        os.environ['DJANGO_SETTINGS_MODULE'] = settings_module
+
+    from django.contrib.auth.models import User
-
-    # check that the username is valid

django/trunk/docs/apache_auth.txt

@@ -57 +57 @@
-    ================================  =========================================
-
+Note that sometimes ``SetEnv`` doesn't play well in this mod_python
+configuration, for reasons unknown. If you're having problems getting
+mod_python to recognize your ``DJANGO_SETTINGS_MODULE``, you can set it using
+``PythonOption`` instead of ``SetEnv``. Therefore, these two Apache directives
+are equivalent::
+
+    SetEnv DJANGO_SETTINGS_MODULE mysite.settings
+    PythonOption DJANGO_SETTINGS_MODULE mysite.settings
+
-.. _authentication system: http://www.djangoproject.com/documentation/authentication/
-.. _Subversion: http://subversion.tigris.org/