Added first portion of logging adaptation.

Things may be broken at this point - there are still several modules to
be adapted.

ebook_converter/ebooks/conversion/plugins/epub_input.py

@@ -146,7 +146,7 @@ class EPUBInput(InputFormatPlugin):
             if len(spine) > 1:
                 for item in spine:
                     if item.get('idref') == titlepage_id:
-                        log('Found HTML cover', titlepage_href)
+                        log.info('Found HTML cover %s', titlepage_href)
                         if self.for_viewer:
                             item.attrib.pop('linear', None)
                         else:
@@ -192,7 +192,7 @@ class EPUBInput(InputFormatPlugin):
         elem = [x for x in manifest if x.get('id', '') == idref]
         if not elem or elem[0].get('href', None) != guide_cover:
             return
-        log('Found HTML cover', guide_cover)
+        log.info('Found HTML cover %s', guide_cover)
 
         # Remove from spine as covers must be treated
         # specially
@@ -272,8 +272,8 @@ class EPUBInput(InputFormatPlugin):
             zf = ZipFile(stream)
             zf.extractall(os.getcwd())
         except Exception:
-            log.exception('EPUB appears to be invalid ZIP file, trying a'
-                          ' more forgiving ZIP parser')
+            log.exception('EPUB appears to be invalid ZIP file, trying a '
+                          'more forgiving ZIP parser')
             from ebook_converter.utils.localunzip import extractall
             stream.seek(0)
             extractall(stream)

ebook_converter/ebooks/conversion/plugins/epub_output.py

@@ -214,8 +214,8 @@ class EPUBOutput(OutputFormatPlugin):
         self.workaround_sony_quirks()
 
         if self.oeb.toc.count() == 0:
-            self.log.warn('This EPUB file has no Table of Contents. '
-                    'Creating a default TOC')
+            self.log.warning('This EPUB file has no Table of Contents. '
+                             'Creating a default TOC')
             first = next(iter(self.oeb.spine))
             self.oeb.toc.add('Start', first.href)
 
@@ -229,7 +229,7 @@ class EPUBOutput(OutputFormatPlugin):
         encrypted_fonts = getattr(input_plugin, 'encrypted_fonts', [])
 
         if _uuid is None:
-            self.log.warn('No UUID identifier found')
+            self.log.warning('No UUID identifier found')
             _uuid = str(uuid.uuid4())
             oeb.metadata.add('identifier', _uuid, scheme='uuid', id=_uuid)
 
@@ -281,7 +281,7 @@ class EPUBOutput(OutputFormatPlugin):
                 os.mkdir(opts.extract_to)
                 with ZipFile(output_path) as zf:
                     zf.extractall(path=opts.extract_to)
-                self.log.info('EPUB extracted to', opts.extract_to)
+                self.log.info('EPUB extracted to %s', opts.extract_to)
 
     def upgrade_to_epub3(self, tdir, opf):
         self.log.info('Upgrading to EPUB 3...')
@@ -323,7 +323,7 @@ class EPUBOutput(OutputFormatPlugin):
                 if not os.path.exists(path):
                     uris.pop(uri)
                     continue
-                self.log.debug('Encrypting font:', uri)
+                self.log.debug('Encrypting font: %s', uri)
                 with open(path, 'r+b') as f:
                     data = f.read(1024)
                     if len(data) >= 1024:
@@ -332,7 +332,7 @@ class EPUBOutput(OutputFormatPlugin):
                         f.write(bytes(bytearray(data[i] ^ key[i%16]
                                                 for i in range(1024))))
                     else:
-                        self.log.warn('Font', path, 'is invalid, ignoring')
+                        self.log.warning('Font %s is invalid, ignoring', path)
                 if not isinstance(uri, str):
                     uri = uri.decode('utf-8')
                 fonts.append('''
@@ -385,8 +385,9 @@ class EPUBOutput(OutputFormatPlugin):
                 _base, _, frag = href.partition('#')
                 frag = urllib.parse.unquote(frag)
                 if frag and frag_pat.match(frag) is None:
-                    self.log.warn(
-                            'Removing fragment identifier %r from TOC as Adobe Digital Editions cannot handle it'%frag)
+                    self.log.warning('Removing fragment identifier %r from '
+                                     'TOC as Adobe Digital Editions cannot '
+                                     'handle it', frag)
                     node.href = _base
 
         for x in self.oeb.spine:
@@ -530,8 +531,8 @@ class EPUBOutput(OutputFormatPlugin):
                     for x in self.oeb.spine:
                         if x.href == href:
                             if frag_is_at_top(x.data, frag):
-                                self.log.debug('Removing anchor from TOC href:',
-                                        href+'#'+frag)
+                                self.log.debug('Removing anchor from TOC '
+                                               'href: %s#%s', href, frag)
                                 toc.href = href
                             break
             for x in toc:

ebook_converter/ebooks/conversion/plugins/lrf_input.py

@@ -20,7 +20,7 @@ class LRFInput(InputFormatPlugin):
         from ebook_converter.ebooks.lrf.input import MediaType, Styles, \
                 TextBlock, Canvas, ImageBlock, RuledLine
         self.log = log
-        self.log('Generating XML')
+        self.log.info('Generating XML')
         from ebook_converter.ebooks.lrf.lrfparser import LRFDocument
         d = LRFDocument(stream)
         d.parse()
@@ -50,7 +50,7 @@ class LRFInput(InputFormatPlugin):
                 if imgstr:
                     plot_map[ro] = imgstr[0].get('file')
 
-        self.log('Converting XML to HTML...')
+        self.log.info('Converting XML to HTML...')
 
         with open(pkg_resources.
                   resource_filename('ebook_converter',