Changeset 2705

Timestamp:

Dec 20, 2009, 9:46:37 PM (15 years ago)

Author:

broder

Message:

tighten a bit of code

File:

• package_branches/invirt-web/cherrypy-rebased/code/main.py (modified) (1 diff)

package_branches/invirt-web/cherrypy-rebased/code/main.py

@@ -98 +98 @@
         err = sys.exc_info()[1]
         if isinstance(err, InvalidInput):
-            e = revertStandardError()
             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:
-            e = revertStandardError()
             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')