X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/2c9037d33f3e9d8d0ff6f7389fcfd68ca11258ed..bd4e85c2780dc58b34a16b4f2137723e68ba5a07:/views.py?ds=sidebyside diff --git a/views.py b/views.py index 7aac917..41718e5 100644 --- a/views.py +++ b/views.py @@ -1,10 +1,6 @@ -from django.contrib.sites.models import Site -from django.conf import settings -from django.http import Http404, HttpResponse -from django.template import RequestContext +from django.http import Http404 from django.views.decorators.vary import vary_on_headers from philo.exceptions import MIDDLEWARE_NOT_CONFIGURED -from philo.models import Node @vary_on_headers('Accept') @@ -18,37 +14,6 @@ def node_view(request, path=None, **kwargs): node = request.node subpath = request.node.subpath - try: - if subpath and not node.accepts_subpath: - raise Http404 - return node.render_to_response(request, kwargs) - except Http404, e: - if settings.DEBUG: - raise - - try: - Http404View = node.attributes['Http404'] - except KeyError: - Http404View = None - - if not Http404View: - raise e - - extra_context = {'exception': e} - - return Http404View.render_to_response(request, extra_context) - except Exception, e: - if settings.DEBUG: - raise - - try: - Http500View = node.attributes['Http500'] - - if not Http500View: - raise e - - extra_context = {'exception': e} - - return Http500View.render_to_response(request, extra_context) - except: - raise e \ No newline at end of file + if subpath and not node.accepts_subpath: + raise Http404 + return node.render_to_response(request, kwargs) \ No newline at end of file