[Erp5-report] r33174 luke - /erp5/trunk/buildout/tests/assertSoftware.py

[nobody at svn.erp5.org]

Author: luke
Date: Mon Mar  1 13:07:16 2010
New Revision: 33174

URL: http://svn.erp5.org?rev=33174&view=rev
Log:
 - use only try..finally, it is enough
 - put all possible-to-fail code in try block

Modified:
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=33174&r1=33173&r2=33174&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Mon Mar  1 13:07:16 2010
@@ -10,20 +10,17 @@
 
   def test_use_generated_python(self):
     fd, name = tempfile.mkstemp()
-    f = os.fdopen(fd, 'w')
-    f.write("""\
+    try:
+      f = os.fdopen(fd, 'w')
+      f.write("""\
 #!%s
 import sys
 print sys.version_info[:2]
     """ % sys.executable)
-    f.close()
-    f_stat = os.stat(name)
-    os.chmod(name, f_stat.st_mode | stat.S_IXUSR)
-    try:
-      try:
-        self.assertEqual(0, os.system(name))
-      except:
-        raise
+      f.close()
+      f_stat = os.stat(name)
+      os.chmod(name, f_stat.st_mode | stat.S_IXUSR)
+      self.assertEqual(0, os.system(name))
     finally:
       os.unlink(name)