@@ -7923,29 +7923,29 @@ def PackCatFileFromInFile(infile, outfile, fmttype="auto", compression="auto", c
79237923def CatFileArrayValidate (infile , verbose = False ):
79247924 # ---------- Input handling ----------
79257925 if isinstance (infile , dict ):
7926- listarrayfiles = [infile ]
7926+ listarrayfileslist = [infile ]
79277927 elif isinstance (infile , list ):
7928- listarrayfiles = infile
7928+ listarrayfileslist = infile
79297929 else :
79307930 if (infile != "-" and not isinstance (infile , (bytes , bytearray , memoryview )) # bytes is str on Py2
79317931 and not hasattr (infile , "read" ) and not hasattr (infile , "write" )):
79327932 infile = RemoveWindowsPath (infile )
7933- listarrayfiles = ArchiveFileToArray (
7933+ listarrayfileslist = ArchiveFileToArray (
79347934 infile , fmttype , filestart , 0 , 0 ,
79357935 False , True , False , True , formatspecs , saltkey , seektoend , returnfp
79367936 )
7937- if not isinstance (listarrayfiles , dict ):
7938- if verbose : logging .warning ("listarrayfiles must be a dict, got %r" , type (listarrayfiles ))
7939- return False
7940- for key in ("ffilelist" , "fnumfiles" ):
7941- if key not in listarrayfiles :
7942- if verbose : logging .warning ("Missing top-level key: %s" , key )
7943- return False
7944- if not isinstance (listarrayfiles ["ffilelist" ], list ):
7945- if verbose : logging .warning ("ffilelist must be a list, got %r" , type (listarrayfiles ["ffilelist" ]))
7946- return False
79477937
79487938 for listarrayfiles in listarrayfileslist :
7939+ if not isinstance (listarrayfiles , dict ):
7940+ if verbose : logging .warning ("listarrayfiles must be a dict, got %r" , type (listarrayfiles ))
7941+ return False
7942+ for key in ("ffilelist" , "fnumfiles" ):
7943+ if key not in listarrayfiles :
7944+ if verbose : logging .warning ("Missing top-level key: %s" , key )
7945+ return False
7946+ if not isinstance (listarrayfiles ["ffilelist" ], list ):
7947+ if verbose : logging .warning ("ffilelist must be a list, got %r" , type (listarrayfiles ["ffilelist" ]))
7948+ return False
79497949 # Per-entry required keys
79507950 required = [
79517951 "fname" , "fencoding" , "fheadersize" , "fsize" , "flinkname" ,
0 commit comments