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

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.

Location:

trunk/src/VBox/ValidationKit/testboxscript

Files:

• testboxcommons.py (modified) (2 diffs)
• testboxscript_real.py (modified) (4 diffs)
• testboxtasks.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testboxscript/testboxcommons.py

@@ -48 +48 @@
     Custom exception class
     """
-    pass
+    pass;                               # pylint: disable=unnecessary-pass
 
 #
@@ -67 +67 @@
     Debug logging, will later be disabled by default.
     """
-    if True is True:
+    if True is True:                    # pylint: disable=comparison-with-itself
         if sTsPrf is None: sTsPrf = utils.getTimePrefix();
         print('[%s] %s' % (sTsPrf, sMessage,));

trunk/src/VBox/ValidationKit/testboxscript/testboxscript_real.py

@@ -67 +67 @@
 class TestBoxScriptException(Exception):
     """ For raising exceptions during TestBoxScript.__init__. """
-    pass;
+    pass;                               # pylint: disable=unnecessary-pass
 
 
@@ -401 +401 @@
         if sValue == 'false':
             return False;
-        if sValue != 'dunno' and sValue != 'none':
+        if sValue not in  ('dunno', 'none',):
             raise TestBoxException('Unexpected response "%s" to helper command "%s"' % (sValue, sCmd));
         return fDunnoValue;
@@ -453 +453 @@
                 oWebm = oWmi.ConnectServer('.', 'root\\cimv2');
                 for oItem in oWebm.ExecQuery('SELECT * FROM Win32_ComputerSystemProduct'):
-                    if oItem.UUID != None:
+                    if oItem.UUID is not None:
                         sUuid = str(uuid.UUID(oItem.UUID));
             except:
@@ -848 +848 @@
 
         # Refresh sign-on parameters, changes triggers sign-on.
-        fNeedSignOn = (True if not self._fSignedOn or self._fNeedReSignOn else False)
+        fNeedSignOn = not self._fSignedOn or self._fNeedReSignOn;
         for item in self._ddSignOnParams:
             if self._ddSignOnParams[item][self.FN] is None:

trunk/src/VBox/ValidationKit/testboxscript/testboxtasks.py

@@ -430 +430 @@
                                             cwd        = self._oTestBoxScript.getPathSpill(),
                                             universal_newlines = True,
-                                            close_fds  = (False if utils.getHostOs() == 'win' else True),
+                                            close_fds  = utils.getHostOs() != 'win',
                                             preexec_fn = (None if utils.getHostOs() in ['win', 'os2']
                                                           else os.setsid)); # pylint: disable=no-member
@@ -842 +842 @@
             # Figure the destination name (in scripts).
             sDstFile = webutils.getFilename(sArchive);
-            if   len(sDstFile) < 1 \
+            if   not sDstFile \
               or re.search('[^a-zA-Z0-9 !#$%&\'()@^_`{}~.-]', sDstFile) is not None: # FAT charset sans 128-255 + '.'.
                 self._log('Malformed script zip filename: %s' % (sArchive,));