From cf173bdb894f55cfb4e5c950ed0830b025788e18 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 3 Feb 2012 09:56:11 +0530 Subject: [PATCH] When trying to find an ebook inside a zip file, do not error out if the zip file itself contains other zip files. Fixes #925670 (no plugin to handle input format: zip) --- src/calibre/ebooks/conversion/plumber.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py index 8f51c3b5df..59a779b9f1 100644 --- a/src/calibre/ebooks/conversion/plumber.py +++ b/src/calibre/ebooks/conversion/plumber.py @@ -706,8 +706,9 @@ OptionRecommendation(name='sr3_replace', files = [f if isinstance(f, unicode) else f.decode(filesystem_encoding) for f in files] from calibre.customize.ui import available_input_formats - fmts = available_input_formats() - for x in ('htm', 'html', 'xhtm', 'xhtml'): fmts.remove(x) + fmts = set(available_input_formats()) + fmts -= {'htm', 'html', 'xhtm', 'xhtml'} + fmts -= set(ARCHIVE_FMTS) for ext in fmts: for f in files: