diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 11b1c0e08a471..5b3795fade2b7 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -223,10 +223,6 @@ # http://www.djangoproject.com/documentation/templates/#now 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! TRANSACTIONS_MANAGED = False diff --git a/django/core/handlers/modpython.py b/django/core/handlers/modpython.py index d7f214ba90f93..bf759db06815e 100644 --- a/django/core/handlers/modpython.py +++ b/django/core/handlers/modpython.py @@ -139,10 +139,6 @@ def __call__(self, req): # that use settings now can work 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: self.load_middleware() diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py index 4d5c65b0703ec..2998bd31f6d93 100644 --- a/django/core/handlers/wsgi.py +++ b/django/core/handlers/wsgi.py @@ -174,10 +174,6 @@ class WSGIHandler(BaseHandler): def __call__(self, environ, start_response): 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. if self._request_middleware is None: diff --git a/docs/settings.txt b/docs/settings.txt index 61355c46ada6d..0e808c018b883 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -401,15 +401,6 @@ 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`` - -Whether to enable Psyco, which optimizes Python code. Requires Psyco_. - -.. _Psyco: http://psyco.sourceforge.net/ - IGNORABLE_404_ENDS ------------------