From f69a18560e74293bb4a62a99c8638769cd8d56e6 Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Tue, 4 Apr 2000 23:20:08 +0000
Subject: run_main(): During call to the Cgi's main routine, set sys.stderr to
 the logger object so they can simply sys.stderr.write() to get error messages
 out to logs/error.

No need to set sys.__stderr__ and sys.__stdout__; we're requiring at
least Python 1.5.2 now.
---
 scripts/driver | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/scripts/driver b/scripts/driver
index e5f849c71..c8faff442 100644
--- a/scripts/driver
+++ b/scripts/driver
@@ -84,7 +84,11 @@ def run_main():
         module = getattr(pkg, scriptname)
         main = getattr(module, 'main')
         try:
-            main()
+            try:
+                sys.stderr = logger
+                main()
+            finally:
+                sys.stderr = sys.__stderr__
         except SystemExit:
             # this is a valid way for the function to exit
             pass
@@ -180,12 +184,6 @@ def print_environment(logfp=None):
 
 
 try:
-    # Python 1.5 doesn't have these by default.  Let's make our lives easy
-    if not hasattr(sys, '__stderr__'):
-        sys.__stderr__ = sys.stderr
-    if not hasattr(sys, '__stdout__'):
-        sys.__stdout__ = sys.stdout
-
     run_main()
 except:
     # Some exception percolated all the way back up to the top.  This
-- 
cgit v1.3.1