diff options
| -rw-r--r-- | scripts/driver | 12 |
1 files changed, 5 insertions, 7 deletions
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 |