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

Timestamp:

Jan 21, 2018 4:18:58 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit: Python 3 and pylint 1.8.1 adjustments/fixes.

Location:

trunk/src/VBox/ValidationKit/testboxscript

Files:

• testboxcommand.py (modified) (1 diff)
• testboxconnection.py (modified) (1 diff)
• testboxscript_real.py (modified) (1 diff)

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

@@ -244 +244 @@
             self.doReboot();
         sys.exit(TBS_EXITCODE_NEED_UPGRADE);
+        return False;                   # shuts up pylint (it will probably complain later when it learns DECL_NO_RETURN).
 
     def _cmdUpgrade(self, oResponse, oConnection):

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

@@ -37 +37 @@
     from urllib.parse import urlencode as urllib_urlencode; # pylint: disable=import-error,no-name-in-module
 else:
-    import httplib;                                         # pylint: disable=import-error
-    import urlparse;                                        # pylint: disable=import-error
-    from urllib import urlencode as urllib_urlencode;       # pylint: disable=import-error
+    import httplib;                                         # pylint: disable=import-error,no-name-in-module
+    import urlparse;                                        # pylint: disable=import-error,no-name-in-module
+    from urllib import urlencode as urllib_urlencode;       # pylint: disable=import-error,no-name-in-module
 
 # Validation Kit imports.

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

@@ -35 +35 @@
 import multiprocessing
 import os
-from optparse import OptionParser
+from optparse import OptionParser       # pylint: disable=deprecated-module
 import platform
 import random