Changeset 70508 in vbox for trunk/src/VBox/ValidationKit/testdriver/reporter.py

Timestamp:

Jan 10, 2018 11:21:09 AM (7 years ago)

Author:

vboxsync

Message:

testdriver: python 3 updates.

File:

• trunk/src/VBox/ValidationKit/testdriver/reporter.py (modified) (9 diffs)

trunk/src/VBox/ValidationKit/testdriver/reporter.py

@@ -432 +432 @@
         """Ends and completes the log files."""
         try:    sTsIso = self.fnGetIsoTimestamp();
-        except Exception, oXcpt:
+        except Exception as oXcpt:
             sTsIso = str(oXcpt);
 
@@ -522 +522 @@
         try:
             oDstFile = utils.openNoInherit(sDstFilename, 'w');
-        except Exception, oXcpt:
+        except Exception as oXcpt:
             self.log(0, 'error opening %s: %s' % (sDstFilename, oXcpt), sCaller, sTsPrf);
         else:
@@ -528 +528 @@
                 try:
                     abBuf = oSrcFile.read(65536);
-                except Exception, oXcpt:
+                except Exception as oXcpt:
                     fRc = False;
                     self.log(0, 'error reading %s: %s' % (sSrcFilename, oXcpt), sCaller, sTsPrf);
@@ -534 +534 @@
                     try:
                         oDstFile.write(abBuf);
-                    except Exception, oXcpt:
+                    except Exception as oXcpt:
                         fRc = False;
                         self.log(0, 'error writing %s: %s' % (sDstFilename, oXcpt), sCaller, sTsPrf);
@@ -562 +562 @@
         try:
             oDstFile = utils.openNoInherit(sDstFilename, 'w');
-        except Exception, oXcpt:
+        except Exception as oXcpt:
             self.log(0, 'error opening %s: %s' % (sDstFilename, oXcpt), sCaller, sTsPrf);
         else:
             try:
                 oDstFile.write(sLog);
-            except Exception, oXcpt:
+            except Exception as oXcpt:
                 fRc = False;
                 self.log(0, 'error writing %s: %s' % (sDstFilename, oXcpt), sCaller, sTsPrf);
@@ -719 +719 @@
         try:
             sRspBody  = oResponse.read();
-        except httplib.IncompleteRead, oXcpt:
+        except httplib.IncompleteRead as oXcpt:
             self._writeOutput('%s: %s: Warning: httplib.IncompleteRead: %s [expected %s, got %s]'
                               % (utils.getTimePrefix(), sOperation, oXcpt, oXcpt.expected, len(oXcpt.partial),));
@@ -861 +861 @@
                     self._writeOutput('_xmlDoFlush: Failed - we should abort the test, really.');
                     return (None, True);
-            except Exception, oXcpt:
+            except Exception as oXcpt:
                 if not fDtor:
                     logXcpt('warning: exception during XML_RESULTS request');
@@ -1423 +1423 @@
     try:
         oSrcFile = utils.openNoInherit(sFilename, 'rb');
-    except IOError, oXcpt:
+    except IOError as oXcpt:
         if oXcpt.errno != errno.ENOENT:
             logXcpt('addLogFile(%s,%s,%s)' % (sFilename, sDescription, sKind));
@@ -1624 +1624 @@
     try:
         oSrcFile = utils.openNoInherit(sFilename, 'r');
-    except IOError, oXcpt:
+    except IOError as oXcpt:
         if oXcpt.errno != errno.ENOENT:
             logXcpt('addSubXmlFile(%s)' % (sFilename,));