From 060219ee48daddf8d487cd2edb8f201ccb11197b Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 18 Jul 2014 17:32:41 +0100
Subject: [PATCH] Revert "Allow RouteResult to return a view"

This reverts commit bbbc83c56e9e627160af46061ce0183c23a7e072.
---
 wagtail/wagtailcore/url_routing.py | 5 ++---
 wagtail/wagtailcore/views.py       | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/wagtail/wagtailcore/url_routing.py b/wagtail/wagtailcore/url_routing.py
index 60566120b7..0d7a5e1c4c 100644
--- a/wagtail/wagtailcore/url_routing.py
+++ b/wagtail/wagtailcore/url_routing.py
@@ -6,11 +6,10 @@ class RouteResult(object):
     a Page instance that we will call serve(*args, **kwargs) on, rather
     than a view function.
     """
-    def __init__(self, page, view=None, args=None, kwargs=None):
+    def __init__(self, page, args=None, kwargs=None):
         self.page = page
         self.args = args or []
         self.kwargs = kwargs or {}
-        self.view = view or page.serve
 
     def __getitem__(self, index):
-        return (self.page, self.view, self.args, self.kwargs)[index]
+        return (self.page, self.args, self.kwargs)[index]
diff --git a/wagtail/wagtailcore/views.py b/wagtail/wagtailcore/views.py
index 28a38249ba..b955efa54d 100644
--- a/wagtail/wagtailcore/views.py
+++ b/wagtail/wagtailcore/views.py
@@ -25,13 +25,13 @@ def serve(request, path):
         )
         return route_result
 
-    (page, view, args, kwargs) = route_result
+    (page, args, kwargs) = route_result
     for fn in hooks.get_hooks('before_serve_page'):
         result = fn(page, request, args, kwargs)
         if isinstance(result, HttpResponse):
             return result
 
-    return view(request, *args, **kwargs)
+    return page.serve(request, *args, **kwargs)
 
 
 def authenticate_with_password(request, page_view_restriction_id, page_id):