tps: remove 2.5+ constructions

Now this can be run under python 2.4 and above. Suppressed with statements, try/except/finally clauses and hashlib

tps: remove 2.5+ constructions
Now this can be run under python 2.4 and above. Suppressed with statements, try/except/finally clauses and hashlib
67631ad1 · Juan David González Cobas · a534b402 · 67631ad1
Commit 67631ad1 authored May 25, 2011 by Juan David González Cobas
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 10 deletions

tps.py tps.py +8 -10

No files found.
--- a/tps.py
+++ b/tps.py
@@ -13,7 +13,7 @@ import warnings

 from ConfigParser import ConfigParser
 from optparse import OptionParser
-from hashlib import sha1 as sha160
+from sha import sha as sha160
 from tpsexcept import *

 default_config_file  = 'tpsdefault.cfg'
@@ -27,12 +27,11 @@ def run_test(testname, logname):
    """
    try:
        tmpout = sys.stdout
-        with open(logname, 'w') as sys.stdout:
-            mod = __import__(testname, globals(), locals(), [])
-            mod.main()
-    except:
-        raise
+        sys.stdout = open(logname, 'w')
+        mod = __import__(testname, globals(), locals(), [])
+        mod.main()
    finally:
+        sys.stdout.close()
        sys.stdout = tmpout

 class Suite(object):
@@ -84,8 +83,9 @@ class Suite(object):
        config.set('global', 'log_pattern', self.log_pattern)

        # Writing our configuration file
-        with open(self.config, 'wb') as configfile:
-            config.write(configfile)
+        configfile = open(self.config, 'wb')
+        config.write(configfile)
+        configfile.close()

    def validate_and_compute_run(self):
        """validate run paramenters"""
@@ -200,8 +200,6 @@ class Suite(object):
                log.write('    warning in test {0}, exception [{1}]\n'.format(shortname, e.message))
            else:
                log.write('    OK\n')
-            finally:
-                pass
        log.close()

 def get_serial():