Changeset 61828 in vbox

Timestamp:

Jun 22, 2016 6:50:19 PM (9 years ago)

Author:

vboxsync

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

108235

Message:

vbox.py,Config.kmk: linted for pylint v1.5.5

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/ValidationKit/testdriver/vbox.py (modified) (5 diffs)

trunk/Config.kmk

@@ -1827 +1827 @@
 #         * False positives due to __copyright__, __version__, probably.
 #   E0012:bad-option-value - Bad option value XXXXX.
-#         * Newere pylint doesn't grok older warning disables in sources (e.g. W0142 in db.py). Wonderful!
+#         * Newer pylint doesn't grok older warning disables in sources (e.g. W0142 in db.py). Wonderful!
+#   I0012:locally-enabled - Locally enabling XXXXX.
+#         * We temporarily disable stuff and then renabled it. Very tedious.
 #
 # Note! Yes, --max-branchs is a typo, but not by me.
@@ -1886 +1888 @@
        $(if-expr $(VBOX_PYLINT_VERSION) >= 10201,--disable=C0330 --disable=W0123,) \
        $(if-expr $(VBOX_PYLINT_VERSION) >= 10201 && $(VBOX_PYLIN_VERSION) < 10500,--disable=bad-option-value,) \
-       $(if-expr $(VBOX_PYLINT_VERSION) >= 10500,--disable=C0413 --disable=E0012,) \
+       $(if-expr $(VBOX_PYLINT_VERSION) >= 10500,--disable=C0413 --disable=E0012 --disable=locally-enabled,) \
         --disable=W0301,W0511,W0603,W0702,W0703,C0321,R0201,I0011 \
         --ignored-classes=testdriver.vboxcon \

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

@@ -226 +226 @@
                 oAttr = getattr(oNativeComErrorClass, sAttr);
                 setattr(ComError, sAttr, oAttr);
-                if type(oAttr) is int:
+                if isinstance(oAttr, int):
                     ComError.dDecimalToConst[oAttr] = sAttr;
 
@@ -652 +652 @@
         reporter.log2('onShowWindow/%s' % (self.sName));
         return None;
-
     # pylint: enable=C0111,R0913,W0613
 
@@ -838 +837 @@
             return True;
 
-        # Try dev build first since that's where I'll be using it first..
-        if True:
+        # Try dev build first since that's where I'll be using it first...
+        if True is True:
             try:
                 self.oBuild = Build(self, None);
@@ -910 +909 @@
         #
         sCandidate = None;
-        for i in range(len(asCandidates)):
+        for i, _ in enumerate(asCandidates):
             sCandidate = asCandidates[i];
             if os.path.isfile(os.path.join(sCandidate, 'VBoxValidationKit.iso')):
@@ -1554 +1553 @@
                 raise base.InvalidOption('The "--vrdp-base-port" takes an argument');
             try:    self.uVrdpBasePort = int(asArgs[iArg]);
-            except: raise base.InvalidOption('The "--vrdp-base-port" value "%s" is not a valid integer', asArgs[iArg]);
+            except: raise base.InvalidOption('The "--vrdp-base-port" value "%s" is not a valid integer' % (asArgs[iArg],));
             if self.uVrdpBasePort <= 0 or self.uVrdpBasePort >= 65530:
-                raise base.InvalidOption('The "--vrdp-base-port" value "%s" is not in the valid range (1..65530)', asArgs[iArg]);
+                raise base.InvalidOption('The "--vrdp-base-port" value "%s" is not in the valid range (1..65530)'
+                                         % (asArgs[iArg],));
         elif asArgs[iArg] == '--vbox-default-bridged-nic':
             iArg += 1;