mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Refactored the internals of URL parsing to use less code

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty
2005-08-05 20:50:19 +00:00
parent 888cf1f889
commit a55598cbdd
3 changed files with 38 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
django/core/handlers/base.py
View File

@@ -51,8 +51,7 @@ class BaseHandler:
if response:
return response
conf_module = __import__(ROOT_URLCONF, '', '', [''])
resolver = urlresolvers.RegexURLResolver(conf_module.urlpatterns)
resolver = urlresolvers.RegexURLResolver(r'^/', ROOT_URLCONF)
try:
callback, param_dict = resolver.resolve(path)
# Apply view middleware
@@ -65,8 +64,7 @@ class BaseHandler:
if DEBUG:
return self.get_technical_error_response(is404=True)
else:
resolver = urlresolvers.Error404Resolver(conf_module.handler404)
callback, param_dict = resolver.resolve()
callback, param_dict = resolver.resolve404()
return callback(request, **param_dict)
except db.DatabaseError:
db.db.rollback()
@@ -76,7 +74,7 @@ class BaseHandler:
subject = 'Database error (%s IP)' % (request.META['REMOTE_ADDR'] in INTERNAL_IPS and 'internal' or 'EXTERNAL')
message = "%s\n\n%s" % (self._get_traceback(), request)
mail_admins(subject, message, fail_silently=True)
return self.get_friendly_error_response(request, conf_module)
return self.get_friendly_error_response(request, resolver)
except exceptions.PermissionDenied:
return httpwrappers.HttpResponseForbidden('<h1>Permission denied</h1>')
except: # Handle everything else, including SuspiciousOperation, etc.
@@ -90,16 +88,15 @@ class BaseHandler:
request_repr = "Request repr() unavailable"
message = "%s\n\n%s" % (self._get_traceback(), request_repr)
mail_admins(subject, message, fail_silently=True)
return self.get_friendly_error_response(request, conf_module)
return self.get_friendly_error_response(request, resolver)
def get_friendly_error_response(self, request, conf_module):
def get_friendly_error_response(self, request, resolver):
"""
Returns an HttpResponse that displays a PUBLIC error message for a
fundamental database or coding error.
"""
from django.core import urlresolvers
resolver = urlresolvers.Error404Resolver(conf_module.handler500)
callback, param_dict = resolver.resolve()
callback, param_dict = resolver.resolve500()
return callback(request, **param_dict)
def get_technical_error_response(self, is404=False):