[Mpuls-commits] r2217 - in wasko/branches/2.0: . mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-03-25 20:37:16 +0100 (Thu, 25 Mar 2010)
New Revision: 2217

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/controllers/error.py
Log:
* mpulsweb/controllers/error.py: Fix formatting.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-03-25 19:29:03 UTC (rev 2216)
+++ wasko/branches/2.0/ChangeLog	2010-03-25 19:37:16 UTC (rev 2217)
@@ -1,5 +1,9 @@
 2010-03-25  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/controllers/error.py: Fix formatting.
+
+2010-03-25  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/controllers/casedocument.py: Fix formatting.
 
 2010-03-25  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/mpulsweb/controllers/error.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/error.py	2010-03-25 19:29:03 UTC (rev 2216)
+++ wasko/branches/2.0/mpulsweb/controllers/error.py	2010-03-25 19:37:16 UTC (rev 2217)
@@ -7,6 +7,7 @@
 
 from mpulsweb.lib.base import BaseController, render, c
 
+
 class ErrorController(BaseController):
 
     """Generates error documents as and when they are required.
@@ -23,8 +24,9 @@
         """Render the error document"""
         resp = request.environ.get('pylons.original_response')
         c.error_code = cgi.escape(request.GET.get('code', str(resp.status_int)))
-        c.error_message = literal(resp.body) or cgi.escape(request.GET.get('message', ''))
-        c.error_email = config.get('email_to', 'mpuls at intevation.de') 
+        c.error_message = (literal(resp.body)
+                           or cgi.escape(request.GET.get('message', '')))
+        c.error_email = config.get('email_to', 'mpuls at intevation.de')
         return render('/error/error.mako')
 
     def img(self, id):