Changeset 603

Timestamp:

Jun 13, 2008, 4:10:10 AM (16 years ago)

Author:

price

Message:

small code cleanups

File:

• trunk/packages/sipb-xen-www/code/main.py (modified) (5 diffs)

trunk/packages/sipb-xen-www/code/main.py

@@ -117 +117 @@
 
 DEFAULT_HEADERS = {'Content-Type': 'text/html'}
-
-def error(op, username, fields, err, emsg, traceback):
-    """Print an error page when an exception occurs"""
-    d = dict(op=op, user=username, fields=fields,
-             errorMessage=str(err), stderr=emsg, traceback=traceback)
-    details = templates.error_raw(searchList=[d])
-    send_error_mail('xvm error on %s for %s: %s' % (op, username, err),
-                    details)
-    d['details'] = details
-    return templates.error(searchList=[d])
 
 def invalidInput(op, username, fields, err, emsg):
@@ -618 +608 @@
     p.wait()
 
+def show_error(op, username, fields, err, emsg, traceback):
+    """Print an error page when an exception occurs"""
+    d = dict(op=op, user=username, fields=fields,
+             errorMessage=str(err), stderr=emsg, traceback=traceback)
+    details = templates.error_raw(searchList=[d])
+    send_error_mail('xvm error on %s for %s: %s' % (op, username, err),
+                    details)
+    d['details'] = details
+    return templates.error(searchList=[d])
+
 def getUser(environ):
     """Return the current user based on the SSL environment variables"""
@@ -663 +663 @@
                 new_headers, output = output
                 headers.update(new_headers)
-            print 'MOO2'
             e = revertStandardError()
             if e:
@@ -681 +680 @@
                     self.start('200 OK', [('Content-Type', 'text/html')])
                     e = revertStandardError()
-                    yield str(invalidInput(operation, self.username, fields, err, e))
+                    yield str(invalidInput(operation, self.username, fields,
+                                           err, e))
                     return
             import traceback
@@ -687 +687 @@
                        [('Content-Type', 'text/html')])
             e = revertStandardError()
-            s = error(operation, self.username, fields,
+            s = show_error(operation, self.username, fields,
                            err, e, traceback.format_exc())
             yield str(s)