Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 567e4e441131434c855f9232553ae939962def99 1 parent bd41a51
@adrianholovaty adrianholovaty authored
View
4 django/conf/global_settings.py
@@ -187,6 +187,10 @@
# http://www.djangoproject.com/documentation/templates/#now
TIME_FORMAT = 'P'
+# Whether to enable Psyco, which optimizes Python code. Requires Psyco.
+# http://psyco.sourceforge.net/
+ENABLE_PSYCO = False
+
##############
# MIDDLEWARE #
##############
View
4 django/core/handlers/modpython.py
@@ -130,6 +130,10 @@ def __call__(self, req):
from django.conf import settings
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:
self.load_middleware()
View
4 django/core/handlers/wsgi.py
@@ -145,6 +145,10 @@ def __call__(self, environ, start_response):
from django.conf import settings
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.
if self._request_middleware is None:
View
11 docs/settings.txt
@@ -343,6 +343,17 @@ Subject-line prefix for e-mail messages sent with ``django.core.mail.mail_admins
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
------------------
Please sign in to comment.
Something went wrong with that request. Please try again.