Changeset 94129 in vbox for trunk/src/VBox/ValidationKit/testmanager/batch/filearchiver.py

Timestamp:

Mar 8, 2022 2:57:25 PM (3 years ago)

Author:

vboxsync

Message:

testmanager: pylint 2.9.6 adjustments (mostly about using sub-optimal looping and 'with' statements).

File:

• trunk/src/VBox/ValidationKit/testmanager/batch/filearchiver.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testmanager/batch/filearchiver.py

@@ -123 +123 @@
 
                     utils.noxcptDeleteFile(sZipFileNm + '.tmp');
-                    oZipFile = zipfile.ZipFile(sZipFileNm + '.tmp', 'w', zipfile.ZIP_DEFLATED, allowZip64 = True);
-
-                    for sFile in asFiles:
-                        sSuff = os.path.splitext(sFile)[1];
-                        if sSuff in [ '.png', '.webm', '.gz', '.bz2', '.zip', '.mov', '.avi', '.mpg', '.gif', '.jpg' ]:
-                            ## @todo Consider storing these files outside the zip if they are a little largish.
-                            self.dprint('TestSet %d: Storing   %s...' % (idTestSet, sFile));
-                            oZipFile.write(sSrcFileBase + sFile, sFile, zipfile.ZIP_STORED);
-                        else:
-                            self.dprint('TestSet %d: Deflating %s...' % (idTestSet, sFile));
-                            oZipFile.write(sSrcFileBase + sFile, sFile, zipfile.ZIP_DEFLATED);
-
-                    oZipFile.close();
+                    with zipfile.ZipFile(sZipFileNm + '.tmp', 'w', zipfile.ZIP_DEFLATED, allowZip64 = True) as oZipFile:
+                        for sFile in asFiles:
+                            sSuff = os.path.splitext(sFile)[1];
+                            if sSuff in [ '.png', '.webm', '.gz', '.bz2', '.zip', '.mov', '.avi', '.mpg', '.gif', '.jpg' ]:
+                                ## @todo Consider storing these files outside the zip if they are a little largish.
+                                self.dprint('TestSet %d: Storing   %s...' % (idTestSet, sFile));
+                                oZipFile.write(sSrcFileBase + sFile, sFile, zipfile.ZIP_STORED);
+                            else:
+                                self.dprint('TestSet %d: Deflating %s...' % (idTestSet, sFile));
+                                oZipFile.write(sSrcFileBase + sFile, sFile, zipfile.ZIP_DEFLATED);
 
                     #
@@ -216 +213 @@
         #
         fRc = True;
-        for idTestSet in dTestSets:
+        for idTestSet, oTestSet in dTestSets.items():
             try:
-                if self._processTestSet(idTestSet, dTestSets[idTestSet], sCurDir) is not True:
+                if self._processTestSet(idTestSet, oTestSet, sCurDir) is not True:
                     fRc = False;
             except: