Index: /trunk/src/VBox/ValidationKit/testdriver/base.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testdriver/base.py	(revision 70507)
+++ /trunk/src/VBox/ValidationKit/testdriver/base.py	(revision 70508)
@@ -1080,5 +1080,5 @@
             self.aoTasks[0].waitForTask(cMsTimeout);
             return True;
-        except Exception, oXcpt:
+        except Exception as oXcpt:
             reporter.log("waitForTasksSleepWorker: %s" % (str(oXcpt),));
             return False;
@@ -1444,5 +1444,5 @@
                     oFile = utils.openNoInherit(sFull, "rb");
                     oFile.close();
-                except Exception, oXcpt:
+                except Exception as oXcpt:
                     reporter.error('The file resource "%s" cannot be accessed: %s' % (sFull, oXcpt));
                     return False;
@@ -1614,7 +1614,7 @@
                         raise InvalidOption('unknown option: %s' % (asArgs[iArg]))
                 iArg = iNext;
-        except QuietInvalidOption, oXcpt:
+        except QuietInvalidOption as oXcpt:
             return rtexitcode.RTEXITCODE_SYNTAX;
-        except InvalidOption, oXcpt:
+        except InvalidOption as oXcpt:
             reporter.error(oXcpt.str());
             return rtexitcode.RTEXITCODE_SYNTAX;
Index: /trunk/src/VBox/ValidationKit/testdriver/reporter.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testdriver/reporter.py	(revision 70507)
+++ /trunk/src/VBox/ValidationKit/testdriver/reporter.py	(revision 70508)
@@ -432,5 +432,5 @@
         """Ends and completes the log files."""
         try:    sTsIso = self.fnGetIsoTimestamp();
-        except Exception, oXcpt:
+        except Exception as oXcpt:
             sTsIso = str(oXcpt);
 
@@ -522,5 +522,5 @@
         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,5 +528,5 @@
                 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,5 +534,5 @@
                     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,10 +562,10 @@
         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,5 +719,5 @@
         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,5 +861,5 @@
                     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,5 +1423,5 @@
     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,5 +1624,5 @@
     try:
         oSrcFile = utils.openNoInherit(sFilename, 'r');
-    except IOError, oXcpt:
+    except IOError as oXcpt:
         if oXcpt.errno != errno.ENOENT:
             logXcpt('addSubXmlFile(%s)' % (sFilename,));
Index: /trunk/src/VBox/ValidationKit/testdriver/txsclient.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testdriver/txsclient.py	(revision 70507)
+++ /trunk/src/VBox/ValidationKit/testdriver/txsclient.py	(revision 70508)
@@ -1773,5 +1773,5 @@
         try:
             (oClientSocket, tClientAddr) = oSocket.accept();
-        except socket.error, e:
+        except socket.error as e:
             if not self.__isInProgressXcpt(e):
                 raise;
@@ -1781,5 +1781,5 @@
             try:
                 select.select([oSocket, oWakeupR], [], [oSocket, oWakeupR], cMsTimeout / 1000.0);
-            except socket.error, e:
+            except socket.error as e:
                 if e[0] != errno.EBADF  or  not self.fConnectCanceled:
                     raise;
@@ -1792,5 +1792,5 @@
             try:
                 (oClientSocket, tClientAddr) = oSocket.accept();
-            except socket.error, e:
+            except socket.error as e:
                 if not self.__isInProgressXcpt(e):
                     if e[0] != errno.EBADF  or  not self.fConnectCanceled:
@@ -1825,5 +1825,5 @@
             oSocket.connect((self.sHostname, self.uPort));
             rc = True;
-        except socket.error, e:
+        except socket.error as e:
             iRc = e[0];
             if self.__isInProgressXcpt(e):
@@ -1836,5 +1836,5 @@
                     iRc = oSocket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR);
                     rc = iRc == 0;
-                except socket.error, e:
+                except socket.error as e:
                     iRc = e[0];
                 except:
@@ -1956,5 +1956,5 @@
             if cbSent == len(abBuf):
                 return True;
-        except Exception, oXcpt:
+        except Exception as oXcpt:
             if not self.__isWouldBlockXcpt(oXcpt):
                 reporter.errorXcpt('TranportTcp.sendBytes: %s bytes' % (len(abBuf)));
@@ -1988,5 +1988,5 @@
                 if cbSent == len(abBuf):
                     return True;
