Skip to content

Commit cfd2dee

Browse files
committed
Small update
1 parent 4e61054 commit cfd2dee

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

pyneofile/pyfile.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ def _wrap(stream):
9090
sys.stderr = _wrap(sys.stderr)
9191

9292
hashlib_guaranteed = False
93+
try:
94+
_ALGORITHMS_AVAILABLE = set(hashlib.algorithms_available)
95+
except AttributeError:
96+
_ALGORITHMS_AVAILABLE = set(getattr(hashlib, "algorithms", []))
9397
# Environment setup
9498
os.environ["PYTHONIOENCODING"] = "UTF-8"
9599

@@ -5961,6 +5965,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
59615965
fcurfid = format(int(curfid), 'x').lower()
59625966
fcurinode = format(int(curfid), 'x').lower()
59635967
curfid = curfid + 1
5968+
flinkcount = format(int(flinkcount), 'x').lower()
59645969
fdev = format(int(0), 'x').lower()
59655970
frdev = format(int(0), 'x').lower()
59665971
if(ftype == 5):
@@ -5994,6 +5999,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
59945999
elif(zipinfo.create_system == 3):
59956000
fwinattributes = format(int(zipinfo.external_attr & 0xFFFF), 'x').lower()
59966001
fmode = format(int((zipinfo.external_attr >> 16) & 0xFFFF), 'x').lower()
6002+
mode = int(zipinfo.external_attr >> 16)
59976003
prefmode = int((zipinfo.external_attr >> 16) & 0xFFFF)
59986004
if(prefmode==0):
59996005
fmode = 0
@@ -6223,6 +6229,7 @@ def AppendFilesWithContentFromRarFileToList(infile, extradata=[], jsondata={}, c
62236229
fcurfid = format(int(curfid), 'x').lower()
62246230
fcurinode = format(int(curfid), 'x').lower()
62256231
curfid = curfid + 1
6232+
flinkcount = format(int(flinkcount), 'x').lower()
62266233
fdev = format(int(0), 'x').lower()
62276234
frdev = format(int(0), 'x').lower()
62286235
if(ftype == 5):
@@ -6481,6 +6488,7 @@ def AppendFilesWithContentFromSevenZipFileToList(infile, extradata=[], jsondata=
64816488
fcurfid = format(int(curfid), 'x').lower()
64826489
fcurinode = format(int(curfid), 'x').lower()
64836490
curfid = curfid + 1
6491+
flinkcount = format(int(flinkcount), 'x').lower()
64846492
fdev = format(int(0), 'x').lower()
64856493
frdev = format(int(0), 'x').lower()
64866494
if(ftype == 5):
@@ -9080,6 +9088,7 @@ def ZipFileListFiles(infile, verbose=False, returnfp=False):
90809088
elif(zipinfo.create_system == 3):
90819089
fwinattributes = int(zipinfo.external_attr & 0xFFFF)
90829090
fmode = int((zipinfo.external_attr >> 16) & 0xFFFF)
9091+
mode = int(zipinfo.external_attr >> 16)
90839092
prefmode = int((zipinfo.external_attr >> 16) & 0xFFFF)
90849093
if(prefmode==0):
90859094
fmode = 0

0 commit comments

Comments
 (0)