Changeset 79092 in vbox for trunk/src/VBox/ValidationKit/analysis

Timestamp:

Jun 11, 2019 3:26:40 PM (6 years ago)

Author:

vboxsync

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

131252

Message:

ValKit,++: Pylint 2.3.1 adjustments.

File:

• trunk/src/VBox/ValidationKit/analysis/reader.py (modified) (9 diffs)

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

@@ -31 +31 @@
 """
 __version__ = "$Revision$"
-__all__     = ['ParseTestResult', ]
+__all__     = [ 'parseTestResult', ]
 
 # Standard python imports.
@@ -59 +59 @@
 
     def printValue(self, cIndent):
-        print '%sValue: name=%s timestamp=%s unit=%s value="%s"' \
-                % (''.ljust(cIndent*2), self.sName, self.sTimestamp, self.sUnit, self.sValue);
+        print('%sValue: name=%s timestamp=%s unit=%s value="%s"'
+              % (''.ljust(cIndent*2), self.sName, self.sTimestamp, self.sUnit, self.sValue));
 
 
@@ -130 +130 @@
 
     def printTree(self, iLevel = 0):
-        print '%sTest: name=%s start=%s end=%s' % (''.ljust(iLevel*2), self.sName, self.sStartTS, self.sEndTS);
+        print('%sTest: name=%s start=%s end=%s' % (''.ljust(iLevel*2), self.sName, self.sStartTS, self.sEndTS));
         for oChild in self.aoChildren:
             oChild.printTree(iLevel + 1);
@@ -175 +175 @@
 
         # If we have children, they must've matched up.
-        if len(self.aoChildren) != 0:
+        if self.aoChildren:
             return True;
         return self.matchFilters(asFilters);
 
     def filterTests(self, asFilters):
-        if len(asFilters) > 0:
+        if asFilters:
             self.filterTestsWorker(asFilters)
         return self;
@@ -220 +220 @@
     def handleElementStart(self, sName, hsAttrs):
         #print '%s%s: %s' % (''.ljust(self.iLevel * 2), sName, str(hsAttrs));
-        if sName == 'Test' or sName == 'SubTest':
+        if sName in ('Test', 'SubTest',):
             self.iLevel += 1;
             self.oTest = self.oTest.addChild(Test(self.oTest, hsAttrs));
@@ -236 +236 @@
             self.handleInclude(hsAttrs);
         else:
-            print 'Unknonwn element "%s"' % (sName);
+            print('Unknonwn element "%s"' % (sName,));
 
     def handleElementData(self, sData):
@@ -242 +242 @@
             self.oValue.addData(sData);
         elif sData.strip() != '':
-            print 'Unexpected data "%s"' % (sData);
+            print('Unexpected data "%s"' % (sData,));
         return True;
 
     def handleElementEnd(self, sName):
-        if sName == 'Test' or sName == 'Subtest':
+        if sName in ('Test', 'Subtest',):
             self.iLevel -= 1;
             self.oTest = self.oTest.oParent;
@@ -262 +262 @@
         oSub = parseTestResult(sXmlFile);
         if oSub is None:
-            print 'error: failed to parse include "%s"' % (sXmlFile);
+            print('error: failed to parse include "%s"' % (sXmlFile,));
         else:
             # Skip the root and the next level before merging it the subtest and
@@ -272 +272 @@
             # test or values.
             oSub2 = oSub;
-            while len(oSub2.aoChildren) == 1 and len(oSub2.aoValues) == 0:
+            while len(oSub2.aoChildren) == 1 and not oSub2.aoValues:
                 oSub2 = oSub2.aoChildren[0];
-            if len(oSub2.aoValues) == 0:
+            if not oSub2.aoValues:
                 oSub2 = oSub;
             self.oTest.mergeInIncludedTest(oSub2);