Django

Code

Changeset 3879

Show
Ignore:
Timestamp:
09/27/06 21:37:41 (2 years ago)
Author:
adrian
Message:

Folded BaseHandler?.get_technical_error_response() into BaseHandler?.get_response() to save the overhead of a function call, and because that logic didn't need to be abstracted.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/handlers/base.py

    r3878 r3879  
    9090        except http.Http404, e: 
    9191            if settings.DEBUG: 
    92                 return self.get_technical_error_response(request, is404=True, exception=e) 
     92                from django.views import debug 
     93                return debug.technical_404_response(request, e) 
    9394            else: 
    9495                callback, param_dict = resolver.resolve404() 
    …… 
    100101        except: # Handle everything else, including SuspiciousOperation, etc. 
    101102            if settings.DEBUG: 
    102                 return self.get_technical_error_response(request) 
     103                from django.views import debug 
     104                return debug.technical_500_response(request, *sys.exc_info()) 
    103105            else: 
    104106                # Get the exception info now, in case another exception is thrown later. 
    …… 
    117119                return callback(request, **param_dict) 
    118120 
    119     def get_technical_error_response(self, request, is404=False, exception=None): 
    120         """ 
    121         Returns an HttpResponse that displays a TECHNICAL error message for a 
    122         fundamental error. 
    123         """ 
    124         from django.views import debug 
    125         if is404: 
    126             return debug.technical_404_response(request, exception) 
    127         else: 
    128             return debug.technical_500_response(request, *sys.exc_info()) 
    129  
    130121    def _get_traceback(self, exc_info=None): 
    131122        "Helper function to return the traceback as a string"