Merging upstream version 7.0.16-dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 8 insertions, 8 deletions

diff --git a/src/VBox/ValidationKit/common/pathutils.py b/src/VBox/ValidationKit/common/pathutils.py
index 6787f1aa..6787f1aa 100644..100755
--- a/src/VBox/ValidationKit/common/pathutils.py
+++ b/src/VBox/ValidationKit/common/pathutils.py
diff --git a/src/VBox/ValidationKit/common/utils.py b/src/VBox/ValidationKit/common/utils.py
index e8a50604..d392c9ee 100755
--- a/src/VBox/ValidationKit/common/utils.py
+++ b/src/VBox/ValidationKit/common/utils.py
@@ -39,7 +39,7 @@ terms and conditions of either the GPL or the CDDL or both.
 
 SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
 """
-__version__ = "$Revision: 155244 $"
+__version__ = "$Revision: 162363 $"
 
 
 # Standard Python imports.
@@ -301,7 +301,7 @@ def getHostOsVersion():
         sVersion += ' / OS X ' + sOsxVersion + ' (' + getMacVersionName(sOsxVersion) + ')'
 
     elif sOs == 'win':
-        class OSVersionInfoEx(ctypes.Structure):
+        class OSVersionInfoEx(ctypes.Structure): # pylint: disable=used-before-assignment
             """ OSVERSIONEX """
             kaFields = [
                     ('dwOSVersionInfoSize', ctypes.c_ulong),
@@ -424,7 +424,7 @@ def openNoDenyDeleteNoInherit(sFile, sMode = 'r'):
         # Need to use CreateFile directly to open the file so we can feed it FILE_SHARE_DELETE.
         # pylint: disable=no-member,c-extension-no-member
         fAccess = 0;
-        fDisposition = win32file.OPEN_EXISTING;
+        fDisposition = win32file.OPEN_EXISTING; # pylint: disable=used-before-assignment
         if 'r' in sMode or '+' in sMode:
             fAccess |= win32file.GENERIC_READ;
         if 'a' in sMode:
@@ -458,7 +458,7 @@ def openNoDenyDeleteNoInherit(sFile, sMode = 'r'):
             fOpen |= os.O_APPEND;
         if 'b' in sMode or 't' in sMode:
             fOpen |= os.O_TEXT;                                         # pylint: disable=no-member
-        fdFile = msvcrt.open_osfhandle(hDetachedFile, fOpen);
+        fdFile = msvcrt.open_osfhandle(hDetachedFile, fOpen);           # pylint: disable=used-before-assignment
 
         # Tell python to use this handle.
         oFile = os.fdopen(fdFile, sMode);
@@ -1016,8 +1016,8 @@ def processExists(uPid):
         try:
             hProcess = win32api.OpenProcess(win32con.SYNCHRONIZE,           # pylint: disable=no-member,c-extension-no-member
                                             False, uPid);
-        except pywintypes.error as oXcpt:                                   # pylint: disable=no-member
-            if oXcpt.winerror == winerror.ERROR_ACCESS_DENIED:
+        except pywintypes.error as oXcpt:                                   # pylint: disable=no-member,used-before-assignment
+            if oXcpt.winerror == winerror.ERROR_ACCESS_DENIED:              # pylint: disable=used-before-assignment
                 fRc = True;
         except:
             pass;
diff --git a/src/VBox/ValidationKit/testboxscript/testboxscript_real.py b/src/VBox/ValidationKit/testboxscript/testboxscript_real.py
index 7a2581ae..af7df36e 100755
--- a/src/VBox/ValidationKit/testboxscript/testboxscript_real.py
+++ b/src/VBox/ValidationKit/testboxscript/testboxscript_real.py
@@ -37,7 +37,7 @@ terms and conditions of either the GPL or the CDDL or both.
 
 SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
 """
-__version__ = "$Revision: 155244 $"
+__version__ = "$Revision: 162363 $"
 
 
 # Standard python imports.
@@ -714,7 +714,7 @@ class TestBoxScript(object):
             sFullName = os.path.join(self._oOptions.sScratchRoot, sName);
             try:
                 if os.path.isdir(sFullName):
-                    shutil.rmtree(sFullName, False, oRc.onErrorCallback);
+                    shutil.rmtree(sFullName, False, oRc.onErrorCallback); # pylint: disable=deprecated-argument
                 else:
                     os.remove(sFullName);
                 if os.path.exists(sFullName):
diff --git a/src/VBox/ValidationKit/testmanager/config.py b/src/VBox/ValidationKit/testmanager/config.py
index b4ef94cc..b4ef94cc 100644..100755
--- a/src/VBox/ValidationKit/testmanager/config.py
+++ b/src/VBox/ValidationKit/testmanager/config.py
diff --git a/src/VBox/ValidationKit/testmanager/core/schedqueue.py b/src/VBox/ValidationKit/testmanager/core/schedqueue.py
index f49c4ad3..f49c4ad3 100755..100644
--- a/src/VBox/ValidationKit/testmanager/core/schedqueue.py
+++ b/src/VBox/ValidationKit/testmanager/core/schedqueue.py
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuivcshistory.py b/src/VBox/ValidationKit/testmanager/webui/wuivcshistory.py
index 1df9bbb2..1df9bbb2 100755..100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuivcshistory.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuivcshistory.py
diff --git a/src/VBox/ValidationKit/tests/serial/loopback.py b/src/VBox/ValidationKit/tests/serial/loopback.py
index b5ad831a..b5ad831a 100755..100644
--- a/src/VBox/ValidationKit/tests/serial/loopback.py
+++ b/src/VBox/ValidationKit/tests/serial/loopback.py