tighten a bit of code

svn path=/package_branches/invirt-web/cherrypy-rebased/; revision=2705

diff --git a/code/main.py b/code/main.py
index a2ab887..786a087 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -97,14 +97,12 @@ class InvirtWeb(View):
     def handle_error(self):
         err = sys.exc_info()[1]
         if isinstance(err, InvalidInput):
     def handle_error(self):
         err = sys.exc_info()[1]
         if isinstance(err, InvalidInput):

-            e = revertStandardError()

             cherrypy.request.params['err'] = err
             cherrypy.request.params['err'] = err

-            cherrypy.request.params['emsg'] = e
+            cherrypy.request.params['emsg'] = revertStandardError()

             raise cherrypy.InternalRedirect('/invalidInput')
         if not cherrypy.request.prev or 'err' not in cherrypy.request.prev.params:
             raise cherrypy.InternalRedirect('/invalidInput')
         if not cherrypy.request.prev or 'err' not in cherrypy.request.prev.params:

-            e = revertStandardError()

             cherrypy.request.params['err'] = err
             cherrypy.request.params['err'] = err

-            cherrypy.request.params['emsg'] = e
+            cherrypy.request.params['emsg'] = revertStandardError()

             cherrypy.request.params['traceback'] = _cperror.format_exc()
             raise cherrypy.InternalRedirect('/error')
         # fall back to cherrypy default error page
             cherrypy.request.params['traceback'] = _cperror.format_exc()
             raise cherrypy.InternalRedirect('/error')
         # fall back to cherrypy default error page