From a5202458dcf573b901caa9d8a21d9ffc92c3a175 Mon Sep 17 00:00:00 2001 From: Alex Xu Date: Wed, 5 Jul 2023 09:54:24 -0700 Subject: [PATCH] Merge pull request #553 * warn p7zip-rar * replace strerror --- kindlecomicconverter/comic2ebook.py | 2 +- kindlecomicconverter/metadata.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py index 7ff7d97..049e44c 100755 --- a/kindlecomicconverter/comic2ebook.py +++ b/kindlecomicconverter/comic2ebook.py @@ -631,7 +631,7 @@ def getWorkFolder(afile): path = cbx.extract(workdir) except OSError as e: rmtree(workdir, True) - raise UserWarning(e.strerror) + raise UserWarning(e) else: raise UserWarning("Failed to open source file/directory.") sanitizePermissions(path) diff --git a/kindlecomicconverter/metadata.py b/kindlecomicconverter/metadata.py index 9d60616..51ade3b 100644 --- a/kindlecomicconverter/metadata.py +++ b/kindlecomicconverter/metadata.py @@ -46,7 +46,7 @@ class MetadataParser: self.rawdata = cbx.extractMetadata() self.format = cbx.type except OSError as e: - raise UserWarning(e.strerror) + raise UserWarning(e) if self.rawdata: self.parseXML() @@ -121,5 +121,5 @@ class MetadataParser: cbx = comicarchive.ComicArchive(self.source) cbx.addFile(tmpXML) except OSError as e: - raise UserWarning(e.strerror) + raise UserWarning(e) rmtree(workdir)