Changeset 98648 in vbox for trunk/src/VBox/ValidationKit/common

Timestamp:

Feb 20, 2023 12:55:13 PM (22 months ago)

Author:

vboxsync

Message:

ValKit/utils.py,tdUnitTest1.py: Added iteritems() wrapper to utils and use it to iterate keys+values of dictionaries.

File:

• trunk/src/VBox/ValidationKit/common/utils.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/common/utils.py

@@ -74 +74 @@
     xrange = range; # pylint: disable=redefined-builtin,invalid-name
     long = int;     # pylint: disable=redefined-builtin,invalid-name
+
+
+#
+# Python 2/3 glue.
+#
+
+if sys.version_info[0] >= 3:
+    def iteritems(dDict):
+        """
+        Wrapper around dict.items() / dict.iteritems().
+        """
+        return iter(dDict.items());
+else:
+    def iteritems(dDict):
+        """
+        Wrapper around dict.items() / dict.iteritems().
+        """
+        return dDict.iteritems();
 
 
@@ -2267 +2285 @@
     # 20%+ speedup for python 2.7 and 15%+ speedup for python 3.5, both on windows skipping PDBs.
     #
-    if True is True: # pylint: disable=comparison-with-itself
+    if True is True: # pylint: disable=comparison-with-itself,comparison-of-constants
         __installShUtilHacks(shutil);
         global g_fTarCopyFileObjOverriddend;