Skip to content

Commit 651fa43

Browse files
authored
Add files via upload
1 parent 83442d1 commit 651fa43

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

pyarchivefile.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ def _get(section_dict, key, default=None):
650650
__version_date__ = str(__version_date_info__[0]) + "." + str(
651651
__version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
652652
__revision__ = __version_info__[3]
653-
__revision_id__ = "$Id$"
653+
__revision_id__ = "$Id: 739a621c8fd9c555929ae2f1fc90ad67d86b4f14 $"
654654
if(__version_info__[4] is not None):
655655
__version_date_plusrc__ = __version_date__ + \
656656
"-" + str(__version_date_info__[4])
@@ -3756,7 +3756,8 @@ def GetHeaderChecksum(inlist=None, checksumtype="md5", encodedata=True, formatsp
37563756
if encodedata and not isinstance(hdr_bytes, (bytes, bytearray, memoryview)):
37573757
hdr_bytes = _to_bytes(hdr_bytes)
37583758
hdr_bytes = bytes(hdr_bytes)
3759-
saltkey = _to_bytes(saltkey)
3759+
if(saltkey is not None):
3760+
saltkey = _to_bytes(saltkey)
37603761
if CheckSumSupport(algo_key, hashlib_guaranteed):
37613762
if(saltkey is None):
37623763
h = hashlib.new(algo_key, hdr_bytes)
@@ -3774,7 +3775,8 @@ def GetFileChecksum(inbytes, checksumtype="md5", encodedata=True, formatspecs=__
37743775
- Falls back to one-shot for non-file-like inputs.
37753776
"""
37763777
algo_key = (checksumtype or "md5").lower()
3777-
saltkey = _to_bytes(saltkey)
3778+
if(saltkey is not None):
3779+
saltkey = _to_bytes(saltkey)
37783780
# file-like streaming
37793781
if hasattr(inbytes, "read"):
37803782
# hashlib

0 commit comments

Comments
 (0)