don't need support for smtp auth

[bluechips.git] / bluechips / controllers / error.py

diff --git a/bluechips/controllers/error.py b/bluechips/controllers/error.py
index 921549d078727ebe378f21dcbeb56023d9babe5d..6fd2c4576ebdbc5a10dee999a90f658110e91bc8 100644 (file)
--- a/bluechips/controllers/error.py
+++ b/bluechips/controllers/error.py
@@ -1,12 +1,8 @@
 import cgi
-import os.path
 
-from paste.urlparser import StaticURLParser
-from pylons import request
-from pylons.controllers.util import forward
-from pylons.middleware import error_document_template, media_path
+from pylons import request, tmpl_context as c
 
-from bluechips.lib.base import BaseController
+from bluechips.lib.base import BaseController, render
 
 class ErrorController(BaseController):
     """Generates error documents as and when they are required.
@@ -21,24 +17,5 @@ class ErrorController(BaseController):
     def document(self):
         """Render the error document"""
         resp = request.environ.get('pylons.original_response')
-        page = error_document_template % \
-            dict(prefix=request.environ.get('SCRIPT_NAME', ''),
-                 code=cgi.escape(request.GET.get('code', resp.status)),
-                 message=cgi.escape(request.GET.get('message', resp.body)))
-        return page
-
-    def img(self, id):
-        """Serve Pylons' stock images"""
-        return self._serve_file(os.path.join(media_path, 'img'), id)
-
-    def style(self, id):
-        """Serve Pylons' stock stylesheets"""
-        return self._serve_file(os.path.join(media_path, 'style'), id)
-
-    def _serve_file(self, root, path):
-        """Call Paste's FileApp (a WSGI application) to serve the file
-        at the specified path
-        """
-        static = StaticURLParser(root)
-        request.environ['PATH_INFO'] = '/%s' % path
-        return static(request.environ, self.start_response)
+        c.code = cgi.escape(request.GET.get('code', resp.status))
+        return render('/error.mako')