From f22cd4ec05f924725af2b634ab206bc99fbe543d Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 28 Sep 2006 02:34:48 +0000 Subject: [PATCH] Folded BaseHandler.get_friendly_error_response() into BaseHandler.get_response() to save the overhead of a function call, and because that logic didn't need to be abstracted. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3878 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/handlers/base.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py index a24c26d0a0..f9a948d186 100644 --- a/django/core/handlers/base.py +++ b/django/core/handlers/base.py @@ -112,15 +112,9 @@ class BaseHandler(object): request_repr = "Request repr() unavailable" message = "%s\n\n%s" % (self._get_traceback(exc_info), request_repr) mail_admins(subject, message, fail_silently=True) - return self.get_friendly_error_response(request, resolver) - - def get_friendly_error_response(self, request, resolver): - """ - Returns an HttpResponse that displays a PUBLIC error message for a - fundamental error. - """ - callback, param_dict = resolver.resolve500() - return callback(request, **param_dict) + # Return an HttpResponse that displays a friendly error message. + callback, param_dict = resolver.resolve500() + return callback(request, **param_dict) def get_technical_error_response(self, request, is404=False, exception=None): """