Changeset 693 for trunk

Timestamp:

Jul 21, 2008, 3:46:05 PM (16 years ago)

Author:

price

Message:

don't give 500 for mere stdout on a redirect

File:

• trunk/packages/sipb-xen-www/code/main.py (modified) (1 diff)

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

@@ -697 +697 @@
             e = revertStandardError()
             if e:
-                if isinstance(output, basestring):
-                    sys.stderr = StringIO()
-                    x = str(output)
-                    print >> sys.stderr, x
-                    print >> sys.stderr, 'XXX'
-                    print >> sys.stderr, e
-                    raise Exception()
-                output.addError(e)
+                if hasattr(output, 'addError'):
+                    output.addError(e)
+                else:
+                    # This only happens on redirects, so it'd be a pain to get
+                    # the message to the user.  Maybe in the response is useful.
+                    output = output + '\n\nstderr:\n' + e
             output_string =  str(output)
             checkpoint.checkpoint('output as a string')