Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Nicer error messages for unknown compression type

Browse Source
This commit is contained in:
Kovid Goyal 2016-06-03 20:53:06 +05:30
parent 67060de830
commit 8bbd389d0f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/utils/zipfile.py
View File

@ -42,6 +42,7 @@ ZIP_MAX_COMMENT = (1 << 16) - 1
ZIP_STORED = 0 ZIP_STORED = 0
ZIP_DEFLATED = 8 ZIP_DEFLATED = 8
# Other ZIP compression methods not supported # Other ZIP compression methods not supported
# For a list see: http://www.winzip.com/wz54.htm
# Below are some formats and associated data for reading/writing headers using # Below are some formats and associated data for reading/writing headers using
# the struct module. The names and structures of headers/records are those used # the struct module. The names and structures of headers/records are those used
@ -721,7 +722,7 @@ class ZipFile:
raise RuntimeError( raise RuntimeError(
"Compression requires the (missing) zlib module") "Compression requires the (missing) zlib module")
else: else:
raise RuntimeError("That compression method is not supported") raise RuntimeError("The compression method %s is not supported" % compression)
self._allowZip64 = allowZip64 self._allowZip64 = allowZip64
self._didModify = False self._didModify = False
@ -1171,7 +1172,7 @@ class ZipFile:
"Compression requires the (missing) zlib module") "Compression requires the (missing) zlib module")
if zinfo.compress_type not in (ZIP_STORED, ZIP_DEFLATED): if zinfo.compress_type not in (ZIP_STORED, ZIP_DEFLATED):
raise RuntimeError( raise RuntimeError(
"That compression method is not supported") "The compression method %s is not supported" % zinfo.compress_type)
if zinfo.file_size > ZIP64_LIMIT: if zinfo.file_size > ZIP64_LIMIT:
if not self._allowZip64: if not self._allowZip64:
raise LargeZipFile("Filesize would require ZIP64 extensions") raise LargeZipFile("Filesize would require ZIP64 extensions")