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

Timestamp:

Mar 7, 2017 11:01:44 AM (8 years ago)

Author:

vboxsync

Message:

ValidationKit/common: pylint 2.0.0 fixes.

File:

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

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

@@ -187 +187 @@
                         continue;
                     sLine = sLine.strip()
-                    if len(sLine) > 0:
+                    if sLine:
                         sVersion += ' / ' + sPrefix + sLine;
                     break;
@@ -199 +199 @@
                 oFile.close();
                 sLast = sLast.strip();
-                if len(sLast) > 0:
+                if sLast:
                     sVersion += ' (' + sLast + ')';
             except:
@@ -430 +430 @@
 
     if asArgs[0].endswith('.py'):
-        if sys.executable is not None  and  len(sys.executable) > 0:
+        if sys.executable:
             asArgs.insert(0, sys.executable);
         else:
@@ -742 +742 @@
                 return False;
             sCurName = sCurName.strip();
-            if sCurName is '':
+            if not sCurName:
                 return False;
 
@@ -915 +915 @@
             sRet = self.sImage if self.sName is None else self.sName;
             if sRet is None:
-                if self.asArgs is None or len(self.asArgs) == 0:
+                if not self.asArgs:
                     return None;
                 sRet = self.asArgs[0];
-                if len(sRet) == 0:
+                if not sRet:
                     return None;
         return os.path.basename(sRet);
@@ -1286 +1286 @@
     if cSecs > 0:
         sRet += '%ss ' % (cSecs,);
-    assert len(sRet) > 0; assert sRet[-1] == ' ';
+    assert sRet; assert sRet[-1] == ' ';
     return sRet[:-1];
 
@@ -1294 +1294 @@
     data is usually already string form.
     """
-    if isinstance(oSeconds, int) or isinstance(oSeconds, long):
+    if isinstance(oSeconds, (int, long)):
         return formatIntervalSeconds(oSeconds);
     if not isString(oSeconds):
@@ -1315 +1315 @@
     # We might given non-strings, just return them without any fuss.
     if not isString(sString):
-        if isinstance(sString, int) or isinstance(sString, long) or  sString is None:
+        if isinstance(sString, (int, long)) or sString is None:
             return (sString, None);
         ## @todo time/date objects?
@@ -1322 +1322 @@
     # Strip it and make sure it's not empty.
     sString = sString.strip();
-    if len(sString) == 0:
+    if not sString:
         return (0, 'Empty interval string.');
 
@@ -1335 +1335 @@
     for sPart in asRawParts:
         sPart = sPart.strip();
-        if len(sPart) > 0:
+        if sPart:
             asParts.append(sPart);
-    if len(asParts) == 0:
+    if not asParts:
         return (0, 'Empty interval string or something?');
 
@@ -1373 +1373 @@
         else:
             asErrors.append('Bad number "%s".' % (sNumber,));
-    return (cSeconds, None if len(asErrors) == 0 else ' '.join(asErrors));
+    return (cSeconds, None if not asErrors else ' '.join(asErrors));
 
 def formatIntervalHours(cHours):
@@ -1393 +1393 @@
     if cHours > 0:
         sRet += '%sh ' % (cHours,);
-    assert len(sRet) > 0; assert sRet[-1] == ' ';
+    assert sRet; assert sRet[-1] == ' ';
     return sRet[:-1];
 
@@ -1405 +1405 @@
     # We might given non-strings, just return them without any fuss.
     if not isString(sString):
-        if isinstance(sString, int) or isinstance(sString, long) or  sString is None:
+        if isinstance(sString, (int, long)) or sString is None:
             return (sString, None);
         ## @todo time/date objects?
@@ -1412 +1412 @@
     # Strip it and make sure it's not empty.
     sString = sString.strip();
-    if len(sString) == 0:
+    if not sString:
         return (0, 'Empty interval string.');
 
@@ -1425 +1425 @@
     for sPart in asRawParts:
         sPart = sPart.strip();
-        if len(sPart) > 0:
+        if sPart:
             asParts.append(sPart);
-    if len(asParts) == 0:
+    if not asParts:
         return (0, 'Empty interval string or something?');
 
@@ -1459 +1459 @@
         else:
             asErrors.append('Bad number "%s".' % (sNumber,));
-    return (cHours, None if len(asErrors) == 0 else ' '.join(asErrors));
+    return (cHours, None if not asErrors else ' '.join(asErrors));
 
 
@@ -1519 +1519 @@
                 asRet.append('internal-error: Hit exception #2! %s' % (traceback.format_exc(),));
 
-            if len(asRet) == 0:
+            if not asRet:
                 asRet.append('No exception info...');
         except:
@@ -1575 +1575 @@
     """
     asArgs = argsSplit(sCmdLine);
-    if asArgs is None  or  len(asArgs) == 0:
+    if not asArgs:
         return None;
 
@@ -1789 +1789 @@
                         try:    os.unlink(sLinkFile);
                         except: pass;
-                        if sParentDir is not ''  and  not os.path.exists(sParentDir):
+                        if sParentDir and not os.path.exists(sParentDir):
                             os.makedirs(sParentDir);
                         try:    os.link(sLinkTarget, sLinkFile);