From 8d774b6e7c6c3cc41f2d41594622fa5bf6ba26c0 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sat, 11 Apr 2009 11:46:55 -0400
Subject: [PATCH] EPubInput: make convert conform to interface.

---
 src/calibre/ebooks/epub/input.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/epub/input.py b/src/calibre/ebooks/epub/input.py
index 4c1cdbfcf5..5c8a5c9d89 100644
--- a/src/calibre/ebooks/epub/input.py
+++ b/src/calibre/ebooks/epub/input.py
@@ -51,8 +51,7 @@ class EPUBInput(InputFormatPlugin):
             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 @@ class EPUBInput(InputFormatPlugin):
         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)