diff options
Diffstat (limited to 'django/core/handlers')
| -rw-r--r-- | django/core/handlers/base.py | 3 | ||||
| -rw-r--r-- | django/core/handlers/modpython.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py index 79f6607214..b03c2fd71e 100644 --- a/django/core/handlers/base.py +++ b/django/core/handlers/base.py @@ -137,9 +137,8 @@ class BaseHandler(object): raise except: # Handle everything else, including SuspiciousOperation, etc. # Get the exception info now, in case another exception is thrown later. - exc_info = sys.exc_info() receivers = signals.got_request_exception.send(sender=self.__class__, request=request) - return self.handle_uncaught_exception(request, resolver, exc_info) + return self.handle_uncaught_exception(request, resolver, sys.exc_info()) finally: # Reset URLconf for this thread on the way out for complete # isolation of request.urlconf diff --git a/django/core/handlers/modpython.py b/django/core/handlers/modpython.py index b1e3e17227..17e739600c 100644 --- a/django/core/handlers/modpython.py +++ b/django/core/handlers/modpython.py @@ -1,5 +1,6 @@ import os from pprint import pformat +from warnings import warn from django import http from django.core import signals @@ -179,6 +180,9 @@ class ModPythonHandler(BaseHandler): request_class = ModPythonRequest def __call__(self, req): + warn(('The mod_python handler is deprecated; use a WSGI or FastCGI server instead.'), + PendingDeprecationWarning) + # mod_python fakes the environ, and thus doesn't process SetEnv. This fixes that os.environ.update(req.subprocess_env) |