@@ -7917,29 +7917,29 @@ def PackNeoFileFromInFile(infile, outfile, fmttype="auto", compression="auto", c
79177917def NeoFileArrayValidate (infile , verbose = False ):
79187918 # ---------- Input handling ----------
79197919 if isinstance (infile , dict ):
7920- listarrayfiles = [infile ]
7920+ listarrayfileslist = [infile ]
79217921 elif isinstance (infile , list ):
7922- listarrayfiles = infile
7922+ listarrayfileslist = infile
79237923 else :
79247924 if (infile != "-" and not isinstance (infile , (bytes , bytearray , memoryview )) # bytes is str on Py2
79257925 and not hasattr (infile , "read" ) and not hasattr (infile , "write" )):
79267926 infile = RemoveWindowsPath (infile )
7927- listarrayfiles = ArchiveFileToArray (
7927+ listarrayfileslist = ArchiveFileToArray (
79287928 infile , fmttype , filestart , 0 , 0 ,
79297929 False , True , False , True , formatspecs , saltkey , seektoend , returnfp
79307930 )
7931- if not isinstance (listarrayfiles , dict ):
7932- if verbose : logging .warning ("listarrayfiles must be a dict, got %r" , type (listarrayfiles ))
7933- return False
7934- for key in ("ffilelist" , "fnumfiles" ):
7935- if key not in listarrayfiles :
7936- if verbose : logging .warning ("Missing top-level key: %s" , key )
7937- return False
7938- if not isinstance (listarrayfiles ["ffilelist" ], list ):
7939- if verbose : logging .warning ("ffilelist must be a list, got %r" , type (listarrayfiles ["ffilelist" ]))
7940- return False
79417931
79427932 for listarrayfiles in listarrayfileslist :
7933+ if not isinstance (listarrayfiles , dict ):
7934+ if verbose : logging .warning ("listarrayfiles must be a dict, got %r" , type (listarrayfiles ))
7935+ return False
7936+ for key in ("ffilelist" , "fnumfiles" ):
7937+ if key not in listarrayfiles :
7938+ if verbose : logging .warning ("Missing top-level key: %s" , key )
7939+ return False
7940+ if not isinstance (listarrayfiles ["ffilelist" ], list ):
7941+ if verbose : logging .warning ("ffilelist must be a list, got %r" , type (listarrayfiles ["ffilelist" ]))
7942+ return False
79437943 # Per-entry required keys
79447944 required = [
79457945 "fname" , "fencoding" , "fheadersize" , "fsize" , "flinkname" ,
0 commit comments