Changeset 70548 in vbox for trunk/src/VBox/ValidationKit/testboxscript/testboxupgrade.py

Timestamp:

Jan 11, 2018 8:46:02 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120222

Message:

testboxscript: Python 3 adjustments.

File:

• trunk/src/VBox/ValidationKit/testboxscript/testboxupgrade.py (modified) (7 diffs)

trunk/src/VBox/ValidationKit/testboxscript/testboxupgrade.py

@@ -90 +90 @@
     for sMember in asMembers:
         if sMember.endswith('/'):
-            os.makedirs(os.path.join(sUpgradeDir, sMember.replace('/', os.path.sep)), 0775);
+            os.makedirs(os.path.join(sUpgradeDir, sMember.replace('/', os.path.sep)), 0o775);
         else:
             oZip.extract(sMember, sUpgradeDir);
@@ -110 +110 @@
                 return False;
             try:
-                os.chmod(sFull, 0755);
-            except Exception, oXcpt:
+                os.chmod(sFull, 0o755);
+            except Exception as oXcpt:
                 testboxcommons.log('warning chmod error on %s: %s' % (sFull, oXcpt));
     return True;
@@ -170 +170 @@
                 sFull = os.path.join(g_ksValidationKitDir, sMember);
                 if not os.path.isdir(sFull):
-                    os.makedirs(sFull, 0755);
+                    os.makedirs(sFull, 0o755);
 
     #
@@ -189 +189 @@
                 try:
                     os.rename(sDst, sDstRm);
-                except Exception, oXcpt:
+                except Exception as oXcpt:
                     testboxcommons.log('Error: failed to rename (old) "%s" to "%s": %s' % (sDst, sDstRm, oXcpt));
                     try:
                         shutil.copy(sDst, sDstRm);
-                    except Exception, oXcpt:
+                    except Exception as oXcpt:
                         testboxcommons.log('Error: failed to copy (old) "%s" to "%s": %s' % (sDst, sDstRm, oXcpt));
                         break;
                     try:
                         os.unlink(sDst);
-                    except Exception, oXcpt:
+                    except Exception as oXcpt:
                         testboxcommons.log('Error: failed to unlink (old) "%s": %s' % (sDst, oXcpt));
                         break;
@@ -206 +206 @@
             try:
                 os.rename(sSrc, sDst);
-            except Exception, oXcpt:
+            except Exception as oXcpt:
                 testboxcommons.log('Warning: failed to rename (new) "%s" to "%s": %s' % (sSrc, sDst, oXcpt));
                 try:
@@ -259 +259 @@
                 try:
                     os.rmdir(sFull);
-                except Exception, oXcpt:
+                except Exception as oXcpt:
                     testboxcommons.log('Warning: failed to rmdir obsolete dir "%s": %s' % (sFull, oXcpt));
 
@@ -268 +268 @@
                 try:
                     os.unlink(sFull);
-                except Exception, oXcpt:
+                except Exception as oXcpt:
                     testboxcommons.log('Warning: failed to unlink obsolete file "%s": %s' % (sFull, oXcpt));
     return True;