Skip to content

Commit de8e12b

Browse files
author
Kazuki Suzuki Przyborowski
committed
Update pycatfile.py
1 parent 8b55716 commit de8e12b

1 file changed

Lines changed: 4 additions & 21 deletions

File tree

pycatfile.py

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8638,9 +8638,9 @@ def UnPackCatFile(infile, outdir=None, followlink=False, filestart=0, seekstart=
86388638
return True
86398639

86408640

8641-
def UnPackCatFileString(instr, outdir=None, followlink=False, seekstart=0, seekend=0, skipchecksum=False, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, returnfp=False):
8641+
def UnPackCatFileString(instr, outdir=None, followlink=False, filestart=0, seekstart=0, seekend=0, skipchecksum=False, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, returnfp=False):
86428642
fp = MkTempFile(instr)
8643-
listarrayfiles = UnPackCatFile(fp, outdir, followlink, seekstart, seekend, skipchecksum, formatspecs, seektoend, verbose, returnfp)
8643+
listarrayfiles = UnPackCatFile(fp, outdir, followlink, filestart, seekstart, seekend, skipchecksum, formatspecs, seektoend, verbose, returnfp)
86448644
return listarrayfiles
86458645

86468646
def ftype_to_str(ftype):
@@ -8762,26 +8762,9 @@ def MultipleStackedCatFileListFiles(infile, fmttype="auto", filestart=0, seeksta
87628762
return outretval
87638763

87648764

8765-
def CatFileStringToArray(instr, filestart=0, seekstart=0, seekend=0, listonly=False, contentasfile=True, skipchecksum=False, formatspecs=__file_format_multi_dict__, seektoend=False, returnfp=False):
8766-
checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
8767-
if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
8768-
formatspecs = formatspecs[checkcompressfile]
8765+
def CatFileStringListFiles(instr, filestart=0, seekstart=0, seekend=0, skipchecksum=False, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, newstyle=False, returnfp=False):
87698766
fp = MkTempFile(instr)
8770-
listarrayfiles = CatFileToArray(fp, "auto", filestart, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, seektoend, returnfp)
8771-
return listarrayfiles
8772-
8773-
8774-
def CatFileStringListFiles(instr, seekstart=0, seekend=0, skipchecksum=False, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, newstyle=False, returnfp=False):
8775-
fp = MkTempFile(instr)
8776-
listarrayfiles = CatFileListFiles(
8777-
instr, seekstart, seekend, skipchecksum, formatspecs, seektoend, verbose, newstyle, returnfp)
8778-
return listarrayfiles
8779-
8780-
8781-
def CatFileStringListFiles(instr, seekstart=0, seekend=0, skipchecksum=False, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, newstyle=False, returnfp=False):
8782-
fp = MkTempFile(instr)
8783-
listarrayfiles = CatFileListFiles(
8784-
instr, seekstart, seekend, skipchecksum, formatspecs, seektoend, verbose, newstyle, returnfp)
8767+
listarrayfiles = CatFileListFiles(instr, "auto", filestart, seekstart, seekend, skipchecksum, formatspecs, seektoend, verbose, newstyle, returnfp)
87858768
return listarrayfiles
87868769

87878770

0 commit comments

Comments
 (0)