Changeset 2239

Timestamp:

02/03/06 09:18:20 (3 years ago)

Author:

adrian

Message:

Fixed #1323 -- Added ENABLE_PSYCO. Thanks, Wojtek.

Files:

• django/trunk/django/conf/global_settings.py (modified) (1 diff)
• django/trunk/django/core/handlers/modpython.py (modified) (1 diff)
• django/trunk/django/core/handlers/wsgi.py (modified) (1 diff)
• django/trunk/docs/settings.txt (modified) (1 diff)

django/trunk/django/conf/global_settings.py

@@ -188 +188 @@
-TIME_FORMAT = 'P'
-
+# Whether to enable Psyco, which optimizes Python code. Requires Psyco.
+# http://psyco.sourceforge.net/
+ENABLE_PSYCO = False
+
-##############
-# MIDDLEWARE #

django/trunk/django/core/handlers/modpython.py

@@ -131 +131 @@
-        from django.core import db
-
+        if settings.ENABLE_PSYCO:
+            import psyco
+            psyco.profile()
+
-        # if we need to set up middleware, now that settings works we can do it now.
-        if self._request_middleware is None:

django/trunk/django/core/handlers/wsgi.py

@@ -146 +146 @@
-        from django.core import db
-
+        if settings.ENABLE_PSYCO:
+            import psyco
+            psyco.profile()
+
-        # Set up middleware if needed. We couldn't do this earlier, because
-        # settings weren't available.

django/trunk/docs/settings.txt

@@ -343 +343 @@
-or ``django.core.mail.mail_managers``. You'll probably want to include the
-trailing space.
+
+ENABLE_PSYCO
+------------
+
+Default: ``False``
+
+**New in Django development version.**
+
+Whether to enable Psyco, which optimizes Python code. Requires Psyco_.
+
+.. _Psyco: http://psyco.sourceforge.net/
-
-IGNORABLE_404_ENDS