Changeset 3877

Timestamp:

09/27/06 21:31:05 (2 years ago)

Author:

adrian

Message:

Removed ENABLE_PSYCO setting. If you still need to use this, write custom middleware that activates psyco for you.

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

@@ -224 +224 @@
-MONTH_DAY_FORMAT = 'F j'
-
-# Whether to enable Psyco, which optimizes Python code. Requires Psyco.
-# http://psyco.sourceforge.net/
-ENABLE_PSYCO = False
-
-# Do you want to manage transactions manually?
-# Hint: you really don't!

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

@@ -140 +140 @@
-        from django.conf import settings
-
-        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

@@ -175 +175 @@
-        from django.conf import settings
-
-        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

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