Changeset 65980 in vbox for trunk/src/VBox/ValidationKit/testmanager/core/base.py

Timestamp:

Mar 7, 2017 1:00:36 PM (8 years ago)

Author:

vboxsync

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

113806

Message:

testmanager/core: pylint 2.0.0 fixes.

File:

• trunk/src/VBox/ValidationKit/testmanager/core/base.py (modified) (9 diffs)

trunk/src/VBox/ValidationKit/testmanager/core/base.py

@@ -233 +233 @@
         # Perform deep conversion on ModelDataBase object and lists of them.
         #
-        elif isinstance(oValue, list) and len(oValue) > 0 and isinstance(oValue[0], ModelDataBase):
+        elif isinstance(oValue, list) and oValue and isinstance(oValue[0], ModelDataBase):
             oValue = copy.copy(oValue);
             for i, _ in enumerate(oValue):
@@ -269 +269 @@
         # Perform deep conversion on ModelDataBase object and lists of them.
         #
-        elif isinstance(oValue, list) and len(oValue) > 0 and isinstance(oValue[0], ModelDataBase):
+        elif isinstance(oValue, list) and oValue and isinstance(oValue[0], ModelDataBase):
             oValue = copy.copy(oValue);
             for i, _ in enumerate(oValue):
@@ -316 +316 @@
                                                     lMax = getattr(self, 'klMax_' + sAttr, None));
         elif sPrefix == 'f':
-            if oValue is '' and not fAllowNull: oValue = '0'; # HACK ALERT! Checkboxes are only added when checked.
+            if not oValue and not fAllowNull: oValue = '0'; # HACK ALERT! Checkboxes are only added when checked.
             (oNewValue, sError) = self.validateBool(oValue, aoNilValues = aoNilValues, fAllowNull = fAllowNull);
         elif sPrefix == 'ts':
@@ -743 +743 @@
     def validateListOfSomething(asValues, aoNilValues = tuple([[], None]), fAllowNull = True):
         """ Validate a list of some uniform values. Returns a copy of the list (if list it is). """
-        if asValues in aoNilValues  or  (len(asValues) == 0 and not fAllowNull):
+        if asValues in aoNilValues  or  (not asValues and not fAllowNull):
             return (asValues, None if fAllowNull else 'Mandatory.')
 
@@ -750 +750 @@
 
         asValues = list(asValues); # copy the list.
-        if len(asValues) > 0:
+        if asValues:
             oType = type(asValues[0]);
             for i in range(1, len(asValues)):
@@ -764 +764 @@
         (asValues, sError) = ModelDataBase.validateListOfSomething(asValues, aoNilValues, fAllowNull);
 
-        if sError is None  and asValues not in aoNilValues  and  len(asValues) > 0:
+        if sError is None  and  asValues not in aoNilValues  and  asValues:
             if not utils.isString(asValues[0]):
                 return (asValues, 'Invalid item data type.');
@@ -793 +793 @@
         (asValues, sError) = ModelDataBase.validateListOfSomething(asValues, aoNilValues, fAllowNull);
 
-        if sError is None  and asValues not in aoNilValues  and  len(asValues) > 0:
+        if sError is None  and  asValues not in aoNilValues  and  asValues:
             for i, _ in enumerate(asValues):
                 sValue = asValues[i];
@@ -1089 +1089 @@
 
     def testNullConversion(self):
-        if len(self.aoSamples[0].getDataAttributes()) == 0:
+        if not self.aoSamples[0].getDataAttributes():
             return;
         for oSample in self.aoSamples:
@@ -1261 +1261 @@
         else:
             assert False;
-        if len(oCriterion.aoSelected) > 0:
+        if oCriterion.aoSelected:
             oCriterion.sState = FilterCriterion.ksState_Selected;
         else: