Changeset 97673 in vbox for trunk/src/VBox/ValidationKit/common

Timestamp:

Nov 24, 2022 11:46:15 AM (2 years ago)

Author:

vboxsync

Message:

Validation Kit: Fixed lots of warnings, based on pylint 2.12.2.

Location:

trunk/src/VBox/ValidationKit/common

Files:

• utils.py (modified) (10 diffs)
• webutils.py (modified) (1 diff)

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

@@ -224 +224 @@
         try:
             # try /etc/lsb-release first to distinguish between Debian and Ubuntu
-            with open('/etc/lsb-release') as oFile:
+            with open('/etc/lsb-release') as oFile: # pylint: disable=unspecified-encoding
                 for sLine in oFile:
                     oMatch = re.search(r'(?:DISTRIB_DESCRIPTION\s*=)\s*"*(.*)"', sLine);
@@ -245 +245 @@
                 if os.path.isfile(sFile):
                     try:
-                        with open(sFile) as oFile:
+                        with open(sFile) as oFile: # pylint: disable=unspecified-encoding
                             sLine = oFile.readline();
                     except:
@@ -258 +258 @@
         if os.path.isfile('/etc/release'):
             try:
-                with open('/etc/release') as oFile:
+                with open('/etc/release') as oFile: # pylint: disable=unspecified-encoding
                     sLast = oFile.readlines()[-1];
                 sLast = sLast.strip();
@@ -387 +387 @@
     uPythonVer = (sys.version_info[0] << 16) | (sys.version_info[1] & 0xffff);
     if uPythonVer >= ((3 << 16) | 4):
-        oFile = open(sFile, sMode);                             # pylint: disable=consider-using-with
+        oFile = open(sFile, sMode);                             # pylint: disable=consider-using-with,unspecified-encoding
     else:
         try:
@@ -397 +397 @@
                     offComma = sMode.find(',');
                     if offComma < 0:
-                        return open(sFile, sMode + 'N');        # pylint: disable=consider-using-with
-                    return open(sFile,                          # pylint: disable=consider-using-with,bad-open-mode
+                        return open(sFile, sMode + 'N');        # pylint: disable=consider-using-with,unspecified-encoding
+                    return open(sFile,                          # pylint: disable=consider-using-with,unspecified-encoding,bad-open-mode
                                 sMode[:offComma] + 'N' + sMode[offComma:]);
 
             # Just in case.
-            return open(sFile, sMode);                          # pylint: disable=consider-using-with
-
-        oFile = open(sFile, sMode);                             # pylint: disable=consider-using-with
+            return open(sFile, sMode);                          # pylint: disable=consider-using-with,unspecified-encoding
+
+        oFile = open(sFile, sMode);                             # pylint: disable=consider-using-with,unspecified-encoding
         #try:
         fcntl(oFile, F_SETFD, fcntl(oFile, F_GETFD) | FD_CLOEXEC);
@@ -464 +464 @@
         oFile = os.fdopen(fdFile, sMode);
     else:
-        oFile = open(sFile, sMode);                                     # pylint: disable=consider-using-with
+        oFile = open(sFile, sMode);                                     # pylint: disable=consider-using-with,unspecified-encoding
 
         # Python 3.4 and later automatically creates non-inherit handles. See PEP-0446.
@@ -493 +493 @@
     Reads the entire file.
     """
-    with open(sFile, sMode) as oFile:
+    with open(sFile, sMode) as oFile: # pylint: disable=unspecified-encoding
         sRet = oFile.read();
     return sRet;
@@ -1020 +1020 @@
             if oXcpt.winerror == winerror.ERROR_ACCESS_DENIED:
                 fRc = True;
-        except Exception as oXcpt:
+        except:
             pass;
         else:
@@ -1381 +1381 @@
                 sFull = os.path.join(sDir, sEntry);
                 try:
-                    with open(sFull, 'r') as oFile:
+                    with open(sFull, 'r') as oFile: # pylint: disable=unspecified-encoding
                         sFirstLine = oFile.readline();
                 except:
@@ -2487 +2487 @@
 
     uCrc32 = 0;
-    with open(sFile, 'rb') as oFile:
+    with open(sFile, 'rb') as oFile: # pylint: disable=unspecified-encoding
         while True:
             oBuf = oFile.read(1024 * 1024);

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

@@ -173 +173 @@
                 oOpener = urllib_build_opener();
             else:
-                oOpener = urllib_build_opener(urllib_ProxyHandler(proxies = dict()));
+                oOpener = urllib_build_opener(urllib_ProxyHandler(proxies = {} ));
             oSrc = oOpener.open(sUrlFile);
             oDst = utils.openNoInherit(sDstFile, 'wb');