Changeset 96 for branches/0.2.1.x/pysvnmanager/controllers/error.py

Timestamp:

2009年08月23日 15时40分34秒 (3 years ago)

Author:

jiangx

Message:

Fixed #28: downgrade pylons framework from 0.9.7 to 0.9.6.2

Files:

• branches/0.2.1.x/pysvnmanager/controllers/error.py (modified) (2 diffs)

branches/0.2.1.x/pysvnmanager/controllers/error.py

@@ -21 +21 @@
 
 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 webhelpers.html.builder import literal
 
-from pysvnmanager.lib.base import BaseController
+from pysvnmanager.lib.base import *
 
 class ErrorController(BaseController):
@@ -40 +37 @@
     def document(self):
         """Render the error document"""
-        resp = request.environ.get('pylons.original_response')
-        content = literal(resp.body) or cgi.escape(request.GET.get('message'))
         page = error_document_template % \
             dict(prefix=request.environ.get('SCRIPT_NAME', ''),
-                 code=cgi.escape(request.GET.get('code', str(resp.status_int))),
-                 message=content)
+                 code=cgi.escape(request.params.get('code', '')),
+                 message=cgi.escape(request.params.get('message', '')))
         return page