Changeset 86975 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Nov 25, 2020 2:45:30 PM (4 years ago)

Author:

vboxsync

Message:

ValKit: Shut up python3 compilation errors. bugref:9788

Location:

trunk/src/VBox/ValidationKit

Files:

• analysis/reporting.py (modified) (6 diffs)
• analysis/tst-a1.py (modified) (3 diffs)
• testboxscript/win/fix_stale_refs.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/analysis/reporting.py

@@ -218 +218 @@
     Produce an HTML report on stdout (via print).
     """
-    print 'not implemented: %s' % (oTest);
+    print('not implemented: %s' % (oTest));
     return False;
 
@@ -225 +225 @@
     Produce a ReStructured text report on stdout (via print).
     """
-    print 'not implemented: %s' % (oTest);
+    print('not implemented: %s' % (oTest));
     return False;
 
@@ -276 +276 @@
                 if i > 0: sLine += '  ';
                 sLine += asLine[i].center(acchColumns[i]);
-            print sLine;
+            print(sLine);
 
         # Units.
@@ -283 +283 @@
             if i > 0: sLine += '  ';
             sLine += oTable.asUnits[i].center(acchColumns[i]);
-        print sLine;
+        print(sLine);
 
         # Separator line.
@@ -290 +290 @@
             if i > 0: sLine += '  '
             sLine += '=' * acchColumns[i];
-        print sLine;
+        print(sLine);
 
         # The rows.
@@ -297 +297 @@
             for i in range(1, len(asColumns)):
                 sText += '  ' + asColumns[i].rjust(acchColumns[i]);
-            print sText;
+            print(sText);
 
     return None;

trunk/src/VBox/ValidationKit/analysis/tst-a1.py

@@ -48 +48 @@
 def usage():
     """ Display usage """
-    print 'usage: %s [options] <testresults.xml> [baseline.xml]' % (sys.argv[0]);
-    print ''
-    print 'options:'
-    print '  --filter <test-sub-string>'
+    print('usage: %s [options] <testresults.xml> [baseline.xml]' % (sys.argv[0]));
+    print('')
+    print('options:')
+    print('  --filter <test-sub-string>')
     return 1;
 
@@ -68 +68 @@
             return usage();
         elif asArgs[iArg].startswith('--'):
-            print 'syntax error: unknown option "%s"' % (asArgs[iArg]);
+            print('syntax error: unknown option "%s"' % (asArgs[iArg]));
             return usage();
         elif sTestFile is None:
@@ -75 +75 @@
             sBaseFile = asArgs[iArg];
         else:
-            print 'syntax error: too many file names: %s' % (asArgs[iArg])
+            print('syntax error: too many file names: %s' % (asArgs[iArg]))
             return usage();
         iArg += 1;

trunk/src/VBox/ValidationKit/testboxscript/win/fix_stale_refs.py

@@ -76 +76 @@
             try:
                 value = QueryValueEx(hkey_product_properties, 'DisplayName')[0]
-            except WindowsError, exception:
-                if exception.winerror != 2:
+            except WindowsError as oXcpt:
+                if oXcpt.winerror != 2:
                     raise
                 value = '<unknown>'
@@ -83 +83 @@
             products[product_guid] = value
             product_index += 1
-    except WindowsError, exceptione:
-        if exceptione.winerror != 259:
-            print exceptione.strerror + '.', 'error', exceptione.winerror
+    except WindowsError as oXcpt:
+        if oXcpt.winerror != 259:
+            print(oXcpt.strerror + '.', 'error', oXcpt.winerror)
     CloseKey(hkey_products)
 
-    print 'Installed products:'
+    print('Installed products:')
     for product_key in sorted(products.keys()):
-        print transpose_guid(product_key), '=', products[product_key]
+        print(transpose_guid(product_key), '=', products[product_key])
 
-    print
+    print()
     return products
 
@@ -127 +127 @@
     missing_products = get_missing_products(hkey_components)
 
-    print 'Missing products refer the following components:'
+    print('Missing products refer the following components:')
     for product_guid in sorted(missing_products.keys()):
         if product_guid[1:] == '0'*31:
             continue
-        print 'Product', transpose_guid(product_guid) + ':'
+        print('Product', transpose_guid(product_guid) + ':')
         for component_guid, component_file in missing_products[product_guid]:
-            print ' ' + transpose_guid(component_guid), '=', component_file
+            print(' ' + transpose_guid(component_guid), '=', component_file)
 
-        print 'Remove all references to product', transpose_guid(product_guid) + '? [y/n]'
+        print('Remove all references to product', transpose_guid(product_guid) + '? [y/n]')
         if strtobool(raw_input().lower()):
             for component_guid, component_file in missing_products[product_guid]:
                 hkey_component = OpenKey(hkey_components, component_guid, 0, KEY_ALL_ACCESS)
-                print 'Removing reference in ' + transpose_guid(component_guid), '=', component_file
+                print('Removing reference in ' + transpose_guid(component_guid), '=', component_file)
                 DeleteValue(hkey_component, product_guid)
                 CloseKey(hkey_component)
         else:
-            print 'Cancelled removal of product', transpose_guid(product_guid)
+            print('Cancelled removal of product', transpose_guid(product_guid))
 
     CloseKey(hkey_components)