Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-08 18:13:04 +02:00
Code Issues Projects Releases Wiki Activity

EPubInput: make convert conform to interface.

Browse source
This commit is contained in:
John Schember 2009-04-11 11:46:55 -04:00
parent c06f894229
commit 8d774b6e7c
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/calibre/ebooks/epub/input.py
View file

@ -51,8 +51,7 @@ def process_ecryption(cls, encfile, opf, log):
traceback.print_exc()
return False
def convert(self, stream, options, file_ext, parse_cache, log,
accelerators):
def convert(self, stream, options, file_ext, log, accelerators):
from calibre.utils.zipfile import ZipFile
from calibre import walk
from calibre.ebooks import DRMError
@ -72,6 +71,5 @@ def convert(self, stream, options, file_ext, parse_cache, log,
if os.path.exists(encfile):
if not self.process_encryption(encfile, opf, log):
raise DRMError(os.path.basename(path))
return opf
return os.path.join(os.getcwd(), opf)