Changeset 2524 for package_branches

Timestamp:

Oct 29, 2009, 1:36:40 AM (15 years ago)

Author:

price

Message:

tighten a bit of code

File:

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

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

@@ -103 +103 @@
         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')