-            except Exception, oXcpt:
+            except Exception as oXcpt:
                 if not self.__isWouldBlockXcpt(oXcpt):
                     reporter.errorXcpt('TranportTcp.sendBytes: %s bytes' % (len(abBuf)));
@@ -2013,5 +2013,5 @@
                 if abBuf:
                     self.abReadAhead.extend(array.array('B', abBuf));
-            except Exception, oXcpt:
+            except Exception as oXcpt:
                 if not self.__isWouldBlockXcpt(oXcpt):
                     reporter.errorXcpt('TranportTcp.recvBytes: 0/%s bytes' % (cb,));
@@ -2056,5 +2056,5 @@
                 self.abReadAhead.extend(array.array('B', abBuf));
 
-            except Exception, oXcpt:
+            except Exception as oXcpt:
                 reporter.log('recv => exception %s' % (oXcpt,));
                 if not self.__isWouldBlockXcpt(oXcpt):
Index: /trunk/src/VBox/ValidationKit/testdriver/vbox.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testdriver/vbox.py	(revision 70507)
+++ /trunk/src/VBox/ValidationKit/testdriver/vbox.py	(revision 70508)
@@ -561,5 +561,5 @@
                     oSrcParent.registerCallback(oRet);
                     return oRet;
-                except Exception, oXcpt:
+                except Exception as oXcpt:
                     if fMustSucceed or ComError.notEqual(oXcpt, ComError.E_UNEXPECTED):
                         reporter.errorXcpt('%s::registerCallback(%s)%s' % (sSrcParentNm, oRet, sLogSuffix));
@@ -580,5 +580,5 @@
                 try:
                     oEventSrc.registerListener(oListener, [vboxcon.VBoxEventType_Any], not fPassive);
-                except Exception, oXcpt:
+                except Exception as oXcpt:
                     if fMustSucceed or ComError.notEqual(oXcpt, ComError.E_UNEXPECTED):
                         reporter.errorXcpt('%s::eventSource.registerListener(%s) failed%s' \
@@ -2456,5 +2456,5 @@
             else:
                 iCurPid   = iOrgPid   = oVM.sessionPid;
-        except Exception, oXcpt:
+        except Exception as oXcpt:
             if ComError.notEqual(oXcpt, ComError.E_ACCESSDENIED):
                 reporter.logXcpt();
@@ -2476,5 +2476,5 @@
                 sCurName  = oVM.sessionName if self.fpApiVer >= 5.0 else oVM.sessionType;
                 iCurPid   = oVM.sessionPID if self.fpApiVer >= 4.2 else oVM.sessionPid;
-            except Exception, oXcpt:
+            except Exception as oXcpt:
                 if ComError.notEqual(oXcpt, ComError.E_ACCESSDENIED):
                     reporter.logXcpt();
Index: /trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py	(revision 70507)
+++ /trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py	(revision 70508)
@@ -610,5 +610,5 @@
             try:
                 eState = self.o.machine.state;
-            except Exception, oXcpt:
+            except Exception as oXcpt:
                 if vbox.ComError.notEqual(oXcpt, vbox.ComError.E_UNEXPECTED):
                     reporter.logXcpt();
@@ -745,5 +745,5 @@
             try:
                 eState = self.o.machine.state;
-            except Exception, oXcpt:
+            except Exception as oXcpt:
                 if vbox.ComError.notEqual(oXcpt, vbox.ComError.E_UNEXPECTED):
                     reporter.logXcpt();
@@ -1761,5 +1761,5 @@
                     else:
                         oImage = self.oVBox.openDVDImage(sFullName, "");
-                except vbox.ComException, oXcpt:
+                except vbox.ComException as oXcpt:
                     if oXcpt.errno != -1:
                         reporter.errorXcpt('failed to open DVD image "%s" xxx' % (sFullName));
@@ -2680,5 +2680,5 @@
                 if uPid != os.getpid() and uPid != 0xffffffff:
                     self.uPid = uPid;
-            except Exception, oXcpt:
+            except Exception as oXcpt:
                 if vbox.ComError.equal(oXcpt, vbox.ComError.E_UNEXPECTED):
                     try:
@@ -2751,5 +2751,5 @@
         try:
             oConsole = self.o.console;
-        except Exception, oXcpt:
+        except Exception as oXcpt:
             if fMustSucceed or vbox.ComError.notEqual(oXcpt, vbox.ComError.E_UNEXPECTED):
                 reporter.errorXcpt('Failed to get ISession::console for "%s"' % (self.sName, ));
