Changeset 65967 in vbox for trunk/src/VBox/ValidationKit/testdriver/btresolver.py

Timestamp:

Mar 7, 2017 10:54:16 AM (8 years ago)

Author:

vboxsync

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

113793

Message:

ValidationKit/testdriver: pylint 2.0.0 fixes.

File:

• trunk/src/VBox/ValidationKit/testdriver/btresolver.py (modified) (6 diffs)

trunk/src/VBox/ValidationKit/testdriver/btresolver.py

@@ -99 +99 @@
                 asMembers = utils.unpackFile(sDbgArchive, self.sScratchPath, self.fnLog,
                                              self.fnLog);
-                if asMembers is not None and len(asMembers) > 0:
+                if asMembers:
                     # Populate the list of debug files.
                     for sMember in asMembers:
@@ -155 +155 @@
         for sLine in asReport[iLine:]:
             asCandidate = sLine.split();
-            if     len(asCandidate) is 5 \
+            if     len(asCandidate) == 5 \
                and asCandidate[0].startswith('0x') \
                and asCandidate[1].startswith('0x') \
@@ -300 +300 @@
             while iLine < len(asReport):
                 asMatches = oRegExpPath.findall(asReport[iLine]);
-                if len(asMatches) > 0:
+                if asMatches:
                     # Line contains the path, extract start address and path to binary
                     sAddr = oRegExpAddr.findall(asReport[iLine]);
                     sPath = oRegExpBinPath.findall(asReport[iLine]);
 
-                    if len(sAddr) > 0 and len(sPath) > 0:
+                    if sAddr and sPath:
                         # Construct the path in into the build cache containing the debug symbols
                         oRegExp = re.compile(r'\w+\.{0,1}\w*$');
@@ -338 +338 @@
             # and the first one is a number.
             if     len(asStackTrace) == 6 and asStackTrace[0].isdigit() \
-               and (asStackTrace[1].find('VBox') is not -1 or asStackTrace[1].find('VirtualBox') is not -1) \
+               and (asStackTrace[1].find('VBox') != -1 or asStackTrace[1].find('VirtualBox') != -1) \
                and asStackTrace[3].startswith('0x'):
 
@@ -404 +404 @@
                 asMembers = utils.unpackFile(sDbgArchive, self.sScratchPath, self.fnLog,
                                              self.fnLog);
-                if asMembers is not None and len(asMembers) > 0:
+                if asMembers:
                     # Populate the list of debug files.
                     for sMember in asMembers:
@@ -589 +589 @@
             asListBinaries = self.oResolverOs.getBinaryListWithLoadAddrFromReport(sReport.split('\n'));
 
-            if len(asListBinaries) > 0:
+            if asListBinaries:
                 asArgs = [self.sRTLdrFltPath, ];