diff --git a/icons/icns/make_iconsets.py b/icons/icns/make_iconsets.py
index c9bf6f88dc..aff3f2fa72 100644
--- a/icons/icns/make_iconsets.py
+++ b/icons/icns/make_iconsets.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim:fileencoding=utf-8
 
 
 __license__ = 'GPL v3'
@@ -27,7 +26,7 @@ for name, src in sources.items():
     os.chdir(iconset)
     try:
         for sz in (16, 32, 128, 256, 512, 1024):
-            iname = 'icon_{0}x{0}.png'.format(sz)
+            iname = f'icon_{sz}x{sz}.png'
             iname2x = 'icon_{0}x{0}@2x.png'.format(sz // 2)
             if src.endswith('.svg'):
                 subprocess.check_call(['rsvg-convert', src, '-w', str(sz), '-h', str(sz), '-o', iname])
@@ -36,7 +35,7 @@ for name, src in sources.items():
                 if sz == 512:
                     shutil.copy2(src, iname)
                 else:
-                    subprocess.check_call(['convert', src, '-resize', '{0}x{0}'.format(sz), iname])
+                    subprocess.check_call(['convert', src, '-resize', f'{sz}x{sz}', iname])
             if sz > 16:
                 shutil.copy2(iname, iname2x)
             if sz > 512:
diff --git a/icons/make_ico_files.py b/icons/make_ico_files.py
index 179d7606db..d8b97ba8ae 100644
--- a/icons/make_ico_files.py
+++ b/icons/make_ico_files.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim:fileencoding=utf-8
 
 
 __license__ = 'GPL v3'
@@ -24,7 +23,7 @@ for name, src in sources.items():
     try:
         names = []
         for sz in (16, 24, 32, 48, 64, 256):
-            iname = os.path.join('ico_temp', '{0}x{0}.png'.format(sz))
+            iname = os.path.join('ico_temp', f'{sz}x{sz}.png')
             subprocess.check_call(['rsvg-convert', src, '-w', str(sz), '-h', str(sz), '-o', iname])
             subprocess.check_call(['optipng', '-o7', '-strip', 'all', iname])
             if sz >= 128:
diff --git a/imgsrc/generate.py b/imgsrc/generate.py
index 9adaeab79f..8d0e0c5426 100755
--- a/imgsrc/generate.py
+++ b/imgsrc/generate.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim:fileencoding=utf-8
 # License: GPLv3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 
 import argparse
diff --git a/imgsrc/render-logo.py b/imgsrc/render-logo.py
index 82d85072ae..0403760849 100755
--- a/imgsrc/render-logo.py
+++ b/imgsrc/render-logo.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim:fileencoding=utf-8
 # License: GPLv3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 
 
diff --git a/imgsrc/srv/generate.py b/imgsrc/srv/generate.py
index c56f3140f6..f2600811ba 100644
--- a/imgsrc/srv/generate.py
+++ b/imgsrc/srv/generate.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim:fileencoding=utf-8
 # License: GPLv3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 
 
@@ -27,7 +26,7 @@ def clone_node(node, parent):
 def merge():
     base = os.path.dirname(os.path.abspath(__file__))
     ans = etree.fromstring(
-        '<svg xmlns="%s" xmlns:xlink="%s"/>' % (SVG_NS, XLINK_NS),
+        f'<svg xmlns="{SVG_NS}" xmlns:xlink="{XLINK_NS}"/>',
         parser=etree.XMLParser(
             recover=True, no_network=True, resolve_entities=False
         )
@@ -43,14 +42,14 @@ def merge():
                 recover=True, no_network=True, resolve_entities=False
             )
         )
-        symbol = ans.makeelement('{%s}symbol' % SVG_NS)
+        symbol = ans.makeelement('{%s}symbol' % SVG_NS)  # noqa: UP031
         symbol.set('viewBox', svg.get('viewBox'))
         symbol.set('id', 'icon-' + f.rpartition('.')[0])
         for child in svg.iterchildren('*'):
             clone_node(child, symbol)
         ans.append(symbol)
     ans = etree.tostring(ans, encoding='unicode', pretty_print=True, with_tail=False)
-    ans = re.sub('<svg[^>]+>', '<svg style="display:none">', ans, count=1)
+    ans = re.sub(r'<svg[^>]+>', '<svg style="display:none">', ans, count=1)
     return ans
 
 
diff --git a/manual/build.py b/manual/build.py
index f90eaf7b7a..e0dd62b30b 100755
--- a/manual/build.py
+++ b/manual/build.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim:fileencoding=utf-8
 
 
 __license__ = 'GPL v3'
diff --git a/manual/conf.py b/manual/conf.py
index 98ac86e9ae..33a0efcdcf 100644
--- a/manual/conf.py
+++ b/manual/conf.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # calibre documentation build configuration file, created by
 # sphinx-quickstart.py on Sun Mar 23 01:23:55 2008.
 #
@@ -47,11 +45,11 @@ templates_path = ['templates']
 source_suffix = {'.rst': 'restructuredtext'}
 
 # The master toctree document.
-master_doc = 'index' if tags.has('online') else 'simple_index'  # noqa
+master_doc = 'index' if tags.has('online') else 'simple_index'  # noqa: F821
 # kill the warning about index/simple_index not being in a toctree
 exclude_patterns = ['simple_index.rst'] if master_doc == 'index' else ['index.rst']
 exclude_patterns.append('cli-options-header.rst')
-if tags.has('gettext'):  # noqa
+if tags.has('gettext'):  # noqa: F821
     # Do not exclude anything as the strings must be translated. This will
     # generate a warning about the documents not being in a toctree, just ignore
     # it.
@@ -64,7 +62,7 @@ language = os.environ.get('CALIBRE_OVERRIDE_LANG', 'en')
 def generated_langs():
     try:
         return os.listdir(os.path.join(base, 'generated'))
-    except EnvironmentError as e:
+    except OSError as e:
         if e.errno != errno.ENOENT:
             raise
     return ()
@@ -99,13 +97,13 @@ today_fmt = '%B %d, %Y'
 unused_docs = ['global', 'cli/global']
 
 locale_dirs = ['locale/']
-title = '%s User Manual' % __appname__
+title = f'{__appname__} User Manual'
 needs_localization = language not in {'en', 'eng'}
 if needs_localization:
     import gettext
     try:
         t = gettext.translation('simple_index', locale_dirs[0], [language])
-    except IOError:
+    except OSError:
         pass
     else:
         title = t.gettext(title)
@@ -176,7 +174,7 @@ def sort_languages(x):
     lc, name = x
     if lc == language:
         return ''
-    return sort_key(type(u'')(name))
+    return sort_key(str(name))
 
 
 website = 'https://calibre-ebook.com'
@@ -193,13 +191,13 @@ extlinks = {
 }
 del sort_languages, get_language
 
-epub_author      = u'Kovid Goyal'
-epub_publisher   = u'Kovid Goyal'
-epub_copyright   = u'© {} Kovid Goyal'.format(date.today().year)
-epub_description = u'Comprehensive documentation for calibre'
-epub_identifier  = u'https://manual.calibre-ebook.com'
-epub_scheme      = u'url'
-epub_uid         = u'S54a88f8e9d42455e9c6db000e989225f'
+epub_author      = 'Kovid Goyal'
+epub_publisher   = 'Kovid Goyal'
+epub_copyright   = f'© {date.today().year} Kovid Goyal'
+epub_description = 'Comprehensive documentation for calibre'
+epub_identifier  = 'https://manual.calibre-ebook.com'
+epub_scheme      = 'url'
+epub_uid         = 'S54a88f8e9d42455e9c6db000e989225f'
 epub_tocdepth    = 4
 epub_tocdup      = True
 epub_cover       = ('epub_cover.jpg', 'epub_cover_template.html')
@@ -255,5 +253,5 @@ latex_show_pagerefs = True
 latex_show_urls = 'footnote'
 latex_elements = {
     'papersize':'letterpaper',
-    'preamble': r'\renewcommand{\pageautorefname}{%s}' % _('page'),
+    'preamble': r'\renewcommand{\pageautorefname}{%s}' % _('page'),  # noqa: UP031
 }
diff --git a/manual/custom.py b/manual/custom.py
index ee8f429cdd..1da37118c9 100644
--- a/manual/custom.py
+++ b/manual/custom.py
@@ -33,7 +33,7 @@ def formatter_funcs():
 
     ans = {'doc': {}, 'sum': {}}
     with TemporaryDirectory() as tdir:
-        db = LibraryDatabase(tdir) # needed to load formatter_funcs
+        db = LibraryDatabase(tdir)  # needed to load formatter_funcs
         ffml = FFMLProcessor()
         all_funcs = formatter_functions().get_builtins()
         for func_name, func in all_funcs.items():
@@ -195,13 +195,13 @@ details and examples.
     lines = []
     for cmd in COMMANDS:
         parser = option_parser_for(cmd)()
-        lines += ['.. _calibredb-%s-%s:' % (language, cmd), '']
+        lines += [f'.. _calibredb-{language}-{cmd}:', '']
         lines += [cmd, '~'*20, '']
         usage = parser.usage.strip()
-        usage = [i for i in usage.replace('%prog', 'calibredb').splitlines()]
+        usage = usage.replace('%prog', 'calibredb').splitlines()
         cmdline = '    '+usage[0]
         usage = usage[1:]
-        usage = [re.sub(r'(%s)([^a-zA-Z0-9])'%cmd, r':command:`\1`\2', i) for i in usage]
+        usage = [re.sub(rf'({cmd})([^a-zA-Z0-9])', r':command:`\1`\2', i) for i in usage]
         lines += ['.. code-block:: none', '', cmdline, '']
         lines += usage
         groups = [(None, None, parser.option_list)]
@@ -240,14 +240,14 @@ def generate_ebook_convert_help(preamble, app):
         parser, plumber = create_option_parser(['ebook-convert',
             'dummyi.'+sorted(pl.file_types)[0], 'dummyo.epub', '-h'], default_log)
         groups = [(pl.name+ ' Options', '', g.option_list) for g in
-                parser.option_groups if g.title == "INPUT OPTIONS"]
+                parser.option_groups if g.title == 'INPUT OPTIONS']
         prog = 'ebook-convert-'+(pl.name.lower().replace(' ', '-'))
         raw += '\n\n' + '\n'.join(render_options(prog, groups, False, True))
     for pl in sorted(output_format_plugins(), key=lambda x: x.name):
         parser, plumber = create_option_parser(['ebook-convert', 'd.epub',
             'dummyi.'+pl.file_type, '-h'], default_log)
         groups = [(pl.name+ ' Options', '', g.option_list) for g in
-                parser.option_groups if g.title == "OUTPUT OPTIONS"]
+                parser.option_groups if g.title == 'OUTPUT OPTIONS']
         prog = 'ebook-convert-'+(pl.name.lower().replace(' ', '-'))
         raw += '\n\n' + '\n'.join(render_options(prog, groups, False, True))
 
@@ -257,7 +257,7 @@ def generate_ebook_convert_help(preamble, app):
 def update_cli_doc(name, raw, language):
     if isinstance(raw, bytes):
         raw = raw.decode('utf-8')
-    path = 'generated/%s/%s.rst' % (language, name)
+    path = f'generated/{language}/{name}.rst'
     old_raw = open(path, encoding='utf-8').read() if os.path.exists(path) else ''
     if not os.path.exists(path) or old_raw != raw:
         import difflib
@@ -352,7 +352,7 @@ def cli_docs(language):
         usage = [mark_options(i) for i in parser.usage.replace('%prog', cmd).splitlines()]
         cmdline = usage[0]
         usage = usage[1:]
-        usage = [i.replace(cmd, ':command:`%s`'%cmd) for i in usage]
+        usage = [i.replace(cmd, f':command:`{cmd}`') for i in usage]
         usage = '\n'.join(usage)
         preamble = CLI_PREAMBLE.format(cmd=cmd, cmdref=cmd + '-' + language, cmdline=cmdline, usage=usage)
         if cmd == 'ebook-convert':
@@ -382,7 +382,7 @@ def template_docs(language):
 
 def localized_path(app, langcode, pagename):
     href = app.builder.get_target_uri(pagename)
-    href = re.sub(r'generated/[a-z]+/', 'generated/%s/' % langcode, href)
+    href = re.sub(r'generated/[a-z]+/', f'generated/{langcode}/', href)
     prefix = '/'
     if langcode != 'en':
         prefix += langcode + '/'
@@ -397,7 +397,7 @@ def add_html_context(app, pagename, templatename, context, *args):
 
 def guilabel_role(typ, rawtext, text, *args, **kwargs):
     from sphinx.roles import GUILabel
-    text = text.replace(u'->', u'\N{THIN SPACE}\N{RIGHTWARDS ARROW}\N{THIN SPACE}')
+    text = text.replace('->', '\N{THIN SPACE}\N{RIGHTWARDS ARROW}\N{THIN SPACE}')
     return GUILabel()(typ, rawtext, text, *args, **kwargs)
 
 
@@ -405,7 +405,7 @@ def setup_man_pages(app):
     documented_cmds = get_cli_docs()[0]
     man_pages = []
     for cmd, option_parser in documented_cmds:
-        path = 'generated/%s/%s' % (app.config.language, cmd)
+        path = f'generated/{app.config.language}/{cmd}'
         man_pages.append((
             path, cmd, cmd, 'Kovid Goyal', 1
         ))
diff --git a/manual/epub.py b/manual/epub.py
index 9fa088bc78..3e08ac5dc8 100644
--- a/manual/epub.py
+++ b/manual/epub.py
@@ -49,8 +49,8 @@ class EPUBHelpBuilder(EpubBuilder):
                 imgname = container.href_to_name(img.get('src'), name)
                 fmt, width, height = identify(container.raw_data(imgname))
                 if width == -1:
-                    raise ValueError('Failed to read size of: %s' % imgname)
-                img.set('style', 'width: %dpx; height: %dpx' % (width, height))
+                    raise ValueError(f'Failed to read size of: {imgname}')
+                img.set('style', f'width: {width}px; height: {height}px')
 
     def fix_opf(self, container):
         spine_names = {n for n, l in container.spine_names}
@@ -75,7 +75,7 @@ class EPUBHelpBuilder(EpubBuilder):
 
         # Ensure that the cover-image property is set
         cover_id = rmap['_static/' + self.config.epub_cover[0]]
-        for item in container.opf_xpath('//opf:item[@id="{}"]'.format(cover_id)):
+        for item in container.opf_xpath(f'//opf:item[@id="{cover_id}"]'):
             item.set('properties', 'cover-image')
         for item in container.opf_xpath('//opf:item[@href="epub-cover.xhtml"]'):
             item.set('properties', 'svg calibre:title-page')
diff --git a/manual/plugin_examples/editor_demo/main.py b/manual/plugin_examples/editor_demo/main.py
index fecdc4dd91..3da2fb442d 100644
--- a/manual/plugin_examples/editor_demo/main.py
+++ b/manual/plugin_examples/editor_demo/main.py
@@ -32,7 +32,7 @@ class DemoTool(Tool):
     def create_action(self, for_toolbar=True):
         # Create an action, this will be added to the plugins toolbar and
         # the plugins menu
-        ac = QAction(get_icons('images/icon.png'), 'Magnify fonts', self.gui)  # noqa
+        ac = QAction(get_icons('images/icon.png'), 'Magnify fonts', self.gui)  # noqa: F821
         if not for_toolbar:
             # Register a keyboard shortcut for this toolbar action. We only
             # register it for the action created for the menu, not the toolbar,
diff --git a/manual/plugin_examples/helloworld/__init__.py b/manual/plugin_examples/helloworld/__init__.py
index 60b3cb570b..07647b2d5f 100644
--- a/manual/plugin_examples/helloworld/__init__.py
+++ b/manual/plugin_examples/helloworld/__init__.py
@@ -13,13 +13,13 @@ from calibre.customize import FileTypePlugin
 
 class HelloWorld(FileTypePlugin):
 
-    name                = 'Hello World Plugin' # Name of the plugin
+    name                = 'Hello World Plugin'  # Name of the plugin
     description         = 'Set the publisher to Hello World for all new conversions'
-    supported_platforms = ['windows', 'osx', 'linux'] # Platforms this plugin will run on
-    author              = 'Acme Inc.' # The author of this plugin
+    supported_platforms = ['windows', 'osx', 'linux']  # Platforms this plugin will run on
+    author              = 'Acme Inc.'  # The author of this plugin
     version             = (1, 0, 0)   # The version number of this plugin
-    file_types          = {'epub', 'mobi'} # The file types that this plugin will be applied to
-    on_postprocess      = True # Run this plugin after conversion is complete
+    file_types          = {'epub', 'mobi'}  # The file types that this plugin will be applied to
+    on_postprocess      = True  # Run this plugin after conversion is complete
     minimum_calibre_version = (0, 7, 53)
 
     def run(self, path_to_ebook):
diff --git a/manual/plugin_examples/interface_demo/__init__.py b/manual/plugin_examples/interface_demo/__init__.py
index f6733549f2..1a9df67b43 100644
--- a/manual/plugin_examples/interface_demo/__init__.py
+++ b/manual/plugin_examples/interface_demo/__init__.py
@@ -76,5 +76,3 @@ class InterfacePluginDemo(InterfaceActionBase):
         ac = self.actual_plugin_
         if ac is not None:
             ac.apply_settings()
-
-
diff --git a/manual/plugin_examples/interface_demo/main.py b/manual/plugin_examples/interface_demo/main.py
index c3c35f714f..2e6fd25df7 100644
--- a/manual/plugin_examples/interface_demo/main.py
+++ b/manual/plugin_examples/interface_demo/main.py
@@ -55,7 +55,7 @@ class DemoDialog(QDialog):
         self.l.addWidget(self.view_button)
 
         self.update_metadata_button = QPushButton(
-            'Update metadata in a book\'s files', self)
+            "Update metadata in a book's files", self)
         self.update_metadata_button.clicked.connect(self.update_metadata)
         self.l.addWidget(self.update_metadata_button)
 
diff --git a/manual/sidebar_toc.py b/manual/sidebar_toc.py
index b399c130b3..b1488f2874 100644
--- a/manual/sidebar_toc.py
+++ b/manual/sidebar_toc.py
@@ -54,8 +54,8 @@ class checkbox(nodes.Element):
 def visit_checkbox(self, node):
     cid = node['ids'][0]
     node['classes'] = []
-    self.body.append('<input id="{0}" type="checkbox" />'
-                     '<label for="{0}">&nbsp;</label>'.format(cid))
+    self.body.append(f'<input id="{cid}" type="checkbox" />'
+                     f'<label for="{cid}">&nbsp;</label>')
 
 
 def modify_li(li):
@@ -66,7 +66,7 @@ def modify_li(li):
         li['classes'].append('leaf-node')
     else:
         c = checkbox()
-        c['ids'] = ['collapse-checkbox-{}'.format(next(id_counter))]
+        c['ids'] = [f'collapse-checkbox-{next(id_counter)}']
         li.insert(0, c)
 
 
diff --git a/manual/template_ref_generate.py b/manual/template_ref_generate.py
index ba64235d75..0aac5a924e 100644
--- a/manual/template_ref_generate.py
+++ b/manual/template_ref_generate.py
@@ -61,7 +61,7 @@ def generate_template_language_help(language, log):
     a = output.append
 
     with TemporaryDirectory() as tdir:
-        db = LibraryDatabase(tdir) # needed to load formatter_funcs
+        db = LibraryDatabase(tdir)  # needed to load formatter_funcs
         ffml = FFMLProcessor()
         all_funcs = formatter_functions().get_builtins()
         categories = defaultdict(dict)
@@ -89,5 +89,6 @@ def generate_template_language_help(language, log):
     a(POSTAMBLE)
     return ''.join(output)
 
+
 if __name__ == '__main__':
     generate_template_language_help()
diff --git a/pyproject.toml b/pyproject.toml
index e16c31d869..c6bc3082fb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,10 +21,11 @@ quote-style = 'single'
 
 [tool.ruff.lint]
 ignore = ['E402', 'E722', 'E741']
-select = ['E', 'F', 'I', 'W', 'INT']
+select = ['E', 'F', 'I', 'W', 'INT', 'PIE794']
+unfixable = ['PIE794']
 
 [tool.ruff.lint.per-file-ignores]
-"src/calibre/ebooks/unihandecode/*codepoints.py" = ['E501', 'W191']
+"src/calibre/ebooks/unihandecode/*codepoints.py" = ['E501']
 "src/qt/*.py" = ['I']
 "src/qt/*.pyi" = ['I']
 
diff --git a/recipes/1843.recipe b/recipes/1843.recipe
index df4b16f452..d7c79c7122 100644
--- a/recipes/1843.recipe
+++ b/recipes/1843.recipe
@@ -17,6 +17,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 use_archive = True
 
+
 def E(parent, name, text='', **attrs):
     ans = parent.makeelement(name, **attrs)
     ans.text = text
@@ -60,8 +61,8 @@ if use_archive:
         data = json.loads(raw)
         body = root.xpath('//body')[0]
         article = E(body, 'article')
-        E(article, 'div', data['flyTitle'] , style='color: red; font-size:small; font-weight:bold;')
-        E(article, 'h1', data['title'], title=safe_dict(data, "url", "canonical") or '')
+        E(article, 'div', data['flyTitle'], style='color: red; font-size:small; font-weight:bold;')
+        E(article, 'h1', data['title'], title=safe_dict(data, 'url', 'canonical') or '')
         E(article, 'div', data['rubric'], style='font-style: italic; color:#202020;')
         try:
             date = data['dateModified']
@@ -95,7 +96,7 @@ else:
         for child in tuple(body):
             body.remove(child)
         article = E(body, 'article')
-        E(article, 'div', replace_entities(data['subheadline']) , style='color: red; font-size:small; font-weight:bold;')
+        E(article, 'div', replace_entities(data['subheadline']), style='color: red; font-size:small; font-weight:bold;')
         E(article, 'h1', replace_entities(data['headline']))
         E(article, 'div', replace_entities(data['description']), style='font-style: italic; color:#202020;')
         if data['dateline'] is None:
@@ -157,7 +158,7 @@ class Economist(BasicNewsRecipe):
     encoding = 'utf-8'
     masthead_url = 'https://www.livemint.com/lm-img/dev/economist-logo-oneline.png'
 
-    __author__ = "Kovid Goyal"
+    __author__ = 'Kovid Goyal'
     description = (
         'Published since September 1843 to take part in “a severe contest between intelligence, which presses forward, and '
         'an unworthy, timid ignorance obstructing our progress.”'
@@ -170,7 +171,7 @@ class Economist(BasicNewsRecipe):
     resolve_internal_links = True
     remove_tags = [
         dict(name=['script', 'noscript', 'title', 'iframe', 'cf_floatingcontent', 'aside', 'footer']),
-        dict(attrs={'aria-label': "Article Teaser"}),
+        dict(attrs={'aria-label': 'Article Teaser'}),
         dict(attrs={
                 'class': [
                     'dblClkTrk', 'ec-article-info', 'share_inline_header',
@@ -224,13 +225,13 @@ class Economist(BasicNewsRecipe):
         def parse_index(self):
             # return self.economist_test_article()
             soup = self.index_to_soup('https://www.economist.com/hidden-content/1843magazine-hub')
-            script_tag = soup.find("script", id="__NEXT_DATA__")
+            script_tag = soup.find('script', id='__NEXT_DATA__')
             if script_tag is None:
                 raise ValueError('No script tag with JSON data found in the weeklyedition archive')
             data = json.loads(script_tag.string)
             content_id = data['props']['pageProps']['content'][0]['tegID'].split('/')[-1]
             query = {
-                'query': 'query HubsDataQuery($id:String!$size:Int!){canonical(ref:$id){id headline description url{canonical __typename}image{ident{url{canonical __typename}width height __typename}__typename}text(mode:"hub" format:"json")hasPart(size:$size){parts{id title:headline isPartOf{context{title:headline __typename}__typename}hasPart{parts{...ArticleFragment isPartOf{id context{title:headline flyTitle:subheadline rubric:description dateline image{...ImageMainFragment ...ImagePromoFragment __typename}__typename}__typename}__typename}__typename}__typename}__typename}__typename}}fragment ArticleFragment on Content{ad{grapeshot{channels{name __typename}__typename}__typename}articleSection{internal{id title:headline __typename}__typename}audio{main{id duration(format:"seconds")source:channel{id __typename}url{canonical __typename}__typename}__typename}byline dateline dateModified datePublished dateRevised flyTitle:subheadline id image{...ImageInlineFragment ...ImageMainFragment ...ImagePromoFragment __typename}print{title:headline flyTitle:subheadline rubric:description section{id title:headline __typename}__typename}publication{id tegID title:headline flyTitle:subheadline datePublished regionsAllowed url{canonical __typename}__typename}rubric:description source:channel{id __typename}tegID text(format:"json")title:headline type url{canonical __typename}topic contentIdentity{forceAppWebview mediaType articleType __typename}__typename}fragment ImageInlineFragment on Media{inline{url{canonical __typename}width height __typename}__typename}fragment ImageMainFragment on Media{main{url{canonical __typename}width height __typename}__typename}fragment ImagePromoFragment on Media{promo{url{canonical __typename}id width height __typename}__typename}',  # noqa
+                'query': 'query HubsDataQuery($id:String!$size:Int!){canonical(ref:$id){id headline description url{canonical __typename}image{ident{url{canonical __typename}width height __typename}__typename}text(mode:"hub" format:"json")hasPart(size:$size){parts{id title:headline isPartOf{context{title:headline __typename}__typename}hasPart{parts{...ArticleFragment isPartOf{id context{title:headline flyTitle:subheadline rubric:description dateline image{...ImageMainFragment ...ImagePromoFragment __typename}__typename}__typename}__typename}__typename}__typename}__typename}__typename}}fragment ArticleFragment on Content{ad{grapeshot{channels{name __typename}__typename}__typename}articleSection{internal{id title:headline __typename}__typename}audio{main{id duration(format:"seconds")source:channel{id __typename}url{canonical __typename}__typename}__typename}byline dateline dateModified datePublished dateRevised flyTitle:subheadline id image{...ImageInlineFragment ...ImageMainFragment ...ImagePromoFragment __typename}print{title:headline flyTitle:subheadline rubric:description section{id title:headline __typename}__typename}publication{id tegID title:headline flyTitle:subheadline datePublished regionsAllowed url{canonical __typename}__typename}rubric:description source:channel{id __typename}tegID text(format:"json")title:headline type url{canonical __typename}topic contentIdentity{forceAppWebview mediaType articleType __typename}__typename}fragment ImageInlineFragment on Media{inline{url{canonical __typename}width height __typename}__typename}fragment ImageMainFragment on Media{main{url{canonical __typename}width height __typename}__typename}fragment ImagePromoFragment on Media{promo{url{canonical __typename}id width height __typename}__typename}',  # noqa: E501
                 'operationName': 'HubsDataQuery',
                 'variables': '{{"id":"/content/{}","size":40}}'.format(content_id),
             }
@@ -247,22 +248,22 @@ class Economist(BasicNewsRecipe):
             self.description = data['description']
 
             feeds_dict = defaultdict(list)
-            for part in safe_dict(data, "hasPart", "parts"):
+            for part in safe_dict(data, 'hasPart', 'parts'):
                 section = part['title']
                 self.log(section)
-                for art in safe_dict(part, "hasPart", "parts"):
-                    title = safe_dict(art, "title")
-                    desc = safe_dict(art, "rubric") or ''
-                    sub = safe_dict(art, "flyTitle") or ''
+                for art in safe_dict(part, 'hasPart', 'parts'):
+                    title = safe_dict(art, 'title')
+                    desc = safe_dict(art, 'rubric') or ''
+                    sub = safe_dict(art, 'flyTitle') or ''
                     if sub and section != sub:
                         desc = sub + ' :: ' + desc
                     pt = PersistentTemporaryFile('.html')
                     pt.write(json.dumps(art).encode('utf-8'))
                     pt.close()
                     url = 'file:///' + pt.name
-                    feeds_dict[section].append({"title": title, "url": url, "description": desc})
+                    feeds_dict[section].append({'title': title, 'url': url, 'description': desc})
                     self.log('\t', title, '\n\t\t', desc)
-            return [(section, articles) for section, articles in feeds_dict.items()]
+            return list(feeds_dict.items())
 
         def populate_article_metadata(self, article, soup, first):
             article.url = soup.find('h1')['title']
@@ -273,7 +274,7 @@ class Economist(BasicNewsRecipe):
                     'economist.com/cdn-cgi/image/width=600,quality=80,format=auto/')
             return soup
 
-    else: # Load articles from individual article pages {{{
+    else:  # Load articles from individual article pages {{{
 
         def __init__(self, *args, **kwargs):
             BasicNewsRecipe.__init__(self, *args, **kwargs)
@@ -311,26 +312,26 @@ class Economist(BasicNewsRecipe):
             return ans
 
         def economist_parse_index(self, soup):
-            script_tag = soup.find("script", id="__NEXT_DATA__")
+            script_tag = soup.find('script', id='__NEXT_DATA__')
             if script_tag is not None:
                 data = json.loads(script_tag.string)
                 # open('/t/raw.json', 'w').write(json.dumps(data, indent=2, sort_keys=True))
-                self.title = safe_dict(data, "props", "pageProps", "content", "headline")
+                self.title = safe_dict(data, 'props', 'pageProps', 'content', 'headline')
                 # self.cover_url = 'https://mma.prnewswire.com/media/2275620/The_Economist_The_World_Ahead_2024.jpg?w=600'
 
                 feeds = []
 
-                for coll in safe_dict(data, "props", "pageProps", "content", "collections"):
-                    section = safe_dict(coll, "headline") or ''
+                for coll in safe_dict(data, 'props', 'pageProps', 'content', 'collections'):
+                    section = safe_dict(coll, 'headline') or ''
                     self.log(section)
                     articles = []
-                    for part in safe_dict(coll, "hasPart", "parts"):
-                        title = safe_dict(part, "headline") or ''
-                        url = safe_dict(part, "url", "canonical") or ''
+                    for part in safe_dict(coll, 'hasPart', 'parts'):
+                        title = safe_dict(part, 'headline') or ''
+                        url = safe_dict(part, 'url', 'canonical') or ''
                         if not title or not url:
                             continue
-                        desc = safe_dict(part, "description") or ''
-                        sub = safe_dict(part, "subheadline") or ''
+                        desc = safe_dict(part, 'description') or ''
+                        sub = safe_dict(part, 'subheadline') or ''
                         if sub:
                             desc = sub + ' :: ' + desc
                         self.log('\t', title, '\n\t', desc, '\n\t\t', url)
@@ -341,7 +342,6 @@ class Economist(BasicNewsRecipe):
 
         # }}}
 
-
     def preprocess_raw_html(self, raw, url):
         # open('/t/raw.html', 'wb').write(raw.encode('utf-8'))
         if use_archive:
@@ -358,9 +358,9 @@ class Economist(BasicNewsRecipe):
                     cleanup_html_article(root)
 
         if '/interactive/' in url:
-            return '<html><body><article><h1>' + root.xpath('//h1')[0].text + '</h1><em>' \
-                        + 'This article is supposed to be read in a browser' \
-                            + '</em></article></body></html>'
+            return ('<html><body><article><h1>' + root.xpath('//h1')[0].text + '</h1><em>'
+                    'This article is supposed to be read in a browser.'
+                    '</em></article></body></html>')
 
         for div in root.xpath('//div[@class="lazy-image"]'):
             noscript = list(div.iter('noscript'))
diff --git a/recipes/20_minutos.recipe b/recipes/20_minutos.recipe
index cb75c2e71a..31c8ac0a76 100644
--- a/recipes/20_minutos.recipe
+++ b/recipes/20_minutos.recipe
@@ -36,22 +36,21 @@ class AdvancedUserRecipe1294946868(BasicNewsRecipe):
     remove_empty_feeds = True
 
     keep_only_tags = [
-        dict(name='div', attrs={'id': ['content', 'vinetas', ]}), dict(name='div', attrs={'class': ['boxed', 'description', 'lead', 'article-content', 'cuerpo estirar']}), dict(name='span', attrs={'class': ['photo-bar']}), dict(name='ul', attrs={'class': ['article-author']})  # noqa
+        dict(name='div', attrs={'id': ['content', 'vinetas', ]}), dict(name='div', attrs={'class': ['boxed', 'description', 'lead', 'article-content', 'cuerpo estirar']}), dict(name='span', attrs={'class': ['photo-bar']}), dict(name='ul', attrs={'class': ['article-author']})  # noqa: E501
     ]
 
     remove_tags_before = dict(name='ul', attrs={'class': ['servicios-sub']})
-    remove_tags_after = dict(
-        name='div', attrs={'class': ['related-news', 'col']})
+    remove_tags_after = dict(name='div', attrs={'class': ['related-news', 'col']})
 
     remove_tags = [
-        dict(name='ol', attrs={'class': ['navigation', ]}), dict(name='span', attrs={'class': ['action']}), dict(name='div', attrs={'class': ['twitter comments-list hidden', 'related-news', 'col', 'photo-gallery', 'photo-gallery side-art-block', 'calendario', 'article-comment', 'postto estirar', 'otras_vinetas estirar', 'kment', 'user-actions']}), dict( name='div', attrs={'id': ['twitter-destacados', 'eco-tabs', 'inner', 'vineta_calendario', 'vinetistas clearfix', 'otras_vinetas estirar', 'MIN1', 'main', 'SUP1', 'INT']}), dict(name='ul', attrs={'class': ['article-user-actions', 'stripped-list']}), dict(name='ul', attrs={'id': ['site-links']}), dict(name='li', attrs={'class': ['puntuacion', 'enviar', 'compartir']})  # noqa
+        dict(name='ol', attrs={'class': ['navigation', ]}), dict(name='span', attrs={'class': ['action']}), dict(name='div', attrs={'class': ['twitter comments-list hidden', 'related-news', 'col', 'photo-gallery', 'photo-gallery side-art-block', 'calendario', 'article-comment', 'postto estirar', 'otras_vinetas estirar', 'kment', 'user-actions']}), dict(name='div', attrs={'id': ['twitter-destacados', 'eco-tabs', 'inner', 'vineta_calendario', 'vinetistas clearfix', 'otras_vinetas estirar', 'MIN1', 'main', 'SUP1', 'INT']}), dict(name='ul', attrs={'class': ['article-user-actions', 'stripped-list']}), dict(name='ul', attrs={'id': ['site-links']}), dict(name='li', attrs={'class': ['puntuacion', 'enviar', 'compartir']})  # noqa: E501
     ]
 
-    extra_css             = """
-                               p{text-align: justify; font-size: 100%}
-                               body{ text-align: left; font-size:100% }
-                               h3{font-family: sans-serif; font-size:150%; font-weight:bold; text-align: justify; }
-                                 """
+    extra_css = '''
+                p{text-align: justify; font-size: 100%}
+                body{ text-align: left; font-size:100% }
+                h3{font-family: sans-serif; font-size:150%; font-weight:bold; text-align: justify; }
+                '''
 
     preprocess_regexps = [(re.compile(
         r'<a href="http://estaticos.*?[0-999]px;" target="_blank">', re.DOTALL), lambda m: '')]
diff --git a/recipes/20minutes.recipe b/recipes/20minutes.recipe
index 0890b6f2c3..4baa4e1cd6 100644
--- a/recipes/20minutes.recipe
+++ b/recipes/20minutes.recipe
@@ -9,8 +9,7 @@ from calibre.web.feeds.recipes import BasicNewsRecipe
 
 def classes(classes):
     q = frozenset(classes.split(' '))
-    return dict(attrs={
-        'class': lambda x: x and frozenset(x.split()).intersection(q)})
+    return dict(attrs={'class': lambda x: x and frozenset(x.split()).intersection(q)})
 
 
 class Minutes(BasicNewsRecipe):
diff --git a/recipes/DrawAndCook.recipe b/recipes/DrawAndCook.recipe
index 95a74b8cfa..7916fe512b 100644
--- a/recipes/DrawAndCook.recipe
+++ b/recipes/DrawAndCook.recipe
@@ -28,7 +28,7 @@ class DrawAndCook(BasicNewsRecipe):
     def parse_index(self):
         feeds = []
         for title, url in [
-            ("They Draw and Cook", "http://www.theydrawandcook.com/")
+            ('They Draw and Cook', 'http://www.theydrawandcook.com/')
         ]:
             articles = self.make_links(url)
             if articles:
diff --git a/recipes/TheMITPressReader.recipe b/recipes/TheMITPressReader.recipe
index 84417ce803..c64226e771 100644
--- a/recipes/TheMITPressReader.recipe
+++ b/recipes/TheMITPressReader.recipe
@@ -5,11 +5,11 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class TheMITPressReader(BasicNewsRecipe):
-    title = "The MIT Press Reader"
+    title = 'The MIT Press Reader'
     __author__ = 'yodha8'
     language = 'en'
-    description = ("Thought-provoking excerpts, interviews and essays backed by academic rigor written by MIT Press authors."
-                   " This recipe pulls articles from the past 7 days.")
+    description = ('Thought-provoking excerpts, interviews and essays backed by academic rigor written by MIT Press authors.'
+                   ' This recipe pulls articles from the past 7 days.')
     oldest_article = 7
     max_articles_per_feed = 100
     auto_cleanup = True
diff --git a/recipes/abc_au.recipe b/recipes/abc_au.recipe
index 82591d1357..82662f0351 100644
--- a/recipes/abc_au.recipe
+++ b/recipes/abc_au.recipe
@@ -38,9 +38,9 @@ class ABCNews(BasicNewsRecipe):
         if d and isinstance(d, str):
             self.oldest_article = float(d)
 
-#    auto_cleanup   = True # enable this as a backup option if recipe stops working
+    # auto_cleanup   = True # enable this as a backup option if recipe stops working
 
-#    use_embedded_content = False # if set to true will assume that all the article content is within the feed (i.e. won't try to fetch more data)
+    # use_embedded_content = False # if set to true will assume that all the article content is within the feed (i.e. won't try to fetch more data)
 
     no_stylesheets = True
     remove_javascript = True
@@ -57,7 +57,7 @@ class ABCNews(BasicNewsRecipe):
     # Clear out all the unwanted html tags:
     # ************************************
     remove_tags = [
-#        dict(name='aside', attrs={'name': re.compile(aside_reg_exp, re.IGNORECASE)})
+        # dict(name='aside', attrs={'name': re.compile(aside_reg_exp, re.IGNORECASE)})
         {
             'name': ['meta', 'link', 'noscript', 'aside']
         },
@@ -98,12 +98,12 @@ class ABCNews(BasicNewsRecipe):
         ('Health', 'https://www.abc.net.au/news/feed/9167762/rss.xml'),
         ('Arts and Entertainment', 'https://www.abc.net.au/news/feed/472/rss.xml'),
         ('Fact Check', 'https://www.abc.net.au/news/feed/5306468/rss.xml'),
-#        ('Adelaide', 'https://www.abc.net.au/news/feed/8057540/rss.xml'), #enable by removing # at start of line
-#        ('Brisbane', 'https://www.abc.net.au/news/feed/8053540/rss.xml'), #enable by removing # at start of line
-#        ('Canberra', 'https://www.abc.net.au/news/feed/8057234/rss.xml'), #enable by removing # at start of line
-#        ('Darwin', 'https://www.abc.net.au/news/feed/8057648/rss.xml'), #enable by removing # at start of line
-#        ('Hobart', 'https://www.abc.net.au/news/feed/8054562/rss.xml'), #enable by removing # at start of line
-#        ('Melbourne', 'https://www.abc.net.au/news/feed/8057136/rss.xml'), #enable by removing # at start of line
-#        ('Perth', 'https://www.abc.net.au/news/feed/8057096/rss.xml'), #enable by removing # at start of line
-#        ('Sydney', 'https://www.abc.net.au/news/feed/8055316/rss.xml'), #enable by removing # at start of line
+        # ('Adelaide', 'https://www.abc.net.au/news/feed/8057540/rss.xml'), #enable by removing # at start of line
+        # ('Brisbane', 'https://www.abc.net.au/news/feed/8053540/rss.xml'), #enable by removing # at start of line
+        # ('Canberra', 'https://www.abc.net.au/news/feed/8057234/rss.xml'), #enable by removing # at start of line
+        # ('Darwin', 'https://www.abc.net.au/news/feed/8057648/rss.xml'), #enable by removing # at start of line
+        # ('Hobart', 'https://www.abc.net.au/news/feed/8054562/rss.xml'), #enable by removing # at start of line
+        # ('Melbourne', 'https://www.abc.net.au/news/feed/8057136/rss.xml'), #enable by removing # at start of line
+        # ('Perth', 'https://www.abc.net.au/news/feed/8057096/rss.xml'), #enable by removing # at start of line
+        # ('Sydney', 'https://www.abc.net.au/news/feed/8055316/rss.xml'), #enable by removing # at start of line
     ]
diff --git a/recipes/abc_es.recipe b/recipes/abc_es.recipe
index f5b036b359..0f902a0202 100644
--- a/recipes/abc_es.recipe
+++ b/recipes/abc_es.recipe
@@ -47,13 +47,13 @@ class AdvancedUserRecipe1296604369(BasicNewsRecipe):
         if d and isinstance(d, str):
             self.oldest_article = float(d)
 
-    extra_css             = """
+    extra_css             = '''
                                p{text-align: justify; font-size: 100%}
                                body{ text-align: left; font-size:100% }
                                h3{font-family: sans-serif; font-size:120%; font-weight:bold; text-align: justify; }
                                h2{font-family: sans-serif; font-size:100%; font-weight:bold; text-align: justify; }
                                h1{font-family: sans-serif; font-size:150%; font-weight:bold; text-align: justify; }
-                                 """
+                                 '''
 
     feeds = [
 
diff --git a/recipes/acrimed.recipe b/recipes/acrimed.recipe
index da796681e4..d3229562bd 100644
--- a/recipes/acrimed.recipe
+++ b/recipes/acrimed.recipe
@@ -28,6 +28,6 @@ class Acrimed(BasicNewsRecipe):
          lambda m: '<title>' + m.group(1) + '</title>'),
         (re.compile(r'<h2>(.*) - Acrimed \| Action Critique M.*dias</h2>'), lambda m: '<h2>' + m.group(1) + '</h2>')]
 
-    extra_css              = """
+    extra_css              = '''
                                 .chapo{font-style:italic; margin: 1em 0 0.5em}
-                            """
+                            '''
diff --git a/recipes/ad.recipe b/recipes/ad.recipe
index a8f69b107d..1164c480a5 100644
--- a/recipes/ad.recipe
+++ b/recipes/ad.recipe
@@ -85,9 +85,10 @@ class ADRecipe(BasicNewsRecipe):
 
     def print_version(self, url):
         parts = url.split('/')
-        print_url = 'http://' + parts[2] + '/' + parts[3] + '/' + parts[4] + '/' + parts[5] + '/' \
-            + parts[10] + '/' + parts[7] + '/print/' + \
-            parts[8] + '/' + parts[9] + '/' + parts[13]
+        print_url = 'http://' + '/'.join([
+            parts[2], parts[3], parts[4], parts[5], parts[10],
+            parts[7], 'print', parts[8], parts[9], parts[13],
+        ])
 
         return print_url
 
diff --git a/recipes/adevarul.recipe b/recipes/adevarul.recipe
index e013497b88..bea42e0ca6 100644
--- a/recipes/adevarul.recipe
+++ b/recipes/adevarul.recipe
@@ -33,7 +33,7 @@ class Adevarul(BasicNewsRecipe):
                       ]
 
     remove_tags = [
-        dict(name='li', attrs={'class': 'author'}), dict(name='li', attrs={'class': 'date'}), dict(name='li', attrs={'class': 'comments'}), dict(name='div', attrs={'class': 'bb-wg-article_related_attachements'}), dict(name='div', attrs={'class': 'bb-md bb-md-article_comments'}), dict(name='form', attrs={'id': 'bb-comment-create-form'}), dict(name='div', attrs={'id': 'mediatag'}), dict(name='div', attrs={'id': 'ft'}), dict(name='div', attrs={'id': 'comment_wrapper'})  # noqa
+        dict(name='li', attrs={'class': 'author'}), dict(name='li', attrs={'class': 'date'}), dict(name='li', attrs={'class': 'comments'}), dict(name='div', attrs={'class': 'bb-wg-article_related_attachements'}), dict(name='div', attrs={'class': 'bb-md bb-md-article_comments'}), dict(name='form', attrs={'id': 'bb-comment-create-form'}), dict(name='div', attrs={'id': 'mediatag'}), dict(name='div', attrs={'id': 'ft'}), dict(name='div', attrs={'id': 'comment_wrapper'})  # noqa: E501
     ]
 
     remove_tags_after = [
diff --git a/recipes/adventuregamers.recipe b/recipes/adventuregamers.recipe
index e1c5ddfd20..7a019c1512 100644
--- a/recipes/adventuregamers.recipe
+++ b/recipes/adventuregamers.recipe
@@ -21,7 +21,7 @@ class AdventureGamers(BasicNewsRecipe):
     remove_javascript = True
     use_embedded_content = False
     INDEX = u'http://www.adventuregamers.com'
-    extra_css             = """
+    extra_css             = '''
                                 .pageheader_type{font-size: x-large; font-weight: bold; color: #828D74}
                                 .pageheader_title,.page_title{font-size: xx-large; color: #394128}
                                 .pageheader_byline{font-size: small; font-weight: bold; color: #394128}
@@ -32,7 +32,7 @@ class AdventureGamers(BasicNewsRecipe):
                                 .score_header{font-size: large; color: #50544A}
                                 img{margin-bottom: 1em;}
                                 body{font-family: 'Open Sans',Helvetica,Arial,sans-serif}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/afr.recipe b/recipes/afr.recipe
index d43cb046cb..fc89323751 100644
--- a/recipes/afr.recipe
+++ b/recipes/afr.recipe
@@ -8,13 +8,14 @@ def absurl(url):
     if url.startswith('/'):
         return 'https://www.afr.com' + url
 
+
 class afr(BasicNewsRecipe):
     title = 'Australian Financial Review'
     __author__ = 'unkn0wn'
     description = (
         'For more than 65 years The Australian Financial Review has been the authority on business,'
         ' finance and investment news in Australia. It has a reputation for independent, award-winning '
-        'journalism and is essential reading for Australia\'s business and investor community.'
+        "journalism and is essential reading for Australia's business and investor community."
     )
     masthead_url = 'https://www.nineforbrands.com.au/wp-content/uploads/2020/08/AFR-DHOSP-Logo-black-RGB.png'
     encoding = 'utf-8'
@@ -24,7 +25,6 @@ class afr(BasicNewsRecipe):
     timefmt = ' [%d %b %Y]'
     max_articles_per_feed = 25
     no_stylesheets = True
-    remove_empty_feeds = True
     remove_attributes = ['style', 'height', 'width']
 
     keep_only_tags = [
@@ -39,7 +39,7 @@ class afr(BasicNewsRecipe):
         dict(name=['button', 'aside', 'svg']),
     ]
 
-    remove_tags_after= [ dict(name='aside', attrs={'id':'stickyContainer'})]
+    remove_tags_after= [dict(name='aside', attrs={'id':'stickyContainer'})]
 
     extra_css = '''
         #img-cap {font-size:small; text-align:center;}
diff --git a/recipes/afrique_21.recipe b/recipes/afrique_21.recipe
index df24e4d17c..2c1e5ccbcc 100644
--- a/recipes/afrique_21.recipe
+++ b/recipes/afrique_21.recipe
@@ -36,9 +36,9 @@ class AfriqueXXIRecipe(BasicNewsRecipe):
     '''
 
     def default_cover(self, cover_file):
-        """
+        '''
         Crée une couverture personnalisée avec le logo
-        """
+        '''
         from qt.core import QColor, QFont, QImage, QPainter, QPen, QRect, Qt
 
         from calibre.gui2 import ensure_app, load_builtin_fonts, pixmap_to_data
@@ -54,7 +54,7 @@ class AfriqueXXIRecipe(BasicNewsRecipe):
 
             weekday = french_weekday[wkd]
             month = french_month[today.month]
-            date_str = f"{weekday} {today.day} {month} {today.year}"
+            date_str = f'{weekday} {today.day} {month} {today.year}'
             edition = today.strftime('Édition de %Hh')
 
             # Image de base
diff --git a/recipes/agents.recipe b/recipes/agents.recipe
index 43414eff82..096f8dbd39 100644
--- a/recipes/agents.recipe
+++ b/recipes/agents.recipe
@@ -6,7 +6,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Agents(BasicNewsRecipe):
     title = u'\u00AB\u0410\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E\u00BB'
-    description = u'\u041D\u043E\u0432\u043E\u0441\u0442\u043D\u043E\u0435 \u0438\u0437\u0434\u0430\u043D\u0438\u0435, \u043E\u0441\u043D\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0432\u044B\u0445\u043E\u0434\u0446\u0430\u043C\u0438 \u0438\u0437 \u043A\u043E\u043B\u043B\u0435\u043A\u0442\u0438\u0432\u0430 \u043D\u0435\u0437\u0430\u0432\u0438\u0441\u043C\u043E\u0433\u043E \u0438\u0437\u0434\u0430\u043D\u0438\u044F \u00AB\u041F\u0440\u043E\u0435\u043A\u0442\u00BB.'  # noqa
+    description = u'\u041D\u043E\u0432\u043E\u0441\u0442\u043D\u043E\u0435 \u0438\u0437\u0434\u0430\u043D\u0438\u0435, \u043E\u0441\u043D\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0432\u044B\u0445\u043E\u0434\u0446\u0430\u043C\u0438 \u0438\u0437 \u043A\u043E\u043B\u043B\u0435\u043A\u0442\u0438\u0432\u0430 \u043D\u0435\u0437\u0430\u0432\u0438\u0441\u043C\u043E\u0433\u043E \u0438\u0437\u0434\u0430\u043D\u0438\u044F \u00AB\u041F\u0440\u043E\u0435\u043A\u0442\u00BB.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = 'Project Media'
     publication_type = 'news'
diff --git a/recipes/aktualne.cz.recipe b/recipes/aktualne.cz.recipe
index ed1d647b8b..d1a8701769 100644
--- a/recipes/aktualne.cz.recipe
+++ b/recipes/aktualne.cz.recipe
@@ -32,7 +32,7 @@ class aktualneRecipe(BasicNewsRecipe):
     remove_attributes = []
     remove_tags_before = dict(name='h1', attrs={'class': ['titulek-clanku']})
     filter_regexps = [r'img.aktualne.centrum.cz']
-    remove_tags = [dict(name='div',   attrs={'id': ['social-bookmark']}),
+    remove_tags = [dict(name='div', attrs={'id': ['social-bookmark']}),
                    dict(name='div', attrs={'class': ['box1', 'svazane-tagy']}),
                    dict(name='div', attrs={'class': 'itemcomment id0'}),
                    dict(name='div', attrs={'class': 'hlavicka'}),
diff --git a/recipes/al_jazeera.recipe b/recipes/al_jazeera.recipe
index ed7957dccf..0e94bdc5dd 100644
--- a/recipes/al_jazeera.recipe
+++ b/recipes/al_jazeera.recipe
@@ -21,9 +21,9 @@ class AlJazeera(BasicNewsRecipe):
     max_articles_per_feed = 100
     no_stylesheets = True
     use_embedded_content = False
-    extra_css              = """
+    extra_css              = '''
                                 body{font-family: Arial,sans-serif}
-                             """
+                             '''
     conversion_options = {
         'comment': description, 'tags': category,
         'publisher': publisher, 'language': language
@@ -55,7 +55,7 @@ class AlJazeera(BasicNewsRecipe):
               u'http://www.aljazeera.com/xml/rss/all.xml')]
 
     def get_article_url(self, article):
-        artlurl = article.get('link',  None)
+        artlurl = article.get('link', None)
         return artlurl
 
     def preprocess_html(self, soup):
diff --git a/recipes/al_masry_alyoum_arabic.recipe b/recipes/al_masry_alyoum_arabic.recipe
index b834f1ff62..63920445ed 100644
--- a/recipes/al_masry_alyoum_arabic.recipe
+++ b/recipes/al_masry_alyoum_arabic.recipe
@@ -22,7 +22,7 @@ class AlMasryAlyoum(BasicNewsRecipe):
     category = 'News'
     publication_type = 'newsportal'
 
-    extra_css = ' body{ font-family: Verdana,Helvetica,Arial,sans-serif; direction: rtl; } .tit_2{ font-weight: bold; font-size: 2em; } .pinfo{ font-size: 1.3em; } .articleimg img{ max-width: 100%; } .imgauther{ display: block; font-size: 0.7em; } .caption{ font-size: 0.7em; } '  # noqa
+    extra_css = ' body{ font-family: Verdana,Helvetica,Arial,sans-serif; direction: rtl; } .tit_2{ font-weight: bold; font-size: 2em; } .pinfo{ font-size: 1.3em; } .articleimg img{ max-width: 100%; } .imgauther{ display: block; font-size: 0.7em; } .caption{ font-size: 0.7em; } '  # noqa: E501
 
     keep_only_tags = [
         dict(name='div', attrs={'class': ['article']})
diff --git a/recipes/al_monitor.recipe b/recipes/al_monitor.recipe
index 9c3f214b6b..d57e602275 100644
--- a/recipes/al_monitor.recipe
+++ b/recipes/al_monitor.recipe
@@ -110,7 +110,7 @@ class AlMonitor(BasicNewsRecipe):
             title = title[0:120] + '...'
         href = link.get('href')
         if not href:
-            self._p("BAD HREF: " + str(link))
+            self._p('BAD HREF: ' + str(link))
             return
         self.queue_article_link(section, href, title)
 
@@ -158,7 +158,7 @@ class AlMonitor(BasicNewsRecipe):
 
         age = (datetime.datetime.now() - date).days
         if (age > self.oldest_article):
-            return "too old"
+            return 'too old'
         return False
 
     def scrape_article_date(self, soup):
@@ -174,7 +174,7 @@ class AlMonitor(BasicNewsRecipe):
     def date_from_string(self, datestring):
         try:
             # eg: Posted September 17, 2014
-            dt = datetime.datetime.strptime(datestring, "Posted %B %d, %Y")
+            dt = datetime.datetime.strptime(datestring, 'Posted %B %d, %Y')
         except:
             dt = None
 
@@ -203,11 +203,10 @@ class AlMonitor(BasicNewsRecipe):
         return self.tag_to_string(n).strip()
 
     def _dbg_soup_node(self, node):
-        s = '   cls: ' + str(node.get('class')).strip() + \
-            '  id: ' + str(node.get('id')).strip() + \
-            '  role: ' + str(node.get('role')).strip() + \
-            ' txt: ' + self.text(node)
-        return s
+        return ('   cls: ' + str(node.get('class')).strip() +
+                '  id: ' + str(node.get('id')).strip() +
+                '  role: ' + str(node.get('role')).strip() +
+                ' txt: ' + self.text(node))
 
     def _p(self, msg):
         curframe = inspect.currentframe()
diff --git a/recipes/albert_mohler.recipe b/recipes/albert_mohler.recipe
index a85063290a..6babd67c0f 100644
--- a/recipes/albert_mohler.recipe
+++ b/recipes/albert_mohler.recipe
@@ -5,7 +5,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class AlbertMohlersBlog(BasicNewsRecipe):
-    title = u'Albert Mohler\'s Blog'
+    title = u"Albert Mohler's Blog"
     __author__ = 'Peter Grungi'
     language = 'en'
     oldest_article = 90
@@ -13,8 +13,7 @@ class AlbertMohlersBlog(BasicNewsRecipe):
     auto_cleanup = True
     cover_url = 'http://www.albertmohler.com/wp-content/themes/albert-mohler-v5/img/logo-am-lg.gif'
     publisher = 'Albert Mohler'
-    language = 'en'
     author = 'Albert Mohler'
 
-    feeds = [(u'Albert Mohler\'s Blog',
+    feeds = [(u"Albert Mohler's Blog",
               u'http://feeds.feedburner.com/AlbertMohlersBlog?format=xml')]
diff --git a/recipes/ald.recipe b/recipes/ald.recipe
index e34e6b90ed..88d30aeac0 100644
--- a/recipes/ald.recipe
+++ b/recipes/ald.recipe
@@ -43,7 +43,7 @@ class ALD(BasicNewsRecipe):
         # Extract a list of dates from the page.
         # Subset this out to the list of target dates for extraction.
         date_list = []
-        for div in soup.findAll('div', attrs={'id': "dayheader"}):
+        for div in soup.findAll('div', attrs={'id': 'dayheader'}):
             date_list.append(self.tag_to_string(div))
         date_list_clean = [re.sub(r'[^\w]', ' ', date) for date in date_list]
         date_list_bool = [
@@ -54,14 +54,14 @@ class ALD(BasicNewsRecipe):
 
         # Process each paragraph one by one.
         # Stop when the text of the previous div is not in the target date list.
-        for div in soup.findAll('div', attrs={'class': "mobile-front"}):
+        for div in soup.findAll('div', attrs={'class': 'mobile-front'}):
             for p in div.findAll('p'):
                 if self.tag_to_string(p.findPreviousSibling('div')) in compress_date:
                     if p.find('a'):
                         title = self.tag_to_string(p)
                         link = p.find('a')['href']
                         if self.tag_to_string(p.findPreviousSibling('h3')
-                                              ) == "Articles of Note":
+                                              ) == 'Articles of Note':
                             articles_note.append({
                                 'title': title,
                                 'url': link,
@@ -69,7 +69,7 @@ class ALD(BasicNewsRecipe):
                                 'date': ''
                             })
                         elif self.tag_to_string(p.findPreviousSibling('h3')
-                                                ) == "New Books":
+                                                ) == 'New Books':
                             new_books.append({
                                 'title': title,
                                 'url': link,
diff --git a/recipes/alejakomiksu_com.recipe b/recipes/alejakomiksu_com.recipe
index 2f22bbffaf..c08a5ada5f 100644
--- a/recipes/alejakomiksu_com.recipe
+++ b/recipes/alejakomiksu_com.recipe
@@ -29,6 +29,6 @@ class AlejaKomiksu(BasicNewsRecipe):
     def skip_ad_pages(self, soup):
         tag = soup.find(attrs={'class': 'rodzaj'})
         if tag and tag.a.string.lower().strip() == 'recenzje':
-            link = soup.find(text=re.compile('recenzuje'))
+            link = soup.find(text=re.compile(r'recenzuje'))
             if link:
                 return self.index_to_soup(link.parent['href'], raw=True)
diff --git a/recipes/alternatives_economiques.recipe b/recipes/alternatives_economiques.recipe
index 4845283694..5d5cda5911 100644
--- a/recipes/alternatives_economiques.recipe
+++ b/recipes/alternatives_economiques.recipe
@@ -21,7 +21,7 @@ class AlternativesEconomiques(BasicNewsRecipe):
     remove_images = False
 
     def get_cover_url(self):
-        """Récupère dynamiquement l'URL de la dernière une depuis MLP"""
+        '''Récupère dynamiquement l'URL de la dernière une depuis MLP'''
         br = self.get_browser()
         try:
             # Accéder à la page du magazine sur MLP
@@ -38,7 +38,7 @@ class AlternativesEconomiques(BasicNewsRecipe):
                     self.log('Cover URL found:', cover_url)
                     return cover_url
 
-            self.log('Aucune couverture trouvée, utilisation de l\'image par défaut')
+            self.log("Aucune couverture trouvée, utilisation de l'image par défaut")
             return 'https://www.alternatives-economiques.fr/sites/all/themes/alternatives-economiques-main/assets/logo-alternatives-economiques.svg'
 
         except Exception as e:
@@ -92,7 +92,7 @@ class AlternativesEconomiques(BasicNewsRecipe):
                     display_name = section_name.replace('-', ' ').title()
                     articles.append((display_name, feed_articles[:self.max_articles_per_feed]))
             except Exception as e:
-                self.log.error(f'Error processing {section_name}: {str(e)}')
+                self.log.error(f'Error processing {section_name}: {e}')
                 continue
 
         return articles
@@ -133,7 +133,7 @@ class AlternativesEconomiques(BasicNewsRecipe):
                             'description': ''
                         })
                 except Exception as e:
-                    self.log.error(f'Error getting H1 title for {article_url}: {str(e)}')
+                    self.log.error(f'Error getting H1 title for {article_url}: {e}')
                     continue
 
         return feed_articles
diff --git a/recipes/altomdata_dk.recipe b/recipes/altomdata_dk.recipe
index c0e76b1fdd..3dbdd41a0d 100644
--- a/recipes/altomdata_dk.recipe
+++ b/recipes/altomdata_dk.recipe
@@ -21,11 +21,9 @@ class WwwAltomdata_dk(BasicNewsRecipe):
     resolve_internal_links = True
     remove_empty_feeds = True
     auto_cleanup = True
-    language = 'da'
 
     feeds = [
         ('Alt om DATA, Datatid TechLife', 'http://www.altomdata.dk/feed'),
         ('Kommentarer til Alt om DATA, Datatid TechLife', 'http://www.altomdata.dk/comments/feed'),
 
     ]
-
diff --git a/recipes/am730.recipe b/recipes/am730.recipe
index 38d4a5ea9b..d5114f119e 100644
--- a/recipes/am730.recipe
+++ b/recipes/am730.recipe
@@ -34,7 +34,7 @@ class AM730(BasicNewsRecipe):
     description = 'http://www.am730.com.hk'
     category = 'Chinese, News, Hong Kong'
     masthead_url = 'https://upload.wikimedia.org/wikipedia/en/5/58/Am730_Hong_Kong_newspaper_logo.png'
-    extra_css = 'img {display: block; margin-left: auto; margin-right: auto; margin-top: 20px; margin-bottom: 20px; max-height:70%;} div[id=articleHeader] {font-size:200%; text-align:left; font-weight:bold;} li {font-size:50%; margin-left:auto; margin-right:auto;}'  # noqa
+    extra_css = 'img {display: block; margin-left: auto; margin-right: auto; margin-top: 20px; margin-bottom: 20px; max-height:70%;} div[id=articleHeader] {font-size:200%; text-align:left; font-weight:bold;} li {font-size:50%; margin-left:auto; margin-right:auto;}'  # noqa: E501
     remove_tags =[dict(name='div',attrs={'class':'col-xs-12 col-sm-1 col-md-1 share-button'}),
                 dict(name='div',attrs={'class':'logo-container print-logo'}),
                 dict(name='div',attrs={'id':'galleria'})]
@@ -53,12 +53,12 @@ class AM730(BasicNewsRecipe):
         return self.masthead_url
 
     def getAMSectionArticles(self, sectionName,url):
-        # print sectionName
+        # print(sectionName)
         soup = self.index_to_soup(url)
         articles = []
         for aTag in soup.findAll('a',attrs={'class':'newsimglink'}):
             href = aTag.get('href',False)
-            if not href.encode("utf-8").startswith(url.encode("utf-8")) :
+            if not href.encode('utf-8').startswith(url.encode('utf-8')):
                 continue  # not in same section
 
             title = href.split('/')[-1].split('-')[0]
@@ -67,7 +67,7 @@ class AM730(BasicNewsRecipe):
                 print(title)
             try:
                 if articles.index({'title':title,'url':href})>=0:
-                    # print 'already added'
+                    # print('already added')
                     continue  # already added
             except:
                 pass
@@ -78,7 +78,7 @@ class AM730(BasicNewsRecipe):
                 break
         if self.debug:
             print(articles)
-        return (sectionName,articles)
+        return sectionName, articles
 
     def parse_index(self):
         # hard code sections
@@ -89,12 +89,12 @@ class AM730(BasicNewsRecipe):
         ('體育','https://www.am730.com.hk/news/%E9%AB%94%E8%82%B2'),
         ('娛樂','https://www.am730.com.hk/news/%E5%A8%9B%E6%A8%82'),
         ('旅遊.飲食','https://www.am730.com.hk/news/%E6%97%85%E9%81%8A.%E9%A3%B2%E9%A3%9F')
-         ]       # articles =[]
+        ]       # articles =[]
         SectionsArticles=[]
-        for (title, url) in Sections:
+        for title, url in Sections:
             if self.debug:
                 print(title)
                 print(url)
             SectionsArticles.append(self.getAMSectionArticles(title,url))
-#        feeds.append(articles[0]['url'])
+        # feeds.append(articles[0]['url'])
         return SectionsArticles
diff --git a/recipes/ambito.recipe b/recipes/ambito.recipe
index 7a5a177cc6..ad83cc6605 100644
--- a/recipes/ambito.recipe
+++ b/recipes/ambito.recipe
@@ -28,9 +28,9 @@ class Ambito(BasicNewsRecipe):
     language = 'es_AR'
     publication_type = 'newsportal'
     masthead_url = 'https://www.ambito.com/css-custom/239/images/logo-239-2020v2.svg'
-    extra_css = """
+    extra_css = '''
         body{font-family: Roboto, sans-serif}
-    """
+    '''
 
     conversion_options = {
         'comment': description,
diff --git a/recipes/american_thinker.recipe b/recipes/american_thinker.recipe
index 9ad7d0f7ec..b054407f86 100644
--- a/recipes/american_thinker.recipe
+++ b/recipes/american_thinker.recipe
@@ -12,7 +12,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class AmericanThinker(BasicNewsRecipe):
     title = u'American Thinker'
-    description = "American Thinker is a daily internet publication devoted to the thoughtful exploration of issues of importance to Americans."
+    description = 'American Thinker is a daily internet publication devoted to the thoughtful exploration of issues of importance to Americans.'
     __author__ = 'Walt Anthony'
     publisher = 'Thomas Lifson'
     category = 'news, politics, USA'
@@ -33,7 +33,7 @@ class AmericanThinker(BasicNewsRecipe):
         root = html5lib.parse(
             clean_xml_chars(raw), treebuilder='lxml',
             namespaceHTMLElements=False)
-        for x in root.xpath('''descendant-or-self::*[@class and contains(concat(' ', normalize-space(@class), ' '), ' article_body ') and (@class and contains(concat(' ', normalize-space(@class), ' '), ' bottom '))]'''):  # noqa
+        for x in root.xpath('''descendant-or-self::*[@class and contains(concat(' ', normalize-space(@class), ' '), ' article_body ') and (@class and contains(concat(' ', normalize-space(@class), ' '), ' bottom '))]'''):  # noqa: E501
             x.getparent().remove(x)
         return etree.tostring(root, encoding='unicode')
 
diff --git a/recipes/anandtech.recipe b/recipes/anandtech.recipe
index aa29ed443c..8ca0011757 100644
--- a/recipes/anandtech.recipe
+++ b/recipes/anandtech.recipe
@@ -39,4 +39,4 @@ class anan(BasicNewsRecipe):
 
     def print_version(self, url):
         # return url.replace("0Cshow0C", "0Cprint0C") # 2013-09-07 AGE: update
-        return url.replace("/show/", "/print/")  # 2014-02-27 AGE: update
+        return url.replace('/show/', '/print/')  # 2014-02-27 AGE: update
diff --git a/recipes/ancient_egypt.recipe b/recipes/ancient_egypt.recipe
index c40b0aa3cc..d88a181ea3 100644
--- a/recipes/ancient_egypt.recipe
+++ b/recipes/ancient_egypt.recipe
@@ -12,7 +12,7 @@ class ancientegypt(BasicNewsRecipe):
     language = 'en'
     __author__ = 'unkn0wn'
     description = (
-        'Ancient Egypt is the world\'s leading Egyptology magazine, exploring the history, people and culture of the Nile Valley. '
+        "Ancient Egypt is the world's leading Egyptology magazine, exploring the history, people and culture of the Nile Valley. "
         'Now in a larger format with a fresh new design, AE brings you the latest news and discoveries, and feature articles covering '
         'more than 5000 years of Egyptian history. Published bimonthly.'
     )
diff --git a/recipes/andhrajyothy_ap.recipe b/recipes/andhrajyothy_ap.recipe
index 041098c8ca..86a122fb6c 100644
--- a/recipes/andhrajyothy_ap.recipe
+++ b/recipes/andhrajyothy_ap.recipe
@@ -5,7 +5,7 @@ from datetime import date
 from calibre.web.feeds.news import BasicNewsRecipe
 
 # figure out your local edition id from the log of this recipe
-edi_id = 182 # NTR VIJAYAWADA - 182
+edi_id = 182  # NTR VIJAYAWADA - 182
 
 today = date.today().strftime('%d/%m/%Y')
 
@@ -18,6 +18,7 @@ today = today.replace('/', '%2F')
 
 index = 'https://epaper.andhrajyothy.com'
 
+
 class andhra(BasicNewsRecipe):
     title = 'ఆంధ్రజ్యోతి - ఆంధ్రప్రదేశ్'
     language = 'te'
@@ -50,7 +51,7 @@ class andhra(BasicNewsRecipe):
         self.log('## For your local edition id, modify this recipe to match your edi_id from the cities below\n')
         for edi in edi_data:
             if edi['org_location'] in {'Magazines', 'Navya Daily'}:
-                    continue
+                continue
             self.log(edi['org_location'])
             cities = []
             for edi_loc in edi['editionlocation']:
@@ -75,8 +76,8 @@ class andhra(BasicNewsRecipe):
                 url = str(snaps['OrgId'])
                 if snaps['ObjectType'] == 4:
                     continue
-                feeds_dict[section].append({"title": '', "url": url})
-        return [(section, articles) for section, articles in feeds_dict.items()]
+                feeds_dict[section].append({'title': '', 'url': url})
+        return list(feeds_dict.items())
 
     def preprocess_raw_html(self, raw, *a):
         data = json.loads(raw)
diff --git a/recipes/andhrajyothy_tel.recipe b/recipes/andhrajyothy_tel.recipe
index 37cba5ebfb..eb1abb8dfd 100644
--- a/recipes/andhrajyothy_tel.recipe
+++ b/recipes/andhrajyothy_tel.recipe
@@ -5,7 +5,7 @@ from datetime import date
 from calibre.web.feeds.news import BasicNewsRecipe
 
 # figure out your local edition id from the log of this recipe
-edi_id = 34 # HYDERABAD MAIN I - 34
+edi_id = 34  # HYDERABAD MAIN I - 34
 
 today = date.today().strftime('%d/%m/%Y')
 
@@ -18,6 +18,7 @@ today = today.replace('/', '%2F')
 
 index = 'https://epaper.andhrajyothy.com'
 
+
 class andhra(BasicNewsRecipe):
     title = 'ఆంధ్రజ్యోతి - తెలంగాణ'
     language = 'te'
@@ -50,7 +51,7 @@ class andhra(BasicNewsRecipe):
         self.log('## For your local edition id, modify this recipe to match your edi_id from the cities below\n')
         for edi in edi_data:
             if edi['org_location'] in {'Magazines', 'Navya Daily'}:
-                    continue
+                continue
             self.log(edi['org_location'])
             cities = []
             for edi_loc in edi['editionlocation']:
@@ -75,8 +76,8 @@ class andhra(BasicNewsRecipe):
                 url = str(snaps['OrgId'])
                 if snaps['ObjectType'] == 4:
                     continue
-                feeds_dict[section].append({"title": '', "url": url})
-        return [(section, articles) for section, articles in feeds_dict.items()]
+                feeds_dict[section].append({'title': '', 'url': url})
+        return list(feeds_dict.items())
 
     def preprocess_raw_html(self, raw, *a):
         data = json.loads(raw)
diff --git a/recipes/android_com_pl.recipe b/recipes/android_com_pl.recipe
index c62f1ceef4..6265f25011 100644
--- a/recipes/android_com_pl.recipe
+++ b/recipes/android_com_pl.recipe
@@ -16,5 +16,5 @@ class Android_com_pl(BasicNewsRecipe):
     remove_tags_after = [{'class': 'post-content'}]
     remove_tags = [dict(name='ul', attrs={'class': 'tags small-tags'}), dict(name='a', attrs={'onclick': 'return ss_plugin_loadpopup_js(this);'})]
     preprocess_regexps = [
-        (re.compile(u'<p>.{,1}</p>', re.DOTALL), lambda match: '')]
+        (re.compile(r'<p>.{,1}</p>', re.DOTALL), lambda match: '')]
     feeds = [(u'Android', u'http://android.com.pl/feed/')]
diff --git a/recipes/android_police.recipe b/recipes/android_police.recipe
index a3b9a4114f..dd9b304600 100644
--- a/recipes/android_police.recipe
+++ b/recipes/android_police.recipe
@@ -23,36 +23,36 @@ class AdvancedUserRecipe1718384518(BasicNewsRecipe):
     auto_cleanup   = True
 
     feeds          = [
-        #Phones
+        # Phones
         ('Phones', 'https://www.androidpolice.com/feed/phones/'),
         ('News about Phones', 'https://www.androidpolice.com/feed/phones-news/'),
         ('Guides about Phones', 'https://www.androidpolice.com/feed/phones-guide/'),
         ('Phones Features', 'https://www.androidpolice.com/feed/phones-features/'),
         ('Phones & Accessory Reviews', 'https://www.androidpolice.com/feed/phones-reviews/'),
-        #Google
+        # Google
         ('Google', 'https://www.androidpolice.com/feed/google/'),
         ('News about Google', 'https://www.androidpolice.com/feed/news-google/'),
         ('Google Applications', 'https://www.androidpolice.com/feed/tag/google-app/'),
         ('Guides about Google', 'https://www.androidpolice.com/feed/guides-google/'),
         ('Features about Google', 'https://www.androidpolice.com/feed/features-google/'),
-        #Operating Systems
+        # Operating Systems
         ('Operating Systems', 'https://www.androidpolice.com/feed/operating-systems/'),
         ('News about Operating Systems', 'https://www.androidpolice.com/feed/news-operating-systems/'),
         ('Guides about Operating Systems', 'https://www.androidpolice.com/feed/guides-operating-systems/'),
         ('Features on Operating Systems', 'https://www.androidpolice.com/feed/features-operating-systems/'),
-        #Chromebooks
+        # Chromebooks
         ('Chromebooks', 'https://www.androidpolice.com/feed/laptops/'),
         ('News about Chromebooks', 'https://www.androidpolice.com/feed/news-chromebooks/'),
         ('Guides about Chromebooks', 'https://www.androidpolice.com/feed/guides-chromebooks/'),
         ('Chromebook & Laptop Reviews', 'https://www.androidpolice.com/feed/reviews-chromebooks/'),
-        #Gadgets
+        # Gadgets
         ('Gadgets', 'https://www.androidpolice.com/feed/gadgets/'),
         ('Smartwatches & Wearables', 'https://www.androidpolice.com/feed/wearables/'),
         ('Audio', 'https://www.androidpolice.com/feed/tag/audio/'),
         ('Accessories', 'https://www.androidpolice.com/feed/accessories/'),
         ('Smart Home', 'https://www.androidpolice.com/feed/smart-home/'),
         ('Applications & Games', 'https://www.androidpolice.com/feed/applications-games/'),
-        #Reviews
+        # Reviews
         ('Reviews', 'https://www.androidpolice.com/feed/reviews/'),
         ('Phones & Accessory Reviews', 'https://www.androidpolice.com/feed/phones-reviews/'),
         ('Smartwatch & Wearable Reviews', 'https://www.androidpolice.com/feed/wearable-reviews/'),
diff --git a/recipes/animal_politico.recipe b/recipes/animal_politico.recipe
index 5d23429f2a..c356126d64 100644
--- a/recipes/animal_politico.recipe
+++ b/recipes/animal_politico.recipe
@@ -32,14 +32,11 @@ class AnimalPolitico(BasicNewsRecipe):
     def parse_index(self):
         soup = self.index_to_soup('http://www.animalpolitico.com/')
         articles = []
-        for a in soup(**{
-                'name': 'a',
-                'attrs': {
+        for a in soup(name='a', attrs={
                     'href': True, 'title': True,
                     'data-author': True, 'data-type': True,
                     'data-home-title': True
-                }
-        }):
+                }):
             title = a['title']
             url = a['href']
             author = a['data-author']
diff --git a/recipes/aprospect.recipe b/recipes/aprospect.recipe
index de904a2dca..5de1cefe7d 100644
--- a/recipes/aprospect.recipe
+++ b/recipes/aprospect.recipe
@@ -19,8 +19,6 @@ class AmericanProspect(BasicNewsRecipe):
 
     use_embedded_content = False
 
-    no_stylesheets = True
-
     keep_only_tags = [
         dict(id=['title', 'content']),
     ]
diff --git a/recipes/arbetaren.recipe b/recipes/arbetaren.recipe
index e22ed5e23f..7e34597917 100644
--- a/recipes/arbetaren.recipe
+++ b/recipes/arbetaren.recipe
@@ -18,8 +18,6 @@ class Arbetaren_SE(BasicNewsRecipe):
     encoding = 'utf-8'
     language = 'sv'
     auto_cleanup   = True
-    auto_cleanup_keep = '//div[@class="thumbnail"]'
-    auto_cleanup_keep = '//div[@id="article-image"]'
-    auto_cleanup_keep = '//div[@id="article-image"]|//span[@class="important"]'
+    auto_cleanup_keep = '//div[@class="thumbnail"]|//div[@id="article-image"]|//span[@class="important"]'
 
     feeds = [(u'Nyheter', u'https://www.arbetaren.se/feed')]
diff --git a/recipes/arcamax.recipe b/recipes/arcamax.recipe
index c255442669..aef1ca6a26 100644
--- a/recipes/arcamax.recipe
+++ b/recipes/arcamax.recipe
@@ -66,19 +66,19 @@ class Arcamax(BasicNewsRecipe):
                 # (u"9 Chickweed Lane", u"https://www.arcamax.com/thefunnies/ninechickweedlane"),
                 # (u"Agnes", u"https://www.arcamax.com/thefunnies/agnes"),
                 # (u"Andy Capp", u"https://www.arcamax.com/thefunnies/andycapp"),
-                (u"BC", u"https://www.arcamax.com/thefunnies/bc"),
+                (u'BC', u'https://www.arcamax.com/thefunnies/bc'),
                 # (u"Baby Blues", u"https://www.arcamax.com/thefunnies/babyblues"),
                 # (u"Beetle Bailey", u"https://www.arcamax.com/thefunnies/beetlebailey"),
-                (u"Blondie", u"https://www.arcamax.com/thefunnies/blondie"),
+                (u'Blondie', u'https://www.arcamax.com/thefunnies/blondie'),
                 # u"Boondocks", u"https://www.arcamax.com/thefunnies/boondocks"),
                 # (u"Cathy", u"https://www.arcamax.com/thefunnies/cathy"),
                 # (u"Daddys Home", u"https://www.arcamax.com/thefunnies/daddyshome"),
                 # (u"Dinette Set", u"https://www.arcamax.com/thefunnies/thedinetteset"),
-                (u"Dog Eat Doug", u"https://www.arcamax.com/thefunnies/dogeatdoug"),
+                (u'Dog Eat Doug', u'https://www.arcamax.com/thefunnies/dogeatdoug'),
                 # (u"Doonesbury", u"https://www.arcamax.com/thefunnies/doonesbury"),
                 # (u"Dustin", u"https://www.arcamax.com/thefunnies/dustin"),
-                (u"Family Circus", u"https://www.arcamax.com/thefunnies/familycircus"),
-                (u"Garfield", u"https://www.arcamax.com/thefunnies/garfield"),
+                (u'Family Circus', u'https://www.arcamax.com/thefunnies/familycircus'),
+                (u'Garfield', u'https://www.arcamax.com/thefunnies/garfield'),
                 # (u"Get Fuzzy", u"https://www.arcamax.com/thefunnies/getfuzzy"),
                 # (u"Girls and Sports", u"https://www.arcamax.com/thefunnies/girlsandsports"),
                 # (u"Hagar the Horrible", u"https://www.arcamax.com/thefunnies/hagarthehorrible"),
@@ -87,16 +87,16 @@ class Arcamax(BasicNewsRecipe):
                 # (u"Luann", u"https://www.arcamax.com/thefunnies/luann"),
                 # (u"Momma", u"https://www.arcamax.com/thefunnies/momma"),
                 # (u"Mother Goose and Grimm", u"https://www.arcamax.com/thefunnies/mothergooseandgrimm"),
-                (u"Mutts", u"https://www.arcamax.com/thefunnies/mutts"),
+                (u'Mutts', u'https://www.arcamax.com/thefunnies/mutts'),
                 # (u"Non Sequitur", u"https://www.arcamax.com/thefunnies/nonsequitur"),
                 # (u"Pearls Before Swine", u"https://www.arcamax.com/thefunnies/pearlsbeforeswine"),
                 # (u"Pickles", u"https://www.arcamax.com/thefunnies/pickles"),
                 # (u"Red and Rover", u"https://www.arcamax.com/thefunnies/redandrover"),
                 # (u"Rubes", u"https://www.arcamax.com/thefunnies/rubes"),
                 # (u"Rugrats", u"https://www.arcamax.com/thefunnies/rugrats"),
-                (u"Speed Bump", u"https://www.arcamax.com/thefunnies/speedbump"),
-                (u"Wizard of Id", u"https://www.arcamax.com/thefunnies/wizardofid"),
-                (u"Zits", u"https://www.arcamax.com/thefunnies/zits"),
+                (u'Speed Bump', u'https://www.arcamax.com/thefunnies/speedbump'),
+                (u'Wizard of Id', u'https://www.arcamax.com/thefunnies/wizardofid'),
+                (u'Zits', u'https://www.arcamax.com/thefunnies/zits'),
         ]:
             self.log('Finding strips for:', title)
             articles = self.make_links(url, title)
diff --git a/recipes/arret_sur_images.recipe b/recipes/arret_sur_images.recipe
index d4b3520430..b4c0ba79c4 100644
--- a/recipes/arret_sur_images.recipe
+++ b/recipes/arret_sur_images.recipe
@@ -13,7 +13,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class ArretSurImages(BasicNewsRecipe):
     title = 'Arrêt sur Images'
-    description = 'Site français d\'analyse des médias'
+    description = "Site français d'analyse des médias"
     language = 'fr'
     encoding = 'utf-8'
     needs_subscription = True
@@ -27,9 +27,9 @@ class ArretSurImages(BasicNewsRecipe):
     ]
 
     def default_cover(self, cover_file):
-        """
+        '''
         Crée une couverture personnalisée avec le logo ASI
-        """
+        '''
         from qt.core import QColor, QFont, QImage, QPainter, QPen, QRect, Qt
 
         from calibre.gui2 import ensure_app, load_builtin_fonts, pixmap_to_data
@@ -45,7 +45,7 @@ class ArretSurImages(BasicNewsRecipe):
 
             weekday = french_weekday[wkd]
             month = french_month[today.month]
-            date_str = f"{weekday} {today.day} {month} {today.year}"
+            date_str = f'{weekday} {today.day} {month} {today.year}'
             edition = today.strftime('Édition de %Hh')
 
             img = QImage(1400, 1920, QImage.Format_RGB888)
@@ -123,9 +123,9 @@ class ArretSurImages(BasicNewsRecipe):
                     br.addheaders += [('Authorization', f'Bearer {auth_response["access_token"]}')]
                     print('Authentification réussie')
                 else:
-                    print('Échec de l\'authentification - Vérifiez vos identifiants')
+                    print("Échec de l'authentification - Vérifiez vos identifiants")
             except Exception as e:
-                print(f'Erreur lors de l\'authentification: {str(e)}')
+                print(f"Erreur lors de l'authentification: {e}")
         return br
 
     def get_article_url(self, article):
@@ -162,7 +162,7 @@ class ArretSurImages(BasicNewsRecipe):
                 </html>
             '''
         except Exception as e:
-            print(f'Erreur preprocessing HTML: {str(e)}')
+            print(f'Erreur preprocessing HTML: {e}')
             return raw_html
 
     def preprocess_html(self, soup):
@@ -186,11 +186,11 @@ class ArretSurImages(BasicNewsRecipe):
                                 else:
                                     tag.replace_with(img_tag)
                         except Exception as e:
-                            print(f'Erreur processing image: {str(e)}')
+                            print(f'Erreur processing image: {e}')
                             tag.decompose()
                 else:
                     tag.decompose()
             return soup
         except Exception as e:
-            print(f'Erreur preprocessing HTML: {str(e)}')
+            print(f'Erreur preprocessing HTML: {e}')
             return soup
diff --git a/recipes/asahi_shimbun_en.recipe b/recipes/asahi_shimbun_en.recipe
index 7cdbfbbc8b..5f539dc5b7 100644
--- a/recipes/asahi_shimbun_en.recipe
+++ b/recipes/asahi_shimbun_en.recipe
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__license__ = "GPL v3"
-__copyright__ = "2022, Albert Aparicio Isarn <aaparicio at posteo.net>"
+__license__ = 'GPL v3'
+__copyright__ = '2022, Albert Aparicio Isarn <aaparicio at posteo.net>'
 
-"""
+'''
 https://www.asahi.com/ajw/
-"""
+'''
 
 from datetime import datetime
 
@@ -14,99 +14,99 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class AsahiShimbunEnglishNews(BasicNewsRecipe):
-    title = "The Asahi Shimbun"
-    __author__ = "Albert Aparicio Isarn"
+    title = 'The Asahi Shimbun'
+    __author__ = 'Albert Aparicio Isarn'
 
-    description = ("The Asahi Shimbun is widely regarded for its journalism as the most respected daily newspaper in Japan."
-                   " The English version offers selected articles from the vernacular Asahi Shimbun, as well as extensive"
-                   " coverage of cool Japan,focusing on manga, travel and other timely news.")
-    publisher = "The Asahi Shimbun Company"
-    publication_type = "newspaper"
-    category = "news, japan"
-    language = "en_JP"
+    description = ('The Asahi Shimbun is widely regarded for its journalism as the most respected daily newspaper in Japan.'
+                   ' The English version offers selected articles from the vernacular Asahi Shimbun, as well as extensive'
+                   ' coverage of cool Japan,focusing on manga, travel and other timely news.')
+    publisher = 'The Asahi Shimbun Company'
+    publication_type = 'newspaper'
+    category = 'news, japan'
+    language = 'en_JP'
 
-    index = "https://www.asahi.com"
-    masthead_url = "https://p.potaufeu.asahi.com/ajw/css/images/en_logo@2x.png"
+    index = 'https://www.asahi.com'
+    masthead_url = 'https://p.potaufeu.asahi.com/ajw/css/images/en_logo@2x.png'
 
     oldest_article = 3
     max_articles_per_feed = 40
     no_stylesheets = True
     remove_javascript = True
 
-    remove_tags_before = {"id": "MainInner"}
-    remove_tags_after = {"class": "ArticleText"}
-    remove_tags = [{"name": "div", "class": "SnsUtilityArea"}]
+    remove_tags_before = {'id': 'MainInner'}
+    remove_tags_after = {'class': 'ArticleText'}
+    remove_tags = [{'name': 'div', 'class': 'SnsUtilityArea'}]
 
     def get_whats_new(self):
-        soup = self.index_to_soup(self.index + "/ajw/new")
-        news_section = soup.find("div", attrs={"class": "specialList"})
+        soup = self.index_to_soup(self.index + '/ajw/new')
+        news_section = soup.find('div', attrs={'class': 'specialList'})
 
         new_news = []
 
-        for item in news_section.findAll("li"):
-            title = item.find("p", attrs={"class": "title"}).string
-            date_string = item.find("p", attrs={"class": "date"}).next
+        for item in news_section.findAll('li'):
+            title = item.find('p', attrs={'class': 'title'}).string
+            date_string = item.find('p', attrs={'class': 'date'}).next
             date = date_string.strip()
-            url = self.index + item.find("a")["href"]
+            url = self.index + item.find('a')['href']
 
             new_news.append(
                 {
-                    "title": title,
-                    "date": datetime.strptime(date, "%B %d, %Y").strftime("%Y/%m/%d"),
-                    "url": url,
-                    "description": "",
+                    'title': title,
+                    'date': datetime.strptime(date, '%B %d, %Y').strftime('%Y/%m/%d'),
+                    'url': url,
+                    'description': '',
                 }
             )
 
         return new_news
 
     def get_top6(self, soup):
-        top = soup.find("ul", attrs={"class": "top6"})
+        top = soup.find('ul', attrs={'class': 'top6'})
 
         top6_news = []
 
-        for item in top.findAll("li"):
-            title = item.find("p", attrs={"class": "title"}).string
-            date_string = item.find("p", attrs={"class": "date"}).next
+        for item in top.findAll('li'):
+            title = item.find('p', attrs={'class': 'title'}).string
+            date_string = item.find('p', attrs={'class': 'date'}).next
             date = date_string.strip()
-            url = self.index + item.find("a")["href"]
+            url = self.index + item.find('a')['href']
 
             top6_news.append(
                 {
-                    "title": title,
-                    "date": datetime.strptime(date, "%B %d, %Y").strftime("%Y/%m/%d"),
-                    "url": url,
-                    "description": "",
+                    'title': title,
+                    'date': datetime.strptime(date, '%B %d, %Y').strftime('%Y/%m/%d'),
+                    'url': url,
+                    'description': '',
                 }
             )
 
         return top6_news
 
     def get_section_news(self, soup):
-        news_grid = soup.find("ul", attrs={"class": "default"})
+        news_grid = soup.find('ul', attrs={'class': 'default'})
 
         news = []
 
-        for item in news_grid.findAll("li"):
-            title = item.find("p", attrs={"class": "title"}).string
-            date_string = item.find("p", attrs={"class": "date"}).next
+        for item in news_grid.findAll('li'):
+            title = item.find('p', attrs={'class': 'title'}).string
+            date_string = item.find('p', attrs={'class': 'date'}).next
             date = date_string.strip()
 
-            url = self.index + item.find("a")["href"]
+            url = self.index + item.find('a')['href']
 
             news.append(
                 {
-                    "title": title,
-                    "date": datetime.strptime(date, "%B %d, %Y").strftime("%Y/%m/%d"),
-                    "url": url,
-                    "description": "",
+                    'title': title,
+                    'date': datetime.strptime(date, '%B %d, %Y').strftime('%Y/%m/%d'),
+                    'url': url,
+                    'description': '',
                 }
             )
 
         return news
 
     def get_section(self, section):
-        soup = self.index_to_soup(self.index + "/ajw/" + section)
+        soup = self.index_to_soup(self.index + '/ajw/' + section)
 
         section_news_items = self.get_top6(soup)
         section_news_items.extend(self.get_section_news(soup))
@@ -114,26 +114,26 @@ class AsahiShimbunEnglishNews(BasicNewsRecipe):
         return section_news_items
 
     def get_special_section(self, section):
-        soup = self.index_to_soup(self.index + "/ajw/" + section)
-        top = soup.find("div", attrs={"class": "Section"})
+        soup = self.index_to_soup(self.index + '/ajw/' + section)
+        top = soup.find('div', attrs={'class': 'Section'})
 
         special_news = []
 
-        for item in top.findAll("li"):
-            item_a = item.find("a")
+        for item in top.findAll('li'):
+            item_a = item.find('a')
 
-            text_split = item_a.text.strip().split("\n")
+            text_split = item_a.text.strip().split('\n')
             title = text_split[0]
             description = text_split[1].strip()
 
-            url = self.index + item_a["href"]
+            url = self.index + item_a['href']
 
             special_news.append(
                 {
-                    "title": title,
-                    "date": "",
-                    "url": url,
-                    "description": description,
+                    'title': title,
+                    'date': '',
+                    'url': url,
+                    'description': description,
                 }
             )
 
@@ -144,24 +144,24 @@ class AsahiShimbunEnglishNews(BasicNewsRecipe):
 
         feeds = [
             ("What's New", self.get_whats_new()),
-            ("National Report", self.get_section("national_report")),
-            ("Politics", self.get_section("politics")),
-            ("Business", self.get_section("business")),
-            ("Asia & World - China", self.get_section("asia_world/china")),
-            ("Asia & World - Korean Peninsula", self.get_section("asia_world/korean_peninsula")),
-            ("Asia & World - Around Asia", self.get_section("asia_world/around_asia")),
-            ("Asia & World - World", self.get_section("asia_world/world")),
-            ("Sci & Tech", self.get_section("sci_tech")),
-            ("Culture - Style", self.get_section("culture/style")),
+            ('National Report', self.get_section('national_report')),
+            ('Politics', self.get_section('politics')),
+            ('Business', self.get_section('business')),
+            ('Asia & World - China', self.get_section('asia_world/china')),
+            ('Asia & World - Korean Peninsula', self.get_section('asia_world/korean_peninsula')),
+            ('Asia & World - Around Asia', self.get_section('asia_world/around_asia')),
+            ('Asia & World - World', self.get_section('asia_world/world')),
+            ('Sci & Tech', self.get_section('sci_tech')),
+            ('Culture - Style', self.get_section('culture/style')),
             # ("Culture - Cooking", self.get_section("culture/cooking")),
-            ("Culture - Movies", self.get_section("culture/movies")),
-            ("Culture - Manga & Anime", self.get_section("culture/manga_anime")),
-            ("Travel", self.get_section("travel")),
-            ("Sports", self.get_section("sports")),
-            ("Opinion - Editorial", self.get_section("opinion/editorial")),
-            ("Opinion - Vox Populi", self.get_section("opinion/vox")),
-            ("Opinion - Views", self.get_section("opinion/views")),
-            ("Special", self.get_special_section("special")),
+            ('Culture - Movies', self.get_section('culture/movies')),
+            ('Culture - Manga & Anime', self.get_section('culture/manga_anime')),
+            ('Travel', self.get_section('travel')),
+            ('Sports', self.get_section('sports')),
+            ('Opinion - Editorial', self.get_section('opinion/editorial')),
+            ('Opinion - Vox Populi', self.get_section('opinion/vox')),
+            ('Opinion - Views', self.get_section('opinion/views')),
+            ('Special', self.get_special_section('special')),
         ]
 
         return feeds
diff --git a/recipes/asianreviewofbooks.recipe b/recipes/asianreviewofbooks.recipe
index f9e463b545..3a3565c9a3 100644
--- a/recipes/asianreviewofbooks.recipe
+++ b/recipes/asianreviewofbooks.recipe
@@ -14,7 +14,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class AsianReviewOfBooks(BasicNewsRecipe):
     title = 'The Asian Review of Books'
     __author__ = 'Darko Miletic'
-    description = 'In addition to reviewing books about or of relevance to Asia, the Asian Review of Books also features long-format essays by leading Asian writers and thinkers, to providing an unparalleled forum for discussion of key contemporary issues by Asians for Asia and a vehicle of intellectual depth and breadth where leading thinkers can write on the books, arts and ideas of the day. Widely quoted and referenced, with an archive of more than one thousand book reviews, it is the only web resource dedicated to Asian books. And now, with the addition of the new premium content, the Asian Review of Books, is a must-read publication.'  # noqa
+    description = 'In addition to reviewing books about or of relevance to Asia, the Asian Review of Books also features long-format essays by leading Asian writers and thinkers, to providing an unparalleled forum for discussion of key contemporary issues by Asians for Asia and a vehicle of intellectual depth and breadth where leading thinkers can write on the books, arts and ideas of the day. Widely quoted and referenced, with an archive of more than one thousand book reviews, it is the only web resource dedicated to Asian books. And now, with the addition of the new premium content, the Asian Review of Books, is a must-read publication.'  # noqa: E501
     publisher = 'The Asian Review of Books'
     category = 'literature, books, reviews, Asia'
     oldest_article = 30
@@ -26,11 +26,11 @@ class AsianReviewOfBooks(BasicNewsRecipe):
     publication_type = 'magazine'
     auto_cleanup = True
     masthead_url = 'https://i2.wp.com/asianreviewofbooks.com/content/wp-content/uploads/2016/09/ARBwidelogo.png'
-    extra_css             = """
+    extra_css             = '''
                                body{font-family: "Droid Serif", serif}
                                .entry-title {font-family: "Playfair Display", serif}
                                img {display: block}
-                            """
+                            '''
 
     recipe_specific_options = {
         'days': {
diff --git a/recipes/astro_news_pl.recipe b/recipes/astro_news_pl.recipe
index 8f9911dcd8..14162aae85 100644
--- a/recipes/astro_news_pl.recipe
+++ b/recipes/astro_news_pl.recipe
@@ -4,7 +4,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class AstroNEWS(BasicNewsRecipe):
     title = u'AstroNEWS'
     __author__ = 'fenuks'
-    description = u'AstroNEWS regularnie dostarcza wiadomości o wydarzeniach związanych z astronomią i astronautyką. Informujemy o aktualnych odkryciach i wydarzeniach naukowych, zapowiadamy ciekawe zjawiska astronomiczne. Serwis jest częścią portalu astronomicznego AstroNET prowadzonego przez miłośników astronomii i zawodowych astronomów.'  # noqa
+    description = u'AstroNEWS regularnie dostarcza wiadomości o wydarzeniach związanych z astronomią i astronautyką. Informujemy o aktualnych odkryciach i wydarzeniach naukowych, zapowiadamy ciekawe zjawiska astronomiczne. Serwis jest częścią portalu astronomicznego AstroNET prowadzonego przez miłośników astronomii i zawodowych astronomów.'  # noqa: E501
     category = 'astronomy, science'
     language = 'pl'
     oldest_article = 8
diff --git a/recipes/atlantic.recipe b/recipes/atlantic.recipe
index a8a0d7565b..51b5fda9b5 100644
--- a/recipes/atlantic.recipe
+++ b/recipes/atlantic.recipe
@@ -12,7 +12,7 @@ test_article = None
 # test_article = 'https://www.theatlantic.com/health/archive/2020/12/covid-19-second-surge/617415/?utm_source=feed'
 
 
-# {{{ parse article JSON
+# parse article JSON {{{
 def process_image_block(lines, block):
     caption = block.get('captionText')
     caption_lines = []
diff --git a/recipes/atlantic_com.recipe b/recipes/atlantic_com.recipe
index f8a96645bc..496ef3277a 100644
--- a/recipes/atlantic_com.recipe
+++ b/recipes/atlantic_com.recipe
@@ -12,7 +12,7 @@ test_article = None
 # test_article = 'https://www.theatlantic.com/health/archive/2020/12/covid-19-second-surge/617415/?utm_source=feed'
 
 
-# {{{ parse article JSON
+# parse article JSON {{{
 def process_image_block(lines, block):
     caption = block.get('captionText')
     caption_lines = []
diff --git a/recipes/attac_es.recipe b/recipes/attac_es.recipe
index 6b91dece96..d6882eeaf1 100644
--- a/recipes/attac_es.recipe
+++ b/recipes/attac_es.recipe
@@ -11,7 +11,7 @@ class AttacEspanaRecipe (BasicNewsRecipe):
     __license__ = 'GPL v3'
     __copyright__ = '2012, Marc Busqué <marc@lamarciana.com>'
     title = u'attac.es'
-    description = u'La Asociación por la Tasación de las Transacciones Financieras y por la Ayuda a los Ciudadanos (ATTAC) es un movimiento internacional altermundialista que promueve el control democrático de los mercados financieros y las instituciones encargadas de su control mediante la reflexión política y la movilización social.'  # noqa
+    description = u'La Asociación por la Tasación de las Transacciones Financieras y por la Ayuda a los Ciudadanos (ATTAC) es un movimiento internacional altermundialista que promueve el control democrático de los mercados financieros y las instituciones encargadas de su control mediante la reflexión política y la movilización social.'  # noqa: E501
     url = 'http://www.attac.es'
     language = 'es'
     tags = 'contrainformación, información alternativa'
diff --git a/recipes/avisen_dk.recipe b/recipes/avisen_dk.recipe
index 15d8033f24..2b0aa9f8ed 100644
--- a/recipes/avisen_dk.recipe
+++ b/recipes/avisen_dk.recipe
@@ -24,4 +24,3 @@ class WwwAvisen_dk(BasicNewsRecipe):
     feeds = [
                 ('Nyheder fra Avisen.dk', 'http://www.avisen.dk/rss.aspx'),
     ]
-
diff --git a/recipes/ba_herald.recipe b/recipes/ba_herald.recipe
index 91cac54aa8..40758a84e7 100644
--- a/recipes/ba_herald.recipe
+++ b/recipes/ba_herald.recipe
@@ -24,12 +24,12 @@ class BuenosAiresHerald(BasicNewsRecipe):
     publication_type = 'newspaper'
     masthead_url = 'http://www.buenosairesherald.com/img/logo.jpg'
     INDEX = 'http://www.buenosairesherald.com'
-    extra_css             = """
+    extra_css             = '''
                                body{font-family: Arial,Helvetica,sans-serif }
                                img{margin-bottom: 0.4em; display:block}
                                h1{font-family: Georgia,serif}
                                #fecha{text-align: right; font-size: small}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/backyard_boss.recipe b/recipes/backyard_boss.recipe
index 783fd11183..2626a3baec 100644
--- a/recipes/backyard_boss.recipe
+++ b/recipes/backyard_boss.recipe
@@ -22,21 +22,21 @@ class AdvancedUserRecipe1718382046(BasicNewsRecipe):
     auto_cleanup   = True
 
     feeds          = [
-        #Gardening
+        # Gardening
         ('Gardening', 'https://www.backyardboss.net/feed/category/gardening/'),
         ('Outdoor Gardening', 'https://www.backyardboss.net/feed/category/gardening/outdoor-gardening/'),
         ('Indoor Gardening', 'https://www.backyardboss.net/feed/category/gardening/indoor-gardening/'),
         ('Fruits & Vegetables', 'https://www.backyardboss.net/feed/tag/gardening/fruits-and-vegetables/'),
         ('Houseplants', 'https://www.backyardboss.net/feed/category/gardening/houseplants/'),
         ('Plant Care', 'https://www.backyardboss.net/feed/category/gardening/plant-care/'),
-        #Backyard
+        # Backyard
         ('Backyard', 'https://www.backyardboss.net/feed/category/backyard/'),
         ('Home Improvement', 'https://www.backyardboss.net/feed/category/backyard/home-improvement/'),
         ('Lawn Care', 'https://www.backyardboss.net/feed/category/backyard/lawn-care/'),
         ('Landscaping', 'https://www.backyardboss.net/feed/category/backyard/landscape-industry/'),
         ('Barbecue', 'https://www.backyardboss.net/feed/category/backyard/bbq/'),
         ('Reviews', 'https://www.backyardboss.net/feed/category/backyard/reviews/'),
-        #DIY & Project
+        # DIY & Project
         ('DIY & Projects', 'https://www.backyardboss.net/feed/category/diy/'),
         ('How-To', 'https://www.backyardboss.net/feed/category/diy/how-to/'),
         ('Designs & Ideas', 'https://www.backyardboss.net/feed/category/diy/designs-and-ideas/'),
diff --git a/recipes/baikaljournal.recipe b/recipes/baikaljournal.recipe
index 58d4e86d07..c134c2f024 100644
--- a/recipes/baikaljournal.recipe
+++ b/recipes/baikaljournal.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class BaikalJournal(BasicNewsRecipe):
     title = '\u041B\u044E\u0434\u0438 \u0411\u0430\u0439\u043A\u0430\u043B\u0430'
     __author__ = 'bugmen00t'
-    description = '\u041D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u044B\u0439 \u0430\u0432\u0442\u043E\u0440\u0441\u043A\u0438\u0439 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0436\u0443\u0440\u043D\u0430\u043B \u043E \u0436\u0438\u0437\u043D\u0438 \u0432 \u0421\u0438\u0431\u0438\u0440\u0438 \u0438 \u0432\u043E\u043A\u0440\u0443\u0433 \u0411\u0430\u0439\u043A\u0430\u043B\u0430, \u043E\u043F\u0438\u0441\u044B\u0432\u0430\u044E\u0449\u0438\u0439 \u0436\u0438\u0437\u043D\u044C \u0432 \u0441\u0438\u0431\u0438\u0440\u0441\u043A\u043E\u0439 \u0433\u043B\u0443\u0431\u0438\u043D\u043A\u0435.'  # noqa
-    publisher = '\u041E\u043B\u044C\u0433\u0430 \u041C\u0443\u0442\u043E\u0432\u0438\u043D\u0430, \u0415\u043B\u0435\u043D\u0430 \u0422\u0440\u0438\u0444\u043E\u043D\u043E\u0432\u0430'  # noqa
+    description = '\u041D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u044B\u0439 \u0430\u0432\u0442\u043E\u0440\u0441\u043A\u0438\u0439 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0436\u0443\u0440\u043D\u0430\u043B \u043E \u0436\u0438\u0437\u043D\u0438 \u0432 \u0421\u0438\u0431\u0438\u0440\u0438 \u0438 \u0432\u043E\u043A\u0440\u0443\u0433 \u0411\u0430\u0439\u043A\u0430\u043B\u0430, \u043E\u043F\u0438\u0441\u044B\u0432\u0430\u044E\u0449\u0438\u0439 \u0436\u0438\u0437\u043D\u044C \u0432 \u0441\u0438\u0431\u0438\u0440\u0441\u043A\u043E\u0439 \u0433\u043B\u0443\u0431\u0438\u043D\u043A\u0435.'  # noqa: E501
+    publisher = '\u041E\u043B\u044C\u0433\u0430 \u041C\u0443\u0442\u043E\u0432\u0438\u043D\u0430, \u0415\u043B\u0435\u043D\u0430 \u0422\u0440\u0438\u0444\u043E\u043D\u043E\u0432\u0430'  # noqa: E501
     category = 'blog'
     cover_url = u'https://baikal-journal.ru/wp-content/themes/baikal/assets/img/logo-full.svg'
     language = 'ru'
diff --git a/recipes/bangkokpost.recipe b/recipes/bangkokpost.recipe
index 464ad9800c..259a7bcb6c 100644
--- a/recipes/bangkokpost.recipe
+++ b/recipes/bangkokpost.recipe
@@ -16,7 +16,7 @@ class BangkokPostRecipe(BasicNewsRecipe):
     title = u'Bangkok Post'
     publisher = u'Post Publishing PCL'
     category = u'News'
-    description = u'The world\'s window to Thailand'
+    description = u"The world's window to Thailand"
 
     oldest_article = 7
     max_articles_per_feed = 100
diff --git a/recipes/bar_and_bench.recipe b/recipes/bar_and_bench.recipe
index 9fe81716bb..f6ebe248ad 100644
--- a/recipes/bar_and_bench.recipe
+++ b/recipes/bar_and_bench.recipe
@@ -26,7 +26,7 @@ class bar(BasicNewsRecipe):
         prefixed_classes(
             'text-story-m_story-tags__ story-footer-module__metype__'
         ),
-        dict(name = 'svg')
+        dict(name='svg')
     ]
 
     def preprocess_html(self, soup):
diff --git a/recipes/barrons.recipe b/recipes/barrons.recipe
index 4ec30b325c..007605fd0e 100644
--- a/recipes/barrons.recipe
+++ b/recipes/barrons.recipe
@@ -8,11 +8,11 @@ from calibre.web.feeds.news import BasicNewsRecipe, classes, prefixed_classes
 
 
 class barrons(BasicNewsRecipe):
-    title = 'Barron\'s Magazine'
+    title = "Barron's Magazine"
     __author__ = 'unkn0wn'
     description = (
-        'Barron\'s is an American weekly magazine/newspaper published by Dow Jones & Company. Founded in 1921 as a sister '
-        'publication to The Wall Street Journal, Barron\'s covers U.S. financial information, market developments, and '
+        "Barron's is an American weekly magazine/newspaper published by Dow Jones & Company. Founded in 1921 as a sister "
+        "publication to The Wall Street Journal, Barron's covers U.S. financial information, market developments, and "
         'relevant statistics.'
     )
     language = 'en_US'
@@ -82,7 +82,7 @@ class barrons(BasicNewsRecipe):
     recipe_specific_options = {
         'date': {
             'short': 'The date of the edition to download (YYYYMMDD format)',
-            'long': 'For example, 20240722.\nIf it didn\'t work, try again later.'
+            'long': "For example, 20240722.\nIf it didn't work, try again later."
         }
     }
 
@@ -119,7 +119,7 @@ class barrons(BasicNewsRecipe):
             byl = articles.find(**prefixed_classes('BarronsTheme--byline--'))
             if byl:
                 desc += self.tag_to_string(byl)
-            ttr =  articles.find(**prefixed_classes('BarronsTheme--time-to-read--'))
+            ttr = articles.find(**prefixed_classes('BarronsTheme--time-to-read--'))
             if ttr:
                 desc += self.tag_to_string(ttr)
             summ = articles.find(**prefixed_classes('BarronsTheme--summary--'))
@@ -127,7 +127,7 @@ class barrons(BasicNewsRecipe):
                 desc += ' | ' + self.tag_to_string(summ)
             self.log('\t', title, ' ', url, '\n\t', desc)
             ans[section].append({'title': title, 'url': url, 'description': desc})
-        return [(section, articles) for section, articles in ans.items()]
+        return list(ans.items())
 
     def print_version(self, url):
         return url.split('?')[0].replace('/articles/', '/amp/articles/')
diff --git a/recipes/bbc.recipe b/recipes/bbc.recipe
index 7302d02d3f..a872d50550 100644
--- a/recipes/bbc.recipe
+++ b/recipes/bbc.recipe
@@ -135,9 +135,9 @@ class BBCNews(BasicNewsRecipe):
 
     # Select / de-select the feeds you want in your ebook.
     feeds = [
-        ("News Home", "https://feeds.bbci.co.uk/news/rss.xml"),
-        ("UK", "https://feeds.bbci.co.uk/news/uk/rss.xml"),
-        ("World", "https://feeds.bbci.co.uk/news/world/rss.xml"),
+        ('News Home', 'https://feeds.bbci.co.uk/news/rss.xml'),
+        ('UK', 'https://feeds.bbci.co.uk/news/uk/rss.xml'),
+        ('World', 'https://feeds.bbci.co.uk/news/world/rss.xml'),
         # ("England", "https://feeds.bbci.co.uk/news/england/rss.xml"),
         # ("Scotland", "https://feeds.bbci.co.uk/news/scotland/rss.xml"),
         # ("Wales", "https://feeds.bbci.co.uk/news/wales/rss.xml"),
@@ -147,26 +147,26 @@ class BBCNews(BasicNewsRecipe):
         # ("Europe", "https://feeds.bbci.co.uk/news/world/europe/rss.xml"),
         # ("Latin America", "https://feeds.bbci.co.uk/news/world/latin_america/rss.xml"),
         # ("Middle East", "https://feeds.bbci.co.uk/news/world/middle_east/rss.xml"),
-        ("US & Canada", "https://feeds.bbci.co.uk/news/world/us_and_canada/rss.xml"),
-        ("Politics", "https://feeds.bbci.co.uk/news/politics/rss.xml"),
-        ("Science/Environment",
-         "https://feeds.bbci.co.uk/news/science_and_environment/rss.xml"),
-        ("Technology", "https://feeds.bbci.co.uk/news/technology/rss.xml"),
-        ("Magazine", "https://feeds.bbci.co.uk/news/magazine/rss.xml"),
-        ("Entertainment/Arts",
-         "https://feeds.bbci.co.uk/news/entertainment_and_arts/rss.xml"),
+        ('US & Canada', 'https://feeds.bbci.co.uk/news/world/us_and_canada/rss.xml'),
+        ('Politics', 'https://feeds.bbci.co.uk/news/politics/rss.xml'),
+        ('Science/Environment',
+         'https://feeds.bbci.co.uk/news/science_and_environment/rss.xml'),
+        ('Technology', 'https://feeds.bbci.co.uk/news/technology/rss.xml'),
+        ('Magazine', 'https://feeds.bbci.co.uk/news/magazine/rss.xml'),
+        ('Entertainment/Arts',
+         'https://feeds.bbci.co.uk/news/entertainment_and_arts/rss.xml'),
         # ("Health", "https://feeds.bbci.co.uk/news/health/rss.xml"),
         # ("Education/Family", "https://feeds.bbci.co.uk/news/education/rss.xml"),
-        ("Business", "https://feeds.bbci.co.uk/news/business/rss.xml"),
-        ("Special Reports", "https://feeds.bbci.co.uk/news/special_reports/rss.xml"),
-        ("Also in the News", "https://feeds.bbci.co.uk/news/also_in_the_news/rss.xml"),
+        ('Business', 'https://feeds.bbci.co.uk/news/business/rss.xml'),
+        ('Special Reports', 'https://feeds.bbci.co.uk/news/special_reports/rss.xml'),
+        ('Also in the News', 'https://feeds.bbci.co.uk/news/also_in_the_news/rss.xml'),
         # ("Newsbeat", "https://www.bbc.co.uk/newsbeat/rss.xml"),
         # ("Click", "http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/programmes/click_online/rss.xml"),
         # ("Blog: Mark D'Arcy (Parliamentary Correspondent)", "https://feeds.bbci.co.uk/news/correspondents/markdarcy/rss.sxml"),
         # ("Blog: Robert Peston (Business Editor)", "https://feeds.bbci.co.uk/news/correspondents/robertpeston/rss.sxml"),
         # ("Blog: Stephanie Flanders (Economics Editor)", "https://feeds.bbci.co.uk/news/correspondents/stephanieflanders/rss.sxml"),
-        ("Sport Front Page",
-         "http://newsrss.bbc.co.uk/rss/sportonline_uk_edition/front_page/rss.xml"),
+        ('Sport Front Page',
+         'http://newsrss.bbc.co.uk/rss/sportonline_uk_edition/front_page/rss.xml'),
         # ("Football", "http://newsrss.bbc.co.uk/rss/sportonline_uk_edition/football/rss.xml"),
         # ("Cricket", "http://newsrss.bbc.co.uk/rss/sportonline_uk_edition/cricket/rss.xml"),
         # ("Rugby Union", "http://newsrss.bbc.co.uk/rss/sportonline_uk_edition/rugby_union/rss.xml"),
diff --git a/recipes/bbc_brasil.recipe b/recipes/bbc_brasil.recipe
index 840c589401..d6e8619cdf 100644
--- a/recipes/bbc_brasil.recipe
+++ b/recipes/bbc_brasil.recipe
@@ -201,24 +201,24 @@ class BBCBrasilRecipe(BasicNewsRecipe):
     conversion_options = {'smarten_punctuation': True}
 
     # Specify extra CSS - overrides ALL other CSS (IE. Added last).
-    extra_css = 'body { font-family: verdana, helvetica, sans-serif; } \
-                 .introduction, .first { font-weight: bold; } \
-                 .cross-head { font-weight: bold; font-size: 125%; } \
-                 .cap, .caption { display: block; font-size: 80%; font-style: italic; } \
-                 .cap, .caption, .caption img, .caption span { display: block; text-align: center; margin: 5px auto; } \
-                 .byl, .byd, .byline img, .byline-name, .byline-title, .author-name, .author-position, \
-                    .correspondent-portrait img, .byline-lead-in, .name, .role, .bbc-role { display: block; \
-                    text-align: center; font-size: 80%; font-style: italic; margin: 1px auto; } \
-                 .story-date, .published, .datestamp { font-size: 80%; } \
-                 table { width: 100%; } \
-                 td img { display: block; margin: 5px auto; } \
-                 ul { padding-top: 10px; } \
-                 ol { padding-top: 10px; } \
-                 li { padding-top: 5px; padding-bottom: 5px; } \
-                 h1 { text-align: center; font-size: 175%; font-weight: bold; } \
-                 h2 { text-align: center; font-size: 150%; font-weight: bold; } \
-                 h3 { text-align: center; font-size: 125%; font-weight: bold; } \
-                 h4, h5, h6 { text-align: center; font-size: 100%; font-weight: bold; }'
+    extra_css = '''body { font-family: verdana, helvetica, sans-serif; }
+                   .introduction, .first { font-weight: bold; }
+                   .cross-head { font-weight: bold; font-size: 125%; }
+                   .cap, .caption { display: block; font-size: 80%; font-style: italic; }
+                   .cap, .caption, .caption img, .caption span { display: block; text-align: center; margin: 5px auto; }
+                   .byl, .byd, .byline img, .byline-name, .byline-title, .author-name, .author-position,
+                      .correspondent-portrait img, .byline-lead-in, .name, .role, .bbc-role { display: block;
+                      text-align: center; font-size: 80%; font-style: italic; margin: 1px auto; }
+                   .story-date, .published, .datestamp { font-size: 80%; }
+                   table { width: 100%; }
+                   td img { display: block; margin: 5px auto; }
+                   ul { padding-top: 10px; }
+                   ol { padding-top: 10px; }
+                   li { padding-top: 5px; padding-bottom: 5px; }
+                   h1 { text-align: center; font-size: 175%; font-weight: bold; }
+                   h2 { text-align: center; font-size: 150%; font-weight: bold; }
+                   h3 { text-align: center; font-size: 125%; font-weight: bold; }
+                   h4, h5, h6 { text-align: center; font-size: 100%; font-weight: bold; }'''
 
     # Remove various tag attributes to improve the look of the ebook pages.
     remove_attributes = ['border', 'cellspacing', 'align', 'cellpadding', 'colspan',
@@ -556,19 +556,19 @@ class BBCBrasilRecipe(BasicNewsRecipe):
     def print_version(self, url):
 
         # Handle sports page urls type 01:
-        if (url.find("go/rss/-/sport1/") != -1):
-            temp_url = url.replace("go/rss/-/", "")
+        if (url.find('go/rss/-/sport1/') != -1):
+            temp_url = url.replace('go/rss/-/', '')
 
         # Handle sports page urls type 02:
-        elif (url.find("go/rss/int/news/-/sport1/") != -1):
-            temp_url = url.replace("go/rss/int/news/-/", "")
+        elif (url.find('go/rss/int/news/-/sport1/') != -1):
+            temp_url = url.replace('go/rss/int/news/-/', '')
 
         # Handle regular news page urls:
         else:
-            temp_url = url.replace("go/rss/int/news/-/", "")
+            temp_url = url.replace('go/rss/int/news/-/', '')
 
         # Always add "?print=true" to the end of the url.
-        print_url = temp_url + "?print=true"
+        print_url = temp_url + '?print=true'
 
         return print_url
 
diff --git a/recipes/bbc_es.recipe b/recipes/bbc_es.recipe
index 4c2e51ed74..e5a7fd49f4 100644
--- a/recipes/bbc_es.recipe
+++ b/recipes/bbc_es.recipe
@@ -36,7 +36,7 @@ class AdvancedUserRecipe1294946868(BasicNewsRecipe):
     remove_tags_after = dict(name='div', attrs={'class': [' g-w8']})
 
     remove_tags = [
-        dict(name='ul', attrs={'class': ['document-tools blq-clearfix', 'blq-clearfix']}), dict(name='div', attrs={'class': ['box bx-quote-bubble', 'socialmedia-links', 'list li-carousel', 'list li-plain rolling-news', 'list li-plain', 'box bx-livestats', 'li-tab content', 'list li-relatedlinks', 'list li-relatedinternetlinks']})  # noqa
+        dict(name='ul', attrs={'class': ['document-tools blq-clearfix', 'blq-clearfix']}), dict(name='div', attrs={'class': ['box bx-quote-bubble', 'socialmedia-links', 'list li-carousel', 'list li-plain rolling-news', 'list li-plain', 'box bx-livestats', 'li-tab content', 'list li-relatedlinks', 'list li-relatedinternetlinks']})  # noqa: E501
     ]
 
     feeds = [
diff --git a/recipes/bbc_fast.recipe b/recipes/bbc_fast.recipe
index a53d5a6db9..a7fa84aaa5 100644
--- a/recipes/bbc_fast.recipe
+++ b/recipes/bbc_fast.recipe
@@ -134,7 +134,7 @@ if __name__ == '__main__':
 class BBC(BasicNewsRecipe):
     title = 'BBC News (fast)'
     __author__ = 'Kovid Goyal'
-    description = 'Visit BBC News for up-to-the-minute news, breaking news, video, audio and feature stories. BBC News provides trusted World and UK news as well as local and regional perspectives. Also entertainment, business, science, technology and health news.'  # noqa
+    description = 'Visit BBC News for up-to-the-minute news, breaking news, video, audio and feature stories. BBC News provides trusted World and UK news as well as local and regional perspectives. Also entertainment, business, science, technology and health news.'  # noqa: E501
     oldest_article = 2
     max_articles_per_feed = 100
     no_stylesheets = True
diff --git a/recipes/bbc_sport.recipe b/recipes/bbc_sport.recipe
index 62d16ef337..9f6a8b7411 100644
--- a/recipes/bbc_sport.recipe
+++ b/recipes/bbc_sport.recipe
@@ -21,7 +21,7 @@ class BBC(BasicNewsRecipe):
     category = 'sport, news, UK, world'
     language = 'en_GB'
     publication_type = 'newsportal'
-    extra_css = ' body{ font-family: Verdana,Helvetica,Arial,sans-serif } .introduction{font-weight: bold} .story-feature{display: block; padding: 0; border: 1px solid; width: 40%; font-size: small} .story-feature h2{text-align: center; text-transform: uppercase} '  # noqa
+    extra_css = ' body{ font-family: Verdana,Helvetica,Arial,sans-serif } .introduction{font-weight: bold} .story-feature{display: block; padding: 0; border: 1px solid; width: 40%; font-size: small} .story-feature h2{text-align: center; text-transform: uppercase} '  # noqa: E501
     preprocess_regexps = [(re.compile(r'<!--.*?-->', re.DOTALL), lambda m: '')]
     conversion_options = {
         'comments': description, 'tags': category, 'language': language, 'publisher': publisher, 'linearize_tables': True
diff --git a/recipes/before_we_go.recipe b/recipes/before_we_go.recipe
index 062a02d62e..cb0516083c 100644
--- a/recipes/before_we_go.recipe
+++ b/recipes/before_we_go.recipe
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
- # vim:fileencoding=utf-8
+# vim:fileencoding=utf-8
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
@@ -9,10 +9,10 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class BeforeWeGo(BasicNewsRecipe):
     title                 = 'Before We Go'
     __author__            = 'bugmen00t'
-    description           = 'Before We Go Blog is a collective of Fantasy, Sci-Fi and Graphic Novel fans from around the world, passionate about providing awesome, enjoyable reviews for anyone who loves a good book!'  # noqa
+    description           = 'Before We Go Blog is a collective of Fantasy, Sci-Fi and Graphic Novel fans from around the world, passionate about providing awesome, enjoyable reviews for anyone who loves a good book!'  # noqa: E501
     publisher             = 'BEFOREWEGOBLOG'
     category              = 'blog'
-#     cover_url = u'https://i0.wp.com/beforewegoblog.com/wp-content/uploads/2021/09/beth-with-long-hair.jpeg'
+    # cover_url = u'https://i0.wp.com/beforewegoblog.com/wp-content/uploads/2021/09/beth-with-long-hair.jpeg'
     cover_url = u'https://i0.wp.com/beforewegoblog.com/wp-content/uploads/2021/01/before-we-go-blog-1.png'
     language              = 'en'
     no_stylesheets        = True
@@ -24,9 +24,9 @@ class BeforeWeGo(BasicNewsRecipe):
     remove_tags_before = dict(name='h1', attrs={'class': 'entry-title'})
 
     remove_tags_after = dict(name='div', attrs={'id': 'author-bio'})
-#    remove_tags_after = dict(name='article')
+    # remove_tags_after = dict(name='article')
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='div', attrs={'class': 'nectar-scrolling-text font_size_10vh custom_color has-custom-divider'}),
         dict(name='span', attrs={'class': 'meta-comment-count'}),
         dict(name='p', attrs={'id': 'breadcrumbs'})
diff --git a/recipes/bellingcat_en.recipe b/recipes/bellingcat_en.recipe
index 2931ca7196..4c80bf220c 100644
--- a/recipes/bellingcat_en.recipe
+++ b/recipes/bellingcat_en.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Bellingcat(BasicNewsRecipe):
     title = 'Bellingcat'
     __author__ = 'bugmen00t'
-    description = 'Bellingcat is an independent international collective of researchers, investigators and citizen journalists using open source and social media investigation to probe a variety of subjects – from Mexican drug lords and crimes against humanity, to tracking the use of chemical weapons and conflicts worldwide. With staff and contributors in more than 20 countries around the world, we operate in a unique field where advanced technology, forensic research, journalism, investigations, transparency and accountability come together.'  # noqa
+    description = 'Bellingcat is an independent international collective of researchers, investigators and citizen journalists using open source and social media investigation to probe a variety of subjects – from Mexican drug lords and crimes against humanity, to tracking the use of chemical weapons and conflicts worldwide. With staff and contributors in more than 20 countries around the world, we operate in a unique field where advanced technology, forensic research, journalism, investigations, transparency and accountability come together.'  # noqa: E501
     publisher = 'Stichting Bellingcat'
     category = 'blog'
     cover_url = u'https://www.bellingcat.com/app/uploads/2018/04/bellingcat_HP_logo_black.jpg'
diff --git a/recipes/bellingcat_es.recipe b/recipes/bellingcat_es.recipe
index 239fb6ed15..191a4f8460 100644
--- a/recipes/bellingcat_es.recipe
+++ b/recipes/bellingcat_es.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Bellingcat(BasicNewsRecipe):
     title = 'Bellingcat'
     __author__ = 'bugmen00t'
-    description = 'Bellingcat es un colectivo internacional independiente de investigadores y periodistas ciudadanos que usan informaci\u00F3n de fuente abierta y redes sociales para investigar una gran variedad de temas, desde carteles de droga en M\u00E9xico y cr\u00EDmenes de lesa humanidad hasta el rastreo de armas qu\u00EDmicas en zonas de conflicto alrededor del mundo. Nosotros operamos en un campo \u00FAnico donde la tecnolog\u00EDa avanzada, las investigaciones forenses, el periodismo, y la transparencia y responsabilidad se unen.'  # noqa
+    description = 'Bellingcat es un colectivo internacional independiente de investigadores y periodistas ciudadanos que usan informaci\u00F3n de fuente abierta y redes sociales para investigar una gran variedad de temas, desde carteles de droga en M\u00E9xico y cr\u00EDmenes de lesa humanidad hasta el rastreo de armas qu\u00EDmicas en zonas de conflicto alrededor del mundo. Nosotros operamos en un campo \u00FAnico donde la tecnolog\u00EDa avanzada, las investigaciones forenses, el periodismo, y la transparencia y responsabilidad se unen.'  # noqa: E501
     publisher = 'Stichting Bellingcat'
     category = 'blog'
     cover_url = u'https://www.bellingcat.com/app/uploads/2018/04/bellingcat_HP_logo_black.jpg'
diff --git a/recipes/bellingcat_fr.recipe b/recipes/bellingcat_fr.recipe
index ea119aacc6..14a60e0a5c 100644
--- a/recipes/bellingcat_fr.recipe
+++ b/recipes/bellingcat_fr.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Bellingcat(BasicNewsRecipe):
     title = 'Bellingcat'
     __author__ = 'bugmen00t'
-    description = 'Bellingcat est un groupe international ind\u00E9pendant de chercheurs, d\u0027enqu\u00EAteurs et de journalistes citoyens utilisant \u00E0 la fois: enqu\u00EAtes \u0027open source\u0027 et r\u00E9seaux sociaux, pour sonder une vari\u00E9t\u00E9 de sujets - trafiquants de drogue mexicains, crimes contre l\u0027humanit\u00E9, suivi de l\u0027utilisation d\u0027armes chimiques et conflits dans le monde entier. Nous op\u00E9rons dans un domaine unique dans lequel technologie de pointe, recherche m\u00E9dico-l\u00E9gale, journalisme, enqu\u00EAtes, transparence et responsabilit\u00E9 se rencontrent.'  # noqa
+    description = 'Bellingcat est un groupe international ind\u00E9pendant de chercheurs, d\u0027enqu\u00EAteurs et de journalistes citoyens utilisant \u00E0 la fois: enqu\u00EAtes \u0027open source\u0027 et r\u00E9seaux sociaux, pour sonder une vari\u00E9t\u00E9 de sujets - trafiquants de drogue mexicains, crimes contre l\u0027humanit\u00E9, suivi de l\u0027utilisation d\u0027armes chimiques et conflits dans le monde entier. Nous op\u00E9rons dans un domaine unique dans lequel technologie de pointe, recherche m\u00E9dico-l\u00E9gale, journalisme, enqu\u00EAtes, transparence et responsabilit\u00E9 se rencontrent.'  # noqa: E501
     publisher = 'Stichting Bellingcat'
     category = 'blog'
     cover_url = u'https://www.bellingcat.com/app/uploads/2018/04/bellingcat_HP_logo_black.jpg'
diff --git a/recipes/bellingcat_ru.recipe b/recipes/bellingcat_ru.recipe
index a5884f2b5f..60b27faa85 100644
--- a/recipes/bellingcat_ru.recipe
+++ b/recipes/bellingcat_ru.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Bellingcat(BasicNewsRecipe):
     title = '\u0411\u0435\u043B\u043B\u0438\u043D\u0433\u043A\u044D\u0442 (bell\u00BFngcat)'
     __author__ = 'bugmen00t'
-    description = 'Bellingcat \u2014 \u044D\u0442\u043E \u043D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u0430\u044F \u043C\u0435\u0436\u0434\u0443\u043D\u0430\u0440\u043E\u0434\u043D\u0430\u044F \u043A\u043E\u043C\u0430\u043D\u0434\u0430 \u0440\u0430\u0441\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439 \u0438 \u0433\u0440\u0430\u0436\u0434\u0430\u043D\u0441\u043A\u0438\u0445 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u043E\u0432, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u044E\u0442 \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A\u0438 \u0438 \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0435 \u0441\u0435\u0442\u0438 \u0434\u043B\u044F \u0440\u0430\u0441\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u043D\u0438\u0439 \u043D\u0430 \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u044B\u0435 \u0442\u0435\u043C\u044B \u2014 \u043E\u0442 \u043C\u0435\u043A\u0441\u0438\u043A\u0430\u043D\u0441\u043A\u0438\u0445 \u043D\u0430\u0440\u043A\u043E\u043A\u0430\u0440\u0442\u0435\u043B\u0435\u0439 \u0438 \u043F\u0440\u0435\u0441\u0442\u0443\u043F\u043B\u0435\u043D\u0438\u0439 \u043F\u0440\u043E\u0442\u0438\u0432 \u0447\u0435\u043B\u043E\u0432\u0435\u0447\u0435\u0441\u0442\u0432\u0430 \u0434\u043E \u043E\u0442\u0441\u043B\u0435\u0436\u0438\u0432\u0430\u043D\u0438\u044F \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u044F \u0445\u0438\u043C\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u043E\u0440\u0443\u0436\u0438\u044F \u0438 \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u043E\u0432 \u043F\u043E \u0432\u0441\u0435\u043C\u0443 \u043C\u0438\u0440\u0443 \u2014 \u0441\u043E\u0447\u0435\u0442\u0430\u044F \u0441\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435 \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u0438, \u043A\u0440\u0438\u043C\u0438\u043D\u0430\u043B\u0438\u0441\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u044D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u044B, \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0438\u043A\u0443, \u0440\u0430\u0441\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u043D\u0438\u044F \u0438 \u0431\u043E\u0440\u044C\u0431\u0443 \u0437\u0430 \u043F\u0440\u043E\u0437\u0440\u0430\u0447\u043D\u043E\u0441\u0442\u044C \u0438 \u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u0441\u0442\u044C.'  # noqa
+    description = 'Bellingcat \u2014 \u044D\u0442\u043E \u043D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u0430\u044F \u043C\u0435\u0436\u0434\u0443\u043D\u0430\u0440\u043E\u0434\u043D\u0430\u044F \u043A\u043E\u043C\u0430\u043D\u0434\u0430 \u0440\u0430\u0441\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439 \u0438 \u0433\u0440\u0430\u0436\u0434\u0430\u043D\u0441\u043A\u0438\u0445 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u043E\u0432, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u044E\u0442 \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A\u0438 \u0438 \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0435 \u0441\u0435\u0442\u0438 \u0434\u043B\u044F \u0440\u0430\u0441\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u043D\u0438\u0439 \u043D\u0430 \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u044B\u0435 \u0442\u0435\u043C\u044B \u2014 \u043E\u0442 \u043C\u0435\u043A\u0441\u0438\u043A\u0430\u043D\u0441\u043A\u0438\u0445 \u043D\u0430\u0440\u043A\u043E\u043A\u0430\u0440\u0442\u0435\u043B\u0435\u0439 \u0438 \u043F\u0440\u0435\u0441\u0442\u0443\u043F\u043B\u0435\u043D\u0438\u0439 \u043F\u0440\u043E\u0442\u0438\u0432 \u0447\u0435\u043B\u043E\u0432\u0435\u0447\u0435\u0441\u0442\u0432\u0430 \u0434\u043E \u043E\u0442\u0441\u043B\u0435\u0436\u0438\u0432\u0430\u043D\u0438\u044F \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u044F \u0445\u0438\u043C\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u043E\u0440\u0443\u0436\u0438\u044F \u0438 \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u043E\u0432 \u043F\u043E \u0432\u0441\u0435\u043C\u0443 \u043C\u0438\u0440\u0443 \u2014 \u0441\u043E\u0447\u0435\u0442\u0430\u044F \u0441\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435 \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u0438, \u043A\u0440\u0438\u043C\u0438\u043D\u0430\u043B\u0438\u0441\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u044D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u044B, \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0438\u043A\u0443, \u0440\u0430\u0441\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u043D\u0438\u044F \u0438 \u0431\u043E\u0440\u044C\u0431\u0443 \u0437\u0430 \u043F\u0440\u043E\u0437\u0440\u0430\u0447\u043D\u043E\u0441\u0442\u044C \u0438 \u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u0441\u0442\u044C.'  # noqa: E501
     publisher = 'Stichting Bellingcat'
     category = 'blog'
     cover_url = u'https://www.bellingcat.com/app/uploads/2018/04/bellingcat_HP_logo_black.jpg'
diff --git a/recipes/bellingcat_uk.recipe b/recipes/bellingcat_uk.recipe
index fa5cd98be1..5d6a482904 100644
--- a/recipes/bellingcat_uk.recipe
+++ b/recipes/bellingcat_uk.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Bellingcat(BasicNewsRecipe):
     title = '\u0411\u0435\u043B\u043B\u0456\u043D\u0433\u043A\u0435\u0442 (bell\u00BFngcat)'
     __author__ = 'bugmen00t'
-    description = '\u0411\u0435\u043B\u043B\u0456\u043D\u0433\u043A\u0435\u0442 \u2014 \u043D\u0435\u0437\u0430\u043B\u0435\u0436\u043D\u0438\u0439 \u043C\u0456\u0436\u043D\u0430\u0440\u043E\u0434\u043D\u0438\u0439 \u043A\u043E\u043B\u0435\u043A\u0442\u0438\u0432 \u0434\u043E\u0441\u043B\u0456\u0434\u043D\u0438\u043A\u0456\u0432, \u0441\u043B\u0456\u0434\u0447\u0438\u0445 \u0456 \u0433\u0440\u043E\u043C\u0430\u0434\u044F\u043D\u0441\u044C\u043A\u0438\u0445 \u0436\u0443\u0440\u043D\u0430\u043B\u0456\u0441\u0442\u0456\u0432, \u044F\u043A\u0456 \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u044E\u0442\u044C \u0432\u0456\u0434\u043A\u0440\u0438\u0442\u0456 \u0434\u0436\u0435\u0440\u0435\u043B\u0430 \u0442\u0430 \u0441\u043E\u0446\u0456\u0430\u043B\u044C\u043D\u0456 \u043C\u0435\u0440\u0435\u0436\u0456 \u0434\u043B\u044F \u0440\u043E\u0437\u0441\u043B\u0456\u0434\u0443\u0432\u0430\u043D\u043D\u044F \u0440\u0456\u0437\u043D\u043E\u043C\u0430\u043D\u0456\u0442\u043D\u0438\u0445 \u0442\u0435\u043C \u2014 \u0432\u0456\u0434 \u043C\u0435\u043A\u0441\u0438\u043A\u0430\u043D\u0441\u044C\u043A\u0438\u0445 \u043D\u0430\u0440\u043A\u043E\u0431\u0430\u0440\u043E\u043D\u0456\u0432 \u0456 \u0437\u043B\u043E\u0447\u0438\u043D\u0456\u0432 \u043F\u0440\u043E\u0442\u0438 \u043B\u044E\u0434\u0441\u0442\u0432\u0430, \u0434\u043E \u0432\u0456\u0434\u0441\u0442\u0435\u0436\u0435\u043D\u043D\u044F \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u0430\u043D\u043D\u044F \u0445\u0456\u043C\u0456\u0447\u043D\u043E\u0457 \u0437\u0431\u0440\u043E\u0457 \u0442\u0430 \u043A\u043E\u043D\u0444\u043B\u0456\u043A\u0442\u0456\u0432 \u0443 \u0432\u0441\u044C\u043E\u043C\u0443 \u0441\u0432\u0456\u0442\u0456. \u041C\u0438 \u043F\u0440\u0430\u0446\u044E\u0454\u043C\u043E \u0432 \u0443\u043D\u0456\u043A\u0430\u043B\u044C\u043D\u0456\u0439 \u0441\u0444\u0435\u0440\u0456, \u0434\u0435 \u043F\u0435\u0440\u0435\u0434\u043E\u0432\u0456 \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0456\u0457, \u0441\u0443\u0434\u043E\u0432\u043E-\u043C\u0435\u0434\u0438\u0447\u043D\u0456 \u0434\u043E\u0441\u043B\u0456\u0434\u0436\u0435\u043D\u043D\u044F, \u0436\u0443\u0440\u043D\u0430\u043B\u0456\u0441\u0442\u0438\u043A\u0430, \u0440\u043E\u0437\u0441\u043B\u0456\u0434\u0443\u0432\u0430\u043D\u043D\u044F, \u043F\u0440\u043E\u0437\u043E\u0440\u0456\u0441\u0442\u044C \u0456 \u0432\u0456\u0434\u043F\u043E\u0432\u0456\u0434\u0430\u043B\u044C\u043D\u0456\u0441\u0442\u044C \u043E\u0431\u2019\u0454\u0434\u043D\u0443\u044E\u0442\u044C\u0441\u044F.'  # noqa
+    description = '\u0411\u0435\u043B\u043B\u0456\u043D\u0433\u043A\u0435\u0442 \u2014 \u043D\u0435\u0437\u0430\u043B\u0435\u0436\u043D\u0438\u0439 \u043C\u0456\u0436\u043D\u0430\u0440\u043E\u0434\u043D\u0438\u0439 \u043A\u043E\u043B\u0435\u043A\u0442\u0438\u0432 \u0434\u043E\u0441\u043B\u0456\u0434\u043D\u0438\u043A\u0456\u0432, \u0441\u043B\u0456\u0434\u0447\u0438\u0445 \u0456 \u0433\u0440\u043E\u043C\u0430\u0434\u044F\u043D\u0441\u044C\u043A\u0438\u0445 \u0436\u0443\u0440\u043D\u0430\u043B\u0456\u0441\u0442\u0456\u0432, \u044F\u043A\u0456 \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u044E\u0442\u044C \u0432\u0456\u0434\u043A\u0440\u0438\u0442\u0456 \u0434\u0436\u0435\u0440\u0435\u043B\u0430 \u0442\u0430 \u0441\u043E\u0446\u0456\u0430\u043B\u044C\u043D\u0456 \u043C\u0435\u0440\u0435\u0436\u0456 \u0434\u043B\u044F \u0440\u043E\u0437\u0441\u043B\u0456\u0434\u0443\u0432\u0430\u043D\u043D\u044F \u0440\u0456\u0437\u043D\u043E\u043C\u0430\u043D\u0456\u0442\u043D\u0438\u0445 \u0442\u0435\u043C \u2014 \u0432\u0456\u0434 \u043C\u0435\u043A\u0441\u0438\u043A\u0430\u043D\u0441\u044C\u043A\u0438\u0445 \u043D\u0430\u0440\u043A\u043E\u0431\u0430\u0440\u043E\u043D\u0456\u0432 \u0456 \u0437\u043B\u043E\u0447\u0438\u043D\u0456\u0432 \u043F\u0440\u043E\u0442\u0438 \u043B\u044E\u0434\u0441\u0442\u0432\u0430, \u0434\u043E \u0432\u0456\u0434\u0441\u0442\u0435\u0436\u0435\u043D\u043D\u044F \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u0430\u043D\u043D\u044F \u0445\u0456\u043C\u0456\u0447\u043D\u043E\u0457 \u0437\u0431\u0440\u043E\u0457 \u0442\u0430 \u043A\u043E\u043D\u0444\u043B\u0456\u043A\u0442\u0456\u0432 \u0443 \u0432\u0441\u044C\u043E\u043C\u0443 \u0441\u0432\u0456\u0442\u0456. \u041C\u0438 \u043F\u0440\u0430\u0446\u044E\u0454\u043C\u043E \u0432 \u0443\u043D\u0456\u043A\u0430\u043B\u044C\u043D\u0456\u0439 \u0441\u0444\u0435\u0440\u0456, \u0434\u0435 \u043F\u0435\u0440\u0435\u0434\u043E\u0432\u0456 \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0456\u0457, \u0441\u0443\u0434\u043E\u0432\u043E-\u043C\u0435\u0434\u0438\u0447\u043D\u0456 \u0434\u043E\u0441\u043B\u0456\u0434\u0436\u0435\u043D\u043D\u044F, \u0436\u0443\u0440\u043D\u0430\u043B\u0456\u0441\u0442\u0438\u043A\u0430, \u0440\u043E\u0437\u0441\u043B\u0456\u0434\u0443\u0432\u0430\u043D\u043D\u044F, \u043F\u0440\u043E\u0437\u043E\u0440\u0456\u0441\u0442\u044C \u0456 \u0432\u0456\u0434\u043F\u043E\u0432\u0456\u0434\u0430\u043B\u044C\u043D\u0456\u0441\u0442\u044C \u043E\u0431\u2019\u0454\u0434\u043D\u0443\u044E\u0442\u044C\u0441\u044F.'  # noqa: E501
     publisher = 'Stichting Bellingcat'
     category = 'blog'
     cover_url = u'https://www.bellingcat.com/app/uploads/2018/04/bellingcat_HP_logo_black.jpg'
diff --git a/recipes/benchmark_pl.recipe b/recipes/benchmark_pl.recipe
index 3b588b72dd..e187756553 100644
--- a/recipes/benchmark_pl.recipe
+++ b/recipes/benchmark_pl.recipe
@@ -17,13 +17,13 @@ class BenchmarkPl(BasicNewsRecipe):
     extra_css = 'ul {list-style-type: none;}'
     no_stylesheets = True
     use_embedded_content = False
-    preprocess_regexps = [(re.compile(u'<h3><span style="font-size: small;">&nbsp;Zobacz poprzednie <a href="http://www.benchmark.pl/news/zestawienie/grupa_id/135">Opinie dnia:</a></span>.*</body>',  # noqa
-        re.DOTALL | re.IGNORECASE), lambda match: '</body>'), (re.compile(u'Więcej o .*?</ul>', re.DOTALL | re.IGNORECASE), lambda match: '')]  # noqa
+    preprocess_regexps = [(re.compile(u'<h3><span style="font-size: small;">&nbsp;Zobacz poprzednie <a href="http://www.benchmark.pl/news/zestawienie/grupa_id/135">Opinie dnia:</a></span>.*</body>',  # noqa: E501, RUF039
+        re.DOTALL | re.IGNORECASE), lambda match: '</body>'), (re.compile(u'Więcej o .*?</ul>', re.DOTALL | re.IGNORECASE), lambda match: '')]  # noqa: RUF039
 
     keep_only_tags = [dict(id=['articleHeader', 'articleGallery']), dict(
         name='div', attrs={'class': ['m_zwykly', 'gallery']}), dict(id='article')]
     remove_tags_after = dict(id='article')
-    remove_tags = [dict(name='div', attrs={'class': ['comments', 'body', 'kategoria', 'socialize', 'thumb', 'panelOcenaObserwowane', 'categoryNextToSocializeGallery', 'breadcrumb', 'footer', 'moreTopics']}), dict(name='table', attrs={ 'background': 'http://www.benchmark.pl/uploads/backend_img/a/fotki_newsy/opinie_dnia/bg.png'}), dict(name='table', attrs={'width': '210', 'cellspacing': '1', 'cellpadding': '4', 'border': '0', 'align': 'right'})]  # noqa
+    remove_tags = [dict(name='div', attrs={'class': ['comments', 'body', 'kategoria', 'socialize', 'thumb', 'panelOcenaObserwowane', 'categoryNextToSocializeGallery', 'breadcrumb', 'footer', 'moreTopics']}), dict(name='table', attrs={'background': 'http://www.benchmark.pl/uploads/backend_img/a/fotki_newsy/opinie_dnia/bg.png'}), dict(name='table', attrs={'width': '210', 'cellspacing': '1', 'cellpadding': '4', 'border': '0', 'align': 'right'})]  # noqa: E501
 
     INDEX = 'http://www.benchmark.pl'
     feeds = [(u'Aktualności', u'http://www.benchmark.pl/rss/aktualnosci-pliki.xml'),
diff --git a/recipes/berfreunde_blog.recipe b/recipes/berfreunde_blog.recipe
index 997588ecd8..cebf908515 100644
--- a/recipes/berfreunde_blog.recipe
+++ b/recipes/berfreunde_blog.recipe
@@ -25,7 +25,6 @@ class bergfreunde_blog(BasicNewsRecipe):
     __author__ = 'VoHe'
     no_stylesheets = True
     remove_javascript = True
-    remove_javascript = True
     remove_empty_feeds = True
     ignore_duplicate_articles = {'title', 'url'}
 
diff --git a/recipes/bild_de.recipe b/recipes/bild_de.recipe
index a4150f80fc..2801ed376b 100644
--- a/recipes/bild_de.recipe
+++ b/recipes/bild_de.recipe
@@ -63,12 +63,12 @@ class AdvancedUserRecipe1303841067(BasicNewsRecipe):
         dict(
             attrs={'class': ['socialbar', 'social-sharing flank', 'vel', 'back']}),
         dict(name='img', attrs={'alt': 'logo'}),
-        dict(name='div', attrs={'class': re.compile('infoEl')}),
-        dict(name='span', attrs={'class': re.compile('loupe')})
+        dict(name='div', attrs={'class': re.compile(r'infoEl')}),
+        dict(name='span', attrs={'class': re.compile(r'loupe')})
     ]
 
     remove_tags_after = [
-        dict(name='div', attrs={'itemprop': re.compile('articleBody')})
+        dict(name='div', attrs={'itemprop': re.compile(r'articleBody')})
     ]
 
     def preprocess_html(self, soup):
diff --git a/recipes/billorielly.recipe b/recipes/billorielly.recipe
index 3369cc49e2..bb87260362 100644
--- a/recipes/billorielly.recipe
+++ b/recipes/billorielly.recipe
@@ -30,7 +30,7 @@ class BillOReilly(BasicNewsRecipe):
             feeds.append(("O'Reilly Factor", articles_shows))
 
         if articles_columns:
-            feeds.append(("Newspaper Column", articles_columns))
+            feeds.append(('Newspaper Column', articles_columns))
 
         return feeds
 
@@ -49,8 +49,7 @@ class BillOReilly(BasicNewsRecipe):
                     continue
 
                 if url.startswith('/'):
-                    url = 'http://www.billoreilly.com' + url + \
-                        '&dest=/pg/jsp/community/tvshowprint.jsp'
+                    url = 'http://www.billoreilly.com' + url + '&dest=/pg/jsp/community/tvshowprint.jsp'
 
                 self.log('\t\tFound article:', title)
                 self.log('\t\t\t', url)
diff --git a/recipes/birmingham_evening_mail.recipe b/recipes/birmingham_evening_mail.recipe
index 8217f13d73..8549dd2216 100644
--- a/recipes/birmingham_evening_mail.recipe
+++ b/recipes/birmingham_evening_mail.recipe
@@ -57,8 +57,7 @@ class AdvancedUserRecipe1306097511(BasicNewsRecipe):
 
     def get_cover_url(self):
         soup = self.index_to_soup('http://www.birminghammail.co.uk')
-        cov = soup.find(attrs={'src': re.compile(
-            'http://images.icnetwork.co.uk/upl/birm')})
+        cov = soup.find(attrs={'src': re.compile(r'http://images.icnetwork.co.uk/upl/birm')})
         cov = str(cov)
         cov2 = re.findall(
             r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', cov)
diff --git a/recipes/blesk.recipe b/recipes/blesk.recipe
index 8757bf4dcf..3a50ee8b8b 100644
--- a/recipes/blesk.recipe
+++ b/recipes/blesk.recipe
@@ -27,15 +27,15 @@ class bleskRecipe(BasicNewsRecipe):
     cover_url = 'http://img.blesk.cz/images/blesk/blesk-logo.png'
     remove_javascript = True
     no_stylesheets = True
-    extra_css             = """
-                            """
+    extra_css             = '''
+                            '''
 
     remove_attributes = []
     remove_tags_before = dict(name='div', attrs={'id': ['boxContent']})
     remove_tags_after = dict(name='div', attrs={'class': ['artAuthors']})
-    remove_tags = [dict(name='div',   attrs={'class': ['link_clanek']}),
-                   dict(name='div',   attrs={'id': ['partHeader']}),
-                   dict(name='div',   attrs={'id': ['top_bottom_box', 'lista_top']})]
+    remove_tags = [dict(name='div', attrs={'class': ['link_clanek']}),
+                   dict(name='div', attrs={'id': ['partHeader']}),
+                   dict(name='div', attrs={'id': ['top_bottom_box', 'lista_top']})]
     preprocess_regexps = [(re.compile(r'<div class="(textovytip|related)".*',
                                       re.DOTALL | re.IGNORECASE), lambda match: '</body>')]
 
diff --git a/recipes/blic.recipe b/recipes/blic.recipe
index 7368ec530e..ec44e53123 100644
--- a/recipes/blic.recipe
+++ b/recipes/blic.recipe
@@ -13,7 +13,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Blic(BasicNewsRecipe):
     title = 'Blic'
     __author__ = 'Darko Miletic'
-    description = 'Blic.rs online verzija najtiraznije novine u Srbiji donosi najnovije vesti iz Srbije i sveta, komentare, politicke analize, poslovne i ekonomske vesti, vesti iz regiona, intervjue, informacije iz kulture, reportaze, pokriva sve sportske dogadjaje, detaljan tv program, nagradne igre, zabavu, fenomenalni Blic strip, dnevni horoskop, arhivu svih dogadjaja'  # noqa
+    description = 'Blic.rs online verzija najtiraznije novine u Srbiji donosi najnovije vesti iz Srbije i sveta, komentare, politicke analize, poslovne i ekonomske vesti, vesti iz regiona, intervjue, informacije iz kulture, reportaze, pokriva sve sportske dogadjaje, detaljan tv program, nagradne igre, zabavu, fenomenalni Blic strip, dnevni horoskop, arhivu svih dogadjaja'  # noqa: E501
     publisher = 'RINGIER d.o.o.'
     category = 'news, politics, Serbia'
     oldest_article = 2
@@ -23,7 +23,7 @@ class Blic(BasicNewsRecipe):
     masthead_url = 'http://www.blic.rs/resources/images/header/header_back.png'
     language = 'sr'
     publication_type = 'newspaper'
-    extra_css             = """
+    extra_css             = '''
                                @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)}
                                @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)}
                                body{font-family: Georgia, serif1, serif}
@@ -35,13 +35,13 @@ class Blic(BasicNewsRecipe):
                                .potpis{font-size: x-small; color: gray}
                                .article_info{font-size: small}
                                img{margin-bottom: 0.8em; margin-top: 0.8em; display: block}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language, 'linearize_tables': True
     }
 
-    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]  # noqa: RUF039
     remove_tags_before = dict(name='div', attrs={'id': 'article_info'})
     remove_tags = [
         dict(name=['object', 'link', 'meta', 'base', 'object', 'embed'])]
diff --git a/recipes/bloomberg-business-week.recipe b/recipes/bloomberg-business-week.recipe
index 8d3753fc20..e13167ca14 100644
--- a/recipes/bloomberg-business-week.recipe
+++ b/recipes/bloomberg-business-week.recipe
@@ -56,7 +56,7 @@ class Bloomberg(BasicNewsRecipe):
     masthead_url = 'https://assets.bwbx.io/s3/javelin/public/hub/images/BW-Logo-Black-cc9035fbb3.svg'
     description = (
         'Bloomberg Businessweek helps global leaders stay ahead with insights and in-depth analysis on the people,'
-        ' companies, events, and trends shaping today\'s complex, global economy.'
+        " companies, events, and trends shaping today's complex, global economy."
     )
     remove_empty_feeds = True
 
@@ -124,8 +124,8 @@ class Bloomberg(BasicNewsRecipe):
             cat = '<div class="cat">' + data['primaryCategory'] + '</div>'
 
         if 'abstract' in data and data['abstract'] and data['abstract'] is not None:
-            subhead = '<div class="subhead"><ul><li>' + '</li><li>'.join([x for x in data['abstract']]) + '</li></ul></div>'
-        elif 'summary' in data and data['summary']:
+            subhead = '<div class="subhead"><ul><li>' + '</li><li>'.join(list(data['abstract'])) + '</li></ul></div>'
+        elif data.get('summary'):
             subhead = '<div class="subhead"><p>' + data['summary'] + '</p></div>'
 
         if 'byline' in data and data['byline'] is not None:
diff --git a/recipes/bloomberg.recipe b/recipes/bloomberg.recipe
index e2bc3f3831..40846337dd 100644
--- a/recipes/bloomberg.recipe
+++ b/recipes/bloomberg.recipe
@@ -58,7 +58,7 @@ class Bloomberg(BasicNewsRecipe):
         'Bloomberg delivers business and markets news, data, analysis, and video'
         ' to the world, featuring stories from Businessweek and Bloomberg News.'
     )
-    oldest_article = 1.2 # days
+    oldest_article = 1.2  # days
     resolve_internal_links = True
     remove_empty_feeds = True
     cover_url = 'https://assets.bwbx.io/images/users/iqjWHBFdfxIU/ivUxvlPidC3M/v0/600x-1.jpg'
@@ -134,8 +134,8 @@ class Bloomberg(BasicNewsRecipe):
             cat = '<div class="cat">' + data['primaryCategory'] + '</div>'
 
         if 'abstract' in data and data['abstract'] and data['abstract'] is not None:
-            subhead = '<div class="subhead"><ul><li>' + '</li><li>'.join([x for x in data['abstract']]) + '</li></ul></div>'
-        elif 'summary' in data and data['summary']:
+            subhead = '<div class="subhead"><ul><li>' + '</li><li>'.join(list(data['abstract'])) + '</li></ul></div>'
+        elif data.get('summary'):
             subhead = '<div class="subhead"><p>' + data['summary'] + '</p></div>'
 
         if 'byline' in data and data['byline'] is not None:
diff --git a/recipes/bookforummagazine.recipe b/recipes/bookforummagazine.recipe
index cab082a8e3..f5e8cbdb98 100644
--- a/recipes/bookforummagazine.recipe
+++ b/recipes/bookforummagazine.recipe
@@ -2,29 +2,29 @@ from urllib.parse import urljoin
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
-_issue_url = ""
+_issue_url = ''
 
 
 class BookforumMagazine(BasicNewsRecipe):
-    title = "Bookforum"
+    title = 'Bookforum'
     description = (
-        "Bookforum is an American book review magazine devoted to books and "
-        "the discussion of literature. https://www.bookforum.com/print"
+        'Bookforum is an American book review magazine devoted to books and '
+        'the discussion of literature. https://www.bookforum.com/print'
     )
-    language = "en"
-    __author__ = "ping"
-    publication_type = "magazine"
-    encoding = "utf-8"
+    language = 'en'
+    __author__ = 'ping'
+    publication_type = 'magazine'
+    encoding = 'utf-8'
     remove_javascript = True
     no_stylesheets = True
     auto_cleanup = False
     compress_news_images = True
     compress_news_images_auto_size = 8
 
-    keep_only_tags = [dict(class_="blog-article")]
-    remove_tags = [dict(name=["af-share-toggle", "af-related-articles"])]
+    keep_only_tags = [dict(class_='blog-article')]
+    remove_tags = [dict(name=['af-share-toggle', 'af-related-articles'])]
 
-    extra_css = """
+    extra_css = '''
     .blog-article__header { font-size: 1.8rem; margin-bottom: 0.4rem; }
     .blog-article__subtitle { font-size: 1.2rem; font-style: italic; margin-bottom: 1rem; }
     .blog-article__writer { font-size: 1rem; font-weight: bold; color: #444; }
@@ -33,46 +33,46 @@ class BookforumMagazine(BasicNewsRecipe):
         display: block; max-width: 100%; height: auto;
     }
     .blog-article__caption { font-size: 0.8rem; display: block; margin-top: 0.2rem; }
-    """
+    '''
 
     def preprocess_html(self, soup):
         # strip away links that's not needed
-        for ele in soup.select(".blog-article__header a"):
+        for ele in soup.select('.blog-article__header a'):
             ele.unwrap()
         return soup
 
     def parse_index(self):
         soup = self.index_to_soup(
-            _issue_url if _issue_url else "https://www.bookforum.com/print"
+            _issue_url if _issue_url else 'https://www.bookforum.com/print'
         )
-        meta_ele = soup.find("meta", property="og:title")
+        meta_ele = soup.find('meta', property='og:title')
         if meta_ele:
             self.timefmt = f' [{meta_ele["content"]}]'
 
-        cover_ele = soup.find("img", class_="toc-issue__cover")
+        cover_ele = soup.find('img', class_='toc-issue__cover')
         if cover_ele:
             self.cover_url = urljoin(
-                "https://www.bookforum.com",
-                soup.find("img", class_="toc-issue__cover")["src"],
+                'https://www.bookforum.com',
+                soup.find('img', class_='toc-issue__cover')['src'],
             )
 
         articles = {}
-        for sect_ele in soup.find_all("div", class_="toc-articles__section"):
+        for sect_ele in soup.find_all('div', class_='toc-articles__section'):
             section_name = self.tag_to_string(
-                sect_ele.find("a", class_="toc__anchor-links__link")
+                sect_ele.find('a', class_='toc__anchor-links__link')
             )
-            for article_ele in sect_ele.find_all("article"):
-                title_ele = article_ele.find("h1")
-                sub_title_ele = article_ele.find(class_="toc-article__subtitle")
+            for article_ele in sect_ele.find_all('article'):
+                title_ele = article_ele.find('h1')
+                sub_title_ele = article_ele.find(class_='toc-article__subtitle')
                 articles.setdefault(section_name, []).append(
                     {
-                        "title": self.tag_to_string(title_ele),
-                        "url": article_ele.find("a", class_="toc-article__link")[
-                            "href"
+                        'title': self.tag_to_string(title_ele),
+                        'url': article_ele.find('a', class_='toc-article__link')[
+                            'href'
                         ],
-                        "description": self.tag_to_string(sub_title_ele)
+                        'description': self.tag_to_string(sub_title_ele)
                         if sub_title_ele
-                        else "",
+                        else '',
                     }
                 )
         return articles.items()
diff --git a/recipes/borsen_dk.recipe b/recipes/borsen_dk.recipe
index 3a4e47f345..5414105b39 100644
--- a/recipes/borsen_dk.recipe
+++ b/recipes/borsen_dk.recipe
@@ -22,9 +22,9 @@ class Borsen_dk(BasicNewsRecipe):
     language              = 'da'
 
     keep_only_tags = [
-        dict(name="h1", attrs={'itemprop': 'headline'}),
-        dict(name="div", attrs={'itemprob': 'datePublished'}),
-        dict(name="div", attrs={'itemprop': 'articleBody'}),
+        dict(name='h1', attrs={'itemprop': 'headline'}),
+        dict(name='div', attrs={'itemprob': 'datePublished'}),
+        dict(name='div', attrs={'itemprop': 'articleBody'}),
     ]
 
     # Feed are found here:
diff --git a/recipes/boston.com.recipe b/recipes/boston.com.recipe
index 82f75c53d4..e4cbd3cd2f 100644
--- a/recipes/boston.com.recipe
+++ b/recipes/boston.com.recipe
@@ -42,24 +42,24 @@ def class_startswith(*prefixes):
 
 # From: https://www3.bostonglobe.com/lifestyle/comics?arc404=true
 comics_to_fetch = {
-    "ADAM@HOME": 'ad',
-    "ARLO & JANIS": 'aj',
+    'ADAM@HOME': 'ad',
+    'ARLO & JANIS': 'aj',
     # "CUL DE SAC": 'cds',
     # "CURTIS": 'kfcrt',
-    "DILBERT": 'dt',
-    "DOONESBURY": 'db',
-    "DUSTIN": 'kfdus',
-    "F MINUS": 'fm',
-    "FOR BETTER OR WORSE": 'fb',
+    'DILBERT': 'dt',
+    'DOONESBURY': 'db',
+    'DUSTIN': 'kfdus',
+    'F MINUS': 'fm',
+    'FOR BETTER OR WORSE': 'fb',
     # "GET FUZZY": 'gz',
     # "MOTHER GOOSE & GRIMM": 'tmmgg',
     # "JUMPSTART": 'jt',
-    "MONTY": 'mt',
+    'MONTY': 'mt',
     # "POOCH CAFE",
-    "RHYMES WITH ORANGE": 'kfrwo',
+    'RHYMES WITH ORANGE': 'kfrwo',
     # "ROSE IS ROSE": 'rr',
     # "ZIPPY THE PINHEAD": 'kfzpy',
-    "ZITS": 'kfzt'
+    'ZITS': 'kfzt'
 }
 
 
@@ -77,10 +77,10 @@ def extract_json(raw_html):
 
 
 def absolutize_url(url):
-    if url.startswith("//"):
-        return "https:" + url
+    if url.startswith('//'):
+        return 'https:' + url
     if url.startswith('/'):
-        url = "https://www.bostonglobe.com" + url
+        url = 'https://www.bostonglobe.com' + url
     return url
 
 
@@ -120,7 +120,7 @@ def main():
 
 class BostonGlobeSubscription(BasicNewsRecipe):
 
-    title = "Boston Globe"
+    title = 'Boston Globe'
     __author__ = 'Kovid Goyal'
     description = 'The Boston Globe'
     language = 'en_US'
diff --git a/recipes/boston_globe_print_edition.recipe b/recipes/boston_globe_print_edition.recipe
index 8c5e81df7c..7a48a86b43 100644
--- a/recipes/boston_globe_print_edition.recipe
+++ b/recipes/boston_globe_print_edition.recipe
@@ -12,6 +12,7 @@ def class_as_string(x):
         x = ' '.join(x)
     return x
 
+
 def class_startswith(*prefixes):
 
     def q(x):
@@ -24,18 +25,19 @@ def class_startswith(*prefixes):
 
     return dict(attrs={'class': q})
 
+
 def absolutize_url(url):
-    if url.startswith("//"):
-        return "https:" + url
+    if url.startswith('//'):
+        return 'https:' + url
     if url.startswith('/'):
-        url = "https://www.bostonglobe.com" + url
+        url = 'https://www.bostonglobe.com' + url
     return url
 
 
 class BostonGlobePrint(BasicNewsRecipe):
-    title = "Boston Globe | Print Edition"
+    title = 'Boston Globe | Print Edition'
     __author__ = 'Kovid Goyal, unkn0wn'
-    description = 'The Boston Globe - Today\'s Paper'
+    description = "The Boston Globe - Today's Paper"
     language = 'en_US'
 
     keep_only_tags = [
@@ -70,7 +72,7 @@ class BostonGlobePrint(BasicNewsRecipe):
             for image in soup.findAll('img', src=True):
                 if image['src'].endswith('750.jpg'):
                     return 'https:' + image['src']
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             cover = None
         return cover
 
@@ -94,8 +96,8 @@ class BostonGlobePrint(BasicNewsRecipe):
                     desc = self.tag_to_string(d)
 
                 self.log(section, '\n\t', title, '\n\t', desc, '\n\t\t', url)
-                feeds_dict[section].append({"title": title, "url": url, "description": desc})
-        return [(section, articles) for section, articles in feeds_dict.items()]
+                feeds_dict[section].append({'title': title, 'url': url, 'description': desc})
+        return list(feeds_dict.items())
 
     def preprocess_raw_html(self, raw_html, url):
         soup = self.index_to_soup(raw_html)
diff --git a/recipes/breaking_mad.recipe b/recipes/breaking_mad.recipe
index e0b0574b65..d9cc454363 100644
--- a/recipes/breaking_mad.recipe
+++ b/recipes/breaking_mad.recipe
@@ -8,7 +8,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class AdvancedUserRecipe1467715002(BasicNewsRecipe):
     title = 'Breaking Mad'
     __author__ = 'bugmen00t'
-    description = 'Breaking Mad - пока смерть не насмешит нас. Breakingmad - это агрегатор самых странных и драматичных новостей с жизнеутверждающим эффектом. Breakingmad - это все, что вы должны знать о России и не только.'  # noqa
+    description = 'Breaking Mad - пока смерть не насмешит нас. Breakingmad - это агрегатор самых странных и драматичных новостей с жизнеутверждающим эффектом. Breakingmad - это все, что вы должны знать о России и не только.'  # noqa: E501
     publisher = 'BreakingMad'
     category = 'news'
     cover_url = u'http://breakingmad.me/images/logo.png'
diff --git a/recipes/brewiarz.recipe b/recipes/brewiarz.recipe
index ada68ebd17..0eb5cf0542 100644
--- a/recipes/brewiarz.recipe
+++ b/recipes/brewiarz.recipe
@@ -5,7 +5,6 @@ from __future__ import print_function
 __license__   = 'GPL v3'
 
 import datetime
-import re
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
@@ -23,40 +22,39 @@ class brewiarz(BasicNewsRecipe):
     next_days = 1
 
     def parse_index(self):
-        dec2rom_dict = {"01": "i", "02": "ii", "03": "iii", "04": "iv",
-                        "05": "v", "06": "vi", "07": "vii", "08": "viii",
-                        "09": "ix", "10": "x", "11": "xi", "12": "xii"}
+        dec2rom_dict = {'01': 'i', '02': 'ii', '03': 'iii', '04': 'iv',
+                        '05': 'v', '06': 'vi', '07': 'vii', '08': 'viii',
+                        '09': 'ix', '10': 'x', '11': 'xi', '12': 'xii'}
 
-        weekday_dict = {"Sunday": "Niedziela", "Monday": "Poniedziałek", "Tuesday": "Wtorek",
-                        "Wednesday": "Środa", "Thursday": "Czwartek", "Friday": "Piątek", "Saturday": "Sobota"}
+        weekday_dict = {'Sunday': 'Niedziela', 'Monday': 'Poniedziałek', 'Tuesday': 'Wtorek',
+                        'Wednesday': 'Środa', 'Thursday': 'Czwartek', 'Friday': 'Piątek', 'Saturday': 'Sobota'}
 
         now = datetime.datetime.now()
 
         feeds = []
-        for i in range(0, self.next_days):
+        for i in range(self.next_days):
             url_date = now + datetime.timedelta(days=i)
-            url_date_month = url_date.strftime("%m")
+            url_date_month = url_date.strftime('%m')
             url_date_month_roman = dec2rom_dict[url_date_month]
-            url_date_day = url_date.strftime("%d")
-            url_date_year = url_date.strftime("%Y")[2:]
-            url_date_weekday = url_date.strftime("%A")
+            url_date_day = url_date.strftime('%d')
+            url_date_year = url_date.strftime('%Y')[2:]
+            url_date_weekday = url_date.strftime('%A')
             url_date_weekday_pl = weekday_dict[url_date_weekday]
 
-            url = "http://brewiarz.pl/" + url_date_month_roman + "_" + \
-                url_date_year + "/" + url_date_day + url_date_month + "/index.php3"
+            url = ('http://brewiarz.pl/' + url_date_month_roman + '_' +
+                   url_date_year + '/' + url_date_day + url_date_month + '/index.php3')
             articles = self.parse_pages(url)
             if articles:
-                title = url_date_weekday_pl + " " + url_date_day + \
-                    "." + url_date_month + "." + url_date_year
+                title = (url_date_weekday_pl + ' ' + url_date_day +
+                         '.' + url_date_month + '.' + url_date_year)
                 feeds.append((title, articles))
             else:
                 sectors = self.get_sectors(url)
                 for subpage in sectors:
-                    title = url_date_weekday_pl + " " + url_date_day + "." + \
-                        url_date_month + "." + url_date_year + " - " + subpage.string
-                    url = "http://brewiarz.pl/" + url_date_month_roman + "_" + url_date_year + \
-                        "/" + url_date_day + url_date_month + \
-                        "/" + subpage['href']
+                    title = (url_date_weekday_pl + ' ' + url_date_day + '.' +
+                             url_date_month + '.' + url_date_year + ' - ' + subpage.string)
+                    url = ('http://brewiarz.pl/' + url_date_month_roman + '_' + url_date_year +
+                           '/' + url_date_day + url_date_month + '/' + subpage['href'])
                     print(url)
                     articles = self.parse_pages(url)
                     if articles:
@@ -91,9 +89,8 @@ class brewiarz(BasicNewsRecipe):
                     sublinks = ol.findAll(name='a')
                     for sublink in sublinks:
                         link_title = self.tag_to_string(
-                            link) + " - " + self.tag_to_string(sublink)
-                        link_url_print = re.sub(
-                            'php3', 'php3?kr=_druk&wr=lg&', sublink['href'])
+                            link) + ' - ' + self.tag_to_string(sublink)
+                        link_url_print = sublink['href'].replace('php3', 'php3?kr=_druk&wr=lg&')
                         link_url = url[:-10] + link_url_print
                         current_articles.append({'title': link_title,
                                                  'url': link_url, 'description': '', 'date': ''})
@@ -102,8 +99,7 @@ class brewiarz(BasicNewsRecipe):
                         continue
                     else:
                         link_title = self.tag_to_string(link)
-                        link_url_print = re.sub(
-                            'php3', 'php3?kr=_druk&wr=lg&', link['href'])
+                        link_url_print = link['href'].replace('php3', 'php3?kr=_druk&wr=lg&')
                         link_url = url[:-10] + link_url_print
                         current_articles.append({'title': link_title,
                                                  'url': link_url, 'description': '', 'date': ''})
@@ -145,7 +141,7 @@ class brewiarz(BasicNewsRecipe):
                     if x == tag:
                         break
                 else:
-                    print("Can't find", tag, "in", tag.parent)
+                    print("Can't find", tag, 'in', tag.parent)
                     continue
                 for r in reversed(tag.contents):
                     tag.parent.insert(i, r)
diff --git a/recipes/brigitte_de.recipe b/recipes/brigitte_de.recipe
index 0033cd88fd..8810e4b636 100644
--- a/recipes/brigitte_de.recipe
+++ b/recipes/brigitte_de.recipe
@@ -16,7 +16,7 @@ class AdvancedUserRecipe(BasicNewsRecipe):
     cover_url = 'http://www.medienmilch.de/typo3temp/pics/Brigitte-Logo_d5feb4a6e4.jpg'
     masthead_url = 'http://www.medienmilch.de/typo3temp/pics/Brigitte-Logo_d5feb4a6e4.jpg'
 
-    remove_tags = [dict(attrs={'class': ['linklist', 'head', 'indent right relatedContent', 'artikel-meta segment', 'segment', 'comment commentFormWrapper segment borderBG', 'segment borderBG comments', 'segment borderBG box', 'center', 'segment nextPageLink', 'inCar']}),  # noqa
+    remove_tags = [dict(attrs={'class': ['linklist', 'head', 'indent right relatedContent', 'artikel-meta segment', 'segment', 'comment commentFormWrapper segment borderBG', 'segment borderBG comments', 'segment borderBG box', 'center', 'segment nextPageLink', 'inCar']}),  # noqa: E501
                    dict(id=['header', 'artTools', 'context', 'interact',
                             'footer-navigation', 'bwNet', 'copy', 'keyboardNavigationHint']),
                    dict(name=['hjtrs', 'kud'])]
diff --git a/recipes/business_insider.recipe b/recipes/business_insider.recipe
index d04913ea17..e08b84b1e0 100644
--- a/recipes/business_insider.recipe
+++ b/recipes/business_insider.recipe
@@ -22,10 +22,10 @@ class Business_insider(BasicNewsRecipe):
     remove_empty_feeds = True
     publication_type = 'newsportal'
     masthead_url = 'http://static.businessinsider.com/assets/images/logos/tbi_print.jpg'
-    extra_css             = """
+    extra_css             = '''
                                body{font-family: Arial,Helvetica,sans-serif }
                                img{margin-bottom: 0.4em; display:block}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/business_standard_print.recipe b/recipes/business_standard_print.recipe
index f4dc6d6de1..439284b28d 100644
--- a/recipes/business_standard_print.recipe
+++ b/recipes/business_standard_print.recipe
@@ -15,8 +15,6 @@ class BusinessStandardPrint(BasicNewsRecipe):
     language = 'en_IN'
     masthead_url = 'https://bsmedia.business-standard.com/include/_mod/site/html5/images/business-standard-logo.png'
     encoding = 'utf-8'
-    resolve_internal_links = True
-    remove_empty_feeds = True
 
     no_stylesheets = True
     remove_javascript = True
@@ -64,7 +62,7 @@ class BusinessStandardPrint(BasicNewsRecipe):
         if dt.weekday() == 6:
             self.log.warn(
                 'Business Standard Does Not Have A Print Publication On Sunday. The Reports'
-                ' And Columns On This Page Today Appeared In The Newspaper\'s Saturday Edition.'
+                " And Columns On This Page Today Appeared In The Newspaper's Saturday Edition."
             )
         url = 'https://apibs.business-standard.com/category/today-paper?sortBy=' + today
         raw = self.index_to_soup(url, raw=True)
diff --git a/recipes/business_today.recipe b/recipes/business_today.recipe
index b8188de06a..cab351e15a 100644
--- a/recipes/business_today.recipe
+++ b/recipes/business_today.recipe
@@ -90,7 +90,7 @@ class BT(BasicNewsRecipe):
 
         # Insert feeds in specified order, if available
 
-        feedSort = ['Editor\'s Note', 'Editors note']
+        feedSort = ["Editor's Note", 'Editors note']
         for i in feedSort:
             if i in sections:
                 feeds.append((i, sections[i]))
@@ -98,8 +98,7 @@ class BT(BasicNewsRecipe):
         # Done with the sorted feeds
 
         for i in feedSort:
-            if i in sections:
-                del sections[i]
+            sections.pop(i, None)
 
         # Append what is left over...
 
diff --git a/recipes/cacm.recipe b/recipes/cacm.recipe
index aee3c68eca..201312128a 100644
--- a/recipes/cacm.recipe
+++ b/recipes/cacm.recipe
@@ -5,8 +5,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class CACM(BasicNewsRecipe):
-    title = "ACM CACM Magazine"
-    description = "Published on day 1 of every month."
+    title = 'ACM CACM Magazine'
+    description = 'Published on day 1 of every month.'
     language = 'en'
     oldest_article = 30
     max_articles_per_feed = 100
@@ -17,16 +17,16 @@ class CACM(BasicNewsRecipe):
     ]
 
     def get_cover_url(self):
-        """
+        '''
         Parse out cover URL from cover page.
         Example:
         From: https://cacm.acm.org/system/assets/0004/2570/April2022.Cover.1000x1338.large.jpg?1647524668&1647524668
         Get:  https://cacm.acm.org/system/assets/0004/2570/April2022.Cover.1000x1338.jpg
-        """
+        '''
 
-        soup = self.index_to_soup("https://cacm.acm.org/")
-        a_img = soup.find("a", class_="menuCover")
-        img_url = a_img.img["src"]
-        img_url = img_url.split("?")[0]
-        img_url = img_url.replace(".large", "")
+        soup = self.index_to_soup('https://cacm.acm.org/')
+        a_img = soup.find('a', class_='menuCover')
+        img_url = a_img.img['src']
+        img_url = img_url.split('?')[0]
+        img_url = img_url.replace('.large', '')
         return img_url
diff --git a/recipes/calcalist.recipe b/recipes/calcalist.recipe
index d794946412..32f80cdb25 100644
--- a/recipes/calcalist.recipe
+++ b/recipes/calcalist.recipe
@@ -9,8 +9,7 @@ class AdvancedUserRecipe1283848012(BasicNewsRecipe):
     title = u'Calcalist'
     language = 'he'
     __author__ = 'marbs'
-    extra_css = 'img {max-width:100%;} body{direction: rtl;},title{direction: rtl; } ,article_description{direction: rtl; }, a.article{direction: rtl; } ,calibre_feed_description{direction: rtl; }'  # noqa
-    simultaneous_downloads = 5
+    extra_css = 'img {max-width:100%;} body{direction: rtl;},title{direction: rtl; } ,article_description{direction: rtl; }, a.article{direction: rtl; } ,calibre_feed_description{direction: rtl; }'  # noqa: E501
     remove_javascript = True
     timefmt = '[%a, %d %b, %Y]'
     oldest_article = 1
@@ -23,34 +22,33 @@ class AdvancedUserRecipe1283848012(BasicNewsRecipe):
         dict(name='div', attrs={'class': 'ArticleBodyComponent'}),
     ]
     remove_tags = [dict(name='p', attrs={'text': ['&nbsp;']})]
-    max_articles_per_feed = 100
     preprocess_regexps = [
         (re.compile(r'<p>&nbsp;</p>', re.DOTALL | re.IGNORECASE), lambda match: '')
     ]
 
     feeds = [
-        (u" דף הבית", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-8,00.xml"),
-        (u" 24/7", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3674,00.xml"),
-        (u" באזז", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3673,00.xml"),
-        (u" משפט", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3772,00.xml"),
-        (u" רכב", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3783,00.xml"),
-        (u" אחריות וסביבה", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3781,00.xml"),
-        (u" דעות", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3791,00.xml"),
-        (u" תיירות ותעופה", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3784,00.xml"),
-        (u" קריירה", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3782,00.xml"),
-        (u" אחד העם", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3768,00.xml"),
-        (u" המלצות ואזהרות", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3771,00.xml"),
-        (u" הייטק והון סיכון", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3928,00.xml"),
-        (u" חדשות טכנולוגיה", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3778,00.xml"),
-        (u" תקשורת", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-4471,00.xml"),
-        (u" אינטרנט", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3773,00.xml"),
-        (u" מכשירים וגאדג'טים", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3777,00.xml"),
-        (u" המדריך", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3880,00.xml"),
-        (u" אפליקציות", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3998,00.xml"),
-        (u" Play", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3792,00.xml"),
-        (u" הכסף", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-9,00.xml"),
-        (u" עולם", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-13,00.xml"),
-        (u" פרסום ושיווק", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-5,00.xml"),
-        (u" פנאי", u"http://www.calcalist.co.il/GeneralRSS/0,16335,L-3,00.xml"),
-        (u" עסקי ספורט", u"http://WallaNewsw.calcalist.co.il/GeneralRSS/0,16335,L-18,00.xml")
+        (u' דף הבית', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-8,00.xml'),
+        (u' 24/7', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3674,00.xml'),
+        (u' באזז', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3673,00.xml'),
+        (u' משפט', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3772,00.xml'),
+        (u' רכב', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3783,00.xml'),
+        (u' אחריות וסביבה', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3781,00.xml'),
+        (u' דעות', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3791,00.xml'),
+        (u' תיירות ותעופה', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3784,00.xml'),
+        (u' קריירה', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3782,00.xml'),
+        (u' אחד העם', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3768,00.xml'),
+        (u' המלצות ואזהרות', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3771,00.xml'),
+        (u' הייטק והון סיכון', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3928,00.xml'),
+        (u' חדשות טכנולוגיה', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3778,00.xml'),
+        (u' תקשורת', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-4471,00.xml'),
+        (u' אינטרנט', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3773,00.xml'),
+        (u" מכשירים וגאדג'טים", u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3777,00.xml'),
+        (u' המדריך', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3880,00.xml'),
+        (u' אפליקציות', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3998,00.xml'),
+        (u' Play', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3792,00.xml'),
+        (u' הכסף', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-9,00.xml'),
+        (u' עולם', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-13,00.xml'),
+        (u' פרסום ושיווק', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-5,00.xml'),
+        (u' פנאי', u'http://www.calcalist.co.il/GeneralRSS/0,16335,L-3,00.xml'),
+        (u' עסקי ספורט', u'http://WallaNewsw.calcalist.co.il/GeneralRSS/0,16335,L-18,00.xml')
     ]
diff --git a/recipes/calgary_herald.recipe b/recipes/calgary_herald.recipe
index 5ab1c722fa..eef67df749 100644
--- a/recipes/calgary_herald.recipe
+++ b/recipes/calgary_herald.recipe
@@ -60,20 +60,20 @@ class CanWestPaper(BasicNewsRecipe):
     ]
 
     # un-comment the following six lines for the Vancouver Province
-    # title = u'Vancouver Province'
-    # url_prefix = 'http://www.theprovince.com'
-    # description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
-    # logo_url = 'vplogo.jpg'
-    # fp_tag = 'CAN_TP'
+    # #    title = u'Vancouver Province'
+    # #    url_prefix = 'http://www.theprovince.com'
+    # #    description = u'News from Vancouver, BC'
+    # #    std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
+    # #    logo_url = 'vplogo.jpg'
+    # #    fp_tag = 'CAN_TP'
 
     # un-comment the following six lines for the Vancouver Sun
-    # title = u'Vancouver Sun'
-    # url_prefix = 'http://www.vancouversun.com'
-    # description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
-    # logo_url = 'vslogo.jpg'
-    # fp_tag = 'CAN_VS'
+    # #    title = u'Vancouver Sun'
+    # #    url_prefix = 'http://www.vancouversun.com'
+    # #    description = u'News from Vancouver, BC'
+    # #    std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
+    # #    logo_url = 'vslogo.jpg'
+    # #    fp_tag = 'CAN_VS'
 
     # un-comment the following six lines for the Calgary Herald
     title = u'Calgary Herald'
@@ -90,7 +90,7 @@ class CanWestPaper(BasicNewsRecipe):
     # #    std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
     # #    logo_url = 'ejlogo.jpg'
     # #    fp_tag = 'CAN_EJ'
-    #
+
     # un-comment the following six lines for the Ottawa Citizen
     # #    title = u'Ottawa Citizen'
     # #    url_prefix = 'http://www.ottawacitizen.com'
@@ -98,7 +98,7 @@ class CanWestPaper(BasicNewsRecipe):
     # #    std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
     # #    logo_url = 'oclogo.jpg'
     # #    fp_tag = 'CAN_OC'
-    #
+
     # un-comment the following six lines for the Montreal Gazette
     # #    title = u'Montreal Gazette'
     # #    url_prefix = 'http://www.montrealgazette.com'
@@ -126,7 +126,7 @@ class CanWestPaper(BasicNewsRecipe):
                 .photocaption { font-size: xx-small; font-style: italic; font-weight: normal; }
                 #photocredit { font-size: xx-small; font-weight: normal; }'''
 
-    keep_only_tags = [dict(name='div', attrs={'id': re.compile('story')})]
+    keep_only_tags = [dict(name='div', attrs={'id': re.compile(r'story')})]
 
     remove_tags = [{'class': 'comments'}, {'class': 'comment-intro'}, {'class': 'storytab'},
                    dict(name='div', attrs={'class': 'section_title'}), dict(name='div', attrs={'class': 'sharebar'}), dict(
@@ -140,7 +140,7 @@ class CanWestPaper(BasicNewsRecipe):
                        name='div', attrs={'class': 'copyright'}),
                    dict(name='div', attrs={'class': 'rule_grey_solid'}),
                    dict(name='div', attrs={'id': 'soundoff'}),
-                   dict(name='div', attrs={'id': re.compile('flyer')}),
+                   dict(name='div', attrs={'id': re.compile(r'flyer')}),
                    dict(name='li', attrs={'class': 'print'}), dict(name='li', attrs={'class': 'share'}), dict(name='ul', attrs={'class': 'bullet'})]
 
     def get_cover_url(self):
@@ -154,8 +154,7 @@ class CanWestPaper(BasicNewsRecipe):
         except:
             while daysback < 7:
                 cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg' + \
-                    str((date.today() - timedelta(days=daysback)).day) + \
-                    '/lg/' + self.fp_tag + '.jpg'
+                    str((date.today() - timedelta(days=daysback)).day) + '/lg/' + self.fp_tag + '.jpg'
                 br = BasicNewsRecipe.get_browser(self)
                 try:
                     br.open(cover)
@@ -164,24 +163,24 @@ class CanWestPaper(BasicNewsRecipe):
                     continue
                 break
         if daysback == 7:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             cover = None
         return cover
 
     def fixChars(self, string):
         # Replace lsquo (\x91)
-        fixed = re.sub("\x91", "‘", string)
+        fixed = string.replace('\x91', '‘')
         # Replace rsquo (\x92)
-        fixed = re.sub("\x92", "’", fixed)
+        fixed = fixed.replace('\x92', '’')
         # Replace ldquo (\x93)
-        fixed = re.sub("\x93", "“", fixed)
+        fixed = fixed.replace('\x93', '“')
         # Replace rdquo (\x94)
-        fixed = re.sub("\x94", "”", fixed)
+        fixed = fixed.replace('\x94', '”')
         # Replace ndash (\x96)
-        fixed = re.sub("\x96", "–", fixed)
+        fixed = fixed.replace('\x96', '–')
         # Replace mdash (\x97)
-        fixed = re.sub("\x97", "—", fixed)
-        fixed = re.sub("&#x2019;", "’", fixed)
+        fixed = fixed.replace('\x97', '—')
+        fixed = fixed.replace('&#x2019;', '’')
         return fixed
 
     def massageNCXText(self, description):
@@ -214,7 +213,7 @@ class CanWestPaper(BasicNewsRecipe):
         divtags = soup.findAll('div', attrs={'id': ''})
         if divtags:
             for div in divtags:
-                del(div['id'])
+                del div['id']
 
         pgall = soup.find('div', attrs={'id': 'storyphoto'})
         if pgall is not None:  # photo gallery perhaps
@@ -262,10 +261,10 @@ class CanWestPaper(BasicNewsRecipe):
                     if url.startswith('/'):
                         url = self.url_prefix + url
                     if not url.startswith(self.url_prefix):
-                        print("Rejected " + url)
+                        print('Rejected ' + url)
                         return
                     if url in self.url_list:
-                        print("Rejected dup " + url)
+                        print('Rejected dup ' + url)
                         return
                     self.url_list.append(url)
                     title = self.tag_to_string(atag, False)
@@ -277,8 +276,8 @@ class CanWestPaper(BasicNewsRecipe):
                         return
                     dtag = adiv.find('div', 'content')
                     description = ''
-                    print("URL " + url)
-                    print("TITLE " + title)
+                    print('URL ' + url)
+                    print('TITLE ' + title)
                     if dtag is not None:
                         stag = dtag.span
                         if stag is not None:
@@ -286,18 +285,18 @@ class CanWestPaper(BasicNewsRecipe):
                                 description = self.tag_to_string(stag, False)
                         else:
                             description = self.tag_to_string(dtag, False)
-                        print("DESCRIPTION: " + description)
+                        print('DESCRIPTION: ' + description)
                     if key not in articles:
                         articles[key] = []
                     articles[key].append(dict(
                         title=title, url=url, date='', description=description, author='', content=''))
 
         def parse_web_index(key, keyurl):
-            print("Section: " + key + ': ' + self.url_prefix + keyurl)
+            print('Section: ' + key + ': ' + self.url_prefix + keyurl)
             try:
                 soup = self.index_to_soup(self.url_prefix + keyurl)
             except:
-                print("Section: " + key + ' NOT FOUND')
+                print('Section: ' + key + ' NOT FOUND')
                 return
             ans.append(key)
             mainsoup = soup.find('div', 'bodywrapper')
@@ -309,7 +308,7 @@ class CanWestPaper(BasicNewsRecipe):
             for wdiv in mainsoup.findAll(attrs={'class': ['headline', 'featurecontent']}):
                 handle_article(wdiv, key)
 
-        for (k, url) in self.postmedia_index_pages:
+        for k,url in self.postmedia_index_pages:
             parse_web_index(k, url)
         ans = [(key, articles[key]) for key in ans if key in articles]
         return ans
diff --git a/recipes/canardpc.recipe b/recipes/canardpc.recipe
index be8a3267b4..839165dd63 100644
--- a/recipes/canardpc.recipe
+++ b/recipes/canardpc.recipe
@@ -4,7 +4,6 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class AdvancedUserRecipe1271446252(BasicNewsRecipe):
     title = u'CanardPC'
     oldest_article = 7
-    max_articles_per_feed = 100
     language = 'fr'
     __author__ = 'zorgluf'
     max_articles_per_feed = 25
diff --git a/recipes/capital_gr.recipe b/recipes/capital_gr.recipe
index 2e716b79b0..848a24f41b 100644
--- a/recipes/capital_gr.recipe
+++ b/recipes/capital_gr.recipe
@@ -17,7 +17,7 @@ class Capital(BasicNewsRecipe):
     keep_only_tags = [
         dict(name='h1'),
         dict(name='p'),
-        dict(name='span', attrs={'id': ["textbody"]})
+        dict(name='span', attrs={'id': ['textbody']})
     ]
 
 # 3 posts seemed to have utf8 encoding
@@ -36,6 +36,6 @@ class Capital(BasicNewsRecipe):
          'http://www.capital.gr/articles/articlesrss.asp?catid=4'),
         (u'\u039C\u03CC\u03BD\u03B9\u03BC\u03B5\u03C2 \u03C3\u03C4\u03AE\u03BB\u03B5\u03C2: \u03A3\u0399\u03A9\u03A0\u0397\u03A4\u0397\u03A1\u0399\u039F',
          'http://www.capital.gr/articles/articlesrss.asp?catid=6'),
-        (u'\u039C\u03CC\u03BD\u03B9\u03BC\u03B5\u03C2 \u03C3\u03C4\u03AE\u03BB\u03B5\u03C2: \u03A0\u0399\u03A3\u03A9 \u0391\u03A0\u039F \u03A4\u0399\u03A3 \u0393\u03A1\u0391\u039C\u039C\u0395\u03A3',  # noqa
+        (u'\u039C\u03CC\u03BD\u03B9\u03BC\u03B5\u03C2 \u03C3\u03C4\u03AE\u03BB\u03B5\u03C2: \u03A0\u0399\u03A3\u03A9 \u0391\u03A0\u039F \u03A4\u0399\u03A3 \u0393\u03A1\u0391\u039C\u039C\u0395\u03A3',  # noqa: E501
          'http://www.capital.gr/articles/articlesrss.asp?catid=8'),
     ]
diff --git a/recipes/caravan_magazine.recipe b/recipes/caravan_magazine.recipe
index 115424802d..938fc7b393 100644
--- a/recipes/caravan_magazine.recipe
+++ b/recipes/caravan_magazine.recipe
@@ -15,6 +15,7 @@ def absurl(x):
         x = 'https://caravanmagazine.in' + x
     return x
 
+
 def safe_dict(data, *names):
     ans = data
     for x in names:
@@ -49,6 +50,7 @@ def parse_body(x):
                 yield from parse_body(p)
             yield '</p>'
 
+
 def parse_p(p):
     if p.get('type', '') == 'text':
         if 'marks' in p:
@@ -96,7 +98,7 @@ class CaravanMagazine(BasicNewsRecipe):
         br = BasicNewsRecipe.get_browser(self, *args, **kw)
         if not self.username or not self.password:
             return br
-        data = json.dumps({"0":{"json":{"email":self.username,"password":self.password}}})
+        data = json.dumps({'0':{'json':{'email':self.username,'password':self.password}}})
         if not isinstance(data, bytes):
             data = data.encode('utf-8')
         rq = Request(
@@ -138,7 +140,7 @@ class CaravanMagazine(BasicNewsRecipe):
         d = self.recipe_specific_options.get('date')
         if d and isinstance(d, str):
             x = d.split('-')
-            inp = json.dumps({"0":{"json":{"month":int(x[0]),"year":int(x[1])}}})
+            inp = json.dumps({'0':{'json':{'month':int(x[0]),'year':int(x[1])}}})
             api = 'https://api.caravanmagazine.in/api/trpc/magazines.getForMonthAndYear?batch=1&input=' + quote(inp, safe='')
 
         raw = json.loads(self.index_to_soup(api, raw=True))
@@ -174,7 +176,7 @@ class CaravanMagazine(BasicNewsRecipe):
 
     def print_version(self, url):
         slug = urlparse(url).path
-        inp = json.dumps({"0":{"json":{"slug":slug}}})
+        inp = json.dumps({'0':{'json':{'slug':slug}}})
         return 'https://api.caravanmagazine.in/api/trpc/articles.getFromCache?batch=1&input=' + quote(inp, safe='')
 
     def preprocess_raw_html(self, raw, url):
@@ -211,6 +213,6 @@ class CaravanMagazine(BasicNewsRecipe):
             for x in art_cont['premiumContent']:
                 premium_cont += '\n' + ''.join(parse_body(x))
 
-        return '<html><body><div>' \
-                    + cat + title + desc + auth + lede + free_cont + premium_cont + \
-                        '</div></body></html>'
+        return ('<html><body><div>'
+                + cat + title + desc + auth + lede + free_cont + premium_cont +
+                '</div></body></html>')
diff --git a/recipes/cato.recipe b/recipes/cato.recipe
index c2d7332f17..234ad3edba 100644
--- a/recipes/cato.recipe
+++ b/recipes/cato.recipe
@@ -5,9 +5,9 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class CATOInstitute(BasicNewsRecipe):
     title = u'The CATO Institute'
-    description         = "The Cato Institute is a public policy research organization — a think tank — \
-dedicated to the principles of individual liberty, limited government, free markets and peace.\
- Its scholars and analysts conduct independent, nonpartisan research on a wide range of policy issues."
+    description         = ('The Cato Institute is a public policy research organization — a think tank — '
+                           'dedicated to the principles of individual liberty, limited government, free markets and peace. '
+                           'Its scholars and analysts conduct independent, nonpartisan research on a wide range of policy issues.')
     __author__ = '_reader'
     __date__ = '05 July 2012'
     __version__ = '1.0'
diff --git a/recipes/cbn.recipe b/recipes/cbn.recipe
index 36a4f5a255..834f5d57ae 100644
--- a/recipes/cbn.recipe
+++ b/recipes/cbn.recipe
@@ -31,7 +31,6 @@ class CBN(BasicNewsRecipe):
     remove_javascript = True
     use_embedded_content = False
     no_stylesheets = True
-    language = 'en'
     encoding = 'iso-8859-1'
     conversion_options = {'linearize_tables': True}
 
diff --git a/recipes/cedar.recipe b/recipes/cedar.recipe
index f3625509f0..17f6199d09 100644
--- a/recipes/cedar.recipe
+++ b/recipes/cedar.recipe
@@ -6,7 +6,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Cedar(BasicNewsRecipe):
     title = u'\u041A\u0435\u0434\u0440'
-    description = u'\u041D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0435 \u043C\u0435\u0434\u0438\u0430 \u043E\u0431 \u043E\u043A\u0440\u0443\u0436\u0430\u044E\u0449\u0435\u0439 \u0441\u0440\u0435\u0434\u0435'  # noqa
+    description = u'\u041D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0435 \u043C\u0435\u0434\u0438\u0430 \u043E\u0431 \u043E\u043A\u0440\u0443\u0436\u0430\u044E\u0449\u0435\u0439 \u0441\u0440\u0435\u0434\u0435'  # noqa: E501
     __author__ = 'bugmen00t'
     publication_type = 'blog'
     oldest_article = 30
diff --git a/recipes/cherta.recipe b/recipes/cherta.recipe
index 8496a543c4..62ae6a18dc 100644
--- a/recipes/cherta.recipe
+++ b/recipes/cherta.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Cherta(BasicNewsRecipe):
     title                 = '\u0427\u0435\u0440\u0442\u0430'
     __author__            = 'bugmen00t'
-    description           = ' \u0418\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u044B\u0435, \u0432\u0430\u0436\u043D\u044B\u0435 \u0438 \u0433\u043B\u0443\u0431\u043E\u043A\u0438\u0435 \u0442\u0435\u043A\u0441\u0442\u044B \u043F\u0440\u043E \u043D\u0430\u0441\u0438\u043B\u0438\u0435 \u0438 \u043D\u0435\u0440\u0430\u0432\u0435\u043D\u0441\u0442\u0432\u043E \u0432 \u0420\u043E\u0441\u0441\u0438\u0438.'  # noqa
+    description           = ' \u0418\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u044B\u0435, \u0432\u0430\u0436\u043D\u044B\u0435 \u0438 \u0433\u043B\u0443\u0431\u043E\u043A\u0438\u0435 \u0442\u0435\u043A\u0441\u0442\u044B \u043F\u0440\u043E \u043D\u0430\u0441\u0438\u043B\u0438\u0435 \u0438 \u043D\u0435\u0440\u0430\u0432\u0435\u043D\u0441\u0442\u0432\u043E \u0432 \u0420\u043E\u0441\u0441\u0438\u0438.'  # noqa: E501
     publisher             = 'cherta.media'
     category              = 'blog'
     cover_url = u'https://cherta.media/wp-content/uploads/2022/01/cherta_snippet2.png'
@@ -22,7 +22,7 @@ class Cherta(BasicNewsRecipe):
 
     remove_tags_after = dict(name='div', attrs={'class':'single-page__footer-info'})
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='div', attrs={'class': 'single-content-link'}),
         dict(name='div', attrs={'class': 'single-page__footer-info_links clearfix'}),
         dict(name='div', attrs={'class': 'single-article-tags-wrapper'})
diff --git a/recipes/chicago_tribune.recipe b/recipes/chicago_tribune.recipe
index 70cf0958ee..66b9969af7 100644
--- a/recipes/chicago_tribune.recipe
+++ b/recipes/chicago_tribune.recipe
@@ -67,7 +67,6 @@ class ChicagoTribune(BasicNewsRecipe):
             feeds.append({'title': title, 'url': url})
         return [('Articles', feeds)]
 
-
     def preprocess_html(self, soup):
         for img in soup.findAll('img', attrs={'data-src': True}):
             img['src'] = img['data-src']
diff --git a/recipes/chr_mon.recipe b/recipes/chr_mon.recipe
index 650c699fad..c75fc5fd4c 100644
--- a/recipes/chr_mon.recipe
+++ b/recipes/chr_mon.recipe
@@ -12,7 +12,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class CSMonitor(BasicNewsRecipe):
     title = 'The Christian Science Monitor - daily'
     __author__ = 'Darko Miletic'
-    description = 'The Christian Science Monitor is an international news organization that delivers thoughtful, global coverage via its website, weekly magazine, daily news briefing, and email newsletters.'  # noqa
+    description = 'The Christian Science Monitor is an international news organization that delivers thoughtful, global coverage via its website, weekly magazine, daily news briefing, and email newsletters.'  # noqa: E501
     publisher = 'The Christian Science Monitor'
     category = 'news, politics, USA'
     oldest_article = 2
@@ -24,7 +24,7 @@ class CSMonitor(BasicNewsRecipe):
     remove_empty_feeds = True
     publication_type = 'newspaper'
     masthead_url = 'http://www.csmonitor.com/extension/csm_base/design/csm_design/images/csmlogo_179x46.gif'
-    extra_css             = """
+    extra_css             = '''
                                body{font-family: Arial,Tahoma,Verdana,Helvetica,sans-serif }
                                img{margin-bottom: 0.4em; display:block}
                                .head {font-family: Georgia,"Times New Roman",Times,serif}
@@ -32,19 +32,19 @@ class CSMonitor(BasicNewsRecipe):
                                .hide{display: none}
                                .sLoc{font-weight: bold}
                                ul{list-style-type: none}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
     }
 
     remove_tags = [
-        dict(name=['meta', 'link', 'iframe', 'object', 'embed']), dict(attrs={'class': re.compile('(^|| )podStoryRel($|| )', re.DOTALL)}), dict(
+        dict(name=['meta', 'link', 'iframe', 'object', 'embed']), dict(attrs={'class': re.compile(r'(^|| )podStoryRel($|| )', re.DOTALL)}), dict(
             attrs={'class': ['bottom-rel', 'hide']}), dict(attrs={'id': ['pgallerycarousel_enlarge', 'pgallerycarousel_related']})
     ]
     keep_only_tags = [
         dict(name='h1', attrs={'class': 'head'}), dict(name='h2', attrs={'class': 'subhead'}), dict(attrs={'class': [
-            'sByline', 'thePhoto', 'ui-body-header']}), dict(attrs={'class': re.compile('(^|| )sBody($|| )', re.DOTALL)})
+            'sByline', 'thePhoto', 'ui-body-header']}), dict(attrs={'class': re.compile(r'(^|| )sBody($|| )', re.DOTALL)})
     ]
     remove_attributes = ['xmlns:fb']
 
@@ -74,11 +74,11 @@ class CSMonitor(BasicNewsRecipe):
                 nurl = 'http://www.csmonitor.com' + nexttag['href']
                 soup2 = self.index_to_soup(nurl)
                 texttag = soup2.find(
-                    attrs={'class': re.compile('(^|| )sBody($|| )', re.DOTALL)})
+                    attrs={'class': re.compile(r'(^|| )sBody($|| )', re.DOTALL)})
                 if texttag:
                     appendtag = soup.find(
-                        attrs={'class': re.compile('(^|| )sBody($|| )', re.DOTALL)})
-                    for citem in texttag.findAll(attrs={'class': [re.compile('(^|| )podStoryRel($|| )', re.DOTALL), 'bottom-rel', 'hide']}):
+                        attrs={'class': re.compile(r'(^|| )sBody($|| )', re.DOTALL)})
+                    for citem in texttag.findAll(attrs={'class': [re.compile(r'(^|| )podStoryRel($|| )', re.DOTALL), 'bottom-rel', 'hide']}):
                         citem.extract()
                     self.append_page(soup2)
                     texttag.extract()
diff --git a/recipes/christian_post.recipe b/recipes/christian_post.recipe
index e924984dac..9ab4a639d2 100644
--- a/recipes/christian_post.recipe
+++ b/recipes/christian_post.recipe
@@ -9,7 +9,6 @@ class ChristianPost(BasicNewsRecipe):
     __author__ = 'sexymax15'
     description = 'Homepage'
     language = 'en'
-    no_stylesheets = True
     use_embedded_content = False
     oldest_article = 30
     max_articles_per_feed = 15
diff --git a/recipes/chronicle_higher_ed.recipe b/recipes/chronicle_higher_ed.recipe
index 619dbb287c..c61c54686b 100644
--- a/recipes/chronicle_higher_ed.recipe
+++ b/recipes/chronicle_higher_ed.recipe
@@ -39,7 +39,7 @@ class Chronicle(BasicNewsRecipe):
         # Go to the issue
         soup0 = self.index_to_soup('http://chronicle.com/section/Archives/39/')
         issue = soup0.find('ul', attrs={'class': 'feature-promo-list'}).li
-        issueurl = "http://chronicle.com" + issue.a['href']
+        issueurl = 'http://chronicle.com' + issue.a['href']
 
         # Find date
         dates = self.tag_to_string(issue.a).split(': ')[-1]
@@ -47,12 +47,12 @@ class Chronicle(BasicNewsRecipe):
 
         # Find cover
         cover = soup0.find('div', attrs={
-                           'class': 'side-content'}).find(attrs={'src': re.compile("photos/biz/Current")})
+                           'class': 'side-content'}).find(attrs={'src': re.compile(r'photos/biz/Current')})
         if cover is not None:
-            if "chronicle.com" in cover['src']:
+            if 'chronicle.com' in cover['src']:
                 self.cover_url = cover['src']
             else:
-                self.cover_url = "http://chronicle.com" + cover['src']
+                self.cover_url = 'http://chronicle.com' + cover['src']
         # Go to the main body
         soup = self.index_to_soup(issueurl)
         div = soup.find('div', attrs={'id': 'article-body'})
@@ -64,7 +64,7 @@ class Chronicle(BasicNewsRecipe):
             a = post.find('a', href=True)
             if a is not None:
                 title = self.tag_to_string(a)
-                url = "http://chronicle.com" + a['href'].strip()
+                url = 'http://chronicle.com' + a['href'].strip()
                 sectiontitle = post.findPrevious('h3')
                 if sectiontitle is None:
                     sectiontitle = post.findPrevious('h4')
@@ -77,7 +77,7 @@ class Chronicle(BasicNewsRecipe):
                     if section_title not in feeds:
                         feeds[section_title] = []
                     feeds[section_title] += articles
-        ans = [(key, val) for key, val in feeds.items()]
+        ans = list(feeds.items())
         return ans
 
     def preprocess_html(self, soup):
diff --git a/recipes/cicero.recipe b/recipes/cicero.recipe
index 4a4acd2507..61dc3e6b71 100644
--- a/recipes/cicero.recipe
+++ b/recipes/cicero.recipe
@@ -15,27 +15,27 @@ class BasicUserRecipe1316245412(BasicNewsRecipe):
     no_stylesheets = True
     auto_cleanup = False
 
-#    remove_javascript = True
+    # remove_javascript = True
 
     remove_tags = [
-        dict(name='div', attrs={'id': ["header", "navigation", "skip-link",
-                                       "header-print", "header-print-url", "meta-toolbar", "footer"]}),
-        dict(name='div', attrs={'class': ["region region-sidebar-first column sidebar", "breadcrumb",
-                                          "breadcrumb-title", "meta", "comment-wrapper",
-                                          "field field-name-field-show-teaser-right field-type-list-boolean field-label-above",
-                                          "page-header",
-                                          "view view-alle-karikaturen view-id-alle_karikaturen view-display-id-default view-dom-id-1",
-                                          "pagination",
-                                          "view view-letzte-videos view-id-letzte_videos view-display-id-default view-dom-id-1",
-                                          "view view-letzte-videos view-id-letzte_videos view-display-id-default view-dom-id-2",  # 2011-09-23
-                                          "view view-alle-karikaturen view-id-alle_karikaturen view-display-id-default view-dom-id-2",  # 2011-09-23
+        dict(name='div', attrs={'id': ['header', 'navigation', 'skip-link',
+                                       'header-print', 'header-print-url', 'meta-toolbar', 'footer']}),
+        dict(name='div', attrs={'class': ['region region-sidebar-first column sidebar', 'breadcrumb',
+                                          'breadcrumb-title', 'meta', 'comment-wrapper',
+                                          'field field-name-field-show-teaser-right field-type-list-boolean field-label-above',
+                                          'page-header',
+                                          'view view-alle-karikaturen view-id-alle_karikaturen view-display-id-default view-dom-id-1',
+                                          'pagination',
+                                          'view view-letzte-videos view-id-letzte_videos view-display-id-default view-dom-id-1',
+                                          'view view-letzte-videos view-id-letzte_videos view-display-id-default view-dom-id-2',  # 2011-09-23
+                                          'view view-alle-karikaturen view-id-alle_karikaturen view-display-id-default view-dom-id-2',  # 2011-09-23
                                           ]}),
-        dict(name='div', attrs={'title': ["Dossier Auswahl"]}),
-        dict(name='h2', attrs={'class': ["title comment-form"]}),
+        dict(name='div', attrs={'title': ['Dossier Auswahl']}),
+        dict(name='h2', attrs={'class': ['title comment-form']}),
         dict(name='form', attrs={
-             'class': ["comment-form user-info-from-cookie"]}),
+             'class': ['comment-form user-info-from-cookie']}),
         dict(name='table', attrs={
-             'class': ["mcx-social-horizontal", "page-header"]}),
+             'class': ['mcx-social-horizontal', 'page-header']}),
     ]
 
     feeds = [
@@ -51,6 +51,6 @@ class BasicUserRecipe1316245412(BasicNewsRecipe):
     def print_version(self, url):
         return url + '?print'
 
-#    def get_cover_url(self):
-# return 'http://www.cicero.de/sites/all/themes/cicero/logo.png' # need to
-# find a good logo on their home page!
+    # def get_cover_url(self):
+    #     return 'http://www.cicero.de/sites/all/themes/cicero/logo.png' # need to
+    #     find a good logo on their home page!
diff --git a/recipes/cincinnati_enquirer.recipe b/recipes/cincinnati_enquirer.recipe
index 4e2409024c..2fcad1c635 100644
--- a/recipes/cincinnati_enquirer.recipe
+++ b/recipes/cincinnati_enquirer.recipe
@@ -34,7 +34,7 @@ class AdvancedUserRecipe1234144423(BasicNewsRecipe):
         dict(name='div', attrs={'class': ['padding', 'sidebar-photo', 'blog caitlin']})]
 
     remove_tags = [
-        dict(name=['object', 'link', 'table', 'embed']), dict(name='div', attrs={'id': ["pluckcomments", "StoryChat"]}), dict(
+        dict(name=['object', 'link', 'table', 'embed']), dict(name='div', attrs={'id': ['pluckcomments', 'StoryChat']}), dict(
             name='div', attrs={'class': ['articleflex-container', ]}), dict(name='p', attrs={'class': ['posted', 'tags']})
     ]
 
diff --git a/recipes/ciperchile.recipe b/recipes/ciperchile.recipe
index 2aaa2a761d..c503b218bc 100644
--- a/recipes/ciperchile.recipe
+++ b/recipes/ciperchile.recipe
@@ -10,7 +10,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class CiperChile(BasicNewsRecipe):
     title = 'CIPER Chile'
     __author__ = 'Darko Miletic'
-    description = 'El Centro de Investigacion e Informacion Periodistica (CIPER) es una institucion independiente que desarrolla reportajes de investigacion de acuerdo a principios de maxima calidad e integridad profesional. Para lograr dicho objetivo, los profesionales de CIPER incorporan a las tecnicas propias del reporteo el uso sistematico de las leyes chilenas que norman el libre acceso a la informacion, de manera que los documentos que se obtengan por esta via esten puestos a disposicion del publico sin restricciones.'  # noqa
+    description = 'El Centro de Investigacion e Informacion Periodistica (CIPER) es una institucion independiente que desarrolla reportajes de investigacion de acuerdo a principios de maxima calidad e integridad profesional. Para lograr dicho objetivo, los profesionales de CIPER incorporan a las tecnicas propias del reporteo el uso sistematico de las leyes chilenas que norman el libre acceso a la informacion, de manera que los documentos que se obtengan por esta via esten puestos a disposicion del publico sin restricciones.'  # noqa: E501
     publisher = 'CIPER'
     category = 'news, politics, Chile'
     oldest_article = 15
@@ -23,14 +23,14 @@ class CiperChile(BasicNewsRecipe):
     remove_empty_feeds = True
     publication_type = 'blog'
     masthead_url = 'http://ciperchile.cl/wp-content/themes/cipertheme/css/ui/ciper-logo.png'
-    extra_css             = """
+    extra_css             = '''
                                body{font-family: Arial,sans-serif}
                                .excerpt{font-family: Georgia,"Times New Roman",Times,serif; font-style: italic; font-size: 1.25em}
                                .author{font-family: Georgia,"Times New Roman",Times,serif; font-style: italic; font-size: small}
                                .date{font-family: Georgia,"Times New Roman",Times,serif; font-size: small; color: grey}
                                .epigrafe{font-size: small; color: grey}
                                img{margin-bottom: 0.4em; display:block}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/clarin.recipe b/recipes/clarin.recipe
index 9cac8328ed..898a10a7f8 100644
--- a/recipes/clarin.recipe
+++ b/recipes/clarin.recipe
@@ -44,7 +44,7 @@ class Clarin(BasicNewsRecipe):
     # To get all the data (images)
     auto_cleanup = False
 
-    extra_css = """
+    extra_css = '''
       h1#title {
         line-height: 1em;
         margin: 0 0 .5em 0;
@@ -64,7 +64,7 @@ class Clarin(BasicNewsRecipe):
         font-size: .9em;
         margin-bottom: .5em;
       }
-    """
+    '''
 
     conversion_options = {
       'comment': description, 'tags': category, 'publisher': publisher, 'language': language
@@ -85,11 +85,11 @@ class Clarin(BasicNewsRecipe):
             self.oldest_article = float(d)
 
     keep_only_tags = [
-      dict(name='p'  , attrs={'class'   : 'volanta'}),
-      dict(name='h1' , attrs={'id': 'title'}),
-      dict(name='div', attrs={'class'   : 'bajada'}),
-      dict(name='div', attrs={'id'   : 'galeria-trigger'}),
-      dict(name='div', attrs={'class'   : 'body-nota'})
+      dict(name='p',   attrs={'class': 'volanta'}),
+      dict(name='h1',  attrs={'id':    'title'}),
+      dict(name='div', attrs={'class': 'bajada'}),
+      dict(name='div', attrs={'id':    'galeria-trigger'}),
+      dict(name='div', attrs={'class': 'body-nota'})
 
     ]
 
@@ -138,7 +138,7 @@ class Clarin(BasicNewsRecipe):
                                      'ingresar_ingresar_email_paseInputComponent': self.username,
                                      'ingresar_ingresar_palabraClave_paseInputComponent': self.password,
                                      'ingresar_ingresar_ingresar_paseButton': 'Ingresar',
-                                     'javax.faces.ViewState': 'e1s1'  # noqa
+                                     'javax.faces.ViewState': 'e1s1'
                                      })
             br.open(self.LOGIN, data)
         return br
diff --git a/recipes/cm_journal.recipe b/recipes/cm_journal.recipe
index 31df657e7b..704b35bda8 100644
--- a/recipes/cm_journal.recipe
+++ b/recipes/cm_journal.recipe
@@ -12,7 +12,7 @@ class CMJornal_pt(BasicNewsRecipe):
     encoding = 'utf-8'
     use_embedded_content = False
     language = 'pt'
-    extra_css = ' .publish{font-style: italic; line-height: 1.2em; border-bottom: 1px dotted; padding: 5px 0} .entity{line-height: 1.2em} .overview{line-height:1.2em} '  # noqa
+    extra_css = ' .publish{font-style: italic; line-height: 1.2em; border-bottom: 1px dotted; padding: 5px 0} .entity{line-height: 1.2em} .overview{line-height:1.2em} '  # noqa: E501
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/cnetjapan.recipe b/recipes/cnetjapan.recipe
index e1e4d79827..6dbcb927e5 100644
--- a/recipes/cnetjapan.recipe
+++ b/recipes/cnetjapan.recipe
@@ -25,16 +25,16 @@ class CNetJapan(BasicNewsRecipe):
             lambda match: '<!-- removed -->'),
     ]
 
-    remove_tags_before = dict(id="contents_l")
+    remove_tags_before = dict(id='contents_l')
     remove_tags = [
-        {'class': "social_bkm_share"},
-        {'class': "social_bkm_print"},
-        {'class': "block20 clearfix"},
-        dict(name="div", attrs={'id': 'bookreview'}),
-        {'class': "tag_left_ttl"},
-        {'class': "tag_right"}
+        {'class': 'social_bkm_share'},
+        {'class': 'social_bkm_print'},
+        {'class': 'block20 clearfix'},
+        dict(name='div', attrs={'id': 'bookreview'}),
+        {'class': 'tag_left_ttl'},
+        {'class': 'tag_right'}
     ]
-    remove_tags_after = {'class': "block20"}
+    remove_tags_after = {'class': 'block20'}
 
     def parse_feeds(self):
 
diff --git a/recipes/cnetjapan_digital.recipe b/recipes/cnetjapan_digital.recipe
index 9cb2a148b4..db10032de9 100644
--- a/recipes/cnetjapan_digital.recipe
+++ b/recipes/cnetjapan_digital.recipe
@@ -25,16 +25,16 @@ class CNetJapanDigital(BasicNewsRecipe):
             lambda match: '<!-- removed -->'),
     ]
 
-    remove_tags_before = dict(id="contents_l")
+    remove_tags_before = dict(id='contents_l')
     remove_tags = [
-        {'class': "social_bkm_share"},
-        {'class': "social_bkm_print"},
-        {'class': "block20 clearfix"},
-        dict(name="div", attrs={'id': 'bookreview'}),
-        {'class': "tag_left_ttl"},
-        {'class': "tag_right"}
+        {'class': 'social_bkm_share'},
+        {'class': 'social_bkm_print'},
+        {'class': 'block20 clearfix'},
+        dict(name='div', attrs={'id': 'bookreview'}),
+        {'class': 'tag_left_ttl'},
+        {'class': 'tag_right'}
     ]
-    remove_tags_after = {'class': "block20"}
+    remove_tags_after = {'class': 'block20'}
 
     def parse_feeds(self):
 
diff --git a/recipes/cnetjapan_release.recipe b/recipes/cnetjapan_release.recipe
index 4b85d24b9b..1cf29aef02 100644
--- a/recipes/cnetjapan_release.recipe
+++ b/recipes/cnetjapan_release.recipe
@@ -25,15 +25,15 @@ class CNetJapanRelease(BasicNewsRecipe):
             lambda match: '<!-- removed -->'),
     ]
 
-    remove_tags_before = dict(id="contents_l")
+    remove_tags_before = dict(id='contents_l')
     remove_tags = [
-        {'class': "social_bkm_share"},
-        {'class': "social_bkm_print"},
-        {'class': "block20 clearfix"},
-        dict(name="div", attrs={'id': 'bookreview'}),
-        {'class': "tag_left_ttl"}
+        {'class': 'social_bkm_share'},
+        {'class': 'social_bkm_print'},
+        {'class': 'block20 clearfix'},
+        dict(name='div', attrs={'id': 'bookreview'}),
+        {'class': 'tag_left_ttl'}
     ]
-    remove_tags_after = {'class': "block20"}
+    remove_tags_after = {'class': 'block20'}
 
     def parse_feeds(self):
 
diff --git a/recipes/cnetnews.recipe b/recipes/cnetnews.recipe
index a0f9607d12..a98034ca21 100644
--- a/recipes/cnetnews.recipe
+++ b/recipes/cnetnews.recipe
@@ -27,7 +27,7 @@ def classes(classes):
 class CnetNews(BasicNewsRecipe):
     title = 'CNET News'
     __author__ = 'Kovid Goyal'
-    description = 'Tech news and business reports by CNET News. Focused on information technology, core topics include computers, hardware, software, networking, and Internet media.'  # noqa
+    description = 'Tech news and business reports by CNET News. Focused on information technology, core topics include computers, hardware, software, networking, and Internet media.'  # noqa: E501
     publisher = 'CNET'
     category = 'news, IT, USA'
     encoding = 'utf-8'
@@ -56,7 +56,7 @@ class CnetNews(BasicNewsRecipe):
     keep_only_tags = [
         dict(name='h1'),
         dict(section='author'),
-        dict(id=["article-body", 'cnetReview']),
+        dict(id=['article-body', 'cnetReview']),
         dict(attrs={'class': 'deal-content'}),
     ]
 
diff --git a/recipes/cnn.recipe b/recipes/cnn.recipe
index 9089c9d2bb..b8a80131cc 100644
--- a/recipes/cnn.recipe
+++ b/recipes/cnn.recipe
@@ -72,7 +72,7 @@ class CNN(BasicNewsRecipe):
         try:
             br.open(masthead)
         except:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             masthead = None
         return masthead
 
diff --git a/recipes/coda.recipe b/recipes/coda.recipe
index e1538704b6..2e2c80ab63 100644
--- a/recipes/coda.recipe
+++ b/recipes/coda.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Coda(BasicNewsRecipe):
     title = 'Coda'
     __author__ = 'bugmen00t'
-    description = 'Coda Story reports on major currents shaping our world from disinformation to authoritarian technologies to the war on science. Coda stays on these stories to reveal why they matter, how they are connected and where they are heading next.'  # noqa
+    description = 'Coda Story reports on major currents shaping our world from disinformation to authoritarian technologies to the war on science. Coda stays on these stories to reveal why they matter, how they are connected and where they are heading next.'  # noqa: E501
     publisher = 'Natalia Antelava & Ilan Greenberg'
     category = 'blog'
     cover_url = u'https://www.codastory.com/wp-content/uploads/2021/05/AT_thumbnail_512x512.png'
diff --git a/recipes/coda_ru.recipe b/recipes/coda_ru.recipe
index 6d65dd6e32..45147ceae6 100644
--- a/recipes/coda_ru.recipe
+++ b/recipes/coda_ru.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Coda(BasicNewsRecipe):
     title                 = 'Coda \u043D\u0430 \u0440\u0443\u0441\u0441\u043A\u043E\u043C'
     __author__            = 'bugmen00t'
-    description           = 'Coda - \u043C\u0435\u0434\u0438\u0430, \u043A\u043E\u0442\u043E\u0440\u043E\u0435 \u0432\u044B\u044F\u0432\u043B\u044F\u0435\u0442 \u0441\u0432\u044F\u0437\u0438 \u043C\u0435\u0436\u0434\u0443 \u0441\u043E\u0431\u044B\u0442\u0438\u044F\u043C\u0438 \u0438 \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0435\u0442 \u0441\u043B\u0435\u0434\u0438\u0442\u044C \u0437\u0430 \u0438\u0441\u0442\u043E\u0440\u0438\u044F\u043C\u0438 \u0434\u0430\u0436\u0435 \u043F\u043E\u0441\u043B\u0435 \u0442\u043E\u0433\u043E, \u043A\u0430\u043A \u043E\u043D\u0438 \u043E\u043D\u0438 \u043F\u0440\u043E\u043F\u0430\u043B\u0438 \u0438\u0437 \u043F\u043E\u0432\u0435\u0441\u0442\u043A\u0438. Coda \u043F\u043E\u0433\u0440\u0443\u0436\u0430\u0435\u0442\u0441\u044F \u043D\u0435 \u0442\u043E\u043B\u044C\u043A\u043E \u0432 \u0441\u0430\u043C\u0438 \u043A\u0440\u0438\u0437\u0438\u0441\u044B, \u043D\u043E \u0438 \u0432 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u0438\u0445 \u043E\u043A\u0440\u0443\u0436\u0430\u0435\u0442'  # noqa
+    description           = 'Coda - \u043C\u0435\u0434\u0438\u0430, \u043A\u043E\u0442\u043E\u0440\u043E\u0435 \u0432\u044B\u044F\u0432\u043B\u044F\u0435\u0442 \u0441\u0432\u044F\u0437\u0438 \u043C\u0435\u0436\u0434\u0443 \u0441\u043E\u0431\u044B\u0442\u0438\u044F\u043C\u0438 \u0438 \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0435\u0442 \u0441\u043B\u0435\u0434\u0438\u0442\u044C \u0437\u0430 \u0438\u0441\u0442\u043E\u0440\u0438\u044F\u043C\u0438 \u0434\u0430\u0436\u0435 \u043F\u043E\u0441\u043B\u0435 \u0442\u043E\u0433\u043E, \u043A\u0430\u043A \u043E\u043D\u0438 \u043E\u043D\u0438 \u043F\u0440\u043E\u043F\u0430\u043B\u0438 \u0438\u0437 \u043F\u043E\u0432\u0435\u0441\u0442\u043A\u0438. Coda \u043F\u043E\u0433\u0440\u0443\u0436\u0430\u0435\u0442\u0441\u044F \u043D\u0435 \u0442\u043E\u043B\u044C\u043A\u043E \u0432 \u0441\u0430\u043C\u0438 \u043A\u0440\u0438\u0437\u0438\u0441\u044B, \u043D\u043E \u0438 \u0432 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u0438\u0445 \u043E\u043A\u0440\u0443\u0436\u0430\u0435\u0442'  # noqa: E501
     publisher             = 'Natalia Antelava & Ilan Greenberg'
     category              = 'blog'
     cover_url = u'https://www.codastory.com/wp-content/uploads/2021/05/AT_thumbnail_512x512.png'
@@ -22,7 +22,7 @@ class Coda(BasicNewsRecipe):
 
     remove_tags_after = dict(name='div', attrs={'class': 'article'})
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='li', attrs={'class': 'material-meta__type'}),
         dict(name='div', attrs={'class': 'more'})
         ]
diff --git a/recipes/colta.recipe b/recipes/colta.recipe
index ea86cda905..d2ce698c40 100644
--- a/recipes/colta.recipe
+++ b/recipes/colta.recipe
@@ -12,7 +12,6 @@ class Colta(BasicNewsRecipe):
     publisher = 'OpenSpace.ru'
     category = 'news'
     cover_url = u'http://www.colta.ru/assets/logo-afb684c3d35fc1f6f103f9fb638c8ec1.png'
-    language = 'ru'
     no_stylesheets = True
     remove_javascript = True
 
diff --git a/recipes/common_dreams.recipe b/recipes/common_dreams.recipe
index 37f1c9fc4d..f693153402 100644
--- a/recipes/common_dreams.recipe
+++ b/recipes/common_dreams.recipe
@@ -33,24 +33,24 @@ class CommonDreams(BasicNewsRecipe):
     remove_javascript = True
 
     # Specify extra CSS - overrides ALL other CSS (IE. Added last).
-    extra_css = 'body { font-family: verdana, helvetica, sans-serif; } \
-                 .introduction, .first { font-weight: bold; } \
-                 .cross-head { font-weight: bold; font-size: 125%; } \
-                 .cap, .caption { display: block; font-size: 80%; font-style: italic; } \
-                 .cap, .caption, .caption img, .caption span { display: block; margin: 5px auto; } \
-                 .byl, .byd, .byline img, .byline-name, .byline-title, .author-name, .author-position, \
-                    .correspondent-portrait img, .byline-lead-in, .name, .bbc-role { display: block; \
-                    font-size: 80%; font-style: italic; margin: 1px auto; } \
-                 .story-date, .published { font-size: 80%; } \
-                 table { width: 100%; } \
-                 td img { display: block; margin: 5px auto; } \
-                 ul { padding-top: 10px; } \
-                 ol { padding-top: 10px; } \
-                 li { padding-top: 5px; padding-bottom: 5px; } \
-                 h1 { font-size: 175%; font-weight: bold; } \
-                 h2 { font-size: 150%; font-weight: bold; } \
-                 h3 { font-size: 125%; font-weight: bold; } \
-                 h4, h5, h6 { font-size: 100%; font-weight: bold; }'
+    extra_css = '''body { font-family: verdana, helvetica, sans-serif; }
+                   .introduction, .first { font-weight: bold; }
+                   .cross-head { font-weight: bold; font-size: 125%; }
+                   .cap, .caption { display: block; font-size: 80%; font-style: italic; }
+                   .cap, .caption, .caption img, .caption span { display: block; margin: 5px auto; }
+                   .byl, .byd, .byline img, .byline-name, .byline-title, .author-name, .author-position,
+                      .correspondent-portrait img, .byline-lead-in, .name, .bbc-role { display: block;
+                      font-size: 80%; font-style: italic; margin: 1px auto; }
+                   .story-date, .published { font-size: 80%; }
+                   table { width: 100%; }
+                   td img { display: block; margin: 5px auto; }
+                   ul { padding-top: 10px; }
+                   ol { padding-top: 10px; }
+                   li { padding-top: 5px; padding-bottom: 5px; }
+                   h1 { font-size: 175%; font-weight: bold; }
+                   h2 { font-size: 150%; font-weight: bold; }
+                   h3 { font-size: 125%; font-weight: bold; }
+                   h4, h5, h6 { font-size: 100%; font-weight: bold; }'''
 
     # Remove the line breaks and float left/right and picture width/height.
     preprocess_regexps = [(re.compile(r'<br[ ]*/>', re.IGNORECASE), lambda m: ''),
diff --git a/recipes/computer_weekly.recipe b/recipes/computer_weekly.recipe
index ed63d407d0..7aad0dde7f 100644
--- a/recipes/computer_weekly.recipe
+++ b/recipes/computer_weekly.recipe
@@ -25,7 +25,7 @@ class ComputerWeekly(BasicNewsRecipe):
         ('Financial services IT news', 'https://www.computerweekly.com/rss/Financial-services-IT-news.xml'),
         ('Public sector IT news', 'https://www.computerweekly.com/rss/Public-sector-IT-news.xml'),
         ('Enterprise software', 'https://www.computerweekly.com/rss/Enterprise-software.xml'),
-        ('SME IT news' , 'https://www.computerweekly.com/rss/SME-IT-news.xml'),
+        ('SME IT news', 'https://www.computerweekly.com/rss/SME-IT-news.xml'),
         ('Datacenter and cloud computing', 'https://www.computerweekly.com/rss/Datacentre-and-cloud-computing.xml'),
         ('Storage', 'https://www.computerweekly.com/rss/Storage.xml'),
         ('Information Management', 'https://www.computerweekly.com/rss/Information-management.xml'),
diff --git a/recipes/computerworld_dk.recipe b/recipes/computerworld_dk.recipe
index d34ebac609..1102a09b66 100644
--- a/recipes/computerworld_dk.recipe
+++ b/recipes/computerworld_dk.recipe
@@ -51,4 +51,3 @@ class WwwComputerworld_dk(BasicNewsRecipe):
         ('IDG Kurser', 'http://job.idgkurser.dk/rss/'),
 
     ]
-
diff --git a/recipes/contretemps.recipe b/recipes/contretemps.recipe
index fb72855ba0..8c96314279 100644
--- a/recipes/contretemps.recipe
+++ b/recipes/contretemps.recipe
@@ -36,9 +36,9 @@ class ContretempsRecipe(BasicNewsRecipe):
         return None
 
     def default_cover(self, cover_file):
-        """
+        '''
         Crée une couverture personnalisée pour Contretemps
-        """
+        '''
         from qt.core import QColor, QFont, QImage, QPainter, QPen, QRect, Qt
 
         from calibre.gui2 import ensure_app, load_builtin_fonts, pixmap_to_data
@@ -56,7 +56,7 @@ class ContretempsRecipe(BasicNewsRecipe):
 
             weekday = french_weekday[wkd]
             month = french_month[today.month]
-            date_str = f"{weekday} {today.day} {month} {today.year}"
+            date_str = f'{weekday} {today.day} {month} {today.year}'
             edition = today.strftime('Édition de %Hh%M')
 
             # Création de l'image de base (ratio ~1.6 pour format livre)
diff --git a/recipes/contropiano.recipe b/recipes/contropiano.recipe
index 26108dec66..31edae46b8 100644
--- a/recipes/contropiano.recipe
+++ b/recipes/contropiano.recipe
@@ -27,25 +27,18 @@ class AdvancedUserRecipe(BasicNewsRecipe):
     remove_tags_after = dict(name='p', attrs={'class': ['firma-redazione']})
 
     feeds = [
-        (u'Politica',
-         u'http://contropiano.org/news/politica-news/feed'),
-        (u'Internazionale',
-         u'http://contropiano.org/news/internazionale-news/feed'),
-        (u'Aggiornamenti in breve',  u'http://contropiano.org/news/aggiornamenti-in-breve/feed'),
-        (u'Economia',
-         u'http://contropiano.org/news/news-economia/feed'),
-        (u'Ambiente',
-         u'http://contropiano.org/news/ambiente-news/feed'),
-        (u'Scienza',
-            u'http://contropiano.org/news/scienza-news/feed'),
-        (u'Cultura',
-         u'http://contropiano.org/news/cultura-news/feed'),
+        (u'Politica', u'http://contropiano.org/news/politica-news/feed'),
+        (u'Internazionale', u'http://contropiano.org/news/internazionale-news/feed'),
+        (u'Aggiornamenti in breve', u'http://contropiano.org/news/aggiornamenti-in-breve/feed'),
+        (u'Economia', u'http://contropiano.org/news/news-economia/feed'),
+        (u'Ambiente', u'http://contropiano.org/news/ambiente-news/feed'),
+        (u'Scienza', u'http://contropiano.org/news/scienza-news/feed'),
+        (u'Cultura', u'http://contropiano.org/news/cultura-news/feed'),
         (u'Locali', u'http://contropiano.org/regionali/feed'),
         (u'Lavoro', u'http://contropiano.org/news/lavoro-conflitto-news/feed'),
-        (u'Malapolizia',  u'http://contropiano.org/news/malapolizia-news/feed'),
+        (u'Malapolizia', u'http://contropiano.org/news/malapolizia-news/feed'),
         (u'Interventi', u'http://contropiano.org/interventi/feed'),
         (u'Documenti', u'http://contropiano.org/documenti/feed'),
         (u'Vignette', u'http://contropiano.org/vignette/feed'),
-        (u'Altro',
-            u'http://contropiano.org/altro/feed')
+        (u'Altro', u'http://contropiano.org/altro/feed')
     ]
diff --git a/recipes/cosmos.recipe b/recipes/cosmos.recipe
index b973c027bd..0100149ed0 100644
--- a/recipes/cosmos.recipe
+++ b/recipes/cosmos.recipe
@@ -5,10 +5,10 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class CosmosMagazine(BasicNewsRecipe):
-    title = "Cosmos Magazine"
+    title = 'Cosmos Magazine'
     description = (
-        "Cosmos is a quarterly science magazine with 4 editions a year (Mar, Jun, Sep, Dec)."
-        "It is produced by The Royal Institution of Australia Inc (RiAus)."
+        'Cosmos is a quarterly science magazine with 4 editions a year (Mar, Jun, Sep, Dec).'
+        'It is produced by The Royal Institution of Australia Inc (RiAus).'
     )
     language = 'en_AU'
     __author__ = 'yodha8'
diff --git a/recipes/courrierinternational.recipe b/recipes/courrierinternational.recipe
index 5aa05d55dc..043952ceaa 100644
--- a/recipes/courrierinternational.recipe
+++ b/recipes/courrierinternational.recipe
@@ -2,8 +2,8 @@
 # vim:fileencoding=utf-8
 
 __license__ = 'GPL v3'
-__copyright__ = '2009, Mathieu Godlewski <mathieu at godlewski.fr>\
-2015, Rémi Vanicat <vanicat at debian.org'
+__copyright__ = ('2009, Mathieu Godlewski <mathieu at godlewski.fr>, '
+                 '2015, Rémi Vanicat <vanicat at debian.org')
 '''
 Courrier International
 '''
@@ -70,12 +70,12 @@ class CourrierInternational(BasicNewsRecipe):
         }
     '''
 
-    needs_subscription = "optional"
+    needs_subscription = 'optional'
     login_url = 'http://www.courrierinternational.com/login'
 
     def get_browser(self):
         def is_form_login(form):
-            return "id" in form.attrs and form.attrs['id'] == "user-login-form"
+            return 'id' in form.attrs and form.attrs['id'] == 'user-login-form'
         br = BasicNewsRecipe.get_browser(self)
         if self.username:
             br.open(self.login_url)
@@ -86,8 +86,8 @@ class CourrierInternational(BasicNewsRecipe):
         return br
 
     def preprocess_html(self, soup):
-        for link in soup.findAll("a", href=re.compile('^/')):
-            link["href"] = 'http://www.courrierinternational.com' + link["href"]
+        for link in soup.findAll('a', href=re.compile(r'^/')):
+            link['href'] = 'http://www.courrierinternational.com' + link['href']
         return soup
 
     feeds = [
diff --git a/recipes/cubadebate.recipe b/recipes/cubadebate.recipe
index ea87b6688c..335245ca4e 100644
--- a/recipes/cubadebate.recipe
+++ b/recipes/cubadebate.recipe
@@ -21,10 +21,10 @@ class CubaDebate(BasicNewsRecipe):
     encoding = 'utf-8'
     masthead_url = 'http://www.cubadebate.cu/wp-content/themes/cubadebate/images/logo.gif'
     publication_type = 'newsportal'
-    extra_css             = """
+    extra_css             = '''
                                #BlogTitle{font-size: xx-large; font-weight: bold}
                                body{font-family: Verdana, Arial, Tahoma, sans-serif}
-                            """
+                            '''
 
     conversion_options = {
         'comments': description, 'tags': category, 'language': language, 'publisher': publisher
diff --git a/recipes/cumhuriyet.recipe b/recipes/cumhuriyet.recipe
index 5284d33082..e7c56aac36 100644
--- a/recipes/cumhuriyet.recipe
+++ b/recipes/cumhuriyet.recipe
@@ -31,8 +31,8 @@ class Cumhuriyet(BasicNewsRecipe):
     ]
 
     feeds = [
-        ('Gundem',  'https://www.cumhuriyet.com.tr/rss/9999'),
-        ('Dünya',   'https://www.cumhuriyet.com.tr/rss/4'),
+        ('Gundem', 'https://www.cumhuriyet.com.tr/rss/9999'),
+        ('Dünya', 'https://www.cumhuriyet.com.tr/rss/4'),
         ('Türkiye', 'https://www.cumhuriyet.com.tr/rss/3'),
         ('Ekonomi', 'https://www.cumhuriyet.com.tr/rss/5'),
         ('Kultur Sanat', 'https://www.cumhuriyet.com.tr/rss/6'),
diff --git a/recipes/currenttime.recipe b/recipes/currenttime.recipe
index abb63fa430..00dbf14a88 100644
--- a/recipes/currenttime.recipe
+++ b/recipes/currenttime.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class CurrentTime(BasicNewsRecipe):
     title = '\u041D\u0430\u0441\u0442\u043E\u044F\u0449\u0435\u0435 \u0432\u0440\u0435\u043C\u044F'
     __author__ = 'bugmen00t'
-    description = '\u0422\u0435\u043B\u0435\u043A\u0430\u043D\u0430\u043B "\u041D\u0430\u0441\u0442\u043E\u044F\u0449\u0435\u0435 \u0412\u0440\u0435\u043C\u044F" \u0440\u0430\u0441\u0441\u043A\u0430\u0437\u044B\u0432\u0430\u0435\u0442 \u043E \u0432\u0430\u0436\u043D\u044B\u0445 \u043D\u043E\u0432\u043E\u0441\u0442\u044F\u0445 \u0438 \u0437\u043B\u043E\u0431\u043E\u0434\u043D\u0435\u0432\u043D\u044B\u0445 \u0442\u0435\u043C\u0430\u0445, \u043F\u0440\u0435\u0434\u043E\u0441\u0442\u0430\u0432\u043B\u044F\u044F \u0430\u0443\u0434\u0438\u0442\u043E\u0440\u0438\u0438 \u0442\u043E, \u0447\u0442\u043E \u043D\u0435 \u0432\u0441\u0435\u0433\u0434\u0430 \u043C\u043E\u0433\u0443\u0442 \u043E\u0431\u0435\u0441\u043F\u0435\u0447\u0438\u0442\u044C \u043C\u0435\u0441\u0442\u043D\u044B\u0435 \u0421\u041C\u0418: \u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u0431\u0435\u0437 \u0446\u0435\u043D\u0437\u0443\u0440\u044B, \u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0439 \u043E\u0431\u043C\u0435\u043D \u043C\u043D\u0435\u043D\u0438\u044F\u043C\u0438, \u043E\u0442\u043A\u0440\u044B\u0442\u043E\u0435 \u043E\u0431\u0441\u0443\u0436\u0434\u0435\u043D\u0438\u0435 \u043F\u0440\u043E\u0431\u043B\u0435\u043C.'  # noqa
-    publisher = 'RFE/RL ("\u0420\u0430\u0434\u0438\u043E \u0421\u0432\u043E\u0431\u043E\u0434\u043D\u0430\u044F \u0415\u0432\u0440\u043E\u043F\u0430"/"\u0420\u0430\u0434\u0438\u043E \u0421\u0432\u043E\u0431\u043E\u0434\u0430") \u043F\u0440\u0438 \u0443\u0447\u0430\u0441\u0442\u0438\u0438 VoA ("\u0413\u043E\u043B\u043E\u0441 \u0410\u043C\u0435\u0440\u0438\u043A\u0438")'  # noqa
+    description = '\u0422\u0435\u043B\u0435\u043A\u0430\u043D\u0430\u043B "\u041D\u0430\u0441\u0442\u043E\u044F\u0449\u0435\u0435 \u0412\u0440\u0435\u043C\u044F" \u0440\u0430\u0441\u0441\u043A\u0430\u0437\u044B\u0432\u0430\u0435\u0442 \u043E \u0432\u0430\u0436\u043D\u044B\u0445 \u043D\u043E\u0432\u043E\u0441\u0442\u044F\u0445 \u0438 \u0437\u043B\u043E\u0431\u043E\u0434\u043D\u0435\u0432\u043D\u044B\u0445 \u0442\u0435\u043C\u0430\u0445, \u043F\u0440\u0435\u0434\u043E\u0441\u0442\u0430\u0432\u043B\u044F\u044F \u0430\u0443\u0434\u0438\u0442\u043E\u0440\u0438\u0438 \u0442\u043E, \u0447\u0442\u043E \u043D\u0435 \u0432\u0441\u0435\u0433\u0434\u0430 \u043C\u043E\u0433\u0443\u0442 \u043E\u0431\u0435\u0441\u043F\u0435\u0447\u0438\u0442\u044C \u043C\u0435\u0441\u0442\u043D\u044B\u0435 \u0421\u041C\u0418: \u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u0431\u0435\u0437 \u0446\u0435\u043D\u0437\u0443\u0440\u044B, \u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0439 \u043E\u0431\u043C\u0435\u043D \u043C\u043D\u0435\u043D\u0438\u044F\u043C\u0438, \u043E\u0442\u043A\u0440\u044B\u0442\u043E\u0435 \u043E\u0431\u0441\u0443\u0436\u0434\u0435\u043D\u0438\u0435 \u043F\u0440\u043E\u0431\u043B\u0435\u043C.'  # noqa: E501
+    publisher = 'RFE/RL ("\u0420\u0430\u0434\u0438\u043E \u0421\u0432\u043E\u0431\u043E\u0434\u043D\u0430\u044F \u0415\u0432\u0440\u043E\u043F\u0430"/"\u0420\u0430\u0434\u0438\u043E \u0421\u0432\u043E\u0431\u043E\u0434\u0430") \u043F\u0440\u0438 \u0443\u0447\u0430\u0441\u0442\u0438\u0438 VoA ("\u0413\u043E\u043B\u043E\u0441 \u0410\u043C\u0435\u0440\u0438\u043A\u0438")'  # noqa: E501
     category = 'newspaper'
     cover_url = u'https://www.currenttime.tv/Content/responsive/RFE/ru-RU-TV/img/top_logo_news.png'
     language = 'ru'
diff --git a/recipes/cvecezla.recipe b/recipes/cvecezla.recipe
index 25b8efbac5..6a330cb194 100644
--- a/recipes/cvecezla.recipe
+++ b/recipes/cvecezla.recipe
@@ -21,13 +21,13 @@ class CveceZla(BasicNewsRecipe):
     no_stylesheets = True
     use_embedded_content = False
     publication_type = 'blog'
-    extra_css = ' @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: "Trebuchet MS",Trebuchet,Verdana,sans1,sans-serif} .article_description{font-family: sans1, sans-serif} img{display: block } '  # noqa
+    extra_css = ' @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: "Trebuchet MS",Trebuchet,Verdana,sans1,sans-serif} .article_description{font-family: sans1, sans-serif} img{display: block } '  # noqa: E501
 
     conversion_options = {
         'comment': description, 'tags': 'igre, muzika, film, blog, Srbija', 'publisher': 'Mehmet Krljic', 'language': language
     }
 
-    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]  # noqa: RUF039
 
     remove_tags_before = dict(attrs={'class': 'navigation'})
     remove_tags_after = dict(attrs={'class': 'commentlist'})
diff --git a/recipes/dagens_industri.recipe b/recipes/dagens_industri.recipe
index cb69060e67..570d5d114a 100644
--- a/recipes/dagens_industri.recipe
+++ b/recipes/dagens_industri.recipe
@@ -21,8 +21,8 @@ class AdvancedUserRecipe1311450855(BasicNewsRecipe):
 
     feeds = [(u'DI', u'https://di.se/rss')]
 
-    keep_only_tags = [dict(name='h1', attrs={'id': 'ctl00_ExtraWideContentRegion_WideContentRegion_MainRegion_MainContentRegion_MainBodyRegion_headlineNormal'}), dict( name='div', attrs={'id': 'articleBody'})]  # noqa
+    keep_only_tags = [dict(name='h1', attrs={'id': 'ctl00_ExtraWideContentRegion_WideContentRegion_MainRegion_MainContentRegion_MainBodyRegion_headlineNormal'}), dict(name='div', attrs={'id': 'articleBody'})]  # noqa: E501
 
     remove_tags = [
-        dict(name='div', attrs={'class': 'article-actions clear'}), dict(name='div', attrs={'class': 'article-action-popup'}), dict(name='div', attrs={'class': 'header'}), dict(name='div', attrs={'class': 'content clear'}), dict(name='div', attrs={'id': 'articleAdvertisementDiv'}), dict(name='ul', attrs={'class': 'action-list'})  # noqa
+        dict(name='div', attrs={'class': 'article-actions clear'}), dict(name='div', attrs={'class': 'article-action-popup'}), dict(name='div', attrs={'class': 'header'}), dict(name='div', attrs={'class': 'content clear'}), dict(name='div', attrs={'id': 'articleAdvertisementDiv'}), dict(name='ul', attrs={'class': 'action-list'})  # noqa: E501
     ]
diff --git a/recipes/daily_mirror.recipe b/recipes/daily_mirror.recipe
index e7436f63ec..064aaa5d00 100644
--- a/recipes/daily_mirror.recipe
+++ b/recipes/daily_mirror.recipe
@@ -57,11 +57,11 @@ class AdvancedUserRecipe1306061239(BasicNewsRecipe):
         (u'world News', u'http://www.mirror.co.uk/news/world-news/rss.xml'),
         (u'Sports', u'http://www.mirror.co.uk/sport/rss.xml'),
         (u'3AM', u'http://www.mirror.co.uk/3am/rss.xml'),
-        (u'Lifestyle', u'http://www.mirror.co.uk/lifestyle/rss.xml')
+        (u'Lifestyle', u'http://www.mirror.co.uk/lifestyle/rss.xml'),
 
 
         # example of commented out feed not needed
-        # ,(u'Travel','http://www.mirror.co.uk/advice/travel/rss.xml')
+        # (u'Travel','http://www.mirror.co.uk/advice/travel/rss.xml'),
     ]
     extra_css = '''
     h1{font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:large;}
diff --git a/recipes/dainik_bhaskar.recipe b/recipes/dainik_bhaskar.recipe
index d9389c234b..129fd0ce2e 100644
--- a/recipes/dainik_bhaskar.recipe
+++ b/recipes/dainik_bhaskar.recipe
@@ -23,7 +23,7 @@ class DainikBhaskar(BasicNewsRecipe):
         soup = self.index_to_soup('https://epaper.bhaskar.com/')
         tag = soup.find(attrs={'class': 'scaleDiv'})
         if tag:
-            self.cover_url = tag.find('img')['src'].replace("_ss.jpg", "_l.jpg")
+            self.cover_url = tag.find('img')['src'].replace('_ss.jpg', '_l.jpg')
         return super().get_cover_url()
 
     keep_only_tags = [
diff --git a/recipes/danas.recipe b/recipes/danas.recipe
index 23cea6e0cd..92ef429ba0 100644
--- a/recipes/danas.recipe
+++ b/recipes/danas.recipe
@@ -17,7 +17,7 @@ class Danas(BasicNewsRecipe):
     __author__ = 'Darko Miletic'
     description = 'Dnevne novine sa vestima iz sveta, politike, ekonomije, kulture, sporta, Beograda, Novog Sada i cele Srbije.'
     publisher = 'DAN GRAF d.o.o.'
-    category = 'danas Dnevne novine politika drustvo ekonomija svet sport beograd vojvodina periskop terazije Beograd Srbija Novi Sad Nis Kragujevac Vojvodina politics Serbia'  # noqa
+    category = 'danas Dnevne novine politika drustvo ekonomija svet sport beograd vojvodina periskop terazije Beograd Srbija Novi Sad Nis Kragujevac Vojvodina politics Serbia'  # noqa: E501
     oldest_article = 2
     max_articles_per_feed = 100
     no_stylesheets = False
@@ -31,11 +31,11 @@ class Danas(BasicNewsRecipe):
     auto_cleanup = True
     auto_cleanup_keep = '//div[@class="post-intro-above"] //h1[@class="post-title"] | //div[@class="post-intro-title"] | //div[@class="post-meta-wrapper"]'
     resolve_internal_links = True
-    extra_css = """
+    extra_css = '''
                                 .author{font-size: small}
                                 .published {font-size: small}
                                 img{margin-bottom: 0.8em}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description,
@@ -66,7 +66,7 @@ class Danas(BasicNewsRecipe):
                   'avgust', 'septembar', 'oktobar', 'novembar', 'decembar']
         td = date.today()
         monthname = months[td.month - 1]
-        lurl = td.strftime("https://www.danas.rs/naslovna/naslovna-strana-za-%d-" + monthname + "-%Y/")
+        lurl = td.strftime('https://www.danas.rs/naslovna/naslovna-strana-za-%d-' + monthname + '-%Y/')
         soup = self.index_to_soup(lurl)
         al = soup.find('div', attrs={'class':'corax-image'})
         if al and al.img:
diff --git a/recipes/daum_net.recipe b/recipes/daum_net.recipe
index a6590bb2d5..be4b3f15b6 100644
--- a/recipes/daum_net.recipe
+++ b/recipes/daum_net.recipe
@@ -61,7 +61,7 @@ class MediaDaumRecipe(BasicNewsRecipe):
             lambda match: '<em>'),
         (re.compile(r'<i>(<br[^>]*>[ \t\r\n]*)*', re.DOTALL | re.IGNORECASE),
             lambda match: '<i>'),
-        (re.compile(u'(<br[^>]*>[ \t\r\n]*)*(\u25B6|\u25CF|\u261E|\u24D2|\(c\))*\[[^\]]*(\u24D2|\(c\)|\uAE30\uC0AC|\uC778\uAE30[^\]]*\uB274\uC2A4)[^\]]*\].*</div>', re.DOTALL | re.IGNORECASE),  # noqa
+        (re.compile(u'(<br[^>]*>[ \t\r\n]*)*(\u25B6|\u25CF|\u261E|\u24D2|\\(c\\))*\\[[^\\]]*(\u24D2|\\(c\\)|\uAE30\uC0AC|\uC778\uAE30[^\\]]*\uB274\uC2A4)[^\\]]*\\].*</div>', re.DOTALL | re.IGNORECASE),  # noqa: E501, RUF039
             lambda match: '</div>'),
     ]
 
diff --git a/recipes/de_standaard.recipe b/recipes/de_standaard.recipe
index 4bb2222672..e374a22f44 100644
--- a/recipes/de_standaard.recipe
+++ b/recipes/de_standaard.recipe
@@ -71,10 +71,10 @@ class AdvancedUserRecipe1467571059(BasicNewsRecipe):
     remove_tags = [
         dict(name=['embed', 'object']),
         dict(name='div', attrs={'class':['note NotePortrait', 'note']}),
-        dict(name='ul', attrs={'class':re.compile('article__share')}),
+        dict(name='ul', attrs={'class':re.compile(r'article__share')}),
         dict(name='div', attrs={'class':'slideshow__controls'}),
         dict(name='a', attrs={'role':'button'}),
-        dict(name='figure', attrs={'class':re.compile('video')})
+        dict(name='figure', attrs={'class':re.compile(r'video')})
     ]
 
     remove_attributes = ['width', 'height']
diff --git a/recipes/debunkingdenialism.recipe b/recipes/debunkingdenialism.recipe
index 71fbd69a53..1d190974c3 100644
--- a/recipes/debunkingdenialism.recipe
+++ b/recipes/debunkingdenialism.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Bellingcat(BasicNewsRecipe):
     title = 'Debunking Denialism'
     __author__ = 'bugmen00t'
-    description = 'Debunking Denialism is a website dedicated to the refutation of pseudoscience and denialism by applying scientific skepticism and defending evidence-based science. Fighting pseudoscience and quackery with reason and evidence.'  # noqa
+    description = 'Debunking Denialism is a website dedicated to the refutation of pseudoscience and denialism by applying scientific skepticism and defending evidence-based science. Fighting pseudoscience and quackery with reason and evidence.'  # noqa: E501
     publisher = 'Debunking Denialism'
     category = 'blog'
     cover_url = u'https://i0.wp.com/debunkingdenialism.com/wp-content/uploads/2017/06/cropped-newestblavatar.jpg'
diff --git a/recipes/deccan_herald.recipe b/recipes/deccan_herald.recipe
index 81525ea8fa..7070db9904 100644
--- a/recipes/deccan_herald.recipe
+++ b/recipes/deccan_herald.recipe
@@ -5,6 +5,7 @@ def absurl(url):
     if url.startswith('/'):
         return 'https://www.deccanherald.com' + url
 
+
 class herald(BasicNewsRecipe):
     title = 'Deccan Herald'
     __author__ = 'unkn0wn'
diff --git a/recipes/degentenaar.recipe b/recipes/degentenaar.recipe
index 13f93f778a..93ff41ae08 100644
--- a/recipes/degentenaar.recipe
+++ b/recipes/degentenaar.recipe
@@ -36,9 +36,8 @@ class DeGentenaarOnline(BasicNewsRecipe):
         '--comment', description, '--category', category, '--publisher', publisher
     ]
 
-    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + \
-        category + \
-        '"\noverride_css=" p {text-indent: 0cm; margin-top: 0em; margin-bottom: 0.5em} "'
+    html2epub_options = ('publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category +
+        '"\noverride_css=" p {text-indent: 0cm; margin-top: 0em; margin-bottom: 0.5em} "')
 
     keep_only_tags = [dict(name='span', attrs={
                            'id': ['lblArticleTitle', 'lblArticleIntroduction', 'lblArticleMainText']})]
@@ -63,7 +62,7 @@ class DeGentenaarOnline(BasicNewsRecipe):
         return url.replace('/Detail.aspx?articleid', '/PrintArticle.aspx?ArticleID')
 
     def get_article_url(self, article):
-        return article.get('guid',  None)
+        return article.get('guid', None)
 
     def preprocess_html(self, soup):
         del soup.body['onload']
@@ -77,9 +76,9 @@ class DeGentenaarOnline(BasicNewsRecipe):
         soup.html['lang'] = self.lang
         soup.html['dir'] = self.direction
         mlang = new_tag(soup, 'meta', [
-                    ("http-equiv", "Content-Language"), ("content", self.lang)])
+                    ('http-equiv', 'Content-Language'), ('content', self.lang)])
         mcharset = new_tag(soup, 'meta', [
-                       ("http-equiv", "Content-Type"), ("content", "text/html; charset=utf-8")])
+                       ('http-equiv', 'Content-Type'), ('content', 'text/html; charset=utf-8')])
         soup.head.insert(0, mlang)
         soup.head.insert(1, mcharset)
         return soup
diff --git a/recipes/democracy_journal.recipe b/recipes/democracy_journal.recipe
index 96c80c946c..965947d0df 100644
--- a/recipes/democracy_journal.recipe
+++ b/recipes/democracy_journal.recipe
@@ -16,8 +16,8 @@ class AdvancedUserRecipe1361743898(BasicNewsRecipe):
     def parse_index(self):
         articles = []
         feeds = []
-        soup = self.index_to_soup("http://www.democracyjournal.org")
-        for x in soup.findAll(href=re.compile(r"http://www\.democracyjournal\.org/\d*/.*php$")):
+        soup = self.index_to_soup('http://www.democracyjournal.org')
+        for x in soup.findAll(href=re.compile(r'http://www\.democracyjournal\.org/\d*/.*php$')):
             url = x.get('href')
             title = self.tag_to_string(x)
             articles.append({'title': title, 'url': url,
diff --git a/recipes/democracy_now.recipe b/recipes/democracy_now.recipe
index cfd9900c25..b6df72b0bc 100644
--- a/recipes/democracy_now.recipe
+++ b/recipes/democracy_now.recipe
@@ -5,7 +5,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class DemocracyNowRecipe(BasicNewsRecipe):
     title = u'Democracy now!'
     __author__ = u'Antoine Beaupré'
-    description = 'A daily TV/radio news program, hosted by Amy Goodman and Juan Gonzalez, airing on over 1,100 stations, pioneering the largest community media collaboration in the United States.'  # noqa
+    description = 'A daily TV/radio news program, hosted by Amy Goodman and Juan Gonzalez, airing on over 1,100 stations, pioneering the largest community media collaboration in the United States.'  # noqa: E501
     language = 'en'
     cover_url = 'http://www.democracynow.org/images/dn-logo-for-podcast.png'
 
diff --git a/recipes/demorgen_be.recipe b/recipes/demorgen_be.recipe
index 98e77f97c3..8d7eab72a4 100644
--- a/recipes/demorgen_be.recipe
+++ b/recipes/demorgen_be.recipe
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-"""
+'''
 demorgen.be
-"""
+'''
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
@@ -13,7 +13,7 @@ class DeMorganBe(BasicNewsRecipe):
     description = 'News from Belgium in Dutch'
     oldest_article = 1
     language = 'nl_BE'
-    encoding = "utf-8"
+    encoding = 'utf-8'
     max_articles_per_feed = 100
     no_stylesheets = True
     remove_attributes = ['style', 'height', 'width']
@@ -23,10 +23,10 @@ class DeMorganBe(BasicNewsRecipe):
     masthead_url = 'https://www.demorgen.be/_next/static/media/demorgen_logo.dce579e2.svg'
     cover_url = 'https://usercontent.one/wp/www.insidejazz.be/wp-content/uploads/2018/11/pic0143.png'
 
-    extra_css = """
+    extra_css = '''
         time, [data-test-id:"article-label"], [data-test-id:"article-sublabel"], [[data-test-id:"article-author"]] { font-size:small; }
         [data-test-id:"header-intro"] { font-style: italic; }
-    """
+    '''
 
     keep_only_tags = [
         dict(name='article', attrs={'id': 'article-content'}),
diff --git a/recipes/den_of_geek.recipe b/recipes/den_of_geek.recipe
index 518b1b23ca..4274a50737 100644
--- a/recipes/den_of_geek.recipe
+++ b/recipes/den_of_geek.recipe
@@ -5,9 +5,8 @@ class AdvancedUserRecipe1316944753(BasicNewsRecipe):
     title = u'Den of Geek'
     __author__ = 'Jaded'
     language = 'en'
-    description = 'From science fiction enthusiasts through to gaming fanatics, Den of Geek has become the one-stop UK website for people genuinely passionate about their entertainment media. Den of Geek covers popular culture but always with an edgy, UK centric slant that sets it apart from the crowd.'  # noqa
+    description = 'From science fiction enthusiasts through to gaming fanatics, Den of Geek has become the one-stop UK website for people genuinely passionate about their entertainment media. Den of Geek covers popular culture but always with an edgy, UK centric slant that sets it apart from the crowd.'  # noqa: E501
     category = 'Movies, TV, Games, Comics, Cult, News, Reviews'
-    language = 'en'
 
     oldest_article = 7
     max_articles_per_feed = 100
diff --git a/recipes/denik.cz.recipe b/recipes/denik.cz.recipe
index 2af252fc9a..b856914ab8 100644
--- a/recipes/denik.cz.recipe
+++ b/recipes/denik.cz.recipe
@@ -23,8 +23,8 @@ class ceskyDenikRecipe(BasicNewsRecipe):
     cover_url = 'http://g.denik.cz/images/loga/denik.png'
     remove_javascript = True
     no_stylesheets = True
-    extra_css             = """
-                            """
+    extra_css             = '''
+                            '''
 
     remove_tags = []
     keep_only_tags = [dict(name='div', attrs={'class': 'content'})]
diff --git a/recipes/denik_referendum.recipe b/recipes/denik_referendum.recipe
index 35fdd1248c..486524ab67 100644
--- a/recipes/denik_referendum.recipe
+++ b/recipes/denik_referendum.recipe
@@ -25,4 +25,4 @@ class denikReferendumRecipe(BasicNewsRecipe):
     remove_tags = [dict(name='div', attrs={'class': ['box boxLine', 'box noprint', 'box']}),
                    dict(name='h3', attrs={'class': 'head alt'})]
 
-    keep_only_tags = [dict(name='div',   attrs={'id': ['content']})]
+    keep_only_tags = [dict(name='div', attrs={'id': ['content']})]
diff --git a/recipes/denikn.cz.recipe b/recipes/denikn.cz.recipe
index 50c7b9fd3e..a857cb98a2 100644
--- a/recipes/denikn.cz.recipe
+++ b/recipes/denikn.cz.recipe
@@ -11,11 +11,11 @@ CZ_MONTHS = ['led', 'úno', 'bře', 'dub', 'kvě', 'čen', 'čec', 'srp', 'zář
 
 
 def cz_title_time():
-    """
+    '''
     Helper function to return date with czech locale.
     Uses hardcoded lookup table of day and month names as strftime requires
     locale change that is not thread safe.
-    """
+    '''
     today = datetime.today()
     weekday = CZ_DAYS[today.weekday()]
     month = CZ_MONTHS[today.month-1]
@@ -26,9 +26,9 @@ def cz_title_time():
 
 
 class DenikNRecipe(BasicNewsRecipe):
-    """
+    '''
     Recipe for the RSS feed of https://denikn.cz/
-    """
+    '''
 
     title = u'Deník N'
     __author__ = 'Robert Mihaly'
diff --git a/recipes/deredactie.recipe b/recipes/deredactie.recipe
index 1f6a1e5316..eb9dd676e6 100644
--- a/recipes/deredactie.recipe
+++ b/recipes/deredactie.recipe
@@ -31,13 +31,13 @@ class deredactie(BasicNewsRecipe):
         catnames = {}
         soup = self.index_to_soup(
             'http://www.deredactie.be/cm/vrtnieuws.deutsch')
-        for elem in soup.findAll('li', attrs={'id': re.compile("^navItem[2-9]")}):
+        for elem in soup.findAll('li', attrs={'id': re.compile(r'^navItem[2-9]')}):
             a = elem.find('a', href=True)
-            m = re.search('(?<=/)[^/]*$', a['href'])
+            m = re.search(r'(?<=/)[^/]*$', a['href'])
             cat = str(m.group(0))
             categories.append(cat)
             catnames[cat] = a['title']
-            self.log("found cat %s\n" % catnames[cat])
+            self.log('found cat %s\n' % catnames[cat])
 
         feeds = []
 
@@ -45,7 +45,7 @@ class deredactie(BasicNewsRecipe):
             articles = []
             soup = self.index_to_soup(
                 'http://www.deredactie.be/cm/vrtnieuws.deutsch/' + cat)
-            for a in soup.findAll('a', attrs={'href': re.compile("deutsch.*/[0-9][0-9][0-9][0-9][0-9][0-9]_")}):
+            for a in soup.findAll('a', attrs={'href': re.compile(r'deutsch.*/[0-9][0-9][0-9][0-9][0-9][0-9]_')}):
                 skip_this_article = False
                 url = a['href'].strip()
                 if url.startswith('/'):
@@ -55,12 +55,12 @@ class deredactie(BasicNewsRecipe):
                 for article in articles:
                     if article['url'] == url:
                         skip_this_article = True
-                        self.log("SKIPPING DUP %s" % url)
+                        self.log('SKIPPING DUP %s' % url)
                         break
                 if skip_this_article:
                     continue
                 articles.append(myarticle)
-                self.log("Adding URL %s\n" % url)
+                self.log('Adding URL %s\n' % url)
             if articles:
                 feeds.append((catnames[cat], articles))
         return feeds
diff --git a/recipes/descopera.recipe b/recipes/descopera.recipe
index 3186b28ecb..949dc006a9 100644
--- a/recipes/descopera.recipe
+++ b/recipes/descopera.recipe
@@ -18,12 +18,10 @@ class Descopera(BasicNewsRecipe):
     oldest_article = 5
     language = 'ro'
     max_articles_per_feed = 100
-    no_stylesheets = True
     use_embedded_content = False
     category = 'Ziare,Reviste,Descopera'
     encoding = 'utf-8'
     cover_url = 'http://www.descopera.ro/images/header_images/logo.gif'
-    use_embedded_content = False
 
     no_stylesheets = True
     auto_cleanup = True
diff --git a/recipes/desiring_god.recipe b/recipes/desiring_god.recipe
index bd287217ef..579ce6d873 100644
--- a/recipes/desiring_god.recipe
+++ b/recipes/desiring_god.recipe
@@ -11,7 +11,6 @@ class DesiringGodEnglish(BasicNewsRecipe):
 
     cover_url = 'http://cdn0.desiringgod.org/images/layout/breadcrumbs_dg_mark.png'
     masthead_url = 'http://cdn0.desiringgod.org/images/layout/breadcrumbs_dg_mark.png'
-    language = 'en'
     oldest_article = 7
     max_articles_per_feed = 50
     auto_cleanup = True
diff --git a/recipes/deutsche_welle_de.recipe b/recipes/deutsche_welle_de.recipe
index 985b43e59c..b70b58fb9f 100644
--- a/recipes/deutsche_welle_de.recipe
+++ b/recipes/deutsche_welle_de.recipe
@@ -11,8 +11,6 @@ class DeutscheWelle(BasicNewsRecipe):
     max_articles_per_feed = 200
     no_stylesheets = True
     remove_javascript = True
-    no_stylesheets = True
-    remove_javascript = True
     remove_empty_feeds = True
     ignore_duplicate_articles = {'title', 'url'}
     remove_attributes = ['height', 'width', 'style']
diff --git a/recipes/deutsche_welle_es.recipe b/recipes/deutsche_welle_es.recipe
index 5076f1425d..96639af75a 100644
--- a/recipes/deutsche_welle_es.recipe
+++ b/recipes/deutsche_welle_es.recipe
@@ -54,7 +54,6 @@ class DeutscheWelle_es(BasicNewsRecipe):
         ('Conozca Alemania', 'http://rss.dw-world.de/rdf/rss-sp-con')
     ]
 
-
     def preprocess_html(self, soup):
         for img in soup.findAll('img', srcset=True):
             img['src'] = img['srcset'].split()[6]
diff --git a/recipes/deutsche_welle_ru.recipe b/recipes/deutsche_welle_ru.recipe
index 140722b3be..aca0b9cf2a 100644
--- a/recipes/deutsche_welle_ru.recipe
+++ b/recipes/deutsche_welle_ru.recipe
@@ -3,7 +3,7 @@ from calibre.web.feeds.news import BasicNewsRecipe, classes
 
 class DeutscheWelle(BasicNewsRecipe):
     title = u'Deutsche Welle \u043D\u0430 \u0440\u0443\u0441\u0441\u043A\u043E\u043C'
-    description = u'\u0420\u0443\u0441\u0441\u043A\u0430\u044F \u0440\u0435\u0434\u0430\u043A\u0446\u0438\u044F Deutsche Welle: \u043D\u043E\u0432\u043E\u0441\u0442\u0438, \u0430\u043D\u0430\u043B\u0438\u0442\u0438\u043A\u0430, \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 \u0438 \u0440\u0435\u043F\u043E\u0440\u0442\u0430\u0436\u0438 \u0438\u0437 \u0413\u0435\u0440\u043C\u0430\u043D\u0438\u0438 \u0438 \u0415\u0432\u0440\u043E\u043F\u044B, \u043D\u0435\u043C\u0435\u0446\u043A\u0438\u0439 \u0438 \u0435\u0432\u0440\u043E\u043F\u0435\u0439\u0441\u043A\u0438\u0439 \u0432\u0437\u0433\u043B\u044F\u0434 \u043D\u0430 \u0441\u043E\u0431\u044B\u0442\u0438\u044F \u0432 \u0420\u043E\u0441\u0441\u0438\u0438 \u0438 \u043C\u0438\u0440\u0435,  \u043F\u0440\u0430\u043A\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u0441\u043E\u0432\u0435\u0442\u044B \u0434\u043B\u044F \u0442\u0443\u0440\u0438\u0441\u0442\u043E\u0432 \u0438 \u0442\u0435\u0445, \u043A\u0442\u043E \u0436\u0435\u043B\u0430\u0435\u0442 \u0443\u0447\u0438\u0442\u044C\u0441\u044F \u0438\u043B\u0438 \u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C \u0432 \u0413\u0435\u0440\u043C\u0430\u043D\u0438\u0438 \u0438 \u0434\u0440\u0443\u0433\u0438\u0445 \u0441\u0442\u0440\u0430\u043D\u0430\u0445 \u0415\u0432\u0440\u043E\u0441\u043E\u044E\u0437\u0430.'  # noqa
+    description = u'\u0420\u0443\u0441\u0441\u043A\u0430\u044F \u0440\u0435\u0434\u0430\u043A\u0446\u0438\u044F Deutsche Welle: \u043D\u043E\u0432\u043E\u0441\u0442\u0438, \u0430\u043D\u0430\u043B\u0438\u0442\u0438\u043A\u0430, \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 \u0438 \u0440\u0435\u043F\u043E\u0440\u0442\u0430\u0436\u0438 \u0438\u0437 \u0413\u0435\u0440\u043C\u0430\u043D\u0438\u0438 \u0438 \u0415\u0432\u0440\u043E\u043F\u044B, \u043D\u0435\u043C\u0435\u0446\u043A\u0438\u0439 \u0438 \u0435\u0432\u0440\u043E\u043F\u0435\u0439\u0441\u043A\u0438\u0439 \u0432\u0437\u0433\u043B\u044F\u0434 \u043D\u0430 \u0441\u043E\u0431\u044B\u0442\u0438\u044F \u0432 \u0420\u043E\u0441\u0441\u0438\u0438 \u0438 \u043C\u0438\u0440\u0435,  \u043F\u0440\u0430\u043A\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u0441\u043E\u0432\u0435\u0442\u044B \u0434\u043B\u044F \u0442\u0443\u0440\u0438\u0441\u0442\u043E\u0432 \u0438 \u0442\u0435\u0445, \u043A\u0442\u043E \u0436\u0435\u043B\u0430\u0435\u0442 \u0443\u0447\u0438\u0442\u044C\u0441\u044F \u0438\u043B\u0438 \u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C \u0432 \u0413\u0435\u0440\u043C\u0430\u043D\u0438\u0438 \u0438 \u0434\u0440\u0443\u0433\u0438\u0445 \u0441\u0442\u0440\u0430\u043D\u0430\u0445 \u0415\u0432\u0440\u043E\u0441\u043E\u044E\u0437\u0430.'  # noqa: E501
     __author__ = 'bugmen00t, unkn0wn'
     publication_type = 'newspaper'
     oldest_article = 2
diff --git a/recipes/deutsche_welle_sr.recipe b/recipes/deutsche_welle_sr.recipe
index 134ea368fc..e0a052bcd2 100644
--- a/recipes/deutsche_welle_sr.recipe
+++ b/recipes/deutsche_welle_sr.recipe
@@ -59,4 +59,3 @@ class DeutscheWelle_sr(BasicNewsRecipe):
         (u'Nauka Tehnika Medicina', u'http://rss.dw-world.de/rdf/rss-ser-science'),
         (u'Kultura', u'feed:http://rss.dw-world.de/rdf/rss-ser-cul')
     ]
-
diff --git a/recipes/deutschland_funk.recipe b/recipes/deutschland_funk.recipe
index aefe587276..d742b8fd41 100644
--- a/recipes/deutschland_funk.recipe
+++ b/recipes/deutschland_funk.recipe
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#from __future__ import unicode_literals, division, absolute_import, print_function
+# from __future__ import unicode_literals, division, absolute_import, print_function
 from calibre.web.feeds.news import BasicNewsRecipe
 
 __license__   = 'GPL v3'
@@ -14,6 +14,7 @@ Fetch Deutschlandfunk & Deutschlandfunk Kultur
 ## Version:1.6
 ## New RSS source: https://www.deutschlandfunk.de/rss-angebot-102.html
 
+
 class AdvancedUserRecipe1432200863(BasicNewsRecipe):
 
     title            = 'Deutschlandfunk & Deutschlandfunk Kultur'
@@ -28,14 +29,12 @@ class AdvancedUserRecipe1432200863(BasicNewsRecipe):
     max_articles_per_feed = 100
     auto_cleanup     = False
 
-    extra_css      =  '''
+    extra_css      = '''
                       h1, h2 {font-size: 1.6em; text-align: left}
                       .article-header-description {font-size: 1em; font-style: italic; font-weight: normal;margin-bottom: 1em}
                       .b-image-figure, .caption-figure.is-left, .b-image-credits {font-size: .75em; font-weight: normal;margin-bottom: .75em}
                       '''
 
-
-
     feeds = [
               ('DLF Nachrichten', 'https://www.deutschlandfunk.de/nachrichten-100.rss'),
               ('DLF Politikportal', 'https://www.deutschlandfunk.de/politikportal-100.rss'),
@@ -59,8 +58,8 @@ class AdvancedUserRecipe1432200863(BasicNewsRecipe):
               ('DLF-Kultur Film / Serie', 'https://www.deutschlandfunkkultur.de/film-serie-100.rss'),
             ]
     keep_only_tags = [
-                        dict(name='nav', attrs={'class':'b-breadcrumbs'}), # DLF articles
-                        dict(name='article', attrs={'class':'b-article'}), # DLF articles
+                        dict(name='nav', attrs={'class':'b-breadcrumbs'}),  # DLF articles
+                        dict(name='article', attrs={'class':'b-article'}),  # DLF articles
                         dict(name='div', attrs={'class':[
                                                          'b-section-article-head-area',
                                                          'b-section-editor-content',
@@ -77,6 +76,6 @@ class AdvancedUserRecipe1432200863(BasicNewsRecipe):
                     dict(name='ul', attrs={'class':['b-social-icons']}),   # DLF articles
 
                     dict(name='ul', attrs={'class':['b-social-icons']}),      # DLF Kultur articles
-                    dict(name='div', attrs={'class':'b-footer-area-series'}), # DLF Kultur articles
+                    dict(name='div', attrs={'class':'b-footer-area-series'}),  # DLF Kultur articles
                     dict(name='div', attrs={'id':'weekender'})
                   ]
diff --git a/recipes/dev_ua.recipe b/recipes/dev_ua.recipe
index ed778d908f..49e32138d4 100644
--- a/recipes/dev_ua.recipe
+++ b/recipes/dev_ua.recipe
@@ -17,14 +17,14 @@ class WiComix(BasicNewsRecipe):
     auto_cleanup   = False
     oldest_article = 3
     max_articles_per_feed = 30
-    description           = '\u041C\u0435\u0434\u0456\u0430 \u043F\u0440\u043E \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0456\u0457, \u0456\u043D\u043D\u043E\u0432\u0430\u0446\u0456\u0457, \u0432\u0438\u043D\u0430\u0445\u043E\u0434\u0438 \u0432 \u0423\u043A\u0440\u0430\u0457\u043D\u0456 \u0442\u0430 \u0437\u0430 \u0457\u0457 \u043C\u0435\u0436\u0430\u043C\u0438. \u041F\u0440\u043E \u0442\u0435, \u044F\u043A \u0432\u043E\u043D\u0438 \u0432\u043F\u043B\u0438\u0432\u0430\u044E\u0442\u044C \u043D\u0430 \u0436\u0438\u0442\u0442\u044F \u043B\u044E\u0434\u0435\u0439.'  # noqa
+    description           = '\u041C\u0435\u0434\u0456\u0430 \u043F\u0440\u043E \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0456\u0457, \u0456\u043D\u043D\u043E\u0432\u0430\u0446\u0456\u0457, \u0432\u0438\u043D\u0430\u0445\u043E\u0434\u0438 \u0432 \u0423\u043A\u0440\u0430\u0457\u043D\u0456 \u0442\u0430 \u0437\u0430 \u0457\u0457 \u043C\u0435\u0436\u0430\u043C\u0438. \u041F\u0440\u043E \u0442\u0435, \u044F\u043A \u0432\u043E\u043D\u0438 \u0432\u043F\u043B\u0438\u0432\u0430\u044E\u0442\u044C \u043D\u0430 \u0436\u0438\u0442\u0442\u044F \u043B\u044E\u0434\u0435\u0439.'  # noqa: E501
     language              = 'uk'
 
     remove_tags_before = dict(name='div', attrs={'class': 'article__header'})
 
     remove_tags_after = dict(name='div', attrs={'class': 'article__body'})
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='div', attrs={'class': 'article__reference article__reference_header'}),
         dict(name='div', attrs={'class': 'my-lg-5'}),
         dict(name='div', attrs={'class': 'video '}),
diff --git a/recipes/diario_sport.recipe b/recipes/diario_sport.recipe
index 312917eb5d..e02db71cba 100644
--- a/recipes/diario_sport.recipe
+++ b/recipes/diario_sport.recipe
@@ -20,7 +20,7 @@ class DiarioSport(BasicNewsRecipe):
     keep_only_tags = [dict(name='div', attrs={'id': ['noticiasMedio']})]
 
     remove_tags = [
-        dict(name=['object', 'link', 'script', 'ul']), dict(name='div', attrs={'id': ['scrAdSense', 'herramientas2', 'participacion', 'participacion2', 'bloque1resultados', 'bloque2resultados', 'cont_vinyetesAnt', 'tinta', 'noticiasSuperior', 'cintillopublicidad2']}), dict( name='p', attrs={'class': ['masinformacion', 'hora']}), dict(name='a', attrs={'class': ["'link'"]}), dict(name='div', attrs={'class': ['addthis_toolbox addthis_default_style', 'firma', 'pretitularnoticia']}), dict(name='form', attrs={'id': ['formularioDeBusquedaAvanzada']})  # noqa
+        dict(name=['object', 'link', 'script', 'ul']), dict(name='div', attrs={'id': ['scrAdSense', 'herramientas2', 'participacion', 'participacion2', 'bloque1resultados', 'bloque2resultados', 'cont_vinyetesAnt', 'tinta', 'noticiasSuperior', 'cintillopublicidad2']}), dict(name='p', attrs={'class': ['masinformacion', 'hora']}), dict(name='a', attrs={'class': ["'link'"]}), dict(name='div', attrs={'class': ['addthis_toolbox addthis_default_style', 'firma', 'pretitularnoticia']}), dict(name='form', attrs={'id': ['formularioDeBusquedaAvanzada']})  # noqa: E501
     ]
 
     def preprocess_html(self, soup):
diff --git a/recipes/digizone.recipe b/recipes/digizone.recipe
index 5726c41782..e486daeeec 100644
--- a/recipes/digizone.recipe
+++ b/recipes/digizone.recipe
@@ -19,9 +19,9 @@ class DigiZoneCZ(BasicNewsRecipe):
     publication_type = 'newsportal'
     no_stylesheets = True
     remove_javascript = True
-    extra_css               = 'p.perex{font-size: 1.2em; margin: 0 0 10px 0;line-height: 1.4;padding: 0 0 10px 0;font-weight: bold;} \
-                               p.perex img {display:none;} \
-                               .urs p {margin: 0 0 0.8em 0;}'
+    extra_css               = '''p.perex{font-size: 1.2em; margin: 0 0 10px 0;line-height: 1.4;padding: 0 0 10px 0;font-weight: bold;}
+                                 p.perex img {display:none;}
+                                 .urs p {margin: 0 0 0.8em 0;}'''
 
     feeds = [
         (u'Aktuality', u'http://rss.digizone.cz/aktuality'),
diff --git a/recipes/dilema.recipe b/recipes/dilema.recipe
index 1a64701880..468065ad6c 100644
--- a/recipes/dilema.recipe
+++ b/recipes/dilema.recipe
@@ -12,8 +12,8 @@ class Volkskrant(BasicNewsRecipe):
     country = 'RO'
     category = 'politics, culture, Romania'
     resolve_internal_links = True
-    remove_tags_before = { 'class': 'post' }
-    remove_tags_after = { 'class': 'post_content' }
+    remove_tags_before = {'class': 'post'}
+    remove_tags_after = {'class': 'post_content'}
     remove_tags = [
         dict(
             attrs={
@@ -34,7 +34,7 @@ class Volkskrant(BasicNewsRecipe):
         dict(id=['like', 'dlik']),
         dict(name=['script', 'noscript', 'style']),
     ]
-    remove_attributes = ["class", "id", "name", "style"]
+    remove_attributes = ['class', 'id', 'name', 'style']
     encoding = 'utf-8'
     no_stylesheets = True
     ignore_duplicate_articles = {'url'}
@@ -88,7 +88,7 @@ class Volkskrant(BasicNewsRecipe):
                     )
                 )
 
-        sections = [("Numărul curent", articles)]
+        sections = [('Numărul curent', articles)]
         return sections
 
     def preprocess_html(self, soup):
diff --git a/recipes/discover_magazine_monthly.recipe b/recipes/discover_magazine_monthly.recipe
index 56db6633b9..2ba78e6633 100644
--- a/recipes/discover_magazine_monthly.recipe
+++ b/recipes/discover_magazine_monthly.recipe
@@ -81,11 +81,11 @@ class DiscoverMagazine(BasicNewsRecipe):
     preprocess_regexps = [(re.compile(r'<br[ ]*/>', re.IGNORECASE), lambda m: ''),
                           (re.compile(r'<br[ ]*clear.*/>', re.IGNORECASE), lambda m: '')]
 
-    extra_css = 'body { font-family: helvetica, sans-serif; } \
-                 .belowdeck {font-style: italic; padding=bottom: 10px; max-width: none} \
-                 .caption {font-style: italic; padding=bottom: 10px; max-width: none} \
-                 .caption1 {font-style: italic; padding=bottom: 10px; max-width: none} \
-                 h2 { text-align: left; font-size: 1em; font-weight: bold; }}'
+    extra_css = '''body { font-family: helvetica, sans-serif; }
+                   .belowdeck {font-style: italic; padding=bottom: 10px; max-width: none}
+                   .caption {font-style: italic; padding=bottom: 10px; max-width: none}
+                   .caption1 {font-style: italic; padding=bottom: 10px; max-width: none}
+                   h2 { text-align: left; font-size: 1em; font-weight: bold; }}'''
 
     def parse_index(self):
         # gets current month from homepage and append to index
@@ -104,8 +104,7 @@ class DiscoverMagazine(BasicNewsRecipe):
         if cover is not None:
             img = cover.find('img', src=True)
             if img is not None:
-                self.cover_url = 'http://www.discovermagazine.com' + \
-                    img['src'].replace(' ', '%20')  # [:-7]
+                self.cover_url = 'http://www.discovermagazine.com' + img['src'].replace(' ', '%20')  # [:-7]
         # parse articles
         for tag in col.findAll(name=['h3', 'div'], attrs={'class': ['bottomBorder', 'headline']}):
             if tag.name == 'h3':
diff --git a/recipes/distrowatch_weekly.recipe b/recipes/distrowatch_weekly.recipe
index 836b8a3d01..03aa38ed22 100644
--- a/recipes/distrowatch_weekly.recipe
+++ b/recipes/distrowatch_weekly.recipe
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-__license__ = "GPL v3"
+__license__ = 'GPL v3'
 
-"""DistroWatch Weekly"""
+'''DistroWatch Weekly'''
 
 import datetime
 
@@ -10,28 +10,28 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class DistroWatchWeekly(BasicNewsRecipe):
-    title = "DistroWatch Weekly"
-    description = "Weekly news about Linux distributions"
-    category = "Linux, Technology, News"
+    title = 'DistroWatch Weekly'
+    description = 'Weekly news about Linux distributions'
+    category = 'Linux, Technology, News'
     oldest_article = 14
-    language = "en"
+    language = 'en'
     max_articles_per_feed = 50
     no_stylesheets = True
     use_embedded_content = False
-    timefmt = " [%A, %d %B, %Y]"
+    timefmt = ' [%A, %d %B, %Y]'
     auto_cleanup = False
 
     keep_only_tags = [
         dict(
             attrs={
-                "class":
-                lambda x: x and ("News1" in x)
+                'class':
+                lambda x: x and ('News1' in x)
             }
         )
     ]
 
     def _get_mag_date(self):
-        """Return date of latest weekly issue."""
+        '''Return date of latest weekly issue.'''
 
         d = datetime.date(2022, 6, 20)
         t = datetime.date.today()
@@ -45,17 +45,17 @@ class DistroWatchWeekly(BasicNewsRecipe):
 
         # Get URL of latest mag page
         ld = self._get_mag_date()
-        url = ld.strftime("https://distrowatch.com/weekly.php?issue=%Y%m%d")
+        url = ld.strftime('https://distrowatch.com/weekly.php?issue=%Y%m%d')
         url = url.lower()
-        title = ld.strftime("DistroWatch Weekly for %Y-%m-%d")
+        title = ld.strftime('DistroWatch Weekly for %Y-%m-%d')
 
         # Get articles
         stories = [{
-            "url": url,
-            "title": title,
+            'url': url,
+            'title': title,
         },]
         index = [
-            ("Articles", stories),
+            ('Articles', stories),
         ]
 
         return index
diff --git a/recipes/dnevnik_cro.recipe b/recipes/dnevnik_cro.recipe
index e3bafb6c1c..ea9fe20023 100644
--- a/recipes/dnevnik_cro.recipe
+++ b/recipes/dnevnik_cro.recipe
@@ -23,7 +23,7 @@ def new_tag(soup, name, attrs=()):
 class DnevnikCro(BasicNewsRecipe):
     title = 'Dnevnik - Hr'
     __author__ = 'Darko Miletic'
-    description = "Vijesti iz Hrvatske"
+    description = 'Vijesti iz Hrvatske'
     publisher = 'Dnevnik.hr'
     category = 'news, politics, Croatia'
     oldest_article = 2
@@ -36,13 +36,13 @@ class DnevnikCro(BasicNewsRecipe):
 
     lang = 'hr-HR'
     direction = 'ltr'
-    extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'  # noqa
+    extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'  # noqa: E501
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': lang, 'pretty_print': True
     }
 
-    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]  # noqa: RUF039
 
     keep_only_tags = [dict(name='div', attrs={'id': 'article'})]
 
@@ -59,7 +59,7 @@ class DnevnikCro(BasicNewsRecipe):
         soup.html['lang'] = self.lang
         soup.html['dir'] = self.direction
 
-        attribs = ['style', 'font', 'valign', 'colspan', 'width', 'height', 'rowspan', 'summary', 'align', 'cellspacing', 'cellpadding', 'frames', 'rules', 'border' ]  # noqa
+        attribs = ['style', 'font', 'valign', 'colspan', 'width', 'height', 'rowspan', 'summary', 'align', 'cellspacing', 'cellpadding', 'frames', 'rules', 'border']  # noqa: E501
         for item in soup.body.findAll(name=['table', 'td', 'tr', 'th', 'caption', 'thead', 'tfoot', 'tbody', 'colgroup', 'col']):
             item.name = 'div'
             for attrib in attribs:
@@ -67,9 +67,9 @@ class DnevnikCro(BasicNewsRecipe):
                 del item[attrib]
 
         mlang = new_tag(soup, 'meta', [
-                    ("http-equiv", "Content-Language"), ("content", self.lang)])
+                    ('http-equiv', 'Content-Language'), ('content', self.lang)])
         mcharset = new_tag(soup, 'meta', [
-                       ("http-equiv", "Content-Type"), ("content", "text/html; charset=UTF-8")])
+                       ('http-equiv', 'Content-Type'), ('content', 'text/html; charset=UTF-8')])
         soup.head.insert(0, mlang)
         soup.head.insert(1, mcharset)
         return self.adeify_images(soup)
diff --git a/recipes/dobreprogamy.recipe b/recipes/dobreprogamy.recipe
index 55e906e17b..b9b7bfa220 100644
--- a/recipes/dobreprogamy.recipe
+++ b/recipes/dobreprogamy.recipe
@@ -15,7 +15,7 @@ class Dobreprogramy_pl(BasicNewsRecipe):
     index = 'http://www.dobreprogramy.pl/'
     no_stylesheets = True
     language = 'pl'
-    extra_css = '.title {font-size:22px;}'
+    extra_css = '.title {font-size:22px;}, h1 { font-size:130% }'
     oldest_article = 8
     max_articles_per_feed = 100
     remove_attrs = ['style', 'width', 'height']
@@ -23,7 +23,7 @@ class Dobreprogramy_pl(BasicNewsRecipe):
         type(u'')(r'<div id="\S+360pmp4">Twoja przeglądarka nie obsługuje Flasha i HTML5 lub wyłączono obsługę JavaScript...</div>')), lambda match: '')]
     keep_only_tags = [dict(name='h1'), dict(
         attrs={'class': ['entry single']}), dict(id='phContent_divArticle')]
-    remove_tags = [dict(attrs={'class': ['newsOptions', 'noPrint', 'komentarze', 'tags  font-heading-master', 'social nested-grid  grid-margin-px15-top clearfix no-mobile', 'page-info text-h4 font-heading grid-margin-px15-top color-annotation clearfix', 'series grid-margin-px30-top']}), dict(id='komentarze'), dict(id='phContent_ctl02_sBreadcrumb'), dict(name='iframe')]  # noqa
+    remove_tags = [dict(attrs={'class': ['newsOptions', 'noPrint', 'komentarze', 'tags  font-heading-master', 'social nested-grid  grid-margin-px15-top clearfix no-mobile', 'page-info text-h4 font-heading grid-margin-px15-top color-annotation clearfix', 'series grid-margin-px30-top']}), dict(id='komentarze'), dict(id='phContent_ctl02_sBreadcrumb'), dict(name='iframe')]  # noqa: E501
 
     feeds = [(u'Aktualności', 'http://feeds.feedburner.com/dobreprogramy/Aktualnosci'),
              ('Blogi', 'http://feeds.feedburner.com/dobreprogramy/BlogCzytelnikow')]
@@ -41,7 +41,3 @@ class Dobreprogramy_pl(BasicNewsRecipe):
             if not r.string:
                 r.extract()
         return soup
-
-    extra_css = '''
-        h1 { font-size:130% }
-    '''
diff --git a/recipes/donga.recipe b/recipes/donga.recipe
index 0c55c88300..ddefdf61e3 100644
--- a/recipes/donga.recipe
+++ b/recipes/donga.recipe
@@ -4,46 +4,46 @@ from calibre.web.feeds.recipes import BasicNewsRecipe
 
 # Comment out sections you are not interested in
 sections = [
-    ("정치", "politics"),
-    ("사회", "national"),
-    ("경제", "economy"),
-    ("국제", "international"),
-    ("사설칼럼", "editorials"),
-    ("의학과학", "science"),
-    ("문화연예", "culture"),
-    ("스포츠", "sports"),
-    ("사람속으로", "inmul")
+    ('정치', 'politics'),
+    ('사회', 'national'),
+    ('경제', 'economy'),
+    ('국제', 'international'),
+    ('사설칼럼', 'editorials'),
+    ('의학과학', 'science'),
+    ('문화연예', 'culture'),
+    ('스포츠', 'sports'),
+    ('사람속으로', 'inmul'),
     # Following sections are marked as marked optional
     # as default. Uncomment to enable.
-    # , (u'건강', 'health')
-    # , (u'레저', 'leisure')
-    # , (u'도서', 'book')
-    # , (u'공연', 'show')
-    # , (u'여성', 'woman')
-    # , (u'여행', 'travel')
-    # , (u'생활정보', 'lifeinfo')
+    # (u'건강', 'health'),
+    # (u'레저', 'leisure'),
+    # (u'도서', 'book'),
+    # (u'공연', 'show'),
+    # (u'여성', 'woman'),
+    # (u'여행', 'travel'),
+    # (u'생활정보', 'lifeinfo'),
 ]
 
 
 class Donga(BasicNewsRecipe):
-    language = "ko"
-    title = "동아일보"
-    description = "동아일보 기사"
-    __author__ = "Minsik Cho"
-    ignore_duplicate_articles = {"title", "url"}
+    language = 'ko'
+    title = '동아일보'
+    description = '동아일보 기사'
+    __author__ = 'Minsik Cho'
+    ignore_duplicate_articles = {'title', 'url'}
     compress_news_images = True
     no_stylesheets = True
     oldest_article = 2
-    encoding = "utf-8"
+    encoding = 'utf-8'
 
     # RSS Feed in syntax:
     # https://rss.donga.com/[sections].xml
-    feeds = [(title, "https://rss.donga.com/" + section + ".xml") for (title, section) in sections]
+    feeds = [(title, 'https://rss.donga.com/' + section + '.xml') for (title, section) in sections]
 
     # Remove logo and print buttons
     remove_tags = [
-        dict(name="div", attrs={"class": "popHeaderWrap"}),
-        dict(name="div", attrs={"class": "etc"}),
+        dict(name='div', attrs={'class': 'popHeaderWrap'}),
+        dict(name='div', attrs={'class': 'etc'}),
     ]
 
     def print_version(self, url):
@@ -51,8 +51,8 @@ class Donga(BasicNewsRecipe):
         # https://www.donga.com/news/[sections]/article/all/[date]/[gid]/1
         # Return print version url with syntax:
         # https://www.donga.com/news/View?gid=[gid]&date=[date]
-        reobject = re.search("(?<=/all/)([0-9]*)/([0-9]*)", url)
+        reobject = re.search(r'(?<=/all/)([0-9]*)/([0-9]*)', url)
         date = reobject.group(1)
         gid = reobject.group(2)
 
-        return "https://www.donga.com/news/View?gid=" + gid + "&date=" + date
+        return 'https://www.donga.com/news/View?gid=' + gid + '&date=' + date
diff --git a/recipes/dovod.recipe b/recipes/dovod.recipe
index 9594e6122a..6a7a8cccdc 100644
--- a/recipes/dovod.recipe
+++ b/recipes/dovod.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Dovod(BasicNewsRecipe):
     title = '\u0414\u043E\u0432\u043E\u0434'
     __author__ = 'bugmen00t'
-    description = '\u0421\u0430\u0439\u0442 \u00AB\u0414\u043E\u0432\u043E\u0434\u00BB \u043F\u043E\u043B\u0443\u0447\u0438\u043B \u0441\u0432\u043E\u0451 \u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0432 \u0447\u0435\u0441\u0442\u044C \u0440\u0430\u043D\u0435\u0435 \u0441\u043E\u0437\u0434\u0430\u043D\u043D\u043E\u0433\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u00AB\u0414\u043E\u0432\u043E\u0434 \u2014 \u0412\u043B\u0430\u0434\u0438\u043C\u0438\u0440\u0441\u043A\u0438\u0435 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0435 \u0434\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438\u00BB. \u041D\u0430\u0448\u0430 \u0446\u0435\u043B\u044C \u2014 \u043E\u0441\u0432\u0435\u0449\u0435\u043D\u0438\u0435 \u0430\u043A\u0442\u0443\u0430\u043B\u044C\u043D\u044B\u0445 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E-\u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u0432\u043E\u043F\u0440\u043E\u0441\u043E\u0432 \u0438 \u0438\u0445 \u043E\u0442\u043A\u0440\u043E\u0432\u0435\u043D\u043D\u043E\u0435 \u0438 \u043E\u0441\u043C\u044B\u0441\u043B\u0435\u043D\u043D\u043E\u0435 \u043E\u0431\u0441\u0443\u0436\u0434\u0435\u043D\u0438\u0435.'  # noqa
+    description = '\u0421\u0430\u0439\u0442 \u00AB\u0414\u043E\u0432\u043E\u0434\u00BB \u043F\u043E\u043B\u0443\u0447\u0438\u043B \u0441\u0432\u043E\u0451 \u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0432 \u0447\u0435\u0441\u0442\u044C \u0440\u0430\u043D\u0435\u0435 \u0441\u043E\u0437\u0434\u0430\u043D\u043D\u043E\u0433\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u00AB\u0414\u043E\u0432\u043E\u0434 \u2014 \u0412\u043B\u0430\u0434\u0438\u043C\u0438\u0440\u0441\u043A\u0438\u0435 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0435 \u0434\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438\u00BB. \u041D\u0430\u0448\u0430 \u0446\u0435\u043B\u044C \u2014 \u043E\u0441\u0432\u0435\u0449\u0435\u043D\u0438\u0435 \u0430\u043A\u0442\u0443\u0430\u043B\u044C\u043D\u044B\u0445 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E-\u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u0432\u043E\u043F\u0440\u043E\u0441\u043E\u0432 \u0438 \u0438\u0445 \u043E\u0442\u043A\u0440\u043E\u0432\u0435\u043D\u043D\u043E\u0435 \u0438 \u043E\u0441\u043C\u044B\u0441\u043B\u0435\u043D\u043D\u043E\u0435 \u043E\u0431\u0441\u0443\u0436\u0434\u0435\u043D\u0438\u0435.'  # noqa: E501
     publisher = '\u0418\u043B\u044C\u044F \u041A\u043E\u0441\u044B\u0433\u0438\u043D, \u041A\u0438\u0440\u0438\u043B\u043B \u0418\u0448\u0443\u0442\u0438\u043D'
     category = 'blog'
     cover_url = u'https://pbs.twimg.com/profile_images/1498229545505284099/l9V1l59Z_400x400.jpg'
diff --git a/recipes/dr_dk.recipe b/recipes/dr_dk.recipe
index 4ab0a9726e..7f735ed313 100644
--- a/recipes/dr_dk.recipe
+++ b/recipes/dr_dk.recipe
@@ -14,8 +14,8 @@ class DRNyheder(BasicNewsRecipe):
         ('Udland', 'https://www.dr.dk/nyheder/service/feeds/udland'),
         ('Penge', 'https://www.dr.dk/nyheder/service/feeds/penge'),
         ('Politik', 'https://www.dr.dk/nyheder/service/feeds/politik'),
-        #('Sporten', 'https://www.dr.dk/nyheder/service/feeds/sporten'),
-        #('Seneste sport', 'https://www.dr.dk/nyheder/service/feeds/senestesport'),
+        # ('Sporten', 'https://www.dr.dk/nyheder/service/feeds/sporten'),
+        # ('Seneste sport', 'https://www.dr.dk/nyheder/service/feeds/senestesport'),
         ('Viden', 'https://www.dr.dk/nyheder/service/feeds/viden'),
         ('Kultur', 'https://www.dr.dk/nyheder/service/feeds/kultur'),
         ('Musik', 'https://www.dr.dk/nyheder/service/feeds/musik'),
@@ -42,8 +42,8 @@ class DRNyheder(BasicNewsRecipe):
     publication_type            = 'newspaper'
     encoding                    = 'utf8'
     language                    = 'da'
-    oldest_article              = 4 # 2 might be best
-    max_articles_per_feed       = 50 # 100 better, this is just for testing
+    oldest_article              = 4  # 2 might be best
+    max_articles_per_feed       = 50  # 100 better, this is just for testing
     no_stylesheets              = True
     use_embedded_content        = False
     auto_cleanup                = False
@@ -104,18 +104,17 @@ class DRNyheder(BasicNewsRecipe):
             cover_url = cover_item['src']
         return cover_url
 
-
     keep_only_tags = [
 
-        dict(name="h1", attrs={'class': 'dre-article-title__heading'}), # Title
-        dict(name="div", attrs={'class': 'dre-article-byline'}), # Author
-        dict(name="figure", attrs={'class': 'dre-standard-article__figure'}), # Comment out to remove images
-        dict(name="p", attrs={'class': 'dre-article-body-paragraph'}), # All body text of the article
-        dict(name="article", attrs={'itemtype': 'http://schema.org/NewsArticle'}),
-        #dict(name="h1", attrs={'class': 'hydra-latest-news-page-short-news__title'}),
-        #dict(name="p", attrs={'class': 'hydra-latest-news-page-short-news__paragraph'}),
-        #dict(name="div", attrs={'class': 'dre-speech'}),
-        #dict(name="div", attrs={'itemprop': 'author'})
+        dict(name='h1', attrs={'class': 'dre-article-title__heading'}),  # Title
+        dict(name='div', attrs={'class': 'dre-article-byline'}),  # Author
+        dict(name='figure', attrs={'class': 'dre-standard-article__figure'}),  # Comment out to remove images
+        dict(name='p', attrs={'class': 'dre-article-body-paragraph'}),  # All body text of the article
+        dict(name='article', attrs={'itemtype': 'http://schema.org/NewsArticle'}),
+        # dict(name="h1", attrs={'class': 'hydra-latest-news-page-short-news__title'}),
+        # dict(name="p", attrs={'class': 'hydra-latest-news-page-short-news__paragraph'}),
+        # dict(name="div", attrs={'class': 'dre-speech'}),
+        # dict(name="div", attrs={'itemprop': 'author'})
     ]
 
     remove_tags = [
@@ -123,9 +122,9 @@ class DRNyheder(BasicNewsRecipe):
         dict(name='div', attrs={'class': [
             'hydra-latest-news-page-short-news__share', 'hydra-latest-news-page-short-news__a11y-container',
             'hydra-latest-news-page-short-news__meta', 'hydra-latest-news-page-short-news__image-slider', 'dre-byline__dates']}),
-        dict(name="source"),
-        #dict(name='menu', attrs={'class': 'share'}),
-        #dict(name='menu', attrs={'class': 'dr-site-share-horizontal'}),
+        dict(name='source'),
+        # dict(name='menu', attrs={'class': 'share'}),
+        # dict(name='menu', attrs={'class': 'dr-site-share-horizontal'}),
     ]
 
     # Fixes images having the wrong aspect ratio
diff --git a/recipes/drytooling_pl.recipe b/recipes/drytooling_pl.recipe
index be1245cedc..d22d8c4447 100644
--- a/recipes/drytooling_pl.recipe
+++ b/recipes/drytooling_pl.recipe
@@ -7,7 +7,7 @@ class BasicUserRecipe1337668045(BasicNewsRecipe):
     title = u'Drytooling.com.pl'
     masthead_url = 'http://drytooling.com.pl/images/drytooling-kindle.png'
     cover_url = 'http://drytooling.com.pl/images/drytooling-kindle.png'
-    description = u'Drytooling.com.pl jest serwisem wspinaczki zimowej, alpinizmu i himalaizmu. Jeśli uwielbiasz zimę, nie możesz doczekać się aż wyciągniesz szpej z szafki i uderzysz w Tatry, Alpy, czy może Himalaje, to znajdziesz tutaj naprawdę dużo interesujących Cię treści! Zapraszamy!'  # noqa
+    description = u'Drytooling.com.pl jest serwisem wspinaczki zimowej, alpinizmu i himalaizmu. Jeśli uwielbiasz zimę, nie możesz doczekać się aż wyciągniesz szpej z szafki i uderzysz w Tatry, Alpy, czy może Himalaje, to znajdziesz tutaj naprawdę dużo interesujących Cię treści! Zapraszamy!'  # noqa: E501
     __author__ = u'Damian Granowski'
     language = 'pl'
     oldest_article = 100
diff --git a/recipes/dwutygodnik.recipe b/recipes/dwutygodnik.recipe
index 574acde94d..0c5f0bf9b5 100644
--- a/recipes/dwutygodnik.recipe
+++ b/recipes/dwutygodnik.recipe
@@ -33,7 +33,7 @@ class dwutygodnik(BasicNewsRecipe):
         browser.open('http://www.dwutygodnik.com/')
 
         # find the link
-        epublink = browser.find_link(text_regex=re.compile('Wydanie EPUB'))
+        epublink = browser.find_link(text_regex=re.compile(r'Wydanie EPUB'))
 
         # download ebook
         self.report_progress(0, _('Downloading ePUB'))
diff --git a/recipes/dzieje_pl.recipe b/recipes/dzieje_pl.recipe
index e4a0305158..82f8baff32 100644
--- a/recipes/dzieje_pl.recipe
+++ b/recipes/dzieje_pl.recipe
@@ -5,7 +5,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Dzieje(BasicNewsRecipe):
     title = u'dzieje.pl'
     __author__ = 'fenuks'
-    description = 'Dzieje.pl - najlepszy portal informacyjno-edukacyjny dotyczący historii Polski XX wieku. Archiwalne fotografie, filmy, katalog postaci, quizy i konkursy.'  # noqa
+    description = 'Dzieje.pl - najlepszy portal informacyjno-edukacyjny dotyczący historii Polski XX wieku. Archiwalne fotografie, filmy, katalog postaci, quizy i konkursy.'  # noqa: E501
     cover_url = 'http://www.dzieje.pl/sites/default/files/dzieje_logo.png'
     category = 'history'
     language = 'pl'
@@ -31,7 +31,7 @@ class Dzieje(BasicNewsRecipe):
                 soup2 = self.index_to_soup(url)
                 pagetext = soup2.find(
                     id='content-area').find(attrs={'class': 'content'})
-                for r in pagetext.findAll(attrs={'class': ['fieldgroup group-groupkul', 'fieldgroup group-zdjeciekult', 'fieldgroup group-zdjecieciekaw', 'fieldgroup group-zdjecieksiazka', 'fieldgroup group-zdjeciedu', 'field field-type-filefield field-field-zdjecieglownawyd']}):  # noqa
+                for r in pagetext.findAll(attrs={'class': ['fieldgroup group-groupkul', 'fieldgroup group-zdjeciekult', 'fieldgroup group-zdjecieciekaw', 'fieldgroup group-zdjecieksiazka', 'fieldgroup group-zdjeciedu', 'field field-type-filefield field-field-zdjecieglownawyd']}):  # noqa: E501
                     r.extract()
                 comments = pagetext.findAll(
                     text=lambda text: isinstance(text, Comment))
@@ -63,20 +63,20 @@ class Dzieje(BasicNewsRecipe):
 
     def parse_index(self):
         feeds = []
-        feeds.append((u"Wiadomości", self.find_articles(
+        feeds.append((u'Wiadomości', self.find_articles(
             'http://dzieje.pl/wiadomosci')))
-        feeds.append((u"Kultura i sztuka", self.find_articles(
+        feeds.append((u'Kultura i sztuka', self.find_articles(
             'http://dzieje.pl/kulturaisztuka')))
-        feeds.append((u"Film", self.find_articles('http://dzieje.pl/kino')))
-        feeds.append((u"Rozmaitości historyczne",
+        feeds.append((u'Film', self.find_articles('http://dzieje.pl/kino')))
+        feeds.append((u'Rozmaitości historyczne',
                       self.find_articles('http://dzieje.pl/rozmaitości')))
         feeds.append(
-            (u"Książka", self.find_articles('http://dzieje.pl/ksiazka')))
+            (u'Książka', self.find_articles('http://dzieje.pl/ksiazka')))
         feeds.append(
-            (u"Wystawa", self.find_articles('http://dzieje.pl/wystawa')))
-        feeds.append((u"Edukacja", self.find_articles(
+            (u'Wystawa', self.find_articles('http://dzieje.pl/wystawa')))
+        feeds.append((u'Edukacja', self.find_articles(
             'http://dzieje.pl/edukacja')))
-        feeds.append((u"Dzieje się", self.find_articles(
+        feeds.append((u'Dzieje się', self.find_articles(
             'http://dzieje.pl/wydarzenia')))
         return feeds
 
diff --git a/recipes/dziennik_pl.recipe b/recipes/dziennik_pl.recipe
index aa89e55823..58bceab229 100644
--- a/recipes/dziennik_pl.recipe
+++ b/recipes/dziennik_pl.recipe
@@ -21,10 +21,10 @@ class Dziennik_pl(BasicNewsRecipe):
     remove_empty_feeds = True
     ignore_duplicate_articles = {'title', 'url'}
     extra_css = 'ul {list-style: none; padding: 0; margin: 0;} .foto {float: left;} .clr {clear: both;}'
-    preprocess_regexps = [(re.compile("Komentarze:"), lambda m: ''), (re.compile(
-        '<p><strong><a href=".*?">&gt;&gt;&gt; CZYTAJ TAKŻE: ".*?"</a></strong></p>'), lambda m: '')]
+    preprocess_regexps = [(re.compile(r'Komentarze:'), lambda m: ''), (re.compile(
+        r'<p><strong><a href=".*?">&gt;&gt;&gt; CZYTAJ TAKŻE: ".*?"</a></strong></p>'), lambda m: '')]
     keep_only_tags = [dict(id='article')]
-    remove_tags = [dict(name='div', attrs={'class': ['art_box_dodatki', 'new_facebook_icons2', 'leftArt', 'article_print', 'quiz-widget', 'belka-spol', 'belka-spol belka-spol-bottom', 'art_data_tags', 'cl_right', 'boxRounded gal_inside']}), dict(name='a', attrs={'class': ['komentarz', 'article_icon_addcommnent']}), dict(name='ins'), dict(name='br')]  # noqa
+    remove_tags = [dict(name='div', attrs={'class': ['art_box_dodatki', 'new_facebook_icons2', 'leftArt', 'article_print', 'quiz-widget', 'belka-spol', 'belka-spol belka-spol-bottom', 'art_data_tags', 'cl_right', 'boxRounded gal_inside']}), dict(name='a', attrs={'class': ['komentarz', 'article_icon_addcommnent']}), dict(name='ins'), dict(name='br')]  # noqa: E501
     feeds = [(u'Wszystko', u'http://rss.dziennik.pl/Dziennik-PL/'),
              (u'Wiadomości', u'http://rss.dziennik.pl/Dziennik-Wiadomosci'),
              (u'Gospodarka', u'http://rss.dziennik.pl/Dziennik-Gospodarka'),
diff --git a/recipes/dziennik_polski.recipe b/recipes/dziennik_polski.recipe
index 51263ef9ab..08aa849e6d 100644
--- a/recipes/dziennik_polski.recipe
+++ b/recipes/dziennik_polski.recipe
@@ -35,7 +35,7 @@ class DziennikPolski24(BasicNewsRecipe):
 
     keep_only_tags = [
 
-        dict(name='div', attrs={'class': ['toolbar']}), dict(name='h1'), dict(name='h2', attrs={'class': ['teaser']}), dict(name='div', attrs={'class': ['picture']}), dict(name='div', attrs={'id': ['showContent']}), dict(name='div', attrs={'class': ['paging']}), dict(name='div', attrs={'class': ['wykupTresc']})  # noqa
+        dict(name='div', attrs={'class': ['toolbar']}), dict(name='h1'), dict(name='h2', attrs={'class': ['teaser']}), dict(name='div', attrs={'class': ['picture']}), dict(name='div', attrs={'id': ['showContent']}), dict(name='div', attrs={'class': ['paging']}), dict(name='div', attrs={'class': ['wykupTresc']})  # noqa: E501
     ]
 
     remove_tags = [
@@ -120,7 +120,7 @@ class DziennikPolski24(BasicNewsRecipe):
         if self.username is not None and self.password is not None:
             br.open('http://www.dziennikpolski24.pl/pl/moje-konto/950606-loguj.html')
             br.select_form(nr=1)
-            br["user_login[login]"] = self.username
+            br['user_login[login]'] = self.username
             br['user_login[pass]'] = self.password
             br.submit()
         return br
diff --git a/recipes/dziennik_wschodni.recipe b/recipes/dziennik_wschodni.recipe
index f091dd9551..13ec01e240 100644
--- a/recipes/dziennik_wschodni.recipe
+++ b/recipes/dziennik_wschodni.recipe
@@ -20,8 +20,8 @@ class DziennikWschodni(BasicNewsRecipe):
     no_stylesheets = True
     ignore_duplicate_articles = {'title', 'url'}
 
-    preprocess_regexps = [(re.compile(u'Czytaj:.*?</a>', re.DOTALL), lambda match: ''), (re.compile(u'Przeczytaj także:.*?</a>', re.DOTALL | re.IGNORECASE), lambda match: ''),  # noqa
-                          (re.compile(u'Przeczytaj również:.*?</a>', re.DOTALL | re.IGNORECASE), lambda match: ''), (re.compile(u'Zobacz też:.*?</a>', re.DOTALL | re.IGNORECASE), lambda match: '')]  # noqa
+    preprocess_regexps = [(re.compile(u'Czytaj:.*?</a>', re.DOTALL), lambda match: ''), (re.compile(u'Przeczytaj także:.*?</a>', re.DOTALL | re.IGNORECASE), lambda match: ''),  # noqa: E501, RUF039
+                          (re.compile(u'Przeczytaj również:.*?</a>', re.DOTALL | re.IGNORECASE), lambda match: ''), (re.compile(u'Zobacz też:.*?</a>', re.DOTALL | re.IGNORECASE), lambda match: '')]  # noqa: E501, RUF039
 
     keep_only_tags = [dict(id=['article', 'cover', 'photostory'])]
     remove_tags = [dict(id=['articleTags', 'articleMeta', 'boxReadIt', 'articleGalleries', 'articleConnections',
@@ -52,16 +52,14 @@ class DziennikWschodni(BasicNewsRecipe):
             self.INDEX + '/apps/pbcs.dll/section?Category=JEDYNKI')
         nexturl = self.INDEX + soup.find(id='covers').find('a')['href']
         soup = self.index_to_soup(nexturl)
-        self.cover_url = self.INDEX + \
-            soup.find(id='cover').find(name='img')['src']
+        self.cover_url = self.INDEX + soup.find(id='cover').find(name='img')['src']
         return getattr(self, 'cover_url', self.cover_url)
 
     def append_page(self, soup, appendtag):
         tag = soup.find('span', attrs={'class': 'photoNavigationPages'})
         if tag:
             number = int(tag.string.rpartition('/')[-1].replace('&nbsp;', ''))
-            baseurl = self.INDEX + \
-                soup.find(attrs={'class': 'photoNavigationNext'})['href'][:-1]
+            baseurl = self.INDEX + soup.find(attrs={'class': 'photoNavigationNext'})['href'][:-1]
 
             for r in appendtag.findAll(attrs={'class': 'photoNavigation'}):
                 r.extract()
diff --git a/recipes/echo_moskvy.recipe b/recipes/echo_moskvy.recipe
index 303ca03858..1f2600f77d 100644
--- a/recipes/echo_moskvy.recipe
+++ b/recipes/echo_moskvy.recipe
@@ -22,7 +22,7 @@ class EchoMsk(BasicNewsRecipe):
 
     remove_tags_after = dict(name='article')
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='span', attrs={'class': 'sc-7b4cbb79-0 guzUFC'}),
         dict(name='div', attrs={'class': 'sc-f94c4ef5-0 frGiYu'}),
         dict(name='div', attrs={'class': 'sc-f94c4ef5-0 frGiYu'})
diff --git a/recipes/economist.recipe b/recipes/economist.recipe
index b562e7e501..883a7e4c5d 100644
--- a/recipes/economist.recipe
+++ b/recipes/economist.recipe
@@ -63,7 +63,7 @@ def load_article_from_json(raw, root):
     body = root.xpath('//body')[0]
     article = E(body, 'article')
     E(article, 'div', data['flyTitle'], style='color: red; font-size:small; font-weight:bold;')
-    E(article, 'h1', data['title'], title=safe_dict(data, "url", "canonical") or '')
+    E(article, 'h1', data['title'], title=safe_dict(data, 'url', 'canonical') or '')
     E(article, 'div', data['rubric'], style='font-style: italic; color:#202020;')
     try:
         date = data['dateModified']
@@ -97,8 +97,8 @@ def process_web_node(node):
             return f'<p>{node.get("textHtml")}</p>'
         return f'<p>{node.get("text", "")}</p>'
     elif ntype == 'IMAGE':
-        alt = "" if node.get("altText") is None else node.get("altText")
-        cap = ""
+        alt = '' if node.get('altText') is None else node.get('altText')
+        cap = ''
         if node.get('caption'):
             if node['caption'].get('textHtml') is not None:
                 cap = node['caption']['textHtml']
@@ -123,7 +123,7 @@ def load_article_from_web_json(raw):
     data = json.loads(raw)['props']['pageProps']['cp2Content']
     body += f'<div style="color: red; font-size:small; font-weight:bold;">{data.get("flyTitle", "")}</div>'
     body += f'<h1>{data["headline"]}</h1>'
-    if data.get("rubric") and data.get("rubric") is not None:
+    if data.get('rubric') and data.get('rubric') is not None:
         body += f'<div style="font-style: italic; color:#202020;">{data.get("rubric", "")}</div>'
     try:
         date = data['dateModified']
@@ -186,7 +186,7 @@ class Economist(BasicNewsRecipe):
     encoding = 'utf-8'
     masthead_url = 'https://www.livemint.com/lm-img/dev/economist-logo-oneline.png'
 
-    __author__ = "Kovid Goyal"
+    __author__ = 'Kovid Goyal'
     description = (
         'Global news and current affairs from a European'
         ' perspective. Best downloaded on Friday mornings (GMT)'
@@ -199,7 +199,7 @@ class Economist(BasicNewsRecipe):
     resolve_internal_links = True
     remove_tags = [
         dict(name=['script', 'noscript', 'title', 'iframe', 'cf_floatingcontent', 'aside', 'footer', 'svg']),
-        dict(attrs={'aria-label': "Article Teaser"}),
+        dict(attrs={'aria-label': 'Article Teaser'}),
         dict(attrs={'id': 'player'}),
         dict(attrs={
                 'class': [
@@ -252,7 +252,7 @@ class Economist(BasicNewsRecipe):
     def get_browser(self, *args, **kwargs):
         if self.from_archive:
             kwargs['user_agent'] = (
-                'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36 Lamarr' # noqa
+                'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36 Lamarr'
             )
             br = BasicNewsRecipe.get_browser(self, *args, **kwargs)
         else:
@@ -266,11 +266,11 @@ class Economist(BasicNewsRecipe):
         if edition_date and isinstance(edition_date, str):
             return parse_only_date(edition_date, as_utc=False)
         try:
-            url = self.browser.open("https://www.economist.com/printedition").geturl()
+            url = self.browser.open('https://www.economist.com/printedition').geturl()
         except Exception as e:
             self.log('Failed to fetch publication date with error: ' + str(e))
             return super().publication_date()
-        return parse_only_date(url.split("/")[-1], as_utc=False)
+        return parse_only_date(url.split('/')[-1], as_utc=False)
 
     def economist_test_article(self):
         return [('Articles', [{'title':'test',
@@ -311,7 +311,7 @@ class Economist(BasicNewsRecipe):
         # return self.economist_test_article()
         # url = 'https://www.economist.com/weeklyedition/archive'
         query = {
-            'query': 'query LatestWeeklyAutoEditionQuery($ref:String!){canonical(ref:$ref){hasPart(from:0 size:1 sort:"datePublished:desc"){parts{...WeeklyEditionFragment __typename}__typename}__typename}}fragment WeeklyEditionFragment on Content{id type datePublished image{...ImageCoverFragment __typename}url{canonical __typename}hasPart(size:100 sort:"publication.context.position"){parts{...ArticleFragment __typename}__typename}__typename}fragment ArticleFragment on Content{ad{grapeshot{channels{name __typename}__typename}__typename}articleSection{internal{id title:headline __typename}__typename}audio{main{id duration(format:"seconds")source:channel{id __typename}url{canonical __typename}__typename}__typename}byline dateline dateModified datePublished dateRevised flyTitle:subheadline id image{...ImageInlineFragment ...ImageMainFragment ...ImagePromoFragment __typename}print{title:headline flyTitle:subheadline rubric:description section{id title:headline __typename}__typename}publication{id tegID title:headline flyTitle:subheadline datePublished regionsAllowed url{canonical __typename}__typename}rubric:description source:channel{id __typename}tegID text(format:"json")title:headline type url{canonical __typename}topic contentIdentity{forceAppWebview mediaType articleType __typename}__typename}fragment ImageInlineFragment on Media{inline{url{canonical __typename}width height __typename}__typename}fragment ImageMainFragment on Media{main{url{canonical __typename}width height __typename}__typename}fragment ImagePromoFragment on Media{promo{url{canonical __typename}id width height __typename}__typename}fragment ImageCoverFragment on Media{cover{headline width height url{canonical __typename}regionsAllowed __typename}__typename}',  # noqa
+            'query': 'query LatestWeeklyAutoEditionQuery($ref:String!){canonical(ref:$ref){hasPart(from:0 size:1 sort:"datePublished:desc"){parts{...WeeklyEditionFragment __typename}__typename}__typename}}fragment WeeklyEditionFragment on Content{id type datePublished image{...ImageCoverFragment __typename}url{canonical __typename}hasPart(size:100 sort:"publication.context.position"){parts{...ArticleFragment __typename}__typename}__typename}fragment ArticleFragment on Content{ad{grapeshot{channels{name __typename}__typename}__typename}articleSection{internal{id title:headline __typename}__typename}audio{main{id duration(format:"seconds")source:channel{id __typename}url{canonical __typename}__typename}__typename}byline dateline dateModified datePublished dateRevised flyTitle:subheadline id image{...ImageInlineFragment ...ImageMainFragment ...ImagePromoFragment __typename}print{title:headline flyTitle:subheadline rubric:description section{id title:headline __typename}__typename}publication{id tegID title:headline flyTitle:subheadline datePublished regionsAllowed url{canonical __typename}__typename}rubric:description source:channel{id __typename}tegID text(format:"json")title:headline type url{canonical __typename}topic contentIdentity{forceAppWebview mediaType articleType __typename}__typename}fragment ImageInlineFragment on Media{inline{url{canonical __typename}width height __typename}__typename}fragment ImageMainFragment on Media{main{url{canonical __typename}width height __typename}__typename}fragment ImagePromoFragment on Media{promo{url{canonical __typename}id width height __typename}__typename}fragment ImageCoverFragment on Media{cover{headline width height url{canonical __typename}regionsAllowed __typename}__typename}',  # noqa: E501
             'operationName': 'LatestWeeklyAutoEditionQuery',
             'variables': '{"ref":"/content/d06tg8j85rifiq3oo544c6b9j61dno2n"}',
         }
@@ -319,7 +319,7 @@ class Economist(BasicNewsRecipe):
             content_id = self.get_content_id(edition_date)
             if content_id:
                 query = {
-                    'query': 'query SpecificWeeklyEditionQuery($path:String!){section:canonical(ref:$path){...WeeklyEditionFragment __typename}}fragment WeeklyEditionFragment on Content{id type datePublished image{...ImageCoverFragment __typename}url{canonical __typename}hasPart(size:100 sort:"publication.context.position"){parts{...ArticleFragment __typename}__typename}__typename}fragment ArticleFragment on Content{articleSection{internal{id title:headline __typename}__typename}audio{main{id duration(format:"seconds")source:channel{id __typename}url{canonical __typename}__typename}__typename}byline dateline dateModified datePublished flyTitle:subheadline id image{...ImageInlineFragment ...ImageMainFragment ...ImagePromoFragment __typename}print{title:headline flyTitle:subheadline rubric:description section{id title:headline __typename}__typename}publication{id tegID title:headline flyTitle:subheadline datePublished regionsAllowed url{canonical __typename}__typename}rubric:description source:channel{id __typename}tegID text(format:"json")title:headline type url{canonical __typename}__typename}fragment ImageInlineFragment on Media{inline{url{canonical __typename}width height __typename}__typename}fragment ImageMainFragment on Media{main{url{canonical __typename}width height __typename}__typename}fragment ImagePromoFragment on Media{promo{url{canonical __typename}id width height __typename}__typename}fragment ImageCoverFragment on Media{cover{headline width height url{canonical __typename}regionsAllowed __typename}__typename}',  # noqa
+                    'query': 'query SpecificWeeklyEditionQuery($path:String!){section:canonical(ref:$path){...WeeklyEditionFragment __typename}}fragment WeeklyEditionFragment on Content{id type datePublished image{...ImageCoverFragment __typename}url{canonical __typename}hasPart(size:100 sort:"publication.context.position"){parts{...ArticleFragment __typename}__typename}__typename}fragment ArticleFragment on Content{articleSection{internal{id title:headline __typename}__typename}audio{main{id duration(format:"seconds")source:channel{id __typename}url{canonical __typename}__typename}__typename}byline dateline dateModified datePublished flyTitle:subheadline id image{...ImageInlineFragment ...ImageMainFragment ...ImagePromoFragment __typename}print{title:headline flyTitle:subheadline rubric:description section{id title:headline __typename}__typename}publication{id tegID title:headline flyTitle:subheadline datePublished regionsAllowed url{canonical __typename}__typename}rubric:description source:channel{id __typename}tegID text(format:"json")title:headline type url{canonical __typename}__typename}fragment ImageInlineFragment on Media{inline{url{canonical __typename}width height __typename}__typename}fragment ImageMainFragment on Media{main{url{canonical __typename}width height __typename}__typename}fragment ImagePromoFragment on Media{promo{url{canonical __typename}id width height __typename}__typename}fragment ImageCoverFragment on Media{cover{headline width height url{canonical __typename}regionsAllowed __typename}__typename}',  # noqa: E501
                     'operationName': 'SpecificWeeklyEditionQuery',
                     'variables': '{{"path":"{}"}}'.format(content_id),
                 }
@@ -339,9 +339,9 @@ class Economist(BasicNewsRecipe):
     def economist_parse_index(self, raw):
         # edition_date = self.recipe_specific_options.get('date')
         # if edition_date and isinstance(edition_date, str):
-            # data = json.loads(raw)['data']['section']
+        #     data = json.loads(raw)['data']['section']
         # else:
-            # data = json.loads(raw)['data']['canonical']['hasPart']['parts'][0]
+        #     data = json.loads(raw)['data']['canonical']['hasPart']['parts'][0]
         data = json.loads(raw)['data']['canonical']['hasPart']['parts'][0]
         dt = datetime.fromisoformat(data['datePublished'][:-1]) + timedelta(seconds=time.timezone)
         dt = dt.strftime('%b %d, %Y')
@@ -364,25 +364,25 @@ class Economist(BasicNewsRecipe):
         self.log('Got cover:', self.cover_url, '\n', self.description)
 
         feeds_dict = defaultdict(list)
-        for part in safe_dict(data, "hasPart", "parts"):
+        for part in safe_dict(data, 'hasPart', 'parts'):
             try:
                 section = part['articleSection']['internal'][0]['title']
             except Exception:
                 section = safe_dict(part, 'print', 'section', 'title') or 'section'
             if section not in feeds_dict:
                 self.log(section)
-            title = safe_dict(part, "title")
-            desc = safe_dict(part, "rubric") or ''
-            sub = safe_dict(part, "flyTitle") or ''
+            title = safe_dict(part, 'title')
+            desc = safe_dict(part, 'rubric') or ''
+            sub = safe_dict(part, 'flyTitle') or ''
             if sub and section != sub:
                 desc = sub + ' :: ' + desc
             pt = PersistentTemporaryFile('.html')
             pt.write(json.dumps(part).encode('utf-8'))
             pt.close()
             url = 'file:///' + pt.name
-            feeds_dict[section].append({"title": title, "url": url, "description": desc})
+            feeds_dict[section].append({'title': title, 'url': url, 'description': desc})
             self.log('\t', title, '\n\t\t', desc)
-        return [(section, articles) for section, articles in feeds_dict.items()]
+        return list(feeds_dict.items())
 
     def populate_article_metadata(self, article, soup, first):
         if not self.from_archive:
@@ -409,9 +409,9 @@ class Economist(BasicNewsRecipe):
         load_article_from_json(raw, root)
 
         if '/interactive/' in url:
-            return '<html><body><article><h1>' + root.xpath('//h1')[0].text + '</h1><em>' \
-                        + 'This article is supposed to be read in a browser' \
-                            + '</em></article></body></html>'
+            return ('<html><body><article><h1>' + root.xpath('//h1')[0].text + '</h1><em>'
+                    'This article is supposed to be read in a browser.'
+                    '</em></article></body></html>')
 
         for div in root.xpath('//div[@class="lazy-image"]'):
             noscript = list(div.iter('noscript'))
@@ -513,22 +513,22 @@ class Economist(BasicNewsRecipe):
         return self.economist_return_index(ans)
 
     def economist_parse_web_index(self, soup):
-        script_tag = soup.find("script", id="__NEXT_DATA__")
+        script_tag = soup.find('script', id='__NEXT_DATA__')
         if script_tag is not None:
             data = json.loads(script_tag.string)
             # open('/t/raw.json', 'w').write(json.dumps(data, indent=2, sort_keys=True))
-            self.description = safe_dict(data, "props", "pageProps", "content", "headline")
-            self.timefmt = ' [' + safe_dict(data, "props", "pageProps", "content", "formattedIssueDate") + ']'
-            self.cover_url = safe_dict(data, "props", "pageProps", "content", "cover", "url").replace(
+            self.description = safe_dict(data, 'props', 'pageProps', 'content', 'headline')
+            self.timefmt = ' [' + safe_dict(data, 'props', 'pageProps', 'content', 'formattedIssueDate') + ']'
+            self.cover_url = safe_dict(data, 'props', 'pageProps', 'content', 'cover', 'url').replace(
                 'economist.com/', 'economist.com/cdn-cgi/image/width=960,quality=80,format=auto/').replace('SQ_', '')
             self.log('Got cover:', self.cover_url)
 
             feeds = []
 
             for part in safe_dict(
-                data, "props", "pageProps", "content", "headerSections"
-            ) + safe_dict(data, "props", "pageProps", "content", "sections"):
-                section = safe_dict(part, "name") or ''
+                data, 'props', 'pageProps', 'content', 'headerSections'
+            ) + safe_dict(data, 'props', 'pageProps', 'content', 'sections'):
+                section = safe_dict(part, 'name') or ''
                 if not section:
                     continue
                 self.log(section)
@@ -536,12 +536,12 @@ class Economist(BasicNewsRecipe):
                 articles = []
 
                 for ar in part['articles']:
-                    title = safe_dict(ar, "headline") or ''
-                    url = process_url(safe_dict(ar, "url") or '')
+                    title = safe_dict(ar, 'headline') or ''
+                    url = process_url(safe_dict(ar, 'url') or '')
                     if not title or not url:
                         continue
-                    desc = safe_dict(ar, "rubric") or ''
-                    sub = safe_dict(ar, "flyTitle") or ''
+                    desc = safe_dict(ar, 'rubric') or ''
+                    sub = safe_dict(ar, 'flyTitle') or ''
                     if sub and section != sub:
                         desc = sub + ' :: ' + desc
                     self.log('\t', title, '\n\t', desc, '\n\t\t', url)
@@ -555,12 +555,9 @@ class Economist(BasicNewsRecipe):
         # open('/t/raw.html', 'wb').write(raw.encode('utf-8'))
         root_ = parse(raw)
         if '/interactive/' in url:
-            return (
-                '<html><body><article><h1>'
-                + root_.xpath('//h1')[0].text + '</h1><em>'
-                + 'This article is supposed to be read in a browser'
-                + '</em></article></body></html>'
-            )
+            return ('<html><body><article><h1>' + root_.xpath('//h1')[0].text + '</h1><em>'
+                    'This article is supposed to be read in a browser'
+                    '</em></article></body></html>')
 
         script = root_.xpath('//script[@id="__NEXT_DATA__"]')
 
diff --git a/recipes/economist_espresso.recipe b/recipes/economist_espresso.recipe
index f976771790..ed94653431 100644
--- a/recipes/economist_espresso.recipe
+++ b/recipes/economist_espresso.recipe
@@ -57,8 +57,8 @@ def load_article_from_json(raw, root):
     data = json.loads(raw)
     body = root.xpath('//body')[0]
     article = E(body, 'article')
-    E(article, 'div', data['flyTitle'] , style='color: red; font-size:small; font-weight:bold;')
-    E(article, 'h1', data['title'], title=safe_dict(data, "url", "canonical") or '')
+    E(article, 'div', data['flyTitle'], style='color: red; font-size:small; font-weight:bold;')
+    E(article, 'h1', data['title'], title=safe_dict(data, 'url', 'canonical') or '')
     E(article, 'div', data['rubric'], style='font-style: italic; color:#202020;')
     E(article, 'div', data['byline'], style='font-style: italic; color:#202020;')
     main_image_url = safe_dict(data, 'image', 'main', 'url').get('canonical')
@@ -130,7 +130,7 @@ class Espresso(BasicNewsRecipe):
 
     remove_tags = [
         dict(name=['script', 'noscript', 'title', 'iframe', 'cf_floatingcontent', 'aside', 'footer']),
-        dict(attrs={'aria-label': "Article Teaser"}),
+        dict(attrs={'aria-label': 'Article Teaser'}),
         dict(attrs={
                 'class': [
                     'dblClkTrk', 'ec-article-info', 'share_inline_header',
@@ -172,7 +172,7 @@ class Espresso(BasicNewsRecipe):
 
     def parse_index(self):
         query = {
-            'query': 'query EspressoQuery($ref:String!){espresso:canonical(ref:$ref){...EspressoFragment __typename}}fragment EspressoFragment on Content{id type hasPart(size:1 sort:"datePublished:desc"){parts{id type rubric:description hasPart(sort:"publication.context.position:asc,datePublished:desc"){parts{...ArticleFragment __typename}__typename}__typename}__typename}__typename}fragment ArticleFragment on Content{ad{grapeshot{channels{name __typename}__typename}__typename}articleSection{internal{id title:headline __typename}__typename}audio{main{id duration(format:"seconds")source:channel{id __typename}url{canonical __typename}__typename}__typename}byline dateline dateModified datePublished dateRevised flyTitle:subheadline id image{...ImageInlineFragment ...ImageMainFragment ...ImagePromoFragment __typename}print{title:headline flyTitle:subheadline rubric:description section{id title:headline __typename}__typename}publication{id tegID title:headline flyTitle:subheadline datePublished regionsAllowed url{canonical __typename}__typename}rubric:description source:channel{id __typename}tegID text(format:"json")title:headline type url{canonical __typename}topic contentIdentity{forceAppWebview mediaType articleType __typename}__typename}fragment ImageInlineFragment on Media{inline{url{canonical __typename}width height __typename}__typename}fragment ImageMainFragment on Media{main{url{canonical __typename}width height __typename}__typename}fragment ImagePromoFragment on Media{promo{url{canonical __typename}id width height __typename}__typename}',  # noqa
+            'query': 'query EspressoQuery($ref:String!){espresso:canonical(ref:$ref){...EspressoFragment __typename}}fragment EspressoFragment on Content{id type hasPart(size:1 sort:"datePublished:desc"){parts{id type rubric:description hasPart(sort:"publication.context.position:asc,datePublished:desc"){parts{...ArticleFragment __typename}__typename}__typename}__typename}__typename}fragment ArticleFragment on Content{ad{grapeshot{channels{name __typename}__typename}__typename}articleSection{internal{id title:headline __typename}__typename}audio{main{id duration(format:"seconds")source:channel{id __typename}url{canonical __typename}__typename}__typename}byline dateline dateModified datePublished dateRevised flyTitle:subheadline id image{...ImageInlineFragment ...ImageMainFragment ...ImagePromoFragment __typename}print{title:headline flyTitle:subheadline rubric:description section{id title:headline __typename}__typename}publication{id tegID title:headline flyTitle:subheadline datePublished regionsAllowed url{canonical __typename}__typename}rubric:description source:channel{id __typename}tegID text(format:"json")title:headline type url{canonical __typename}topic contentIdentity{forceAppWebview mediaType articleType __typename}__typename}fragment ImageInlineFragment on Media{inline{url{canonical __typename}width height __typename}__typename}fragment ImageMainFragment on Media{main{url{canonical __typename}width height __typename}__typename}fragment ImagePromoFragment on Media{promo{url{canonical __typename}id width height __typename}__typename}',  # noqa: E501
             'operationName': 'EspressoQuery',
             'variables': '{"ref":"/content/jakj5ed3rml75i8j0d5i74p8adf6eem4"}',
         }
@@ -189,13 +189,13 @@ class Espresso(BasicNewsRecipe):
         self.description = data['rubric']
 
         ans = []
-        for part in safe_dict(data, "hasPart", "parts"):
-            title = safe_dict(part, "title")
+        for part in safe_dict(data, 'hasPart', 'parts'):
+            title = safe_dict(part, 'title')
             pt = PersistentTemporaryFile('.html')
             pt.write(json.dumps(part).encode('utf-8'))
             pt.close()
             url = 'file:///' + pt.name
-            ans.append({"title": title, "url": url})
+            ans.append({'title': title, 'url': url})
         return [('Espresso', ans)]
 
     def preprocess_html(self, soup):
@@ -242,7 +242,6 @@ class Espresso(BasicNewsRecipe):
         raw = etree.tostring(root, encoding='unicode')
         return raw
 
-
     def eco_find_image_tables(self, soup):
         for x in soup.findAll('table', align=['right', 'center']):
             if len(x.findAll('font')) in (1, 2) and len(x.findAll('img')) == 1:
diff --git a/recipes/economist_free.recipe b/recipes/economist_free.recipe
index b562e7e501..883a7e4c5d 100644
--- a/recipes/economist_free.recipe
+++ b/recipes/economist_free.recipe
@@ -63,7 +63,7 @@ def load_article_from_json(raw, root):
     body = root.xpath('//body')[0]
     article = E(body, 'article')
     E(article, 'div', data['flyTitle'], style='color: red; font-size:small; font-weight:bold;')
-    E(article, 'h1', data['title'], title=safe_dict(data, "url", "canonical") or '')
+    E(article, 'h1', data['title'], title=safe_dict(data, 'url', 'canonical') or '')
     E(article, 'div', data['rubric'], style='font-style: italic; color:#202020;')
     try:
         date = data['dateModified']
@@ -97,8 +97,8 @@ def process_web_node(node):
             return f'<p>{node.get("textHtml")}</p>'
         return f'<p>{node.get("text", "")}</p>'
     elif ntype == 'IMAGE':
-        alt = "" if node.get("altText") is None else node.get("altText")
-        cap = ""
+        alt = '' if node.get('altText') is None else node.get('altText')
+        cap = ''
         if node.get('caption'):
             if node['caption'].get('textHtml') is not None:
                 cap = node['caption']['textHtml']
@@ -123,7 +123,7 @@ def load_article_from_web_json(raw):
     data = json.loads(raw)['props']['pageProps']['cp2Content']
     body += f'<div style="color: red; font-size:small; font-weight:bold;">{data.get("flyTitle", "")}</div>'
     body += f'<h1>{data["headline"]}</h1>'
-    if data.get("rubric") and data.get("rubric") is not None:
+    if data.get('rubric') and data.get('rubric') is not None:
         body += f'<div style="font-style: italic; color:#202020;">{data.get("rubric", "")}</div>'
     try:
         date = data['dateModified']
@@ -186,7 +186,7 @@ class Economist(BasicNewsRecipe):
     encoding = 'utf-8'
     masthead_url = 'https://www.livemint.com/lm-img/dev/economist-logo-oneline.png'
 
-    __author__ = "Kovid Goyal"
+    __author__ = 'Kovid Goyal'
     description = (
         'Global news and current affairs from a European'
         ' perspective. Best downloaded on Friday mornings (GMT)'
@@ -199,7 +199,7 @@ class Economist(BasicNewsRecipe):
     resolve_internal_links = True
     remove_tags = [
         dict(name=['script', 'noscript', 'title', 'iframe', 'cf_floatingcontent', 'aside', 'footer', 'svg']),
-        dict(attrs={'aria-label': "Article Teaser"}),
+        dict(attrs={'aria-label': 'Article Teaser'}),
         dict(attrs={'id': 'player'}),
         dict(attrs={
                 'class': [
@@ -252,7 +252,7 @@ class Economist(BasicNewsRecipe):
     def get_browser(self, *args, **kwargs):
         if self.from_archive:
             kwargs['user_agent'] = (
-                'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36 Lamarr' # noqa
+                'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36 Lamarr'
             )
             br = BasicNewsRecipe.get_browser(self, *args, **kwargs)
         else:
@@ -266,11 +266,11 @@ class Economist(BasicNewsRecipe):
         if edition_date and isinstance(edition_date, str):
             return parse_only_date(edition_date, as_utc=False)
         try:
-            url = self.browser.open("https://www.economist.com/printedition").geturl()
+            url = self.browser.open('https://www.economist.com/printedition').geturl()
         except Exception as e:
             self.log('Failed to fetch publication date with error: ' + str(e))
             return super().publication_date()
-        return parse_only_date(url.split("/")[-1], as_utc=False)
+        return parse_only_date(url.split('/')[-1], as_utc=False)
 
     def economist_test_article(self):
         return [('Articles', [{'title':'test',
@@ -311,7 +311,7 @@ class Economist(BasicNewsRecipe):
         # return self.economist_test_article()
         # url = 'https://www.economist.com/weeklyedition/archive'
         query = {
-            'query': 'query LatestWeeklyAutoEditionQuery($ref:String!){canonical(ref:$ref){hasPart(from:0 size:1 sort:"datePublished:desc"){parts{...WeeklyEditionFragment __typename}__typename}__typename}}fragment WeeklyEditionFragment on Content{id type datePublished image{...ImageCoverFragment __typename}url{canonical __typename}hasPart(size:100 sort:"publication.context.position"){parts{...ArticleFragment __typename}__typename}__typename}fragment ArticleFragment on Content{ad{grapeshot{channels{name __typename}__typename}__typename}articleSection{internal{id title:headline __typename}__typename}audio{main{id duration(format:"seconds")source:channel{id __typename}url{canonical __typename}__typename}__typename}byline dateline dateModified datePublished dateRevised flyTitle:subheadline id image{...ImageInlineFragment ...ImageMainFragment ...ImagePromoFragment __typename}print{title:headline flyTitle:subheadline rubric:description section{id title:headline __typename}__typename}publication{id tegID title:headline flyTitle:subheadline datePublished regionsAllowed url{canonical __typename}__typename}rubric:description source:channel{id __typename}tegID text(format:"json")title:headline type url{canonical __typename}topic contentIdentity{forceAppWebview mediaType articleType __typename}__typename}fragment ImageInlineFragment on Media{inline{url{canonical __typename}width height __typename}__typename}fragment ImageMainFragment on Media{main{url{canonical __typename}width height __typename}__typename}fragment ImagePromoFragment on Media{promo{url{canonical __typename}id width height __typename}__typename}fragment ImageCoverFragment on Media{cover{headline width height url{canonical __typename}regionsAllowed __typename}__typename}',  # noqa
+            'query': 'query LatestWeeklyAutoEditionQuery($ref:String!){canonical(ref:$ref){hasPart(from:0 size:1 sort:"datePublished:desc"){parts{...WeeklyEditionFragment __typename}__typename}__typename}}fragment WeeklyEditionFragment on Content{id type datePublished image{...ImageCoverFragment __typename}url{canonical __typename}hasPart(size:100 sort:"publication.context.position"){parts{...ArticleFragment __typename}__typename}__typename}fragment ArticleFragment on Content{ad{grapeshot{channels{name __typename}__typename}__typename}articleSection{internal{id title:headline __typename}__typename}audio{main{id duration(format:"seconds")source:channel{id __typename}url{canonical __typename}__typename}__typename}byline dateline dateModified datePublished dateRevised flyTitle:subheadline id image{...ImageInlineFragment ...ImageMainFragment ...ImagePromoFragment __typename}print{title:headline flyTitle:subheadline rubric:description section{id title:headline __typename}__typename}publication{id tegID title:headline flyTitle:subheadline datePublished regionsAllowed url{canonical __typename}__typename}rubric:description source:channel{id __typename}tegID text(format:"json")title:headline type url{canonical __typename}topic contentIdentity{forceAppWebview mediaType articleType __typename}__typename}fragment ImageInlineFragment on Media{inline{url{canonical __typename}width height __typename}__typename}fragment ImageMainFragment on Media{main{url{canonical __typename}width height __typename}__typename}fragment ImagePromoFragment on Media{promo{url{canonical __typename}id width height __typename}__typename}fragment ImageCoverFragment on Media{cover{headline width height url{canonical __typename}regionsAllowed __typename}__typename}',  # noqa: E501
             'operationName': 'LatestWeeklyAutoEditionQuery',
             'variables': '{"ref":"/content/d06tg8j85rifiq3oo544c6b9j61dno2n"}',
         }
@@ -319,7 +319,7 @@ class Economist(BasicNewsRecipe):
             content_id = self.get_content_id(edition_date)
             if content_id:
                 query = {
-                    'query': 'query SpecificWeeklyEditionQuery($path:String!){section:canonical(ref:$path){...WeeklyEditionFragment __typename}}fragment WeeklyEditionFragment on Content{id type datePublished image{...ImageCoverFragment __typename}url{canonical __typename}hasPart(size:100 sort:"publication.context.position"){parts{...ArticleFragment __typename}__typename}__typename}fragment ArticleFragment on Content{articleSection{internal{id title:headline __typename}__typename}audio{main{id duration(format:"seconds")source:channel{id __typename}url{canonical __typename}__typename}__typename}byline dateline dateModified datePublished flyTitle:subheadline id image{...ImageInlineFragment ...ImageMainFragment ...ImagePromoFragment __typename}print{title:headline flyTitle:subheadline rubric:description section{id title:headline __typename}__typename}publication{id tegID title:headline flyTitle:subheadline datePublished regionsAllowed url{canonical __typename}__typename}rubric:description source:channel{id __typename}tegID text(format:"json")title:headline type url{canonical __typename}__typename}fragment ImageInlineFragment on Media{inline{url{canonical __typename}width height __typename}__typename}fragment ImageMainFragment on Media{main{url{canonical __typename}width height __typename}__typename}fragment ImagePromoFragment on Media{promo{url{canonical __typename}id width height __typename}__typename}fragment ImageCoverFragment on Media{cover{headline width height url{canonical __typename}regionsAllowed __typename}__typename}',  # noqa
+                    'query': 'query SpecificWeeklyEditionQuery($path:String!){section:canonical(ref:$path){...WeeklyEditionFragment __typename}}fragment WeeklyEditionFragment on Content{id type datePublished image{...ImageCoverFragment __typename}url{canonical __typename}hasPart(size:100 sort:"publication.context.position"){parts{...ArticleFragment __typename}__typename}__typename}fragment ArticleFragment on Content{articleSection{internal{id title:headline __typename}__typename}audio{main{id duration(format:"seconds")source:channel{id __typename}url{canonical __typename}__typename}__typename}byline dateline dateModified datePublished flyTitle:subheadline id image{...ImageInlineFragment ...ImageMainFragment ...ImagePromoFragment __typename}print{title:headline flyTitle:subheadline rubric:description section{id title:headline __typename}__typename}publication{id tegID title:headline flyTitle:subheadline datePublished regionsAllowed url{canonical __typename}__typename}rubric:description source:channel{id __typename}tegID text(format:"json")title:headline type url{canonical __typename}__typename}fragment ImageInlineFragment on Media{inline{url{canonical __typename}width height __typename}__typename}fragment ImageMainFragment on Media{main{url{canonical __typename}width height __typename}__typename}fragment ImagePromoFragment on Media{promo{url{canonical __typename}id width height __typename}__typename}fragment ImageCoverFragment on Media{cover{headline width height url{canonical __typename}regionsAllowed __typename}__typename}',  # noqa: E501
                     'operationName': 'SpecificWeeklyEditionQuery',
                     'variables': '{{"path":"{}"}}'.format(content_id),
                 }
@@ -339,9 +339,9 @@ class Economist(BasicNewsRecipe):
     def economist_parse_index(self, raw):
         # edition_date = self.recipe_specific_options.get('date')
         # if edition_date and isinstance(edition_date, str):
-            # data = json.loads(raw)['data']['section']
+        #     data = json.loads(raw)['data']['section']
         # else:
-            # data = json.loads(raw)['data']['canonical']['hasPart']['parts'][0]
+        #     data = json.loads(raw)['data']['canonical']['hasPart']['parts'][0]
         data = json.loads(raw)['data']['canonical']['hasPart']['parts'][0]
         dt = datetime.fromisoformat(data['datePublished'][:-1]) + timedelta(seconds=time.timezone)
         dt = dt.strftime('%b %d, %Y')
@@ -364,25 +364,25 @@ class Economist(BasicNewsRecipe):
         self.log('Got cover:', self.cover_url, '\n', self.description)
 
         feeds_dict = defaultdict(list)
-        for part in safe_dict(data, "hasPart", "parts"):
+        for part in safe_dict(data, 'hasPart', 'parts'):
             try:
                 section = part['articleSection']['internal'][0]['title']
             except Exception:
                 section = safe_dict(part, 'print', 'section', 'title') or 'section'
             if section not in feeds_dict:
                 self.log(section)
-            title = safe_dict(part, "title")
-            desc = safe_dict(part, "rubric") or ''
-            sub = safe_dict(part, "flyTitle") or ''
+            title = safe_dict(part, 'title')
+            desc = safe_dict(part, 'rubric') or ''
+            sub = safe_dict(part, 'flyTitle') or ''
             if sub and section != sub:
                 desc = sub + ' :: ' + desc
             pt = PersistentTemporaryFile('.html')
             pt.write(json.dumps(part).encode('utf-8'))
             pt.close()
             url = 'file:///' + pt.name
-            feeds_dict[section].append({"title": title, "url": url, "description": desc})
+            feeds_dict[section].append({'title': title, 'url': url, 'description': desc})
             self.log('\t', title, '\n\t\t', desc)
-        return [(section, articles) for section, articles in feeds_dict.items()]
+        return list(feeds_dict.items())
 
     def populate_article_metadata(self, article, soup, first):
         if not self.from_archive:
@@ -409,9 +409,9 @@ class Economist(BasicNewsRecipe):
         load_article_from_json(raw, root)
 
         if '/interactive/' in url:
-            return '<html><body><article><h1>' + root.xpath('//h1')[0].text + '</h1><em>' \
-                        + 'This article is supposed to be read in a browser' \
-                            + '</em></article></body></html>'
+            return ('<html><body><article><h1>' + root.xpath('//h1')[0].text + '</h1><em>'
+                    'This article is supposed to be read in a browser.'
+                    '</em></article></body></html>')
 
         for div in root.xpath('//div[@class="lazy-image"]'):
             noscript = list(div.iter('noscript'))
@@ -513,22 +513,22 @@ class Economist(BasicNewsRecipe):
         return self.economist_return_index(ans)
 
     def economist_parse_web_index(self, soup):
-        script_tag = soup.find("script", id="__NEXT_DATA__")
+        script_tag = soup.find('script', id='__NEXT_DATA__')
         if script_tag is not None:
             data = json.loads(script_tag.string)
             # open('/t/raw.json', 'w').write(json.dumps(data, indent=2, sort_keys=True))
-            self.description = safe_dict(data, "props", "pageProps", "content", "headline")
-            self.timefmt = ' [' + safe_dict(data, "props", "pageProps", "content", "formattedIssueDate") + ']'
-            self.cover_url = safe_dict(data, "props", "pageProps", "content", "cover", "url").replace(
+            self.description = safe_dict(data, 'props', 'pageProps', 'content', 'headline')
+            self.timefmt = ' [' + safe_dict(data, 'props', 'pageProps', 'content', 'formattedIssueDate') + ']'
+            self.cover_url = safe_dict(data, 'props', 'pageProps', 'content', 'cover', 'url').replace(
                 'economist.com/', 'economist.com/cdn-cgi/image/width=960,quality=80,format=auto/').replace('SQ_', '')
             self.log('Got cover:', self.cover_url)
 
             feeds = []
 
             for part in safe_dict(
-                data, "props", "pageProps", "content", "headerSections"
-            ) + safe_dict(data, "props", "pageProps", "content", "sections"):
-                section = safe_dict(part, "name") or ''
+                data, 'props', 'pageProps', 'content', 'headerSections'
+            ) + safe_dict(data, 'props', 'pageProps', 'content', 'sections'):
+                section = safe_dict(part, 'name') or ''
                 if not section:
                     continue
                 self.log(section)
@@ -536,12 +536,12 @@ class Economist(BasicNewsRecipe):
                 articles = []
 
                 for ar in part['articles']:
-                    title = safe_dict(ar, "headline") or ''
-                    url = process_url(safe_dict(ar, "url") or '')
+                    title = safe_dict(ar, 'headline') or ''
+                    url = process_url(safe_dict(ar, 'url') or '')
                     if not title or not url:
                         continue
-                    desc = safe_dict(ar, "rubric") or ''
-                    sub = safe_dict(ar, "flyTitle") or ''
+                    desc = safe_dict(ar, 'rubric') or ''
+                    sub = safe_dict(ar, 'flyTitle') or ''
                     if sub and section != sub:
                         desc = sub + ' :: ' + desc
                     self.log('\t', title, '\n\t', desc, '\n\t\t', url)
@@ -555,12 +555,9 @@ class Economist(BasicNewsRecipe):
         # open('/t/raw.html', 'wb').write(raw.encode('utf-8'))
         root_ = parse(raw)
         if '/interactive/' in url:
-            return (
-                '<html><body><article><h1>'
-                + root_.xpath('//h1')[0].text + '</h1><em>'
-                + 'This article is supposed to be read in a browser'
-                + '</em></article></body></html>'
-            )
+            return ('<html><body><article><h1>' + root_.xpath('//h1')[0].text + '</h1><em>'
+                    'This article is supposed to be read in a browser'
+                    '</em></article></body></html>')
 
         script = root_.xpath('//script[@id="__NEXT_DATA__"]')
 
diff --git a/recipes/economist_news.recipe b/recipes/economist_news.recipe
index 2c3372d86f..e08f7ba91d 100644
--- a/recipes/economist_news.recipe
+++ b/recipes/economist_news.recipe
@@ -59,7 +59,7 @@ def load_article_from_json(raw, root):
     body = root.xpath('//body')[0]
     article = E(body, 'article')
     E(article, 'div', data['flyTitle'], style='color: red; font-size:small; font-weight:bold;')
-    E(article, 'h1', data['title'], title=safe_dict(data, "url", "canonical") or '')
+    E(article, 'h1', data['title'], title=safe_dict(data, 'url', 'canonical') or '')
     E(article, 'div', data['rubric'], style='font-style: italic; color:#202020;')
     try:
         date = data['dateModified']
@@ -125,7 +125,7 @@ class EconomistNews(BasicNewsRecipe):
     encoding = 'utf-8'
     masthead_url = 'https://www.livemint.com/lm-img/dev/economist-logo-oneline.png'
 
-    __author__ = "Kovid Goyal"
+    __author__ = 'Kovid Goyal'
     description = (
         'Global news and current affairs from a European'
         ' perspective. Get the latest articles here.'
@@ -140,7 +140,7 @@ class EconomistNews(BasicNewsRecipe):
     resolve_internal_links = True
     remove_tags = [
         dict(name=['script', 'noscript', 'title', 'iframe', 'cf_floatingcontent', 'aside', 'footer', 'svg']),
-        dict(attrs={'aria-label': "Article Teaser"}),
+        dict(attrs={'aria-label': 'Article Teaser'}),
         dict(attrs={'id': 'player'}),
         dict(attrs={
                 'class': [
@@ -209,7 +209,7 @@ class EconomistNews(BasicNewsRecipe):
 
     def parse_index(self):
         query = {
-            'query': 'query HomeQuery($homeId:String!$relatedId:String!$podcastsId:String!){canonical(ref:$homeId){hasPart{parts{id title:headline cta{text url __typename}type hasPart{parts{isPartOf{id context{title:headline flyTitle:subheadline rubric:description dateline image{...ImageMainFragment ...ImagePromoFragment __typename}__typename}__typename}...ArticleFragment hasPart{parts{...ArticleFragment isPartOf{id context{title:headline flyTitle:subheadline rubric:description dateline image{...ImageMainFragment ...ImagePromoFragment __typename}__typename}__typename}hasPart{parts{...ArticleFragment isPartOf{id context{title:headline flyTitle:subheadline rubric:description dateline image{...ImageMainFragment ...ImagePromoFragment __typename}__typename}__typename}__typename}__typename}__typename}__typename}isPartOf{id context{title:headline flyTitle:subheadline rubric:description dateline image{...ImageMainFragment ...ImagePromoFragment __typename}__typename}__typename}__typename}__typename}__typename}__typename}__typename}relatedTopStories:canonical(ref:$relatedId){id title:headline hasPart(size:2 sort:"datePublished:desc"){parts{...ArticleFragment isPartOf{id context{title:headline flyTitle:subheadline rubric:description dateline image{...ImageMainFragment ...ImagePromoFragment __typename}__typename}__typename}__typename}__typename}__typename}podcasts:canonical(ref:$podcastsId){id title:headline hasPart(size:6 sort:"datePublished:desc"){parts{...ArticleFragment isPartOf{id context{title:headline flyTitle:subheadline rubric:description dateline image{...ImageMainFragment ...ImagePromoFragment __typename}__typename}__typename}__typename}__typename}__typename}}fragment ArticleFragment on Content{articleSection{internal{id title:headline __typename}__typename}audio{main{id duration(format:"seconds")source:channel{id __typename}url{canonical __typename}__typename}__typename}byline dateline dateModified datePublished flyTitle:subheadline id image{...ImageInlineFragment ...ImageMainFragment ...ImagePromoFragment __typename}print{title:headline flyTitle:subheadline rubric:description section{id title:headline __typename}__typename}publication{id tegID title:headline flyTitle:subheadline datePublished regionsAllowed url{canonical __typename}__typename}rubric:description source:channel{id __typename}tegID text(format:"json")title:headline type url{canonical __typename}__typename}fragment ImageInlineFragment on Media{inline{url{canonical __typename}width height __typename}__typename}fragment ImageMainFragment on Media{main{url{canonical __typename}width height __typename}__typename}fragment ImagePromoFragment on Media{promo{url{canonical __typename}id width height __typename}__typename}',  # noqa
+            'query': 'query HomeQuery($homeId:String!$relatedId:String!$podcastsId:String!){canonical(ref:$homeId){hasPart{parts{id title:headline cta{text url __typename}type hasPart{parts{isPartOf{id context{title:headline flyTitle:subheadline rubric:description dateline image{...ImageMainFragment ...ImagePromoFragment __typename}__typename}__typename}...ArticleFragment hasPart{parts{...ArticleFragment isPartOf{id context{title:headline flyTitle:subheadline rubric:description dateline image{...ImageMainFragment ...ImagePromoFragment __typename}__typename}__typename}hasPart{parts{...ArticleFragment isPartOf{id context{title:headline flyTitle:subheadline rubric:description dateline image{...ImageMainFragment ...ImagePromoFragment __typename}__typename}__typename}__typename}__typename}__typename}__typename}isPartOf{id context{title:headline flyTitle:subheadline rubric:description dateline image{...ImageMainFragment ...ImagePromoFragment __typename}__typename}__typename}__typename}__typename}__typename}__typename}__typename}relatedTopStories:canonical(ref:$relatedId){id title:headline hasPart(size:2 sort:"datePublished:desc"){parts{...ArticleFragment isPartOf{id context{title:headline flyTitle:subheadline rubric:description dateline image{...ImageMainFragment ...ImagePromoFragment __typename}__typename}__typename}__typename}__typename}__typename}podcasts:canonical(ref:$podcastsId){id title:headline hasPart(size:6 sort:"datePublished:desc"){parts{...ArticleFragment isPartOf{id context{title:headline flyTitle:subheadline rubric:description dateline image{...ImageMainFragment ...ImagePromoFragment __typename}__typename}__typename}__typename}__typename}__typename}}fragment ArticleFragment on Content{articleSection{internal{id title:headline __typename}__typename}audio{main{id duration(format:"seconds")source:channel{id __typename}url{canonical __typename}__typename}__typename}byline dateline dateModified datePublished flyTitle:subheadline id image{...ImageInlineFragment ...ImageMainFragment ...ImagePromoFragment __typename}print{title:headline flyTitle:subheadline rubric:description section{id title:headline __typename}__typename}publication{id tegID title:headline flyTitle:subheadline datePublished regionsAllowed url{canonical __typename}__typename}rubric:description source:channel{id __typename}tegID text(format:"json")title:headline type url{canonical __typename}__typename}fragment ImageInlineFragment on Media{inline{url{canonical __typename}width height __typename}__typename}fragment ImageMainFragment on Media{main{url{canonical __typename}width height __typename}__typename}fragment ImagePromoFragment on Media{promo{url{canonical __typename}id width height __typename}__typename}',  # noqa: E501
             'operationName': 'HomeQuery',
             'variables': '{"homeId":"/content/8mmm7h9v7arvfpvn4n20hakmg4ugatur",'
                            '"relatedId":"/content/c7kho74htgua3gif74fa4bnbjr64i1js","podcastsId":"/content/omi23dr8h15h8c33t2gkb2cju8ap758o"}',
@@ -234,9 +234,9 @@ class EconomistNews(BasicNewsRecipe):
             articles = []
 
             for art in part['hasPart']['parts']:
-                title = safe_dict(art, "title")
-                desc = safe_dict(art, "rubric") or ''
-                sub = safe_dict(art, "flyTitle") or ''
+                title = safe_dict(art, 'title')
+                desc = safe_dict(art, 'rubric') or ''
+                sub = safe_dict(art, 'flyTitle') or ''
                 if sub and section != sub:
                     desc = sub + ' :: ' + desc
                 if not art.get('text'):
@@ -249,7 +249,7 @@ class EconomistNews(BasicNewsRecipe):
                 pt.write(json.dumps(art).encode('utf-8'))
                 pt.close()
                 url = 'file:///' + pt.name
-                articles.append({"title": title, "url": url, "description": desc})
+                articles.append({'title': title, 'url': url, 'description': desc})
                 self.log('\t', title, '\n\t\t', desc)
             if articles:
                 feeds.append((section, articles))
@@ -276,9 +276,9 @@ class EconomistNews(BasicNewsRecipe):
         load_article_from_json(raw, root)
 
         if '/interactive/' in url:
-            return '<html><body><article><h1>' + root.xpath('//h1')[0].text + '</h1><em>' \
-                        + 'This article is supposed to be read in a browser' \
-                            + '</em></article></body></html>'
+            return ('<html><body><article><h1>' + root.xpath('//h1')[0].text + '</h1><em>'
+                    'This article is supposed to be read in a browser.'
+                    '</em></article></body></html>')
 
         for div in root.xpath('//div[@class="lazy-image"]'):
             noscript = list(div.iter('noscript'))
diff --git a/recipes/economist_search.recipe b/recipes/economist_search.recipe
index a0c621e7d2..5ac61ad57f 100644
--- a/recipes/economist_search.recipe
+++ b/recipes/economist_search.recipe
@@ -23,8 +23,8 @@ def process_node(node):
             return f'<p>{node.get("textHtml")}</p>'
         return f'<p>{node.get("text", "")}</p>'
     elif ntype == 'IMAGE':
-        alt = "" if node.get("altText") is None else node.get("altText")
-        cap = ""
+        alt = '' if node.get('altText') is None else node.get('altText')
+        cap = ''
         if node.get('caption'):
             if node['caption'].get('textHtml') is not None:
                 cap = node['caption']['textHtml']
@@ -78,6 +78,7 @@ def load_article_from_json(raw):
         body += process_node(node)
     return '<html><body><article>' + body + '</article></body></html>'
 
+
 def cleanup_html_article(root):
     main = root.xpath('//main')[0]
     body = root.xpath('//body')[0]
@@ -91,17 +92,20 @@ def cleanup_html_article(root):
     for x in root.xpath('//button'):
         x.getparent().remove(x)
 
+
 def classes(classes):
     q = frozenset(classes.split(' '))
     return dict(attrs={
         'class': lambda x: x and frozenset(x.split()).intersection(q)})
 
+
 def new_tag(soup, name, attrs=()):
     impl = getattr(soup, 'new_tag', None)
     if impl is not None:
         return impl(name, attrs=dict(attrs))
     return Tag(soup, name, attrs=attrs or None)
 
+
 def process_url(url):
     if url.startswith('/'):
         url = 'https://www.economist.com' + url
@@ -112,12 +116,12 @@ class econ_search(BasicNewsRecipe):
     title = 'The Economist - Search'
     language = 'en'
     encoding = 'utf-8'
-    __author__ = "unkn0wn"
+    __author__ = 'unkn0wn'
     description = (
         'Use the Advanced section of the recipe to search.'
     )
 
-    remove_attributes = ['style', 'height', 'width']
+    remove_attributes = ['data-reactid', 'style', 'height', 'width']
     no_stylesheets = True
     ignore_duplicate_articles = {'url'}
     extra_css = '''
@@ -128,7 +132,7 @@ class econ_search(BasicNewsRecipe):
     resolve_internal_links = True
     remove_tags = [
         dict(name=['script', 'noscript', 'title', 'iframe', 'cf_floatingcontent', 'aside', 'footer', 'svg']),
-        dict(attrs={'aria-label': "Article Teaser"}),
+        dict(attrs={'aria-label': 'Article Teaser'}),
         dict(attrs={'id':'player'}),
         dict(attrs={
                 'class': [
@@ -150,15 +154,13 @@ class econ_search(BasicNewsRecipe):
         )
     ]
     keep_only_tags = [dict(name='article', id=lambda x: not x)]
-    no_stylesheets = True
-    remove_attributes = ['data-reactid', 'width', 'height']
     # economist.com has started throttling after about 60% of the total has
     # downloaded with connection reset by peer (104) errors.
     delay = 3
 
     def get_browser(self, *args, **kwargs):
         kwargs['user_agent'] = (
-            'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36 Lamarr' # noqa
+            'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36 Lamarr'
         )
         br = BasicNewsRecipe.get_browser(self, *args, **kwargs)
         return br
@@ -167,12 +169,9 @@ class econ_search(BasicNewsRecipe):
         # open('/t/raw.html', 'wb').write(raw.encode('utf-8'))
         root_ = parse(raw)
         if '/interactive/' in url:
-            return (
-                '<html><body><article><h1>'
-                + root_.xpath('//h1')[0].text + '</h1><em>'
-                + 'This article is supposed to be read in a browser'
-                + '</em></article></body></html>'
-            )
+            return ('<html><body><article><h1>' + root_.xpath('//h1')[0].text + '</h1><em>'
+                    'This article is supposed to be read in a browser.'
+                    '</em></article></body></html>')
 
         script = root_.xpath('//script[@id="__NEXT_DATA__"]')
 
diff --git a/recipes/economist_world_ahead.recipe b/recipes/economist_world_ahead.recipe
index 3e9b177370..6d7e2336ee 100644
--- a/recipes/economist_world_ahead.recipe
+++ b/recipes/economist_world_ahead.recipe
@@ -23,8 +23,8 @@ def process_node(node):
             return f'<p>{node.get("textHtml")}</p>'
         return f'<p>{node.get("text", "")}</p>'
     elif ntype == 'IMAGE':
-        alt = "" if node.get("altText") is None else node.get("altText")
-        cap = ""
+        alt = '' if node.get('altText') is None else node.get('altText')
+        cap = ''
         if node.get('caption'):
             if node['caption'].get('textHtml') is not None:
                 cap = node['caption']['textHtml']
@@ -122,7 +122,7 @@ class EconomistWorld(BasicNewsRecipe):
     encoding = 'utf-8'
     masthead_url = 'https://www.livemint.com/lm-img/dev/economist-logo-oneline.png'
 
-    __author__ = "unkn0wn"
+    __author__ = 'unkn0wn'
     description = (
         'The World Ahead is The Economist’s future-gazing publication. It prepares audiences for what is to '
         'come with mind-stretching insights and expert analysis—all in The Economist’s clear, elegant style.'
@@ -136,7 +136,7 @@ class EconomistWorld(BasicNewsRecipe):
     resolve_internal_links = True
     remove_tags = [
         dict(name=['script', 'noscript', 'title', 'iframe', 'cf_floatingcontent', 'aside', 'footer', 'svg']),
-        dict(attrs={'aria-label': "Article Teaser"}),
+        dict(attrs={'aria-label': 'Article Teaser'}),
         dict(attrs={'id': 'player'}),
         dict(attrs={
                 'class': [
@@ -178,7 +178,7 @@ class EconomistWorld(BasicNewsRecipe):
 
     def get_browser(self, *args, **kwargs):
         kwargs['user_agent'] = (
-            'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36 Lamarr' # noqa
+            'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36 Lamarr'
         )
         br = BasicNewsRecipe.get_browser(self, *args, **kwargs)
         return br
@@ -205,24 +205,24 @@ class EconomistWorld(BasicNewsRecipe):
         return self.economist_return_index(ans)
 
     def economist_parse_index(self, soup):
-        script_tag = soup.find("script", id="__NEXT_DATA__")
+        script_tag = soup.find('script', id='__NEXT_DATA__')
         if script_tag is not None:
             data = json.loads(script_tag.string)
             # open('/t/raw.json', 'w').write(json.dumps(data, indent=2, sort_keys=True))
-            self.title = safe_dict(data, "props", "pageProps", "content", "headline")
+            self.title = safe_dict(data, 'props', 'pageProps', 'content', 'headline')
             self.cover_url = 'https://mma.prnewswire.com/media/2561745/The_Economist_World_Ahead_2025_cover.jpg?w=600'
 
             feeds = []
 
-            for coll in safe_dict(data, "props", "pageProps", "content", "components"):
-                section = safe_dict(coll, "headline") or ''
+            for coll in safe_dict(data, 'props', 'pageProps', 'content', 'components'):
+                section = safe_dict(coll, 'headline') or ''
                 self.log(section)
                 articles = []
-                for part in safe_dict(coll, "items"):
-                    title = safe_dict(part, "headline") or ''
-                    url = process_url(safe_dict(part, "url") or '')
-                    desc = safe_dict(part, "rubric") or ''
-                    sub = safe_dict(part, "flyTitle") or ''
+                for part in safe_dict(coll, 'items'):
+                    title = safe_dict(part, 'headline') or ''
+                    url = process_url(safe_dict(part, 'url') or '')
+                    desc = safe_dict(part, 'rubric') or ''
+                    sub = safe_dict(part, 'flyTitle') or ''
                     if sub and section != sub:
                         desc = sub + ' :: ' + desc
                     self.log('\t', title, '\n\t', desc, '\n\t\t', url)
@@ -245,12 +245,9 @@ class EconomistWorld(BasicNewsRecipe):
         # open('/t/raw.html', 'wb').write(raw.encode('utf-8'))
         root_ = parse(raw)
         if '/interactive/' in url:
-            return (
-                '<html><body><article><h1>'
-                + root_.xpath('//h1')[0].text + '</h1><em>'
-                + 'This article is supposed to be read in a browser'
-                + '</em></article></body></html>'
-            )
+            return ('<html><body><article><h1>' + root_.xpath('//h1')[0].text + '</h1><em>'
+                    'This article is supposed to be read in a browser.'
+                    '</em></article></body></html>')
 
         script = root_.xpath('//script[@id="__NEXT_DATA__"]')
 
diff --git a/recipes/edmonton_journal.recipe b/recipes/edmonton_journal.recipe
index 5395ba7bda..f6a054a5e0 100644
--- a/recipes/edmonton_journal.recipe
+++ b/recipes/edmonton_journal.recipe
@@ -60,28 +60,28 @@ class CanWestPaper(BasicNewsRecipe):
     ]
 
     # un-comment the following six lines for the Vancouver Province
-    # title = u'Vancouver Province'
-    # url_prefix = 'http://www.theprovince.com'
-    # description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
-    # logo_url = 'vplogo.jpg'
-    # fp_tag = 'CAN_TP'
+    # #    title = u'Vancouver Province'
+    # #    url_prefix = 'http://www.theprovince.com'
+    # #    description = u'News from Vancouver, BC'
+    # #    std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
+    # #    logo_url = 'vplogo.jpg'
+    # #    fp_tag = 'CAN_TP'
 
     # un-comment the following six lines for the Vancouver Sun
-    # title = u'Vancouver Sun'
-    # url_prefix = 'http://www.vancouversun.com'
-    # description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
-    # logo_url = 'vslogo.jpg'
-    # fp_tag = 'CAN_VS'
+    # #    title = u'Vancouver Sun'
+    # #    url_prefix = 'http://www.vancouversun.com'
+    # #    description = u'News from Vancouver, BC'
+    # #    std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
+    # #    logo_url = 'vslogo.jpg'
+    # #    fp_tag = 'CAN_VS'
 
     # un-comment the following six lines for the Calgary Herald
-    # title = u'Calgary Herald'
-    # url_prefix = 'http://www.calgaryherald.com'
-    # description = u'News from Calgary, AB'
-    # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
-    # logo_url = 'chlogo.jpg'
-    # fp_tag = 'CAN_CH'
+    # #    title = u'Calgary Herald'
+    # #    url_prefix = 'http://www.calgaryherald.com'
+    # #    description = u'News from Calgary, AB'
+    # #    std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
+    # #    logo_url = 'chlogo.jpg'
+    # #    fp_tag = 'CAN_CH'
 
     # un-comment the following six lines for the Edmonton Journal
     title = u'Edmonton Journal'
@@ -92,20 +92,20 @@ class CanWestPaper(BasicNewsRecipe):
     fp_tag = 'CAN_EJ'
 
     # un-comment the following six lines for the Ottawa Citizen
-#     title = u'Ottawa Citizen'
-#     url_prefix = 'http://www.ottawacitizen.com'
-#     description = u'News from Ottawa, ON'
-#     std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
-#     logo_url = 'oclogo.jpg'
-#     fp_tag = 'CAN_OC'
+    # #    title = u'Ottawa Citizen'
+    # #    url_prefix = 'http://www.ottawacitizen.com'
+    # #    description = u'News from Ottawa, ON'
+    # #    std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
+    # #    logo_url = 'oclogo.jpg'
+    # #    fp_tag = 'CAN_OC'
 
     # un-comment the following six lines for the Montreal Gazette
-#     title = u'Montreal Gazette'
-#     url_prefix = 'http://www.montrealgazette.com'
-#     description = u'News from Montreal, QC'
-#     std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg'
-#     logo_url = 'mglogo.jpg'
-#     fp_tag = 'CAN_MG'
+    # #    title = u'Montreal Gazette'
+    # #    url_prefix = 'http://www.montrealgazette.com'
+    # #    description = u'News from Montreal, QC'
+    # #    std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg'
+    # #    logo_url = 'mglogo.jpg'
+    # #    fp_tag = 'CAN_MG'
 
     Kindle_Fire = False
     masthead_url = std_logo_url
@@ -126,7 +126,7 @@ class CanWestPaper(BasicNewsRecipe):
                 .photocaption { font-size: xx-small; font-style: italic; font-weight: normal; }
                 #photocredit { font-size: xx-small; font-weight: normal; }'''
 
-    keep_only_tags = [dict(name='div', attrs={'id': re.compile('story')})]
+    keep_only_tags = [dict(name='div', attrs={'id': re.compile(r'story')})]
 
     remove_tags = [{'class': 'comments'}, {'class': 'comment-intro'}, {'class': 'storytab'},
                    dict(name='div', attrs={'class': 'section_title'}), dict(name='div', attrs={'class': 'sharebar'}), dict(
@@ -140,7 +140,7 @@ class CanWestPaper(BasicNewsRecipe):
                        name='div', attrs={'class': 'copyright'}),
                    dict(name='div', attrs={'class': 'rule_grey_solid'}),
                    dict(name='div', attrs={'id': 'soundoff'}),
-                   dict(name='div', attrs={'id': re.compile('flyer')}),
+                   dict(name='div', attrs={'id': re.compile(r'flyer')}),
                    dict(name='li', attrs={'class': 'print'}), dict(name='li', attrs={'class': 'share'}), dict(name='ul', attrs={'class': 'bullet'})]
 
     def get_cover_url(self):
@@ -154,8 +154,7 @@ class CanWestPaper(BasicNewsRecipe):
         except:
             while daysback < 7:
                 cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg' + \
-                    str((date.today() - timedelta(days=daysback)).day) + \
-                    '/lg/' + self.fp_tag + '.jpg'
+                    str((date.today() - timedelta(days=daysback)).day) + '/lg/' + self.fp_tag + '.jpg'
                 br = BasicNewsRecipe.get_browser(self)
                 try:
                     br.open(cover)
@@ -164,24 +163,24 @@ class CanWestPaper(BasicNewsRecipe):
                     continue
                 break
         if daysback == 7:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             cover = None
         return cover
 
     def fixChars(self, string):
         # Replace lsquo (\x91)
-        fixed = re.sub("\x91", "‘", string)
+        fixed = string.replace('\x91', '‘')
         # Replace rsquo (\x92)
-        fixed = re.sub("\x92", "’", fixed)
+        fixed = fixed.replace('\x92', '’')
         # Replace ldquo (\x93)
-        fixed = re.sub("\x93", "“", fixed)
+        fixed = fixed.replace('\x93', '“')
         # Replace rdquo (\x94)
-        fixed = re.sub("\x94", "”", fixed)
+        fixed = fixed.replace('\x94', '”')
         # Replace ndash (\x96)
-        fixed = re.sub("\x96", "–", fixed)
+        fixed = fixed.replace('\x96', '–')
         # Replace mdash (\x97)
-        fixed = re.sub("\x97", "—", fixed)
-        fixed = re.sub("&#x2019;", "’", fixed)
+        fixed = fixed.replace('\x97', '—')
+        fixed = fixed.replace('&#x2019;', '’')
         return fixed
 
     def massageNCXText(self, description):
@@ -214,7 +213,7 @@ class CanWestPaper(BasicNewsRecipe):
         divtags = soup.findAll('div', attrs={'id': ''})
         if divtags:
             for div in divtags:
-                del(div['id'])
+                del div['id']
 
         pgall = soup.find('div', attrs={'id': 'storyphoto'})
         if pgall is not None:  # photo gallery perhaps
@@ -262,10 +261,10 @@ class CanWestPaper(BasicNewsRecipe):
                     if url.startswith('/'):
                         url = self.url_prefix + url
                     if not url.startswith(self.url_prefix):
-                        print("Rejected " + url)
+                        print('Rejected ' + url)
                         return
                     if url in self.url_list:
-                        print("Rejected dup " + url)
+                        print('Rejected dup ' + url)
                         return
                     self.url_list.append(url)
                     title = self.tag_to_string(atag, False)
@@ -277,8 +276,8 @@ class CanWestPaper(BasicNewsRecipe):
                         return
                     dtag = adiv.find('div', 'content')
                     description = ''
-                    print("URL " + url)
-                    print("TITLE " + title)
+                    print('URL ' + url)
+                    print('TITLE ' + title)
                     if dtag is not None:
                         stag = dtag.span
                         if stag is not None:
@@ -286,18 +285,18 @@ class CanWestPaper(BasicNewsRecipe):
                                 description = self.tag_to_string(stag, False)
                         else:
                             description = self.tag_to_string(dtag, False)
-                        print("DESCRIPTION: " + description)
+                        print('DESCRIPTION: ' + description)
                     if key not in articles:
                         articles[key] = []
                     articles[key].append(dict(
                         title=title, url=url, date='', description=description, author='', content=''))
 
         def parse_web_index(key, keyurl):
-            print("Section: " + key + ': ' + self.url_prefix + keyurl)
+            print('Section: ' + key + ': ' + self.url_prefix + keyurl)
             try:
                 soup = self.index_to_soup(self.url_prefix + keyurl)
             except:
-                print("Section: " + key + ' NOT FOUND')
+                print('Section: ' + key + ' NOT FOUND')
                 return
             ans.append(key)
             mainsoup = soup.find('div', 'bodywrapper')
@@ -309,7 +308,7 @@ class CanWestPaper(BasicNewsRecipe):
             for wdiv in mainsoup.findAll(attrs={'class': ['headline', 'featurecontent']}):
                 handle_article(wdiv, key)
 
-        for (k, url) in self.postmedia_index_pages:
+        for k,url in self.postmedia_index_pages:
             parse_web_index(k, url)
         ans = [(key, articles[key]) for key in ans if key in articles]
         return ans
diff --git a/recipes/el_colombiano.recipe b/recipes/el_colombiano.recipe
index f557d85bbd..3a39cb0fbb 100644
--- a/recipes/el_colombiano.recipe
+++ b/recipes/el_colombiano.recipe
@@ -9,8 +9,10 @@ class AdvancedUserRecipe1311790237(BasicNewsRecipe):
     language = 'es_CO'
     cover_url = 'http://www.elcolombiano.com/images/logoElColombiano348x46.gif'
     remove_tags_before = dict(id='contenidoArt')
-    remove_tags_after = dict(id='enviaTips')
-    remove_tags_after = dict(id='zonaPata')
+    remove_tags_after = [
+        dict(id='enviaTips'),
+        dict(id='zonaPata'),
+    ]
     oldest_article = 1
     max_articles_per_feed = 100
     remove_javascript = True
@@ -20,12 +22,12 @@ class AdvancedUserRecipe1311790237(BasicNewsRecipe):
     masthead_url = 'http://www.elcolombiano.com/images/logoElColombiano348x46.gif'
     publication_type = 'newspaper'
 
-    extra_css             = """
+    extra_css             = '''
                                p{text-align: justify; font-size: 100%}
                                body{ text-align: left; font-size:100% }
                                h1{font-family: sans-serif; font-size:150%; font-weight:bold; text-align: justify; }
                                h3{font-family: sans-serif; font-size:100%; font-style: italic; text-align: justify; }
-                                 """
+                                 '''
 
     feeds = [(u'Portada', u'http://www.elcolombiano.com/rss/portada.xml'),
              (u'Antioquia', u'http://www.elcolombiano.com/rss/Antioquia.xml'),
diff --git a/recipes/el_correo.recipe b/recipes/el_correo.recipe
index 5f42a7aa2e..675dac2e20 100644
--- a/recipes/el_correo.recipe
+++ b/recipes/el_correo.recipe
@@ -18,10 +18,9 @@ class elcorreo(BasicNewsRecipe):
     ignore_duplicate_articles = {'url'}
     encoding = 'utf-8'
     masthead_url = 'https://s1.ppllstatics.com/starfish/1.3.76/assets/images/logos/logo-elcorreo.svg'
-    encoding = 'utf-8'
     remove_empty_feeds = True
     resolve_internal_links = True
-    max_articles_per_feed = 25 # articles
+    max_articles_per_feed = 25  # articles
     compress_news_images = True
 
     recipe_specific_options = {
@@ -59,7 +58,7 @@ class elcorreo(BasicNewsRecipe):
     ]
 
     remove_tags = [
-        dict(name = ['svg', 'section', 'nav']),
+        dict(name=['svg', 'section', 'nav']),
         dict(attrs={'data-voc-component':['dropdown', 'modal', 'slider-grab']}),
         classes(
             'v-mdl-ath__img-c v-adv v-i-b v-mdl-ath__c--2 v-d-cmp-adv v-d-cmp-nws '
@@ -88,14 +87,6 @@ class elcorreo(BasicNewsRecipe):
                 p.name = 'div'
         return soup
 
-    recipe_specific_options = {
-        'days': {
-            'short': 'Oldest article to download from this news source. In days ',
-            'long': 'For example, 0.5, gives you articles from the past 12 hours',
-            'default': str(oldest_article)
-        }
-    }
-
     def get_browser(self, *args, **kwargs):
         kwargs['user_agent'] = 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)'
         br = BasicNewsRecipe.get_browser(self, *args, **kwargs)
diff --git a/recipes/el_cultural.recipe b/recipes/el_cultural.recipe
index c502fe4e31..737aace9fc 100644
--- a/recipes/el_cultural.recipe
+++ b/recipes/el_cultural.recipe
@@ -14,7 +14,7 @@ class RevistaElCultural(BasicNewsRecipe):
     no_stylesheets = True
     remove_javascript = True
 
-    extra_css = 'h1{ font-family: sans-serif; font-size: large; font-weight: bolder; text-align: justify } h2{ font-family: sans-serif; font-size: small; font-weight: 500; text-align: justify } h3{ font-family: sans-serif; font-size: small; font-weight: 500; text-align: justify } h4{ font-family: sans-serif; font-weight: lighter; font-size: medium; font-style: italic; text-align: justify } .rtsArticuloFirma{ font-family: sans-serif; font-size: small; text-align: justify } .column span-13 last{ font-family: sans-serif; font-size: medium; text-align: justify } .rtsImgArticulo{font-family: serif; font-size: small; color: #000000; text-align: justify}'  # noqa
+    extra_css = 'h1{ font-family: sans-serif; font-size: large; font-weight: bolder; text-align: justify } h2{ font-family: sans-serif; font-size: small; font-weight: 500; text-align: justify } h3{ font-family: sans-serif; font-size: small; font-weight: 500; text-align: justify } h4{ font-family: sans-serif; font-weight: lighter; font-size: medium; font-style: italic; text-align: justify } .rtsArticuloFirma{ font-family: sans-serif; font-size: small; text-align: justify } .column span-13 last{ font-family: sans-serif; font-size: medium; text-align: justify } .rtsImgArticulo{font-family: serif; font-size: small; color: #000000; text-align: justify}'  # noqa: E501
 
     def preprocess_html(self, soup):
         for item in soup.findAll(style=True):
@@ -55,9 +55,9 @@ class RevistaElCultural(BasicNewsRecipe):
             if url.startswith('/version_papel/' + titleSection + '/'):
                 url = 'http://www.elcultural.es' + url
 
-            self.log('\t\tFound article:', title[0:title.find("|") - 1])
+            self.log('\t\tFound article:', title[0:title.find('|') - 1])
             self.log('\t\t\t', url)
-            current_articles.append({'title': title[0:title.find("|") - 1], 'url': url,
+            current_articles.append({'title': title[0:title.find('|') - 1], 'url': url,
                                      'description': '', 'date': ''})
 
         return current_articles
diff --git a/recipes/el_diplo.recipe b/recipes/el_diplo.recipe
index c9c44e26f0..2374a639cb 100644
--- a/recipes/el_diplo.recipe
+++ b/recipes/el_diplo.recipe
@@ -1,51 +1,51 @@
 # -*- mode: python; coding: utf-8; -*-
 # vim: set syntax=python fileencoding=utf-8
 
-__license__ = "GPL v3"
-__copyright__ = "2023, Tomás Di Domenico <tdido at tdido.eu>"
+__license__ = 'GPL v3'
+__copyright__ = '2023, Tomás Di Domenico <tdido at tdido.eu>'
 
-"""
+'''
 www.eldiplo.org
-"""
+'''
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class ElDiplo2023(BasicNewsRecipe):
-    title = "Le Monde Diplomatique - cono sur"
-    __author__ = "Tomás Di Domenico"
-    description = "Publicación de Le Monde Diplomatique para el cono sur."
-    publisher = "Capital Intelectual"
-    category = "News, Politics, Argentina, Uruguay, Paraguay, South America, World"
+    title = 'Le Monde Diplomatique - cono sur'
+    __author__ = 'Tomás Di Domenico'
+    description = 'Publicación de Le Monde Diplomatique para el cono sur.'
+    publisher = 'Capital Intelectual'
+    category = 'News, Politics, Argentina, Uruguay, Paraguay, South America, World'
     oldest_article = 31
     no_stylesheets = True
-    encoding = "utf8"
+    encoding = 'utf8'
     use_embedded_content = False
-    language = "es_AR"
+    language = 'es_AR'
     remove_empty_feeds = True
-    publication_type = "magazine"
+    publication_type = 'magazine'
     delay = 1
     simultaneous_downloads = 1
     timeout = 8
     needs_subscription = True
-    ignore_duplicate_articles = {"url"}
+    ignore_duplicate_articles = {'url'}
     temp_files = []
     fetch_retries = 10
     handle_gzip = True
     compress_news_images = True
     scale_news_images_to_device = True
     masthead_url = (
-        "https://www.eldiplo.org/wp-content/themes/_polenta_/assets/diplo.png"
+        'https://www.eldiplo.org/wp-content/themes/_polenta_/assets/diplo.png'
     )
-    INDEX = "https://www.eldiplo.org/"
+    INDEX = 'https://www.eldiplo.org/'
 
-    conversion_options = {"series": "El Dipló", "publisher": publisher, "base_font_size": 8, "tags": category}
+    conversion_options = {'series': 'El Dipló', 'publisher': publisher, 'base_font_size': 8, 'tags': category}
 
-    keep_only_tags = [dict(name=["article"])]
+    keep_only_tags = [dict(name=['article'])]
 
-    remove_tags = [dict(name=["button"])]
+    remove_tags = [dict(name=['button'])]
 
-    extra_css = """
+    extra_css = '''
         .entry-title {
             text-align: center;
         }
@@ -67,59 +67,59 @@ class ElDiplo2023(BasicNewsRecipe):
             padding-left: 10%;
             padding-right: 10%;
         }
-    """
+    '''
 
     def get_browser(self):
         br = BasicNewsRecipe.get_browser(self)
         br.open(self.INDEX)
         if self.username is not None and self.password is not None:
-            br.select_form(id="loginform")
-            br["log"] = self.username
-            br["pwd"] = self.password
+            br.select_form(id='loginform')
+            br['log'] = self.username
+            br['pwd'] = self.password
             br.submit()
         return br
 
     def get_cover_url(self):
         soup_index = self.index_to_soup(self.INDEX)
-        tag_sumario = soup_index.find("span", text="Sumario")
-        url_sumario = "https://www.eldiplo.org" + tag_sumario.parent["href"]
+        tag_sumario = soup_index.find('span', text='Sumario')
+        url_sumario = 'https://www.eldiplo.org' + tag_sumario.parent['href']
 
         soup = self.index_to_soup(url_sumario)
 
-        container = soup.find("div", class_="px-16")
-        url = container.find("img")["src"]
+        container = soup.find('div', class_='px-16')
+        url = container.find('img')['src']
 
-        return getattr(self, "cover_url", url)
+        return getattr(self, 'cover_url', url)
 
     def _process_article(self, article):
-        url = article.find("a", href=True, attrs={"class": "title"})["href"]
-        title = self.tag_to_string(article).replace("Editorial", "Editorial: ")
+        url = article.find('a', href=True, attrs={'class': 'title'})['href']
+        title = self.tag_to_string(article).replace('Editorial', 'Editorial: ')
         try:
-            title, authors = title.split(", por")
-            authors = f"por {authors}"
+            title, authors = title.split(', por')
+            authors = f'por {authors}'
         except ValueError:
-            authors = ""
-        self.log("title: ", title, " url: ", url)
-        return {"title": title, "url": url, "description": authors, "date": ""}
+            authors = ''
+        self.log('title: ', title, ' url: ', url)
+        return {'title': title, 'url': url, 'description': authors, 'date': ''}
 
     def preprocess_html(self, soup):
-        font_size = "90%"
+        font_size = '90%'
 
         # make the footnotes smaller
-        for p in soup.find("div", id="nota_pie").findChildren("p", recursive=False):
-            p["style"] = f"font-size: {font_size};"
+        for p in soup.find('div', id='nota_pie').findChildren('p', recursive=False):
+            p['style'] = f'font-size: {font_size};'
 
         return soup
 
     def parse_index(self):
         soup_index = self.index_to_soup(self.INDEX)
 
-        tag_sumario = soup_index.find("span", text="Sumario")
+        tag_sumario = soup_index.find('span', text='Sumario')
 
         if tag_sumario is None:
             return None
 
-        url_sumario = "https://www.eldiplo.org" + tag_sumario.parent["href"]
+        url_sumario = 'https://www.eldiplo.org' + tag_sumario.parent['href']
         self.log(url_sumario)
 
         soup_sumario = self.index_to_soup(url_sumario)
@@ -128,20 +128,20 @@ class ElDiplo2023(BasicNewsRecipe):
         articles = []
         dossiers = []
 
-        sumario = soup_sumario.find("div", class_="sumario")
+        sumario = soup_sumario.find('div', class_='sumario')
 
-        for section in sumario.find_all("div", recursive=False):
-            classes = section.attrs["class"]
+        for section in sumario.find_all('div', recursive=False):
+            classes = section.attrs['class']
 
-            if "dossier" in classes:
-                dtitle = self.tag_to_string(section.find("h3"))
+            if 'dossier' in classes:
+                dtitle = self.tag_to_string(section.find('h3'))
                 darticles = []
-                for article in section.find_all("div", recursive=False):
+                for article in section.find_all('div', recursive=False):
                     darticles.append(self._process_article(article))
                 dossiers.append((dtitle, darticles))
             else:
                 articles.append(self._process_article(section))
-        feeds.append(("Artículos", articles))
+        feeds.append(('Artículos', articles))
         feeds += dossiers
 
         return feeds
diff --git a/recipes/el_pais.recipe b/recipes/el_pais.recipe
index ffe83b57dc..d1a929c506 100644
--- a/recipes/el_pais.recipe
+++ b/recipes/el_pais.recipe
@@ -114,16 +114,16 @@ div.a_md_a {text-align: center; text-transform: uppercase; font-size: .8rem;}
         from datetime import date
         cover = ('https://srv00.epimg.net/pdf/elpais/snapshot/' +
                  str(date.today().year) + '/' + date.today().strftime('%m') + '/elpais/' +
-                 str(date.today().year) +  date.today().strftime('%m') + date.today().strftime('%d') + 'Big.jpg')
+                 str(date.today().year) + date.today().strftime('%m') + date.today().strftime('%d') + 'Big.jpg')
         br = BasicNewsRecipe.get_browser(self)
         try:
             br.open(cover)
         except:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             cover = None
         return cover
 
     def image_url_processor(cls, baseurl, url):
-        splitUrl = url.split("cloudfront-")
+        splitUrl = url.split('cloudfront-')
         parsedUrl = 'https://cloudfront-' + splitUrl[1]
         return parsedUrl
diff --git a/recipes/el_pais_babelia.recipe b/recipes/el_pais_babelia.recipe
index 88049a91b1..3fff2db54d 100644
--- a/recipes/el_pais_babelia.recipe
+++ b/recipes/el_pais_babelia.recipe
@@ -36,7 +36,7 @@ class ElPaisBabelia(BasicNewsRecipe):
                     title = self.tag_to_string(post)
                     if str(post).find('class=') > 0:
                         klass = post['class']
-                        if klass != "":
+                        if klass != '':
                             self.log()
                             self.log('--> post:  ', post)
                             self.log('--> url:   ', url)
diff --git a/recipes/el_pais_uy.recipe b/recipes/el_pais_uy.recipe
index 04a5e6f11c..47be554529 100644
--- a/recipes/el_pais_uy.recipe
+++ b/recipes/el_pais_uy.recipe
@@ -66,7 +66,7 @@ class General(BasicNewsRecipe):
         index = 'https://www.elpais.com.uy/impresa/'
         soup = self.index_to_soup(index)
         link_item = soup.find('a', attrs={'class': 'page-link link-module'})
-        # print link_item
+        # print(link_item)
         if link_item:
             cover_url = 'https://www.elpais.com.uy' + link_item.get('href')
         return cover_url
diff --git a/recipes/elcohetealaluna.recipe b/recipes/elcohetealaluna.recipe
index 1ff45144b5..4e33f113ef 100644
--- a/recipes/elcohetealaluna.recipe
+++ b/recipes/elcohetealaluna.recipe
@@ -28,12 +28,12 @@ class elcohetealaluna(BasicNewsRecipe):
     compress_news_images = True
     masthead_url         = 'https://www.elcohetealaluna.com/wp-content/uploads/2018/06/logo-menu.png'
 
-    extra_css            = """
+    extra_css            = '''
         body{font-family: Georgia, Times, "Times New Roman", serif}
         h1,h2,.post-author-name{font-family: Oswald, sans-serif}
         h2{color: gray}
         img{margin-top:1em; margin-bottom: 1em; display:block}
-    """
+    '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/elcronista-arg.recipe b/recipes/elcronista-arg.recipe
index 9cc1f908ae..4ada20b514 100644
--- a/recipes/elcronista-arg.recipe
+++ b/recipes/elcronista-arg.recipe
@@ -28,10 +28,10 @@ class ElCronistaArg(BasicNewsRecipe):
     auto_cleanup_keep    = '//div[@class="header-bottom"] | //h1 | //h2'
     ignore_duplicate_articles = {'url'}
     masthead_url         = 'https://www.cronista.com/export/sites/diarioelcronista/arte/v2/lg_cronista_footer.png_665574830.png'
-    extra_css            = """
+    extra_css            = '''
         body{font-family: 'Source Sans Pro', sans-serif}
         h1,h2,h3,h4{font-family: 'Libre Baskerville', serif}
-    """
+    '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/elektroda_pl.recipe b/recipes/elektroda_pl.recipe
index 2a5550ae40..d5361c4407 100644
--- a/recipes/elektroda_pl.recipe
+++ b/recipes/elektroda_pl.recipe
@@ -29,5 +29,5 @@ class Elektroda(BasicNewsRecipe):
         feeds = BasicNewsRecipe.parse_feeds(self)
         for feed in feeds:
             for article in feed.articles[:]:
-                article.title = article.title[article.title.find("::") + 3:]
+                article.title = article.title[article.title.find('::') + 3:]
         return feeds
diff --git a/recipes/elmundo.recipe b/recipes/elmundo.recipe
index 1432aa1715..21c7f832b0 100644
--- a/recipes/elmundo.recipe
+++ b/recipes/elmundo.recipe
@@ -35,14 +35,14 @@ class ElMundo(BasicNewsRecipe):
     articles_are_obfuscated = True
     auto_cleanup = True
     temp_files = []
-    extra_css                 = """
+    extra_css                 = '''
                                     body{font-family: "PT serif",Georgia,serif,times}
                                     .metadata_noticia{font-size: small}
                                     .pestana_GDP{font-size: small; font-weight:bold}
                                     h1 {color: #333333; font-family: "Clear Sans Bold",Arial,sans-serif,helvetica}
                                     .hora{color: red}
                                     .update{color: gray}
-                                    """
+                                    '''
 
     conversion_options = {
         'comments': description, 'tags': category, 'language': language, 'publisher': publisher
@@ -83,14 +83,13 @@ class ElMundo(BasicNewsRecipe):
         cover = self.masthead_url
         st = time.localtime()
         year = str(st.tm_year)
-        month = "%.2d" % st.tm_mon
-        day = "%.2d" % st.tm_mday
-        cover = 'http://img.kiosko.net/' + year + '/' + \
-            month + '/' + day + '/es/elmundo.750.jpg'
+        month = '%.2d' % st.tm_mon
+        day = '%.2d' % st.tm_mday
+        cover = 'http://img.kiosko.net/' + '/'.join([year, month, day]) + '/es/elmundo.750.jpg'
         try:
             self.browser.open(cover)
         except:
-            self.log("\nPortada no disponible")
+            self.log('\nPortada no disponible')
         return cover
 
     def get_obfuscated_article(self, url):
@@ -103,7 +102,7 @@ class ElMundo(BasicNewsRecipe):
                 html = response.read()
                 count = tries
             except:
-                print("Retrying download...")
+                print('Retrying download...')
             count += 1
         if html is not None:
             tfile = PersistentTemporaryFile('_fa.html')
diff --git a/recipes/elpais_semanal.recipe b/recipes/elpais_semanal.recipe
index 69a0a0fb42..1ce8ab86e2 100644
--- a/recipes/elpais_semanal.recipe
+++ b/recipes/elpais_semanal.recipe
@@ -21,7 +21,7 @@ class ElPaisSemanal(BasicNewsRecipe):
     publication_type = 'magazine'
     masthead_url = 'http://www.elpais.com/im/tit_logo_int.gif'
     index = 'http://www.elpais.com/suple/eps/'
-    extra_css = ' p{text-align: justify} body{ text-align: left; font-family: Georgia,"Times New Roman",Times,serif } h2{font-family: Arial,Helvetica,sans-serif} img{margin-bottom: 0.4em} '  # noqa
+    extra_css = ' p{text-align: justify} body{ text-align: left; font-family: Georgia,"Times New Roman",Times,serif } h2{font-family: Arial,Helvetica,sans-serif} img{margin-bottom: 0.4em} '  # noqa: E501
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/elperiodico_spanish.recipe b/recipes/elperiodico_spanish.recipe
index b6c591c48f..4aa07b9524 100644
--- a/recipes/elperiodico_spanish.recipe
+++ b/recipes/elperiodico_spanish.recipe
@@ -36,8 +36,8 @@ class ElPeriodico_cat(BasicNewsRecipe):
         '--comment', description, '--category', category, '--publisher', publisher
     ]
 
-    html2epub_options = 'publisher="' + publisher + \
-        '"\ncomments="' + description + '"\ntags="' + category + '"'
+    html2epub_options = ('publisher="' + publisher +
+        '"\ncomments="' + description + '"\ntags="' + category + '"')
 
     feeds = [(u'Portada', u'http://www.elperiodico.com/es/rss/rss_portada.xml'),
              (u'Internacional', u'http://elperiodico.com/es/rss/internacional/rss.xml'),
@@ -66,7 +66,7 @@ class ElPeriodico_cat(BasicNewsRecipe):
 
     def preprocess_html(self, soup):
         mcharset = new_tag(soup, 'meta', [
-                       ("http-equiv", "Content-Type"), ("content", "text/html; charset=utf-8")])
+                       ('http-equiv', 'Content-Type'), ('content', 'text/html; charset=utf-8')])
         soup.head.insert(0, mcharset)
         for item in soup.findAll(style=True):
             del item['style']
diff --git a/recipes/en_globes_co_il.recipe b/recipes/en_globes_co_il.recipe
index 2ad5aac6af..0dbe822972 100644
--- a/recipes/en_globes_co_il.recipe
+++ b/recipes/en_globes_co_il.recipe
@@ -18,18 +18,18 @@ class En_Globes_Recipe(BasicNewsRecipe):
     max_articles_per_feed = 100
 
     feeds = [
-        (u"Main Headlines", u"https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederNode?iID=942"),
-        (u"Israeli stocks on Wall Street", u"https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1392"),
-        (u"All news", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=1725"),
-        (u"Macro economics", u"https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1389"),
-        (u"Aerospace and defense", u"https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1380"),
-        (u"Real estate", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederKeyword?iID=1385"),
-        (u"Energy and water", u"https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1382"),
-        (u"Start-ups and venture capital", u"https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1397"),
-        (u"Financial services", u"https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1383"),
-        (u"Tel Aviv markets", u"https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1404"),
-        (u"Healthcare", u"https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1377"),
-        (u"Telecommunications", u"https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1386"),
-        (u"Information technology", u"https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1376"),
-        (u"Transport and infrastructure", u"https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1388"),
+        (u'Main Headlines', u'https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederNode?iID=942'),
+        (u'Israeli stocks on Wall Street', u'https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1392'),
+        (u'All news', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=1725'),
+        (u'Macro economics', u'https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1389'),
+        (u'Aerospace and defense', u'https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1380'),
+        (u'Real estate', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederKeyword?iID=1385'),
+        (u'Energy and water', u'https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1382'),
+        (u'Start-ups and venture capital', u'https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1397'),
+        (u'Financial services', u'https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1383'),
+        (u'Tel Aviv markets', u'https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1404'),
+        (u'Healthcare', u'https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1377'),
+        (u'Telecommunications', u'https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1386'),
+        (u'Information technology', u'https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1376'),
+        (u'Transport and infrastructure', u'https://www.globes.co.il/WebService/Rss/RssFeeder.asmx/FeederKeyword?iID=1388'),
     ]
diff --git a/recipes/endgadget.recipe b/recipes/endgadget.recipe
index de5ef2a941..bb8a3c00b4 100644
--- a/recipes/endgadget.recipe
+++ b/recipes/endgadget.recipe
@@ -38,33 +38,33 @@ class Engadget(BasicNewsRecipe):
     remove_tags = [
         dict(name='div', attrs={'class':'caas-content-byline-wrapper'}),
         dict(name='div', attrs={'data-component':'ArticleAuthorInfo'}),
-        classes('commerce-module caas-header caas-prestige-bottom-share caas-share-buttons caas-da caas-3p-blocked commerce-disclaimer notification-upsell-push article-slideshow athena-button email-form')  # noqa
+        classes('commerce-module caas-header caas-prestige-bottom-share caas-share-buttons caas-da caas-3p-blocked commerce-disclaimer notification-upsell-push article-slideshow athena-button email-form')  # noqa: E501
     ]
 
     feeds = [(u'Posts', u'https://www.engadget.com/rss.xml')]
 
     def parse_feeds(self):
-      # Call parent's method.
-      feeds = BasicNewsRecipe.parse_feeds(self)
-      # Loop through all feeds.
-      for feed in feeds:
-        # Loop through all articles in feed.
-        for article in feed.articles[:]:
-          # Remove articles with '...' in the url.
-          if '/deals/' in article.url:
-            print('Removing:',article.title)
-            feed.articles.remove(article)
-          # Remove articles with '...' in the title.
-          elif 'best tech deals' in article.title:
-              print('Removing:',article.title)
-              feed.articles.remove(article)
-          elif 'Podcast' in article.title:
-              print('Removing:',article.title)
-              feed.articles.remove(article)
-          elif 'The Morning After' in article.title:
-              print('Removing:',article.title)
-              feed.articles.remove(article)
-      return feeds
+        # Call parent's method.
+        feeds = BasicNewsRecipe.parse_feeds(self)
+        # Loop through all feeds.
+        for feed in feeds:
+            # Loop through all articles in feed.
+            for article in feed.articles[:]:
+                # Remove articles with '...' in the url.
+                if '/deals/' in article.url:
+                    print('Removing:',article.title)
+                    feed.articles.remove(article)
+                # Remove articles with '...' in the title.
+                elif 'best tech deals' in article.title:
+                    print('Removing:',article.title)
+                    feed.articles.remove(article)
+                elif 'Podcast' in article.title:
+                    print('Removing:',article.title)
+                    feed.articles.remove(article)
+                elif 'The Morning After' in article.title:
+                    print('Removing:',article.title)
+                    feed.articles.remove(article)
+        return feeds
 
     def preprocess_html(self, soup):
         for attr in 'data-src data-src-mobile'.split():
@@ -87,8 +87,8 @@ class Engadget(BasicNewsRecipe):
             except KeyError:
                 continue
         # Reorder the "title" and "content" elements
-        title_div = soup.find("div", {"class": "caas-title-wrapper"})
-        content_div = soup.find("div", {"class": "caas-content-wrapper"})
+        title_div = soup.find('div', {'class': 'caas-title-wrapper'})
+        content_div = soup.find('div', {'class': 'caas-content-wrapper'})
         if title_div and content_div:
             soup.body.clear()
             soup.body.append(title_div)
diff --git a/recipes/epoch_times.recipe b/recipes/epoch_times.recipe
index 26998ea5e3..576676a199 100644
--- a/recipes/epoch_times.recipe
+++ b/recipes/epoch_times.recipe
@@ -13,7 +13,7 @@ class EpochTimes(BasicNewsRecipe):
     max_articles_per_feed = 20
     ignore_duplicate_articles = {'url'}
     remove_attributes = ['height', 'width', 'style']
-    remove_empty_feeds =  True
+    remove_empty_feeds = True
     no_stylesheets = True
     resolve_internal_links = True
     masthead_url = 'https://epochtimes-ny.newsmemory.com/eeLayout/epochtimes/1.0.a/images/webapp/banner.png'
diff --git a/recipes/epw_magazine.recipe b/recipes/epw_magazine.recipe
index 105ee34f7c..ff258fbc16 100644
--- a/recipes/epw_magazine.recipe
+++ b/recipes/epw_magazine.recipe
@@ -72,5 +72,5 @@ class epw(BasicNewsRecipe):
                 if section_title not in feeds:
                     feeds[section_title] = []
                 feeds[section_title] += articles
-        ans = [(key, val) for key, val in feeds.items()]
+        ans = list(feeds.items())
         return ans
diff --git a/recipes/equestria_daily.recipe b/recipes/equestria_daily.recipe
index b0d15db6a9..1efeb7bfe1 100644
--- a/recipes/equestria_daily.recipe
+++ b/recipes/equestria_daily.recipe
@@ -5,12 +5,12 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class AdvancedUserRecipe1639926896(BasicNewsRecipe):
-    __author__ = "Aisteru"
-    __copyright__ = "2021, Timothée Andres <timothee dot andres at gmail dot com>"
+    __author__ = 'Aisteru'
+    __copyright__ = '2021, Timothée Andres <timothee dot andres at gmail dot com>'
     __license__ = 'GNU General Public License v3 - http://www.gnu.org/copyleft/gpl.html'
 
-    title = "Equestria Daily"
-    description = "Everything new in Equestria and beyond!"
+    title = 'Equestria Daily'
+    description = 'Everything new in Equestria and beyond!'
     language = 'en'
 
     # Max. supported by website: 50
@@ -29,13 +29,13 @@ class AdvancedUserRecipe1639926896(BasicNewsRecipe):
 
     # To discard posts under a certain section, simply comment the whole line
     sections = [
-        ("Art", 'Art'),
-        ("News", 'News'),
-        ("Fics", 'Fanfiction'),
-        ("Media", 'Media'),
-        ("Comics", 'Comic'),
-        ("Community", 'Community'),
-        ("Editorial", 'Editorial'),
+        ('Art', 'Art'),
+        ('News', 'News'),
+        ('Fics', 'Fanfiction'),
+        ('Media', 'Media'),
+        ('Comics', 'Comic'),
+        ('Community', 'Community'),
+        ('Editorial', 'Editorial'),
     ]
 
     def get_masthead_url(self):
@@ -51,7 +51,7 @@ class AdvancedUserRecipe1639926896(BasicNewsRecipe):
             lines = description.split('\n')
             return '\n'.join([line.strip() for line in lines if len(line.strip()) > 0])
 
-        for (section_name, section_url_name) in self.sections:
+        for section_name, section_url_name in self.sections:
             soup = self.index_to_soup(
                 f'https://www.equestriadaily.com/search/label/{section_url_name}?max-results={self.max_articles_per_feed}')
             articles = soup.select('div.post.hentry')
diff --git a/recipes/esenja.recipe b/recipes/esenja.recipe
index c17537af9c..5836913ab4 100644
--- a/recipes/esenja.recipe
+++ b/recipes/esenja.recipe
@@ -33,7 +33,6 @@ class Esensja(BasicNewsRecipe):
                    dict(attrs={'class': ['tekst_koniec', 'ref', 'wykop']}),
                    dict(attrs={'itemprop': ['copyrightHolder', 'publisher']}),
                    dict(id='komentarze')
-
                    ]
 
     extra_css = '''
@@ -45,19 +44,16 @@ class Esensja(BasicNewsRecipe):
                             '''
 
     preprocess_regexps = [(re.compile(r'alt="[^"]*"'), lambda match: ''),
-                          (re.compile(
-                              u'(title|alt)="[^"]*?"', re.DOTALL), lambda match: ''),
-                          ]
+                          (re.compile(r'(title|alt)="[^"]*?"', re.DOTALL), lambda match: '')]
 
     def parse_index(self):
         soup = self.index_to_soup('http://www.esensja.pl/magazyn/')
-        a = soup.find('a', attrs={'href': re.compile('.*/index.html')})
+        a = soup.find('a', attrs={'href': re.compile(r'.*/index.html')})
         year = a['href'].split('/')[0]
         month = a['href'].split('/')[1]
         self.HREF = 'http://www.esensja.pl/magazyn/' + year + '/' + month + '/iso/'
         soup = self.index_to_soup(self.HREF + '01.html')
-        self.cover_url = 'http://www.esensja.pl/magazyn/' + \
-            year + '/' + month + '/img/ilustr/cover_b.jpg'
+        self.cover_url = 'http://www.esensja.pl/magazyn/' + year + '/' + month + '/img/ilustr/cover_b.jpg'
         feeds = []
         chapter = ''
         subchapter = ''
@@ -149,7 +145,7 @@ class Esensja(BasicNewsRecipe):
             info = tag.find(attrs={'class': 'img_info'})
             text = str(tag)
             if not src:
-                src = re.search('src="[^"]*?"', text)
+                src = re.search(r'src="[^"]*?"', text)
                 if src:
                     src = src.group(0)
                     src = src[5:].replace('//', '/')
diff --git a/recipes/esensja_(rss).recipe b/recipes/esensja_(rss).recipe
index f91607702d..1e301e4822 100644
--- a/recipes/esensja_(rss).recipe
+++ b/recipes/esensja_(rss).recipe
@@ -23,9 +23,7 @@ class EsensjaRSS(BasicNewsRecipe):
     remove_javascript = True
     ignore_duplicate_articles = {'title', 'url'}
     preprocess_regexps = [(re.compile(r'alt="[^"]*"'), lambda match: ''),
-                          (re.compile(
-                              u'(title|alt)="[^"]*?"', re.DOTALL), lambda match: ''),
-                          ]
+                          (re.compile(r'(title|alt)="[^"]*?"', re.DOTALL), lambda match: '')]
     remove_attributes = ['style', 'bgcolor', 'alt', 'color']
     keep_only_tags = [dict(attrs={'class': 'sekcja'}), ]
     remove_tags_after = dict(id='tekst')
@@ -53,9 +51,9 @@ class EsensjaRSS(BasicNewsRecipe):
     def get_cover_url(self):
         soup = self.index_to_soup(self.INDEX)
         cover = soup.find(id='panel_1')
-        self.cover_url = self.INDEX + \
-            cover.find('a')['href'].replace(
-                'index.html', '') + 'img/ilustr/cover_b.jpg'
+        self.cover_url = (self.INDEX
+            + cover.find('a')['href'].replace('index.html', '')
+            + 'img/ilustr/cover_b.jpg')
         return getattr(self, 'cover_url', self.cover_url)
 
     def append_page(self, soup, appendtag):
@@ -95,7 +93,7 @@ class EsensjaRSS(BasicNewsRecipe):
             info = tag.find(attrs={'class': 'img_info'})
             text = str(tag)
             if not src:
-                src = re.search('src="[^"]*?"', text)
+                src = re.search(r'src="[^"]*?"', text)
                 if src:
                     src = src.group(0)
                     src = src[5:].replace('//', '/')
diff --git a/recipes/eso_pl.recipe b/recipes/eso_pl.recipe
index e4e1143c7f..5f0dbb5456 100644
--- a/recipes/eso_pl.recipe
+++ b/recipes/eso_pl.recipe
@@ -13,7 +13,10 @@ class ESO(BasicNewsRecipe):
     remove_empty_feeds = True
     use_embedded_content = False
     cover_url = 'https://www.eso.org/public/archives/logos/medium/eso-logo-black-outline.jpg'
-    keep_only_tags = [dict(attrs={'class': 'subcl'})]
+    keep_only_tags = [
+        dict(attrs={'class': 'subcl'}),
+        dict(name='div',attrs={'class':'col-md-9 left-column'}),
+    ]
     remove_tags = [dict(id='lang_row'), dict(
         attrs={'class': ['pr_typeid', 'pr_news_feature_link', 'outreach_usage', 'hidden']})]
     feeds = [
@@ -21,9 +24,6 @@ class ESO(BasicNewsRecipe):
     (u'Og\u0142oszenia', u'http://www.eso.org/public/poland/announcements/feed/'),
     (u'Zdj\u0119cie tygodnia', u'http://www.eso.org/public/poland/images/potw/feed/')]
 
-    keep_only_tags = [
-        dict(name='div',attrs={'class':'col-md-9 left-column'})]
-
     def preprocess_html(self, soup):
         for a in soup.findAll('a', href=True):
             if a['href'].startswith('/'):
diff --git a/recipes/europa_press.recipe b/recipes/europa_press.recipe
index 7cbc7c8cb3..7f268d5038 100644
--- a/recipes/europa_press.recipe
+++ b/recipes/europa_press.recipe
@@ -32,8 +32,8 @@ class AdvancedUserRecipe1294946868(BasicNewsRecipe):
         name='div', attrs={'id': ['ImprimirEnviarNoticia']})
 
     remove_tags = [
-        dict(name='ul', attrs={'id': ['entidadesNoticia', 'MenuSecciones']}), dict(name='div', attrs={'id': ['ImprimirEnviarNoticia', 'PublicidadSuperior', 'CabeceraDerecha', 'Comentarios', 'comentarios full fbConnectAPI', 'ComentarEstaNoticia', 'ctl00_Superior_Main_MasEnChance_cajamasnoticias', 'gl_chn', 'videos_portada_derecha', 'galeria_portada_central', 'galeria_portada_central_boxes']}), dict(  # noqa
-            name='div', attrs={'class': ['infoRelacionada', 'col_1', 'buscador', 'caja doblecolumna strong', 'CHANCE_EP_Encuesta_frontal text', 'seccionportada col_0', 'seccion header', 'text', 'pie caption_over']}), dict(name='a', attrs={'class': ['buscadorLabel']}), dict(name='span', attrs={'class': ['editado']}), dict(name='table'), dict(name='li') ]  # noqa
+        dict(name='ul', attrs={'id': ['entidadesNoticia', 'MenuSecciones']}), dict(name='div', attrs={'id': ['ImprimirEnviarNoticia', 'PublicidadSuperior', 'CabeceraDerecha', 'Comentarios', 'comentarios full fbConnectAPI', 'ComentarEstaNoticia', 'ctl00_Superior_Main_MasEnChance_cajamasnoticias', 'gl_chn', 'videos_portada_derecha', 'galeria_portada_central', 'galeria_portada_central_boxes']}), dict(  # noqa: E501
+            name='div', attrs={'class': ['infoRelacionada', 'col_1', 'buscador', 'caja doblecolumna strong', 'CHANCE_EP_Encuesta_frontal text', 'seccionportada col_0', 'seccion header', 'text', 'pie caption_over']}), dict(name='a', attrs={'class': ['buscadorLabel']}), dict(name='span', attrs={'class': ['editado']}), dict(name='table'), dict(name='li')]  # noqa: E501
 
     feeds = [
 
diff --git a/recipes/expansion_spanish.recipe b/recipes/expansion_spanish.recipe
index 674e9f699f..bc72f2637f 100644
--- a/recipes/expansion_spanish.recipe
+++ b/recipes/expansion_spanish.recipe
@@ -37,7 +37,7 @@ class expansion_spanish(BasicNewsRecipe):
 
     remove_tags = [
         dict(name='div', attrs={'class': ['compartir', 'metadata_desarrollo_noticia', 'relacionadas', 'mas_info',
-                                          'publicidad publicidad_textlink', 'ampliarfoto', 'tit_relacionadas', 'interact', 'paginacion estirar', 'sumario derecha']}),  # noqa
+                                          'publicidad publicidad_textlink', 'ampliarfoto', 'tit_relacionadas', 'interact', 'paginacion estirar', 'sumario derecha']}),  # noqa: E501
         dict(name='ul', attrs={
              'class': ['bolos_desarrollo_noticia', 'not_logged']}),
         dict(name='span', attrs={'class': ['comentarios']}),
@@ -106,15 +106,14 @@ class expansion_spanish(BasicNewsRecipe):
         cover = None
         st = time.localtime()
         year = str(st.tm_year)
-        month = "%.2d" % st.tm_mon
-        day = "%.2d" % st.tm_mday
-        cover = 'http://img5.kiosko.net/' + year + '/' + \
-            month + '/' + day + '/es/expansion.750.jpg'
+        month = '%.2d' % st.tm_mon
+        day = '%.2d' % st.tm_mday
+        cover = 'http://img5.kiosko.net/' + '/'.join([year, month, day]) + '/es/expansion.750.jpg'
         br = BasicNewsRecipe.get_browser(self)
         try:
             br.open(cover)
         except:
-            self.log("\nPortada no disponible")
+            self.log('\nPortada no disponible')
             cover = 'http://www.aproahp.org/enlaces/images/diario_expansion.gif'
         return cover
 
@@ -138,13 +137,13 @@ class expansion_spanish(BasicNewsRecipe):
         link = article.get('link', None)
         if link is None:
             return article
-        if link.split('/')[-1] == "story01.htm":
+        if link.split('/')[-1] == 'story01.htm':
             link = link.split('/')[-2]
             a = ['0B', '0C', '0D', '0E', '0F', '0G', '0N', '0L0S', '0A']
             b = ['.', '/', '?', '-', '=', '&', '.com', 'www.', '0']
-            for i in range(0, len(a)):
+            for i in range(len(a)):
                 link = link.replace(a[i], b[i])
-            link = "http://" + link
+            link = 'http://' + link
 
         # Eliminar artículos duplicados en otros feeds
 
diff --git a/recipes/factcheck.recipe b/recipes/factcheck.recipe
index 732344ebd0..f7fad0d34c 100644
--- a/recipes/factcheck.recipe
+++ b/recipes/factcheck.recipe
@@ -13,6 +13,6 @@ class FactCheckOrg(BasicNewsRecipe):
     masthead_url = 'http://factcheck.org/wp-content/themes/Streamline/images/headernew.jpg'
     cover_url = 'http://factcheck.org/wp-content/themes/Streamline/images/headernew.jpg'
 
-    remove_tags = [dict({'id': ['footer', 'footerabout', 'sidebar']})]
+    remove_tags = [{'id': ['footer', 'footerabout', 'sidebar']}]
 
     feeds = [(u'Factcheck', u'feed://www.factcheck.org/feed/')]
diff --git a/recipes/fairbanks_daily.recipe b/recipes/fairbanks_daily.recipe
index 6435406cb5..f72f612891 100644
--- a/recipes/fairbanks_daily.recipe
+++ b/recipes/fairbanks_daily.recipe
@@ -13,7 +13,6 @@ class FairbanksDailyNewsminer(BasicNewsRecipe):
     remove_javascript = True
     use_embedded_content = False
     no_stylesheets = True
-    language = 'en'
     encoding = 'utf8'
     conversion_options = {'linearize_tables': True}
     auto_cleanup = True
diff --git a/recipes/fastcompany.recipe b/recipes/fastcompany.recipe
index c867c7b8ae..84af8ec54c 100644
--- a/recipes/fastcompany.recipe
+++ b/recipes/fastcompany.recipe
@@ -45,15 +45,15 @@ class FastCompany(BasicNewsRecipe):
     feeds = [(u'All News', u'http://feeds.feedburner.com/fastcompany/headlines')]
 
     def get_article_url(self, article):
-        return article.get('guid',  None)
+        return article.get('guid', None)
 
     def preprocess_html(self, soup):
         soup.html['xml:lang'] = self.lang
         soup.html['lang'] = self.lang
         mlang = new_tag(soup, 'meta', [
-                    ("http-equiv", "Content-Language"), ("content", self.lang)])
+                    ('http-equiv', 'Content-Language'), ('content', self.lang)])
         mcharset = new_tag(soup, 'meta', [
-                       ("http-equiv", "Content-Type"), ("content", "text/html; charset=UTF-8")])
+                       ('http-equiv', 'Content-Type'), ('content', 'text/html; charset=UTF-8')])
         soup.head.insert(0, mlang)
         soup.head.insert(1, mcharset)
         for item in soup.findAll('a'):
diff --git a/recipes/faz_net.recipe b/recipes/faz_net.recipe
index 90b789a2c4..e1ac34f1b4 100644
--- a/recipes/faz_net.recipe
+++ b/recipes/faz_net.recipe
@@ -18,22 +18,22 @@ def format_tickaroo_liveblog(soup):
     for div in soup.findAll('div', attrs={'class':'tik4-content-block tik4-content-block--rich-text tik4-content-block--position-2'}):
         div.insert_before(soup.new_tag('br'))
 
-
-    #format liveblogs
+    # format liveblogs
     for tag in soup.findAll('time'):
-        ntag = soup.new_tag("br")
+        ntag = soup.new_tag('br')
         tag.insert_before(ntag)
 
-    for tag in soup.findAll(class_ = 'tik4-author__wrapper'):
-        ntag = tag.find(class_ = 'tik4-author__name')
+    for tag in soup.findAll(class_='tik4-author__wrapper'):
+        ntag = tag.find(class_='tik4-author__name')
         if ntag:
             temp = ntag.extract()
             temp['class'] = 'tik4-media-body__title'
-        ntag = tag.find(class_ = 'tik4-author__thumb')
+        ntag = tag.find(class_='tik4-author__thumb')
         if ntag and temp:
             ntag.insert_after(temp)
 
-    # process run of images
+
+# process run of images
 def bilderstrecke(soup,tag):
     flag = False
     try:
@@ -56,19 +56,19 @@ def bilderstrecke(soup,tag):
 
     for v in struct:
         if isinstance(v, dict) and 'caption' in v and 'defaultUrl' in v:
-#            if type(struct[i-1])== str:
-#                head = soup.new_tag("h4")
-#                head.append(struct[i-1])
+            # if type(struct[i-1])== str:
+            #     head = soup.new_tag("h4")
+            #     head.append(struct[i-1])
             cap = soup.new_tag('p')
             cap.append(struct[int(v['caption'])])
-            cap['class'] = "body-elements__image-figcaption"
+            cap['class'] = 'body-elements__image-figcaption'
             if 'source' in v.keys():
                 cred = soup.new_tag('span')
                 cred.append(struct[int(v['source'])])
-                cred['class'] = "body-elements__image-figcaption--source"
+                cred['class'] = 'body-elements__image-figcaption--source'
                 cap.append(cred)
             if 'defaultUrl' in v.keys():
-                fig = soup.new_tag("figure")
+                fig = soup.new_tag('figure')
                 img = soup.new_tag('img')
                 img['src'] = struct[int(v['defaultUrl'])]
                 fig.append(img)
@@ -76,10 +76,10 @@ def bilderstrecke(soup,tag):
                 collect.append(fig)
     soup.find(class_='header-teaser').insert_after(collect)
 
-
     for tag in soup.findAll(class_='header-teaser__image--default'):
         tag.extract()
 
+
 def story(soup,tag):
     first_image = soup.find('img',attrs={'loading':'lazy'})
     first_caption = soup.find('figcaption',attrs={'class':'caption'})
@@ -93,25 +93,24 @@ class FazNet(BasicNewsRecipe):
     # original by Armin Geller
     # overhaul to deal with changes in the faz.net websites
 
-    title                 =             'FAZ.NET'
-    __author__            =             'Unknown'
-    description           =             'Frankfurter Allgemeine Zeitung'
-    publisher             =             'Frankfurter Allgemeine Zeitung GmbH'
-    category              =             'news, politics, Germany'
-    cover_url             =             'https://upload.wikimedia.org/wikipedia/commons/7/72/Frankfurter_Allgemeine_logo.svg'
-    encoding              =             'utf-8'
-    language              =             'de'
-    ignore_duplicate_articles   =       {'title', 'url'}
-    max_articles_per_feed =             30
-    no_stylesheets        =             True
-    remove_javascript     =             True
-    scale_news_images = (10,100)
-    delay                 =      1
+    title                       = 'FAZ.NET'
+    __author__                  = 'Unknown'
+    description                 = 'Frankfurter Allgemeine Zeitung'
+    publisher                   = 'Frankfurter Allgemeine Zeitung GmbH'
+    category                    = 'news, politics, Germany'
+    cover_url                   = 'https://upload.wikimedia.org/wikipedia/commons/7/72/Frankfurter_Allgemeine_logo.svg'
+    encoding                    = 'utf-8'
+    language                    = 'de'
+    ignore_duplicate_articles   = {'title', 'url'}
+    max_articles_per_feed       = 30
+    no_stylesheets              = True
+    remove_javascript           = True
+    scale_news_images           = (10,100)
+    delay                       = 1
 
-    test_article = 'https://www.faz.net/rss/aktuell/feuilleton/kunst-und-architektur/berlinische-galerie-zeigt-edvard-munch-die-ganze-gefuehlsskala-des-lebens-19180631.html?printPagedArticle=true#pageIndex_2'
-    test_article = None
+    test_feed = 'https://www.faz.net/rss/aktuell/feuilleton/kunst-und-architektur/berlinische-galerie-zeigt-edvard-munch-die-ganze-gefuehlsskala-des-lebens-19180631.html?printPagedArticle=true#pageIndex_2'
 
-    extra_css      =  '''
+    extra_css = '''
         .header-title,.scrolly-title {font-size: 1.5em; font-weight:bold; text-align:left;}
         .quote {font-size: 1.5em; font-weight:bold; text-align:center;}
         .author {font-size: 0.7em; font-weight:bold; text-align:center; display:block;
@@ -132,11 +131,10 @@ class FazNet(BasicNewsRecipe):
     keep_only_tags = [dict(name='article', attrs={'class':['article','storytelling']}),
                       dict(name='body'),
                       dict(name='div', attrs={'class':['imageGallery','image_only']}),
-                      dict(name = 'div', attrs ={'class':'tik4-live__container'}),
-                      dict(name = 'script', attrs = {'id':'__NUXT_DATA__'}),
+                      dict(name='div', attrs={'class':'tik4-live__container'}),
+                      dict(name='script', attrs={'id':'__NUXT_DATA__'}),
                       ]
 
-
     remove_tags = [
                    dict(name='div', attrs={'class':[
                        'related-articles','consent-placeholder',
@@ -144,8 +142,8 @@ class FazNet(BasicNewsRecipe):
                        'tik4-sharing','tik4-load-more-bottom',
                        'tik4-by','header-detail__image','mm-adbox','upper-toolbar content-container'
                    ]}),
-  #                 dict(name ='script'),
-                   dict(name = "style"),
+                   # dict(name ='script'),
+                   dict(name='style'),
                    dict(name='svg'),
                    dict(name='div', attrs={'data-module':'teaser'}),
 
@@ -153,7 +151,6 @@ class FazNet(BasicNewsRecipe):
 
     remove_attributes = ['onclick']
 
-
     test_article = False
     if not test_article:
         feeds = [
@@ -174,11 +171,11 @@ class FazNet(BasicNewsRecipe):
     else:
         def parse_index(self):
             test_article = 'https://www.faz.net/aktuell/stil/mode-im-em-jahr-wir-zeigen-wie-fussball-und-mode-zusammengehoeren-19766969.html'
-#            test_article = 'https://www.faz.net/aktuell/feuilleton/buecher/film-eruption-ein-thriller-aus-dem-nachlass-von-michael-crichton-19770491.html'
-#            test_article = 'https://www.faz.net/aktuell/stil/mode-design/leonie-benesch-sandra-hueller-ist-eine-meiner-heldinnen-19671638.html'
-#            test_article = 'https://www.faz.net/aktuell/feuilleton/medien/sabine-postel-zum-siebzigsten-die-briten-nannten-sie-german-traktor-19708409.html'
-#            test_article = 'https://www.faz.net/aktuell/stil/mode-design/von-richert-beil-bis-william-fan-wer-kauft-denn-das-19666592.html'
- #           test_article = 'https://www.faz.net/aktuell/feuilleton/buecher/rezensionen/sachbuch/tom-mustills-buch-die-sprache-der-wale-19657782.html'
+            # test_article = 'https://www.faz.net/aktuell/feuilleton/buecher/film-eruption-ein-thriller-aus-dem-nachlass-von-michael-crichton-19770491.html'
+            # test_article = 'https://www.faz.net/aktuell/stil/mode-design/leonie-benesch-sandra-hueller-ist-eine-meiner-heldinnen-19671638.html'
+            # test_article = 'https://www.faz.net/aktuell/feuilleton/medien/sabine-postel-zum-siebzigsten-die-briten-nannten-sie-german-traktor-19708409.html'
+            # test_article = 'https://www.faz.net/aktuell/stil/mode-design/von-richert-beil-bis-william-fan-wer-kauft-denn-das-19666592.html'
+            # test_article = 'https://www.faz.net/aktuell/feuilleton/buecher/rezensionen/sachbuch/tom-mustills-buch-die-sprache-der-wale-19657782.html'
             if test_article:
                 return [('Articles', [{'title': 'Test article', 'url': test_article}])]
             soup = self.index_to_soup(self.INDEX)
@@ -211,13 +208,13 @@ class FazNet(BasicNewsRecipe):
         if tag:
             story(soup,tag)
 
-        #Extract images and text from image galleries
+        # Extract images and text from image galleries
         for par in soup.findAll('p'):
             if len(par.contents) == 1:
                 cont = str(par.contents[0])
-                if re.search(r"^[1-9]\d* Bilder$",cont):
-#                    print(cont)
-                    for tag in soup.findAll('script',attrs={'id':"__NUXT_DATA__",'type':'application/json'}):
+                if re.search(r'^[1-9]\d* Bilder$',cont):
+                    # print(cont)
+                    for tag in soup.findAll('script',attrs={'id':'__NUXT_DATA__','type':'application/json'}):
                         bilderstrecke(soup,tag)
                         break
                     break
@@ -227,14 +224,14 @@ class FazNet(BasicNewsRecipe):
             tag.unwrap()
 
         # remove ":""
-        tag = soup.find(class_ ="header-label__content")
+        tag = soup.find(class_='header-label__content')
         if tag:
-            colon=tag.find(class_ ="sr-only")
+            colon=tag.find(class_='sr-only')
             if colon:
                 colon.extract()
 
         # Skip articles behind paywall
-        if soup.find(id = "faz-paywall"):
+        if soup.find(id='faz-paywall'):
             self.abort_article('Skipping paywalled article')
 
         # Remove F.A.Z. ad
@@ -242,11 +239,11 @@ class FazNet(BasicNewsRecipe):
             if tag.contents[0] and 'F.A.Z.-Newsletter' in tag.contents[0]:
                 tag.extract()
 
-#         format liveblog
+        # format liveblog
         if soup.find(attrs={'class':'tik4-live__container'}):
-                    format_tickaroo_liveblog(soup)
+            format_tickaroo_liveblog(soup)
 
-# remove sizes and calc attributes in images
+        # remove sizes and calc attributes in images
         for tag in soup.findAll('img'):
             if tag.has_attr('src'):
                 new_img = soup.new_tag('img')
@@ -262,7 +259,7 @@ class FazNet(BasicNewsRecipe):
 
     def postprocess_html(self, soup, first_fetch):
 
-        #Position point between figure caption and figure credit, where needed
+        # Position point between figure caption and figure credit, where needed
         for tag in soup.findAll(attrs={'class':['body-elements__image-figcaption','header-teaser__image-details']}):
             if tag.string is None:
                 if tag.contents[0].string:
@@ -271,5 +268,5 @@ class FazNet(BasicNewsRecipe):
                 text = str(tag.string)
                 text = text.strip()
                 if text != '' and text[-1] not in ['.','?','!',':']:
-                    tag.string.replace_with(text + ".")
+                    tag.string.replace_with(text + '.')
         return self.adeify_images(soup)
diff --git a/recipes/film_org_pl.recipe b/recipes/film_org_pl.recipe
index cc278a8517..e08abbd25c 100644
--- a/recipes/film_org_pl.recipe
+++ b/recipes/film_org_pl.recipe
@@ -5,7 +5,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class FilmOrgPl(BasicNewsRecipe):
     title = u'Film.org.pl'
     __author__ = 'fenuks'
-    description = u"Recenzje, analizy, artykuły, rankingi - wszystko o filmie dla miłośników kina. Opisy efektów specjalnych, wersji reżyserskich, remake'ów, sequeli. No i forum filmowe. Jedne z największych w Polsce."  # noqa
+    description = u"Recenzje, analizy, artykuły, rankingi - wszystko o filmie dla miłośników kina. Opisy efektów specjalnych, wersji reżyserskich, remake'ów, sequeli. No i forum filmowe. Jedne z największych w Polsce."  # noqa: E501
     category = 'film'
     language = 'pl'
     cover_url = 'http://film.org.pl/wp-content/uploads/2015/02/film.org.pl_film.org_.pl_kmfviolet4.png'
diff --git a/recipes/film_web.recipe b/recipes/film_web.recipe
index 77c57458be..da8eede0b3 100644
--- a/recipes/film_web.recipe
+++ b/recipes/film_web.recipe
@@ -23,7 +23,7 @@ class FilmWebPl(BasicNewsRecipe):
                       'ul.sep-line > li + li::before {content: " | "} '
                       'ul.inline {padding:0px;} .vertical-align {display: inline-block;}')
     preprocess_regexps = [(re.compile(r'<body.+?</head>', re.DOTALL), lambda match: ''),  # fix malformed HTML with 2 body tags...
-    (re.compile(u'(?:<sup>)?\\(kliknij\\,\\ aby powiększyć\\)(?:</sup>)?', re.IGNORECASE), lambda m: ''),
+    (re.compile(u'(?:<sup>)?\\(kliknij\\,\\ aby powiększyć\\)(?:</sup>)?', re.IGNORECASE), lambda m: ''),  # noqa: RUF039
     (re.compile(type(u'')(r'(<br ?/?>\s*?<br ?/?>\s*?)+'), re.IGNORECASE), lambda m: '<br />')
     ]
     remove_tags = [dict(attrs={'class':['infoParent', 'likeBar',
diff --git a/recipes/financial_times.recipe b/recipes/financial_times.recipe
index 337f6ea949..5df77f095d 100644
--- a/recipes/financial_times.recipe
+++ b/recipes/financial_times.recipe
@@ -13,7 +13,7 @@ from calibre.web.feeds.news import BasicNewsRecipe, classes
 class ft(BasicNewsRecipe):
     title = 'Financial Times'
     language = 'en'
-    __author__ = "Kovid Goyal"
+    __author__ = 'Kovid Goyal'
     description = 'The Financial Times is one of the world’s leading news organisations, recognised internationally for its authority, integrity and accuracy.'
     oldest_article = 1.15
     max_articles_per_feed = 50
diff --git a/recipes/financialsense.recipe b/recipes/financialsense.recipe
index fdf45c45b8..6bc1bc23aa 100644
--- a/recipes/financialsense.recipe
+++ b/recipes/financialsense.recipe
@@ -22,12 +22,12 @@ class FinancialSense(BasicNewsRecipe):
     remove_empty_feeds = True
     publication_type = 'newsportal'
     masthead_url = 'http://www.financialsense.com/sites/default/files/logo.jpg'
-    extra_css             = """
+    extra_css             = '''
                                body{font-family: Arial,"Helvetica Neue",Helvetica,sans-serif }
                                img{margin-bottom: 0.4em; display:block}
                                h2{color: gray}
                                .name{margin-right: 5em}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/financiarul.recipe b/recipes/financiarul.recipe
index 0f96e054b5..cd601b30b1 100644
--- a/recipes/financiarul.recipe
+++ b/recipes/financiarul.recipe
@@ -33,7 +33,7 @@ class Financiarul(BasicNewsRecipe):
     ]
 
     remove_tags = [
-        dict(name='div', attrs={'class': ['infoArticol']}), dict(name='ul', attrs={'class': 'navSectiuni'}), dict(name='div', attrs={'class': 'separator separatorTop'}), dict(name='div', attrs={'class': 'infoArticol infoArticolBottom'}), dict(name='ul', attrs={'class': ['related']}), dict(name='div', attrs={'class': ['slot panel300 panelGri300 panelGri300s panelGri300sm']})  # noqa
+        dict(name='div', attrs={'class': ['infoArticol']}), dict(name='ul', attrs={'class': 'navSectiuni'}), dict(name='div', attrs={'class': 'separator separatorTop'}), dict(name='div', attrs={'class': 'infoArticol infoArticolBottom'}), dict(name='ul', attrs={'class': ['related']}), dict(name='div', attrs={'class': ['slot panel300 panelGri300 panelGri300s panelGri300sm']})  # noqa: E501
     ]
 
     remove_tags_after = [
diff --git a/recipes/first_things.recipe b/recipes/first_things.recipe
index c044afa125..17d6a18eb2 100644
--- a/recipes/first_things.recipe
+++ b/recipes/first_things.recipe
@@ -16,7 +16,7 @@ class FirstThings(BasicNewsRecipe):
 
     title = 'First Things'
     __author__ = 'John Hutson'
-    description = 'America\'s Most Influential Journal of Religion and Public Life'
+    description = "America's Most Influential Journal of Religion and Public Life"
     INDEX = 'https://www.firstthings.com/current-edition'
     language = 'en'
     encoding = 'utf-8'
diff --git a/recipes/firstpost.recipe b/recipes/firstpost.recipe
index 75e62501a4..2d0c7e7d19 100644
--- a/recipes/firstpost.recipe
+++ b/recipes/firstpost.recipe
@@ -41,7 +41,7 @@ class firstpost(BasicNewsRecipe):
         # 'photos', 'entertainment', 'living', 'education', 'sports', 'firstcricket',
     ]
 
-    oldest_article = 1.2 # days
+    oldest_article = 1.2  # days
     for sec in sections:
         a = 'https://www.firstpost.com/rss/{}.xml'
         feeds.append((sec.capitalize(), a.format(sec)))
diff --git a/recipes/flickr.recipe b/recipes/flickr.recipe
index 63a1b9e66f..474648932e 100644
--- a/recipes/flickr.recipe
+++ b/recipes/flickr.recipe
@@ -31,13 +31,13 @@ class AdvancedUserRecipe1297031650(BasicNewsRecipe):
     remove_javascript = True
     language = 'en'
 
-    extra_css             = """
+    extra_css             = '''
                                p{text-align: justify; font-size: 100%}
                                body{ text-align: left; font-size:100% }
                                h2{font-family: sans-serif; font-size:130%; font-weight:bold; text-align: justify; }
                                .published{font-family:Arial,Helvetica,sans-serif; font-size:80%; }
                                .posted{font-family:Arial,Helvetica,sans-serif; font-size:80%; }
-                                 """
+                                 '''
 
     keep_only_tags = [
         dict(name='div', attrs={'class': 'entry'})
diff --git a/recipes/flickr_es.recipe b/recipes/flickr_es.recipe
index 377e7f154a..b6049c7b2a 100644
--- a/recipes/flickr_es.recipe
+++ b/recipes/flickr_es.recipe
@@ -31,13 +31,13 @@ class AdvancedUserRecipe1297031650(BasicNewsRecipe):
     remove_javascript = True
     language = 'es'
 
-    extra_css             = """
+    extra_css             = '''
                                p{text-align: justify; font-size: 100%}
                                body{ text-align: left; font-size:100% }
                                h2{font-family: sans-serif; font-size:130%; font-weight:bold; text-align: justify; }
                                .published{font-family:Arial,Helvetica,sans-serif; font-size:80%; }
                                .posted{font-family:Arial,Helvetica,sans-serif; font-size:80%; }
-                                 """
+                                 '''
 
     keep_only_tags = [
         dict(name='div', attrs={'class': 'entry'})
diff --git a/recipes/fluter_de.recipe b/recipes/fluter_de.recipe
index 508ae4de6f..525ce1706f 100644
--- a/recipes/fluter_de.recipe
+++ b/recipes/fluter_de.recipe
@@ -20,13 +20,13 @@ class AdvancedUserRecipe1313693926(BasicNewsRecipe):
     language = 'de'
     encoding = 'UTF-8'
 
-    __author__ = 'Armin Geller' # 2013-02-05 V3
+    __author__ = 'Armin Geller'  # 2013-02-05 V3
 
     oldest_article = 14
     max_articles_per_feed = 50
     auto_cleanup = False
 
-    feeds =  [
+    feeds = [
               (u'Inhalt:', u'https://www.fluter.de/rss.xml')
              ]
 
@@ -38,6 +38,6 @@ class AdvancedUserRecipe1313693926(BasicNewsRecipe):
                     dict(name='h2', attrs={'class':'element-invisible'})
                   ]
 
-    extra_css =  '''
+    extra_css = '''
                  .field-group-format, .group_additional_info, .additional-info {display: inline-block; min-width: 8rem; text-align: center}
                  '''
diff --git a/recipes/fokus.recipe b/recipes/fokus.recipe
index 20321d5efe..9559086188 100644
--- a/recipes/fokus.recipe
+++ b/recipes/fokus.recipe
@@ -74,7 +74,7 @@ class Fokus(BasicNewsRecipe):
         return br
 
     def get_web_sections(self, main_url: str) -> dict[str, str]:
-        """Return a dict of (1) section URL and (2) section name key-value pairs found at `main_url`.
+        '''Return a dict of (1) section URL and (2) section name key-value pairs found at `main_url`.
 
         For example, if the Fokus website currently includes an 'Aktuellt' section, the dict should include an entry on
         the form: `{'https://www.fokus.se/aktuellt': 'Aktuellt'}`.
@@ -84,7 +84,7 @@ class Fokus(BasicNewsRecipe):
 
         Yields:
             dict[str, str]: (1) URLs and (2) human-readable names of Fokus sections.
-        """
+        '''
         self.log(f"Identifying all sections under '{main_url}'...")
         soup = self.index_to_soup(main_url)
 
@@ -110,14 +110,14 @@ class Fokus(BasicNewsRecipe):
         return section_urls_and_names
 
     def parse_article_blurb(self, article_blurb) -> dict[str, str, str, str] | None:
-        """Given a <article> tag of class 'Blurb', parse it into a dict.
+        '''Given a <article> tag of class 'Blurb', parse it into a dict.
 
         Args:
             article_blurb (Tag): An <article> tag hosting metadata and the URL of an article.
 
         Returns:
             dict[str, str, str, str]: A dict on a `{'url': str, 'title': str, 'description': str, 'date': str}` format.
-        """
+        '''
         if a_tag := article_blurb.find('a', href=True):
             url = a_tag['href'].strip().rstrip('/')
             if url.startswith('/'):
@@ -147,7 +147,7 @@ class Fokus(BasicNewsRecipe):
         return
 
     def _get_article_blurbs(self, soup) -> dict[str, dict[str, str, str, str]]:
-        """Given a Fokus webpage `soup`, return a dict of unique article entries found on the page.
+        '''Given a Fokus webpage `soup`, return a dict of unique article entries found on the page.
 
         The key of a given entry in the output dictionary is the article URL. The corresponding value is a dictionary
         on a `{'url': str, 'title': str, 'description': str, 'date': str}` format.
@@ -157,10 +157,10 @@ class Fokus(BasicNewsRecipe):
 
         Returns:
             dict[str, dict[str, str, str, str]]: A dict with article URLs as keys and 'article dicts' as values.
-        """
+        '''
 
         def _log(article) -> None:
-            """Log a digestible summary of the input `article` blurb."""
+            '''Log a digestible summary of the input `article` blurb.'''
             log_message = f"\t{article['title']} : {article['date']} : {article['url']}"
             if article.get('description'):
                 log_message += f" : {article['description']}"
@@ -187,7 +187,7 @@ class Fokus(BasicNewsRecipe):
         return parsed_blurbs
 
     def get_article_blurbs(self, sections: dict[str, str]) -> dict[str, dict[str, str, str, str]]:
-        """Create and return a dict of all unique article blurbs found in all `sections`.
+        '''Create and return a dict of all unique article blurbs found in all `sections`.
 
         The key of a given entry in the output dictionary is the article URL. The corresponding value is a dictionary
         on a `{'url': str, 'title': str, 'description': str, 'date': str}` format.
@@ -197,7 +197,7 @@ class Fokus(BasicNewsRecipe):
 
         Returns:
             dict[str, dict[str, str, str, str]]: A dict with article URLs as keys and 'article dicts' as values.
-        """
+        '''
         self.log(f'Identifying all articles under all {len(sections)} sections...')
 
         article_blurbs = {}
@@ -224,7 +224,7 @@ class Fokus(BasicNewsRecipe):
         sections: dict[str, str],
         articles: dict[str, dict[str, str, str, str]],
     ) -> dict[str, list[dict[str, str, str, str]]]:
-        """Assign each article in `articles` to a section in `sections`.
+        '''Assign each article in `articles` to a section in `sections`.
 
         Args:
             sections (dict[str, str]): A dict of section URLs as keys and section titles as values.
@@ -232,7 +232,7 @@ class Fokus(BasicNewsRecipe):
 
         Returns:
             dict[str, list[dict[str, str, str, str]]]: A dict on a `{section_title: list[article_dict]}` format.
-        """
+        '''
         self.log(f'Assigning each of the {len(articles)} articles to either of the {len(sections)} sections...')
         section_to_articles = {}
         for article_url, article_dict in articles.items():
@@ -276,7 +276,7 @@ class Fokus(BasicNewsRecipe):
         section_to_articles = self.assign_articles_to_sections(sections, articles)
 
         # Convert to the expected `list[tuple[str, dict[str, str, str, str]]]` format.
-        feeds = [(section_url, article_dicts) for section_url, article_dicts in section_to_articles.items()]
+        feeds = list(section_to_articles.items())
         num_articles = sum(len(article_dicts) for article_dicts in section_to_articles.values())
         self.log(f'A total of {num_articles} articles belonging to {len(section_to_articles)} sections were kept.')
 
diff --git a/recipes/folha.recipe b/recipes/folha.recipe
index 3bc31aee0e..91a9371c28 100644
--- a/recipes/folha.recipe
+++ b/recipes/folha.recipe
@@ -28,10 +28,10 @@ class Folha_de_s_paulo(BasicNewsRecipe):
     remove_empty_feeds = True
     publication_type = 'newspaper'
     masthead_url = 'http://f.i.uol.com.br/fsp/furniture/images/lgo-fsp-430x50-ffffff.gif'
-    extra_css             = """
+    extra_css             = '''
                                body{font-family: Arial,Helvetica,sans-serif }
                                img{margin-bottom: 0.4em; display:block}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/folhadesaopaulo_sub.recipe b/recipes/folhadesaopaulo_sub.recipe
index 0b1d263cca..35a61458f0 100644
--- a/recipes/folhadesaopaulo_sub.recipe
+++ b/recipes/folhadesaopaulo_sub.recipe
@@ -11,8 +11,8 @@ class FSP(BasicNewsRecipe):
 
     title = u'Folha de S\xE3o Paulo'
     __author__ = 'Joao Eduardo Bertacchi - lc_addicted, 2020 Leonardo Amaral - leleobhz'
-    description = u'Printed edition contents. Folha subscription required (UOL subscription currently not supported).' + \
-                  u' [Conte\xfado completo da edi\xe7\xe3o impressa. Somente para assinantes Folha. N\xE3o suporta assinantes UOL]'
+    description = (u'Printed edition contents. Folha subscription required (UOL subscription currently not supported).'
+                   u' [Conte\xfado completo da edi\xe7\xe3o impressa. Somente para assinantes Folha. N\xE3o suporta assinantes UOL]')
 
     today = datetime.date.today()
 
@@ -49,7 +49,7 @@ class FSP(BasicNewsRecipe):
     # this solves the problem with truncated content in Kindle
     conversion_options = {'linearize_tables': True}
 
-    extra_css = """
+    extra_css = '''
 #articleNew { font: 18px Times New Roman,verdana,arial; }
 img { background: none !important; float: none; margin: 0px; }
 .newstexts { list-style-type: none; height: 20px; margin: 15px 0 10px 0; }
@@ -82,14 +82,14 @@ img { background: none !important; float: none; margin: 0px; }
 .divisor { text-indent: -9999px; border-bottom: 1px solid #ccc; height: 1px; margin: 0; }
 .star { background: none !important; height: 15px; }
 .articleGraphic { margin-bottom: 20px; }
-"""
+'''
 
     # This is the code for login, here a mini browser is called and id entered
     def get_browser(self):
         br = BasicNewsRecipe.get_browser(self)
         if self.username is not None and self.password is not None:
             br.open('https://login.folha.com.br/login')
-            br.select_form(action="https://login.folha.com.br/login")
+            br.select_form(action='https://login.folha.com.br/login')
             br['email'] = self.username
             br['password'] = self.password
             br.submit()
@@ -109,7 +109,7 @@ img { background: none !important; float: none; margin: 0px; }
 
         for post in soup.findAll('a'):
             strpost = str(post)
-            if re.match('<a href="https://www1.folha.uol.com.br/.*/"><svg aria-hidden="true" class="icon icon--star"', strpost):
+            if re.match(r'<a href="https://www1.folha.uol.com.br/.*/"><svg aria-hidden="true" class="icon icon--star"', strpost):
                 if articles:
                     feeds.append((section_title, articles))
                     self.log()
@@ -125,7 +125,7 @@ img { background: none !important; float: none; margin: 0px; }
                 break
             elif strpost.startswith('<a href'):
                 url = post['href']
-                if url.startswith('http://www1.folha.uol.com.br/') or url.startswith('https://www1.folha.uol.com.br/') :
+                if url.startswith(('http://www1.folha.uol.com.br/', 'https://www1.folha.uol.com.br/')):
                     title = self.tag_to_string(post)
                     self.log()
                     self.log('--> post:  ', post)
diff --git a/recipes/fontanka.recipe b/recipes/fontanka.recipe
index 99d210cd62..46a9b632a0 100644
--- a/recipes/fontanka.recipe
+++ b/recipes/fontanka.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Fontanka(BasicNewsRecipe):
     title = '\u0424\u043E\u043D\u0442\u0430\u043D\u043A\u0430'
     __author__ = 'bugmen00t'
-    description = '\u0415\u0436\u0435\u0434\u043D\u0435\u0432\u043D\u043E\u0435 \u043F\u0435\u0442\u0435\u0440\u0431\u0443\u0440\u0433\u0441\u043A\u043E\u0435 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E-\u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u0441\u0435\u0442\u0435\u0432\u043E\u0435 \u0438\u0437\u0434\u0430\u043D\u0438\u0435.'  # noqa
+    description = '\u0415\u0436\u0435\u0434\u043D\u0435\u0432\u043D\u043E\u0435 \u043F\u0435\u0442\u0435\u0440\u0431\u0443\u0440\u0433\u0441\u043A\u043E\u0435 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E-\u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u0441\u0435\u0442\u0435\u0432\u043E\u0435 \u0438\u0437\u0434\u0430\u043D\u0438\u0435.'  # noqa: E501
     publisher = '\u0410\u041E "\u0410\u0416\u0423\u0420-\u041C\u0415\u0414\u0418\u0410"'
     category = 'blog'
     cover_url = u'https://www.fontanka.ru/longreads/69505589/2015/images/tild3834-3362-4166-b239-366134363733____-01.png'
diff --git a/recipes/football_fancast.recipe b/recipes/football_fancast.recipe
index 8644b45253..88644578ce 100644
--- a/recipes/football_fancast.recipe
+++ b/recipes/football_fancast.recipe
@@ -20,13 +20,13 @@ class AdvancedUserRecipe1718373345(BasicNewsRecipe):
     auto_cleanup   = True
 
     feeds          = [
-        #EURO 2024
+        # EURO 2024
         ('EURO 2024', 'https://www.footballfancast.com/feed/tag/euro-2024/'),
         ('EURO England', 'https://www.footballfancast.com/feed/tag/england/'),
         ('EURO Scotland', 'https://www.footballfancast.com/feed/tag/scotland/'),
         ('EURO Groups', 'https://www.footballfancast.com/feed/tag/euro-2024-groups/'),
         ('History of the EUROs', 'https://www.footballfancast.com/feed/tag/history-of-the-euros/'),
-        #Transfer Rumours
+        # Transfer Rumours
         ('Transfer Focus', 'https://www.footballfancast.com/feed/tag/transfer-focus/'),
         ('Saudi Pro League', 'https://www.footballfancast.com/feed/tag/saudi-pro-league/'),
         ('Marcus Rashford', 'https://www.footballfancast.com/feed/tag/marcus-rashford/'),
@@ -34,7 +34,7 @@ class AdvancedUserRecipe1718373345(BasicNewsRecipe):
         ('Michael Olise', 'https://www.footballfancast.com/feed/tag/michael-olise/'),
         ('Bruno Guimarães', 'https://www.footballfancast.com/feed/tag/bruno-guimaraes/'),
         ('Fabrizio Romano', 'https://www.footballfancast.com/feed/tag/fabrizio-romano/'),
-        #Premier League
+        # Premier League
         ('Premier League', 'https://www.footballfancast.com/feed/tag/premier-league/'),
         ('Arsenal', 'https://www.footballfancast.com/feed/tag/arsenal/'),
         ('Aston Villa', 'https://www.footballfancast.com/feed/tag/aston-villa/'),
@@ -45,19 +45,19 @@ class AdvancedUserRecipe1718373345(BasicNewsRecipe):
         ('Manchester United', 'https://www.footballfancast.com/feed/tag/manchester-united/'),
         ('Tottenham Hotspur', 'https://www.footballfancast.com/feed/tag/tottenham-hotspur/'),
         ('West Ham United', 'https://www.footballfancast.com/feed/tag/west-ham-united/'),
-        #European Leagues
+        # European Leagues
         ('La Liga', 'https://www.footballfancast.com/feed/la-liga/'),
         ('Bundesliga', 'https://www.footballfancast.com/feed/bundesliga/'),
         ('Ligue 1', 'https://www.footballfancast.com/feed/ligue-1/'),
         ('Serie A', 'https://www.footballfancast.com/feed/serie-a/'),
-        #Champions League
+        # Champions League
         ('Champions League', 'https://www.footballfancast.com/feed/champions-league/'),
         ('Real Madrid', 'https://www.footballfancast.com/feed/tag/real-madrid/'),
         ('Barcelona', 'https://www.footballfancast.com/feed/tag/barcelona/'),
         ('Bayern Munich', 'https://www.footballfancast.com/feed/tag/bayern-munich/'),
         ('Paris Saint-Germain', 'https://www.footballfancast.com/feed/tag/psg/'),
         ('Europa League', 'https://www.footballfancast.com/feed/europa-league/'),
-        #Europa League
+        # Europa League
         ('ROMA', 'https://www.footballfancast.com/feed/tag/roma/'),
         ('Villarreal', 'https://www.footballfancast.com/feed/tag/villarreal/'),
 
diff --git a/recipes/football_league_world.recipe b/recipes/football_league_world.recipe
index 200ecc3635..b7e7d336b1 100644
--- a/recipes/football_league_world.recipe
+++ b/recipes/football_league_world.recipe
@@ -21,12 +21,12 @@ class AdvancedUserRecipe1718380039(BasicNewsRecipe):
     auto_cleanup   = True
 
     feeds          = [
-        #Transfer Rumours
+        # Transfer Rumours
         ('Transfer Rumours', 'https://footballleagueworld.co.uk/feed/transfer-rumours/'),
         ('Alex Scott', 'https://footballleagueworld.co.uk/feed/tag/alex-scott/'),
         ('James Ward-Prowse', 'https://footballleagueworld.co.uk/feed/tag/james-ward-prowse/'),
         ('Wilfried Gnonto', 'https://footballleagueworld.co.uk/feed/wilfried-gnonto/'),
-        #Championship
+        # Championship
         ('Championship', 'https://footballleagueworld.co.uk/feed/championship/'),
         ('Leeds United', 'https://footballleagueworld.co.uk/feed/tag/leeds-united/'),
         ('Leicester City', 'https://footballleagueworld.co.uk/feed/tag/leicester-city/'),
@@ -36,14 +36,14 @@ class AdvancedUserRecipe1718380039(BasicNewsRecipe):
         ('Southampton', 'https://footballleagueworld.co.uk/feed/tag/southampton/'),
         ('Sunderland', 'https://footballleagueworld.co.uk/feed/tag/sunderland/'),
         ('West Bromwich Albion', 'https://footballleagueworld.co.uk/feed/tag/west-bromwich-albion/'),
-        #League One
+        # League One
         ('Barnsley', 'https://footballleagueworld.co.uk/feed/tag/barnsley/'),
         ('Bolton Wanderers', 'https://footballleagueworld.co.uk/feed/tag/bolton-wanderers/'),
         ('Charlton Athletic', 'https://footballleagueworld.co.uk/feed/tag/charlton-athletic/'),
         ('Derby County', 'https://footballleagueworld.co.uk/feed/tag/derby-county/'),
         ('Portsmouth', 'https://footballleagueworld.co.uk/feed/tag/portsmouth/'),
         ('Reading', 'https://footballleagueworld.co.uk/feed/tag/reading/'),
-        #League Two
+        # League Two
         ('Bradford City', 'https://footballleagueworld.co.uk/feed/tag/bradford-city/'),
         ('Gillingham', 'https://footballleagueworld.co.uk/feed/tag/gillingham/'),
         ('Notts County', 'https://footballleagueworld.co.uk/feed/tag/notts-county/'),
diff --git a/recipes/footballua.recipe b/recipes/footballua.recipe
index fbcb7ba362..649bc88cca 100644
--- a/recipes/footballua.recipe
+++ b/recipes/footballua.recipe
@@ -25,7 +25,7 @@ class FootballUA(BasicNewsRecipe):
 
     remove_tags_after = dict(name='article')
 
-    remove_tags =   [
+    remove_tags = [
          dict(name='div', attrs={'class': 'bottom-info'}),
          dict(name='div', attrs={'class': 'social-buttons'})
         ]
diff --git a/recipes/foreign_policy.recipe b/recipes/foreign_policy.recipe
index 89d8fc5b2d..2caea2e354 100644
--- a/recipes/foreign_policy.recipe
+++ b/recipes/foreign_policy.recipe
@@ -85,8 +85,8 @@ class ForeignPolicy(BasicNewsRecipe):
                 if dek:
                     desc += ' | ' + self.tag_to_string(dek)
                 self.log('\t', title, url, '\n\t', desc)
-                feeds_dict[current_section].append({"title": title, "url": url, "description": desc})
-        return [(section, articles) for section, articles in feeds_dict.items()]
+                feeds_dict[current_section].append({'title': title, 'url': url, 'description': desc})
+        return list(feeds_dict.items())
 
     def preprocess_html(self, soup):
         for img in soup.findAll('img', attrs={'src':True}):
diff --git a/recipes/foreignaffairs.recipe b/recipes/foreignaffairs.recipe
index 4ca3d684f5..71a319d52a 100644
--- a/recipes/foreignaffairs.recipe
+++ b/recipes/foreignaffairs.recipe
@@ -37,20 +37,20 @@ def get_issue_data(br, log, node_id='1126213', year='2020', volnum='99', issue_v
         return {
             'from': 0,
             'post_filter': {'bool': q},
-            "_source": {
-                "includes": [
-                    "nid", 'path', 'title', 'field_subtitle', 'field_display_authors',
+            '_source': {
+                'includes': [
+                    'nid', 'path', 'title', 'field_subtitle', 'field_display_authors',
                     'fa_node_type_or_subtype',
 
                     'field_issue_sspecial_articles__nid',
                     'field_issue_sspecial_header'
                 ]
             },
-            "query": {
-                "match_all": {}
+            'query': {
+                'match_all': {}
             },
-            'sort': [{'field_sequence': "asc"}, {'fa_normalized_date': "desc"}],
-            "size": size,
+            'sort': [{'field_sequence': 'asc'}, {'fa_normalized_date': 'desc'}],
+            'size': size,
         }
 
     def get_data(data):
@@ -171,9 +171,9 @@ class ForeignAffairsRecipe(BasicNewsRecipe):
         cov = main.find('img', attrs={'srcset': lambda x: x and 'Cover.jpg' in x})
         if cov:
             self.cover_url = re.sub(
-                r"_webp_issue_small_\dx",
-                "_webp_issue_large_2x",
-                cov["srcset"].split()[0]
+                r'_webp_issue_small_\dx',
+                '_webp_issue_large_2x',
+                cov['srcset'].split()[0]
             )
 
         cls = soup.find('link', attrs={'rel':'shortlink'})['href']
@@ -188,7 +188,7 @@ class ForeignAffairsRecipe(BasicNewsRecipe):
         for by in soup.findAll(**classes('topper__byline topper__date font-style-italic')):
             by.name = 'div'
         for img in soup.find_all('img', attrs={'srcset': True}):
-            img['src'] = re.sub(r"_webp_small_\dx", "_webp_large_1x",img['srcset'].split()[0])
+            img['src'] = re.sub(r'_webp_small_\dx', '_webp_large_1x', img['srcset'].split()[0])
         return soup
 
     def get_browser(self):
diff --git a/recipes/fortune_magazine.recipe b/recipes/fortune_magazine.recipe
index ae1657ae17..580934b2d8 100644
--- a/recipes/fortune_magazine.recipe
+++ b/recipes/fortune_magazine.recipe
@@ -25,7 +25,7 @@ class Fortune(BasicNewsRecipe):
     title = 'Fortune Magazine'
     __author__ = 'Rick Shang'
 
-    description = 'FORTUNE is a global business magazine that has been revered in its content and credibility since 1930. FORTUNE covers the entire field of business, including specific companies and business trends, prominent business leaders, and new ideas shaping the global marketplace.'  # noqa
+    description = 'FORTUNE is a global business magazine that has been revered in its content and credibility since 1930. FORTUNE covers the entire field of business, including specific companies and business trends, prominent business leaders, and new ideas shaping the global marketplace.'  # noqa: E501
     language = 'en'
     category = 'news'
     encoding = 'UTF-8'
diff --git a/recipes/foxnews.recipe b/recipes/foxnews.recipe
index 402b2ea894..4949049fd2 100644
--- a/recipes/foxnews.recipe
+++ b/recipes/foxnews.recipe
@@ -25,11 +25,11 @@ class FoxNews(BasicNewsRecipe):
 
     language = 'en_US'
     remove_empty_feeds = True
-    extra_css = """
+    extra_css = '''
         body{font-family: Arial,sans-serif }
         .caption{font-size: x-small}
         .author,.dateline{font-size: small}
-    """
+    '''
 
     recipe_specific_options = {
         'days': {
diff --git a/recipes/free_inquiry.recipe b/recipes/free_inquiry.recipe
index ced2c2f160..071b071a4b 100644
--- a/recipes/free_inquiry.recipe
+++ b/recipes/free_inquiry.recipe
@@ -25,14 +25,14 @@ class FreeInquiry(BasicNewsRecipe):
     ignore_duplicate_articles = {'url'}
     remove_empty_feeds = True
     needs_subscription = True
-    extra_css             = """
+    extra_css             = '''
                             .entry-header{
                                           text-transform: uppercase;
                                           vertical-align: baseline;
                                           display: inline;
                                          }
                             ul li{display: inline}
-                            """
+                            '''
 
     remove_tags = [
         classes(
@@ -76,7 +76,7 @@ class FreeInquiry(BasicNewsRecipe):
                                 url = ''
                             seen.add(url)
                             self.log('Found article:', art_title)
-                            yield{
+                            yield {
                                 'title': art_title,
                                 'url': url,
                                 'description': desc
diff --git a/recipes/frontline.recipe b/recipes/frontline.recipe
index f1a4d8af36..b03d8b1470 100644
--- a/recipes/frontline.recipe
+++ b/recipes/frontline.recipe
@@ -95,5 +95,5 @@ class Frontline(BasicNewsRecipe):
             if not url or not title:
                 continue
             self.log(section, '\n\t', title, '\n\t', desc, '\n\t\t', url)
-            feeds_dict[section].append({"title": title, "url": url, "description": desc})
-        return [(section, articles) for section, articles in feeds_dict.items()]
+            feeds_dict[section].append({'title': title, 'url': url, 'description': desc})
+        return list(feeds_dict.items())
diff --git a/recipes/gagadget_de.recipe b/recipes/gagadget_de.recipe
index 0314658e63..3c19ccf8e5 100644
--- a/recipes/gagadget_de.recipe
+++ b/recipes/gagadget_de.recipe
@@ -6,21 +6,21 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Gagadget(BasicNewsRecipe):
     title = u'Gagadget'
-    description = u'Gagadget.com is Ukrainian no-nonsense tech site. We only write about what is interesting to us, and we do this in the most vivid and ironic way.'  # noqa
+    description = u'Gagadget.com is Ukrainian no-nonsense tech site. We only write about what is interesting to us, and we do this in the most vivid and ironic way.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = 'Gagadget'
     publication_type = 'news'
     oldest_article = 7
     max_articles_per_feed = 100
-#    language = 'ru_UK'
-#    language = 'uk'
-#    language = 'en_UK'
+    # language = 'ru_UK'
+    # language = 'uk'
+    # language = 'en_UK'
     language = 'de'
-#    language = 'nb'
-#    language = 'nl'
-#    language = 'es'
-#    language = 'it'
-#    language = 'fr'
+    # language = 'nb'
+    # language = 'nl'
+    # language = 'es'
+    # language = 'it'
+    # language = 'fr'
     cover_url = 'https://gagadget.com/static/img/gagadget.jpg'
     auto_cleanup = False
     no_stylesheets = False
@@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
-# Ukrainian version only
-#
-#    remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
-#    remove_tags =   [
-#        dict(name='div', attrs={'class': 'footer-content'}),
-#        ]
+
+    # Ukrainian version only
+    # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
+
+    # remove_tags = [
+    #     dict(name='div', attrs={'class': 'footer-content'}),
+    # ]
 
     feeds = [
-#
-# Russian
-#
-#       ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
-#       ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
-#       ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
-#       ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
-# Ukrainian
-#
-#       ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
-#       ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
-#       ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
-# English
-#
-#       ('Gagadget', 'https://gagadget.com/en/rss/'),
-#       ('News', 'https://gagadget.com/en/rss/news/'),
-#
-# German
-#
-       ('Gagadget', 'https://gagadget.com/de/rss/'),
-       ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
-       ('Tests', 'https://gagadget.com/de/rss/reviews/'),
-       ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
-# Norwegian
-#
-#       ('Gagadget', 'https://gagadget.com/nb/rss/'),
-#       ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
-#       ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
-#       ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
-# Dutch
-#
-#       ('Gagadget', 'https://gagadget.com/nl/rss/'),
-#       ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
-#       ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
-#       ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
-# Spanish
-#
-#       ('Gagadget', 'https://gagadget.com/es/rss/'),
-#       ('Noticias', 'https://gagadget.com/es/rss/news/'),
-#       ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
-#       ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
-# Italian
-#
-#       ('Gagadget', 'https://gagadget.com/it/rss/'),
-#       ('Notizia', 'https://gagadget.com/it/rss/news/'),
-#       ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
-#       ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
-# French
-#
-#       ('Gagadget', 'https://gagadget.com/fr/rss/'),
-#       ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
-#       ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
-#       ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
-     ]
+        # Russian
+        # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
+        # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
+        # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
+
+        # Ukrainian
+        # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
+        # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
+        # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
+
+        # English
+        # ('Gagadget', 'https://gagadget.com/en/rss/'),
+        # ('News', 'https://gagadget.com/en/rss/news/'),
+
+        # German
+        ('Gagadget', 'https://gagadget.com/de/rss/'),
+        ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
+        ('Tests', 'https://gagadget.com/de/rss/reviews/'),
+        ('Artikel', 'https://gagadget.com/de/rss/articles/'),
+
+        # Norwegian
+        # ('Gagadget', 'https://gagadget.com/nb/rss/'),
+        # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
+        # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
+        # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
+
+        # Dutch
+        # ('Gagadget', 'https://gagadget.com/nl/rss/'),
+        # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
+        # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
+        # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
+
+        # Spanish
+        # ('Gagadget', 'https://gagadget.com/es/rss/'),
+        # ('Noticias', 'https://gagadget.com/es/rss/news/'),
+        # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
+        # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
+
+        # Italian
+        # ('Gagadget', 'https://gagadget.com/it/rss/'),
+        # ('Notizia', 'https://gagadget.com/it/rss/news/'),
+        # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
+        # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
+
+        # French
+        # ('Gagadget', 'https://gagadget.com/fr/rss/'),
+        # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
+        # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
+        # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
+    ]
diff --git a/recipes/gagadget_en.recipe b/recipes/gagadget_en.recipe
index 4c114b6ccd..5d29a797bc 100644
--- a/recipes/gagadget_en.recipe
+++ b/recipes/gagadget_en.recipe
@@ -6,21 +6,21 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Gagadget(BasicNewsRecipe):
     title = u'Gagadget'
-    description = u'Gagadget.com is Ukrainian no-nonsense tech site. We only write about what is interesting to us, and we do this in the most vivid and ironic way.'  # noqa
+    description = u'Gagadget.com is Ukrainian no-nonsense tech site. We only write about what is interesting to us, and we do this in the most vivid and ironic way.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = 'Gagadget'
     publication_type = 'news'
     oldest_article = 7
     max_articles_per_feed = 100
-#    language = 'ru_UK'
-#    language = 'uk'
+    # language = 'ru_UK'
+    # language = 'uk'
     language = 'en_UK'
-#    language = 'de'
-#    language = 'nb'
-#    language = 'nl'
-#    language = 'es'
-#    language = 'it'
-#    language = 'fr'
+    # language = 'de'
+    # language = 'nb'
+    # language = 'nl'
+    # language = 'es'
+    # language = 'it'
+    # language = 'fr'
     cover_url = 'https://gagadget.com/static/img/gagadget.jpg'
     auto_cleanup = False
     no_stylesheets = False
@@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
-# Ukrainian version only
-#
-#    remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
-#    remove_tags =   [
-#        dict(name='div', attrs={'class': 'footer-content'}),
-#        ]
+
+    # Ukrainian version only
+    # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
+
+    # remove_tags = [
+    #     dict(name='div', attrs={'class': 'footer-content'}),
+    # ]
 
     feeds = [
-#
-# Russian
-#
-#       ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
-#       ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
-#       ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
-#       ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
-# Ukrainian
-#
-#       ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
-#       ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
-#       ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
-# English
-#
-       ('Gagadget', 'https://gagadget.com/en/rss/'),
-       ('News', 'https://gagadget.com/en/rss/news/'),
-#
-# German
-#
-#       ('Gagadget', 'https://gagadget.com/de/rss/'),
-#       ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
-#       ('Tests', 'https://gagadget.com/de/rss/reviews/'),
-#       ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
-# Norwegian
-#
-#       ('Gagadget', 'https://gagadget.com/nb/rss/'),
-#       ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
-#       ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
-#       ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
-# Dutch
-#
-#       ('Gagadget', 'https://gagadget.com/nl/rss/'),
-#       ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
-#       ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
-#       ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
-# Spanish
-#
-#       ('Gagadget', 'https://gagadget.com/es/rss/'),
-#       ('Noticias', 'https://gagadget.com/es/rss/news/'),
-#       ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
-#       ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
-# Italian
-#
-#       ('Gagadget', 'https://gagadget.com/it/rss/'),
-#       ('Notizia', 'https://gagadget.com/it/rss/news/'),
-#       ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
-#       ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
-# French
-#
-#       ('Gagadget', 'https://gagadget.com/fr/rss/'),
-#       ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
-#       ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
-#       ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
-     ]
+        # Russian
+        # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
+        # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
+        # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
+
+        # Ukrainian
+        # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
+        # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
+        # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
+
+        # English
+        ('Gagadget', 'https://gagadget.com/en/rss/'),
+        ('News', 'https://gagadget.com/en/rss/news/'),
+
+        # German
+        # ('Gagadget', 'https://gagadget.com/de/rss/'),
+        # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
+        # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
+        # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
+
+        # Norwegian
+        # ('Gagadget', 'https://gagadget.com/nb/rss/'),
+        # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
+        # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
+        # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
+
+        # Dutch
+        # ('Gagadget', 'https://gagadget.com/nl/rss/'),
+        # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
+        # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
+        # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
+
+        # Spanish
+        # ('Gagadget', 'https://gagadget.com/es/rss/'),
+        # ('Noticias', 'https://gagadget.com/es/rss/news/'),
+        # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
+        # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
+
+        # Italian
+        # ('Gagadget', 'https://gagadget.com/it/rss/'),
+        # ('Notizia', 'https://gagadget.com/it/rss/news/'),
+        # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
+        # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
+
+        # French
+        # ('Gagadget', 'https://gagadget.com/fr/rss/'),
+        # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
+        # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
+        # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
+    ]
diff --git a/recipes/gagadget_es.recipe b/recipes/gagadget_es.recipe
index fa9cd4ce80..e50af1e27d 100644
--- a/recipes/gagadget_es.recipe
+++ b/recipes/gagadget_es.recipe
@@ -6,21 +6,21 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Gagadget(BasicNewsRecipe):
     title = u'Gagadget'
-    description = u'Gagadget.com is Ukrainian no-nonsense tech site. We only write about what is interesting to us, and we do this in the most vivid and ironic way.'  # noqa
+    description = u'Gagadget.com is Ukrainian no-nonsense tech site. We only write about what is interesting to us, and we do this in the most vivid and ironic way.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = 'Gagadget'
     publication_type = 'news'
     oldest_article = 7
     max_articles_per_feed = 100
-#    language = 'ru_UK'
-#    language = 'uk'
-#    language = 'en_UK'
-#    language = 'de'
-#    language = 'nb'
-#    language = 'nl'
+    # language = 'ru_UK'
+    # language = 'uk'
+    # language = 'en_UK'
+    # language = 'de'
+    # language = 'nb'
+    # language = 'nl'
     language = 'es'
-#    language = 'it'
-#    language = 'fr'
+    # language = 'it'
+    # language = 'fr'
     cover_url = 'https://gagadget.com/static/img/gagadget.jpg'
     auto_cleanup = False
     no_stylesheets = False
@@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
-# Ukrainian version only
-#
-#    remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
-#    remove_tags =   [
-#        dict(name='div', attrs={'class': 'footer-content'}),
-#        ]
+
+    # Ukrainian version only
+    # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
+
+    # remove_tags = [
+    #     dict(name='div', attrs={'class': 'footer-content'}),
+    # ]
 
     feeds = [
-#
-# Russian
-#
-#       ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
-#       ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
-#       ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
-#       ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
-# Ukrainian
-#
-#       ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
-#       ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
-#       ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
-# English
-#
-#       ('Gagadget', 'https://gagadget.com/en/rss/'),
-#       ('News', 'https://gagadget.com/en/rss/news/'),
-#
-# German
-#
-#       ('Gagadget', 'https://gagadget.com/de/rss/'),
-#       ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
-#       ('Tests', 'https://gagadget.com/de/rss/reviews/'),
-#       ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
-# Norwegian
-#
-#       ('Gagadget', 'https://gagadget.com/nb/rss/'),
-#       ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
-#       ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
-#       ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
-# Dutch
-#
-#       ('Gagadget', 'https://gagadget.com/nl/rss/'),
-#       ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
-#       ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
-#       ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
-# Spanish
-#
-       ('Gagadget', 'https://gagadget.com/es/rss/'),
-       ('Noticias', 'https://gagadget.com/es/rss/news/'),
-       ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
-       ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
-# Italian
-#
-#       ('Gagadget', 'https://gagadget.com/it/rss/'),
-#       ('Notizia', 'https://gagadget.com/it/rss/news/'),
-#       ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
-#       ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
-# French
-#
-#       ('Gagadget', 'https://gagadget.com/fr/rss/'),
-#       ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
-#       ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
-#       ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
-     ]
+        # Russian
+        # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
+        # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
+        # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
+
+        # Ukrainian
+        # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
+        # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
+        # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
+
+        # English
+        # ('Gagadget', 'https://gagadget.com/en/rss/'),
+        # ('News', 'https://gagadget.com/en/rss/news/'),
+
+        # German
+        # ('Gagadget', 'https://gagadget.com/de/rss/'),
+        # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
+        # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
+        # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
+
+        # Norwegian
+        # ('Gagadget', 'https://gagadget.com/nb/rss/'),
+        # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
+        # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
+        # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
+
+        # Dutch
+        # ('Gagadget', 'https://gagadget.com/nl/rss/'),
+        # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
+        # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
+        # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
+
+        # Spanish
+        ('Gagadget', 'https://gagadget.com/es/rss/'),
+        ('Noticias', 'https://gagadget.com/es/rss/news/'),
+        ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
+        ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
+
+        # Italian
+        # ('Gagadget', 'https://gagadget.com/it/rss/'),
+        # ('Notizia', 'https://gagadget.com/it/rss/news/'),
+        # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
+        # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
+
+        # French
+        # ('Gagadget', 'https://gagadget.com/fr/rss/'),
+        # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
+        # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
+        # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
+    ]
diff --git a/recipes/gagadget_fr.recipe b/recipes/gagadget_fr.recipe
index 4b103feab5..e82efc797e 100644
--- a/recipes/gagadget_fr.recipe
+++ b/recipes/gagadget_fr.recipe
@@ -6,20 +6,20 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Gagadget(BasicNewsRecipe):
     title = u'Gagadget'
-    description = u'Gagadget.com is Ukrainian no-nonsense tech site. We only write about what is interesting to us, and we do this in the most vivid and ironic way.'  # noqa
+    description = u'Gagadget.com is Ukrainian no-nonsense tech site. We only write about what is interesting to us, and we do this in the most vivid and ironic way.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = 'Gagadget'
     publication_type = 'news'
     oldest_article = 7
     max_articles_per_feed = 100
-#    language = 'ru_UK'
-#    language = 'uk'
-#    language = 'en_UK'
-#    language = 'de'
-#    language = 'nb'
-#    language = 'nl'
-#    language = 'es'
-#    language = 'it'
+    # language = 'ru_UK'
+    # language = 'uk'
+    # language = 'en_UK'
+    # language = 'de'
+    # language = 'nb'
+    # language = 'nl'
+    # language = 'es'
+    # language = 'it'
     language = 'fr'
     cover_url = 'https://gagadget.com/static/img/gagadget.jpg'
     auto_cleanup = False
@@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
-# Ukrainian version only
-#
-#    remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
-#    remove_tags =   [
-#        dict(name='div', attrs={'class': 'footer-content'}),
-#        ]
+
+    # Ukrainian version only
+    # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
+
+    # remove_tags = [
+    #     dict(name='div', attrs={'class': 'footer-content'}),
+    # ]
 
     feeds = [
-#
-# Russian
-#
-#       ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
-#       ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
-#       ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
-#       ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
-# Ukrainian
-#
-#       ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
-#       ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
-#       ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
-# English
-#
-#       ('Gagadget', 'https://gagadget.com/en/rss/'),
-#       ('News', 'https://gagadget.com/en/rss/news/'),
-#
-# German
-#
-#       ('Gagadget', 'https://gagadget.com/de/rss/'),
-#       ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
-#       ('Tests', 'https://gagadget.com/de/rss/reviews/'),
-#       ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
-# Norwegian
-#
-#       ('Gagadget', 'https://gagadget.com/nb/rss/'),
-#       ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
-#       ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
-#       ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
-# Dutch
-#
-#       ('Gagadget', 'https://gagadget.com/nl/rss/'),
-#       ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
-#       ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
-#       ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
-# Spanish
-#
-#       ('Gagadget', 'https://gagadget.com/es/rss/'),
-#       ('Noticias', 'https://gagadget.com/es/rss/news/'),
-#       ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
-#       ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
-# Italian
-#
-#       ('Gagadget', 'https://gagadget.com/it/rss/'),
-#       ('Notizia', 'https://gagadget.com/it/rss/news/'),
-#       ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
-#       ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
-# French
-#
-       ('Gagadget', 'https://gagadget.com/fr/rss/'),
-       ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
-       ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
-       ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
-     ]
+        # Russian
+        # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
+        # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
+        # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
+
+        # Ukrainian
+        # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
+        # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
+        # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
+
+        # English
+        # ('Gagadget', 'https://gagadget.com/en/rss/'),
+        # ('News', 'https://gagadget.com/en/rss/news/'),
+
+        # German
+        # ('Gagadget', 'https://gagadget.com/de/rss/'),
+        # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
+        # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
+        # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
+
+        # Norwegian
+        # ('Gagadget', 'https://gagadget.com/nb/rss/'),
+        # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
+        # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
+        # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
+
+        # Dutch
+        # ('Gagadget', 'https://gagadget.com/nl/rss/'),
+        # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
+        # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
+        # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
+
+        # Spanish
+        # ('Gagadget', 'https://gagadget.com/es/rss/'),
+        # ('Noticias', 'https://gagadget.com/es/rss/news/'),
+        # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
+        # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
+
+        # Italian
+        # ('Gagadget', 'https://gagadget.com/it/rss/'),
+        # ('Notizia', 'https://gagadget.com/it/rss/news/'),
+        # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
+        # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
+
+        # French
+        ('Gagadget', 'https://gagadget.com/fr/rss/'),
+        ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
+        ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
+        ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
+    ]
diff --git a/recipes/gagadget_it.recipe b/recipes/gagadget_it.recipe
index 5eb9cf41d8..58325232ba 100644
--- a/recipes/gagadget_it.recipe
+++ b/recipes/gagadget_it.recipe
@@ -6,21 +6,21 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Gagadget(BasicNewsRecipe):
     title = u'Gagadget'
-    description = u'Gagadget.com is Ukrainian no-nonsense tech site. We only write about what is interesting to us, and we do this in the most vivid and ironic way.'  # noqa
+    description = u'Gagadget.com is Ukrainian no-nonsense tech site. We only write about what is interesting to us, and we do this in the most vivid and ironic way.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = 'Gagadget'
     publication_type = 'news'
     oldest_article = 7
     max_articles_per_feed = 100
-#    language = 'ru_UK'
-#    language = 'uk'
-#    language = 'en_UK'
-#    language = 'de'
-#    language = 'nb'
-#    language = 'nl'
-#    language = 'es'
+    # language = 'ru_UK'
+    # language = 'uk'
+    # language = 'en_UK'
+    # language = 'de'
+    # language = 'nb'
+    # language = 'nl'
+    # language = 'es'
     language = 'it'
-#    language = 'fr'
+    # language = 'fr'
     cover_url = 'https://gagadget.com/static/img/gagadget.jpg'
     auto_cleanup = False
     no_stylesheets = False
@@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
-# Ukrainian version only
-#
-#    remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
-#    remove_tags =   [
-#        dict(name='div', attrs={'class': 'footer-content'}),
-#        ]
+
+    # Ukrainian version only
+    # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
+
+    # remove_tags = [
+    #     dict(name='div', attrs={'class': 'footer-content'}),
+    # ]
 
     feeds = [
-#
-# Russian
-#
-#       ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
-#       ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
-#       ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
-#       ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
-# Ukrainian
-#
-#       ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
-#       ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
-#       ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
-# English
-#
-#       ('Gagadget', 'https://gagadget.com/en/rss/'),
-#       ('News', 'https://gagadget.com/en/rss/news/'),
-#
-# German
-#
-#       ('Gagadget', 'https://gagadget.com/de/rss/'),
-#       ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
-#       ('Tests', 'https://gagadget.com/de/rss/reviews/'),
-#       ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
-# Norwegian
-#
-#       ('Gagadget', 'https://gagadget.com/nb/rss/'),
-#       ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
-#       ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
-#       ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
-# Dutch
-#
-#       ('Gagadget', 'https://gagadget.com/nl/rss/'),
-#       ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
-#       ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
-#       ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
-# Spanish
-#
-#       ('Gagadget', 'https://gagadget.com/es/rss/'),
-#       ('Noticias', 'https://gagadget.com/es/rss/news/'),
-#       ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
-#       ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
-# Italian
-#
-       ('Gagadget', 'https://gagadget.com/it/rss/'),
-       ('Notizia', 'https://gagadget.com/it/rss/news/'),
-       ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
-       ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
-# French
-#
-#       ('Gagadget', 'https://gagadget.com/fr/rss/'),
-#       ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
-#       ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
-#       ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
-     ]
+        # Russian
+        # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
+        # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
+        # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
+
+        # Ukrainian
+        # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
+        # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
+        # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
+
+        # English
+        # ('Gagadget', 'https://gagadget.com/en/rss/'),
+        # ('News', 'https://gagadget.com/en/rss/news/'),
+
+        # German
+        # ('Gagadget', 'https://gagadget.com/de/rss/'),
+        # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
+        # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
+        # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
+
+        # Norwegian
+        # ('Gagadget', 'https://gagadget.com/nb/rss/'),
+        # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
+        # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
+        # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
+
+        # Dutch
+        # ('Gagadget', 'https://gagadget.com/nl/rss/'),
+        # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
+        # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
+        # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
+
+        # Spanish
+        # ('Gagadget', 'https://gagadget.com/es/rss/'),
+        # ('Noticias', 'https://gagadget.com/es/rss/news/'),
+        # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
+        # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
+
+        # Italian
+        ('Gagadget', 'https://gagadget.com/it/rss/'),
+        ('Notizia', 'https://gagadget.com/it/rss/news/'),
+        ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
+        ('Articoli', 'https://gagadget.com/it/rss/articles/'),
+
+        # French
+        # ('Gagadget', 'https://gagadget.com/fr/rss/'),
+        # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
+        # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
+        # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
+    ]
diff --git a/recipes/gagadget_nb.recipe b/recipes/gagadget_nb.recipe
index c562f93d4a..d3365e34b4 100644
--- a/recipes/gagadget_nb.recipe
+++ b/recipes/gagadget_nb.recipe
@@ -6,21 +6,21 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Gagadget(BasicNewsRecipe):
     title = u'Gagadget'
-    description = u'Gagadget.com is Ukrainian no-nonsense tech site. We only write about what is interesting to us, and we do this in the most vivid and ironic way.'  # noqa
+    description = u'Gagadget.com is Ukrainian no-nonsense tech site. We only write about what is interesting to us, and we do this in the most vivid and ironic way.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = 'Gagadget'
     publication_type = 'news'
     oldest_article = 7
     max_articles_per_feed = 100
-#    language = 'ru_UK'
-#    language = 'uk'
-#    language = 'en_UK'
-#    language = 'de'
+    # language = 'ru_UK'
+    # language = 'uk'
+    # language = 'en_UK'
+    # language = 'de'
     language = 'nb'
-#    language = 'nl'
-#    language = 'es'
-#    language = 'it'
-#    language = 'fr'
+    # language = 'nl'
+    # language = 'es'
+    # language = 'it'
+    # language = 'fr'
     cover_url = 'https://gagadget.com/static/img/gagadget.jpg'
     auto_cleanup = False
     no_stylesheets = False
@@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
-# Ukrainian version only
-#
-#    remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
-#    remove_tags =   [
-#        dict(name='div', attrs={'class': 'footer-content'}),
-#        ]
+
+    # Ukrainian version only
+    # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
+
+    # remove_tags = [
+    #     dict(name='div', attrs={'class': 'footer-content'}),
+    # ]
 
     feeds = [
-#
-# Russian
-#
-#       ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
-#       ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
-#       ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
-#       ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
-# Ukrainian
-#
-#       ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
-#       ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
-#       ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
-# English
-#
-#       ('Gagadget', 'https://gagadget.com/en/rss/'),
-#       ('News', 'https://gagadget.com/en/rss/news/'),
-#
-# German
-#
-#       ('Gagadget', 'https://gagadget.com/de/rss/'),
-#       ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
-#       ('Tests', 'https://gagadget.com/de/rss/reviews/'),
-#       ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
-# Norwegian
-#
-       ('Gagadget', 'https://gagadget.com/nb/rss/'),
-       ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
-       ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
-       ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
-# Dutch
-#
-#       ('Gagadget', 'https://gagadget.com/nl/rss/'),
-#       ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
-#       ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
-#       ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
-# Spanish
-#
-#       ('Gagadget', 'https://gagadget.com/es/rss/'),
-#       ('Noticias', 'https://gagadget.com/es/rss/news/'),
-#       ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
-#       ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
-# Italian
-#
-#       ('Gagadget', 'https://gagadget.com/it/rss/'),
-#       ('Notizia', 'https://gagadget.com/it/rss/news/'),
-#       ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
-#       ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
-# French
-#
-#       ('Gagadget', 'https://gagadget.com/fr/rss/'),
-#       ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
-#       ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
-#       ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
-     ]
+        # Russian
+        # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
+        # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
+        # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
+
+        # Ukrainian
+        # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
+        # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
+        # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
+
+        # English
+        # ('Gagadget', 'https://gagadget.com/en/rss/'),
+        # ('News', 'https://gagadget.com/en/rss/news/'),
+
+        # German
+        # ('Gagadget', 'https://gagadget.com/de/rss/'),
+        # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
+        # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
+        # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
+
+        # Norwegian
+        ('Gagadget', 'https://gagadget.com/nb/rss/'),
+        ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
+        ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
+        ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
+
+        # Dutch
+        # ('Gagadget', 'https://gagadget.com/nl/rss/'),
+        # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
+        # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
+        # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
+
+        # Spanish
+        # ('Gagadget', 'https://gagadget.com/es/rss/'),
+        # ('Noticias', 'https://gagadget.com/es/rss/news/'),
+        # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
+        # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
+
+        # Italian
+        # ('Gagadget', 'https://gagadget.com/it/rss/'),
+        # ('Notizia', 'https://gagadget.com/it/rss/news/'),
+        # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
+        # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
+
+        # French
+        # ('Gagadget', 'https://gagadget.com/fr/rss/'),
+        # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
+        # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
+        # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
+    ]
diff --git a/recipes/gagadget_nl.recipe b/recipes/gagadget_nl.recipe
index cf6d34f2f8..01e446f209 100644
--- a/recipes/gagadget_nl.recipe
+++ b/recipes/gagadget_nl.recipe
@@ -6,21 +6,21 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Gagadget(BasicNewsRecipe):
     title = u'Gagadget'
-    description = u'Gagadget.com is Ukrainian no-nonsense tech site. We only write about what is interesting to us, and we do this in the most vivid and ironic way.'  # noqa
+    description = u'Gagadget.com is Ukrainian no-nonsense tech site. We only write about what is interesting to us, and we do this in the most vivid and ironic way.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = 'Gagadget'
     publication_type = 'news'
     oldest_article = 7
     max_articles_per_feed = 100
-#    language = 'ru_UK'
-#    language = 'uk'
-#    language = 'en_UK'
-#    language = 'de'
-#    language = 'nb'
+    # language = 'ru_UK'
+    # language = 'uk'
+    # language = 'en_UK'
+    # language = 'de'
+    # language = 'nb'
     language = 'nl'
-#    language = 'es'
-#    language = 'it'
-#    language = 'fr'
+    # language = 'es'
+    # language = 'it'
+    # language = 'fr'
     cover_url = 'https://gagadget.com/static/img/gagadget.jpg'
     auto_cleanup = False
     no_stylesheets = False
@@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
-# Ukrainian version only
-#
-#    remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
-#    remove_tags =   [
-#        dict(name='div', attrs={'class': 'footer-content'}),
-#        ]
+
+    # Ukrainian version only
+    # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
+
+    # remove_tags = [
+    #     dict(name='div', attrs={'class': 'footer-content'}),
+    # ]
 
     feeds = [
-#
-# Russian
-#
-#       ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
-#       ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
-#       ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
-#       ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
-# Ukrainian
-#
-#       ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
-#       ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
-#       ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
-# English
-#
-#       ('Gagadget', 'https://gagadget.com/en/rss/'),
-#       ('News', 'https://gagadget.com/en/rss/news/'),
-#
-# German
-#
-#       ('Gagadget', 'https://gagadget.com/de/rss/'),
-#       ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
-#       ('Tests', 'https://gagadget.com/de/rss/reviews/'),
-#       ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
-# Norwegian
-#
-#       ('Gagadget', 'https://gagadget.com/nb/rss/'),
-#       ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
-#       ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
-#       ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
-# Dutch
-#
-       ('Gagadget', 'https://gagadget.com/nl/rss/'),
-       ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
-       ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
-       ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
-# Spanish
-#
-#       ('Gagadget', 'https://gagadget.com/es/rss/'),
-#       ('Noticias', 'https://gagadget.com/es/rss/news/'),
-#       ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
-#       ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
-# Italian
-#
-#       ('Gagadget', 'https://gagadget.com/it/rss/'),
-#       ('Notizia', 'https://gagadget.com/it/rss/news/'),
-#       ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
-#       ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
-# French
-#
-#       ('Gagadget', 'https://gagadget.com/fr/rss/'),
-#       ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
-#       ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
-#       ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
-     ]
+        # Russian
+        # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
+        # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
+        # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
+
+        # Ukrainian
+        # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
+        # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
+        # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
+
+        # English
+        # ('Gagadget', 'https://gagadget.com/en/rss/'),
+        # ('News', 'https://gagadget.com/en/rss/news/'),
+
+        # German
+        # ('Gagadget', 'https://gagadget.com/de/rss/'),
+        # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
+        # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
+        # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
+
+        # Norwegian
+        # ('Gagadget', 'https://gagadget.com/nb/rss/'),
+        # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
+        # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
+        # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
+
+        # Dutch
+        ('Gagadget', 'https://gagadget.com/nl/rss/'),
+        ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
+        ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
+        ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
+
+        # Spanish
+        # ('Gagadget', 'https://gagadget.com/es/rss/'),
+        # ('Noticias', 'https://gagadget.com/es/rss/news/'),
+        # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
+        # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
+
+        # Italian
+        # ('Gagadget', 'https://gagadget.com/it/rss/'),
+        # ('Notizia', 'https://gagadget.com/it/rss/news/'),
+        # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
+        # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
+
+        # French
+        # ('Gagadget', 'https://gagadget.com/fr/rss/'),
+        # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
+        # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
+        # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
+    ]
diff --git a/recipes/gagadget_ru.recipe b/recipes/gagadget_ru.recipe
index 3c4a712aa2..524b470b14 100644
--- a/recipes/gagadget_ru.recipe
+++ b/recipes/gagadget_ru.recipe
@@ -7,21 +7,21 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Gagadget(BasicNewsRecipe):
     title = u'Gagadget'
 # Russian
-    description = u'Gagadget.com - \u043D\u0435\u0441\u043A\u0443\u0447\u043D\u044B\u0439 \u0441\u0430\u0439\u0442 \u043E \u0442\u0435\u0445\u043D\u0438\u043A\u0435.'  # noqa
+    description = u'Gagadget.com - \u043D\u0435\u0441\u043A\u0443\u0447\u043D\u044B\u0439 \u0441\u0430\u0439\u0442 \u043E \u0442\u0435\u0445\u043D\u0438\u043A\u0435.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = 'Gagadget'
     publication_type = 'news'
     oldest_article = 7
     max_articles_per_feed = 100
     language = 'ru_UK'
-#    language = 'uk'
-#    language = 'en_UK'
-#    language = 'de'
-#    language = 'nb'
-#    language = 'nl'
-#    language = 'es'
-#    language = 'it'
-#    language = 'fr'
+    # language = 'uk'
+    # language = 'en_UK'
+    # language = 'de'
+    # language = 'nb'
+    # language = 'nl'
+    # language = 'es'
+    # language = 'it'
+    # language = 'fr'
     cover_url = 'https://gagadget.com/static/img/gagadget.jpg'
     auto_cleanup = False
     no_stylesheets = False
@@ -29,77 +29,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
-# Ukrainian version only
-#
-#    remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
-#    remove_tags =   [
-#        dict(name='div', attrs={'class': 'footer-content'}),
-#        ]
+
+    # Ukrainian version only
+    # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
+
+    # remove_tags = [
+    #     dict(name='div', attrs={'class': 'footer-content'}),
+    # ]
 
     feeds = [
-#
-# Russian
-#
-       ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
-       ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
-       ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
-       ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
-#       ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
-# Ukrainian
-#
-#       ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
-#       ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
-#       ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
-# English
-#
-#       ('Gagadget', 'https://gagadget.com/en/rss/'),
-#       ('News', 'https://gagadget.com/en/rss/news/'),
-#
-# German
-#
-#       ('Gagadget', 'https://gagadget.com/de/rss/'),
-#       ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
-#       ('Tests', 'https://gagadget.com/de/rss/reviews/'),
-#       ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
-# Norwegian
-#
-#       ('Gagadget', 'https://gagadget.com/nb/rss/'),
-#       ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
-#       ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
-#       ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
-# Dutch
-#
-#       ('Gagadget', 'https://gagadget.com/nl/rss/'),
-#       ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
-#       ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
-#       ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
-# Spanish
-#
-#       ('Gagadget', 'https://gagadget.com/es/rss/'),
-#       ('Noticias', 'https://gagadget.com/es/rss/news/'),
-#       ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
-#       ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
-# Italian
-#
-#       ('Gagadget', 'https://gagadget.com/it/rss/'),
-#       ('Notizia', 'https://gagadget.com/it/rss/news/'),
-#       ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
-#       ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
-# French
-#
-#       ('Gagadget', 'https://gagadget.com/fr/rss/'),
-#       ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
-#       ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
-#       ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
-     ]
+        # Russian
+        ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
+        ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
+        ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
+        ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
+        # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
+
+        # Ukrainian
+        # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
+        # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
+        # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
+
+        # English
+        # ('Gagadget', 'https://gagadget.com/en/rss/'),
+        # ('News', 'https://gagadget.com/en/rss/news/'),
+
+        # German
+        # ('Gagadget', 'https://gagadget.com/de/rss/'),
+        # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
+        # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
+        # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
+
+        # Norwegian
+        # ('Gagadget', 'https://gagadget.com/nb/rss/'),
+        # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
+        # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
+        # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
+
+        # Dutch
+        # ('Gagadget', 'https://gagadget.com/nl/rss/'),
+        # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
+        # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
+        # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
+
+        # Spanish
+        # ('Gagadget', 'https://gagadget.com/es/rss/'),
+        # ('Noticias', 'https://gagadget.com/es/rss/news/'),
+        # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
+        # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
+
+        # Italian
+        # ('Gagadget', 'https://gagadget.com/it/rss/'),
+        # ('Notizia', 'https://gagadget.com/it/rss/news/'),
+        # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
+        # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
+
+        # French
+        # ('Gagadget', 'https://gagadget.com/fr/rss/'),
+        # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
+        # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
+        # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
+    ]
diff --git a/recipes/gagadget_ua.recipe b/recipes/gagadget_ua.recipe
index d16e6262ec..14ba4461f3 100644
--- a/recipes/gagadget_ua.recipe
+++ b/recipes/gagadget_ua.recipe
@@ -6,99 +6,87 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Gagadget(BasicNewsRecipe):
     title = u'Gagadget'
-    description = u'Gagadget.com - \u043D\u0435\u043D\u0443\u0434\u043D\u0438\u0439 \u0441\u0430\u0439\u0442 \u043F\u0440\u043E \u0442\u0435\u0445\u043D\u0456\u043A\u0443.'  # noqa
+    description = u'Gagadget.com - \u043D\u0435\u043D\u0443\u0434\u043D\u0438\u0439 \u0441\u0430\u0439\u0442 \u043F\u0440\u043E \u0442\u0435\u0445\u043D\u0456\u043A\u0443.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = 'Gagadget'
     publication_type = 'news'
     oldest_article = 7
     max_articles_per_feed = 100
-#    language = 'ru_UK'
+    # language = 'ru_UK'
     language = 'uk'
-#    language = 'en_UK'
-#    language = 'de'
-#    language = 'nb'
-#    language = 'nl'
-#    language = 'es'
-#    language = 'it'
-#    language = 'fr'
+    # language = 'en_UK'
+    # language = 'de'
+    # language = 'nb'
+    # language = 'nl'
+    # language = 'es'
+    # language = 'it'
+    # language = 'fr'
     cover_url = 'https://gagadget.com/static/img/gagadget.jpg'
     auto_cleanup = False
     no_stylesheets = False
 
     remove_tags_before = dict(name='h1')
 
-#    remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
-# Ukrainian version only
-#
+    # remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
+
+    # Ukrainian version only
     remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='div', attrs={'class': 'footer-content'}),
-        ]
+    ]
 
     feeds = [
-#
-# Russian
-#
-#       ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
-#       ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
-#       ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
-#       ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
-#       ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
-# Ukrainian
-#
-       ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
-       ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
-       ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
-       ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
-# English
-#
-#       ('Gagadget', 'https://gagadget.com/en/rss/'),
-#       ('News', 'https://gagadget.com/en/rss/news/'),
-#
-# German
-#
-#       ('Gagadget', 'https://gagadget.com/de/rss/'),
-#       ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
-#       ('Tests', 'https://gagadget.com/de/rss/reviews/'),
-#       ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
-# Norwegian
-#
-#       ('Gagadget', 'https://gagadget.com/nb/rss/'),
-#       ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
-#       ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
-#       ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
-# Dutch
-#
-#       ('Gagadget', 'https://gagadget.com/nl/rss/'),
-#       ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
-#       ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
-#       ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
-# Spanish
-#
-#       ('Gagadget', 'https://gagadget.com/es/rss/'),
-#       ('Noticias', 'https://gagadget.com/es/rss/news/'),
-#       ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
-#       ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
-# Italian
-#
-#       ('Gagadget', 'https://gagadget.com/it/rss/'),
-#       ('Notizia', 'https://gagadget.com/it/rss/news/'),
-#       ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
-#       ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
-# French
-#
-#       ('Gagadget', 'https://gagadget.com/fr/rss/'),
-#       ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
-#       ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
-#       ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
-     ]
+        # Russian
+        # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
+        # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
+        # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
+        # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
+
+        # Ukrainian
+        ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
+        ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
+        ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
+        ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
+
+        # English
+        # ('Gagadget', 'https://gagadget.com/en/rss/'),
+        # ('News', 'https://gagadget.com/en/rss/news/'),
+
+        # German
+        # ('Gagadget', 'https://gagadget.com/de/rss/'),
+        # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
+        # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
+        # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
+
+        # Norwegian
+        # ('Gagadget', 'https://gagadget.com/nb/rss/'),
+        # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
+        # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
+        # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
+
+        # Dutch
+        # ('Gagadget', 'https://gagadget.com/nl/rss/'),
+        # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
+        # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
+        # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
+
+        # Spanish
+        # ('Gagadget', 'https://gagadget.com/es/rss/'),
+        # ('Noticias', 'https://gagadget.com/es/rss/news/'),
+        # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
+        # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
+
+        # Italian
+        # ('Gagadget', 'https://gagadget.com/it/rss/'),
+        # ('Notizia', 'https://gagadget.com/it/rss/news/'),
+        # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
+        # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
+
+        # French
+        # ('Gagadget', 'https://gagadget.com/fr/rss/'),
+        # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
+        # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
+        # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
+    ]
diff --git a/recipes/galaxys_edge.recipe b/recipes/galaxys_edge.recipe
index 233277a29c..0f500cbd23 100644
--- a/recipes/galaxys_edge.recipe
+++ b/recipes/galaxys_edge.recipe
@@ -34,18 +34,18 @@ class AdvancedUserRecipe1515196393(BasicNewsRecipe):
         issue_title = soup.find('h1')
         self.title = "Galaxy's Edge: " + self.tag_to_string(issue_title).lower().title()
         toc = soup.find('div', attrs={'class':'nav-tabs'})
-        current_section = "Articles"
+        current_section = 'Articles'
         current_articles = []
         feeds = []
         br = self.get_browser()
         self.ctdir = PersistentTemporaryDirectory()
-        for x in toc.findAll(['li'], attrs={"class": re.compile(".*get_content.*")}):
+        for x in toc.findAll(['li'], attrs={'class': re.compile(r'.*get_content.*')}):
             edwo = x.find('a')
             title = self.tag_to_string(edwo)
             self.log('\t\tFound article:', title)
-            post_id = x["data-post-id"]
-            cat_id = x["data-cat-id"]
-            parent_id = x["data-parent-id"]
+            post_id = x['data-post-id']
+            cat_id = x['data-cat-id']
+            parent_id = x['data-parent-id']
             self.log('\t\tdata-parent-id', parent_id)
             self.log('\t\tdata-cat-id', cat_id)
             self.log('\t\tdata-post-id', post_id)
@@ -61,5 +61,5 @@ class AdvancedUserRecipe1515196393(BasicNewsRecipe):
         return feeds
 
     def cleanup(self):
-        self.log("Deleting temp files...")
+        self.log('Deleting temp files...')
         shutil.rmtree(self.ctdir)
diff --git a/recipes/game_rant.recipe b/recipes/game_rant.recipe
index 39f5b4043c..5913eb69ad 100644
--- a/recipes/game_rant.recipe
+++ b/recipes/game_rant.recipe
@@ -24,14 +24,14 @@ class AdvancedUserRecipe1718106336(BasicNewsRecipe):
 
     feeds          = [
         ('Game News', 'https://gamerant.com/feed/gaming/'),
-        #Platforms
+        # Platforms
         ('Platforms', 'https://gamerant.com/feed/platforms/'),
         ('Playstation', 'https://gamerant.com/feed/tag/playstation/'),
         ('Xbox', 'https://gamerant.com/feed/tag/xbox/'),
         ('Nintendo', 'https://gamerant.com/feed/tag/nintendo/'),
         ('PC Gaming', 'https://gamerant.com/feed/tag/pc/'),
         ('Mobile Gaming', 'https://gamerant.com/feed/tag/mobile/'),
-        #Game Rant Originals
+        # Game Rant Originals
         ('Game Rant Originals', 'https://gamerant.com/feed/originals/'),
         ('Editorials', 'https://gamerant.com/feed/editorial/'),
         ('Game Reviews', 'https://gamerant.com/feed/game-reviews/'),
diff --git a/recipes/gates_notes.recipe b/recipes/gates_notes.recipe
index 5b7844f819..40718e8cd2 100644
--- a/recipes/gates_notes.recipe
+++ b/recipes/gates_notes.recipe
@@ -8,7 +8,6 @@ class AdvancedUserRecipe1716089864(BasicNewsRecipe):
     description = 'The Blog of Bill Gates.'
     language = 'en'
     __author__ = 'Spicy Poison'
-    description = 'The Blog of Bill Gates'
     publisher = 'Bill Gates'
     oldest_article = 30
     max_articles_per_feed = 50
diff --git a/recipes/gazeta-prawna-calibre-v1.recipe b/recipes/gazeta-prawna-calibre-v1.recipe
index e78a9f1861..71cca67d83 100644
--- a/recipes/gazeta-prawna-calibre-v1.recipe
+++ b/recipes/gazeta-prawna-calibre-v1.recipe
@@ -69,8 +69,8 @@ class gazetaprawna(BasicNewsRecipe):
         parsed_feeds = BasicNewsRecipe.parse_feeds(self)
         for n, feed in enumerate(parsed_feeds):
             for a, article in enumerate(feed):
-                article.text_summary = re.sub(r'<\!\[CDATA\[', "", article.text_summary)
-                article.text_summary = re.sub(r'\]\]', "", article.text_summary)
+                article.text_summary = re.sub(r'<\!\[CDATA\[', '', article.text_summary)
+                article.text_summary = re.sub(r'\]\]', '', article.text_summary)
                 article.summary = article.text_summary
 
         return parsed_feeds
@@ -84,10 +84,10 @@ class gazetaprawna(BasicNewsRecipe):
 
         for span in soup.findAll(name='span'):
             if len(self.tag_to_string(span)) > 1:
-                span.append(" ")
+                span.append(' ')
 
         for locked in soup.findAll(name='div', attrs={'class': ['articleGate']}):
-            locked.append(u"Przejd\u017a do artyku\u0142u na GazetaPrawna.pl aby zalogowa\u0107 si\u0119 lub wykupi\u0107 dost\u0119p")
+            locked.append(u'Przejd\u017a do artyku\u0142u na GazetaPrawna.pl aby zalogowa\u0107 si\u0119 lub wykupi\u0107 dost\u0119p')
 
         return soup
 
@@ -108,5 +108,5 @@ class gazetaprawna(BasicNewsRecipe):
     def get_cover_url(self):
         soup = self.index_to_soup(
             'http://www.egazety.pl/infor/e-wydanie-dziennik-gazeta-prawna.html')
-        self.cover_url = soup.find("a", {"class": "image cover-preview"}).img['src']
+        self.cover_url = soup.find('a', {'class': 'image cover-preview'}).img['src']
         return getattr(self, 'cover_url', self.cover_url)
diff --git a/recipes/gazeta_pl_krakow.recipe b/recipes/gazeta_pl_krakow.recipe
index 2469536fd2..cc3067dec3 100644
--- a/recipes/gazeta_pl_krakow.recipe
+++ b/recipes/gazeta_pl_krakow.recipe
@@ -34,7 +34,7 @@ class gw_krakow(BasicNewsRecipe):
 
     # rules for gazeta.pl
     preprocess_regexps = [
-        (re.compile(u'<b>Czytaj więcej</b>.*', re.DOTALL), lambda m: '</body>')]
+        (re.compile(u'<b>Czytaj więcej</b>.*', re.DOTALL), lambda m: '</body>')]  # noqa: RUF039
     keep_only_tags = [dict(id='gazeta_article')]
     remove_tags = [dict(id=['gazeta_article_tools', 'gazeta_article_miniatures']), dict(
         attrs={'class': ['mod mod_sociallist', 'c0', 'fb', 'voteNeedLogin']})]
diff --git a/recipes/gazeta_pl_warszawa.recipe b/recipes/gazeta_pl_warszawa.recipe
index a0fa38e851..df3dcd3b40 100644
--- a/recipes/gazeta_pl_warszawa.recipe
+++ b/recipes/gazeta_pl_warszawa.recipe
@@ -33,7 +33,7 @@ class gw_wawa(BasicNewsRecipe):
 
     # rules for gazeta.pl
     preprocess_regexps = [
-        (re.compile(u'<b>Czytaj więcej</b>.*', re.DOTALL), lambda m: '</body>')]
+        (re.compile(u'<b>Czytaj więcej</b>.*', re.DOTALL), lambda m: '</body>')]  # noqa: RUF039
     keep_only_tags = [dict(id='gazeta_article')]
     remove_tags = [dict(id=['gazeta_article_tools', 'gazeta_article_miniatures']), dict(
         attrs={'class': ['mod mod_sociallist', 'c0', 'fb', 'voteNeedLogin']})]
diff --git a/recipes/gazetaua_ru.recipe b/recipes/gazetaua_ru.recipe
index 5ca2113039..f3a3c22476 100644
--- a/recipes/gazetaua_ru.recipe
+++ b/recipes/gazetaua_ru.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class GazetaUA(BasicNewsRecipe):
     title = 'Gazeta.ua'
     __author__ = 'bugmen00t'
-    description = '\u0412\u0441\u0435\u0443\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0430\u044F \u043E\u043D-\u043B\u0430\u0439\u043D \u0433\u0430\u0437\u0435\u0442\u0430. \u041E\u043F\u0435\u0440\u0430\u0442\u0438\u0432\u043D\u044B\u0435 \u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435 \u0438 \u0432 \u043C\u0438\u0440\u0435: \u0441\u043E\u0431\u044B\u0442\u0438\u044F, \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430, \u0441\u043F\u043E\u0440\u0442, \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u0430.'  # noqa
-    publisher = '\u0418\u0437\u0434\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0430\u044F \u0433\u0440\u0443\u043F\u043F\u0430 "\u041D\u043E\u0432\u0430 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u044F"'  # noqa
+    description = '\u0412\u0441\u0435\u0443\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0430\u044F \u043E\u043D-\u043B\u0430\u0439\u043D \u0433\u0430\u0437\u0435\u0442\u0430. \u041E\u043F\u0435\u0440\u0430\u0442\u0438\u0432\u043D\u044B\u0435 \u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435 \u0438 \u0432 \u043C\u0438\u0440\u0435: \u0441\u043E\u0431\u044B\u0442\u0438\u044F, \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430, \u0441\u043F\u043E\u0440\u0442, \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u0430.'  # noqa: E501
+    publisher = '\u0418\u0437\u0434\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0430\u044F \u0433\u0440\u0443\u043F\u043F\u0430 "\u041D\u043E\u0432\u0430 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u044F"'  # noqa: E501
     category = 'newspaper'
     cover_url = u'https://static2.gazeta.ua/img2/cache/preview/1064/1064219_w_450.jpg'
     language = 'ru_UK'
@@ -23,7 +23,7 @@ class GazetaUA(BasicNewsRecipe):
 
     remove_tags_after = dict(name='section', attrs={'class': 'article-content clearfix'})
 
-    remove_tags =   [
+    remove_tags = [
          dict(name='div', attrs={'class': 'mt5'}),
          dict(name='div', attrs={'class': 'interview-block'}),
          dict(name='p', attrs={'id': 'mce_0'}),
diff --git a/recipes/gazetaua_ua.recipe b/recipes/gazetaua_ua.recipe
index 2c9dfdb70c..02a50c9a59 100644
--- a/recipes/gazetaua_ua.recipe
+++ b/recipes/gazetaua_ua.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class GazetaUA(BasicNewsRecipe):
     title = 'Gazeta.ua'
     __author__ = 'bugmen00t'
-    description = '\u0412\u0441\u0435\u0443\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430 \u043E\u043D-\u043B\u0430\u0439\u043D \u0433\u0430\u0437\u0435\u0442\u0430. \u041E\u043F\u0435\u0440\u0430\u0442\u0438\u0432\u043D\u0456 \u043D\u043E\u0432\u0438\u043D\u0438 \u0437 \u0423\u043A\u0440\u0430\u0457\u043D\u0438 \u0456 \u0441\u0432\u0456\u0442\u0443: \u043F\u043E\u0434\u0456\u0457, \u043F\u043E\u043B\u0456\u0442\u0438\u043A\u0430, \u0441\u043F\u043E\u0440\u0442, \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u0430.'  # noqa
-    publisher = '\u0422\u041E\u0412 "\u0412\u0438\u0434\u0430\u0432\u043D\u0438\u0447\u0430 \u043A\u043E\u043C\u043F\u0430\u043D\u0456\u044F "\u041D\u043E\u0432\u0430 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u044F"'  # noqa
+    description = '\u0412\u0441\u0435\u0443\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430 \u043E\u043D-\u043B\u0430\u0439\u043D \u0433\u0430\u0437\u0435\u0442\u0430. \u041E\u043F\u0435\u0440\u0430\u0442\u0438\u0432\u043D\u0456 \u043D\u043E\u0432\u0438\u043D\u0438 \u0437 \u0423\u043A\u0440\u0430\u0457\u043D\u0438 \u0456 \u0441\u0432\u0456\u0442\u0443: \u043F\u043E\u0434\u0456\u0457, \u043F\u043E\u043B\u0456\u0442\u0438\u043A\u0430, \u0441\u043F\u043E\u0440\u0442, \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u0430.'  # noqa: E501
+    publisher = '\u0422\u041E\u0412 "\u0412\u0438\u0434\u0430\u0432\u043D\u0438\u0447\u0430 \u043A\u043E\u043C\u043F\u0430\u043D\u0456\u044F "\u041D\u043E\u0432\u0430 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u044F"'  # noqa: E501
     category = 'newspaper'
     cover_url = u'https://static2.gazeta.ua/img2/cache/preview/1064/1064219_w_450.jpg'
     language = 'uk'
@@ -23,7 +23,7 @@ class GazetaUA(BasicNewsRecipe):
 
     remove_tags_after = dict(name='section', attrs={'class': 'article-content clearfix'})
 
-    remove_tags =   [
+    remove_tags = [
          dict(name='div', attrs={'class': 'mt5'}),
          dict(name='div', attrs={'class': 'interview-block'}),
          dict(name='p', attrs={'id': 'mce_0'}),
diff --git a/recipes/geekcity.recipe b/recipes/geekcity.recipe
index ba1fae13f5..4e8aa97845 100644
--- a/recipes/geekcity.recipe
+++ b/recipes/geekcity.recipe
@@ -6,7 +6,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class GeekCity(BasicNewsRecipe):
     title = u'GeekCity'
-    description = u'\u041F\u043E\u0440\u0442\u0430\u043B \u043E \u043A\u043E\u043C\u0438\u043A\u0441\u0430\u0445, \u043A\u0438\u043D\u043E, \u0441\u0435\u0440\u0438\u0430\u043B\u0430\u0445, \u0438\u0433\u0440\u0430\u0445, sci-fi \u0438 \u043C\u043D\u043E\u0433\u043E\u043C \u0434\u0440\u0443\u0433\u043E\u043C. \u0417\u0434\u0435\u0441\u044C \u0432\u044B \u0432\u0441\u0435\u0433\u0434\u0430 \u0441\u043C\u043E\u0436\u0435\u0442\u0435 \u043D\u0430\u0439\u0442\u0438 \u0441\u0432\u0435\u0436\u0438\u0435 \u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u043E \u0441\u0430\u043C\u044B\u0445 \u0432\u0430\u0436\u043D\u044B\u0445 \u0441\u043E\u0431\u044B\u0442\u0438\u044F\u0445 \u0432 \u043C\u0438\u0440\u0435 \u0433\u0438\u043A\u043E\u0432, \u0430\u043A\u0442\u0443\u0430\u043B\u044C\u043D\u044B\u0435 \u043E\u0431\u0437\u043E\u0440\u044B, \u0433\u0430\u0439\u0434\u044B, \u0441\u0442\u0430\u0442\u044C\u0438 \u0438 \u043C\u043D\u043E\u0433\u043E\u0435 \u0434\u0440\u0443\u0433\u043E\u0435.'  # noqa
+    description = u'\u041F\u043E\u0440\u0442\u0430\u043B \u043E \u043A\u043E\u043C\u0438\u043A\u0441\u0430\u0445, \u043A\u0438\u043D\u043E, \u0441\u0435\u0440\u0438\u0430\u043B\u0430\u0445, \u0438\u0433\u0440\u0430\u0445, sci-fi \u0438 \u043C\u043D\u043E\u0433\u043E\u043C \u0434\u0440\u0443\u0433\u043E\u043C. \u0417\u0434\u0435\u0441\u044C \u0432\u044B \u0432\u0441\u0435\u0433\u0434\u0430 \u0441\u043C\u043E\u0436\u0435\u0442\u0435 \u043D\u0430\u0439\u0442\u0438 \u0441\u0432\u0435\u0436\u0438\u0435 \u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u043E \u0441\u0430\u043C\u044B\u0445 \u0432\u0430\u0436\u043D\u044B\u0445 \u0441\u043E\u0431\u044B\u0442\u0438\u044F\u0445 \u0432 \u043C\u0438\u0440\u0435 \u0433\u0438\u043A\u043E\u0432, \u0430\u043A\u0442\u0443\u0430\u043B\u044C\u043D\u044B\u0435 \u043E\u0431\u0437\u043E\u0440\u044B, \u0433\u0430\u0439\u0434\u044B, \u0441\u0442\u0430\u0442\u044C\u0438 \u0438 \u043C\u043D\u043E\u0433\u043E\u0435 \u0434\u0440\u0443\u0433\u043E\u0435.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = 'GeekCity.ru'
     publication_type = 'blog'
@@ -21,7 +21,7 @@ class GeekCity(BasicNewsRecipe):
 
     remove_tags_after = dict(name='article')
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='div', attrs={'class': 'term-badges floated'}),
         dict(name='div', attrs={'class': 'post-meta single-post-meta'}),
         dict(name='div', attrs={'class': 'post-share single-post-share top-share clearfix style-1'}),
diff --git a/recipes/github.recipe b/recipes/github.recipe
index 1024624ffc..6eae771bd6 100644
--- a/recipes/github.recipe
+++ b/recipes/github.recipe
@@ -13,13 +13,13 @@ class GithubBlog(BasicNewsRecipe):
     oldest_article = 14
 
     keep_only_tags = [
-        dict(name='div', attrs={'class': 'col-12 offset-lg-1 col-lg-10 col-xl-7 mt-5 mt-lg-10 mb-6 mb-lg-8' }),
-        dict(name='section', attrs={'class': lambda x: x and 'post__content' in x.split(' ') })
+        dict(name='div', attrs={'class': 'col-12 offset-lg-1 col-lg-10 col-xl-7 mt-5 mt-lg-10 mb-6 mb-lg-8'}),
+        dict(name='section', attrs={'class': lambda x: x and 'post__content' in x.split(' ')})
     ]
 
     remove_tags = [
-        dict(name='div', attrs={'class': lambda x: x and 'post-tags' in x.split(' ') }),
-        dict(name='ul', attrs={'class': lambda x: x and 'post-hero__categories' in x.split(' ') })
+        dict(name='div', attrs={'class': lambda x: x and 'post-tags' in x.split(' ')}),
+        dict(name='ul', attrs={'class': lambda x: x and 'post-hero__categories' in x.split(' ')})
     ]
 
     preprocess_regexps = [
diff --git a/recipes/glasgow_herald.recipe b/recipes/glasgow_herald.recipe
index 388dff9783..fd48f22e84 100644
--- a/recipes/glasgow_herald.recipe
+++ b/recipes/glasgow_herald.recipe
@@ -11,7 +11,6 @@ class GlasgowHerald(BasicNewsRecipe):
     title = u'Glasgow Herald'
     oldest_article = 1
     max_articles_per_feed = 100
-    no_stylesheets = True
     language = 'en_GB'
 
     __author__ = 'Kovid Goyal'
diff --git a/recipes/globaltimes.recipe b/recipes/globaltimes.recipe
index e7d808c1ad..c33c67762d 100644
--- a/recipes/globaltimes.recipe
+++ b/recipes/globaltimes.recipe
@@ -7,6 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe, classes
 
 index = 'https://www.globaltimes.cn/'
 
+
 class GlobalTimes(BasicNewsRecipe):
     title = 'Global Times'
     __author__ = 'unkn0wn'
@@ -19,7 +20,7 @@ class GlobalTimes(BasicNewsRecipe):
     encoding = 'utf-8'
     remove_empty_feeds = True
     resolve_internal_links = True
-    oldest_article = 1 # days
+    oldest_article = 1  # days
 
     def get_cover_url(self):
         soup = self.index_to_soup('https://en.kiosko.net/cn/np/cn_global_times.html')
diff --git a/recipes/globes_co_il.recipe b/recipes/globes_co_il.recipe
index ffd5c71f9d..8102642749 100644
--- a/recipes/globes_co_il.recipe
+++ b/recipes/globes_co_il.recipe
@@ -7,7 +7,7 @@ class AdvancedUserRecipe1283848012(BasicNewsRecipe):
     title = u'Globes'
     language = 'he'
     __author__ = 'marbs & barakplasma'
-    extra_css = 'img {max-width:100%;} body{direction: rtl;max-width:100%;}title{direction: rtl; } article_description{direction: rtl; }, a.article{direction: rtl;max-width:100%;} calibre_feed_description{direction: rtl; }'  # noqa
+    extra_css = 'img {max-width:100%;} body{direction: rtl;max-width:100%;}title{direction: rtl; } article_description{direction: rtl; }, a.article{direction: rtl;max-width:100%;} calibre_feed_description{direction: rtl; }'  # noqa: E501
     simultaneous_downloads = 5
     remove_javascript = True
     keep_only_tags = [
@@ -21,21 +21,21 @@ class AdvancedUserRecipe1283848012(BasicNewsRecipe):
     remove_attributes = ['width', 'style']
 
     feeds = [
-        (u"עידכוני RSS ", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=3038"),
-        (u"כל הכתבות", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=2"),
-        (u"שוק ההון", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=585"),
-        (u"בארץ", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=9917"),
-        (u"גלובלי ושוקי עולם", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=1225"),
-        (u"גלובסטק", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=594"),
-        (u"דין וחשבון", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=829"),
-        (u"דעות", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=845"),
-        (u"וידאו", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=2007"),
-        (u"ליידי גלובס", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=3314"),
-        (u"מגזין G", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=3312"),
-        (u"nadlan", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=607"),
-        (u"נתח שוק וצרכנות", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=821"),
-        (u"מטבעות דיגיטליים", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=9758"),
-        (u"קריירה", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iid=3266"),
-        (u"תיירות", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iid=9010"),
-        (u"רכב", u"https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=3220")
+        (u'עידכוני RSS ', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=3038'),
+        (u'כל הכתבות', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=2'),
+        (u'שוק ההון', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=585'),
+        (u'בארץ', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=9917'),
+        (u'גלובלי ושוקי עולם', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=1225'),
+        (u'גלובסטק', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=594'),
+        (u'דין וחשבון', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=829'),
+        (u'דעות', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=845'),
+        (u'וידאו', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=2007'),
+        (u'ליידי גלובס', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=3314'),
+        (u'מגזין G', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=3312'),
+        (u'nadlan', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=607'),
+        (u'נתח שוק וצרכנות', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=821'),
+        (u'מטבעות דיגיטליים', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=9758'),
+        (u'קריירה', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iid=3266'),
+        (u'תיירות', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iid=9010'),
+        (u'רכב', u'https://www.globes.co.il/webservice/rss/rssfeeder.asmx/FeederNode?iID=3220')
     ]
diff --git a/recipes/go_comics.recipe b/recipes/go_comics.recipe
index 57c23d87e1..fbd79f714a 100644
--- a/recipes/go_comics.recipe
+++ b/recipes/go_comics.recipe
@@ -61,7 +61,7 @@ class GoComics(BasicNewsRecipe):
             # (u"Andertoons",u"http://www.gocomics.com/andertoons"),
             # (u"Andy Capp",u"http://www.gocomics.com/andycapp"),
             # (u"Angry Little Girls",u"http://www.gocomics.com/angry-little-girls"),
-            (u"Animal Crackers", u"http://www.gocomics.com/animalcrackers"),
+            (u'Animal Crackers', u'http://www.gocomics.com/animalcrackers'),
             # (u"Annie",u"http://www.gocomics.com/annie"),
             # (u"The Argyle Sweater",u"http://www.gocomics.com/theargylesweater"),
             # (u"Robert Ariail",u"http://www.gocomics.com/robert-ariail"),
@@ -71,14 +71,14 @@ class GoComics(BasicNewsRecipe):
             # (u"At the Zoo",u"http://www.gocomics.com/at-the-zoo"),
             # (u"Aunty Acid",u"http://www.gocomics.com/aunty-acid"),
             # (u"The Awkward Yeti",u"http://www.gocomics.com/the-awkward-yeti"),
-            (u"B.C.",u"http://www.gocomics.com/bc"),
+            (u'B.C.',u'http://www.gocomics.com/bc'),
             # (u"Back to B.C.",u"http://www.gocomics.com/back-to-bc"),
             # (u"Back in the Day",u"http://www.gocomics.com/backintheday"),
             # (u"bacon",u"http://www.gocomics.com/bacon"),
             # (u"Bad Machinery",u"http://www.gocomics.com/bad-machinery"),
             # (u"Bad Reporter",u"http://www.gocomics.com/badreporter"),
             # (u"Badlands",u"http://www.gocomics.com/badlands"),
-            (u"Baldo",u"http://www.gocomics.com/baldo"),
+            (u'Baldo',u'http://www.gocomics.com/baldo'),
             # (u"Ballard Street",u"http://www.gocomics.com/ballardstreet"),
             # (u"Banana Triangle",u"http://www.gocomics.com/banana-triangle"),
             # (u"Barkeater Lake Pandolph",u"http://www.gocomics.com/barkeaterlake"),
@@ -115,10 +115,10 @@ class GoComics(BasicNewsRecipe):
             # (u"Chip Bok",u"http://www.gocomics.com/chipbok"),
             # (u"Boomerangs",u"http://www.gocomics.com/boomerangs"),
             # (u"The Boondocks",u"http://www.gocomics.com/boondocks"),
-            (u"The Born Loser",u"http://www.gocomics.com/the-born-loser"),
+            (u'The Born Loser',u'http://www.gocomics.com/the-born-loser'),
             # (u"Matt Bors",u"http://www.gocomics.com/matt-bors"),
             # (u"Bottomliners",u"http://www.gocomics.com/bottomliners"),
-            (u"Bound and Gagged",u"http://www.gocomics.com/boundandgagged"),
+            (u'Bound and Gagged',u'http://www.gocomics.com/boundandgagged'),
             # (u"Brain Squirts",u"http://www.gocomics.com/brain-squirts"),
             # (u"Break of Day",u"http://www.gocomics.com/break-of-day"),
             # (u"Breaking Cat News",u"http://www.gocomics.com/breaking-cat-news"),
@@ -126,12 +126,12 @@ class GoComics(BasicNewsRecipe):
             # (u"Brevity",u"http://www.gocomics.com/brevitypanel"),
             # (u"Brewster Rockit",u"http://www.gocomics.com/brewsterrockit"),
             # (u"Chris Britt",u"http://www.gocomics.com/chrisbritt"),
-            (u"Broom Hilda",u"http://www.gocomics.com/broomhilda"),
+            (u'Broom Hilda',u'http://www.gocomics.com/broomhilda'),
             # (u"The Buckets",u"http://www.gocomics.com/thebuckets"),
             # (u"Bully",u"http://www.gocomics.com/bully"),
             # (u"Buni",u"http://www.gocomics.com/buni"),
             # (u"Bushy Tales",u"http://www.gocomics.com/bushy-tales"),
-            (u"Calvin and Hobbes",u"http://www.gocomics.com/calvinandhobbes"),
+            (u'Calvin and Hobbes',u'http://www.gocomics.com/calvinandhobbes'),
             # (u"Candorville",u"http://www.gocomics.com/candorville"),
             # (u"Stuart Carlson",u"http://www.gocomics.com/stuartcarlson"),
             # (u"Ken Catalino",u"http://www.gocomics.com/kencatalino"),
@@ -202,7 +202,7 @@ class GoComics(BasicNewsRecipe):
             # (u"Flo and Friends",u"http://www.gocomics.com/floandfriends"),
             # (u"The Flying McCoys",u"http://www.gocomics.com/theflyingmccoys"),
             # (u"Foolish Mortals",u"http://www.gocomics.com/foolish-mortals"),
-            (u"For Better or For Worse",u"http://www.gocomics.com/forbetterorforworse"),
+            (u'For Better or For Worse',u'http://www.gocomics.com/forbetterorforworse'),
             # (u"For Heaven's Sake",u"http://www.gocomics.com/forheavenssake"),
             # (u"Fort Knox",u"http://www.gocomics.com/fortknox"),
             # (u"Four Eyes",u"http://www.gocomics.com/four-eyes"),
@@ -210,7 +210,7 @@ class GoComics(BasicNewsRecipe):
             # (u"FoxTrot",u"http://www.gocomics.com/foxtrot"),
             # (u"FoxTrot Classics",u"http://www.gocomics.com/foxtrotclassics"),
             # (u"Francis",u"http://www.gocomics.com/francis"),
-            (u"Frank and Ernest",u"http://www.gocomics.com/frank-and-ernest"),
+            (u'Frank and Ernest',u'http://www.gocomics.com/frank-and-ernest'),
             # (u"Frankie Comics",u"http://www.gocomics.com/frankie-comics"),
             # (u"Frazz",u"http://www.gocomics.com/frazz"),
             # (u"Fred Basset",u"http://www.gocomics.com/fredbasset"),
@@ -219,7 +219,7 @@ class GoComics(BasicNewsRecipe):
             # (u"Frog Applause",u"http://www.gocomics.com/frogapplause"),
             # (u"From the Mo Willems Sketchbook",u"http://www.gocomics.com/from-the-mo-willems-sketchbook"),
             # (u"The Fusco Brothers",u"http://www.gocomics.com/thefuscobrothers"),
-            (u"Garfield",u"http://www.gocomics.com/garfield"),
+            (u'Garfield',u'http://www.gocomics.com/garfield'),
             # (u"Garfield Classics",u"http://www.gocomics.com/garfield-classics"),
             # (u"Garfield Minus Garfield",u"http://www.gocomics.com/garfieldminusgarfield"),
             # (u"Gasoline Alley",u"http://www.gocomics.com/gasolinealley"),
@@ -227,7 +227,7 @@ class GoComics(BasicNewsRecipe):
             # (u"Gentle Creatures",u"http://www.gocomics.com/gentle-creatures"),
             # (u"The Gentleman's Armchair",u"http://www.gocomics.com/the-gentlemans-armchair"),
             # (u"Get a Life",u"http://www.gocomics.com/getalife"),
-            (u"Get Fuzzy",u"http://www.gocomics.com/getfuzzy"),
+            (u'Get Fuzzy',u'http://www.gocomics.com/getfuzzy'),
             # (u"Gil",u"http://www.gocomics.com/gil"),
             # (u"Gil Thorp",u"http://www.gocomics.com/gilthorp"),
             # (u"Ginger Meggs",u"http://www.gocomics.com/gingermeggs"),
@@ -248,7 +248,7 @@ class GoComics(BasicNewsRecipe):
             # (u"Phil Hands",u"http://www.gocomics.com/phil-hands"),
             # (u"Health Capsules",u"http://www.gocomics.com/healthcapsules"),
             # (u"Heart of the City",u"http://www.gocomics.com/heartofthecity"),
-            (u"Heathcliff",u"http://www.gocomics.com/heathcliff"),
+            (u'Heathcliff',u'http://www.gocomics.com/heathcliff'),
             # (u"Joe Heller",u"http://www.gocomics.com/joe-heller"),
             # (u"Rebecca Hendin",u"http://www.gocomics.com/rebecca-hendin"),
             # (u"Herb and Jamaal",u"http://www.gocomics.com/herbandjamaal"),
@@ -313,7 +313,7 @@ class GoComics(BasicNewsRecipe):
             # (u"Lost Side of Suburbia",u"http://www.gocomics.com/lostsideofsuburbia"),
             # (u"Lost Sheep",u"http://www.gocomics.com/lostsheep"),
             # (u"Chan Lowe",u"http://www.gocomics.com/chanlowe"),
-            (u"Luann",u"http://www.gocomics.com/luann"),
+            (u'Luann',u'http://www.gocomics.com/luann'),
             # (u"Luann Againn",u"http://www.gocomics.com/luann-againn"),
             # (u"Mike Luckovich",u"http://www.gocomics.com/mikeluckovich"),
             # (u"Lucky Cow",u"http://www.gocomics.com/luckycow"),
@@ -326,7 +326,7 @@ class GoComics(BasicNewsRecipe):
             # (u"Making It",u"http://www.gocomics.com/making-it"),
             # (u"Maria's Day",u"http://www.gocomics.com/marias-day"),
             # (u"Gary Markstein",u"http://www.gocomics.com/garymarkstein"),
-            (u"Marmaduke",u"http://www.gocomics.com/marmaduke"),
+            (u'Marmaduke',u'http://www.gocomics.com/marmaduke'),
             # (u"The Martian Confederacy",u"http://www.gocomics.com/the-martian-confederacy"),
             # (u"MazeToons Puzzle",u"http://www.gocomics.com/mazetoons-puzzle"),
             # (u"Glenn McCoy",u"http://www.gocomics.com/glennmccoy"),
@@ -335,13 +335,13 @@ class GoComics(BasicNewsRecipe):
             # (u"Medium Large",u"http://www.gocomics.com/medium-large"),
             # (u"Meg Classics",u"http://www.gocomics.com/meg-classics"),
             # (u"Microcosm",u"http://www.gocomics.com/microcosm"),
-            (u"The Middletons",u"http://www.gocomics.com/themiddletons"),
+            (u'The Middletons',u'http://www.gocomics.com/themiddletons'),
             # (u"Mike du Jour",u"http://www.gocomics.com/mike-du-jour"),
             # (u"Minimum Security",u"http://www.gocomics.com/minimumsecurity"),
             # (u"Moderately Confused",u"http://www.gocomics.com/moderately-confused"),
             # (u"Molebashed",u"http://www.gocomics.com/molebashed"),
             # (u"Molly and the Bear",u"http://www.gocomics.com/mollyandthebear"),
-            (u"Momma",u"http://www.gocomics.com/momma"),
+            (u'Momma',u'http://www.gocomics.com/momma'),
             # (u"Mom's Cancer",u"http://www.gocomics.com/moms-cancer"),
             # (u"Monty",u"http://www.gocomics.com/monty"),
             # (u"Jim Morin",u"http://www.gocomics.com/jimmorin"),
@@ -359,7 +359,7 @@ class GoComics(BasicNewsRecipe):
             # (u"New Adventures of Queen Victoria",u"http://www.gocomics.com/thenewadventuresofqueenvictoria"),
             # (u"Next Door Neighbors",u"http://www.gocomics.com/next-door-neighbors"),
             # (u"Nick and Zuzu",u"http://www.gocomics.com/nick-and-zuzu),
-            (u"Non Sequitur",u"http://www.gocomics.com/nonsequitur"),
+            (u'Non Sequitur',u'http://www.gocomics.com/nonsequitur'),
             # (u"The Norm 4.0",u"http://www.gocomics.com/the-norm-4-0"),
             # (u"The Norm Classics",u"http://www.gocomics.com/thenorm"),
             # (u"Not Invented Here",u"http://www.gocomics.com/not-invented-here"),
@@ -383,10 +383,10 @@ class GoComics(BasicNewsRecipe):
             # (u"Ozy and Millie",u"http://www.gocomics.com/ozy-and-millie"),
             # (u"Henry Payne",u"http://www.gocomics.com/henrypayne"),
             # (u"PC and Pixel",u"http://www.gocomics.com/pcandpixel"),
-            (u"Peanuts",u"http://www.gocomics.com/peanuts"),
+            (u'Peanuts',u'http://www.gocomics.com/peanuts'),
             # (u"Peanuts Begins",u"http://www.gocomics.com/peanuts-begins"),
             # (u"Peanuts Holiday Countdown",u"http://www.gocomics.com/peanuts-holiday-countdown"),
-            (u"Pearls Before Swine",u"http://www.gocomics.com/pearlsbeforeswine"),
+            (u'Pearls Before Swine',u'http://www.gocomics.com/pearlsbeforeswine'),
             # (u"Perry Bible Fellowship",u"http://www.gocomics.com/perry-bible-fellowship"),
             # (u"Joel Pett",u"http://www.gocomics.com/joelpett"),
             # (u"Phoebe and Her Unicorn",u"http://www.gocomics.com/phoebe-and-her-unicorn"),
@@ -398,7 +398,7 @@ class GoComics(BasicNewsRecipe):
             # (u"Pinkerton",u"http://www.gocomics.com/pinkerton"),
             # (u"Please Listen to Me",u"http://www.gocomics.com/please-listen-to-me"),
             # (u"Pluggers",u"http://www.gocomics.com/pluggers"),
-            (u"Pooch Cafe",u"http://www.gocomics.com/poochcafe"),
+            (u'Pooch Cafe',u'http://www.gocomics.com/poochcafe'),
             # (u"Poorcraft",u"http://www.gocomics.com/poorcraft"),
             # (u"Poorly Drawn Lines",u"http://www.gocomics.com/poorly-drawn-lines"),
             # (u"Pop Culture Shock Therapy",u"http://www.gocomics.com/pop-culture-shock-therapy"),
@@ -427,7 +427,7 @@ class GoComics(BasicNewsRecipe):
             # (u"Ripley's Believe It or Not",u"http://www.gocomics.com/ripleysbelieveitornot"),
             # (u"Robbie and Bobby",u"http://www.gocomics.com/robbie-and-bobby"),
             # (u"Rob Rogers",u"http://www.gocomics.com/robrogers"),
-            (u"Rose is Rose",u"http://www.gocomics.com/roseisrose"),
+            (u'Rose is Rose',u'http://www.gocomics.com/roseisrose'),
             # (u"Rubes",u"http://www.gocomics.com/rubes"),
             # (u"Rudy Park",u"http://www.gocomics.com/rudypark"),
             # (u"Sarah's Scribbles",u"http://www.gocomics.com/sarahs-scribbles"),
@@ -438,7 +438,7 @@ class GoComics(BasicNewsRecipe):
             # (u"Sheldon",u"http://www.gocomics.com/sheldon"),
             # (u"Drew Sheneman",u"http://www.gocomics.com/drewsheneman"),
             # (u"Shirley and Son Classics",u"http://www.gocomics.com/shirley-and-son-classics"),
-            (u"Shoe",u"http://www.gocomics.com/shoe"),
+            (u'Shoe',u'http://www.gocomics.com/shoe'),
             # (u"Shoecabbage",u"http://www.gocomics.com/shoecabbage"),
             # (u"Shortcuts",u"http://www.gocomics.com/shortcuts"),
             # (u"Shutterbug Follies",u"http://www.gocomics.com/shutterbug-follies"),
@@ -524,7 +524,7 @@ class GoComics(BasicNewsRecipe):
             # (u"Winston",u"http://www.gocomics.com/winston"),
             # (u"Wit of the World",u"http://www.gocomics.com/witoftheworld"),
             # (u"CartoonArts International",u"http://www.gocomics.com/witoftheworld"),
-            (u"Wizard of Id",u"http://www.gocomics.com/wizardofid"),
+            (u'Wizard of Id',u'http://www.gocomics.com/wizardofid'),
             # (u"Wizard of Id Classics",u"http://www.gocomics.com/wizard-of-id-classics"),
             # (u"Wondermark",u"http://www.gocomics.com/wondermark"),
             # (u"Working Daze",u"http://www.gocomics.com/working-daze"),
diff --git a/recipes/google_news.recipe b/recipes/google_news.recipe
index 7eca31974a..761dc07050 100644
--- a/recipes/google_news.recipe
+++ b/recipes/google_news.recipe
@@ -50,7 +50,7 @@ class google_news_de(BasicNewsRecipe):
             url = e.hdrs.get('location')
         soup = self.index_to_soup(url)
         link = soup.find('a', href=True)
-        skip_sections =[ # add sections you want to skip
+        skip_sections =[  # add sections you want to skip
             '/video/', '/videos/', '/media/', 'podcast-'
         ]
         if any(x in link['href'] for x in skip_sections):
@@ -68,7 +68,7 @@ class google_news_de(BasicNewsRecipe):
     # feel free to add, wipe out what you need                              ---- can be edit by user
     #
     def get_feeds(self):
-        url = "https://geolocation-db.com/json"
+        url = 'https://geolocation-db.com/json'
         data = self.index_to_soup(url, raw=True)
         data = json.loads(data)
         country_code = str(data['country_code']).lower()  # for me this is de
diff --git a/recipes/gorky.recipe b/recipes/gorky.recipe
index e5e671449a..8bc7988cc4 100644
--- a/recipes/gorky.recipe
+++ b/recipes/gorky.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Gorky(BasicNewsRecipe):
     title                 = '\u0413\u043E\u0440\u044C\u043A\u0438\u0439'
     __author__            = 'bugmen00t'
-    description           = '\u041D\u0435\u043A\u043E\u043C\u043C\u0435\u0440\u0447\u0435\u0441\u043A\u0438\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u043E \u043A\u043D\u0438\u0433\u0430\u0445 \u0438 \u0447\u0442\u0435\u043D\u0438\u0438.'  # noqa
-    publisher             = '\u0410\u041D\u041E "\u0426\u0435\u043D\u0442\u0440 \u043F\u043E \u0441\u043E\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044E \u0440\u0430\u0437\u0432\u0438\u0442\u0438\u044F \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u044B \u0447\u0442\u0435\u043D\u0438\u044F \u0438 \u043A\u043D\u0438\u0433\u043E\u0438\u0437\u0434\u0430\u043D\u0438\u044F \u00AB\u0413\u043E\u0440\u044C\u043A\u0438\u0439 \u041C\u0435\u0434\u0438\u0430\u00BB"'  # noqa
+    description           = '\u041D\u0435\u043A\u043E\u043C\u043C\u0435\u0440\u0447\u0435\u0441\u043A\u0438\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u043E \u043A\u043D\u0438\u0433\u0430\u0445 \u0438 \u0447\u0442\u0435\u043D\u0438\u0438.'  # noqa: E501
+    publisher             = '\u0410\u041D\u041E "\u0426\u0435\u043D\u0442\u0440 \u043F\u043E \u0441\u043E\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044E \u0440\u0430\u0437\u0432\u0438\u0442\u0438\u044F \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u044B \u0447\u0442\u0435\u043D\u0438\u044F \u0438 \u043A\u043D\u0438\u0433\u043E\u0438\u0437\u0434\u0430\u043D\u0438\u044F \u00AB\u0413\u043E\u0440\u044C\u043A\u0438\u0439 \u041C\u0435\u0434\u0438\u0430\u00BB"'  # noqa: E501
     category              = 'blog'
     cover_url = u'https://gorky.media/wp-content/uploads/2016/09/gorky.png'
     language              = 'ru'
@@ -22,7 +22,7 @@ class Gorky(BasicNewsRecipe):
 
     remove_tags_after = dict(name='footer')
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='footer'),
         dict(name='nav', attrs={'class': 'navbar'}),
         dict(name='div', attrs={'class': 'hide'}),
diff --git a/recipes/gosc_full.recipe b/recipes/gosc_full.recipe
index 2f1752f5be..8e373f95f4 100644
--- a/recipes/gosc_full.recipe
+++ b/recipes/gosc_full.recipe
@@ -2,8 +2,8 @@
 from __future__ import unicode_literals
 
 __license__ = 'GPL v3'
-__copyright__ = '2011, Piotr Kontek, piotr.kontek@gmail.com \
-                 2013-2018, Tomasz Długosz, tomek3d@gmail.com'
+__copyright__ = ('2011, Piotr Kontek, piotr.kontek@gmail.com '
+                 '2013-2018, Tomasz Długosz, tomek3d@gmail.com')
 
 import re
 import time
@@ -32,7 +32,7 @@ class GN(BasicNewsRecipe):
         page = doc.xpath(
             '//div[@class="search-result release-result"]/div[1]/div[1]/a/@href')
 
-        if time.strftime("%w") in ['3', '4']:
+        if time.strftime('%w') in ['3', '4']:
             return page[5]
         else:
             return page[4]
@@ -54,7 +54,7 @@ class GN(BasicNewsRecipe):
              }]
         feeds.append((u'Na dobry początek', articles))
         # columns:
-        for addr in soup.findAll('a', attrs={'href': re.compile('kategoria')}):
+        for addr in soup.findAll('a', attrs={'href': re.compile(r'kategoria')}):
             if not addr.span:
                 main_block = self.index_to_soup(
                     'http://www.gosc.pl' + addr['href'])
diff --git a/recipes/gosc_niedzielny.recipe b/recipes/gosc_niedzielny.recipe
index 773b25aefa..fc26fb911f 100644
--- a/recipes/gosc_niedzielny.recipe
+++ b/recipes/gosc_niedzielny.recipe
@@ -2,8 +2,8 @@
 # -*- coding: utf-8 -*-
 
 __license__ = 'GPL v3'
-__copyright__ = '2011, Piotr Kontek, piotr.kontek@gmail.com \
-                 2013-2018, Tomasz Długosz, tomek3d@gmail.com'
+__copyright__ = ('2011, Piotr Kontek, piotr.kontek@gmail.com '
+                 '2013-2018, Tomasz Długosz, tomek3d@gmail.com')
 
 import re
 
@@ -50,7 +50,7 @@ class GN(BasicNewsRecipe):
              }]
         feeds.append((u'Na dobry początek', articles))
         # columns:
-        for addr in soup.findAll('a', attrs={'href': re.compile('kategoria')}):
+        for addr in soup.findAll('a', attrs={'href': re.compile(r'kategoria')}):
             if not addr.span:
                 main_block = self.index_to_soup(
                     'http://www.gosc.pl' + addr['href'])
diff --git a/recipes/gram_pl.recipe b/recipes/gram_pl.recipe
index ca5d843478..23651191fc 100644
--- a/recipes/gram_pl.recipe
+++ b/recipes/gram_pl.recipe
@@ -44,7 +44,7 @@ class Gram_pl(BasicNewsRecipe):
                 tag.p.insert(len(tag.p.contents) - 2,
                              BeautifulSoup('<h2>Ocena: {0}</h2>'.format(rate)).h2)
         for a in soup.findAll('a', href=True):
-            if 'http://' not in a['href'] and 'https://' not in a['href']:  # noqa
+            if 'http://' not in a['href'] and 'https://' not in a['href']:
                 a['href'] = self.index + a['href']
         tag = soup.find(name='span', attrs={'class': 'platforma'})
         if tag:
diff --git a/recipes/grani.recipe b/recipes/grani.recipe
index 8c0c0bec11..5509434320 100644
--- a/recipes/grani.recipe
+++ b/recipes/grani.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Grani(BasicNewsRecipe):
     title = '\u0413\u0440\u0430\u043D\u0438.\u0420\u0443'
     __author__ = 'bugmen00t'
-    description = '\u0415\u0436\u0435\u0434\u043D\u0435\u0432\u043D\u0430\u044F \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0433\u0430\u0437\u0435\u0442\u0430. \u041E\u0431\u0437\u043E\u0440\u044B \u0438 \u0430\u043D\u0430\u043B\u0438\u0437 \u0440\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u0438\u0445 \u0438 \u043C\u0438\u0440\u043E\u0432\u044B\u0445 \u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u0441\u043E\u0431\u044B\u0442\u0438\u0439, \u0441\u0442\u0430\u0442\u044C\u0438 \u0438 \u0432\u0438\u0434\u0435\u043E \u043E \u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u0437\u0430\u043A\u043B\u044E\u0447\u0451\u043D\u043D\u044B\u0445.'  # noqa
+    description = '\u0415\u0436\u0435\u0434\u043D\u0435\u0432\u043D\u0430\u044F \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0433\u0430\u0437\u0435\u0442\u0430. \u041E\u0431\u0437\u043E\u0440\u044B \u0438 \u0430\u043D\u0430\u043B\u0438\u0437 \u0440\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u0438\u0445 \u0438 \u043C\u0438\u0440\u043E\u0432\u044B\u0445 \u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u0441\u043E\u0431\u044B\u0442\u0438\u0439, \u0441\u0442\u0430\u0442\u044C\u0438 \u0438 \u0432\u0438\u0434\u0435\u043E \u043E \u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u0437\u0430\u043A\u043B\u044E\u0447\u0451\u043D\u043D\u044B\u0445.'  # noqa: E501
     publisher = '\u041E\u041E\u041E "\u0424\u043B\u0430\u0432\u0443\u0441"'
     category = 'newspaper'
     cover_url = u'https://graniru.org/files/96172.png'
@@ -21,7 +21,7 @@ class Grani(BasicNewsRecipe):
 
     remove_tags_before = dict(name='h3')
 
-    remove_tags_after = dict(name='div', attrs={'class': 'main-text clearfix'}),
+    remove_tags_after = dict(name='div', attrs={'class': 'main-text clearfix'})
 
     # Original feeds
     #    feeds = [
diff --git a/recipes/granta.recipe b/recipes/granta.recipe
index 910e0a2cf5..3b84de65a6 100644
--- a/recipes/granta.recipe
+++ b/recipes/granta.recipe
@@ -47,18 +47,18 @@ def multiply_with_unknown_component(first_comp, second_comp, result):
 
 
 def solve_captcha(captcha):
-    # # Convert from a word problem into a numeric problem
+    # Convert from a word problem into a numeric problem
     numeric_problem = ''
     for part in captcha.split(' '):
         numeric_problem = numeric_problem + str(text2num(part))
 
     # Parse into parts
     pattern = re.compile(
-            u'(?P<first_component>[0-9]+)?'
-            u'\\s*(?P<operator>[+×−])\\s*'
-            u'(?P<second_component>[0-9]+)'
-            u'\\s*(=)\\s*'
-            u'(?P<result>[0-9]+)?', re.UNICODE)
+            r'(?P<first_component>[0-9]+)?'
+            u'\\s*(?P<operator>[+×−])\\s*'  # noqa: RUF039
+            r'(?P<second_component>[0-9]+)'
+            r'\s*(=)\s*'
+            r'(?P<result>[0-9]+)?', re.UNICODE)
 
     calculationParts = re.search(pattern, numeric_problem)
     if calculationParts is None:
@@ -138,14 +138,14 @@ Magnitude = {
 
 
 def text2num(s):
-    a = re.split(r"[\s-]+", s)
+    a = re.split(r'[\s-]+', s)
     n = 0
     g = 0
     for w in a:
         x = Small.get(w, None)
         if x is not None:
             g += x
-        elif w == "hundred" and g != 0:
+        elif w == 'hundred' and g != 0:
             g *= 100
         else:
             x = Magnitude.get(w, None)
@@ -195,7 +195,7 @@ class Granta(BasicNewsRecipe):
                 if captcha_question is not None:
                     captcha = str(solve_captcha(captcha_question))
 
-            br.select_form(method="post", action="https://granta.com/")
+            br.select_form(method='post', action='https://granta.com/')
             br['username'] = self.username
             br['password'] = self.password
             br['capcha'] = captcha
diff --git a/recipes/grantland.recipe b/recipes/grantland.recipe
index c0d400e84f..8500ea5313 100644
--- a/recipes/grantland.recipe
+++ b/recipes/grantland.recipe
@@ -4,7 +4,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class GrantLand(BasicNewsRecipe):
-    title = u"Grantland"
+    title = u'Grantland'
     description = 'Writings on Sports & Pop Culture'
     language = 'en'
     __author__ = 'barty on mobileread.com forum'
@@ -47,11 +47,11 @@ class GrantLand(BasicNewsRecipe):
 
         for category in self.CATEGORIES:
 
-            (cat_name, tag, max_articles) = category
+            cat_name, tag, max_articles = category
             self.log('Reading category:', cat_name)
             articles = []
 
-            page = "%s/%s" % (self.INDEX, tag)
+            page = '%s/%s' % (self.INDEX, tag)
             soup = self.index_to_soup(page)
 
             main = soup.find('div', id='col-main')
diff --git a/recipes/greensboro_news_and_record.recipe b/recipes/greensboro_news_and_record.recipe
index 003d0f3c74..1e04fb8864 100644
--- a/recipes/greensboro_news_and_record.recipe
+++ b/recipes/greensboro_news_and_record.recipe
@@ -8,7 +8,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class NewsandRecord(BasicNewsRecipe):
     title = u'Greensboro News & Record'
-    description = "News from Greensboro, North Carolina"
+    description = 'News from Greensboro, North Carolina'
     __author__ = 'Walt Anthony'
     publisher = 'News & Record and Landmark Media Enterprises, LLC'
     category = 'news, USA'
@@ -27,11 +27,11 @@ class NewsandRecord(BasicNewsRecipe):
 
     feeds = [
         ('News', 'http://www.greensboro.com/search/?q=&t=article&l=10&d=&d1=&d2=&s=start_time&sd=desc&c[]=news,news/*&f=rss'),
-        ('Greensboro News', 'http://www.greensboro.com/search/?q=&t=article&l=100&d=&d1=&d2=&s=start_time&sd=desc&nsa=eedition&c[]=news/local,news/crime,news/goverment,news/schools,news/rockingham_county,news/local,news/crime,news/goverment,news/schools,news/rockingham_county/*&f=rss'),  # noqa
+        ('Greensboro News', 'http://www.greensboro.com/search/?q=&t=article&l=100&d=&d1=&d2=&s=start_time&sd=desc&nsa=eedition&c[]=news/local,news/crime,news/goverment,news/schools,news/rockingham_county,news/local,news/crime,news/goverment,news/schools,news/rockingham_county/*&f=rss'),  # noqa: E501
         ('Business', 'http://www.greensboro.com/search/?q=&t=article&l=10&d=&d1=&d2=&s=start_time&sd=desc&c[]=business,business/*&f=rss'),
-        ('Local Business', 'http://www.greensboro.com/search/?q=&t=article&l=100&d=&d1=&d2=&s=start_time&sd=desc&nsa=eedition&c[]=business/local_business,business/local_business/*&f=rss'),  # noqa
+        ('Local Business', 'http://www.greensboro.com/search/?q=&t=article&l=100&d=&d1=&d2=&s=start_time&sd=desc&nsa=eedition&c[]=business/local_business,business/local_business/*&f=rss'),  # noqa: E501
         ('Sports', 'http://www.greensboro.com/search/?q=&t=article&l=10&d=&d1=&d2=&s=start_time&sd=desc&c[]=sports,sports/*&f=rss'),
-        ('College Sports', 'http://www.greensboro.com/search/?q=&t=article&l=100&d=&d1=&d2=&s=start_time&sd=desc&nsa=eedition&c[]=sports/college,sports/college/*&f=rss'),  # noqa
-        ('Sports Extra', 'http://www.greensboro.com/search/?q=&t=article&l=100&d=&d1=&d2=&s=start_time&sd=desc&nsa=eedition&c[]=blogs/sports_extra,blogs/sports_extra/*&f=rss'),  # noqa
+        ('College Sports', 'http://www.greensboro.com/search/?q=&t=article&l=100&d=&d1=&d2=&s=start_time&sd=desc&nsa=eedition&c[]=sports/college,sports/college/*&f=rss'),  # noqa: E501
+        ('Sports Extra', 'http://www.greensboro.com/search/?q=&t=article&l=100&d=&d1=&d2=&s=start_time&sd=desc&nsa=eedition&c[]=blogs/sports_extra,blogs/sports_extra/*&f=rss'),  # noqa: E501
         ('Life', 'http://www.greensboro.com/search/?q=&t=article&l=10&d=&d1=&d2=&s=start_time&sd=desc&c[]=life,life/*&f=rss'),
     ]
diff --git a/recipes/gry_online_pl.recipe b/recipes/gry_online_pl.recipe
index d769443d29..d9a8771873 100644
--- a/recipes/gry_online_pl.recipe
+++ b/recipes/gry_online_pl.recipe
@@ -21,7 +21,7 @@ class GryOnlinePl(BasicNewsRecipe):
     keep_only_tags = [dict(name='div', attrs={'class': [
                            'gc660', 'gc660 S013', 'news_endpage_tit', 'news_container', 'news']})]
     remove_tags = [
-        dict({'class': ['nav-social', 'add-info', 'smlb', 'lista lista3 lista-gry', 'S013po', 'S013-npb', 'zm_gfx_cnt_bottom', 'ocen-txt', 'wiecej-txt', 'wiecej-txt2', 'social-for-old-news', 'social-for-old-rec']})]  # noqa
+        {'class': ['nav-social', 'add-info', 'smlb', 'lista lista3 lista-gry', 'S013po', 'S013-npb', 'zm_gfx_cnt_bottom', 'ocen-txt', 'wiecej-txt', 'wiecej-txt2', 'social-for-old-news', 'social-for-old-rec']}]  # noqa: E501
     feeds = [
         (u'Newsy', 'http://www.gry-online.pl/rss/news.xml'),
         ('Teksty', u'http://www.gry-online.pl/rss/teksty.xml')]
@@ -33,8 +33,7 @@ class GryOnlinePl(BasicNewsRecipe):
             url_part = soup.find('link', attrs={'rel': 'canonical'})['href']
             url_part = url_part[25:].rpartition('?')[0]
             for nexturl in nexturls[1:-1]:
-                finalurl = 'http://www.gry-online.pl/' + \
-                    url_part + nexturl['href']
+                finalurl = 'http://www.gry-online.pl/' + url_part + nexturl['href']
                 for i in range(10):
                     try:
                         soup2 = self.index_to_soup(finalurl)
@@ -69,8 +68,7 @@ class GryOnlinePl(BasicNewsRecipe):
                         break
                     else:
                         nexturl = tag.a
-                    finalurl = 'http://www.gry-online.pl/' + \
-                        url_part + nexturl['href']
+                    finalurl = 'http://www.gry-online.pl/' + url_part + nexturl['href']
                     for i in range(10):
                         try:
                             soup2 = self.index_to_soup(finalurl)
diff --git a/recipes/gsp.recipe b/recipes/gsp.recipe
index 6a2e611ab4..af9e2f5299 100644
--- a/recipes/gsp.recipe
+++ b/recipes/gsp.recipe
@@ -29,7 +29,7 @@ class GSP(BasicNewsRecipe):
         'comments': description, 'tags': category, 'language': language, 'publisher': publisher
     }
 
-    keep_only_tags = [dict(name='h1', attrs={'class': 'serif title_2'}), dict(name='div', attrs={'id': 'only_text'}), dict(name='span', attrs={'class': 'block poza_principala'})  # noqa
+    keep_only_tags = [dict(name='h1', attrs={'class': 'serif title_2'}), dict(name='div', attrs={'id': 'only_text'}), dict(name='span', attrs={'class': 'block poza_principala'})  # noqa: E501
                       ]
 
     feeds = [(u'\u0218tiri', u'http://www.gsp.ro/rss.xml')]
diff --git a/recipes/guardian.recipe b/recipes/guardian.recipe
index cf6df01729..9e05967e4a 100644
--- a/recipes/guardian.recipe
+++ b/recipes/guardian.recipe
@@ -22,10 +22,10 @@ class Guardian(BasicNewsRecipe):
 
     title = u'The Guardian and The Observer'
     is_observer = False
-    base_url = "https://www.theguardian.com/uk"
+    base_url = 'https://www.theguardian.com/uk'
     if date.today().weekday() == 6:
         is_observer = True
-        base_url = "https://www.theguardian.com/observer"
+        base_url = 'https://www.theguardian.com/observer'
 
     __author__ = 'Kovid Goyal'
     language = 'en_GB'
@@ -64,7 +64,7 @@ class Guardian(BasicNewsRecipe):
         classes('content__article-body js-bottom-marker article-body-commercial-selector'),
     ]
 
-    extra_css = """
+    extra_css = '''
             img {
                 max-width: 100% !important;
                 max-height: 100% !important;
@@ -78,7 +78,7 @@ class Guardian(BasicNewsRecipe):
                 font-size: 0.5em;
                 color: #6B6B6B;
             }
-        """
+        '''
 
     def get_browser(self, *a, **kw):
         # This site returns images in JPEG-XR format if the user agent is IE
diff --git a/recipes/gva_be.recipe b/recipes/gva_be.recipe
index e2f304f26e..6ba7792ffc 100644
--- a/recipes/gva_be.recipe
+++ b/recipes/gva_be.recipe
@@ -50,10 +50,10 @@ class GazetvanAntwerpen(BasicNewsRecipe):
     remove_tags = [
         dict(name=['embed', 'object']),
         dict(name='div', attrs={'class': ['note NotePortrait', 'note']}),
-        dict(name='ul', attrs={'class': re.compile('article__share')}),
+        dict(name='ul', attrs={'class': re.compile(r'article__share')}),
         dict(name='div', attrs={'class': 'slideshow__controls'}),
         dict(name='a', attrs={'role': 'button'}),
-        dict(name='figure', attrs={'class': re.compile('video')})
+        dict(name='figure', attrs={'class': re.compile(r'video')})
     ]
 
     remove_attributes = ['width', 'height']
diff --git a/recipes/haaretz_en.recipe b/recipes/haaretz_en.recipe
index 525194c5d4..951687c1f7 100644
--- a/recipes/haaretz_en.recipe
+++ b/recipes/haaretz_en.recipe
@@ -33,13 +33,13 @@ class Haaretz_en(BasicNewsRecipe):
     PREFIX = 'https://www.haaretz.com'
     LOGIN = 'https://services.haaretz.com/ms-sso/loginUrlEncoded'
     LOGOUT = 'https://services.haaretz.com/ms-sso/logout'
-    extra_css             = """
+    extra_css             = '''
                                 body{font-family: Merriweather, "Helvetica Neue", Helvetica, Arial, sans-serif }
                                 div.mx time{display: none}
                                 div.my time{display: none}
                                 div.mq time{display: none}
                                 div.mr time{display: none}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'publisher': publisher, 'language': language
diff --git a/recipes/habr_ru.recipe b/recipes/habr_ru.recipe
index 3c4b7ce4e4..b3bebccfa3 100644
--- a/recipes/habr_ru.recipe
+++ b/recipes/habr_ru.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Habr(BasicNewsRecipe):
     title = '\u0425\u0430\u0431\u0440'
     __author__ = 'bugmen00t'
-    description = '\u041D\u0430 \u200B\u0425\u0430\u0431\u0440\u0435 \u200B\u0434\u0443\u043C\u0430\u044E\u0449\u0438\u0435 \u200B\u043B\u044E\u0434\u0438 \u200B\u0434\u0435\u043B\u044F\u0442\u0441\u044F \u200B\u0443\u043D\u0438\u043A\u0430\u043B\u044C\u043D\u044B\u043C \u200B\u200B\u043E\u043F\u044B\u0442\u043E\u043C. \u200B\u200B\u0417\u0434\u0435\u0441\u044C \u0431\u0443\u0434\u0435\u0442 \u200B\u200B\u043E\u0434\u0438\u043D\u0430\u043A\u043E\u0432\u043E \u200B\u0438\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u043E \u200B\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0438\u0441\u0442\u0430\u043C \u200B\u0438 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0430\u043C, \u200B\u200B\u0430\u0434\u043C\u0438\u043D\u0430\u043C \u200B\u0438 \u0440\u0435\u043A\u043B\u0430\u043C\u0449\u0438\u043A\u0430\u043C, \u200B\u0430\u043D\u0430\u043B\u0438\u0442\u0438\u043A\u0430\u043C \u200B\u0438 \u0434\u0438\u0437\u0430\u0439\u043D\u0435\u0440\u0430\u043C, \u200B\u043C\u0435\u043D\u0435\u0434\u0436\u0435\u0440\u0430\u043C \u200B\u0432\u044B\u0441\u0448\u0435\u0433\u043E \u200B\u0438 \u0441\u0440\u0435\u0434\u043D\u0435\u0433\u043E \u200B\u0437\u0432\u0435\u043D\u0430, \u200B\u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0430\u043C \u200B\u043A\u0440\u0443\u043F\u043D\u044B\u0445 \u200B\u043A\u043E\u043C\u043F\u0430\u043D\u0438\u0439 \u200B\u0438 \u043D\u0435\u0431\u043E\u043B\u044C\u0448\u0438\u0445 \u200B\u0444\u0438\u0440\u043C, \u200B\u0430 \u0442\u0430\u043A\u0436\u0435 \u200B\u0432\u0441\u0435\u043C \u200B\u0442\u0435\u043C, \u200B\u0434\u043B\u044F \u043A\u043E\u0433\u043E \u200BIT \u2014 \u200B\u044D\u0442\u043E \u043D\u0435 \u043F\u0440\u043E\u0441\u0442\u043E \u200B\u0434\u0432\u0435 \u0431\u0443\u043A\u0432\u044B \u200B\u0430\u043B\u0444\u0430\u0432\u0438\u0442\u0430.'  # noqa
+    description = '\u041D\u0430 \u200B\u0425\u0430\u0431\u0440\u0435 \u200B\u0434\u0443\u043C\u0430\u044E\u0449\u0438\u0435 \u200B\u043B\u044E\u0434\u0438 \u200B\u0434\u0435\u043B\u044F\u0442\u0441\u044F \u200B\u0443\u043D\u0438\u043A\u0430\u043B\u044C\u043D\u044B\u043C \u200B\u200B\u043E\u043F\u044B\u0442\u043E\u043C. \u200B\u200B\u0417\u0434\u0435\u0441\u044C \u0431\u0443\u0434\u0435\u0442 \u200B\u200B\u043E\u0434\u0438\u043D\u0430\u043A\u043E\u0432\u043E \u200B\u0438\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u043E \u200B\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0438\u0441\u0442\u0430\u043C \u200B\u0438 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0430\u043C, \u200B\u200B\u0430\u0434\u043C\u0438\u043D\u0430\u043C \u200B\u0438 \u0440\u0435\u043A\u043B\u0430\u043C\u0449\u0438\u043A\u0430\u043C, \u200B\u0430\u043D\u0430\u043B\u0438\u0442\u0438\u043A\u0430\u043C \u200B\u0438 \u0434\u0438\u0437\u0430\u0439\u043D\u0435\u0440\u0430\u043C, \u200B\u043C\u0435\u043D\u0435\u0434\u0436\u0435\u0440\u0430\u043C \u200B\u0432\u044B\u0441\u0448\u0435\u0433\u043E \u200B\u0438 \u0441\u0440\u0435\u0434\u043D\u0435\u0433\u043E \u200B\u0437\u0432\u0435\u043D\u0430, \u200B\u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0430\u043C \u200B\u043A\u0440\u0443\u043F\u043D\u044B\u0445 \u200B\u043A\u043E\u043C\u043F\u0430\u043D\u0438\u0439 \u200B\u0438 \u043D\u0435\u0431\u043E\u043B\u044C\u0448\u0438\u0445 \u200B\u0444\u0438\u0440\u043C, \u200B\u0430 \u0442\u0430\u043A\u0436\u0435 \u200B\u0432\u0441\u0435\u043C \u200B\u0442\u0435\u043C, \u200B\u0434\u043B\u044F \u043A\u043E\u0433\u043E \u200BIT \u2014 \u200B\u044D\u0442\u043E \u043D\u0435 \u043F\u0440\u043E\u0441\u0442\u043E \u200B\u0434\u0432\u0435 \u0431\u0443\u043A\u0432\u044B \u200B\u0430\u043B\u0444\u0430\u0432\u0438\u0442\u0430.'  # noqa: E501
     publisher = 'Habr Blockchain Publishing LTD'
     category = 'blog'
     cover_url = u'https://habr.com/img/habr_ru.png'
diff --git a/recipes/hackernews.recipe b/recipes/hackernews.recipe
index ef6e367d40..3d9656c158 100644
--- a/recipes/hackernews.recipe
+++ b/recipes/hackernews.recipe
@@ -71,14 +71,12 @@ class HNWithCommentsLink(BasicNewsRecipe):
         for td in main.findAll('td', 'default'):
             comhead = td.find('span', 'comhead')
             if comhead:
-                com_title = u'<h4>' + \
-                    self.tag_to_string(comhead).replace(
-                        ' | link', '') + u'</h4>'
+                com_title = u'<h4>' + self.tag_to_string(comhead).replace(' | link', '') + u'</h4>'
                 comhead.parent.extract()
                 br = td.find('br')
                 if br:
                     br.extract()
-                reply = td.find('a', attrs={'href': re.compile('^reply?')})
+                reply = td.find('a', attrs={'href': re.compile(r'^reply?')})
                 if reply:
                     reply.parent.extract()
                 td.name = 'div'
@@ -86,8 +84,8 @@ class HNWithCommentsLink(BasicNewsRecipe):
                 td['style'] = 'padding-left: ' + str(indent_width) + 'px'
                 comments = comments + com_title + td.prettify()
 
-        body = u'<h3>' + title + u'</h3><p><a href="' + link + u'">' + readable_link + \
-            u'</a><br/><strong>' + subtext + u'</strong></p>' + title_content + u'<br/>'
+        body = (u'<h3>' + title + u'</h3><p><a href="' + link + u'">' + readable_link +
+                u'</a><br/><strong>' + subtext + u'</strong></p>' + title_content + u'<br/>')
         body = body + comments
         return u'<html><title>' + title + u'</title><body>' + body + '</body></html>'
 
@@ -114,8 +112,7 @@ class HNWithCommentsLink(BasicNewsRecipe):
             else:
                 content = self.get_readable_content(url)
 
-        # content = re.sub(r'</body>\s*</html>\s*$', '', content) + \
-        #    article.summary + '</body></html>'
+        # content = re.sub(r'</body>\s*</html>\s*$', '', content) + article.summary + '</body></html>'
 
         if not isinstance(content, bytes):
             content = content.encode('utf-8')
@@ -136,7 +133,7 @@ class HNWithCommentsLink(BasicNewsRecipe):
         article.text_summary = self.prettyify_url(article.url)
         article.summary = article.text_summary
 
-#    def parse_index(self):
-#        feeds = []
-#        feeds.append((u'Hacker News',[{'title': 'Testing', 'url': 'https://news.ycombinator.com/item?id=2935944'}]))
-#        return feeds
+    # def parse_index(self):
+    #     feeds = []
+    #     feeds.append((u'Hacker News',[{'title': 'Testing', 'url': 'https://news.ycombinator.com/item?id=2935944'}]))
+    #     return feeds
diff --git a/recipes/hamilton_spectator.recipe b/recipes/hamilton_spectator.recipe
index 92180b75ea..57aed48530 100644
--- a/recipes/hamilton_spectator.recipe
+++ b/recipes/hamilton_spectator.recipe
@@ -5,10 +5,12 @@ from calibre.web.feeds.news import BasicNewsRecipe, classes
 Hamilton Spectator Calibre Recipe
 '''
 
+
 def absurl(url):
     if url.startswith('/'):
         return 'https://www.thespec.com' + url
 
+
 class HamiltonSpectator(BasicNewsRecipe):
     title = u'Hamilton Spectator'
     max_articles_per_feed = 50
diff --git a/recipes/handelsblatt.recipe b/recipes/handelsblatt.recipe
index f8285cb48a..3984579592 100644
--- a/recipes/handelsblatt.recipe
+++ b/recipes/handelsblatt.recipe
@@ -59,7 +59,7 @@ class Handelsblatt(BasicNewsRecipe):
         dict(name='aside', attrs={'class': ['vhb-article-element vhb-left',
                                             'vhb-article-element vhb-left vhb-teasergallery',
                                             'vhb-article-element vhb-left vhb-shorttexts']}),
-        dict(name='aside', attrs={'class': re.compile('vhb-club-events')}),
+        dict(name='aside', attrs={'class': re.compile(r'vhb-club-events')}),
         dict(name='article', attrs={'class': ['vhb-imagegallery vhb-teaser',
                                               'vhb-teaser vhb-type-video']}),
         dict(name='small', attrs={'class': ['vhb-credit']}),
@@ -70,14 +70,14 @@ class Handelsblatt(BasicNewsRecipe):
                                           'opinary-widget-wrapper',
                                           'vhb-article__content-element--shorttextgallery',
                                           'vhb-hollow-area vhb-hollow-area--col-1']}),
-        dict(name='div', attrs={'class': re.compile('stepstone')}),
-        dict(name='div', attrs={'class': re.compile('vhb-imagegallery')}),
+        dict(name='div', attrs={'class': re.compile(r'stepstone')}),
+        dict(name='div', attrs={'class': re.compile(r'vhb-imagegallery')}),
         dict(name='div', attrs={'id': ['highcharts_infografik']}),
-        dict(name='div', attrs={'id': re.compile('dax-sentiment')}),
-        dict(name=['div', 'section'], attrs={'class': re.compile('slider')}),
+        dict(name='div', attrs={'id': re.compile(r'dax-sentiment')}),
+        dict(name=['div', 'section'], attrs={'class': re.compile(r'slider')}),
         dict(name='a', attrs={'class': ['twitter-follow-button']}),
         dict(name='img', attrs={'class': ['highlight-icon', 'lb-author__avatar', 'pin-icon']}),
-        dict(name='img', attrs={'alt': re.compile('Handelsblatt Morning Briefing')}),
+        dict(name='img', attrs={'alt': re.compile(r'Handelsblatt Morning Briefing')}),
         dict(name=['blockquote', 'button', 'link'])
     ]
 
@@ -92,17 +92,17 @@ class Handelsblatt(BasicNewsRecipe):
         (re.compile(r'( data-src=")([^"]*")', re.IGNORECASE), lambda match: ' src="' + match.group(2))
     ]
 
-    extra_css = 'h2 {font-size: 1em; text-align: left} \
-                 h3 {font-size: 1em; text-align: left} \
-                 h4 {font-size: 1em; text-align: left; margin-bottom: 0em} \
-                 em {font-style: normal; font-weight: bold} \
-                 .vhb-subline {font-weight: normal; text-transform: uppercase} \
-                 .vhb-headline {font-size: 1.6em} \
-                 .vhb-teaser-head {margin-top: 1em; margin-bottom: 1em} \
-                 .vhb-hollow-area--innercontent {font-size: 0.6em} \
-                 .hcf-location-mark {font-weight: bold} \
-                 .lb-post-header {margin-top: 1em} \
-                 .panel-body p {margin-top: 0em}'
+    extra_css = '''h2 {font-size: 1em; text-align: left}
+                   h3 {font-size: 1em; text-align: left}
+                   h4 {font-size: 1em; text-align: left; margin-bottom: 0em}
+                   em {font-style: normal; font-weight: bold}
+                   .vhb-subline {font-weight: normal; text-transform: uppercase}
+                   .vhb-headline {font-size: 1.6em}
+                   .vhb-teaser-head {margin-top: 1em; margin-bottom: 1em}
+                   .vhb-hollow-area--innercontent {font-size: 0.6em}
+                   .hcf-location-mark {font-weight: bold}
+                   .lb-post-header {margin-top: 1em}
+                   .panel-body p {margin-top: 0em}'''
 
     def get_browser(self):
         br = BasicNewsRecipe.get_browser(self)
@@ -138,7 +138,7 @@ class Handelsblatt(BasicNewsRecipe):
 
     def postprocess_html(self, soup, first_fetch):
         # convert lists of author(s) and date(s) into simple text
-        for cap in soup.find_all('div', {'class': re.compile('vhb-article-caption')}):
+        for cap in soup.find_all('div', {'class': re.compile(r'vhb-article-caption')}):
             cap.replace_with(cap.encode_contents().decode('utf-8').strip() + ' ')
         for row in soup.find_all('div', {'class': 'vhb-article-author-row'}):
             for ul in row.find_all('ul'):
@@ -160,7 +160,7 @@ class Handelsblatt(BasicNewsRecipe):
             fig.find('div', {'class': 'vhb-caption'}).replace_with(cap)
         # remove references to related articles
         for strong in soup.find_all('strong'):
-            if strong.string and (re.match('^Mehr:? ?', strong.string) or re.match('^>>.*', strong.string)):
+            if strong.string and (re.match(r'^Mehr:? ?', strong.string) or re.match(r'^>>.*', strong.string)):
                 p_parent = strong.find_parent('p')
                 if p_parent:
                     p_parent.decompose()
diff --git a/recipes/hankyoreh21.recipe b/recipes/hankyoreh21.recipe
index 3113df68e7..f89476c9f9 100644
--- a/recipes/hankyoreh21.recipe
+++ b/recipes/hankyoreh21.recipe
@@ -36,4 +36,4 @@ class Hankyoreh21(BasicNewsRecipe):
 
     def get_article_url(self, article):
         org_url = BasicNewsRecipe.get_article_url(self, article)
-        return "http://h21.hani.co.kr" + org_url if org_url[0] == '/' else org_url
+        return 'http://h21.hani.co.kr' + org_url if org_url[0] == '/' else org_url
diff --git a/recipes/hannoversche_zeitung.recipe b/recipes/hannoversche_zeitung.recipe
index 9a2525e09a..5b33cec208 100644
--- a/recipes/hannoversche_zeitung.recipe
+++ b/recipes/hannoversche_zeitung.recipe
@@ -29,9 +29,8 @@ class AdvancedUserRecipe1287519083(BasicNewsRecipe):
     remove_tags_before = dict(id='modul_artikel')
     remove_tags_after = dict(id='articlecontent')
 
-    remove_tags = dict(id='articlesidebar')
-
     remove_tags = [
+        dict(id='articlesidebar'),
         dict(name='div', attrs={'class': ['articlecomment',
                                           'articlebookmark', 'teaser_anzeige', 'teaser_umfrage',
                                           'navigation', 'subnavigation']})
diff --git a/recipes/harpers.recipe b/recipes/harpers.recipe
index ee83add22c..e8bd34366c 100644
--- a/recipes/harpers.recipe
+++ b/recipes/harpers.recipe
@@ -35,7 +35,6 @@ class Harpers(BasicNewsRecipe):
     remove_tags = [
         classes('header-controls')
     ]
-    remove_attributes = ["style", "width", "height"]
 
     extra_css = '''
         img {display:block; margin:0 auto;}
@@ -64,8 +63,8 @@ class Harpers(BasicNewsRecipe):
     }
 
     def parse_index(self):
-        issues_soup = self.index_to_soup("https://harpers.org/issues/")
-        a_ele = issues_soup.select_one("div.issue-card a")
+        issues_soup = self.index_to_soup('https://harpers.org/issues/')
+        a_ele = issues_soup.select_one('div.issue-card a')
         self.timefmt = ' [' + self.tag_to_string(a_ele.find(attrs={'class':'issue-title'})) + ']'
         url = a_ele['href']
 
diff --git a/recipes/hbr.recipe b/recipes/hbr.recipe
index 4dcde07c4e..8b326a18af 100644
--- a/recipes/hbr.recipe
+++ b/recipes/hbr.recipe
@@ -12,28 +12,28 @@ from calibre.web.feeds.news import BasicNewsRecipe, classes
 
 
 class HBR(BasicNewsRecipe):
-    title = "Harvard Business Review"
-    __author__ = "unkn0wn, updated by ping"
+    title = 'Harvard Business Review'
+    __author__ = 'unkn0wn, updated by ping'
     description = (
-        "Harvard Business Review is the leading destination for smart management thinking. "
-        "Through its flagship magazine, books, and digital content and tools published on HBR.org, "
-        "Harvard Business Review aims to provide professionals around the world with rigorous insights "
-        "and best practices to help lead themselves and their organizations more effectively and to "
-        "make a positive impact."
+        'Harvard Business Review is the leading destination for smart management thinking. '
+        'Through its flagship magazine, books, and digital content and tools published on HBR.org, '
+        'Harvard Business Review aims to provide professionals around the world with rigorous insights '
+        'and best practices to help lead themselves and their organizations more effectively and to '
+        'make a positive impact.'
     )
-    language = "en"
-    masthead_url = "https://hbr.org/resources/css/images/hbr_logo.svg"
-    publication_type = "magazine"
-    encoding = "utf-8"
+    language = 'en'
+    masthead_url = 'https://hbr.org/resources/css/images/hbr_logo.svg'
+    publication_type = 'magazine'
+    encoding = 'utf-8'
     remove_javascript = True
     no_stylesheets = True
     auto_cleanup = False
     compress_news_images = True
-    ignore_duplicate_articles = {"url"}
-    base_url = "https://hbr.org"
+    ignore_duplicate_articles = {'url'}
+    base_url = 'https://hbr.org'
 
-    remove_attributes = ["height", "width", "style"]
-    extra_css = """
+    remove_attributes = ['height', 'width', 'style']
+    extra_css = '''
         h1.article-hed { font-size: x-large; margin-bottom: 0.4rem; }
         .article-dek {  font-size: large; font-style: italic; margin-bottom: 1rem; }
         .article-byline { margin-top: 0.7rem; font-size: medium; font-style: normal; font-weight: bold; }
@@ -50,35 +50,35 @@ class HBR(BasicNewsRecipe):
             padding-top: 0.5rem;
             font-style: italic;
         }
-        """
+        '''
 
     keep_only_tags = [
         classes(
-            "headline-container article-dek-group pub-date hero-image-content "
-            "article-body standard-content"
+            'headline-container article-dek-group pub-date hero-image-content '
+            'article-body standard-content'
         ),
     ]
 
     remove_tags = [
         classes(
-            "left-rail--container translate-message follow-topic "
-            "newsletter-container by-prefix related-topics--common"
+            'left-rail--container translate-message follow-topic '
+            'newsletter-container by-prefix related-topics--common'
         ),
-        dict(name=["article-sidebar"]),
+        dict(name=['article-sidebar']),
     ]
 
     def preprocess_raw_html(self, raw_html, article_url):
         soup = self.soup(raw_html)
 
         # break author byline out of list
-        byline_list = soup.find("ul", class_="article-byline-list")
+        byline_list = soup.find('ul', class_='article-byline-list')
         if byline_list:
             byline = byline_list.parent
             byline.append(
-                ", ".join(
+                ', '.join(
                     [
                         self.tag_to_string(author)
-                        for author in byline_list.find_all(class_="article-author")
+                        for author in byline_list.find_all(class_='article-author')
                     ]
                 )
             )
@@ -86,44 +86,44 @@ class HBR(BasicNewsRecipe):
 
         # Extract full article content
         content_ele = soup.find(
-            "content",
+            'content',
             attrs={
-                "data-index": True,
-                "data-page-year": True,
-                "data-page-month": True,
-                "data-page-seo-title": True,
-                "data-page-slug": True,
+                'data-index': True,
+                'data-page-year': True,
+                'data-page-month': True,
+                'data-page-seo-title': True,
+                'data-page-slug': True,
             },
         )
-        endpoint_url = "https://hbr.org/api/article/piano/content?" + urlencode(
+        endpoint_url = 'https://hbr.org/api/article/piano/content?' + urlencode(
             {
-                "year": content_ele["data-page-year"],
-                "month": content_ele["data-page-month"],
-                "seotitle": content_ele["data-page-seo-title"],
+                'year': content_ele['data-page-year'],
+                'month': content_ele['data-page-month'],
+                'seotitle': content_ele['data-page-seo-title'],
             }
         )
         data = {
-            "contentKey": content_ele["data-index"],
-            "pageSlug": content_ele["data-page-slug"],
+            'contentKey': content_ele['data-index'],
+            'pageSlug': content_ele['data-page-slug'],
         }
         headers = {
-            "User-Agent": random_user_agent(),
-            "Pragma": "no-cache",
-            "Cache-Control": "no-cache",
-            "Content-Type": "application/json",
-            "Referer": article_url,
+            'User-Agent': random_user_agent(),
+            'Pragma': 'no-cache',
+            'Cache-Control': 'no-cache',
+            'Content-Type': 'application/json',
+            'Referer': article_url,
         }
         br = browser()
         req = Request(
             endpoint_url,
             headers=headers,
             data=json.dumps(data),
-            method="POST",
+            method='POST',
             timeout=self.timeout,
         )
         res = br.open(req)
         article = json.loads(res.read())
-        new_soup = self.soup(article["content"])
+        new_soup = self.soup(article['content'])
         # clear out existing partial content
         for c in list(content_ele.children):
             c.extract()  # use extract() instead of decompose() because of strings
@@ -140,52 +140,52 @@ class HBR(BasicNewsRecipe):
     def parse_index(self):
         d = self.recipe_specific_options.get('issue')
         if not (d and isinstance(d, str)):
-            soup = self.index_to_soup(f"{self.base_url}/magazine")
-            a = soup.find("a", href=lambda x: x and x.startswith("/archive-toc/"))
-            cov_url = a.find("img", attrs={"src": True})["src"]
+            soup = self.index_to_soup(f'{self.base_url}/magazine')
+            a = soup.find('a', href=lambda x: x and x.startswith('/archive-toc/'))
+            cov_url = a.find('img', attrs={'src': True})['src']
             self.cover_url = urljoin(self.base_url, cov_url)
-            issue_url = urljoin(self.base_url, a["href"])
+            issue_url = urljoin(self.base_url, a['href'])
         else:
             issue_url = 'https://hbr.org/archive-toc/BR' + d
-            mobj = re.search(r"archive-toc/(?P<issue>(BR)?\d+)\b", issue_url)
+            mobj = re.search(r'archive-toc/(?P<issue>(BR)?\d+)\b', issue_url)
             if mobj:
                 self.cover_url = f'https://hbr.org/resources/images/covers/{mobj.group("issue")}_500.png'
 
-        self.log("Downloading issue:", issue_url)
+        self.log('Downloading issue:', issue_url)
         soup = self.index_to_soup(issue_url)
-        issue_title = soup.find("h1")
+        issue_title = soup.find('h1')
         if issue_title:
-            self.timefmt = f" [{self.tag_to_string(issue_title)}]"
+            self.timefmt = f' [{self.tag_to_string(issue_title)}]'
 
         feeds = OrderedDict()
-        for h3 in soup.find_all("h3", attrs={"class": "hed"}):
-            article_link_ele = h3.find("a")
+        for h3 in soup.find_all('h3', attrs={'class': 'hed'}):
+            article_link_ele = h3.find('a')
             if not article_link_ele:
                 continue
 
             article_ele = h3.find_next_sibling(
-                "div", attrs={"class": "stream-item-info"}
+                'div', attrs={'class': 'stream-item-info'}
             )
             if not article_ele:
                 continue
 
             title = self.tag_to_string(article_link_ele)
-            url = urljoin(self.base_url, article_link_ele["href"])
+            url = urljoin(self.base_url, article_link_ele['href'])
 
-            authors_ele = article_ele.select("ul.byline li")
-            authors = ", ".join([self.tag_to_string(a) for a in authors_ele])
+            authors_ele = article_ele.select('ul.byline li')
+            authors = ', '.join([self.tag_to_string(a) for a in authors_ele])
 
-            article_desc = ""
-            dek_ele = h3.find_next_sibling("div", attrs={"class": "dek"})
+            article_desc = ''
+            dek_ele = h3.find_next_sibling('div', attrs={'class': 'dek'})
             if dek_ele:
-                article_desc = self.tag_to_string(dek_ele) + " | " + authors
+                article_desc = self.tag_to_string(dek_ele) + ' | ' + authors
             section_ele = (
-                h3.findParent("li")
-                .find_previous_sibling("div", **classes("stream-section-label"))
-                .find("h4")
+                h3.findParent('li')
+                .find_previous_sibling('div', **classes('stream-section-label'))
+                .find('h4')
             )
             section_title = self.tag_to_string(section_ele).title()
             feeds.setdefault(section_title, []).append(
-                {"title": title, "url": url, "description": article_desc}
+                {'title': title, 'url': url, 'description': article_desc}
             )
         return feeds.items()
diff --git a/recipes/heise.recipe b/recipes/heise.recipe
index 886fad31cf..cae53ef938 100644
--- a/recipes/heise.recipe
+++ b/recipes/heise.recipe
@@ -68,4 +68,4 @@ class heiseDe(BasicNewsRecipe):
     ]
 
     def get_article_url(self, article):
-        return article.link + "&view=print"
+        return article.link + '&view=print'
diff --git a/recipes/heise_ct.recipe b/recipes/heise_ct.recipe
index 66ec19a02b..c48c29f9a6 100644
--- a/recipes/heise_ct.recipe
+++ b/recipes/heise_ct.recipe
@@ -108,7 +108,7 @@ class heise_select(BasicNewsRecipe):
                 img = soup.new_tag('img',
                                    src=aimg['href'],
                                    alt=aimg['data-pswp-bu'],
-                                   style="display: block;")
+                                   style='display: block;')
             if img is not None:
                 aimg.replaceWith(img)
 
diff --git a/recipes/heise_ix.recipe b/recipes/heise_ix.recipe
index dadbf1ac94..d4d7fcd1b3 100644
--- a/recipes/heise_ix.recipe
+++ b/recipes/heise_ix.recipe
@@ -109,7 +109,7 @@ class heise_select(BasicNewsRecipe):
                     'img',
                     src=aimg['href'],
                     alt=aimg['data-pswp-bu'],
-                    style="display: block;"
+                    style='display: block;'
                 )
             if img is not None:
                 aimg.replaceWith(img)
diff --git a/recipes/high_country_news.recipe b/recipes/high_country_news.recipe
index 277a516d3a..1972c58b9e 100644
--- a/recipes/high_country_news.recipe
+++ b/recipes/high_country_news.recipe
@@ -50,7 +50,7 @@ class HighCountryNews(BasicNewsRecipe):
     auto_cleanup = False
     remove_javascript = True
     remove_empty_feeds = True
-    remove_attributes = ['width', 'height']
+    remove_attributes = ['style', 'width', 'height']
     use_embedded_content = False
 
     masthead_url = 'http://www.hcn.org/logo.jpg'
@@ -69,8 +69,6 @@ class HighCountryNews(BasicNewsRecipe):
     # caption and credit for description & author of pictures
     # main-topic
 
-    remove_attributes = ['style']
-
     extra_css = '''
                       h1 {font-size: 1.6em; text-align: left}
                       h2 {font-size: 1em; font-style: italic; font-weight: normal}
diff --git a/recipes/himal_southasian.recipe b/recipes/himal_southasian.recipe
index f384bd40b6..13621ac383 100644
--- a/recipes/himal_southasian.recipe
+++ b/recipes/himal_southasian.recipe
@@ -17,6 +17,7 @@ def get_story(story):
         for x in story['story-elements']:
             yield from get_story(x)
 
+
 def img(img):
     yield '<p>'
     if 'image-s3-key' in img:
@@ -25,6 +26,7 @@ def img(img):
         yield '<div class="cap">' + img['title'] + '</div>'
     yield '</p>'
 
+
 class himal(BasicNewsRecipe):
     title = 'Himal Southasian'
     __author__ = 'unkn0wn'
diff --git a/recipes/hindu.recipe b/recipes/hindu.recipe
index c1719195f8..8027919a81 100644
--- a/recipes/hindu.recipe
+++ b/recipes/hindu.recipe
@@ -17,7 +17,7 @@ def absurl(url):
 class TheHindu(BasicNewsRecipe):
     title = 'The Hindu'
     __author__ = 'unkn0wn'
-    description = 'Articles from The Hindu, Today\'s Paper.'
+    description = "Articles from The Hindu, Today's Paper."
     language = 'en_IN'
     no_stylesheets = True
     masthead_url = 'https://www.thehindu.com/theme/images/th-online/thehindu-logo.svg'
@@ -133,7 +133,7 @@ class TheHindu(BasicNewsRecipe):
                         url = absurl(item['href'])
                         desc = 'Page no.' + item['pageno'] + ' | ' + item['teaser_text'] or ''
                         self.log('            ', title, '\n\t', url)
-                        feeds_dict[section].append({"title": title, "url": url, "description": desc})
-                return [(section, articles) for section, articles in feeds_dict.items()]
+                        feeds_dict[section].append({'title': title, 'url': url, 'description': desc})
+                return list(feeds_dict.items())
             else:
                 return []
diff --git a/recipes/hindufeeds.recipe b/recipes/hindufeeds.recipe
index 143cdcdd6a..8d6aba19b2 100644
--- a/recipes/hindufeeds.recipe
+++ b/recipes/hindufeeds.recipe
@@ -74,7 +74,6 @@ class TheHindufeeds(BasicNewsRecipe):
             src.extract()
         return soup
 
-
     def get_cover_url(self):
         soup = self.index_to_soup('https://www.thehindu.com/todays-paper/')
         if cover := soup.find(attrs={'class':'hindu-ad'}):
diff --git a/recipes/hindustan.recipe b/recipes/hindustan.recipe
index 8ca4efe0bd..262ef267f1 100644
--- a/recipes/hindustan.recipe
+++ b/recipes/hindustan.recipe
@@ -28,7 +28,7 @@ class LiveHindustan(BasicNewsRecipe):
     remove_tags_after = [classes('stry-bdy')]
 
     feeds = [
-        ('प्रमुख खबरें' ,'https://feed.livehindustan.com/rss/3127'),
+        ('प्रमुख खबरें', 'https://feed.livehindustan.com/rss/3127'),
         ('देश', 'https://feed.livehindustan.com/rss/4911'),
         ('विदेश', 'https://feed.livehindustan.com/rss/4913'),
         ('ओपिनियन', 'https://feed.livehindustan.com/rss/5165'),
diff --git a/recipes/hindustan_times_print.recipe b/recipes/hindustan_times_print.recipe
index e90d28a446..4fd78d0363 100644
--- a/recipes/hindustan_times_print.recipe
+++ b/recipes/hindustan_times_print.recipe
@@ -8,6 +8,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 index = 'https://epaper.hindustantimes.com'
 
+
 class ht(BasicNewsRecipe):
     title = 'Hindustan Times Print Edition'
     language = 'en_IN'
@@ -97,9 +98,8 @@ class ht(BasicNewsRecipe):
                     continue
                 desc = page_no
                 self.log('\t', title, ' ', desc)
-                feeds_dict[section].append({"title": title, "description": desc, "url": url})
-        return [(section, articles) for section, articles in feeds_dict.items()]
-
+                feeds_dict[section].append({'title': title, 'description': desc, 'url': url})
+        return list(feeds_dict.items())
 
     def preprocess_raw_html(self, raw, *a):
         data = json.loads(raw)
diff --git a/recipes/historia_pl.recipe b/recipes/historia_pl.recipe
index 2c36e78c94..173a7ac071 100644
--- a/recipes/historia_pl.recipe
+++ b/recipes/historia_pl.recipe
@@ -4,7 +4,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Historia_org_pl(BasicNewsRecipe):
     title = u'Historia.org.pl'
     __author__ = 'fenuks'
-    description = u'Artykuły dotyczące historii w układzie epok i tematów, forum. Najlepsza strona historii. Matura z historii i egzamin gimnazjalny z historii.'  # noqa
+    description = u'Artykuły dotyczące historii w układzie epok i tematów, forum. Najlepsza strona historii. Matura z historii i egzamin gimnazjalny z historii.'  # noqa: E501
     cover_url = 'http://lh3.googleusercontent.com/_QeRQus12wGg/TOvHsZ2GN7I/AAAAAAAAD_o/LY1JZDnq7ro/logo5.jpg'
     category = 'history'
     language = 'pl'
diff --git a/recipes/history_today.recipe b/recipes/history_today.recipe
index eed6efad0a..43d55648b1 100644
--- a/recipes/history_today.recipe
+++ b/recipes/history_today.recipe
@@ -49,7 +49,7 @@ class HistoryToday(BasicNewsRecipe):
         # Go to issue
         soup = self.index_to_soup('https://www.historytoday.com/contents')
         cover = soup.find('div', attrs={
-                          'id': 'content-area'}).find('img', attrs={'src': re.compile('.*cover.*')})['src']
+                          'id': 'content-area'}).find('img', attrs={'src': re.compile(r'.*cover.*')})['src']
         self.cover_url = cover
         self.log(self.cover_url)
 
@@ -59,33 +59,30 @@ class HistoryToday(BasicNewsRecipe):
 
         feeds = OrderedDict()
         section_title = ''
-        for section in div.findAll('div', attrs={'id': re.compile(r"block\-views\-contents.*")}):
+        for section in div.findAll('div', attrs={'id': re.compile(r'block\-views\-contents.*')}):
             section_title = self.tag_to_string(
                 section.find('h2', attrs={'class': 'title'}))
             sectionbody = section.find('div', attrs={'class': 'view-content'})
-            for article in sectionbody.findAll('div', attrs={'class': re.compile(r"views\-row.*")}):
+            for article in sectionbody.findAll('div', attrs={'class': re.compile(r'views\-row.*')}):
                 articles = []
                 subarticle = []
                 subarticle = article.findAll('div')
                 if len(subarticle) < 2:
                     continue
                 title = self.tag_to_string(subarticle[0])
-                originalurl = "https://www.historytoday.com" + \
-                    subarticle[0].span.a['href'].strip()
+                originalurl = 'https://www.historytoday.com' + subarticle[0].span.a['href'].strip()
                 originalpage = self.index_to_soup(originalurl)
-                printurl = originalpage.find(
-                    'div', attrs={'id': 'ht-tools'}).a['href'].strip()
-                url = "https://www.historytoday.com" + printurl
+                printurl = originalpage.find('div', attrs={'id': 'ht-tools'}).a['href'].strip()
+                url = 'https://www.historytoday.com' + printurl
                 desc = self.tag_to_string(subarticle[1])
-                articles.append({'title': title, 'url': url,
-                                 'description': desc, 'date': ''})
+                articles.append({'title': title, 'url': url,'description': desc, 'date': ''})
 
                 if articles:
                     if section_title not in feeds:
                         feeds[section_title] = []
                     feeds[section_title] += articles
 
-        ans = [(key, val) for key, val in feeds.items()]
+        ans = list(feeds.items())
         return ans
 
     def cleanup(self):
diff --git a/recipes/hna.recipe b/recipes/hna.recipe
index 814476dd9e..d84df3b31d 100644
--- a/recipes/hna.recipe
+++ b/recipes/hna.recipe
@@ -13,7 +13,6 @@ class hnaDe(BasicNewsRecipe):
     title = 'HNA'
     description = 'local news from Hessen/Germany'
     __author__ = 'Oliver Niesner'
-    use_embedded_content = False
     language = 'de'
     use_embedded_content = False
     timefmt = ' [%d %b %Y]'
diff --git a/recipes/horizons.recipe b/recipes/horizons.recipe
index baa007e5fd..880b4c230f 100644
--- a/recipes/horizons.recipe
+++ b/recipes/horizons.recipe
@@ -47,7 +47,7 @@ class horizons(BasicNewsRecipe):
             url = d
         else:
             soup = self.index_to_soup('https://www.cirsd.org/en/horizons')
-            a = soup.findAll('a', href=True, attrs={'class':'horizon-gallery-box'})[0] #use 1 for previous edition
+            a = soup.findAll('a', href=True, attrs={'class':'horizon-gallery-box'})[0]  # use 1 for previous edition
             url = a['href']
             if url.startswith('/'):
                 url = 'https://www.cirsd.org' + url
diff --git a/recipes/hot_cars.recipe b/recipes/hot_cars.recipe
index bb7aa0cfd0..87a1d4ba7b 100644
--- a/recipes/hot_cars.recipe
+++ b/recipes/hot_cars.recipe
@@ -23,7 +23,7 @@ class AdvancedUserRecipe1718126839(BasicNewsRecipe):
     auto_cleanup   = True
 
     feeds          = [
-        #Car Types
+        # Car Types
         ('Fast Cars', 'https://www.hotcars.com/feed/category/fast-cars/'),
         ('Classic Cars', 'https://www.hotcars.com/feed/tag/classic-cars/'),
         ('Muscle Cars', 'https://www.hotcars.com/feed/category/muscle-cars/'),
@@ -32,13 +32,13 @@ class AdvancedUserRecipe1718126839(BasicNewsRecipe):
         ('Mass Market Cars', 'https://www.hotcars.com/feed/category/mass-market-cars/'),
         ('Luxury Cars', 'https://www.hotcars.com/feed/tag/luxury-cars/'),
         ('Motorcycles', 'https://www.hotcars.com/feed/category/motorcycles/'),
-        #Hot Cars Exclusives
+        # Hot Cars Exclusives
         ('Hot Cars Exclusives', 'https://www.hotcars.com/feed/category/hotcars-exclusives/'),
         ('Car Reviews', 'https://www.hotcars.com/feed/category/car-reviews/'),
         ('Car Guides', 'https://www.hotcars.com/feed/category/car-guides/'),
         ('Car Renders', 'https://www.hotcars.com/feed/category/car-renders/'),
         ('Hot Cars Awards', 'https://www.hotcars.com/feed/category/hotcars-awards/'),
-        #Car Culture
+        # Car Culture
         ('News', 'https://www.hotcars.com/feed/category/news/'),
         ('JDM Life', 'https://www.hotcars.com/feed/category/jdm-life/'),
         ('Car TV', 'https://www.hotcars.com/feed/category/cars-on-tv/'),
diff --git a/recipes/howtogeek.recipe b/recipes/howtogeek.recipe
index c60ee2d90d..abf1297e6a 100644
--- a/recipes/howtogeek.recipe
+++ b/recipes/howtogeek.recipe
@@ -20,18 +20,18 @@ class AdvancedUserRecipe1716091656(BasicNewsRecipe):
     auto_cleanup   = True
 
     feeds          = [
-        #Desktop
+        # Desktop
         ('Desktop', 'https://www.howtogeek.com/feed/category/desktop/'),
         ('Windows', 'https://www.howtogeek.com/feed/category/windows/'),
         ('Mac', 'https://www.howtogeek.com/feed/category/mac/'),
         ('Linux', 'https://www.howtogeek.com/feed/category/linux/'),
         ('Chromebook', 'https://www.howtogeek.com/feed/category/chromebook-chrome-os/'),
-        #Mobile
+        # Mobile
         ('Mobile', 'https://www.howtogeek.com/feed/category/mobile/'),
         ('Android', 'https://www.howtogeek.com/feed/category/android/'),
         ('iOS', 'https://www.howtogeek.com/feed/tag/ios/'),
         ('Cellular Carriers', 'https://www.howtogeek.com/feed/category/cellular-carriers/'),
-        #Hardware
+        # Hardware
         ('Hardware', 'https://www.howtogeek.com/feed/category/hardware/'),
         ('Computer Hardware', 'https://www.howtogeek.com/feed/category/hardware/'),
         ('Wifi & Networking', 'https://www.howtogeek.com/feed/category/wifi-routers/'),
@@ -39,7 +39,7 @@ class AdvancedUserRecipe1716091656(BasicNewsRecipe):
         ('eReaders', 'https://www.howtogeek.com/feed/category/ereaders/'),
         ('Audio', 'https://www.howtogeek.com/feed/category/audio/'),
         ('Televisions', 'https://www.howtogeek.com/feed/category/tv/'),
-        #Web
+        # Web
         ('Web', 'https://www.howtogeek.com/feed/category/web/'),
         ('Web Apps', 'https://www.howtogeek.com/feed/category/apps-web-apps/'),
         ('Social Media', 'https://www.howtogeek.com/feed/category/social-media/'),
@@ -48,11 +48,11 @@ class AdvancedUserRecipe1716091656(BasicNewsRecipe):
         ('Google', 'https://www.howtogeek.com/feed/category/google/'),
         ('Microsoft', 'https://www.howtogeek.com/feed/category/microsoft/'),
         ('Privacy & Security', 'https://www.howtogeek.com/feed/category/privacy-security/'),
-        #Cutting Edge
+        # Cutting Edge
         ('Cutting Edge', 'https://www.howtogeek.com/feed/category/cutting-edge/'),
         ('Virtual Reality', 'https://www.howtogeek.com/feed/category/virtual-reality/'),
         ('AI & Machine Learning', 'https://www.howtogeek.com/feed/category/ai-machine-learning/'),
-        #Lifestyle
+        # Lifestyle
         ('Lifestyle', 'https://www.howtogeek.com/feed/category/lifestyle/'),
         ('Gaming', 'https://www.howtogeek.com/feed/category/video-games/'),
         ('Streaming', 'https://www.howtogeek.com/feed/category/cord-cutting-streaming/'),
@@ -63,7 +63,7 @@ class AdvancedUserRecipe1716091656(BasicNewsRecipe):
         ('Buying Guides', 'https://www.howtogeek.com/feed/buying-guides/'),
         ('Deals', 'https://www.howtogeek.com/feed/tag/deals/'),
 
-        #Discontinued Feeds
-        #('Electric Vehicles', 'https://www.howtogeek.com/feed/category/electric-vehicles/'),
-        #('Cryptocurrency', 'https://www.howtogeek.com/feed/category/cryptocurrency/'),
+        # Discontinued Feeds
+        # ('Electric Vehicles', 'https://www.howtogeek.com/feed/category/electric-vehicles/'),
+        # ('Cryptocurrency', 'https://www.howtogeek.com/feed/category/cryptocurrency/'),
     ]
diff --git a/recipes/hoy.recipe b/recipes/hoy.recipe
index 8811b0e079..dd40c12488 100644
--- a/recipes/hoy.recipe
+++ b/recipes/hoy.recipe
@@ -69,7 +69,7 @@ class Hoy(BasicNewsRecipe):
     def preprocess_html(self, soup):
         soup.html['dir'] = self.direction
         mcharset = new_tag(soup, 'meta', [
-                       ("http-equiv", "Content-Type"), ("content", "text/html; charset=utf-8")])
+                       ('http-equiv', 'Content-Type'), ('content', 'text/html; charset=utf-8')])
         soup.head.insert(0, mcharset)
         for item in soup.findAll(style=True):
             del item['style']
diff --git a/recipes/hurriyet.recipe b/recipes/hurriyet.recipe
index 26577b4faa..11dead19b0 100644
--- a/recipes/hurriyet.recipe
+++ b/recipes/hurriyet.recipe
@@ -35,8 +35,8 @@ class Hurriyet(BasicNewsRecipe):
     compress_news_images = True
 
     # some mild formatting
-    extra_css = """.news-media { clear: left; }
-           .news-detail-title { clear:left; }"""
+    extra_css = '''.news-media { clear: left; }
+           .news-detail-title { clear:left; }'''
 
     keep_only_tags = [
         # title
@@ -64,4 +64,3 @@ class Hurriyet(BasicNewsRecipe):
         (u'Ankara', 'https://www.hurriyet.com.tr/rss/ankara'),
         (u'Ege', 'https://www.hurriyet.com.tr/rss/ege')
     ]
-
diff --git a/recipes/id_pixel.recipe b/recipes/id_pixel.recipe
index eb74e1efd6..dcd53fe79b 100644
--- a/recipes/id_pixel.recipe
+++ b/recipes/id_pixel.recipe
@@ -9,7 +9,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class IdPixel(BasicNewsRecipe):
     title = '\u0418\u0434\u0435\u0430\u043B\u044C\u043D\u044B\u0439 \u043F\u0438\u043A\u0441\u0435\u043B\u044C'
     cover_url = u'https://idpixel.ru/i/logo2x.png'
-    description = '\u041D\u043E\u0432\u043E\u0441\u0442\u043D\u043E\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u043E \u0440\u0435\u0442\u0440\u043E-\u0438\u0433\u0440\u0430\u0445 \u0438 \u0440\u0435\u0442\u0440\u043E-\u0442\u0435\u0445\u043D\u0438\u043A\u0435. \u0412\u043E\u0441\u044C\u043C\u0438\u0431\u0438\u0442\u043D\u044B\u0435 \u0438\u0433\u0440\u044B, \u0448\u0435\u0441\u0442\u043D\u0430\u0434\u0446\u0430\u0442\u0438\u0431\u0438\u0442\u043D\u044B\u0435 \u043A\u043E\u043D\u0441\u043E\u043B\u0438, \u0434\u043E\u043C\u0430\u0448\u043D\u0438\u0435 \u043A\u043E\u043C\u043F\u044C\u044E\u0442\u0435\u0440\u044B \u0441 \u0438\u0433\u0440\u0430\u043C\u0438 \u043D\u0430 \u043A\u0430\u0441\u0441\u0435\u0442\u0430\u0445 \u0438 \u0442\u0430\u043A \u0434\u0430\u043B\u0435\u0435. \u041C\u044B \u0438\u0449\u0435\u043C \u0440\u0435\u0442\u0440\u043E-\u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u043F\u043E \u0432\u0441\u0435\u043C\u0443 \u0441\u0432\u0435\u0442\u0443 \u0438 \u0434\u043E\u043D\u043E\u0441\u0438\u043C \u0438\u0445 \u0434\u043E \u0432\u0430\u0441.'  # noqa
+    description = '\u041D\u043E\u0432\u043E\u0441\u0442\u043D\u043E\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u043E \u0440\u0435\u0442\u0440\u043E-\u0438\u0433\u0440\u0430\u0445 \u0438 \u0440\u0435\u0442\u0440\u043E-\u0442\u0435\u0445\u043D\u0438\u043A\u0435. \u0412\u043E\u0441\u044C\u043C\u0438\u0431\u0438\u0442\u043D\u044B\u0435 \u0438\u0433\u0440\u044B, \u0448\u0435\u0441\u0442\u043D\u0430\u0434\u0446\u0430\u0442\u0438\u0431\u0438\u0442\u043D\u044B\u0435 \u043A\u043E\u043D\u0441\u043E\u043B\u0438, \u0434\u043E\u043C\u0430\u0448\u043D\u0438\u0435 \u043A\u043E\u043C\u043F\u044C\u044E\u0442\u0435\u0440\u044B \u0441 \u0438\u0433\u0440\u0430\u043C\u0438 \u043D\u0430 \u043A\u0430\u0441\u0441\u0435\u0442\u0430\u0445 \u0438 \u0442\u0430\u043A \u0434\u0430\u043B\u0435\u0435. \u041C\u044B \u0438\u0449\u0435\u043C \u0440\u0435\u0442\u0440\u043E-\u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u043F\u043E \u0432\u0441\u0435\u043C\u0443 \u0441\u0432\u0435\u0442\u0443 \u0438 \u0434\u043E\u043D\u043E\u0441\u0438\u043C \u0438\u0445 \u0434\u043E \u0432\u0430\u0441.'  # noqa: E501
     publisher = '\u041C\u0438\u0445\u0430\u0438\u043B \u0421\u0443\u0434\u0430\u043A\u043E\u0432'
     category = 'news'
     __author__ = 'bugmen00t'
diff --git a/recipes/idnes.recipe b/recipes/idnes.recipe
index af359f2ec2..3375979f0a 100644
--- a/recipes/idnes.recipe
+++ b/recipes/idnes.recipe
@@ -26,9 +26,8 @@ class iHeuteRecipe(BasicNewsRecipe):
     no_stylesheets = True
 
     remove_attributes = ['width', 'height']
-    remove_tags = [dict(name='div',   attrs={'id': ['zooming']}),
-                   dict(name='div',   attrs={
-                        'class': ['related', 'mapa-wrapper']}),
+    remove_tags = [dict(name='div', attrs={'id': ['zooming']}),
+                   dict(name='div', attrs={'class': ['related', 'mapa-wrapper']}),
                    dict(name='table', attrs={'id': ['opener-img', 'portal']}),
                    dict(name='table', attrs={'class': ['video-16ku9']})]
     remove_tags_after = [
@@ -39,7 +38,7 @@ class iHeuteRecipe(BasicNewsRecipe):
 
     def print_version(self, url):
         print_url = url
-        split_url = url.split("?")
+        split_url = url.split('?')
         if (split_url[0].rfind('dilbert.asp') != -1):  # dilbert komix
             print_url = print_url.replace('.htm', '.gif&tisk=1')
             print_url = print_url.replace('.asp', '.aspx')
diff --git a/recipes/ieee_spectrum_mag.recipe b/recipes/ieee_spectrum_mag.recipe
index 11c65b91f2..f0a590f0fb 100644
--- a/recipes/ieee_spectrum_mag.recipe
+++ b/recipes/ieee_spectrum_mag.recipe
@@ -7,18 +7,18 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class IEEESpectrumMagazine(BasicNewsRecipe):
-    title = "IEEE Spectrum Magazine"
+    title = 'IEEE Spectrum Magazine'
     language = 'en'
     __author__ = 'yodha8'
-    description = "Published on day 1 of every month."
+    description = 'Published on day 1 of every month.'
     oldest_article = 120  # Mag gathers articles published older than a month online. So we scan for 4 months in the feed.
     max_articles_per_feed = 100
     auto_cleanup = True
 
     # RSS feed for the current month
     now = datetime.datetime.now()
-    year_month = now.strftime("%Y/%B").lower()
-    month_feed_url = "https://spectrum.ieee.org/feeds/magazine/{}.rss".format(
+    year_month = now.strftime('%Y/%B').lower()
+    month_feed_url = 'https://spectrum.ieee.org/feeds/magazine/{}.rss'.format(
         year_month
     )
 
@@ -27,9 +27,9 @@ class IEEESpectrumMagazine(BasicNewsRecipe):
     ]
 
     def get_cover_url(self):
-        """Go to this month's URL and pull cover image from there."""
-        month_url = "https://spectrum.ieee.org/magazine/{}".format(self.year_month)
+        '''Go to this month's URL and pull cover image from there.'''
+        month_url = 'https://spectrum.ieee.org/magazine/{}'.format(self.year_month)
         soup = self.index_to_soup(month_url)
-        img_meta = soup.find("meta", property="og:image")
-        img_url = img_meta["content"]
+        img_meta = soup.find('meta', property='og:image')
+        img_url = img_meta['content']
         return img_url
diff --git a/recipes/ifzm.recipe b/recipes/ifzm.recipe
index b9c962eab5..8cc96344f8 100644
--- a/recipes/ifzm.recipe
+++ b/recipes/ifzm.recipe
@@ -8,6 +8,7 @@ def absurl(url):
     if url.startswith('/'):
         return 'https://www.infzm.com' + url
 
+
 def json_to_html(raw, link):
     data = json.loads(raw)
     data = data['data']['content']
@@ -39,19 +40,18 @@ class infzm(BasicNewsRecipe):
     def get_obfuscated_article(self, url):
         br = self.get_browser()
         link = url
-        res_link = link.replace('https://www.infzm.com', 'https://api.infzm.com/mobile') \
-            + '?platform=wap&version=1.89.0&machine_id=35458aa29603f2b246636e5492122b50&user_id=&token=&member_type='
+        res_link = (link.replace('https://www.infzm.com', 'https://api.infzm.com/mobile') +
+                    '?platform=wap&version=1.89.0&machine_id=35458aa29603f2b246636e5492122b50&user_id=&token=&member_type=')
         # if article is paywalled, add code to figure out machine_id
         raw = br.open(res_link).read()
         html = json_to_html(raw, link)
-        return ({ 'data': html, 'url': link })
+        return ({'data': html, 'url': link})
 
     extra_css = '''
         img {display:block; margin:0 auto;}
         .cm_pic_caption, .cm_pic_author { font-size:small; text-align:center; }
     '''
 
-
     def parse_index(self):
         index = 'https://www.infzm.com/'
         sections = [
diff --git a/recipes/il_fatto.recipe b/recipes/il_fatto.recipe
index 66af6e3d2f..800749978d 100644
--- a/recipes/il_fatto.recipe
+++ b/recipes/il_fatto.recipe
@@ -10,29 +10,21 @@ class AdvancedUserRecipe1286477122(BasicNewsRecipe):
     __author__ = 'egilh'
 
     feeds = [
-        (u'Politica & Palazzo',
-         u'http://www.ilfattoquotidiano.it/category/politica-palazzo/feed/'),
-        (u'Giustizia & impunit\xe0',
-         u'http://www.ilfattoquotidiano.it/category/giustizia-impunita/feed/'),
-        (u'Media & regime',  u'http://www.ilfattoquotidiano.it/category/media-regime/feed/'),
-        (u'Economia & Lobby',
-         u'http://www.ilfattoquotidiano.it/category/economia-lobby/feed/'),
-        (u'Lavoro & precari',
-         u'http://www.ilfattoquotidiano.it/category/lavoro-precari/feed/'),
-        (u'Ambiente & Veleni',
-            u'http://www.ilfattoquotidiano.it/category/ambiente-veleni/feed/'),
-        (u'Sport & miliardi',
-         u'http://www.ilfattoquotidiano.it/category/sport-miliardi/feed/'),
+        (u'Politica & Palazzo', u'http://www.ilfattoquotidiano.it/category/politica-palazzo/feed/'),
+        (u'Giustizia & impunit\xe0', u'http://www.ilfattoquotidiano.it/category/giustizia-impunita/feed/'),
+        (u'Media & regime', u'http://www.ilfattoquotidiano.it/category/media-regime/feed/'),
+        (u'Economia & Lobby', u'http://www.ilfattoquotidiano.it/category/economia-lobby/feed/'),
+        (u'Lavoro & precari', u'http://www.ilfattoquotidiano.it/category/lavoro-precari/feed/'),
+        (u'Ambiente & Veleni', u'http://www.ilfattoquotidiano.it/category/ambiente-veleni/feed/'),
+        (u'Sport & miliardi', u'http://www.ilfattoquotidiano.it/category/sport-miliardi/feed/'),
         (u'Cronaca', u'http://www.ilfattoquotidiano.it/category/cronaca/feed/'),
         (u'Mondo', u'http://www.ilfattoquotidiano.it/category/mondo/feed/'),
-        (u'Societ\xe0',  u'http://www.ilfattoquotidiano.it/category/societa/feed/'),
+        (u'Societ\xe0', u'http://www.ilfattoquotidiano.it/category/societa/feed/'),
         (u'Scuola', u'http://www.ilfattoquotidiano.it/category/scuola/feed/'),
         (u'Tecno', u'http://www.ilfattoquotidiano.it/category/tecno/feed/'),
         (u'Terza pagina', u'http://www.ilfattoquotidiano.it/category/terza-pagina/feed/'),
-        (u'Piacere quotidiano',
-            u'http://www.ilfattoquotidiano.it/category/piacere-quotidiano/feed/'),
-        (u'Cervelli in fuga',
-         u'http://www.ilfattoquotidiano.it/category/cervelli-in-fuga/feed/'),
+        (u'Piacere quotidiano', u'http://www.ilfattoquotidiano.it/category/piacere-quotidiano/feed/'),
+        (u'Cervelli in fuga', u'http://www.ilfattoquotidiano.it/category/cervelli-in-fuga/feed/'),
         (u'Documentati!', u'http://www.ilfattoquotidiano.it/category/documentati/feed/'),
         (u'Misfatto', u'http://www.ilfattoquotidiano.it/category/misfatto/feed/')
     ]
diff --git a/recipes/il_messaggero.recipe b/recipes/il_messaggero.recipe
index ad6ac66af7..26feeb0153 100644
--- a/recipes/il_messaggero.recipe
+++ b/recipes/il_messaggero.recipe
@@ -16,7 +16,7 @@ class IlMessaggero(BasicNewsRecipe):
     __author__ = 'Gabriele Marini'
     description = 'Italian News'
 
-#    cover_url      = 'http://www.ilmessaggero.it/img_tst/logomsgr.gif'
+    # cover_url      = 'http://www.ilmessaggero.it/img_tst/logomsgr.gif'
     title = u'Il Messaggero'
     publisher = 'Caltagirone Editore'
     category = 'News, politics, culture, economy, general interest'
@@ -36,22 +36,21 @@ class IlMessaggero(BasicNewsRecipe):
                       dict(name='h2', attrs={
                           'class': ['sottotitLettura', 'grigio16']}),
                       dict(name='span', attrs={'class': 'testoArticoloG'}),
-                      dict(name='div',  attrs={'id': 'testodim'})
+                      dict(name='div', attrs={'id': 'testodim'})
                       ]
 
     def get_cover_url(self):
         cover = None
         st = time.localtime()
         year = str(st.tm_year)
-        month = "%.2d" % st.tm_mon
-        day = "%.2d" % st.tm_mday
-        cover = 'http://carta.ilmessaggero.it/' + year + \
-            month + day + '/jpeg/MSGR_20_CITTA_1.jpg'
+        month = '%.2d' % st.tm_mon
+        day = '%.2d' % st.tm_mday
+        cover = 'http://carta.ilmessaggero.it/' + year + month + day + '/jpeg/MSGR_20_CITTA_1.jpg'
         br = BasicNewsRecipe.get_browser(self)
         try:
             br.open(cover)
         except:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             cover = 'http://www.ilmessaggero.it/img_tst/logomsgr.gif'
 
         return cover
diff --git a/recipes/il_post.recipe b/recipes/il_post.recipe
index 42a08d5964..9fa8a31638 100644
--- a/recipes/il_post.recipe
+++ b/recipes/il_post.recipe
@@ -14,27 +14,27 @@ from datetime import date, timedelta
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
-dates = [ date.today().strftime('%Y/%m/%d'), (date.today() - timedelta(1)).strftime('%Y/%m/%d') ]
+dates = [date.today().strftime('%Y/%m/%d'), (date.today() - timedelta(1)).strftime('%Y/%m/%d')]
 
 # ----------- CUSTOMIZATION OPTIONS START -----------
 
 # Comment (add # in front) to disable the sections you are not interested in
 # Commenta (aggiungi # davanti alla riga) per disabilitare le sezioni che non vuoi scaricare
 sections = [
-    ("Italia", "https://www.ilpost.it/italia/"),
-    ("Mondo", "https://www.ilpost.it/mondo/"),
-    ("Politica", "https://www.ilpost.it/politica/"),
-    ("Tecnologia", "https://www.ilpost.it/tecnologia/"),
-    ("Internet", "https://www.ilpost.it/internet/"),
-    ("Scienza", "https://www.ilpost.it/scienza/"),
-    ("Cultura", "https://www.ilpost.it/cultura/"),
-    ("Economia", "https://www.ilpost.it/economia/"),
-    ("Sport", "https://www.ilpost.it/sport/"),
-    ("Media", "https://www.ilpost.it/media/"),
-    ("Moda", "https://www.ilpost.it/moda/"),
-    ("Libri", "https://www.ilpost.it/libri/"),
-    ("Auto", "https://www.ilpost.it/auto/"),
-    ("Konrad", "https://www.ilpost.it/europa/"),
+    ('Italia', 'https://www.ilpost.it/italia/'),
+    ('Mondo', 'https://www.ilpost.it/mondo/'),
+    ('Politica', 'https://www.ilpost.it/politica/'),
+    ('Tecnologia', 'https://www.ilpost.it/tecnologia/'),
+    ('Internet', 'https://www.ilpost.it/internet/'),
+    ('Scienza', 'https://www.ilpost.it/scienza/'),
+    ('Cultura', 'https://www.ilpost.it/cultura/'),
+    ('Economia', 'https://www.ilpost.it/economia/'),
+    ('Sport', 'https://www.ilpost.it/sport/'),
+    ('Media', 'https://www.ilpost.it/media/'),
+    ('Moda', 'https://www.ilpost.it/moda/'),
+    ('Libri', 'https://www.ilpost.it/libri/'),
+    ('Auto', 'https://www.ilpost.it/auto/'),
+    ('Konrad', 'https://www.ilpost.it/europa/'),
 ]
 
 # ----------- CUSTOMIZATION OPTIONS OVER -----------
@@ -45,16 +45,16 @@ class IlPost(BasicNewsRecipe):
     __license__ = 'GPL v3'
     __copyright__ = '2019, Marco Scirea <marco.prolog at gmail.com>'
 
-    title = "Il Post"
-    language = "it"
+    title = 'Il Post'
+    language = 'it'
     description = (
         'Puoi decidere quali sezioni scaricare modificando la ricetta.'
         ' Di default le immagini sono convertite in scala di grigio per risparmiare spazio,'
-        ' la ricetta puo\' essere configurata per tenerle a colori'
+        " la ricetta puo' essere configurata per tenerle a colori"
     )
-    tags = "news"
+    tags = 'news'
     masthead_url = 'https://www.ilpost.it/error/images/ilpost.svg'
-    ignore_duplicate_articles = {"title", "url"}
+    ignore_duplicate_articles = {'title', 'url'}
     no_stylesheets = True
     extra_css = ' .wp-caption-text { font-size:small; } '
     keep_only_tags = [dict(name='main', attrs={'id':lambda x: x and x.startswith('index_main-content__')})]
@@ -81,11 +81,11 @@ class IlPost(BasicNewsRecipe):
                     continue
                 self.log('\t', title)
                 entries.append({
-                    "url": link["href"],
-                    "title": title,
-                    "description": desc
+                    'url': link['href'],
+                    'title': title,
+                    'description': desc
                 })
-        return (name, entries)
+        return name, entries
 
     def parse_index(self):
         feeds = []
diff --git a/recipes/ilmanifesto.recipe b/recipes/ilmanifesto.recipe
index 6ea5a50ca7..5ae8ff772e 100644
--- a/recipes/ilmanifesto.recipe
+++ b/recipes/ilmanifesto.recipe
@@ -34,7 +34,7 @@ class IlManifesto(BasicNewsRecipe):
             startSoup = self.index_to_soup(startUrl)
             lastEdition = startSoup.findAll('div', id='accordion_inedicola')[
                 1].find('a')['href']
-            del(startSoup)
+            del startSoup
             self.manifesto_index = MANIFESTO_BASEURL + lastEdition
             urlsplit = lastEdition.split('/')
             self.manifesto_datestr = urlsplit[-1]
@@ -43,8 +43,7 @@ class IlManifesto(BasicNewsRecipe):
 
     def get_cover_url(self):
         self._set_manifesto_index()
-        url = MANIFESTO_BASEURL + \
-            'fileadmin/archivi/in_edicola/%sprimapagina.gif' % self.manifesto_datestr
+        url = MANIFESTO_BASEURL + 'fileadmin/archivi/in_edicola/%sprimapagina.gif' % self.manifesto_datestr
         return url
 
     def parse_index(self):
@@ -105,6 +104,6 @@ class IlManifesto(BasicNewsRecipe):
         if sommNode is not None:
             summary = sommNode
 
-        template = "<html><head><title>%(title)s</title></head><body><h1>%(title)s</h1><h2>%(subtitle)s</h2><h3>%(author)s</h3><div style='font-size: x-large;'>%(summary)s</div><div>%(content)s</div></body></html>"  # noqa
-        del(bs)
+        template = "<html><head><title>%(title)s</title></head><body><h1>%(title)s</h1><h2>%(subtitle)s</h2><h3>%(author)s</h3><div style='font-size: x-large;'>%(summary)s</div><div>%(content)s</div></body></html>"  # noqa: E501
+        del bs
         return template % dict(title=title, subtitle=subtitle, author=author, summary=summary, content=content)
diff --git a/recipes/ilsole24ore.recipe b/recipes/ilsole24ore.recipe
index e8b678155b..38a5f8d77b 100644
--- a/recipes/ilsole24ore.recipe
+++ b/recipes/ilsole24ore.recipe
@@ -44,13 +44,13 @@ class IlSole24Ore(BasicNewsRecipe):
         link = article.get('link', None)
         if link is None:
             return article
-        if link.split('/')[-1] == "story01.htm":
+        if link.split('/')[-1] == 'story01.htm':
             link = link.split('/')[-2]
             a = ['0B', '0C', '0D', '0E', '0F', '0G', '0N', '0L0S', '0A']
             b = ['.', '/', '?', '-', '=', '&', '.com', 'www.', '0']
-            for i in range(0, len(a)):
+            for i in range(len(a)):
                 link = link.replace(a[i], b[i])
-            link = "http://" + link
+            link = 'http://' + link
         return link
 
     feeds          = [
diff --git a/recipes/in4_pl.recipe b/recipes/in4_pl.recipe
index b80b1255a9..b4b8331b35 100644
--- a/recipes/in4_pl.recipe
+++ b/recipes/in4_pl.recipe
@@ -16,7 +16,7 @@ class in4(BasicNewsRecipe):
     no_stylesheets = True
     remove_empty_feeds = True
     preprocess_regexps = [
-        (re.compile(u'<a title="translate into.*?</a>', re.DOTALL), lambda match: '')]
+        (re.compile(r'<a title="translate into.*?</a>', re.DOTALL), lambda match: '')]
     keep_only_tags = [dict(name='div', attrs={'class': 'left_alone'})]
     remove_tags_after = dict(name='img', attrs={'title': 'komentarze'})
     remove_tags = [dict(name='img', attrs={'title': 'komentarze'})]
diff --git a/recipes/in_gr.recipe b/recipes/in_gr.recipe
index e9de1d44a8..7354d7cc18 100644
--- a/recipes/in_gr.recipe
+++ b/recipes/in_gr.recipe
@@ -5,7 +5,7 @@ class ingr(BasicNewsRecipe):
     title = 'in.gr'
     __author__ = 'Stelios'
     description = 'News from Greece'
-#    max_articles_per_feed  = 100
+    # max_articles_per_feed  = 100
     oldest_article = 4
     publisher = 'in.gr'
     category = 'news, GR'
@@ -14,7 +14,6 @@ class ingr(BasicNewsRecipe):
     no_stylesheets = True
     use_embedded_content = False
     remove_empty_feeds = True
-    encoding = 'utf8'
     keep_only_tags = [
         dict(name='h1'),
 
diff --git a/recipes/inc.recipe b/recipes/inc.recipe
index f1dfa19c2a..501bff65e8 100644
--- a/recipes/inc.recipe
+++ b/recipes/inc.recipe
@@ -40,7 +40,7 @@ class IncMagazineRecipe(BasicNewsRecipe):
     def get_browser(self):
         def has_login_name(form):
             try:
-                form.find_control(name="email")
+                form.find_control(name='email')
             except:
                 return False
             else:
diff --git a/recipes/inc42.recipe b/recipes/inc42.recipe
index ec43ebdfbe..b5b10066e0 100644
--- a/recipes/inc42.recipe
+++ b/recipes/inc42.recipe
@@ -47,7 +47,6 @@ class inc42(BasicNewsRecipe):
                 feeds.append((section, articles))
         return feeds
 
-
     def preprocess_html(self, soup):
         for img in soup.findAll('img', attrs={'data-src':True}):
             img['src'] = img['data-src']
diff --git a/recipes/independent.recipe b/recipes/independent.recipe
index 6076d506dd..53d58b1298 100644
--- a/recipes/independent.recipe
+++ b/recipes/independent.recipe
@@ -22,15 +22,14 @@ class TheIndependentNew(BasicNewsRecipe):
 
     title = u'The Independent'
     __author__ = 'Krittika Goyal'
-    description             = 'The latest in UK News and World News from The \
-                               Independent. Wide range of international and local news, sports \
-                               news, commentary and opinion pieces.Independent News - Breaking news \
-                               that matters. Your daily comprehensive news source - The \
-                               Independent Newspaper'
+    description             = ('The latest in UK News and World News from The '
+                               'Independent. Wide range of international and local news, sports '
+                               'news, commentary and opinion pieces.Independent News - Breaking news '
+                               'that matters. Your daily comprehensive news source - The '
+                               'Independent Newspaper')
     publisher = 'The Independent'
     oldest_article = 2.0
     ignore_duplicate_articles = {'title', 'url'}
-    remove_empty_feeds = True
     category = 'news, UK'
     no_stylesheets = True
     use_embedded_content = False
diff --git a/recipes/independent_australia.recipe b/recipes/independent_australia.recipe
index 1e2f5148da..f0968398dc 100644
--- a/recipes/independent_australia.recipe
+++ b/recipes/independent_australia.recipe
@@ -20,8 +20,6 @@ class IndependentAustralia(BasicNewsRecipe):
     description = (
         'Independent Australia is a progressive journal focusing on politics, democracy, the environment, Australian history and Australian identity.'
         ' It contains news and opinion from Australia and around the world.')
-    oldest_article = 7  # days
-    max_articles_per_feed = 100
 
     feeds = [
         (
@@ -46,7 +44,7 @@ class IndependentAustralia(BasicNewsRecipe):
     remove_javascript = True
 
     keep_only_tags = [
-        dict(name='div', attrs={'class': "art-display"})
+        dict(name='div', attrs={'class': 'art-display'})
     ]  # the article content is contained in
 
     # ************************************
@@ -67,13 +65,6 @@ class IndependentAustralia(BasicNewsRecipe):
     extra_css = '.byline{font-size:smaller;margin-bottom:10px;}.inline-caption{display:block;font-size:smaller;text-decoration: none;}'
     compress_news_images = True
 
-    feeds = [
-        (
-            'Independent Australia',
-            'https://feeds.feedburner.com/IndependentAustralia'
-        ),
-    ]
-
     # ************************************
     # Break up feed into categories (based on BrianG's code snippet):
     # ************************************
diff --git a/recipes/india_speaks_reddit.recipe b/recipes/india_speaks_reddit.recipe
index 5866dc379f..c9b9c67bef 100644
--- a/recipes/india_speaks_reddit.recipe
+++ b/recipes/india_speaks_reddit.recipe
@@ -20,4 +20,3 @@ class IndiaSpeaksReddit(BasicNewsRecipe):
     feeds          = [
         ('India Speaks Reddit main feed', 'https://www.reddit.com/r/IndiaSpeaks.rss'),
     ]
-
diff --git a/recipes/india_today.recipe b/recipes/india_today.recipe
index 3f2c960a3b..8654a99ef6 100644
--- a/recipes/india_today.recipe
+++ b/recipes/india_today.recipe
@@ -75,7 +75,7 @@ class IndiaToday(BasicNewsRecipe):
             section = x[0]
             try:
                 return (
-                    'Editor\'s Note', 'Cover Story', 'The Big Story', 'Upfront',
+                    "Editor's Note", 'Cover Story', 'The Big Story', 'Upfront',
                     'NATION', 'INTERVIEW'
                 ).index(section)
             except Exception:
@@ -89,7 +89,7 @@ class IndiaToday(BasicNewsRecipe):
         return soup
 
     def preprocess_raw_html(self, raw, *a):
-        m = re.search('id="__NEXT_DATA__" type="application/json">', raw)
+        m = re.search(r'id="__NEXT_DATA__" type="application/json">', raw)
         raw = raw[m.start():]
         raw = raw.split('>', 1)[1]
         data = json.JSONDecoder().raw_decode(raw)[0]
@@ -114,7 +114,6 @@ class IndiaToday(BasicNewsRecipe):
             if 'image_caption' in data:
                 imagecap = '<div id="imgcap">' + data['image_caption'] + '</div>'
 
-        html = '<html><body>' + slug + '<h1>' + title + '</h1>\n' + desc + '<div id="author">'\
-                    + author +  '<span> ' + city + ' UPDATED: ' + date + '</span></div>\n' + image + imagecap + body\
-                        + '</body></html>'
-        return html
+        return ('<html><body>' + slug + '<h1>' + title + '</h1>\n' + desc + '<div id="author">'
+                + author + '<span> ' + city + ' UPDATED: ' + date + '</span></div>\n' + image + imagecap + body +
+                '</body></html>')
diff --git a/recipes/indian_express.recipe b/recipes/indian_express.recipe
index cd94f157cc..6a185992d4 100644
--- a/recipes/indian_express.recipe
+++ b/recipes/indian_express.recipe
@@ -136,13 +136,13 @@ class IndianExpress(BasicNewsRecipe):
         return citem['content'].replace('300', '600')
 
     def preprocess_html(self, soup):
-        if h2 := (soup.find(attrs={"itemprop": "description"}) or soup.find(**classes("synopsis"))):
+        if h2 := (soup.find(attrs={'itemprop': 'description'}) or soup.find(**classes('synopsis'))):
             h2.name = 'p'
             h2['id'] = 'sub-d'
         for span in soup.findAll(
-            "span", attrs={"class": ["ie-custom-caption", "custom-caption"]}
+            'span', attrs={'class': ['ie-custom-caption', 'custom-caption']}
         ):
-            span["id"] = "img-cap"
+            span['id'] = 'img-cap'
         for img in soup.findAll('img', attrs={'data-src': True}):
             img['src'] = img['data-src']
         if span := soup.find('span', content=True, attrs={'itemprop': 'dateModified'}):
diff --git a/recipes/ing_dk.recipe b/recipes/ing_dk.recipe
index e75e24d5a8..ff47f9da78 100644
--- a/recipes/ing_dk.recipe
+++ b/recipes/ing_dk.recipe
@@ -21,9 +21,9 @@ class Ing_dk(BasicNewsRecipe):
     auto_cleanup = True
 
     keep_only_tags = [
-        dict(name="div", attrs={'class': 'menu-article-current-title'}),
-        dict(name="section", attrs={'class': 'byline'}),
-        dict(name="section", attrs={'class': 'body'}),
+        dict(name='div', attrs={'class': 'menu-article-current-title'}),
+        dict(name='section', attrs={'class': 'byline'}),
+        dict(name='section', attrs={'class': 'body'}),
     ]
 
     feeds          = [
diff --git a/recipes/inquirer_net.recipe b/recipes/inquirer_net.recipe
index 177a2d2fb3..00227b323f 100644
--- a/recipes/inquirer_net.recipe
+++ b/recipes/inquirer_net.recipe
@@ -15,7 +15,6 @@ class InquirerNet(BasicNewsRecipe):
     description = 'News from Philipines'
     oldest_article = 2
     max_articles_per_feed = 100
-    no_stylesheets = True
     use_embedded_content = False
     encoding = 'utf8'
     publisher = 'inquirer.net'
@@ -23,8 +22,6 @@ class InquirerNet(BasicNewsRecipe):
     lang = 'en'
     language = 'en'
 
-    use_embedded_content = False
-
     no_stylesheets = True
     auto_cleanup = True
 
diff --git a/recipes/instapaper.recipe b/recipes/instapaper.recipe
index 0d91d6dcc5..c7ecf69381 100644
--- a/recipes/instapaper.recipe
+++ b/recipes/instapaper.recipe
@@ -10,7 +10,7 @@
 from calibre.web.feeds.news import BasicNewsRecipe
 
 # The Gutenweb stylesheet from https://www.mobileread.com/forums/showpost.php?p=2809828&postcount=31
-gutenweb = """"html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:\'\';content:none}table{border-collapse:collapse;border-spacing:0}html,:root{font-size:16px}body{font-size:1em;line-height:1.5em;margin-top:1.5em;margin-bottom:1.5em;max-width:33em;margin-left:auto;margin-right:auto;font-family:Helvetica,Arial,sans-serif;text-align:left;word-spacing:normal;hyphens:auto;orphans:2;widows:2;font-variant-numeric:oldstyle-nums}body *{max-width:100%}address,article,aside,audio,canvas,footer,header,ol,ul,dl,pre,section,table,video,img,figure{margin-top:1.5em;margin-bottom:1.5em}p{margin-top:1.5em;margin-bottom:0em}p+p{margin-top:0em;margin-bottom:0em;text-indent:1.5em}h1{font-size:2.25em;line-height:1.33333em;margin-top:0.66667em;margin-bottom:0.66667em}h2{font-size:1.5em;line-height:1em;margin-top:1em;margin-bottom:1em}h3{font-size:1.3125em;line-height:1.14286em;margin-top:1.14286em;margin-bottom:1.14286em}h4{font-size:1.125em;line-height:1.33333em;margin-top:1.33333em;margin-bottom:1.33333em}h1,h2,h3,h4,h5,h6{font-family:Georgia,serif;font-weight:bold;page-break-after:avoid}ul li{list-style-type:disc}ol li{list-style-type:decimal}li{list-style-position:inside;text-indent:1.5em}dt{font-weight:bold;float:left;margin-right:1.5em}tr{page-break-before:avoid;page-break-after:avoid}td,th{outline:0.1em solid #000;padding:0 0.5em;text-align:left}tfoot td{font-style:italic}caption{font-style:italic;text-align:center;font-style:italic}blockquote{margin-top:2.25em;margin-bottom:2.25em;margin-left:2.25em;margin-right:2.25em}blockquote p{margin-top:0em;margin-bottom:0em;text-indent:0}figure{text-align:center}figure img,figure audio,figure canvas,figure video,figure table{margin-top:0;margin-bottom:0}figcaption{font-size:0.875em;line-height:1.71429em;margin-top:0em;margin-bottom:1.71429em;font-style:italic}img{vertical-align:bottom}code,samp,kbd,var{font-family:Consolas,"Liberation Mono",Courier,monospace;font-size:0.875em;font-weight:normal;font-style:normal;text-decoration:none;line-height:0.875em;padding:0 0.3em}mark{background:#ff0;color:#000}code,.code,samp,kbd,var{background-color:#f8f8f8;box-shadow:0 0 0.1em 0.1em #ddd}em{font-style:italic}strong{font-weight:bold}abbr{letter-spacing:0.1em}abbr[title]{border-bottom:1px dotted #000}cite,q{font-style:italic}q{font-style:italic;quotes:"\xe2\x80\x9c" "\xe2\x80\x9d" "\xe2\x80\x98" "\xe2\x80\x99"}q:before{content:open-quote}q:after{content:close-quote}dfn{font-style:italic}sup,sub{font-size:70%;line-height:70%;position:relative}sup{top:-0.5em}sub{top:0.5em}hr{border-bottom:0.0625em solid #000;border-top:0 none;border-left:0 none;border-right:0 none;margin-top:1.4375em;margin-bottom:1.5em}small{font-size:0.875em;line-height:1.71429em;margin-top:1.71429em;margin-bottom:1.71429em}i{font-style:italic}b{font-weight:bold}u{text-decoration:underline}s{text-decoration:line-through}ins{font-weight:bold;text-decoration:underline}del{text-decoration:line-through}.caps,.nums{letter-spacing:0.1em}.caps{font-variant-numeric:lining-nums}.code{overflow:auto;padding:0 1em;background-color:#f8f8f8;box-shadow:0 0 0.1em 0.1em #ddd}.code code,.code samp,.code kbd,.code var{box-shadow:none;padding:0}.chapter{page-break-after:auto;page-break-before:always}.note{text-indent:0;font-size:0.875em;line-height:1.71429em;margin-top:1.71429em;margin-bottom:1.71429em}.verse{font-family:inherit;display:table;width:auto;margin-left:auto;margin-right:auto}.toc{margin:0 auto}.toc td,.toc th{outline:0 none}.toc th{padding:0 0.5em 0 0;text-align:right;font-weight:normal}.toc td:before{content:"\\2022";padding-right:0.5em}.toc td{padding:0;text-align:left;font-style:italic}@page{margin-top:72pt;margin-bottom:72pt}@media print{body{font-size:12pt;line-height:18pt;margin-top:0pt;margin-bottom:0pt;font-family:"Times New Roman",Times,serif}p{margin-top:18pt;margin-bottom:0pt}p+p{text-indent:18pt}address,article,aside,audio,canvas,footer,header,ol,ul,dl,pre,section,table,video,img,figure{margin-top:18pt;margin-bottom:18pt}h1{font-size:21pt;line-height:36pt;margin-top:18pt;margin-bottom:18pt}h2{font-size:18pt;line-height:18pt;margin-top:18pt;margin-bottom:18pt}h3{font-size:16pt;line-height:18pt;margin-top:18pt;margin-bottom:18pt}h4{font-size:14pt;line-height:18pt;margin-top:18pt;margin-bottom:18pt}dt{margin-right:18pt}li{text-indent:18pt}blockquote{margin-top:27pt;margin-bottom:27pt;margin-left:27pt;margin-right:27pt}blockquote p{margin-top:0em;margin-bottom:0em;text-indent:0}figcaption{font-size:10pt;line-height:18pt;margin-top:0pt;margin-bottom:18pt}pre{white-space:pre-line}abbr[title]{border-bottom:0 none}small{font-size:10pt;line-height:18pt;margin-top:18pt;margin-bottom:18pt}hr{border-bottom:0.08333em solid #000;margin-top:17pt;margin-bottom:18pt}.note{font-size:10pt;line-height:18pt;margin-top:18pt;margin-bottom:18pt}}"""  # noqa
+gutenweb = '''"html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:\'\';content:none}table{border-collapse:collapse;border-spacing:0}html,:root{font-size:16px}body{font-size:1em;line-height:1.5em;margin-top:1.5em;margin-bottom:1.5em;max-width:33em;margin-left:auto;margin-right:auto;font-family:Helvetica,Arial,sans-serif;text-align:left;word-spacing:normal;hyphens:auto;orphans:2;widows:2;font-variant-numeric:oldstyle-nums}body *{max-width:100%}address,article,aside,audio,canvas,footer,header,ol,ul,dl,pre,section,table,video,img,figure{margin-top:1.5em;margin-bottom:1.5em}p{margin-top:1.5em;margin-bottom:0em}p+p{margin-top:0em;margin-bottom:0em;text-indent:1.5em}h1{font-size:2.25em;line-height:1.33333em;margin-top:0.66667em;margin-bottom:0.66667em}h2{font-size:1.5em;line-height:1em;margin-top:1em;margin-bottom:1em}h3{font-size:1.3125em;line-height:1.14286em;margin-top:1.14286em;margin-bottom:1.14286em}h4{font-size:1.125em;line-height:1.33333em;margin-top:1.33333em;margin-bottom:1.33333em}h1,h2,h3,h4,h5,h6{font-family:Georgia,serif;font-weight:bold;page-break-after:avoid}ul li{list-style-type:disc}ol li{list-style-type:decimal}li{list-style-position:inside;text-indent:1.5em}dt{font-weight:bold;float:left;margin-right:1.5em}tr{page-break-before:avoid;page-break-after:avoid}td,th{outline:0.1em solid #000;padding:0 0.5em;text-align:left}tfoot td{font-style:italic}caption{font-style:italic;text-align:center;font-style:italic}blockquote{margin-top:2.25em;margin-bottom:2.25em;margin-left:2.25em;margin-right:2.25em}blockquote p{margin-top:0em;margin-bottom:0em;text-indent:0}figure{text-align:center}figure img,figure audio,figure canvas,figure video,figure table{margin-top:0;margin-bottom:0}figcaption{font-size:0.875em;line-height:1.71429em;margin-top:0em;margin-bottom:1.71429em;font-style:italic}img{vertical-align:bottom}code,samp,kbd,var{font-family:Consolas,"Liberation Mono",Courier,monospace;font-size:0.875em;font-weight:normal;font-style:normal;text-decoration:none;line-height:0.875em;padding:0 0.3em}mark{background:#ff0;color:#000}code,.code,samp,kbd,var{background-color:#f8f8f8;box-shadow:0 0 0.1em 0.1em #ddd}em{font-style:italic}strong{font-weight:bold}abbr{letter-spacing:0.1em}abbr[title]{border-bottom:1px dotted #000}cite,q{font-style:italic}q{font-style:italic;quotes:"\xe2\x80\x9c" "\xe2\x80\x9d" "\xe2\x80\x98" "\xe2\x80\x99"}q:before{content:open-quote}q:after{content:close-quote}dfn{font-style:italic}sup,sub{font-size:70%;line-height:70%;position:relative}sup{top:-0.5em}sub{top:0.5em}hr{border-bottom:0.0625em solid #000;border-top:0 none;border-left:0 none;border-right:0 none;margin-top:1.4375em;margin-bottom:1.5em}small{font-size:0.875em;line-height:1.71429em;margin-top:1.71429em;margin-bottom:1.71429em}i{font-style:italic}b{font-weight:bold}u{text-decoration:underline}s{text-decoration:line-through}ins{font-weight:bold;text-decoration:underline}del{text-decoration:line-through}.caps,.nums{letter-spacing:0.1em}.caps{font-variant-numeric:lining-nums}.code{overflow:auto;padding:0 1em;background-color:#f8f8f8;box-shadow:0 0 0.1em 0.1em #ddd}.code code,.code samp,.code kbd,.code var{box-shadow:none;padding:0}.chapter{page-break-after:auto;page-break-before:always}.note{text-indent:0;font-size:0.875em;line-height:1.71429em;margin-top:1.71429em;margin-bottom:1.71429em}.verse{font-family:inherit;display:table;width:auto;margin-left:auto;margin-right:auto}.toc{margin:0 auto}.toc td,.toc th{outline:0 none}.toc th{padding:0 0.5em 0 0;text-align:right;font-weight:normal}.toc td:before{content:"\\2022";padding-right:0.5em}.toc td{padding:0;text-align:left;font-style:italic}@page{margin-top:72pt;margin-bottom:72pt}@media print{body{font-size:12pt;line-height:18pt;margin-top:0pt;margin-bottom:0pt;font-family:"Times New Roman",Times,serif}p{margin-top:18pt;margin-bottom:0pt}p+p{text-indent:18pt}address,article,aside,audio,canvas,footer,header,ol,ul,dl,pre,section,table,video,img,figure{margin-top:18pt;margin-bottom:18pt}h1{font-size:21pt;line-height:36pt;margin-top:18pt;margin-bottom:18pt}h2{font-size:18pt;line-height:18pt;margin-top:18pt;margin-bottom:18pt}h3{font-size:16pt;line-height:18pt;margin-top:18pt;margin-bottom:18pt}h4{font-size:14pt;line-height:18pt;margin-top:18pt;margin-bottom:18pt}dt{margin-right:18pt}li{text-indent:18pt}blockquote{margin-top:27pt;margin-bottom:27pt;margin-left:27pt;margin-right:27pt}blockquote p{margin-top:0em;margin-bottom:0em;text-indent:0}figcaption{font-size:10pt;line-height:18pt;margin-top:0pt;margin-bottom:18pt}pre{white-space:pre-line}abbr[title]{border-bottom:0 none}small{font-size:10pt;line-height:18pt;margin-top:18pt;margin-bottom:18pt}hr{border-bottom:0.08333em solid #000;margin-top:17pt;margin-bottom:18pt}.note{font-size:10pt;line-height:18pt;margin-top:18pt;margin-bottom:18pt}}'''  # noqa: E501
 
 
 class InstapaperRecipe(BasicNewsRecipe):
diff --git a/recipes/interfax_ua.recipe b/recipes/interfax_ua.recipe
index eae204a661..5aecd757cb 100644
--- a/recipes/interfax_ua.recipe
+++ b/recipes/interfax_ua.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class InterfaxUAUA(BasicNewsRecipe):
     title = '\u0406\u043D\u0442\u0435\u0440\u0444\u0430\u043A\u0441-\u0423\u043A\u0440\u0430\u0457\u043D\u0430'
     __author__ = 'bugmen00t'
-    description = '\u0406\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u044F \u043F\u0440\u043E \u043E\u0441\u0442\u0430\u043D\u043D\u0456 \u043F\u043E\u0434\u0456\u0457 \u0432 \u043F\u043E\u043B\u0456\u0442\u0438\u0446\u0456 \u0423\u043A\u0440\u0430\u0457\u043D\u0438, \u043A\u043B\u044E\u0447\u043E\u0432\u0456 \u0443\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0456 \u0435\u043A\u043E\u043D\u043E\u043C\u0456\u0447\u043D\u0456 \u043D\u043E\u0432\u0438\u043D\u0438 \u0442\u0430 \u043E\u0441\u043D\u043E\u0432\u043D\u0456 \u043F\u043E\u0434\u0456\u0457 \u0432 \u043A\u0440\u0430\u0457\u043D\u0430\u0445 \u0421\u041D\u0414 \u0456 \u0441\u0432\u0456\u0442\u0443.'  # noqa
-    publisher = '\u0406\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E \u00AB\u0406\u043D\u0442\u0435\u0440\u0444\u0430\u043A\u0441-\u0423\u043A\u0440\u0430\u0457\u043D\u0430\u00BB'  # noqa
+    description = '\u0406\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u044F \u043F\u0440\u043E \u043E\u0441\u0442\u0430\u043D\u043D\u0456 \u043F\u043E\u0434\u0456\u0457 \u0432 \u043F\u043E\u043B\u0456\u0442\u0438\u0446\u0456 \u0423\u043A\u0440\u0430\u0457\u043D\u0438, \u043A\u043B\u044E\u0447\u043E\u0432\u0456 \u0443\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0456 \u0435\u043A\u043E\u043D\u043E\u043C\u0456\u0447\u043D\u0456 \u043D\u043E\u0432\u0438\u043D\u0438 \u0442\u0430 \u043E\u0441\u043D\u043E\u0432\u043D\u0456 \u043F\u043E\u0434\u0456\u0457 \u0432 \u043A\u0440\u0430\u0457\u043D\u0430\u0445 \u0421\u041D\u0414 \u0456 \u0441\u0432\u0456\u0442\u0443.'  # noqa: E501
+    publisher = '\u0406\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E \u00AB\u0406\u043D\u0442\u0435\u0440\u0444\u0430\u043A\u0441-\u0423\u043A\u0440\u0430\u0457\u043D\u0430\u00BB'  # noqa: E501
     category = 'newspaper'
     cover_url = u'https://interfax.com.ua/static/articles/images/interfax_ukraine_logo_ukr.svg'
     language = 'uk'
diff --git a/recipes/interfax_uk.recipe b/recipes/interfax_uk.recipe
index 1f232dbdef..f22dc0c604 100644
--- a/recipes/interfax_uk.recipe
+++ b/recipes/interfax_uk.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class InterfaxUARU(BasicNewsRecipe):
     title = '\u0418\u043D\u0442\u0435\u0440\u0444\u0430\u043A\u0441-\u0423\u043A\u0440\u0430\u0438\u043D\u0430'
     __author__ = 'bugmen00t'
-    description = '\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043E \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0445 \u0441\u043E\u0431\u044B\u0442\u0438\u044F\u0445 \u0432 \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0435 \u0423\u043A\u0440\u0430\u0438\u043D\u044B, \u043A\u043B\u044E\u0447\u0435\u0432\u044B\u0435 \u0443\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0438\u0435 \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u0438 \u043E\u0441\u043D\u043E\u0432\u043D\u044B\u0435 \u0441\u043E\u0431\u044B\u0442\u0438\u044F \u0432 \u0441\u0442\u0440\u0430\u043D\u0430\u0445 \u0421\u041D\u0413 \u0438 \u043C\u0438\u0440\u0430.'  # noqa
-    publisher = '\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E \u00AB\u0418\u043D\u0442\u0435\u0440\u0444\u0430\u043A\u0441-\u0423\u043A\u0440\u0430\u0438\u043D\u0430\u00BB'  # noqa
+    description = '\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043E \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0445 \u0441\u043E\u0431\u044B\u0442\u0438\u044F\u0445 \u0432 \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0435 \u0423\u043A\u0440\u0430\u0438\u043D\u044B, \u043A\u043B\u044E\u0447\u0435\u0432\u044B\u0435 \u0443\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0438\u0435 \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u0438 \u043E\u0441\u043D\u043E\u0432\u043D\u044B\u0435 \u0441\u043E\u0431\u044B\u0442\u0438\u044F \u0432 \u0441\u0442\u0440\u0430\u043D\u0430\u0445 \u0421\u041D\u0413 \u0438 \u043C\u0438\u0440\u0430.'  # noqa: E501
+    publisher = '\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E \u00AB\u0418\u043D\u0442\u0435\u0440\u0444\u0430\u043A\u0441-\u0423\u043A\u0440\u0430\u0438\u043D\u0430\u00BB'  # noqa: E501
     category = 'newspaper'
     cover_url = u'https://interfax.com.ua/static/articles/images/interfax_ukraine_logo_rus.svg'
     language = 'ru'
diff --git a/recipes/internazionale.recipe b/recipes/internazionale.recipe
index d2c1a0bbfc..052f3519d7 100644
--- a/recipes/internazionale.recipe
+++ b/recipes/internazionale.recipe
@@ -12,8 +12,8 @@ class Volkskrant(BasicNewsRecipe):
     country = 'IT'
     category = 'news, politics, Italy, world'
     resolve_internal_links = True
-    remove_tags_before = { 'name': 'article' }
-    remove_tags_after = { 'name': 'article' }
+    remove_tags_before = {'name': 'article'}
+    remove_tags_after = {'name': 'article'}
     remove_tags = [
         dict(
             attrs={
@@ -29,13 +29,13 @@ class Volkskrant(BasicNewsRecipe):
         ),
         dict(name=['script', 'style']),
     ]
-    remove_attributes = ["class", "id", "name", "style"]
+    remove_attributes = ['class', 'id', 'name', 'style']
     encoding = 'utf-8'
     no_stylesheets = True
     ignore_duplicate_articles = {'url'}
 
-    current_number_url = "https://www.internazionale.it/sommario"
-    home_url = "https://www.internazionale.it"
+    current_number_url = 'https://www.internazionale.it/sommario'
+    home_url = 'https://www.internazionale.it'
     cover_url = None
 
     def extract_article(self, article):
@@ -67,8 +67,8 @@ class Volkskrant(BasicNewsRecipe):
 
     def parse_index(self):
         soup = self.index_to_soup(self.current_number_url)
-        self.cover_url = soup.find('span', { 'class': 'img_expand' })['data-src']
-        main_container = soup.find('div', { 'class': 'content_data' })
+        self.cover_url = soup.find('span', {'class': 'img_expand'})['data-src']
+        main_container = soup.find('div', {'class': 'content_data'})
         children = main_container.findAll('div', recursive=False)
         sections = []
         current_section = None
diff --git a/recipes/iol_za.recipe b/recipes/iol_za.recipe
index cd98f85d63..8ddc433fb9 100644
--- a/recipes/iol_za.recipe
+++ b/recipes/iol_za.recipe
@@ -10,7 +10,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class IOL_za(BasicNewsRecipe):
     title = 'IOL News'
     __author__ = 'Darko Miletic'
-    description = "South Africa's Premier Online News Source. Discover the world of IOL, News South Africa, Sport, Business, Financial, World News, Entertainment, Technology, Motoring, Travel, Property, Classifieds and more."  # noqa
+    description = "South Africa's Premier Online News Source. Discover the world of IOL, News South Africa, Sport, Business, Financial, World News, Entertainment, Technology, Motoring, Travel, Property, Classifieds and more."  # noqa: E501
     publisher = 'Independent Newspapers (Pty) Limited.'
     category = 'news, politics, South Africa'
     oldest_article = 2
@@ -23,10 +23,10 @@ class IOL_za(BasicNewsRecipe):
     remove_empty_feeds = True
     publication_type = 'newsportal'
     masthead_url = 'http://www.iol.co.za/polopoly_fs/iol-news5-1.989381!/image/464471284.png_gen/derivatives/absolute/464471284.png'
-    extra_css             = """
+    extra_css             = '''
                                 body{font-family: Arial,Helvetica,sans-serif }
                                 img{display: block}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/iprofesional.recipe b/recipes/iprofesional.recipe
index 27dad0a157..60564f4743 100644
--- a/recipes/iprofesional.recipe
+++ b/recipes/iprofesional.recipe
@@ -25,7 +25,7 @@ class iProfesional(BasicNewsRecipe):
     remove_empty_feeds = True
     publication_type = 'newsportal'
     masthead_url = 'http://www.iprofesional.com/img/header/logoiprofesional.png'
-    extra_css             = """
+    extra_css             = '''
                                body{font-family: "Open Sans", sans-serif}
                                img{margin-bottom: 0.4em; display:block}
                                .tituloprincipal{font-family: WhitneyBold, Arial, sans-serif;
@@ -33,18 +33,18 @@ class iProfesional(BasicNewsRecipe):
                                                 font-size: x-large;
                                                 display: block; margin-bottom: 1em;}
                                .bajadanh{font-size: small; display: block; margin-bottom: 1em;}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
     }
 
     keep_only_tags = [
-                       dict(name='div', attrs={'class': lambda x: x and 'tituloprincipal' in x.split()})
-                       ,dict(name='div', attrs={'class': lambda x: x and 'bajadanh' in x.split()})
-                       ,dict(name='div', attrs={'class': lambda x: x and 'datosautornh' in x.split()})
-                       ,dict(name='div', attrs={'class': lambda x: x and 'fotonotanh' in x.split()})
-                       ,dict(name='div', attrs={'class': lambda x: x and 'contenidonotanh' in x.split()})
+                       dict(name='div', attrs={'class': lambda x: x and 'tituloprincipal' in x.split()}),
+                       dict(name='div', attrs={'class': lambda x: x and 'bajadanh' in x.split()}),
+                       dict(name='div', attrs={'class': lambda x: x and 'datosautornh' in x.split()}),
+                       dict(name='div', attrs={'class': lambda x: x and 'fotonotanh' in x.split()}),
+                       dict(name='div', attrs={'class': lambda x: x and 'contenidonotanh' in x.split()}),
                      ]
     remove_tags = [
         dict(name=['meta', 'link', 'base', 'embed', 'object', 'iframe'])]
diff --git a/recipes/irish_times.recipe b/recipes/irish_times.recipe
index 90cbdd1a87..9f0637435e 100644
--- a/recipes/irish_times.recipe
+++ b/recipes/irish_times.recipe
@@ -121,7 +121,7 @@ class IrishTimes(BasicNewsRecipe):
             'sec-fetch-site': 'same-origin',
             'sec-fetch-dest': 'empty',
             'sec-fetch-mode': 'cors',
-        },  data=urlencode({'username': self.username, 'password': self.password, 'deviceid':deviceid, 'persistent':'on', 'rid': ''}))
+        }, data=urlencode({'username': self.username, 'password': self.password, 'deviceid':deviceid, 'persistent':'on', 'rid': ''}))
 
         r = br.open(rq)
         raw = r.read()
diff --git a/recipes/istories.recipe b/recipes/istories.recipe
index 4984ff0dd3..10169a6c8a 100644
--- a/recipes/istories.recipe
+++ b/recipes/istories.recipe
@@ -6,7 +6,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class IStories(BasicNewsRecipe):
     title = u'\u0412\u0430\u0436\u043D\u044B\u0435 \u0438\u0441\u0442\u043E\u0440\u0438\u0438'
-    description = u'\u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0438\u0437\u0434\u0430\u043D\u0438\u0435, \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u0438\u0437\u0438\u0440\u0443\u044E\u0449\u0435\u0435\u0441\u044F \u043D\u0430 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0441\u043A\u0438\u0445 \u0440\u0430\u0441\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u043D\u0438\u044F\u0445. \u041E\u0441\u043D\u043E\u0432\u0430\u043D\u043E \u0432 2020 \u0433\u043E\u0434\u0443 \u0440\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u0438\u043C\u0438 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0430\u043C\u0438 \u0420\u043E\u043C\u0430\u043D\u043E\u043C \u0410\u043D\u0438\u043D\u044B\u043C \u0438 \u041E\u043B\u0435\u0441\u0435\u0439 \u0428\u043C\u0430\u0433\u0443\u043D.'  # noqa
+    description = u'\u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0438\u0437\u0434\u0430\u043D\u0438\u0435, \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u0438\u0437\u0438\u0440\u0443\u044E\u0449\u0435\u0435\u0441\u044F \u043D\u0430 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0441\u043A\u0438\u0445 \u0440\u0430\u0441\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u043D\u0438\u044F\u0445. \u041E\u0441\u043D\u043E\u0432\u0430\u043D\u043E \u0432 2020 \u0433\u043E\u0434\u0443 \u0440\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u0438\u043C\u0438 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0430\u043C\u0438 \u0420\u043E\u043C\u0430\u043D\u043E\u043C \u0410\u043D\u0438\u043D\u044B\u043C \u0438 \u041E\u043B\u0435\u0441\u0435\u0439 \u0428\u043C\u0430\u0433\u0443\u043D.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = 'Roman Anin & Olesya Shmagun'
     publication_type = 'blog'
diff --git a/recipes/ixbt.recipe b/recipes/ixbt.recipe
index 24493cb4c2..3ccc1b3bf1 100644
--- a/recipes/ixbt.recipe
+++ b/recipes/ixbt.recipe
@@ -9,7 +9,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Ixbt(BasicNewsRecipe):
     title = 'iXBT.com'
     __author__ = 'bugmen00t'
-    description = 'Специализированный российский информационно-аналитический сервер, освещающий вопросы аппаратного обеспечения персональных компьютеров, коммуникаций и серверов, 3D-графики и звука, цифрового фото и видео, Hi-Fi аппаратуры и проекторов, мобильной связи и периферии, игровых приложений и многого другого.'  # noqa
+    description = 'Специализированный российский информационно-аналитический сервер, освещающий вопросы аппаратного обеспечения персональных компьютеров, коммуникаций и серверов, 3D-графики и звука, цифрового фото и видео, Hi-Fi аппаратуры и проекторов, мобильной связи и периферии, игровых приложений и многого другого.'  # noqa: E501
     publisher = 'www.ixbt.com'
     category = 'news'
     cover_url = u'https://www.ixbt.com/images/ixbt-logo-new.jpg'
diff --git a/recipes/jacobinmag.recipe b/recipes/jacobinmag.recipe
index 5804d55fec..2338d62c7c 100644
--- a/recipes/jacobinmag.recipe
+++ b/recipes/jacobinmag.recipe
@@ -35,11 +35,11 @@ class Jacobinmag(BasicNewsRecipe):
     issue_url = None
     PREFIX = 'https://www.jacobinmag.com'
     LOGIN = 'https://auth.jacobinmag.com/mini_profile?redirect=https%3A%2F%2Fwww.jacobinmag.com%2F'
-    extra_css = """
+    extra_css = '''
         body{font-family: Antwerp, 'Times New Roman', Times, serif}
         img{margin-top:1em; margin-bottom: 1em; display:block}
         .entry-dek,.entry-author{font-family: Hurme-No3, Futura, sans-serif}
-    """
+    '''
 
     conversion_options = {
         'comment': description,
diff --git a/recipes/japan_times.recipe b/recipes/japan_times.recipe
index eb1db6493c..fad4f6eb2b 100644
--- a/recipes/japan_times.recipe
+++ b/recipes/japan_times.recipe
@@ -1,36 +1,36 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__license__ = "GPL v3"
+__license__ = 'GPL v3'
 __copyright__ = (
-    "2008-2013, Darko Miletic <darko.miletic at gmail.com>. "
-    "2022, Albert Aparicio Isarn <aaparicio at posteo.net>"
+    '2008-2013, Darko Miletic <darko.miletic at gmail.com>. '
+    '2022, Albert Aparicio Isarn <aaparicio at posteo.net>'
 )
-"""
+'''
 japantimes.co.jp
-"""
+'''
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class JapanTimes(BasicNewsRecipe):
-    title = "The Japan Times"
-    __author__ = "Albert Aparicio Isarn (original recipe by Darko Miletic)"
+    title = 'The Japan Times'
+    __author__ = 'Albert Aparicio Isarn (original recipe by Darko Miletic)'
     description = (
         "The latest news from Japan Times, Japan's leading English-language daily newspaper"
     )
-    language = "en_JP"
-    category = "news, politics, japan"
-    publisher = "The Japan Times"
+    language = 'en_JP'
+    category = 'news, politics, japan'
+    publisher = 'The Japan Times'
     oldest_article = 2
     max_articles_per_feed = 150
     no_stylesheets = True
     remove_javascript = True
     use_embedded_content = False
-    encoding = "utf8"
-    publication_type = "newspaper"
-    masthead_url = "https://cdn-japantimes.com/wp-content/themes/jt_theme/library/img/japantimes-logo-tagline.png"
-    extra_css = "body{font-family: Geneva,Arial,Helvetica,sans-serif}"
+    encoding = 'utf8'
+    publication_type = 'newspaper'
+    masthead_url = 'https://cdn-japantimes.com/wp-content/themes/jt_theme/library/img/japantimes-logo-tagline.png'
+    extra_css = 'body{font-family: Geneva,Arial,Helvetica,sans-serif}'
 
     recipe_specific_options = {
         'days': {
@@ -47,37 +47,37 @@ class JapanTimes(BasicNewsRecipe):
             self.oldest_article = float(d)
 
     conversion_options = {
-        "comment": description,
-        "tags": category,
-        "publisher": publisher,
-        "language": language,
+        'comment': description,
+        'tags': category,
+        'publisher': publisher,
+        'language': language,
     }
 
-    remove_tags_before = {"name": "h1"}
-    remove_tags_after = {"name": "ul", "attrs": {"class": "single-sns-area"}}
+    remove_tags_before = {'name': 'h1'}
+    remove_tags_after = {'name': 'ul', 'attrs': {'class': 'single-sns-area'}}
     keep_only_tags = [
-        {"name": "div", "attrs": {"class": "padding_block"}},
+        {'name': 'div', 'attrs': {'class': 'padding_block'}},
         # {"name": "h5", "attrs": {"class": "writer", "role": "author"}},
         # {"name": "p", "attrs": {"class": "credit"}},
     ]
     remove_tags = [
-        {"name": "div", "id": "no_js_blocker", "attrs": {"class": "padding_block"}},
-        {"name": "div", "attrs": {"class": "single-upper-meta"}},
-        {"name": "ul", "attrs": {"class": "single-sns-area"}},
+        {'name': 'div', 'id': 'no_js_blocker', 'attrs': {'class': 'padding_block'}},
+        {'name': 'div', 'attrs': {'class': 'single-upper-meta'}},
+        {'name': 'ul', 'attrs': {'class': 'single-sns-area'}},
     ]
     feeds = [
-        (u"Top Stories", u"https://www.japantimes.co.jp/feed/topstories/"),
-        (u"News", u"https://www.japantimes.co.jp/news/feed/"),
-        (u"Opinion", u"https://www.japantimes.co.jp/opinion/feed/"),
-        (u"Life", u"https://www.japantimes.co.jp/life/feed/"),
-        (u"Community", u"https://www.japantimes.co.jp/community/feed/"),
-        (u"Culture", u"https://www.japantimes.co.jp/culture/feed/"),
-        (u"Sports", u"https://www.japantimes.co.jp/sports/feed/"),
+        (u'Top Stories', u'https://www.japantimes.co.jp/feed/topstories/'),
+        (u'News', u'https://www.japantimes.co.jp/news/feed/'),
+        (u'Opinion', u'https://www.japantimes.co.jp/opinion/feed/'),
+        (u'Life', u'https://www.japantimes.co.jp/life/feed/'),
+        (u'Community', u'https://www.japantimes.co.jp/community/feed/'),
+        (u'Culture', u'https://www.japantimes.co.jp/culture/feed/'),
+        (u'Sports', u'https://www.japantimes.co.jp/sports/feed/'),
     ]
 
     def get_article_url(self, article):
         rurl = BasicNewsRecipe.get_article_url(self, article)
-        return rurl.partition("?")[0]
+        return rurl.partition('?')[0]
 
     def preprocess_raw_html(self, raw, url):
-        return "<html><head>" + raw[raw.find("</head>") :]
+        return '<html><head>' + raw[raw.find('</head>') :]
diff --git a/recipes/javalobby.recipe b/recipes/javalobby.recipe
index dfd5396dd9..9d884cd5a6 100644
--- a/recipes/javalobby.recipe
+++ b/recipes/javalobby.recipe
@@ -19,10 +19,10 @@ class Engadget(BasicNewsRecipe):
     no_stylesheets = True
     use_embedded_content = False
 
-    remove_tags = [dict(name='div', attrs={'class': ["fivestar-static-form-item", "relatedContent", "pagination clearfix", "addResources"]}),
-                   dict(name='div', attrs={'id': ["comments"]})]
+    remove_tags = [dict(name='div', attrs={'class': ['fivestar-static-form-item', 'relatedContent', 'pagination clearfix', 'addResources']}),
+                   dict(name='div', attrs={'id': ['comments']})]
 
-    keep_only_tags = [dict(name='div', attrs={'id': ["article"]})]
+    keep_only_tags = [dict(name='div', attrs={'id': ['article']})]
 
     feeds = [(u'news', u'http://feeds.dzone.com/javalobby/frontpage')]
 
diff --git a/recipes/jijinews.recipe b/recipes/jijinews.recipe
index bd2a471e42..02728f2f6d 100644
--- a/recipes/jijinews.recipe
+++ b/recipes/jijinews.recipe
@@ -23,8 +23,8 @@ class JijiDotCom(BasicNewsRecipe):
     feeds = [(u'\u30cb\u30e5\u30fc\u30b9',
               u'http://www.jiji.com/rss/ranking.rdf')]
 
-    remove_tags_before = dict(id="article-area")
-    remove_tags_after = dict(id="ad_google")
+    remove_tags_before = dict(id='article-area')
+    remove_tags_after = dict(id='ad_google')
 
     def get_cover_url(self):
         cover_url = 'http://www.jiji.com/img/top_header_logo2.gif'
diff --git a/recipes/joop.recipe b/recipes/joop.recipe
index 3464c4a548..16d5092798 100644
--- a/recipes/joop.recipe
+++ b/recipes/joop.recipe
@@ -36,7 +36,7 @@ class JoopRecipe(BasicNewsRecipe):
     keep_only_tags.append(
         dict(name='h2', attrs={'class': 'columnhead smallline'}))
     keep_only_tags.append(
-        dict(name='div', attrs={'class': re.compile('article.*')}))
+        dict(name='div', attrs={'class': re.compile(r'article.*')}))
 
     extra_css = '''
                 body {font-family: verdana, arial, helvetica, geneva, sans-serif;}
diff --git a/recipes/jot_down.recipe b/recipes/jot_down.recipe
index b1b9deccd7..b078edd90c 100644
--- a/recipes/jot_down.recipe
+++ b/recipes/jot_down.recipe
@@ -47,7 +47,7 @@ class jotdown(BasicNewsRecipe):
                           dict(name='div', attrs={'id':'respond'})
                          ]
 
-    remove_tags_after  = dict(name='div' , attrs={'id':'respond'})
+    remove_tags_after  = dict(name='div', attrs={'id':'respond'})
 
     preprocess_regexps = [
         # To change the small size of the text
diff --git a/recipes/jpost.recipe b/recipes/jpost.recipe
index 2c94daead2..ef8281a4cb 100644
--- a/recipes/jpost.recipe
+++ b/recipes/jpost.recipe
@@ -25,7 +25,6 @@ class JerusalemPost(BasicNewsRecipe):
 
     __author__ = 'Kovid Goyal'
     max_articles_per_feed = 10
-    no_stylesheets = True
 
     def get_browser(self):
         return BasicNewsRecipe.get_browser(self, user_agent='common_words/based')
diff --git a/recipes/juventudrebelde.recipe b/recipes/juventudrebelde.recipe
index 9dd33892d1..d75d8da8d9 100644
--- a/recipes/juventudrebelde.recipe
+++ b/recipes/juventudrebelde.recipe
@@ -21,7 +21,7 @@ class JuventudRebelde(BasicNewsRecipe):
     category = 'Noticias'
     language = 'es'
     publication_type = 'Periodico'
-    extra_css = ' body{ font-family: Verdana,Helvetica,Arial,sans-serif } .title{font-weight: bold} .read{display: block; padding: 0; border: 1px solid; width: 40%; font-size: small} .story-feature h2{text-align: center; text-transform: uppercase} '  # noqa
+    extra_css = ' body{ font-family: Verdana,Helvetica,Arial,sans-serif } .title{font-weight: bold} .read{display: block; padding: 0; border: 1px solid; width: 40%; font-size: small} .story-feature h2{text-align: center; text-transform: uppercase} '  # noqa: E501
     preprocess_regexps = [(re.compile(r'<!--.*?-->', re.DOTALL), lambda m: '')]
     conversion_options = {
         'comments': description, 'tags': category, 'language': language, 'publisher': publisher, 'linearize_tables': True
diff --git a/recipes/kirkusreviews.recipe b/recipes/kirkusreviews.recipe
index 99de429ee3..c3437f2fd7 100644
--- a/recipes/kirkusreviews.recipe
+++ b/recipes/kirkusreviews.recipe
@@ -4,20 +4,20 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class KirkusReviews(BasicNewsRecipe):
-    title = "Kirkus Reviews"
-    description = ("Kirkus Reviews is an American book review magazine founded in 1933 by Virginia Kirkus."
-                   " The magazine is headquartered in New York City. Released twice monthly on the 1st/15th.")
-    language = "en"
-    __author__ = "ping"
-    publication_type = "magazine"
+    title = 'Kirkus Reviews'
+    description = ('Kirkus Reviews is an American book review magazine founded in 1933 by Virginia Kirkus.'
+                   ' The magazine is headquartered in New York City. Released twice monthly on the 1st/15th.')
+    language = 'en'
+    __author__ = 'ping'
+    publication_type = 'magazine'
     masthead_url = (
-        "https://d1fd687oe6a92y.cloudfront.net/img/kir_images/logo/kirkus-nav-logo.svg"
+        'https://d1fd687oe6a92y.cloudfront.net/img/kir_images/logo/kirkus-nav-logo.svg'
     )
-    encoding = "utf-8"
+    encoding = 'utf-8'
     remove_javascript = True
     no_stylesheets = True
     auto_cleanup = False
-    ignore_duplicate_articles = {"url"}
+    ignore_duplicate_articles = {'url'}
     compress_news_images = True
     compress_news_images_auto_size = 6
     max_articles_per_feed = 99
@@ -25,105 +25,105 @@ class KirkusReviews(BasicNewsRecipe):
     keep_only_tags = [
         dict(
             class_=[
-                "article-author",
-                "article-author-img-start",
-                "article-author-description-start",
-                "single-review",
+                'article-author',
+                'article-author-img-start',
+                'article-author-description-start',
+                'single-review',
             ]
         )
     ]
     remove_tags = [
         dict(
             class_=[
-                "sidebar-content",
-                "article-social-share-desktop-first",
-                "article-social-share-desktop-pagination",
-                "article-social-share-mobile",
-                "share-review-text",
-                "like-dislike-article",
-                "rate-this-book-text",
-                "input-group",
-                "user-comments",
-                "show-all-response-text",
-                "button-row",
-                "hide-on-mobile",
-                "related-article",
-                "breadcrumb-row",
-                "shop-now-dropdown",
+                'sidebar-content',
+                'article-social-share-desktop-first',
+                'article-social-share-desktop-pagination',
+                'article-social-share-mobile',
+                'share-review-text',
+                'like-dislike-article',
+                'rate-this-book-text',
+                'input-group',
+                'user-comments',
+                'show-all-response-text',
+                'button-row',
+                'hide-on-mobile',
+                'related-article',
+                'breadcrumb-row',
+                'shop-now-dropdown',
             ]
         )
     ]
-    remove_tags_after = [dict(class_="single-review")]
+    remove_tags_after = [dict(class_='single-review')]
 
-    extra_css = """
+    extra_css = '''
     .image-container img { max-width: 100%; height: auto; margin-bottom: 0.2rem; }
     .photo-caption { font-size: 0.8rem; margin-bottom: 0.5rem; display: block; }
     .book-review-img .image-container { text-align: center; }
     .book-rating-module .description-title { font-size: 1.25rem; margin-left: 0; text-align: center; }
-    """
+    '''
 
     def preprocess_html(self, soup):
-        h1 = soup.find(class_="article-title")
-        book_cover = soup.find("ul", class_="book-review-img")
+        h1 = soup.find(class_='article-title')
+        book_cover = soup.find('ul', class_='book-review-img')
         if book_cover:
-            for li in book_cover.find_all("li"):
-                li.name = "div"
-            book_cover.name = "div"
+            for li in book_cover.find_all('li'):
+                li.name = 'div'
+            book_cover.name = 'div'
             if h1:
                 book_cover.insert_before(h1.extract())
         return soup
 
     def parse_index(self):
-        issue_url = "https://www.kirkusreviews.com/magazine/current/"
+        issue_url = 'https://www.kirkusreviews.com/magazine/current/'
         soup = self.index_to_soup(issue_url)
-        issue = soup.find(name="article", class_="issue-container")
-        cover_img = issue.select(".issue-header .cover-image img")
+        issue = soup.find(name='article', class_='issue-container')
+        cover_img = issue.select('.issue-header .cover-image img')
         if cover_img:
-            self.cover_url = cover_img[0]["src"]
+            self.cover_url = cover_img[0]['src']
 
-        h1 = issue.find("h1")
+        h1 = issue.find('h1')
         if h1:
-            self.timefmt = f" [{self.tag_to_string(h1)}]"  # edition
+            self.timefmt = f' [{self.tag_to_string(h1)}]'  # edition
 
         articles = {}
-        for book_ele in soup.find_all(name="div", class_="issue-featured-book"):
-            link = book_ele.find("a")
+        for book_ele in soup.find_all(name='div', class_='issue-featured-book'):
+            link = book_ele.find('a')
             if not link:
                 continue
-            section = self.tag_to_string(book_ele.find("h3")).upper()
+            section = self.tag_to_string(book_ele.find('h3')).upper()
             articles.setdefault(section, []).append(
-                {"url": urljoin(issue_url, link["href"]), "title": link["title"]}
+                {'url': urljoin(issue_url, link['href']), 'title': link['title']}
             )
-        for post_ele in issue.select("div.issue-more-posts ul li div.lead-text"):
-            link = post_ele.find("a")
+        for post_ele in issue.select('div.issue-more-posts ul li div.lead-text'):
+            link = post_ele.find('a')
             if not link:
                 continue
-            section = self.tag_to_string(post_ele.find(class_="lead-text-type")).upper()
+            section = self.tag_to_string(post_ele.find(class_='lead-text-type')).upper()
             articles.setdefault(section, []).append(
                 {
-                    "url": urljoin(issue_url, link["href"]),
-                    "title": self.tag_to_string(link),
+                    'url': urljoin(issue_url, link['href']),
+                    'title': self.tag_to_string(link),
                 }
             )
-        for section_ele in issue.select("section.reviews-section"):
+        for section_ele in issue.select('section.reviews-section'):
             section_articles = []
-            for review in section_ele.select("ul li.starred"):
-                link = review.select("h4 a")
+            for review in section_ele.select('ul li.starred'):
+                link = review.select('h4 a')
                 if not link:
                     continue
-                description = review.find("p")
+                description = review.find('p')
                 section_articles.append(
                     {
-                        "url": urljoin(issue_url, link[0]["href"]),
-                        "title": self.tag_to_string(link[0]),
-                        "description": ""
+                        'url': urljoin(issue_url, link[0]['href']),
+                        'title': self.tag_to_string(link[0]),
+                        'description': ''
                         if not description
                         else self.tag_to_string(description),
                     }
                 )
             if not section_articles:
                 continue
-            section = self.tag_to_string(section_ele.find("h3")).upper()
+            section = self.tag_to_string(section_ele.find('h3')).upper()
             if section not in articles:
                 articles[section] = []
             articles.setdefault(section, []).extend(section_articles)
diff --git a/recipes/knife_media.recipe b/recipes/knife_media.recipe
index 4e728e2936..60ce16cf2a 100644
--- a/recipes/knife_media.recipe
+++ b/recipes/knife_media.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class KnifeMedia(BasicNewsRecipe):
     title = '\u041D\u043E\u0436'
     __author__ = 'bugmen00t'
-    description = '\u0418\u043D\u0442\u0435\u043B\u043B\u0435\u043A\u0442\u0443\u0430\u043B\u044C\u043D\u044B\u0439 \u0436\u0443\u0440\u043D\u0430\u043B \u043E \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u0435 \u0438 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435'  # noqa
+    description = '\u0418\u043D\u0442\u0435\u043B\u043B\u0435\u043A\u0442\u0443\u0430\u043B\u044C\u043D\u044B\u0439 \u0436\u0443\u0440\u043D\u0430\u043B \u043E \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u0435 \u0438 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435'  # noqa: E501
     publisher = '\u041C\u0438\u0445\u0430\u0438\u043B \u0426\u044B\u0433\u0430\u043D, \u0422\u0430\u0442\u044C\u044F\u043D\u0430 \u041A\u043E\u044D\u043D'
     category = 'blog'
     cover_url = u'https://knife.media/feature/pdd/img/knife_logo.33a98aee.svg'
diff --git a/recipes/kompiutierra.recipe b/recipes/kompiutierra.recipe
index d34a60b365..6e2064ddb1 100644
--- a/recipes/kompiutierra.recipe
+++ b/recipes/kompiutierra.recipe
@@ -26,7 +26,7 @@ class Computerra(BasicNewsRecipe):
 
     remove_tags_after = dict(name='article')
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='ul', attrs={'class': 'breadcrumbs'}),
         dict(name='div', attrs={'class': 'post-info__likes post-info-likes'}),
         dict(name='div', attrs={'class': 'cta-row'}),
diff --git a/recipes/konflikty_zbrojne.recipe b/recipes/konflikty_zbrojne.recipe
index 5e27d99c74..3c1c41c841 100644
--- a/recipes/konflikty_zbrojne.recipe
+++ b/recipes/konflikty_zbrojne.recipe
@@ -7,7 +7,7 @@ class Konflikty(BasicNewsRecipe):
     __author__ = 'fenuks'
     cover_url = 'http://konflikty.pl/wp-content/uploads/2014/07/konflikty.pl-logo.png'
     language = 'pl'
-    description = u'Zbiór ciekawych artykułów historycznych, militarnych oraz recenzji książek, gier i filmów. Najświeższe informacje o lotnictwie, wojskach lądowych i polityce.'  # noqa
+    description = u'Zbiór ciekawych artykułów historycznych, militarnych oraz recenzji książek, gier i filmów. Najświeższe informacje o lotnictwie, wojskach lądowych i polityce.'  # noqa: E501
     category = 'military, history'
     oldest_article = 7
     max_articles_per_feed = 100
@@ -17,7 +17,7 @@ class Konflikty(BasicNewsRecipe):
         dict(name='div', attrs={'id': 'page-content'})]
 
     remove_tags = [dict(name='aside'), dict(name='p', attrs={'id': 'breadcrumbs'}), dict(name='div', attrs={'class': [
-        'tags clearfix', 'post-tags clearfix', 'post-nav section-container clearfix', 'about-author section-container clearfix vcard', 'post-related section-container clearfix', ]}), dict(name='div', attrs={'id': 'disqus_thread'})]  # noqa
+        'tags clearfix', 'post-tags clearfix', 'post-nav section-container clearfix', 'about-author section-container clearfix vcard', 'post-related section-container clearfix', ]}), dict(name='div', attrs={'id': 'disqus_thread'})]  # noqa: E501
 
     feeds = [(u'Konflikty Zbrojne', u'http://www.konflikty.pl/feed')]
 
diff --git a/recipes/kopalniawiedzy.recipe b/recipes/kopalniawiedzy.recipe
index c9189ca643..5b67df334b 100644
--- a/recipes/kopalniawiedzy.recipe
+++ b/recipes/kopalniawiedzy.recipe
@@ -25,13 +25,13 @@ class KopalniaWiedzy(BasicNewsRecipe):
                    {'name': 'div', 'attrs': {'class': 'article-time-and-cat'}}, {'name': 'p', 'attrs': {'class': 'tags'}}]
     remove_tags_after = dict(attrs={'class': 'ad-square'})
     keep_only_tags = [
-        dict(name="div", attrs={'class': 'article-text text-small'})]
+        dict(name='div', attrs={'class': 'article-text text-small'})]
     extra_css = '.topimage {margin-top: 30px}'
 
     preprocess_regexps = [
-        (re.compile(u'<a .* rel="lightboxText" .*><img (.*)></a>'),
+        (re.compile(r'<a .* rel="lightboxText" .*><img (.*)></a>'),
          lambda match: '<img class="topimage" ' + match.group(1) + '>'),
-        (re.compile(u'<br  /><br  />'),
+        (re.compile(r'<br  /><br  />'),
          lambda match: '<br/>')
     ]
 
diff --git a/recipes/korben.recipe b/recipes/korben.recipe
index 30a8b12cca..aa1b0f3492 100644
--- a/recipes/korben.recipe
+++ b/recipes/korben.recipe
@@ -17,6 +17,6 @@ class BasicUserRecipe1318619728(BasicNewsRecipe):
         try:
             br.open(masthead)
         except:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             masthead = None
         return masthead
diff --git a/recipes/kosmonauta_pl.recipe b/recipes/kosmonauta_pl.recipe
index 8cc7258c1b..a262723abb 100644
--- a/recipes/kosmonauta_pl.recipe
+++ b/recipes/kosmonauta_pl.recipe
@@ -10,11 +10,9 @@ class Kosmonauta(BasicNewsRecipe):
     category = 'astronomy'
     language = 'pl'
     cover_url = 'http://bi.gazeta.pl/im/4/10393/z10393414X,Kosmonauta-net.jpg'
-    no_stylesheets = True
     oldest_article = 7
     no_stylesheets = True
     remove_javascript = True
     remove_attributes = ['style']
     max_articles_per_feed = 100
     feeds = [(u'Kosmonauta.net', u'http://www.kosmonauta.net/feed')]
-
diff --git a/recipes/kudy_z_nudy.recipe b/recipes/kudy_z_nudy.recipe
index 5a5b320e3a..29aa54e224 100644
--- a/recipes/kudy_z_nudy.recipe
+++ b/recipes/kudy_z_nudy.recipe
@@ -22,15 +22,15 @@ class kudyznudyRecipe(BasicNewsRecipe):
     cover_url = 'http://www.kudyznudy.cz/App_Themes/KzN/Images/Containers/Header/HeaderLogoKZN.png'
     remove_javascript = True
     no_stylesheets = True
-    extra_css             = """
-                            """
+    extra_css             = '''
+                            '''
 
     remove_attributes = []
     remove_tags_before = dict(
         name='div', attrs={'class': ['C_WholeContentPadding']})
     remove_tags_after = dict(
         name='div', attrs={'class': ['SurroundingsContainer']})
-    remove_tags = [dict(name='div',   attrs={
+    remove_tags = [dict(name='div', attrs={
                         'class': ['Details', 'buttons', 'SurroundingsContainer', 'breadcrumb']})]
 
     keep_only_tags = []
diff --git a/recipes/kurier.recipe b/recipes/kurier.recipe
index d9e7ea0d67..d51cda698f 100644
--- a/recipes/kurier.recipe
+++ b/recipes/kurier.recipe
@@ -44,16 +44,16 @@ class Kurier(BasicNewsRecipe):
     ]
 
     keep_only_tags = [
-        dict(name='article', attrs={'class': re.compile('main-article')})
+        dict(name='article', attrs={'class': re.compile(r'main-article')})
     ]
 
     remove_tags = [
         dict(name='div', attrs={'class': 'social-media-container'}),
         dict(name='section', attrs={'class': 'tags'}),
-        dict(name='section', attrs={'class': re.compile('comment-box')}),
-        dict(name='section', attrs={'class': re.compile('related-content')}),
-        dict(name='section', attrs={'class': re.compile('article-slider')}),
-        dict(name='section', attrs={'class': re.compile('commentcontainer')}),
+        dict(name='section', attrs={'class': re.compile(r'comment-box')}),
+        dict(name='section', attrs={'class': re.compile(r'related-content')}),
+        dict(name='section', attrs={'class': re.compile(r'article-slider')}),
+        dict(name='section', attrs={'class': re.compile(r'commentcontainer')}),
         dict(name='blockquote')
     ]
 
diff --git a/recipes/kyivpost_en.recipe b/recipes/kyivpost_en.recipe
index 344ac169a0..cf0c97d463 100644
--- a/recipes/kyivpost_en.recipe
+++ b/recipes/kyivpost_en.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class KyivPost(BasicNewsRecipe):
     title = 'Kyiv Post'
     __author__ = 'bugmen00t'
-    description = 'The Kyiv Post is Ukraine\u2019s English-language newspaper. The newspaper\u2019s first print edition came out on Oct. 18, 1995, and went online in 1997. The newspaper\u2019s motto is \u201CUkraine\u2019s Global Voice,\u201D which in 2018 replaced the previous motto of \u201CIndependence. Community. Trust.\u201D Both slogans reflect the newspaper\u2019s commitment to the highest journalistic and ethical standards.'  # noqa
+    description = 'The Kyiv Post is Ukraine\u2019s English-language newspaper. The newspaper\u2019s first print edition came out on Oct. 18, 1995, and went online in 1997. The newspaper\u2019s motto is \u201CUkraine\u2019s Global Voice,\u201D which in 2018 replaced the previous motto of \u201CIndependence. Community. Trust.\u201D Both slogans reflect the newspaper\u2019s commitment to the highest journalistic and ethical standards.'  # noqa: E501
     publisher = 'BIZNESGRUPP TOV'
     category = 'newspaper'
     cover_url = u'https://www.kyivpost.com/wp-content/themes/kyivpost/assets/img/svg/logo-foot.svg'
diff --git a/recipes/kyivpost_ua.recipe b/recipes/kyivpost_ua.recipe
index e4a05c6ecb..4c0ec6ada1 100644
--- a/recipes/kyivpost_ua.recipe
+++ b/recipes/kyivpost_ua.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class KyivPost(BasicNewsRecipe):
     title = 'Kyiv Post'
     __author__ = 'bugmen00t'
-    description = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430 \u0430\u043D\u0433\u043B\u043E\u043C\u043E\u0432\u043D\u0430 \u0433\u0430\u0437\u0435\u0442\u0430, \u043D\u0430\u0433\u043E\u0440\u043E\u0434\u0436\u0435\u043D\u0430 \u0443 2014 \u0440\u043E\u043A\u0443. \u041F\u0435\u0440\u0448\u0438\u0439 \u0434\u0440\u0443\u043A\u043E\u0432\u0430\u043D\u0438\u0439 \u043F\u0440\u0438\u043C\u0456\u0440\u043D\u0438\u043A \u0433\u0430\u0437\u0435\u0442\u0438 \u0432\u0438\u0439\u0448\u043E\u0432 18 \u0436\u043E\u0432\u0442\u043D\u044F 1995 \u0440\u043E\u043A\u0443, \u0430 \u0432 \u0406\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0432\u0430\u0440\u0456\u0430\u043D\u0442\u0456 Kyiv Post \u0437\u2019\u044F\u0432\u0438\u043B\u0430\u0441\u044C \u0432 1997 \u0440\u043E\u0446\u0456. \u0414\u0435\u0432\u0456\u0437 \u0433\u0430\u0437\u0435\u0442\u0438: \u00AB\u0413\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u0438\u0439 \u0433\u043E\u043B\u043E\u0441 \u0423\u043A\u0440\u0430\u0457\u043D\u0438\u00BB, \u044F\u043A\u0438\u0439 \u0443 2018 \u0440\u043E\u0446\u0456 \u0437\u0430\u043C\u0456\u043D\u0438\u0432 \u043F\u043E\u043F\u0435\u0440\u0435\u0434\u043D\u0456\u0439 \u0434\u0435\u0432\u0456\u0437 \u00AB\u041D\u0435\u0437\u0430\u043B\u0435\u0436\u043D\u0456\u0441\u0442\u044C. \u0421\u043F\u0456\u043B\u044C\u043D\u043E\u0442\u0430. \u0414\u043E\u0432\u0456\u0440\u0430.\u00BB \u041E\u0431\u0438\u0434\u0432\u0430 \u0433\u0430\u0441\u043B\u0430 \u0432\u0456\u0434\u043E\u0431\u0440\u0430\u0436\u0430\u044E\u0442\u044C \u0442\u0435, \u0449\u043E \u0443 \u0432\u0438\u0434\u0430\u043D\u043D\u0456  \u0434\u043E\u0442\u0440\u0438\u043C\u0443\u044E\u0442\u044C\u0441\u044F \u043D\u0430\u0439\u0432\u0438\u0449\u0438\u0445 \u0436\u0443\u0440\u043D\u0430\u043B\u0456\u0441\u0442\u0441\u044C\u043A\u0438\u0445 \u0442\u0430 \u0435\u0442\u0438\u0447\u043D\u0438\u0445 \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u0456\u0432.'  # noqa
+    description = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430 \u0430\u043D\u0433\u043B\u043E\u043C\u043E\u0432\u043D\u0430 \u0433\u0430\u0437\u0435\u0442\u0430, \u043D\u0430\u0433\u043E\u0440\u043E\u0434\u0436\u0435\u043D\u0430 \u0443 2014 \u0440\u043E\u043A\u0443. \u041F\u0435\u0440\u0448\u0438\u0439 \u0434\u0440\u0443\u043A\u043E\u0432\u0430\u043D\u0438\u0439 \u043F\u0440\u0438\u043C\u0456\u0440\u043D\u0438\u043A \u0433\u0430\u0437\u0435\u0442\u0438 \u0432\u0438\u0439\u0448\u043E\u0432 18 \u0436\u043E\u0432\u0442\u043D\u044F 1995 \u0440\u043E\u043A\u0443, \u0430 \u0432 \u0406\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0432\u0430\u0440\u0456\u0430\u043D\u0442\u0456 Kyiv Post \u0437\u2019\u044F\u0432\u0438\u043B\u0430\u0441\u044C \u0432 1997 \u0440\u043E\u0446\u0456. \u0414\u0435\u0432\u0456\u0437 \u0433\u0430\u0437\u0435\u0442\u0438: \u00AB\u0413\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u0438\u0439 \u0433\u043E\u043B\u043E\u0441 \u0423\u043A\u0440\u0430\u0457\u043D\u0438\u00BB, \u044F\u043A\u0438\u0439 \u0443 2018 \u0440\u043E\u0446\u0456 \u0437\u0430\u043C\u0456\u043D\u0438\u0432 \u043F\u043E\u043F\u0435\u0440\u0435\u0434\u043D\u0456\u0439 \u0434\u0435\u0432\u0456\u0437 \u00AB\u041D\u0435\u0437\u0430\u043B\u0435\u0436\u043D\u0456\u0441\u0442\u044C. \u0421\u043F\u0456\u043B\u044C\u043D\u043E\u0442\u0430. \u0414\u043E\u0432\u0456\u0440\u0430.\u00BB \u041E\u0431\u0438\u0434\u0432\u0430 \u0433\u0430\u0441\u043B\u0430 \u0432\u0456\u0434\u043E\u0431\u0440\u0430\u0436\u0430\u044E\u0442\u044C \u0442\u0435, \u0449\u043E \u0443 \u0432\u0438\u0434\u0430\u043D\u043D\u0456  \u0434\u043E\u0442\u0440\u0438\u043C\u0443\u044E\u0442\u044C\u0441\u044F \u043D\u0430\u0439\u0432\u0438\u0449\u0438\u0445 \u0436\u0443\u0440\u043D\u0430\u043B\u0456\u0441\u0442\u0441\u044C\u043A\u0438\u0445 \u0442\u0430 \u0435\u0442\u0438\u0447\u043D\u0438\u0445 \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u0456\u0432.'  # noqa: E501
     publisher = 'BIZNESGRUPP TOV'
     category = 'newspaper'
     cover_url = u'https://www.kyivpost.com/wp-content/themes/kyivpost/assets/img/svg/logo-foot.svg'
diff --git a/recipes/kyungyhang.recipe b/recipes/kyungyhang.recipe
index c755d50c7d..31b1ba6379 100644
--- a/recipes/kyungyhang.recipe
+++ b/recipes/kyungyhang.recipe
@@ -21,7 +21,7 @@ class Kyungyhang(BasicNewsRecipe):
     remove_javascript = True
 
     preprocess_regexps = [
-        (re.compile("<div class='ad_movFocus'.*</html>",
+        (re.compile(r"<div class='ad_movFocus'.*</html>",
                     re.DOTALL | re.IGNORECASE), lambda match: '</html>'),
     ]
 
diff --git a/recipes/la_jornada.recipe b/recipes/la_jornada.recipe
index cbf806c3ef..355d6a6017 100644
--- a/recipes/la_jornada.recipe
+++ b/recipes/la_jornada.recipe
@@ -33,10 +33,10 @@ class LaJornada_mx(BasicNewsRecipe):
     use_embedded_content = False
     language = 'es_MX'
     remove_empty_feeds = True
-    cover_url = strftime("http://www.jornada.com.mx/%Y/%m/%d/portada.pdf")
+    cover_url = strftime('http://www.jornada.com.mx/%Y/%m/%d/portada.pdf')
     masthead_url = 'http://www.jornada.com.mx/v7.0/imagenes/la-jornada-trans.png'
     publication_type = 'newspaper'
-    extra_css             = """
+    extra_css             = '''
                                 body{font-family: "Times New Roman",serif }
                                 .cabeza{font-size: xx-large; font-weight: bold }
                                 .documentFirstHeading{font-size: xx-large; font-weight: bold }
@@ -54,7 +54,7 @@ class LaJornada_mx(BasicNewsRecipe):
                                 .text{margin-top: 1.4em}
                                 p.inicial{display: inline; font-size: xx-large; font-weight: bold}
                                 p.s-s{display: inline; text-indent: 0}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
@@ -111,7 +111,7 @@ class LaJornada_mx(BasicNewsRecipe):
 
     def get_article_url(self, article):
         # Get link to original article URL
-        rurl = article.get('guid',  None)
+        rurl = article.get('guid', None)
         if not rurl:
             # Use the "link" attribute as failover
             return article.get('link', None)
diff --git a/recipes/la_nacion_cr.recipe b/recipes/la_nacion_cr.recipe
index 5462e2fb74..a8b776fb10 100644
--- a/recipes/la_nacion_cr.recipe
+++ b/recipes/la_nacion_cr.recipe
@@ -5,7 +5,7 @@ class crnews(BasicNewsRecipe):
     __author__ = 'Douglas Delgado'
     title = u'La Nacion Costa Rica'
     publisher = 'GRUPO NACION GN, S. A.'
-    description = 'Diario de circulacion nacional de Costa Rica. Recipe creado por Douglas Delgado (doudelgado@gmail.com) para su uso con Calibre por Kovid Goyal'  # noqa
+    description = 'Diario de circulacion nacional de Costa Rica. Recipe creado por Douglas Delgado (doudelgado@gmail.com) para su uso con Calibre por Kovid Goyal'  # noqa: E501
     category = 'Spanish, Entertainment'
     masthead_url = 'http://www.nacion.com/App_Themes/nacioncom/Images/logo_nacioncom.png'
 
diff --git a/recipes/la_nueva.recipe b/recipes/la_nueva.recipe
index 43ffa73516..5b9887d4f0 100644
--- a/recipes/la_nueva.recipe
+++ b/recipes/la_nueva.recipe
@@ -36,14 +36,14 @@ class AdvancedUserRecipe1294946868(BasicNewsRecipe):
             name='div', attrs={'id': ['noticia_texto']})
     ]
 
-    extra_css = ' p{text-align: justify; font-size: 100%} body{ text-align: left; font-family: serif; font-size: 100% } h1{ font-family: sans-serif; font-size:150%; font-weight: 600; text-align: justify; } h2{ font-family: sans-serif; font-size:120%; font-weight: 500; text-align: justify } '  # noqa
+    extra_css = ' p{text-align: justify; font-size: 100%} body{ text-align: left; font-family: serif; font-size: 100% } h1{ font-family: sans-serif; font-size:150%; font-weight: 600; text-align: justify; } h2{ font-family: sans-serif; font-size:120%; font-weight: 500; text-align: justify } '  # noqa: E501
 
     remove_tags_before = dict(name='div', attrs={'class': ['contenedor']})
     remove_tags_after = dict(name='div', attrs={'class': ['fin_noticia']})
 
     remove_tags = [
         dict(name='div', attrs={'class': ['epigrafe', 'antetitulo', 'bloqueclear', 'bloqueclear_video', 'cuadro_multimedia', 'cintillo2',
-                                          'editor_documentos', 'noticiadd', 'noticiadd3', 'noticiainterior', 'fin_noticia']}), dict(name='div', attrs={'id': ['evotos']})  # noqa
+                                          'editor_documentos', 'noticiadd', 'noticiadd3', 'noticiainterior', 'fin_noticia']}), dict(name='div', attrs={'id': ['evotos']})  # noqa: E501
     ]
 
     feeds = [
diff --git a/recipes/la_republica.recipe b/recipes/la_republica.recipe
index d0ca63bd8d..9efeaeacbd 100644
--- a/recipes/la_republica.recipe
+++ b/recipes/la_republica.recipe
@@ -15,9 +15,9 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class LaRepubblica(BasicNewsRecipe):
     title = 'La Repubblica'
     __author__ = 'Lorenzo Vigentini, Gabriele Marini, Darko Miletic, faber1971'
-    description = 'il quotidiano online con tutte le notizie in tempo reale. News e ultime notizie. Tutti i settori: politica, cronaca, economia, sport, esteri, scienza, tecnologia, internet, spettacoli, musica, cultura, arte, mostre, libri, dvd, vhs, concerti, cinema, attori, attrici, recensioni, chat, cucina, mappe. Le citta di Repubblica: Roma, Milano, Bologna, Firenze, Palermo, Napoli, Bari, Torino.'  # noqa
+    description = 'il quotidiano online con tutte le notizie in tempo reale. News e ultime notizie. Tutti i settori: politica, cronaca, economia, sport, esteri, scienza, tecnologia, internet, spettacoli, musica, cultura, arte, mostre, libri, dvd, vhs, concerti, cinema, attori, attrici, recensioni, chat, cucina, mappe. Le citta di Repubblica: Roma, Milano, Bologna, Firenze, Palermo, Napoli, Bari, Torino.'  # noqa: E501
     masthead_url = 'http://www.repubblica.it/static/images/homepage/2010/la-repubblica-logo-home-payoff.png'
-    publisher = 'Gruppo editoriale L\'Espresso'
+    publisher = "Gruppo editoriale L'Espresso"
     category = 'News, politics, culture, economy, general interest'
     language = 'it'
     timefmt = '[%a, %d %b, %Y]'
@@ -28,9 +28,9 @@ class LaRepubblica(BasicNewsRecipe):
     publication_type = 'newspaper'
     articles_are_obfuscated = True
     temp_files = []
-    extra_css               = """
+    extra_css               = '''
                                img{display: block}
-                              """
+                              '''
 
     remove_attributes = ['width', 'height', 'lang', 'xmlns:og', 'xmlns:fb']
 
@@ -50,7 +50,7 @@ class LaRepubblica(BasicNewsRecipe):
                 html = response.read()
                 count = 10
             except:
-                print("Retrying download...")
+                print('Retrying download...')
             count += 1
         self.temp_files.append(PersistentTemporaryFile('_fa.html'))
         self.temp_files[-1].write(html)
diff --git a/recipes/la_stampa.recipe b/recipes/la_stampa.recipe
index 820016c60e..9970590d5a 100644
--- a/recipes/la_stampa.recipe
+++ b/recipes/la_stampa.recipe
@@ -26,7 +26,7 @@ class LaStampa(BasicNewsRecipe):
     conversion_options = {'linearize_tables': True}
     remove_attributes = ['colspan']
 
-    extra_css = ' .boxocchiello2{font-size: small} .catenaccio{font-style: italic} .titoloRub{font-size: xx-large; font-weight: bold } .titologir{font-size: xx-large; font-weight: bold } .sezione{font-weight: bold} '  # noqa
+    extra_css = ' .boxocchiello2{font-size: small} .catenaccio{font-style: italic} .titoloRub{font-size: xx-large; font-weight: bold } .titologir{font-size: xx-large; font-weight: bold } .sezione{font-weight: bold} '  # noqa: E501
 
     def get_article_url(self, article):
         link = article.get('links')
@@ -34,7 +34,7 @@ class LaStampa(BasicNewsRecipe):
             return link[0]['href']
 
     keep_only_tags = [
-        dict(attrs={'class': ['boxocchiello2', 'titoloRub', 'titologir', 'autore-girata', 'luogo-girata', 'catenaccio', 'sezione', 'articologirata', 'bodytext', 'news-single-img', 'ls-articoloCorpo', 'ls-blog-list-1col']}),  # noqa
+        dict(attrs={'class': ['boxocchiello2', 'titoloRub', 'titologir', 'autore-girata', 'luogo-girata', 'catenaccio', 'sezione', 'articologirata', 'bodytext', 'news-single-img', 'ls-articoloCorpo', 'ls-blog-list-1col']}),  # noqa: E501
         dict(name='div', attrs={'id': 'corpoarticolo'})
     ]
 
diff --git a/recipes/lalibre_be.recipe b/recipes/lalibre_be.recipe
index cef8318a0e..100c32712a 100644
--- a/recipes/lalibre_be.recipe
+++ b/recipes/lalibre_be.recipe
@@ -32,7 +32,7 @@ class LaLibre(BasicNewsRecipe):
 
     feeds = [
 
-    (u'L\'actu', u'http://www.lalibre.be/rss/?section=10'),
+    (u"L'actu", u'http://www.lalibre.be/rss/?section=10'),
     (u'Culture', u'http://www.lalibre.be/rss/?section=5'),
     (u'Economie', u'http://www.lalibre.be/rss/?section=3'),
     (u'Libre Entreprise', u'http://www.lalibre.be/rss/?section=904'),
diff --git a/recipes/lanacion.recipe b/recipes/lanacion.recipe
index 15f35c7ca2..326b9a575f 100644
--- a/recipes/lanacion.recipe
+++ b/recipes/lanacion.recipe
@@ -9,7 +9,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Lanacion(BasicNewsRecipe):
     title = 'La Nacion'
     __author__ = 'Darko Miletic'
-    description = "lanacion.com - Informacion actualizada las 24 horas, con noticias de Argentina y del mundo"
+    description = 'lanacion.com - Informacion actualizada las 24 horas, con noticias de Argentina y del mundo'
     publisher = 'La Nacion S.A.'
     category = 'news, politics, Argentina'
     oldest_article = 1
@@ -22,13 +22,13 @@ class Lanacion(BasicNewsRecipe):
     publication_type = 'newspaper'
     remove_empty_feeds = True
     masthead_url = 'http://www.lanacion.com.ar/_ui/desktop/imgs/layout/logos/ln-home.gif'
-    extra_css             = """
+    extra_css             = '''
                                 h1{font-family: TheSans,Arial,sans-serif}
                                 body{font-family: Arial,sans-serif}
                                 img{display: block}
                                 .firma,.fecha{font-size: small}
                                 .epigrafe-columna{font-size: x-small}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
@@ -36,7 +36,7 @@ class Lanacion(BasicNewsRecipe):
 
     remove_tags = [
         dict(name=['iframe', 'embed', 'object', 'meta', 'link', 'button']), dict(attrs={'id': [
-            'herramientas-sociales', 'comunidad', 'ranking-nota', 'footer']}), dict(attrs={'class': ['mas-sobre-tema', 'cinturon-notas floatFix', 'cinturon-notas']})  # noqa
+            'herramientas-sociales', 'comunidad', 'ranking-nota', 'footer']}), dict(attrs={'class': ['mas-sobre-tema', 'cinturon-notas floatFix', 'cinturon-notas']})  # noqa: E501
     ]
 
     remove_tags_before = dict(attrs={'id': 'nota'})
diff --git a/recipes/lapoliticaonline_ar.recipe b/recipes/lapoliticaonline_ar.recipe
index 7134b6dcf6..aa1e78310d 100644
--- a/recipes/lapoliticaonline_ar.recipe
+++ b/recipes/lapoliticaonline_ar.recipe
@@ -9,7 +9,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class LaPoliticaOnline_AR(BasicNewsRecipe):
     title = 'La Politica Online'
     __author__ = 'Darko Miletic'
-    description = "Informacion actualizada las 24 horas, con noticias de Argentina y del mundo"
+    description = 'Informacion actualizada las 24 horas, con noticias de Argentina y del mundo'
     publisher = 'La Politica Online SA'
     category = 'news, politics, Argentina'
     oldest_article = 1
@@ -22,13 +22,13 @@ class LaPoliticaOnline_AR(BasicNewsRecipe):
     publication_type = 'newspaper'
     remove_empty_feeds = True
     masthead_url = 'http://www.lapoliticaonline.com/0/img/header/logo.gif'
-    extra_css             = """
+    extra_css             = '''
                                 .title,.vsmcontent{font-family: Georgia,"Times New Roman",Times,serif}
                                 body{font-family: Arial,Helvetica,sans-serif}
                                 .galleryfooter{font-size: small; color: gainsboro;}
                                 img{display: block}
                                 .title{font-size: x-large; font-weight: bold; line-height: 2em;}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/laprensa.recipe b/recipes/laprensa.recipe
index 820edf8abe..bf04fa9dfa 100644
--- a/recipes/laprensa.recipe
+++ b/recipes/laprensa.recipe
@@ -35,33 +35,33 @@ class LaPrensa(BasicNewsRecipe):
     filter_regexps = [r'.*archive.aspx.*']
 
     remove_tags = [
-        dict(name='td', attrs={'class': ["link-registro", "link-buscador"]}),
+        dict(name='td', attrs={'class': ['link-registro', 'link-buscador']}),
         dict(name='td', attrs={
-             'id': ["TDTabItem1", "TDTabItem2", "TDTabItem3", "TDTabItem4"]}),
-        dict(name='table', attrs={'class': ["marco-botonera"]}),
-        dict(name='tr', attrs={'class': ["messages", "IUTabItemSelected"]}),
-        dict(name='input', attrs={'id': "txt_allfields"}),
+             'id': ['TDTabItem1', 'TDTabItem2', 'TDTabItem3', 'TDTabItem4']}),
+        dict(name='table', attrs={'class': ['marco-botonera']}),
+        dict(name='tr', attrs={'class': ['messages', 'IUTabItemSelected']}),
+        dict(name='input', attrs={'id': 'txt_allfields'}),
         dict(name='div', attrs={
-             'id': ["TabItem1", "TabItem2", "TabItem3", "TabItem4", "RCPanel"]}),
-        dict(name='span', attrs={'id': ["GWCNavigatorControl", "_ctl15"]}),
-        dict(name='span', attrs={'class': ["ranking-titulo", "IUTab"]}),
-        dict(name='a', attrs={'class': ["link-registro", ]}),
-        dict(name='img', src="/versions/1/imgs/icono-comentario.gif"),
-        dict(name='img', src="/versions/1/imgs/logo.gif"),
-        dict(name='img', src="/versions/1/imgs/boton-ingresar-roll.gif"),
-        dict(name='img', src="/versions/1/imgs/icono-recomendar.gif"),
+             'id': ['TabItem1', 'TabItem2', 'TabItem3', 'TabItem4', 'RCPanel']}),
+        dict(name='span', attrs={'id': ['GWCNavigatorControl', '_ctl15']}),
+        dict(name='span', attrs={'class': ['ranking-titulo', 'IUTab']}),
+        dict(name='a', attrs={'class': ['link-registro', ]}),
+        dict(name='img', src='/versions/1/imgs/icono-comentario.gif'),
+        dict(name='img', src='/versions/1/imgs/logo.gif'),
+        dict(name='img', src='/versions/1/imgs/boton-ingresar-roll.gif'),
+        dict(name='img', src='/versions/1/imgs/icono-recomendar.gif'),
         dict(name='button'),
-        dict(name='img', src="/versions/1/imgs/boton-votar-roll.gif"),
-        dict(name='img', src="/versions/1/imgs/boton-ingresar.gif"),
-        dict(name='img', src="/versions/1/imgs/icono-imprimir.gif"),
-        dict(name='img', src="/versions/1/imgs/icono-ampliar-letra.gif"),
-        dict(name='img', src="/versions/1/imgs/icono-reducir-letra.gif"),
-        dict(name='img', src="/versions/1/imgs/pix-trans.gif"),
-        dict(name='img', src="/versions/1/imgs/icono-buscador.gif"),
-        dict(name='img', src="/versions/1/imgs/separador-linea-azul.gif"),
-        dict(name='img', src=" /versions/1/imgs/separador-linea.gif"),
-        dict(name='a', text="Powered by Civinext Groupware - V. 2.0.3567.23706"),
-        dict(name='img', height="0")
+        dict(name='img', src='/versions/1/imgs/boton-votar-roll.gif'),
+        dict(name='img', src='/versions/1/imgs/boton-ingresar.gif'),
+        dict(name='img', src='/versions/1/imgs/icono-imprimir.gif'),
+        dict(name='img', src='/versions/1/imgs/icono-ampliar-letra.gif'),
+        dict(name='img', src='/versions/1/imgs/icono-reducir-letra.gif'),
+        dict(name='img', src='/versions/1/imgs/pix-trans.gif'),
+        dict(name='img', src='/versions/1/imgs/icono-buscador.gif'),
+        dict(name='img', src='/versions/1/imgs/separador-linea-azul.gif'),
+        dict(name='img', src=' /versions/1/imgs/separador-linea.gif'),
+        dict(name='a', text='Powered by Civinext Groupware - V. 2.0.3567.23706'),
+        dict(name='img', height='0')
     ]
 
     extra_css = '''
@@ -95,8 +95,8 @@ class LaPrensa(BasicNewsRecipe):
         soup.head.insert(0, mtag)
         for item in soup.findAll(style=True):
             del item['style']
-        for item in soup.findAll(align="center"):
+        for item in soup.findAll(align='center'):
             del item['align']
-        for item in soup.findAll(bgcolor="ffffff"):
+        for item in soup.findAll(bgcolor='ffffff'):
             del item['bgcolor']
         return soup
diff --git a/recipes/latimes.recipe b/recipes/latimes.recipe
index dc30505a29..b3e2362071 100644
--- a/recipes/latimes.recipe
+++ b/recipes/latimes.recipe
@@ -46,7 +46,7 @@ def what_section(url):
 class LATimes(BasicNewsRecipe):
     title = 'Los Angeles Times'
     __author__ = 'Jose Ortiz'
-    description = 'The Los Angeles Times is a leading source of news on Southern California, entertainment, movies, television, music, politics, business, health, technology, travel, sports, environment, economics, autos, jobs, real estate and other topics affecting California'  # noqa
+    description = 'The Los Angeles Times is a leading source of news on Southern California, entertainment, movies, television, music, politics, business, health, technology, travel, sports, environment, economics, autos, jobs, real estate and other topics affecting California'  # noqa: E501
     category = 'news, politics, USA, Los Angeles, world'
     oldest_article = 1
     max_articles_per_feed = 200
diff --git a/recipes/le_canard_enchaine.recipe b/recipes/le_canard_enchaine.recipe
index 2da45db09f..ff8779ce54 100644
--- a/recipes/le_canard_enchaine.recipe
+++ b/recipes/le_canard_enchaine.recipe
@@ -48,7 +48,7 @@ class LeCanardEnchaine(BasicNewsRecipe):
     '''
 
     def get_cover_url(self):
-        """Récupère dynamiquement l'URL de la dernière une"""
+        '''Récupère dynamiquement l'URL de la dernière une'''
         br = self.get_browser()
         try:
             soup = self.index_to_soup(br.open('https://boutique.lecanardenchaine.fr/acheter-au-numero/').read())
@@ -61,7 +61,7 @@ class LeCanardEnchaine(BasicNewsRecipe):
                 elif img and img.get('src'):
                     return 'https://boutique.lecanardenchaine.fr' + img['src']
 
-            self.log.info('Aucune couverture trouvée, utilisation de l\'image par défaut')
+            self.log.info("Aucune couverture trouvée, utilisation de l'image par défaut")
             return 'https://image.ausha.co/2x1H3rkhwjmSwAa8KzIFfcN0G9GxfJWY83UafXn8_400x400.jpeg'
         except Exception:
             self.log.exception('Erreur lors de la récupération de la couverture')
@@ -90,7 +90,7 @@ class LeCanardEnchaine(BasicNewsRecipe):
         feeds = []
 
         for section_title, section_url in self.SECTIONS.items():
-            print(f"Exploration de la rubrique : {section_title}")
+            print(f'Exploration de la rubrique : {section_title}')
             articles = []
             try:
                 url = 'https://www.lecanardenchaine.fr' + section_url
@@ -119,10 +119,10 @@ class LeCanardEnchaine(BasicNewsRecipe):
 
                 if unique_articles:
                     feeds.append((section_title, unique_articles))
-                    print(f"  {len(unique_articles)} articles trouvés")
+                    print(f'  {len(unique_articles)} articles trouvés')
 
             except Exception as e:
-                print(f"Erreur sur {section_title}: {str(e)}")
+                print(f'Erreur sur {section_title}: {e}')
 
         return feeds
 
diff --git a/recipes/le_gorafi.recipe b/recipes/le_gorafi.recipe
index ee3adcecce..494fba7c0c 100644
--- a/recipes/le_gorafi.recipe
+++ b/recipes/le_gorafi.recipe
@@ -13,7 +13,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class LeGorafi(BasicNewsRecipe):
     title = u'Le GORAFI.fr'
     __author__ = 'Malah, LAntoine'
-    description = u'Depuis 1826, toute l\'information de sources contradictoires'
+    description = u"Depuis 1826, toute l'information de sources contradictoires"
     oldest_article = 7
     language = 'fr'
     max_articles_per_feed = 100
@@ -54,7 +54,7 @@ class LeGorafi(BasicNewsRecipe):
                     soup = self.index_to_soup(article.url)
                     img = soup.select_one('#mvp-post-feat-img img')
                     return img['data-lazy-src']
-        print("No cover found")
+        print('No cover found')
         return None
 
     def parse_feeds(self):
diff --git a/recipes/le_monde.recipe b/recipes/le_monde.recipe
index 42f4e8774e..ab4e9852c4 100644
--- a/recipes/le_monde.recipe
+++ b/recipes/le_monde.recipe
@@ -27,7 +27,6 @@ class LeMonde(BasicNewsRecipe):
 
     oldest_article = 1
     no_stylesheets = True
-    remove_empty_feeds = True
     ignore_duplicate_articles = {'title', 'url'}
     reverse_article_order = True
     remove_empty_feeds = True
@@ -178,10 +177,10 @@ class LeMonde(BasicNewsRecipe):
         # soup = self.index_to_soup('https://www.lemonde.fr/')
         # a = soup.find('a', {'id': 'jelec_link', 'style': True})
         # if a and a['style']:
-            # url = a['style'].split('/')
-            # if len(url) > 5 and url[3].isdigit():
-                # overwrite guess if actual cover ID was found
-                # cover_id = url[3]
+        #     url = a['style'].split('/')
+        #     if len(url) > 5 and url[3].isdigit():
+        #         overwrite guess if actual cover ID was found
+        #         cover_id = url[3]
         return 'https://www.lemonde.fr/thumbnail/journal/' + cover_id + '/1000/1490'
 
     def get_article_url(self, article):
diff --git a/recipes/le_monde_diplomatique_fr.recipe b/recipes/le_monde_diplomatique_fr.recipe
index 556af30b61..a07e9f78bf 100644
--- a/recipes/le_monde_diplomatique_fr.recipe
+++ b/recipes/le_monde_diplomatique_fr.recipe
@@ -23,7 +23,7 @@ def absurl(url):
 class LeMondeDiplomatiqueSiteWeb(BasicNewsRecipe):
     title = u'Le Monde diplomatique.fr'
     __author__ = 'Gaëtan Lehmann'
-    description = "Le Monde diplomatique est un mensuel français d’information et d’opinion à la ligne éditoriale nettement engagée en faveur d'une gauche de rupture avec le capitalisme. Il aborde de nombreux sujets — géopolitique, relations internationales, économie, questions sociales, écologie, culture, médias, …"  # noqa
+    description = "Le Monde diplomatique est un mensuel français d’information et d’opinion à la ligne éditoriale nettement engagée en faveur d'une gauche de rupture avec le capitalisme. Il aborde de nombreux sujets — géopolitique, relations internationales, économie, questions sociales, écologie, culture, médias, …"  # noqa: E501
     oldest_article = 30
     max_articles_per_feed = 100
     auto_cleanup = True
@@ -104,7 +104,7 @@ class LeMondeDiplomatiqueSiteWeb(BasicNewsRecipe):
                     'url': absurl(feed_link['href']),
                     'description': description
                 })
-        return [("La valise diplomatique", articles)]
+        return [('La valise diplomatique', articles)]
 
     def parse_index_cartes(self):
         articles = []
@@ -125,7 +125,7 @@ class LeMondeDiplomatiqueSiteWeb(BasicNewsRecipe):
                     'url': absurl(feed_link['href']),
                     'description': author
                 })
-        return [("Cartes", articles)]
+        return [('Cartes', articles)]
 
     def parse_feeds(self):
         feeds = BasicNewsRecipe.parse_feeds(self)
diff --git a/recipes/le_monde_sub_paper.recipe b/recipes/le_monde_sub_paper.recipe
index 0b6a7de449..698f36e33f 100644
--- a/recipes/le_monde_sub_paper.recipe
+++ b/recipes/le_monde_sub_paper.recipe
@@ -51,7 +51,7 @@ class LeMondeAbonne(BasicNewsRecipe):
     zipurl_format = 'http://medias.lemonde.fr/abonnes/editionelectronique/%Y%m%d/html/%y%m%d.zip'
     coverurl_format = '/img/%y%m%d01.jpg'
     masthead_url = 'http://upload.wikimedia.org/wikipedia/commons/thumb/5/54/Le_monde_logo.svg/800px-Le_monde_logo.svg.png'
-    path_format = "%y%m%d"
+    path_format = '%y%m%d'
 
     keep_only_tags = [
         dict(name=['h1']),
@@ -66,7 +66,7 @@ class LeMondeAbonne(BasicNewsRecipe):
         dict(name='div', attrs={'class': 'po-copy'})
     ]
 
-    article_id_pattern = re.compile("[0-9]+\\.html")
+    article_id_pattern = re.compile(r'[0-9]+\.html')
     article_url_format = 'http://www.lemonde.fr/journalelectronique/donnees/protege/%Y%m%d/html/'
 
     def get_browser(self):
@@ -92,7 +92,7 @@ class LeMondeAbonne(BasicNewsRecipe):
 
         for i in range(7):
             self.ltime = time.gmtime(second)
-            self.timefmt = time.strftime(" %A %d %B %Y",
+            self.timefmt = time.strftime(' %A %d %B %Y',
                                          self.ltime).decode(preferred_encoding)
             url = time.strftime(self.zipurl_format, self.ltime)
             try:
@@ -113,7 +113,7 @@ class LeMondeAbonne(BasicNewsRecipe):
         zfile.close()
 
         path = os.path.join(
-            self.output_dir, time.strftime(self.path_format, self.ltime), "data"
+            self.output_dir, time.strftime(self.path_format, self.ltime), 'data'
         )
 
         self.articles_path = path
@@ -121,7 +121,7 @@ class LeMondeAbonne(BasicNewsRecipe):
         files = os.listdir(path)
 
         nb_index_files = len([
-            name for name in files if re.match("frame_gauche_[0-9]+.html", name)
+            name for name in files if re.match(r'frame_gauche_[0-9]+.html', name)
         ])
 
         flux = []
@@ -129,39 +129,39 @@ class LeMondeAbonne(BasicNewsRecipe):
         article_url = time.strftime(self.article_url_format, self.ltime)
 
         for i in range(nb_index_files):
-            filename = os.path.join(path, "selection_%d.html" % (i + 1))
+            filename = os.path.join(path, 'selection_%d.html' % (i + 1))
             with open(filename, 'rb') as tmp:
                 soup = self.index_to_soup(tmp.read())
             title = soup.find('span').contents[0]
-            if title == "Une":
-                title = "À la une"
-            if title == "Evenement":
+            if title == 'Une':
+                title = 'À la une'
+            if title == 'Evenement':
                 title = "L'événement"
-            if title == "Planete":
-                title = "Planète"
-            if title == "Economie - Entreprises":
-                title = "Économie"
+            if title == 'Planete':
+                title = 'Planète'
+            if title == 'Economie - Entreprises':
+                title = 'Économie'
             if title == "L'Oeil du Monde":
                 title = "L'œil du Monde"
-            if title == "Enquete":
-                title = "Enquête"
-            if title == "Editorial - Analyses":
-                title = "Horizons"
-            if title == "Le Monde Economie":
-                title = "Économie"
-            if title == "Lettre et chronique":
-                title = "Idées"
-            if title == "Le Monde Géo et politique":
-                title = "Géopolitique"
-            if title == "Météo - Jeux - Ecrans":
-                title = "Économie & Entreprise"
+            if title == 'Enquete':
+                title = 'Enquête'
+            if title == 'Editorial - Analyses':
+                title = 'Horizons'
+            if title == 'Le Monde Economie':
+                title = 'Économie'
+            if title == 'Lettre et chronique':
+                title = 'Idées'
+            if title == 'Le Monde Géo et politique':
+                title = 'Géopolitique'
+            if title == 'Météo - Jeux - Ecrans':
+                title = 'Économie & Entreprise'
             tmp.close()
 
-            filename = os.path.join(path, "frame_gauche_%d.html" % (i + 1))
+            filename = os.path.join(path, 'frame_gauche_%d.html' % (i + 1))
             with open(filename, 'rb') as tmp:
                 soup = self.index_to_soup(tmp.read())
             articles = []
-            for link in soup.findAll("a"):
+            for link in soup.findAll('a'):
                 article_file = link['href']
                 article_id = self.article_id_pattern.search(article_file).group()
                 article = {
diff --git a/recipes/le_peuple_breton.recipe b/recipes/le_peuple_breton.recipe
index cad05cc0c5..ce6e126c26 100644
--- a/recipes/le_peuple_breton.recipe
+++ b/recipes/le_peuple_breton.recipe
@@ -10,7 +10,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class LePeupleBreton(BasicNewsRecipe):
     title = 'Le Peuple Breton'
     __author__ = 'Lionel Plais'
-    description = u'Aujourd\'hui, être libre c\'est être informé'
+    description = u"Aujourd'hui, être libre c'est être informé"
     oldest_article = 90
     language = 'fr'
     cover_img_url = 'http://lepeuplebreton.bzh/wp-content/uploads/2017/11/le-peuple-breton-logo.jpg'
diff --git a/recipes/leggo_it.recipe b/recipes/leggo_it.recipe
index 2ad79b1db8..3a5393c192 100644
--- a/recipes/leggo_it.recipe
+++ b/recipes/leggo_it.recipe
@@ -16,7 +16,7 @@ class LeggoIT(BasicNewsRecipe):
     __author__ = 'Gabriele Marini'
     description = 'Italian Free daily newspaper'
 
-#    cover_url      = 'http://www.leggo.it/img/logo-leggo2.gif'
+    # cover_url      = 'http://www.leggo.it/img/logo-leggo2.gif'
     title = u'Leggo.it'
     publisher = 'Ced Caltagirone Editore S.p.A.'
     category = 'News, politics, culture, economy, general interest'
@@ -53,8 +53,8 @@ class LeggoIT(BasicNewsRecipe):
         cover = None
         st = time.localtime()
         year = str(st.tm_year)
-        month = "%.2d" % st.tm_mon
-        day = "%.2d" % st.tm_mday
+        month = '%.2d' % st.tm_mon
+        day = '%.2d' % st.tm_mday
         cover = 'http://www.leggo.it/' + year + month + day + '/jpeg/LEGGO_ROMA_1.jpg'
         br = BasicNewsRecipe.get_browser(self)
         try:
@@ -65,6 +65,6 @@ class LeggoIT(BasicNewsRecipe):
             try:
                 br.open(cover)
             except:
-                self.log("\nCover unavailable")
+                self.log('\nCover unavailable')
                 cover = 'http://www.leggo.it/img/logo-leggo2.gif'
         return cover
diff --git a/recipes/lemonde_dip.recipe b/recipes/lemonde_dip.recipe
index 8bc0eb4d81..bc2f6614d4 100644
--- a/recipes/lemonde_dip.recipe
+++ b/recipes/lemonde_dip.recipe
@@ -15,7 +15,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class LeMondeDiplomatiqueEn(BasicNewsRecipe):
     title = 'Le Monde diplomatique - English edition'
     __author__ = 'Darko Miletic'
-    description = "Le Monde diplomatique is the place you go when you want to know what's really happening. This is a major international paper that is truly independent, that sees the world in fresh ways, that focuses on places no other publications reach. We offer a clear, considered view of the conflicting interests and complexities of a modern global world. LMD in English is a concise version of the Paris-based parent edition, publishing all the major stories each month, expertly translated, and with some London-based commissions too. We offer a taster of LMD quality on our website where a selection of articles are available each month."  # noqa
+    description = "Le Monde diplomatique is the place you go when you want to know what's really happening. This is a major international paper that is truly independent, that sees the world in fresh ways, that focuses on places no other publications reach. We offer a clear, considered view of the conflicting interests and complexities of a modern global world. LMD in English is a concise version of the Paris-based parent edition, publishing all the major stories each month, expertly translated, and with some London-based commissions too. We offer a taster of LMD quality on our website where a selection of articles are available each month."  # noqa: E501
     publisher = 'Le Monde diplomatique'
     category = 'news, politics, world'
     no_stylesheets = True
@@ -30,13 +30,13 @@ class LeMondeDiplomatiqueEn(BasicNewsRecipe):
     INDEX = PREFIX + strftime('%Y/%m/')
     use_embedded_content = False
     language = 'en'
-    extra_css              = """
+    extra_css              = '''
                                 body{font-family: "Luxi sans","Lucida sans","Lucida Grande",Lucida,"Lucida Sans Unicode",sans-serif}
                                 .surtitre{font-size: 1.2em; font-variant: small-caps; margin-bottom: 0.5em}
                                 .chapo{font-size: 1.2em; font-weight: bold; margin: 1em 0 0.5em}
                                 .texte{font-family: Georgia,"Times New Roman",serif} h1{color: #990000}
                                 .notes{border-top: 1px solid #CCCCCC; font-size: 0.9em; line-height: 1.4em}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/lepoint.recipe b/recipes/lepoint.recipe
index 47a59d7994..db8bfe6165 100644
--- a/recipes/lepoint.recipe
+++ b/recipes/lepoint.recipe
@@ -71,6 +71,6 @@ class lepoint(BasicNewsRecipe):
         try:
             br.open(masthead)
         except:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             masthead = None
         return masthead
diff --git a/recipes/lex_fridman_podcast.recipe b/recipes/lex_fridman_podcast.recipe
index 8dfb25a5c2..fee8031d49 100644
--- a/recipes/lex_fridman_podcast.recipe
+++ b/recipes/lex_fridman_podcast.recipe
@@ -10,7 +10,7 @@ class lexfridman(BasicNewsRecipe):
         'philosophy and the nature of intelligence, consciousness, love, and power. Lex is an AI '
         'researcher at MIT and beyond. Download monthly.'
     )
-    oldest_article = 30 # days
+    oldest_article = 30  # days
     __author__ = 'unkn0wn'
     language = 'en'
     encoding = 'utf-8'
diff --git a/recipes/lexpress.recipe b/recipes/lexpress.recipe
index 773c22818f..a8ba0a30b0 100644
--- a/recipes/lexpress.recipe
+++ b/recipes/lexpress.recipe
@@ -15,7 +15,7 @@ def classes(classes):
 
 class lepoint(BasicNewsRecipe):
 
-    title = 'L\'express'
+    title = "L'express"
     __author__ = 'calibre'
     description = 'Actualités'
     publisher = 'LExpress.fr'
@@ -73,6 +73,6 @@ class lepoint(BasicNewsRecipe):
         try:
             br.open(masthead)
         except:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             masthead = None
         return masthead
diff --git a/recipes/liberation.recipe b/recipes/liberation.recipe
index a81bd5a93a..9015eb0866 100644
--- a/recipes/liberation.recipe
+++ b/recipes/liberation.recipe
@@ -21,12 +21,14 @@ def resize(x):
         if '_750' in k:
             return v
 
+
 m_fr = {
     1: 'Janvier', 2: 'Février', 3: 'Mars', 4: 'Avril',
     5: 'Mai', 6: 'Juin', 7: 'Juillet', 8: 'Août',
     9: 'Septembre', 10: 'Octobre', 11: 'Novembre', 12: 'Décembre'
 }
 
+
 def json_to_html(raw):
     data = json.loads(raw)
 
@@ -78,9 +80,9 @@ class Liberation(BasicNewsRecipe):
     title = 'Libération'
     __author__ = 'unkn0wn'
     description = (
-        'Libération est un quotidien d\'information libre, vigilant et engagé. L\'objectif de Libération est de '
+        "Libération est un quotidien d'information libre, vigilant et engagé. L'objectif de Libération est de "
         'fournir une information complète et vérifiée, dans tous les domaines. Sans préjugés, ni complaisance, '
-        'ses enquêtes reportages et analyses s\'emploient à comprendre et à décrire l\'actualité et à révéler '
+        "ses enquêtes reportages et analyses s'emploient à comprendre et à décrire l'actualité et à révéler "
         'les mutations des sociétés et des cultures.'
     )
     language = 'fr'
@@ -136,9 +138,9 @@ class Liberation(BasicNewsRecipe):
         b64 = base64.b64decode(self.key)
         query = {
             'website': 'liberation',
-            'website_url': '{}'.format(slug),
+            'website_url': str(slug),
             'published': 'true',
-            '_sourceInclude': '_id,content_restrictions.content_code,credits,promo_items.basic.caption,promo_items.basic.credits,promo_items.basic.url,promo_items.basic.height,promo_items.basic.width,promo_items.basic.resized_image_urls,promo_items.basic.last_updated_date,promo_items.lead_art.caption,promo_items.lead_art.credits,promo_items.lead_art.url,promo_items.lead_art.height,promo_items.lead_art.width,promo_items.lead_art.resized_image_urls,promo_items.lead_art.last_updated_date,source.additional_properties.legacy_url,content_elements,source.source_id,taxonomy.primary_section.additional_properties.original._admin.alias_ids,taxonomy.primary_section.additional_properties.original.navigation.nav_title,taxonomy.primary_section._id,taxonomy.primary_section.name,taxonomy.primary_section.path,taxonomy.tags,label,subheadlines.basic,headlines.basic,source.additional_properties.legacy_url,source.source_type,first_publish_date,display_date,canonical_url' # noqa
+            '_sourceInclude': '_id,content_restrictions.content_code,credits,promo_items.basic.caption,promo_items.basic.credits,promo_items.basic.url,promo_items.basic.height,promo_items.basic.width,promo_items.basic.resized_image_urls,promo_items.basic.last_updated_date,promo_items.lead_art.caption,promo_items.lead_art.credits,promo_items.lead_art.url,promo_items.lead_art.height,promo_items.lead_art.width,promo_items.lead_art.resized_image_urls,promo_items.lead_art.last_updated_date,source.additional_properties.legacy_url,content_elements,source.source_id,taxonomy.primary_section.additional_properties.original._admin.alias_ids,taxonomy.primary_section.additional_properties.original.navigation.nav_title,taxonomy.primary_section._id,taxonomy.primary_section.name,taxonomy.primary_section.path,taxonomy.tags,label,subheadlines.basic,headlines.basic,source.additional_properties.legacy_url,source.source_type,first_publish_date,display_date,canonical_url'  # noqa: E501
         }
         headers = {
             'cache-control': 'public, max-age=5',
@@ -148,7 +150,7 @@ class Liberation(BasicNewsRecipe):
         }
         api = 'https://arc.api.liberation.fr/content/v4/?' + urlencode(query, safe='()!', quote_via=quote)
         rq = Request(
-            url= api,
+            url=api,
             headers=headers
         )
         raw = br.open(rq).read()
diff --git a/recipes/libertad_digital.recipe b/recipes/libertad_digital.recipe
index 55a90adba3..834166e00c 100644
--- a/recipes/libertad_digital.recipe
+++ b/recipes/libertad_digital.recipe
@@ -22,10 +22,10 @@ class LibertadDigital(BasicNewsRecipe):
     remove_empty_feeds = True
     publication_type = 'website'
     masthead_url = 'http://s.libertaddigital.com/images/logo.gif'
-    extra_css             = """
+    extra_css             = '''
                                body{font-family: Verdana,sans-serif }
                                img{margin-bottom: 0.4em; display:block}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
@@ -50,7 +50,7 @@ class LibertadDigital(BasicNewsRecipe):
     ]
 
     def get_article_url(self, article):
-        return article.get('guid',  None)
+        return article.get('guid', None)
 
     def print_version(self, url):
         art, sep, rest = url.rpartition('/')
diff --git a/recipes/liberty_times.recipe b/recipes/liberty_times.recipe
index e079ea0468..d83ab440d2 100644
--- a/recipes/liberty_times.recipe
+++ b/recipes/liberty_times.recipe
@@ -36,6 +36,6 @@ class AdvancedUserRecipe1277443634(BasicNewsRecipe):
     no_stylesheets = True
     encoding = 'utf-8'
     conversion_options = {'linearize_tables': True}
-    masthead_url = 'https://cache.ltn.com.tw/images/rwd_ltnlogo.png',
+    masthead_url = 'https://cache.ltn.com.tw/images/rwd_ltnlogo.png'
     cover_url = 'https://cache.ltn.com.tw/images/rwd_ltnlogo.png'
     auto_cleanup = True
diff --git a/recipes/list_apart.recipe b/recipes/list_apart.recipe
index 52011b68cc..466182d63f 100644
--- a/recipes/list_apart.recipe
+++ b/recipes/list_apart.recipe
@@ -14,7 +14,7 @@ class AListApart (BasicNewsRecipe):
     __license__ = 'GPL v3'
     __copyright__ = '2012, Marc Busqué <marc@lamarciana.com>'
     title = u'A List Apart'
-    description = u'A List Apart Magazine (ISSN: 1534-0295) explores the design, development, and meaning of web content, with a special focus on web standards and best practices. This recipe retrieve articles and columns.'  # noqa
+    description = u'A List Apart Magazine (ISSN: 1534-0295) explores the design, development, and meaning of web content, with a special focus on web standards and best practices. This recipe retrieve articles and columns.'  # noqa: E501
     language = 'en'
     tags = 'web development, software'
     oldest_article = 120
diff --git a/recipes/live_law.recipe b/recipes/live_law.recipe
index 4d6a1e3c5a..c05ebaebec 100644
--- a/recipes/live_law.recipe
+++ b/recipes/live_law.recipe
@@ -6,6 +6,7 @@ def absurl(url):
     if url.startswith('/'):
         return 'https://www.livelaw.in' + url
 
+
 class livelaw(BasicNewsRecipe):
     title = 'Live Law'
     __author__ = 'unkn0wn'
diff --git a/recipes/livemint.recipe b/recipes/livemint.recipe
index 8cdbbf8bec..90c8e5a05b 100644
--- a/recipes/livemint.recipe
+++ b/recipes/livemint.recipe
@@ -42,7 +42,7 @@ class LiveMint(BasicNewsRecipe):
             if 'MINT_FRONT_1' in x['src']:
                 return 'https://epaper.livemint.com' + x['src'].replace('-S', '')
 
-    extra_css = """
+    extra_css = '''
         img {margin:0 auto;}
         .psTopLogoItem img, .ecologoStory { width:100; }
         #img-cap {font-size:small; text-align:center;}
@@ -51,7 +51,7 @@ class LiveMint(BasicNewsRecipe):
         }
         em, blockquote {color:#202020;}
         .moreAbout, .articleInfo, .metaData, .psTopicsHeading, .topicsTag, .auth {font-size:small;}
-    """
+    '''
 
     keep_only_tags = [
         dict(
diff --git a/recipes/livescience.recipe b/recipes/livescience.recipe
index 2cc26e321e..5506d15fc7 100644
--- a/recipes/livescience.recipe
+++ b/recipes/livescience.recipe
@@ -5,8 +5,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class LiveScience(BasicNewsRecipe):
-    title = "Live Science"
-    description = "For the science geek in everyone! Stories on the latest findings from science journals and institutions. Sourced from livescience.com"
+    title = 'Live Science'
+    description = 'For the science geek in everyone! Stories on the latest findings from science journals and institutions. Sourced from livescience.com'
     __author__ = 'yodha8'
     language = 'en'
     oldest_article = 7
diff --git a/recipes/lrb.recipe b/recipes/lrb.recipe
index 93c0d927a2..37b1150608 100644
--- a/recipes/lrb.recipe
+++ b/recipes/lrb.recipe
@@ -12,14 +12,14 @@ def classes(classes):
 
 def absolutize(href):
     if href.startswith('/'):
-        href =  'https://www.lrb.co.uk' + href
+        href = 'https://www.lrb.co.uk' + href
     return href
 
 
 class LondonReviewOfBooksPayed(BasicNewsRecipe):
     title = 'London Review of Books'
     __author__ = 'Kovid Goyal'
-    description = 'Literary review publishing essay-length book reviews and topical articles on politics, literature, history, philosophy, science and the arts by leading writers and thinkers'  # noqa
+    description = 'Literary review publishing essay-length book reviews and topical articles on politics, literature, history, philosophy, science and the arts by leading writers and thinkers'  # noqa: E501
     category = 'news, literature, UK'
     publisher = 'LRB Ltd.'
     language = 'en_GB'
diff --git a/recipes/lupa.recipe b/recipes/lupa.recipe
index 02097782c5..a28be3b490 100644
--- a/recipes/lupa.recipe
+++ b/recipes/lupa.recipe
@@ -19,9 +19,9 @@ class LupaCZ(BasicNewsRecipe):
     publication_type = 'newsportal'
     no_stylesheets = True
     remove_javascript = True
-    extra_css               = 'p.perex{font-size: 1.2em;margin: 0 0 10px 0;line-height: 1.4;padding: 0 0 10px 0;font-weight: bold;} \
-                               p.perex img {display:none;} \
-                               .urs p {margin: 0 0 0.8em 0;}'
+    extra_css               = '''p.perex{font-size: 1.2em;margin: 0 0 10px 0;line-height: 1.4;padding: 0 0 10px 0;font-weight: bold;}
+                                 p.perex img {display:none;}
+                                 .urs p {margin: 0 0 0.8em 0;}'''
 
     feeds = [
         (u'Zpr\xe1vi\u010dky', u'http://rss.lupa.cz/zpravicky'),
diff --git a/recipes/lwn.recipe b/recipes/lwn.recipe
index cee5c92b3f..e21efdfb33 100644
--- a/recipes/lwn.recipe
+++ b/recipes/lwn.recipe
@@ -14,7 +14,6 @@ class LWN(BasicNewsRecipe):
     __author__ = 'Oliver Niesner'
     description = 'Linux Weekly News'
     oldest_article = 54
-    language = _('English')
     max_articles_per_feed = 100
     needs_subscription = True
     language = 'en'
diff --git a/recipes/lwn_free.recipe b/recipes/lwn_free.recipe
index 0a9c1d9993..7cc7c473a4 100644
--- a/recipes/lwn_free.recipe
+++ b/recipes/lwn_free.recipe
@@ -5,7 +5,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class LWNFree(BasicNewsRecipe):
-    title = "LWN Linux Weekly News (Free)"
+    title = 'LWN Linux Weekly News (Free)'
     language = 'en'
     __author__ = 'yodha8'
     description = "LWN is published every Thursday. This recipe skips current week's articles (subscriber-only) and pulls free articles from previous week."
@@ -18,7 +18,7 @@ class LWNFree(BasicNewsRecipe):
     ]
 
     def parse_feeds(self):
-        """Remove paid articles and articles older than a week."""
+        '''Remove paid articles and articles older than a week.'''
 
         prev_feeds = super().parse_feeds()
 
@@ -28,12 +28,12 @@ class LWNFree(BasicNewsRecipe):
         for article in prev_feeds[0]:
 
             # Paid article
-            if "[$]" in article.title:
+            if '[$]' in article.title:
                 remove_articles.append(article)
                 continue
 
             # Count how many free weekly edition we passed
-            if "Weekly Edition" in article.title:
+            if 'Weekly Edition' in article.title:
                 weekly_count += 1
 
             # Remove all articles starting from 2nd free weekly edition
diff --git a/recipes/lwn_weekly.recipe b/recipes/lwn_weekly.recipe
index 8917cbc423..162078db8b 100644
--- a/recipes/lwn_weekly.recipe
+++ b/recipes/lwn_weekly.recipe
@@ -137,14 +137,14 @@ class WeeklyLWN(BasicNewsRecipe):
                     article_title = _('Undefined article title')
 
                 if subsection:
-                    section_title = "%s: %s" % (section, subsection)
+                    section_title = '%s: %s' % (section, subsection)
                 else:
                     section_title = section
 
                 # Most articles have anchors in their titles, *except* the
                 # security vulnerabilities
                 article_anchor = curr.find(
-                    name='a', attrs={'href': re.compile('^/Articles/')})
+                    name='a', attrs={'href': re.compile(r'^/Articles/')})
 
                 if article_anchor:
                     article_url = article_anchor.get('href')
@@ -170,7 +170,7 @@ class WeeklyLWN(BasicNewsRecipe):
                 })
 
             else:
-                self.log.error("lwn_weekly.recipe: something bad happened; should not be able to reach this")
+                self.log.error('lwn_weekly.recipe: something bad happened; should not be able to reach this')
 
         ans = [(section2, articles[section2])
                for section2 in ans if section2 in articles]
diff --git a/recipes/mainichi.recipe b/recipes/mainichi.recipe
index 69c0159996..4eaa4f02e5 100644
--- a/recipes/mainichi.recipe
+++ b/recipes/mainichi.recipe
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
-"""
+'''
 www.mainichi.jp
-"""
+'''
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
@@ -9,11 +9,11 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class MainichiDailyNews(BasicNewsRecipe):
     title = u'\u6bce\u65e5\u65b0\u805e'
     __author__ = 'unkn0wn'
-    description = "Japanese traditional newspaper Mainichi Daily News"
-    publisher = "Mainichi News"
-    publication_type = "newspaper"
-    category = "news, japan"
-    language = "ja"
+    description = 'Japanese traditional newspaper Mainichi Daily News'
+    publisher = 'Mainichi News'
+    publication_type = 'newspaper'
+    category = 'news, japan'
+    language = 'ja'
 
     no_stylesheets = True
     remove_javascript = True
diff --git a/recipes/mainichi_en.recipe b/recipes/mainichi_en.recipe
index ec74c962df..6f083554e3 100644
--- a/recipes/mainichi_en.recipe
+++ b/recipes/mainichi_en.recipe
@@ -1,23 +1,23 @@
 #!/usr/bin/env python
-"""
+'''
 www.mainichi.jp/english
-"""
+'''
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class MainichiEnglishNews(BasicNewsRecipe):
-    title = u"The Mainichi"
+    title = u'The Mainichi'
     __author__ = 'unkn0wn'
 
-    description = "Japanese traditional newspaper Mainichi news in English"
-    publisher = "Mainichi News"
-    publication_type = "newspaper"
-    category = "news, japan"
-    language = "en_JP"
+    description = 'Japanese traditional newspaper Mainichi news in English'
+    publisher = 'Mainichi News'
+    publication_type = 'newspaper'
+    category = 'news, japan'
+    language = 'en_JP'
 
-    index = "http://mainichi.jp/english/"
-    masthead_url = index + "images/themainichi.png"
+    index = 'http://mainichi.jp/english/'
+    masthead_url = index + 'images/themainichi.png'
 
     no_stylesheets = True
     remove_javascript = True
diff --git a/recipes/mainichi_science_news.recipe b/recipes/mainichi_science_news.recipe
index d7ede8543b..381e145107 100644
--- a/recipes/mainichi_science_news.recipe
+++ b/recipes/mainichi_science_news.recipe
@@ -22,8 +22,8 @@ class MainichiDailyScienceNews(BasicNewsRecipe):
     remove_javascript = True
     masthead_title = u'MAINICHI DAILY NEWS'
 
-    remove_tags_before = {'class': "NewsTitle"}
-    remove_tags_after = {'class': "NewsBody clr"}
+    remove_tags_before = {'class': 'NewsTitle'}
+    remove_tags_after = {'class': 'NewsBody clr'}
 
     def parse_feeds(self):
 
diff --git a/recipes/make_use_of.recipe b/recipes/make_use_of.recipe
index 50cfae3de3..3546197709 100644
--- a/recipes/make_use_of.recipe
+++ b/recipes/make_use_of.recipe
@@ -20,28 +20,28 @@ class AdvancedUserRecipe1716102924(BasicNewsRecipe):
     auto_cleanup   = True
 
     feeds          = [
-        #PC & Mobile
+        # PC & Mobile
         ('PC & Mobile', 'https://www.makeuseof.com/feed/category/pc-mobile/'),
         ('Windows', 'https://www.makeuseof.com/feed/category/windows/'),
         ('Mac', 'https://www.makeuseof.com/feed/category/mac/'),
         ('Linux', 'https://www.makeuseof.com/feed/category/linux/'),
         ('Android', 'https://www.makeuseof.com/feed/category/google-android/'),
         ('iOS', 'https://www.makeuseof.com/feed/category/ios/'),
-        #Internet
+        # Internet
         ('Internet', 'https://www.makeuseof.com/feed/category/web-based/'),
         ('Social Media', 'https://www.makeuseof.com/feed/category/social-media/'),
         ('Security', 'https://www.makeuseof.com/feed/category/security/'),
         ('Programming', 'https://www.makeuseof.com/feed/category/programming/'),
-        #Productivity
+        # Productivity
         ('Productivity', 'https://www.makeuseof.com/feed/category/productivity/'),
         ('Creative', 'https://www.makeuseof.com/feed/category/creative/'),
         ('DIY', 'https://www.makeuseof.com/feed/category/diy-projects/'),
-        #Lifestyle
+        # Lifestyle
         ('Lifestyle', 'https://www.makeuseof.com/feed/category/lifestyle/'),
         ('Smart Home', 'https://www.makeuseof.com/feed/category/smart-home/'),
         ('Gaming', 'https://www.makeuseof.com/feed/category/games/'),
         ('Entertainment', 'https://www.makeuseof.com/feed/category/entertainment/'),
-        #Technology Explained
+        # Technology Explained
         ('Technology Explained', 'https://www.makeuseof.com/feed/category/technology-explained/'),
         ('Artificial Intelligence', 'https://www.makeuseof.com/feed/tag/artificial-intelligence/'),
         ('Tech Jargon', 'https://www.makeuseof.com/feed/tag/pc-jargon-terminology/'),
diff --git a/recipes/marca.recipe b/recipes/marca.recipe
index fd64c937f9..48c0b436f0 100644
--- a/recipes/marca.recipe
+++ b/recipes/marca.recipe
@@ -23,12 +23,12 @@ class Marca(BasicNewsRecipe):
     language = 'es'
     publication_type = 'newsportal'
     masthead_url = 'http://estaticos.marca.com/deporte/img/v3.0/img_marca-com.png'
-    extra_css             = """
+    extra_css             = '''
                                 body{font-family: Tahoma,Geneva,sans-serif}
                                 h1,h2,h3,h4,h5,h6{font-family: 'LatoBlack',Tahoma,Geneva,sans-serif}
                                 .cab_articulo h4 {font-family: Georgia,"Times New Roman",Times,serif}
                                 .antetitulo{text-transform: uppercase}
-                            """
+                            '''
 
     feeds = [(u'Portada', u'http://estaticos.marca.com/rss/portada.xml')]
 
@@ -46,4 +46,4 @@ class Marca(BasicNewsRecipe):
         return soup
 
     def get_article_url(self, article):
-        return article.get('guid',  None)
+        return article.get('guid', None)
diff --git a/recipes/marctv.recipe b/recipes/marctv.recipe
index ca5cbe5f84..87890a95a9 100644
--- a/recipes/marctv.recipe
+++ b/recipes/marctv.recipe
@@ -26,7 +26,7 @@ class MarcTVde(BasicNewsRecipe):
 
     remove_tags = []
 
-    keep_only_tags = dict(name='div', attrs={'class': ["content"]})
+    keep_only_tags = dict(name='div', attrs={'class': ['content']})
 
     feeds = [
     (u'Spiele', u'http://feeds.feedburner.com/marctv/spiele'),
diff --git a/recipes/mateusz_czytania.recipe b/recipes/mateusz_czytania.recipe
index 9717176efb..4a40aeb1f3 100644
--- a/recipes/mateusz_czytania.recipe
+++ b/recipes/mateusz_czytania.recipe
@@ -23,7 +23,6 @@ class czytania_mateusz(BasicNewsRecipe):
     remove_javascript = True
     simultaneous_downloads = 2
     max_articles_per_feed = 100
-    auto_cleanup = True
 
     feeds = [(u'Czytania', u'http://mateusz.pl/rss/czytania/')]
 
diff --git a/recipes/mdj.recipe b/recipes/mdj.recipe
index d454e2b5dd..ed12fef2e6 100644
--- a/recipes/mdj.recipe
+++ b/recipes/mdj.recipe
@@ -15,10 +15,10 @@ class AdvancedUserRecipe1282101454(BasicNewsRecipe):
     auto_cleanup = True
 
     feeds = [
-        ('Local News', 'http://www.mdjonline.com/search/?f=rss&amp;t=article&amp;c=news/local&amp;l=50&amp;s=start_time&amp;sd=desc'),  # noqa
+        ('Local News', 'http://www.mdjonline.com/search/?f=rss&amp;t=article&amp;c=news/local&amp;l=50&amp;s=start_time&amp;sd=desc'),
         ('Sports', 'http://www.mdjonline.com/search/?f=rss&amp;t=article&amp;c=sports&amp;l=50&amp;s=start_time&amp;sd=desc'),
         ('Obits', 'http://www.mdjonline.com/search/?f=rss&amp;t=article&amp;c=obituaries&amp;l=50&amp;s=start_time&amp;sd=desc'),
-        ('Editorial & oped', 'http://www.mdjonline.com/search/?f=rss&amp;t=article&amp;c=opinion/mdj_editorials&amp;l=50&amp;s=start_time&amp;sd=desc'),  # noqa
-        ('Lifestyle', 'http://www.mdjonline.com/search/?f=rss&amp;t=article&amp;c=news/lifestyle&amp;l=50&amp;s=start_time&amp;sd=desc'),  # noqa
-        ('Blogs', 'http://www.mdjonline.com/search/?f=rss&amp;t=article&amp;c=opinion/blogs&amp;l=50&amp;s=start_time&amp;sd=desc')  # noqa
+        ('Editorial & oped', 'http://www.mdjonline.com/search/?f=rss&amp;t=article&amp;c=opinion/mdj_editorials&amp;l=50&amp;s=start_time&amp;sd=desc'),
+        ('Lifestyle', 'http://www.mdjonline.com/search/?f=rss&amp;t=article&amp;c=news/lifestyle&amp;l=50&amp;s=start_time&amp;sd=desc'),
+        ('Blogs', 'http://www.mdjonline.com/search/?f=rss&amp;t=article&amp;c=opinion/blogs&amp;l=50&amp;s=start_time&amp;sd=desc')
     ]
diff --git a/recipes/media2.recipe b/recipes/media2.recipe
index b889c77552..a3a9bd555d 100644
--- a/recipes/media2.recipe
+++ b/recipes/media2.recipe
@@ -10,7 +10,7 @@ class media2_pl(BasicNewsRecipe):
     title = u'Media2'
     __author__ = 'teepel <teepel44@gmail.com>'
     language = 'pl'
-    description = u'Media2.pl to jeden z najczęściej odwiedzanych serwisów dla profesjonalistów z branży medialnej, telekomunikacyjnej, public relations oraz nowych technologii.'  # noqa
+    description = u'Media2.pl to jeden z najczęściej odwiedzanych serwisów dla profesjonalistów z branży medialnej, telekomunikacyjnej, public relations oraz nowych technologii.'  # noqa: E501
     masthead_url = 'http://media2.pl/res/logo/www.png'
     cover_url = 'http://media2.pl/res/logo/www.png'
     INDEX = 'http://media2.pl'
diff --git a/recipes/media_zone.recipe b/recipes/media_zone.recipe
index a55d65d10d..ddf315b644 100644
--- a/recipes/media_zone.recipe
+++ b/recipes/media_zone.recipe
@@ -9,7 +9,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class MediaZona(BasicNewsRecipe):
     title = '\u041c\u0435\u0434\u0438\u0430\u0417\u043e\u043d\u0430'
     __author__ = 'bugmen00t'
-    description = 'Общественно-политическое издание, сделавшее акцент на функционировании закона в России. По мнению авторитетных медиаэкспертов, по цитируемости и посещаемости формат «Медиазоны» оказался ведущим форматом новостного издания в России 2015 года. «Медиазона» пишет о реально происходящем в России, первой улавливая векторы развития общества.'  # noqa
+    description = 'Общественно-политическое издание, сделавшее акцент на функционировании закона в России. По мнению авторитетных медиаэкспертов, по цитируемости и посещаемости формат «Медиазоны» оказался ведущим форматом новостного издания в России 2015 года. «Медиазона» пишет о реально происходящем в России, первой улавливая векторы развития общества.'  # noqa: E501
     publisher = 'zona.media'
     category = 'news'
     cover_url = u'https://zona.media/s/share/default_mz.png'
diff --git a/recipes/mediaindonesia.recipe b/recipes/mediaindonesia.recipe
index e282ac450d..4f5dd5b740 100644
--- a/recipes/mediaindonesia.recipe
+++ b/recipes/mediaindonesia.recipe
@@ -24,7 +24,7 @@ class Media(BasicNewsRecipe):
     no_javascript = True
 
     remove_tags = [dict(id=['atas', 'merah', 'putih']), dict(name='a')]
-    remove_tags_after = [dict(id="putih")]
+    remove_tags_after = [dict(id='putih')]
 
     extra_css             = '''
                             .judul {font-size: x-large;}
diff --git a/recipes/mediapart.recipe b/recipes/mediapart.recipe
index 239e385c06..9aa66689c6 100644
--- a/recipes/mediapart.recipe
+++ b/recipes/mediapart.recipe
@@ -14,7 +14,7 @@
 from __future__ import unicode_literals
 
 __license__ = 'GPL v3'
-__copyright__ = '2021, Loïc Houpert <houpertloic at gmail .com>. Adapted from: 2016, Daniel Bonnery; 2009, Mathieu Godlewski; 2010-2012, Louis Gesbert'  # noqa
+__copyright__ = '2021, Loïc Houpert <houpertloic at gmail .com>. Adapted from: 2016, Daniel Bonnery; 2009, Mathieu Godlewski; 2010-2012, Louis Gesbert'
 '''
 Mediapart
 '''
@@ -49,7 +49,7 @@ class Mediapart(BasicNewsRecipe):
 
     conversion_options = {'smarten_punctuation': True}
 
-    masthead_url = "https://raw.githubusercontent.com/lhoupert/calibre_contrib/main/mediapart_masthead.png"
+    masthead_url = 'https://raw.githubusercontent.com/lhoupert/calibre_contrib/main/mediapart_masthead.png'
 
     ignore_duplicate_articles = {'title'}
     resolve_internal_links  = True
@@ -65,7 +65,7 @@ class Mediapart(BasicNewsRecipe):
             url = e.hdrs.get('location')
         soup = self.index_to_soup(url)
         link = soup.find('a', href=True)
-        skip_sections =[ # add sections you want to skip
+        skip_sections =[  # add sections you want to skip
             '/video/', '/videos/', '/media/'
         ]
         if any(x in link['href'] for x in skip_sections):
@@ -95,7 +95,7 @@ class Mediapart(BasicNewsRecipe):
         for feed in feeds:
             feed_name = feed.title.lower()
             for article in feed.articles:
-                if feed_name != 'autres'  and feed_name not in article.url:
+                if feed_name != 'autres' and feed_name not in article.url:
                     feed.articles.remove(article)
                 if feed_name == 'autres' and any(section in article.url for section in self.sections):
                     feed.articles.remove(article)
diff --git a/recipes/medscape.recipe b/recipes/medscape.recipe
index 098f7d54de..68cd93ebd9 100644
--- a/recipes/medscape.recipe
+++ b/recipes/medscape.recipe
@@ -56,7 +56,7 @@ class MedScrape(BasicNewsRecipe):
         # the original url is: http://www.medscape.com/viewarticle/728955?src=rss
         # the print    url is: http://www.medscape.com/viewarticle/728955_print
         print_url = url.partition('?')[0] + '_print'
-        # print 'the printable version is: ',print_url
+        # print('the printable version is: ',print_url)
         return print_url
 
     def preprocess_html(self, soup):
diff --git a/recipes/meduza.recipe b/recipes/meduza.recipe
index d3ff8e0036..dc0e01c724 100644
--- a/recipes/meduza.recipe
+++ b/recipes/meduza.recipe
@@ -6,14 +6,14 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Meduza(BasicNewsRecipe):
     title = u'Meduza'
-    description = u'Russian- and English-language independent news website, based in Latvia. It was founded in 2014 by a group of former employees of the then independent Lenta.ru news website. Every day we bring you the most important news and feature stories from hundreds of sources in Russia and across the former Soviet Union.'  # noqa
+    description = u'Russian- and English-language independent news website, based in Latvia. It was founded in 2014 by a group of former employees of the then independent Lenta.ru news website. Every day we bring you the most important news and feature stories from hundreds of sources in Russia and across the former Soviet Union.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = 'Medusa Project SIA'
     publication_type = 'blog'
     oldest_article = 21
     max_articles_per_feed = 100
     language = 'en_RU'
-    cover_url = 'https://meduza.io/impro/E_cJMv0IQxOC45z-YXeGuzuPB2kQ_A1XsZYrdByOCnk/fill/1200/0/ce/0/aHR0cHM6Ly9tZWR1/emEuaW8vaW1hZ2Uv/YXR0YWNobWVudHMv/aW1hZ2VzLzAwNi83/MTgvODcyL29yaWdp/bmFsLzVPSmRDdWc1/bC1JVG9lTXBqSHFH/ZXcucG5n.png'  # noqa
+    cover_url = 'https://meduza.io/impro/E_cJMv0IQxOC45z-YXeGuzuPB2kQ_A1XsZYrdByOCnk/fill/1200/0/ce/0/aHR0cHM6Ly9tZWR1/emEuaW8vaW1hZ2Uv/YXR0YWNobWVudHMv/aW1hZ2VzLzAwNi83/MTgvODcyL29yaWdp/bmFsLzVPSmRDdWc1/bC1JVG9lTXBqSHFH/ZXcucG5n.png'  # noqa: E501
     auto_cleanup = False
     no_stylesheets = False
 
diff --git a/recipes/meduza_ru.recipe b/recipes/meduza_ru.recipe
index dcecb40686..4943df13cc 100644
--- a/recipes/meduza_ru.recipe
+++ b/recipes/meduza_ru.recipe
@@ -6,14 +6,14 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Meduza(BasicNewsRecipe):
     title = u'Meduza'
-    description = u'\u041C\u0435\u0436\u0434\u0443\u043D\u0430\u0440\u043E\u0434\u043D\u043E\u0435 \u0440\u0443\u0441\u0441\u043A\u043E\u044F\u0437\u044B\u0447\u043D\u043E\u0435 \u0438\u0437\u0434\u0430\u043D\u0438\u0435. \u041C\u044B \u0432\u044B\u0431\u0438\u0440\u0430\u0435\u043C \u0434\u043B\u044F \u0432\u0430\u0441 \u0441\u0430\u043C\u044B\u0435 \u0432\u0430\u0436\u043D\u044B\u0435 \u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u0438 \u0433\u043E\u0442\u043E\u0432\u0438\u043C \u043B\u0443\u0447\u0448\u0438\u0435 \u0442\u0435\u043A\u0441\u0442\u044B \u043E \u0442\u043E\u043C, \u0447\u0442\u043E \u043F\u0440\u043E\u0438\u0441\u0445\u043E\u0434\u0438\u0442 \u0432 \u0420\u043E\u0441\u0441\u0438\u0438 \u0438 \u043C\u0438\u0440\u0435.'  # noqa
+    description = u'\u041C\u0435\u0436\u0434\u0443\u043D\u0430\u0440\u043E\u0434\u043D\u043E\u0435 \u0440\u0443\u0441\u0441\u043A\u043E\u044F\u0437\u044B\u0447\u043D\u043E\u0435 \u0438\u0437\u0434\u0430\u043D\u0438\u0435. \u041C\u044B \u0432\u044B\u0431\u0438\u0440\u0430\u0435\u043C \u0434\u043B\u044F \u0432\u0430\u0441 \u0441\u0430\u043C\u044B\u0435 \u0432\u0430\u0436\u043D\u044B\u0435 \u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u0438 \u0433\u043E\u0442\u043E\u0432\u0438\u043C \u043B\u0443\u0447\u0448\u0438\u0435 \u0442\u0435\u043A\u0441\u0442\u044B \u043E \u0442\u043E\u043C, \u0447\u0442\u043E \u043F\u0440\u043E\u0438\u0441\u0445\u043E\u0434\u0438\u0442 \u0432 \u0420\u043E\u0441\u0441\u0438\u0438 \u0438 \u043C\u0438\u0440\u0435.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = 'Medusa Project SIA'
     publication_type = 'blog'
     oldest_article = 7
     max_articles_per_feed = 100
     language = 'ru'
-    cover_url = 'https://meduza.io/impro/E_cJMv0IQxOC45z-YXeGuzuPB2kQ_A1XsZYrdByOCnk/fill/1200/0/ce/0/aHR0cHM6Ly9tZWR1/emEuaW8vaW1hZ2Uv/YXR0YWNobWVudHMv/aW1hZ2VzLzAwNi83/MTgvODcyL29yaWdp/bmFsLzVPSmRDdWc1/bC1JVG9lTXBqSHFH/ZXcucG5n.png'  # noqa
+    cover_url = 'https://meduza.io/impro/E_cJMv0IQxOC45z-YXeGuzuPB2kQ_A1XsZYrdByOCnk/fill/1200/0/ce/0/aHR0cHM6Ly9tZWR1/emEuaW8vaW1hZ2Uv/YXR0YWNobWVudHMv/aW1hZ2VzLzAwNi83/MTgvODcyL29yaWdp/bmFsLzVPSmRDdWc1/bC1JVG9lTXBqSHFH/ZXcucG5n.png'  # noqa: E501
     auto_cleanup = False
     no_stylesheets = False
 
diff --git a/recipes/mel.recipe b/recipes/mel.recipe
index 44430b58d0..b76cae8a4f 100644
--- a/recipes/mel.recipe
+++ b/recipes/mel.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Mel(BasicNewsRecipe):
     title = '\u041C\u0435\u043B'
     __author__ = 'bugmen00t'
-    description = '\u041C\u0435\u0434\u0438\u0430 \u043F\u0440\u043E \u043E\u0431\u0440\u0430\u0437\u043E\u0432\u0430\u043D\u0438\u0435 \u0438 \u0432\u043E\u0441\u043F\u0438\u0442\u0430\u043D\u0438\u0435 \u0434\u0435\u0442\u0435\u0439'  # noqa
+    description = '\u041C\u0435\u0434\u0438\u0430 \u043F\u0440\u043E \u043E\u0431\u0440\u0430\u0437\u043E\u0432\u0430\u043D\u0438\u0435 \u0438 \u0432\u043E\u0441\u043F\u0438\u0442\u0430\u043D\u0438\u0435 \u0434\u0435\u0442\u0435\u0439'  # noqa: E501
     publisher = '\u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u00AB\u041C\u0435\u043B\u00BB'
     category = 'blog'
     cover_url = u'https://static.mel.fm/images/project/site/dummyLogo.png'
diff --git a/recipes/merco_press.recipe b/recipes/merco_press.recipe
index 88d1eaaaa5..77433a188c 100644
--- a/recipes/merco_press.recipe
+++ b/recipes/merco_press.recipe
@@ -3,7 +3,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class MercoPress(BasicNewsRecipe):
     title = u'Merco Press'
-    description = u"Read News, Stories and Insight Analysis from Latin America and Mercosur. Politics, Economy, Business and Investments in South America."
+    description = u'Read News, Stories and Insight Analysis from Latin America and Mercosur. Politics, Economy, Business and Investments in South America.'
     cover_url = 'http://en.mercopress.com/web/img/en/mercopress-logo.gif'
 
     __author__ = 'Russell Phillips'
diff --git a/recipes/mesec.recipe b/recipes/mesec.recipe
index db4f1e92e0..38149bf1fa 100644
--- a/recipes/mesec.recipe
+++ b/recipes/mesec.recipe
@@ -19,9 +19,9 @@ class MesecCZ(BasicNewsRecipe):
     publication_type = 'newsportal'
     no_stylesheets = True
     remove_javascript = True
-    extra_css               = 'p.perex{font-size: 1.2em;margin: 0 0 10px 0;line-height: 1.4;padding: 0 0 10px 0;font-weight: bold;} \
-                               p.perex img {display:none;} \
-                               .urs p {margin: 0 0 0.8em 0;}'
+    extra_css               = '''p.perex{font-size: 1.2em;margin: 0 0 10px 0;line-height: 1.4;padding: 0 0 10px 0;font-weight: bold;}
+                                 p.perex img {display:none;}
+                                 .urs p {margin: 0 0 0.8em 0;}'''
 
     feeds = [
         (u'Aktuality', u'http://www.mesec.cz/rss/aktuality/'),
diff --git a/recipes/miami_herald.recipe b/recipes/miami_herald.recipe
index 25965b0f4e..ed220abc3a 100644
--- a/recipes/miami_herald.recipe
+++ b/recipes/miami_herald.recipe
@@ -17,7 +17,7 @@ def classes(classes):
 class TheMiamiHerald(BasicNewsRecipe):
     title = 'The Miami Herald'
     __author__ = 'Kovid Goyal'
-    description = "Miami-Dade and Broward's source for the latest breaking local news on sports, weather, business, jobs, real estate, shopping, health, travel, entertainment, & more."  # noqa
+    description = "Miami-Dade and Broward's source for the latest breaking local news on sports, weather, business, jobs, real estate, shopping, health, travel, entertainment, & more."  # noqa: E501
     oldest_article = 1
     max_articles_per_feed = 100
     publisher = u'The Miami Herald'
diff --git a/recipes/mit_technology_review.recipe b/recipes/mit_technology_review.recipe
index dc14af12e2..225ed5c498 100644
--- a/recipes/mit_technology_review.recipe
+++ b/recipes/mit_technology_review.recipe
@@ -19,7 +19,7 @@ def absurl(x):
     if x.startswith('//'):
         x = 'http:' + x
     elif not x.startswith('http'):
-        x = "http://www.technologyreview.com" + x
+        x = 'http://www.technologyreview.com' + x
     return x
 
 
@@ -58,8 +58,8 @@ class MitTechnologyReview(BasicNewsRecipe):
         prefixed_classes('contentHeader contentArticleHeader contentBody')
     ]
     remove_tags = [
-        dict(name="aside"),
-        dict(name="svg"),
+        dict(name='aside'),
+        dict(name='svg'),
         prefixed_classes(
             'image__placeholder sliderAd__wrapper eyebrow__wrap-- screen-reader-text'
         ),
@@ -83,7 +83,7 @@ class MitTechnologyReview(BasicNewsRecipe):
         if script := soup.find('script', id='preload'):
             raw = script.contents[0]
             m = re.search(r'\"children\":\[{\"name\":\"magazine-hero\"', raw)
-            spl = re.split(r"(?=\{)", raw[m.start():], 1)[1]
+            spl = re.split(r'(?=\{)', raw[m.start():], 1)[1]
             data = json.JSONDecoder().raw_decode(spl)[0]
             self.cover_url = data['children'][0]['config']['src'] + '?fit=572,786'
             self.timefmt = ' [' + data['config']['issueDate'] + ']'
@@ -94,7 +94,7 @@ class MitTechnologyReview(BasicNewsRecipe):
         feeds = OrderedDict()
 
         classNamePrefixes = [
-            "magazineHero__letter--", "teaserItem__title", "teaserItem--aside__title"
+            'magazineHero__letter--', 'teaserItem__title', 'teaserItem--aside__title'
         ]
         for div in soup.findAll(
             attrs={
@@ -151,7 +151,7 @@ class MitTechnologyReview(BasicNewsRecipe):
                 if section_title not in feeds:
                     feeds[section_title] = []
                 feeds[section_title] += articles
-        ans = [(key, val) for key, val in feeds.items()]
+        ans = list(feeds.items())
         return ans
 
     def preprocess_html(self, soup):
diff --git a/recipes/mmc_rtv.recipe b/recipes/mmc_rtv.recipe
index 67bc888d90..d39266c3e5 100644
--- a/recipes/mmc_rtv.recipe
+++ b/recipes/mmc_rtv.recipe
@@ -10,7 +10,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class MMCRTV(BasicNewsRecipe):
     title = u'MMC RTV Slovenija'
     __author__ = u'TadejS'
-    description = u"Prvi interaktivni multimedijski portal, MMC RTV Slovenija"
+    description = u'Prvi interaktivni multimedijski portal, MMC RTV Slovenija'
     oldest_article = 3
     max_articles_per_feed = 100
     language = 'sl'
diff --git a/recipes/modoros.recipe b/recipes/modoros.recipe
index a934eb8427..c9d1269630 100644
--- a/recipes/modoros.recipe
+++ b/recipes/modoros.recipe
@@ -15,7 +15,7 @@ from hashlib import md5
 class ModorosBlogHu(BasicNewsRecipe):
     __author__ = 'Zsolt Botykai'
     title = u'Modoros Blog'
-    description = u"Modoros.blog.hu"
+    description = u'Modoros.blog.hu'
     oldest_article = 10000
     max_articles_per_feed = 10000
     reverse_article_order = True
@@ -24,7 +24,6 @@ class ModorosBlogHu(BasicNewsRecipe):
     remove_empty_feeds = True
     no_stylesheets = True
     feeds = [(u'Modoros Blog', u'http://modoros.blog.hu/rss')]
-    remove_javascript = True
     use_embedded_content = False
     preprocess_regexps = [
         (re.compile(r'<!--megosztas -->.*?</body>', re.DOTALL | re.IGNORECASE),
diff --git a/recipes/moneycontrol.recipe b/recipes/moneycontrol.recipe
index 98d7c15350..68f422a475 100644
--- a/recipes/moneycontrol.recipe
+++ b/recipes/moneycontrol.recipe
@@ -16,7 +16,7 @@ class MoneyControlRecipe(BasicNewsRecipe):
     ignore_duplicate_articles = {'title', 'url'}
     remove_empty_feeds = True
     resolve_internal_links = True
-    oldest_article = 1 # days
+    oldest_article = 1  # days
 
     extra_css = '''
         img {display:block; margin:0 auto;}
diff --git a/recipes/montreal_gazette.recipe b/recipes/montreal_gazette.recipe
index 6701af2093..5b9bc97f92 100644
--- a/recipes/montreal_gazette.recipe
+++ b/recipes/montreal_gazette.recipe
@@ -60,44 +60,44 @@ class CanWestPaper(BasicNewsRecipe):
     ]
 
     # un-comment the following six lines for the Vancouver Province
-    # title = u'Vancouver Province'
-    # url_prefix = 'http://www.theprovince.com'
-    # description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
-    # logo_url = 'vplogo.jpg'
-    # fp_tag = 'CAN_TP'
+    # #    title = u'Vancouver Province'
+    # #    url_prefix = 'http://www.theprovince.com'
+    # #    description = u'News from Vancouver, BC'
+    # #    std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
+    # #    logo_url = 'vplogo.jpg'
+    # #    fp_tag = 'CAN_TP'
 
     # un-comment the following six lines for the Vancouver Sun
-    # title = u'Vancouver Sun'
-    # url_prefix = 'http://www.vancouversun.com'
-    # description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
-    # logo_url = 'vslogo.jpg'
-    # fp_tag = 'CAN_VS'
+    # #    title = u'Vancouver Sun'
+    # #    url_prefix = 'http://www.vancouversun.com'
+    # #    description = u'News from Vancouver, BC'
+    # #    std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
+    # #    logo_url = 'vslogo.jpg'
+    # #    fp_tag = 'CAN_VS'
 
     # un-comment the following six lines for the Calgary Herald
-    # title = u'Calgary Herald'
-    # url_prefix = 'http://www.calgaryherald.com'
-    # description = u'News from Calgary, AB'
-    # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
-    # logo_url = 'chlogo.jpg'
-    # fp_tag = 'CAN_CH'
+    # #    title = u'Calgary Herald'
+    # #    url_prefix = 'http://www.calgaryherald.com'
+    # #    description = u'News from Calgary, AB'
+    # #    std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
+    # #    logo_url = 'chlogo.jpg'
+    # #    fp_tag = 'CAN_CH'
 
     # un-comment the following six lines for the Edmonton Journal
-    # title = u'Edmonton Journal'
-    # url_prefix = 'http://www.edmontonjournal.com'
-    # description = u'News from Edmonton, AB'
-    # std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
-    # logo_url = 'ejlogo.jpg'
-    # fp_tag = 'CAN_EJ'
+    # #    title = u'Edmonton Journal'
+    # #    url_prefix = 'http://www.edmontonjournal.com'
+    # #    description = u'News from Edmonton, AB'
+    # #    std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
+    # #    logo_url = 'ejlogo.jpg'
+    # #    fp_tag = 'CAN_EJ'
 
     # un-comment the following six lines for the Ottawa Citizen
-    # title = u'Ottawa Citizen'
-    # url_prefix = 'http://www.ottawacitizen.com'
-    # description = u'News from Ottawa, ON'
-    # std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
-    # logo_url = 'oclogo.jpg'
-    # fp_tag = 'CAN_OC'
+    # #    title = u'Ottawa Citizen'
+    # #    url_prefix = 'http://www.ottawacitizen.com'
+    # #    description = u'News from Ottawa, ON'
+    # #    std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
+    # #    logo_url = 'oclogo.jpg'
+    # #    fp_tag = 'CAN_OC'
 
     # un-comment the following six lines for the Montreal Gazette
     title = u'Montreal Gazette'
@@ -126,7 +126,7 @@ class CanWestPaper(BasicNewsRecipe):
                 .photocaption { font-size: xx-small; font-style: italic; font-weight: normal; }
                 #photocredit { font-size: xx-small; font-weight: normal; }'''
 
-    keep_only_tags = [dict(name='div', attrs={'id': re.compile('story')})]
+    keep_only_tags = [dict(name='div', attrs={'id': re.compile(r'story')})]
 
     remove_tags = [{'class': 'comments'}, {'class': 'comment-intro'}, {'class': 'storytab'},
                    dict(name='div', attrs={'class': 'section_title'}), dict(name='div', attrs={'class': 'sharebar'}), dict(
@@ -140,7 +140,7 @@ class CanWestPaper(BasicNewsRecipe):
                        name='div', attrs={'class': 'copyright'}),
                    dict(name='div', attrs={'class': 'rule_grey_solid'}),
                    dict(name='div', attrs={'id': 'soundoff'}),
-                   dict(name='div', attrs={'id': re.compile('flyer')}),
+                   dict(name='div', attrs={'id': re.compile(r'flyer')}),
                    dict(name='li', attrs={'class': 'print'}), dict(name='li', attrs={'class': 'share'}), dict(name='ul', attrs={'class': 'bullet'})]
 
     def get_cover_url(self):
@@ -154,8 +154,7 @@ class CanWestPaper(BasicNewsRecipe):
         except:
             while daysback < 7:
                 cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg' + \
-                    str((date.today() - timedelta(days=daysback)).day) + \
-                    '/lg/' + self.fp_tag + '.jpg'
+                    str((date.today() - timedelta(days=daysback)).day) + '/lg/' + self.fp_tag + '.jpg'
                 br = BasicNewsRecipe.get_browser(self)
                 try:
                     br.open(cover)
@@ -164,24 +163,24 @@ class CanWestPaper(BasicNewsRecipe):
                     continue
                 break
         if daysback == 7:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             cover = None
         return cover
 
     def fixChars(self, string):
         # Replace lsquo (\x91)
-        fixed = re.sub("\x91", "‘", string)
+        fixed = string.replace('\x91', '‘')
         # Replace rsquo (\x92)
-        fixed = re.sub("\x92", "’", fixed)
+        fixed = fixed.replace('\x92', '’')
         # Replace ldquo (\x93)
-        fixed = re.sub("\x93", "“", fixed)
+        fixed = fixed.replace('\x93', '“')
         # Replace rdquo (\x94)
-        fixed = re.sub("\x94", "”", fixed)
+        fixed = fixed.replace('\x94', '”')
         # Replace ndash (\x96)
-        fixed = re.sub("\x96", "–", fixed)
+        fixed = fixed.replace('\x96', '–')
         # Replace mdash (\x97)
-        fixed = re.sub("\x97", "—", fixed)
-        fixed = re.sub("&#x2019;", "’", fixed)
+        fixed = fixed.replace('\x97', '—')
+        fixed = fixed.replace('&#x2019;', '’')
         return fixed
 
     def massageNCXText(self, description):
@@ -214,7 +213,7 @@ class CanWestPaper(BasicNewsRecipe):
         divtags = soup.findAll('div', attrs={'id': ''})
         if divtags:
             for div in divtags:
-                del(div['id'])
+                del div['id']
 
         pgall = soup.find('div', attrs={'id': 'storyphoto'})
         if pgall is not None:  # photo gallery perhaps
@@ -262,10 +261,10 @@ class CanWestPaper(BasicNewsRecipe):
                     if url.startswith('/'):
                         url = self.url_prefix + url
                     if not url.startswith(self.url_prefix):
-                        print("Rejected " + url)
+                        print('Rejected ' + url)
                         return
                     if url in self.url_list:
-                        print("Rejected dup " + url)
+                        print('Rejected dup ' + url)
                         return
                     self.url_list.append(url)
                     title = self.tag_to_string(atag, False)
@@ -277,8 +276,8 @@ class CanWestPaper(BasicNewsRecipe):
                         return
                     dtag = adiv.find('div', 'content')
                     description = ''
-                    print("URL " + url)
-                    print("TITLE " + title)
+                    print('URL ' + url)
+                    print('TITLE ' + title)
                     if dtag is not None:
                         stag = dtag.span
                         if stag is not None:
@@ -286,18 +285,18 @@ class CanWestPaper(BasicNewsRecipe):
                                 description = self.tag_to_string(stag, False)
                         else:
                             description = self.tag_to_string(dtag, False)
-                        print("DESCRIPTION: " + description)
+                        print('DESCRIPTION: ' + description)
                     if key not in articles:
                         articles[key] = []
                     articles[key].append(dict(
                         title=title, url=url, date='', description=description, author='', content=''))
 
         def parse_web_index(key, keyurl):
-            print("Section: " + key + ': ' + self.url_prefix + keyurl)
+            print('Section: ' + key + ': ' + self.url_prefix + keyurl)
             try:
                 soup = self.index_to_soup(self.url_prefix + keyurl)
             except:
-                print("Section: " + key + ' NOT FOUND')
+                print('Section: ' + key + ' NOT FOUND')
                 return
             ans.append(key)
             mainsoup = soup.find('div', 'bodywrapper')
@@ -309,7 +308,7 @@ class CanWestPaper(BasicNewsRecipe):
             for wdiv in mainsoup.findAll(attrs={'class': ['headline', 'featurecontent']}):
                 handle_article(wdiv, key)
 
-        for (k, url) in self.postmedia_index_pages:
+        for k,url in self.postmedia_index_pages:
             parse_web_index(k, url)
         ans = [(key, articles[key]) for key in ans if key in articles]
         return ans
diff --git a/recipes/moscow_times.recipe b/recipes/moscow_times.recipe
index 21004cbe0e..6f78caa6e3 100644
--- a/recipes/moscow_times.recipe
+++ b/recipes/moscow_times.recipe
@@ -10,8 +10,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Moscowtimes(BasicNewsRecipe):
     title = 'The Moscow Times (light version)'
     __author__ = 'Darko Miletic and Sujata Raman'
-    description = 'The Moscow Times is a daily English-language newspaper featuring objective, reliable news on business, politics, sports and culture in Moscow, in Russia and the former Soviet Union (CIS).'  # noqa
-    category = 'Russia, Moscow, Russian news, Moscow news, Russian newspaper, daily news, independent news, reliable news, USSR, Soviet Union, CIS, Russian politics, Russian business, Russian culture, Russian opinion, St Petersburg, Saint Petersburg'  # noqa
+    description = 'The Moscow Times is a daily English-language newspaper featuring objective, reliable news on business, politics, sports and culture in Moscow, in Russia and the former Soviet Union (CIS).'  # noqa: E501
+    category = 'Russia, Moscow, Russian news, Moscow news, Russian newspaper, daily news, independent news, reliable news, USSR, Soviet Union, CIS, Russian politics, Russian business, Russian culture, Russian opinion, St Petersburg, Saint Petersburg'  # noqa: E501
     publisher = 'The Moscow Times'
     language = 'en_RU'
     oldest_article = 2
diff --git a/recipes/moscowtimes_en.recipe b/recipes/moscowtimes_en.recipe
index 9fca9a29c2..8ab1832838 100644
--- a/recipes/moscowtimes_en.recipe
+++ b/recipes/moscowtimes_en.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class MoscowTimes(BasicNewsRecipe):
     title                 = 'The Moscow Times'
     __author__            = 'bugmen00t'
-    description           = 'The Moscow Times is Russia’s leading, independent English-language media outlet. Our team of Russian and English journalists provide readers across the world with breaking news, engaging stories and balanced reporting about the largest country on Earth.'  # noqa
+    description           = 'The Moscow Times is Russia’s leading, independent English-language media outlet. Our team of Russian and English journalists provide readers across the world with breaking news, engaging stories and balanced reporting about the largest country on Earth.'  # noqa: E501
     publisher             = 'Tiamti LLC'
     category              = 'newspaper'
     cover_url = u'https://static.themoscowtimes.com/img/share_default.jpg'
@@ -22,7 +22,7 @@ class MoscowTimes(BasicNewsRecipe):
 
     remove_tags_after = dict(name='div', attrs={'class': 'article__tags'})
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='aside'),
         dict(name='footer'),
         dict(name='section', attrs={'class': 'cluster'}),
diff --git a/recipes/moscowtimes_ru.recipe b/recipes/moscowtimes_ru.recipe
index 318b335f36..d8a16fcd52 100644
--- a/recipes/moscowtimes_ru.recipe
+++ b/recipes/moscowtimes_ru.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class MoscowTimes(BasicNewsRecipe):
     title = 'The Moscow Times'
     __author__ = 'bugmen00t'
-    description = '\u0410\u043D\u0433\u043B\u043E\u044F\u0437\u044B\u0447\u043D\u043E\u0435 \u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u043E \u0420\u043E\u0441\u0441\u0438\u0438. \u041D\u0430\u0448\u0430 \u0440\u0435\u0434\u0430\u043A\u0446\u0438\u044F \u0434\u0435\u043B\u0438\u0442\u0441\u044F \u0441 \u0447\u0438\u0442\u0430\u0442\u0435\u043B\u044F\u043C\u0438 \u043F\u043E \u0432\u0441\u0435\u043C\u0443 \u043C\u0438\u0440\u0443 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u043C\u0438 \u043D\u043E\u0432\u043E\u0441\u0442\u044F\u043C\u0438 \u0438 \u0441\u0430\u043C\u044B\u043C\u0438 \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u044B\u043C\u0438 \u0441\u043E\u0431\u044B\u0442\u0438\u044F\u043C\u0438 \u0441\u0430\u043C\u043E\u0439 \u0431\u043E\u043B\u044C\u0448\u043E\u0439 \u0441\u0442\u0440\u0430\u043D\u044B \u043D\u0430 \u0417\u0435\u043C\u043B\u0435.'  # noqa
+    description = '\u0410\u043D\u0433\u043B\u043E\u044F\u0437\u044B\u0447\u043D\u043E\u0435 \u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u043E \u0420\u043E\u0441\u0441\u0438\u0438. \u041D\u0430\u0448\u0430 \u0440\u0435\u0434\u0430\u043A\u0446\u0438\u044F \u0434\u0435\u043B\u0438\u0442\u0441\u044F \u0441 \u0447\u0438\u0442\u0430\u0442\u0435\u043B\u044F\u043C\u0438 \u043F\u043E \u0432\u0441\u0435\u043C\u0443 \u043C\u0438\u0440\u0443 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u043C\u0438 \u043D\u043E\u0432\u043E\u0441\u0442\u044F\u043C\u0438 \u0438 \u0441\u0430\u043C\u044B\u043C\u0438 \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u044B\u043C\u0438 \u0441\u043E\u0431\u044B\u0442\u0438\u044F\u043C\u0438 \u0441\u0430\u043C\u043E\u0439 \u0431\u043E\u043B\u044C\u0448\u043E\u0439 \u0441\u0442\u0440\u0430\u043D\u044B \u043D\u0430 \u0417\u0435\u043C\u043B\u0435.'  # noqa: E501
     publisher = '\u041E\u041E\u041E \u0422\u0438\u044D\u043C\u0442\u0438'
     category = 'newspaper'
     cover_url = u'https://static.themoscowtimes.com/img/share_default.jpg'
diff --git a/recipes/movie_web.recipe b/recipes/movie_web.recipe
index bf6231e896..6030346cdf 100644
--- a/recipes/movie_web.recipe
+++ b/recipes/movie_web.recipe
@@ -23,20 +23,20 @@ class AdvancedUserRecipe1716109041(BasicNewsRecipe):
     auto_cleanup   = True
 
     feeds          = [
-        #News feeds
+        # News feeds
         ('Trailers', 'https://movieweb.com/feed/trailers/'),
         ('Movie News', 'https://movieweb.com/feed/movie-news/'),
         ('TV News', 'https://movieweb.com/feed/tv-news/'),
         ('Marvel Cinematic Universe News', 'https://movieweb.com/feed/mcu-news/'),
         ('DC Universe News', 'https://movieweb.com/feed/tag/dcu-news/'),
-        #Genre feeds
+        # Genre feeds
         ('Action', 'https://movieweb.com/feed/tag/action/'),
         ('Comedy', 'https://movieweb.com/feed/tag/comedy/'),
         ('Fantasy', 'https://movieweb.com/feed/tag/fantasy/'),
         ('Horror', 'https://movieweb.com/feed/tag/horror/'),
         ('Sci-Fi', 'https://movieweb.com/feed/tag/sci-fi/'),
         ('Western', 'https://movieweb.com/feed/tag/western/'),
-        #What to Watch feeds
+        # What to Watch feeds
         ('Apple TV+', 'https://movieweb.com/feed/tag/apple-tv-plus/'),
         ('Criterion Collection', 'https://movieweb.com/feed/tag/criterion-collection/'),
         ('Disney+', 'https://movieweb.com/feed/tag/disney-plus/'),
diff --git a/recipes/mwjournal.recipe b/recipes/mwjournal.recipe
index d9ba4161b1..c1ab7555bc 100644
--- a/recipes/mwjournal.recipe
+++ b/recipes/mwjournal.recipe
@@ -49,24 +49,24 @@ class MWJournal(BasicNewsRecipe):
                          'valign', 'vspace', 'hspace', 'alt', 'width', 'height']
 
     # Specify extra CSS - overrides ALL other CSS (IE. Added last).
-    extra_css = 'body { font-family: verdana, helvetica, sans-serif; } \
-                 .introduction, .first { font-weight: bold; } \
-                 .cross-head { font-weight: bold; font-size: 125%; } \
-                 .cap, .caption { display: block; font-size: 80%; font-style: italic; } \
-                 .cap, .caption, .caption img, .caption span { display: block; margin: 5px auto; } \
-                 .byl, .byd, .byline img, .byline-name, .byline-title, .author-name, .author-position, \
-                    .correspondent-portrait img, .byline-lead-in, .name, .bbc-role { display: block; \
-                    font-size: 80%; font-style: italic; margin: 1px auto; } \
-                 .story-date, .published { font-size: 80%; } \
-                 table { width: 100%; } \
-                 td img { display: block; margin: 5px auto; } \
-                 ul { padding-top: 10px; } \
-                 ol { padding-top: 10px; } \
-                 li { padding-top: 5px; padding-bottom: 5px; } \
-                 h1 { font-size: 175%; font-weight: bold; } \
-                 h2 { font-size: 150%; font-weight: bold; } \
-                 h3 { font-size: 125%; font-weight: bold; } \
-                 h4, h5, h6 { font-size: 100%; font-weight: bold; }'
+    extra_css = '''body { font-family: verdana, helvetica, sans-serif; }
+                   .introduction, .first { font-weight: bold; }
+                   .cross-head { font-weight: bold; font-size: 125%; }
+                   .cap, .caption { display: block; font-size: 80%; font-style: italic; }
+                   .cap, .caption, .caption img, .caption span { display: block; margin: 5px auto; }
+                   .byl, .byd, .byline img, .byline-name, .byline-title, .author-name, .author-position,
+                      .correspondent-portrait img, .byline-lead-in, .name, .bbc-role { display: block;
+                      font-size: 80%; font-style: italic; margin: 1px auto; }
+                   .story-date, .published { font-size: 80%; }
+                   table { width: 100%; }
+                   td img { display: block; margin: 5px auto; }
+                   ul { padding-top: 10px; }
+                   ol { padding-top: 10px; }
+                   li { padding-top: 5px; padding-bottom: 5px; }
+                   h1 { font-size: 175%; font-weight: bold; }
+                   h2 { font-size: 150%; font-weight: bold; }
+                   h3 { font-size: 125%; font-weight: bold; }
+                   h4, h5, h6 { font-size: 100%; font-weight: bold; }'''
 
     # Remove the line breaks, href links and float left/right and picture
     # width/height.
diff --git a/recipes/myapple_pl.recipe b/recipes/myapple_pl.recipe
index 8e28e8ff89..46bc27eab0 100644
--- a/recipes/myapple_pl.recipe
+++ b/recipes/myapple_pl.recipe
@@ -12,7 +12,6 @@ class MyAppleRecipe(BasicNewsRecipe):
     description = u' Największy w Polsce serwis zajmujący się tematyką związaną z Apple i wszelkimi produktami tej firmy.'
     cover_url = ''
     remove_empty_feeds = True
-    no_stylesheets = True
     oldest_article = 7
     max_articles_per_feed = 100000
     recursions = 0
diff --git a/recipes/n_kaliningrad.recipe b/recipes/n_kaliningrad.recipe
index 2d7ea1bfdf..b985043115 100644
--- a/recipes/n_kaliningrad.recipe
+++ b/recipes/n_kaliningrad.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class NewKaliningrad(BasicNewsRecipe):
     title = '\u041D\u043E\u0432\u044B\u0439 \u041A\u0430\u043B\u0438\u043D\u0438\u043D\u0433\u0440\u0430\u0434'
     __author__ = 'bugmen00t'
-    description = '\u0420\u0435\u0433\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u044B\u0439 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u043F\u043E\u0440\u0442\u0430\u043B \u041A\u0430\u043B\u0438\u043D\u0438\u043D\u0433\u0440\u0430\u0434\u0441\u043A\u043E\u0439 \u043E\u0431\u043B\u0430\u0441\u0442\u0438 \u0438 \u0433\u043E\u0440\u043E\u0434\u0430 \u041A\u0430\u043B\u0438\u043D\u0438\u043D\u0433\u0440\u0430\u0434\u0430.'  # noqa
+    description = '\u0420\u0435\u0433\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u044B\u0439 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u043F\u043E\u0440\u0442\u0430\u043B \u041A\u0430\u043B\u0438\u043D\u0438\u043D\u0433\u0440\u0430\u0434\u0441\u043A\u043E\u0439 \u043E\u0431\u043B\u0430\u0441\u0442\u0438 \u0438 \u0433\u043E\u0440\u043E\u0434\u0430 \u041A\u0430\u043B\u0438\u043D\u0438\u043D\u0433\u0440\u0430\u0434\u0430.'  # noqa: E501
     publisher = '\u0417\u0410\u041E "\u0422\u0432\u0438\u043A \u041C\u0430\u0440\u043A\u0435\u0442\u0438\u043D\u0433"'
     category = 'news'
     cover_url = u'https://www.newkaliningrad.ru/images/logo.gif'
diff --git a/recipes/n_plus_one.recipe b/recipes/n_plus_one.recipe
index 89a5140ee6..1a4655fb66 100644
--- a/recipes/n_plus_one.recipe
+++ b/recipes/n_plus_one.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class AdvancedUserRecipe1467724863(BasicNewsRecipe):
     title = 'N+1'
     __author__ = 'bugmen00t'
-    description = '\u041D\u0430\u0443\u0447\u043D\u043E-\u043F\u043E\u043F\u0443\u043B\u044F\u0440\u043D\u043E\u0435 \u0440\u0430\u0437\u0432\u043B\u0435\u043A\u0430\u0442\u0435\u043B\u044C\u043D\u043E\u0435 \u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u043E \u0442\u043E\u043C, \u0447\u0442\u043E \u043F\u0440\u043E\u0438\u0441\u0445\u043E\u0434\u0438\u0442 \u0432 \u043D\u0430\u0443\u043A\u0435, \u0442\u0435\u0445\u043D\u0438\u043A\u0435 \u0438 \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u044F\u0445 \u043F\u0440\u044F\u043C\u043E \u0441\u0435\u0439\u0447\u0430\u0441. \u041D\u043E\u0432\u043E\u0441\u0442\u0438, \u0431\u043E\u043B\u044C\u0448\u0438\u0435 \u0441\u0442\u0430\u0442\u044C\u0438, \u0431\u043B\u043E\u0433\u0438 \u2014 \u044D\u0442\u043E \u0432\u0441\u0435 \u043F\u0440\u043E \u043D\u0430\u0441. \u041C\u044B \u0438\u0449\u0435\u043C \u0441\u0430\u043C\u043E\u0435 \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u043E\u0435 \u0438 \u0434\u043E\u0441\u0442\u0430\u0432\u043B\u044F\u0435\u043C \u044D\u0442\u043E \u0447\u0438\u0442\u0430\u0442\u0435\u043B\u044F\u043C \u0432 \u043F\u043E\u043D\u044F\u0442\u043D\u043E\u0439, \u044F\u0441\u043D\u043E\u0439, \u043F\u0440\u0438\u0432\u043B\u0435\u043A\u0430\u0442\u0435\u043B\u044C\u043D\u043E\u0439 (\u0438 \u0441 \u0432\u0438\u0437\u0443\u0430\u043B\u044C\u043D\u043E\u0439 \u0442\u043E\u0447\u043A\u0438 \u0437\u0440\u0435\u043D\u0438\u044F) \u0444\u043E\u0440\u043C\u0435. \u041C\u044B \u2014 \u0447\u0443\u0442\u044C \u0431\u043E\u043B\u044C\u0448\u0435, \u0447\u0435\u043C \u043F\u0440\u043E\u0441\u0442\u043E \u043D\u0430\u0443\u043A\u0430!'  # noqa
+    description = '\u041D\u0430\u0443\u0447\u043D\u043E-\u043F\u043E\u043F\u0443\u043B\u044F\u0440\u043D\u043E\u0435 \u0440\u0430\u0437\u0432\u043B\u0435\u043A\u0430\u0442\u0435\u043B\u044C\u043D\u043E\u0435 \u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u043E \u0442\u043E\u043C, \u0447\u0442\u043E \u043F\u0440\u043E\u0438\u0441\u0445\u043E\u0434\u0438\u0442 \u0432 \u043D\u0430\u0443\u043A\u0435, \u0442\u0435\u0445\u043D\u0438\u043A\u0435 \u0438 \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u044F\u0445 \u043F\u0440\u044F\u043C\u043E \u0441\u0435\u0439\u0447\u0430\u0441. \u041D\u043E\u0432\u043E\u0441\u0442\u0438, \u0431\u043E\u043B\u044C\u0448\u0438\u0435 \u0441\u0442\u0430\u0442\u044C\u0438, \u0431\u043B\u043E\u0433\u0438 \u2014 \u044D\u0442\u043E \u0432\u0441\u0435 \u043F\u0440\u043E \u043D\u0430\u0441. \u041C\u044B \u0438\u0449\u0435\u043C \u0441\u0430\u043C\u043E\u0435 \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u043E\u0435 \u0438 \u0434\u043E\u0441\u0442\u0430\u0432\u043B\u044F\u0435\u043C \u044D\u0442\u043E \u0447\u0438\u0442\u0430\u0442\u0435\u043B\u044F\u043C \u0432 \u043F\u043E\u043D\u044F\u0442\u043D\u043E\u0439, \u044F\u0441\u043D\u043E\u0439, \u043F\u0440\u0438\u0432\u043B\u0435\u043A\u0430\u0442\u0435\u043B\u044C\u043D\u043E\u0439 (\u0438 \u0441 \u0432\u0438\u0437\u0443\u0430\u043B\u044C\u043D\u043E\u0439 \u0442\u043E\u0447\u043A\u0438 \u0437\u0440\u0435\u043D\u0438\u044F) \u0444\u043E\u0440\u043C\u0435. \u041C\u044B \u2014 \u0447\u0443\u0442\u044C \u0431\u043E\u043B\u044C\u0448\u0435, \u0447\u0435\u043C \u043F\u0440\u043E\u0441\u0442\u043E \u043D\u0430\u0443\u043A\u0430!'  # noqa: E501
     publisher = 'N+1'
     category = 'news'
     cover_url = u'https://nplus1.ru/i/logo.png'
diff --git a/recipes/nacional_cro.recipe b/recipes/nacional_cro.recipe
index 96d3a1d2f6..6dd5f6d9ac 100644
--- a/recipes/nacional_cro.recipe
+++ b/recipes/nacional_cro.recipe
@@ -23,7 +23,7 @@ def new_tag(soup, name, attrs=()):
 class NacionalCro(BasicNewsRecipe):
     title = 'Nacional - Hr'
     __author__ = 'Darko Miletic'
-    description = "news from Croatia"
+    description = 'news from Croatia'
     publisher = 'Nacional.hr'
     category = 'news, politics, Croatia'
     oldest_article = 2
@@ -37,13 +37,13 @@ class NacionalCro(BasicNewsRecipe):
     lang = 'hr-HR'
     direction = 'ltr'
 
-    extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'  # noqa
+    extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'  # noqa: E501
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': lang, 'pretty_print': True
     }
 
-    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]  # noqa: RUF039
 
     remove_tags = [dict(name=['object', 'link', 'embed'])]
 
@@ -53,9 +53,9 @@ class NacionalCro(BasicNewsRecipe):
         soup.html['lang'] = self.lang
         soup.html['dir'] = self.direction
         mlang = new_tag(soup, 'meta', [
-                    ("http-equiv", "Content-Language"), ("content", self.lang)])
+                    ('http-equiv', 'Content-Language'), ('content', self.lang)])
         mcharset = new_tag(soup, 'meta', [
-                       ("http-equiv", "Content-Type"), ("content", "text/html; charset=UTF-8")])
+                       ('http-equiv', 'Content-Type'), ('content', 'text/html; charset=UTF-8')])
         soup.head.insert(0, mlang)
         soup.head.insert(1, mcharset)
         for item in soup.findAll(style=True):
diff --git a/recipes/nasa.recipe b/recipes/nasa.recipe
index b1b5b5e7f8..f1c6702004 100644
--- a/recipes/nasa.recipe
+++ b/recipes/nasa.recipe
@@ -49,11 +49,11 @@ class NASA(BasicNewsRecipe):
          lambda match: match.group().replace(match.group(1), 'UTF-8')),
 
         # Remove any banners/links/ads/cruft before the body of the article.
-        (r'<body.*?((<div id="article_body">)|(<div id="st-page-maincontent">)|(<div id="containermain">)|(<p class="ap-story-p">)|(<!-- img_nav -->))', lambda match: '<body><div>'),  # noqa
+        (r'<body.*?((<div id="article_body">)|(<div id="st-page-maincontent">)|(<div id="containermain">)|(<p class="ap-story-p">)|(<!-- img_nav -->))', lambda match: '<body><div>'),  # noqa: E501
 
         # Remove any links/ads/comments/cruft from the end of the body
         # of the article.
-        (r'((<!-- end article content -->)|(<div id="st-custom-afterpagecontent">)|(<p class="ap-story-p">&copy;)|(<div class="entry-footer">)|(<div id="see_also">)|(<p>Via <a href=)|(<div id="ss_nav">)).*?</html>', lambda match: '</div></body></html>'),  # noqa
+        (r'((<!-- end article content -->)|(<div id="st-custom-afterpagecontent">)|(<p class="ap-story-p">&copy;)|(<div class="entry-footer">)|(<div id="see_also">)|(<p>Via <a href=)|(<div id="ss_nav">)).*?</html>', lambda match: '</div></body></html>'),  # noqa: E501
 
         # Correctly embed in-line images by removing the surrounding
         # javascript that will be ignored in the conversion
diff --git a/recipes/naszdziennik.recipe b/recipes/naszdziennik.recipe
index 1dc09bec30..4868171f2d 100644
--- a/recipes/naszdziennik.recipe
+++ b/recipes/naszdziennik.recipe
@@ -9,7 +9,7 @@ class naszdziennik(BasicNewsRecipe):
     title = u'Nasz Dziennik'
     __author__ = 'Artur Stachecki <artur.stachecki@gmail.com>'
     language = 'pl'
-    description = u'Nasz Dziennik - Ogólnopolska gazeta codzienna. Podejmuje tematykę dotyczącą życia społecznego, kulturalnego, politycznego i religijnego. Propaguje wartości chrześcijańskie oraz tradycję i kulturę polską.'  # noqa
+    description = u'Nasz Dziennik - Ogólnopolska gazeta codzienna. Podejmuje tematykę dotyczącą życia społecznego, kulturalnego, politycznego i religijnego. Propaguje wartości chrześcijańskie oraz tradycję i kulturę polską.'  # noqa: E501
     masthead_url = 'http://www.naszdziennik.pl/images/logo-male.png'
     max_articles_per_feed = 100
     remove_javascript = True
@@ -60,7 +60,7 @@ class naszdziennik(BasicNewsRecipe):
                 article_title_datetime.find('h4'))
             # zebrane elementy dodajemy do listy zadeklarowanej w linijce 44
             articles[section].append(
-                {'title': article_title,  'url': article_url, 'date': article_date})
+                {'title': article_title, 'url': article_url, 'date': article_date})
         # po dodaniu wszystkich artykułów dodajemy sekcje do listy feedów,
         # korzystając z list sekcji znajdujących się w słowniku
         for section in sections:
diff --git a/recipes/natemat_pl.recipe b/recipes/natemat_pl.recipe
index 0fc12986e4..8ecb9c6c16 100644
--- a/recipes/natemat_pl.recipe
+++ b/recipes/natemat_pl.recipe
@@ -11,8 +11,8 @@ class NaTemat(BasicNewsRecipe):
     description = u'informacje, komentarze, opinie'
     category = 'news'
     language = 'pl'
-    preprocess_regexps = [(re.compile(u'Czytaj też\\:.*?</a>', re.IGNORECASE), lambda m: ''), (re.compile(u'Zobacz też\\:.*?</a>', re.IGNORECASE), lambda m: ''),  # noqa
-                          (re.compile(u'Czytaj więcej\\:.*?</a>', re.IGNORECASE), lambda m: ''), (re.compile(u'Czytaj również\\:.*?</a>', re.IGNORECASE), lambda m: '')]  # noqa
+    preprocess_regexps = [(re.compile(u'Czytaj też\\:.*?</a>', re.IGNORECASE), lambda m: ''), (re.compile(u'Zobacz też\\:.*?</a>', re.IGNORECASE), lambda m: ''),  # noqa: E501, RUF039
+                          (re.compile(u'Czytaj więcej\\:.*?</a>', re.IGNORECASE), lambda m: ''), (re.compile(u'Czytaj również\\:.*?</a>', re.IGNORECASE), lambda m: '')]  # noqa: E501, RUF039
     cover_url = 'http://blog.plona.pl/wp-content/uploads/2012/05/natemat.png'
     no_stylesheets = True
     keep_only_tags = [dict(id='main')]
diff --git a/recipes/natgeo.recipe b/recipes/natgeo.recipe
index f2c054aa92..f54294fac4 100644
--- a/recipes/natgeo.recipe
+++ b/recipes/natgeo.recipe
@@ -7,13 +7,13 @@ from calibre.web.feeds.news import BasicNewsRecipe, classes
 
 class NatGeo(BasicNewsRecipe):
     title = 'National Geographic'
-    description = 'News articles from The National Geographic, Download Monthly.'
+    description = ('News articles from The National Geographic, Download Monthly. '
+                   'Inspiring people to care about the planet since 1888')
     language = 'en'
     encoding = 'utf8'
     publisher = 'nationalgeographic.com'
     category = 'science, nat geo'
     __author__ = 'Kovid Goyal, unkn0wn'
-    description = 'Inspiring people to care about the planet since 1888'
     timefmt = ' [%a, %d %b, %Y]'
     no_stylesheets = True
     use_embedded_content = False
@@ -44,14 +44,14 @@ class NatGeo(BasicNewsRecipe):
     def preprocess_raw_html(self, raw_html, url):
         return self.natgeo_parser.extract_html(raw_html)
 
-    extra_css = """
+    extra_css = '''
         blockquote { color:#404040; }
         .byline, i { font-style:italic; color:#202020; }
         .cap { font-size:small; }
         img {display:block; margin:0 auto;}
         .cred { font-style:italic; font-size:small; color:#404040; }
         .auth, .time, .sub { font-size:small; color:#5c5c5c; }
-    """
+    '''
 
     def get_cover_url(self):
         # soup = self.index_to_soup('https://www.nationalgeographic.com/magazine/')
diff --git a/recipes/natgeo_kids.recipe b/recipes/natgeo_kids.recipe
index 8884f8488d..834ba19305 100644
--- a/recipes/natgeo_kids.recipe
+++ b/recipes/natgeo_kids.recipe
@@ -6,13 +6,13 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class NatGeo(BasicNewsRecipe):
     title = 'National Geographic Kids'
-    description = 'The National Geographic, an American monthly magazine'
+    description = ('The National Geographic, an American monthly magazine. '
+                   'Inspiring people to care about the planet since 1888')
     language = 'en'
     encoding = 'utf8'
     publisher = 'kids.nationalgeographic.com'
     category = 'science, nat geo'
     __author__ = 'unkn0wn'
-    description = 'Inspiring people to care about the planet since 1888'
     timefmt = ' [%a, %d %b, %Y]'
     use_embedded_content = False
     remove_javascript = True
@@ -41,14 +41,14 @@ class NatGeo(BasicNewsRecipe):
     def preprocess_raw_html(self, raw_html, url):
         return self.natgeo_parser.extract_html(raw_html)
 
-    extra_css = """
+    extra_css = '''
         blockquote { color:#404040; }
         .byline, i { font-style:italic; color:#202020; }
         .cap { font-size:small; }
         img {display:block; margin:0 auto;}
         .cred { font-style:italic; font-size:small; color:#404040; }
         .auth, .time, .sub { font-size:small; color:#5c5c5c; }
-    """
+    '''
 
     def parse_index(self):
         index = 'https://kids.nationalgeographic.com/'
diff --git a/recipes/natgeo_traveller.recipe b/recipes/natgeo_traveller.recipe
index eed9e5a0c2..e7ccafccf7 100644
--- a/recipes/natgeo_traveller.recipe
+++ b/recipes/natgeo_traveller.recipe
@@ -7,13 +7,13 @@ from calibre.web.feeds.news import BasicNewsRecipe, classes
 
 class NatGeo(BasicNewsRecipe):
     title = 'National Geographic Traveller'
-    description = 'News articles from The National Geographic Traveller, Download Monthly.'
+    description = ('News articles from The National Geographic Traveller, Download Monthly. '
+                   'Inspiring people to care about the planet since 1888')
     language = 'en'
     encoding = 'utf8'
     publisher = 'nationalgeographic.com'
     category = 'science, nat geo'
     __author__ = 'unkn0wn'
-    description = 'Inspiring people to care about the planet since 1888'
     timefmt = ' [%a, %d %b, %Y]'
     no_stylesheets = True
     use_embedded_content = False
@@ -44,14 +44,14 @@ class NatGeo(BasicNewsRecipe):
     def preprocess_raw_html(self, raw_html, url):
         return self.natgeo_parser.extract_html(raw_html)
 
-    extra_css = """
+    extra_css = '''
         blockquote { color:#404040; }
         .byline, i { font-style:italic; color:#202020; }
         .cap { font-size:small; }
         img {display:block; margin:0 auto;}
         .cred { font-style:italic; font-size:small; color:#404040; }
         .auth, .time, .sub { font-size:small; color:#5c5c5c; }
-    """
+    '''
 
     def parse_index(self):
         pages = [
diff --git a/recipes/natgeohis.recipe b/recipes/natgeohis.recipe
index 61012a18e1..cdec6edd84 100644
--- a/recipes/natgeohis.recipe
+++ b/recipes/natgeohis.recipe
@@ -5,16 +5,14 @@ from calibre.web.feeds.news import BasicNewsRecipe, classes
 
 class NatGeo(BasicNewsRecipe):
     title = 'National Geographic History'
-    description = (
-        'From Caesar to Napoleon, the Pyramids to the Parthenon, the Trojan War to the Civil War—National Geographic '
-        'HISTORY draws readers in with more than 5,000 years of people, places, and things to explore.'
-    )
+    description = ('From Caesar to Napoleon, the Pyramids to the Parthenon, the Trojan War to the Civil War—National Geographic '
+                   'HISTORY draws readers in with more than 5,000 years of people, places, and things to explore. '
+                   'Inspiring people to care about the planet since 1888')
     language = 'en'
     encoding = 'utf8'
     publisher = 'nationalgeographic.com'
     category = 'science, nat geo'
     __author__ = 'Kovid Goyal, unkn0wn'
-    description = 'Inspiring people to care about the planet since 1888'
     timefmt = ' [%a, %d %b, %Y]'
     no_stylesheets = True
     use_embedded_content = False
@@ -43,14 +41,14 @@ class NatGeo(BasicNewsRecipe):
     def preprocess_raw_html(self, raw_html, url):
         return self.natgeo_parser.extract_html(raw_html)
 
-    extra_css = """
+    extra_css = '''
         blockquote { color:#404040; }
         .byline, i { font-style:italic; color:#202020; }
         .cap { font-size:small; }
         img {display:block; margin:0 auto;}
         .cred { font-style:italic; font-size:small; color:#404040; }
         .auth, .time, .sub { font-size:small; color:#5c5c5c; }
-    """
+    '''
 
     def get_cover_url(self):
         soup = self.index_to_soup('https://ngsingleissues.nationalgeographic.com/history')
diff --git a/recipes/natgeomag.recipe b/recipes/natgeomag.recipe
index 2826d8c1a0..91d77089db 100644
--- a/recipes/natgeomag.recipe
+++ b/recipes/natgeomag.recipe
@@ -8,13 +8,13 @@ from calibre.web.feeds.news import BasicNewsRecipe, classes
 
 class NatGeo(BasicNewsRecipe):
     title = 'National Geographic Magazine'
-    description = 'The National Geographic, an American monthly magazine'
+    description = ('The National Geographic, an American monthly magazine. '
+                   'Inspiring people to care about the planet since 1888')
     language = 'en'
     encoding = 'utf8'
     publisher = 'nationalgeographic.com'
     category = 'science, nat geo'
     __author__ = 'Kovid Goyal, unkn0wn'
-    description = 'Inspiring people to care about the planet since 1888'
     timefmt = ' [%a, %d %b, %Y]'
     no_stylesheets = True
     use_embedded_content = False
@@ -48,14 +48,14 @@ class NatGeo(BasicNewsRecipe):
     def preprocess_raw_html(self, raw_html, url):
         return self.natgeo_parser.extract_html(raw_html)
 
-    extra_css = """
+    extra_css = '''
         blockquote { color:#404040; }
         .byline, i { font-style:italic; color:#202020; }
         .cap { font-size:small; }
         img {display:block; margin:0 auto;}
         .cred { font-style:italic; font-size:small; color:#404040; }
         .auth, .time, .sub { font-size:small; color:#5c5c5c; }
-    """
+    '''
 
     def parse_index(self):
         edition = date.today().strftime('%B-%Y')
diff --git a/recipes/nature.recipe b/recipes/nature.recipe
index 02c70c211a..1484c44903 100644
--- a/recipes/nature.recipe
+++ b/recipes/nature.recipe
@@ -40,14 +40,14 @@ class Nature(BasicNewsRecipe):
     no_javascript = True
     no_stylesheets = True
 
-    keep_only_tags = [dict(name="article")]
+    keep_only_tags = [dict(name='article')]
 
     remove_tags = [
         classes(
-            "u-hide-print hide-print c-latest-content__item c-context-bar "
-            "c-pdf-button__container u-js-hide"
+            'u-hide-print hide-print c-latest-content__item c-context-bar '
+            'c-pdf-button__container u-js-hide'
         ),
-        dict(name="img", attrs={"class": ["visually-hidden"]}),
+        dict(name='img', attrs={'class': ['visually-hidden']}),
     ]
 
     def parse_index(self):
@@ -56,15 +56,15 @@ class Nature(BasicNewsRecipe):
             'img', attrs={'data-test': check_words('issue-cover-image')}
         )['src']
         try:
-            self.cover_url = re.sub(r"\bw\d+\b", "w1000", self.cover_url)  # enlarge cover size resolution
+            self.cover_url = re.sub(r'\bw\d+\b', 'w1000', self.cover_url)  # enlarge cover size resolution
         except:
-            """
+            '''
             failed, img src might have changed, use default width 200
-            """
+            '''
             pass
 
         section_tags = soup.find_all(
-            "section", attrs={"data-container-type": "issue-section-list"}
+            'section', attrs={'data-container-type': 'issue-section-list'}
         )
 
         sections = defaultdict(list)
diff --git a/recipes/nautilus.recipe b/recipes/nautilus.recipe
index 7ee8788b08..ae310fe111 100644
--- a/recipes/nautilus.recipe
+++ b/recipes/nautilus.recipe
@@ -1,7 +1,7 @@
 #!/usr/bin/env  python
-"""
+'''
 nautil.us
-"""
+'''
 
 from calibre.web.feeds.news import BasicNewsRecipe, classes
 
@@ -23,14 +23,14 @@ class Nautilus(BasicNewsRecipe):
     remove_attributes = ['height', 'width']
     ignore_duplicate_articles = {'title', 'url'}
     remove_empty_feeds = True
-    extra_css = """
+    extra_css = '''
         .article-list_item-byline{font-size:small;}
         blockquote{color:#404040; text-align:center;}
         #fig-c{font-size:small;}
         em{color:#202020;}
         .breadcrumb{color:gray; font-size:small;}
         .article-author{font-size:small;}
-    """
+    '''
 
     recipe_specific_options = {
         'days': {
diff --git a/recipes/navalny.recipe b/recipes/navalny.recipe
index a1983b2e59..59cfecc67e 100644
--- a/recipes/navalny.recipe
+++ b/recipes/navalny.recipe
@@ -8,7 +8,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class AdvancedUserRecipe1467716191(BasicNewsRecipe):
     title = '\u0410\u043b\u0435\u043a\u0441\u0435\u0439 \u041d\u0430\u0432\u0430\u043b\u044c\u043d\u044b\u0439'
     __author__ = 'bugmen00t'
-    description = '\u0411\u043B\u043E\u0433 \u0410\u043B\u0435\u043A\u0441\u0435\u044F \u041D\u0430\u0432\u0430\u043B\u044C\u043D\u043E\u0433\u043E. \u0424\u0438\u043D\u0430\u043B\u044C\u043D\u0430\u044F \u0431\u0438\u0442\u0432\u0430 \u043C\u0435\u0436\u0434\u0443 \u0434\u043E\u0431\u0440\u043E\u043C \u0438 \u043D\u0435\u0439\u0442\u0440\u0430\u043B\u0438\u0442\u0435\u0442\u043E\u043C'  # noqa
+    description = '\u0411\u043B\u043E\u0433 \u0410\u043B\u0435\u043A\u0441\u0435\u044F \u041D\u0430\u0432\u0430\u043B\u044C\u043D\u043E\u0433\u043E. \u0424\u0438\u043D\u0430\u043B\u044C\u043D\u0430\u044F \u0431\u0438\u0442\u0432\u0430 \u043C\u0435\u0436\u0434\u0443 \u0434\u043E\u0431\u0440\u043E\u043C \u0438 \u043D\u0435\u0439\u0442\u0440\u0430\u043B\u0438\u0442\u0435\u0442\u043E\u043C'  # noqa: E501
     publisher = 'navalny.com'
     category = 'news'
     cover_url = u'https://st.navalny.com/static/images/present.dd46b90f0221.png'
diff --git a/recipes/navy_times.recipe b/recipes/navy_times.recipe
index bd3f297e65..021b3ca26d 100644
--- a/recipes/navy_times.recipe
+++ b/recipes/navy_times.recipe
@@ -27,12 +27,12 @@ class NavyTimes(BasicNewsRecipe):
         ('Home page', 'https://www.navytimes.com/arc/outboundfeeds/rss/?outputType=xml'),
         ('News', 'https://www.navytimes.com/arc/outboundfeeds/rss/category/news/?outputType=xml'),
         ('Your Navy', 'https://www.navytimes.com/arc/outboundfeeds/rss/category/news/your-navy/?outputType=xml'),
-        ('Your Army',   'https://www.armytimes.com/arc/outboundfeeds/rss/category/news/your-army/?outputType=xml'),
+        ('Your Army', 'https://www.armytimes.com/arc/outboundfeeds/rss/category/news/your-army/?outputType=xml'),
         ('Your Air Force', 'https://www.airforcetimes.com/arc/outboundfeeds/rss/category/news/your-air-force?outputType=xml'),
-        ('Your Marine Core',   'https://www.marinecorpstimes.com/arc/outboundfeeds/rss/category/news/your-marine-corps/?outputType=xml'),
-        ('Pentagon and Congress',   'https://www.navytimes.com/arc/outboundfeeds/rss/category/news/pentagon-congress/?outputType=xml'),
-        ('Pay and Benefits',   'https://www.navytimes.com/arc/outboundfeeds/rss/category/pay-benefits/?outputType=xml'),
-        ('Veterans',   'https://www.navytimes.com/arc/outboundfeeds/rss/category/veterans/?outputType=xml'),
-        ('Education and Transition',   'https://www.navytimes.com/arc/outboundfeeds/rss/category/education-transition/?outputType=xml'),
-        ('Flashpoints',   'https://www.navytimes.com/arc/outboundfeeds/rss/category/flashpoints/?outputType=xml'),
+        ('Your Marine Core', 'https://www.marinecorpstimes.com/arc/outboundfeeds/rss/category/news/your-marine-corps/?outputType=xml'),
+        ('Pentagon and Congress', 'https://www.navytimes.com/arc/outboundfeeds/rss/category/news/pentagon-congress/?outputType=xml'),
+        ('Pay and Benefits', 'https://www.navytimes.com/arc/outboundfeeds/rss/category/pay-benefits/?outputType=xml'),
+        ('Veterans', 'https://www.navytimes.com/arc/outboundfeeds/rss/category/veterans/?outputType=xml'),
+        ('Education and Transition', 'https://www.navytimes.com/arc/outboundfeeds/rss/category/education-transition/?outputType=xml'),
+        ('Flashpoints', 'https://www.navytimes.com/arc/outboundfeeds/rss/category/flashpoints/?outputType=xml'),
     ]
diff --git a/recipes/nepszabadsag.recipe b/recipes/nepszabadsag.recipe
index a0b9f5279d..51612d42b8 100644
--- a/recipes/nepszabadsag.recipe
+++ b/recipes/nepszabadsag.recipe
@@ -29,7 +29,7 @@ class nepszabadsag(BasicNewsRecipe):
     remove_attributes = []
     remove_tags_before = dict(name='div', attrs={'class': ['d-source']})
     remove_tags_after = dict(name='div', attrs={'class': ['tags']})
-    remove_tags = [dict(name='div',   attrs={'class': ['h']}),
+    remove_tags = [dict(name='div', attrs={'class': ['h']}),
                    dict(name='tfoot')]
 
     keep_only_tags = [dict(name='table', attrs={'class': 'article-box'})]
diff --git a/recipes/new_scientist.recipe b/recipes/new_scientist.recipe
index ccbc2fc73d..0f9c5f06eb 100644
--- a/recipes/new_scientist.recipe
+++ b/recipes/new_scientist.recipe
@@ -101,7 +101,7 @@ class NewScientist(BasicNewsRecipe):
         br = BasicNewsRecipe.get_browser(self)
         if self.username is not None and self.password is not None:
             def is_login_form(form):
-                return "action" in form.attrs and form.attrs['action'] == "/login/"
+                return 'action' in form.attrs and form.attrs['action'] == '/login/'
 
             br.open('https://www.newscientist.com/login/')
             br.select_form(predicate=is_login_form)
diff --git a/recipes/new_scientist_mag.recipe b/recipes/new_scientist_mag.recipe
index 9aa04e4ecd..49fe63b97d 100644
--- a/recipes/new_scientist_mag.recipe
+++ b/recipes/new_scientist_mag.recipe
@@ -40,7 +40,7 @@ class NewScientist(BasicNewsRecipe):
         br = BasicNewsRecipe.get_browser(self)
         if self.username is not None and self.password is not None:
             def is_login_form(form):
-                return "action" in form.attrs and form.attrs['action'] == "/login/"
+                return 'action' in form.attrs and form.attrs['action'] == '/login/'
 
             br.open('https://www.newscientist.com/login/')
             br.select_form(predicate=is_login_form)
diff --git a/recipes/new_statesman.recipe b/recipes/new_statesman.recipe
index 553f5a8f6e..86ecc7b35f 100644
--- a/recipes/new_statesman.recipe
+++ b/recipes/new_statesman.recipe
@@ -15,7 +15,7 @@ class NewStatesman(BasicNewsRecipe):
     __author__ = 'Darko Miletic'
     description = "Current affairs, world politics, the arts and more from Britain's award-winning magazine"
     publisher = 'New Statesman Media'
-    category = 'New Statesman magazine, International Politics, British Politics, Britain, UK, Tony Blair, Gordon Brown, Geoffrey Robinson, David Cameron, Sir Menzies Campbell, Labour, Conservative, Liberal Democrat, UK Politics, House of Commons, House of Lords, Legislation, politics magazine'  # noqa
+    category = 'New Statesman magazine, International Politics, British Politics, Britain, UK, Tony Blair, Gordon Brown, Geoffrey Robinson, David Cameron, Sir Menzies Campbell, Labour, Conservative, Liberal Democrat, UK Politics, House of Commons, House of Lords, Legislation, politics magazine'  # noqa: E501
     oldest_article = 30
     no_stylesheets = True
     encoding = 'utf8'
@@ -28,10 +28,10 @@ class NewStatesman(BasicNewsRecipe):
     ignore_duplicate_articles = {'url'}
     masthead_url = 'https://www.newstatesman.com/sites/all/themes/creative-responsive-theme/images/newstatesman_logo@2x.png'
 
-    extra_css = """
+    extra_css = '''
         body{font-family: serif}
         img{margin-top:1em; margin-bottom: 1em; display:block}
-    """
+    '''
 
     conversion_options = {
         'comment': description,
diff --git a/recipes/new_yorker.recipe b/recipes/new_yorker.recipe
index 6d8b49f863..77afa4d5fd 100644
--- a/recipes/new_yorker.recipe
+++ b/recipes/new_yorker.recipe
@@ -14,9 +14,10 @@ def absurl(x):
         x = 'https://www.newyorker.com' + x
     return x
 
+
 class NewYorker(BasicNewsRecipe):
 
-    title = "The New Yorker Magazine"
+    title = 'The New Yorker Magazine'
     description = "Articles of the week's New Yorker magazine"
     language = 'en_US'
     __author__ = 'Kovid Goyal'
@@ -48,7 +49,7 @@ class NewYorker(BasicNewsRecipe):
     remove_attributes = ['style']
 
     def preprocess_html(self, soup):
-        w = '/w_320' # use '/w_640' for highres
+        w = '/w_320'  # use '/w_640' for highres
         for img in soup.findAll('img'):
             if img.has_attr('srcset'):
                 for x in img['srcset'].split():
@@ -68,16 +69,16 @@ class NewYorker(BasicNewsRecipe):
         return soup
 
     # def preprocess_image(self, img_data, image_url):
-        # from PIL import Image
-        # from calibre import fit_image
-        # from io import BytesIO
-        # img = Image.open(BytesIO(img_data)).convert('RGB')
-        # scaled, nwidth, nheight = fit_image(img.width, img.height, 1024, 1024)
-        # if scaled:
-            # img = img.resize((nwidth, nheight))
-        # buf = BytesIO()
-        # img.save(buf, format='JPEG')
-        # return buf.getvalue()
+    #     from PIL import Image
+    #     from calibre import fit_image
+    #     from io import BytesIO
+    #     img = Image.open(BytesIO(img_data)).convert('RGB')
+    #     scaled, nwidth, nheight = fit_image(img.width, img.height, 1024, 1024)
+    #     if scaled:
+    #         img = img.resize((nwidth, nheight))
+    #     buf = BytesIO()
+    #     img.save(buf, format='JPEG')
+    #     return buf.getvalue()
 
     recipe_specific_options = {
         'date': {
@@ -99,9 +100,9 @@ class NewYorker(BasicNewsRecipe):
             self.log('Found cover:', self.cover_url)
             try:
                 # the src original resolution w_280 was too low, replace w_280 with w_560
-                cover_url_width_index = self.cover_url.find("w_")
+                cover_url_width_index = self.cover_url.find('w_')
                 old_width = self.cover_url[cover_url_width_index:cover_url_width_index+5]
-                self.cover_url = self.cover_url.replace(old_width, "w_640")
+                self.cover_url = self.cover_url.replace(old_width, 'w_640')
             except Exception:
                 self.log('Failed enlarging cover img, using the original one')
 
@@ -126,10 +127,9 @@ class NewYorker(BasicNewsRecipe):
                 if rub:
                     desc = self.tag_to_string(rub) + ' | ' + desc
                 self.log('\t', title, '\n\t', desc, '\n\t\t', url)
-                feeds_dict[section].append({"title": title, "url": url, "description": desc})
+                feeds_dict[section].append({'title': title, 'url': url, 'description': desc})
         return feeds_dict.items()
 
-
     # The New Yorker changes the content it delivers based on cookies, so the
     # following ensures that we send no cookies
     def get_browser(self, *args, **kwargs):
diff --git a/recipes/newrepublicmag.recipe b/recipes/newrepublicmag.recipe
index 01ede950a4..621944570c 100644
--- a/recipes/newrepublicmag.recipe
+++ b/recipes/newrepublicmag.recipe
@@ -1,6 +1,6 @@
-"""
+'''
 newrepublic.com
-"""
+'''
 import json
 from functools import cmp_to_key
 from urllib.parse import urlencode, urljoin, urlparse, urlsplit
@@ -10,16 +10,16 @@ from calibre.ebooks.BeautifulSoup import BeautifulSoup
 from calibre.utils.date import parse_date
 from calibre.web.feeds.news import BasicNewsRecipe
 
-_issue_url = ""  # example: https://newrepublic.com/magazine/may-2023
+_issue_url = ''  # example: https://newrepublic.com/magazine/may-2023
 
 
 def sort_section(a, b, sections_sort):
     try:
-        a_index = sections_sort.index(a["section"])
+        a_index = sections_sort.index(a['section'])
     except ValueError:
         a_index = 999
     try:
-        b_index = sections_sort.index(b["section"])
+        b_index = sections_sort.index(b['section'])
     except ValueError:
         b_index = 999
 
@@ -27,31 +27,31 @@ def sort_section(a, b, sections_sort):
         return -1
     if a_index > b_index:
         return 1
-    if a["section"] == b["section"]:
-        return -1 if a["date"] < b["date"] else 1
-    return -1 if a["section"] < b["section"] else 1
+    if a['section'] == b['section']:
+        return -1 if a['date'] < b['date'] else 1
+    return -1 if a['section'] < b['section'] else 1
 
 
 class NewRepublicMagazine(BasicNewsRecipe):
-    title = "The New Republic Magazine"
-    language = "en"
-    __author__ = "ping"
+    title = 'The New Republic Magazine'
+    language = 'en'
+    __author__ = 'ping'
     description = (
-        "Founded in 1914, The New Republic is a media organization dedicated to addressing "
-        "today’s most critical issues. https://newrepublic.com/magazine"
+        'Founded in 1914, The New Republic is a media organization dedicated to addressing '
+        'today’s most critical issues. https://newrepublic.com/magazine'
     )
-    publication_type = "magazine"
+    publication_type = 'magazine'
     use_embedded_content = False
-    masthead_url = "https://images.newrepublic.com/f5acdc0030e3212e601040dd24d5c2c0c684b15f.png?w=512&q=65&dpi=1&fit=crop&crop=faces&h=256"
-    remove_attributes = ["height", "width"]
-    ignore_duplicate_articles = {"title", "url"}
+    masthead_url = 'https://images.newrepublic.com/f5acdc0030e3212e601040dd24d5c2c0c684b15f.png?w=512&q=65&dpi=1&fit=crop&crop=faces&h=256'
+    remove_attributes = ['height', 'width']
+    ignore_duplicate_articles = {'title', 'url'}
     remove_empty_feeds = True
     compress_news_images_auto_size = 6
     requires_version = (5, 0, 0)
 
-    BASE_URL = "https://newrepublic.com"
+    BASE_URL = 'https://newrepublic.com'
 
-    extra_css = """
+    extra_css = '''
     h1.headline { margin-bottom: 0.4rem; }
     h2.subheadline { font-style: italic; margin-bottom: 1rem; font-weight: normal; }
     .article-meta {  margin-bottom: 1rem; }
@@ -64,15 +64,15 @@ class NewRepublicMagazine(BasicNewsRecipe):
     }
     .lede-media .caption, .article-embed .caption { font-size: 0.8rem; }
     div.author-bios { margin-top: 2rem; font-style: italic; border-top: solid 1px dimgray; }
-    """
+    '''
 
     def _article_endpoint(self, nid):
-        """
+        '''
         Graphql endpoint to fetch full article
         :param nid:
         :return:
-        """
-        query = """
+        '''
+        query = '''
 query ($id: ID, $nid: ID) {
   Article(id: $id, nid: $nid) {
     ...ArticlePageFields
@@ -157,12 +157,12 @@ fragment ArticlePageFields on Article {
     slug
     label
   }
-}"""
-        params = {"query": query, "variables": json.dumps({"nid": str(nid)})}
-        return f"https://newrepublic.com/graphql?{urlencode(params)}"
+}'''
+        params = {'query': query, 'variables': json.dumps({'nid': str(nid)})}
+        return f'https://newrepublic.com/graphql?{urlencode(params)}'
 
     def _resize_image(self, image_url, width, height):
-        """
+        '''
         Rewrite the image url to fetch a device appropriate sized one instead
         of the full-res one
 
@@ -170,76 +170,76 @@ fragment ArticlePageFields on Article {
         :param width:
         :param height:
         :return:
-        """
+        '''
         crop_params = {
-            "auto": "compress",
-            "ar": f"{width}:{height}",
-            "fm": "jpg",
-            "fit": "crop",
-            "crop": "faces",
-            "ixlib": "react-9.0.2",
-            "dpr": 1,
-            "q": 65,
-            "w": self.scale_news_images[0] if self.scale_news_images else 800,
+            'auto': 'compress',
+            'ar': f'{width}:{height}',
+            'fm': 'jpg',
+            'fit': 'crop',
+            'crop': 'faces',
+            'ixlib': 'react-9.0.2',
+            'dpr': 1,
+            'q': 65,
+            'w': self.scale_news_images[0] if self.scale_news_images else 800,
         }
         url_tuple = urlsplit(image_url)
-        return f"{url_tuple.scheme}://{url_tuple.netloc}{url_tuple.path}?{urlencode(crop_params)}"
+        return f'{url_tuple.scheme}://{url_tuple.netloc}{url_tuple.path}?{urlencode(crop_params)}'
 
     def populate_article_metadata(self, article, soup, first):
         # pick up the og link from preprocess_raw_html() and set it as url instead of the api endpoint
-        og_link = soup.select("[data-og-link]")
+        og_link = soup.select('[data-og-link]')
         if og_link:
-            article.url = og_link[0]["data-og-link"]
+            article.url = og_link[0]['data-og-link']
 
     def preprocess_raw_html(self, raw_html, url):
         # formulate the api response into html
-        article = json.loads(raw_html)["data"]["Article"]
+        article = json.loads(raw_html)['data']['Article']
         # Example: 2022-08-12T10:00:00.000Z
-        date_published_loc = parse_date(article["publishedAt"])
+        date_published_loc = parse_date(article['publishedAt'])
         # authors
-        author_bios_html = ""
+        author_bios_html = ''
         post_authors = []
         try:
-            post_authors = [a["name"] for a in article.get("authors", [])]
+            post_authors = [a['name'] for a in article.get('authors', [])]
             if post_authors:
-                author_bios_html = "".join(
-                    [a.get("blurb", "") for a in article.get("authors", [])]
+                author_bios_html = ''.join(
+                    [a.get('blurb', '') for a in article.get('authors', [])]
                 )
                 author_bios_html = f'<div class="author-bios">{author_bios_html}</div>'
         except (KeyError, TypeError):
             pass
 
         # lede image
-        lede_image_html = ""
-        if article.get("ledeImage"):
-            img = article["ledeImage"]
+        lede_image_html = ''
+        if article.get('ledeImage'):
+            img = article['ledeImage']
             lede_img_url = self._resize_image(
-                urljoin(self.BASE_URL, img["src"]), img["width"], img["height"]
+                urljoin(self.BASE_URL, img['src']), img['width'], img['height']
             )
-            lede_image_caption = ""
-            if article.get("ledeImageRealCaption"):
+            lede_image_caption = ''
+            if article.get('ledeImageRealCaption'):
                 lede_image_caption = (
                     f'<span class="caption">{article["ledeImageRealCaption"]}>/span>'
                 )
-            lede_image_html = f"""<p class="lede-media">
+            lede_image_html = f'''<p class="lede-media">
                 <img src="{lede_img_url}">{lede_image_caption}
-                </p>"""
+                </p>'''
 
-        body_soup = BeautifulSoup(article["body"], features="html.parser")
-        for img in body_soup.find_all("img", attrs={"data-serialized": True}):
+        body_soup = BeautifulSoup(article['body'], features='html.parser')
+        for img in body_soup.find_all('img', attrs={'data-serialized': True}):
             try:
-                img_info = json.loads(img["data-serialized"])
+                img_info = json.loads(img['data-serialized'])
                 img_src = self._resize_image(
-                    urljoin(self.BASE_URL, img_info["src"]),
-                    img_info["width"],
-                    img_info["height"],
+                    urljoin(self.BASE_URL, img_info['src']),
+                    img_info['width'],
+                    img_info['height'],
                 )
-                img["src"] = img_src
-                del img["data-serialized"]
-            except:  # noqa
+                img['src'] = img_src
+                del img['data-serialized']
+            except:
                 pass
 
-        return f"""<html>
+        return f'''<html>
         <head><title>{article["cleanTitle"]}</title></head>
         <body>
             <article data-og-link="{article["urlFull"]}">
@@ -252,37 +252,37 @@ fragment ArticlePageFields on Article {
                 </span>
             </div>
             {lede_image_html}
-            {str(body_soup)}
+            {body_soup!s}
             {author_bios_html}
             </article>
-        </body></html>"""
+        </body></html>'''
 
     def parse_index(self):
         br = self.get_browser()
-        params = ""
+        params = ''
         if _issue_url:
-            month = urlparse(_issue_url).path.split("/")[-1]
+            month = urlparse(_issue_url).path.split('/')[-1]
             params = f'?{urlencode({"magazineTag": month})}'
-        res = br.open_novisit(f"https://newrepublic.com/api/content/magazine{params}")
-        magazine = json.loads(res.read().decode("utf-8"))["data"]
+        res = br.open_novisit(f'https://newrepublic.com/api/content/magazine{params}')
+        magazine = json.loads(res.read().decode('utf-8'))['data']
         self.log.debug(f'Found issue: {magazine["metaData"]["issueTag"]["text"]}')
         self.timefmt = f': {magazine["metaData"]["issueTag"]["text"]}'
-        self.cover_url = urljoin(self.BASE_URL, magazine["metaData"]["image"]["src"])
+        self.cover_url = urljoin(self.BASE_URL, magazine['metaData']['image']['src'])
 
         feed_articles = []
         for k, articles in magazine.items():
-            if not (k.startswith("magazine") and articles):
+            if not (k.startswith('magazine') and articles):
                 continue
             try:
                 for article in articles:
                     self.log.debug(f'Found article: {article["title"]}')
                     feed_articles.append(
                         {
-                            "url": self._article_endpoint(article["nid"]),
-                            "title": article["title"].replace("\n", " "),
-                            "description": article.get("deck", ""),
-                            "date": article["publishedAt"],
-                            "section": k[len("magazine") :],
+                            'url': self._article_endpoint(article['nid']),
+                            'title': article['title'].replace('\n', ' '),
+                            'description': article.get('deck', ''),
+                            'date': article['publishedAt'],
+                            'section': k[len('magazine') :],
                         }
                     )
             except TypeError:
@@ -290,24 +290,24 @@ fragment ArticlePageFields on Article {
                 pass
 
         sort_sections = [
-            "Cover",
-            "Editorsnote",
-            "Features",
-            "StateOfTheNation",
-            "ResPublica",
-            "Columns",
-            "Upfront",
-            "Backstory",
-            "SignsAndWonders",
-            "Usandtheworld",
-            "Booksandthearts",
-            "Poetry",
-            "Exposure",
+            'Cover',
+            'Editorsnote',
+            'Features',
+            'StateOfTheNation',
+            'ResPublica',
+            'Columns',
+            'Upfront',
+            'Backstory',
+            'SignsAndWonders',
+            'Usandtheworld',
+            'Booksandthearts',
+            'Poetry',
+            'Exposure',
         ]
         sort_category_key = cmp_to_key(lambda a, b: sort_section(a, b, sort_sections))
         return [
             (
-                magazine["metaData"]["issueTag"]["text"],
+                magazine['metaData']['issueTag']['text'],
                 sorted(feed_articles, key=sort_category_key),
             )
         ]
diff --git a/recipes/news24.recipe b/recipes/news24.recipe
index 94b9979ba2..a5c4e77d06 100644
--- a/recipes/news24.recipe
+++ b/recipes/news24.recipe
@@ -3,7 +3,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class AdvancedUserRecipe1375900744(BasicNewsRecipe):
     title = u'News24'
-    description = "News24."
+    description = 'News24.'
     __author__ = 'Nicki de Wet'
     publisher = 'Media24'
     category = 'news, politics, South Africa'
@@ -17,10 +17,10 @@ class AdvancedUserRecipe1375900744(BasicNewsRecipe):
     remove_empty_feeds = True
     publication_type = 'newsportal'
     masthead_url = 'http://www.24.com/images/widgethead_news.png'
-    extra_css             = """
+    extra_css             = '''
                                 body{font-family: Arial,Helvetica,sans-serif }
                                 img{display: block}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/news_busters.recipe b/recipes/news_busters.recipe
index 7d8ab2d80e..dea3e7ad17 100644
--- a/recipes/news_busters.recipe
+++ b/recipes/news_busters.recipe
@@ -7,7 +7,7 @@ class NewsBusters(BasicNewsRecipe):
     __author__ = 'jde'
     oldest_article = 1  # day
     max_articles_per_feed = 100
-    cover_url = "http://newsbusters.org/sites/all/themes/genesis_nb/images/nb-mrc.png"
+    cover_url = 'http://newsbusters.org/sites/all/themes/genesis_nb/images/nb-mrc.png'
     language = 'en'
     encoding = 'utf8'
     needs_subscription = False
diff --git a/recipes/newslaundry.recipe b/recipes/newslaundry.recipe
index 4fe4cf6996..3e317aaff0 100644
--- a/recipes/newslaundry.recipe
+++ b/recipes/newslaundry.recipe
@@ -14,7 +14,7 @@ class newslaundry(BasicNewsRecipe):
     encoding = 'utf-8'
     no_stylesheets = True
     remove_javascript = True
-    oldest_article = 7 # days
+    oldest_article = 7  # days
     resolve_internal_links = True
 
     ignore_duplicate_articles = {'url'}
@@ -34,5 +34,5 @@ class newslaundry(BasicNewsRecipe):
 
     def print_version(self, url):
         if 'hindi.newslaundry' in url:
-            self.abort_article('Skipping hindi article') # remove this line if you want hindi articles.
+            self.abort_article('Skipping hindi article')  # remove this line if you want hindi articles.
         return url
diff --git a/recipes/newsweek_polska.recipe b/recipes/newsweek_polska.recipe
index af69641762..4733dfe135 100644
--- a/recipes/newsweek_polska.recipe
+++ b/recipes/newsweek_polska.recipe
@@ -71,31 +71,31 @@ class Newsweek(BasicNewsRecipe):
                 strong = p.find('strong')
                 if strong:
                     newest = re.compile(
-                        "Tekst pochodzi z najnowszego numeru Tygodnika Newsweek")
+                        r'Tekst pochodzi z najnowszego numeru Tygodnika Newsweek')
                     if newest.search(str(strong)):
                         strong.extract()
                         continue
 
                 itunes = p.find('a')
                 if itunes:
-                    reurl = re.compile("itunes.apple.com")
+                    reurl = re.compile(r'itunes.apple.com')
                     if reurl.search(str(itunes['href'])):
                         p.extract()
                         continue
 
                 imagedesc = p.find('div', attrs={'class': 'image-desc'})
                 if imagedesc:
-                    redesc = re.compile("Okładka numeru")
+                    redesc = re.compile(r'Okładka numeru')
                     if (redesc.search(str(imagedesc))):
                         p.extract()
                         continue
 
             # get actual contents
             for content in article_div.contents:
-                strs.append("".join(str(content)))
+                strs.append(''.join(str(content)))
 
         # return contents as a string
-        return u"".join(strs)
+        return u''.join(strs)
 
     #
     # Articles can be divided into several pages, this method parses them recursevely
@@ -108,7 +108,7 @@ class Newsweek(BasicNewsRecipe):
 
         matches = re.search(r'<article>(.*)</article>', source, re.DOTALL)
         if matches is None:
-            print("no article tag found, returning...")
+            print('no article tag found, returning...')
             return
 
         main_section = BeautifulSoup(matches.group(0))
diff --git a/recipes/newtab.recipe b/recipes/newtab.recipe
index 7dc3d84064..9e7a70d335 100644
--- a/recipes/newtab.recipe
+++ b/recipes/newtab.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class NewTab(BasicNewsRecipe):
     title = '\u041D\u043E\u0432\u0430\u044F \u0432\u043A\u043B\u0430\u0434\u043A\u0430'
     __author__ = 'bugmen00t'
-    description = '\u041F\u043B\u043E\u0449\u0430\u0434\u043A\u0430 \u0434\u043B\u044F \u043F\u0443\u0431\u043B\u0438\u043A\u0430\u0446\u0438\u0438 \u0440\u0435\u043F\u043E\u0440\u0442\u0430\u0436\u0435\u0439 \u0438 \u0437\u0430\u043C\u0435\u0442\u043E\u043A \u043E \u0442\u043E\u043C, \u043A\u0430\u043A \u043C\u0435\u043D\u044F\u044E\u0442\u0441\u044F \u0440\u0435\u0433\u0438\u043E\u043D\u044B \u0420\u043E\u0441\u0441\u0438\u0438 \u043F\u043E\u0441\u043B\u0435 24 \u0444\u0435\u0432\u0440\u0430\u043B\u044F 2022 \u0433\u043E\u0434\u0430.'  # noqa
+    description = '\u041F\u043B\u043E\u0449\u0430\u0434\u043A\u0430 \u0434\u043B\u044F \u043F\u0443\u0431\u043B\u0438\u043A\u0430\u0446\u0438\u0438 \u0440\u0435\u043F\u043E\u0440\u0442\u0430\u0436\u0435\u0439 \u0438 \u0437\u0430\u043C\u0435\u0442\u043E\u043A \u043E \u0442\u043E\u043C, \u043A\u0430\u043A \u043C\u0435\u043D\u044F\u044E\u0442\u0441\u044F \u0440\u0435\u0433\u0438\u043E\u043D\u044B \u0420\u043E\u0441\u0441\u0438\u0438 \u043F\u043E\u0441\u043B\u0435 24 \u0444\u0435\u0432\u0440\u0430\u043B\u044F 2022 \u0433\u043E\u0434\u0430.'  # noqa: E501
     publisher = '\u041C\u0438\u0445\u0430\u0438\u043B \u0414\u0430\u043D\u0438\u043B\u043E\u0432\u0438\u0447'
     category = 'blog'
     cover_url = u'https://static.tildacdn.com/tild3765-3961-4337-b366-323437626331/thenewtab-sn.jpg'
diff --git a/recipes/newtimes.recipe b/recipes/newtimes.recipe
index aeb7f082fa..90c3a70bf9 100644
--- a/recipes/newtimes.recipe
+++ b/recipes/newtimes.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class NewTimes(BasicNewsRecipe):
     title = 'The New Times'
     __author__ = 'bugmen00t'
-    description = ' \u0415\u0436\u0435\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u044B\u0439 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E-\u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0436\u0443\u0440\u043D\u0430\u043B'  # noqa
+    description = ' \u0415\u0436\u0435\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u044B\u0439 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E-\u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0436\u0443\u0440\u043D\u0430\u043B'  # noqa: E501
     publisher = 'The New Times'
     category = 'newspaper'
     cover_url = u'https://newtimes.ru/img/ogimage.png'
diff --git a/recipes/nezavisne_novine.recipe b/recipes/nezavisne_novine.recipe
index 9ab93d928d..11b8da10af 100644
--- a/recipes/nezavisne_novine.recipe
+++ b/recipes/nezavisne_novine.recipe
@@ -24,10 +24,10 @@ class NezavisneNovine(BasicNewsRecipe):
     cover_url = strftime(
         'http://pdf.nezavisne.com/slika/novina/nezavisne_novine.jpg?v=%Y%m%d')
     masthead_url = 'http://www.nezavisne.com/slika/osnova/nezavisne-novine-logo.gif'
-    extra_css             = """
+    extra_css             = '''
                                body{font-family: Arial,Helvetica,sans-serif }
                                img{margin-bottom: 0.4em; display:block}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/nhk_news.recipe b/recipes/nhk_news.recipe
index b9dcc0ebd3..6582cbc28f 100644
--- a/recipes/nhk_news.recipe
+++ b/recipes/nhk_news.recipe
@@ -36,4 +36,3 @@ class ReutersJa(BasicNewsRecipe):
         for img in soup.findAll('img', attrs={'data-src':True}):
             img['src'] = img['data-src']
         return soup
-
diff --git a/recipes/nikkei_news.recipe b/recipes/nikkei_news.recipe
index e5f7fd204d..7c4f02cfb6 100644
--- a/recipes/nikkei_news.recipe
+++ b/recipes/nikkei_news.recipe
@@ -14,7 +14,7 @@ from calibre.web.feeds.recipes import BasicNewsRecipe
 class NikkeiNet_paper_subscription(BasicNewsRecipe):
     title = u'\u65E5\u672C\u7D4C\u6E08\u65B0\u805E\uFF08\u671D\u520A\u30FB\u5915\u520A\uFF09'
     __author__ = 'Ado Nishimura'
-    description = u'\u65E5\u7D4C\u96FB\u5B50\u7248\u306B\u3088\u308B\u65E5\u672C\u7D4C\u6E08\u65B0\u805E\u3002\u671D\u520A\u30FB\u5915\u520A\u306F\u53D6\u5F97\u6642\u9593\u306B\u3088\u308A\u5207\u308A\u66FF\u308F\u308A\u307E\u3059\u3002\u8981\u8CFC\u8AAD'  # noqa
+    description = u'\u65E5\u7D4C\u96FB\u5B50\u7248\u306B\u3088\u308B\u65E5\u672C\u7D4C\u6E08\u65B0\u805E\u3002\u671D\u520A\u30FB\u5915\u520A\u306F\u53D6\u5F97\u6642\u9593\u306B\u3088\u308A\u5207\u308A\u66FF\u308F\u308A\u307E\u3059\u3002\u8981\u8CFC\u8AAD'  # noqa: E501
     needs_subscription = True
     oldest_article = 1
     max_articles_per_feed = 30
@@ -26,67 +26,67 @@ class NikkeiNet_paper_subscription(BasicNewsRecipe):
     masthead_url = 'http://cdn.nikkei.co.jp/parts/ds/images/common/st_nikkei_r1_20101003_1.gif'
     cover_margins = (10, 188, '#ffffff')
 
-    remove_tags_before = {'class': "cmn-indent"}
+    remove_tags_before = {'class': 'cmn-indent'}
     remove_tags = [
         #                       {'class':"cmn-article_move"},
         #                       {'class':"cmn-pr_list"},
         #                       {'class':"cmnc-zoom"},
-        {'class': "cmn-hide"},
+        {'class': 'cmn-hide'},
         {'name': 'form'},
         {'class': 'cmn-print_headline cmn-clearfix'},
         {'id': 'ABOUT_NIKKEI'},
     ]
-    remove_tags_after = {'class': "cmn-indent"}
+    remove_tags_after = {'class': 'cmn-indent'}
 
     def get_browser(self):
         br = BasicNewsRecipe.get_browser(self)
 
         if self.username is not None and self.password is not None:
-            print("-------------------------open top page-------------------------------------")
+            print('-------------------------open top page-------------------------------------')
             br.open('http://www.nikkei.com/')
-            print("-------------------------open first login form-----------------------------")
+            print('-------------------------open first login form-----------------------------')
             try:
                 url = list(br.links(
-                    url_regex="www.nikkei.com/etc/accounts/login"))[0].url
+                    url_regex='www.nikkei.com/etc/accounts/login'))[0].url
             except IndexError:
-                print("Found IndexError")
+                print('Found IndexError')
                 url = 'http://www.nikkei.com/etc/accounts/login?dps=3&pageflag=top&url=http%3A%2F%2Fwww.nikkei.com%2F'
             except StopIteration:
                 url = 'http://www.nikkei.com/etc/accounts/login?dps=3&pageflag=top&url=http%3A%2F%2Fwww.nikkei.com%2F'
             br.open(url)
-            print("-------------------------JS redirect(send autoPostForm)--------------------")
+            print('-------------------------JS redirect(send autoPostForm)--------------------')
             br.select_form(name='autoPostForm')
             br.submit()
             # response = br.response()
-            print("-------------------------got login form------------------------------------")
+            print('-------------------------got login form------------------------------------')
             br.select_form(name='LA7010Form01')
             br['LA7010Form01:LA7010Email'] = self.username
             br['LA7010Form01:LA7010Password'] = self.password
             br.submit(id='LA7010Form01:submitBtn')
-            print("-------------------------JS redirect---------------------------------------")
+            print('-------------------------JS redirect---------------------------------------')
             br.select_form(nr=0)
             br.submit()
 
         return br
 
     def cleanup(self):
-        print("-------------------------logout--------------------------------------------")
+        print('-------------------------logout--------------------------------------------')
         self.browser.open('https://regist.nikkei.com/ds/etc/accounts/logout')
 
     def parse_index(self):
-        print("-------------------------get index of paper--------------------------------")
+        print('-------------------------get index of paper--------------------------------')
         result = []
         soup = self.index_to_soup('http://www.nikkei.com/paper/')
-        sections = soup.findAll(attrs={'class': re.compile(".*cmn-article_title.*")})
+        sections = soup.findAll(attrs={'class': re.compile(r'.*cmn-article_title.*')})
 
         for sect in sections:
-            sect_title = sect.find(attrs={'class' : re.compile(".*cmnc-((large)|(middle)|(small)).*")})
+            sect_title = sect.find(attrs={'class': re.compile(r'.*cmnc-((large)|(middle)|(small)).*')})
             if sect_title is None:
                 continue
             sect_title = sect_title.contents[0]
             sect_result = []
             url = sect.a['href']
-            url = re.sub("/article/", "/print-article/", url)
+            url = url.replace('/article/', '/print-article/')
             url = 'http://www.nikkei.com' + url
             sect_result.append(dict(title=sect_title, url=url, date='',description='', content=''))
             result.append([sect_title, sect_result])
@@ -95,11 +95,11 @@ class NikkeiNet_paper_subscription(BasicNewsRecipe):
     def populate_article_metadata(self, article, soup, first):
         try:
             elms = soup.findAll(
-                'div', {"class": "cmn-article_text JSID_key_fonttxt"})
+                'div', {'class': 'cmn-article_text JSID_key_fonttxt'})
             elm_text = u'◆'.join(
                 [self.tag_to_string(elm).strip() for elm in elms])
             elm_text = unicodedata.normalize('NFKC', elm_text)
             article.summary = article.text_summary = elm_text
         except:
-            self.log("Error: Failed to get article summary.")
+            self.log('Error: Failed to get article summary.')
             return
diff --git a/recipes/nikkeiasia.recipe b/recipes/nikkeiasia.recipe
index c9c55c88b4..5a725bb808 100644
--- a/recipes/nikkeiasia.recipe
+++ b/recipes/nikkeiasia.recipe
@@ -29,12 +29,12 @@ class Nikkei(BasicNewsRecipe):
     encoding = 'utf-8'
     use_embedded_content = False
 
-    extra_css = """
+    extra_css = '''
         .subhead { font-style:italic; color:#202020; }
         em, blockquote { color:#202020; }
         .sec, .byline { font-size:small; font-weight:bold; }
         .article__image, .article__caption { font-size:small; text-align:center; }
-    """
+    '''
 
     recipe_specific_options = {
         'date': {'short': 'The edition date (YYYY-MM-DD format)', 'long': '2024-09-19'}
diff --git a/recipes/njuz_net.recipe b/recipes/njuz_net.recipe
index 7db58348d5..4977ea42a4 100644
--- a/recipes/njuz_net.recipe
+++ b/recipes/njuz_net.recipe
@@ -23,18 +23,18 @@ class NjuzNet(BasicNewsRecipe):
     language = 'sr'
     publication_type = 'newsportal'
     masthead_url = 'http://www.njuz.net/njuznet.jpg'
-    extra_css             = """
+    extra_css             = '''
                                @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)}
                                 body{font-family: serif1, serif}
                                .articledescription{font-family: serif1, serif}
                                .wp-caption-text{font-size: x-small}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
     }
 
-    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]  # noqa: RUF039
 
     keep_only_tags = [
         dict(attrs={'id': 'entryMeta'}), dict(attrs={'class': 'post'})
diff --git a/recipes/nme.recipe b/recipes/nme.recipe
index 80e8481251..ada5fb066e 100644
--- a/recipes/nme.recipe
+++ b/recipes/nme.recipe
@@ -27,7 +27,6 @@ class AdvancedUserRecipe1306061239(BasicNewsRecipe):
     simultaneous_downloads = 20
     use_embedded_content = False
     recursions = 0
-    auto_cleanup = True
 
     feeds = [
         (u'NME News', u'http://www.nme.com/news/feed'),
diff --git a/recipes/nordjyske_dk.recipe b/recipes/nordjyske_dk.recipe
index 76a71e9454..8d9132941e 100644
--- a/recipes/nordjyske_dk.recipe
+++ b/recipes/nordjyske_dk.recipe
@@ -38,4 +38,3 @@ class Nordjyske_dk(BasicNewsRecipe):
         ('Aalborg', 'http://nordjyske.dk/rss/aalborg'),
 
     ]
-
diff --git a/recipes/novaya_gazeta_europe.recipe b/recipes/novaya_gazeta_europe.recipe
index 9e7b4df57c..8a32e21b2e 100644
--- a/recipes/novaya_gazeta_europe.recipe
+++ b/recipes/novaya_gazeta_europe.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class NovayaGazetaEurope(BasicNewsRecipe):
     title = u'\u041D\u043E\u0432\u0430\u044F \u0413\u0430\u0437\u0435\u0442\u0430. \u0415\u0432\u0440\u043E\u043F\u0430'
     __author__ = 'bugmen00t'
-    description = u'\u0413\u043E\u0432\u043E\u0440\u0438\u043C \u043A\u0430\u043A \u0435\u0441\u0442\u044C. \u041F\u0438\u0448\u0435\u043C \u043E \u043F\u0440\u043E\u0438\u0441\u0445\u043E\u0434\u044F\u0449\u0435\u043C \u0432 \u0420\u043E\u0441\u0441\u0438\u0438, \u0423\u043A\u0440\u0430\u0438\u043D\u0435 \u0438 \u0415\u0432\u0440\u043E\u043F\u0435. \u041D\u043E\u0432\u043E\u0441\u0442\u0438, \u0430\u043D\u0430\u043B\u0438\u0442\u0438\u043A\u0430, \u043C\u043D\u0435\u043D\u0438\u044F \u044D\u043A\u0441\u043F\u0435\u0440\u0442\u043E\u0432, \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0435 \u0440\u0435\u043F\u043E\u0440\u0442\u0430\u0436\u0438 \u0438 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0441\u043A\u0438\u0435 \u0440\u0430\u0441\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u043D\u0438\u044F.'  # noqa
+    description = u'\u0413\u043E\u0432\u043E\u0440\u0438\u043C \u043A\u0430\u043A \u0435\u0441\u0442\u044C. \u041F\u0438\u0448\u0435\u043C \u043E \u043F\u0440\u043E\u0438\u0441\u0445\u043E\u0434\u044F\u0449\u0435\u043C \u0432 \u0420\u043E\u0441\u0441\u0438\u0438, \u0423\u043A\u0440\u0430\u0438\u043D\u0435 \u0438 \u0415\u0432\u0440\u043E\u043F\u0435. \u041D\u043E\u0432\u043E\u0441\u0442\u0438, \u0430\u043D\u0430\u043B\u0438\u0442\u0438\u043A\u0430, \u043C\u043D\u0435\u043D\u0438\u044F \u044D\u043A\u0441\u043F\u0435\u0440\u0442\u043E\u0432, \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0435 \u0440\u0435\u043F\u043E\u0440\u0442\u0430\u0436\u0438 \u0438 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0441\u043A\u0438\u0435 \u0440\u0430\u0441\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u043D\u0438\u044F.'  # noqa: E501
     publisher = '\u041A\u0438\u0440\u0438\u043B\u043B \u041C\u0430\u0440\u0442\u044B\u043D\u043E\u0432'
     publication_type = 'newspaper'
     category = 'news'
diff --git a/recipes/novilist_novine_hr.recipe b/recipes/novilist_novine_hr.recipe
index 6939447607..61e6f78e71 100644
--- a/recipes/novilist_novine_hr.recipe
+++ b/recipes/novilist_novine_hr.recipe
@@ -27,16 +27,16 @@ class NoviList_hr(BasicNewsRecipe):
     needs_subscription = True
     masthead_url = 'http://novine.novilist.hr/images/system/novilist-logo.jpg'
     index = 'http://novine.novilist.hr/'
-    extra_css             = """
+    extra_css             = '''
                                @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)}
                                body{font-family: Geneva,Arial,Helvetica,Swiss,sans1,sans-serif }
                                img{display:block; margin-bottom: 0.4em; margin-top: 0.4em}
                                .nadnaslov,.podnaslov{font-size: small; display: block; margin-bottom: 1em}
                                .naslov{font-size: x-large; color: maroon; font-weight: bold; display: block; margin-bottom: 1em;}
                                p{display: block}
-                            """
+                            '''
 
-    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]  # noqa: RUF039
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language, 'linearize_tables': True
diff --git a/recipes/novinite_bg.recipe b/recipes/novinite_bg.recipe
index 0bf794da60..b3db41c18e 100644
--- a/recipes/novinite_bg.recipe
+++ b/recipes/novinite_bg.recipe
@@ -13,8 +13,10 @@ class AdvancedUserRecipe1329123365(BasicNewsRecipe):
     no_stylesheets = True
     remove_javascript = True
     keep_only_tags = [dict(name='div', attrs={'id': 'content'})]
-    remove_tags = [dict(name='div', attrs={'id': 'text_options'})]
-    remove_tags = [dict(name='div', attrs={'id': 'social_shares_top'})]
+    remove_tags = [
+        dict(name='div', attrs={'id': 'text_options'}),
+        dict(name='div', attrs={'id': 'social_shares_top'}),
+    ]
     remove_tags_after = dict(id='textsize')
     feeds = [(u'Business', u'http://novinite.bg/rss.php?category_id=1'),
              (u'Politics', u'http://novinite.bg/rss.php?category_id=2'),
diff --git a/recipes/novinky.cz.recipe b/recipes/novinky.cz.recipe
index c30dc259d7..e131e798e8 100644
--- a/recipes/novinky.cz.recipe
+++ b/recipes/novinky.cz.recipe
@@ -24,12 +24,12 @@ class novinkyRecipe(BasicNewsRecipe):
     remove_javascript = True
     no_stylesheets = True
 
-    remove_tags = [dict(name='div',   attrs={'id': ['pictureInnerBox']}),
-                   dict(name='div',   attrs={'id': ['discussionEntry']}),
-                   dict(name='span',   attrs={
+    remove_tags = [dict(name='div', attrs={'id': ['pictureInnerBox']}),
+                   dict(name='div', attrs={'id': ['discussionEntry']}),
+                   dict(name='span', attrs={
                         'id': ['mynews-hits', 'mynews-author']}),
-                   dict(name='div',   attrs={'class': ['related']}),
-                   dict(name='div',   attrs={'id': ['multimediaInfo']})]
+                   dict(name='div', attrs={'class': ['related']}),
+                   dict(name='div', attrs={'id': ['multimediaInfo']})]
     remove_tags_before = dict(name='div', attrs={'class': ['articleHeader']})
     remove_tags_after = dict(name='div', attrs={'class': 'related'})
 
diff --git a/recipes/novosti.recipe b/recipes/novosti.recipe
index 7a4d19f4d2..442b2b4c5c 100644
--- a/recipes/novosti.recipe
+++ b/recipes/novosti.recipe
@@ -13,7 +13,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Novosti(BasicNewsRecipe):
     title = 'Vecernje Novosti'
     __author__ = 'Darko Miletic'
-    description = 'U početku su bile istinske večernje novine - pokrenute u vreme Tršćanske krize, Italijansko-jugoslovenskog konflikta oko grada Trsta - ali su brzo izrasle u dnevni informativno-politički list, koji već godinama ima najveći tiraž u Srbiji.'  # noqa
+    description = 'U početku su bile istinske večernje novine - pokrenute u vreme Tršćanske krize, Italijansko-jugoslovenskog konflikta oko grada Trsta - ali su brzo izrasle u dnevni informativno-politički list, koji već godinama ima najveći tiraž u Srbiji.'  # noqa: E501
     publisher = 'Kompanija Novosti'
     category = 'news, politics, Serbia'
     oldest_article = 2
@@ -24,18 +24,18 @@ class Novosti(BasicNewsRecipe):
     language = 'sr'
     publication_type = 'newspaper'
     masthead_url = 'http://www.novosti.rs/images/basic/logo-print.png'
-    extra_css             = """ @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)}
+    extra_css             = ''' @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)}
                                 .article_description,body{font-family: Arial,Helvetica,sans1,sans-serif}
                                 .author{font-size: small}
                                 .articleLead{font-size: large; font-weight: bold}
                                 img{display: block; margin-bottom: 1em; margin-top: 1em}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language, 'pretty_print': True
     }
 
-    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]  # noqa: RUF039
 
     keep_only_tags = [dict(attrs={'class': [
                            'articleTitle', 'articleInfo', 'articleLead', 'singlePhoto fl', 'articleBody']})]
diff --git a/recipes/nrc.nl.recipe b/recipes/nrc.nl.recipe
index a03fb6269e..4f5b29fffc 100644
--- a/recipes/nrc.nl.recipe
+++ b/recipes/nrc.nl.recipe
@@ -39,7 +39,7 @@ class NRC(BasicNewsRecipe):
         ),
         dict(name=['script', 'noscript', 'style']),
     ]
-    remove_attributes = ["class", "id", "name", "style"]
+    remove_attributes = ['class', 'id', 'name', 'style']
     encoding = 'utf-8'
     no_stylesheets = True
     ignore_duplicate_articles = {'url'}
@@ -52,8 +52,8 @@ class NRC(BasicNewsRecipe):
     title_regexp = None
 
     @staticmethod
-    def _monthly_list_url(date, fmt="%Y/%m/"):
-        return "https://www.nrc.nl/de/data/NH/" + date.strftime(fmt)
+    def _monthly_list_url(date, fmt='%Y/%m/'):
+        return 'https://www.nrc.nl/de/data/NH/' + date.strftime(fmt)
 
     def _clean_article_title(self, title):
         if not title:
@@ -62,7 +62,7 @@ class NRC(BasicNewsRecipe):
             self.title_regexp = re.compile(
                 r'<span class="keyword">([^<]+)</span>\s*'
             )
-        return self.title_regexp.sub(r"\1 ", title)
+        return self.title_regexp.sub(r'\1 ', title)
 
     def parse_index(self):
         sections = []
@@ -88,43 +88,43 @@ class NRC(BasicNewsRecipe):
                 issues = json.loads(r.read())
                 if len(issues) > 0:
                     issue_date = datetime.datetime.strptime(
-                        issues[0]["published_at"], "%Y-%m-%dT%H:%M:%SZ"
+                        issues[0]['published_at'], '%Y-%m-%dT%H:%M:%SZ'
                     )
-                    issue_url = self._monthly_list_url(issue_date, "%Y/%m/%d/")
-                    self.frontpage = issues[0]["frontpage"]
+                    issue_url = self._monthly_list_url(issue_date, '%Y/%m/%d/')
+                    self.frontpage = issues[0]['frontpage']
                     break
         if issue_url is None:
             return []
         with closing(self.browser.open(Request(issue_url, None, headers))) as r:
             edition = json.loads(r.read())
         documents = {}
-        for headline in edition["paperheadlines"]:
-            item = headline["item"]
-            documents[headline["document_id"]] = dict(
-                url=item["full_url"],
-                headline=self._clean_article_title(item["headline"])
+        for headline in edition['paperheadlines']:
+            item = headline['item']
+            documents[headline['document_id']] = dict(
+                url=item['full_url'],
+                headline=self._clean_article_title(item['headline'])
             )
-        for section in edition["sections"]:
+        for section in edition['sections']:
             articles = []
-            for doc in section["document_ids"]:
+            for doc in section['document_ids']:
                 if doc not in documents:
                     self.log.warn('Document not found:', doc)
                     continue
                 articles.append(
                     dict(
-                        title=documents[doc]["headline"], url=documents[doc]["url"]
+                        title=documents[doc]['headline'], url=documents[doc]['url']
                     )
                 )
-            sections.append((section["name"], articles))
+            sections.append((section['name'], articles))
         return sections
 
     def preprocess_html(self, soup):
         for tag in soup():
             if tag.name == 'img':
                 if tag.has_attr('data-src-medium'):
-                    tag['src'] = tag['data-src-medium'].split("|")[0]
+                    tag['src'] = tag['data-src-medium'].split('|')[0]
                 elif tag.has_attr('data-src'):
-                    tag['src'] = tag['data-src'].split("|")[0]
+                    tag['src'] = tag['data-src'].split('|')[0]
                 if tag['src'].startswith('//'):
                     tag['src'] = 'https:' + tag['src']
                 elif tag['src'].startswith('/'):
diff --git a/recipes/nrc_next.recipe b/recipes/nrc_next.recipe
index 42886190d2..237feaac3c 100644
--- a/recipes/nrc_next.recipe
+++ b/recipes/nrc_next.recipe
@@ -45,8 +45,7 @@ class NRCNext(BasicNewsRecipe):
             raise ValueError('Failed to login, check username and password')
         epubraw = None
         for today in (date.today(), date.today() - timedelta(days=1),):
-            url = 'http://digitaleeditie.nrc.nl/digitaleeditie/helekrant/epub/nn_%s.epub' \
-                  % today.strftime('%Y%m%d')
+            url = 'http://digitaleeditie.nrc.nl/digitaleeditie/helekrant/epub/nn_%s.epub' % today.strftime('%Y%m%d')
             self.log('Trying to download epub from:', url)
             try:
                 response3 = br.open(url, timeout=60)
@@ -62,7 +61,7 @@ class NRCNext(BasicNewsRecipe):
         zfile = zipfile.ZipFile(BytesIO(epubraw), 'r')
         zfile.extractall(self.output_dir)
         namelist = zfile.namelist()
-        emre = re.compile("&lt;em(?:.*)&gt;(.*)&lt;/em&gt;")
+        emre = re.compile(r'&lt;em(?:.*)&gt;(.*)&lt;/em&gt;')
         subst = '\\1'
         for name in namelist:
             _, ext = os.path.splitext(name)
diff --git a/recipes/nspm.recipe b/recipes/nspm.recipe
index 2b89b3a604..a05107c411 100644
--- a/recipes/nspm.recipe
+++ b/recipes/nspm.recipe
@@ -33,19 +33,19 @@ class Nspm(BasicNewsRecipe):
     remove_empty_feeds = True
     publication_type = 'magazine'
     masthead_url = 'http://www.nspm.rs/templates/jsn_epic_pro/images/logol.jpg'
-    extra_css             = """ @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)}
+    extra_css             = ''' @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)}
                                 @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)}
                                 body{font-family: "Times New Roman", serif1, serif}
                                 .article_description{font-family: Arial, sans1, sans-serif}
                                 img{margin-top:0.5em; margin-bottom: 0.7em; display: block}
                                 .author{color: #990000; font-weight: bold}
-                                .author,.createdate{font-size: 0.9em} """
+                                .author,.createdate{font-size: 0.9em} '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language, 'pretty_print': True
     }
 
-    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]  # noqa: RUF039
     remove_tags = [dict(name=['link', 'script', 'meta', 'base', 'img'])]
     remove_attributes = ['width', 'height', 'lang', 'xmlns:fb',
                          'xmlns:og', 'vspace', 'hspace', 'type', 'start', 'size']
diff --git a/recipes/nspm_int.recipe b/recipes/nspm_int.recipe
index a562a05628..9309c88bfb 100644
--- a/recipes/nspm_int.recipe
+++ b/recipes/nspm_int.recipe
@@ -22,12 +22,12 @@ class Nspm_int(BasicNewsRecipe):
     delay = 2
     publication_type = 'magazine'
     masthead_url = 'http://www.nspm.rs/templates/jsn_epic_pro/images/logol.jpg'
-    extra_css             = """
+    extra_css             = '''
                                 body{font-family: "Times New Roman", serif}
                                 .article_description{font-family: Arial, sans-serif}
                                 img{margin-top:0.5em; margin-bottom: 0.7em}
                                 .author{color: #990000; font-weight: bold}
-                                .author,.createdate{font-size: 0.9em} """
+                                .author,.createdate{font-size: 0.9em} '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language, 'linearize_tables': True
diff --git a/recipes/nu.recipe b/recipes/nu.recipe
index 80dd9a19f0..a40d392304 100644
--- a/recipes/nu.recipe
+++ b/recipes/nu.recipe
@@ -49,4 +49,4 @@ class Nu(BasicNewsRecipe):
              (u'Podcast Algemeen nieuws', u'http://www.nu.nl/podcast.php')]
 
     def get_article_url(self, article):
-        return article.get('guid',  None)
+        return article.get('guid', None)
diff --git a/recipes/nv_ru.recipe b/recipes/nv_ru.recipe
index c651b1ec09..bc069cc032 100644
--- a/recipes/nv_ru.recipe
+++ b/recipes/nv_ru.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class NV(BasicNewsRecipe):
     title = '\u041D\u0412 (\u00AB\u041D\u043E\u0432\u043E\u0435 \u0432\u0440\u0435\u043C\u044F\u00BB)'
     __author__ = 'bugmen00t'
-    description = '\u0415\u0436\u0435\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u044B\u0439 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E-\u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0438 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E-\u043D\u043E\u0432\u043E\u0441\u0442\u043D\u043E\u0439 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0440\u0435\u0441\u0443\u0440\u0441.'  # noqa
-    publisher = '\u041E\u041E\u041E \u00AB\u0418\u0437\u0434\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0439 \u0434\u043E\u043C \u00AB\u041C\u0435\u0434\u0438\u0430-\u0414\u041A\u00BB'  # noqa
+    description = '\u0415\u0436\u0435\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u044B\u0439 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E-\u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0438 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E-\u043D\u043E\u0432\u043E\u0441\u0442\u043D\u043E\u0439 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0440\u0435\u0441\u0443\u0440\u0441.'  # noqa: E501
+    publisher = '\u041E\u041E\u041E \u00AB\u0418\u0437\u0434\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0439 \u0434\u043E\u043C \u00AB\u041C\u0435\u0434\u0438\u0430-\u0414\u041A\u00BB'  # noqa: E501
     category = 'magazine'
     cover_url = u'https://yes-ukraine.org/imglib/_newimage/Yalta-annual-meeting/11th-yalta-annual-meeting/partners/media-partneri/nv_logo.png'
     language = 'ru_UK'
diff --git a/recipes/nv_ua.recipe b/recipes/nv_ua.recipe
index cb7ced20a6..205bf63336 100644
--- a/recipes/nv_ua.recipe
+++ b/recipes/nv_ua.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class NV(BasicNewsRecipe):
     title = '\u041D\u0412 (\u00AB\u041D\u043E\u0432\u0438\u0439 \u0427\u0430\u0441\u00BB)'
     __author__ = 'bugmen00t'
-    description = '\u0429\u043E\u0442\u0438\u0436\u043D\u0435\u0432\u0438\u0439 \u0441\u0443\u0441\u043F\u0456\u043B\u044C\u043D\u043E-\u043F\u043E\u043B\u0456\u0442\u0438\u0447\u043D\u0438\u0439 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u043E-\u043D\u043E\u0432\u0438\u043D\u043D\u0438\u0439 \u0441\u0430\u0439\u0442.'  # noqa
-    publisher = '\u0422\u041E\u0412 \u00AB\u0412\u0438\u0434\u0430\u0432\u043D\u0438\u0447\u0438\u0439 \u0434\u0456\u043C \u00AB\u041C\u0435\u0434\u0456\u0430-\u0414\u041A\u00BB'  # noqa
+    description = '\u0429\u043E\u0442\u0438\u0436\u043D\u0435\u0432\u0438\u0439 \u0441\u0443\u0441\u043F\u0456\u043B\u044C\u043D\u043E-\u043F\u043E\u043B\u0456\u0442\u0438\u0447\u043D\u0438\u0439 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u043E-\u043D\u043E\u0432\u0438\u043D\u043D\u0438\u0439 \u0441\u0430\u0439\u0442.'  # noqa: E501
+    publisher = '\u0422\u041E\u0412 \u00AB\u0412\u0438\u0434\u0430\u0432\u043D\u0438\u0447\u0438\u0439 \u0434\u0456\u043C \u00AB\u041C\u0435\u0434\u0456\u0430-\u0414\u041A\u00BB'  # noqa: E501
     category = 'magazine'
     cover_url = u'https://static.nv.ua/shared/system/Article/posters/002/467/576/600x300/272ab80cd01e4022dcb4c691c9073e97.jpg'
     language = 'uk'
diff --git a/recipes/nyt_magazine.recipe b/recipes/nyt_magazine.recipe
index 52c4a38b0d..e548976fcc 100644
--- a/recipes/nyt_magazine.recipe
+++ b/recipes/nyt_magazine.recipe
@@ -66,7 +66,7 @@ class NytMag(BasicNewsRecipe):
             if c.lower() == 'yes':
                 self.compress_news_images = True
 
-    extra_css = """
+    extra_css = '''
         .byl, .time { font-size:small; color:#202020; }
         .cap { font-size:small; text-align:center; }
         .cred { font-style:italic; font-size:small; }
@@ -74,7 +74,7 @@ class NytMag(BasicNewsRecipe):
         .sc { font-variant: small-caps; }
         .lbl { font-size:small; color:#404040; }
         img { display:block; margin:0 auto; }
-    """
+    '''
 
     @property
     def nyt_parser(self):
diff --git a/recipes/nyt_tmag.recipe b/recipes/nyt_tmag.recipe
index b4b0a25a18..718a37adcb 100644
--- a/recipes/nyt_tmag.recipe
+++ b/recipes/nyt_tmag.recipe
@@ -66,7 +66,7 @@ class NytMag(BasicNewsRecipe):
             if c.lower() == 'yes':
                 self.compress_news_images = True
 
-    extra_css = """
+    extra_css = '''
         .byl, .time { font-size:small; color:#202020; }
         .cap { font-size:small; text-align:center; }
         .cred { font-style:italic; font-size:small; }
@@ -74,7 +74,7 @@ class NytMag(BasicNewsRecipe):
         .sc { font-variant: small-caps; }
         .lbl { font-size:small; color:#404040; }
         img { display:block; margin:0 auto; }
-    """
+    '''
 
     @property
     def nyt_parser(self):
diff --git a/recipes/nytfeeds.recipe b/recipes/nytfeeds.recipe
index bf05758c1e..136e707ec1 100644
--- a/recipes/nytfeeds.recipe
+++ b/recipes/nytfeeds.recipe
@@ -92,7 +92,7 @@ class NytFeeds(BasicNewsRecipe):
             if c.lower() == 'yes':
                 self.compress_news_images = True
 
-    extra_css = """
+    extra_css = '''
         .byl, .time { font-size:small; color:#202020; }
         .cap { font-size:small; text-align:center; }
         .cred { font-style:italic; font-size:small; }
@@ -100,7 +100,7 @@ class NytFeeds(BasicNewsRecipe):
         .sc { font-variant: small-caps; }
         .lbl { font-size:small; color:#404040; }
         img { display:block; margin:0 auto; }
-    """
+    '''
 
     @property
     def nyt_parser(self):
diff --git a/recipes/nytimes.recipe b/recipes/nytimes.recipe
index 8e6013895b..7d81bb0d15 100644
--- a/recipes/nytimes.recipe
+++ b/recipes/nytimes.recipe
@@ -7,7 +7,6 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 import datetime
 import json
 import re
-from pprint import pprint  # noqa
 
 from calibre import strftime
 from calibre.ebooks.BeautifulSoup import Tag
@@ -88,7 +87,7 @@ class NewYorkTimes(BasicNewsRecipe):
     is_web_edition = True
     oldest_web_edition_article = 7  # days
 
-    extra_css = """
+    extra_css = '''
         .byl, .time { font-size:small; color:#202020; }
         .cap { font-size:small; text-align:center; }
         .cred { font-style:italic; font-size:small; }
@@ -96,7 +95,7 @@ class NewYorkTimes(BasicNewsRecipe):
         .sc { font-variant: small-caps; }
         .lbl { font-size:small; color:#404040; }
         img { display:block; margin:0 auto; }
-    """
+    '''
 
     @property
     def nyt_parser(self):
diff --git a/recipes/nytimes_sports.recipe b/recipes/nytimes_sports.recipe
index 8086ca729a..f07b5f285e 100644
--- a/recipes/nytimes_sports.recipe
+++ b/recipes/nytimes_sports.recipe
@@ -6,7 +6,7 @@ from __future__ import with_statement
 __license__ = 'GPL 3'
 __copyright__ = 'zotzo'
 __docformat__ = 'restructuredtext en'
-"""
+'''
 http://fifthdown.blogs.nytimes.com/
 http://offthedribble.blogs.nytimes.com/
 http://thequad.blogs.nytimes.com/
@@ -16,7 +16,7 @@ http://bats.blogs.nytimes.com/
 http://straightsets.blogs.nytimes.com/
 http://formulaone.blogs.nytimes.com/
 http://onpar.blogs.nytimes.com/
-"""
+'''
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
@@ -32,7 +32,6 @@ class NYTimesSports(BasicNewsRecipe):
     max_articles_per_feed = 25
     use_embedded_content = False
     no_stylesheets = True
-    language = 'en'
     delay = 1
 
     feeds = [
diff --git a/recipes/nytimes_sub.recipe b/recipes/nytimes_sub.recipe
index ba28033827..ef0dd2157d 100644
--- a/recipes/nytimes_sub.recipe
+++ b/recipes/nytimes_sub.recipe
@@ -7,7 +7,6 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 import datetime
 import json
 import re
-from pprint import pprint  # noqa
 
 from calibre import strftime
 from calibre.ebooks.BeautifulSoup import Tag
@@ -88,7 +87,7 @@ class NewYorkTimes(BasicNewsRecipe):
     is_web_edition = False
     oldest_web_edition_article = 7  # days
 
-    extra_css = """
+    extra_css = '''
         .byl, .time { font-size:small; color:#202020; }
         .cap { font-size:small; text-align:center; }
         .cred { font-style:italic; font-size:small; }
@@ -96,7 +95,7 @@ class NewYorkTimes(BasicNewsRecipe):
         .sc { font-variant: small-caps; }
         .lbl { font-size:small; color:#404040; }
         img { display:block; margin:0 auto; }
-    """
+    '''
 
     @property
     def nyt_parser(self):
diff --git a/recipes/nytimes_tech.recipe b/recipes/nytimes_tech.recipe
index a7d9009f06..5d76fcd862 100644
--- a/recipes/nytimes_tech.recipe
+++ b/recipes/nytimes_tech.recipe
@@ -60,7 +60,7 @@ class NytTech(BasicNewsRecipe):
             if c.lower() == 'yes':
                 self.compress_news_images = True
 
-    extra_css = """
+    extra_css = '''
         .byl, .time { font-size:small; color:#202020; }
         .cap { font-size:small; text-align:center; }
         .cred { font-style:italic; font-size:small; }
@@ -68,7 +68,7 @@ class NytTech(BasicNewsRecipe):
         .sc { font-variant: small-caps; }
         .lbl { font-size:small; color:#404040; }
         img { display:block; margin:0 auto; }
-    """
+    '''
 
     @property
     def nyt_parser(self):
diff --git a/recipes/nytimesbook.recipe b/recipes/nytimesbook.recipe
index fb9e3558c2..df8eddc39a 100644
--- a/recipes/nytimesbook.recipe
+++ b/recipes/nytimesbook.recipe
@@ -24,7 +24,7 @@ class NewYorkTimesBookReview(BasicNewsRecipe):
     ignore_duplicate_articles = {'title', 'url'}
     encoding = 'utf-8'
 
-    extra_css = """
+    extra_css = '''
         .byl, .time { font-size:small; color:#202020; }
         .cap { font-size:small; text-align:center; }
         .cred { font-style:italic; font-size:small; }
@@ -32,7 +32,7 @@ class NewYorkTimesBookReview(BasicNewsRecipe):
         .sc { font-variant: small-caps; }
         .lbl { font-size:small; color:#404040; }
         img { display:block; margin:0 auto; }
-    """
+    '''
 
     articles_are_obfuscated = use_wayback_machine
 
diff --git a/recipes/nzz_ger.recipe b/recipes/nzz_ger.recipe
index 3c7a1c15fd..9f6e4ea0c7 100644
--- a/recipes/nzz_ger.recipe
+++ b/recipes/nzz_ger.recipe
@@ -97,7 +97,6 @@ class Nzz(BasicNewsRecipe):
 
         return url
 
-
     def get_browser(self, *args, **kwargs):
         kwargs['user_agent'] = 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)'
         br = BasicNewsRecipe.get_browser(self, *args, **kwargs)
diff --git a/recipes/observatorul_cultural.recipe b/recipes/observatorul_cultural.recipe
index 4c91f8859e..07aa0d3635 100644
--- a/recipes/observatorul_cultural.recipe
+++ b/recipes/observatorul_cultural.recipe
@@ -31,8 +31,7 @@ class ObservatorulCultural(BasicNewsRecipe):
     def parse_index(self):
         soup = self.index_to_soup(
             'http://www.observatorcultural.ro/Arhiva*-archive.html')
-        issueTag = soup.find('a', href=re.compile(
-            "observatorcultural.ro\\/Numarul"))
+        issueTag = soup.find('a', href=re.compile(r'observatorcultural.ro/Numarul'))
         issueURL = issueTag['href']
         print(issueURL)
         issueSoup = self.index_to_soup(issueURL)
diff --git a/recipes/observer_gb.recipe b/recipes/observer_gb.recipe
index dc49dc2d23..7a844061de 100644
--- a/recipes/observer_gb.recipe
+++ b/recipes/observer_gb.recipe
@@ -27,18 +27,18 @@ class Guardian(BasicNewsRecipe):
 
     keep_only_tags = [
         dict(name='div', attrs={
-             'id': ["content", "article_header", "main-article-info", ]}),
+             'id': ['content', 'article_header', 'main-article-info', ]}),
     ]
     remove_tags = [
         dict(name='div', attrs={
-             'class': ["video-content", "videos-third-column"]}),
+             'class': ['video-content', 'videos-third-column']}),
         dict(name='div', attrs={
-             'id': ["article-toolbox", "subscribe-feeds", ]}),
+             'id': ['article-toolbox', 'subscribe-feeds', ]}),
         dict(name='div', attrs={
-             'class': ["promo-component bookshop-books-promo bookshop-books"]}),
-        dict(name='ul', attrs={'class': ["pagination"]}),
-        dict(name='ul', attrs={'id': ["content-actions"]}),
-        dict(name='li', attrs={'id': ["product-image"]}),
+             'class': ['promo-component bookshop-books-promo bookshop-books']}),
+        dict(name='ul', attrs={'class': ['pagination']}),
+        dict(name='ul', attrs={'id': ['content-actions']}),
+        dict(name='li', attrs={'id': ['product-image']}),
     ]
     use_embedded_content = False
 
diff --git a/recipes/oc_register.recipe b/recipes/oc_register.recipe
index 5e489b404d..d0799cf17b 100644
--- a/recipes/oc_register.recipe
+++ b/recipes/oc_register.recipe
@@ -36,18 +36,18 @@ class OrangeCountyRegister(BasicNewsRecipe):
 
     def parsePage(self, index):
         if self.debugMessages is True:
-            print("\n\nStarting " + self.feeds[index][0])
+            print('\n\nStarting ' + self.feeds[index][0])
         articleList = []
         soup = self.index_to_soup(self.feeds[index][1])
         # Have this index page now.
         # look for a.article-title
         # If any, the description is <div class="excerpt">
-        for newsentry in soup.findAll("a", {"class": "article-title"}):
+        for newsentry in soup.findAll('a', {'class': 'article-title'}):
             print('Next up:')
             print(newsentry)
-            title = newsentry["title"]
+            title = newsentry['title']
             url = newsentry['href']
-            print("Title: ")
+            print('Title: ')
             print(title)
             print('URL')
             print(url)
@@ -66,19 +66,19 @@ class OrangeCountyRegister(BasicNewsRecipe):
     def extract_readable_article(self, html, url):
         cleanedHTML = super(OrangeCountyRegister,
                             self).extract_readable_article(html, url)
-        print("Processing html for author")
+        print('Processing html for author')
         # Find the attribs...
         attribDict = self.htmlToAttribsDict(html)
-        print("dict is type...")
+        print('dict is type...')
         print(type(attribDict))
         author = attribDict.get('Byline')
         if author is not None:
             # add author code after <body>
-            print("Adding author in meta")
+            print('Adding author in meta')
             print(author)
             cleanedHTML = cleanedHTML.replace(
-                "<body>",
-                "<body>\n<div class=\"metaAuthor\" value=\"" + author + "\"></div>\n"
+                '<body>',
+                '<body>\n<div class="metaAuthor" value="' + author + '"></div>\n'
             )
         else:
             print('no author found')
@@ -92,7 +92,7 @@ class OrangeCountyRegister(BasicNewsRecipe):
     def htmlToAttribsDict(self, rawHTML):
         tokenStart = 'dataLayer.push({'
         tokenEnd = '});'
-        print("1")
+        print('1')
         startJSON = rawHTML.find(tokenStart)
         if (startJSON < 0):
             return
@@ -101,13 +101,13 @@ class OrangeCountyRegister(BasicNewsRecipe):
         if (endJSON < 0):
             return
         JSON = JSONBeginning[:endJSON + 1]
-        JSONQuoted = JSON.replace("'", "\"")
+        JSONQuoted = JSON.replace("'", '"')
         try:
             metadata = json.loads(JSONQuoted)
             pprint(metadata)
             return metadata
         except ValueError:
-            print("Could not decode JSON:")
+            print('Could not decode JSON:')
             print(JSONQuoted)
         return None
 
@@ -126,7 +126,7 @@ class OrangeCountyRegister(BasicNewsRecipe):
         # articleList = []
         ans = []
         feedsCount = len(self.feeds)
-        for x in range(0, feedsCount - 1):  # should be ,4
+        for x in range(feedsCount - 1):  # should be ,4
             feedarticles = self.parsePage(x)
             if feedarticles is not None:
                 ans.append((self.feeds[x][0], feedarticles))
diff --git a/recipes/old_games.recipe b/recipes/old_games.recipe
index 063eb2a086..508eba0a85 100644
--- a/recipes/old_games.recipe
+++ b/recipes/old_games.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class OGRU(BasicNewsRecipe):
     title = u'Old-Games.RU'
     __author__ = 'bugmen00t'
-    description = u'Old-Games.RU \u2014 \u043A\u0440\u0443\u043F\u043D\u0435\u0439\u0448\u0438\u0439 \u0440\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u0438\u0439 \u0430\u0440\u0445\u0438\u0432 \u0441\u0442\u0430\u0440\u044B\u0445 \u043A\u043E\u043C\u043F\u044C\u044E\u0442\u0435\u0440\u043D\u044B\u0445 \u0438\u0433\u0440. \u041C\u044B \u043D\u0435 \u0441\u0442\u0430\u0432\u0438\u043C \u043F\u0435\u0440\u0435\u0434 \u0441\u043E\u0431\u043E\u0439 \u0446\u0435\u043B\u0438 \u0441\u043E\u0431\u0440\u0430\u0442\u044C \u0432\u0441\u0435 \u0438\u0433\u0440\u044B, \u0447\u0442\u043E \u0435\u0441\u0442\u044C \u0432 \u043C\u0438\u0440\u0435, \u043D\u043E \u043C\u044B \u0441\u0442\u0430\u0440\u0430\u0435\u043C\u0441\u044F, \u0447\u0442\u043E\u0431\u044B \u043D\u0430 \u0441\u0430\u0439\u0442\u0435 \u0431\u044B\u043B\u043E \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u043E \u0431\u043E\u043B\u044C\u0448\u0438\u043D\u0441\u0442\u0432\u043E \u0448\u0435\u0434\u0435\u0432\u0440\u043E\u0432, \u0440\u0435\u0434\u043A\u043E\u0441\u0442\u0435\u0439 \u0438 \u043F\u0440\u043E\u0441\u0442\u043E \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u044B\u0445 \u043F\u0440\u043E\u0435\u043A\u0442\u043E\u0432 \u043F\u0440\u043E\u0448\u043B\u044B\u0445 \u043B\u0435\u0442. \u0421 \u0442\u0435\u0447\u0435\u043D\u0438\u0435\u043C \u0432\u0440\u0435\u043C\u0435\u043D\u0438 \u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u0438 \u0437\u0432\u0443\u043A\u043E\u0432\u043E\u0435 \u043E\u0444\u043E\u0440\u043C\u043B\u0435\u043D\u0438\u0435 \u0438\u0433\u0440 \u043D\u0430\u0448\u0435\u0433\u043E \u0430\u0440\u0445\u0438\u0432\u0430 \u0437\u0430\u043C\u0435\u0442\u043D\u043E \u0443\u0441\u0442\u0430\u0440\u0435\u043B\u043E, \u043D\u043E \u0438\u0433\u0440\u043E\u0432\u043E\u0439 \u043F\u0440\u043E\u0446\u0435\u0441\u0441 \u043E\u0441\u0442\u0430\u043B\u0441\u044F \u043F\u0440\u0435\u0436\u043D\u0438\u043C, \u0438 \u043F\u043E\u0440\u043E\u0439 \u043E\u043D \u0433\u043E\u0440\u0430\u0437\u0434\u043E \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u0435\u0435, \u0447\u0435\u043C \u0432\u043E \u043C\u043D\u043E\u0433\u0438\u0445 \u0441\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0445 \u00AB\u0445\u0438\u0442\u0430\u0445\u00BB.'  # noqa
+    description = u'Old-Games.RU \u2014 \u043A\u0440\u0443\u043F\u043D\u0435\u0439\u0448\u0438\u0439 \u0440\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u0438\u0439 \u0430\u0440\u0445\u0438\u0432 \u0441\u0442\u0430\u0440\u044B\u0445 \u043A\u043E\u043C\u043F\u044C\u044E\u0442\u0435\u0440\u043D\u044B\u0445 \u0438\u0433\u0440. \u041C\u044B \u043D\u0435 \u0441\u0442\u0430\u0432\u0438\u043C \u043F\u0435\u0440\u0435\u0434 \u0441\u043E\u0431\u043E\u0439 \u0446\u0435\u043B\u0438 \u0441\u043E\u0431\u0440\u0430\u0442\u044C \u0432\u0441\u0435 \u0438\u0433\u0440\u044B, \u0447\u0442\u043E \u0435\u0441\u0442\u044C \u0432 \u043C\u0438\u0440\u0435, \u043D\u043E \u043C\u044B \u0441\u0442\u0430\u0440\u0430\u0435\u043C\u0441\u044F, \u0447\u0442\u043E\u0431\u044B \u043D\u0430 \u0441\u0430\u0439\u0442\u0435 \u0431\u044B\u043B\u043E \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u043E \u0431\u043E\u043B\u044C\u0448\u0438\u043D\u0441\u0442\u0432\u043E \u0448\u0435\u0434\u0435\u0432\u0440\u043E\u0432, \u0440\u0435\u0434\u043A\u043E\u0441\u0442\u0435\u0439 \u0438 \u043F\u0440\u043E\u0441\u0442\u043E \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u044B\u0445 \u043F\u0440\u043E\u0435\u043A\u0442\u043E\u0432 \u043F\u0440\u043E\u0448\u043B\u044B\u0445 \u043B\u0435\u0442. \u0421 \u0442\u0435\u0447\u0435\u043D\u0438\u0435\u043C \u0432\u0440\u0435\u043C\u0435\u043D\u0438 \u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u0438 \u0437\u0432\u0443\u043A\u043E\u0432\u043E\u0435 \u043E\u0444\u043E\u0440\u043C\u043B\u0435\u043D\u0438\u0435 \u0438\u0433\u0440 \u043D\u0430\u0448\u0435\u0433\u043E \u0430\u0440\u0445\u0438\u0432\u0430 \u0437\u0430\u043C\u0435\u0442\u043D\u043E \u0443\u0441\u0442\u0430\u0440\u0435\u043B\u043E, \u043D\u043E \u0438\u0433\u0440\u043E\u0432\u043E\u0439 \u043F\u0440\u043E\u0446\u0435\u0441\u0441 \u043E\u0441\u0442\u0430\u043B\u0441\u044F \u043F\u0440\u0435\u0436\u043D\u0438\u043C, \u0438 \u043F\u043E\u0440\u043E\u0439 \u043E\u043D \u0433\u043E\u0440\u0430\u0437\u0434\u043E \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u0435\u0435, \u0447\u0435\u043C \u0432\u043E \u043C\u043D\u043E\u0433\u0438\u0445 \u0441\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0445 \u00AB\u0445\u0438\u0442\u0430\u0445\u00BB.'  # noqa: E501
     publisher = 'Old-Games.RU'
     publication_type = 'blog'
     category = 'news, games, retro'
@@ -24,7 +24,7 @@ class OGRU(BasicNewsRecipe):
 
     remove_attributes = ['style']
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='p', attrs={'id': 'pageDescription'}),
         dict(name='div', attrs={'class': 'pageNavLinkGroup'}),
         dict(name='div', attrs={'class': 'tagBlock TagContainer'}),
diff --git a/recipes/omgubuntu.recipe b/recipes/omgubuntu.recipe
index 9242c5c683..0da184ad37 100644
--- a/recipes/omgubuntu.recipe
+++ b/recipes/omgubuntu.recipe
@@ -5,8 +5,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class OMGUbuntu(BasicNewsRecipe):
-    title = u"Omg! Ubuntu!"
-    description = u"Online news site covering Ubuntu activities. Recipe pulls articles from past 7 days."
+    title = u'Omg! Ubuntu!'
+    description = u'Online news site covering Ubuntu activities. Recipe pulls articles from past 7 days.'
     language = 'en'
     oldest_article = 7
     max_articles_per_feed = 100
diff --git a/recipes/onda_rock.recipe b/recipes/onda_rock.recipe
index fc0f0d811d..310de65e4d 100644
--- a/recipes/onda_rock.recipe
+++ b/recipes/onda_rock.recipe
@@ -23,9 +23,9 @@ class AdvancedUserRecipe1328535130(BasicNewsRecipe):
     ]
     no_stylesheets = True
     feeds = [(u'Onda Rock', u'http://www.ondarock.it/feed.php')]
-    masthead_url = 'http://api.ning.com/files/4ot8ampp*-rYQuwL2NoaHvVqcyu7VMyWyan12a9QMsJUWxk-q5V1-34wnD-Wj9B5qWjc1yPMLGiwQg8hZJxaySeaG2lx8hpV/2009_banner_ondarock.gif'  # noqa
+    masthead_url = 'http://api.ning.com/files/4ot8ampp*-rYQuwL2NoaHvVqcyu7VMyWyan12a9QMsJUWxk-q5V1-34wnD-Wj9B5qWjc1yPMLGiwQg8hZJxaySeaG2lx8hpV/2009_banner_ondarock.gif'  # noqa: E501
 
-    extra_css = '''  # noqa
+    extra_css = '''
         .boxtabscontain_page {
              border: 1px solid #E0E0E0;clear: both;
              font-family: "Verdana", "Arial", "Helvetica", sans-serif;
diff --git a/recipes/onemagazine.recipe b/recipes/onemagazine.recipe
index a5a4d7b610..9306693302 100644
--- a/recipes/onemagazine.recipe
+++ b/recipes/onemagazine.recipe
@@ -49,7 +49,7 @@ class Onemagazine(BasicNewsRecipe):
     ]
 
     remove_tags = [
-        dict(name='p', attrs={'class': ['info']}), dict(name='table', attrs={'class': ['connect_widget_interactive_area']}), dict(name='span', attrs={'class': ['photo']}), dict(name='div', attrs={'class': ['counter']}), dict(name='div', attrs={'class': ['carousel']}), dict(name='div', attrs={'class': ['jcarousel-container jcarousel-container-horizontal']})  # noqa
+        dict(name='p', attrs={'class': ['info']}), dict(name='table', attrs={'class': ['connect_widget_interactive_area']}), dict(name='span', attrs={'class': ['photo']}), dict(name='div', attrs={'class': ['counter']}), dict(name='div', attrs={'class': ['carousel']}), dict(name='div', attrs={'class': ['jcarousel-container jcarousel-container-horizontal']})  # noqa: E501
     ]
 
     remove_tags_after = [
diff --git a/recipes/opennet.recipe b/recipes/opennet.recipe
index 5d22ca4afa..fa457cdef0 100644
--- a/recipes/opennet.recipe
+++ b/recipes/opennet.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class PaperPaper(BasicNewsRecipe):
     title = 'OpenNet.ru'
     __author__ = 'bugmen00t'
-    description = '\u0420\u0443\u0441\u0441\u043A\u043E\u044F\u0437\u044B\u0447\u043D\u044B\u0439 \u043F\u043E\u0440\u0442\u0430\u043B, \u043F\u043E\u0441\u0432\u044F\u0449\u0451\u043D\u043D\u044B\u0439 \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u043C \u0438 \u0441\u0432\u043E\u0431\u043E\u0434\u043D\u044B\u043C \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u044F\u043C (FOSS): \u0435\u0436\u0435\u0434\u043D\u0435\u0432\u043D\u044B\u0435 \u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u0432 \u043E\u0431\u043B\u0430\u0441\u0442\u0438 \u0441\u0432\u043E\u0431\u043E\u0434\u043D\u043E\u0433\u043E \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u043E\u0433\u043E \u043E\u0431\u0435\u0441\u043F\u0435\u0447\u0435\u043D\u0438\u044F, Linux, BSD \u0438 UNIX-\u043F\u043E\u0434\u043E\u0431\u043D\u044B\u0445 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u0445 \u0441\u0438\u0441\u0442\u0435\u043C.'  # noqa
+    description = '\u0420\u0443\u0441\u0441\u043A\u043E\u044F\u0437\u044B\u0447\u043D\u044B\u0439 \u043F\u043E\u0440\u0442\u0430\u043B, \u043F\u043E\u0441\u0432\u044F\u0449\u0451\u043D\u043D\u044B\u0439 \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u043C \u0438 \u0441\u0432\u043E\u0431\u043E\u0434\u043D\u044B\u043C \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u044F\u043C (FOSS): \u0435\u0436\u0435\u0434\u043D\u0435\u0432\u043D\u044B\u0435 \u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u0432 \u043E\u0431\u043B\u0430\u0441\u0442\u0438 \u0441\u0432\u043E\u0431\u043E\u0434\u043D\u043E\u0433\u043E \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u043E\u0433\u043E \u043E\u0431\u0435\u0441\u043F\u0435\u0447\u0435\u043D\u0438\u044F, Linux, BSD \u0438 UNIX-\u043F\u043E\u0434\u043E\u0431\u043D\u044B\u0445 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u0445 \u0441\u0438\u0441\u0442\u0435\u043C.'  # noqa: E501
     publisher = 'Maxim Chirkov'
     category = 'blog'
     cover_url = u'https://www.opennet.ru/opennet.gif'
diff --git a/recipes/optyczne_pl.recipe b/recipes/optyczne_pl.recipe
index c0648ffc13..4dd2834e97 100644
--- a/recipes/optyczne_pl.recipe
+++ b/recipes/optyczne_pl.recipe
@@ -13,7 +13,6 @@ class OptyczneRecipe(BasicNewsRecipe):
     description = u'Najlepsze testy obiektywów, testy aparatów cyfrowych i testy lornetek w sieci!'
     cover_url = ''
     remove_empty_feeds = True
-    no_stylesheets = True
     oldest_article = 7
     max_articles_per_feed = 100
     recursions = 0
diff --git a/recipes/orfonline.recipe b/recipes/orfonline.recipe
index 85035f4195..0d162ca4b8 100644
--- a/recipes/orfonline.recipe
+++ b/recipes/orfonline.recipe
@@ -20,7 +20,6 @@ class ORF(BasicNewsRecipe):
     masthead_url = 'https://www.orfonline.org/wp-content/uploads/2015/09/Logo_ORF_JPEG.jpg'
     remove_attributes = ['style', 'height', 'width']
     ignore_duplicate_articles = {'url', 'title'}
-    remove_empty_feeds = True
     oldest_article = 7
     simultaneous_downloads = 1
 
diff --git a/recipes/orient_21.recipe b/recipes/orient_21.recipe
index 6b06434e79..94ac39e363 100644
--- a/recipes/orient_21.recipe
+++ b/recipes/orient_21.recipe
@@ -32,9 +32,9 @@ class OrientXXIRecipe(BasicNewsRecipe):
     '''
 
     def default_cover(self, cover_file):
-        """
+        '''
         Crée une couverture personnalisée avec le logo
-        """
+        '''
         from qt.core import QColor, QFont, QImage, QPainter, QPen, QRect, Qt
 
         from calibre.gui2 import ensure_app, load_builtin_fonts, pixmap_to_data
@@ -50,7 +50,7 @@ class OrientXXIRecipe(BasicNewsRecipe):
 
             weekday = french_weekday[wkd]
             month = french_month[today.month]
-            date_str = f"{weekday} {today.day} {month} {today.year}"
+            date_str = f'{weekday} {today.day} {month} {today.year}'
             edition = today.strftime('Édition de %Hh')
 
             # Image de base
diff --git a/recipes/osvitaua.recipe b/recipes/osvitaua.recipe
index 540895f5b4..f1177cb293 100644
--- a/recipes/osvitaua.recipe
+++ b/recipes/osvitaua.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Osvita(BasicNewsRecipe):
     title = '\u041E\u0441\u0432\u0456\u0442\u0430.ua'
     __author__ = 'bugmen00t'
-    description = '\u0423\u0441\u0435 \u043F\u0440\u043E \u043E\u0441\u0432\u0456\u0442\u0443 \u0432 \u0423\u043A\u0440\u0430\u0457\u043D\u0456 \u0442\u0430 \u0437\u0430 \u043A\u043E\u0440\u0434\u043E\u043D\u043E\u043C: \u0442\u0435\u043C\u0430\u0442\u0438\u0447\u043D\u0438\u0439 \u0440\u0435\u0441\u0443\u0440\u0441, \u043F\u0440\u0438\u0441\u0432\u044F\u0447\u0435\u043D\u0438\u0439 \u043E\u0441\u0432\u0456\u0442\u0456 \u0432 \u0423\u043A\u0440\u0430\u0457\u043D\u0456 \u0442\u0430 \u0437\u0430 \u0457\u0457 \u043C\u0435\u0436\u0430\u043C\u0438, \u0454 \u0430\u043A\u0442\u0443\u0430\u043B\u044C\u043D\u0438\u043C \u0434\u0436\u0435\u0440\u0435\u043B\u043E\u043C \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0457 \u0443 \u0446\u0456\u0439 \u0441\u0444\u0435\u0440\u0456.'  # noqa
+    description = '\u0423\u0441\u0435 \u043F\u0440\u043E \u043E\u0441\u0432\u0456\u0442\u0443 \u0432 \u0423\u043A\u0440\u0430\u0457\u043D\u0456 \u0442\u0430 \u0437\u0430 \u043A\u043E\u0440\u0434\u043E\u043D\u043E\u043C: \u0442\u0435\u043C\u0430\u0442\u0438\u0447\u043D\u0438\u0439 \u0440\u0435\u0441\u0443\u0440\u0441, \u043F\u0440\u0438\u0441\u0432\u044F\u0447\u0435\u043D\u0438\u0439 \u043E\u0441\u0432\u0456\u0442\u0456 \u0432 \u0423\u043A\u0440\u0430\u0457\u043D\u0456 \u0442\u0430 \u0437\u0430 \u0457\u0457 \u043C\u0435\u0436\u0430\u043C\u0438, \u0454 \u0430\u043A\u0442\u0443\u0430\u043B\u044C\u043D\u0438\u043C \u0434\u0436\u0435\u0440\u0435\u043B\u043E\u043C \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0457 \u0443 \u0446\u0456\u0439 \u0441\u0444\u0435\u0440\u0456.'  # noqa: E501
     publisher = '\u041E\u0441\u0432\u0456\u0442\u0430.ua'
     category = 'blog'
     cover_url = u'http://osvita.ua/doc/i/Contacts-logo.jpg'
diff --git a/recipes/osvitaua_ru.recipe b/recipes/osvitaua_ru.recipe
index 0407e4dcfb..a98d8cb9e5 100644
--- a/recipes/osvitaua_ru.recipe
+++ b/recipes/osvitaua_ru.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Osvita(BasicNewsRecipe):
     title = '\u041E\u0441\u0432\u0456\u0442\u0430.ua'
     __author__ = 'bugmen00t'
-    description = '\u0422\u0435\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0440\u0435\u0441\u0443\u0440\u0441, \u043F\u043E\u0441\u0432\u044F\u0449\u0451\u043D\u043D\u044B\u0439 \u043E\u0431\u0440\u0430\u0437\u043E\u0432\u0430\u043D\u0438\u044E \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435 \u0438 \u0437\u0430 \u0440\u0443\u0431\u0435\u0436\u043E\u043C.'  # noqa
+    description = '\u0422\u0435\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0440\u0435\u0441\u0443\u0440\u0441, \u043F\u043E\u0441\u0432\u044F\u0449\u0451\u043D\u043D\u044B\u0439 \u043E\u0431\u0440\u0430\u0437\u043E\u0432\u0430\u043D\u0438\u044E \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435 \u0438 \u0437\u0430 \u0440\u0443\u0431\u0435\u0436\u043E\u043C.'  # noqa: E501
     publisher = '\u041E\u0441\u0432\u0456\u0442\u0430.ua'
     category = 'blog'
     cover_url = u'http://osvita.ua/doc/i/Contacts-logo.jpg'
diff --git a/recipes/ottawa_citizen.recipe b/recipes/ottawa_citizen.recipe
index 7b0b152767..b3b35e4155 100644
--- a/recipes/ottawa_citizen.recipe
+++ b/recipes/ottawa_citizen.recipe
@@ -60,36 +60,36 @@ class CanWestPaper(BasicNewsRecipe):
     ]
 
     # un-comment the following six lines for the Vancouver Province
-    # title = u'Vancouver Province'
-    # url_prefix = 'http://www.theprovince.com'
-    # description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
-    # logo_url = 'vplogo.jpg'
-    # fp_tag = 'CAN_TP'
+    # #    title = u'Vancouver Province'
+    # #    url_prefix = 'http://www.theprovince.com'
+    # #    description = u'News from Vancouver, BC'
+    # #    std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
+    # #    logo_url = 'vplogo.jpg'
+    # #    fp_tag = 'CAN_TP'
 
     # un-comment the following six lines for the Vancouver Sun
-    # title = u'Vancouver Sun'
-    # url_prefix = 'http://www.vancouversun.com'
-    # description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
-    # logo_url = 'vslogo.jpg'
-    # fp_tag = 'CAN_VS'
+    # #    title = u'Vancouver Sun'
+    # #    url_prefix = 'http://www.vancouversun.com'
+    # #    description = u'News from Vancouver, BC'
+    # #    std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
+    # #    logo_url = 'vslogo.jpg'
+    # #    fp_tag = 'CAN_VS'
 
     # un-comment the following six lines for the Calgary Herald
-    # title = u'Calgary Herald'
-    # url_prefix = 'http://www.calgaryherald.com'
-    # description = u'News from Calgary, AB'
-    # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
-    # logo_url = 'chlogo.jpg'
-    # fp_tag = 'CAN_CH'
+    # #    title = u'Calgary Herald'
+    # #    url_prefix = 'http://www.calgaryherald.com'
+    # #    description = u'News from Calgary, AB'
+    # #    std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
+    # #    logo_url = 'chlogo.jpg'
+    # #    fp_tag = 'CAN_CH'
 
     # un-comment the following six lines for the Edmonton Journal
-    # title = u'Edmonton Journal'
-    # url_prefix = 'http://www.edmontonjournal.com'
-    # description = u'News from Edmonton, AB'
-    # std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
-    # logo_url = 'ejlogo.jpg'
-    # fp_tag = 'CAN_EJ'
+    # #    title = u'Edmonton Journal'
+    # #    url_prefix = 'http://www.edmontonjournal.com'
+    # #    description = u'News from Edmonton, AB'
+    # #    std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
+    # #    logo_url = 'ejlogo.jpg'
+    # #    fp_tag = 'CAN_EJ'
 
     # un-comment the following six lines for the Ottawa Citizen
     title = u'Ottawa Citizen'
@@ -100,12 +100,12 @@ class CanWestPaper(BasicNewsRecipe):
     fp_tag = 'CAN_OC'
 
     # un-comment the following six lines for the Montreal Gazette
-#    title = u'Montreal Gazette'
-#    url_prefix = 'http://www.montrealgazette.com'
-#    description = u'News from Montreal, QC'
-#    std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg'
-#    logo_url = 'mglogo.jpg'
-#    fp_tag = 'CAN_MG'
+    # #    title = u'Montreal Gazette'
+    # #    url_prefix = 'http://www.montrealgazette.com'
+    # #    description = u'News from Montreal, QC'
+    # #    std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg'
+    # #    logo_url = 'mglogo.jpg'
+    # #    fp_tag = 'CAN_MG'
 
     Kindle_Fire = False
     masthead_url = std_logo_url
@@ -126,7 +126,7 @@ class CanWestPaper(BasicNewsRecipe):
                 .photocaption { font-size: xx-small; font-style: italic; font-weight: normal; }
                 #photocredit { font-size: xx-small; font-weight: normal; }'''
 
-    keep_only_tags = [dict(name='div', attrs={'id': re.compile('story')})]
+    keep_only_tags = [dict(name='div', attrs={'id': re.compile(r'story')})]
 
     remove_tags = [{'class': 'comments'}, {'class': 'comment-intro'}, {'class': 'storytab'},
                    dict(name='div', attrs={'class': 'section_title'}), dict(name='div', attrs={'class': 'sharebar'}), dict(
@@ -140,7 +140,7 @@ class CanWestPaper(BasicNewsRecipe):
                        name='div', attrs={'class': 'copyright'}),
                    dict(name='div', attrs={'class': 'rule_grey_solid'}),
                    dict(name='div', attrs={'id': 'soundoff'}),
-                   dict(name='div', attrs={'id': re.compile('flyer')}),
+                   dict(name='div', attrs={'id': re.compile(r'flyer')}),
                    dict(name='li', attrs={'class': 'print'}), dict(name='li', attrs={'class': 'share'}), dict(name='ul', attrs={'class': 'bullet'})]
 
     def get_cover_url(self):
@@ -154,8 +154,7 @@ class CanWestPaper(BasicNewsRecipe):
         except:
             while daysback < 7:
                 cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg' + \
-                    str((date.today() - timedelta(days=daysback)).day) + \
-                    '/lg/' + self.fp_tag + '.jpg'
+                    str((date.today() - timedelta(days=daysback)).day) + '/lg/' + self.fp_tag + '.jpg'
                 br = BasicNewsRecipe.get_browser(self)
                 try:
                     br.open(cover)
@@ -164,24 +163,24 @@ class CanWestPaper(BasicNewsRecipe):
                     continue
                 break
         if daysback == 7:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             cover = None
         return cover
 
     def fixChars(self, string):
         # Replace lsquo (\x91)
-        fixed = re.sub("\x91", "‘", string)
+        fixed = string.replace('\x91', '‘')
         # Replace rsquo (\x92)
-        fixed = re.sub("\x92", "’", fixed)
+        fixed = fixed.replace('\x92', '’')
         # Replace ldquo (\x93)
-        fixed = re.sub("\x93", "“", fixed)
+        fixed = fixed.replace('\x93', '“')
         # Replace rdquo (\x94)
-        fixed = re.sub("\x94", "”", fixed)
+        fixed = fixed.replace('\x94', '”')
         # Replace ndash (\x96)
-        fixed = re.sub("\x96", "–", fixed)
+        fixed = fixed.replace('\x96', '–')
         # Replace mdash (\x97)
-        fixed = re.sub("\x97", "—", fixed)
-        fixed = re.sub("&#x2019;", "’", fixed)
+        fixed = fixed.replace('\x97', '—')
+        fixed = fixed.replace('&#x2019;', '’')
         return fixed
 
     def massageNCXText(self, description):
@@ -214,7 +213,7 @@ class CanWestPaper(BasicNewsRecipe):
         divtags = soup.findAll('div', attrs={'id': ''})
         if divtags:
             for div in divtags:
-                del(div['id'])
+                del div['id']
 
         pgall = soup.find('div', attrs={'id': 'storyphoto'})
         if pgall is not None:  # photo gallery perhaps
@@ -262,10 +261,10 @@ class CanWestPaper(BasicNewsRecipe):
                     if url.startswith('/'):
                         url = self.url_prefix + url
                     if not url.startswith(self.url_prefix):
-                        print("Rejected " + url)
+                        print('Rejected ' + url)
                         return
                     if url in self.url_list:
-                        print("Rejected dup " + url)
+                        print('Rejected dup ' + url)
                         return
                     self.url_list.append(url)
                     title = self.tag_to_string(atag, False)
@@ -277,8 +276,8 @@ class CanWestPaper(BasicNewsRecipe):
                         return
                     dtag = adiv.find('div', 'content')
                     description = ''
-                    print("URL " + url)
-                    print("TITLE " + title)
+                    print('URL ' + url)
+                    print('TITLE ' + title)
                     if dtag is not None:
                         stag = dtag.span
                         if stag is not None:
@@ -286,18 +285,18 @@ class CanWestPaper(BasicNewsRecipe):
                                 description = self.tag_to_string(stag, False)
                         else:
                             description = self.tag_to_string(dtag, False)
-                        print("DESCRIPTION: " + description)
+                        print('DESCRIPTION: ' + description)
                     if key not in articles:
                         articles[key] = []
                     articles[key].append(dict(
                         title=title, url=url, date='', description=description, author='', content=''))
 
         def parse_web_index(key, keyurl):
-            print("Section: " + key + ': ' + self.url_prefix + keyurl)
+            print('Section: ' + key + ': ' + self.url_prefix + keyurl)
             try:
                 soup = self.index_to_soup(self.url_prefix + keyurl)
             except:
-                print("Section: " + key + ' NOT FOUND')
+                print('Section: ' + key + ' NOT FOUND')
                 return
             ans.append(key)
             mainsoup = soup.find('div', 'bodywrapper')
@@ -309,7 +308,7 @@ class CanWestPaper(BasicNewsRecipe):
             for wdiv in mainsoup.findAll(attrs={'class': ['headline', 'featurecontent']}):
                 handle_article(wdiv, key)
 
-        for (k, url) in self.postmedia_index_pages:
+        for k,url in self.postmedia_index_pages:
             parse_web_index(k, url)
         ans = [(key, articles[key]) for key in ans if key in articles]
         return ans
diff --git a/recipes/ourdailybread.recipe b/recipes/ourdailybread.recipe
index 1bbb87f984..a7a933d5b5 100644
--- a/recipes/ourdailybread.recipe
+++ b/recipes/ourdailybread.recipe
@@ -66,7 +66,7 @@ class OurDailyBread(BasicNewsRecipe):
                 div.set('class', 'calibre-inserted-psalm')
                 hr = div.makeelement('hr')
                 div.insert(0, hr)
-                # print html.tostring(div)
+                # print(html.tostring(div))
                 raw = html.tostring(root, encoding='unicode')
         return raw
 
diff --git a/recipes/outlook_business_magazine.recipe b/recipes/outlook_business_magazine.recipe
index 1ab5abbaa4..50fe0b6ffd 100644
--- a/recipes/outlook_business_magazine.recipe
+++ b/recipes/outlook_business_magazine.recipe
@@ -48,7 +48,7 @@ class outlook(BasicNewsRecipe):
         return [('Articles', ans)]
 
     def preprocess_raw_html(self, raw, *a):
-        m = re.search('id="__NEXT_DATA__" type="application/json">', raw)
+        m = re.search(r'id="__NEXT_DATA__" type="application/json">', raw)
         raw = raw[m.start():]
         raw = raw.split('>', 1)[1]
         data = json.JSONDecoder().raw_decode(raw)[0]
diff --git a/recipes/outlook_india.recipe b/recipes/outlook_india.recipe
index 71f40a34c8..0f7128ee92 100644
--- a/recipes/outlook_india.recipe
+++ b/recipes/outlook_india.recipe
@@ -8,7 +8,7 @@ class outlook(BasicNewsRecipe):
     __author__ = 'unkn0wn'
     description = (
         'Outlook covers the latest India news, analysis, business news and long-form stories on culture,'
-        ' money market and personal finance. Read India\'s best online magazine.'
+        " money market and personal finance. Read India's best online magazine."
     )
     language = 'en_IN'
     use_embedded_content = False
diff --git a/recipes/pagina12.recipe b/recipes/pagina12.recipe
index 54ab8ae358..3276fa4c7f 100644
--- a/recipes/pagina12.recipe
+++ b/recipes/pagina12.recipe
@@ -33,7 +33,7 @@ class Pagina12(BasicNewsRecipe):
     articles_are_obfuscated = True
     temp_files              = []
     fetch_retries           = 10
-    extra_css            = """
+    extra_css            = '''
         body{font-family: "Open Sans", sans-serif}
         .article-date{font-size: small; margin-bottom: 1em;}
         .article-title{font-size: x-large; font-weight: bold; display: block; margin-bottom: 1em; margin-top: 1em;}
@@ -43,7 +43,7 @@ class Pagina12(BasicNewsRecipe):
         img{margin-top:1em; margin-bottom: 1em; display:block}
         .article-text p:first-letter{display: inline; font-size: xx-large; font-weight: bold}
         .article-prefix{font-family: "Archivo Narrow",Helvetica,sans-serif; font-size: small; text-transform: uppercase;}
-    """
+    '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
@@ -76,22 +76,22 @@ class Pagina12(BasicNewsRecipe):
         return br
 
     feeds = [
-      (u'Diario de hoy'     , u'https://www.pagina12.com.ar/rss/edicion-impresa'),
-      (u'Espectaculos'      , u'https://www.pagina12.com.ar/rss/suplementos/cultura-y-espectaculos/notas'),
-      (u'Radar'             , u'https://www.pagina12.com.ar/rss/suplementos/radar/notas'),
-      (u'Radar libros'      , u'https://www.pagina12.com.ar/rss/suplementos/radar-libros/notas'),
-      (u'Cash'              , u'https://www.pagina12.com.ar/rss/suplementos/cash/notas'),
-      (u'NO'                , u'https://www.pagina12.com.ar/rss/suplementos/no/notas'),
-      (u'Las 12'            , u'https://www.pagina12.com.ar/rss/suplementos/las12/notas'),
-      (u'Soy'               , u'https://www.pagina12.com.ar/rss/suplementos/soy/notas'),
-      (u'M2'                , u'https://www.pagina12.com.ar/rss/suplementos/m2/notas'),
-      (u'Rosario 12'        , u'https://www.pagina12.com.ar/rss/suplementos/rosario12/notas')
+      (u'Diario de hoy',    u'https://www.pagina12.com.ar/rss/edicion-impresa'),
+      (u'Espectaculos',     u'https://www.pagina12.com.ar/rss/suplementos/cultura-y-espectaculos/notas'),
+      (u'Radar',            u'https://www.pagina12.com.ar/rss/suplementos/radar/notas'),
+      (u'Radar libros',     u'https://www.pagina12.com.ar/rss/suplementos/radar-libros/notas'),
+      (u'Cash',             u'https://www.pagina12.com.ar/rss/suplementos/cash/notas'),
+      (u'NO',               u'https://www.pagina12.com.ar/rss/suplementos/no/notas'),
+      (u'Las 12',           u'https://www.pagina12.com.ar/rss/suplementos/las12/notas'),
+      (u'Soy',              u'https://www.pagina12.com.ar/rss/suplementos/soy/notas'),
+      (u'M2',               u'https://www.pagina12.com.ar/rss/suplementos/m2/notas'),
+      (u'Rosario 12',       u'https://www.pagina12.com.ar/rss/suplementos/rosario12/notas')
     ]
 
     def get_cover_url(self):
         lurl = strftime('https://www.pagina12.com.ar/edicion-impresa/%d-%m-%Y')
         soup = self.index_to_soup(lurl)
-        mydiv = soup.find('div', {'class' : lambda x: x and 'printed-edition-cover' in x.split()})
+        mydiv = soup.find('div', {'class': lambda x: x and 'printed-edition-cover' in x.split()})
         if mydiv:
             for image in mydiv.findAll('img'):
                 if image['src'].startswith('https://images.pagina12.com.ar/styles/width700/public/'):
@@ -112,6 +112,6 @@ class Pagina12(BasicNewsRecipe):
                 self.temp_files.append(tfile)
                 result = tfile.name
             except:
-                self.info("Retrying download...")
+                self.info('Retrying download...')
             count += 1
         return result
diff --git a/recipes/pajama.recipe b/recipes/pajama.recipe
index 93bd3dab7e..4b556d2db4 100644
--- a/recipes/pajama.recipe
+++ b/recipes/pajama.recipe
@@ -18,4 +18,3 @@ class PajamasMedia(BasicNewsRecipe):
          'http://feeds.feedburner.com/PajamasMedia'),
 
     ]
-
diff --git a/recipes/paperpaper.recipe b/recipes/paperpaper.recipe
index dbe6fc7c5f..5bb6705753 100644
--- a/recipes/paperpaper.recipe
+++ b/recipes/paperpaper.recipe
@@ -9,8 +9,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class PaperPaper(BasicNewsRecipe):
     title                 = '\u0411\u0443\u043C\u0430\u0433\u0430'
     __author__            = 'bugmen00t'
-    description           = '\u0418\u0437\u0434\u0430\u043D\u0438\u0435 \u043E \u043F\u0440\u0435\u043A\u0440\u0430\u0441\u043D\u043E\u043C \u0433\u043E\u0440\u043E\u0434\u0435 \u0421\u0430\u043D\u043A\u0442-\u041F\u0435\u0442\u0435\u0440\u0431\u0443\u0440\u0433\u0435, \u0432 \u043A\u043E\u0442\u043E\u0440\u043E\u043C, \u043A\u043E\u043D\u0435\u0447\u043D\u043E, \u0434\u0430\u043B\u0435\u043A\u043E \u043D\u0435 \u0432\u0441\u0451 \u0438\u0434\u0435\u0430\u043B\u044C\u043D\u043E, \u2014 \u0438 \u043F\u043E\u044D\u0442\u043E\u043C\u0443 \u043C\u044B \u0437\u0430\u043D\u0438\u043C\u0430\u0435\u043C\u0441\u044F \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0438\u043A\u043E\u0439, \u0447\u0442\u043E\u0431\u044B \u043F\u0440\u0438\u0432\u043B\u0435\u043A\u0430\u0442\u044C \u0432\u043D\u0438\u043C\u0430\u043D\u0438\u0435 \u043A \u0432\u0430\u0436\u043D\u044B\u043C \u0434\u043B\u044F \u0432\u0441\u0435\u0445 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430\u043C \u0438 \u0432\u043B\u0438\u044F\u0442\u044C \u043D\u0430 \u0438\u0445 \u0440\u0435\u0448\u0435\u043D\u0438\u0435.'  # noqa
-    publisher             = '\u041A\u0438\u0440\u0438\u043B\u043B \u0410\u0440\u0442\u0451\u043C\u0435\u043D\u043A\u043E, \u0422\u0430\u0442\u044C\u044F\u043D\u0430 \u0418\u0432\u0430\u043D\u043E\u0432\u0430'  # noqa
+    description           = '\u0418\u0437\u0434\u0430\u043D\u0438\u0435 \u043E \u043F\u0440\u0435\u043A\u0440\u0430\u0441\u043D\u043E\u043C \u0433\u043E\u0440\u043E\u0434\u0435 \u0421\u0430\u043D\u043A\u0442-\u041F\u0435\u0442\u0435\u0440\u0431\u0443\u0440\u0433\u0435, \u0432 \u043A\u043E\u0442\u043E\u0440\u043E\u043C, \u043A\u043E\u043D\u0435\u0447\u043D\u043E, \u0434\u0430\u043B\u0435\u043A\u043E \u043D\u0435 \u0432\u0441\u0451 \u0438\u0434\u0435\u0430\u043B\u044C\u043D\u043E, \u2014 \u0438 \u043F\u043E\u044D\u0442\u043E\u043C\u0443 \u043C\u044B \u0437\u0430\u043D\u0438\u043C\u0430\u0435\u043C\u0441\u044F \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0438\u043A\u043E\u0439, \u0447\u0442\u043E\u0431\u044B \u043F\u0440\u0438\u0432\u043B\u0435\u043A\u0430\u0442\u044C \u0432\u043D\u0438\u043C\u0430\u043D\u0438\u0435 \u043A \u0432\u0430\u0436\u043D\u044B\u043C \u0434\u043B\u044F \u0432\u0441\u0435\u0445 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430\u043C \u0438 \u0432\u043B\u0438\u044F\u0442\u044C \u043D\u0430 \u0438\u0445 \u0440\u0435\u0448\u0435\u043D\u0438\u0435.'  # noqa: E501
+    publisher             = '\u041A\u0438\u0440\u0438\u043B\u043B \u0410\u0440\u0442\u0451\u043C\u0435\u043D\u043A\u043E, \u0422\u0430\u0442\u044C\u044F\u043D\u0430 \u0418\u0432\u0430\u043D\u043E\u0432\u0430'  # noqa: E501
     category              = 'newspaper'
     cover_url = u'https://upload.wikimedia.org/wikipedia/commons/1/1f/Paperpaper_logo.jpg'
     language              = 'ru'
@@ -24,7 +24,7 @@ class PaperPaper(BasicNewsRecipe):
 
     remove_tags_after = dict(name='article')
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='div', attrs={'class': 'bottom-block '}),
         dict(name='div', attrs={'class': 'bottom-block news'})
         ]
diff --git a/recipes/parisreview.recipe b/recipes/parisreview.recipe
index e670ff7a53..49050111bf 100644
--- a/recipes/parisreview.recipe
+++ b/recipes/parisreview.recipe
@@ -21,6 +21,6 @@ class ParisReview(BasicNewsRecipe):
     # remove_attributes = ['style',]
     # keep_only_tags = []
     remove_tags = []
-    # remove_tags_before = dict()
-    remove_tags_after = dict()
+    # remove_tags_before = {}
+    remove_tags_after = {}
     feeds          = [('Posts', 'http://feeds.feedburner.com/TheParisReviewBlog')]
diff --git a/recipes/parlamentni_listy.recipe b/recipes/parlamentni_listy.recipe
index 27bd17b4e3..adcfc3b259 100644
--- a/recipes/parlamentni_listy.recipe
+++ b/recipes/parlamentni_listy.recipe
@@ -32,4 +32,4 @@ class plRecipe(BasicNewsRecipe):
     preprocess_regexps = [(re.compile(r'<(span|strong)[^>]*>\s*Ptejte se politik.*',
                                       re.DOTALL | re.IGNORECASE), lambda match: '</body>')]
 
-    keep_only_tags = [dict(name='div',   attrs={'class': ['article-detail']})]
+    keep_only_tags = [dict(name='div', attrs={'class': ['article-detail']})]
diff --git a/recipes/parool.recipe b/recipes/parool.recipe
index fd674d1522..3c2ef05987 100644
--- a/recipes/parool.recipe
+++ b/recipes/parool.recipe
@@ -26,7 +26,7 @@ class Parool(BasicNewsRecipe):
         dict(attrs={'data-element-id': ['article-element-authors']}),
         dict(name=['script', 'noscript', 'style']),
     ]
-    remove_attributes = ["class", "id", "name", "style"]
+    remove_attributes = ['class', 'id', 'name', 'style']
     encoding = 'utf-8'
     no_stylesheets = True
     ignore_duplicate_articles = {'url'}
@@ -50,7 +50,7 @@ class Parool(BasicNewsRecipe):
                 teaser_label = self.tag_to_string(header.find('h4').find('span', attrs={'class': 'teaser__label'})).strip()
                 teaser_sublabel = self.tag_to_string(header.find('h4').find('span', attrs={'class': 'teaser__sublabel'})).strip()
                 teaser_title = self.tag_to_string(header.find('h3').find('span', attrs={'class': 'teaser__title__value--short'})).strip()
-                ignore = { "dirkjan", "s1ngle", "pukkels", "hein de kort" }
+                ignore = {'dirkjan', 's1ngle', 'pukkels', 'hein de kort'}
                 if teaser_label.lower() in ignore:
                     continue
                 parts = []
@@ -74,13 +74,13 @@ class Parool(BasicNewsRecipe):
                 if tag['src'][0] == '/':
                     tag['src'] = 'https://www.parool.nl' + tag['src']
         for tag in soup():
-            if tag.name == "picture":
-                tag.replaceWith(tag.find("img"))
+            if tag.name == 'picture':
+                tag.replaceWith(tag.find('img'))
         comic_articles = {
-            "Alle strips van Dirkjan",
-            "S1NGLE",
-            "Pukkels",
-            "Bekijk hier alle cartoons van Hein de Kort",
+            'Alle strips van Dirkjan',
+            'S1NGLE',
+            'Pukkels',
+            'Bekijk hier alle cartoons van Hein de Kort',
         }
         if self.tag_to_string(soup.find('h1')).strip() in comic_articles:
             for node in soup.find('figure').find_next_siblings():
@@ -93,8 +93,8 @@ class Parool(BasicNewsRecipe):
             'Accept': 'application/json, text/javascript, */*; q=0.01',
             'DNT': '1',
         }
-        url = "https://login-api.e-pages.dk/v1/krant.parool.nl/folders"
+        url = 'https://login-api.e-pages.dk/v1/krant.parool.nl/folders'
         with closing(self.browser.open(Request(url, None, headers))) as r:
             folders = json.loads(r.read())
-            return folders["objects"][0]["teaser_medium"]
+            return folders['objects'][0]['teaser_medium']
         return None
diff --git a/recipes/pc_advisor.recipe b/recipes/pc_advisor.recipe
index e165607646..f2ab13271f 100644
--- a/recipes/pc_advisor.recipe
+++ b/recipes/pc_advisor.recipe
@@ -14,7 +14,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class pcAdvisor(BasicNewsRecipe):
     __author__ = 'Lorenzo Vigentini'
-    description = 'PC Advisor delivers expert advice you can trust to business and home PC users who want to buy the best-value equipment and make the most out of the equipment they already own.'  # noqa
+    description = 'PC Advisor delivers expert advice you can trust to business and home PC users who want to buy the best-value equipment and make the most out of the equipment they already own.'  # noqa: E501
 
     cover_url = 'http://media.pcadvisor.co.uk/images/spacer.gif'
     title = 'Pc Advisor '
diff --git a/recipes/pc_foster.recipe b/recipes/pc_foster.recipe
index d73fa0cea4..993a597301 100644
--- a/recipes/pc_foster.recipe
+++ b/recipes/pc_foster.recipe
@@ -9,7 +9,7 @@ class PC_Foster(BasicNewsRecipe):
     oldest_article = 7
     max_articles_per_feed = 100
     __author__ = 'fenuks'
-    description = u'Vortal technologiczny: testy, recenzje sprzętu komputerowego i telefonów, nowinki hardware, programy i gry dla Windows. Podkręcanie, modding i Overclocking.'  # noqa
+    description = u'Vortal technologiczny: testy, recenzje sprzętu komputerowego i telefonów, nowinki hardware, programy i gry dla Windows. Podkręcanie, modding i Overclocking.'  # noqa: E501
     category = 'IT'
     language = 'pl'
     masthead_url = 'http://pcfoster.pl/public/images/logo.png'
diff --git a/recipes/pecat.recipe b/recipes/pecat.recipe
index 6426d36221..4d70704a99 100644
--- a/recipes/pecat.recipe
+++ b/recipes/pecat.recipe
@@ -25,11 +25,11 @@ class Pecat_rs(BasicNewsRecipe):
     ignore_duplicate_articles = {'url'}
     needs_subscription = 'optional'
     publication_type = 'magazine'
-    extra_css                 = """
+    extra_css                 = '''
                                 body{font-family: Arial,Helvetica,sans1,sans-serif}
                                 img{display: block; margin-bottom: 1em; margin-top: 1em}
                                 p{display: block; margin-bottom: 1em; margin-top: 1em}
-                                """
+                                '''
 
     conversion_options = {
         'comment': description, 'tags': 'politika, Srbija', 'publisher': 'Pecat', 'language': language
diff --git a/recipes/people_daily.recipe b/recipes/people_daily.recipe
index 4ad18a436c..e03f10a52d 100644
--- a/recipes/people_daily.recipe
+++ b/recipes/people_daily.recipe
@@ -20,7 +20,6 @@ class AdvancedUserRecipe1277129332(BasicNewsRecipe):
     use_embedded_content = False
     no_stylesheets = True
     encoding = 'GB2312'
-    language = 'zh'
     conversion_options = {'linearize_tables': True}
     masthead_url = 'http://www.people.com.cn/img/2010wb/images/logo.gif'
 
@@ -89,11 +88,11 @@ class AdvancedUserRecipe1277129332(BasicNewsRecipe):
     #     dict(name='p'),
     # ]
     remove_tags = [
-        dict(name='div', class_="channel cf")
+        dict(name='div', class_='channel cf')
     ]
 
-    remove_tags_before = [dict(name='div', class_="layout rm_txt cf")]
-    remove_tags_after = [dict(name='div', class_="edit cf")]
+    remove_tags_before = [dict(name='div', class_='layout rm_txt cf')]
+    remove_tags_after = [dict(name='div', class_='edit cf')]
 
     def append_page(self, soup, appendtag, position):
         pager = soup.find('img', attrs={'src': '/img/next_b.gif'})
@@ -129,12 +128,12 @@ class AdvancedUserRecipe1277129332(BasicNewsRecipe):
         year = time.strftime('%Y')
         month = time.strftime('%m')
         day = time.strftime('%d')
-        cover = 'http://paper.people.com.cn/rmrb/images/' + year + '-' + \
-            month + '/' + day + '/01/rmrb' + year + month + day + '01_b.jpg'
+        cover = ('http://paper.people.com.cn/rmrb/images/' + year + '-'
+                 + month + '/' + day + '/01/rmrb' + year + month + day + '01_b.jpg')
         br = BasicNewsRecipe.get_browser(self)
         try:
             br.open(cover)
         except:
-            self.log("\nCover unavailable: " + cover)
+            self.log('\nCover unavailable: ' + cover)
             cover = None
         return cover
diff --git a/recipes/pescanik.recipe b/recipes/pescanik.recipe
index 985568768b..b5978c82a6 100644
--- a/recipes/pescanik.recipe
+++ b/recipes/pescanik.recipe
@@ -13,7 +13,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Pescanik(BasicNewsRecipe):
     title = u'Peščanik'
     __author__ = 'Darko Miletic'
-    description = u'Peščanik je udruženje građana osnovano 2006. godine. Glavni proizvod Peščanika je radio emisija koja je emitovana na Radiju B92 od 02.02.2000. do 16.06.2011, a od septembra 2011. se emituje na osam radio stanica u Srbiji, Crnoj Gori i BiH'  # noqa
+    description = u'Peščanik je udruženje građana osnovano 2006. godine. Glavni proizvod Peščanika je radio emisija koja je emitovana na Radiju B92 od 02.02.2000. do 16.06.2011, a od septembra 2011. se emituje na osam radio stanica u Srbiji, Crnoj Gori i BiH'  # noqa: E501
     publisher = u'Peščanik'
     category = 'news, politics, Serbia'
     oldest_article = 10
@@ -24,17 +24,17 @@ class Pescanik(BasicNewsRecipe):
     language = 'sr'
     publication_type = 'newsportal'
     masthead_url = 'http://pescanik.net/wp-content/uploads/2011/10/logo1.png'
-    extra_css             = """
+    extra_css             = '''
                                @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)}
                                body{font-family: Verdana,Arial,Tahoma,sans1,sans-serif}
                                #BlogTitle{font-size: xx-large; font-weight: bold}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
     }
 
-    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]  # noqa: RUF039
     remove_tags = [
         dict(name=['object', 'link', 'meta', 'script', 'iframe', 'embed'])]
     keep_only_tags = [
diff --git a/recipes/phillosophy_now.recipe b/recipes/phillosophy_now.recipe
index 21fa9ef565..0ed4f64db7 100644
--- a/recipes/phillosophy_now.recipe
+++ b/recipes/phillosophy_now.recipe
@@ -82,7 +82,7 @@ class PhilosophyNow(BasicNewsRecipe):
                 if section_title not in feeds:
                     feeds[section_title] = []
                 feeds[section_title] += articles
-        ans = [(key, val) for key, val in feeds.items()]
+        ans = list(feeds.items())
         return ans
 
     # PN changes the content it delivers based on cookies, so the
diff --git a/recipes/pocket_lint.recipe b/recipes/pocket_lint.recipe
index c63562d2f3..f50b023b59 100644
--- a/recipes/pocket_lint.recipe
+++ b/recipes/pocket_lint.recipe
@@ -20,12 +20,12 @@ class AdvancedUserRecipe1718387215(BasicNewsRecipe):
     auto_cleanup   = True
 
     feeds          = [
-        #Segments
+        # Segments
         ('Devices', 'https://www.pocket-lint.com/feed/devices-segment/'),
         ('Entertainment', 'https://www.pocket-lint.com/feed/entertainment-segment/'),
         ('Lifestyle', 'https://www.pocket-lint.com/feed/lifestyle-segment/'),
         ('Audio Video', 'https://www.pocket-lint.com/feed/audio-video-segment/'),
-        #Segments
+        # Segments
         ('News', 'https://www.pocket-lint.com/feed/news/'),
         ('Features', 'https://www.pocket-lint.com/feed/features/'),
         ('Editorials', 'https://www.pocket-lint.com/feed/editorials/'),
@@ -33,13 +33,13 @@ class AdvancedUserRecipe1718387215(BasicNewsRecipe):
         ('Lists', 'https://www.pocket-lint.com/feed/lists/'),
         ('Guides', 'https://www.pocket-lint.com/feed/guides/'),
         ('Hubs', 'https://www.pocket-lint.com/feed/hubs/'),
-        #Best Products
+        # Best Products
         ('Reviews', 'https://www.pocket-lint.com/feed/reviews/'),
         ('Buyer’s Guides', 'https://www.pocket-lint.com/feed/buyers-guides/'),
         ('Comparisons', 'https://www.pocket-lint.com/feed/comparisons/'),
         ('Gift Guides', 'https://www.pocket-lint.com/feed/gift-guides/'),
         ('Deals', 'https://www.pocket-lint.com/feed/deals/'),
-        #Topics
+        # Topics
         ('Apps', 'https://www.pocket-lint.com/feed/apps/'),
         ('Augmented Reality & Virtual Reality', 'https://www.pocket-lint.com/feed/ar-vr/'),
         ('Cameras', 'https://www.pocket-lint.com/feed/cameras/'),
diff --git a/recipes/podnikatel.recipe b/recipes/podnikatel.recipe
index 785bbad039..c374860863 100644
--- a/recipes/podnikatel.recipe
+++ b/recipes/podnikatel.recipe
@@ -19,9 +19,9 @@ class PodnikatelCZ(BasicNewsRecipe):
     publication_type = 'newsportal'
     no_stylesheets = True
     remove_javascript = True
-    extra_css               = 'p.perex{font-size: 1.2em; margin: 0 0 10px 0;line-height: 1.4;padding: 0 0 10px 0;font-weight: bold;} \
-                               p.perex img {display:none;} \
-                               .urs p {margin: 0 0 0.8em 0;}'
+    extra_css               = '''p.perex{font-size: 1.2em; margin: 0 0 10px 0;line-height: 1.4;padding: 0 0 10px 0;font-weight: bold;}
+                                 p.perex img {display:none;}
+                                 .urs p {margin: 0 0 0.8em 0;}'''
 
     feeds = [
         (u'Aktuality', u'http://rss.podnikatel.cz/aktuality'),
diff --git a/recipes/poligon.recipe b/recipes/poligon.recipe
index acd9c4ff93..1aab94d713 100644
--- a/recipes/poligon.recipe
+++ b/recipes/poligon.recipe
@@ -9,7 +9,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Poligon(BasicNewsRecipe):
     title             = '\u041F\u043E\u043B\u0438\u0433\u043E\u043D'
     __author__            = 'bugmen00t'
-    description           = '\u041D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0435 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0438\u0437\u0434\u0430\u043D\u0438\u0435, \u0432\u044B\u043F\u0443\u0441\u043A\u0430\u0435\u043C\u043E\u0435 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0430\u043C\u0438 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u0438\u0445 \u0440\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u0438\u0445 \u0438\u0437\u0434\u0430\u043D\u0438\u0439, \u043F\u043E\u0434\u0432\u0435\u0440\u0433\u0448\u0438\u0445\u0441\u044F \u0434\u0430\u0432\u043B\u0435\u043D\u0438\u044E \u0441\u043E \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u0433\u043E\u0441\u0443\u0434\u0430\u0440\u0441\u0442\u0432\u0430. \u041F\u0438\u0448\u0435\u043C \u043E \u0420\u043E\u0441\u0441\u0438\u0438 \u0438 \u043D\u0435 \u0442\u043E\u043B\u044C\u043A\u043E.'  # noqa
+    description           = '\u041D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0435 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0438\u0437\u0434\u0430\u043D\u0438\u0435, \u0432\u044B\u043F\u0443\u0441\u043A\u0430\u0435\u043C\u043E\u0435 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0430\u043C\u0438 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u0438\u0445 \u0440\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u0438\u0445 \u0438\u0437\u0434\u0430\u043D\u0438\u0439, \u043F\u043E\u0434\u0432\u0435\u0440\u0433\u0448\u0438\u0445\u0441\u044F \u0434\u0430\u0432\u043B\u0435\u043D\u0438\u044E \u0441\u043E \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u0433\u043E\u0441\u0443\u0434\u0430\u0440\u0441\u0442\u0432\u0430. \u041F\u0438\u0448\u0435\u043C \u043E \u0420\u043E\u0441\u0441\u0438\u0438 \u0438 \u043D\u0435 \u0442\u043E\u043B\u044C\u043A\u043E.'  # noqa: E501
     publisher             = 'poligon.media'
     category              = 'news'
     cover_url = u'https://www.plgnmedia.io/wp-content/uploads/2022/02/poligon-share.png'
diff --git a/recipes/poliitico_eu.recipe b/recipes/poliitico_eu.recipe
index 44f4e9f484..666dfcae67 100644
--- a/recipes/poliitico_eu.recipe
+++ b/recipes/poliitico_eu.recipe
@@ -19,7 +19,7 @@ class Politico(BasicNewsRecipe):
      ' intelligence about European politics and policy. Download Weekly.')
     publisher = 'Axel Springer SE.'
     category = 'news, politics, Europe'
-    oldest_article = 7 # days
+    oldest_article = 7  # days
     max_articles_per_feed = 20
     use_embedded_content = False
     no_stylesheets = True
diff --git a/recipes/politiko_dk.recipe b/recipes/politiko_dk.recipe
index 5d5228c6c3..82a602eb8e 100644
--- a/recipes/politiko_dk.recipe
+++ b/recipes/politiko_dk.recipe
@@ -26,10 +26,10 @@ class PolitikoDK(BasicNewsRecipe):
     auto_cleanup          = False
 
     keep_only_tags = [
-        dict(name="h1", attrs={'class': 'article-headline'}),
-        dict(name="p", attrs={'class': 'article-summary'}),
-        dict(name="div", attrs={'class': 'article-date'}),
-        dict(name="div", attrs={'class': 'article-content'}),
+        dict(name='h1', attrs={'class': 'article-headline'}),
+        dict(name='p', attrs={'class': 'article-summary'}),
+        dict(name='div', attrs={'class': 'article-date'}),
+        dict(name='div', attrs={'class': 'article-content'}),
     ]
 
     # Feed are found here: http://www.b.dk/rss
diff --git a/recipes/polizeipress_de.recipe b/recipes/polizeipress_de.recipe
index 86a511331e..5c89167a6e 100644
--- a/recipes/polizeipress_de.recipe
+++ b/recipes/polizeipress_de.recipe
@@ -5,7 +5,10 @@ class AdvancedUserRecipe(BasicNewsRecipe):
 
     title = u'Polizeipresse - Deutschland'
     __author__ = 'schuster'
-    description = 'Tagesaktuelle "Polizeiberichte" aus ganz Deutschland (bis auf Ortsebene).' 'Um deinen Ort/Stadt/Kreis usw. einzubinden, gehe auf "http://www.presseportal.de/polizeipresse/" und suche im oberen "Suchfeld" nach dem Namen.'   'Oberhalb der Suchergebnisse (Folgen:) auf den üblichen link zu den RSS-Feeds klicken und den RSS-link im Rezept unter "feeds" eintragen wie üblich.'   'Die Auswahl von Orten kann vereinfacht werden wenn man den Suchbegriff wie folgt eingibt:' '"Stadt-Ort".'  # noqa
+    description = ('Tagesaktuelle "Polizeiberichte" aus ganz Deutschland (bis auf Ortsebene). '
+        'Um deinen Ort/Stadt/Kreis usw. einzubinden, gehe auf "http://www.presseportal.de/polizeipresse/" und suche im oberen "Suchfeld" nach dem Namen. '
+        'Oberhalb der Suchergebnisse (Folgen:) auf den üblichen link zu den RSS-Feeds klicken und den RSS-link im Rezept unter "feeds" eintragen wie üblich. '
+        'Die Auswahl von Orten kann vereinfacht werden wenn man den Suchbegriff wie folgt eingibt: "Stadt-Ort".')
     oldest_article = 21
     max_articles_per_feed = 100
     no_stylesheets = True
@@ -22,8 +25,7 @@ class AdvancedUserRecipe(BasicNewsRecipe):
 
     def print_version(self, url):
         segments = url.split('/')
-        printURL = 'http://www.presseportal.de/print.htx?nr=' + \
-            '/'.join(segments[5:6]) + '&type=polizei'
+        printURL = 'http://www.presseportal.de/print.htx?nr=' + '/'.join(segments[5:6]) + '&type=polizei'
         return printURL
 
     feeds = [(u'Frimmerdorf', u'http://www.presseportal.de/rss/rss2_vts.htx?q=Grevenbroich-frimmersdorf&w=public_service'),
diff --git a/recipes/polter_pl.recipe b/recipes/polter_pl.recipe
index ada19901fd..f5cf9e631e 100644
--- a/recipes/polter_pl.recipe
+++ b/recipes/polter_pl.recipe
@@ -7,10 +7,10 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Polter(BasicNewsRecipe):
     title = u'Polter.pl'
     __author__ = 'fenuks'
-    description = u'Największy polski serwis poświęcony ogólno pojętej fantastyce - grom fabularnym (RPG), książkom, filmowi, komiksowi, grom planszowym, karcianym i bitewnym.'  # noqa
+    description = u'Największy polski serwis poświęcony ogólno pojętej fantastyce - grom fabularnym (RPG), książkom, filmowi, komiksowi, grom planszowym, karcianym i bitewnym.'  # noqa: E501
     category = 'fantasy, books, rpg, games'
     language = 'pl'
-    extra_css = '.image, .floatright {float: right; margin-left: 10px;} .floatleft {float: left; margin-right: 10px;} .calibre_navbar {clear: both;} .p_title {font-weight: bold;} .p_image {margin-left: auto; margin-right: auto; display: block;} .italic {font-style: italic;}'  # noqa
+    extra_css = '.image, .floatright {float: right; margin-left: 10px;} .floatleft {float: left; margin-right: 10px;} .calibre_navbar {clear: both;} .p_title {font-weight: bold;} .p_image {margin-left: auto; margin-right: auto; display: block;} .italic {font-style: italic;}'  # noqa: E501
     cover_url = 'http://static.polter.pl/sub/promo/bpromo2524.jpg'
     use_embedded_content = False
     oldest_article = 7
@@ -41,9 +41,9 @@ class Polter(BasicNewsRecipe):
     (u'Konwenty', 'http://konwenty.polter.pl/wiesci,rss.html')]
 
     def preprocess_html(self, soup):
-        for s in soup.findAll(attrs={'style': re.compile('float: ?left')}):
+        for s in soup.findAll(attrs={'style': re.compile(r'float: ?left')}):
             s['class'] = 'floatleft'
-        for s in soup.findAll(attrs={'style': re.compile('float: ?right')}):
+        for s in soup.findAll(attrs={'style': re.compile(r'float: ?right')}):
             s['class'] = 'floatright'
         for s in soup.findAll(style=True):
             if 'bold;' in s['style']:
diff --git a/recipes/popscience.recipe b/recipes/popscience.recipe
index 002b266e9f..e86741c363 100644
--- a/recipes/popscience.recipe
+++ b/recipes/popscience.recipe
@@ -26,7 +26,7 @@ class AdvancedUserRecipe1282101454(BasicNewsRecipe):
         classes('Article-header Article-excerpt Article-author Article-thumbnail Article-bodyText article-title article-dek article-paragraph articlebody'),
     ]
     remove_tags = [
-        dict(name='section',   attrs={'class': ['recurrent-share']})
+        dict(name='section', attrs={'class': ['recurrent-share']})
     ]
 
     def parse_section_index(self, slug):
diff --git a/recipes/portafolio.recipe b/recipes/portafolio.recipe
index ffdc530f85..df17cfb4dc 100644
--- a/recipes/portafolio.recipe
+++ b/recipes/portafolio.recipe
@@ -20,12 +20,12 @@ class AdvancedUserRecipe1311799898(BasicNewsRecipe):
     masthead_url = 'http://www.portafolio.co/sites/portafolio.co/themes/portafolio_2011/logo.png'
     publication_type = 'newspaper'
 
-    extra_css             = """
+    extra_css             = '''
                                p{text-align: justify; font-size: 100%}
                                body{ text-align: left; font-size:100% }
                                h1{font-family: sans-serif; font-size:150%; font-weight:bold; text-align: justify; }
                                h3{font-family: sans-serif; font-size:100%; font-style: italic; text-align: justify; }
-                                 """
+                                 '''
 
     feeds = [(u'Negocios', u'http://www.portafolio.co/negocios/feed'),
              (u'Economia', u'http://www.portafolio.co/economia/feed'),
diff --git a/recipes/ppe_pl.recipe b/recipes/ppe_pl.recipe
index 354b5eec5d..e5e7279ab4 100644
--- a/recipes/ppe_pl.recipe
+++ b/recipes/ppe_pl.recipe
@@ -11,7 +11,6 @@ class ppeRecipe(BasicNewsRecipe):
     category = u'News'
     description = u'Portal o konsolach i grach wideo.'
     extra_css = '.categories > li {list-style: none; display: inline;} .galmini > li {list-style: none; float: left;} .calibre_navbar {clear: both;}'
-    remove_empty_feeds = True
     no_stylesheets = True
     oldest_article = 7
     max_articles_per_feed = 100
diff --git a/recipes/pravda_por.recipe b/recipes/pravda_por.recipe
index 274576b4ee..31b88dec59 100644
--- a/recipes/pravda_por.recipe
+++ b/recipes/pravda_por.recipe
@@ -22,10 +22,10 @@ class Pravda_port(BasicNewsRecipe):
     remove_empty_feeds = True
     publication_type = 'newspaper'
     masthead_url = 'http://port.pravda.ru/pix/logo.gif'
-    extra_css             = """
+    extra_css             = '''
                                body{font-family: Arial,sans-serif }
                                img{margin-bottom: 0.4em; display:block}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/pravda_uk.recipe b/recipes/pravda_uk.recipe
index 32ffbeb26c..360d9dbf31 100644
--- a/recipes/pravda_uk.recipe
+++ b/recipes/pravda_uk.recipe
@@ -9,7 +9,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class PravdaUAUA(BasicNewsRecipe):
     title = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430 \u043F\u0440\u0430\u0432\u0434\u0430'
     __author__ = 'bugmen00t'
-    description = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0435 \u0441\u0443\u0441\u043F\u0456\u043B\u044C\u043D\u043E-\u043F\u043E\u043B\u0456\u0442\u0438\u0447\u043D\u0435 \u0456\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0417\u041C\u0406'  # noqa
+    description = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0435 \u0441\u0443\u0441\u043F\u0456\u043B\u044C\u043D\u043E-\u043F\u043E\u043B\u0456\u0442\u0438\u0447\u043D\u0435 \u0456\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0417\u041C\u0406'  # noqa: E501
     publisher = 'pravda.com.ua'
     category = 'newspaper'
     cover_url = u'https://img.pravda.com/images/up_for_fb.gif'
diff --git a/recipes/pravda_ukraine_ru.recipe b/recipes/pravda_ukraine_ru.recipe
index e8dd1a9ed1..6a605cd8dd 100644
--- a/recipes/pravda_ukraine_ru.recipe
+++ b/recipes/pravda_ukraine_ru.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class PravdaUARU(BasicNewsRecipe):
     title = '\u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0430\u044F \u043F\u0440\u0430\u0432\u0434\u0430'
     __author__ = 'bugmen00t'
-    description = '\u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0438\u0437\u0434\u0430\u043D\u0438\u0435, \u043E\u0441\u043D\u043E\u0432\u043D\u0430\u044F \u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430 \u2014 \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430, \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0435 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u044B, \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u043A\u0430. '  # noqa
+    description = '\u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0438\u0437\u0434\u0430\u043D\u0438\u0435, \u043E\u0441\u043D\u043E\u0432\u043D\u0430\u044F \u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430 \u2014 \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430, \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0435 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u044B, \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u043A\u0430. '  # noqa: E501
     publisher = 'pravda.com.ua'
     category = 'newspaper'
     cover_url = u'https://img.pravda.com/images/up_for_fb.gif'
diff --git a/recipes/presse_portal.recipe b/recipes/presse_portal.recipe
index eda9430236..fae834986e 100644
--- a/recipes/presse_portal.recipe
+++ b/recipes/presse_portal.recipe
@@ -23,8 +23,7 @@ class PressePortalDE(BasicNewsRecipe):
     description = u'Presseportal News Feed DE'
     # add date to description so for dayly downloads you can find them easier
     # ---- can be edit by user
-    description = description + ' fetched: ' + \
-        datetime.now().strftime("%Y-%m-%d")  # %H:%M:%S")
+    description = description + ' fetched: ' + datetime.now().strftime('%Y-%m-%d')  # %H:%M:%S")
     # Who published the content?
     publisher = u'Presseportal.de'
     # What is the content of?
@@ -142,6 +141,6 @@ class PressePortalDE(BasicNewsRecipe):
         # and split this at the symbol '.' (if there) : ('3120111',)
         # from this take the first tuple. '3120111'
         side = (url.rpartition('/')[-1]).rsplit('.', 1)[0]
-        # print 'ConvertPrintURL from :  ' + url + '/n to ' + side
+        # print('ConvertPrintURL from :  ' + url + '/n to ' + side)
         printurl = 'http://www.presseportal.de/print/' + side + '-print.html'
         return printurl
diff --git a/recipes/private_eye.recipe b/recipes/private_eye.recipe
index 5881eb5b90..f00ffaf4d4 100644
--- a/recipes/private_eye.recipe
+++ b/recipes/private_eye.recipe
@@ -77,10 +77,10 @@ class PrivateEyeRecipe(BasicNewsRecipe):
         try:
             day, month, year = next_issue_text.split(' ')
             day = ''.join(c for c in day if c.isdigit())
-            pub_date = datetime.strptime(" ".join((day, month, year)), "%d %B %Y") - timedelta(12)
+            pub_date = datetime.strptime(' '.join((day, month, year)), '%d %B %Y') - timedelta(12)
             self.log('pub-date:', pub_date)
-            self.conversion_options.update({'pubdate': datetime.strftime(pub_date, "%d %B %Y").lstrip("0")})
-            title = self.title + " " + datetime.strftime(pub_date, "%Y-%m-%d")
+            self.conversion_options.update({'pubdate': datetime.strftime(pub_date, '%d %B %Y').lstrip('0')})
+            title = self.title + ' ' + datetime.strftime(pub_date, '%Y-%m-%d')
             self.conversion_options.update({'title': title})
             self.conversion_options.update({'title_sort': title})
         except (TypeError, ValueError):
@@ -124,24 +124,24 @@ class PrivateEyeRecipe(BasicNewsRecipe):
     def preprocess_html(self, soup):
         # Remove <a> tag link to crossword image
         for tag in soup.findAll('a', {'href': re.compile(r'/pictures/crossword/')}):
-            self.log("Removing link to crossword image...")
+            self.log('Removing link to crossword image...')
             tag.unwrap()
 
         # Remove align tag in crossword image (so float right works)
         for tag in soup.findAll('img', {'src': re.compile(r'/pictures/crossword/')}):
-            if "align" in tag.attrs:
-                self.log("Removing crossword image align attribute...")
+            if 'align' in tag.attrs:
+                self.log('Removing crossword image align attribute...')
                 del tag.attrs['align']
 
         return soup
 
     # We remove vast swathes of HTML which is not part of the articles.
     # Remove sibling content
-    remove_tags_before =  [
-        {'name': 'div', 'class': "article"},
-        {'name': 'div', 'id': "page"},
-        {'name': 'div', 'id': "page-wide"},
-        {'name': 'div', 'id': "content"},
+    remove_tags_before = [
+        {'name': 'div', 'class': 'article'},
+        {'name': 'div', 'id': 'page'},
+        {'name': 'div', 'id': 'page-wide'},
+        {'name': 'div', 'id': 'content'},
         {'name': 'a', '  attrs': {'href': 'https://shop.private-eye.co.uk'}},
     ]
     remove_tags_after = remove_tags_before.copy()
@@ -161,9 +161,9 @@ class PrivateEyeRecipe(BasicNewsRecipe):
         {'name': 'div', 'attrs': {'id': 'about-covers'}},
         {'name': 'a', '  attrs': {'href': 'https://shop.private-eye.co.uk'}},
         {'name': 'iframe'},
-        {'name': 'link', 'attrs': {'href': re.compile('/javastyle/lightbox/')}},
-        {'name': 'link', 'attrs': {'href': re.compile('/javastyle/news_ticker/')}},
-        {'name': 'link', 'attrs': {'href': re.compile('/javastyle/media-queries-')}},
+        {'name': 'link', 'attrs': {'href': re.compile(r'/javastyle/lightbox/')}},
+        {'name': 'link', 'attrs': {'href': re.compile(r'/javastyle/news_ticker/')}},
+        {'name': 'link', 'attrs': {'href': re.compile(r'/javastyle/media-queries-')}},
     ]
 
     # Convert headers to h1, strapline to h4
diff --git a/recipes/pro_physik.recipe b/recipes/pro_physik.recipe
index 8c945069fb..be1e30e2cf 100644
--- a/recipes/pro_physik.recipe
+++ b/recipes/pro_physik.recipe
@@ -31,7 +31,7 @@ class AdvancedUserRecipe1303841067(BasicNewsRecipe):
 
     # cover_url = file:///c:/Users/YOUR_USERNAME/AppData/Roaming/calibre/resources/images/news_covers/Pro_Physik.png
 
-    extra_css      =  '''
+    extra_css      = '''
                         h1 {font-size: 1.6em; text-align: left}
                         h2, h3 {font-size: 1.3em;text-align: left}
                         h2.subtitle {font-size: 1.2em;text-align: left;font-style: italic}
@@ -45,10 +45,10 @@ class AdvancedUserRecipe1303841067(BasicNewsRecipe):
                         ]
 
     remove_tags = [
-                       dict(name='ul', attrs={'class':["wj-share-buttons"]}),  #Block social media
+                       dict(name='ul', attrs={'class':['wj-share-buttons']}),  # Block social media
                   ]
 
     feeds = [
               (u'Nachrichten', u'https://pro-physik.de/rss/news/'),
-#              (u'Veranstaltungen', u'https://pro-physik.de/rss/events/'), # AGe 2024-02-11
+              # (u'Veranstaltungen', u'https://pro-physik.de/rss/events/'), # AGe 2024-02-11
             ]
diff --git a/recipes/project.recipe b/recipes/project.recipe
index ebb3c672a1..b6ea7dc88c 100644
--- a/recipes/project.recipe
+++ b/recipes/project.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Project(BasicNewsRecipe):
     title = '\u041F\u0440\u043E\u0435\u043A\u0442'
     __author__ = 'bugmen00t'
-    description = '\u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0438\u0437\u0434\u0430\u043D\u0438\u0435, \u0441\u043E\u0437\u0434\u0430\u043D\u043D\u043E\u0435 \u0431\u044B\u0432\u0448\u0438\u043C \u0433\u043B\u0430\u0432\u043D\u044B\u043C \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u043E\u043C \u0442\u0435\u043B\u0435\u043A\u0430\u043D\u0430\u043B\u0430 \u00AB\u0414\u043E\u0436\u0434\u044C\u00BB \u0438 \u0434\u0440\u0443\u0433\u0438\u0445 \u0421\u041C\u0418 \u0420\u043E\u043C\u0430\u043D\u043E\u043C \u0411\u0430\u0434\u0430\u043D\u0438\u043D\u044B\u043C, \u043A\u043E\u0442\u043E\u0440\u0435 \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u0438\u0437\u0438\u0440\u0443\u044E\u0435\u0442\u0441\u044F \u043D\u0430 \u0440\u0430\u0441\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u043E\u0439 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0438\u043A\u0435.'  # noqa
+    description = '\u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0438\u0437\u0434\u0430\u043D\u0438\u0435, \u0441\u043E\u0437\u0434\u0430\u043D\u043D\u043E\u0435 \u0431\u044B\u0432\u0448\u0438\u043C \u0433\u043B\u0430\u0432\u043D\u044B\u043C \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u043E\u043C \u0442\u0435\u043B\u0435\u043A\u0430\u043D\u0430\u043B\u0430 \u00AB\u0414\u043E\u0436\u0434\u044C\u00BB \u0438 \u0434\u0440\u0443\u0433\u0438\u0445 \u0421\u041C\u0418 \u0420\u043E\u043C\u0430\u043D\u043E\u043C \u0411\u0430\u0434\u0430\u043D\u0438\u043D\u044B\u043C, \u043A\u043E\u0442\u043E\u0440\u0435 \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u0438\u0437\u0438\u0440\u0443\u044E\u0435\u0442\u0441\u044F \u043D\u0430 \u0440\u0430\u0441\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u043E\u0439 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0438\u043A\u0435.'  # noqa: E501
     publisher = '\u0420\u043E\u043C\u0430\u043D \u0411\u0430\u0434\u0430\u043D\u0438\u043D'
     category = 'blog'
     cover_url = u'https://proektmedia-stat.ams3.digitaloceanspaces.com/2018/08/proektmedia_facebook_default.png'
diff --git a/recipes/project_syndicate.recipe b/recipes/project_syndicate.recipe
index 0bd7caac26..9305be77fb 100644
--- a/recipes/project_syndicate.recipe
+++ b/recipes/project_syndicate.recipe
@@ -24,7 +24,7 @@ class projectsynd(BasicNewsRecipe):
     resolve_internal_links  = True
     remove_empty_feeds = True
     remove_attributes = ['style', 'height', 'width']
-    oldest_article = 7 # days
+    oldest_article = 7  # days
     storage = []
 
     articles_are_obfuscated = True
@@ -60,7 +60,7 @@ class projectsynd(BasicNewsRecipe):
     keep_only_tags = [
         dict(attrs={'itemprop':lambda x: x and 'associatedMedia' in x.split()}),
         dict(attrs={'itemprop':['headline', 'datePublished', 'author', 'abstract', 'articleBody']}),
-        dict(name = 'aside', attrs={'data-page-area':'article-bottom'})
+        dict(name='aside', attrs={'data-page-area':'article-bottom'})
     ]
 
     remove_tags = [
diff --git a/recipes/prosleduet.recipe b/recipes/prosleduet.recipe
index e7ed9666b8..3900da0be7 100644
--- a/recipes/prosleduet.recipe
+++ b/recipes/prosleduet.recipe
@@ -26,12 +26,12 @@ class ProSleduet(BasicNewsRecipe):
 
     remove_tags_after = dict(name='div', attrs={'class': 'container'})
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='div', attrs={'class': 'ya-share2 ya-share2_inited'})
         ]
 
     feeds = [
-#        ('\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0435\u043D\u0438\u0435 \u0441\u043B\u0435\u0434\u0443\u0435\u0442', 'https://prosleduet.media/feed/'),
+        # ('\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0435\u043D\u0438\u0435 \u0441\u043B\u0435\u0434\u0443\u0435\u0442', 'https://prosleduet.media/feed/'),
         ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://prosleduet.media/category/news/feed/'),
         ('\u041B\u044E\u0434\u0438', 'https://prosleduet.media/category/people/feed/'),
         ('\u0421\u044E\u0436\u0435\u0442\u044B', 'https://prosleduet.media/category/syuzhety/feed/'),
diff --git a/recipes/prospectmaguk_free.recipe b/recipes/prospectmaguk_free.recipe
index c37513a90d..b0018324df 100644
--- a/recipes/prospectmaguk_free.recipe
+++ b/recipes/prospectmaguk_free.recipe
@@ -8,47 +8,47 @@ from urllib.parse import urljoin
 
 from calibre.web.feeds.news import BasicNewsRecipe, prefixed_classes
 
-_issue_url = ""
+_issue_url = ''
 
 
 class ProspectMagazineUKFree(BasicNewsRecipe):
-    title = "Prospect Magazine (Free)"
-    __author__ = "ping"
+    title = 'Prospect Magazine (Free)'
+    __author__ = 'ping'
     description = (
-        "Prospect is Britain’s leading current affairs monthly magazine. "
-        "It is an independent and eclectic forum for writing and thinking—in "
-        "print and online. Published every month with two double issues in "
-        "the summer and winter, it spans politics, science, foreign affairs, "
-        "economics, the environment, philosophy and the arts."
+        'Prospect is Britain’s leading current affairs monthly magazine. '
+        'It is an independent and eclectic forum for writing and thinking—in '
+        'print and online. Published every month with two double issues in '
+        'the summer and winter, it spans politics, science, foreign affairs, '
+        'economics, the environment, philosophy and the arts.'
     )
-    language = "en_GB"
-    category = "news, UK"
-    publication_type = "magazine"
-    masthead_url = "https://media.prospectmagazine.co.uk/prod/images/gm_grid_thumbnail/358ffc17208c-f4c3cddcdeda-prospect-masthead.png"
-    encoding = "utf-8"
+    language = 'en_GB'
+    category = 'news, UK'
+    publication_type = 'magazine'
+    masthead_url = 'https://media.prospectmagazine.co.uk/prod/images/gm_grid_thumbnail/358ffc17208c-f4c3cddcdeda-prospect-masthead.png'
+    encoding = 'utf-8'
     remove_javascript = True
     no_stylesheets = True
-    ignore_duplicate_articles = {"url"}
-    INDEX = "https://www.prospectmagazine.co.uk/issues"
+    ignore_duplicate_articles = {'url'}
+    INDEX = 'https://www.prospectmagazine.co.uk/issues'
 
-    keep_only_tags = [dict(class_="prop-book-article-panel_main")]
+    keep_only_tags = [dict(class_='prop-book-article-panel_main')]
     remove_tags = [
         dict(
             class_=[
-                "prop-book-review-header-wrapper_magazine",
-                "prop-mobile-social-share_header",
-                "prop-magazine-link-block",
-                "pros-article-body__img-credit",
-                "pros-article-topics__wrapper",
-                "pros-article-author__image-wrapper",
-                "prop-book-review-promo_details-buy-mobile",
+                'prop-book-review-header-wrapper_magazine',
+                'prop-mobile-social-share_header',
+                'prop-magazine-link-block',
+                'pros-article-body__img-credit',
+                'pros-article-topics__wrapper',
+                'pros-article-author__image-wrapper',
+                'prop-book-review-promo_details-buy-mobile',
             ]
         ),
-        dict(id=["disqus_thread", "newsletter_wrapper"]),
-        prefixed_classes("dfp-slot-"),
+        dict(id=['disqus_thread', 'newsletter_wrapper']),
+        prefixed_classes('dfp-slot-'),
     ]
 
-    extra_css = """
+    extra_css = '''
     h1 { font-size: 1.8rem; margin-bottom: 0.4rem; }
     .prop-book-review-header-wrapper_standfirst { font-size: 1.2rem; font-style: italic; font-weight: normal; margin-bottom: 0.5rem; }
     .prop-book-review-header-wrapper_details {  margin-top: 1rem; margin-bottom: 1rem; }
@@ -62,23 +62,23 @@ class ProspectMagazineUKFree(BasicNewsRecipe):
     .pullquote, blockquote { text-align: center; margin-left: 0; margin-bottom: 0.4rem; font-size: 1.25rem; }
     .prop-book-review-article_author { margin: 1.5rem 0; font-style: italic; }
     .prop-book-review-promo { margin-bottom: 1rem; }
-    """
+    '''
 
     def preprocess_html(self, soup):
         # re-position lede image
-        lede_img = soup.find("img", class_="prop-book-review-header-wrapper_image")
-        meta = soup.find("div", class_="prop-book-review-header-wrapper_details")
+        lede_img = soup.find('img', class_='prop-book-review-header-wrapper_image')
+        meta = soup.find('div', class_='prop-book-review-header-wrapper_details')
         if lede_img and meta:
             lede_img = lede_img.extract()
             meta.insert_after(lede_img)
 
-        for img in soup.find_all("img", attrs={"data-src": True}):
-            img["src"] = img["data-src"]
-            del img["data-src"]
+        for img in soup.find_all('img', attrs={'data-src': True}):
+            img['src'] = img['data-src']
+            del img['data-src']
 
-        for byline_link in soup.find_all("a", attrs={"data-author-name": True}):
+        for byline_link in soup.find_all('a', attrs={'data-author-name': True}):
             byline_link.unwrap()
-        for author_link in soup.find_all("a", class_="pros-article-author"):
+        for author_link in soup.find_all('a', class_='pros-article-author'):
             author_link.unwrap()
 
         return soup
@@ -87,39 +87,39 @@ class ProspectMagazineUKFree(BasicNewsRecipe):
         if not _issue_url:
             issues_soup = self.index_to_soup(self.INDEX)
             curr_issue_a_ele = issues_soup.find(
-                "a", class_="pros-collection-landing__item"
+                'a', class_='pros-collection-landing__item'
             )
-            curr_issue_url = urljoin(self.INDEX, curr_issue_a_ele["href"])
+            curr_issue_url = urljoin(self.INDEX, curr_issue_a_ele['href'])
         else:
             curr_issue_url = _issue_url
 
         soup = self.index_to_soup(curr_issue_url)
         issue_name = (
-            self.tag_to_string(soup.find(class_="magazine-lhc__issue-name"))
-            .replace(" issue", "")
+            self.tag_to_string(soup.find(class_='magazine-lhc__issue-name'))
+            .replace(' issue', '')
             .strip()
         )
-        self.timefmt = f" [{issue_name}]"
+        self.timefmt = f' [{issue_name}]'
 
-        self.cover_url = soup.find("img", class_="magazine-lhc__cover-image")[
-            "data-src"
-        ].replace("portrait_small_fit", "portrait_large_fit")
+        self.cover_url = soup.find('img', class_='magazine-lhc__cover-image')[
+            'data-src'
+        ].replace('portrait_small_fit', 'portrait_large_fit')
 
         articles = OrderedDict()
-        sections = soup.find_all("div", class_="pro-magazine-section")
+        sections = soup.find_all('div', class_='pro-magazine-section')
         for section in sections:
             section_name = self.tag_to_string(
-                section.find(class_="pro-magazine-section__name")
+                section.find(class_='pro-magazine-section__name')
             )
             for sect_article in section.find_all(
-                class_="pro-magazine-section__article"
+                class_='pro-magazine-section__article'
             ):
                 articles.setdefault(section_name, []).append(
                     {
-                        "url": urljoin(self.INDEX, sect_article.find("a")["href"]),
-                        "title": self.tag_to_string(
+                        'url': urljoin(self.INDEX, sect_article.find('a')['href']),
+                        'title': self.tag_to_string(
                             sect_article.find(
-                                class_="pro-magazine-section__article-headline"
+                                class_='pro-magazine-section__article-headline'
                             )
                         ),
                     }
diff --git a/recipes/psych.recipe b/recipes/psych.recipe
index b5353a4f1e..b07ed764d5 100644
--- a/recipes/psych.recipe
+++ b/recipes/psych.recipe
@@ -5,10 +5,10 @@ from calibre.web.feeds.recipes import BasicNewsRecipe
 
 
 def absurl(url):
-    if url.startswith("//"):
-        return "https:" + url
-    if url.startswith("/"):
-        return "https://www.psychologytoday.com" + url
+    if url.startswith('//'):
+        return 'https:' + url
+    if url.startswith('/'):
+        return 'https://www.psychologytoday.com' + url
     return url
 
 
diff --git a/recipes/quanta_magazine.recipe b/recipes/quanta_magazine.recipe
index 404b7d5a50..aa9d7567fd 100644
--- a/recipes/quanta_magazine.recipe
+++ b/recipes/quanta_magazine.recipe
@@ -7,25 +7,25 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class Quanta(BasicNewsRecipe):
-    title = "Quanta Magazine"
+    title = 'Quanta Magazine'
     __author__ = 'lui1'
-    description = "Articles from the magazine. Please set to download weekly."
+    description = 'Articles from the magazine. Please set to download weekly.'
 
     oldest_article = 7
     max_articles_per_feed = 100
     language = 'en'
     encoding = 'UTF-8'
-    publication_type = "blog"
-    cover_url = "https://d2r55xnwy6nx47.cloudfront.net/uploads/2017/05/logo.png"
+    publication_type = 'blog'
+    cover_url = 'https://d2r55xnwy6nx47.cloudfront.net/uploads/2017/05/logo.png'
 
     feeds = [
         ('Articles', 'https://api.quantamagazine.org/feed/'),
     ]
 
     keep_only_tags = [
-        dict(name="div", attrs={"id": "postBody"}),
+        dict(name='div', attrs={'id': 'postBody'}),
     ]
 
     remove_tags = [
-        dict(name="div", attrs={"class": "post__sidebar__content"}),
+        dict(name='div', attrs={'class': 'post__sidebar__content'}),
     ]
diff --git a/recipes/queueacmorg.recipe b/recipes/queueacmorg.recipe
index e58878f435..deb7053020 100644
--- a/recipes/queueacmorg.recipe
+++ b/recipes/queueacmorg.recipe
@@ -11,17 +11,17 @@ ACM Queue Magazine
 
 
 class QueueAcmOrg(BasicNewsRecipe):
-    title = "ACM Queue Magazine"
+    title = 'ACM Queue Magazine'
     __author__ = 'yodha8'
-    description = "Queue is the ACM magazine for practicing software engineers. Published once every 2 months. Example: Jan-Feb."
+    description = 'Queue is the ACM magazine for practicing software engineers. Published once every 2 months. Example: Jan-Feb.'
     oldest_article = 60
     max_articles_per_feed = 50
     auto_cleanup = True
     language = 'en'
-    cover_url = "https://queue.acm.org/img/acmqueue_logo.gif"
+    cover_url = 'https://queue.acm.org/img/acmqueue_logo.gif'
 
     feeds = [
-        ("All Queue Content", "https://queue.acm.org/rss/feeds/queuecontent.xml"),
+        ('All Queue Content', 'https://queue.acm.org/rss/feeds/queuecontent.xml'),
     ]
 
     def get_cover_url(self):
diff --git a/recipes/radio_canada.recipe b/recipes/radio_canada.recipe
index 765c40920b..1316a844f0 100644
--- a/recipes/radio_canada.recipe
+++ b/recipes/radio_canada.recipe
@@ -24,6 +24,7 @@ def classes(classes):
     return dict(attrs={
         'class': lambda x: x and frozenset(x.split()).intersection(q)})
 
+
 class RadioCanada(BasicNewsRecipe):
     title            = 'Radio Canada'
     __author__       = 'quatorze, pticrix'
@@ -47,28 +48,28 @@ class RadioCanada(BasicNewsRecipe):
     '''
 
     keep_only_tags = [
-        classes('text-fluid1' # title
-                ' group/signature' # author (top)
-                ' sc-jbo7hw-6 cemuXe sc-1ejcmnj-0 bKbDpQ' # whole article block
-                ' sc-jbo7hw-4 gPWroG' # individual paragraphs
-                ' sc-jbo7hw-3 GgmiC' # section title (h2 headings)
-                ' sc-1tkrlyq-0 sc-1tkrlyq-1 eJZZNJ dthPak sc-1fmq1ly-0 hGSCGE' # images
-                ' sc-1tkrlyq-2 gucMx transition-opacity ease-out' # images
-                ' sc-ic6be9-0 eZGuin' # figure/picture caption
+        classes('text-fluid1'  # title
+                ' group/signature'  # author (top)
+                ' sc-jbo7hw-6 cemuXe sc-1ejcmnj-0 bKbDpQ'  # whole article block
+                ' sc-jbo7hw-4 gPWroG'  # individual paragraphs
+                ' sc-jbo7hw-3 GgmiC'  # section title (h2 headings)
+                ' sc-1tkrlyq-0 sc-1tkrlyq-1 eJZZNJ dthPak sc-1fmq1ly-0 hGSCGE'  # images
+                ' sc-1tkrlyq-2 gucMx transition-opacity ease-out'  # images
+                ' sc-ic6be9-0 eZGuin'  # figure/picture caption
                 ' blockquote'
                  ),
     ]
 
     remove_tags    = [
-            classes('print:hidden' # whatever is deemed not necessary while printing
-                    ' xsOnly:hidden' # whetever is deemed not necessary on very small screens
-                    ' sc-jbo7hw-0 dQmOIK' # ads
-                    ' sc-1f1cagl-0 hvyKh' # buttons? (full-screen, contact author)
-                    ' sc-jbo7hw-2' # link to full dossier and insights
-                    ' sc-fqkvVR crilYZ rcplayer-show' # video player
-                    ' framed' # "À lire aussi" (might be desirable in some cases?)
-                    ' bg-gray100 light:bg-gray100 dark:bg-gray999 lg:mt-10 print:hidden' # "À la une" (links to other current events) and more
-                    ' sc-pahfbg-0 beUHeC' # Infolettre
+            classes('print:hidden'  # whatever is deemed not necessary while printing
+                    ' xsOnly:hidden'  # whetever is deemed not necessary on very small screens
+                    ' sc-jbo7hw-0 dQmOIK'  # ads
+                    ' sc-1f1cagl-0 hvyKh'  # buttons? (full-screen, contact author)
+                    ' sc-jbo7hw-2'  # link to full dossier and insights
+                    ' sc-fqkvVR crilYZ rcplayer-show'  # video player
+                    ' framed'  # "À lire aussi" (might be desirable in some cases?)
+                    ' bg-gray100 light:bg-gray100 dark:bg-gray999 lg:mt-10 print:hidden'  # "À la une" (links to other current events) and more
+                    ' sc-pahfbg-0 beUHeC'  # Infolettre
                     ),
             dict(name='aside')
     ]
@@ -103,7 +104,7 @@ class RadioCanada(BasicNewsRecipe):
         ('Grands titres',   'https://ici.radio-canada.ca/rss/771'),
         ('Football',        'https://ici.radio-canada.ca/rss/1000057'),
         ('Hockey',          'https://ici.radio-canada.ca/rss/1000056'),
-        ('Olympiques',        'https://ici.radio-canada.ca/rss/64852'),
+        ('Olympiques',      'https://ici.radio-canada.ca/rss/64852'),
         ('Podium',          'https://ici.radio-canada.ca/rss/555082'),
         ('Soccer',          'https://ici.radio-canada.ca/rss/1000058'),
         ('Tennis',          'https://ici.radio-canada.ca/rss/1000059'),
@@ -151,16 +152,16 @@ class RadioCanada(BasicNewsRecipe):
     # The following was copied and adapted as per the following post:
     # https://www.mobileread.com/forums/showpost.php?p=1165462&postcount=6
     # Credit goes to user Starson17
-    def parse_feeds (self):
-      feeds = BasicNewsRecipe.parse_feeds(self)
-      for feed in feeds:
-        for article in feed.articles[:]:
-            if ('VIDEO' in article.title.upper() or
-                'OHDIO' in article.title.upper() or
-                '/emissions/' in article.url or
-                '/segments/' in article.url or
-                '/entrevue/' in article.url or
-                '/ohdio/' in article.url
-                ):
-                feed.articles.remove(article)
-      return feeds
+    def parse_feeds(self):
+        feeds = BasicNewsRecipe.parse_feeds(self)
+        for feed in feeds:
+            for article in feed.articles[:]:
+                if ('VIDEO' in article.title.upper() or
+                    'OHDIO' in article.title.upper() or
+                    '/emissions/' in article.url or
+                    '/segments/' in article.url or
+                    '/entrevue/' in article.url or
+                    '/ohdio/' in article.url
+                    ):
+                    feed.articles.remove(article)
+        return feeds
diff --git a/recipes/radio_prague.recipe b/recipes/radio_prague.recipe
index 55f4e8d15f..4aca975b09 100644
--- a/recipes/radio_prague.recipe
+++ b/recipes/radio_prague.recipe
@@ -18,7 +18,7 @@ class AdvancedUserRecipe1291540961(BasicNewsRecipe):
     language = 'en_CZ'
     publication_type = 'newsportal'
 
-    extra_css = 'h1 .section { display: block; text-transform: uppercase; font-size: 10px; margin-top: 4em; } \n .title { font-size: 14px; margin-top: 4em; } \n a.photo { display: block; clear:both; }  \n .caption { font-size: 9px; display: block; clear:both; padding:0px 0px 20px 0px; } \n a { font-type: normal; }'  # noqa
+    extra_css = 'h1 .section { display: block; text-transform: uppercase; font-size: 10px; margin-top: 4em; } \n .title { font-size: 14px; margin-top: 4em; } \n a.photo { display: block; clear:both; }  \n .caption { font-size: 9px; display: block; clear:both; padding:0px 0px 20px 0px; } \n a { font-type: normal; }'  # noqa: E501
 
     keep_only_tags = [
         dict(name='div', attrs={'class': ['main']})
diff --git a/recipes/radiosvoboda_ua.recipe b/recipes/radiosvoboda_ua.recipe
index 6aa730dee9..3520accab0 100644
--- a/recipes/radiosvoboda_ua.recipe
+++ b/recipes/radiosvoboda_ua.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class RadioSvoboda(BasicNewsRecipe):
     title = '\u0420\u0430\u0434\u0456\u043E \u0421\u0432\u043E\u0431\u043E\u0434\u0430'
     __author__ = 'bugmen00t'
-    description = '\u0420\u0430\u0434\u0456\u043E\u0441\u0442\u0430\u043D\u0446\u0456\u044F \u0442\u0430 \u0456\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0432\u0438\u0434\u0430\u043D\u043D\u044F, \u044F\u043A\u0430 \u043F\u043E\u0437\u0438\u0446\u0456\u043E\u043D\u0443\u0454 \u0441\u0435\u0431\u0435 \u044F\u043A \u043F\u0440\u0438\u0432\u0430\u0442\u043D\u0438\u0439 \u043D\u0435\u043A\u043E\u043C\u0435\u0440\u0446\u0456\u0439\u043D\u0438\u0439 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u043E-\u043D\u043E\u0432\u0438\u043D\u043D\u0438\u0439 \u0437\u0430\u0441\u0456\u0431 \u043C\u0430\u0441\u043E\u0432\u043E\u0457 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0457.'  # noqa
-    publisher = '\u0420\u0430\u0434\u0456\u043E \u0412\u0456\u043B\u044C\u043D\u0430 \u0404\u0432\u0440\u043E\u043F\u0430/\u0420\u0430\u0434\u0456\u043E \u0421\u0432\u043E\u0431\u043E\u0434\u0430 (\u0420\u0412\u0404/\u0420\u0421)'  # noqa
+    description = '\u0420\u0430\u0434\u0456\u043E\u0441\u0442\u0430\u043D\u0446\u0456\u044F \u0442\u0430 \u0456\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0432\u0438\u0434\u0430\u043D\u043D\u044F, \u044F\u043A\u0430 \u043F\u043E\u0437\u0438\u0446\u0456\u043E\u043D\u0443\u0454 \u0441\u0435\u0431\u0435 \u044F\u043A \u043F\u0440\u0438\u0432\u0430\u0442\u043D\u0438\u0439 \u043D\u0435\u043A\u043E\u043C\u0435\u0440\u0446\u0456\u0439\u043D\u0438\u0439 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u043E-\u043D\u043E\u0432\u0438\u043D\u043D\u0438\u0439 \u0437\u0430\u0441\u0456\u0431 \u043C\u0430\u0441\u043E\u0432\u043E\u0457 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0457.'  # noqa: E501
+    publisher = '\u0420\u0430\u0434\u0456\u043E \u0412\u0456\u043B\u044C\u043D\u0430 \u0404\u0432\u0440\u043E\u043F\u0430/\u0420\u0430\u0434\u0456\u043E \u0421\u0432\u043E\u0431\u043E\u0434\u0430 (\u0420\u0412\u0404/\u0420\u0421)'  # noqa: E501
     category = 'newspaper'
     cover_url = u'https://www.radiosvoboda.org/Content/responsive/RFE/uk-UA/img/top_logo_news.png'
     language = 'uk'
diff --git a/recipes/rbc_ru.recipe b/recipes/rbc_ru.recipe
index 271b842060..8f9a02e7ce 100644
--- a/recipes/rbc_ru.recipe
+++ b/recipes/rbc_ru.recipe
@@ -4,7 +4,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class RBC_ru(BasicNewsRecipe):
     title = u'RBC.ru'
     __author__ = 'A. Chewi (with fixes by bugmen00t)'
-    description = 'Российское информационное агентство «РосБизнесКонсалтинг» (РБК) - ленты новостей политики, экономики и финансов, аналитические материалы, комментарии и прогнозы, тематические статьи'  # noqa
+    description = 'Российское информационное агентство «РосБизнесКонсалтинг» (РБК) - ленты новостей политики, экономики и финансов, аналитические материалы, комментарии и прогнозы, тематические статьи'  # noqa: E501
     needs_subscription = False
     cover_url = 'https://pics.rbc.ru/img/fp_v4/skin/img/logo.gif'
     cover_margins = (80, 160, '#ffffff')
diff --git a/recipes/rbcua_ru.recipe b/recipes/rbcua_ru.recipe
index df124ce296..c2b70ccf96 100644
--- a/recipes/rbcua_ru.recipe
+++ b/recipes/rbcua_ru.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class RBCUA(BasicNewsRecipe):
     title = '\u0420\u0411\u041A-\u0423\u043A\u0440\u0430\u0438\u043D\u0430'
     __author__ = 'bugmen00t'
-    description = '\u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u043E\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E, \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u0438\u0437\u0438\u0440\u0443\u044E\u0449\u0435\u0435\u0441\u044F \u043D\u0430 \u0444\u0438\u043D\u0430\u043D\u0441\u043E\u0432\u044B\u0445, \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u0438 \u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u043D\u043E\u0432\u043E\u0441\u0442\u044F\u0445 \u0423\u043A\u0440\u0430\u0438\u043D\u044B.'  # noqa
+    description = '\u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u043E\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E, \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u0438\u0437\u0438\u0440\u0443\u044E\u0449\u0435\u0435\u0441\u044F \u043D\u0430 \u0444\u0438\u043D\u0430\u043D\u0441\u043E\u0432\u044B\u0445, \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u0438 \u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u043D\u043E\u0432\u043E\u0441\u0442\u044F\u0445 \u0423\u043A\u0440\u0430\u0438\u043D\u044B.'  # noqa: E501
     publisher = '\u041E\u041E\u041E \u00AB\u042E\u0431\u0438\u0442\u0438 \u041C\u0435\u0434\u0438\u0430\u00BB'
     category = 'news'
     cover_url = u'https://www.rbc.ua/static/common/imgs/logo650.jpg'
diff --git a/recipes/rbcua_ua.recipe b/recipes/rbcua_ua.recipe
index 49779b7395..aa5b1628b9 100644
--- a/recipes/rbcua_ua.recipe
+++ b/recipes/rbcua_ua.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class RBCUA(BasicNewsRecipe):
     title = '\u0420\u0411\u041A-\u0423\u043A\u0440\u0430\u0457\u043D\u0430'
     __author__ = 'bugmen00t'
-    description = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0435 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E.'  # noqa
+    description = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0435 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E.'  # noqa: E501
     publisher = '\u0422\u041E\u0412 \u00AB\u042E\u0431\u0456\u0442\u0456 \u041C\u0435\u0434\u0456\u0430\u00BB'
     category = 'news'
     cover_url = u'https://www.rbc.ua/static/img/r/b/rbc_pic_best_news_650x410_2_650x410_1_650x410_1_480x270.jpg'
diff --git a/recipes/readers_digest.recipe b/recipes/readers_digest.recipe
index 79cd854ea8..9c373528c6 100644
--- a/recipes/readers_digest.recipe
+++ b/recipes/readers_digest.recipe
@@ -23,7 +23,6 @@ class ReadersDigest(BasicNewsRecipe):
     oldest_article = 60
     max_articles_per_feed = 200
 
-    language = 'en'
     remove_javascript = True
     remove_attributes = ['style']
 
diff --git a/recipes/readitlater.recipe b/recipes/readitlater.recipe
index 43c8c8211c..1c99c8b367 100644
--- a/recipes/readitlater.recipe
+++ b/recipes/readitlater.recipe
@@ -1,6 +1,6 @@
-"""
+'''
 Pocket Calibre Recipe v1.5
-"""
+'''
 import json
 import operator
 
@@ -53,15 +53,15 @@ class Pocket(BasicNewsRecipe):
     articles = []
 
     def get_browser(self, *args, **kwargs):
-        """
+        '''
         We need to pretend to be a recent version of safari for the mac to
         prevent User-Agent checks Pocket api requires username and password so
         fail loudly if it's missing from the config.
-        """
+        '''
         br = BasicNewsRecipe.get_browser(self,
-                                         user_agent='Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; \
-                        en-us) AppleWebKit/533.19.4 (KHTML, like Gecko) \
-                        Version/5.0.3 Safari/533.19.4')
+                                         user_agent='''Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; en-us)
+                        AppleWebKit/533.19.4 (KHTML, like Gecko)
+                        Version/5.0.3 Safari/533.19.4''')
         if self.username is not None and self.password is not None:
             br.open(self.legacy_login_url)
             br.select_form(nr=0)
@@ -69,33 +69,33 @@ class Pocket(BasicNewsRecipe):
             br['password'] = self.password
             br.submit()
         else:
-            self.user_error("This Recipe requires authentication")
+            self.user_error('This Recipe requires authentication')
         return br
 
     def get_auth_uri(self):
-        """Quick function to return the authentication part of the url"""
-        uri = ""
-        uri = u'{0}&apikey={1!s}'.format(uri, self.apikey)
+        '''Quick function to return the authentication part of the url'''
+        uri = ''
+        uri = u'{0}&apikey={1}'.format(uri, self.apikey)
         if self.username is None or self.password is None:
-            self.user_error("Username or password is blank.")
+            self.user_error('Username or password is blank.')
         else:
-            uri = u'{0}&username={1!s}'.format(uri, self.username)
-            uri = u'{0}&password={1!s}'.format(uri, self.password)
+            uri = u'{0}&username={1}'.format(uri, self.username)
+            uri = u'{0}&password={1}'.format(uri, self.password)
         return uri
 
     def get_pull_articles_uri(self):
-        uri = ""
+        uri = ''
         uri = u'{0}&state={1}'.format(uri, u'unread')
         uri = u'{0}&contentType={1}'.format(uri, u'article')
         uri = u'{0}&sort={1}'.format(uri, self.sort_method)
-        uri = u'{0}&count={1!s}'.format(uri, self.max_articles_per_feed)
+        uri = u'{0}&count={1}'.format(uri, self.max_articles_per_feed)
         if self.only_pull_tag is not None:
             uri = u'{0}&tag={1}'.format(uri, self.only_pull_tag)
         return uri
 
     def parse_index(self):
         pocket_feed = []
-        fetch_url = u"{0}?{1}{2}".format(
+        fetch_url = u'{0}?{1}{2}'.format(
             self.read_api_url,
             self.get_auth_uri(),
             self.get_pull_articles_uri()
@@ -106,7 +106,7 @@ class Pocket(BasicNewsRecipe):
         if len(pocket_feed) < self.minimum_articles:
             self.mark_as_read_after_dl = False
             self.user_error(
-                "Only {0} articles retrieved, minimum_articles not reached".format(len(pocket_feed)))
+                'Only {0} articles retrieved, minimum_articles not reached'.format(len(pocket_feed)))
 
         for pocket_article in pocket_feed.items():
             self.articles.append({
@@ -119,7 +119,7 @@ class Pocket(BasicNewsRecipe):
                 'sort':         pocket_article[1]['sort_id']
             })
         self.articles = sorted(self.articles, key=operator.itemgetter('sort'))
-        return [("My Pocket Articles for {0}".format(strftime('[%I:%M %p]')), self.articles)]
+        return [('My Pocket Articles for {0}'.format(strftime('[%I:%M %p]')), self.articles)]
 
     def mark_as_read(self, mark_list):
         actions_list = []
@@ -147,18 +147,15 @@ class Pocket(BasicNewsRecipe):
     def cleanup(self):
         if self.mark_as_read_after_dl:
             self.mark_as_read([x['item_id'] for x in self.articles])
-        else:
-            pass
 
     def default_cover(self, cover_file):
-        """
+        '''
         Create a generic cover for recipes that don't have a cover
         This override adds time to the cover
-        """
+        '''
         try:
             from calibre.ebooks.covers import calibre_cover2
-            title = self.title if isinstance(self.title, type(u'')) else \
-                self.title.decode('utf-8', 'replace')
+            title = self.title if isinstance(self.title, type(u'')) else self.title.decode('utf-8', 'replace')
             date = strftime(self.timefmt)
             time = strftime('[%I:%M %p]')
             img_data = calibre_cover2(title, date, time)
diff --git a/recipes/real_clear.recipe b/recipes/real_clear.recipe
index a2031e8b7b..13a0650e5e 100644
--- a/recipes/real_clear.recipe
+++ b/recipes/real_clear.recipe
@@ -35,17 +35,17 @@ class RealClear(BasicNewsRecipe):
 
     # Numeric parameter is type, controls whether we look for
     feedsets = [
-        ["Politics",        "http://www.realclearpolitics.com/index.xml",   0],
-        ["Policy",           "http://www.realclearpolicy.com/index.xml", 0],
-        ["Science",         "http://www.realclearscience.com/index.xml",    0],
-        ["Tech",            "http://www.realcleartechnology.com/index.xml", 0],
+        ['Politics',        'http://www.realclearpolitics.com/index.xml', 0],
+        ['Policy',          'http://www.realclearpolicy.com/index.xml', 0],
+        ['Science',         'http://www.realclearscience.com/index.xml', 0],
+        ['Tech',            'http://www.realcleartechnology.com/index.xml', 0],
         # The feedburner is essentially the same as the top feed, politics.
         # ["Politics Burner", "http://feeds.feedburner.com/realclearpolitics/qlMj", 1],
         # ["Commentary",      "http://feeds.feedburner.com/Realclearpolitics-Articles", 1],
-        ["Markets Home",    "http://www.realclearmarkets.com/index.xml", 0],
-        ["Markets",         "http://www.realclearmarkets.com/articles/index.xml", 0],
-        ["World",           "http://www.realclearworld.com/index.xml", 0],
-        ["World Blog",           "http://www.realclearworld.com/blog/index.xml", 2]
+        ['Markets Home',    'http://www.realclearmarkets.com/index.xml', 0],
+        ['Markets',         'http://www.realclearmarkets.com/articles/index.xml', 0],
+        ['World',           'http://www.realclearworld.com/index.xml', 0],
+        ['World Blog',      'http://www.realclearworld.com/blog/index.xml', 2]
     ]
     # Hints to extractPrintURL.
     # First column is the URL snippet.  Then the string to search for as text,
@@ -53,13 +53,12 @@ class RealClear(BasicNewsRecipe):
     # drill down.
     phUrlSnip, phLinkText, phMainSearch, phHrefSearch = range(4)
 
-    printhints = [["realclear",           "",                            '', 'printpage'],
-                  ["billoreilly.com",     "Print this entry",            'a', ''],
-                  ["billoreilly.com",     "Print This Article",          'a', ''],
-                  ["politico.com",        "Print",
-                      'a', 'share-print'],
-                  ["nationalreview.com",  ">Print<",                     'a', ''],
-                  ["reason.com",          "",                       'a', 'printer']
+    printhints = [['realclear',           '',                       '', 'printpage'],
+                  ['billoreilly.com',     'Print this entry',       'a', ''],
+                  ['billoreilly.com',     'Print This Article',     'a', ''],
+                  ['politico.com',        'Print',                  'a', 'share-print'],
+                  ['nationalreview.com',  '>Print<',                'a', ''],
+                  ['reason.com',          '',                       'a', 'printer']
                   # The following are not supported due to JavaScripting, and would require obfuscated_article to handle
                   # forbes,
                   # usatoday - just prints with all current crap anyhow
@@ -82,12 +81,12 @@ class RealClear(BasicNewsRecipe):
     def extractPrintURL(self, pageURL):
         tagURL = pageURL
         baseParse = urlparse(pageURL)
-        baseURL = baseParse[0] + "://" + baseParse[1]
+        baseURL = baseParse[0] + '://' + baseParse[1]
         hintsCount = len(self.printhints)
-        for x in range(0, hintsCount):
+        for x in range(hintsCount):
             if pageURL.find(self.printhints[x][0]) == -1:
                 continue
-            print("Trying " + self.printhints[x][0])
+            print('Trying ' + self.printhints[x][0])
             # Only retrieve the soup if we have a match to check for the
             # printed article with.
             soup = self.index_to_soup(pageURL)
@@ -96,51 +95,51 @@ class RealClear(BasicNewsRecipe):
             if len(self.printhints[x][self.phHrefSearch]) > 0 and len(self.printhints[x][self.phLinkText]) == 0:
                 # e.g. RealClear
                 if self.debugMessages is True:
-                    print("Search by href: " +
+                    print('Search by href: ' +
                           self.printhints[x][self.phHrefSearch])
                 printFind = soup.find(href=re.compile(
                     self.printhints[x][self.phHrefSearch]))
             elif len(self.printhints[x][3]) > 0 and len(self.printhints[x][1]) == 0:
                 if self.debugMessages is True:
-                    print("Search 1: " +
-                          self.printhints[x][2] + " Attributes: ")
+                    print('Search 1: ' +
+                          self.printhints[x][2] + ' Attributes: ')
                     print(self.printhints[x][3])
                 printFind = soup.find(
                     self.printhints[x][2], attrs=self.printhints[x][3])
             elif len(self.printhints[x][3]) > 0:
                 if self.debugMessages is True:
-                    print("search2")
+                    print('search2')
                 printFind = soup.find(self.printhints[x][2], attrs=self.printhints[
                                       x][3], text=self.printhints[x][1])
             else:
                 if self.debugMessages is True:
                     print(
-                        "Default Search: " + self.printhints[x][2] + " Text: " + self.printhints[x][1])
+                        'Default Search: ' + self.printhints[x][2] + ' Text: ' + self.printhints[x][1])
                 printFind = soup.find(
                     self.printhints[x][2], text=self.printhints[x][1])
             if printFind is None:
                 if self.debugMessages is True:
-                    print("Not Found")
+                    print('Not Found')
                     # print(soup)
-                    print("end soup\n\n")
+                    print('end soup\n\n')
                 continue
 
             print(printFind)
             if isinstance(printFind, NavigableString) is False:
                 if printFind['href'] is not None:
-                    print("Check " + printFind['href'] +
-                          " for base of " + baseURL)
-                    if printFind['href'].find("http") != 0:
+                    print('Check ' + printFind['href'] +
+                          ' for base of ' + baseURL)
+                    if printFind['href'].find('http') != 0:
                         return baseURL + printFind['href']
                     return printFind['href']
             tag = printFind.parent
             print(tag)
             if tag.get('href', None) is None:
                 if self.debugMessages is True:
-                    print("Not in parent, trying skip-up")
+                    print('Not in parent, trying skip-up')
                 if tag.parent['href'] is None:
                     if self.debugMessages is True:
-                        print("Not in skip either, aborting")
+                        print('Not in skip either, aborting')
                     continue
                 return tag.parent['href']
             return tag['href']
@@ -148,45 +147,45 @@ class RealClear(BasicNewsRecipe):
 
     def get_browser(self):
         if self.debugMessages is True:
-            print("In get_browser")
+            print('In get_browser')
         br = BasicNewsRecipe.get_browser(self)
         return br
 
     def parseRSS(self, index):
         if self.debugMessages is True:
-            print("\n\nStarting " + self.feedsets[index][0])
+            print('\n\nStarting ' + self.feedsets[index][0])
         articleList = []
         soup = self.index_to_soup(self.feedsets[index][1])
-        for div in soup.findAll("item"):
-            title = div.find("title").contents[0]
-            urlEl = div.find("originalLink")
+        for div in soup.findAll('item'):
+            title = div.find('title').contents[0]
+            urlEl = div.find('originalLink')
             if urlEl is None or len(urlEl.contents) == 0:
-                urlEl = div.find("originallink")
+                urlEl = div.find('originallink')
             if urlEl is None or len(urlEl.contents) == 0:
-                urlEl = div.find("link")
+                urlEl = div.find('link')
             if urlEl is None or len(urlEl.contents) == 0:
-                urlEl = div.find("guid")
+                urlEl = div.find('guid')
             if urlEl is None or title is None or len(urlEl.contents) == 0:
-                print("Error in feed " + self.feedsets[index][0])
+                print('Error in feed ' + self.feedsets[index][0])
                 print(div)
                 continue
             print(title)
             print(urlEl)
-            url = urlEl.contents[0].encode("utf-8")
-            description = div.find("description")
+            url = urlEl.contents[0].encode('utf-8')
+            description = div.find('description')
             if description is not None and description.contents is not None and len(description.contents) > 0:
                 description = description.contents[0]
             else:
-                description = "None"
-            pubDateEl = div.find("pubDate")
+                description = 'None'
+            pubDateEl = div.find('pubDate')
             if pubDateEl is None:
-                pubDateEl = div.find("pubdate")
+                pubDateEl = div.find('pubdate')
             if pubDateEl is None:
                 pubDate = time.strftime('%a, %d %b')
             else:
                 pubDate = pubDateEl.contents[0]
             if self.debugMessages is True:
-                print("Article")
+                print('Article')
                 print(title)
                 print(description)
                 print(pubDate)
@@ -218,7 +217,7 @@ class RealClear(BasicNewsRecipe):
         # articleList = []
         ans = []
         feedsCount = len(self.feedsets)
-        for x in range(0, feedsCount):  # should be ,4
+        for x in range(feedsCount):  # should be ,4
             feedarticles = self.parseRSS(x)
             if feedarticles is not None:
                 ans.append((self.feedsets[x][0], feedarticles))
diff --git a/recipes/reason_magazine.recipe b/recipes/reason_magazine.recipe
index e419dfb9fd..d7d8920043 100644
--- a/recipes/reason_magazine.recipe
+++ b/recipes/reason_magazine.recipe
@@ -9,7 +9,7 @@ from calibre import prepare_string_for_xml
 from calibre.web.feeds.news import BasicNewsRecipe, classes
 
 
-# {{{ parse article JSON
+# parse article JSON {{{
 def process_image_block(lines, block):
     caption = block.get('captionText')
     caption_lines = []
diff --git a/recipes/red_voltaire.recipe b/recipes/red_voltaire.recipe
index e77e0c4460..2c5e988b3d 100644
--- a/recipes/red_voltaire.recipe
+++ b/recipes/red_voltaire.recipe
@@ -18,9 +18,9 @@ class RedVoltaireRecipe(BasicNewsRecipe):
     masthead_url = u'http://www.voltairenet.org/squelettes/elements/images/logo-voltairenet-org.png'
 
     preprocess_regexps = [
-        (re.compile(r'<title>(?P<titulo>.+)</title>.+<span class="updated" title=".+"><time', re.IGNORECASE | re.DOTALL), lambda match:'</title></head><body><h1>' + match.group('titulo') + '</h1><time'),   # noqa
+        (re.compile(r'<title>(?P<titulo>.+)</title>.+<span class="updated" title=".+"><time', re.IGNORECASE | re.DOTALL), lambda match:'</title></head><body><h1>' + match.group('titulo') + '</h1><time'),  # noqa: E501
         (re.compile(
-            r'<time datetime=.+pubdate>. (?P<fecha>.+)</time>.+<!------------------- COLONNE TEXTE ------------------->', re.IGNORECASE | re.DOTALL), lambda match:'<small>' + match.group('fecha') + '</small>'), (re.compile(r'<aside>.+', re.IGNORECASE | re.DOTALL), lambda match:'</body></html>')  # noqa
+            r'<time datetime=.+pubdate>. (?P<fecha>.+)</time>.+<!------------------- COLONNE TEXTE ------------------->', re.IGNORECASE | re.DOTALL), lambda match:'<small>' + match.group('fecha') + '</small>'), (re.compile(r'<aside>.+', re.IGNORECASE | re.DOTALL), lambda match:'</body></html>')  # noqa: E501
     ]
 
     extra_css = '''
diff --git a/recipes/regina_leader_post.recipe b/recipes/regina_leader_post.recipe
index d3ff8ef484..e176bf8b9e 100644
--- a/recipes/regina_leader_post.recipe
+++ b/recipes/regina_leader_post.recipe
@@ -19,61 +19,61 @@ class CanWestPaper(BasicNewsRecipe):
     # #    url_prefix = 'http://www.timescolonist.com'
     # #    description = u'News from Victoria, BC'
     # #    fp_tag = 'CAN_TC'
-    #
+
     # un-comment the following four lines for the Vancouver Province
     # #    title = u'Vancouver Province'
     # #    url_prefix = 'http://www.theprovince.com'
     # #    description = u'News from Vancouver, BC'
     # #    fp_tag = 'CAN_VP'
-    #
+
     # un-comment the following four lines for the Vancouver Sun
     # #    title = u'Vancouver Sun'
     # #    url_prefix = 'http://www.vancouversun.com'
     # #    description = u'News from Vancouver, BC'
     # #    fp_tag = 'CAN_VS'
-    #
+
     # un-comment the following four lines for the Edmonton Journal
     # #    title = u'Edmonton Journal'
     # #    url_prefix = 'http://www.edmontonjournal.com'
     # #    description = u'News from Edmonton, AB'
     # #    fp_tag = 'CAN_EJ'
-    #
+
     # un-comment the following four lines for the Calgary Herald
     # #    title = u'Calgary Herald'
     # #    url_prefix = 'http://www.calgaryherald.com'
     # #    description = u'News from Calgary, AB'
     # #    fp_tag = 'CAN_CH'
-    #
+
     # un-comment the following four lines for the Regina Leader-Post
     title = u'Regina Leader-Post'
     url_prefix = 'http://www.leaderpost.com'
     description = u'News from Regina, SK'
     fp_tag = ''
 
-#     un-comment the following four lines for the Saskatoon Star-Phoenix
-# #    title = u'Saskatoon Star-Phoenix'
-# #    url_prefix = 'http://www.thestarphoenix.com'
-# #    description = u'News from Saskatoon, SK'
-# #    fp_tag = ''
-#
-#     un-comment the following four lines for the Windsor Star
-# #    title = u'Windsor Star'
-# #    url_prefix = 'http://www.windsorstar.com'
-# #    description = u'News from Windsor, ON'
-# #    fp_tag = 'CAN_'
-#
-#     un-comment the following four lines for the Ottawa Citizen
-# #    title = u'Ottawa Citizen'
-# #    url_prefix = 'http://www.ottawacitizen.com'
-# #    description = u'News from Ottawa, ON'
-# #    fp_tag = 'CAN_OC'
-#
-#     un-comment the following four lines for the Montreal Gazette
-# #    title = u'Montreal Gazette'
-# #    url_prefix = 'http://www.montrealgazette.com'
-# #    description = u'News from Montreal, QC'
-# #    fp_tag = 'CAN_MG'
-#
+    # un-comment the following four lines for the Saskatoon Star-Phoenix
+    # #    title = u'Saskatoon Star-Phoenix'
+    # #    url_prefix = 'http://www.thestarphoenix.com'
+    # #    description = u'News from Saskatoon, SK'
+    # #    fp_tag = ''
+
+    # un-comment the following four lines for the Windsor Star
+    # #    title = u'Windsor Star'
+    # #    url_prefix = 'http://www.windsorstar.com'
+    # #    description = u'News from Windsor, ON'
+    # #    fp_tag = 'CAN_'
+
+    # un-comment the following four lines for the Ottawa Citizen
+    # #    title = u'Ottawa Citizen'
+    # #    url_prefix = 'http://www.ottawacitizen.com'
+    # #    description = u'News from Ottawa, ON'
+    # #    fp_tag = 'CAN_OC'
+
+    # un-comment the following four lines for the Montreal Gazette
+    # #    title = u'Montreal Gazette'
+    # #    url_prefix = 'http://www.montrealgazette.com'
+    # #    description = u'News from Montreal, QC'
+    # #    fp_tag = 'CAN_MG'
+
     language = 'en_CA'
     __author__ = 'Nick Redding'
     no_stylesheets = True
@@ -113,8 +113,7 @@ class CanWestPaper(BasicNewsRecipe):
         except:
             while daysback < 7:
                 cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg' + \
-                    str((date.today() - timedelta(days=daysback)).day) + \
-                    '/lg/' + self.fp_tag + '.jpg'
+                    str((date.today() - timedelta(days=daysback)).day) + '/lg/' + self.fp_tag + '.jpg'
                 br = BasicNewsRecipe.get_browser(self)
                 try:
                     br.open(cover)
@@ -123,24 +122,24 @@ class CanWestPaper(BasicNewsRecipe):
                     continue
                 break
         if daysback == 7:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             cover = None
         return cover
 
     def fixChars(self, string):
         # Replace lsquo (\x91)
-        fixed = re.sub("\x91", "‘", string)
+        fixed = string.replace('\x91', '‘')
         # Replace rsquo (\x92)
-        fixed = re.sub("\x92", "’", fixed)
+        fixed = fixed.replace('\x92', '’')
         # Replace ldquo (\x93)
-        fixed = re.sub("\x93", "“", fixed)
+        fixed = fixed.replace('\x93', '“')
         # Replace rdquo (\x94)
-        fixed = re.sub("\x94", "”", fixed)
+        fixed = fixed.replace('\x94', '”')
         # Replace ndash (\x96)
-        fixed = re.sub("\x96", "–", fixed)
+        fixed = fixed.replace('\x96', '–')
         # Replace mdash (\x97)
-        fixed = re.sub("\x97", "—", fixed)
-        fixed = re.sub("&#x2019;", "’", fixed)
+        fixed = fixed.replace('\x97', '—')
+        fixed = fixed.replace('&#x2019;', '’')
         return fixed
 
     def massageNCXText(self, description):
@@ -180,14 +179,14 @@ class CanWestPaper(BasicNewsRecipe):
         ans = ['News']
 
         # Find each instance of class="sectiontitle", class="featurecontent"
-        for divtag in soup.findAll('div', attrs={'class': ["section_title02", "featurecontent"]}):
+        for divtag in soup.findAll('div', attrs={'class': ['section_title02', 'featurecontent']}):
             if 'section_title' in ''.join(divtag['class']):
                 # div contains section title
                 if not divtag.h3:
                     continue
                 key = self.tag_to_string(divtag.h3, False)
                 ans.append(key)
-                self.log("Section name %s" % key)
+                self.log('Section name %s' % key)
                 continue
             # div contains article data
             h1tag = divtag.find('h1')
diff --git a/recipes/respekt_magazine.recipe b/recipes/respekt_magazine.recipe
index aa5f76e08d..28faad637a 100644
--- a/recipes/respekt_magazine.recipe
+++ b/recipes/respekt_magazine.recipe
@@ -6,7 +6,6 @@
 __license__     = 'GNU General Public License v3 - http://www.gnu.org/copyleft/gpl.html'
 __copyright__   = 'tomashnyk@gmail.com'
 
-import re
 
 # This imports the version bundled with Calibre
 import lxml
@@ -38,17 +37,17 @@ class respektRecipe(BasicNewsRecipe):
         dict(name='script')
     ]
 
-    extra_css = 'p {text-align:justify;margin-top:0;margin-bottom:0} \
-                 ul {color:black} \
-                 .frame-caption {font-weight:normal;font-size:50%;font-style:italic;}  \
-                 h1 {font-size:150%;margin-bottom:0;} \
-                 h2 {font-size:100%;margin-bottom:0;} \
-                .post-subtitle {margin-top:0;} \
-                 h3 {font-size:100%;margin-bottom:0;margin-top:0;} \
-                 .box-title {background-color: lightgray;font-size:150%;font-weight:bold;margin-left:12%;margin-right:12%;margin-top:12%;margin-bottom:0;} \
-                 .box-content {background-color:lightgray;margin-left:12%;margin-right:12%;margin-top:0;margin-bottom:12%;} \
-                 p.indent_first_line {text-indent:30px;} \
-                 a {text-decoration:none;color:black;}'
+    extra_css = '''p {text-align:justify;margin-top:0;margin-bottom:0}
+                   ul {color:black}
+                   .frame-caption {font-weight:normal;font-size:50%;font-style:italic;}
+                   h1 {font-size:150%;margin-bottom:0;}
+                   h2 {font-size:100%;margin-bottom:0;}
+                   .post-subtitle {margin-top:0;}
+                   h3 {font-size:100%;margin-bottom:0;margin-top:0;}
+                   .box-title {background-color: lightgray;font-size:150%;font-weight:bold;margin-left:12%;margin-right:12%;margin-top:12%;margin-bottom:0;}
+                   .box-content {background-color:lightgray;margin-left:12%;margin-right:12%;margin-top:0;margin-bottom:12%;}
+                   p.indent_first_line {text-indent:30px;}
+                   a {text-decoration:none;color:black;}'''
 
     needs_subscription = True
 
@@ -72,8 +71,8 @@ class respektRecipe(BasicNewsRecipe):
     # So that remove_tags_before works for this section
     def preprocess_raw_html(self, raw_html, url):
         root = lxml.html.fromstring(raw_html)
-        if root.xpath("//title")[0].text == (u"Respekt • Despekt • RESPEKT"):
-            raw_html = re.sub("h2","h1",raw_html)
+        if root.xpath('//title')[0].text == (u'Respekt • Despekt • RESPEKT'):
+            raw_html = raw_html.replace('h2', 'h1')
         return raw_html
 
     def parse_index(self):
@@ -82,17 +81,17 @@ class respektRecipe(BasicNewsRecipe):
         current_edition_url = root1.xpath("//div[@class='heroissue']/a")[0].items()[0][1]
         raw2 = self.index_to_soup('https://www.respekt.cz/' + current_edition_url, raw=True)
         root2 = lxml.html.fromstring(raw2)
-        self.cover_url = root2.xpath("//i[contains(@class, 'heroissue-cover')]")[0].get("data-src")
+        self.cover_url = root2.xpath("//i[contains(@class, 'heroissue-cover')]")[0].get('data-src')
         # Fetch date
         date_text = root2.xpath("//time[@class='heroissue-date']")[0].text.split(',')[1]
-        s = date_text.split(" ")
+        s = date_text.split(' ')
         # Are the dates of the issue in the same month and year?
         if len(s) == 4 or len(s) == 7:
-            date = "/".join([s[1].split(".")[0],s[2].split(".")[0],s[-1]])
+            date = '/'.join([s[1].split('.')[0],s[2].split('.')[0],s[-1]])
         elif len(s) == 8:
-            date = "/".join([s[1].split(".")[0],s[2].split(".")[0],s[3]])
+            date = '/'.join([s[1].split('.')[0],s[2].split('.')[0],s[3]])
         self.conversion_options = {'pubdate':date}
-        self.title = "Respekt magazine #" + "/".join(current_edition_url.split("/")[-1:-3:-1])
+        self.title = 'Respekt magazine #' + '/'.join(current_edition_url.split('/')[-1:-3:-1])
         ans = []
         for section in root2.xpath("//div[@class='col-md-6']/div[@class='issuedetail-categorized-sectionname']"):
             section_name = section.text
@@ -100,7 +99,7 @@ class respektRecipe(BasicNewsRecipe):
             article = section.getnext()
             while hasattr(article, 'text') and not article.text.strip():
                 title = article.xpath("span[@class='issuedetail-categorized-title']")[0].text
-                url = respekt_url + article.xpath("@href")[0]
+                url = respekt_url + article.xpath('@href')[0]
                 articles.append({'title':title,'url':url})
                 article = article.getnext()
             ans.append((section_name,articles))
@@ -113,24 +112,24 @@ class respektRecipe(BasicNewsRecipe):
         raw = u''.join(type(u'')(a) for a in soup.contents)
         root = lxml.html.fromstring(raw)
         # Fix Letem světem
-        if "Letem sv" in root.xpath("//title")[0].text:
-            p = root.xpath("//p")
+        if 'Letem sv' in root.xpath('//title')[0].text:
+            p = root.xpath('//p')
             for par in p[:]:
                 next = par.getnext()
                 if par.getchildren():
                     child = par.getchildren()[0]
-                if hasattr(next,"tag") and next.tag == "h2" and hasattr(child,"tag") and child.tag == "strong":
+                if hasattr(next,'tag') and next.tag == 'h2' and hasattr(child,'tag') and child.tag == 'strong':
                     text = child.text_content()
                     if next.text:
-                        next.text = next.text + u" • " + text
+                        next.text = next.text + u' • ' + text
                     else:
                         if next.getchildren():
                             next_child = next.getchildren()[0]
-                            next_child.text = next_child.text +  u" • " + text
+                            next_child.text = next_child.text + u' • ' + text
                     par.getparent().remove(par)
         # Insert text length
         text = root.xpath("//div[@id='postcontent']")[0]
-        article_length = u" • " + str(len(text.text_content().split(' '))) + ' slov'
+        article_length = u' • ' + str(len(text.text_content().split(' '))) + ' slov'
         try:
             aut = root.xpath("//div[@class='authorship-names']")[0]
             if aut.getchildren() and aut.getchildren()[0].tag == 'a':
@@ -149,11 +148,11 @@ class respektRecipe(BasicNewsRecipe):
         except:
             pass
         # Make images visible
-        pictures = root.xpath("//picture")
+        pictures = root.xpath('//picture')
         for picture in pictures:
-            image = picture.xpath("//source")[0]
-            image_link = [a for a in image.get('srcset').split(' ') if a[:4] == "http"][-1]
-            e=E.img({"src":image_link})
+            image = picture.xpath('//source')[0]
+            image_link = [a for a in image.get('srcset').split(' ') if a[:4] == 'http'][-1]
+            e=E.img({'src':image_link})
             picture.getparent().replace(picture,e)
         # Properly indent
         paragraphs = root.xpath('//p')
@@ -163,13 +162,13 @@ class respektRecipe(BasicNewsRecipe):
             prev = par.getprevious()
             # Do not indent after headings
             if hasattr(prev,'tag') and prev.tag not in ['h2', 'h3']:
-                par.attrib['class']="indent_first_line"
+                par.attrib['class']='indent_first_line'
         # Fix subtitle for Téma
         try:
             o = root.xpath("//p[@class='post-perex']")[0]
-            e = E.h2({"class":"post-subtitle"})
+            e = E.h2({'class':'post-subtitle'})
             e.text = o.text
             o.getparent().replace(o,e)
         except:
             pass
-        return(BeautifulSoup(lxml.etree.tostring(root,encoding='unicode')))
+        return BeautifulSoup(lxml.etree.tostring(root,encoding='unicode'))
diff --git a/recipes/reuters.recipe b/recipes/reuters.recipe
index 50f260a944..282b39e869 100644
--- a/recipes/reuters.recipe
+++ b/recipes/reuters.recipe
@@ -33,11 +33,11 @@ class Reuters(BasicNewsRecipe):
     resolve_internal_links = True
     ignore_duplicate_articles = {'url', 'title'}
 
-    extra_css = """
+    extra_css = '''
         .label, .auth { font-size:small; color:#202020; }
         .figc { font-size:small; }
         img {display:block; margin:0 auto;}
-    """
+    '''
 
     recipe_specific_options = {
         'days': {
@@ -140,7 +140,7 @@ class Reuters(BasicNewsRecipe):
                 for y in x['templates']:
                     if 'author' in y['cid']:
                         body += '<p>'
-                        auths = [x for x in y.get('authors_names', [])]
+                        auths = list(y.get('authors_names', []))
                         if auths:
                             body += (
                                 '<div class="auth">' + 'By ' + ', '.join(auths) + '</div>'
diff --git a/recipes/revista22.recipe b/recipes/revista22.recipe
index 7d2a55b2f1..ab64418538 100644
--- a/recipes/revista22.recipe
+++ b/recipes/revista22.recipe
@@ -12,8 +12,8 @@ class Volkskrant(BasicNewsRecipe):
     country = 'RO'
     category = 'news, politics, Romania'
     resolve_internal_links = True
-    remove_tags_before = { 'class': 'col-span-8' }
-    remove_tags_after = { 'class': 'col-span-8' }
+    remove_tags_before = {'class': 'col-span-8'}
+    remove_tags_after = {'class': 'col-span-8'}
     remove_tags = [
         dict(
             attrs={
@@ -33,7 +33,7 @@ class Volkskrant(BasicNewsRecipe):
         dict(id=['comments']),
         dict(name=['script', 'noscript', 'style']),
     ]
-    remove_attributes = ["class", "id", "name", "style"]
+    remove_attributes = ['class', 'id', 'name', 'style']
     encoding = 'utf-8'
     no_stylesheets = True
     ignore_duplicate_articles = {'url'}
diff --git a/recipes/revista_veintitres.recipe b/recipes/revista_veintitres.recipe
index 4a992d78f5..4940889bd0 100644
--- a/recipes/revista_veintitres.recipe
+++ b/recipes/revista_veintitres.recipe
@@ -29,10 +29,10 @@ class Veintitres(BasicNewsRecipe):
     auto_cleanup = True
     auto_cleanup_keep = '//h1'
     resolve_internal_links = True
-    INDEX = "https://www.veintitres.com.ar"
-    extra_css = """
+    INDEX = 'https://www.veintitres.com.ar'
+    extra_css = '''
                                 img{margin-bottom: 0.8em}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description,
diff --git a/recipes/rmf24_opinie.recipe b/recipes/rmf24_opinie.recipe
index f85a677b6b..1158626839 100644
--- a/recipes/rmf24_opinie.recipe
+++ b/recipes/rmf24_opinie.recipe
@@ -49,7 +49,7 @@ class RMF24_opinie(BasicNewsRecipe):
         (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in
         [
             (r'<h2>Zdj.cie</h2>', lambda match: ''),
-            (r'embed embed(Left|Right|Center) articleEmbed(Audio|Wideo articleEmbedVideo|ArticleFull|ArticleTitle|ArticleListTitle|AlbumHorizontal)">', lambda match: 'REMOVE">'),  # noqa
+            (r'embed embed(Left|Right|Center) articleEmbed(Audio|Wideo articleEmbedVideo|ArticleFull|ArticleTitle|ArticleListTitle|AlbumHorizontal)">', lambda match: 'REMOVE">'),  # noqa: E501
             (r'<a href="http://www.facebook.com/pages/RMF24pl/.*?>RMF24.pl</a> on Facebook</div>',
              lambda match: '</div>')
         ]
diff --git a/recipes/rnd.recipe b/recipes/rnd.recipe
index 62edb2a6f6..c7e2e62e2f 100644
--- a/recipes/rnd.recipe
+++ b/recipes/rnd.recipe
@@ -60,63 +60,61 @@ class RND(BasicNewsRecipe):
 
     feeds = [
  ('Politik', 'https://www.rnd.de/arc/outboundfeeds/rss/category/politik/'),
- ('Wirtschaft',  'https://www.rnd.de/arc/outboundfeeds/rss/category/wirtschaft/'),
+ ('Wirtschaft', 'https://www.rnd.de/arc/outboundfeeds/rss/category/wirtschaft/'),
  ('Sport', 'https://www.rnd.de/arc/outboundfeeds/rss/category/sport/'),
  ('Panorama', 'https://www.rnd.de/arc/outboundfeeds/rss/category/panorama/'),
- #('Promis', 'https://www.rnd.de/arc/outboundfeeds/rss/category/promis/'),
- #('Reise', 'https://www.rnd.de/arc/outboundfeeds/rss/category/reise/'),
- #('Medien', 'https://www.rnd.de/arc/outboundfeeds/rss/category/medien/'),
- #('Digital', 'https://www.rnd.de/arc/outboundfeeds/rss/category/digital/'),
- #('Kultur', 'https://www.rnd.de/arc/outboundfeeds/rss/category/kultur/'),
- #('Wissen', 'https://www.rnd.de/arc/outboundfeeds/rss/category/wissen/'),
- #('Familie', 'https://www.rnd.de/arc/outboundfeeds/rss/category/familie/'),
- #('Gesundheit',  'https://www.rnd.de/arc/outboundfeeds/rss/category/gesundheit/'),
- #('Lifestyle', 'https://www.rnd.de/arc/outboundfeeds/rss/category/lifestyle/'),
- #('Bauen & Wohnen',  'https://www.rnd.de/arc/outboundfeeds/rss/category/bauen-und-wohnen/'),
- #('Geld & Finanzen',  'https://www.rnd.de/arc/outboundfeeds/rss/category/geld-und-finanzen/'),
- #('Liebe & Partnerschaft',  'https://www.rnd.de/arc/outboundfeeds/rss/category/liebe-und-partnerschaft/'),
- #('Beruf & Bildung',  'https://www.rnd.de/arc/outboundfeeds/rss/category/beruf-und-bildung/'),
- #('E-Mobility',  'https://www.rnd.de/arc/outboundfeeds/rss/category/e-mobility/')
+ # ('Promis', 'https://www.rnd.de/arc/outboundfeeds/rss/category/promis/'),
+ # ('Reise', 'https://www.rnd.de/arc/outboundfeeds/rss/category/reise/'),
+ # ('Medien', 'https://www.rnd.de/arc/outboundfeeds/rss/category/medien/'),
+ # ('Digital', 'https://www.rnd.de/arc/outboundfeeds/rss/category/digital/'),
+ # ('Kultur', 'https://www.rnd.de/arc/outboundfeeds/rss/category/kultur/'),
+ # ('Wissen', 'https://www.rnd.de/arc/outboundfeeds/rss/category/wissen/'),
+ # ('Familie', 'https://www.rnd.de/arc/outboundfeeds/rss/category/familie/'),
+ # ('Gesundheit',  'https://www.rnd.de/arc/outboundfeeds/rss/category/gesundheit/'),
+ # ('Lifestyle', 'https://www.rnd.de/arc/outboundfeeds/rss/category/lifestyle/'),
+ # ('Bauen & Wohnen',  'https://www.rnd.de/arc/outboundfeeds/rss/category/bauen-und-wohnen/'),
+ # ('Geld & Finanzen',  'https://www.rnd.de/arc/outboundfeeds/rss/category/geld-und-finanzen/'),
+ # ('Liebe & Partnerschaft',  'https://www.rnd.de/arc/outboundfeeds/rss/category/liebe-und-partnerschaft/'),
+ # ('Beruf & Bildung',  'https://www.rnd.de/arc/outboundfeeds/rss/category/beruf-und-bildung/'),
+ # ('E-Mobility',  'https://www.rnd.de/arc/outboundfeeds/rss/category/e-mobility/')
  ]
 
-
     def parse_feeds(self):
-      # Call parent's method.
-      feeds = BasicNewsRecipe.parse_feeds(self)
-      # Loop through all feeds.
-      for feed in feeds:
-        # Loop through all articles in feed.
-        for article in feed.articles[:]:
-          # Remove articles with '...' in the url.
-          if '/anzeige/' in article.url:
-            print('Removing:',article.title)
-            feed.articles.remove(article)
-          # Remove articles with '...' in the title.
-          elif 'Liveticker' in article.title:
-              print('Removing:',article.title)
-              feed.articles.remove(article)
-          elif 'Liveblog' in article.title:
-              print('Removing:',article.title)
-              feed.articles.remove(article)
-          elif 'Newsblog' in article.title:
-              print('Removing:',article.title)
-              feed.articles.remove(article)
-          elif 'Podcast' in article.title:
-              print('Removing:',article.title)
-              feed.articles.remove(article)
-
-      return feeds
+        # Call parent's method.
+        feeds = BasicNewsRecipe.parse_feeds(self)
+        # Loop through all feeds.
+        for feed in feeds:
+            # Loop through all articles in feed.
+            for article in feed.articles[:]:
+                # Remove articles with '...' in the url.
+                if '/anzeige/' in article.url:
+                    print('Removing:',article.title)
+                    feed.articles.remove(article)
+                # Remove articles with '...' in the title.
+                elif 'Liveticker' in article.title:
+                    print('Removing:',article.title)
+                    feed.articles.remove(article)
+                elif 'Liveblog' in article.title:
+                    print('Removing:',article.title)
+                    feed.articles.remove(article)
+                elif 'Newsblog' in article.title:
+                    print('Removing:',article.title)
+                    feed.articles.remove(article)
+                elif 'Podcast' in article.title:
+                    print('Removing:',article.title)
+                    feed.articles.remove(article)
+        return feeds
 
     def preprocess_raw_html(self, raw, url):
-      # remove articles requiring login and advertisements
-      unwantedtag='ArticleHeadstyled__ArticleHeadPaidIconContainer'
-      if unwantedtag in raw:
-        print('Skipping unwanted article with tag:',unwantedtag)
-        self.abort_article('Skipping unwanted article')
+        # remove articles requiring login and advertisements
+        unwantedtag='ArticleHeadstyled__ArticleHeadPaidIconContainer'
+        if unwantedtag in raw:
+            print('Skipping unwanted article with tag:',unwantedtag)
+            self.abort_article('Skipping unwanted article')
 
-      unwanted_article_keywords = ['Zum Login']
-      for keyword in unwanted_article_keywords:
-          if keyword in raw:
-            print('Skipping unwanted article with keyword(s):',keyword)
-            #self.abort_article('Skipping unwanted article')
-      return raw
+        unwanted_article_keywords = ['Zum Login']
+        for keyword in unwanted_article_keywords:
+            if keyword in raw:
+                print('Skipping unwanted article with keyword(s):',keyword)
+                # self.abort_article('Skipping unwanted article')
+        return raw
diff --git a/recipes/root.recipe b/recipes/root.recipe
index 61a2f2c025..d3b129ab7c 100644
--- a/recipes/root.recipe
+++ b/recipes/root.recipe
@@ -31,9 +31,9 @@ class AdvancedUserRecipe1289939440(BasicNewsRecipe):
     ]
 
     preprocess_regexps = [
-        (re.compile(u'<p class="perex[^"]*">[^<]*<img[^>]*>',
+        (re.compile(r'<p class="perex[^"]*">[^<]*<img[^>]*>',
                     re.DOTALL), lambda match: '<p class="intro">'),
-        (re.compile(u'<h3><a name="tucnak">Tričko tučňák.*</body>',
+        (re.compile(u'<h3><a name="tucnak">Tričko tučňák.*</body>',  # noqa: RUF039
                     re.DOTALL), lambda match: '<!--deleted-->')
     ]
 
diff --git a/recipes/rosbalt.recipe b/recipes/rosbalt.recipe
index aa32f9ca14..b2da8851f3 100644
--- a/recipes/rosbalt.recipe
+++ b/recipes/rosbalt.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Rosbalt(BasicNewsRecipe):
     title = '\u0420\u043E\u0441\u0431\u0430\u043B\u0442'
     __author__ = 'bugmen00t'
-    description = '\u0424\u0435\u0434\u0435\u0440\u0430\u043B\u044C\u043D\u043E\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E-\u0430\u043D\u0430\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E. \u041A\u0440\u0443\u0433\u043B\u043E\u0441\u0443\u0442\u043E\u0447\u043D\u043E \u0441\u043B\u0435\u0434\u0438\u043C \u0437\u0430 \u0441\u043E\u0431\u044B\u0442\u0438\u044F\u043C\u0438 \u0432 \u0441\u0442\u0440\u0430\u043D\u0435 \u0438 \u043C\u0438\u0440\u0435, \u043F\u0443\u0431\u043B\u0438\u043A\u0443\u0435\u043C \u0441\u0430\u043C\u044B\u0435 \u0441\u0432\u0435\u0436\u0438\u0435 \u043D\u043E\u0432\u043E\u0441\u0442\u0438, \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 \u0432\u0435\u0434\u0443\u0449\u0438\u0445 \u044D\u043A\u0441\u043F\u0435\u0440\u0442\u043E\u0432, \u0430\u043D\u0430\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u0441\u0442\u0430\u0442\u044C\u0438, \u0438\u043D\u0442\u0435\u0440\u0432\u044C\u044E \u0441 \u0432\u0435\u0434\u0443\u0449\u0438\u043C\u0438 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u0438\u0442\u0435\u043B\u044F\u043C\u0438 \u0440\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u043E\u0433\u043E \u0431\u0438\u0437\u043D\u0435\u0441\u0430 \u0438 \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0438.'  # noqa
+    description = '\u0424\u0435\u0434\u0435\u0440\u0430\u043B\u044C\u043D\u043E\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E-\u0430\u043D\u0430\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E. \u041A\u0440\u0443\u0433\u043B\u043E\u0441\u0443\u0442\u043E\u0447\u043D\u043E \u0441\u043B\u0435\u0434\u0438\u043C \u0437\u0430 \u0441\u043E\u0431\u044B\u0442\u0438\u044F\u043C\u0438 \u0432 \u0441\u0442\u0440\u0430\u043D\u0435 \u0438 \u043C\u0438\u0440\u0435, \u043F\u0443\u0431\u043B\u0438\u043A\u0443\u0435\u043C \u0441\u0430\u043C\u044B\u0435 \u0441\u0432\u0435\u0436\u0438\u0435 \u043D\u043E\u0432\u043E\u0441\u0442\u0438, \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 \u0432\u0435\u0434\u0443\u0449\u0438\u0445 \u044D\u043A\u0441\u043F\u0435\u0440\u0442\u043E\u0432, \u0430\u043D\u0430\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u0441\u0442\u0430\u0442\u044C\u0438, \u0438\u043D\u0442\u0435\u0440\u0432\u044C\u044E \u0441 \u0432\u0435\u0434\u0443\u0449\u0438\u043C\u0438 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u0438\u0442\u0435\u043B\u044F\u043C\u0438 \u0440\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u043E\u0433\u043E \u0431\u0438\u0437\u043D\u0435\u0441\u0430 \u0438 \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0438.'  # noqa: E501
     publisher = '\u0410\u041E \u00AB\u0420\u0421-\u0411\u0430\u043B\u0442\u00BB'
     category = 'newspaper'
     cover_url = u'https://i.ytimg.com/vi/eeMqJGbjuY0/maxresdefault.jpg'
diff --git a/recipes/rts.recipe b/recipes/rts.recipe
index 70df0a64a1..310feba470 100644
--- a/recipes/rts.recipe
+++ b/recipes/rts.recipe
@@ -32,13 +32,13 @@ class RTS(BasicNewsRecipe):
     language = 'sr'
 
     lang = 'sr-Latn-RS'
-    extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'  # noqa
+    extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'  # noqa: E501
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': lang, 'pretty_print': True
     }
 
-    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]  # noqa: RUF039
 
     feeds = [
 
@@ -59,9 +59,9 @@ class RTS(BasicNewsRecipe):
         soup.html['xml:lang'] = self.lang
         soup.html['lang'] = self.lang
         mlang = new_tag(soup, 'meta', [
-                    ("http-equiv", "Content-Language"), ("content", self.lang)])
+                    ('http-equiv', 'Content-Language'), ('content', self.lang)])
         mcharset = new_tag(soup, 'meta', [
-                       ("http-equiv", "Content-Type"), ("content", "text/html; charset=UTF-8")])
+                       ('http-equiv', 'Content-Type'), ('content', 'text/html; charset=UTF-8')])
         soup.head.insert(0, mlang)
         soup.head.insert(1, mcharset)
         return self.adeify_images(soup)
diff --git a/recipes/russiafeed.recipe b/recipes/russiafeed.recipe
index a90067e869..514da5d158 100644
--- a/recipes/russiafeed.recipe
+++ b/recipes/russiafeed.recipe
@@ -25,11 +25,11 @@ class RussiaFeed(BasicNewsRecipe):
     publication_type     = 'newsportal'
     auto_cleanup         = True
     ignore_duplicate_articles = {'url'}
-    extra_css            = """
+    extra_css            = '''
         body{font-family: Roboto, Arial, sans-serif}
         img{margin-top:1em; margin-bottom: 1em; display:block}
         entry-title,entry-subtitle{font-family: Rajdhani, Poppins, Roboto, Arial, sans-serif}
-    """
+    '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/rzeczpospolita.recipe b/recipes/rzeczpospolita.recipe
index e9e13e04ff..f05b321b3a 100644
--- a/recipes/rzeczpospolita.recipe
+++ b/recipes/rzeczpospolita.recipe
@@ -19,9 +19,9 @@ class RzeczpospolitaRecipe(BasicNewsRecipe):
     simultaneous_downloads = 5
 
     feeds = []
-    feeds.append((u"Wiadomości", u'http://www.rp.pl/rss/1056'))  # Wydarzenia
-    feeds.append((u"Ekonomia", u'http://www.rp.pl/rss/1004'))  # Ekonomia
-    feeds.append((u"Prawo", u'http://www.rp.pl/rss/1037'))  # Prawo
+    feeds.append((u'Wiadomości', u'http://www.rp.pl/rss/1056'))  # Wydarzenia
+    feeds.append((u'Ekonomia', u'http://www.rp.pl/rss/1004'))  # Ekonomia
+    feeds.append((u'Prawo', u'http://www.rp.pl/rss/1037'))  # Prawo
 
     keep_only_tags = []
     keep_only_tags.append(dict(name='h1', attrs={'id': 'article-title'}))
diff --git a/recipes/saechsische.recipe b/recipes/saechsische.recipe
index 6d0fe90f4a..508cceec0a 100644
--- a/recipes/saechsische.recipe
+++ b/recipes/saechsische.recipe
@@ -60,177 +60,175 @@ class Saechsische(BasicNewsRecipe):
     ]
 
     feeds = [
-         #('Alle Artikel der SZ', 'https://www.saechsische.de/arc/outboundfeeds/rss/'),
-         ('Stadt Dresden',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden'),
-         #('Altstadt',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/altstadt'),
-         #('Blasewitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/blasewitz'),
-         #('Cotta',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/cotta'),
-         #('Klotzsche',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/klotzsche'),
-         #('Leuben',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/leuben'),
-         #('Loschwitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/loschwitz'),
-         #('Neustadt',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/neustadt'),
-         #('Pieschen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/pieschen'),
-         #('Plauen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/plauen'),
-         #('Prohlis',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/prohlis'),
-         #('Cossebaude',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/cossebaude'),
-         #('Langebrück',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/langebrueck'),
-         #('Gompitz/Altfranken',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/gompitz-altfranken'),
-         #('Weixdorf',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/weixdorf'),
-         #('Schönfeld-Weißig',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/schoenfeld-weissig'),
-         #('Landkreis Bautzen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk'),
-         #('Stadt Bautzen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/bautzen'),
-         #('Bischofswerda',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/bischofswerda'),
-         #('Kamenz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/kamenz'),
-         #('Pulsnitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/pulsnitz'),
-         #('Radeberg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/radeberg'),
-         #('Hoyerswerda',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/hoyerswerda'),
-         #('Bernsdorf',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/bernsdorf'),
-         #('Großröhrsdorf',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/grossroehrsdorf'),
-         #('Lauta',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/lauta'),
-         #('Schirgiswalde-Kirschau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/schirgiswalde-kirschau'),
-         #('Wittichenau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/wittichenau'),
-         #('Landkreis Görlitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk'),
-         #('Stadt Görlitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/goerlitz'),
-         #('Niesky',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/niesky'),
-         #('Löbau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/loebau'),
-         #('Zittau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/zittau'),
-         #('Ostritz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/ostritz'),
-         #('Rothenburg/Oberlausitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/rothenburg'),
-         #('Zittauer Gebirge',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/zittauer-gebirge'),
-         #('Vierkirchen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/vierkirchen'),
-         #('Bad Muskau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/bad-muskau'),
-         #('Weißwasser',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/weisswasser'),
-         #('Boxberg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/boxberg'),
-         #('Ebersbach-Neugersdorf',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/ebersbach-neugersdorf'),
-         #('Kodersdorf',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/kodersdorf'),
-         #('Landkreis Sächsische Schweiz-Osterzgebirge',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge'),
-         #('Pirna',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/pirna'),
-         #('Sebnitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/sebnitz'),
-         #('Bad Schandau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/bad-schandau'),
-         #('Bad Gottleuba-Berggießhübel',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/bad-gottleuba-berggiesshuebel'),
-         #('Heidenau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/heidenau'),
-         #('Dippoldiswalde',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/dippoldiswalde'),
-         #('Altenberg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/altenberg'),
-         #('Freital',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/freital'),
-         #('Stolpen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/stolpen'),
-         #('Glashütte',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/glashuette'),
-         #('Wilsdruff',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/wilsdruff'),
-         #('Neustadt in Sachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/neustadt-in-sachsen'),
-         #('Landkreis Meißen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk'),
-         #('Meißen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/meissen'),
-         #('Radebeul',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/radebeul'),
-         #('Riesa',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/riesa'),
-         #('Großenhain',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/grossenhain'),
-         #('Nossen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/nossen'),
-         #('Lommatzsch',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/lommatzsch'),
-         #('Radeburg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/radeburg'),
-         #('Königsbrücker Heide',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/koenigsbruecker-heide'),
-         #('Weinböhla',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/weinboehla'),
-         #('Moritzburg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/moritzburg'),
-         #('Coswig',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/coswig'),
-         #('Gröditz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/groeditz'),
-         #('Klipphausen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/klipphausen'),
-         #('Landkreis Mittelsachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen'),
-         #('Döbeln',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/doebeln'),
-         #('Freiberg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/freiberg'),
-         #('Mittweida',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/mittweida'),
-         #('Leisnig',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/leisnig'),
-         #('Waldheim',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/waldheim'),
-         #('Frankenberg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/frankenberg'),
-         #('Großschirma',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/grossschirma'),
-         #('Hainichen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/hainichen'),
-         #('Augustusburg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/augustusburg'),
-         #('Jahnatal',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/jahnatal'),
-         #('Landkreis Zwickau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/zwickau-lk'),
-         #('Stadt Leipzig',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/leipzig'),
-         #('Chemnitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/chemnitz'),
-         #('Landkreis Nordsachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/nordsachsen'),
-         #('Landkreis Leipzig',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/leipzig-lk'),
-         #('Erzgebirgskreis',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/erzgebirgskreis'),
-         #('Annaberg-Buchholz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/erzgebirgskreis/annaberg-buchholz'),
-         #('Seiffen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/erzgebirgskreis/seiffen'),
-         #('Vogtlandkreis',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/vogtland'),
-         #('Plauen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/vogtland/plauen'),
-         #('Tschechien',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/tschechien'),
-         ('Sachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/sachsen'),
-         #('Der Osten',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/der-osten'),
-         #('Politik in Sachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/politik/regional'),
-         #('Wirtschaft in Sachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/wirtschaft/regional'),
-         #('Sport in Sachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/sport/regional'),
-         #('Dynamo Dresden',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/dynamo-dresden'),
-         #('Outdoor in Sachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/outdoor-in-sachsen'),
-         #('Autobahn 17 (A17)',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/autobahn-17-(a17)'),
-         #('Autobahn 4 (A4)',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/autobahn-4-(a4)'),
-         #('Autobahn 72 (A72)',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/autobahn-72-(a72)'),
-         #('Autobahn 9 (A9)',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/autobahn-9-(a9)'),
-         #('Bundesstraße 170 (B170)',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/bundesstrasse-170-(b170)'),
-         #('Bundesstraße 178 (B178)',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/bundesstrasse-178-(b178)'),
-         #('Bundesstraße 96 (B96)',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/bundesstrasse-96-(b96)'),
-         #('Erzgebirge',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/erzgebirge'),
-         #('Sachsen Freizeit',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/sachsen-freizeit'),
-         #('Sachsen Gastronomie',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/sachsen-gastronomie'),
-         #('Genuss und Kochen',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/genuss-und-kochen'),
-         #('Sächsische Schweiz',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/saechsische-schweiz'),
-         #('Sachsenkompass',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/sachsenkompass'),
-         ('Politik',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/politik'),
-         ('Wirtschaft',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/wirtschaft'),
-         #('Sport', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/sport'),
-         ('Panorama',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/panorama'),
-         #('Promis', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/promis'),
-         #('Reise', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/reise'),
-         #('Medien & TV',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/medien'),
-         #('Digital',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/digital'),
-         #('Kultur', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/kultur'),
-         #('Wissen', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/wissen'),
-         #('Familie',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/familie'),
-         #('Gesundheit',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/gesundheit'),
-         #('Lifestyle',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lifestyle'),
-         #('Mobilität',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/mobilitaet'),
-         #('Bauen & Wohnen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/bauen-und-wohnen'),
-         #('Geld & Finanzen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/geld-und-finanzen'),
-         #('Liebe & Partnerschaft',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/liebe-und-partnerschaft'),
-         #('E-Mobility',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/e-mobility'),
-         #('Beruf & Bildung',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/beruf-und-bildung')
+         # ('Alle Artikel der SZ', 'https://www.saechsische.de/arc/outboundfeeds/rss/'),
+         ('Stadt Dresden', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden'),
+         # ('Altstadt',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/altstadt'),
+         # ('Blasewitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/blasewitz'),
+         # ('Cotta',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/cotta'),
+         # ('Klotzsche',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/klotzsche'),
+         # ('Leuben',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/leuben'),
+         # ('Loschwitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/loschwitz'),
+         # ('Neustadt',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/neustadt'),
+         # ('Pieschen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/pieschen'),
+         # ('Plauen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/plauen'),
+         # ('Prohlis',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/prohlis'),
+         # ('Cossebaude',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/cossebaude'),
+         # ('Langebrück',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/langebrueck'),
+         # ('Gompitz/Altfranken',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/gompitz-altfranken'),
+         # ('Weixdorf',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/weixdorf'),
+         # ('Schönfeld-Weißig',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/dresden/schoenfeld-weissig'),
+         # ('Landkreis Bautzen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk'),
+         # ('Stadt Bautzen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/bautzen'),
+         # ('Bischofswerda',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/bischofswerda'),
+         # ('Kamenz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/kamenz'),
+         # ('Pulsnitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/pulsnitz'),
+         # ('Radeberg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/radeberg'),
+         # ('Hoyerswerda',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/hoyerswerda'),
+         # ('Bernsdorf',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/bernsdorf'),
+         # ('Großröhrsdorf',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/grossroehrsdorf'),
+         # ('Lauta',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/lauta'),
+         # ('Schirgiswalde-Kirschau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/schirgiswalde-kirschau'),
+         # ('Wittichenau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/bautzen-lk/wittichenau'),
+         # ('Landkreis Görlitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk'),
+         # ('Stadt Görlitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/goerlitz'),
+         # ('Niesky',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/niesky'),
+         # ('Löbau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/loebau'),
+         # ('Zittau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/zittau'),
+         # ('Ostritz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/ostritz'),
+         # ('Rothenburg/Oberlausitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/rothenburg'),
+         # ('Zittauer Gebirge',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/zittauer-gebirge'),
+         # ('Vierkirchen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/vierkirchen'),
+         # ('Bad Muskau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/bad-muskau'),
+         # ('Weißwasser',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/weisswasser'),
+         # ('Boxberg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/boxberg'),
+         # ('Ebersbach-Neugersdorf',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/ebersbach-neugersdorf'),
+         # ('Kodersdorf',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/goerlitz-lk/kodersdorf'),
+         # ('Landkreis Sächsische Schweiz-Osterzgebirge',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge'),
+         # ('Pirna',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/pirna'),
+         # ('Sebnitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/sebnitz'),
+         # ('Bad Schandau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/bad-schandau'),
+         # ('Bad Gottleuba-Berggießhübel',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/bad-gottleuba-berggiesshuebel'),
+         # ('Heidenau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/heidenau'),
+         # ('Dippoldiswalde',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/dippoldiswalde'),
+         # ('Altenberg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/altenberg'),
+         # ('Freital',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/freital'),
+         # ('Stolpen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/stolpen'),
+         # ('Glashütte',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/glashuette'),
+         # ('Wilsdruff',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/wilsdruff'),
+         # ('Neustadt in Sachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/saechsische-schweiz-osterzgebirge/neustadt-in-sachsen'),
+         # ('Landkreis Meißen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk'),
+         # ('Meißen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/meissen'),
+         # ('Radebeul',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/radebeul'),
+         # ('Riesa',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/riesa'),
+         # ('Großenhain',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/grossenhain'),
+         # ('Nossen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/nossen'),
+         # ('Lommatzsch',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/lommatzsch'),
+         # ('Radeburg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/radeburg'),
+         # ('Königsbrücker Heide',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/koenigsbruecker-heide'),
+         # ('Weinböhla',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/weinboehla'),
+         # ('Moritzburg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/moritzburg'),
+         # ('Coswig',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/coswig'),
+         # ('Gröditz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/groeditz'),
+         # ('Klipphausen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/meissen-lk/klipphausen'),
+         # ('Landkreis Mittelsachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen'),
+         # ('Döbeln',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/doebeln'),
+         # ('Freiberg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/freiberg'),
+         # ('Mittweida',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/mittweida'),
+         # ('Leisnig',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/leisnig'),
+         # ('Waldheim',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/waldheim'),
+         # ('Frankenberg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/frankenberg'),
+         # ('Großschirma',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/grossschirma'),
+         # ('Hainichen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/hainichen'),
+         # ('Augustusburg',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/augustusburg'),
+         # ('Jahnatal',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/mittelsachsen/jahnatal'),
+         # ('Landkreis Zwickau',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/zwickau-lk'),
+         # ('Stadt Leipzig',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/leipzig'),
+         # ('Chemnitz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/chemnitz'),
+         # ('Landkreis Nordsachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/nordsachsen'),
+         # ('Landkreis Leipzig',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/leipzig-lk'),
+         # ('Erzgebirgskreis',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/erzgebirgskreis'),
+         # ('Annaberg-Buchholz',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/erzgebirgskreis/annaberg-buchholz'),
+         # ('Seiffen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/erzgebirgskreis/seiffen'),
+         # ('Vogtlandkreis',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/vogtland'),
+         # ('Plauen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lokales/vogtland/plauen'),
+         # ('Tschechien',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/tschechien'),
+         ('Sachsen', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/sachsen'),
+         # ('Der Osten',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/der-osten'),
+         # ('Politik in Sachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/politik/regional'),
+         # ('Wirtschaft in Sachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/wirtschaft/regional'),
+         # ('Sport in Sachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/sport/regional'),
+         # ('Dynamo Dresden',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/dynamo-dresden'),
+         # ('Outdoor in Sachsen',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/outdoor-in-sachsen'),
+         # ('Autobahn 17 (A17)',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/autobahn-17-(a17)'),
+         # ('Autobahn 4 (A4)',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/autobahn-4-(a4)'),
+         # ('Autobahn 72 (A72)',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/autobahn-72-(a72)'),
+         # ('Autobahn 9 (A9)',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/autobahn-9-(a9)'),
+         # ('Bundesstraße 170 (B170)',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/bundesstrasse-170-(b170)'),
+         # ('Bundesstraße 178 (B178)',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/bundesstrasse-178-(b178)'),
+         # ('Bundesstraße 96 (B96)',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/bundesstrasse-96-(b96)'),
+         # ('Erzgebirge',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/erzgebirge'),
+         # ('Sachsen Freizeit',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/sachsen-freizeit'),
+         # ('Sachsen Gastronomie',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/sachsen-gastronomie'),
+         # ('Genuss und Kochen',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/genuss-und-kochen'),
+         # ('Sächsische Schweiz',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/saechsische-schweiz'),
+         # ('Sachsenkompass',  'https://www.saechsische.de/arc/outboundfeeds/rss/tags_slug/sachsenkompass'),
+         ('Politik', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/politik'),
+         ('Wirtschaft', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/wirtschaft'),
+         # ('Sport', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/sport'),
+         ('Panorama', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/panorama'),
+         # ('Promis', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/promis'),
+         # ('Reise', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/reise'),
+         # ('Medien & TV',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/medien'),
+         # ('Digital',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/digital'),
+         # ('Kultur', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/kultur'),
+         # ('Wissen', 'https://www.saechsische.de/arc/outboundfeeds/rss/category/wissen'),
+         # ('Familie',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/familie'),
+         # ('Gesundheit',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/gesundheit'),
+         # ('Lifestyle',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/lifestyle'),
+         # ('Mobilität',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/mobilitaet'),
+         # ('Bauen & Wohnen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/bauen-und-wohnen'),
+         # ('Geld & Finanzen',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/geld-und-finanzen'),
+         # ('Liebe & Partnerschaft',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/liebe-und-partnerschaft'),
+         # ('E-Mobility',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/e-mobility'),
+         # ('Beruf & Bildung',  'https://www.saechsische.de/arc/outboundfeeds/rss/category/beruf-und-bildung')
     ]
 
-
     def parse_feeds(self):
-      # Call parent's method.
-      feeds = BasicNewsRecipe.parse_feeds(self)
-      # Loop through all feeds.
-      for feed in feeds:
-        # Loop through all articles in feed.
-        for article in feed.articles[:]:
-          # Remove articles with '...' in the url.
-          if '/anzeige/' in article.url:
-            print('Removing:',article.title)
-            feed.articles.remove(article)
-          # Remove articles with '...' in the title.
-          elif 'Liveticker' in article.title:
-              print('Removing:',article.title)
-              feed.articles.remove(article)
-          elif 'Liveblog' in article.title:
-              print('Removing:',article.title)
-              feed.articles.remove(article)
-          elif 'Newsblog' in article.title:
-              print('Removing:',article.title)
-              feed.articles.remove(article)
-          elif 'Podcast' in article.title:
-              print('Removing:',article.title)
-              feed.articles.remove(article)
-
-      return feeds
+        # Call parent's method.
+        feeds = BasicNewsRecipe.parse_feeds(self)
+        # Loop through all feeds.
+        for feed in feeds:
+            # Loop through all articles in feed.
+            for article in feed.articles[:]:
+                # Remove articles with '...' in the url.
+                if '/anzeige/' in article.url:
+                    print('Removing:',article.title)
+                    feed.articles.remove(article)
+                # Remove articles with '...' in the title.
+                elif 'Liveticker' in article.title:
+                    print('Removing:',article.title)
+                    feed.articles.remove(article)
+                elif 'Liveblog' in article.title:
+                    print('Removing:',article.title)
+                    feed.articles.remove(article)
+                elif 'Newsblog' in article.title:
+                    print('Removing:',article.title)
+                    feed.articles.remove(article)
+                elif 'Podcast' in article.title:
+                    print('Removing:',article.title)
+                    feed.articles.remove(article)
+        return feeds
 
     def preprocess_raw_html(self, raw, url):
-      # remove Newsblogs, articles requiring login and advertisements
-      unwantedtag='ArticleHeadstyled__ArticleHeadPaidIconContainer'
-      if unwantedtag in raw:
-        print('Skipping unwanted article with tag:',unwantedtag)
-        self.abort_article('Skipping unwanted article')
+        # remove Newsblogs, articles requiring login and advertisements
+        unwantedtag='ArticleHeadstyled__ArticleHeadPaidIconContainer'
+        if unwantedtag in raw:
+            print('Skipping unwanted article with tag:',unwantedtag)
+            self.abort_article('Skipping unwanted article')
 
-      unwanted_article_keywords = ['Zum Login']
-      for keyword in unwanted_article_keywords:
-          if keyword in raw:
-            print('Skipping unwanted article with keyword(s):',keyword)
-            #self.abort_article('Skipping unwanted article')
-      return raw
+        unwanted_article_keywords = ['Zum Login']
+        for keyword in unwanted_article_keywords:
+            if keyword in raw:
+                print('Skipping unwanted article with keyword(s):',keyword)
+                # self.abort_article('Skipping unwanted article')
+        return raw
diff --git a/recipes/salon.recipe b/recipes/salon.recipe
index e719e9b170..d8e8fe2f84 100644
--- a/recipes/salon.recipe
+++ b/recipes/salon.recipe
@@ -10,6 +10,7 @@ def classes(classes):
     return dict(attrs={
         'class': lambda x: x and frozenset(x.split()).intersection(q)})
 
+
 class Salon_com(BasicNewsRecipe):
 
     title = 'Salon.com'
@@ -20,8 +21,8 @@ class Salon_com(BasicNewsRecipe):
     oldest_article = 7
     max_articles_per_feed = 100
     no_stylesheets = True
-    #auto_cleanup = True
-    #auto_cleanup_keep = '//div[@id="image-id"]'
+    # auto_cleanup = True
+    # auto_cleanup_keep = '//div[@id="image-id"]'
     ignore_duplicate_articles = {'title', 'url'}
     remove_empty_feeds = True
 
@@ -39,15 +40,15 @@ class Salon_com(BasicNewsRecipe):
     remove_attributes = ['lang', 'style']
 
     feeds = [
-        #('News', 'http://www.salon.com/category/news/feed/rss/'),
-        #('Politics', 'http://www.salon.com/category/politics/feed/rss/'),
-        #('Business', 'http://www.salon.com/category/business/feed/rss/'),
-        #('Technology', 'http://www.salon.com/category/technology/feed/rss/'),
-        #('Innovation', 'http://www.salon.com/category/innovation/feed/rss/'),
-        #('Sustainability', 'http://www.salon.com/category/sustainability/feed/rss/'),
-        #('Entertainment', 'http://www.salon.com/category/entertainment/feed/rss/'),
-        #('Life', 'http://www.salon.com/category/life/feed/rss/'),
-        #
+        # ('News', 'http://www.salon.com/category/news/feed/rss/'),
+        # ('Politics', 'http://www.salon.com/category/politics/feed/rss/'),
+        # ('Business', 'http://www.salon.com/category/business/feed/rss/'),
+        # ('Technology', 'http://www.salon.com/category/technology/feed/rss/'),
+        # ('Innovation', 'http://www.salon.com/category/innovation/feed/rss/'),
+        # ('Sustainability', 'http://www.salon.com/category/sustainability/feed/rss/'),
+        # ('Entertainment', 'http://www.salon.com/category/entertainment/feed/rss/'),
+        # ('Life', 'http://www.salon.com/category/life/feed/rss/'),
+
         ('News and Politics', 'https://www.salon.com/category/news-and-politics/feed'),
         ('Culture', 'http://www.salon.com/category/culture/feed/'),
         ('Science &amp; Health', 'https://www.salon.com/category/science-and-health/feed/'),
diff --git a/recipes/saskatoon_star_phoenix.recipe b/recipes/saskatoon_star_phoenix.recipe
index 6592ef51aa..1d580ca01c 100644
--- a/recipes/saskatoon_star_phoenix.recipe
+++ b/recipes/saskatoon_star_phoenix.recipe
@@ -19,60 +19,60 @@ class CanWestPaper(BasicNewsRecipe):
     # #    url_prefix = 'http://www.timescolonist.com'
     # #    description = u'News from Victoria, BC'
     # #    fp_tag = 'CAN_TC'
-    #
+
     # un-comment the following four lines for the Vancouver Province
     # #    title = u'Vancouver Province'
     # #    url_prefix = 'http://www.theprovince.com'
     # #    description = u'News from Vancouver, BC'
     # #    fp_tag = 'CAN_VP'
-    #
+
     # un-comment the following four lines for the Vancouver Sun
     # #    title = u'Vancouver Sun'
     # #    url_prefix = 'http://www.vancouversun.com'
     # #    description = u'News from Vancouver, BC'
     # #    fp_tag = 'CAN_VS'
-    #
+
     # un-comment the following four lines for the Edmonton Journal
     # #    title = u'Edmonton Journal'
     # #    url_prefix = 'http://www.edmontonjournal.com'
     # #    description = u'News from Edmonton, AB'
     # #    fp_tag = 'CAN_EJ'
-    #
+
     # un-comment the following four lines for the Calgary Herald
     # #    title = u'Calgary Herald'
     # #    url_prefix = 'http://www.calgaryherald.com'
     # #    description = u'News from Calgary, AB'
     # #    fp_tag = 'CAN_CH'
-    #
+
     # un-comment the following four lines for the Regina Leader-Post
     # #    title = u'Regina Leader-Post'
     # #    url_prefix = 'http://www.leaderpost.com'
     # #    description = u'News from Regina, SK'
     # #    fp_tag = ''
-    #
+
     # un-comment the following four lines for the Saskatoon Star-Phoenix
     title = u'Saskatoon Star-Phoenix'
     url_prefix = 'http://www.thestarphoenix.com'
     description = u'News from Saskatoon, SK'
     fp_tag = ''
 
-#     un-comment the following four lines for the Windsor Star
-# #    title = u'Windsor Star'
-# #    url_prefix = 'http://www.windsorstar.com'
-# #    description = u'News from Windsor, ON'
-# #    fp_tag = 'CAN_'
-#
-#     un-comment the following four lines for the Ottawa Citizen
-# #    title = u'Ottawa Citizen'
-# #    url_prefix = 'http://www.ottawacitizen.com'
-# #    description = u'News from Ottawa, ON'
-# #    fp_tag = 'CAN_OC'
-#
-#     un-comment the following four lines for the Montreal Gazette
-# #    title = u'Montreal Gazette'
-# #    url_prefix = 'http://www.montrealgazette.com'
-# #    description = u'News from Montreal, QC'
-# #    fp_tag = 'CAN_MG'
+    # un-comment the following four lines for the Windsor Star
+    # #    title = u'Windsor Star'
+    # #    url_prefix = 'http://www.windsorstar.com'
+    # #    description = u'News from Windsor, ON'
+    # #    fp_tag = 'CAN_'
+
+    # un-comment the following four lines for the Ottawa Citizen
+    # #    title = u'Ottawa Citizen'
+    # #    url_prefix = 'http://www.ottawacitizen.com'
+    # #    description = u'News from Ottawa, ON'
+    # #    fp_tag = 'CAN_OC'
+
+    # un-comment the following four lines for the Montreal Gazette
+    # #    title = u'Montreal Gazette'
+    # #    url_prefix = 'http://www.montrealgazette.com'
+    # #    description = u'News from Montreal, QC'
+    # #    fp_tag = 'CAN_MG'
 
     language = 'en_CA'
     __author__ = 'Nick Redding'
@@ -113,8 +113,7 @@ class CanWestPaper(BasicNewsRecipe):
         except:
             while daysback < 7:
                 cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg' + \
-                    str((date.today() - timedelta(days=daysback)).day) + \
-                    '/lg/' + self.fp_tag + '.jpg'
+                    str((date.today() - timedelta(days=daysback)).day) + '/lg/' + self.fp_tag + '.jpg'
                 br = BasicNewsRecipe.get_browser(self)
                 try:
                     br.open(cover)
@@ -123,24 +122,24 @@ class CanWestPaper(BasicNewsRecipe):
                     continue
                 break
         if daysback == 7:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             cover = None
         return cover
 
     def fixChars(self, string):
         # Replace lsquo (\x91)
-        fixed = re.sub("\x91", "‘", string)
+        fixed = string.replace('\x91', '‘')
         # Replace rsquo (\x92)
-        fixed = re.sub("\x92", "’", fixed)
+        fixed = fixed.replace('\x92', '’')
         # Replace ldquo (\x93)
-        fixed = re.sub("\x93", "“", fixed)
+        fixed = fixed.replace('\x93', '“')
         # Replace rdquo (\x94)
-        fixed = re.sub("\x94", "”", fixed)
+        fixed = fixed.replace('\x94', '”')
         # Replace ndash (\x96)
-        fixed = re.sub("\x96", "–", fixed)
+        fixed = fixed.replace('\x96', '–')
         # Replace mdash (\x97)
-        fixed = re.sub("\x97", "—", fixed)
-        fixed = re.sub("&#x2019;", "’", fixed)
+        fixed = fixed.replace('\x97', '—')
+        fixed = fixed.replace('&#x2019;', '’')
         return fixed
 
     def massageNCXText(self, description):
@@ -180,14 +179,14 @@ class CanWestPaper(BasicNewsRecipe):
         ans = ['News']
 
         # Find each instance of class="sectiontitle", class="featurecontent"
-        for divtag in soup.findAll('div', attrs={'class': ["section_title02", "featurecontent"]}):
+        for divtag in soup.findAll('div', attrs={'class': ['section_title02', 'featurecontent']}):
             if ''.join(divtag['class']).startswith('section_title'):
                 # div contains section title
                 if not divtag.h3:
                     continue
                 key = self.tag_to_string(divtag.h3, False)
                 ans.append(key)
-                self.log("Section name %s" % key)
+                self.log('Section name %s' % key)
                 continue
             # div contains article data
             h1tag = divtag.find('h1')
diff --git a/recipes/satmagazine.recipe b/recipes/satmagazine.recipe
index 92577a09b6..c5388083dd 100644
--- a/recipes/satmagazine.recipe
+++ b/recipes/satmagazine.recipe
@@ -47,24 +47,24 @@ class SatMagazine(BasicNewsRecipe):
                          'valign', 'vspace', 'hspace', 'alt', 'width', 'height']
 
     # Specify extra CSS - overrides ALL other CSS (IE. Added last).
-    extra_css = 'body { font-family: verdana, helvetica, sans-serif; } \
-                 .introduction, .first { font-weight: bold; } \
-                 .cross-head { font-weight: bold; font-size: 125%; } \
-                 .cap, .caption { display: block; font-size: 80%; font-style: italic; } \
-                 .cap, .caption, .caption img, .caption span { display: block; margin: 5px auto; } \
-                 .byl, .byd, .byline img, .byline-name, .byline-title, .author-name, .author-position, \
-                    .correspondent-portrait img, .byline-lead-in, .name, .bbc-role { display: block; \
-                    font-size: 80%; font-style: italic; margin: 1px auto; } \
-                 .story-date, .published { font-size: 80%; } \
-                 table { width: 100%; } \
-                 td img { display: block; margin: 5px auto; } \
-                 ul { padding-top: 10px; } \
-                 ol { padding-top: 10px; } \
-                 li { padding-top: 5px; padding-bottom: 5px; } \
-                 h1 { font-size: 175%; font-weight: bold; } \
-                 h2 { font-size: 150%; font-weight: bold; } \
-                 h3 { font-size: 125%; font-weight: bold; } \
-                 h4, h5, h6 { font-size: 100%; font-weight: bold; }'
+    extra_css = '''body { font-family: verdana, helvetica, sans-serif; }
+                   .introduction, .first { font-weight: bold; }
+                   .cross-head { font-weight: bold; font-size: 125%; }
+                   .cap, .caption { display: block; font-size: 80%; font-style: italic; }
+                   .cap, .caption, .caption img, .caption span { display: block; margin: 5px auto; }
+                   .byl, .byd, .byline img, .byline-name, .byline-title, .author-name, .author-position,
+                      .correspondent-portrait img, .byline-lead-in, .name, .bbc-role { display: block;
+                      font-size: 80%; font-style: italic; margin: 1px auto; }
+                   .story-date, .published { font-size: 80%; }
+                   table { width: 100%; }
+                   td img { display: block; margin: 5px auto; }
+                   ul { padding-top: 10px; }
+                   ol { padding-top: 10px; }
+                   li { padding-top: 5px; padding-bottom: 5px; }
+                   h1 { font-size: 175%; font-weight: bold; }
+                   h2 { font-size: 150%; font-weight: bold; }
+                   h3 { font-size: 125%; font-weight: bold; }
+                   h4, h5, h6 { font-size: 100%; font-weight: bold; }'''
 
     # Remove the line breaks, href links and float left/right and picture
     # width/height.
diff --git a/recipes/science_news.recipe b/recipes/science_news.recipe
index f3de3c20b5..4be6289658 100644
--- a/recipes/science_news.recipe
+++ b/recipes/science_news.recipe
@@ -12,8 +12,8 @@ from calibre.web.feeds.news import BasicNewsRecipe, prefixed_classes
 
 class ScienceNewsIssue(BasicNewsRecipe):
     title = u'Science News'
-    description = ("Science News is an award-winning bi-weekly newsmagazine covering the most important research"
-                   " in all fields of science. This recipe downloads all the articles from the latest issue.")
+    description = ('Science News is an award-winning bi-weekly newsmagazine covering the most important research'
+                   ' in all fields of science. This recipe downloads all the articles from the latest issue.')
     category = u'Science, Technology, News'
     publisher = u'Society for Science & the Public'
     language = 'en'
@@ -54,16 +54,16 @@ class ScienceNewsIssue(BasicNewsRecipe):
         # Get articles
         soup = self.index_to_soup(url)
         soup = soup.find('main', attrs={'id':'content'})
-        re_article = re.compile("https://www.sciencenews.org/article/")
+        re_article = re.compile(r'https://www.sciencenews.org/article/')
         stories = []
         past_urls = set()
         for sec in soup.find_all(href=re_article):
 
-            article_url = sec["href"]
+            article_url = sec['href']
             article_title = sec.text.strip()
 
             # Ignore image URLs which do not have text title
-            if article_title == "":
+            if article_title == '':
                 continue
 
             # Ignore if link is a duplicate
@@ -73,12 +73,12 @@ class ScienceNewsIssue(BasicNewsRecipe):
             past_urls.add(article_url)
             self.log('\t', article_title, ' ', article_url)
             article_info = {
-                "url": article_url,
-                "title": article_title,
+                'url': article_url,
+                'title': article_title,
             }
             stories.append(article_info)
 
         index = [
-            ("Articles", stories),
+            ('Articles', stories),
         ]
         return index
diff --git a/recipes/science_x.recipe b/recipes/science_x.recipe
index 1ae4dc8b07..bf3d72ae80 100644
--- a/recipes/science_x.recipe
+++ b/recipes/science_x.recipe
@@ -16,7 +16,7 @@ class scix(BasicNewsRecipe):
     )
     language = 'en'
     __author__ = 'unkn0wn'
-    oldest_article = 1 # days
+    oldest_article = 1  # days
     max_articles_per_feed = 50
     encoding = 'utf-8'
     remove_attributes = ['height', 'width']
@@ -51,8 +51,8 @@ class scix(BasicNewsRecipe):
             ('Tech Xplore', 'https://techxplore.com/rss-feed/'),
             ('Medical Xpress', 'https://medicalxpress.com/rss-feed/'),
             ('Phys.org', 'https://phys.org/rss-feed/')
-            #https://medicalxpress.com/feeds/
-            #https://techxplore.com/feeds/
+            # https://medicalxpress.com/feeds/
+            # https://techxplore.com/feeds/
         ]
 
     def preprocess_html(self, soup):
diff --git a/recipes/scientific_american.recipe b/recipes/scientific_american.recipe
index 4a0374ec70..07b7c544e4 100644
--- a/recipes/scientific_american.recipe
+++ b/recipes/scientific_american.recipe
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-__license__ = "GPL v3"
+__license__ = 'GPL v3'
 
 import json
 from datetime import datetime
@@ -9,29 +9,29 @@ from calibre.web.feeds.news import BasicNewsRecipe, prefixed_classes
 
 
 class ScientificAmerican(BasicNewsRecipe):
-    title = "Scientific American"
-    description = "Popular Science. Monthly magazine. Should be downloaded around the middle of each month."
-    category = "science"
-    __author__ = "Kovid Goyal"
+    title = 'Scientific American'
+    description = 'Popular Science. Monthly magazine. Should be downloaded around the middle of each month.'
+    category = 'science'
+    __author__ = 'Kovid Goyal'
     no_stylesheets = True
-    language = "en"
-    publisher = "Nature Publishing Group"
+    language = 'en'
+    publisher = 'Nature Publishing Group'
     remove_empty_feeds = True
     remove_javascript = True
-    timefmt = " [%B %Y]"
-    remove_attributes = ["height", "width"]
+    timefmt = ' [%B %Y]'
+    remove_attributes = ['height', 'width']
     masthead_url = (
-        "https://static.scientificamerican.com/sciam/assets/Image/newsletter/salogo.png"
+        'https://static.scientificamerican.com/sciam/assets/Image/newsletter/salogo.png'
     )
-    extra_css = """
+    extra_css = '''
         [class^="article_dek-"] { font-style:italic; color:#202020; }
         [class^="article_authors-"] {font-size:small; color:#202020; }
         [class^="article__image-"], [class^="lead_image-"], .calibre-nuked-tag-figcaption { font-size:small; }
         [class^="bio-"] { font-size:small; color:#404040; }
         em, blockquote { color:#202020; }
-    """
+    '''
 
-    needs_subscription = "optional"
+    needs_subscription = 'optional'
 
     keep_only_tags = [
         prefixed_classes(
@@ -59,10 +59,10 @@ class ScientificAmerican(BasicNewsRecipe):
     def get_browser(self, *args):
         br = BasicNewsRecipe.get_browser(self)
         if self.username and self.password:
-            br.open("https://www.scientificamerican.com/account/login/")
-            br.select_form(predicate=lambda f: f.attrs.get("id") == "login")
-            br["emailAddress"] = self.username
-            br["password"] = self.password
+            br.open('https://www.scientificamerican.com/account/login/')
+            br.select_form(predicate=lambda f: f.attrs.get('id') == 'login')
+            br['emailAddress'] = self.username
+            br['password'] = self.password
             br.submit()
         return br
 
@@ -87,50 +87,50 @@ class ScientificAmerican(BasicNewsRecipe):
         if d and isinstance(d, str):
             issue = d
         else:
-            fp_soup = self.index_to_soup("https://www.scientificamerican.com")
+            fp_soup = self.index_to_soup('https://www.scientificamerican.com')
             curr_issue_link = fp_soup.find(**prefixed_classes('latest_issue_links-'))
             if not curr_issue_link:
-                self.abort_recipe_processing("Unable to find issue link")
-            issue = 'https://www.scientificamerican.com' + curr_issue_link.a["href"]
+                self.abort_recipe_processing('Unable to find issue link')
+            issue = 'https://www.scientificamerican.com' + curr_issue_link.a['href']
 
         soup = self.index_to_soup(issue)
-        script = soup.find("script", id="__DATA__")
+        script = soup.find('script', id='__DATA__')
         if not script:
-            self.abort_recipe_processing("Unable to find script")
+            self.abort_recipe_processing('Unable to find script')
 
-        JSON = script.contents[0].split('JSON.parse(`')[1].replace("\\\\", "\\")
+        JSON = script.contents[0].split('JSON.parse(`')[1].replace('\\\\', '\\')
         data = json.JSONDecoder().raw_decode(JSON)[0]
         issue_info = (
             data
-            .get("initialData", {})
-            .get("issueData", {})
+            .get('initialData', {})
+            .get('issueData', {})
         )
         if not issue_info:
-            self.abort_recipe_processing("Unable to find issue info")
+            self.abort_recipe_processing('Unable to find issue info')
 
-        self.cover_url = issue_info["image_url"] + "?w=800"
+        self.cover_url = issue_info['image_url'] + '?w=800'
 
-        edition_date = datetime.strptime(issue_info["issue_date"], "%Y-%m-%d")
-        self.timefmt = f" [{edition_date:%B %Y}]"
+        edition_date = datetime.strptime(issue_info['issue_date'], '%Y-%m-%d')
+        self.timefmt = f' [{edition_date:%B %Y}]'
 
         feeds = {}
-        for section in issue_info.get("article_previews", {}):
-            for article in issue_info.get("article_previews", {}).get(section, []):
-                self.log('\t', article["title"])
+        for section in issue_info.get('article_previews', {}):
+            for article in issue_info.get('article_previews', {}).get(section, []):
+                self.log('\t', article['title'])
                 if section.startswith('featur'):
                     feed_name = section.capitalize()
                 else:
-                    feed_name = article["category"]
+                    feed_name = article['category']
                 if feed_name not in feeds:
                     feeds[feed_name] = []
                 feeds[feed_name].append(
                     {
-                        "title": article["title"],
-                        "url": urljoin(
-                            "https://www.scientificamerican.com/article/",
-                            article["slug"],
+                        'title': article['title'],
+                        'url': urljoin(
+                            'https://www.scientificamerican.com/article/',
+                            article['slug'],
                         ),
-                        "description": article["summary"],
+                        'description': article['summary'],
                     }
                 )
         sorted_feeds = dict(sorted(feeds.items(), key=lambda x: (not x[0].startswith('Featur'), x[0])))
diff --git a/recipes/scmp.recipe b/recipes/scmp.recipe
index b8012e119e..6e3010b7ac 100644
--- a/recipes/scmp.recipe
+++ b/recipes/scmp.recipe
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
-"""
+'''
 scmp.com
-"""
+'''
 
 import json
 import time
@@ -20,6 +20,7 @@ def E(parent, name, text='', **attrs):
     parent.append(ans)
     return ans
 
+
 def process_node(node, html_parent):
     ntype = node.get('type')
 
@@ -45,6 +46,7 @@ def ts_date(x):
     dt = datetime.fromtimestamp(x/1000 + time.timezone)
     return dt.strftime('%b %d, %Y at %I:%M %p')
 
+
 def load_article_from_json(raw, root):
     # open('/t/raw.json', 'w').write(raw)
     data = json.loads(raw)['props']['pageProps']['payload']['data']['article']
@@ -52,13 +54,12 @@ def load_article_from_json(raw, root):
     for child in tuple(body):
         body.remove(child)
     article = E(body, 'article')
-    E(article, 'div', replace_entities(data['firstTopic']['name']) , style='color: gray; font-size:small; font-weight:bold;')
+    E(article, 'div', replace_entities(data['firstTopic']['name']), style='color: gray; font-size:small; font-weight:bold;')
     E(article, 'h1', replace_entities(data['headline']))
     # E(article, 'p', replace_entities(data['subHeadline']['text']), style='font-style: italic; color:#202020;')
     for subh in data['subHeadline']['json']:
         process_node(subh, article)
-    auth = ts_date(data['publishedDate']) + ' | ' + str(data.get('readingTime', '')) + ' min read | ' \
-            + ', '.join([a['name'] for a in data['authors']])
+    auth = ts_date(data['publishedDate']) + ' | ' + str(data.get('readingTime', '')) + ' min read | ' + ', '.join([a['name'] for a in data['authors']])
     E(article, 'p', auth, style='color: #202020; font-size:small;')
     main_image_url = sub_img = ''
     for l in data['images']:
@@ -74,8 +75,8 @@ def load_article_from_json(raw, root):
 
 
 class SCMP(BasicNewsRecipe):
-    title = "South China Morning Post"
-    __author__ = "unkn0wn"
+    title = 'South China Morning Post'
+    __author__ = 'unkn0wn'
     description = (
         'The South China Morning Post is a leading news media company that has reported on China and Asia '
         'for more than a century with global impact. Founded in 1903, SCMP is headquartered in Hong Kong, '
@@ -84,18 +85,18 @@ class SCMP(BasicNewsRecipe):
         'and inspiring through journalism of the highest standards. Our vision is to “Elevate Thought”, '
         'and our mission is to “Lead the global conversation about China”.'
     )
-    publisher = "South China Morning Post Publishers Ltd."
+    publisher = 'South China Morning Post Publishers Ltd.'
     oldest_article = 1
     no_stylesheets = True
     remove_javascript = True
     remove_attributes = ['width', 'height']
-    encoding = "utf-8"
+    encoding = 'utf-8'
     use_embedded_content = False
-    language = "en_HK"
+    language = 'en_HK'
     remove_empty_feeds = True
     resolve_internal_links = True
-    publication_type = "newspaper"
-    ignore_duplicate_articles = {"title", "url"}
+    publication_type = 'newspaper'
+    ignore_duplicate_articles = {'title', 'url'}
     extra_css = 'blockquote, em { color: #202020; }'
     masthead_url = 'https://upload.wikimedia.org/wikipedia/commons/c/c3/SCMP_logo.svg'
 
@@ -139,29 +140,29 @@ class SCMP(BasicNewsRecipe):
     remove_tags = [
         dict(
             classes(
-                "sticky-wrap relative social-media social-media--extended__shares"
-                " article-body-comment scmp_button_comment_wrapper social-media--extended__in-site"
-                " footer scmp-advert-tile sidebar-col related-article share-widget"
+                'sticky-wrap relative social-media social-media--extended__shares'
+                ' article-body-comment scmp_button_comment_wrapper social-media--extended__in-site'
+                ' footer scmp-advert-tile sidebar-col related-article share-widget'
             )
         ),
-        dict(attrs={"addthis_title": True}),
-        dict(name=["script", "style"]),
+        dict(attrs={'addthis_title': True}),
+        dict(name=['script', 'style']),
     ]
 
     # https://www.scmp.com/rss
     feeds = [
-        ("Hong Kong", "https://www.scmp.com/rss/2/feed"),
-        ("China", "https://www.scmp.com/rss/4/feed"),
-        ("Asia", "https://www.scmp.com/rss/3/feed"),
-        ("World", "https://www.scmp.com/rss/5/feed"),
-        ("Business", "https://www.scmp.com/rss/92/feed"),
-        ("Tech", "https://www.scmp.com/rss/36/feed"),
-        ("Life", "https://www.scmp.com/rss/94/feed"),
-        ("Culture", "https://www.scmp.com/rss/322296/feed"),
-        ("Sport", "https://www.scmp.com/rss/95/feed"),
-        ("Post Mag", "https://www.scmp.com/rss/71/feed"),
-        ("Style", "https://www.scmp.com/rss/72/feed"),
-        ("News", 'https://www.scmp.com/rss/91/feed')
+        ('Hong Kong', 'https://www.scmp.com/rss/2/feed'),
+        ('China', 'https://www.scmp.com/rss/4/feed'),
+        ('Asia', 'https://www.scmp.com/rss/3/feed'),
+        ('World', 'https://www.scmp.com/rss/5/feed'),
+        ('Business', 'https://www.scmp.com/rss/92/feed'),
+        ('Tech', 'https://www.scmp.com/rss/36/feed'),
+        ('Life', 'https://www.scmp.com/rss/94/feed'),
+        ('Culture', 'https://www.scmp.com/rss/322296/feed'),
+        ('Sport', 'https://www.scmp.com/rss/95/feed'),
+        ('Post Mag', 'https://www.scmp.com/rss/71/feed'),
+        ('Style', 'https://www.scmp.com/rss/72/feed'),
+        ('News', 'https://www.scmp.com/rss/91/feed')
     ]
 
     def print_version(self, url):
diff --git a/recipes/scott_hanselman.recipe b/recipes/scott_hanselman.recipe
index 711258ddac..fc0ccdddc5 100644
--- a/recipes/scott_hanselman.recipe
+++ b/recipes/scott_hanselman.recipe
@@ -28,8 +28,8 @@ class ScottHanselman(BasicNewsRecipe):
         '--comment', description, '--category', category, '--publisher', publisher, '--author', author
     ]
 
-    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + \
-        description + '"\ntags="' + category + '"\nauthors="' + author + '"'
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + \
+        '"\ntags="' + category + '"\nauthors="' + author + '"'
 
     remove_tags = [
         dict(name=['object', 'link']), dict(
diff --git a/recipes/scprint.recipe b/recipes/scprint.recipe
index e4a2edc3b2..c7497aa6f3 100644
--- a/recipes/scprint.recipe
+++ b/recipes/scprint.recipe
@@ -5,7 +5,7 @@ class SCPrintMagazine(BasicNewsRecipe):
     title = u'SC Print Magazine'
     __author__ = u'Tony Maro'
     description = u'Last print version of the data security magazine'
-    INDEX = "http://www.scmagazineus.com/issuearchive/"
+    INDEX = 'http://www.scmagazineus.com/issuearchive/'
     no_stylesheets = True
     language = 'en'
     keep_only_tags = [dict(id=['article', 'review'])]
@@ -52,9 +52,9 @@ class SCPrintMagazine(BasicNewsRecipe):
                                 if mylink.get('href'):
                                     artlink = mylink['href']
                                     artlink = artlink.replace(
-                                        "/article", "/printarticle")
+                                        '/article', '/printarticle')
                                     artlink = artlink.replace(
-                                        "/review", "/printreview")
+                                        '/review', '/printreview')
                                     deck = onearticle.find(
                                         'div', attrs={'class': 'deck'})
                                     if deck is not None:
@@ -72,7 +72,7 @@ class SCPrintMagazine(BasicNewsRecipe):
         br['ctl00$ctl00$cphAllPageContent$cphMainContent$SubscriberEasyLoginView1$txtEmail'] = self.username
         br['ctl00$ctl00$cphAllPageContent$cphMainContent$SubscriberEasyLoginView1$txtPassword'] = self.password
         raw = br.submit(
-            "ctl00$ctl00$cphAllPageContent$cphMainContent$SubscriberEasyLoginView1$btnLogin").read()
+            'ctl00$ctl00$cphAllPageContent$cphMainContent$SubscriberEasyLoginView1$btnLogin').read()
         if 'Logout</a>' not in raw:
             raise LoginFailed(
                 _('Failed to log in, check your username and password for'
diff --git a/recipes/screen_rant.recipe b/recipes/screen_rant.recipe
index 0df33a3337..9ffc250503 100644
--- a/recipes/screen_rant.recipe
+++ b/recipes/screen_rant.recipe
@@ -7,7 +7,7 @@ class AdvancedUserRecipe1716109928(BasicNewsRecipe):
     title          = 'Screen Rant'
     description = (
             'ScreenRant is a digital publication. ScreenRant has grown into one of the'
-            " world’s most prominent entertainment news sources. ScreenRant don’t just break and report news;"
+            ' world’s most prominent entertainment news sources. ScreenRant don’t just break and report news;'
             ' they analyze and editorialize it with unique insight and inside information.')
     __author__ = 'Spicy Poison'
     encoding = 'utf-8'
diff --git a/recipes/scroll.recipe b/recipes/scroll.recipe
index ee012d32f8..c1cef82bfd 100644
--- a/recipes/scroll.recipe
+++ b/recipes/scroll.recipe
@@ -25,7 +25,7 @@ class scroll(BasicNewsRecipe):
     '''
 
     keep_only_tags = [
-        dict(name = 'header'),
+        dict(name='header'),
         classes('featured-image article-body')
     ]
 
diff --git a/recipes/seminar_magazine.recipe b/recipes/seminar_magazine.recipe
index 7fc77f46d0..0737a9dce9 100644
--- a/recipes/seminar_magazine.recipe
+++ b/recipes/seminar_magazine.recipe
@@ -22,7 +22,7 @@ class Seminar(BasicNewsRecipe):
         soup = self.index_to_soup('https://www.india-seminar.com/')
         citem = soup.find('img', src=lambda x: x and 'covers' in x)
         if citem:
-            cover_url = "https://www.india-seminar.com/" + citem['src']
+            cover_url = 'https://www.india-seminar.com/' + citem['src']
         return cover_url
 
     def parse_index(self):
diff --git a/recipes/sign_of_the_times.recipe b/recipes/sign_of_the_times.recipe
index c29678fd8f..f6a1dc3e11 100644
--- a/recipes/sign_of_the_times.recipe
+++ b/recipes/sign_of_the_times.recipe
@@ -10,11 +10,11 @@ class SignOfTheTimes(BasicNewsRecipe):
     max_articles_per_feed = 50
     use_embedded_content = False
 
-    extra_css             = """
+    extra_css             = '''
                                h2{font-size: large; margin: .2em 0; text-decoration: none;}
                                .image-caption{font-size: medium; font-style:italic; margin: 0 0 1em 0;}
                                .article-info{font-size: small; font-style:italic; margin: 0 0 .5em 0;}
-                            """
+                            '''
 
     remove_stylesheets = True
     remove_tags = [
diff --git a/recipes/simple_flying.recipe b/recipes/simple_flying.recipe
index 542bad9823..1afe3a84be 100644
--- a/recipes/simple_flying.recipe
+++ b/recipes/simple_flying.recipe
@@ -24,17 +24,17 @@ class AdvancedUserRecipe1718370158(BasicNewsRecipe):
     auto_cleanup   = True
 
     feeds          = [
-        #Features
+        # Features
         ('Analysis', 'https://simpleflying.com/feed/category/analysis/'),
         ('History', 'https://simpleflying.com/feed/category/history/'),
         ('Exclusives', 'https://simpleflying.com/feed/category/exclusives/'),
-        #By Region
+        # By Region
         ('Asia', 'https://simpleflying.com/feed/category/asia/'),
         ('Europe', 'https://simpleflying.com/feed/category/europe/'),
         ('North America', 'https://simpleflying.com/feed/category/north-america/'),
         ('Africa', 'https://simpleflying.com/feed/category/africa/'),
         ('Rest of World', 'https://simpleflying.com/feed/category/rest-of-world/'),
-        #Travel
+        # Travel
         ('Trip Reports', 'https://simpleflying.com/feed/category/trip-reports/'),
         ('Passanger Experience', 'https://simpleflying.com/feed/category/passenger-experience/'),
 
diff --git a/recipes/singtaohk.recipe b/recipes/singtaohk.recipe
index 9372f3a9b1..abfb386697 100644
--- a/recipes/singtaohk.recipe
+++ b/recipes/singtaohk.recipe
@@ -5,7 +5,7 @@ from calibre.web.feeds.news import BasicNewsRecipe, classes
 class STHKRecipe(BasicNewsRecipe):
     title = '星島日報 (香港)'
     __author__ = 'unkn0wn'
-    description = 'The Sing Tao Daily is among Hong Kong\'s oldest Chinese language newspapers. (https://std.stheadline.com/)'
+    description = "The Sing Tao Daily is among Hong Kong's oldest Chinese language newspapers. (https://std.stheadline.com/)"
     category = 'Chinese, News, Hong Kong'
     language = 'zh'
     encoding = 'utf-8'
diff --git a/recipes/skai.recipe b/recipes/skai.recipe
index dbf80c27e3..3c77de16a7 100644
--- a/recipes/skai.recipe
+++ b/recipes/skai.recipe
@@ -14,7 +14,6 @@ class SKAI(BasicNewsRecipe):
     no_stylesheets = True
     use_embedded_content = False
     remove_empty_feeds = True
-    encoding = 'utf8'
     keep_only_tags = [
         dict(name='h1'),
         dict(name='div', attrs={'class': ['articleText']})
diff --git a/recipes/skeptical_enquirer.recipe b/recipes/skeptical_enquirer.recipe
index af22b4fcb4..d4ac25b16c 100644
--- a/recipes/skeptical_enquirer.recipe
+++ b/recipes/skeptical_enquirer.recipe
@@ -25,14 +25,14 @@ class FreeInquiry(BasicNewsRecipe):
     ignore_duplicate_articles = {'url'}
     remove_empty_feeds = True
     needs_subscription = True
-    extra_css             = """
+    extra_css             = '''
                             .entry-header{
                                           text-transform: uppercase;
                                           vertical-align: baseline;
                                           display: inline;
                                          }
                             ul li{display: inline}
-                            """
+                            '''
 
     remove_tags = [
         classes(
@@ -76,7 +76,7 @@ class FreeInquiry(BasicNewsRecipe):
                                 url = ''
                             seen.add(url)
                             self.log('Found article:', art_title)
-                            yield{
+                            yield {
                                 'title': art_title,
                                 'url': url,
                                 'description': desc
diff --git a/recipes/smashing.recipe b/recipes/smashing.recipe
index 409a623165..2023d53c18 100644
--- a/recipes/smashing.recipe
+++ b/recipes/smashing.recipe
@@ -11,7 +11,7 @@ class SmashingMagazine (BasicNewsRecipe):
     __license__ = 'GPL v3'
     __copyright__ = '2012, Marc Busqué <marc@lamarciana.com>'
     title = u'Smashing Magazine'
-    description = u'Founded in September 2006, Smashing Magazine delivers useful and innovative information to Web designers and developers. Our aim is to inform our readers about the latest trends and techniques in Web development. We try to persuade you not with the quantity but with the quality of the information we present. Smashing Magazine is and always has been independent.'  # noqa
+    description = u'Founded in September 2006, Smashing Magazine delivers useful and innovative information to Web designers and developers. Our aim is to inform our readers about the latest trends and techniques in Web development. We try to persuade you not with the quantity but with the quality of the information we present. Smashing Magazine is and always has been independent.'  # noqa: E501
     language = 'en'
     tags = 'web development, software'
     oldest_article = 7
diff --git a/recipes/smh.recipe b/recipes/smh.recipe
index 9c9a9878a8..ce1f422889 100644
--- a/recipes/smh.recipe
+++ b/recipes/smh.recipe
@@ -1,50 +1,50 @@
-__license__ = "GPL v3"
-__copyright__ = "2010-2011, Darko Miletic <darko.miletic at gmail.com>"
-"""
+__license__ = 'GPL v3'
+__copyright__ = '2010-2011, Darko Miletic <darko.miletic at gmail.com>'
+'''
 smh.com.au
-"""
+'''
 from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class Smh_au(BasicNewsRecipe):
-    title = "The Sydney Morning Herald"
-    __author__ = "Darko Miletic"
-    description = "Breaking news from Sydney, Australia and the world. Features the latest business, sport, entertainment, travel, lifestyle, and technology news."  # noqa
-    publisher = "Fairfax Digital"
-    category = "news, politics, Australia, Sydney"
+    title = 'The Sydney Morning Herald'
+    __author__ = 'Darko Miletic'
+    description = 'Breaking news from Sydney, Australia and the world. Features the latest business, sport, entertainment, travel, lifestyle, and technology news.'  # noqa: E501
+    publisher = 'Fairfax Digital'
+    category = 'news, politics, Australia, Sydney'
     oldest_article = 2
     max_articles_per_feed = 200
     no_stylesheets = True
-    ignore_duplicate_articles = {"title", "url"}
+    ignore_duplicate_articles = {'title', 'url'}
     use_embedded_content = False
-    encoding = "utf-8"
+    encoding = 'utf-8'
 
-    language = "en_AU"
+    language = 'en_AU'
     remove_empty_feeds = True
-    masthead_url = "http://images.smh.com.au/2010/02/02/1087188/smh-620.jpg"
-    publication_type = "newspaper"
+    masthead_url = 'http://images.smh.com.au/2010/02/02/1087188/smh-620.jpg'
+    publication_type = 'newspaper'
 
-    keep_only_tags = [dict(name="article")]
+    keep_only_tags = [dict(name='article')]
     remove_tags = [
-        dict(name=["button"]),
-        dict(id=["saveTooltip"]),
-        dict(attrs={"class": "noPrint"}),
+        dict(name=['button']),
+        dict(id=['saveTooltip']),
+        dict(attrs={'class': 'noPrint'}),
     ]
 
     # https://www.smh.com.au/rssheadlines
     feeds = [
-        ("Latest News", "https://www.smh.com.au/rss/feed.xml"),
-        ("Federal Politics", "https://www.smh.com.au/rss/politics/federal.xml"),
-        ("NSW News", "https://www.smh.com.au/rss/national/nsw.xml"),
-        ("World", "https://www.smh.com.au/rss/world.xml"),
-        ("National", "https://www.smh.com.au/rss/national.xml"),
-        ("Business", "https://www.smh.com.au/rss/business.xml"),
-        ("Culture", "https://www.smh.com.au/rss/culture.xml"),
-        ("Technology", "https://www.smh.com.au/rss/technology.xml"),
-        ("Environment", "https://www.smh.com.au/rss/environment.xml"),
-        ("Lifestyle", "https://www.smh.com.au/rss/lifestyle.xml"),
-        ("Property", "https://www.smh.com.au/rss/property.xml"),
-        ("Sport", "https://www.smh.com.au/rss/sport.xml"),
-        ("Ruby League", "https://www.smh.com.au/rss/sport/nrl.xml"),
-        ("AFL", "https://www.smh.com.au/rss/sport/afl.xml"),
+        ('Latest News', 'https://www.smh.com.au/rss/feed.xml'),
+        ('Federal Politics', 'https://www.smh.com.au/rss/politics/federal.xml'),
+        ('NSW News', 'https://www.smh.com.au/rss/national/nsw.xml'),
+        ('World', 'https://www.smh.com.au/rss/world.xml'),
+        ('National', 'https://www.smh.com.au/rss/national.xml'),
+        ('Business', 'https://www.smh.com.au/rss/business.xml'),
+        ('Culture', 'https://www.smh.com.au/rss/culture.xml'),
+        ('Technology', 'https://www.smh.com.au/rss/technology.xml'),
+        ('Environment', 'https://www.smh.com.au/rss/environment.xml'),
+        ('Lifestyle', 'https://www.smh.com.au/rss/lifestyle.xml'),
+        ('Property', 'https://www.smh.com.au/rss/property.xml'),
+        ('Sport', 'https://www.smh.com.au/rss/sport.xml'),
+        ('Ruby League', 'https://www.smh.com.au/rss/sport/nrl.xml'),
+        ('AFL', 'https://www.smh.com.au/rss/sport/afl.xml'),
     ]
diff --git a/recipes/smith.recipe b/recipes/smith.recipe
index 2088ecdc20..d32ead1b0e 100644
--- a/recipes/smith.recipe
+++ b/recipes/smith.recipe
@@ -16,7 +16,7 @@ class Smithsonian(BasicNewsRecipe):
     title = 'Smithsonian Magazine'
     __author__ = 'Kovid Goyal'
 
-    description = 'This magazine chronicles the arts, environment, sciences and popular culture of the times. It is edited for modern, well-rounded individuals with diverse, general interests. With your order, you become a National Associate Member of the Smithsonian. Membership benefits include your subscription to Smithsonian magazine, a personalized membership card, discounts from the Smithsonian catalog, and more.'  # noqa
+    description = 'This magazine chronicles the arts, environment, sciences and popular culture of the times. It is edited for modern, well-rounded individuals with diverse, general interests. With your order, you become a National Associate Member of the Smithsonian. Membership benefits include your subscription to Smithsonian magazine, a personalized membership card, discounts from the Smithsonian catalog, and more.'  # noqa: E501
     language = 'en'
     category = 'news'
     encoding = 'UTF-8'
diff --git a/recipes/snob.recipe b/recipes/snob.recipe
index 8f979a4705..f1b5b4c5a9 100644
--- a/recipes/snob.recipe
+++ b/recipes/snob.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Snob(BasicNewsRecipe):
     title = '\u0421\u043D\u043E\u0431'
     __author__ = 'bugmen00t'
-    description = '\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u043E\u043D\u043D\u043E\u0435, \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0435 \u0438 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u0435 \u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0441\u0442\u0432\u043E \u0434\u043B\u044F \u043B\u044E\u0434\u0435\u0439, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0436\u0438\u0432\u0443\u0442 \u0432 \u0440\u0430\u0437\u043D\u044B\u0445 \u0441\u0442\u0440\u0430\u043D\u0430\u0445, \u0433\u043E\u0432\u043E\u0440\u044F\u0442 \u043D\u0430 \u0440\u0430\u0437\u043D\u044B\u0445 \u044F\u0437\u044B\u043A\u0430\u0445, \u043D\u043E \u0434\u0443\u043C\u0430\u044E\u0442 \u043F\u043E-\u0440\u0443\u0441\u0441\u043A\u0438.'  # noqa
+    description = '\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u043E\u043D\u043D\u043E\u0435, \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0435 \u0438 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u0435 \u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0441\u0442\u0432\u043E \u0434\u043B\u044F \u043B\u044E\u0434\u0435\u0439, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0436\u0438\u0432\u0443\u0442 \u0432 \u0440\u0430\u0437\u043D\u044B\u0445 \u0441\u0442\u0440\u0430\u043D\u0430\u0445, \u0433\u043E\u0432\u043E\u0440\u044F\u0442 \u043D\u0430 \u0440\u0430\u0437\u043D\u044B\u0445 \u044F\u0437\u044B\u043A\u0430\u0445, \u043D\u043E \u0434\u0443\u043C\u0430\u044E\u0442 \u043F\u043E-\u0440\u0443\u0441\u0441\u043A\u0438.'  # noqa: E501
     publisher = '\u041E\u041E\u041E \u00AB\u0421\u043D\u043E\u0431 \u041C\u0435\u0434\u0438\u0430\u00BB'
     category = 'magazine'
     cover_url = u'https://snob.ru/indoc/tilda/995317/images/tild3233-6631-4664-b663-353636373235__e3057a5fee932ada1aaf.png'
diff --git a/recipes/sobaka.recipe b/recipes/sobaka.recipe
index 28edf1e82f..9b4856114c 100644
--- a/recipes/sobaka.recipe
+++ b/recipes/sobaka.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Sobaka(BasicNewsRecipe):
     title                 = '\u0421\u043E\u0431\u0430\u043A\u0430.ru'
     __author__            = 'bugmen00t'
-    description           = '\u0416\u0443\u0440\u043D\u0430\u043B \u043E \u043B\u044E\u0434\u044F\u0445 \u0432 \u041F\u0435\u0442\u0435\u0440\u0431\u0443\u0440\u0433\u0435'  # noqa
-    publisher             = '\u041E\u041E\u041E \u00AB\u0416\u0443\u0440\u043D\u0430\u043B\u044B \u0438 \u0441\u0430\u0439\u0442\u044B "\u0424\u0430\u0431\u0440\u0438\u043A\u0430 \u043A\u043E\u043D\u0442\u0435\u043D\u0442\u0430 "\u0422\u043E\u0447\u043A\u0430 \u0420\u0443"\u00BB'  # noqa
+    description           = '\u0416\u0443\u0440\u043D\u0430\u043B \u043E \u043B\u044E\u0434\u044F\u0445 \u0432 \u041F\u0435\u0442\u0435\u0440\u0431\u0443\u0440\u0433\u0435'  # noqa: E501
+    publisher             = '\u041E\u041E\u041E \u00AB\u0416\u0443\u0440\u043D\u0430\u043B\u044B \u0438 \u0441\u0430\u0439\u0442\u044B "\u0424\u0430\u0431\u0440\u0438\u043A\u0430 \u043A\u043E\u043D\u0442\u0435\u043D\u0442\u0430 "\u0422\u043E\u0447\u043A\u0430 \u0420\u0443"\u00BB'  # noqa: E501
     category              = 'magazine'
     cover_url = u'https://static.sobaka.ru/images/post/00/04/31/21/_rotator.jpg'
     language              = 'ru'
@@ -22,7 +22,7 @@ class Sobaka(BasicNewsRecipe):
 
     remove_tags_after = dict(name='div', attrs={'class': 'b-post-view__foot'})
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='div', attrs={'class': 'b-post-view__telegram-promo'}),
         dict(name='div', attrs={'class': 'b-post-view__tgb'}),
         dict(name='div', attrs={'id': 'comments'}),
diff --git a/recipes/sobesednik.recipe b/recipes/sobesednik.recipe
index c1b62035a7..0c44c78cd1 100644
--- a/recipes/sobesednik.recipe
+++ b/recipes/sobesednik.recipe
@@ -6,7 +6,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Sobesednik(BasicNewsRecipe):
     title = u'\u0421\u043E\u0431\u0435\u0441\u0435\u0434\u043D\u0438\u043A'
-    description = u'\u0421\u0432\u0435\u0436\u0438\u0435 \u044D\u043A\u0441\u043A\u043B\u044E\u0437\u0438\u0432\u043D\u044B\u0435 \u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u043E \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0435 \u0438 \u0448\u043E\u0443 \u0431\u0438\u0437\u043D\u0435\u0441\u0435'  # noqa
+    description = u'\u0421\u0432\u0435\u0436\u0438\u0435 \u044D\u043A\u0441\u043A\u043B\u044E\u0437\u0438\u0432\u043D\u044B\u0435 \u043D\u043E\u0432\u043E\u0441\u0442\u0438 \u043E \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0435 \u0438 \u0448\u043E\u0443 \u0431\u0438\u0437\u043D\u0435\u0441\u0435'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = '\u041E\u041E\u041E \u00AB\u0421\u043E\u0431\u0435\u0441\u0435\u0434\u043D\u0438\u043A-\u041C\u0435\u0434\u0438\u0430\u00BB'
     publication_type = 'newspaper'
diff --git a/recipes/sol_haber.recipe b/recipes/sol_haber.recipe
index cf75602e33..6896f66aca 100644
--- a/recipes/sol_haber.recipe
+++ b/recipes/sol_haber.recipe
@@ -22,7 +22,7 @@ class SolHaberRecipe(BasicNewsRecipe):
 
     language = 'tr'
     __author__ = 'Onur Güngör'
-    description = 'Hayata soL''dan bakın..'
+    description = "Hayata soL'dan bakın.."
     publisher = 'soL Haber'
     tags = 'news, haberler, siyaset, türkiye, turkey, politics'
 
@@ -46,12 +46,12 @@ class SolHaberRecipe(BasicNewsRecipe):
     start_date = (datetime.date.today() -
                   datetime.timedelta(days=1)).isoformat()
 
-    section_tuples = [['Köşe Yazıları', 'http://haber.sol.org.tr/arsiv?icerik=kose_yazisi&tarih%%5Bmin%%5D%%5Bdate%%5D=%s&tarih%%5Bmax%%5D%%5Bdate%%5D=%s' % (start_date, end_date)],  # noqa
+    section_tuples = [['Köşe Yazıları', 'http://haber.sol.org.tr/arsiv?icerik=kose_yazisi&tarih%%5Bmin%%5D%%5Bdate%%5D=%s&tarih%%5Bmax%%5D%%5Bdate%%5D=%s' % (start_date, end_date)],  # noqa: E501
                       ['Haberler', 'http://haber.sol.org.tr/arsiv?icerik=haber&tarih%%5Bmin%%5D%%5Bdate%%5D=%s&tarih%%5Bmax%%5D%%5Bdate%%5D=%s' %
                           (start_date, end_date)],
                       ['soL postal', 'http://haber.sol.org.tr/arsiv?icerik=postal&tarih%%5Bmin%%5D%%5Bdate%%5D=%s&tarih%%5Bmax%%5D%%5Bdate%%5D=%s' %
                           (start_date, end_date)],
-                      ['Bizim Amerika', 'http://haber.sol.org.tr/arsiv?icerik=bizim_amerika&tarih%%5Bmin%%5D%%5Bdate%%5D=%s&tarih%%5Bmax%%5D%%5Bdate%%5D=%s' % (start_date, end_date)]]  # noqa
+                      ['Bizim Amerika', 'http://haber.sol.org.tr/arsiv?icerik=bizim_amerika&tarih%%5Bmin%%5D%%5Bdate%%5D=%s&tarih%%5Bmax%%5D%%5Bdate%%5D=%s' % (start_date, end_date)]]  # noqa: E501
 
     # Disable stylesheets from site.
     no_stylesheets = True
@@ -69,15 +69,15 @@ class SolHaberRecipe(BasicNewsRecipe):
         dict(name='div', attrs={'class': re.compile(storybody_reg_exp, re.IGNORECASE)})]
 
     def get_masthead_title(self):
-        return self.title + "(" + self.end_date + ")"
+        return self.title + '(' + self.end_date + ')'
 
     def parse_index(self):
 
         result = []
-        articles_dict = dict()
+        articles_dict = {}
 
-        author_regexp = re.compile('^http://.*?/yazarlar/(.*?)/.*$')
-        category_regexp = re.compile('^http://.*?/(.+?)/.*$')
+        author_regexp = re.compile(r'^http://.*?/yazarlar/(.*?)/.*$')
+        category_regexp = re.compile(r'^http://.*?/(.+?)/.*$')
 
         for section_tuple in self.section_tuples:
 
diff --git a/recipes/sotavision.recipe b/recipes/sotavision.recipe
index af2f46deec..ba3a195e6d 100644
--- a/recipes/sotavision.recipe
+++ b/recipes/sotavision.recipe
@@ -6,9 +6,9 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Sotavision(BasicNewsRecipe):
     title = u'SOTA.Vision'
-    description = u'\u0420\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u043E\u0435 \u043D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0435 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E-\u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u043C\u0435\u0434\u0438\u0430, \u0441\u0444\u043E\u043A\u0443\u0441\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u043D\u0430 \u043E\u0441\u0432\u0435\u0449\u0435\u043D\u0438\u0438 \u043D\u0430\u0440\u0443\u0448\u0435\u043D\u0438\u044F \u043F\u0440\u0430\u0432 \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430 \u0438 \u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u043C \u043F\u0440\u0435\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u043D\u0438\u0438 \u0432 \u0420\u043E\u0441\u0441\u0438\u0438.'  # noqa
+    description = u'\u0420\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u043E\u0435 \u043D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0435 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E-\u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u043C\u0435\u0434\u0438\u0430, \u0441\u0444\u043E\u043A\u0443\u0441\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u043D\u0430 \u043E\u0441\u0432\u0435\u0449\u0435\u043D\u0438\u0438 \u043D\u0430\u0440\u0443\u0448\u0435\u043D\u0438\u044F \u043F\u0440\u0430\u0432 \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430 \u0438 \u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u043C \u043F\u0440\u0435\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u043D\u0438\u0438 \u0432 \u0420\u043E\u0441\u0441\u0438\u0438.'  # noqa: E501
     __author__ = 'bugmen00t'
-    publisher = '\u0410\u043B\u0435\u043A\u0441\u0430\u043D\u0434\u0440\u0430 \u0410\u0433\u0435\u0435\u0432\u0430, \u041E\u043B\u0435\u0433 \u0415\u043B\u0430\u043D\u0447\u0438\u043A,  \u0415\u0432\u0433\u0435\u043D\u0438\u0439 \u0414\u043E\u043C\u043E\u0436\u0438\u0440\u043E\u0432'  # noqa
+    publisher = '\u0410\u043B\u0435\u043A\u0441\u0430\u043D\u0434\u0440\u0430 \u0410\u0433\u0435\u0435\u0432\u0430, \u041E\u043B\u0435\u0433 \u0415\u043B\u0430\u043D\u0447\u0438\u043A,  \u0415\u0432\u0433\u0435\u043D\u0438\u0439 \u0414\u043E\u043C\u043E\u0436\u0438\u0440\u043E\u0432'  # noqa: E501
     publication_type = 'news'
     oldest_article = 7
     max_articles_per_feed = 10
@@ -21,7 +21,7 @@ class Sotavision(BasicNewsRecipe):
 
     remove_tags_after = dict(name='span', attrs={'style': 'border-color:#EBEBEB;border-width:1px;width:100%;'})
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='div', attrs={'class': 'td_block_wrap tdb_mobile_menu tdi_7 td-pb-border-top td_block_template_1 tdb-header-align'}),
         dict(name='div', attrs={'class': 'td_block_wrap tdb_single_author tdi_52 td-pb-border-top td_block_template_1 tdb-post-meta'}),
         dict(name='div', attrs={'class': 'td_block_wrap tdb_single_date tdi_53 td-pb-border-top td_block_template_1 tdb-post-meta'}),
diff --git a/recipes/sova.recipe b/recipes/sova.recipe
index 8d2e227ddf..679925678b 100644
--- a/recipes/sova.recipe
+++ b/recipes/sova.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Sova(BasicNewsRecipe):
     title = 'SOVA'
     __author__ = 'bugmen00t'
-    description = ' \u0420\u0443\u0441\u0441\u043A\u043E\u044F\u0437\u044B\u0447\u043D\u043E\u0435 \u043D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0435 \u043E\u043D\u043B\u0430\u0439\u043D-\u0438\u0437\u0434\u0430\u043D\u0438\u0435, \u043E\u0441\u043D\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0432 \u0422\u0431\u0438\u043B\u0438\u0441\u0438 \u0432 2016 \u0433\u043E\u0434\u0443 \u0433\u0440\u0443\u043F\u043F\u043E\u0439 \u043F\u0440\u043E\u0444\u0435\u0441\u0441\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u044B\u0445 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u043E\u0432, \u043F\u0440\u0435\u0434\u043E\u0441\u0442\u0430\u0432\u043B\u044F\u044E\u0449\u0435\u0435 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u0443\u044E \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044E \u043E \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0435, \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u043A\u0435 \u0438 \u0434\u0440\u0443\u0433\u0438\u0445 \u043D\u0435\u043E\u0442\u044A\u0435\u043C\u043B\u0435\u043C\u044B\u0445 \u0430\u0441\u043F\u0435\u043A\u0442\u0430\u0445 \u0436\u0438\u0437\u043D\u0438 \u0441\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u043E\u0433\u043E \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430 \u0432 \u0413\u0440\u0443\u0437\u0438\u0438 \u0438 \u0440\u0435\u0433\u0438\u043E\u043D\u0435 \u0432 \u0446\u0435\u043B\u043E\u043C.'  # noqa
-    publisher = '\u041D\u0435\u043F\u0440\u0430\u0432\u0438\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u0435\u043D\u043D\u0430\u044F \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u044F Sova News'  # noqa
+    description = ' \u0420\u0443\u0441\u0441\u043A\u043E\u044F\u0437\u044B\u0447\u043D\u043E\u0435 \u043D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0435 \u043E\u043D\u043B\u0430\u0439\u043D-\u0438\u0437\u0434\u0430\u043D\u0438\u0435, \u043E\u0441\u043D\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0432 \u0422\u0431\u0438\u043B\u0438\u0441\u0438 \u0432 2016 \u0433\u043E\u0434\u0443 \u0433\u0440\u0443\u043F\u043F\u043E\u0439 \u043F\u0440\u043E\u0444\u0435\u0441\u0441\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u044B\u0445 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u043E\u0432, \u043F\u0440\u0435\u0434\u043E\u0441\u0442\u0430\u0432\u043B\u044F\u044E\u0449\u0435\u0435 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u0443\u044E \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044E \u043E \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0435, \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u043A\u0435 \u0438 \u0434\u0440\u0443\u0433\u0438\u0445 \u043D\u0435\u043E\u0442\u044A\u0435\u043C\u043B\u0435\u043C\u044B\u0445 \u0430\u0441\u043F\u0435\u043A\u0442\u0430\u0445 \u0436\u0438\u0437\u043D\u0438 \u0441\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u043E\u0433\u043E \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430 \u0432 \u0413\u0440\u0443\u0437\u0438\u0438 \u0438 \u0440\u0435\u0433\u0438\u043E\u043D\u0435 \u0432 \u0446\u0435\u043B\u043E\u043C.'  # noqa: E501
+    publisher = '\u041D\u0435\u043F\u0440\u0430\u0432\u0438\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u0435\u043D\u043D\u0430\u044F \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u044F Sova News'  # noqa: E501
     category = 'blog'
     cover_url = u'https://i0.wp.com/sova.news/wp-content/uploads/2021/08/sova@512.png'
     language = 'ru'
diff --git a/recipes/spectator_magazine.recipe b/recipes/spectator_magazine.recipe
index 7090eff021..84b29306b8 100644
--- a/recipes/spectator_magazine.recipe
+++ b/recipes/spectator_magazine.recipe
@@ -5,7 +5,7 @@ from calibre.web.feeds.news import BasicNewsRecipe, classes
 
 def absurl(url):
     if url.startswith('/'):
-        url =  'https://www.spectator.co.uk' + url
+        url = 'https://www.spectator.co.uk' + url
     return url
 
 
@@ -37,7 +37,7 @@ class spectator(BasicNewsRecipe):
     ]
 
     remove_tags = [
-        dict(name = ['svg', 'button']),
+        dict(name=['svg', 'button']),
         classes(
             'entry-meta audio-read-block insert--most-popular ad-slot ad-slot--in-content ad-content '
             'subscription-banner '
diff --git a/recipes/sportstar.recipe b/recipes/sportstar.recipe
index 90ae0cd0ed..cd4781b8d8 100644
--- a/recipes/sportstar.recipe
+++ b/recipes/sportstar.recipe
@@ -85,7 +85,7 @@ class Sportstar(BasicNewsRecipe):
                 if section_title not in feeds:
                     feeds[section_title] = []
                 feeds[section_title] += articles
-        ans = [(key, val) for key, val in feeds.items()]
+        ans = list(feeds.items())
         return ans
 
     def preprocess_html(self, soup):
diff --git a/recipes/sputnik.recipe b/recipes/sputnik.recipe
index 43f0b5f7b0..4ef83a7a2b 100644
--- a/recipes/sputnik.recipe
+++ b/recipes/sputnik.recipe
@@ -25,5 +25,4 @@ class Ria_eng(BasicNewsRecipe):
         'comment': description, 'tags': category, 'language': language
     }
 
-
     feeds = [(u'News', u'https://sputnikglobe.com/export/rss2/archive/index.xml')]
diff --git a/recipes/standardmedia_ke.recipe b/recipes/standardmedia_ke.recipe
index e702e15a31..d86c4f3a99 100644
--- a/recipes/standardmedia_ke.recipe
+++ b/recipes/standardmedia_ke.recipe
@@ -43,8 +43,8 @@ class StandardMediaKeRecipe(BasicNewsRecipe):
 
     def print_version(self, url):
         import re
-        p = re.compile('http://www.standardmedia.co.ke/.*InsidePage.php')
-        return p.sub('http://www.standardmedia.co.ke/print.php', url)
+        p = re.compile(r'http://www.standardmedia.co.ke/.*InsidePage.php')
+        return p.sub(r'http://www.standardmedia.co.ke/print.php', url)
 
     def preprocess_html(self, soup):
         return self.adeify_images(soup)
diff --git a/recipes/star_gazetesi.recipe b/recipes/star_gazetesi.recipe
index 86a7b9955a..be1723b528 100644
--- a/recipes/star_gazetesi.recipe
+++ b/recipes/star_gazetesi.recipe
@@ -5,7 +5,7 @@ class Star (BasicNewsRecipe):
 
     title = u'Star Gazetesi'
     __author__ = u'thomass'
-    description = 'Yeni Türkiye''nin Gazetesi'
+    description = "Yeni Türkiye'nin Gazetesi"
     oldest_article = 1
     max_articles_per_feed = 10
     no_stylesheets = True
@@ -19,37 +19,37 @@ class Star (BasicNewsRecipe):
     compress_news_images = True
 
     # h1 and h2 tag classes respectively
-    extra_css  = ".title-1 {font-size: 20px; color: #ed0000; text-align: center;}"
-    extra_css += ".title-2 {font-size: 16px;}"
+    extra_css  = '.title-1 {font-size: 20px; color: #ed0000; text-align: center;}'
+    extra_css += '.title-2 {font-size: 16px;}'
 
     keep_only_tags = [
-        dict(name="h1", attrs={"class": "title-1"}),
-        dict(name="h2", attrs={"class": "title-2"}),
-        dict(name="div", attrs={"class": "time"}),
-        dict(name="img", attrs={"class": "margin-bottom-lg"}),
-        dict(name="div", attrs={"class": "detay"}),
+        dict(name='h1', attrs={'class': 'title-1'}),
+        dict(name='h2', attrs={'class': 'title-2'}),
+        dict(name='div', attrs={'class': 'time'}),
+        dict(name='img', attrs={'class': 'margin-bottom-lg'}),
+        dict(name='div', attrs={'class': 'detay'}),
     ]
 
     feeds = [
-        ("MANSET", "http://www.star.com.tr/rss/mansetler.xml"),
-        ("GÜNCEL", "http://www.star.com.tr/rss/guncel.xml"),
-        ("POLİTİKA", "http://www.star.com.tr/rss/politika.xml"),
-        ("EKONOMİ", "http://www.star.com.tr/rss/ekonomi.xml"),
-        ("DÜNYA", "http://www.star.com.tr/rss/dunya.xml"),
-        ("SON DAKİKA", "http://www.star.com.tr/rss/sondakika.xml"),
-        ("YAZARLAR", "http://www.star.com.tr/rss/yazarlar.xml"),
-        ("SPOR", "http://www.star.com.tr/rss/spor.xml"),
-        ("SİNEMA", "http://www.star.com.tr/rss/sinema.xml"),
-        ("SANAT", "http://www.star.com.tr/rss/sanat.xml"),
-        ("MAGAZİN", "http://www.star.com.tr/rss/magazin.xml"),
-        ("MEDYA", "http://www.star.com.tr/rss/medya.xml"),
-        ("SAĞLIK", "http://www.star.com.tr/rss/saglik.xml"),
-        ("TEKNOLOJİ", "http://www.star.com.tr/rss/teknoloji.xml"),
-        ("AÇIK GÖRÜŞ", "http://www.star.com.tr/rss/acikgorus.xml"),
-        ("PAZAR", "http://www.star.com.tr/rss/pazar.xml"),
-        ("CUMARTESİ", "http://www.star.com.tr/rss/cumartesi.xml"),
-        ("DİZİ", "http://www.star.com.tr/rss/dizi.xml"),
-        ("ANKARA", "http://www.star.com.tr/rss/ankara.xml"),
-        ("MEMURLAR", "http://www.star.com.tr/rss/memurlar.xml"),
-        ("OTO HAYAT", "http://www.star.com.tr/rss/otohayat.xml"),
+        ('MANSET', 'http://www.star.com.tr/rss/mansetler.xml'),
+        ('GÜNCEL', 'http://www.star.com.tr/rss/guncel.xml'),
+        ('POLİTİKA', 'http://www.star.com.tr/rss/politika.xml'),
+        ('EKONOMİ', 'http://www.star.com.tr/rss/ekonomi.xml'),
+        ('DÜNYA', 'http://www.star.com.tr/rss/dunya.xml'),
+        ('SON DAKİKA', 'http://www.star.com.tr/rss/sondakika.xml'),
+        ('YAZARLAR', 'http://www.star.com.tr/rss/yazarlar.xml'),
+        ('SPOR', 'http://www.star.com.tr/rss/spor.xml'),
+        ('SİNEMA', 'http://www.star.com.tr/rss/sinema.xml'),
+        ('SANAT', 'http://www.star.com.tr/rss/sanat.xml'),
+        ('MAGAZİN', 'http://www.star.com.tr/rss/magazin.xml'),
+        ('MEDYA', 'http://www.star.com.tr/rss/medya.xml'),
+        ('SAĞLIK', 'http://www.star.com.tr/rss/saglik.xml'),
+        ('TEKNOLOJİ', 'http://www.star.com.tr/rss/teknoloji.xml'),
+        ('AÇIK GÖRÜŞ', 'http://www.star.com.tr/rss/acikgorus.xml'),
+        ('PAZAR', 'http://www.star.com.tr/rss/pazar.xml'),
+        ('CUMARTESİ', 'http://www.star.com.tr/rss/cumartesi.xml'),
+        ('DİZİ', 'http://www.star.com.tr/rss/dizi.xml'),
+        ('ANKARA', 'http://www.star.com.tr/rss/ankara.xml'),
+        ('MEMURLAR', 'http://www.star.com.tr/rss/memurlar.xml'),
+        ('OTO HAYAT', 'http://www.star.com.tr/rss/otohayat.xml'),
     ]
diff --git a/recipes/stiintasitehnica.recipe b/recipes/stiintasitehnica.recipe
index 56cbae20ed..39cc2c90a4 100644
--- a/recipes/stiintasitehnica.recipe
+++ b/recipes/stiintasitehnica.recipe
@@ -33,7 +33,7 @@ class Stiintasitehnica(BasicNewsRecipe):
     ]
 
     remove_tags = [
-        dict(name='span', attrs={'class': ['redEar']}), dict(name='table', attrs={'class': ['connect_widget_interactive_area']}), dict(name='div', attrs={'class': ['panel-overlay']}), dict(name='div', attrs={ 'id': ['pointer']}), dict(name='img', attrs={'class': ['nav-next', 'nav-prev']}), dict(name='table', attrs={'class': ['connect_widget_interactive_area']}), dict(name='hr', attrs={'class': ['dotted']})  # noqa
+        dict(name='span', attrs={'class': ['redEar']}), dict(name='table', attrs={'class': ['connect_widget_interactive_area']}), dict(name='div', attrs={'class': ['panel-overlay']}), dict(name='div', attrs={'id': ['pointer']}), dict(name='img', attrs={'class': ['nav-next', 'nav-prev']}), dict(name='table', attrs={'class': ['connect_widget_interactive_area']}), dict(name='hr', attrs={'class': ['dotted']})  # noqa: E501
     ]
 
     remove_tags_after = [
diff --git a/recipes/stopgame.recipe b/recipes/stopgame.recipe
index 9d694360bb..81afb949f6 100644
--- a/recipes/stopgame.recipe
+++ b/recipes/stopgame.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class StopGame(BasicNewsRecipe):
     title = 'StopGame'
     __author__ = 'bugmen00t'
-    description = ' \u0420\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u0438\u0439 \u0438\u0433\u0440\u043E\u0432\u043E\u0439 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u043F\u043E\u0440\u0442\u0430\u043B, \u043D\u0430 \u043A\u043E\u0442\u043E\u0440\u043E\u043C \u043A\u043E\u043B\u043B\u0435\u043A\u0442\u0438\u0432 \u0430\u0432\u0442\u043E\u0440\u043E\u0432 \u0440\u0430\u0441\u0441\u043A\u0430\u0437\u044B\u0432\u0430\u0435\u0442 \u0432\u0441\u0435\u043C \u0436\u0435\u043B\u0430\u044E\u0449\u0438\u043C \u043E \u0432\u0438\u0434\u0435\u043E\u0438\u0433\u0440\u0430\u0445. '  # noqa
+    description = ' \u0420\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u0438\u0439 \u0438\u0433\u0440\u043E\u0432\u043E\u0439 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u043F\u043E\u0440\u0442\u0430\u043B, \u043D\u0430 \u043A\u043E\u0442\u043E\u0440\u043E\u043C \u043A\u043E\u043B\u043B\u0435\u043A\u0442\u0438\u0432 \u0430\u0432\u0442\u043E\u0440\u043E\u0432 \u0440\u0430\u0441\u0441\u043A\u0430\u0437\u044B\u0432\u0430\u0435\u0442 \u0432\u0441\u0435\u043C \u0436\u0435\u043B\u0430\u044E\u0449\u0438\u043C \u043E \u0432\u0438\u0434\u0435\u043E\u0438\u0433\u0440\u0430\u0445. '  # noqa: E501
     publisher = 'StopGame.ru'
     category = 'blog'
     cover_url = u'https://images.stopgame.ru/blogs/2020/01/29/U7R7t5rQ.jpg'
diff --git a/recipes/straitstimes.recipe b/recipes/straitstimes.recipe
index 114ab78404..8b8e3bcaa0 100644
--- a/recipes/straitstimes.recipe
+++ b/recipes/straitstimes.recipe
@@ -39,16 +39,16 @@ class StraitsTimes(BasicNewsRecipe):
     ]
 
     feeds = [
-        (u'World'            , u'https://www.straitstimes.com/news/world/rss.xml')
-        ,(u'Business'        , u'https://www.straitstimes.com/news/business/rss.xml')
-        ,(u'Life'            , u'https://www.straitstimes.com/news/life/rss.xml')
-        ,(u'Tech'            , u'https://www.straitstimes.com/news/tech/rss.xml')
-        ,(u'Opinion'         , u'https://www.straitstimes.com/news/opinion/rss.xml')
-        ,(u'Life'            , u'https://www.straitstimes.com/news/life/rss.xml')
-        ,(u'Singapore'       , u'https://www.straitstimes.com/news/singapore/rss.xml')
-        ,(u'Asia'            , u'https://www.straitstimes.com/news/asia/rss.xml')
-        ,(u'Multimedia'      , u'https://www.straitstimes.com/news/multimedia/rss.xml')
-        ,(u'Sport'           , u'https://www.straitstimes.com/news/sport/rss.xml')
+        (u'World',         u'https://www.straitstimes.com/news/world/rss.xml'),
+        (u'Business',      u'https://www.straitstimes.com/news/business/rss.xml'),
+        (u'Life',          u'https://www.straitstimes.com/news/life/rss.xml'),
+        (u'Tech',          u'https://www.straitstimes.com/news/tech/rss.xml'),
+        (u'Opinion',       u'https://www.straitstimes.com/news/opinion/rss.xml'),
+        (u'Life',          u'https://www.straitstimes.com/news/life/rss.xml'),
+        (u'Singapore',     u'https://www.straitstimes.com/news/singapore/rss.xml'),
+        (u'Asia',          u'https://www.straitstimes.com/news/asia/rss.xml'),
+        (u'Multimedia',    u'https://www.straitstimes.com/news/multimedia/rss.xml'),
+        (u'Sport',         u'https://www.straitstimes.com/news/sport/rss.xml'),
     ]
 
     def preprocess_html(self, soup):
diff --git a/recipes/strange_horizons.recipe b/recipes/strange_horizons.recipe
index d5ff6dcb88..7652ce6cc7 100644
--- a/recipes/strange_horizons.recipe
+++ b/recipes/strange_horizons.recipe
@@ -28,7 +28,7 @@ class StrangeHorizons(BasicNewsRecipe):
     ]
 
     remove_tags = [
-        dict(name = 'button'),
+        dict(name='button'),
         classes('font-size sharedaddy comments-form-row')
     ]
 
@@ -56,7 +56,7 @@ class StrangeHorizons(BasicNewsRecipe):
                 desc = ''
                 if exp := ti.find_next_sibling(**classes('excerpt')):
                     desc = self.tag_to_string(exp) + desc
-                    desc = re.sub(r"\d{5} ", "", desc)
+                    desc = re.sub(r'\d{5} ', '', desc)
                 if auth := ti.find_next_sibling(**classes('author')):
                     desc = self.tag_to_string(auth) + ' | ' + desc
 
@@ -64,5 +64,5 @@ class StrangeHorizons(BasicNewsRecipe):
                     continue
 
             self.log(sec, '\n\t', title, '\n\t', desc, '\n\t\t', url)
-            feeds_dict[sec].append({"title": title, "url": url, "description": desc})
-        return [(section, articles) for section, articles in feeds_dict.items()]
+            feeds_dict[sec].append({'title': title, 'url': url, 'description': desc})
+        return list(feeds_dict.items())
diff --git a/recipes/swiat_obrazu.recipe b/recipes/swiat_obrazu.recipe
index c5535a0711..3a761222c9 100644
--- a/recipes/swiat_obrazu.recipe
+++ b/recipes/swiat_obrazu.recipe
@@ -4,7 +4,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Swiat_Obrazu(BasicNewsRecipe):
     title = u'Świat Obrazu'
     __author__ = 'fenuks'
-    description = u'Internetowy Dziennik o Fotografii i Wideo www.SwiatObrazu.pl to źródło informacji o technice fotografii i wideo, o sprzęcie najbardziej znanych i uznanych firm: Canon, Nikon, Sony, Hasselblad i wielu innych. Znajdziecie tu programy do obróbki zdjęć, forum foto i forum wideo i galerie zdjęć. Codziennie najświeższe informacje: aktualności, testy, poradniki, wywiady, felietony. Swiatobrazu.pl stale organizuje konkursy oraz warsztaty fotograficzne i wideo.'  # noqa
+    description = u'Internetowy Dziennik o Fotografii i Wideo www.SwiatObrazu.pl to źródło informacji o technice fotografii i wideo, o sprzęcie najbardziej znanych i uznanych firm: Canon, Nikon, Sony, Hasselblad i wielu innych. Znajdziecie tu programy do obróbki zdjęć, forum foto i forum wideo i galerie zdjęć. Codziennie najświeższe informacje: aktualności, testy, poradniki, wywiady, felietony. Swiatobrazu.pl stale organizuje konkursy oraz warsztaty fotograficzne i wideo.'  # noqa: E501
     category = 'photography'
     masthead_url = 'http://www.swiatobrazu.pl/img/logo.jpg'
     cover_url = 'http://www.swiatobrazu.pl/img/logo.jpg'
diff --git a/recipes/swiatkindle.recipe b/recipes/swiatkindle.recipe
index 0616e4ff83..95e289f81f 100644
--- a/recipes/swiatkindle.recipe
+++ b/recipes/swiatkindle.recipe
@@ -25,4 +25,4 @@ class swiatczytnikow(BasicNewsRecipe):
                    dict(name='div', attrs={'class': 'feedflare'})]
 
     preprocess_regexps = [
-        (re.compile(u'<h3>Czytaj dalej:</h3>'), lambda match: '')]
+        (re.compile(u'<h3>Czytaj dalej:</h3>'), lambda match: '')]  # noqa: RUF039
diff --git a/recipes/t_invariant_en.recipe b/recipes/t_invariant_en.recipe
index a210f45957..03a2f342b2 100644
--- a/recipes/t_invariant_en.recipe
+++ b/recipes/t_invariant_en.recipe
@@ -9,16 +9,16 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class TInvariant(BasicNewsRecipe):
     title                 = 'T-Invariant'
     __author__            = 'bugmen00t'
-    description           = 'T-Invariant is a multimedia project of scientists and science journalists. Our task is to be a bridge between the academic community in Russia and outside Russia. Let’s keep in touch!'  # noqa
+    description           = 'T-Invariant is a multimedia project of scientists and science journalists. Our task is to be a bridge between the academic community in Russia and outside Russia. Let’s keep in touch!'  # noqa: E501
     publisher             = '\u0422-\u0438\u043D\u0432\u0430\u0440\u0438\u0430\u043D\u0442 / T-invariant'
     category              = 'news'
     cover_url = u'https://t-invariant.org/wp-content/uploads/2023/02/logo-s.png'
-#    cover_url = u'https://tinyurl.com/t-invariant/wp-content/uploads/2023/02/logo-s.png'
-#    language              = 'ru'
+    # cover_url = u'https://tinyurl.com/t-invariant/wp-content/uploads/2023/02/logo-s.png'
+    # language              = 'ru'
     language              = 'en_RU'
-#    language              = 'uk'
-#    language              = 'de'
-#    language              = 'he'
+    # language              = 'uk'
+    # language              = 'de'
+    # language              = 'he'
     no_stylesheets        = False
     remove_javascript = False
     auto_cleanup   = False
@@ -29,7 +29,7 @@ class TInvariant(BasicNewsRecipe):
 
     remove_tags_after = dict(name='article')
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='div', attrs={'class': 'media mg-info-author-block'}),
         dict(name='div', attrs={'class': 'mg-blog-category mb-1'}),
         dict(name='span', attrs={'class': 'newses-tags'}),
@@ -38,134 +38,117 @@ class TInvariant(BasicNewsRecipe):
         ]
 
     feeds = [
-# Russian version
-#
-# Direct links
-#
-#        ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'),
-#        ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'),
-#        ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'),
-#        ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/biologiya/feed/'),
-#        ('\u0412\u043E\u0439\u043D\u0430', ‘https://www.t-invariant.org/category/war/feed/'),
-#        ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', ‘https://www.t-invariant.org/category/vsyo-slozhno/feed/'),
-#        ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', ‘https://www.t-invariant.org/category/dva-goda-vojne/feed/'),
-#        ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/dve-storony-odnoj-nauki/feed/'),
-#        ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/discussion/feed/'),
-#        ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', ‘https://www.t-invariant.org/category/dissernet/feed/'),
-#        ('\u0418\u0418', ‘https://www.t-invariant.org/category/ai/feed/'),
-#        ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/computer-science/feed/'),
-#        ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', ‘https://www.t-invariant.org/category/history/feed/'),
-#        ('\u041A\u043B\u0438\u043C\u0430\u0442', ‘https://www.t-invariant.org/category/climate-ru/feed/'),
-#        ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/kontrevolyutsiya/feed/'),
-#        ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/korruptsiya/feed/'),
-#        ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', ‘https://www.t-invariant.org/category/pseudoscience/feed/'),
-#        ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/mathematics/feed/'),
-#        ('\u041C\u043E\u0437\u0433', ‘https://www.t-invariant.org/category/brain/feed/'),
-#        ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', ‘https://www.t-invariant.org/category/ukrainian-science/feed/'),
-#        ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/science-policy-ru/feed/'),
-#        ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', ‘https://www.t-invariant.org/category/news/feed/'),
-#        ('\u041E\u043F\u0440\u043E\u0441', ‘https://www.t-invariant.org/category/survey-ru/feed/'),
-#        ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/standpiont/feed/'),
-#        ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/political-science/feed/'),
-#        ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/popular-science/feed/'),
-#        ('\u041F\u0440\u0430\u0432\u043E', ‘https://www.t-invariant.org/category/pravo/feed/'),
-#        ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', ‘https://www.t-invariant.org/category/progress/feed/'),
-#        ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/psihologiya/feed/'),
-#        ('\u0420\u0410\u041D', ‘https://www.t-invariant.org/category/ras/feed/'),
-#        ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/religion/feed/'),
-#        ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/relocation/feed/'),
-#        ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/repression/feed/'),
-#        ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', ‘https://www.t-invariant.org/category/russian-language/feed/'),
-#        ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', ‘https://www.t-invariant.org/category/sanctions/feed/'),
-#        ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', ‘https://www.t-invariant.org/category/creators/feed/'),
-#        ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/sociology/feed/'),
-#        ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', ‘https://www.t-invariant.org/category/terrorizm/feed/'),
-#        ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', ‘https://www.t-invariant.org/category/universities/feed/'),
-#        ('\u0424\u0438\u0437\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/physics/feed/'),
-#        ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', ‘https://www.t-invariant.org/category/philosophy/feed/'),
-#        ('\u0428\u043A\u043E\u043B\u0430', ‘https://www.t-invariant.org/category/shkola/feed/'),
-#        ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'),
-#        ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'),
-#        ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'),
-#
-# Censorship bypass
-#
-#        ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'),
-#        ('\u0410\u0440\u0445\u0438\u0432', 'https://tinyurl.com/t-invariant/category/online/feed/'),
-#        ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', 'https://tinyurl.com/t-invariant/category/astronomy/feed/'),
-#        ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/biologiya/feed/'),
-#        ('\u0412\u043E\u0439\u043D\u0430', 'https://tinyurl.com/t-invariant/category/war/feed/'),
-#        ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', 'https://tinyurl.com/t-invariant/category/vsyo-slozhno/feed/'),
-#        ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', 'https://tinyurl.com/t-invariant/category/dva-goda-vojne/feed/'),
-#        ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/dve-storony-odnoj-nauki/feed/'),
-#        ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/discussion/feed/'),
-#        ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', 'https://tinyurl.com/t-invariant/category/dissernet/feed/'),
-#        ('\u0418\u0418', 'https://tinyurl.com/t-invariant/category/ai/feed/'),
-#        ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/computer-science/feed/'),
-#        ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', 'https://tinyurl.com/t-invariant/category/history/feed/'),
-#        ('\u041A\u043B\u0438\u043C\u0430\u0442', 'https://tinyurl.com/t-invariant/category/climate-ru/feed/'),
-#        ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/kontrevolyutsiya/feed/'),
-#        ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/korruptsiya/feed/'),
-#        ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', 'https://tinyurl.com/t-invariant/category/pseudoscience/feed/'),
-#        ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/mathematics/feed/'),
-#        ('\u041C\u043E\u0437\u0433', 'https://tinyurl.com/t-invariant/category/brain/feed/'),
-#        ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', 'https://tinyurl.com/t-invariant/category/ukrainian-science/feed/'),
-#        ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/science-policy-ru/feed/'),
-#        ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://tinyurl.com/t-invariant/category/news/feed/'),
-#        ('\u041E\u043F\u0440\u043E\u0441', 'https://tinyurl.com/t-invariant/category/survey-ru/feed/'),
-#        ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/standpiont/feed/'),
-#        ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/political-science/feed/'),
-#        ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/popular-science/feed/'),
-#        ('\u041F\u0440\u0430\u0432\u043E', 'https://tinyurl.com/t-invariant/category/pravo/feed/'),
-#        ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', 'https://tinyurl.com/t-invariant/category/progress/feed/'),
-#        ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/psihologiya/feed/'),
-#        ('\u0420\u0410\u041D', 'https://tinyurl.com/t-invariant/category/ras/feed/'),
-#        ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/religion/feed/'),
-#        ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/relocation/feed/'),
-#        ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/repression/feed/'),
-#        ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', 'https://tinyurl.com/t-invariant/category/russian-language/feed/'),
-#        ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', 'https://tinyurl.com/t-invariant/category/sanctions/feed/'),
-#        ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', 'https://tinyurl.com/t-invariant/category/creators/feed/'),
-#        ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/sociology/feed/'),
-#        ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', 'https://tinyurl.com/t-invariant/category/terrorizm/feed/'),
-#        ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', 'https://tinyurl.com/t-invariant/category/universities/feed/'),
-#        ('\u0424\u0438\u0437\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/physics/feed/'),
-#        ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', 'https://tinyurl.com/t-invariant/category/philosophy/feed/'),
-#        ('\u0428\u043A\u043E\u043B\u0430', 'https://tinyurl.com/t-invariant/category/shkola/feed/'),
-#        ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/science-assessment/feed/'),
-#        ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/energy/feed/'),
-#        ('\u042D\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/ethics/feed/'),
-#
-# English version
-#
-#        ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'),
-#
-# Censorship bypass
-#
+        # Russian version
+        # Direct links
+        # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'),
+        # ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'),
+        # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'),
+        # ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/biologiya/feed/'),
+        # ('\u0412\u043E\u0439\u043D\u0430', ‘https://www.t-invariant.org/category/war/feed/'),
+        # ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', ‘https://www.t-invariant.org/category/vsyo-slozhno/feed/'),
+        # ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', ‘https://www.t-invariant.org/category/dva-goda-vojne/feed/'),
+        # ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/dve-storony-odnoj-nauki/feed/'),
+        # ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/discussion/feed/'),
+        # ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', ‘https://www.t-invariant.org/category/dissernet/feed/'),
+        # ('\u0418\u0418', ‘https://www.t-invariant.org/category/ai/feed/'),
+        # ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/computer-science/feed/'),
+        # ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', ‘https://www.t-invariant.org/category/history/feed/'),
+        # ('\u041A\u043B\u0438\u043C\u0430\u0442', ‘https://www.t-invariant.org/category/climate-ru/feed/'),
+        # ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/kontrevolyutsiya/feed/'),
+        # ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/korruptsiya/feed/'),
+        # ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', ‘https://www.t-invariant.org/category/pseudoscience/feed/'),
+        # ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/mathematics/feed/'),
+        # ('\u041C\u043E\u0437\u0433', ‘https://www.t-invariant.org/category/brain/feed/'),
+        # ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', ‘https://www.t-invariant.org/category/ukrainian-science/feed/'),
+        # ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/science-policy-ru/feed/'),
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', ‘https://www.t-invariant.org/category/news/feed/'),
+        # ('\u041E\u043F\u0440\u043E\u0441', ‘https://www.t-invariant.org/category/survey-ru/feed/'),
+        # ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/standpiont/feed/'),
+        # ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/political-science/feed/'),
+        # ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/popular-science/feed/'),
+        # ('\u041F\u0440\u0430\u0432\u043E', ‘https://www.t-invariant.org/category/pravo/feed/'),
+        # ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', ‘https://www.t-invariant.org/category/progress/feed/'),
+        # ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/psihologiya/feed/'),
+        # ('\u0420\u0410\u041D', ‘https://www.t-invariant.org/category/ras/feed/'),
+        # ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/religion/feed/'),
+        # ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/relocation/feed/'),
+        # ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/repression/feed/'),
+        # ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', ‘https://www.t-invariant.org/category/russian-language/feed/'),
+        # ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', ‘https://www.t-invariant.org/category/sanctions/feed/'),
+        # ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', ‘https://www.t-invariant.org/category/creators/feed/'),
+        # ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/sociology/feed/'),
+        # ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', ‘https://www.t-invariant.org/category/terrorizm/feed/'),
+        # ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', ‘https://www.t-invariant.org/category/universities/feed/'),
+        # ('\u0424\u0438\u0437\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/physics/feed/'),
+        # ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', ‘https://www.t-invariant.org/category/philosophy/feed/'),
+        # ('\u0428\u043A\u043E\u043B\u0430', ‘https://www.t-invariant.org/category/shkola/feed/'),
+        # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'),
+        # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'),
+        # ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'),
+        # Censorship bypass
+        # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'),
+        # ('\u0410\u0440\u0445\u0438\u0432', 'https://tinyurl.com/t-invariant/category/online/feed/'),
+        # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', 'https://tinyurl.com/t-invariant/category/astronomy/feed/'),
+        # ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/biologiya/feed/'),
+        # ('\u0412\u043E\u0439\u043D\u0430', 'https://tinyurl.com/t-invariant/category/war/feed/'),
+        # ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', 'https://tinyurl.com/t-invariant/category/vsyo-slozhno/feed/'),
+        # ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', 'https://tinyurl.com/t-invariant/category/dva-goda-vojne/feed/'),
+        # ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/dve-storony-odnoj-nauki/feed/'),
+        # ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/discussion/feed/'),
+        # ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', 'https://tinyurl.com/t-invariant/category/dissernet/feed/'),
+        # ('\u0418\u0418', 'https://tinyurl.com/t-invariant/category/ai/feed/'),
+        # ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/computer-science/feed/'),
+        # ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', 'https://tinyurl.com/t-invariant/category/history/feed/'),
+        # ('\u041A\u043B\u0438\u043C\u0430\u0442', 'https://tinyurl.com/t-invariant/category/climate-ru/feed/'),
+        # ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/kontrevolyutsiya/feed/'),
+        # ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/korruptsiya/feed/'),
+        # ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', 'https://tinyurl.com/t-invariant/category/pseudoscience/feed/'),
+        # ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/mathematics/feed/'),
+        # ('\u041C\u043E\u0437\u0433', 'https://tinyurl.com/t-invariant/category/brain/feed/'),
+        # ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', 'https://tinyurl.com/t-invariant/category/ukrainian-science/feed/'),
+        # ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/science-policy-ru/feed/'),
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://tinyurl.com/t-invariant/category/news/feed/'),
+        # ('\u041E\u043F\u0440\u043E\u0441', 'https://tinyurl.com/t-invariant/category/survey-ru/feed/'),
+        # ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/standpiont/feed/'),
+        # ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/political-science/feed/'),
+        # ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/popular-science/feed/'),
+        # ('\u041F\u0440\u0430\u0432\u043E', 'https://tinyurl.com/t-invariant/category/pravo/feed/'),
+        # ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', 'https://tinyurl.com/t-invariant/category/progress/feed/'),
+        # ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/psihologiya/feed/'),
+        # ('\u0420\u0410\u041D', 'https://tinyurl.com/t-invariant/category/ras/feed/'),
+        # ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/religion/feed/'),
+        # ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/relocation/feed/'),
+        # ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/repression/feed/'),
+        # ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', 'https://tinyurl.com/t-invariant/category/russian-language/feed/'),
+        # ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', 'https://tinyurl.com/t-invariant/category/sanctions/feed/'),
+        # ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', 'https://tinyurl.com/t-invariant/category/creators/feed/'),
+        # ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/sociology/feed/'),
+        # ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', 'https://tinyurl.com/t-invariant/category/terrorizm/feed/'),
+        # ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', 'https://tinyurl.com/t-invariant/category/universities/feed/'),
+        # ('\u0424\u0438\u0437\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/physics/feed/'),
+        # ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', 'https://tinyurl.com/t-invariant/category/philosophy/feed/'),
+        # ('\u0428\u043A\u043E\u043B\u0430', 'https://tinyurl.com/t-invariant/category/shkola/feed/'),
+        # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/science-assessment/feed/'),
+        # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/energy/feed/'),
+        # ('\u042D\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/ethics/feed/'),
+
+        # English version
+        # ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'),
+        # Censorship bypass
         ('T-invariant (English)', 'https://tinyurl.com/t-invariant/en/feed/'),
-#
-# Ukrainian version
-#
-#        ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'),
-#
-# Censorship bypass
-#
-#        ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://tinyurl.com/t-invariant/uk/feed/'),
-#
-# German version
-#
-#        ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'),
-#
-# Censorship bypass
-#
-#        ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'),
-#
-# Hebrew version
-#
-#        ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'),
-#
-# Censorship bypass
-#
-#        ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'),
-#
+
+        # Ukrainian version
+        # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'),
+        # Censorship bypass
+        # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://tinyurl.com/t-invariant/uk/feed/'),
+
+        # German version
+        # ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'),
+        # Censorship bypass
+        # ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'),
+
+        # Hebrew version
+        # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'),
+        # Censorship bypass
+        # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'),
     ]
diff --git a/recipes/t_invariant_ru.recipe b/recipes/t_invariant_ru.recipe
index c506641fd7..1dd5348403 100644
--- a/recipes/t_invariant_ru.recipe
+++ b/recipes/t_invariant_ru.recipe
@@ -9,16 +9,16 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class TInvariant(BasicNewsRecipe):
     title                 = 'T-Invariant'
     __author__            = 'bugmen00t'
-    description           = '\u041C\u0443\u043B\u044C\u0442\u0438\u043C\u0435\u0434\u0438\u0439\u043D\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u0443\u0447\u0435\u043D\u044B\u0445 \u0438 \u043D\u0430\u0443\u0447\u043D\u044B\u0445 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u043E\u0432.'  # noqa
+    description           = '\u041C\u0443\u043B\u044C\u0442\u0438\u043C\u0435\u0434\u0438\u0439\u043D\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u0443\u0447\u0435\u043D\u044B\u0445 \u0438 \u043D\u0430\u0443\u0447\u043D\u044B\u0445 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u043E\u0432.'  # noqa: E501
     publisher             = '\u0422-\u0438\u043D\u0432\u0430\u0440\u0438\u0430\u043D\u0442 / T-invariant'
     category              = 'news'
-#    cover_url = u'https://t-invariant.org/wp-content/uploads/2023/02/logo-s.png'
+    # cover_url = u'https://t-invariant.org/wp-content/uploads/2023/02/logo-s.png'
     cover_url = u'https://tinyurl.com/t-invariant/wp-content/uploads/2023/02/logo-s.png'
     language              = 'ru'
-#    language              = 'en_RU'
-#    language              = 'uk'
-#    language              = 'de'
-#    language              = 'he'
+    # language              = 'en_RU'
+    # language              = 'uk'
+    # language              = 'de'
+    # language              = 'he'
     no_stylesheets        = False
     remove_javascript = False
     auto_cleanup   = False
@@ -29,7 +29,7 @@ class TInvariant(BasicNewsRecipe):
 
     remove_tags_after = dict(name='article')
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='div', attrs={'class': 'media mg-info-author-block'}),
         dict(name='div', attrs={'class': 'mg-blog-category mb-1'}),
         dict(name='span', attrs={'class': 'newses-tags'}),
@@ -38,59 +38,55 @@ class TInvariant(BasicNewsRecipe):
         ]
 
     feeds = [
-# Russian version
-#
-# Direct links
-#
-#        ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'),
-#        ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'),
-#        ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'),
-#        ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/biologiya/feed/'),
-#        ('\u0412\u043E\u0439\u043D\u0430', ‘https://www.t-invariant.org/category/war/feed/'),
-#        ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', ‘https://www.t-invariant.org/category/vsyo-slozhno/feed/'),
-#        ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', ‘https://www.t-invariant.org/category/dva-goda-vojne/feed/'),
-#        ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/dve-storony-odnoj-nauki/feed/'),
-#        ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/discussion/feed/'),
-#        ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', ‘https://www.t-invariant.org/category/dissernet/feed/'),
-#        ('\u0418\u0418', ‘https://www.t-invariant.org/category/ai/feed/'),
-#        ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/computer-science/feed/'),
-#        ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', ‘https://www.t-invariant.org/category/history/feed/'),
-#        ('\u041A\u043B\u0438\u043C\u0430\u0442', ‘https://www.t-invariant.org/category/climate-ru/feed/'),
-#        ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/kontrevolyutsiya/feed/'),
-#        ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/korruptsiya/feed/'),
-#        ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', ‘https://www.t-invariant.org/category/pseudoscience/feed/'),
-#        ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/mathematics/feed/'),
-#        ('\u041C\u043E\u0437\u0433', ‘https://www.t-invariant.org/category/brain/feed/'),
-#        ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', ‘https://www.t-invariant.org/category/ukrainian-science/feed/'),
-#        ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/science-policy-ru/feed/'),
-#        ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', ‘https://www.t-invariant.org/category/news/feed/'),
-#        ('\u041E\u043F\u0440\u043E\u0441', ‘https://www.t-invariant.org/category/survey-ru/feed/'),
-#        ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/standpiont/feed/'),
-#        ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/political-science/feed/'),
-#        ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/popular-science/feed/'),
-#        ('\u041F\u0440\u0430\u0432\u043E', ‘https://www.t-invariant.org/category/pravo/feed/'),
-#        ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', ‘https://www.t-invariant.org/category/progress/feed/'),
-#        ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/psihologiya/feed/'),
-#        ('\u0420\u0410\u041D', ‘https://www.t-invariant.org/category/ras/feed/'),
-#        ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/religion/feed/'),
-#        ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/relocation/feed/'),
-#        ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/repression/feed/'),
-#        ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', ‘https://www.t-invariant.org/category/russian-language/feed/'),
-#        ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', ‘https://www.t-invariant.org/category/sanctions/feed/'),
-#        ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', ‘https://www.t-invariant.org/category/creators/feed/'),
-#        ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/sociology/feed/'),
-#        ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', ‘https://www.t-invariant.org/category/terrorizm/feed/'),
-#        ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', ‘https://www.t-invariant.org/category/universities/feed/'),
-#        ('\u0424\u0438\u0437\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/physics/feed/'),
-#        ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', ‘https://www.t-invariant.org/category/philosophy/feed/'),
-#        ('\u0428\u043A\u043E\u043B\u0430', ‘https://www.t-invariant.org/category/shkola/feed/'),
-#        ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'),
-#        ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'),
-#        ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'),
-#
-# Censorship bypass
-#
-#        ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'),
+        # Russian version
+        # Direct links
+        # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'),
+        # ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'),
+        # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'),
+        # ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/biologiya/feed/'),
+        # ('\u0412\u043E\u0439\u043D\u0430', ‘https://www.t-invariant.org/category/war/feed/'),
+        # ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', ‘https://www.t-invariant.org/category/vsyo-slozhno/feed/'),
+        # ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', ‘https://www.t-invariant.org/category/dva-goda-vojne/feed/'),
+        # ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/dve-storony-odnoj-nauki/feed/'),
+        # ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/discussion/feed/'),
+        # ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', ‘https://www.t-invariant.org/category/dissernet/feed/'),
+        # ('\u0418\u0418', ‘https://www.t-invariant.org/category/ai/feed/'),
+        # ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/computer-science/feed/'),
+        # ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', ‘https://www.t-invariant.org/category/history/feed/'),
+        # ('\u041A\u043B\u0438\u043C\u0430\u0442', ‘https://www.t-invariant.org/category/climate-ru/feed/'),
+        # ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/kontrevolyutsiya/feed/'),
+        # ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/korruptsiya/feed/'),
+        # ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', ‘https://www.t-invariant.org/category/pseudoscience/feed/'),
+        # ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/mathematics/feed/'),
+        # ('\u041C\u043E\u0437\u0433', ‘https://www.t-invariant.org/category/brain/feed/'),
+        # ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', ‘https://www.t-invariant.org/category/ukrainian-science/feed/'),
+        # ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/science-policy-ru/feed/'),
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', ‘https://www.t-invariant.org/category/news/feed/'),
+        # ('\u041E\u043F\u0440\u043E\u0441', ‘https://www.t-invariant.org/category/survey-ru/feed/'),
+        # ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/standpiont/feed/'),
+        # ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/political-science/feed/'),
+        # ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/popular-science/feed/'),
+        # ('\u041F\u0440\u0430\u0432\u043E', ‘https://www.t-invariant.org/category/pravo/feed/'),
+        # ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', ‘https://www.t-invariant.org/category/progress/feed/'),
+        # ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/psihologiya/feed/'),
+        # ('\u0420\u0410\u041D', ‘https://www.t-invariant.org/category/ras/feed/'),
+        # ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/religion/feed/'),
+        # ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/relocation/feed/'),
+        # ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/repression/feed/'),
+        # ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', ‘https://www.t-invariant.org/category/russian-language/feed/'),
+        # ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', ‘https://www.t-invariant.org/category/sanctions/feed/'),
+        # ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', ‘https://www.t-invariant.org/category/creators/feed/'),
+        # ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/sociology/feed/'),
+        # ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', ‘https://www.t-invariant.org/category/terrorizm/feed/'),
+        # ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', ‘https://www.t-invariant.org/category/universities/feed/'),
+        # ('\u0424\u0438\u0437\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/physics/feed/'),
+        # ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', ‘https://www.t-invariant.org/category/philosophy/feed/'),
+        # ('\u0428\u043A\u043E\u043B\u0430', ‘https://www.t-invariant.org/category/shkola/feed/'),
+        # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'),
+        # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'),
+        # ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'),
+        # Censorship bypass
+        # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'),
         ('\u0410\u0440\u0445\u0438\u0432', 'https://tinyurl.com/t-invariant/category/online/feed/'),
         ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', 'https://tinyurl.com/t-invariant/category/astronomy/feed/'),
         ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/biologiya/feed/'),
@@ -113,7 +109,7 @@ class TInvariant(BasicNewsRecipe):
         ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/science-policy-ru/feed/'),
         ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://tinyurl.com/t-invariant/category/news/feed/'),
         ('\u041E\u043F\u0440\u043E\u0441', 'https://tinyurl.com/t-invariant/category/survey-ru/feed/'),
-        ('\u041E\u0442\u0435\u0447\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0435 \u0437\u0430\u043F\u0438\u0441\u043A\u0438 \u0438\u0437 \u043F\u043E\u0434\u043F\u043E\u043B\u044C\u044F', 'https://tinyurl.com/t-invariant/category/story/feed/'),  # noqa
+        ('\u041E\u0442\u0435\u0447\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0435 \u0437\u0430\u043F\u0438\u0441\u043A\u0438 \u0438\u0437 \u043F\u043E\u0434\u043F\u043E\u043B\u044C\u044F', 'https://tinyurl.com/t-invariant/category/story/feed/'),  # noqa: E501
         ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/standpiont/feed/'),
         ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/political-science/feed/'),
         ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/popular-science/feed/'),
@@ -132,42 +128,29 @@ class TInvariant(BasicNewsRecipe):
         ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', 'https://tinyurl.com/t-invariant/category/universities/feed/'),
         ('\u0424\u0438\u0437\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/physics/feed/'),
         ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', 'https://tinyurl.com/t-invariant/category/philosophy/feed/'),
-        ('\u0425\u0440\u043E\u043D\u0438\u043A\u0438 \u043F\u0440\u0435\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u043D\u0438\u044F \u0443\u0447\u0435\u043D\u044B\u0445', 'https://tinyurl.com/t-invariant/category/timeline/feed/'),  # noqa
+        ('\u0425\u0440\u043E\u043D\u0438\u043A\u0438 \u043F\u0440\u0435\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u043D\u0438\u044F \u0443\u0447\u0435\u043D\u044B\u0445', 'https://tinyurl.com/t-invariant/category/timeline/feed/'),  # noqa: E501
         ('\u0428\u043A\u043E\u043B\u0430', 'https://tinyurl.com/t-invariant/category/shkola/feed/'),
         ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/science-assessment/feed/'),
         ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/energy/feed/'),
         ('\u042D\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/ethics/feed/'),
-#
-# English version
-#
-#        ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'),
-#
-# Censorship bypass
-#
-#        ('T-invariant (English)', 'https://tinyurl.com/t-invariant/en/feed/'),
-#
-# Ukrainian version
-#
-#        ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'),
-#
-# Censorship bypass
-#
-#        ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://tinyurl.com/t-invariant/uk/feed/'),
-#
-# German version
-#
-#        ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'),
-#
-# Censorship bypass
-#
-#        ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'),
-#
-# Hebrew version
-#
-#        ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'),
-#
-# Censorship bypass
-#
-#        ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'),
-#
+
+        # English version
+        # ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'),
+        # Censorship bypass
+        # ('T-invariant (English)', 'https://tinyurl.com/t-invariant/en/feed/'),
+
+        # Ukrainian version
+        # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'),
+        # Censorship bypass
+        # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://tinyurl.com/t-invariant/uk/feed/'),
+
+        # German version
+        # ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'),
+        # Censorship bypass
+        # ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'),
+
+        # Hebrew version
+        # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'),
+        # Censorship bypass
+        # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'),
     ]
diff --git a/recipes/t_invariant_ua.recipe b/recipes/t_invariant_ua.recipe
index 04d081e1ec..24ec2a69d5 100644
--- a/recipes/t_invariant_ua.recipe
+++ b/recipes/t_invariant_ua.recipe
@@ -9,16 +9,16 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class TInvariant(BasicNewsRecipe):
     title                 = 'T-Invariant'
     __author__            = 'bugmen00t'
-    description           = 'T-Invariant is a multimedia project of scientists and science journalists. Our task is to be a bridge between the academic community in Russia and outside Russia. Let’s keep in touch!'  # noqa
+    description           = 'T-Invariant is a multimedia project of scientists and science journalists. Our task is to be a bridge between the academic community in Russia and outside Russia. Let’s keep in touch!'  # noqa: E501
     publisher             = '\u0422-\u0438\u043D\u0432\u0430\u0440\u0438\u0430\u043D\u0442 / T-invariant'
     category              = 'news'
     cover_url = u'https://t-invariant.org/wp-content/uploads/2023/02/logo-s.png'
-#    cover_url = u'https://tinyurl.com/t-invariant/wp-content/uploads/2023/02/logo-s.png'
-#    language              = 'ru'
-#    language              = 'en_RU'
+    # cover_url = u'https://tinyurl.com/t-invariant/wp-content/uploads/2023/02/logo-s.png'
+    # language              = 'ru'
+    # language              = 'en_RU'
     language              = 'uk'
-#    language              = 'de'
-#    language              = 'he'
+    # language              = 'de'
+    # language              = 'he'
     no_stylesheets        = False
     remove_javascript = False
     auto_cleanup   = False
@@ -29,7 +29,7 @@ class TInvariant(BasicNewsRecipe):
 
     remove_tags_after = dict(name='article')
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='div', attrs={'class': 'media mg-info-author-block'}),
         dict(name='div', attrs={'class': 'mg-blog-category mb-1'}),
         dict(name='span', attrs={'class': 'newses-tags'}),
@@ -38,134 +38,117 @@ class TInvariant(BasicNewsRecipe):
         ]
 
     feeds = [
-# Russian version
-#
-# Direct links
-#
-#        ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'),
-#        ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'),
-#        ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'),
-#        ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/biologiya/feed/'),
-#        ('\u0412\u043E\u0439\u043D\u0430', ‘https://www.t-invariant.org/category/war/feed/'),
-#        ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', ‘https://www.t-invariant.org/category/vsyo-slozhno/feed/'),
-#        ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', ‘https://www.t-invariant.org/category/dva-goda-vojne/feed/'),
-#        ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/dve-storony-odnoj-nauki/feed/'),
-#        ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/discussion/feed/'),
-#        ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', ‘https://www.t-invariant.org/category/dissernet/feed/'),
-#        ('\u0418\u0418', ‘https://www.t-invariant.org/category/ai/feed/'),
-#        ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/computer-science/feed/'),
-#        ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', ‘https://www.t-invariant.org/category/history/feed/'),
-#        ('\u041A\u043B\u0438\u043C\u0430\u0442', ‘https://www.t-invariant.org/category/climate-ru/feed/'),
-#        ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/kontrevolyutsiya/feed/'),
-#        ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/korruptsiya/feed/'),
-#        ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', ‘https://www.t-invariant.org/category/pseudoscience/feed/'),
-#        ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/mathematics/feed/'),
-#        ('\u041C\u043E\u0437\u0433', ‘https://www.t-invariant.org/category/brain/feed/'),
-#        ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', ‘https://www.t-invariant.org/category/ukrainian-science/feed/'),
-#        ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/science-policy-ru/feed/'),
-#        ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', ‘https://www.t-invariant.org/category/news/feed/'),
-#        ('\u041E\u043F\u0440\u043E\u0441', ‘https://www.t-invariant.org/category/survey-ru/feed/'),
-#        ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/standpiont/feed/'),
-#        ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/political-science/feed/'),
-#        ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/popular-science/feed/'),
-#        ('\u041F\u0440\u0430\u0432\u043E', ‘https://www.t-invariant.org/category/pravo/feed/'),
-#        ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', ‘https://www.t-invariant.org/category/progress/feed/'),
-#        ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/psihologiya/feed/'),
-#        ('\u0420\u0410\u041D', ‘https://www.t-invariant.org/category/ras/feed/'),
-#        ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/religion/feed/'),
-#        ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/relocation/feed/'),
-#        ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/repression/feed/'),
-#        ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', ‘https://www.t-invariant.org/category/russian-language/feed/'),
-#        ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', ‘https://www.t-invariant.org/category/sanctions/feed/'),
-#        ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', ‘https://www.t-invariant.org/category/creators/feed/'),
-#        ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/sociology/feed/'),
-#        ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', ‘https://www.t-invariant.org/category/terrorizm/feed/'),
-#        ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', ‘https://www.t-invariant.org/category/universities/feed/'),
-#        ('\u0424\u0438\u0437\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/physics/feed/'),
-#        ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', ‘https://www.t-invariant.org/category/philosophy/feed/'),
-#        ('\u0428\u043A\u043E\u043B\u0430', ‘https://www.t-invariant.org/category/shkola/feed/'),
-#        ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'),
-#        ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'),
-#        ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'),
-#
-# Censorship bypass
-#
-#        ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'),
-#        ('\u0410\u0440\u0445\u0438\u0432', 'https://tinyurl.com/t-invariant/category/online/feed/'),
-#        ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', 'https://tinyurl.com/t-invariant/category/astronomy/feed/'),
-#        ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/biologiya/feed/'),
-#        ('\u0412\u043E\u0439\u043D\u0430', 'https://tinyurl.com/t-invariant/category/war/feed/'),
-#        ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', 'https://tinyurl.com/t-invariant/category/vsyo-slozhno/feed/'),
-#        ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', 'https://tinyurl.com/t-invariant/category/dva-goda-vojne/feed/'),
-#        ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/dve-storony-odnoj-nauki/feed/'),
-#        ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/discussion/feed/'),
-#        ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', 'https://tinyurl.com/t-invariant/category/dissernet/feed/'),
-#        ('\u0418\u0418', 'https://tinyurl.com/t-invariant/category/ai/feed/'),
-#        ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/computer-science/feed/'),
-#        ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', 'https://tinyurl.com/t-invariant/category/history/feed/'),
-#        ('\u041A\u043B\u0438\u043C\u0430\u0442', 'https://tinyurl.com/t-invariant/category/climate-ru/feed/'),
-#        ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/kontrevolyutsiya/feed/'),
-#        ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/korruptsiya/feed/'),
-#        ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', 'https://tinyurl.com/t-invariant/category/pseudoscience/feed/'),
-#        ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/mathematics/feed/'),
-#        ('\u041C\u043E\u0437\u0433', 'https://tinyurl.com/t-invariant/category/brain/feed/'),
-#        ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', 'https://tinyurl.com/t-invariant/category/ukrainian-science/feed/'),
-#        ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/science-policy-ru/feed/'),
-#        ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://tinyurl.com/t-invariant/category/news/feed/'),
-#        ('\u041E\u043F\u0440\u043E\u0441', 'https://tinyurl.com/t-invariant/category/survey-ru/feed/'),
-#        ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/standpiont/feed/'),
-#        ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/political-science/feed/'),
-#        ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/popular-science/feed/'),
-#        ('\u041F\u0440\u0430\u0432\u043E', 'https://tinyurl.com/t-invariant/category/pravo/feed/'),
-#        ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', 'https://tinyurl.com/t-invariant/category/progress/feed/'),
-#        ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/psihologiya/feed/'),
-#        ('\u0420\u0410\u041D', 'https://tinyurl.com/t-invariant/category/ras/feed/'),
-#        ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/religion/feed/'),
-#        ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/relocation/feed/'),
-#        ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/repression/feed/'),
-#        ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', 'https://tinyurl.com/t-invariant/category/russian-language/feed/'),
-#        ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', 'https://tinyurl.com/t-invariant/category/sanctions/feed/'),
-#        ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', 'https://tinyurl.com/t-invariant/category/creators/feed/'),
-#        ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/sociology/feed/'),
-#        ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', 'https://tinyurl.com/t-invariant/category/terrorizm/feed/'),
-#        ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', 'https://tinyurl.com/t-invariant/category/universities/feed/'),
-#        ('\u0424\u0438\u0437\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/physics/feed/'),
-#        ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', 'https://tinyurl.com/t-invariant/category/philosophy/feed/'),
-#        ('\u0428\u043A\u043E\u043B\u0430', 'https://tinyurl.com/t-invariant/category/shkola/feed/'),
-#        ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/science-assessment/feed/'),
-#        ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/energy/feed/'),
-#        ('\u042D\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/ethics/feed/'),
-#
-# English version
-#
-#        ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'),
-#
-# Censorship bypass
-#
-#        ('T-invariant (English)', 'https://tinyurl.com/t-invariant/en/feed/'),
-#
-# Ukrainian version
-#
-#        ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'),
-#
-# Censorship bypass
-#
+        # Russian version
+        # Direct links
+        # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'),
+        # ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'),
+        # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'),
+        # ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/biologiya/feed/'),
+        # ('\u0412\u043E\u0439\u043D\u0430', ‘https://www.t-invariant.org/category/war/feed/'),
+        # ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', ‘https://www.t-invariant.org/category/vsyo-slozhno/feed/'),
+        # ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', ‘https://www.t-invariant.org/category/dva-goda-vojne/feed/'),
+        # ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/dve-storony-odnoj-nauki/feed/'),
+        # ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/discussion/feed/'),
+        # ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', ‘https://www.t-invariant.org/category/dissernet/feed/'),
+        # ('\u0418\u0418', ‘https://www.t-invariant.org/category/ai/feed/'),
+        # ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/computer-science/feed/'),
+        # ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', ‘https://www.t-invariant.org/category/history/feed/'),
+        # ('\u041A\u043B\u0438\u043C\u0430\u0442', ‘https://www.t-invariant.org/category/climate-ru/feed/'),
+        # ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/kontrevolyutsiya/feed/'),
+        # ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/korruptsiya/feed/'),
+        # ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', ‘https://www.t-invariant.org/category/pseudoscience/feed/'),
+        # ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/mathematics/feed/'),
+        # ('\u041C\u043E\u0437\u0433', ‘https://www.t-invariant.org/category/brain/feed/'),
+        # ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', ‘https://www.t-invariant.org/category/ukrainian-science/feed/'),
+        # ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/science-policy-ru/feed/'),
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', ‘https://www.t-invariant.org/category/news/feed/'),
+        # ('\u041E\u043F\u0440\u043E\u0441', ‘https://www.t-invariant.org/category/survey-ru/feed/'),
+        # ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/standpiont/feed/'),
+        # ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/political-science/feed/'),
+        # ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/popular-science/feed/'),
+        # ('\u041F\u0440\u0430\u0432\u043E', ‘https://www.t-invariant.org/category/pravo/feed/'),
+        # ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', ‘https://www.t-invariant.org/category/progress/feed/'),
+        # ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/psihologiya/feed/'),
+        # ('\u0420\u0410\u041D', ‘https://www.t-invariant.org/category/ras/feed/'),
+        # ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/religion/feed/'),
+        # ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/relocation/feed/'),
+        # ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/repression/feed/'),
+        # ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', ‘https://www.t-invariant.org/category/russian-language/feed/'),
+        # ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', ‘https://www.t-invariant.org/category/sanctions/feed/'),
+        # ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', ‘https://www.t-invariant.org/category/creators/feed/'),
+        # ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/sociology/feed/'),
+        # ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', ‘https://www.t-invariant.org/category/terrorizm/feed/'),
+        # ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', ‘https://www.t-invariant.org/category/universities/feed/'),
+        # ('\u0424\u0438\u0437\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/physics/feed/'),
+        # ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', ‘https://www.t-invariant.org/category/philosophy/feed/'),
+        # ('\u0428\u043A\u043E\u043B\u0430', ‘https://www.t-invariant.org/category/shkola/feed/'),
+        # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'),
+        # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'),
+        # ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'),
+        # Censorship bypass
+        # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'),
+        # ('\u0410\u0440\u0445\u0438\u0432', 'https://tinyurl.com/t-invariant/category/online/feed/'),
+        # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', 'https://tinyurl.com/t-invariant/category/astronomy/feed/'),
+        # ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/biologiya/feed/'),
+        # ('\u0412\u043E\u0439\u043D\u0430', 'https://tinyurl.com/t-invariant/category/war/feed/'),
+        # ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', 'https://tinyurl.com/t-invariant/category/vsyo-slozhno/feed/'),
+        # ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', 'https://tinyurl.com/t-invariant/category/dva-goda-vojne/feed/'),
+        # ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/dve-storony-odnoj-nauki/feed/'),
+        # ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/discussion/feed/'),
+        # ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', 'https://tinyurl.com/t-invariant/category/dissernet/feed/'),
+        # ('\u0418\u0418', 'https://tinyurl.com/t-invariant/category/ai/feed/'),
+        # ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/computer-science/feed/'),
+        # ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', 'https://tinyurl.com/t-invariant/category/history/feed/'),
+        # ('\u041A\u043B\u0438\u043C\u0430\u0442', 'https://tinyurl.com/t-invariant/category/climate-ru/feed/'),
+        # ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/kontrevolyutsiya/feed/'),
+        # ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/korruptsiya/feed/'),
+        # ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', 'https://tinyurl.com/t-invariant/category/pseudoscience/feed/'),
+        # ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/mathematics/feed/'),
+        # ('\u041C\u043E\u0437\u0433', 'https://tinyurl.com/t-invariant/category/brain/feed/'),
+        # ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', 'https://tinyurl.com/t-invariant/category/ukrainian-science/feed/'),
+        # ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/science-policy-ru/feed/'),
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://tinyurl.com/t-invariant/category/news/feed/'),
+        # ('\u041E\u043F\u0440\u043E\u0441', 'https://tinyurl.com/t-invariant/category/survey-ru/feed/'),
+        # ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/standpiont/feed/'),
+        # ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/political-science/feed/'),
+        # ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/popular-science/feed/'),
+        # ('\u041F\u0440\u0430\u0432\u043E', 'https://tinyurl.com/t-invariant/category/pravo/feed/'),
+        # ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', 'https://tinyurl.com/t-invariant/category/progress/feed/'),
+        # ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/psihologiya/feed/'),
+        # ('\u0420\u0410\u041D', 'https://tinyurl.com/t-invariant/category/ras/feed/'),
+        # ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/religion/feed/'),
+        # ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/relocation/feed/'),
+        # ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/repression/feed/'),
+        # ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', 'https://tinyurl.com/t-invariant/category/russian-language/feed/'),
+        # ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', 'https://tinyurl.com/t-invariant/category/sanctions/feed/'),
+        # ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', 'https://tinyurl.com/t-invariant/category/creators/feed/'),
+        # ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/sociology/feed/'),
+        # ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', 'https://tinyurl.com/t-invariant/category/terrorizm/feed/'),
+        # ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', 'https://tinyurl.com/t-invariant/category/universities/feed/'),
+        # ('\u0424\u0438\u0437\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/physics/feed/'),
+        # ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', 'https://tinyurl.com/t-invariant/category/philosophy/feed/'),
+        # ('\u0428\u043A\u043E\u043B\u0430', 'https://tinyurl.com/t-invariant/category/shkola/feed/'),
+        # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/science-assessment/feed/'),
+        # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/energy/feed/'),
+        # ('\u042D\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/ethics/feed/'),
+
+        # English version
+        # ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'),
+        # Censorship bypass
+        # ('T-invariant (English)', 'https://tinyurl.com/t-invariant/en/feed/'),
+
+        # Ukrainian version
+        # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'),
+        # Censorship bypass
         ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://tinyurl.com/t-invariant/uk/feed/'),
-#
-# German version
-#
-#        ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'),
-#
-# Censorship bypass
-#
-#        ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'),
-#
-# Hebrew version
-#
-#        ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'),
-#
-# Censorship bypass
-#
-#        ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'),
-#
+
+        # German version
+        # ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'),
+        # Censorship bypass
+        # ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'),
+
+        # Hebrew version
+        # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'),
+        # Censorship bypass
+        # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'),
     ]
diff --git a/recipes/tablety_pl.recipe b/recipes/tablety_pl.recipe
index 43781dc3a1..76c363a87f 100644
--- a/recipes/tablety_pl.recipe
+++ b/recipes/tablety_pl.recipe
@@ -15,8 +15,8 @@ class Tablety_pl(BasicNewsRecipe):
     no_stylesheets = True
     oldest_article = 8
     max_articles_per_feed = 100
-    preprocess_regexps = [(re.compile(u'<p><strong>Przeczytaj także.*?</a></strong></p>', re.DOTALL), lambda match: ''),
-                          (re.compile(u'<p><strong>Przeczytaj koniecznie.*?</a></strong></p>', re.DOTALL), lambda match: '')]
+    preprocess_regexps = [(re.compile(u'<p><strong>Przeczytaj także.*?</a></strong></p>', re.DOTALL), lambda match: ''),  # noqa: RUF039
+                          (re.compile(u'<p><strong>Przeczytaj koniecznie.*?</a></strong></p>', re.DOTALL), lambda match: '')]  # noqa: RUF039
     keep_only_tags = [dict(attrs={'class': ['featured-image', 'article-content clearfix']})]
     remove_tags = [dict(attrs={'class': ['comments_icon', 'wp-polls', 'entry-comments',
                                          'wp-polls-loading', 'ts-fab-wrapper', 'entry-footer', 'social-custom']})]
diff --git a/recipes/tagesan.recipe b/recipes/tagesan.recipe
index f80f337c2b..f8874ac85d 100644
--- a/recipes/tagesan.recipe
+++ b/recipes/tagesan.recipe
@@ -41,10 +41,10 @@ class AdvancedUserRecipe1450864843(BasicNewsRecipe):
 
     conversion_options = {'base_font_size': 12}
 
-    extra_css = 'h1 { font-size: 150%; font-weight: bold; } \
-                 h2 { font-size: 120%; font-weight: bold; } \
-                 h3 { font-size: 100%; font-style: italic; } \
-                 h4, h5, h6 { font-size: 100%; font-style: italic; }'
+    extra_css = '''h1 { font-size: 150%; font-weight: bold; }
+                   h2 { font-size: 120%; font-weight: bold; }
+                   h3 { font-size: 100%; font-style: italic; }
+                   h4, h5, h6 { font-size: 100%; font-style: italic; }'''
 
     def get_cover_url(self):
         self.cover_url = 'http://newsmail.cleartext.ch/referenz_tagesanzeiger.jpg'
diff --git a/recipes/tagesspiegel.recipe b/recipes/tagesspiegel.recipe
index 36b6600bb1..3f66604571 100644
--- a/recipes/tagesspiegel.recipe
+++ b/recipes/tagesspiegel.recipe
@@ -50,12 +50,12 @@ class TagesspiegelRss(BasicNewsRecipe):
         return cover
 
     keep_only_tags = [
-        dict(name = 'header', attrs={'class':'Bo'}),
-        dict(name = 'div', attrs={'id':'story-elements'})
+        dict(name='header', attrs={'class':'Bo'}),
+        dict(name='div', attrs={'id':'story-elements'})
     ]
 
     remove_tags = [
-        dict(name = 'aside'),
+        dict(name='aside'),
         classes('iqd_mainAd Bs')
     ]
 
@@ -70,4 +70,3 @@ class TagesspiegelRss(BasicNewsRecipe):
         (u'Medien', u'http://www.tagesspiegel.de/contentexport/feed/medien'),
         (u'Wissen', u'http://www.tagesspiegel.de/contentexport/feed/wissen')
     ]
-
diff --git a/recipes/takiedela.recipe b/recipes/takiedela.recipe
index a7d0765543..394b033b1c 100644
--- a/recipes/takiedela.recipe
+++ b/recipes/takiedela.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class TakieDela(BasicNewsRecipe):
     title = '\u0422\u0430\u043A\u0438\u0435 \u0434\u0435\u043B\u0430'
     __author__ = 'bugmen00t'
-    description = '\u0418\u0437\u0434\u0430\u043D\u0438\u0435 \u00AB\u0422\u0430\u043A\u0438\u0435 \u0434\u0435\u043B\u0430\u00BB \u043E\u0441\u0432\u0435\u0449\u0430\u0435\u0442 \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0435 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u044B, \u043F\u0438\u0448\u0435\u0442 \u043E \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430\u0445 \u043B\u044E\u0434\u0435\u0439 \u0441 \u0440\u0435\u0434\u043A\u0438\u043C\u0438 \u0437\u0430\u0431\u043E\u043B\u0435\u0432\u0430\u043D\u0438\u044F\u043C\u0438 \u0438 \u0438\u043D\u0432\u0430\u043B\u0438\u0434\u043D\u043E\u0441\u0442\u044C\u044E, \u043E \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0438 \u0440\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u043E\u0439 \u043C\u0435\u0434\u0438\u0446\u0438\u043D\u044B, \u0430 \u0442\u0430\u043A\u0436\u0435 \u043E \u0431\u043B\u0430\u0433\u043E\u0442\u0432\u043E\u0440\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438 \u0438 \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u043E\u0439 \u043E\u0431\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0435 \u0432 \u0420\u043E\u0441\u0441\u0438\u0438. \u0422\u0430\u043A\u0436\u0435 \u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u0432\u0437\u0430\u0438\u043C\u043E\u0434\u0435\u0439\u0441\u0442\u0432\u0443\u0435\u0442 \u0441 \u043D\u0435\u043A\u043E\u043C\u043C\u0435\u0440\u0447\u0435\u0441\u043A\u0438\u043C\u0438 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u044F\u043C\u0438, \u0441\u043E\u0431\u0438\u0440\u0430\u044F \u0438\u0441\u0442\u043E\u0440\u0438\u0438 \u043E \u0431\u043B\u0430\u0433\u043E\u0442\u0432\u043E\u0440\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0445 \u043F\u0440\u043E\u0435\u043A\u0442\u0430\u0445, \u0438 \u0437\u0430\u043D\u0438\u043C\u0430\u0435\u0442\u0441\u044F \u0441\u0431\u043E\u0440\u043E\u043C \u0441\u0440\u0435\u0434\u0441\u0442\u0432 (\u043A\u0440\u0430\u0443\u0434\u0444\u0430\u043D\u0434\u0438\u043D\u0433\u043E\u043C) \u0434\u043B\u044F \u0444\u043E\u043D\u0434\u0430 \u00AB\u041D\u0443\u0436\u043D\u0430 \u043F\u043E\u043C\u043E\u0449\u044C\u00BB.'  # noqa
-    publisher = '\u0411\u043B\u0430\u0433\u043E\u0442\u0432\u043E\u0440\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 \u0444\u043E\u043D\u0434 \u00AB\u041D\u0443\u0436\u043D\u0430 \u041F\u043E\u043C\u043E\u0449\u044C\u00BB'  # noqa
+    description = '\u0418\u0437\u0434\u0430\u043D\u0438\u0435 \u00AB\u0422\u0430\u043A\u0438\u0435 \u0434\u0435\u043B\u0430\u00BB \u043E\u0441\u0432\u0435\u0449\u0430\u0435\u0442 \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0435 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u044B, \u043F\u0438\u0448\u0435\u0442 \u043E \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430\u0445 \u043B\u044E\u0434\u0435\u0439 \u0441 \u0440\u0435\u0434\u043A\u0438\u043C\u0438 \u0437\u0430\u0431\u043E\u043B\u0435\u0432\u0430\u043D\u0438\u044F\u043C\u0438 \u0438 \u0438\u043D\u0432\u0430\u043B\u0438\u0434\u043D\u043E\u0441\u0442\u044C\u044E, \u043E \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0438 \u0440\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u043E\u0439 \u043C\u0435\u0434\u0438\u0446\u0438\u043D\u044B, \u0430 \u0442\u0430\u043A\u0436\u0435 \u043E \u0431\u043B\u0430\u0433\u043E\u0442\u0432\u043E\u0440\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438 \u0438 \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u043E\u0439 \u043E\u0431\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0435 \u0432 \u0420\u043E\u0441\u0441\u0438\u0438. \u0422\u0430\u043A\u0436\u0435 \u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u0432\u0437\u0430\u0438\u043C\u043E\u0434\u0435\u0439\u0441\u0442\u0432\u0443\u0435\u0442 \u0441 \u043D\u0435\u043A\u043E\u043C\u043C\u0435\u0440\u0447\u0435\u0441\u043A\u0438\u043C\u0438 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u044F\u043C\u0438, \u0441\u043E\u0431\u0438\u0440\u0430\u044F \u0438\u0441\u0442\u043E\u0440\u0438\u0438 \u043E \u0431\u043B\u0430\u0433\u043E\u0442\u0432\u043E\u0440\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0445 \u043F\u0440\u043E\u0435\u043A\u0442\u0430\u0445, \u0438 \u0437\u0430\u043D\u0438\u043C\u0430\u0435\u0442\u0441\u044F \u0441\u0431\u043E\u0440\u043E\u043C \u0441\u0440\u0435\u0434\u0441\u0442\u0432 (\u043A\u0440\u0430\u0443\u0434\u0444\u0430\u043D\u0434\u0438\u043D\u0433\u043E\u043C) \u0434\u043B\u044F \u0444\u043E\u043D\u0434\u0430 \u00AB\u041D\u0443\u0436\u043D\u0430 \u043F\u043E\u043C\u043E\u0449\u044C\u00BB.'  # noqa: E501
+    publisher = '\u0411\u043B\u0430\u0433\u043E\u0442\u0432\u043E\u0440\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 \u0444\u043E\u043D\u0434 \u00AB\u041D\u0443\u0436\u043D\u0430 \u041F\u043E\u043C\u043E\u0449\u044C\u00BB'  # noqa: E501
     category = 'blog'
     cover_url = u'https://takiedela.ru/wp-content/themes/takiedela/assets/image/share/td.jpg'
     language = 'ru'
@@ -129,7 +129,7 @@ class TakieDela(BasicNewsRecipe):
             'https://takiedela.ru/genre/heroes/feed/'
         ),
         (
-            '\u0421\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0435 \u043D\u0430\u0441\u043B\u0435\u0434\u0438\u044F \u0438 \u0438\u0441\u0442\u043E\u0440\u0438\u0447\u0435\u0441\u043A\u043E\u0439 \u043F\u0430\u043C\u044F\u0442\u0438',  # noqa
+            '\u0421\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0435 \u043D\u0430\u0441\u043B\u0435\u0434\u0438\u044F \u0438 \u0438\u0441\u0442\u043E\u0440\u0438\u0447\u0435\u0441\u043A\u043E\u0439 \u043F\u0430\u043C\u044F\u0442\u0438',  # noqa: E501
             'https://takiedela.ru/category/cultural/feed/'
         ),
         (
@@ -137,7 +137,7 @@ class TakieDela(BasicNewsRecipe):
             'https://takiedela.ru/category/deti/feed/'
         ),
         (
-            '\u0414\u0435\u0442\u0438 \u0441 \u043E\u0441\u043E\u0431\u0435\u043D\u043D\u043E\u0441\u0442\u044F\u043C\u0438 \u0440\u0430\u0437\u0432\u0438\u0442\u0438\u044F',  # noqa
+            '\u0414\u0435\u0442\u0438 \u0441 \u043E\u0441\u043E\u0431\u0435\u043D\u043D\u043E\u0441\u0442\u044F\u043C\u0438 \u0440\u0430\u0437\u0432\u0438\u0442\u0438\u044F',  # noqa: E501
             'https://takiedela.ru/category/deti-s-osobennostyami-razvitiya/feed/'
         ),
         (
@@ -145,15 +145,15 @@ class TakieDela(BasicNewsRecipe):
             'https://takiedela.ru/category/detskiy-dom/feed/'
         ),
         (
-            '\u041A\u0430\u0442\u0430\u0441\u0442\u0440\u043E\u0444\u044B \u0438 \u0441\u0442\u0438\u0445\u0438\u0439\u043D\u044B\u0435 \u0431\u0435\u0434\u0441\u0442\u0432\u0438\u044F',  # noqa
+            '\u041A\u0430\u0442\u0430\u0441\u0442\u0440\u043E\u0444\u044B \u0438 \u0441\u0442\u0438\u0445\u0438\u0439\u043D\u044B\u0435 \u0431\u0435\u0434\u0441\u0442\u0432\u0438\u044F',  # noqa: E501
             'https://takiedela.ru/category/disaster/feed/'
         ),
         (
-            '\u0425\u0440\u043E\u043D\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u0438 \u043D\u0435\u0438\u0437\u043B\u0435\u0447\u0438\u043C\u044B\u0435 \u0437\u0430\u0431\u043E\u043B\u0435\u0432\u0430\u043D\u0438\u044F',  # noqa
+            '\u0425\u0440\u043E\u043D\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u0438 \u043D\u0435\u0438\u0437\u043B\u0435\u0447\u0438\u043C\u044B\u0435 \u0437\u0430\u0431\u043E\u043B\u0435\u0432\u0430\u043D\u0438\u044F',  # noqa: E501
             'https://takiedela.ru/category/illness/feed/'
         ),
         (
-            '\u0420\u0430\u0437\u0432\u0438\u0442\u0438\u0435 \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u044B \u0438 \u0438\u0441\u043A\u0443\u0441\u0441\u0442\u0432\u0430',  # noqa
+            '\u0420\u0430\u0437\u0432\u0438\u0442\u0438\u0435 \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u044B \u0438 \u0438\u0441\u043A\u0443\u0441\u0441\u0442\u0432\u0430',  # noqa: E501
             'https://takiedela.ru/category/kultura/feed/'
         ),
         (
diff --git a/recipes/tayga.recipe b/recipes/tayga.recipe
index 3b63508fff..8012bd6f25 100644
--- a/recipes/tayga.recipe
+++ b/recipes/tayga.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Tayga(BasicNewsRecipe):
     title = '\u0422\u0430\u0439\u0433\u0430.\u0438\u043D\u0444\u043E'
     __author__ = 'bugmen00t'
-    description = '\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E-\u0430\u043D\u0430\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u043E \u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u0438 \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u0441\u043E\u0431\u044B\u0442\u0438\u044F\u0445 \u0421\u0438\u0431\u0438\u0440\u0441\u043A\u043E\u0433\u043E \u0444\u0435\u0434\u0435\u0440\u0430\u043B\u044C\u043D\u043E\u0433\u043E \u043E\u043A\u0440\u0443\u0433\u0430.'  # noqa
+    description = '\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E-\u0430\u043D\u0430\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u043E \u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u0438 \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u0441\u043E\u0431\u044B\u0442\u0438\u044F\u0445 \u0421\u0438\u0431\u0438\u0440\u0441\u043A\u043E\u0433\u043E \u0444\u0435\u0434\u0435\u0440\u0430\u043B\u044C\u043D\u043E\u0433\u043E \u043E\u043A\u0440\u0443\u0433\u0430.'  # noqa: E501
     publisher = '\u0422\u0430\u0439\u0433\u0430.\u0438\u043D\u0444\u043E'
     category = 'blog'
     cover_url = u'https://tayga.info/design/logo.svg'
diff --git a/recipes/taz_rss.recipe b/recipes/taz_rss.recipe
index 8b256afc46..b9e497ca77 100644
--- a/recipes/taz_rss.recipe
+++ b/recipes/taz_rss.recipe
@@ -47,7 +47,7 @@ class TazRSSRecipe(BasicNewsRecipe):
     no_stylesheets = True  # default value is False, but True makes process much faster
     keep_only_tags = [
         dict(name=['div'], attrs={
-             'class': re.compile(r".*\bsect_article\b.*")})
+             'class': re.compile(r'.*\bsect_article\b.*')})
     ]
     remove_tags = [
         dict(name=['div'], attrs={'class': 'sectfoot'}),
diff --git a/recipes/techcrunch.recipe b/recipes/techcrunch.recipe
index 22e91777b8..d58f36efc2 100644
--- a/recipes/techcrunch.recipe
+++ b/recipes/techcrunch.recipe
@@ -18,7 +18,7 @@ class AdvancedUserRecipe1718089036(BasicNewsRecipe):
 
     feeds = [
     ('TechCrunch', 'https://techcrunch.com/feed/'),
-    #Categories
+    # Categories
     ('Apps', 'https://techcrunch.com/category/apps/feed/'),
     ('Artificial Intelligence', 'https://techcrunch.com/category/artificial-intelligence/feed/'),
     ('Biotech', 'https://techcrunch.com/category/biotech-health/feed/'),
@@ -41,7 +41,7 @@ class AdvancedUserRecipe1718089036(BasicNewsRecipe):
     ('Tech Policy & Government', 'https://techcrunch.com/category/government-policy/feed/'),
     ('Transportation', 'https://techcrunch.com/category/transportation/feed/'),
     ('Venture Capital', 'https://techcrunch.com/category/venture/feed/'),
-    #Tags
+    # Tags
     ('Amazon', 'https://techcrunch.com/tag/amazon/feed/'),
     ('Apple', 'https://techcrunch.com/tag/apple/feed/'),
     ('Cloud Computing', 'https://techcrunch.com/tag/cloud-computing/feed/'),
@@ -52,6 +52,6 @@ class AdvancedUserRecipe1718089036(BasicNewsRecipe):
     ('Meta', 'https://techcrunch.com/tag/meta/feed/'),
     ('Microsoft', 'https://techcrunch.com/tag/microsoft/feed/'),
     ('TikTok', 'https://techcrunch.com/tag/tiktok/feed/'),
-    #Other
+    # Other
     ('Events Archive', 'https://techcrunch.com/events/feed/'),
 ]
diff --git a/recipes/tehelka.recipe b/recipes/tehelka.recipe
index e90249d2c8..18edfcfc70 100644
--- a/recipes/tehelka.recipe
+++ b/recipes/tehelka.recipe
@@ -27,7 +27,6 @@ class Tehelka(BasicNewsRecipe):
     use_embedded_content = False
     ignore_duplicate_articles = {'title', 'url'}
 
-
     feeds          = [
         ('Tehelka', 'http://tehelka.com/rss'),
     ]
diff --git a/recipes/telepolis.recipe b/recipes/telepolis.recipe
index a62cccbb79..3df56c972e 100644
--- a/recipes/telepolis.recipe
+++ b/recipes/telepolis.recipe
@@ -22,4 +22,4 @@ class Telepolis(BasicNewsRecipe):
     remove_tags = [dict(name='p', attrs={'class':'printversion__back-to-article printversion--hide'})]
 
     def get_article_url(self, article):
-        return article.link + "&view=print"
+        return article.link + '&view=print'
diff --git a/recipes/thairath.recipe b/recipes/thairath.recipe
index 0fe46d6faf..d097d09927 100644
--- a/recipes/thairath.recipe
+++ b/recipes/thairath.recipe
@@ -57,4 +57,4 @@ class AdvancedUserRecipe1271637235(BasicNewsRecipe):
     remove_tags.append(dict(name='id', attrs={'class': 'footer'}))
 
     remove_tags.append(
-        dict(name="ul", attrs={'id': 'banner-highlights-images'}))
+        dict(name='ul', attrs={'id': 'banner-highlights-images'}))
diff --git a/recipes/the_age.recipe b/recipes/the_age.recipe
index 662b7b61ff..871592bcdb 100644
--- a/recipes/the_age.recipe
+++ b/recipes/the_age.recipe
@@ -89,7 +89,7 @@ class TheAge(BasicNewsRecipe):
 
         for i in soup.findAll('a'):
             href = i['href']
-            if href and re.match('http://www.theage.com.au/frontpage/[0-9]+/[0-9]+/[0-9]+/frontpage.pdf', href):
+            if href and re.match(r'http://www.theage.com.au/frontpage/[0-9]+/[0-9]+/[0-9]+/frontpage.pdf', href):
                 return href
 
         return None
diff --git a/recipes/the_clinic_online.recipe b/recipes/the_clinic_online.recipe
index 2f0209e81f..f32d0cda10 100644
--- a/recipes/the_clinic_online.recipe
+++ b/recipes/the_clinic_online.recipe
@@ -21,7 +21,7 @@ class AdvancedUserRecipe1313555075(BasicNewsRecipe):
     remove_tags_before = dict(name='article', attrs={
                               'class': 'scope bordered'})
     remove_tags_after = dict(name='div', attrs={'id': 'commentsSection'})
-    remove_tags = [dict(name='span', attrs={'class': 'relTags'}), dict(name='div', attrs={'class': 'articleActivity hdcol'}), dict(name='div', attrs={'id': 'commentsSection'})  # noqa
+    remove_tags = [dict(name='span', attrs={'class': 'relTags'}), dict(name='div', attrs={'class': 'articleActivity hdcol'}), dict(name='div', attrs={'id': 'commentsSection'})  # noqa: E501
                    ]
 
     feeds = [(u'The Clinic Online', u'http://www.theclinic.cl/feed/')]
diff --git a/recipes/the_diplomat.recipe b/recipes/the_diplomat.recipe
index fde4a0f1a7..a386d3bf6b 100644
--- a/recipes/the_diplomat.recipe
+++ b/recipes/the_diplomat.recipe
@@ -27,7 +27,7 @@ class Diplomat(BasicNewsRecipe):
         soup = self.index_to_soup('https://thediplomat.com')
         tag = soup.find(attrs={'class': 'td-nav-mag'})
         if tag:
-            url = tag.find('img')['src'].split("/")[-1]
+            url = tag.find('img')['src'].split('/')[-1]
             self.cover_url = ('https://magazine.thediplomat.com/media/1080/' +
                               url)
             # /ads/magazine/cover/td-mag-s-1/issue_89_cover.jpg
@@ -67,5 +67,5 @@ class Diplomat(BasicNewsRecipe):
 
     def preprocess_html(self, soup):
         for img in soup.findAll('img', attrs={'src': True}):
-            img['src'] = img['src'].replace("td-story-s-1", "td-story-s-2")
+            img['src'] = img['src'].replace('td-story-s-1', 'td-story-s-2')
         return soup
diff --git a/recipes/the_federalist.recipe b/recipes/the_federalist.recipe
index 6fa4010168..d77f27b13c 100644
--- a/recipes/the_federalist.recipe
+++ b/recipes/the_federalist.recipe
@@ -23,10 +23,10 @@ class Federalist(BasicNewsRecipe):
     use_embedded_content = False
     remove_attributes = ['xmlns', 'lang', 'style', 'width', 'height']
 
-    extra_css = """
+    extra_css = '''
         .shortbio,.article-excerpt{font-style: italic}
         .article-author-details,.article-author-description,.article-meta-author,.article-meta-date,.article-thumbnail-caption{font-size: small}
-    """
+    '''
 
     keep_only_tags = [
         classes(
diff --git a/recipes/the_gamer.recipe b/recipes/the_gamer.recipe
index 3e5acc747d..187ea4eade 100644
--- a/recipes/the_gamer.recipe
+++ b/recipes/the_gamer.recipe
@@ -21,26 +21,26 @@ class AdvancedUserRecipe1718109535(BasicNewsRecipe):
 
     feeds          = [
         ('Game Guides', 'https://www.thegamer.com/feed/category/game-guides/'),
-        #AAA Games
+        # AAA Games
         ('AAA Games', 'https://www.thegamer.com/feed/aaa-games/'),
         ('AAA Games Features', 'https://www.thegamer.com/feed/aaa-games/features/'),
         ('AAA Games News', 'https://www.thegamer.com/feed/aaa-games/news/'),
         ('AAA Games Lists', 'https://www.thegamer.com/feed/aaa-games/lists/'),
-        #Live-Service Games
+        # Live-Service Games
         ('Live-Service Games', 'https://www.thegamer.com/feed/live-service-games/'),
         ('Live-Service Games Features', 'https://www.thegamer.com/feed/live-service-games/features/'),
         ('Live-Service Games News', 'https://www.thegamer.com/feed/live-service-games/news/'),
         ('Live-Service Games Lists', 'https://www.thegamer.com/feed/live-service-games/lists/'),
-        #Indie Games
+        # Indie Games
         ('Indie Games', 'https://www.thegamer.com/feed/indie-games/'),
         ('Indie Games Features', 'https://www.thegamer.com/feed/indie-games/features/'),
         ('Indie Games News', 'https://www.thegamer.com/feed/indie-games/news/'),
         ('Indie Games Lists', 'https://www.thegamer.com/feed/indie-games/lists/'),
-        #Streaming
+        # Streaming
         ('Streaming', 'https://www.thegamer.com/feed/streaming/'),
         ('Streaming Features', 'https://www.thegamer.com/feed/streaming/features/'),
         ('Streaming News', 'https://www.thegamer.com/feed/streaming/news/'),
-        #Movies & Shows
+        # Movies & Shows
         ('Movies & Shows', 'https://www.thegamer.com/feed/movies-tv-anime/'),
         ('Movies & Shows Features', 'https://www.thegamer.com/feed/movies-tv-anime/features/'),
         ('Movies & Shows News', 'https://www.thegamer.com/feed/movies-tv-anime/news/'),
diff --git a/recipes/the_insider.recipe b/recipes/the_insider.recipe
index adda8299ed..2e1be8c8a2 100644
--- a/recipes/the_insider.recipe
+++ b/recipes/the_insider.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class TheInsider(BasicNewsRecipe):
     title = 'The Insider'
-    cover_url = 'https://s3-us-west-2.amazonaws.com/anchor-generated-image-bank/production/podcast_uploaded_nologo400/10331708/10331708-1604408816914-d03520fb339d5.jpg'  # noqa
+    cover_url = 'https://s3-us-west-2.amazonaws.com/anchor-generated-image-bank/production/podcast_uploaded_nologo400/10331708/10331708-1604408816914-d03520fb339d5.jpg'  # noqa: E501
     __author__ = 'bugmen00t'
     description = 'Расследования Репортажи Аналитика'
     publisher = 'theins.ru'
diff --git a/recipes/the_marker.recipe b/recipes/the_marker.recipe
index 40444777e2..74ae8a0e27 100644
--- a/recipes/the_marker.recipe
+++ b/recipes/the_marker.recipe
@@ -45,5 +45,5 @@ class AdvancedUserRecipe1283848012(BasicNewsRecipe):
         rg = re.compile(re1 + re2, re.IGNORECASE | re.DOTALL)
         m = rg.search(txt)
         if m:
-            # print 'bad link'
+            # print('bad link')
             return 1
diff --git a/recipes/the_nation.recipe b/recipes/the_nation.recipe
index 20a4430cb3..ba10ce0ded 100644
--- a/recipes/the_nation.recipe
+++ b/recipes/the_nation.recipe
@@ -28,11 +28,11 @@ class Thenation(BasicNewsRecipe):
     login_url = 'http://www.thenation.com/user?destination=%3Cfront%3E'
     publication_type = 'magazine'
     needs_subscription = 'optional'
-    exra_css              = """
+    exra_css              = '''
                               body{font-family: Arial,Helvetica,sans-serif;}
                               .print-created{font-size: small;}
                               .caption{display: block; font-size: x-small;}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
@@ -47,7 +47,7 @@ class Thenation(BasicNewsRecipe):
     ]
     remove_attributes = ['lang']
 
-    feeds = [(u"Articles", u'http://www.thenation.com/rss/articles')]
+    feeds = [(u'Articles', u'http://www.thenation.com/rss/articles')]
 
     def get_browser(self):
         br = BasicNewsRecipe.get_browser(self)
diff --git a/recipes/the_philippine_daily_inquirer.recipe b/recipes/the_philippine_daily_inquirer.recipe
index 3fcf888a09..a98dde90d7 100644
--- a/recipes/the_philippine_daily_inquirer.recipe
+++ b/recipes/the_philippine_daily_inquirer.recipe
@@ -5,8 +5,7 @@ from calibre.web.feeds.recipes import BasicNewsRecipe
 
 class PhilippineDailyInquirer(BasicNewsRecipe):
     title = 'The Philippine Daily Inquirer'
-    custom_title = "The Philippine Daily Inquirer - " + \
-        time.strftime('%d %b %Y %I:%M %p')
+    custom_title = 'The Philippine Daily Inquirer - ' + time.strftime('%d %b %Y %I:%M %p')
     __author__ = 'jde'
     __date__ = '03 June 2012'
     __version__ = '1.0'
@@ -37,7 +36,7 @@ class PhilippineDailyInquirer(BasicNewsRecipe):
     ]
 
     remove_tags = [
-        dict(name='div', attrs={'class': 'recent'}), dict(name='div', attrs={'id': 'sharefeature'}), dict(name='div', attrs={'id': 'masthead_bg'}), dict(name='div', attrs={'id': 'navmenu_main'}), dict(name='div', attrs={'id': 'navmenu_channel'}), dict(name='div', attrs={'class': 'breadcrumbs'}), dict(name='div', attrs={'id': 'search_container'}), dict(name='a', attrs={'href': 'http://ruby.inquirer.net/redirect/redirect.php?item_id=1143'}), dict(name='a', attrs={'href': 'http://ruby.inquirer.net/redirect/redirect.php?item_id=1147'})  # noqa
+        dict(name='div', attrs={'class': 'recent'}), dict(name='div', attrs={'id': 'sharefeature'}), dict(name='div', attrs={'id': 'masthead_bg'}), dict(name='div', attrs={'id': 'navmenu_main'}), dict(name='div', attrs={'id': 'navmenu_channel'}), dict(name='div', attrs={'class': 'breadcrumbs'}), dict(name='div', attrs={'id': 'search_container'}), dict(name='a', attrs={'href': 'http://ruby.inquirer.net/redirect/redirect.php?item_id=1143'}), dict(name='a', attrs={'href': 'http://ruby.inquirer.net/redirect/redirect.php?item_id=1147'})  # noqa: E501
     ]
 
     conversion_options = {'title': custom_title,
@@ -51,73 +50,80 @@ class PhilippineDailyInquirer(BasicNewsRecipe):
 
     feeds = [
 
-    ('Headlines',             'http://newsinfo.inquirer.net/category/inquirer-headlines/feed'),
-    ('Latest Stories'      , 'http://newsinfo.inquirer.net/category/latest-stories/feed'),
-    ('Nation'           , 'http://newsinfo.inquirer.net/category/nation/feed'),
-    ('Nation - Latest Stories'          , 'http://newsinfo.inquirer.net/category/latest-stories/nation-latest-stories/feed'),
-    ('Metro'        , 'http://newsinfo.inquirer.net/category/metro/feed'),
-    ('Metro - Latest Stories'       , 'http://newsinfo.inquirer.net/category/latest-stories/metro-latest-stories/feed'),
-    ('Regions'           , 'http://newsinfo.inquirer.net/category/regions/feed'),
-    ('Regions - Latest Stories'         , 'http://newsinfo.inquirer.net/category/latest-stories/regions-latest-stories/feed'),
-    ('News'          , 'http://www.inquirer.net/fullfeed'),
-    ('More News'        , 'http://newsinfo.inquirer.net/feed')
-        ,
-    ('Global Nation'         , 'http://globalnation.inquirer.net/feed'),
-    ('Global Nation - Latest Stories', 'http://globalnation.inquirer.net/category/latest-stories/feed'),
-    ('Global Nation - Philippines', 'http://globalnation.inquirer.net/category/news/philippines/feed'),
-    ('Global Nation - Asia & Pacific', 'http://globalnation.inquirer.net/category/news/asiaaustralia/feed'),
-    ('Global Nation - Americas', 'http://globalnation.inquirer.net/category/news/uscanada/feed'),
-    ('Global Nation - Middle East & Africa', 'http://globalnation.inquirer.net/category/news/middle-eastafrica/feed'),
-    ('Global Nation - Europe'         , 'http://globalnation.inquirer.net/category/news/europe/feed'),
-    ('Global Nation - Global Pinoy', 'http://globalnation.inquirer.net/category/global-pinoy/feed'),
-    ('Global Nation - Events'         , 'http://globalnation.inquirer.net/category/events/feed'),
-    ('Business'         , 'http://business.inquirer.net/feed'),
-    ('Business - Latest Stories'       , 'http://business.inquirer.net/category/latest-stories/feed'),
-    ('Business - Money'       , 'http://business.inquirer.net/category/money/feed'),
+    ('Headlines',                   'http://newsinfo.inquirer.net/category/inquirer-headlines/feed'),
+    ('Latest Stories',              'http://newsinfo.inquirer.net/category/latest-stories/feed'),
+    ('Nation',                      'http://newsinfo.inquirer.net/category/nation/feed'),
+    ('Nation - Latest Stories',     'http://newsinfo.inquirer.net/category/latest-stories/nation-latest-stories/feed'),
+    ('Metro',                       'http://newsinfo.inquirer.net/category/metro/feed'),
+    ('Metro - Latest Stories',      'http://newsinfo.inquirer.net/category/latest-stories/metro-latest-stories/feed'),
+    ('Regions',                     'http://newsinfo.inquirer.net/category/regions/feed'),
+    ('Regions - Latest Stories',    'http://newsinfo.inquirer.net/category/latest-stories/regions-latest-stories/feed'),
+    ('News',                        'http://www.inquirer.net/fullfeed'),
+    ('More News',                   'http://newsinfo.inquirer.net/feed'),
+
+    ('Global Nation',                           'http://globalnation.inquirer.net/feed'),
+    ('Global Nation - Latest Stories',          'http://globalnation.inquirer.net/category/latest-stories/feed'),
+    ('Global Nation - Philippines',             'http://globalnation.inquirer.net/category/news/philippines/feed'),
+    ('Global Nation - Asia & Pacific',          'http://globalnation.inquirer.net/category/news/asiaaustralia/feed'),
+    ('Global Nation - Americas',                'http://globalnation.inquirer.net/category/news/uscanada/feed'),
+    ('Global Nation - Middle East & Africa',    'http://globalnation.inquirer.net/category/news/middle-eastafrica/feed'),
+    ('Global Nation - Europe',                  'http://globalnation.inquirer.net/category/news/europe/feed'),
+    ('Global Nation - Global Pinoy',            'http://globalnation.inquirer.net/category/global-pinoy/feed'),
+    ('Global Nation - Events',                  'http://globalnation.inquirer.net/category/events/feed'),
+
+    ('Business',                    'http://business.inquirer.net/feed'),
+    ('Business - Latest Stories',   'http://business.inquirer.net/category/latest-stories/feed'),
+    ('Business - Money',            'http://business.inquirer.net/category/money/feed'),
     ('Business - Science & Health', 'http://business.inquirer.net/category/science-and-health/feed'),
-    ('Business - Motoring'       , 'http://business.inquirer.net/category/motoring/feed'),
-    ('Business - Property Guide'       , 'http://business.inquirer.net/category/property-guide/feed'),
-    ('Business - Columnists'       , 'http://business.inquirer.net/category/columnists/feed'),
-    ('Sports'              , 'http://sports.inquirer.net/feed'),
-    ('Sports - Latest Stories'            , 'http://sports.inquirer.net/category/latest-stories/feed'),
-    ('Sports - Basketball'            , 'http://sports.inquirer.net/category/section/basketball/feed'),
-    ('Sports - Boxing & MMA', 'http://sports.inquirer.net/category/section/boxing-mma/feed'),
-    ('Sports - Golf'            , 'http://sports.inquirer.net/category/section/golf/feed'),
-    ('Sports - Football'            , 'http://sports.inquirer.net/category/section/other-sports/football/feed'),
-    ('Sports - Other Sports'            , 'http://sports.inquirer.net/category/section/other-sports/feed'),
-    ('Technology'             , 'http://technology.inquirer.net/feed'),
-    ('Technology Latest Stories', 'http://technology.inquirer.net/category/latest-stories/feed'),
-    ('Entertainment'          , 'http://entertainment.inquirer.net/feed'),
-    ('Entertainment - Headlines', 'http://entertainment.inquirer.net/category/headlines/feed'),
-    ('Entertainment - Latest Stories', 'http://entertainment.inquirer.net/category/latest-stories/feed'),
-    ('Entertainment - Movies'          , 'http://movies.inquirer.net/feed'),
-    ('Lifestyle'            , 'http://lifestyle.inquirer.net/feed'),
-    ('Lifestyle - Latest Stories', 'http://lifestyle.inquirer.net/category/latest-stories/feed'),
-    ('Lifestyle - Arts & Books'          , 'http://lifestyle.inquirer.net/category/arts-and-books/feed'),
-    ('Lifestyle - Wellness'          , 'http://lifestyle.inquirer.net/category/wellness/feed'),
+    ('Business - Motoring',         'http://business.inquirer.net/category/motoring/feed'),
+    ('Business - Property Guide',   'http://business.inquirer.net/category/property-guide/feed'),
+    ('Business - Columnists',       'http://business.inquirer.net/category/columnists/feed'),
+
+    ('Sports',                  'http://sports.inquirer.net/feed'),
+    ('Sports - Latest Stories', 'http://sports.inquirer.net/category/latest-stories/feed'),
+    ('Sports - Basketball',     'http://sports.inquirer.net/category/section/basketball/feed'),
+    ('Sports - Boxing & MMA',   'http://sports.inquirer.net/category/section/boxing-mma/feed'),
+    ('Sports - Golf',           'http://sports.inquirer.net/category/section/golf/feed'),
+    ('Sports - Football',       'http://sports.inquirer.net/category/section/other-sports/football/feed'),
+    ('Sports - Other Sports',   'http://sports.inquirer.net/category/section/other-sports/feed'),
+
+    ('Technology',                  'http://technology.inquirer.net/feed'),
+    ('Technology Latest Stories',   'http://technology.inquirer.net/category/latest-stories/feed'),
+
+    ('Entertainment',                   'http://entertainment.inquirer.net/feed'),
+    ('Entertainment - Headlines',       'http://entertainment.inquirer.net/category/headlines/feed'),
+    ('Entertainment - Latest Stories',  'http://entertainment.inquirer.net/category/latest-stories/feed'),
+    ('Entertainment - Movies',          'http://movies.inquirer.net/feed'),
+
+    ('Lifestyle',                       'http://lifestyle.inquirer.net/feed'),
+    ('Lifestyle - Latest Stories',      'http://lifestyle.inquirer.net/category/latest-stories/feed'),
+    ('Lifestyle - Arts & Books',        'http://lifestyle.inquirer.net/category/arts-and-books/feed'),
+    ('Lifestyle - Wellness',            'http://lifestyle.inquirer.net/category/wellness/feed'),
     ('Lifestyle - Home & Entertaining', 'http://lifestyle.inquirer.net/category/home-and-entertaining/feed'),
-    ('Lifestyle - Parenting'          , 'http://lifestyle.inquirer.net/category/parenting/feed'),
-    ('Lifestyle - Food'          , 'http://lifestyle.inquirer.net/category/food/feed'),
-    ('Lifestyle - Fashion & Beauty', 'http://lifestyle.inquirer.net/category/fashion-and-beauty/feed'),
-    ('Lifestyle - Super'          , 'http://lifestyle.inquirer.net/category/super/feed'),
-    ('Lifestyle - 2BU'          , 'http://lifestyle.inquirer.net/category/2bu/feed'),
-    ('Lifestyle - Sunday Lifestyle', 'http://lifestyle.inquirer.net/category/sunday-lifestyle/feed'),
-    ('Lifestyle - Wedding'          , 'http://lifestyle.inquirer.net/category/sunday-lifestyle/wedding/feed'),
-    ('Lifestyle - Travel'          , 'http://lifestyle.inquirer.net/category/sunday-lifestyle/travel/feed'),
-    ('Lifestyle - Relationship'          , 'http://lifestyle.inquirer.net/category/sunday-lifestyle/relationship/feed'),
-    ('Opinion'            , 'http://opinion.inquirer.net/feed'),
-    ('Opinion - Viewpoints'          , 'http://opinion.inquirer.net/category/viewpoints/feed'),
-    ('Opinion - Talk of the Town', 'http://opinion.inquirer.net/category/inquirer-opinion/talk-of-the-town/feed'),
-    ('Editorial'            , 'http://opinion.inquirer.net/category/editorial/feed'),
-    ('Letters to the Editor'        , 'http://opinion.inquirer.net/category/letters-to-the-editor/feed'),
-    ('Columns'            , 'http://opinion.inquirer.net/category/columns/feed'),
-    ('Citizens Journalism'         , 'http://newsinfo.inquirer.net/category/citizens-journalism/feed'),
-    ('Cebu - Daily News'         , 'http://newsinfo.inquirer.net/category/cdn/feed'),
-    ('Cebu - More News'         , 'http://newsinfo.inquirer.net/category/cdn/cdn-news/feed'),
-    ('Cebu - Community'         , 'http://newsinfo.inquirer.net/category/cdn/cdn-community/feed'),
-    ('Cebu - Metro'         , 'http://newsinfo.inquirer.net/category/cdn/cdn-metro/feed'),
-    ('Cebu - Business'         , 'http://newsinfo.inquirer.net/category/cdn/cdn-enterprise/feed'),
-    ('Cebu - Sports'         , 'http://newsinfo.inquirer.net/category/cdn/cdn-sports/feed'),
-    ('Cebu - Visayas'         , 'http://newsinfo.inquirer.net/category/cdn/cdn-visayas/feed'),
-    ('Cebu - Opinion'         , 'http://newsinfo.inquirer.net/category/cdn/cdn-opinion/feed')
+    ('Lifestyle - Parenting',           'http://lifestyle.inquirer.net/category/parenting/feed'),
+    ('Lifestyle - Food',                'http://lifestyle.inquirer.net/category/food/feed'),
+    ('Lifestyle - Fashion & Beauty',    'http://lifestyle.inquirer.net/category/fashion-and-beauty/feed'),
+    ('Lifestyle - Super',               'http://lifestyle.inquirer.net/category/super/feed'),
+    ('Lifestyle - 2BU',                 'http://lifestyle.inquirer.net/category/2bu/feed'),
+    ('Lifestyle - Sunday Lifestyle',    'http://lifestyle.inquirer.net/category/sunday-lifestyle/feed'),
+    ('Lifestyle - Wedding',             'http://lifestyle.inquirer.net/category/sunday-lifestyle/wedding/feed'),
+    ('Lifestyle - Travel',              'http://lifestyle.inquirer.net/category/sunday-lifestyle/travel/feed'),
+    ('Lifestyle - Relationship',        'http://lifestyle.inquirer.net/category/sunday-lifestyle/relationship/feed'),
+
+    ('Opinion',                     'http://opinion.inquirer.net/feed'),
+    ('Opinion - Viewpoints',        'http://opinion.inquirer.net/category/viewpoints/feed'),
+    ('Opinion - Talk of the Town',  'http://opinion.inquirer.net/category/inquirer-opinion/talk-of-the-town/feed'),
+    ('Editorial',                   'http://opinion.inquirer.net/category/editorial/feed'),
+    ('Letters to the Editor',       'http://opinion.inquirer.net/category/letters-to-the-editor/feed'),
+    ('Columns',                     'http://opinion.inquirer.net/category/columns/feed'),
+
+    ('Citizens Journalism', 'http://newsinfo.inquirer.net/category/citizens-journalism/feed'),
+    ('Cebu - Daily News',   'http://newsinfo.inquirer.net/category/cdn/feed'),
+    ('Cebu - More News',    'http://newsinfo.inquirer.net/category/cdn/cdn-news/feed'),
+    ('Cebu - Community',    'http://newsinfo.inquirer.net/category/cdn/cdn-community/feed'),
+    ('Cebu - Metro',        'http://newsinfo.inquirer.net/category/cdn/cdn-metro/feed'),
+    ('Cebu - Business',     'http://newsinfo.inquirer.net/category/cdn/cdn-enterprise/feed'),
+    ('Cebu - Sports',       'http://newsinfo.inquirer.net/category/cdn/cdn-sports/feed'),
+    ('Cebu - Visayas',      'http://newsinfo.inquirer.net/category/cdn/cdn-visayas/feed'),
+    ('Cebu - Opinion',      'http://newsinfo.inquirer.net/category/cdn/cdn-opinion/feed'),
     ]
diff --git a/recipes/the_saturday_paper.recipe b/recipes/the_saturday_paper.recipe
index 46276e4768..53f11435d5 100644
--- a/recipes/the_saturday_paper.recipe
+++ b/recipes/the_saturday_paper.recipe
@@ -32,10 +32,9 @@ class SaturdayPaper(BasicNewsRecipe):
                 ' article-page__sidebar article-page__social__icons share-wrapper article-footer-container')
     ]
     remove_tags_after = [
-        {"name": "div", "class": "end-matter"},
+        {'name': 'div', 'class': 'end-matter'},
     ]
 
-
     def get_cover_url(self):
         soup = self.index_to_soup('https://www.thesaturdaypaper.com.au/editions/')
         div = soup.find('div', attrs={'class':'article__image'})
@@ -54,7 +53,7 @@ class SaturdayPaper(BasicNewsRecipe):
 
         articles = []
 
-        for (feed, link) in feeds:
+        for feed, link in feeds:
             soup = self.index_to_soup(link)
             news = []
 
@@ -62,7 +61,7 @@ class SaturdayPaper(BasicNewsRecipe):
                 title = a.find(class_='article__title')
                 title = self.tag_to_string(title)
 
-                url = a.find(class_="article__title_link")
+                url = a.find(class_='article__title_link')
                 if url is None:
                     continue
                 url = url['href']
diff --git a/recipes/the_sportster.recipe b/recipes/the_sportster.recipe
index 3b8574dad3..6d6b9e8222 100644
--- a/recipes/the_sportster.recipe
+++ b/recipes/the_sportster.recipe
@@ -23,14 +23,14 @@ class AdvancedUserRecipe1718381004(BasicNewsRecipe):
     auto_cleanup   = True
 
     feeds          = [
-        #WWE
+        # WWE
         ('World Wrestling Entertainment', 'https://www.thesportster.com/feed/category/wwe/'),
         ('WWE News', 'https://www.thesportster.com/feed/category/news/'),
         ('WWE Lists', 'https://www.thesportster.com/feed/category/wrestling/'),
         ('WWE Real American Wrestling', 'https://www.thesportster.com/feed/category/wwe-raw/'),
         ('WWE SmackDown', 'https://www.thesportster.com/feed/category/wwe-smackdown/'),
         ('WWE NXT', 'https://www.thesportster.com/feed/category/wwe-nxt/'),
-        #AEW
+        # AEW
         ('All Elite Wrestling', 'https://www.thesportster.com/feed/category/aew/'),
         ('AEW News', 'https://www.thesportster.com/feed/category/news/'),
         ('AEW Lists', 'https://www.thesportster.com/feed/category/wrestling/'),
diff --git a/recipes/the_sun.recipe b/recipes/the_sun.recipe
index 217b097af0..0382fb25e7 100644
--- a/recipes/the_sun.recipe
+++ b/recipes/the_sun.recipe
@@ -63,7 +63,7 @@ class AdvancedUserRecipe1325006965(BasicNewsRecipe):
                 'http://www.thepaperboy.com/frontpages/current/The_Sun_newspaper_front_page.jpg')
         except:
             cover_url = random.choice([
-                'http://img.thesun.co.uk/multimedia/archive/00905/errorpage6_677961a_905507a.jpg', 'http://img.thesun.co.uk/multimedia/archive/00905/errorpage7_677962a_905505a.jpg', 'http://img.thesun.co.uk/multimedia/archive/00905/errorpage5_677960a_905512a.jpg', 'http://img.thesun.co.uk/multimedia/archive/00905/errorpage2_677957a_905502a.jpg', 'http://img.thesun.co.uk/multimedia/archive/00905/errorpage3_677958a_905503a.jpg'  # noqa
+                'http://img.thesun.co.uk/multimedia/archive/00905/errorpage6_677961a_905507a.jpg', 'http://img.thesun.co.uk/multimedia/archive/00905/errorpage7_677962a_905505a.jpg', 'http://img.thesun.co.uk/multimedia/archive/00905/errorpage5_677960a_905512a.jpg', 'http://img.thesun.co.uk/multimedia/archive/00905/errorpage2_677957a_905502a.jpg', 'http://img.thesun.co.uk/multimedia/archive/00905/errorpage3_677958a_905503a.jpg'  # noqa: E501
             ])
 
         return cover_url
diff --git a/recipes/the_things.recipe b/recipes/the_things.recipe
index 7798ccd2e1..7ab7b35b89 100644
--- a/recipes/the_things.recipe
+++ b/recipes/the_things.recipe
@@ -23,7 +23,7 @@ class AdvancedUserRecipe1718105400(BasicNewsRecipe):
     auto_cleanup   = True
 
     feeds          = [
-        #Celebrity
+        # Celebrity
         ('Celebrity', 'https://www.thethings.com/feed/category/celebrity/'),
         ('Celebrity News', 'https://www.thethings.com/feed/category/celebrity-news/'),
 
diff --git a/recipes/the_week_magazine_free.recipe b/recipes/the_week_magazine_free.recipe
index 47bc045d2d..35718ae649 100644
--- a/recipes/the_week_magazine_free.recipe
+++ b/recipes/the_week_magazine_free.recipe
@@ -9,7 +9,7 @@ class TheWeek(BasicNewsRecipe):
     title = 'The Week'
     __author__ = 'unkn0wn'
     description = (
-        'The Week is for readers who want to know what\'s going on in the world, without having to read '
+        "The Week is for readers who want to know what's going on in the world, without having to read "
         'several daily newspapers or get wrapped up in the endless news cycle. For every important story, '
         'our editors carefully select commentary from all sides of the debate and artfully stitch them together '
         'into one concise read. By showing you every perspective, we enable you to form your own opinion.'
diff --git a/recipes/the_week_uk.recipe b/recipes/the_week_uk.recipe
index 674d44f88c..32f4ca0495 100644
--- a/recipes/the_week_uk.recipe
+++ b/recipes/the_week_uk.recipe
@@ -9,7 +9,7 @@ class TheWeek(BasicNewsRecipe):
     title = 'The Week'
     __author__ = 'unkn0wn'
     description = (
-        'The Week is for readers who want to know what\'s going on in the world, without having to read '
+        "The Week is for readers who want to know what's going on in the world, without having to read "
         'several daily newspapers or get wrapped up in the endless news cycle. For every important story, '
         'our editors carefully select commentary from all sides of the debate and artfully stitch them together '
         'into one concise read. By showing you every perspective, we enable you to form your own opinion.'
diff --git a/recipes/thebell.recipe b/recipes/thebell.recipe
index d259b66c27..43f3b26222 100644
--- a/recipes/thebell.recipe
+++ b/recipes/thebell.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class TheBell(BasicNewsRecipe):
     title = 'The Bell'
     __author__ = 'bugmen00t'
-    description = '\u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u0438 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u0439 \u0431\u044E\u043B\u043B\u0435\u0442\u0435\u043D\u044C, \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u0438\u0437\u0438\u0440\u0443\u044E\u0449\u0435\u0435\u0441\u044F \u043D\u0430 \u0431\u0438\u0437\u043D\u0435\u0441-\u043D\u043E\u0432\u043E\u0441\u0442\u044F\u0445.'  # noqa
-    publisher = '\u0415\u043B\u0438\u0437\u0430\u0432\u0435\u0442\u0430 \u041E\u0441\u0435\u0442\u0438\u043D\u0441\u043A\u0430\u044F, \u0418\u0440\u0438\u043D\u0430 \u041C\u0430\u043B\u043A\u043E\u0432\u0430'  # noqa
+    description = '\u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u0438 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u0439 \u0431\u044E\u043B\u043B\u0435\u0442\u0435\u043D\u044C, \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u0438\u0437\u0438\u0440\u0443\u044E\u0449\u0435\u0435\u0441\u044F \u043D\u0430 \u0431\u0438\u0437\u043D\u0435\u0441-\u043D\u043E\u0432\u043E\u0441\u0442\u044F\u0445.'  # noqa: E501
+    publisher = '\u0415\u043B\u0438\u0437\u0430\u0432\u0435\u0442\u0430 \u041E\u0441\u0435\u0442\u0438\u043D\u0441\u043A\u0430\u044F, \u0418\u0440\u0438\u043D\u0430 \u041C\u0430\u043B\u043A\u043E\u0432\u0430'  # noqa: E501
     category = 'newspaper'
     cover_url = u'https://thebell.io/wp-content/uploads/2018/03/thebell-cover.png'
     language = 'ru'
diff --git a/recipes/thecultofghoul.recipe b/recipes/thecultofghoul.recipe
index 9401e90ecf..72a30a9ee2 100644
--- a/recipes/thecultofghoul.recipe
+++ b/recipes/thecultofghoul.recipe
@@ -21,13 +21,13 @@ class TheCultOfGhoul(BasicNewsRecipe):
     no_stylesheets = True
     use_embedded_content = True
     publication_type = 'blog'
-    extra_css = ' @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: "Trebuchet MS",Trebuchet,Verdana,sans1,sans-serif} .article_description{font-family: sans1, sans-serif} img{margin-bottom: 0.8em; border: 1px solid #333333; padding: 4px } '  # noqa
+    extra_css = ' @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: "Trebuchet MS",Trebuchet,Verdana,sans1,sans-serif} .article_description{font-family: sans1, sans-serif} img{margin-bottom: 0.8em; border: 1px solid #333333; padding: 4px } '  # noqa: E501
 
     conversion_options = {
         'comment': description, 'tags': 'film, blog, srbija, strava, uzas', 'publisher': 'Dejan Ognjanovic', 'language': language
     }
 
-    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]  # noqa: RUF039
 
     feeds = [(u'Posts', u'http://cultofghoul.blogspot.com/feeds/posts/default')]
 
diff --git a/recipes/thedailywtf.recipe b/recipes/thedailywtf.recipe
index d464da0cae..e896614c5f 100644
--- a/recipes/thedailywtf.recipe
+++ b/recipes/thedailywtf.recipe
@@ -9,7 +9,7 @@ class TheDailyWTF(BasicNewsRecipe):
     title = u'The Daily WTF'
     publisher = u'Mark Bowytz'
     __author__ = 'Jelle van der Waa'
-    description = 'The Daily WTF is your how-not-to guide for developing software. We recount tales of disastrous development, from project management gone spectacularly bad to inexplicable coding choices.'  # noqa
+    description = 'The Daily WTF is your how-not-to guide for developing software. We recount tales of disastrous development, from project management gone spectacularly bad to inexplicable coding choices.'  # noqa: E501
     category = 'software, programming'
     cover_url = 'http://thedailywtf.com/content/images/wtf-logo.png'
     oldest_article = 7
diff --git a/recipes/theecocolapse.recipe b/recipes/theecocolapse.recipe
index 9131883289..d90a340282 100644
--- a/recipes/theecocolapse.recipe
+++ b/recipes/theecocolapse.recipe
@@ -20,10 +20,10 @@ class TheEconomicCollapse(BasicNewsRecipe):
     use_embedded_content = False
     language = 'en'
     remove_empty_feeds = True
-    extra_css             = """
+    extra_css             = '''
                                 body{font-family: Tahoma,Arial,sans-serif }
                                 img{margin-bottom: 0.4em; display: block;}
-                            """
+                            '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
diff --git a/recipes/theeconomictimes_india.recipe b/recipes/theeconomictimes_india.recipe
index 4a4762cc90..b824d1258f 100644
--- a/recipes/theeconomictimes_india.recipe
+++ b/recipes/theeconomictimes_india.recipe
@@ -54,7 +54,7 @@ class TheEconomicTimes(BasicNewsRecipe):
 
     def preprocess_html(self, soup):
         for image in soup.findAll('img', attrs={'src': True}):
-            image['src'] = image['src'].replace("width-300", "width-640")
+            image['src'] = image['src'].replace('width-300', 'width-640')
         for img in soup.findAll('img', attrs={'data-original': True}):
             img['src'] = img['data-original'].replace('photo', 'thumb').replace('quality-100', 'quality-100,width-600,resizemode-4')
         return soup
diff --git a/recipes/theeconomictimes_india_print_edition.recipe b/recipes/theeconomictimes_india_print_edition.recipe
index 6895d870fd..34da739c6c 100644
--- a/recipes/theeconomictimes_india_print_edition.recipe
+++ b/recipes/theeconomictimes_india_print_edition.recipe
@@ -33,14 +33,14 @@ class TheEconomicTimes(BasicNewsRecipe):
         yr = str(date.today().year)
         mn = date.today().strftime('%m')
         dy = date.today().strftime('%d')
-        cover = 'https://asset.harnscloud.com/PublicationData/ET/etbg/'\
-         + yr + '/' + mn + '/' + dy + '/Page/' + dy + '_' + mn + '_' + yr + '_001_etbg.jpg'
+        cover = ('https://asset.harnscloud.com/PublicationData/ET/etbg/'
+                 + yr + '/' + mn + '/' + dy + '/Page/' + dy + '_' + mn + '_' + yr + '_001_etbg.jpg')
         self.log('cover_url ', cover)
         br = BasicNewsRecipe.get_browser(self)
         try:
             br.open(cover)
         except:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             cover = None
         return cover
 
@@ -81,7 +81,7 @@ class TheEconomicTimes(BasicNewsRecipe):
             secname = re.sub(r'[0-9]', '', sec)
             self.log(secname)
             articles = []
-            for h3 in section.findAll(("h1", "h3", "h4", "h5")):
+            for h3 in section.findAll(('h1', 'h3', 'h4', 'h5')):
                 span = h3.find(
                     'span',
                     href=lambda x: x and x.startswith('https://economictimes.indiatimes.com/epaper/'),
@@ -102,7 +102,7 @@ class TheEconomicTimes(BasicNewsRecipe):
 
     def preprocess_html(self, soup):
         for image in soup.findAll('img', attrs={'src': True}):
-            image['src'] = image['src'].replace("width-300", "width-640")
+            image['src'] = image['src'].replace('width-300', 'width-640')
         for img in soup.findAll('img', attrs={'data-original': True}):
             img['src'] = img['data-original']
         return soup
diff --git a/recipes/thenewcriterion.recipe b/recipes/thenewcriterion.recipe
index cb56af5181..732d1ecac7 100644
--- a/recipes/thenewcriterion.recipe
+++ b/recipes/thenewcriterion.recipe
@@ -45,9 +45,9 @@ class TheNewCriterion(BasicNewsRecipe):
     fetch_retries           = 10
     auto_cleanup         = True
     masthead_url         = 'https://www.newcriterion.com/themes/thenewcriterion/assets/img/horizontal-logo.svg'
-    extra_css            = """
+    extra_css            = '''
         body{font-family: Galliard, serif}
-    """
+    '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
@@ -112,6 +112,6 @@ class TheNewCriterion(BasicNewsRecipe):
                 self.temp_files.append(tfile)
                 result = tfile.name
             except:
-                print("Retrying download...")
+                print('Retrying download...')
             count += 1
         return result
diff --git a/recipes/theoldie.recipe b/recipes/theoldie.recipe
index 449064a5bf..3972f50472 100644
--- a/recipes/theoldie.recipe
+++ b/recipes/theoldie.recipe
@@ -43,7 +43,7 @@ class PrivateEyeRecipe(BasicNewsRecipe):
     name = 'Oldie Online'
     series = 'The ' + name
     now = datetime.now().strftime(' %Y-%m')
-    title = series + now
+    title = series + now  # noqa: PIE794
     title_sort = name + now + ', The'
     conversion_options = {
         'authors':      'The Oldie',
@@ -90,9 +90,9 @@ class PrivateEyeRecipe(BasicNewsRecipe):
 
     # oldie links/headings often contain the author (in one of various formats
     # 1. Title. By author
-    #.2. Title by author: subtitle
+    # 2. Title by author: subtitle
     # 3. Title: author: subtitle
-    title_author_re = re.compile('^(.*?)(?:(?: by )|(?:: ))(.*?): (.*?)$')
+    title_author_re = re.compile(r'^(.*?)(?:(?: by )|(?:: ))(.*?): (.*?)$')
 
     # Separate author from title (where it is specified)
     def title_author(self, head):
@@ -100,10 +100,10 @@ class PrivateEyeRecipe(BasicNewsRecipe):
             return head.rsplit('. By ', 1)
         matches = self.title_author_re.findall(head)
         if matches and len(matches[0]) == 3:
-            (title_1, author, title_2) = matches[0]
+            title_1, author, title_2 = matches[0]
             title = ': '.join((title_1, title_2))
-            return (title, author)
-        return (head, None)
+            return title, author
+        return head, None
 
     # Return the list of articles from blocks in the content of an index/listing page
     def parse_content(self, soup):
@@ -117,11 +117,11 @@ class PrivateEyeRecipe(BasicNewsRecipe):
         for article in content.findAll('div', class_='listing-block'):
             for a in article.findAll('a', href=True):
                 for h in a.findAll('h3'):
-                    (title, author) = self.title_author(h.getText())
+                    title, author = self.title_author(h.getText())
                     content_articles.append(self.article_entry(
-                        title = title,
-                        url = self.abs_url(a.get('href')),
-                        author = author,
+                        title=title,
+                        url=self.abs_url(a.get('href')),
+                        author=author,
                     ))
                     break
                 else:
@@ -155,11 +155,11 @@ class PrivateEyeRecipe(BasicNewsRecipe):
                 self.log('Subpages found:', href, len(content))
                 articles.extend(content)
             else:
-                (title, author) = self.title_author(a.getText())
+                title, author = self.title_author(a.getText())
                 articles.append(self.article_entry(
-                    title = title,
-                    url = self.abs_url(a.get('href')),
-                    author = author,
+                    title=title,
+                    url=self.abs_url(a.get('href')),
+                    author=author,
                 ))
 
         if not articles:
@@ -176,7 +176,7 @@ class PrivateEyeRecipe(BasicNewsRecipe):
 
         # 4. The about pages
         abouts = []
-        for (title, url) in self.about_pages.items():
+        for title, url in self.about_pages.items():
             abouts.append({
                 'title': title,
                 'url': url,
@@ -190,13 +190,12 @@ class PrivateEyeRecipe(BasicNewsRecipe):
 
     def preprocess_html(self, soup):
         for h in soup.findAll('h1'):
-            (title, author) = self.title_author(h.getText())
+            title, author = self.title_author(h.getText())
             self.log('Replacing h3 "', h.getText(), '" with "', title, '"')
             h.string = title
 
         return soup
 
-
     # Remove features not wanted and tweak HTML
     preprocess_regexps = [
         # Remove big blank spaces
@@ -213,37 +212,37 @@ class PrivateEyeRecipe(BasicNewsRecipe):
                 r'(?<=[^\.\s])\s*</p>\s*<p>',
                 re.DOTALL | re.IGNORECASE
             ),
-            lambda match: ' ' # space
+            lambda match: ' '  # space
         ),
     ]
 
     # We remove vast swathes of HTML which is not part of the articles.
-    remove_tags_before =  [
-        {'name': 'div', 'class': "container"},
-        {'name': 'div', 'class': "content-wrapper"},
-        {'name': 'div', 'class': "only-in-the-magazine"},
+    remove_tags_before = [
+        {'name': 'div', 'class': 'container'},
+        {'name': 'div', 'class': 'content-wrapper'},
+        {'name': 'div', 'class': 'only-in-the-magazine'},
     ]
     remove_tags_after = [
-        {'name': 'div', 'class': "container"},
-        {'name': 'div', 'class': "content-wrapper"},
-        {'name': 'h2', 'string': "Find out more about The Oldie"},
+        {'name': 'div', 'class': 'container'},
+        {'name': 'div', 'class': 'content-wrapper'},
+        {'name': 'h2', 'string': 'Find out more about The Oldie'},
     ]
     # Remove non-sibling content
     remove_tags = [
-        {'name': 'nav', 'class': "categories"},
-        {'name': 'div', 'class': "internal-placeholders"},
-        {'name': 'div', 'class': "leaderboard"},
-        {'name': 'div', 'class': "share"},
-        {'name': 'div', 'class': "most-popular"},
-        {'name': 'div', 'class': "article-convert"},
+        {'name': 'nav', 'class': 'categories'},
+        {'name': 'div', 'class': 'internal-placeholders'},
+        {'name': 'div', 'class': 'leaderboard'},
+        {'name': 'div', 'class': 'share'},
+        {'name': 'div', 'class': 'most-popular'},
+        {'name': 'div', 'class': 'article-convert'},
         # {'name': 'p', 'class': "article-convert"},
         # {'name': 'p', 'class': "meta"},
         {'name': 'hr'},
-        {'name': 'a', 'class': "view-full-screen"},
-        {'name': 'div', 'class': "image-counter"},
-        {'name': 'h2', 'string': "Find out more about The Oldie"},
-        {'name': 'a', 'href': re.compile(r"^https?:\/\/issuu.com\/")},
-        {'name': 'img', 'src': re.compile(r"\/assets\/images\/icons\/icon-")},
+        {'name': 'a', 'class': 'view-full-screen'},
+        {'name': 'div', 'class': 'image-counter'},
+        {'name': 'h2', 'string': 'Find out more about The Oldie'},
+        {'name': 'a', 'href': re.compile(r'^https?:\/\/issuu.com\/')},
+        {'name': 'img', 'src': re.compile(r'\/assets\/images\/icons\/icon-')},
     ]
 
     # The following extra css is to tweak the formatting of various elements of various article pages.
diff --git a/recipes/theonlinephotographer.recipe b/recipes/theonlinephotographer.recipe
index ed23c88ce2..f1bb80652e 100644
--- a/recipes/theonlinephotographer.recipe
+++ b/recipes/theonlinephotographer.recipe
@@ -11,7 +11,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class theonlinephotographer(BasicNewsRecipe):
     title = 'The Online Photographer'
     __author__ = 'Darko Miletic'
-    description = 'A photography news and information website in the form of a weblog with multiple authors who write on a variety of photography and art-photography related issues.'  # noqa
+    description = 'A photography news and information website in the form of a weblog with multiple authors who write on a variety of photography and art-photography related issues.'  # noqa: E501
     publisher = 'The Online Photographer'
     category = 'news, blog, photograph, international'
     oldest_article = 15
diff --git a/recipes/thestar.recipe b/recipes/thestar.recipe
index d50e0dac6a..743968e45c 100644
--- a/recipes/thestar.recipe
+++ b/recipes/thestar.recipe
@@ -18,7 +18,7 @@ def absolutize(url):
 class TheTorontoStar(BasicNewsRecipe):
     title = 'The Toronto Star'
     __author__ = 'Darko Miletic'
-    description = "Thestar.com is Canada's largest online news site. Stay current with our sports, business entertainment news and more from the Toronto Star and thestar.com"  # noqa
+    description = "Thestar.com is Canada's largest online news site. Stay current with our sports, business entertainment news and more from the Toronto Star and thestar.com"  # noqa: E501
     oldest_article = 2
     language = 'en_CA'
     max_articles_per_feed = 100
diff --git a/recipes/tijd.recipe b/recipes/tijd.recipe
index 4a0507343b..987d880b1c 100644
--- a/recipes/tijd.recipe
+++ b/recipes/tijd.recipe
@@ -76,12 +76,12 @@ class DeTijd(BasicNewsRecipe):
         soup.html['lang'] = self.lang
         soup.html['dir'] = self.direction
         mlang = new_tag(
-            soup, 'meta', [("http-equiv", "Content-Language"),
-                           ("content", self.lang)]
+            soup, 'meta', [('http-equiv', 'Content-Language'),
+                           ('content', self.lang)]
         )
         mcharset = new_tag(
-            soup, 'meta', [("http-equiv", "Content-Type"),
-                           ("content", "text/html; charset=utf-8")]
+            soup, 'meta', [('http-equiv', 'Content-Type'),
+                           ('content', 'text/html; charset=utf-8')]
         )
         soup.head.insert(0, mlang)
         soup.head.insert(1, mcharset)
diff --git a/recipes/times_online.recipe b/recipes/times_online.recipe
index 8f00a45f74..ce52947388 100644
--- a/recipes/times_online.recipe
+++ b/recipes/times_online.recipe
@@ -11,11 +11,13 @@ def resize(x):
     elif '?crop=' in x:
         return x + '&resize=600'
 
+
 def absurl(url):
     if url.startswith('/'):
         url = 'https://www.thetimes.com' + url
     return url
 
+
 class times(BasicNewsRecipe):
     title = 'The Times and Sunday Times'
     __author__ = 'unkn0wn'
@@ -63,7 +65,7 @@ class times(BasicNewsRecipe):
     ]
 
     remove_tags_after = [
-        dict(name = 'div', attrs={'id':'paywall-portal-article-footer'})
+        dict(name='div', attrs={'id':'paywall-portal-article-footer'})
     ]
 
     def preprocess_html(self, soup):
diff --git a/recipes/tls_mag.recipe b/recipes/tls_mag.recipe
index 6bb1ef8765..2be795327e 100644
--- a/recipes/tls_mag.recipe
+++ b/recipes/tls_mag.recipe
@@ -14,6 +14,7 @@ def re_html(y):
         return soup.text
     return ''
 
+
 def get_id(url):
     rq = browser().open(url)
     return re.search(r'\?p=(\S+)>', str(rq.info())).group(1)
@@ -91,7 +92,7 @@ class TLS(BasicNewsRecipe):
         if x['byline']['text']:
             desc = 'By ' + re_html(x['byline']['text']) + ' | ' + desc
         self.log('              ', title, '\n\t', desc, '\n\t', url)
-        return ({ 'title': title, 'description': desc, 'url': url })
+        return ({'title': title, 'description': desc, 'url': url})
 
     def preprocess_html(self, soup):
         for img in soup.findAll('img', attrs={'src':True}):
@@ -120,7 +121,7 @@ class TLS(BasicNewsRecipe):
             if prim['byline']['text']:
                 auth = '<p class="auth"><a href="{}">'.format(prim['byline']['link']) + prim['byline']['text'] + '</a></p>\n'
 
-            if 'bookdetails' in prim and prim['bookdetails']:
+            if prim.get('bookdetails'):
                 bks += '<br>'
                 for a in prim['bookdetails']:
                     for x, y in a.items():
@@ -135,16 +136,16 @@ class TLS(BasicNewsRecipe):
 
         if 'article_data_leadimage' in data:
             i = data['article_data_leadimage']
-            if 'full_image' in i and i['full_image']:
+            if i.get('full_image'):
                 lede = '<br><img src="{}"><div class="figc">{}</div>'.format(
-                    i['full_image'] + '?w600', i['imagecaption'] + ' <i>' \
-                        + i['imagecredit'] + '</i>'
+                    i['full_image'] + '?w600',
+                    i['imagecaption'] + ' <i>' + i['imagecredit'] + '</i>'
                 )
         cont = self.index_to_soup('https://www.the-tls.co.uk/wp-json/wp/v2/tls_articles/' + data['ID'], raw=True)
         c_data = json.loads(cont)
         body = c_data['content']['rendered']
 
-        html = '<html><body><div>' \
-                    + label + title + desc + auth + lede + bks + body + \
-                        '</div></body></html>'
+        html = ('<html><body><div>'
+                + label + title + desc + auth + lede + bks + body +
+                '</div></body></html>')
         return BeautifulSoup(html).prettify()
diff --git a/recipes/tmz.recipe b/recipes/tmz.recipe
index c78264be2f..d217f7729c 100644
--- a/recipes/tmz.recipe
+++ b/recipes/tmz.recipe
@@ -30,21 +30,21 @@ class AdvancedUserRecipe1282101454(BasicNewsRecipe):
         ('TOP 20', 'http://www.tmz.com/rss.xml'),
         ('Exclusives', 'http://www.tmz.com/category/exclusives/rss.xml'),
         ('Celeb Justice', 'http://www.tmz.com/category/celebrity-justice/rss.xml'),
-        ('Celeb Feuds',  'http://www.tmz.com/category/celebrity-feuds/rss.xml'),
-        ('Politix',  'http://www.tmz.com/category/politix/rss.xml'),
-        ('Music',  'http://www.tmz.com/category/music/rss.xml'),
-        ('Movies',  'http://www.tmz.com/category/movies/rss.xml'),
-        ('TV',  'http://www.tmz.com/category/tv/rss.xml'),
-        ('Sports',  'http://www.tmz.com/category/TMZsports/rss.xml'),
-        ('Hook-Ups',  'http://www.tmz.com/category/hook-ups/rss.xml'),
-        ('Beauty',  'http://www.tmz.com/category/beauty/rss.xml'),
-        ('Fashion',  'http://www.tmz.com/category/fashion/rss.xml'),
-        ('Gossip & Rumor',  'http://www.tmz.com/category/gossip-rumors/rss.xml'),
-        ('Hot Mama',   'http://www.tmz.com/category/hot-mamas/rss.xml'),
-        ('Party All The Time',   'http://www.tmz.com/category/party-all-the-time/rss.xml'),
-        ('Ride Me!',   'http://www.tmz.com/category/ride-me/rss.xml'),
-        ('Stars in Heat',  'http://www.tmz.com/category/stars-in-heat/rss.xml'),
-        ('Vegas',   'http://www.tmz.com/category/hot-vegas/rss.xml')
+        ('Celeb Feuds', 'http://www.tmz.com/category/celebrity-feuds/rss.xml'),
+        ('Politix', 'http://www.tmz.com/category/politix/rss.xml'),
+        ('Music', 'http://www.tmz.com/category/music/rss.xml'),
+        ('Movies', 'http://www.tmz.com/category/movies/rss.xml'),
+        ('TV', 'http://www.tmz.com/category/tv/rss.xml'),
+        ('Sports', 'http://www.tmz.com/category/TMZsports/rss.xml'),
+        ('Hook-Ups', 'http://www.tmz.com/category/hook-ups/rss.xml'),
+        ('Beauty', 'http://www.tmz.com/category/beauty/rss.xml'),
+        ('Fashion', 'http://www.tmz.com/category/fashion/rss.xml'),
+        ('Gossip & Rumor', 'http://www.tmz.com/category/gossip-rumors/rss.xml'),
+        ('Hot Mama', 'http://www.tmz.com/category/hot-mamas/rss.xml'),
+        ('Party All The Time', 'http://www.tmz.com/category/party-all-the-time/rss.xml'),
+        ('Ride Me!', 'http://www.tmz.com/category/ride-me/rss.xml'),
+        ('Stars in Heat', 'http://www.tmz.com/category/stars-in-heat/rss.xml'),
+        ('Vegas', 'http://www.tmz.com/category/hot-vegas/rss.xml')
     ]
 
     def print_version(self, url):
diff --git a/recipes/toi.recipe b/recipes/toi.recipe
index ebe7c52712..31505f7eb2 100644
--- a/recipes/toi.recipe
+++ b/recipes/toi.recipe
@@ -29,7 +29,7 @@ class TheEconomicTimes(BasicNewsRecipe):
     language = 'en_IN'
     publication_type = 'newspaper'
     masthead_url = 'http://timesofindia.indiatimes.com/photo.cms?msid=2419189'
-    extra_css              = """
+    extra_css              = '''
                                  body{font-family: Arial,Helvetica,sans-serif}
                                  .foto_mg{font-size: 60%;
                                           font-weight: 700;}
@@ -37,7 +37,7 @@ class TheEconomicTimes(BasicNewsRecipe):
                                  artdate{font-size: 60%}
                                  artag{font-size: 60%}
                                  div.storycontent{padding-top: 10px}
-                             """
+                             '''
     conversion_options = {'comment': description,
                           'tags': category,
                           'publisher': publisher,
@@ -73,7 +73,7 @@ class TheEconomicTimes(BasicNewsRecipe):
             return citem['content']
 
     def get_article_url(self, article):
-        rurl = article.get('guid',  None)
+        rurl = article.get('guid', None)
         if '/articleshow/' in rurl:
             return rurl
 
diff --git a/recipes/toiprint.recipe b/recipes/toiprint.recipe
index 3bc662766d..0a76422ede 100644
--- a/recipes/toiprint.recipe
+++ b/recipes/toiprint.recipe
@@ -9,7 +9,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 # Chennai - 'toich'; Chandigarh - 'toicgct'; Jaipur - 'toijc'; Kolkata - 'toikc';
 # There are others too, try to figure it out, visit toi epaper link.
 
-le = 'cap' # local edition;
+le = 'cap'  # local edition;
 
 date0 = date.today().strftime('%Y/%m/%d')
 
@@ -23,6 +23,7 @@ date_ = dt.strftime('%d_%m_%Y')
 index = 'https://asset.harnscloud.com/PublicationData/TOI/' + le + '/' + date0
 img_index = 'https://cmsimages.timesgroup.com/image-resizer?epaper_s3_path=PublicationData/TOI/' + le + '/' + date0
 
+
 def handle_images(x, soup):
     img = soup.find('img')
     if img:
@@ -36,6 +37,7 @@ def handle_images(x, soup):
     for lead in reversed(soup.findAll('div', attrs={'class':'lead'})):
         x.insert_after(lead)
 
+
 class toiprint(BasicNewsRecipe):
     title = 'TOI Print Edition'
     language = 'en_IN'
@@ -61,8 +63,8 @@ class toiprint(BasicNewsRecipe):
     '''
 
     def get_cover_url(self):
-        cover = 'https://asset.harnscloud.com/PublicationData/TOI/' + le + '/' \
-            + date0 + '/Page/' + date_ + '_001_' + le + '.jpg'
+        cover = ('https://asset.harnscloud.com/PublicationData/TOI/'
+                 + le + '/' + date0 + '/Page/' + date_ + '_001_' + le + '.jpg')
         self.log('cover_url ', cover)
         return cover
 
@@ -97,7 +99,7 @@ class toiprint(BasicNewsRecipe):
                     else:
                         desc = 'Page No.' + url.split('_')[-3] + ' | ' + art.get('ColumnTitle', '')
                     self.log('\t', title, '\n\t', desc.replace('\n', ''))
-                    feeds_dict[section].append({"title": title, "url": url, "description": desc})
+                    feeds_dict[section].append({'title': title, 'url': url, 'description': desc})
         def sort_key(x):
             section = x[0]
             try:
@@ -133,17 +135,18 @@ class toiprint(BasicNewsRecipe):
                 body += '<p class="auth"><i>' + x['ZoneText'] + '</i></p>'
             elif x['TagName'] == 'Photographs':
                 pag = x['ZoneID'].split('_')[-4]
-                body += '<div><img src="{}"></div>'.format(img_index + '/Photographs/' + pag + '/' \
-                     + x['ZoneID'] + '.jpg&bucket=andre-toi-out&q=50')
+                body += '<div><img src="{}"></div>'.format(
+                    '/'.join([img_index, 'Photographs', pag, x['ZoneID']]) + '.jpg&bucket=andre-toi-out&q=50'
+                )
             elif x['TagName'] == 'ImageCaption':
                 body += '<div class="cap">' + x['ZoneText'] + '</div><p>'
             elif x['TagName'] == 'Lead':
                 body += '<div class="lead"><p><i>' + x['ZoneText'] + '</i></p></div><p>'
             elif 'ZoneText' in x:
                 body += '<p><i>' + x['ZoneText'] + '</i></p>'
-        return '<html><body><div>' \
-                    + body.replace('<br>', '<p>').replace('<br/>', '<p>').replace('&lt;br&gt;', '<p>').replace('\n', '<br>') \
-                        + '</div></body></html>'
+        return ('<html><body><div>'
+                + body.replace('<br>', '<p>').replace('<br/>', '<p>').replace('&lt;br&gt;', '<p>').replace('\n', '<br>') +
+                '</div></body></html>')
 
     def preprocess_html(self, soup):
         h1 = soup.find('h1')
diff --git a/recipes/top_speed.recipe b/recipes/top_speed.recipe
index eecc208219..a31a257763 100644
--- a/recipes/top_speed.recipe
+++ b/recipes/top_speed.recipe
@@ -22,10 +22,10 @@ class AdvancedUserRecipe1718128185(BasicNewsRecipe):
     auto_cleanup   = True
 
     feeds          = [
-        #News feeds
+        # News feeds
         ('Car News', 'https://www.topspeed.com/feed/category/car-news/'),
         ('Motorcycle News', 'https://www.topspeed.com/feed/category/motorcycle-news/'),
-        #Guides & Reviews feeds
+        # Guides & Reviews feeds
         ('Car Reviews', 'https://www.topspeed.com/feed/category/car-reviews/'),
         ('Vehicle Comparisons', 'https://www.topspeed.com/feed/category/vehicle-comparisons/'),
         ('Car Guides', 'https://www.topspeed.com/feed/category/car-guides/'),
diff --git a/recipes/tst.recipe b/recipes/tst.recipe
index 017ca0eed7..a1ca3f9078 100644
--- a/recipes/tst.recipe
+++ b/recipes/tst.recipe
@@ -5,10 +5,10 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class Teplitsa(BasicNewsRecipe):
-    title = '\u0422\u0435\u043F\u043B\u0438\u0446\u0430 \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0445 \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u0439'  # noqa
+    title = '\u0422\u0435\u043F\u043B\u0438\u0446\u0430 \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0445 \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u0439'  # noqa: E501
     __author__ = 'bugmen00t'
-    description = '\u0422\u0435\u043F\u043B\u0438\u0446\u0430 \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0445 \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u0439 \u2014 \u043D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u044B\u0439 \u043F\u0440\u043E\u0441\u0432\u0435\u0442\u0438\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0439 \u0438 \u0440\u0430\u0437\u0432\u0438\u0432\u0430\u044E\u0449\u0438\u0439 \u043F\u0440\u043E\u0435\u043A\u0442, \u043C\u0438\u0441\u0441\u0438\u044F \u043A\u043E\u0442\u043E\u0440\u043E\u0433\u043E \u2014 \u0443\u0441\u0438\u043B\u0438\u0442\u044C \u0440\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u043E\u0435 \u0433\u0440\u0430\u0436\u0434\u0430\u043D\u0441\u043A\u043E\u0435 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u043E \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u0445 \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u0439.'  # noqa
-    publisher = '\u0410\u041D\u041E \u00AB\u0410\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u043E\u0439 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u0438\u00BB'  # noqa
+    description = '\u0422\u0435\u043F\u043B\u0438\u0446\u0430 \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0445 \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u0439 \u2014 \u043D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u044B\u0439 \u043F\u0440\u043E\u0441\u0432\u0435\u0442\u0438\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0439 \u0438 \u0440\u0430\u0437\u0432\u0438\u0432\u0430\u044E\u0449\u0438\u0439 \u043F\u0440\u043E\u0435\u043A\u0442, \u043C\u0438\u0441\u0441\u0438\u044F \u043A\u043E\u0442\u043E\u0440\u043E\u0433\u043E \u2014 \u0443\u0441\u0438\u043B\u0438\u0442\u044C \u0440\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u043E\u0435 \u0433\u0440\u0430\u0436\u0434\u0430\u043D\u0441\u043A\u043E\u0435 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u043E \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u0445 \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u0439.'  # noqa: E501
+    publisher = '\u0410\u041D\u041E \u00AB\u0410\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u043E\u0439 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u0438\u00BB'  # noqa: E501
     category = 'blog'
     cover_url = u'https://te-st.ru/wp-content/uploads/2014/05/logo_test.png'
     language = 'ru'
@@ -235,11 +235,11 @@ class Teplitsa(BasicNewsRecipe):
             'https://te-st.ru/tag/video/feed'
         ),
         (
-            '\u0421\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u043E-\u043E\u0440\u0438\u0435\u043D\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0434\u0438\u0437\u0430\u0439\u043D',  # noqa
+            '\u0421\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u043E-\u043E\u0440\u0438\u0435\u043D\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0434\u0438\u0437\u0430\u0439\u043D',  # noqa: E501
             'https://te-st.ru/tag/responsible-design/feed'
         ),
         (
-            '\u0421\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u043E\u0435 \u043F\u0440\u0435\u0434\u043F\u0440\u0438\u043D\u0438\u043C\u0430\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u043E',  # noqa
+            '\u0421\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u043E\u0435 \u043F\u0440\u0435\u0434\u043F\u0440\u0438\u043D\u0438\u043C\u0430\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u043E',  # noqa: E501
             'https://te-st.ru/tag/social-entrepreneurship/feed'
         ),
         (
diff --git a/recipes/tulsaworld.recipe b/recipes/tulsaworld.recipe
index 5a8f81266b..8d1f678739 100644
--- a/recipes/tulsaworld.recipe
+++ b/recipes/tulsaworld.recipe
@@ -13,7 +13,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class TulsaWorld(BasicNewsRecipe):
     title = 'Tulsa World'
     __author__ = 'Darko Miletic'
-    description = 'Find breaking news, local news, Oklahoma weather, sports, business, entertainment, lifestyle, opinion, government, movies, books, jobs, education, blogs, video & multimedia.'  # noqa
+    description = 'Find breaking news, local news, Oklahoma weather, sports, business, entertainment, lifestyle, opinion, government, movies, books, jobs, education, blogs, video & multimedia.'  # noqa: E501
     publisher = 'World Publishing Co.'
     oldest_article = 2
     max_articles_per_feed = 200
@@ -24,8 +24,8 @@ class TulsaWorld(BasicNewsRecipe):
     country = 'US'
     auto_cleanup=True
     remove_empty_feeds = True
-    masthead_url = 'https://bloximages.newyork1.vip.townnews.com/tulsaworld.com/content/tncms/custom/image/cfd1ce2e-7ec7-11e7-b919-8754a2b60fa6.png?_dc=1502478231'  # noqa
-    extra_css = ' body{font-family: Arial,Verdana,sans-serif } img{margin-bottom: 0.4em} .articleHeadline{font-size: xx-large; font-weight: bold} .articleKicker{font-size: x-large; font-weight: bold} .articleByline,.articleDate{font-size: small} .leadp{font-size: 1.1em} '  # noqa
+    masthead_url = 'https://bloximages.newyork1.vip.townnews.com/tulsaworld.com/content/tncms/custom/image/cfd1ce2e-7ec7-11e7-b919-8754a2b60fa6.png?_dc=1502478231'  # noqa: E501
+    extra_css = ' body{font-family: Arial,Verdana,sans-serif } img{margin-bottom: 0.4em} .articleHeadline{font-size: xx-large; font-weight: bold} .articleKicker{font-size: x-large; font-weight: bold} .articleByline,.articleDate{font-size: small} .leadp{font-size: 1.1em} '  # noqa: E501
 
     conversion_options = {
         'comment': description, 'publisher': publisher, 'language': language
diff --git a/recipes/tweakers_net.recipe b/recipes/tweakers_net.recipe
index 13a78898b7..40ea3773e7 100644
--- a/recipes/tweakers_net.recipe
+++ b/recipes/tweakers_net.recipe
@@ -38,7 +38,7 @@ class Tweakers(BasicNewsRecipe):
             'class': ['sidebar', 'advertorial']
         },
         {
-            'class': re.compile('nextPrevious')
+            'class': re.compile(r'nextPrevious')
         },
     ]
     no_stylesheets = True
diff --git a/recipes/tyzden.recipe b/recipes/tyzden.recipe
index 838ddf6965..a2623db7dc 100644
--- a/recipes/tyzden.recipe
+++ b/recipes/tyzden.recipe
@@ -50,7 +50,7 @@ class Tyzden(BasicNewsRecipe):
             'attrs': {
                 'class': re.compile(r'\barticle\b')}}, ]
 
-    extra_css = """.theme-highlight {
+    extra_css = '''.theme-highlight {
         color: #999;
         text-decoration: none;
     }
@@ -90,7 +90,7 @@ class Tyzden(BasicNewsRecipe):
     .teaser__title .highlight {
         color: #000;
     }
-    """
+    '''
 
     def get_browser(self):
         br = BasicNewsRecipe.get_browser(self)
diff --git a/recipes/ua_fooball.recipe b/recipes/ua_fooball.recipe
index 34a1c26ac8..3de987dc1e 100644
--- a/recipes/ua_fooball.recipe
+++ b/recipes/ua_fooball.recipe
@@ -6,14 +6,14 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class UAFootball(BasicNewsRecipe):
 
-#Russian version
-#    title = 'UA-\u0424\u0443\u0442\u0431\u043E\u043B'
-#    language = 'ru_UK'
-#    feeds = [
-#        ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u0444\u0443\u0442\u0431\u043E\u043B\u0430', 'https://www.ua-football.com/rss/all.xml')
-#        ]
+    # Russian version
+    # title = 'UA-\u0424\u0443\u0442\u0431\u043E\u043B'
+    # language = 'ru_UK'
+    # feeds = [
+    #     ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u0444\u0443\u0442\u0431\u043E\u043B\u0430', 'https://www.ua-football.com/rss/all.xml')
+    # ]
 
-#Ukrainian version
+    # Ukrainian version
     title = 'UA-\u0424\u0443\u0442\u0431\u043E\u043B'
     description = ('\u0410\u043A\u0442\u0443\u0430\u043B\u044C\u043D\u0456 \u0442\u0435\u043C\u0438'
                    ' \u0444\u0443\u0442\u0431\u043E\u043B\u044C\u043D\u043E\u0433\u043E'
@@ -22,7 +22,7 @@ class UAFootball(BasicNewsRecipe):
     language = 'uk'
     feeds = [
         ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://www.ua-football.com/ua/rss/all.xml')
-        ]
+    ]
 
     __author__ = 'bugmen00t'
     publisher = '1766 TEAM EOOD'
@@ -39,15 +39,15 @@ class UAFootball(BasicNewsRecipe):
 
     remove_tags_after = dict(name='div', attrs={'class': 'show-post'})
 
-    remove_tags =   [
-         dict(name='form'),
-         dict(name='iframe'),
-         dict(name='div', attrs={'class': 'language'}),
-         dict(name='div', attrs={'class': 'article__read-also'}),
-         dict(name='div', attrs={'class': 'card-player'}),
-         dict(name='div', attrs={'class': 'show-post-socials'})
-         ]
+    remove_tags = [
+        dict(name='form'),
+        dict(name='iframe'),
+        dict(name='div', attrs={'class': 'language'}),
+        dict(name='div', attrs={'class': 'article__read-also'}),
+        dict(name='div', attrs={'class': 'card-player'}),
+        dict(name='div', attrs={'class': 'show-post-socials'})
+    ]
 
-# Replacing articles in Ukraininan for RU-feed
-#    def print_version(self, url):
-#        return url.replace('ua-football.com/ua/', 'ua-football.com/')
+    # Replacing articles in Ukraininan for RU-feed
+    # def print_version(self, url):
+    #     return url.replace('ua-football.com/ua/', 'ua-football.com/')
diff --git a/recipes/ugeskriftet.recipe b/recipes/ugeskriftet.recipe
index d91e5bf0c6..6a58804098 100644
--- a/recipes/ugeskriftet.recipe
+++ b/recipes/ugeskriftet.recipe
@@ -23,13 +23,13 @@ class Ugeskriftet(BasicNewsRecipe):
         ]})
         ]
     remove_tags = [dict(name='img')]
-    extra_css = """
+    extra_css = '''
         h1{font-weight: bold; font-size: large;}
         b{font-weight: bold; font-size: medium;}
         h2{font-weight: bold; font-size: large;}
         h3{font-weight: bold; font-size: large;}
         h4{font-weight: bold; font-size: large;}
-    """
+    '''
 
     feeds          = [
         ('Ugeskriftet for læger', 'https://ugeskriftet.dk/rss/forside'),
diff --git a/recipes/ukrinform_de.recipe b/recipes/ukrinform_de.recipe
index 2a63be9eb9..c19ac8f3c1 100644
--- a/recipes/ukrinform_de.recipe
+++ b/recipes/ukrinform_de.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class UkrInform(BasicNewsRecipe):
     title = 'UkrInform (Deutsch)'
     __author__ = 'bugmen00t'
-    description = 'Nationale Nachrichtenagentur der Ukraine, eine Informationsquelle \u00FCber das politische, wirtschaftliche, soziale, wissenschaftliche, kulturelle und \u00F6ffentliche Leben in der Ukraine und der Welt.'  # noqa
+    description = 'Nationale Nachrichtenagentur der Ukraine, eine Informationsquelle \u00FCber das politische, wirtschaftliche, soziale, wissenschaftliche, kulturelle und \u00F6ffentliche Leben in der Ukraine und der Welt.'  # noqa: E501
     publisher = 'Ministerium f\u00FCr Kultur und Informationspolitik der Ukraine'
     category = 'newspaper'
     cover_url = u'https://static.ukrinform.com/photos/2022_05/thumb_files/630_360_1651819943-560.jpg'
diff --git a/recipes/ukrinform_es.recipe b/recipes/ukrinform_es.recipe
index ddaf9b686e..d73c2650d3 100644
--- a/recipes/ukrinform_es.recipe
+++ b/recipes/ukrinform_es.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class UkrInform(BasicNewsRecipe):
     title                 = 'UkrInform (Espa\u00F1ol)'
     __author__            = 'bugmen00t'
-    description           = 'Agencia de noticias nacional de Ucrania, fuente de informaci\u00F3n sobre la vida pol\u00EDtica, econ\u00F3mica, social, cient\u00EDfica, cultural y p\u00FAblica en Ucrania y en el extranjero.'  # noqa
+    description           = 'Agencia de noticias nacional de Ucrania, fuente de informaci\u00F3n sobre la vida pol\u00EDtica, econ\u00F3mica, social, cient\u00EDfica, cultural y p\u00FAblica en Ucrania y en el extranjero.'  # noqa: E501
     publisher             = 'Ministerio de Cultura y Pol\u00EDtica de Informaci\u00F3n de Ucrania'
     category              = 'newspaper'
     cover_url = u'https://static.ukrinform.com/photos/2022_05/thumb_files/630_360_1651819943-560.jpg'
@@ -22,7 +22,7 @@ class UkrInform(BasicNewsRecipe):
 
     remove_tags_after = dict(name='article')
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='aside'),
         dict(name='img', attrs={'class': 'pixel'}),
         dict(name='section', attrs={'class': 'read'}),
diff --git a/recipes/ukrinform_fr.recipe b/recipes/ukrinform_fr.recipe
index cfa22a8e02..3814561365 100644
--- a/recipes/ukrinform_fr.recipe
+++ b/recipes/ukrinform_fr.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class UkrInform(BasicNewsRecipe):
     title = 'UkrInform (Fran\u00E7ais)'
     __author__ = 'bugmen00t'
-    description = 'Agence de presse nationale de l\u0027Ukraine. C\u2019est une source d\u0027informations sur la vie politique, \u00E9conomique, scientifique, culturelle et sociale en Ukraine et \u00E0 l\u0027\u00E9tranger.'  # noqa
+    description = 'Agence de presse nationale de l\u0027Ukraine. C\u2019est une source d\u0027informations sur la vie politique, \u00E9conomique, scientifique, culturelle et sociale en Ukraine et \u00E0 l\u0027\u00E9tranger.'  # noqa: E501
     publisher = 'Minist\u00E8re de la culture et de la politique d\u0027information de l\u0027Ukraine'
     category = 'newspaper'
     cover_url = u'https://static.ukrinform.com/photos/2022_05/thumb_files/630_360_1651819943-560.jpg'
diff --git a/recipes/ukrinform_ja.recipe b/recipes/ukrinform_ja.recipe
index 62472839bf..5318b746de 100644
--- a/recipes/ukrinform_ja.recipe
+++ b/recipes/ukrinform_ja.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class UkrInform(BasicNewsRecipe):
     title = '\u30A6\u30AF\u30EB\u30A4\u30F3\u30D5\u30A9\u30EB\u30E0\uFF08UkrInform\uFF09'
     __author__ = 'bugmen00t'
-    description = '\u30A6\u30AF\u30E9\u30A4\u30CA\u3067\u552F\u4E00\u306E\u56FD\u55B6\u901A\u4FE1\u793E\u3067\u3059\u3001\u56FD\u5185\u6700\u5927\u306E\u5730\u65B9\u652F\u90E8\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3068\u8907\u6570\u306E\u5916\u56FD\u652F\u5C40\u3092\u6709\u3057\u3066\u3044\u307E\u3059\u3002'  # noqa
+    description = '\u30A6\u30AF\u30E9\u30A4\u30CA\u3067\u552F\u4E00\u306E\u56FD\u55B6\u901A\u4FE1\u793E\u3067\u3059\u3001\u56FD\u5185\u6700\u5927\u306E\u5730\u65B9\u652F\u90E8\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3068\u8907\u6570\u306E\u5916\u56FD\u652F\u5C40\u3092\u6709\u3057\u3066\u3044\u307E\u3059\u3002'  # noqa: E501
     publisher = '\u30A6\u30AF\u30E9\u30A4\u30CA\u6587\u5316\u30FB\u60C5\u5831\u653F\u7B56\u7701'
     category = 'newspaper'
     cover_url = u'https://static.ukrinform.com/photos/2022_05/thumb_files/630_360_1651819943-560.jpg'
diff --git a/recipes/ukrinform_pl.recipe b/recipes/ukrinform_pl.recipe
index c46a4d22d8..4a57e678bb 100644
--- a/recipes/ukrinform_pl.recipe
+++ b/recipes/ukrinform_pl.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class UkrInform(BasicNewsRecipe):
     title = 'UkrInform (polska)'
     __author__ = 'bugmen00t'
-    description = 'Krajowa agencja informacyjna Ukrainy, \u017Ar\u00F3d\u0142o informacji o \u017Cyciu politycznym, gospodarczym, spo\u0142ecznym, naukowym, kulturalnym i spo\u0142ecznym na Ukrainie i za granic\u0105.'  # noqa
+    description = 'Krajowa agencja informacyjna Ukrainy, \u017Ar\u00F3d\u0142o informacji o \u017Cyciu politycznym, gospodarczym, spo\u0142ecznym, naukowym, kulturalnym i spo\u0142ecznym na Ukrainie i za granic\u0105.'  # noqa: E501
     publisher = 'Ministerstwo Kultury i Polityki Informacyjnej Ukrainy'
     category = 'newspaper'
     cover_url = u'https://static.ukrinform.com/photos/2022_05/thumb_files/630_360_1651819943-560.jpg'
diff --git a/recipes/ukrinform_ru.recipe b/recipes/ukrinform_ru.recipe
index 53ccfe4747..801c20aaf0 100644
--- a/recipes/ukrinform_ru.recipe
+++ b/recipes/ukrinform_ru.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class UkrInform(BasicNewsRecipe):
     title = '\u0423\u043A\u0440\u0438\u043D\u0444\u043E\u0440\u043C'
     __author__ = 'bugmen00t'
-    description = '\u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u043E\u0435 \u0433\u043E\u0441\u0443\u0434\u0430\u0440\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u0435 \u043D\u0430\u0446\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u043E\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E, \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u0438 \u043E \u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0439, \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u0447\u0435\u0441\u043A\u043E\u0439, \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u043E\u0439, \u043D\u0430\u0443\u0447\u043D\u043E\u0439, \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u043D\u043E\u0439, \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u0439 \u0436\u0438\u0437\u043D\u0438 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435 \u0438 \u0437\u0430 \u0440\u0443\u0431\u0435\u0436\u043E\u043C.'  # noqa
-    publisher = '\u041C\u0438\u043D\u0438\u0441\u0442\u0435\u0440\u0441\u0442\u0432\u043E \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0439 \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0438 \u0423\u043A\u0440\u0430\u0438\u043D\u044B'  # noqa
+    description = '\u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u043E\u0435 \u0433\u043E\u0441\u0443\u0434\u0430\u0440\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u0435 \u043D\u0430\u0446\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u043E\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E, \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u0438 \u043E \u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0439, \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u0447\u0435\u0441\u043A\u043E\u0439, \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u043E\u0439, \u043D\u0430\u0443\u0447\u043D\u043E\u0439, \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u043D\u043E\u0439, \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u0439 \u0436\u0438\u0437\u043D\u0438 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435 \u0438 \u0437\u0430 \u0440\u0443\u0431\u0435\u0436\u043E\u043C.'  # noqa: E501
+    publisher = '\u041C\u0438\u043D\u0438\u0441\u0442\u0435\u0440\u0441\u0442\u0432\u043E \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0439 \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0438 \u0423\u043A\u0440\u0430\u0438\u043D\u044B'  # noqa: E501
     category = 'newspaper'
     cover_url = u'https://www.ukrinform.ru/img/logo_rus.svg'
     language = 'ru_UK'
diff --git a/recipes/ukrinform_uk.recipe b/recipes/ukrinform_uk.recipe
index 08e1deb693..9322a23bd0 100644
--- a/recipes/ukrinform_uk.recipe
+++ b/recipes/ukrinform_uk.recipe
@@ -7,8 +7,8 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class UkrInform(BasicNewsRecipe):
     title = '\u0423\u043A\u0440\u0456\u043D\u0444\u043E\u0440\u043C'
     __author__ = 'bugmen00t'
-    description = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0435 \u0434\u0435\u0440\u0436\u0430\u0432\u043D\u0435 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E, \u0434\u0436\u0435\u0440\u0435\u043B\u043E \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0457 \u043F\u0440\u043E \u043F\u043E\u043B\u0456\u0442\u0438\u0447\u043D\u0435, \u0435\u043A\u043E\u043D\u043E\u043C\u0456\u0447\u043D\u0435, \u0441\u043E\u0446\u0456\u0430\u043B\u044C\u043D\u0435, \u043D\u0430\u0443\u043A\u043E\u0432\u0435, \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u043D\u0435, \u0441\u0443\u0441\u043F\u0456\u043B\u044C\u043D\u0435 \u0436\u0438\u0442\u0442\u044F \u0432 \u0423\u043A\u0440\u0430\u0457\u043D\u0456 \u0442\u0430 \u0437\u0430 \u043A\u043E\u0440\u0434\u043E\u043D\u043E\u043C.'  # noqa
-    publisher = '\u041C\u0456\u043D\u0456\u0441\u0442\u0435\u0440\u0441\u0442\u0432\u043E \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u0438 \u0442\u0430 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u043E\u0457 \u043F\u043E\u043B\u0456\u0442\u0438\u043A\u0438 \u0423\u043A\u0440\u0430\u0457\u043D\u0438'  # noqa
+    description = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0435 \u0434\u0435\u0440\u0436\u0430\u0432\u043D\u0435 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E, \u0434\u0436\u0435\u0440\u0435\u043B\u043E \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0457 \u043F\u0440\u043E \u043F\u043E\u043B\u0456\u0442\u0438\u0447\u043D\u0435, \u0435\u043A\u043E\u043D\u043E\u043C\u0456\u0447\u043D\u0435, \u0441\u043E\u0446\u0456\u0430\u043B\u044C\u043D\u0435, \u043D\u0430\u0443\u043A\u043E\u0432\u0435, \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u043D\u0435, \u0441\u0443\u0441\u043F\u0456\u043B\u044C\u043D\u0435 \u0436\u0438\u0442\u0442\u044F \u0432 \u0423\u043A\u0440\u0430\u0457\u043D\u0456 \u0442\u0430 \u0437\u0430 \u043A\u043E\u0440\u0434\u043E\u043D\u043E\u043C.'  # noqa: E501
+    publisher = '\u041C\u0456\u043D\u0456\u0441\u0442\u0435\u0440\u0441\u0442\u0432\u043E \u043A\u0443\u043B\u044C\u0442\u0443\u0440\u0438 \u0442\u0430 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u043E\u0457 \u043F\u043E\u043B\u0456\u0442\u0438\u043A\u0438 \u0423\u043A\u0440\u0430\u0457\u043D\u0438'  # noqa: E501
     category = 'newspaper'
     cover_url = u'https://upload.wikimedia.org/wikipedia/commons/thumb/c/ca/Logo_ukr_%281%29.svg/2560px-Logo_ukr_%281%29.svg.png'
     language = 'uk'
diff --git a/recipes/uncrate.recipe b/recipes/uncrate.recipe
index 2ad0fb6f47..549d5f6af3 100644
--- a/recipes/uncrate.recipe
+++ b/recipes/uncrate.recipe
@@ -20,7 +20,7 @@ def new_tag(soup, name, attrs=()):
 class Uncrate(BasicNewsRecipe):
     title = 'Uncrate'
     __author__ = 'Darko Miletic'
-    description = 'Uncrate is a web magazine for guys who love stuff. Our team digs up the best gadgets, clothes, cars, DVDs and more. New items are posted daily. Enjoy responsively.'  # noqa
+    description = 'Uncrate is a web magazine for guys who love stuff. Our team digs up the best gadgets, clothes, cars, DVDs and more. New items are posted daily. Enjoy responsively.'  # noqa: E501
     oldest_article = 7
     max_articles_per_feed = 100
     no_stylesheets = True
@@ -55,9 +55,9 @@ class Uncrate(BasicNewsRecipe):
 
     def preprocess_html(self, soup):
         mlang = new_tag(soup, 'meta', [
-                    ("http-equiv", "Content-Language"), ("content", self.lang)])
+                    ('http-equiv', 'Content-Language'), ('content', self.lang)])
         mcharset = new_tag(soup, 'meta', [
-                       ("http-equiv", "Content-Type"), ("content", "text/html; charset=utf-8")])
+                       ('http-equiv', 'Content-Type'), ('content', 'text/html; charset=utf-8')])
         soup.head.insert(0, mlang)
         soup.head.insert(1, mcharset)
         for item in soup.findAll(style=True):
diff --git a/recipes/unian_net.recipe b/recipes/unian_net.recipe
index ac8c6ddb24..75964e81c0 100644
--- a/recipes/unian_net.recipe
+++ b/recipes/unian_net.recipe
@@ -6,7 +6,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Unian(BasicNewsRecipe):
     title = '\u0423\u041D\u0418\u0410\u041D '
-    description = 'Украинское Независимое Информационное Агентство Новостей – первое в Украине и самое большое независимое информационное агентство, основанное в 1993 году, лидер среди новостных медиа страны, самый цитируемый источник новостей о событиях в стране.'  # noqa
+    description = 'Украинское Независимое Информационное Агентство Новостей – первое в Украине и самое большое независимое информационное агентство, основанное в 1993 году, лидер среди новостных медиа страны, самый цитируемый источник новостей о событиях в стране.'  # noqa: E501
     __author__ = 'bugmen00t'
     publication_type = 'newspaper'
     oldest_article = 7
diff --git a/recipes/unian_net_en.recipe b/recipes/unian_net_en.recipe
index 55d9a43f64..9fe8869f19 100644
--- a/recipes/unian_net_en.recipe
+++ b/recipes/unian_net_en.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Unian(BasicNewsRecipe):
     title = 'UNIAN'
     description = ('UNIAN (Ukrainian Independent News Agency of News) is the largest independent news agency,'
-                   ' first in Ukraine, founded in 1993, remaining the leader among the country\'s news media,'
+                   " first in Ukraine, founded in 1993, remaining the leader among the country's news media,"
                    ' being the most cited source of news from across Ukraine.')
     __author__ = 'bugmen00t'
     publication_type = 'newspaper'
diff --git a/recipes/unn_ru.recipe b/recipes/unn_ru.recipe
index a9d5a8403c..72795966da 100644
--- a/recipes/unn_ru.recipe
+++ b/recipes/unn_ru.recipe
@@ -5,10 +5,10 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class UNN(BasicNewsRecipe):
-    title = '\u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0438\u0435 \u041D\u0430\u0446\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u044B\u0435 \u041D\u043E\u0432\u043E\u0441\u0442\u0438'  # noqa
+    title = '\u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0438\u0435 \u041D\u0430\u0446\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u044B\u0435 \u041D\u043E\u0432\u043E\u0441\u0442\u0438'  # noqa: E501
     __author__ = 'bugmen00t'
-    description = '\u0423\u041D\u041D: \u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0438\u0435 \u041D\u0430\u0446\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u044B\u0435 \u041D\u043E\u0432\u043E\u0441\u0442\u0438'  # noqa
-    publisher = '\u0406\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E \u00AB\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0456 \u041D\u0430\u0446\u0456\u043E\u043D\u0430\u043B\u044C\u043D\u0456 \u041D\u043E\u0432\u0438\u043D\u0438\u00BB'  # noqa
+    description = '\u0423\u041D\u041D: \u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0438\u0435 \u041D\u0430\u0446\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u044B\u0435 \u041D\u043E\u0432\u043E\u0441\u0442\u0438'  # noqa: E501
+    publisher = '\u0406\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E \u00AB\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0456 \u041D\u0430\u0446\u0456\u043E\u043D\u0430\u043B\u044C\u043D\u0456 \u041D\u043E\u0432\u0438\u043D\u0438\u00BB'  # noqa: E501
     category = 'newspaper'
     cover_url = u'https://argentum.ua/uploads/portfolio/2012/c043e0e18fd9f89df5fb421ab28cf609197011c2.png'
     language = 'ru_UK'
diff --git a/recipes/unn_ua.recipe b/recipes/unn_ua.recipe
index aae0192125..f4a90c9c3e 100644
--- a/recipes/unn_ua.recipe
+++ b/recipes/unn_ua.recipe
@@ -5,10 +5,10 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 
 class UNN(BasicNewsRecipe):
-    title = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0456 \u041D\u0430\u0446\u0456\u043E\u043D\u0430\u043B\u044C\u043D\u0456 \u041D\u043E\u0432\u0438\u043D\u0438'  # noqa
+    title = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0456 \u041D\u0430\u0446\u0456\u043E\u043D\u0430\u043B\u044C\u043D\u0456 \u041D\u043E\u0432\u0438\u043D\u0438'  # noqa: E501
     __author__ = 'bugmen00t'
-    description = '\u0423\u041D\u041D: \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0456 \u041D\u0430\u0446\u0456\u043E\u043D\u0430\u043B\u044C\u043D\u0456 \u041D\u043E\u0432\u0438\u043D\u0438'  # noqa
-    publisher = '\u0406\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E \u00AB\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0456 \u041D\u0430\u0446\u0456\u043E\u043D\u0430\u043B\u044C\u043D\u0456 \u041D\u043E\u0432\u0438\u043D\u0438\u00BB'  # noqa
+    description = '\u0423\u041D\u041D: \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0456 \u041D\u0430\u0446\u0456\u043E\u043D\u0430\u043B\u044C\u043D\u0456 \u041D\u043E\u0432\u0438\u043D\u0438'  # noqa: E501
+    publisher = '\u0406\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u0435 \u0430\u0433\u0435\u043D\u0442\u0441\u0442\u0432\u043E \u00AB\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0456 \u041D\u0430\u0446\u0456\u043E\u043D\u0430\u043B\u044C\u043D\u0456 \u041D\u043E\u0432\u0438\u043D\u0438\u00BB'  # noqa: E501
     category = 'newspaper'
     cover_url = u'https://pechersk.kyivcity.gov.ua/done_img/b/11289.jpg'
     language = 'uk'
diff --git a/recipes/usatoday.recipe b/recipes/usatoday.recipe
index d5518aaf1d..46fe9061c8 100644
--- a/recipes/usatoday.recipe
+++ b/recipes/usatoday.recipe
@@ -14,10 +14,12 @@ def classes(classes):
     return dict(attrs={
         'class': lambda x: x and frozenset(x.split()).intersection(q)})
 
+
 def absurl(url):
     if url.startswith('/'):
         return 'https://www.usatoday.com' + url
 
+
 class USAToday(BasicNewsRecipe):
 
     title = 'USA Today'
@@ -30,7 +32,6 @@ class USAToday(BasicNewsRecipe):
     timefmt = ' [%d %b %Y]'
     max_articles_per_feed = 25
     no_stylesheets = True
-    remove_empty_feeds = True
 
     keep_only_tags = [
         classes('gnt_ar_hl gnt_ar_by gnt_ar_b topper__inner in-depth-content'),
diff --git a/recipes/vancouver_province.recipe b/recipes/vancouver_province.recipe
index 838be31c73..0644c70dda 100644
--- a/recipes/vancouver_province.recipe
+++ b/recipes/vancouver_province.recipe
@@ -68,44 +68,44 @@ class CanWestPaper(BasicNewsRecipe):
     fp_tag = 'CAN_TP'
 
     # un-comment the following six lines for the Vancouver Sun
-    # title = u'Vancouver Sun'
-    # url_prefix = 'http://www.vancouversun.com'
-    # description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
-    # logo_url = 'vslogo.jpg'
-    # fp_tag = 'CAN_VS'
+    # #    title = u'Vancouver Sun'
+    # #    url_prefix = 'http://www.vancouversun.com'
+    # #    description = u'News from Vancouver, BC'
+    # #    std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
+    # #    logo_url = 'vslogo.jpg'
+    # #    fp_tag = 'CAN_VS'
 
     # un-comment the following six lines for the Calgary Herald
-# #    title = u'Calgary Herald'
-# #    url_prefix = 'http://www.calgaryherald.com'
-# #    description = u'News from Calgary, AB'
-# #    std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
-# #    logo_url = 'chlogo.jpg'
-# #    fp_tag = 'CAN_CH'
-#
-#     un-comment the following six lines for the Edmonton Journal
-# #    title = u'Edmonton Journal'
-# #    url_prefix = 'http://www.edmontonjournal.com'
-# #    description = u'News from Edmonton, AB'
-# #    std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
-# #    logo_url = 'ejlogo.jpg'
-# #    fp_tag = 'CAN_EJ'
-#
-#     un-comment the following six lines for the Ottawa Citizen
-# #    title = u'Ottawa Citizen'
-# #    url_prefix = 'http://www.ottawacitizen.com'
-# #    description = u'News from Ottawa, ON'
-# #    std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
-# #    logo_url = 'oclogo.jpg'
-# #    fp_tag = 'CAN_OC'
-#
-#     un-comment the following six lines for the Montreal Gazette
-# #    title = u'Montreal Gazette'
-# #    url_prefix = 'http://www.montrealgazette.com'
-# #    description = u'News from Montreal, QC'
-# #    std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg'
-# #    logo_url = 'mglogo.jpg'
-# #    fp_tag = 'CAN_MG'
+    # #    title = u'Calgary Herald'
+    # #    url_prefix = 'http://www.calgaryherald.com'
+    # #    description = u'News from Calgary, AB'
+    # #    std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
+    # #    logo_url = 'chlogo.jpg'
+    # #    fp_tag = 'CAN_CH'
+
+    # un-comment the following six lines for the Edmonton Journal
+    # #    title = u'Edmonton Journal'
+    # #    url_prefix = 'http://www.edmontonjournal.com'
+    # #    description = u'News from Edmonton, AB'
+    # #    std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
+    # #    logo_url = 'ejlogo.jpg'
+    # #    fp_tag = 'CAN_EJ'
+
+    # un-comment the following six lines for the Ottawa Citizen
+    # #    title = u'Ottawa Citizen'
+    # #    url_prefix = 'http://www.ottawacitizen.com'
+    # #    description = u'News from Ottawa, ON'
+    # #    std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
+    # #    logo_url = 'oclogo.jpg'
+    # #    fp_tag = 'CAN_OC'
+
+    # un-comment the following six lines for the Montreal Gazette
+    # #    title = u'Montreal Gazette'
+    # #    url_prefix = 'http://www.montrealgazette.com'
+    # #    description = u'News from Montreal, QC'
+    # #    std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg'
+    # #    logo_url = 'mglogo.jpg'
+    # #    fp_tag = 'CAN_MG'
 
     Kindle_Fire = False
     masthead_url = std_logo_url
@@ -126,7 +126,7 @@ class CanWestPaper(BasicNewsRecipe):
                 .photocaption { font-size: xx-small; font-style: italic; font-weight: normal; }
                 #photocredit { font-size: xx-small; font-weight: normal; }'''
 
-    keep_only_tags = [dict(name='div', attrs={'id': re.compile('story')})]
+    keep_only_tags = [dict(name='div', attrs={'id': re.compile(r'story')})]
 
     remove_tags = [{'class': 'comments'}, {'class': 'comment-intro'}, {'class': 'storytab'},
                    dict(name='div', attrs={'class': 'section_title'}), dict(name='div', attrs={'class': 'sharebar'}), dict(
@@ -140,7 +140,7 @@ class CanWestPaper(BasicNewsRecipe):
                        name='div', attrs={'class': 'copyright'}),
                    dict(name='div', attrs={'class': 'rule_grey_solid'}),
                    dict(name='div', attrs={'id': 'soundoff'}),
-                   dict(name='div', attrs={'id': re.compile('flyer')}),
+                   dict(name='div', attrs={'id': re.compile(r'flyer')}),
                    dict(name='li', attrs={'class': 'print'}), dict(name='li', attrs={'class': 'share'}), dict(name='ul', attrs={'class': 'bullet'})]
 
     def get_cover_url(self):
@@ -154,8 +154,7 @@ class CanWestPaper(BasicNewsRecipe):
         except:
             while daysback < 7:
                 cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg' + \
-                    str((date.today() - timedelta(days=daysback)).day) + \
-                    '/lg/' + self.fp_tag + '.jpg'
+                    str((date.today() - timedelta(days=daysback)).day) + '/lg/' + self.fp_tag + '.jpg'
                 br = BasicNewsRecipe.get_browser(self)
                 try:
                     br.open(cover)
@@ -164,7 +163,7 @@ class CanWestPaper(BasicNewsRecipe):
                     continue
                 break
         if daysback == 7:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             cover = None
         return cover
 
@@ -183,18 +182,18 @@ class CanWestPaper(BasicNewsRecipe):
 
     def fixChars(self, string):
         # Replace lsquo (\x91)
-        fixed = re.sub("\x91", "‘", string)
+        fixed = string.replace('\x91', '‘')
         # Replace rsquo (\x92)
-        fixed = re.sub("\x92", "’", fixed)
+        fixed = fixed.replace('\x92', '’')
         # Replace ldquo (\x93)
-        fixed = re.sub("\x93", "“", fixed)
+        fixed = fixed.replace('\x93', '“')
         # Replace rdquo (\x94)
-        fixed = re.sub("\x94", "”", fixed)
+        fixed = fixed.replace('\x94', '”')
         # Replace ndash (\x96)
-        fixed = re.sub("\x96", "–", fixed)
+        fixed = fixed.replace('\x96', '–')
         # Replace mdash (\x97)
-        fixed = re.sub("\x97", "—", fixed)
-        fixed = re.sub("&#x2019;", "’", fixed)
+        fixed = fixed.replace('\x97', '—')
+        fixed = fixed.replace('&#x2019;', '’')
         return fixed
 
     def massageNCXText(self, description):
@@ -227,7 +226,7 @@ class CanWestPaper(BasicNewsRecipe):
         divtags = soup.findAll('div', attrs={'id': ''})
         if divtags:
             for div in divtags:
-                del(div['id'])
+                del div['id']
 
         pgall = soup.find('div', attrs={'id': 'storyphoto'})
         if pgall is not None:  # photo gallery perhaps
@@ -275,10 +274,10 @@ class CanWestPaper(BasicNewsRecipe):
                     if url.startswith('/'):
                         url = self.url_prefix + url
                     if not url.startswith(self.url_prefix):
-                        print("Rejected " + url)
+                        print('Rejected ' + url)
                         return
                     if url in self.url_list:
-                        print("Rejected dup " + url)
+                        print('Rejected dup ' + url)
                         return
                     self.url_list.append(url)
                     title = self.tag_to_string(atag, False)
@@ -290,8 +289,8 @@ class CanWestPaper(BasicNewsRecipe):
                         return
                     dtag = adiv.find('div', 'content')
                     description = ''
-                    print("URL " + url)
-                    print("TITLE " + title)
+                    print('URL ' + url)
+                    print('TITLE ' + title)
                     if dtag is not None:
                         stag = dtag.span
                         if stag is not None:
@@ -299,18 +298,18 @@ class CanWestPaper(BasicNewsRecipe):
                                 description = self.tag_to_string(stag, False)
                         else:
                             description = self.tag_to_string(dtag, False)
-                        print("DESCRIPTION: " + description)
+                        print('DESCRIPTION: ' + description)
                     if key not in articles:
                         articles[key] = []
                     articles[key].append(dict(
                         title=title, url=url, date='', description=description, author='', content=''))
 
         def parse_web_index(key, keyurl):
-            print("Section: " + key + ': ' + self.url_prefix + keyurl)
+            print('Section: ' + key + ': ' + self.url_prefix + keyurl)
             try:
                 soup = self.index_to_soup(self.url_prefix + keyurl)
             except:
-                print("Section: " + key + ' NOT FOUND')
+                print('Section: ' + key + ' NOT FOUND')
                 return
             ans.append(key)
             mainsoup = soup.find('div', 'bodywrapper')
@@ -322,7 +321,7 @@ class CanWestPaper(BasicNewsRecipe):
             for wdiv in mainsoup.findAll(attrs={'class': ['headline', 'featurecontent']}):
                 handle_article(wdiv, key)
 
-        for (k, url) in self.postmedia_index_pages:
+        for k,url in self.postmedia_index_pages:
             parse_web_index(k, url)
         ans = [(key, articles[key]) for key in ans if key in articles]
         return ans
diff --git a/recipes/vancouver_sun.recipe b/recipes/vancouver_sun.recipe
index 07ec2c7bae..603ada2e93 100644
--- a/recipes/vancouver_sun.recipe
+++ b/recipes/vancouver_sun.recipe
@@ -61,12 +61,12 @@ class CanWestPaper(BasicNewsRecipe):
     ]
 
     # un-comment the following six lines for the Vancouver Province
-#     title = u'Vancouver Province'
-#     url_prefix = 'http://www.theprovince.com'
-#     description = u'News from Vancouver, BC'
-#     std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
-#     logo_url = 'vplogo.jpg'
-#     fp_tag = 'CAN_TP'
+    # #    title = u'Vancouver Province'
+    # #    url_prefix = 'http://www.theprovince.com'
+    # #    description = u'News from Vancouver, BC'
+    # #    std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
+    # #    logo_url = 'vplogo.jpg'
+    # #    fp_tag = 'CAN_TP'
 
     # un-comment the following six lines for the Vancouver Sun
     title = u'Vancouver Sun'
@@ -77,36 +77,36 @@ class CanWestPaper(BasicNewsRecipe):
     fp_tag = 'CAN_VS'
 
     # un-comment the following six lines for the Calgary Herald
-#     title = u'Calgary Herald'
-#     url_prefix = 'http://www.calgaryherald.com'
-#     description = u'News from Calgary, AB'
-#     std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
-#     logo_url = 'chlogo.jpg'
-#     fp_tag = 'CAN_CH'
+    # #    title = u'Calgary Herald'
+    # #    url_prefix = 'http://www.calgaryherald.com'
+    # #    description = u'News from Calgary, AB'
+    # #    std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
+    # #    logo_url = 'chlogo.jpg'
+    # #    fp_tag = 'CAN_CH'
 
     # un-comment the following six lines for the Edmonton Journal
-#     title = u'Edmonton Journal'
-#     url_prefix = 'http://www.edmontonjournal.com'
-#     description = u'News from Edmonton, AB'
-#     std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
-#     logo_url = 'ejlogo.jpg'
-#     fp_tag = 'CAN_EJ'
+    # #    title = u'Edmonton Journal'
+    # #    url_prefix = 'http://www.edmontonjournal.com'
+    # #    description = u'News from Edmonton, AB'
+    # #    std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
+    # #    logo_url = 'ejlogo.jpg'
+    # #    fp_tag = 'CAN_EJ'
 
     # un-comment the following six lines for the Ottawa Citizen
-#     title = u'Ottawa Citizen'
-#     url_prefix = 'http://www.ottawacitizen.com'
-#     description = u'News from Ottawa, ON'
-#     std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
-#     logo_url = 'oclogo.jpg'
-#     fp_tag = 'CAN_OC'
+    # #    title = u'Ottawa Citizen'
+    # #    url_prefix = 'http://www.ottawacitizen.com'
+    # #    description = u'News from Ottawa, ON'
+    # #    std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
+    # #    logo_url = 'oclogo.jpg'
+    # #    fp_tag = 'CAN_OC'
 
     # un-comment the following six lines for the Montreal Gazette
-#     title = u'Montreal Gazette'
-#     url_prefix = 'http://www.montrealgazette.com'
-#     description = u'News from Montreal, QC'
-#     std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg'
-#     logo_url = 'mglogo.jpg'
-#     fp_tag = 'CAN_MG'
+    # #    title = u'Montreal Gazette'
+    # #    url_prefix = 'http://www.montrealgazette.com'
+    # #    description = u'News from Montreal, QC'
+    # #    std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg'
+    # #    logo_url = 'mglogo.jpg'
+    # #    fp_tag = 'CAN_MG'
 
     Kindle_Fire = False
     masthead_url = std_logo_url
@@ -127,7 +127,7 @@ class CanWestPaper(BasicNewsRecipe):
                 .photocaption { font-size: xx-small; font-style: italic; font-weight: normal; }
                 #photocredit { font-size: xx-small; font-weight: normal; }'''
 
-    keep_only_tags = [dict(name='div', attrs={'id': re.compile('story')})]
+    keep_only_tags = [dict(name='div', attrs={'id': re.compile(r'story')})]
 
     remove_tags = [{'class': 'comments'}, {'class': 'comment-intro'}, {'class': 'storytab'},
                    dict(name='div', attrs={'class': 'section_title'}), dict(name='div', attrs={'class': 'sharebar'}), dict(
@@ -141,7 +141,7 @@ class CanWestPaper(BasicNewsRecipe):
                        name='div', attrs={'class': 'copyright'}),
                    dict(name='div', attrs={'class': 'rule_grey_solid'}),
                    dict(name='div', attrs={'id': 'soundoff'}),
-                   dict(name='div', attrs={'id': re.compile('flyer')}),
+                   dict(name='div', attrs={'id': re.compile(r'flyer')}),
                    dict(name='li', attrs={'class': 'print'}), dict(name='li', attrs={'class': 'share'}), dict(name='ul', attrs={'class': 'bullet'})]
 
     def get_cover_url(self):
@@ -155,8 +155,7 @@ class CanWestPaper(BasicNewsRecipe):
         except:
             while daysback < 7:
                 cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg' + \
-                    str((date.today() - timedelta(days=daysback)).day) + \
-                    '/lg/' + self.fp_tag + '.jpg'
+                    str((date.today() - timedelta(days=daysback)).day) + '/lg/' + self.fp_tag + '.jpg'
                 br = BasicNewsRecipe.get_browser(self)
                 try:
                     br.open(cover)
@@ -165,24 +164,24 @@ class CanWestPaper(BasicNewsRecipe):
                     continue
                 break
         if daysback == 7:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             cover = None
         return cover
 
     def fixChars(self, string):
         # Replace lsquo (\x91)
-        fixed = re.sub("\x91", "‘", string)
+        fixed = string.replace('\x91', '‘')
         # Replace rsquo (\x92)
-        fixed = re.sub("\x92", "’", fixed)
+        fixed = fixed.replace('\x92', '’')
         # Replace ldquo (\x93)
-        fixed = re.sub("\x93", "“", fixed)
+        fixed = fixed.replace('\x93', '“')
         # Replace rdquo (\x94)
-        fixed = re.sub("\x94", "”", fixed)
+        fixed = fixed.replace('\x94', '”')
         # Replace ndash (\x96)
-        fixed = re.sub("\x96", "–", fixed)
+        fixed = fixed.replace('\x96', '–')
         # Replace mdash (\x97)
-        fixed = re.sub("\x97", "—", fixed)
-        fixed = re.sub("&#x2019;", "’", fixed)
+        fixed = fixed.replace('\x97', '—')
+        fixed = fixed.replace('&#x2019;', '’')
         return fixed
 
     def massageNCXText(self, description):
@@ -215,7 +214,7 @@ class CanWestPaper(BasicNewsRecipe):
         divtags = soup.findAll('div', attrs={'id': ''})
         if divtags:
             for div in divtags:
-                del(div['id'])
+                del div['id']
 
         pgall = soup.find('div', attrs={'id': 'storyphoto'})
         if pgall is not None:  # photo gallery perhaps
@@ -263,10 +262,10 @@ class CanWestPaper(BasicNewsRecipe):
                     if url.startswith('/'):
                         url = self.url_prefix + url
                     if not url.startswith(self.url_prefix):
-                        print("Rejected " + url)
+                        print('Rejected ' + url)
                         return
                     if url in self.url_list:
-                        print("Rejected dup " + url)
+                        print('Rejected dup ' + url)
                         return
                     self.url_list.append(url)
                     title = self.tag_to_string(atag, False)
@@ -278,8 +277,8 @@ class CanWestPaper(BasicNewsRecipe):
                         return
                     dtag = adiv.find('div', 'content')
                     description = ''
-                    print("URL " + url)
-                    print("TITLE " + title)
+                    print('URL ' + url)
+                    print('TITLE ' + title)
                     if dtag is not None:
                         stag = dtag.span
                         if stag is not None:
@@ -287,18 +286,18 @@ class CanWestPaper(BasicNewsRecipe):
                                 description = self.tag_to_string(stag, False)
                         else:
                             description = self.tag_to_string(dtag, False)
-                        print("DESCRIPTION: " + description)
+                        print('DESCRIPTION: ' + description)
                     if key not in articles:
                         articles[key] = []
                     articles[key].append(dict(
                         title=title, url=url, date='', description=description, author='', content=''))
 
         def parse_web_index(key, keyurl):
-            print("Section: " + key + ': ' + self.url_prefix + keyurl)
+            print('Section: ' + key + ': ' + self.url_prefix + keyurl)
             try:
                 soup = self.index_to_soup(self.url_prefix + keyurl)
             except:
-                print("Section: " + key + ' NOT FOUND')
+                print('Section: ' + key + ' NOT FOUND')
                 return
             ans.append(key)
             mainsoup = soup.find('div', 'bodywrapper')
@@ -310,7 +309,7 @@ class CanWestPaper(BasicNewsRecipe):
             for wdiv in mainsoup.findAll(attrs={'class': ['headline', 'featurecontent']}):
                 handle_article(wdiv, key)
 
-        for (k, url) in self.postmedia_index_pages:
+        for k,url in self.postmedia_index_pages:
             parse_web_index(k, url)
-        ans = [(key, articles[key]) for key in ans if key in articles]  # noqa
+        ans = [(key, articles[key]) for key in ans if key in articles]
         return ans
diff --git a/recipes/variety.recipe b/recipes/variety.recipe
index 2aa61b3c3f..c74bd5d8f5 100644
--- a/recipes/variety.recipe
+++ b/recipes/variety.recipe
@@ -10,7 +10,7 @@ from calibre.web.feeds.recipes import BasicNewsRecipe
 class Variety(BasicNewsRecipe):
     title = 'Variety'
     __author__ = 'Darko Miletic'
-    description = 'Breaking entertainment movie news, movie reviews, entertainment industry events, news and reviews from Cannes, Oscars, and Hollywood awards.  Featuring box office charts, archives and more.'  # noqa
+    description = 'Breaking entertainment movie news, movie reviews, entertainment industry events, news and reviews from Cannes, Oscars, and Hollywood awards.  Featuring box office charts, archives and more.'  # noqa: E501
     oldest_article = 2
     max_articles_per_feed = 100
     no_stylesheets = True
@@ -20,13 +20,13 @@ class Variety(BasicNewsRecipe):
     category = 'Entertainment Industry News, Daily Variety, Movie Reviews, TV, Awards, Oscars, Cannes, Box Office, Hollywood'
     language = 'en'
     masthead_url = 'http://images1.variety.com/graphics/variety/Variety_logo_green_tm.gif'
-    extra_css              = """
+    extra_css              = '''
         body{font-family: Arial,Helvetica,sans-serif; font-size: 1.275em}
         .date{font-size: small; border: 1px dotted rgb(204, 204, 204); font-style: italic; color: rgb(102, 102, 102); margin: 5px 0px; padding: 0.5em;}
                                 .author{margin: 5px 0px 5px 20px; padding: 0.5em; background: none repeat scroll 0% 0% rgb(247, 247, 247);}
                                 .art h2{color: rgb(153, 0, 0); font-size: 1.275em; font-weight: bold;}
                                 img{margin-bottom: 1em}
-                             """
+                             '''
 
     conversion_options = {
         'comments': description, 'tags': category, 'language': language, 'publisher': publisher
diff --git a/recipes/vecernji_list.recipe b/recipes/vecernji_list.recipe
index a18281edac..3f39424eb4 100644
--- a/recipes/vecernji_list.recipe
+++ b/recipes/vecernji_list.recipe
@@ -23,7 +23,7 @@ def new_tag(soup, name, attrs=()):
 class VecernjiList(BasicNewsRecipe):
     title = 'Vecernji List'
     __author__ = 'Darko Miletic'
-    description = "Vecernji.hr je vodeci hrvatski news portal. Cilj je biti prvi u objavljivanju svih vijesti iz Hrvatske, svijeta, sporta, gospodarstva, showbiza i jos mnogo vise. Uz cjelodnevni rad, novinari objavljuju preko 300 raznih vijesti svakoga dana. Vecernji.hr prati sve vaznije dogadaje specijalnim izvjestajima, video specijalima i foto galerijama."  # noqa
+    description = 'Vecernji.hr je vodeci hrvatski news portal. Cilj je biti prvi u objavljivanju svih vijesti iz Hrvatske, svijeta, sporta, gospodarstva, showbiza i jos mnogo vise. Uz cjelodnevni rad, novinari objavljuju preko 300 raznih vijesti svakoga dana. Vecernji.hr prati sve vaznije dogadaje specijalnim izvjestajima, video specijalima i foto galerijama.'  # noqa: E501
     publisher = 'Vecernji.hr'
     category = 'news, politics, Croatia'
     oldest_article = 2
@@ -37,13 +37,13 @@ class VecernjiList(BasicNewsRecipe):
     lang = 'hr-HR'
     direction = 'ltr'
 
-    extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'  # noqa
+    extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'  # noqa: E501
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': lang, 'pretty_print': True
     }
 
-    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]  # noqa: RUF039
 
     remove_tags = [
         dict(name=['object', 'link', 'embed']), dict(
@@ -57,9 +57,9 @@ class VecernjiList(BasicNewsRecipe):
         soup.html['dir'] = self.direction
 
         mlang = new_tag(soup, 'meta', [
-                    ("http-equiv", "Content-Language"), ("content", self.lang)])
+                    ('http-equiv', 'Content-Language'), ('content', self.lang)])
         mcharset = new_tag(soup, 'meta', [
-                       ("http-equiv", "Content-Type"), ("content", "text/html; charset=UTF-8")])
+                       ('http-equiv', 'Content-Type'), ('content', 'text/html; charset=UTF-8')])
         soup.head.insert(0, mlang)
         soup.head.insert(1, mcharset)
         return self.adeify_images(soup)
diff --git a/recipes/vedomosti.recipe b/recipes/vedomosti.recipe
index 03e81a1c44..6968c3e8be 100644
--- a/recipes/vedomosti.recipe
+++ b/recipes/vedomosti.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Vedomosti(BasicNewsRecipe):
     title = '\u0412\u0435\u0434\u043E\u043C\u043E\u0441\u0442\u0438'
     __author__ = 'bugmen00t'
-    description = '\u0415\u0436\u0435\u0434\u043D\u0435\u0432\u043D\u0430\u044F \u0434\u0435\u043B\u043E\u0432\u0430\u044F \u0433\u0430\u0437\u0435\u0442\u0430.'  # noqa
+    description = '\u0415\u0436\u0435\u0434\u043D\u0435\u0432\u043D\u0430\u044F \u0434\u0435\u043B\u043E\u0432\u0430\u044F \u0433\u0430\u0437\u0435\u0442\u0430.'  # noqa: E501
     publisher = '\u0410\u041E \u00AB\u0411\u0438\u0437\u043D\u0435\u0441 \u041D\u044C\u044E\u0441 \u041C\u0435\u0434\u0438\u0430\u00BB'
     category = 'newspaper'
     cover_url = u'https://id.vedomosti.ru/assets/chopick-13077eee55066e639f3a037834ecf11279d3f402e9f5cac7162d13183dfd9d20.jpg'
diff --git a/recipes/version2.recipe b/recipes/version2.recipe
index b9e94f59a5..a665502bc0 100644
--- a/recipes/version2.recipe
+++ b/recipes/version2.recipe
@@ -38,7 +38,7 @@ class version2(BasicNewsRecipe):
         dict(name='span', attrs={'class': 'article-link-id'}),
         dict(name='section', attrs={'class': 'social-tools-pane'}),
         dict(name='section', attrs={'class': 'article-timeline'}),
-        dict(name='div', attrs={'id' : 'mini-panel-comments_and_form'}),
+        dict(name='div', attrs={'id': 'mini-panel-comments_and_form'}),
         dict(name='div', attrs={'class': 'related-articles top-three'}),
         dict(name='div', attrs={'id': 'mini-panel-jobfinder_1'}),
         dict(name='section', attrs={'id': 'mini-panel-frontpage_debat_zone'}),
@@ -53,7 +53,7 @@ class version2(BasicNewsRecipe):
         dict(name='section', attrs={'class': 'jobs-list'}),
         dict(name='footer', attrs={'id': 'footer'}),
         dict(name='section', attrs={'class': 'banner'}),
-        dict(name='div', attrs={'class' : 'fast-track-frontpage'}),
+        dict(name='div', attrs={'class': 'fast-track-frontpage'}),
         dict(name='a', attrs={'class': 'byline-comments'})
     ]
 
diff --git a/recipes/verstka.recipe b/recipes/verstka.recipe
index f34b4e171a..7e3ac33fd7 100644
--- a/recipes/verstka.recipe
+++ b/recipes/verstka.recipe
@@ -6,7 +6,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Verstka(BasicNewsRecipe):
     title = u'\u0412\u0451\u0440\u0441\u0442\u043A\u0430'
-    description = u'\u041E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E-\u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u0438\u0437\u0434\u0430\u043D\u0438\u0435, \u043A\u043E\u0442\u043E\u0440\u043E\u0435 \u0438\u0441\u0441\u043B\u0435\u0434\u0443\u0435\u0442 \u0438 \u043E\u043F\u0438\u0441\u044B\u0432\u0430\u0435\u0442, \u043A\u0430\u043A \u0444\u0443\u043D\u043A\u0446\u0438\u043E\u043D\u0438\u0440\u0443\u0435\u0442 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u043E \u0432 \u0420\u043E\u0441\u0441\u0438\u0438.'  # noqa
+    description = u'\u041E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E-\u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u0438\u0437\u0434\u0430\u043D\u0438\u0435, \u043A\u043E\u0442\u043E\u0440\u043E\u0435 \u0438\u0441\u0441\u043B\u0435\u0434\u0443\u0435\u0442 \u0438 \u043E\u043F\u0438\u0441\u044B\u0432\u0430\u0435\u0442, \u043A\u0430\u043A \u0444\u0443\u043D\u043A\u0446\u0438\u043E\u043D\u0438\u0440\u0443\u0435\u0442 \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u043E \u0432 \u0420\u043E\u0441\u0441\u0438\u0438.'  # noqa: E501
     __author__ = 'bugmen00t'
     publication_type = 'newspaper'
     oldest_article = 21
diff --git a/recipes/vic_times.recipe b/recipes/vic_times.recipe
index 3e11e31e39..113086da9c 100644
--- a/recipes/vic_times.recipe
+++ b/recipes/vic_times.recipe
@@ -82,28 +82,28 @@ class TimesColonist(BasicNewsRecipe):
                 .caption { font-size: xx-small; font-style: italic; font-weight: normal; }
                 '''
     keep_only_tags = [
-        dict(name='div', attrs={'class': re.compile('main.content')})]
+        dict(name='div', attrs={'class': re.compile(r'main.content')})]
 
     def __init__(self, options, log, progress_reporter):
         self.remove_tags = [{'class': 'comments'},
                             {'id': 'photocredit'},
                             dict(name='div', attrs={
-                                 'class': re.compile('top.controls')}),
+                                 'class': re.compile(r'top.controls')}),
                             dict(name='div', attrs={
-                                 'class': re.compile('^comments')}),
+                                 'class': re.compile(r'^comments')}),
                             dict(name='div', attrs={
-                                 'class': re.compile('social')}),
+                                 'class': re.compile(r'social')}),
                             dict(name='div', attrs={
-                                 'class': re.compile('tools')}),
+                                 'class': re.compile(r'tools')}),
                             dict(name='div', attrs={
-                                 'class': re.compile('bottom.tools')}),
+                                 'class': re.compile(r'bottom.tools')}),
                             dict(name='div', attrs={
-                                 'class': re.compile('window')}),
-                            dict(name='div', attrs={'class': re.compile('related.news.element')})]
-        print("PROFILE NAME = " + options.output_profile.short_name)
+                                 'class': re.compile(r'window')}),
+                            dict(name='div', attrs={'class': re.compile(r'related.news.element')})]
+        print('PROFILE NAME = ' + options.output_profile.short_name)
         if self.kindle_omit_images and options.output_profile.short_name in ['kindle', 'kindle_dx', 'kindle_pw']:
             self.remove_tags.append(
-                dict(name='div', attrs={'class': re.compile('image-container')}))
+                dict(name='div', attrs={'class': re.compile(r'image-container')}))
         BasicNewsRecipe.__init__(self, options, log, progress_reporter)
 
     def get_cover_url(self):
@@ -117,8 +117,7 @@ class TimesColonist(BasicNewsRecipe):
         except:
             while daysback < 7:
                 cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg' + \
-                    str((date.today() - timedelta(days=daysback)).day) + \
-                    '/lg/' + self.fp_tag + '.jpg'
+                    str((date.today() - timedelta(days=daysback)).day) + '/lg/' + self.fp_tag + '.jpg'
                 br = BasicNewsRecipe.get_browser(self)
                 try:
                     br.open(cover)
@@ -127,24 +126,24 @@ class TimesColonist(BasicNewsRecipe):
                     continue
                 break
         if daysback == 7:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             cover = None
         return cover
 
     def fixChars(self, string):
         # Replace lsquo (\x91)
-        fixed = re.sub("\x91", "‘", string)
+        fixed = string.replace('\x91', '‘')
         # Replace rsquo (\x92)
-        fixed = re.sub("\x92", "’", fixed)
+        fixed = fixed.replace('\x92', '’')
         # Replace ldquo (\x93)
-        fixed = re.sub("\x93", "“", fixed)
+        fixed = fixed.replace('\x93', '“')
         # Replace rdquo (\x94)
-        fixed = re.sub("\x94", "”", fixed)
+        fixed = fixed.replace('\x94', '”')
         # Replace ndash (\x96)
-        fixed = re.sub("\x96", "–", fixed)
+        fixed = fixed.replace('\x96', '–')
         # Replace mdash (\x97)
-        fixed = re.sub("\x97", "—", fixed)
-        fixed = re.sub("&#x2019;", "’", fixed)
+        fixed = fixed.replace('\x97', '—')
+        fixed = fixed.replace('&#x2019;', '’')
         return fixed
 
     def massageNCXText(self, description):
@@ -173,19 +172,19 @@ class TimesColonist(BasicNewsRecipe):
         return soup
 
     def preprocess_html(self, soup):
-        byline = soup.find('p', attrs={'class': re.compile('ancillary')})
+        byline = soup.find('p', attrs={'class': re.compile(r'ancillary')})
         if byline is not None:
             authstr = self.tag_to_string(byline, False)
-            authstr = re.sub('/ *Times Colonist', '/',
+            authstr = re.sub(r'/ *Times Colonist', '/',
                              authstr, flags=re.IGNORECASE)
-            authstr = re.sub('BY */', '', authstr, flags=re.IGNORECASE)
+            authstr = re.sub(r'BY */', '', authstr, flags=re.IGNORECASE)
             newdiv = new_tag(soup, 'div')
             newdiv.insert(0, authstr)
             newdiv['class'] = 'byline'
             byline.replaceWith(newdiv)
-        for caption in soup.findAll('p', attrs={'class': re.compile('caption')}):
+        for caption in soup.findAll('p', attrs={'class': re.compile(r'caption')}):
             capstr = self.tag_to_string(caption, False)
-            capstr = re.sub('Photograph by.*$', '',
+            capstr = re.sub(r'Photograph by.*$', '',
                             capstr, flags=re.IGNORECASE)
             newdiv = new_tag(soup, 'div')
             newdiv.insert(0, capstr)
@@ -206,7 +205,7 @@ class TimesColonist(BasicNewsRecipe):
         if atag is not None:
             url = atag['href']
             url = url.strip()
-            # print("Checking >>"+url+'<<\n\r')
+            # print('Checking >>'+url+'<<\n\r')
             if url.startswith('/'):
                 url = self.url_prefix + url
             if url in self.url_list:
@@ -229,23 +228,23 @@ class TimesColonist(BasicNewsRecipe):
                 description = self.tag_to_string(dtag, False)
             article_list.append(dict(
                 title=title, url=url, date='', description=description, author='', content=''))
-            print(sectitle + title + ": description = " +
-                  description + " URL=" + url + '\n\r')
+            print(sectitle + title + ': description = ' +
+                  description + ' URL=' + url + '\n\r')
 
     def add_section_index(self, ans, securl, sectitle):
-        print("Add section url=" + self.url_prefix + '/' + securl + '\n\r')
+        print('Add section url=' + self.url_prefix + '/' + securl + '\n\r')
         try:
             soup = self.index_to_soup(self.url_prefix + '/' + securl)
         except:
             return ans
         mainsoup = soup.find(
-            'div', attrs={'class': re.compile('main.content')})
+            'div', attrs={'class': re.compile(r'main.content')})
         article_list = []
-        for wdiv in mainsoup.findAll('div', attrs={'id': re.compile('featured.story')}):
+        for wdiv in mainsoup.findAll('div', attrs={'id': re.compile(r'featured.story')}):
             for htag in wdiv.findAll('h3'):
                 self.handle_articles(htag, article_list, sectitle)
-        for ladiv in mainsoup.findAll(attrs={'class': re.compile('leading.articles')}):
-            for wdiv in mainsoup.findAll('div', attrs={'class': re.compile('article.row')}):
+        for ladiv in mainsoup.findAll(attrs={'class': re.compile(r'leading.articles')}):
+            for wdiv in mainsoup.findAll('div', attrs={'class': re.compile(r'article.row')}):
                 for htag in wdiv.findAll('h2'):
                     self.handle_articles(htag, article_list, sectitle)
         ans.append((sectitle, article_list))
@@ -253,6 +252,6 @@ class TimesColonist(BasicNewsRecipe):
 
     def parse_index(self):
         ans = []
-        for (url, title) in self.section_list:
+        for url, title in self.section_list:
             ans = self.add_section_index(ans, url, title)
         return ans
diff --git a/recipes/vikna_ru.recipe b/recipes/vikna_ru.recipe
index 5229db389c..4176215ed4 100644
--- a/recipes/vikna_ru.recipe
+++ b/recipes/vikna_ru.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class ViknaSTB(BasicNewsRecipe):
     title = '\u0412\u0438\u043A\u043D\u0430-\u043D\u043E\u0432\u043E\u0441\u0442\u0438'
     __author__ = 'bugmen00t'
-    description = '\u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0430\u044F \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u0430\u044F \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0430 \u0442\u0435\u043B\u0435\u043A\u0430\u043D\u0430\u043B\u0430 \u00AB\u0421\u0422\u0411\u00BB.'  # noqa
+    description = '\u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0430\u044F \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u0430\u044F \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0430 \u0442\u0435\u043B\u0435\u043A\u0430\u043D\u0430\u043B\u0430 \u00AB\u0421\u0422\u0411\u00BB.'  # noqa: E501
     publisher = '\u041E\u041E\u041E \u201C\u0421\u041B\u041C \u041D\u043E\u0432\u043E\u0441\u0442\u0438\u201D'
     category = 'newspaper'
     cover_url = u'https://yt3.ggpht.com/QZxhLPDcqhjMitCDPWbzk-Zs-ILbGo3ww1iuV9SIE1k0iqjoOIctT2d4BdyEsSAR6yWsbKbGWg=s900-c-k-c0x00ffffff-no-rj'
@@ -23,7 +23,7 @@ class ViknaSTB(BasicNewsRecipe):
 
     remove_tags_after = dict(name='div', attrs={'class': 'content-wrapper'})
 
-    remove_tags =   [
+    remove_tags = [
          dict(name='div', attrs={'class': 'share-content-wrapper flex-wrapper'}),
          dict(name='div', attrs={'class': 'sticky-wrapper'}),
          dict(name='div', attrs={'class': 'promo-wrapper'}),
diff --git a/recipes/vikna_ua.recipe b/recipes/vikna_ua.recipe
index 97b13d04d7..8bbe06bdef 100644
--- a/recipes/vikna_ua.recipe
+++ b/recipes/vikna_ua.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class ViknaSTB(BasicNewsRecipe):
     title = '\u0412\u0456\u043A\u043D\u0430-\u043D\u043E\u0432\u0438\u043D\u0438'
     __author__ = 'bugmen00t'
-    description = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u0430 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u0430 \u0442\u0435\u043B\u0435\u043A\u0430\u043D\u0430\u043B\u0443 \u00AB\u0421\u0422\u0411\u00BB.'  # noqa
+    description = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u0439\u043D\u0430 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u0430 \u0442\u0435\u043B\u0435\u043A\u0430\u043D\u0430\u043B\u0443 \u00AB\u0421\u0422\u0411\u00BB.'  # noqa: E501
     publisher = '\u0422\u041E\u0412 \u201C\u0421\u041B\u041C \u041D\u043E\u0432\u0438\u043D\u0438\u201D'
     category = 'newspaper'
     cover_url = u'https://yt3.ggpht.com/QZxhLPDcqhjMitCDPWbzk-Zs-ILbGo3ww1iuV9SIE1k0iqjoOIctT2d4BdyEsSAR6yWsbKbGWg=s900-c-k-c0x00ffffff-no-rj'
diff --git a/recipes/villagevoice.recipe b/recipes/villagevoice.recipe
index 7f300a94e9..69a9ab1809 100644
--- a/recipes/villagevoice.recipe
+++ b/recipes/villagevoice.recipe
@@ -9,10 +9,10 @@ class VillageVoice(BasicNewsRecipe):
 
     title = 'Village Voice'
     feeds = [
-        ("Complete Issue", "http://villagevoice.com/syndication/issue"),
-        ("News", "http://villagevoice.com/syndication/section/news"),
-        ("Music", "http://villagevoice.com/syndication/section/music"),
-        ("Movies", "http://villagevoice.com/syndication/section/film"),
+        ('Complete Issue', 'http://villagevoice.com/syndication/issue'),
+        ('News', 'http://villagevoice.com/syndication/section/news'),
+        ('Music', 'http://villagevoice.com/syndication/section/music'),
+        ('Movies', 'http://villagevoice.com/syndication/section/film'),
         # ("Restaurants", "http://villagevoice.com/syndication/section/dining"),
         # ("Music Events", "http://villagevoice.com/syndication/events?type=music"),
         # ("Calendar Events", "http://villagevoice.com/syndication/events"),
@@ -22,7 +22,7 @@ class VillageVoice(BasicNewsRecipe):
 
     auto_cleanup = True
     max_articles_per_feed = 50
-    masthead_url = "http://assets.villagevoice.com/img/citylogo.png"
+    masthead_url = 'http://assets.villagevoice.com/img/citylogo.png'
     language = 'en'
     __author__ = 'Barty'
 
diff --git a/recipes/vitalia.recipe b/recipes/vitalia.recipe
index 016f223581..d6fc0dc0c7 100644
--- a/recipes/vitalia.recipe
+++ b/recipes/vitalia.recipe
@@ -19,11 +19,11 @@ class VitaliaCZ(BasicNewsRecipe):
     publication_type = 'newsportal'
     no_stylesheets = True
     remove_javascript = True
-    extra_css               = 'p.perex{font-size: 1.2em; margin: 0 0 10px 0; line-height: 1.4; padding: 0 0 10px 0; font-weight: bold;} \
-                               p.perex img {display:none;} \
-                               span.author {font-size:0.8em; font-style:italic} \
-                               .urs div.rs-tip-major {padding:0.5em; background: #e0e0e0 none repeat scroll 0 0;border: 1px solid #909090;} \
-                               .urs p {margin: 0 0 0.8em 0;}'
+    extra_css               = '''p.perex{font-size: 1.2em; margin: 0 0 10px 0; line-height: 1.4; padding: 0 0 10px 0; font-weight: bold;}
+                                 p.perex img {display:none;}
+                                 span.author {font-size:0.8em; font-style:italic}
+                                 .urs div.rs-tip-major {padding:0.5em; background: #e0e0e0 none repeat scroll 0 0;border: 1px solid #909090;}
+                                 .urs p {margin: 0 0 0.8em 0;}'''
 
     feeds = [
         (u'Aktuality', 'http://www.vitalia.cz/rss/aktuality/'),
diff --git a/recipes/volksrant.recipe b/recipes/volksrant.recipe
index 6fe050a769..2b86535dbf 100644
--- a/recipes/volksrant.recipe
+++ b/recipes/volksrant.recipe
@@ -34,7 +34,7 @@ class Volkskrant(BasicNewsRecipe):
         dict(attrs={'data-element-id': ['article-element-authors']}),
         dict(name=['script', 'noscript', 'style']),
     ]
-    remove_attributes = ["class", "id", "name", "style"]
+    remove_attributes = ['class', 'id', 'name', 'style']
     encoding = 'utf-8'
     no_stylesheets = True
     ignore_duplicate_articles = {'url'}
@@ -69,7 +69,7 @@ class Volkskrant(BasicNewsRecipe):
                         'span', attrs={'class': 'teaser__title__value--short'}
                     )
                 ).strip()
-                if teaser_label.lower() == "podcast":
+                if teaser_label.lower() == 'podcast':
                     continue
                 parts = []
                 if teaser_label:
@@ -101,10 +101,10 @@ class Volkskrant(BasicNewsRecipe):
                     tag['src'] = 'https://www.volkskrant.nl' + tag['src']
 
         for tag in soup():
-            if tag.name == "picture":
-                tag.replaceWith(tag.find("img"))
+            if tag.name == 'picture':
+                tag.replaceWith(tag.find('img'))
 
-        comic_articles = { "Bas van der Schot", "Poldermodellen", "Gummbah", "Sigmund" }
+        comic_articles = {'Bas van der Schot', 'Poldermodellen', 'Gummbah', 'Sigmund'}
         if self.tag_to_string(soup.find('h1')).strip() in comic_articles:
             for node in soup.find('figure').find_next_siblings():
                 node.extract()
@@ -116,8 +116,8 @@ class Volkskrant(BasicNewsRecipe):
             'Accept': 'application/json, text/javascript, */*; q=0.01',
             'DNT': '1',
         }
-        url = "https://login-api.e-pages.dk/v1/krant.volkskrant.nl/folders"
+        url = 'https://login-api.e-pages.dk/v1/krant.volkskrant.nl/folders'
         with closing(self.browser.open(Request(url, None, headers))) as r:
             folders = json.loads(r.read())
-            return folders["objects"][0]["teaser_medium"]
+            return folders['objects'][0]['teaser_medium']
         return None
diff --git a/recipes/vreme.recipe b/recipes/vreme.recipe
index f8b88e67eb..febbabf1bb 100644
--- a/recipes/vreme.recipe
+++ b/recipes/vreme.recipe
@@ -26,7 +26,7 @@ class Vreme(BasicNewsRecipe):
     language = 'sr'
     publication_type = 'magazine'
     masthead_url = 'http://www.vreme.com/g/vreme-logo.gif'
-    extra_css            = """
+    extra_css            = '''
                               @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)}
                               @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)}
                               body{font-family: serif1, serif}
@@ -35,13 +35,13 @@ class Vreme(BasicNewsRecipe):
                               .column-heading1{font-family: sans1, sans-serif; font-size: x-large}
                               .column-normal{font-family: sans1, sans-serif; font-size: medium}
                               .large{font-family: sans1, sans-serif; font-size: large}
-                           """
+                           '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language, 'linearize_tables': True
     }
 
-    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]  # noqa: RUF039
     remove_tags_before = dict(attrs={'class': 'toc-heading'})
     remove_tags_after = dict(attrs={'class': 'footer'})
 
diff --git a/recipes/walla.recipe b/recipes/walla.recipe
index 5760a71e58..226c22b4ee 100644
--- a/recipes/walla.recipe
+++ b/recipes/walla.recipe
@@ -9,7 +9,7 @@ class AdvancedUserRecipe1283848012(BasicNewsRecipe):
     title = u'Walla'
     language = 'he'
     __author__ = 'marbs & barakplasma'
-    extra_css = 'body{direction: rtl;},title{direction: rtl; } ,article_description{direction: rtl; }, a.article{direction: rtl; } ,calibre_feed_description{direction: rtl; }'  # noqa
+    extra_css = 'body{direction: rtl;},title{direction: rtl; } ,article_description{direction: rtl; }, a.article{direction: rtl; } ,calibre_feed_description{direction: rtl; }'  # noqa: E501
     simultaneous_downloads = 5
     timefmt = '[%d/%m/%y %H:%M]'
     oldest_article = 1
@@ -19,7 +19,6 @@ class AdvancedUserRecipe1283848012(BasicNewsRecipe):
         dict(name='p', attrs={'class': 'subtitle'}),
         dict(name='p', attrs={'class': 'article_speakable'}),
     ]
-    max_articles_per_feed = 100
 
     feeds = [
         (u'חדשות', u'https://rss.walla.co.il/feed/1?type=main'),
diff --git a/recipes/warentest.recipe b/recipes/warentest.recipe
index a7399c0722..b91777c85b 100644
--- a/recipes/warentest.recipe
+++ b/recipes/warentest.recipe
@@ -4,7 +4,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Warentest(BasicNewsRecipe):
     title = u'Warentest'
     language = 'de'
-    description = 'Stiftung Warentest is a German consumer organisation and foundation involved in investigating and comparing goods and services in an unbiased way'  # noqa
+    description = 'Stiftung Warentest is a German consumer organisation and foundation involved in investigating and comparing goods and services in an unbiased way'  # noqa: E501
     __author__ = 'asdfdsfksd'
     needs_subscription = False
     max_articles_per_feed = 100
diff --git a/recipes/wash_post.recipe b/recipes/wash_post.recipe
index ae615a47cf..741d589557 100644
--- a/recipes/wash_post.recipe
+++ b/recipes/wash_post.recipe
@@ -16,7 +16,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class TheWashingtonPost(BasicNewsRecipe):
     title = 'The Washington Post'
     __author__ = 'Darko Miletic, unkn0wn'
-    description = 'Leading source for news, video and opinion on politics, business, world and national news, science, travel, entertainment and more. Our local coverage includes reporting on education, crime, weather, traffic, real estate, jobs and cars for DC, Maryland and Virginia. Offering award-winning opinion writing, entertainment information and restaurant reviews.'  # noqa
+    description = 'Leading source for news, video and opinion on politics, business, world and national news, science, travel, entertainment and more. Our local coverage includes reporting on education, crime, weather, traffic, real estate, jobs and cars for DC, Maryland and Virginia. Offering award-winning opinion writing, entertainment information and restaurant reviews.'  # noqa: E501
     publisher = 'The Washington Post Company'
     category = 'news, politics, USA'
     oldest_article = 1.2
@@ -87,8 +87,8 @@ class TheWashingtonPost(BasicNewsRecipe):
 
         author = ''
         if 'credits' in data:
-            author = '<div><span class="auth">' + 'By ' + ', '.join(x['name'] for x in data['credits']['by']) \
-                 + '</span> | <span class="time">' + data['publish_date'][:-14] + '</span></div>'
+            author = ('<div><span class="auth">' + 'By ' + ', '.join(x['name'] for x in data['credits']['by']) +
+                      '</span> | <span class="time">' + data['publish_date'][:-14] + '</span></div>')
 
         body = ''
         for x in data['content_elements']:
diff --git a/recipes/wash_post_print.recipe b/recipes/wash_post_print.recipe
index 46e77b454d..14db183c43 100644
--- a/recipes/wash_post_print.recipe
+++ b/recipes/wash_post_print.recipe
@@ -77,8 +77,8 @@ class wapoprint(BasicNewsRecipe):
 
         author = ''
         if 'credits' in data:
-            author = '<div><span class="auth">' + 'By ' + ', '.join(x['name'] for x in data['credits']['by']) \
-                 + '</span> | <span class="time">' + data['publish_date'][:-14] + '</span></div>'
+            author = ('<div><span class="auth">' + 'By ' + ', '.join(x['name'] for x in data['credits']['by']) +
+                      '</span> | <span class="time">' + data['publish_date'][:-14] + '</span></div>')
 
         body = ''
         for x in data['content_elements']:
diff --git a/recipes/weblogs_sl.recipe b/recipes/weblogs_sl.recipe
index 571ad1c55b..94f400ae47 100644
--- a/recipes/weblogs_sl.recipe
+++ b/recipes/weblogs_sl.recipe
@@ -29,58 +29,58 @@ class weblogssl(BasicNewsRecipe):
     no_stylesheets = True
 
     # Si no se quiere recuperar todos los blogs se puede suprimir la descarga del que se desee poniendo
-    # un caracter # por delante, es decir,  # ,(u'Applesfera', u'http://feeds.weblogssl.com/applesfera')
+    # un caracter # por delante, es decir,  # (u'Applesfera', u'http://feeds.weblogssl.com/applesfera'),
     # haría que no se descargase Applesfera.
 
     feeds              = [
-        (u'Xataka', u'http://feeds.weblogssl.com/xataka2')
-        ,(u'Xataka M\xf3vil', u'http://feeds.weblogssl.com/xatakamovil')
-        ,(u'Xataka Foto', u'http://feeds.weblogssl.com/xatakafoto')
-        ,(u'Xataka Android', u'http://feeds.weblogssl.com/xatakandroid')
-        ,(u'Xataka Smart Home', u'http://feeds.weblogssl.com/Xatakahome')
-        ,(u'Xataka Windows', u'http://feeds.weblogssl.com/xatakawindows')
-        ,(u'Xataka Ciencia', u'http://feeds.weblogssl.com/xatakaciencia')
-        ,(u'Applesfera', u'http://feeds.weblogssl.com/applesfera')
-        ,(u'Vida Extra', u'http://feeds.weblogssl.com/vidaextra')
-        ,(u'Genbeta', u'http://feeds.weblogssl.com/genbeta')
-        ,(u'Genbeta Dev', u'http://feeds.weblogssl.com/genbetadev')
-        ,(u'Magnet', u'http://feeds.weblogssl.com/xatakamagnet2')
+        (u'Xataka', u'http://feeds.weblogssl.com/xataka2'),
+        (u'Xataka M\xf3vil', u'http://feeds.weblogssl.com/xatakamovil'),
+        (u'Xataka Foto', u'http://feeds.weblogssl.com/xatakafoto'),
+        (u'Xataka Android', u'http://feeds.weblogssl.com/xatakandroid'),
+        (u'Xataka Smart Home', u'http://feeds.weblogssl.com/Xatakahome'),
+        (u'Xataka Windows', u'http://feeds.weblogssl.com/xatakawindows'),
+        (u'Xataka Ciencia', u'http://feeds.weblogssl.com/xatakaciencia'),
+        (u'Applesfera', u'http://feeds.weblogssl.com/applesfera'),
+        (u'Vida Extra', u'http://feeds.weblogssl.com/vidaextra'),
+        (u'Genbeta', u'http://feeds.weblogssl.com/genbeta'),
+        (u'Genbeta Dev', u'http://feeds.weblogssl.com/genbetadev'),
+        (u'Magnet', u'http://feeds.weblogssl.com/xatakamagnet2'),
 
 
-        ,(u'Tendencias', u'http://feeds.weblogssl.com/trendencias')
-        ,(u'Tendencias Belleza', u'http://feeds.weblogssl.com/trendenciasbelleza')
-        ,(u'Tendencias Hombre', u'http://feeds.weblogssl.com/trendenciashombre')
-        ,(u'Tendencias Lifestyle', u'http://feeds.weblogssl.com/trendenciaslifestyle')
-        ,(u'Directo al paladar', u'http://feeds.weblogssl.com/directoalpaladar')
-        ,(u'Beb\xe9s y m\xe1s', u'http://feeds.weblogssl.com/bebesymas')
-        ,(u'Vit\xf3nica', u'http://feeds.weblogssl.com/vitonica')
-        ,(u'Decoesfera', u'http://feeds.weblogssl.com/decoesfera')
-        ,(u'Embelezzia', u'http://feeds.weblogssl.com/embelezzia')
-        ,(u'Pop rosa', u'http://feeds.weblogssl.com/poprosa')
+        (u'Tendencias', u'http://feeds.weblogssl.com/trendencias'),
+        (u'Tendencias Belleza', u'http://feeds.weblogssl.com/trendenciasbelleza'),
+        (u'Tendencias Hombre', u'http://feeds.weblogssl.com/trendenciashombre'),
+        (u'Tendencias Lifestyle', u'http://feeds.weblogssl.com/trendenciaslifestyle'),
+        (u'Directo al paladar', u'http://feeds.weblogssl.com/directoalpaladar'),
+        (u'Beb\xe9s y m\xe1s', u'http://feeds.weblogssl.com/bebesymas'),
+        (u'Vit\xf3nica', u'http://feeds.weblogssl.com/vitonica'),
+        (u'Decoesfera', u'http://feeds.weblogssl.com/decoesfera'),
+        (u'Embelezzia', u'http://feeds.weblogssl.com/embelezzia'),
+        (u'Pop rosa', u'http://feeds.weblogssl.com/poprosa'),
 
-        ,(u'Motorpasi\xf3n', u'http://feeds.weblogssl.com/motorpasion')
-        ,(u'Motorpasi\xf3n Moto', u'http://feeds.weblogssl.com/motorpasionmoto')
-        ,(u'Motorpasi\xf3n Futuro', u'http://feeds.weblogssl.com/motorpasionfuturo')
+        (u'Motorpasi\xf3n', u'http://feeds.weblogssl.com/motorpasion'),
+        (u'Motorpasi\xf3n Moto', u'http://feeds.weblogssl.com/motorpasionmoto'),
+        (u'Motorpasi\xf3n Futuro', u'http://feeds.weblogssl.com/motorpasionfuturo'),
 
-        ,(u'Blog de Cine', u'http://feeds.weblogssl.com/blogdecine')
-        ,(u'Vaya tele', u'http://feeds.weblogssl.com/vayatele2')
-        ,(u'Diario del viajero', u'http://feeds.weblogssl.com/diariodelviajero')
-        ,(u'Papel en blanco', u'http://feeds.weblogssl.com/papelenblanco')
+        (u'Blog de Cine', u'http://feeds.weblogssl.com/blogdecine'),
+        (u'Vaya tele', u'http://feeds.weblogssl.com/vayatele2'),
+        (u'Diario del viajero', u'http://feeds.weblogssl.com/diariodelviajero'),
+        (u'Papel en blanco', u'http://feeds.weblogssl.com/papelenblanco'),
 
-        ,(u'El blog salm\xf3n', u'http://feeds.weblogssl.com/elblogsalmon2')
-        ,(u'Pymes y aut\xf3nomos', u'http://feeds.weblogssl.com/pymesyautonomos')
-        ,(u'Ahorro diario', u'http://feeds.weblogssl.com/ahorrodiario')
+        (u'El blog salm\xf3n', u'http://feeds.weblogssl.com/elblogsalmon2'),
+        (u'Pymes y aut\xf3nomos', u'http://feeds.weblogssl.com/pymesyautonomos'),
+        (u'Ahorro diario', u'http://feeds.weblogssl.com/ahorrodiario'),
 
-        ,(u'Xataka México', u'http://feeds.weblogssl.com/xatakamx')
-        ,(u'Xataka Android México', u'http://feeds.weblogssl.com/xatakandroidmx')
-        ,(u'Vida Extra México', u'http://feeds.weblogssl.com/vidaextramx')
-        ,(u'Xataka Colombia', u'http://feeds.weblogssl.com/xatakaco')
+        (u'Xataka México', u'http://feeds.weblogssl.com/xatakamx'),
+        (u'Xataka Android México', u'http://feeds.weblogssl.com/xatakandroidmx'),
+        (u'Vida Extra México', u'http://feeds.weblogssl.com/vidaextramx'),
+        (u'Xataka Colombia', u'http://feeds.weblogssl.com/xatakaco'),
 
-        ,(u'Directo al paladar México', u'http://feeds.weblogssl.com/directoalpaladarmx')
-        ,(u'Vit\xf3nica México', u'http://feeds.weblogssl.com/vitonicamx')
-        ,(u'Tendencias Hombre México', u'http://feeds.weblogssl.com/trendenciashombremx')
+        (u'Directo al paladar México', u'http://feeds.weblogssl.com/directoalpaladarmx'),
+        (u'Vit\xf3nica México', u'http://feeds.weblogssl.com/vitonicamx'),
+        (u'Tendencias Hombre México', u'http://feeds.weblogssl.com/trendenciashombremx'),
 
-        ,(u'Motorpasi\xf3n México', u'http://feeds.weblogssl.com/motorpasionmx')
+        (u'Motorpasi\xf3n México', u'http://feeds.weblogssl.com/motorpasionmx'),
     ]
 
     keep_only_tags     = [
@@ -101,7 +101,7 @@ class weblogssl(BasicNewsRecipe):
                           dict(name='div', attrs={'id':'comments'})
                          ]
 
-    remove_tags_after  = dict(name='div' , attrs={'id':'comments'})
+    remove_tags_after  = dict(name='div', attrs={'id':'comments'})
 
     def print_version(self, url):
         if url.startswith('http://www'):
diff --git a/recipes/wenxuecity-znjy.recipe b/recipes/wenxuecity-znjy.recipe
index b76aa8ac2c..a3793eddf6 100644
--- a/recipes/wenxuecity-znjy.recipe
+++ b/recipes/wenxuecity-znjy.recipe
@@ -46,7 +46,7 @@ class TheCND(BasicNewsRecipe):
                                 self.tag_to_string(a.parent))
             date = '%(y)s/%(m)02d/%(d)02d' % {'y': dateReg.group(3),
                                               'm': int(dateReg.group(1)), 'd': int(dateReg.group(2))}
-            if date not in articles:  # noqa
+            if date not in articles:
                 articles[date] = []
             articles[date].append(
                 {'title': title, 'url': url, 'description': '', 'date': ''})
@@ -63,4 +63,3 @@ class TheCND(BasicNewsRecipe):
     def populate_article_metadata(self, article, soup, first):
         header = soup.find('h3')
         self.log('header: ' + self.tag_to_string(header))
-        pass
diff --git a/recipes/wicomix.recipe b/recipes/wicomix.recipe
index 17da0fdb20..b97f1a5825 100644
--- a/recipes/wicomix.recipe
+++ b/recipes/wicomix.recipe
@@ -9,7 +9,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class WiComix(BasicNewsRecipe):
     title                 = 'Wicomix'
     __author__            = 'bugmen00t'
-    description           = '\u0418\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u043E \u043F\u0438\u0448\u0435\u043C \u043F\u0440\u043E \u043A\u043E\u043C\u0438\u043A\u0441\u044B \u0438 \u043C\u0430\u043D\u0433\u0443 \u0432 \u0420\u043E\u0441\u0441\u0438\u0438.'  # noqa
+    description           = '\u0418\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u043E \u043F\u0438\u0448\u0435\u043C \u043F\u0440\u043E \u043A\u043E\u043C\u0438\u043A\u0441\u044B \u0438 \u043C\u0430\u043D\u0433\u0443 \u0432 \u0420\u043E\u0441\u0441\u0438\u0438.'  # noqa: E501
     publisher             = '\u0421\u0435\u0440\u0433\u0435\u0439 \u041E\u0440\u0435\u0448\u043A\u0438\u043D'
     category              = 'blog'
     cover_url = u'https://wicomix.files.wordpress.com/2016/03/10865972_581683525300298_6873875730458476144_o.jpg'
@@ -24,13 +24,13 @@ class WiComix(BasicNewsRecipe):
 
     remove_tags_after = dict(name='article')
 
-    remove_tags =   [
-#        dict(name='div', attrs={'class': 'author-meta'}),
+    remove_tags = [
+        # dict(name='div', attrs={'class': 'author-meta'}),
         dict(name='div', attrs={'id': 'jp-post-flair'}),
         dict(name='footer', attrs={'class': 'entry-meta'})
         ]
 
     feeds = [
         ('\u041F\u0443\u0431\u043B\u0438\u043A\u0430\u0446\u0438\u0438', 'https://wicomix.com/feed/')
-#        ('\u041A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438', 'https://wicomix.com/comments/feed/')
+        # ('\u041A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438', 'https://wicomix.com/comments/feed/')
     ]
diff --git a/recipes/windows_star.recipe b/recipes/windows_star.recipe
index 07158419d8..714011f6de 100644
--- a/recipes/windows_star.recipe
+++ b/recipes/windows_star.recipe
@@ -17,14 +17,14 @@ class CanWestPaper(BasicNewsRecipe):
     description = u'News from Windsor, ON'
 
     # un-comment the following three lines for the Ottawa Citizen
-    # title = u'Ottawa Citizen'
-    # url_prefix = 'http://www.ottawacitizen.com'
-    # description = u'News from Ottawa, ON'
-    #
+    # #    title = u'Ottawa Citizen'
+    # #    url_prefix = 'http://www.ottawacitizen.com'
+    # #    description = u'News from Ottawa, ON'
+
     # un-comment the following three lines for the Montreal Gazette
-    # title = u'Montreal Gazette'
-    # url_prefix = 'http://www.montrealgazette.com'
-    # description = u'News from Montreal, QC'
+    # #    title = u'Montreal Gazette'
+    # #    url_prefix = 'http://www.montrealgazette.com'
+    # #    description = u'News from Montreal, QC'
 
     language = 'en_CA'
     __author__ = 'Nick Redding'
@@ -57,7 +57,7 @@ class CanWestPaper(BasicNewsRecipe):
         divtags = soup.findAll('div', attrs={'id': ''})
         if divtags:
             for div in divtags:
-                del(div['id'])
+                del div['id']
         return soup
 
     def parse_index(self):
@@ -69,14 +69,14 @@ class CanWestPaper(BasicNewsRecipe):
         ans = ['News']
 
         # Find each instance of class="sectiontitle", class="featurecontent"
-        for divtag in soup.findAll('div', attrs={'class': ["section_title02", "featurecontent"]}):
+        for divtag in soup.findAll('div', attrs={'class': ['section_title02', 'featurecontent']}):
             if 'section_title' in ''.join(divtag['class']):
                 # div contains section title
                 if not divtag.h3:
                     continue
                 key = self.tag_to_string(divtag.h3, False)
                 ans.append(key)
-                self.log("Section name %s" % key)
+                self.log('Section name %s' % key)
                 continue
             # div contains article data
             h1tag = divtag.find('h1')
diff --git a/recipes/windsor_star.recipe b/recipes/windsor_star.recipe
index 763f8cfa4f..24c041f9c3 100644
--- a/recipes/windsor_star.recipe
+++ b/recipes/windsor_star.recipe
@@ -15,46 +15,46 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class CanWestPaper(BasicNewsRecipe):
 
     # un-comment the following four lines for the Victoria Times Colonist
-    #     title = u'Victoria Times Colonist'
-    #     url_prefix = 'http://www.timescolonist.com'
-    #     description = u'News from Victoria, BC'
-    #     fp_tag = 'CAN_TC'
+    # #    title = u'Victoria Times Colonist'
+    # #    url_prefix = 'http://www.timescolonist.com'
+    # #    description = u'News from Victoria, BC'
+    # #    fp_tag = 'CAN_TC'
 
     # un-comment the following four lines for the Vancouver Province
-    #     title = u'Vancouver Province'
-    #     url_prefix = 'http://www.theprovince.com'
-    #     description = u'News from Vancouver, BC'
-    #     fp_tag = 'CAN_VP'
+    # #    title = u'Vancouver Province'
+    # #    url_prefix = 'http://www.theprovince.com'
+    # #    description = u'News from Vancouver, BC'
+    # #    fp_tag = 'CAN_VP'
 
     # un-comment the following four lines for the Vancouver Sun
-    #     title = u'Vancouver Sun'
-    #     url_prefix = 'http://www.vancouversun.com'
-    #     description = u'News from Vancouver, BC'
-    #     fp_tag = 'CAN_VS'
+    # #    title = u'Vancouver Sun'
+    # #    url_prefix = 'http://www.vancouversun.com'
+    # #    description = u'News from Vancouver, BC'
+    # #    fp_tag = 'CAN_VS'
 
     # un-comment the following four lines for the Edmonton Journal
-    #     title = u'Edmonton Journal'
-    #     url_prefix = 'http://www.edmontonjournal.com'
-    #     description = u'News from Edmonton, AB'
-    #     fp_tag = 'CAN_EJ'
+    # #    title = u'Edmonton Journal'
+    # #    url_prefix = 'http://www.edmontonjournal.com'
+    # #    description = u'News from Edmonton, AB'
+    # #    fp_tag = 'CAN_EJ'
 
     # un-comment the following four lines for the Calgary Herald
-    #     title = u'Calgary Herald'
-    #     url_prefix = 'http://www.calgaryherald.com'
-    #     description = u'News from Calgary, AB'
-    #     fp_tag = 'CAN_CH'
+    # #    title = u'Calgary Herald'
+    # #    url_prefix = 'http://www.calgaryherald.com'
+    # #    description = u'News from Calgary, AB'
+    # #    fp_tag = 'CAN_CH'
 
     # un-comment the following four lines for the Regina Leader-Post
-    #     title = u'Regina Leader-Post'
-    #     url_prefix = 'http://www.leaderpost.com'
-    #     description = u'News from Regina, SK'
-    #     fp_tag = ''
+    # #    title = u'Regina Leader-Post'
+    # #    url_prefix = 'http://www.leaderpost.com'
+    # #    description = u'News from Regina, SK'
+    # #    fp_tag = ''
 
     # un-comment the following four lines for the Saskatoon Star-Phoenix
-    #     title = u'Saskatoon Star-Phoenix'
-    #     url_prefix = 'http://www.thestarphoenix.com'
-    #     description = u'News from Saskatoon, SK'
-    #     fp_tag = ''
+    # #    title = u'Saskatoon Star-Phoenix'
+    # #    url_prefix = 'http://www.thestarphoenix.com'
+    # #    description = u'News from Saskatoon, SK'
+    # #    fp_tag = ''
 
     # un-comment the following four lines for the Windsor Star
     title = u'Windsor Star'
@@ -63,16 +63,16 @@ class CanWestPaper(BasicNewsRecipe):
     fp_tag = 'CAN_'
 
     # un-comment the following four lines for the Ottawa Citizen
-    #     title = u'Ottawa Citizen'
-    #     url_prefix = 'http://www.ottawacitizen.com'
-    #     description = u'News from Ottawa, ON'
-    #     fp_tag = 'CAN_OC'
+    # #    title = u'Ottawa Citizen'
+    # #    url_prefix = 'http://www.ottawacitizen.com'
+    # #    description = u'News from Ottawa, ON'
+    # #    fp_tag = 'CAN_OC'
 
     # un-comment the following four lines for the Montreal Gazette
-    #     title = u'Montreal Gazette'
-    #     url_prefix = 'http://www.montrealgazette.com'
-    #     description = u'News from Montreal, QC'
-    #     fp_tag = 'CAN_MG'
+    # #    title = u'Montreal Gazette'
+    # #    url_prefix = 'http://www.montrealgazette.com'
+    # #    description = u'News from Montreal, QC'
+    # #    fp_tag = 'CAN_MG'
 
     language = 'en_CA'
     __author__ = 'Nick Redding'
@@ -113,8 +113,7 @@ class CanWestPaper(BasicNewsRecipe):
         except:
             while daysback < 7:
                 cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg' + \
-                    str((date.today() - timedelta(days=daysback)).day) + \
-                    '/lg/' + self.fp_tag + '.jpg'
+                    str((date.today() - timedelta(days=daysback)).day) + '/lg/' + self.fp_tag + '.jpg'
                 br = BasicNewsRecipe.get_browser(self)
                 try:
                     br.open(cover)
@@ -123,24 +122,24 @@ class CanWestPaper(BasicNewsRecipe):
                     continue
                 break
         if daysback == 7:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             cover = None
         return cover
 
     def fixChars(self, string):
         # Replace lsquo (\x91)
-        fixed = re.sub("\x91", "‘", string)
+        fixed = string.replace('\x91', '‘')
         # Replace rsquo (\x92)
-        fixed = re.sub("\x92", "’", fixed)
+        fixed = fixed.replace('\x92', '’')
         # Replace ldquo (\x93)
-        fixed = re.sub("\x93", "“", fixed)
+        fixed = fixed.replace('\x93', '“')
         # Replace rdquo (\x94)
-        fixed = re.sub("\x94", "”", fixed)
+        fixed = fixed.replace('\x94', '”')
         # Replace ndash (\x96)
-        fixed = re.sub("\x96", "–", fixed)
+        fixed = fixed.replace('\x96', '–')
         # Replace mdash (\x97)
-        fixed = re.sub("\x97", "—", fixed)
-        fixed = re.sub("&#x2019;", "’", fixed)
+        fixed = fixed.replace('\x97', '—')
+        fixed = fixed.replace('&#x2019;', '’')
         return fixed
 
     def massageNCXText(self, description):
@@ -180,7 +179,7 @@ class CanWestPaper(BasicNewsRecipe):
         ans = ['News']
 
         # Find each instance of class="sectiontitle", class="featurecontent"
-        for divtag in soup.findAll('div', attrs={'class': ["section_title02", "featurecontent"]}):
+        for divtag in soup.findAll('div', attrs={'class': ['section_title02', 'featurecontent']}):
             # self.log(" div class = %s" % divtag['class'])
             if ''.join(divtag['class']).startswith('section_title'):
                 # div contains section title
@@ -188,7 +187,7 @@ class CanWestPaper(BasicNewsRecipe):
                     continue
                 key = self.tag_to_string(divtag.h3, False)
                 ans.append(key)
-                self.log("Section name %s" % key)
+                self.log('Section name %s' % key)
                 continue
             # div contains article data
             h1tag = divtag.find('h1')
diff --git a/recipes/wired.recipe b/recipes/wired.recipe
index cc1d5d021a..8d438fbcad 100644
--- a/recipes/wired.recipe
+++ b/recipes/wired.recipe
@@ -32,14 +32,14 @@ class WiredDailyNews(BasicNewsRecipe):
     language = 'en'
     ignore_duplicate_articles = {'url'}
     remove_empty_feeds = True
-    extra_css             = """
+    extra_css             = '''
                             .entry-header{
                                           text-transform: uppercase;
                                           vertical-align: baseline;
                                           display: inline;
                                          }
                             ul li{display: inline}
-                            """
+                            '''
 
     keep_only_tags = [
         classes('content-header lead-asset article__body'),
@@ -57,7 +57,7 @@ class WiredDailyNews(BasicNewsRecipe):
         self.log('Parsing index page', currenturl)
         soup = self.index_to_soup(currenturl)
         baseurl = 'https://www.wired.com'
-        for a in soup.find("div", {"class" : 'multi-packages'}).findAll('a', href=True):
+        for a in soup.find('div', {'class': 'multi-packages'}).findAll('a', href=True):
             url = a['href']
             if url.startswith('/story') and url.endswith('/'):
                 title = self.tag_to_string(a.parent.find('h3'))
diff --git a/recipes/wired_daily.recipe b/recipes/wired_daily.recipe
index c8e1918423..f73c682219 100644
--- a/recipes/wired_daily.recipe
+++ b/recipes/wired_daily.recipe
@@ -37,14 +37,14 @@ class WiredDailyNews(BasicNewsRecipe):
     ignore_duplicate_articles = {'url'}
     remove_empty_feeds = True
     publication_type = 'newsportal'
-    extra_css = """
+    extra_css = '''
         .entry-header{
                         text-transform: uppercase;
                         vertical-align: baseline;
                         display: inline;
                         }
         ul li{display: inline}
-    """
+    '''
 
     recipe_specific_options = {
         'days': {
diff --git a/recipes/wnp.recipe b/recipes/wnp.recipe
index c4ddbf0cca..7cba0290e3 100644
--- a/recipes/wnp.recipe
+++ b/recipes/wnp.recipe
@@ -10,8 +10,8 @@ class WNP(BasicNewsRecipe):
     description = u'Wirtualny Nowy Przemysł'
     category = 'economy'
     language = 'pl'
-    preprocess_regexps = [(re.compile(u'Czytaj też:.*?</a>', re.DOTALL), lambda match: ''),
-                          (re.compile(u'Czytaj więcej:.*?</a>', re.DOTALL), lambda match: '')]
+    preprocess_regexps = [(re.compile(u'Czytaj też:.*?</a>', re.DOTALL), lambda match: ''),  # noqa: RUF039
+                          (re.compile(u'Czytaj więcej:.*?</a>', re.DOTALL), lambda match: '')]  # noqa: RUF039
     oldest_article = 8
     max_articles_per_feed = 100
     no_stylesheets = True
diff --git a/recipes/wonderzine.recipe b/recipes/wonderzine.recipe
index 21f2222cb5..76632e55af 100644
--- a/recipes/wonderzine.recipe
+++ b/recipes/wonderzine.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Wonderzine(BasicNewsRecipe):
     title = 'Wonderzine'
     __author__ = 'bugmen00t'
-    description = '\u041E\u043D\u043B\u0430\u0439\u043D-\u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u0434\u043B\u044F \u0441\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0445 \u0436\u0435\u043D\u0449\u0438\u043D \u0438 \u0438\u0445 \u0434\u0440\u0443\u0437\u0435\u0439. \u041C\u044B \u043F\u0438\u0448\u0435\u043C \u043E \u043C\u043E\u0434\u0435 \u0438 \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0435, \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0445 \u0442\u0435\u043D\u0434\u0435\u043D\u0446\u0438\u044F\u0445 \u0438 \u0440\u0430\u0437\u0432\u043B\u0435\u0447\u0435\u043D\u0438\u044F\u0445, \u0437\u0434\u043E\u0440\u043E\u0432\u044C\u0435 \u0438 \u0441\u0435\u043A\u0441\u0435, \u044D\u0442\u0438\u043A\u0435 \u0438 \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044F\u0445, \u043E\u0441\u043E\u0437\u043D\u0430\u043D\u043D\u044B\u0445 \u0442\u0440\u0430\u0442\u0430\u0445 \u0438 \u0440\u0430\u0437\u043D\u043E\u043E\u0431\u0440\u0430\u0437\u0438\u0438 \u043A\u0440\u0430\u0441\u043E\u0442\u044B.'  # noqa
+    description = '\u041E\u043D\u043B\u0430\u0439\u043D-\u0438\u0437\u0434\u0430\u043D\u0438\u0435 \u0434\u043B\u044F \u0441\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0445 \u0436\u0435\u043D\u0449\u0438\u043D \u0438 \u0438\u0445 \u0434\u0440\u0443\u0437\u0435\u0439. \u041C\u044B \u043F\u0438\u0448\u0435\u043C \u043E \u043C\u043E\u0434\u0435 \u0438 \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0435, \u043E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0445 \u0442\u0435\u043D\u0434\u0435\u043D\u0446\u0438\u044F\u0445 \u0438 \u0440\u0430\u0437\u0432\u043B\u0435\u0447\u0435\u043D\u0438\u044F\u0445, \u0437\u0434\u043E\u0440\u043E\u0432\u044C\u0435 \u0438 \u0441\u0435\u043A\u0441\u0435, \u044D\u0442\u0438\u043A\u0435 \u0438 \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044F\u0445, \u043E\u0441\u043E\u0437\u043D\u0430\u043D\u043D\u044B\u0445 \u0442\u0440\u0430\u0442\u0430\u0445 \u0438 \u0440\u0430\u0437\u043D\u043E\u043E\u0431\u0440\u0430\u0437\u0438\u0438 \u043A\u0440\u0430\u0441\u043E\u0442\u044B.'  # noqa: E501
     publisher = 'Redefine Media holding'
     category = 'blog'
     cover_url = u'https://lamcdn.net/wonderzine.com/post-og_image/WQRiRGqLlcKyEHsnOS-sUw.png'
diff --git a/recipes/words_without_borders.recipe b/recipes/words_without_borders.recipe
index 136ed8f14c..cc3a9b7c74 100644
--- a/recipes/words_without_borders.recipe
+++ b/recipes/words_without_borders.recipe
@@ -19,7 +19,7 @@ class AdvancedUserRecipe1308302002(BasicNewsRecipe):
     remove_tags_after = [
         {'class': 'addthis_toolbox addthis_default_style no_print'}]
     remove_tags = [{'class': ['posterous_quote_citation', 'button']}]
-    extra_css             = """
-                               h1{font-family: Georgia,serif; font-size: large}h2{font-family: Georgia,serif; font-size: large} """
+    extra_css             = '''
+                               h1{font-family: Georgia,serif; font-size: large}h2{font-family: Georgia,serif; font-size: large} '''
 
     feeds = [(u'wwb', u'http://feeds.feedburner.com/wwborders?format=xml')]
diff --git a/recipes/woz_die.recipe b/recipes/woz_die.recipe
index 55f39fdd1a..e48c2d630a 100644
--- a/recipes/woz_die.recipe
+++ b/recipes/woz_die.recipe
@@ -8,9 +8,11 @@ class WozDie(BasicNewsRecipe):
     language = 'de'
 
     no_stylesheets = True
-    remove_tags = [dict(name='p', attrs={'class': 'arrow_top'})]
-    remove_tags = [dict(name='p', attrs={'class': 'bottom_right'})]
-    remove_tags = [dict(name='script')]
+    remove_tags = [
+        dict(name='p', attrs={'class': 'arrow_top'}),
+        dict(name='p', attrs={'class': 'bottom_right'}),
+        dict(name='script'),
+    ]
     extra_css      = '''#print_titel{vertical-align: bottom; text-align:
  left; color: #666666; background-color: white; padding-top: 30px; padding-
  bottom: 10px; border-bottom: 1px solid #999999;} #title{text-align:
diff --git a/recipes/wsj.recipe b/recipes/wsj.recipe
index a588271ce0..cafc013445 100644
--- a/recipes/wsj.recipe
+++ b/recipes/wsj.recipe
@@ -14,7 +14,7 @@ class WSJ(BasicNewsRecipe):
     __author__ = 'unkn0wn'
     description = (
         'The Print Edition of WSJ. The Wall Street Journal is your source for breaking news, analysis and insights from the U.S. and '
-        'around the world, the world\'s leading business and finance publication.'
+        "around the world, the world's leading business and finance publication."
     )
     language = 'en_US'
     masthead_url = 'https://s.wsj.net/media/wsj_amp_masthead_lg.png'
@@ -143,7 +143,7 @@ class WSJ(BasicNewsRecipe):
         br.addheaders += [
             ('Accept-Encoding', 'gzip'),
             ('cache-control', 'no-cache'),
-            ('x-api-key', ('e''b''2''4''0''8''c''d''2''7''f''8''9''1''3''d''4''2''1''f''a''3''d''5''c''3''d''0''7''c''c''f''0''3''4''c''b''4''4''8')),
+            ('x-api-key', ('eb2408cd27f8913d421fa3d5c3d07ccf034cb448')),
         ]
         return br
 
diff --git a/recipes/wsj_free.recipe b/recipes/wsj_free.recipe
index d818c5ec7b..db05c4b22a 100644
--- a/recipes/wsj_free.recipe
+++ b/recipes/wsj_free.recipe
@@ -28,6 +28,7 @@ except ImportError:
 
 needs_subscription = False
 
+
 class WSJ(BasicNewsRecipe):
 
     if needs_subscription:
@@ -113,7 +114,7 @@ class WSJ(BasicNewsRecipe):
         for figc in soup.findAll('figcaption'):
             figc['id'] = 'big-top-caption'
         if name:= soup.find('h2', attrs={'itemprop':'name'}):
-                name.extract()
+            name.extract()
         for h2 in soup.findAll('h2'):
             if self.tag_to_string(h2).startswith(('What to Read Next', 'Conversation')):
                 h2.extract()
@@ -154,7 +155,7 @@ class WSJ(BasicNewsRecipe):
             # br.set_debug_http(True)
             res = br.open(start_url)
             sso_url = res.geturl()
-            query =  urlparse.parse_qs(urlparse.urlparse(sso_url).query)
+            query = urlparse.parse_qs(urlparse.urlparse(sso_url).query)
             query = {k:v[0] for k, v in query.items()}
             # pprint(query)
             request_query = {
@@ -180,7 +181,7 @@ class WSJ(BasicNewsRecipe):
             # you can get the version below from lib-min.js
             # search for: "\d+\.\d+\.\d+"
             # This might need to be updated in the future
-            auth0_client = json.dumps({"name": "auth0.js-ulp", "version": "9.11.3"})
+            auth0_client = json.dumps({'name': 'auth0.js-ulp', 'version': '9.11.3'})
             if not isinstance(auth0_client, bytes):
                 auth0_client = auth0_client.encode('utf-8')
             auth0_client = standard_b64encode(auth0_client)
@@ -260,7 +261,7 @@ class WSJ(BasicNewsRecipe):
             articles.append({'title': title, 'url': url,
                              'description': desc, 'date': ''})
             self.log('\tFound article:', title)
-            self.log('\t\t', desc + " " + url)
+            self.log('\t\t', desc + ' ' + url)
             if self.test and len(articles) >= self.test[1]:
                 break
 
diff --git a/recipes/wsj_mag.recipe b/recipes/wsj_mag.recipe
index 8276f27e84..b90a286834 100644
--- a/recipes/wsj_mag.recipe
+++ b/recipes/wsj_mag.recipe
@@ -118,7 +118,7 @@ class WSJ(BasicNewsRecipe):
         br.addheaders += [
             ('Accept-Encoding', 'gzip'),
             ('cache-control', 'no-cache'),
-            ('x-api-key', ('e''b''2''4''0''8''c''d''2''7''f''8''9''1''3''d''4''2''1''f''a''3''d''5''c''3''d''0''7''c''c''f''0''3''4''c''b''4''4''8')),
+            ('x-api-key', ('eb2408cd27f8913d421fa3d5c3d07ccf034cb448')),
         ]
         return br
 
diff --git a/recipes/wsj_news.recipe b/recipes/wsj_news.recipe
index 4d0c53a9fb..eecdc2674c 100644
--- a/recipes/wsj_news.recipe
+++ b/recipes/wsj_news.recipe
@@ -14,7 +14,7 @@ class WSJ(BasicNewsRecipe):
     __author__ = 'unkn0wn'
     description = (
         'The Wall Street Journal is your source for breaking news, analysis and insights from the U.S. and '
-        'around the world, the world\'s leading business and finance publication. Get the Latest News here.'
+        "around the world, the world's leading business and finance publication. Get the Latest News here."
     )
     language = 'en_US'
     masthead_url = 'https://s.wsj.net/media/wsj_amp_masthead_lg.png'
@@ -25,7 +25,7 @@ class WSJ(BasicNewsRecipe):
     resolve_internal_links = True
     ignore_duplicate_articles = {'url', 'title'}
     remove_empty_feeds = True
-    oldest_article = 1.2 # days
+    oldest_article = 1.2  # days
 
     recipe_specific_options = {
         'days': {
@@ -151,7 +151,7 @@ class WSJ(BasicNewsRecipe):
         br.addheaders += [
             ('Accept-Encoding', 'gzip'),
             ('cache-control', 'no-cache'),
-            ('x-api-key', ('e''b''2''4''0''8''c''d''2''7''f''8''9''1''3''d''4''2''1''f''a''3''d''5''c''3''d''0''7''c''c''f''0''3''4''c''b''4''4''8')),
+            ('x-api-key', ('eb2408cd27f8913d421fa3d5c3d07ccf034cb448')),
         ]
         return br
 
diff --git a/recipes/xda.recipe b/recipes/xda.recipe
index 1a6ba8445e..2da3acbe79 100644
--- a/recipes/xda.recipe
+++ b/recipes/xda.recipe
@@ -22,11 +22,11 @@ class AdvancedUserRecipe1718385916(BasicNewsRecipe):
     auto_cleanup   = True
 
     feeds          = [
-        #News & Deals
+        # News & Deals
         ('News', 'https://www.xda-developers.com/feed/news/'),
         ('Computing News', 'https://www.xda-developers.com/feed/category/computing-news/'),
         ('Today’s Deals', 'https://www.xda-developers.com/feed/deals/'),
-        #Reviews
+        # Reviews
         ('Reviews', 'https://www.xda-developers.com/feed/reviews/'),
         ('Laptop Reviews', 'https://www.xda-developers.com/feed/category/computing-reviews/'),
         ('CPU Reviews', 'https://www.xda-developers.com/feed/cpu-reviews/'),
@@ -34,9 +34,9 @@ class AdvancedUserRecipe1718385916(BasicNewsRecipe):
         ('SSD Reviews', 'https://www.xda-developers.com/feed/ssd-reviews/'),
         ('Phone Reviews', 'https://www.xda-developers.com/feed/phone-reviews/'),
         ('XDA’s Product Review Awards', 'https://www.xda-developers.com/feed/awards/'),
-        #Best Guides
+        # Best Guides
         ("Buyer's Guides", 'https://www.xda-developers.com/feed/buying-guides/'),
-        #Tutorials
+        # Tutorials
         ('Tutorials', 'https://www.xda-developers.com/feed/tutorials/'),
         ('Windows Tutorials', 'https://www.xda-developers.com/feed/windows-tutorials/'),
         ('MacOS Tutorials', 'https://www.xda-developers.com/feed/macos-tutorials/'),
diff --git a/recipes/ynet.recipe b/recipes/ynet.recipe
index 155d7459d4..4ad6433c8f 100644
--- a/recipes/ynet.recipe
+++ b/recipes/ynet.recipe
@@ -9,7 +9,7 @@ class AdvancedUserRecipe1283848012(BasicNewsRecipe):
     title = u'Ynet'
     __author__ = 'marbs & barakplasma'
     language = 'he'
-    extra_css = 'img {max-width:100%;direction: rtl;} #article{direction: rtl;} div{direction: rtl;} title{direction: rtl; } article_description{direction: rtl; } a.article{direction: rtl; } calibre_feed_description{direction: rtl; } body{direction: ltr;}'  # noqa
+    extra_css = 'img {max-width:100%;direction: rtl;} #article{direction: rtl;} div{direction: rtl;} title{direction: rtl; } article_description{direction: rtl; } a.article{direction: rtl; } calibre_feed_description{direction: rtl; } body{direction: ltr;}'  # noqa: E501
     remove_attributes = ['width']
     simultaneous_downloads = 5
     keep_only_tags = [
diff --git a/recipes/yomiuri_world.recipe b/recipes/yomiuri_world.recipe
index f7babc563a..144c77f1e5 100644
--- a/recipes/yomiuri_world.recipe
+++ b/recipes/yomiuri_world.recipe
@@ -21,9 +21,9 @@ class YOLNews(BasicNewsRecipe):
     encoding = 'UTF-8'
     index = 'http://www.yomiuri.co.jp/world/'
     remove_javascript = True
-    masthead_title = u"YOMIURI ONLINE"
+    masthead_title = u'YOMIURI ONLINE'
 
-    keep_only_tags = [{'class': "article text-resizeable"}]
+    keep_only_tags = [{'class': 'article text-resizeable'}]
 
     def parse_feeds(self):
         feeds = BasicNewsRecipe.parse_feeds(self)
diff --git a/recipes/zadolba_li.recipe b/recipes/zadolba_li.recipe
index 719c4f480c..c17b675a50 100644
--- a/recipes/zadolba_li.recipe
+++ b/recipes/zadolba_li.recipe
@@ -8,7 +8,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class AdvancedUserRecipe1467722946(BasicNewsRecipe):
     title = '\u0417\u0430\u0434\u043e\u043b\u0431\u0430!\u043b\u0438'
     __author__ = 'bugmen00t'
-    description = '\u0412\u0441\u0451 \u043D\u0430\u0447\u0430\u043B\u043E\u0441\u044C \u0432 2009 \u0433\u043E\u0434\u0443 \u0441 \u0438\u0441\u0442\u043E\u0440\u0438\u0439 \u043E \u043A\u043B\u0438\u0435\u043D\u0442\u0430\u0445 \u0438 \u043F\u043E\u043A\u0443\u043F\u0430\u0442\u0435\u043B\u044F\u0445. \u041E\u043A\u0430\u0437\u0430\u043B\u043E\u0441\u044C, \u043D\u0435 \u0432\u0441\u0451 \u043B\u0430\u0434\u043D\u043E \u0438 \u0432 \u0443\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u0430\u0445, \u0438 \u0432 \u0433\u043E\u0441\u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0430\u0445, \u0434\u0430 \u0438 \u0441\u043E\u0441\u0435\u0434\u0438 \u043D\u0435 \u0441\u0430\u0445\u0430\u0440. \u00AB\u0417\u0430\u0434\u043E\u043B\u0431\u0430!\u043B\u0438\u00BB \u043E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u0433\u043B\u0430\u0437\u0430 \u043D\u0430 \u043D\u0435\u0433\u043B\u0430\u0441\u043D\u044B\u0435 \u043D\u043E\u0440\u043C\u044B \u043F\u043E\u0432\u0435\u0434\u0435\u043D\u0438\u044F, \u043F\u0440\u0438\u0432\u0438\u0432\u0430\u0435\u0442 \u0432\u0437\u0430\u0438\u043C\u043D\u0443\u044E \u0442\u0435\u0440\u043F\u0438\u043C\u043E\u0441\u0442\u044C \u0438 \u0434\u0430\u0440\u0438\u0442 \u0445\u043E\u0440\u043E\u0448\u0435\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043D\u0438\u0435 \u043B\u044E\u0434\u044F\u043C \u0441 \u043E\u0431\u0435\u0438\u0445 \u0441\u0442\u043E\u0440\u043E\u043D \u043F\u0440\u0438\u043B\u0430\u0432\u043A\u0430. \u041C\u044B \u043D\u0435 \u043F\u0440\u0435\u0442\u0435\u043D\u0434\u0443\u0435\u043C \u043D\u0430 \u0437\u0432\u0430\u043D\u0438\u0435 \u0433\u043B\u0430\u0432\u043D\u043E\u0439 \u0436\u0430\u043B\u043E\u0431\u043D\u043E\u0439 \u043A\u043D\u0438\u0433\u0438 \u0420\u0443\u043D\u0435\u0442\u0430, \u043D\u043E \u043F\u043E\u0443\u0447\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0445 \u0438\u0441\u0442\u043E\u0440\u0438\u0439 \u0443 \u043D\u0430\u0441 \u043F\u0440\u0435\u0434\u043E\u0441\u0442\u0430\u0442\u043E\u0447\u043D\u043E.'  # noqa
+    description = '\u0412\u0441\u0451 \u043D\u0430\u0447\u0430\u043B\u043E\u0441\u044C \u0432 2009 \u0433\u043E\u0434\u0443 \u0441 \u0438\u0441\u0442\u043E\u0440\u0438\u0439 \u043E \u043A\u043B\u0438\u0435\u043D\u0442\u0430\u0445 \u0438 \u043F\u043E\u043A\u0443\u043F\u0430\u0442\u0435\u043B\u044F\u0445. \u041E\u043A\u0430\u0437\u0430\u043B\u043E\u0441\u044C, \u043D\u0435 \u0432\u0441\u0451 \u043B\u0430\u0434\u043D\u043E \u0438 \u0432 \u0443\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u0430\u0445, \u0438 \u0432 \u0433\u043E\u0441\u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0430\u0445, \u0434\u0430 \u0438 \u0441\u043E\u0441\u0435\u0434\u0438 \u043D\u0435 \u0441\u0430\u0445\u0430\u0440. \u00AB\u0417\u0430\u0434\u043E\u043B\u0431\u0430!\u043B\u0438\u00BB \u043E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u0433\u043B\u0430\u0437\u0430 \u043D\u0430 \u043D\u0435\u0433\u043B\u0430\u0441\u043D\u044B\u0435 \u043D\u043E\u0440\u043C\u044B \u043F\u043E\u0432\u0435\u0434\u0435\u043D\u0438\u044F, \u043F\u0440\u0438\u0432\u0438\u0432\u0430\u0435\u0442 \u0432\u0437\u0430\u0438\u043C\u043D\u0443\u044E \u0442\u0435\u0440\u043F\u0438\u043C\u043E\u0441\u0442\u044C \u0438 \u0434\u0430\u0440\u0438\u0442 \u0445\u043E\u0440\u043E\u0448\u0435\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043D\u0438\u0435 \u043B\u044E\u0434\u044F\u043C \u0441 \u043E\u0431\u0435\u0438\u0445 \u0441\u0442\u043E\u0440\u043E\u043D \u043F\u0440\u0438\u043B\u0430\u0432\u043A\u0430. \u041C\u044B \u043D\u0435 \u043F\u0440\u0435\u0442\u0435\u043D\u0434\u0443\u0435\u043C \u043D\u0430 \u0437\u0432\u0430\u043D\u0438\u0435 \u0433\u043B\u0430\u0432\u043D\u043E\u0439 \u0436\u0430\u043B\u043E\u0431\u043D\u043E\u0439 \u043A\u043D\u0438\u0433\u0438 \u0420\u0443\u043D\u0435\u0442\u0430, \u043D\u043E \u043F\u043E\u0443\u0447\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0445 \u0438\u0441\u0442\u043E\u0440\u0438\u0439 \u0443 \u043D\u0430\u0441 \u043F\u0440\u0435\u0434\u043E\u0441\u0442\u0430\u0442\u043E\u0447\u043D\u043E.'  # noqa: E501
     publisher = 'Chattyfish Ltd.'
     category = 'news, humor'
     cover_url = u'http://zadolba.li/assets/slowpoke/logo.png'
diff --git a/recipes/zaobao.recipe b/recipes/zaobao.recipe
index 5618a99fd8..16e7f355c6 100644
--- a/recipes/zaobao.recipe
+++ b/recipes/zaobao.recipe
@@ -18,7 +18,7 @@ class ZAOBAO(BasicNewsRecipe):
     language = 'zh'
     encoding = 'gbk'
     masthead_url = 'http://www.zaobao.com/ssi/images1/zblogo_original.gif'
-#    multithreaded_fetch = True
+    # multithreaded_fetch = True
 
     keep_only_tags = [
         dict(name='td', attrs={'class': 'text'}),
@@ -32,21 +32,21 @@ class ZAOBAO(BasicNewsRecipe):
         dict(name='div', attrs={'width': '30%'}),
     ]
 
-    extra_css      = '\n\
-            @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)}\n\
-            body{font-family: serif1, serif}\n\
-            .article_description{font-family: serif1, serif}\n\
-            p{font-family: serif1, serif}\n\
-            h1 {font-weight: bold; font-size: large;}\n\
-            h2 {font-size: large;}\n\
-            .title {font-size: large;}\n\
-            .article {font-size:medium}\n\
-            .navbar {font-size: small}\n\
-            .feed{font-size: medium}\n\
-            .small{font-size: small;padding-right: 8pt}\n\
-            .text{padding-right: 8pt}\n\
-            p{text-indent: 0cm}\n\
-            div#content{padding-right: 10pt}'
+    extra_css      = '''
+            @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)}
+            body{font-family: serif1, serif}
+            .article_description{font-family: serif1, serif}
+            p{font-family: serif1, serif}
+            h1 {font-weight: bold; font-size: large;}
+            h2 {font-size: large;}
+            .title {font-size: large;}
+            .article {font-size:medium}
+            .navbar {font-size: small}
+            .feed{font-size: medium}
+            .small{font-size: small;padding-right: 8pt}
+            .text{padding-right: 8pt}
+            p{text-indent: 0cm}
+            div#content{padding-right: 10pt}'''
 
     INDEXES = [
         (u'\u65b0\u95fb\u56fe\u7247',
@@ -172,7 +172,7 @@ class ZAOBAO(BasicNewsRecipe):
                         article.text_summary = article.text_summary.encode(
                             'cp1252', 'replace').decode(self.encoding, 'replace')
 
-                if article.title == "Untitled article":
+                if article.title == 'Untitled article':
                     self.log(_('Removing empty article %s from %s') %
                              (article.title, article.url))
                     # remove the article
diff --git a/recipes/zdnet.fr.recipe b/recipes/zdnet.fr.recipe
index 585f040344..00c83323e4 100644
--- a/recipes/zdnet.fr.recipe
+++ b/recipes/zdnet.fr.recipe
@@ -62,6 +62,6 @@ class zdnet(BasicNewsRecipe):
         try:
             br.open(masthead)
         except:
-            self.log("\nCover unavailable")
+            self.log('\nCover unavailable')
             masthead = None
         return masthead
diff --git a/recipes/zeitde.recipe b/recipes/zeitde.recipe
index 1deb62ba0a..01dc419c61 100644
--- a/recipes/zeitde.recipe
+++ b/recipes/zeitde.recipe
@@ -45,10 +45,10 @@ class ZeitDe(BasicNewsRecipe):
 
     masthead_url = 'https://static.zeit.de/p/zeit.web/3.714/images/structured-data-publisher-logo-zon.png'
 
-    extra_css = '.figure__text { font-size: 0.9em; font-style: italic; } \
-                 .figure__copyright { font-size: 0.9em; font-style: italic; color: #888; } \
-                 .article-heading__kicker { font-size: 0.5em; display: block; margin-bottom: 1em; } \
-                 p.summary { font-size: 1.3em; font-style: italic; } '
+    extra_css = '''.figure__text { font-size: 0.9em; font-style: italic; }
+                   .figure__copyright { font-size: 0.9em; font-style: italic; color: #888; }
+                   .article-heading__kicker { font-size: 0.5em; display: block; margin-bottom: 1em; }
+                   p.summary { font-size: 1.3em; font-style: italic; } '''
 
     remove_tags = [
         dict(name='aside', class_='topicbox'),
@@ -115,7 +115,7 @@ class ZeitDe(BasicNewsRecipe):
     def print_version(self, url):
         # If there is a complete page, use that one
         req = Request(url=url+'/komplettansicht')
-        req.get_method = lambda : 'HEAD'
+        req.get_method = lambda: 'HEAD'
         try:
             urlopen(req)
             return url + '/komplettansicht'
@@ -139,7 +139,7 @@ class ZeitDe(BasicNewsRecipe):
                 body.insert(0, header)
 
         # Add real img tags for images
-        for container in soup.findAll(class_=re.compile('__media-container$')):
+        for container in soup.findAll(class_=re.compile(r'__media-container$')):
             img = container.find('noscript')
             if img is not None:
                 img.name = 'div'
diff --git a/recipes/zeitde_sub.recipe b/recipes/zeitde_sub.recipe
index b9e36039a3..bb36ab6640 100644
--- a/recipes/zeitde_sub.recipe
+++ b/recipes/zeitde_sub.recipe
@@ -7,9 +7,9 @@ __copyright__ = '2010, Steffen Siebert <calibre at steffensiebert.de>'
 __docformat__ = 'restructuredtext de'
 __version__ = '1.5'
 
-"""
+'''
 Die Zeit EPUB
-"""
+'''
 
 import io
 import os
@@ -48,7 +48,7 @@ class ZeitEPUBAbo(BasicNewsRecipe):
 
     preprocess_regexps = [
         # filtering for correct dashes ("Gedankenstrich" and "bis")
-        (re.compile(u' (-|\u2212)(?=[ ,])'), lambda match: u' \u2013'),
+        (re.compile(u' (-|\u2212)(?=[ ,])'), lambda match: u' \u2013'),  # noqa: RUF039
         (re.compile(r'(?<=\d)-(?=\d)'), lambda match: u'\u2013'),  # number-number
         (re.compile(r'(?<=\d,)-(?= ?\u20AC)'), lambda match: u'\u2013'),  # ,- Euro
         # fix the number dash number dash for the title image that was broken
@@ -123,16 +123,16 @@ class ZeitEPUBAbo(BasicNewsRecipe):
         (re.compile(r'\.\.\. (?=[\u00AB\u2039,])'), lambda match: '...'),
         # fix missing spaces between numbers and any sort of units, possibly
         # with dot
-        (re.compile(r'(?<=\d)(?=(Femto|Piko|Nano|Mikro|Milli|Zenti|Dezi|Hekto|Kilo|Mega|Giga|Tera|Peta|Tausend|Trilli|Kubik|Quadrat|Meter|Uhr|Jahr|Schuljahr|Seite))'), lambda match: ' '),  # noqa
-        (re.compile(r'(?<=\d\.)(?=(Femto|Piko|Nano|Mikro|Milli|Zenti|Dezi|Hekto|Kilo|Mega|Giga|Tera|Peta|Tausend|Trilli|Kubik|Quadrat|Meter|Uhr|Jahr|Schuljahr|Seite))'), lambda match: ' '),  # noqa
+        (re.compile(r'(?<=\d)(?=(Femto|Piko|Nano|Mikro|Milli|Zenti|Dezi|Hekto|Kilo|Mega|Giga|Tera|Peta|Tausend|Trilli|Kubik|Quadrat|Meter|Uhr|Jahr|Schuljahr|Seite))'), lambda match: ' '),  # noqa: E501
+        (re.compile(r'(?<=\d\.)(?=(Femto|Piko|Nano|Mikro|Milli|Zenti|Dezi|Hekto|Kilo|Mega|Giga|Tera|Peta|Tausend|Trilli|Kubik|Quadrat|Meter|Uhr|Jahr|Schuljahr|Seite))'), lambda match: ' '),  # noqa: E501
         # fix wrong spaces
         # at beginning of paragraphs
         (re.compile(
             r'(?<=<p class="absatz">[A-ZÄÖÜ]) (?=[a-zäöü\-])'), lambda match: ''),
         # before closing quotation
-        (re.compile(u' \u00AB'), lambda match: u'\u00AB '),
+        (re.compile(u' \u00AB'), lambda match: u'\u00AB '),  # noqa: RUF039
         # after opening quotation
-        (re.compile(u'\u00BB '), lambda match: u' \u00BB'),
+        (re.compile(u'\u00BB '), lambda match: u' \u00BB'),  # noqa: RUF039
         # filtering for spaces in large numbers for better readability
         # end of the number with some character following
         (re.compile(r'(?<=\d\d)(?=\d\d\d[ ,;\)<\?!-])'),
@@ -151,25 +151,25 @@ class ZeitEPUBAbo(BasicNewsRecipe):
         # filtering for unicode characters that are missing on the Kindle,
         # try to replace them with meaningful work-arounds
         # subscript-0
-        (re.compile(u'\u2080'), lambda match: '<span style="font-size: 40%;">0</span>'),
+        (re.compile(u'\u2080'), lambda match: '<span style="font-size: 40%;">0</span>'),  # noqa: RUF039
         # subscript-1
-        (re.compile(u'\u2081'), lambda match: '<span style="font-size: 40%;">1</span>'),
+        (re.compile(u'\u2081'), lambda match: '<span style="font-size: 40%;">1</span>'),  # noqa: RUF039
         # subscript-2
-        (re.compile(u'\u2082'), lambda match: '<span style="font-size: 40%;">2</span>'),
+        (re.compile(u'\u2082'), lambda match: '<span style="font-size: 40%;">2</span>'),  # noqa: RUF039
         # subscript-3
-        (re.compile(u'\u2083'), lambda match: '<span style="font-size: 40%;">3</span>'),
+        (re.compile(u'\u2083'), lambda match: '<span style="font-size: 40%;">3</span>'),  # noqa: RUF039
         # subscript-4
-        (re.compile(u'\u2084'), lambda match: '<span style="font-size: 40%;">4</span>'),
+        (re.compile(u'\u2084'), lambda match: '<span style="font-size: 40%;">4</span>'),  # noqa: RUF039
         # subscript-5
-        (re.compile(u'\u2085'), lambda match: '<span style="font-size: 40%;">5</span>'),
+        (re.compile(u'\u2085'), lambda match: '<span style="font-size: 40%;">5</span>'),  # noqa: RUF039
         # subscript-6
-        (re.compile(u'\u2086'), lambda match: '<span style="font-size: 40%;">6</span>'),
+        (re.compile(u'\u2086'), lambda match: '<span style="font-size: 40%;">6</span>'),  # noqa: RUF039
         # subscript-7
-        (re.compile(u'\u2087'), lambda match: '<span style="font-size: 40%;">7</span>'),
+        (re.compile(u'\u2087'), lambda match: '<span style="font-size: 40%;">7</span>'),  # noqa: RUF039
         # subscript-8
-        (re.compile(u'\u2088'), lambda match: '<span style="font-size: 40%;">8</span>'),
+        (re.compile(u'\u2088'), lambda match: '<span style="font-size: 40%;">8</span>'),  # noqa: RUF039
         # subscript-9
-        (re.compile(u'\u2089'), lambda match: '<span style="font-size: 40%;">9</span>'),
+        (re.compile(u'\u2089'), lambda match: '<span style="font-size: 40%;">9</span>'),  # noqa: RUF039
         # always chance CO2
         (re.compile(r'CO2'), lambda match: 'CO<span style="font-size: 40%;">2</span>'),  # CO2
         # remove *** paragraphs
@@ -184,7 +184,7 @@ class ZeitEPUBAbo(BasicNewsRecipe):
     ]
 
     def build_index(self):
-        url = "https://meine.zeit.de/anmelden?url=https%3A//epaper.zeit.de/abo/diezeit"
+        url = 'https://meine.zeit.de/anmelden?url=https%3A//epaper.zeit.de/abo/diezeit'
         browser = self.get_browser()
 
         # new login process
@@ -199,12 +199,10 @@ class ZeitEPUBAbo(BasicNewsRecipe):
         #    '.*E-Paper.*'))  # used to be '.*Abo-Bereich.*'
         # browser.follow_link(abolink)
         # find page for latest issue
-        latestlink = browser.find_link(text_regex=re.compile(
-            '.*ZUR AKTUELLEN AUSGABE.*'))
+        latestlink = browser.find_link(text_regex=re.compile(r'.*ZUR AKTUELLEN AUSGABE.*'))
         browser.follow_link(latestlink)
         # now find the correct file, we will still use the ePub file
-        epublink = browser.find_link(text_regex=re.compile(
-            '.*EPUB F.*R E-READER LADEN.*'))  # change from '.*EPUB FÜR E-READER LADEN.*' in May 2017
+        epublink = browser.find_link(text_regex=re.compile(r'.*EPUB F.*R E-READER LADEN.*'))  # change from '.*EPUB FÜR E-READER LADEN.*' in May 2017
         response = browser.follow_link(epublink)
         self.report_progress(1, _('next step'))
 
@@ -226,7 +224,7 @@ class ZeitEPUBAbo(BasicNewsRecipe):
 
         # doing regular expression filtering
         for path in walk('.'):
-            (shortname, extension) = os.path.splitext(path)
+            shortname, extension = os.path.splitext(path)
             if extension.lower() in ('.html', '.htm', '.xhtml'):
                 with open(path, 'r+b') as f:
                     raw = f.read()
@@ -241,7 +239,7 @@ class ZeitEPUBAbo(BasicNewsRecipe):
         self.report_progress(
             0, _('trying to download cover image (titlepage)'))
         self.download_cover()
-        self.conversion_options["cover"] = self.cover_path
+        self.conversion_options['cover'] = self.cover_path
 
         return index
 
@@ -250,7 +248,7 @@ class ZeitEPUBAbo(BasicNewsRecipe):
         self.log.warning('Downloading cover')
         try:
             self.log.warning('Trying PDF-based cover')
-            url = "https://meine.zeit.de/anmelden?url=https%3A//epaper.zeit.de/abo/diezeit"
+            url = 'https://meine.zeit.de/anmelden?url=https%3A//epaper.zeit.de/abo/diezeit'
             browser = self.get_browser()
 
             # new login process
@@ -265,12 +263,10 @@ class ZeitEPUBAbo(BasicNewsRecipe):
             #    '.*Abo-Bereich.*'))
             # browser.follow_link(abolink)
             # find page for latest issue
-            latestlink = browser.find_link(text_regex=re.compile(
-                '.*ZUR AKTUELLEN AUSGABE.*'))
+            latestlink = browser.find_link(text_regex=re.compile(r'.*ZUR AKTUELLEN AUSGABE.*'))
             browser.follow_link(latestlink)
             # actual cover search
-            pdflink = browser.find_link(text_regex=re.compile(
-                '.*GESAMT-PDF LADEN.*'))
+            pdflink = browser.find_link(text_regex=re.compile(r'.*GESAMT-PDF LADEN.*'))
             cover_url = urlparse(pdflink.base_url)[0] + '://' + urlparse(pdflink.base_url)[1] + '' + (
                 urlparse(pdflink.url)[2]).replace('ePaper_', '').replace('.pdf', '_001.pdf')
             self.log.warning('PDF link found:')
diff --git a/recipes/zerkalo.recipe b/recipes/zerkalo.recipe
index 045f38a4f6..daa1aa41fb 100644
--- a/recipes/zerkalo.recipe
+++ b/recipes/zerkalo.recipe
@@ -6,7 +6,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Zerkalo(BasicNewsRecipe):
     title = u'\u0417\u0435\u0440\u043A\u0430\u043B\u043E'
-    description = u'\u0417\u0435\u0440\u043A\u0430\u043B\u043E, \u043F\u0440\u043E\u0435\u043A\u0442 \u0447\u0430\u0441\u0442\u0438 \u0431\u044B\u0432\u0448\u0435\u0439 \u043A\u043E\u043C\u0430\u043D\u0434\u044B TUT.BY.'  # noqa
+    description = u'\u0417\u0435\u0440\u043A\u0430\u043B\u043E, \u043F\u0440\u043E\u0435\u043A\u0442 \u0447\u0430\u0441\u0442\u0438 \u0431\u044B\u0432\u0448\u0435\u0439 \u043A\u043E\u043C\u0430\u043D\u0434\u044B TUT.BY.'  # noqa: E501
     __author__ = 'bugmen00t'
     publisher = '\u0417\u0435\u0440\u043A\u0430\u043B\u043E (zerkalo.io)'
     publication_type = 'news'
@@ -21,21 +21,17 @@ class Zerkalo(BasicNewsRecipe):
 
     remove_tags_after = dict(name='div', attrs={'id': 'article_body'})
 
-    remove_tags =   [
+    remove_tags = [
         dict(name='div', attrs={'class': 'b-addition m-single m-simplify'}),
         dict(name='div', attrs={'class': 'b-addition m-simplify'}),
         dict(name='iframe'),
         ]
 
     feeds = [
-#
-# Original feeds
-#
-#        ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u0437\u0430 \u0434\u0435\u043D\u044C', 'https://news.zerkalo.io/rss/all.rss'),
-#       ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u043D\u0435\u0434\u0435\u043B\u0438', 'https://news.zerkalo.io/rss/index.rss'),
-#
-# Censorship bypass
-#
+        # Original feeds
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u0437\u0430 \u0434\u0435\u043D\u044C', 'https://news.zerkalo.io/rss/all.rss'),
+        # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u043D\u0435\u0434\u0435\u043B\u0438', 'https://news.zerkalo.io/rss/index.rss'),
+        # Censorship bypass
         ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u0437\u0430 \u0434\u0435\u043D\u044C', 'https://br0wse-zerkalo.site/news/rss/all.rss'),
         ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u043D\u0435\u0434\u0435\u043B\u0438', 'https://br0wse-zerkalo.site/news/rss/index.rss'),
     ]
diff --git a/recipes/zerodeux.recipe b/recipes/zerodeux.recipe
index 1fc7dda613..45e25cbe8d 100644
--- a/recipes/zerodeux.recipe
+++ b/recipes/zerodeux.recipe
@@ -10,7 +10,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class ZeroDeuxRecipe(BasicNewsRecipe):
     title = 'Zérodeux'
     __author__ = 'Kabonix'
-    description = 'Revue d\'art contemporain trimestrielle'
+    description = "Revue d'art contemporain trimestrielle"
     publisher = 'Zérodeux'
     category = 'art, contemporary art, criticism'
     language = 'fr'
diff --git a/recipes/zn_ru.recipe b/recipes/zn_ru.recipe
index 3e8fbec236..5dbfe68f88 100644
--- a/recipes/zn_ru.recipe
+++ b/recipes/zn_ru.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Zerkalo(BasicNewsRecipe):
     title = '\u0417\u0435\u0440\u043A\u0430\u043B\u043E \u043D\u0435\u0434\u0435\u043B\u0438. \u0423\u043A\u0440\u0430\u0438\u043D\u0430'
     __author__ = 'bugmen00t'
-    description = '\u041E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E-\u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E-\u0430\u043D\u0430\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0435\u0436\u0435\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u0438\u043A.'  # noqa
+    description = '\u041E\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E-\u043F\u043E\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E-\u0430\u043D\u0430\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0435\u0436\u0435\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u0438\u043A.'  # noqa: E501
     publisher = '\u00AB\u0417\u0435\u0440\u043A\u0430\u043B\u043E \u043D\u0435\u0434\u0435\u043B\u0438. \u0423\u043A\u0440\u0430\u0438\u043D\u0430\u00BB'
     category = 'newspaper'
     cover_url = u'https://zn.ua/user/img/zn_no_photo_amp.png'
@@ -21,7 +21,7 @@ class Zerkalo(BasicNewsRecipe):
 
     remove_tags_before = dict(name='h1')
 
-    remove_tags_after = dict(name='div', attrs={'class': 'article_body'}),
+    remove_tags_after = dict(name='div', attrs={'class': 'article_body'})
 
     remove_tags = [
         dict(name='span', attrs={'class': 'print print-art-js'}),
diff --git a/recipes/zn_ua.recipe b/recipes/zn_ua.recipe
index cae979d7b0..39c06a1fce 100644
--- a/recipes/zn_ua.recipe
+++ b/recipes/zn_ua.recipe
@@ -7,7 +7,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Zerkalo(BasicNewsRecipe):
     title = '\u0414\u0437\u0435\u0440\u043A\u0430\u043B\u043E \u0442\u0438\u0436\u043D\u044F. \u0423\u043A\u0440\u0430\u0457\u043D\u0430'
     __author__ = 'bugmen00t'
-    description = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0435 \u0456\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0432\u0438\u0434\u0430\u043D\u043D\u044F, \u0441\u0443\u0441\u043F\u0456\u043B\u044C\u043D\u043E-\u043F\u043E\u043B\u0456\u0442\u0438\u0447\u043D\u0438\u0439 \u0442\u0438\u0436\u043D\u0435\u0432\u0438\u043A.'  # noqa
+    description = '\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0435 \u0456\u043D\u0442\u0435\u0440\u043D\u0435\u0442-\u0432\u0438\u0434\u0430\u043D\u043D\u044F, \u0441\u0443\u0441\u043F\u0456\u043B\u044C\u043D\u043E-\u043F\u043E\u043B\u0456\u0442\u0438\u0447\u043D\u0438\u0439 \u0442\u0438\u0436\u043D\u0435\u0432\u0438\u043A.'  # noqa: E501
     publisher = '\u0414\u0437\u0435\u0440\u043A\u0430\u043B\u043E \u0442\u0438\u0436\u043D\u044F. \u0423\u043A\u0440\u0430\u0457\u043D\u0430'
     category = 'newspaper'
     cover_url = u'https://zn.ua/user/img/zn_no_photo_amp.png'
@@ -21,7 +21,7 @@ class Zerkalo(BasicNewsRecipe):
 
     remove_tags_before = dict(name='h1')
 
-    remove_tags_after = dict(name='div', attrs={'class': 'article_body'}),
+    remove_tags_after = dict(name='div', attrs={'class': 'article_body'})
 
     remove_tags = [
         dict(name='span', attrs={'class': 'print print-art-js'}),
diff --git a/recipes/zycie_warszawy.recipe b/recipes/zycie_warszawy.recipe
index 60052d9827..07b7e1c85e 100644
--- a/recipes/zycie_warszawy.recipe
+++ b/recipes/zycie_warszawy.recipe
@@ -47,5 +47,5 @@ class zyciewarszawy(BasicNewsRecipe):
     preprocess_regexps = [(re.compile(r',3.jpg'), lambda m: ',2.jpg')]
 
     def print_version(self, url):
-        url += "?print=tak"
+        url += '?print=tak'
         return url
diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py
index b25f68f19a..8c5a50e6d2 100644
--- a/resources/default_tweaks.py
+++ b/resources/default_tweaks.py
@@ -221,41 +221,41 @@ per_language_title_sort_articles = {
         'epo': (r'La\s+', r"L'", 'L´'),
         # Spanish
         'spa': (r'El\s+', r'La\s+', r'Lo\s+', r'Los\s+', r'Las\s+', r'Un\s+',
-                  r'Una\s+', r'Unos\s+', r'Unas\s+'),
+                r'Una\s+', r'Unos\s+', r'Unas\s+'),
         # French
         'fra': (r'Le\s+', r'La\s+', r"L'", r'L´', r'L’', r'Les\s+', r'Un\s+', r'Une\s+',
-                  r'Des\s+', r'De\s+La\s+', r'De\s+', r"D'", r'D´', r'D’'),
+                r'Des\s+', r'De\s+La\s+', r'De\s+', r"D'", r'D´', r'D’'),
         # Polish
         'pol': (),
         # Italian
-        'ita': ('Lo\\s+', 'Il\\s+', "L'", 'L´', 'La\\s+', 'Gli\\s+',
-                'I\\s+', 'Le\\s+', 'Uno\\s+', 'Un\\s+', 'Una\\s+', "Un'",
-                'Un´', 'Dei\\s+', 'Degli\\s+', 'Delle\\s+', 'Del\\s+',
-                'Della\\s+', 'Dello\\s+', "Dell'", 'Dell´'),
+        'ita': (r'Lo\s+', r'Il\s+', r"L'", r'L´', r'La\s+', r'Gli\s+',
+                r'I\s+', r'Le\s+', r'Uno\s+', r'Un\s+', r'Una\s+', "rUn'",
+                r'Un´', r'Dei\s+', r'Degli\s+', r'Delle\s+', r'Del\s+',
+                r'Della\s+', r'Dello\s+', r"Dell'", r'Dell´'),
         # Portuguese
         'por': (r'A\s+', r'O\s+', r'Os\s+', r'As\s+', r'Um\s+', r'Uns\s+',
-                  r'Uma\s+', r'Umas\s+', ),
+                r'Uma\s+', r'Umas\s+'),
         # Romanian
-        'ron': (r'Un\s+', r'O\s+', r'Nişte\s+', ),
+        'ron': (r'Un\s+', r'O\s+', r'Nişte\s+'),
         # German
         'deu': (r'Der\s+', r'Die\s+', r'Das\s+', r'Den\s+', r'Ein\s+',
-                  r'Eine\s+', r'Einen\s+', r'Dem\s+', r'Des\s+', r'Einem\s+',
-                  r'Eines\s+'),
+                r'Eine\s+', r'Einen\s+', r'Dem\s+', r'Des\s+', r'Einem\s+',
+                r'Eines\s+'),
         # Dutch
         'nld': (r'De\s+', r'Het\s+', r'Een\s+', r"'n\s+", r"'s\s+", r'Ene\s+',
-                  r'Ener\s+', r'Enes\s+', r'Den\s+', r'Der\s+', r'Des\s+',
-                  r"'t\s+"),
+                r'Ener\s+', r'Enes\s+', r'Den\s+', r'Der\s+', r'Des\s+',
+                r"'t\s+"),
         # Swedish
-        'swe': (r'En\s+', r'Ett\s+', r'Det\s+', r'Den\s+', r'De\s+', ),
+        'swe': (r'En\s+', r'Ett\s+', r'Det\s+', r'Den\s+', r'De\s+'),
         # Turkish
-        'tur': (r'Bir\s+', ),
+        'tur': (r'Bir\s+',),
         # Afrikaans
-        'afr': (r"'n\s+", r'Die\s+', ),
+        'afr': (r"'n\s+", r'Die\s+'),
         # Greek
         'ell': (r'O\s+', r'I\s+', r'To\s+', r'Ta\s+', r'Tus\s+', r'Tis\s+',
-                  r"'Enas\s+", r"'Mia\s+", r"'Ena\s+", r"'Enan\s+", ),
+                r"'Enas\s+", r"'Mia\s+", r"'Ena\s+", r"'Enan\s+"),
         # Hungarian
-        'hun': (r'A\s+', r'Az\s+', r'Egy\s+',),
+        'hun': (r'A\s+', r'Az\s+', r'Egy\s+'),
 }
 default_language_for_title_sort = None
 title_sort_articles = r'^(A|The|An)\s+'
@@ -427,7 +427,7 @@ maximum_cover_size = (1650, 2200)
 # control where it is sent. Valid values are "main", "carda", "cardb". Note
 # that if there isn't enough free space available on the location you choose,
 # the files will be sent to the location with the most free space.
-send_news_to_device_location = "main"
+send_news_to_device_location = 'main'
 
 #: Unified toolbar on macOS
 # If you enable this option and restart calibre, the toolbar will be 'unified'
diff --git a/ruff-strict-pep8.toml b/ruff-strict-pep8.toml
index e7817d248b..993676788c 100644
--- a/ruff-strict-pep8.toml
+++ b/ruff-strict-pep8.toml
@@ -1,5 +1,5 @@
 line-length = 160
-target-version = 'py38'
+target-version = 'py310'
 builtins = ['_', 'I', 'P']
 include = ['*.py', '*.recipe']
 exclude = [
@@ -22,29 +22,33 @@ quote-style = 'single'
 explicit-preview-rules = true
 ignore = [
     'E402', 'E722', 'E741',
-    'UP012', 'UP030', 'UP031', 'UP032', 'C413', 'C420', 'PIE790', 'ISC003',
-    'RUF001', 'RUF002', 'RUF003', 'RUF005', 'RUF012', 'RUF013', 'RUF015', 'RUF100',
+    'UP012', 'UP030', 'UP032', 'UP038', 'C413', 'C420', 'PIE790', 'ISC003',
+    'RUF001', 'RUF002', 'RUF003', 'RUF005', 'RUF012', 'RUF013', 'RUF015', 'RUF031', 'RUF100',
     'F841',  # because in preview, unused tuple unpacking variable that not use dummy syntax (prefix '_' underscore)
              # raise error 'unused-variable', sigh (https://github.com/astral-sh/ruff/issues/8884)
 ]
 select = [
     'E', 'F', 'I', 'W', 'INT',
-    'UP', 'YTT', 'TID', 'Q', 'C4', 'COM818', 'PIE', 'RET501', 'ISC',
+    'Q', 'UP', 'YTT', 'TID', 'C4', 'COM818', 'PIE', 'RET501', 'ISC',
     'RUF',  # nota: RUF can flag many unsolicited errors
     # preview rules
-    'RUF051', 'RUF056',
-    'RUF039', 'RUF055',  # always use raw-string for regex
+    'RUF051', 'RUF056',  # useless dict operation
+    'RUF055',  # unnecessary regex
+    'RUF039',  # always use raw-string for regex
+    'RUF047',  # needless else
     'E302', 'E303', 'E304', 'E305', 'W391',  # blank-line standard
     'E111', 'E112', 'E113', 'E117',  # code indentation
     'E114', 'E115', 'E116', 'E261', 'E262', 'E265',  # comment formating
-    'E201', 'E202', 'E211', 'E251', 'E275', # + partial: 'E203', 'E222', 'E241', 'E271', 'E272' # various whitespace
+    'E201', 'E202', 'E211', 'E251', 'E275',  # various whitespace
 ]
-unfixable = ['ISC001']
+unfixable = ['PIE794', 'ISC001']
 
 
 [lint.per-file-ignores]
 "recipes/*" = ['UP']
 "manual/plugin_examples/*" = ['UP']
+"setup/commands.py" = ['RUF022']
+"src/calibre/*" = ['UP031']
 "src/calibre/customize/__init__.py" = ['RET501']
 "src/calibre/devices/interface.py" = ['RET501']
 "src/calibre/devices/kobo/driver.py" = ['E116']
@@ -53,6 +57,7 @@ unfixable = ['ISC001']
 "src/calibre/ebooks/metadata/sources/base.py" = ['RET501']
 "src/calibre/ebooks/pdf/reflow.py" = ['E114']
 "src/calibre/gui2/store/stores/*" = ['UP']
+"src/calibre/gui2/tts/manager.py" = ['UP037']
 "src/calibre/utils/copy_files.py" = ['UP037']
 "src/calibre/utils/smartypants.py" = ['RUF039', 'RUF055']
 "src/calibre/web/feeds/news.py" = ['RET501']
diff --git a/setup.py b/setup.py
index 5a250024b6..c7e27c9133 100755
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,6 @@ def check_version_info():
         exit(f'calibre requires Python {minver}. Current Python version: {".".join(map(str, sys.version_info[:3]))}')
 
 
-
 check_version_info()
 
 sys.path.insert(0, src_base)
@@ -75,7 +74,7 @@ def main(args=sys.argv):
         print('\nWhere command is one of:')
         print()
         for x in sorted(commands.__all__):
-            print('{:20} -'.format(x), end=' ')
+            print(f'{x:20} -', end=' ')
             c = getattr(commands, x)
             desc = getattr(c, 'short_description', c.description)
             print(desc)
@@ -95,7 +94,7 @@ def main(args=sys.argv):
     parser = option_parser()
     command.add_all_options(parser)
     parser.set_usage(
-        'Usage: python setup.py {} [options]\n\n'.format(args[1]) + command.description)
+        f'Usage: python setup.py {args[1]} [options]\n\n' + command.description)
 
     opts, args = parser.parse_args(args)
     opts.cli_args = args[2:]
diff --git a/setup/__init__.py b/setup/__init__.py
index 3553fb2dd1..213fa3687e 100644
--- a/setup/__init__.py
+++ b/setup/__init__.py
@@ -17,7 +17,7 @@ import time
 from contextlib import contextmanager
 from functools import lru_cache
 
-iswindows = re.search('win(32|64)', sys.platform)
+iswindows = re.search(r'win(32|64)', sys.platform)
 ismacos = 'darwin' in sys.platform
 isfreebsd = 'freebsd' in sys.platform
 isnetbsd = 'netbsd' in sys.platform
@@ -46,10 +46,10 @@ def newer(targets, sources):
     for f in targets:
         if not os.path.exists(f):
             return True
-    ttimes = map(lambda x: os.stat(x).st_mtime, targets)
+    ttimes = (os.stat(x).st_mtime for x in targets)
     oldest_target = min(ttimes)
     try:
-        stimes = map(lambda x: os.stat(x).st_mtime, sources)
+        stimes = (os.stat(x).st_mtime for x in sources)
         newest_source = max(stimes)
     except FileNotFoundError:
         newest_source = oldest_target +1
@@ -126,7 +126,7 @@ def initialize_constants():
     with open(os.path.join(SRC, 'calibre/constants.py'), 'rb') as f:
         src = f.read().decode('utf-8')
     nv = re.search(r'numeric_version\s+=\s+\((\d+), (\d+), (\d+)\)', src)
-    __version__ = '%s.%s.%s'%(nv.group(1), nv.group(2), nv.group(3))
+    __version__ = '.'.join([nv.group(1), nv.group(2), nv.group(3)])
     __appname__ = re.search(r'__appname__\s+=\s+(u{0,1})[\'"]([^\'"]+)[\'"]',
             src).group(2)
     with open(os.path.join(SRC, 'calibre/linux.py'), 'rb') as sf:
diff --git a/setup/build.py b/setup/build.py
index 3e04d8ae5a..db3f567cde 100644
--- a/setup/build.py
+++ b/setup/build.py
@@ -21,7 +21,8 @@ from setup import SRC, Command, isbsd, isfreebsd, ishaiku, islinux, ismacos, isw
 
 isunix = islinux or ismacos or isbsd or ishaiku
 
-py_lib = os.path.join(sys.prefix, 'libs', 'python%d%d.lib' % sys.version_info[:2])
+py_lib = os.path.join(sys.prefix, 'libs', 'python{}{}.lib'.format(*sys.version_info[:2]))
+
 
 class CompileCommand(NamedTuple):
     cmd: list[str]
@@ -61,7 +62,7 @@ class Extension:
         self.headers = d['headers'] = absolutize(kwargs.get('headers', []))
         self.sip_files = d['sip_files'] = absolutize(kwargs.get('sip_files', []))
         self.needs_exceptions = d['needs_exceptions'] = kwargs.get('needs_exceptions', False)
-        self.qt_modules = d['qt_modules'] = kwargs.get('qt_modules', ["widgets"])
+        self.qt_modules = d['qt_modules'] = kwargs.get('qt_modules', ['widgets'])
         self.inc_dirs = d['inc_dirs'] = absolutize(kwargs.get('inc_dirs', []))
         self.lib_dirs = d['lib_dirs'] = absolutize(kwargs.get('lib_dirs', []))
         self.extra_objs = d['extra_objs'] = absolutize(kwargs.get('extra_objs', []))
@@ -83,7 +84,7 @@ def lazy_load(name):
     try:
         return getattr(build_environment, name)
     except AttributeError:
-        raise ImportError('The setup.build_environment module has no symbol named: %s' % name)
+        raise ImportError(f'The setup.build_environment module has no symbol named: {name}')
 
 
 def expand_file_list(items, is_paths=True, cross_compile_for='native'):
@@ -121,7 +122,7 @@ def is_ext_allowed(cross_compile_for: str, ext: Extension) -> bool:
         if islinux and only == cross_compile_for:
             return True
         only = set(only.split())
-        q = set(filter(lambda x: globals()["is" + x], ["bsd", "freebsd", "haiku", "linux", "macos", "windows"]))
+        q = set(filter(lambda x: globals()['is' + x], ['bsd', 'freebsd', 'haiku', 'linux', 'macos', 'windows']))
         return len(q.intersection(only)) > 0
     return True
 
@@ -145,7 +146,6 @@ def parse_extension(ext, compiling_for='native'):
     if compiling_for == 'windows':
         get_key = 'windows_'
 
-
     def get(k, default=''):
         ans = ext.pop(k, default)
         ans = ext.pop(get_key + k, ans)
@@ -242,7 +242,6 @@ class Environment(NamedTuple):
         return list(map(map_name, libs))
 
 
-
 def init_env(debug=False, sanitize=False, compiling_for='native'):
     from setup.build_environment import NMAKE, win_cc, win_inc, win_ld, win_lib
     linker = None
@@ -521,7 +520,7 @@ class Build(Command):
         def get(src: str, env: Environment, for_tooling: bool = False) -> CompileCommand:
             compiler = env.cxx if ext.needs_cxx else env.cc
             obj = self.j(obj_dir, os.path.splitext(self.b(src))[0]+env.obj_suffix)
-            inf = env.cc_input_cpp_flag if src.endswith('.cpp') or src.endswith('.cxx') else env.cc_input_c_flag
+            inf = env.cc_input_cpp_flag if src.endswith(('.cpp', '.cxx')) else env.cc_input_c_flag
             sinc = [inf, src]
             if env.cc_output_flag.startswith('/'):
                 if for_tooling:  # clangd gets confused by cl.exe style source and output flags
@@ -539,10 +538,10 @@ class Build(Command):
                 extern_decl = 'extern "C"' if ext.needs_cxx else ''
                 cflags = [
                     '-DCALIBRE_MODINIT_FUNC='
-                    '{} __attribute__ ((visibility ("default"))) {}'.format(extern_decl, return_type)]
+                    f'{extern_decl} __attribute__ ((visibility ("default"))) {return_type}']
             if ext.needs_cxx and ext.needs_cxx_std:
-                if env.cc_output_flag.startswith('/') and ext.needs_cxx == "11":
-                    ext.needs_cxx = "14"
+                if env.cc_output_flag.startswith('/') and ext.needs_cxx == '11':
+                    ext.needs_cxx = '14'
                 cflags.append(env.std_prefix + 'c++' + ext.needs_cxx_std)
 
             if ext.needs_c_std and not env.std_prefix.startswith('/'):
@@ -608,17 +607,17 @@ class Build(Command):
                     os.remove(x)
 
     def check_call(self, *args, **kwargs):
-        """print cmdline if an error occurred
+        '''print cmdline if an error occurred
 
         If something is missing (cmake e.g.) you get a non-informative error
          self.check_call(qmc + [ext.name+'.pro'])
          so you would have to look at the source to see the actual command.
-        """
+        '''
         try:
             subprocess.check_call(*args, **kwargs)
         except:
-            cmdline = ' '.join(['"%s"' % (arg) if ' ' in arg else arg for arg in args[0]])
-            print("Error while executing: %s\n" % (cmdline))
+            cmdline = ' '.join([f'"{arg}"' if ' ' in arg else arg for arg in args[0]])
+            print(f'Error while executing: {cmdline}\n')
             raise
 
     def build_headless(self):
@@ -657,7 +656,7 @@ class Build(Command):
         os.chdir(bdir)
         try:
             self.check_call(cmd + ['-S', os.path.dirname(sources[0])])
-            self.check_call([self.env.make] + ['-j%d'%(cpu_count or 1)])
+            self.check_call([self.env.make] + ['-j{}'.format(cpu_count or 1)])
         finally:
             os.chdir(cwd)
         os.rename(self.j(bdir, 'libheadless.so'), target)
@@ -734,7 +733,7 @@ sip-file = {os.path.basename(sipf)!r}
             env = os.environ.copy()
             if is_macos_universal_build:
                 env['ARCHS'] = 'x86_64 arm64'
-            self.check_call([self.env.make] + ([] if iswindows else ['-j%d'%(os.cpu_count() or 1)]), env=env)
+            self.check_call([self.env.make] + ([] if iswindows else ['-j{}'.format(os.cpu_count() or 1)]), env=env)
             e = 'pyd' if iswindows else 'so'
             m = glob.glob(f'{ext.name}/{ext.name}.*{e}')
             if not m:
diff --git a/setup/build_environment.py b/setup/build_environment.py
index 7b656c23e5..553c41c2e8 100644
--- a/setup/build_environment.py
+++ b/setup/build_environment.py
@@ -113,7 +113,7 @@ qraw = subprocess.check_output([QMAKE, '-query']).decode('utf-8')
 
 
 def readvar(name):
-    return re.search('^%s:(.+)$' % name, qraw, flags=re.M).group(1).strip()
+    return re.search(f'^{name}:(.+)$', qraw, flags=re.M).group(1).strip()
 
 
 qt = {x:readvar(y) for x, y in {'libs':'QT_INSTALL_LIBS', 'plugins':'QT_INSTALL_PLUGINS'}.items()}
diff --git a/setup/changelog.py b/setup/changelog.py
index ff37888f21..5317f27d03 100644
--- a/setup/changelog.py
+++ b/setup/changelog.py
@@ -13,7 +13,7 @@ def parse(raw, parse_dates=True):
         nonlocal current_entry, current_section
         if not stripped_line:
             return normal
-        if stripped_line.startswith('{' '{' '{'):
+        if stripped_line.startswith('{{{'):
             parts = line.split()[1:]
             if len(parts) != 2:
                 raise ValueError(f'The entry start line is malformed: {line}')
@@ -31,7 +31,7 @@ def parse(raw, parse_dates=True):
 
     def in_entry(linenum, line, stripped_line):
         nonlocal current_section, current_entry
-        if stripped_line == '}' '}' '}':
+        if stripped_line == '}}}':
             if current_entry is None:
                 raise ValueError(f'Entry terminator without active entry at line: {linenum}')
             entries.append(current_entry)
@@ -93,7 +93,7 @@ def parse(raw, parse_dates=True):
         if line.startswith('-'):
             finalize_item(item)
             return start_item(linenum, line, stripped_line)
-        if line.startswith('}' '}' '}'):
+        if line.startswith('}}}'):
             return in_entry(linenum, line, stripped_line)
         if not stripped_line:
             if 'description' not in item:
@@ -138,7 +138,7 @@ def migrate():
         lines = []
         for entry in entries:
             lines.append('')
-            lines.append('{' '{' '{' f' {entry["version"]} {entry["date"]}')
+            lines.append('{{{'+f' {entry["version"]} {entry["date"]}')
             for w in ('new features', 'bug fixes'):
                 nf = entry.get(w)
                 if nf:
@@ -166,7 +166,7 @@ def migrate():
                 lines.append('')
             with open(name.replace('yaml', 'txt'), 'w') as f:
                 f.write('\n'.join(lines))
-            lines.append(''), lines.append('}' '}' '}'), lines.append('')
+            lines.append(''), lines.append('}}}'), lines.append('')
 
 
 if __name__ == '__main__':
diff --git a/setup/check.py b/setup/check.py
index aa73a07059..ea069b8582 100644
--- a/setup/check.py
+++ b/setup/check.py
@@ -150,7 +150,7 @@ class Check(Command):
             for i, f in enumerate(dirty_files):
                 self.info('\tChecking', f)
                 if self.file_has_errors(f):
-                    self.info('%d files left to check' % (len(dirty_files) - i - 1))
+                    self.info('{} files left to check'.format(len(dirty_files) - i - 1))
                     try:
                         edit_file(f)
                     except FileNotFoundError:
diff --git a/setup/file-hosting-bw.py b/setup/file-hosting-bw.py
index c179e6fb4a..b1e8e7ddfa 100644
--- a/setup/file-hosting-bw.py
+++ b/setup/file-hosting-bw.py
@@ -10,6 +10,7 @@ import subprocess
 
 BASE = '/srv/download/bw'
 
+
 def main():
     if not os.path.exists(BASE):
         os.makedirs(BASE)
@@ -52,5 +53,6 @@ def main():
     with open('index.html', 'wb') as f:
         f.write(html.encode('utf-8'))
 
+
 if __name__ == '__main__':
     main()
diff --git a/setup/git_pre_commit_hook.py b/setup/git_pre_commit_hook.py
index 90fb181d04..a5b6a79038 100755
--- a/setup/git_pre_commit_hook.py
+++ b/setup/git_pre_commit_hook.py
@@ -23,8 +23,8 @@ message with the summary of the closed bug.
 
 
 LAUNCHPAD = os.path.expanduser('~/work/env/launchpad.py')
-LAUNCHPAD_BUG = 'https://bugs.launchpad.net/calibre/+bug/%s'
-GITHUB_BUG = 'https://api.github.com/repos/kovidgoyal/calibre/issues/%s'
+LAUNCHPAD_BUG = 'https://bugs.launchpad.net/calibre/+bug/{}'
+GITHUB_BUG = 'https://api.github.com/repos/kovidgoyal/calibre/issues/{}'
 BUG_PAT = r'(Fix|Implement|Fixes|Fixed|Implemented|See)\s+#(\d+)'
 
 socket.setdefaulttimeout(90)
@@ -44,23 +44,23 @@ class Bug:
 
         if int(bug) > 100000:  # Launchpad bug
             try:
-                raw = urllib.request.urlopen(LAUNCHPAD_BUG % bug).read()
+                raw = urllib.request.urlopen(LAUNCHPAD_BUG.format(bug)).read()
                 h1 = html.fromstring(raw).xpath('//h1[@id="edit-title"]')[0]
                 summary = html.tostring(h1, method='text', encoding=str).strip()
             except:
                 summary = 'Private bug'
         else:
-            summary = json.loads(urllib.request.urlopen(GITHUB_BUG % bug).read())['title']
+            summary = json.loads(urllib.request.urlopen(GITHUB_BUG.format(bug)).read())['title']
         if summary:
             print('Working on bug:', summary)
             if int(bug) > 100000 and action != 'See':
                 self.close_bug(bug, action)
-                return match.group() + f' [{summary}]({LAUNCHPAD_BUG % bug})'
-            return match.group() + ' (%s)' % summary
+                return match.group() + f' [{summary}]({LAUNCHPAD_BUG.format(bug)})'
+            return match.group() + f' ({summary})'
         return match.group()
 
     def close_bug(self, bug, action):
-        print('Closing bug #%s' % bug)
+        print(f'Closing bug #{bug}')
         suffix = (
             'The fix will be in the next release. '
             'calibre is usually released every alternate Friday.'
diff --git a/setup/git_version.py b/setup/git_version.py
index 723067223c..e04efbf817 100755
--- a/setup/git_version.py
+++ b/setup/git_version.py
@@ -24,7 +24,7 @@ class GitVersion(Command):
             nv = nv.replace('-', '.')
         except subprocess.CalledProcessError:
             raise SystemExit('Error: not a git checkout')
-        newsrc = re.sub(r'(git_version   = ).*', r'\1%s' % repr(nv), src)
+        newsrc = re.sub(r'(git_version   = ).*', rf'\1{nv!r}', src)
         self.info('new version is:', nv)
 
         with open(constants_file, 'wb') as f:
diff --git a/setup/gui.py b/setup/gui.py
index 22ef575c8b..b94dfb5fbf 100644
--- a/setup/gui.py
+++ b/setup/gui.py
@@ -30,7 +30,7 @@ class GUI(Command):
                 path = os.path.abspath(os.path.join(root, name))
                 if name.endswith('.ui'):
                     forms.append(path)
-                elif name.endswith('_ui.py') or name.endswith('_ui.pyc'):
+                elif name.endswith(('_ui.py', '_ui.pyc')):
                     fname = path.rpartition('_')[0] + '.ui'
                     if not os.path.exists(fname):
                         os.remove(path)
@@ -61,8 +61,8 @@ class GUI(Command):
             if self.newer(self.QRC, sources):
                 self.info('Creating images.qrc')
                 for s in sources:
-                    files.append('<file>%s</file>'%s)
-                manifest = '<RCC>\n<qresource prefix="/">\n%s\n</qresource>\n</RCC>'%'\n'.join(sorted(files))
+                    files.append(f'<file>{s}</file>')
+                manifest = '<RCC>\n<qresource prefix="/">\n{}\n</qresource>\n</RCC>'.format('\n'.join(sorted(files)))
                 if not isinstance(manifest, bytes):
                     manifest = manifest.encode('utf-8')
                 with open('images.qrc', 'wb') as f:
diff --git a/setup/hosting.py b/setup/hosting.py
index b0dc825aa2..d7a265959b 100644
--- a/setup/hosting.py
+++ b/setup/hosting.py
@@ -56,20 +56,19 @@ class ReadFileWithProgressReporting:  # {{{
         eta = int((self._total - self.tell()) / bit_rate) + 1
         eta_m, eta_s = eta / 60, eta % 60
         sys.stdout.write(
-            '  %.1f%%   %.1f/%.1fMB %.1f KB/sec    %d minutes, %d seconds left' %
-            (frac * 100, mb_pos, mb_tot, kb_rate, eta_m, eta_s)
+            '  {:.1f}%   {:.1f}/{:.1f}MB {:.1f} KB/sec    {} minutes, {} seconds left'
+            .format(frac * 100, mb_pos, mb_tot, kb_rate, eta_m, eta_s)
         )
         sys.stdout.write('\x1b[u')
         if self.tell() >= self._total:
             sys.stdout.write('\n')
             t = int(time.time() - self.start_time) + 1
             print(
-                'Upload took %d minutes and %d seconds at %.1f KB/sec' %
-                (t / 60, t % 60, kb_rate)
+                'Upload took {} minutes and {} seconds at {:.1f} KB/sec'
+                .format(t/60, t % 60, kb_rate)
             )
         sys.stdout.flush()
 
-
 # }}}
 
 
@@ -93,7 +92,6 @@ class Base:  # {{{
         print('_' * 50)
         sys.stdout.flush()
 
-
 # }}}
 
 
@@ -116,8 +114,7 @@ class SourceForge(Base):  # {{{
                 try:
                     check_call([
                         'rsync', '-h', '-zz', '--progress', '-e', 'ssh -x', x,
-                        '%s,%s@frs.sourceforge.net:%s' %
-                        (self.username, self.project, self.rdir + '/')
+                        '{},{}@frs.sourceforge.net:{}'.format(self.username, self.project, self.rdir + '/')
                     ])
                 except KeyboardInterrupt:
                     raise SystemExit(1)
@@ -128,7 +125,6 @@ class SourceForge(Base):  # {{{
                     break
             print('Uploaded in', int(time.time() - start), 'seconds\n\n')
 
-
 # }}}
 
 
@@ -154,21 +150,16 @@ class GitHub(Base):  # {{{
         existing_assets = self.existing_assets(release['id'])
         for path, desc in self.files.items():
             self.info('')
-            url = self.API + 'repos/{}/{}/releases/assets/{{}}'.format(
-                self.username, self.reponame
-            )
+            url = self.API + f'repos/{self.username}/{self.reponame}/releases/assets/{{}}'
             fname = os.path.basename(path)
             if fname in existing_assets:
-                self.info(
-                    'Deleting %s from GitHub with id: %s' %
-                    (fname, existing_assets[fname])
-                )
+                self.info(f'Deleting {fname} from GitHub with id: {existing_assets[fname]}')
                 r = self.requests.delete(url.format(existing_assets[fname]))
                 if r.status_code != 204:
-                    self.fail(r, 'Failed to delete %s from GitHub' % fname)
+                    self.fail(r, f'Failed to delete {fname} from GitHub')
             r = self.do_upload(upload_url, path, desc, fname)
             if r.status_code != 201:
-                self.fail(r, 'Failed to upload file: %s' % fname)
+                self.fail(r, f'Failed to upload file: {fname}')
             try:
                 r = self.requests.patch(
                     url.format(r.json()['id']),
@@ -187,25 +178,22 @@ class GitHub(Base):  # {{{
                     })
                 )
             if r.status_code != 200:
-                self.fail(r, 'Failed to set label for %s' % fname)
+                self.fail(r, f'Failed to set label for {fname}')
 
     def clean_older_releases(self, releases):
         for release in releases:
             if release.get('assets',
                            None) and release['tag_name'] != self.current_tag_name:
                 self.info(
-                    '\nDeleting old released installers from: %s' %
-                    release['tag_name']
+                    '\nDeleting old released installers from: {}'.format(release['tag_name'])
                 )
                 for asset in release['assets']:
                     r = self.requests.delete(
-                        self.API + 'repos/%s/%s/releases/assets/%s' %
-                        (self.username, self.reponame, asset['id'])
+                        self.API + 'repos/{}/{}/releases/assets/{}'.format(self.username, self.reponame, asset['id'])
                     )
                     if r.status_code != 204:
                         self.fail(
-                            r, 'Failed to delete obsolete asset: %s for release: %s'
-                            % (asset['name'], release['tag_name'])
+                            r, 'Failed to delete obsolete asset: {} for release: {}'.format(asset['name'], release['tag_name'])
                         )
 
     def do_upload(self, url, path, desc, fname):
@@ -223,8 +211,8 @@ class GitHub(Base):  # {{{
             )
 
     def fail(self, r, msg):
-        print(msg, ' Status Code: %s' % r.status_code, file=sys.stderr)
-        print("JSON from response:", file=sys.stderr)
+        print(msg, f' Status Code: {r.status_code}', file=sys.stderr)
+        print('JSON from response:', file=sys.stderr)
         pprint(dict(r.json()), stream=sys.stderr)
         raise SystemExit(1)
 
@@ -233,9 +221,7 @@ class GitHub(Base):  # {{{
         return error_code == 'already_exists'
 
     def existing_assets(self, release_id):
-        url = self.API + 'repos/{}/{}/releases/{}/assets'.format(
-            self.username, self.reponame, release_id
-        )
+        url = self.API + f'repos/{self.username}/{self.reponame}/releases/{release_id}/assets'
         r = self.requests.get(url)
         if r.status_code != 200:
             self.fail('Failed to get assets for release')
@@ -260,17 +246,16 @@ class GitHub(Base):  # {{{
             data=json.dumps({
                 'tag_name': self.current_tag_name,
                 'target_commitish': 'master',
-                'name': 'version %s' % self.version,
-                'body': 'Release version %s' % self.version,
+                'name': f'version {self.version}',
+                'body': f'Release version {self.version}',
                 'draft': False,
                 'prerelease': False
             })
         )
         if r.status_code != 201:
-            self.fail(r, 'Failed to create release for version: %s' % self.version)
+            self.fail(r, f'Failed to create release for version: {self.version}')
         return r.json()
 
-
 # }}}
 
 
@@ -287,7 +272,7 @@ def generate_index():  # {{{
             rmap[series] = []
         rmap[series].append(rnum)
 
-    template = '''<!DOCTYPE html>\n<html lang="en"> <head> <meta charset="utf-8"> <title>{title}</title><link rel="icon" type="image/png" href="//calibre-ebook.com/favicon.png" /> <style type="text/css"> {style} </style> </head> <body> <h1>{title}</h1> <p>{msg}</p> {body} </body> </html> '''  # noqa
+    template = '''<!DOCTYPE html>\n<html lang="en"> <head> <meta charset="utf-8"> <title>{title}</title><link rel="icon" type="image/png" href="//calibre-ebook.com/favicon.png" /> <style type="text/css"> {style} </style> </head> <body> <h1>{title}</h1> <p>{msg}</p> {body} </body> </html> '''  # noqa: E501
     style = '''
     body { font-family: sans-serif; background-color: #eee; }
     a { text-decoration: none; }
@@ -303,10 +288,8 @@ def generate_index():  # {{{
     body = []
     for series in rmap:
         body.append(
-            '<li><a href="{0}.html" title="Releases in the {0}.x series">{0}.x</a>\xa0\xa0\xa0<span style="font-size:smaller">[{1} releases]</span></li>'
-            .format(  # noqa
-                '.'.join(map(str, series)), len(rmap[series])
-            )
+            '<li><a href="{0}.html" title="Releases in the {0}.x series">{0}.x</a>\xa0\xa0\xa0<span style="font-size:smaller">[{1} releases]</span></li>'  # noqa: E501
+            .format('.'.join(map(str, series)), len(rmap[series]))
         )
     body = '<ul>{}</ul>'.format(' '.join(body))
     index = template.format(
@@ -327,12 +310,12 @@ def generate_index():  # {{{
         ]
         body = '<ul class="release-list">{}</ul>'.format(' '.join(body))
         index = template.format(
-            title='Previous calibre releases (%s.x)' % sname,
+            title=f'Previous calibre releases ({sname}.x)',
             style=style,
             msg='Choose a calibre release',
             body=body
         )
-        with open('%s.html' % sname, 'wb') as f:
+        with open(f'{sname}.html', 'wb') as f:
             f.write(index.encode('utf-8'))
 
         for r in releases:
@@ -366,7 +349,7 @@ def generate_index():  # {{{
                         .format(osx[0], 'OS X Disk Image (.dmg)')
                     )
                 linux = [
-                    x for x in files if x.endswith('.txz') or x.endswith('tar.bz2')
+                    x for x in files if x.endswith(('.txz', 'tar.bz2'))
                 ]
                 if linux:
                     def ldesc(x):
@@ -383,7 +366,7 @@ def generate_index():  # {{{
                             ' '.join(linux)
                         )
                     )
-                source = [x for x in files if x.endswith('.xz') or x.endswith('.gz')]
+                source = [x for x in files if x.endswith(('.xz', '.gz'))]
                 if source:
                     body.append(
                         '<dt>Source Code</dt><dd><a href="{0}" title="{1}">{1}</a></dd>'
@@ -392,7 +375,7 @@ def generate_index():  # {{{
 
                 body = '<dl>{}</dl>'.format(''.join(body))
                 index = template.format(
-                    title='calibre release (%s)' % rname,
+                    title=f'calibre release ({rname})',
                     style=style,
                     msg='',
                     body=body
@@ -401,10 +384,9 @@ def generate_index():  # {{{
                     f.write(index.encode('utf-8'))
             finally:
                 os.chdir('..')
-
-
 # }}}
 
+
 SERVER_BASE = '/srv/download/'
 
 
@@ -423,31 +405,28 @@ def upload_to_servers(files, version):  # {{{
 
     # for server, rdir in {'files':'/srv/download/'}.items():
     #     print('Uploading to server:', server)
-    #     server = '%s.calibre-ebook.com' % server
+    #     server = f'{server}.calibre-ebook.com'
     #     # Copy the generated index files
-    #     print ('Copying generated index')
+    #     print('Copying generated index')
     #     check_call(['rsync', '-hza', '-e', 'ssh -x', '--include', '*.html',
-    #                 '--filter', '-! */', base, 'root@%s:%s' % (server, rdir)])
+    #                 '--filter', '-! */', base, f'root@{server}:{rdir}'])
     #     # Copy the release files
-    #     rdir = '%s%s/' % (rdir, version)
+    #     rdir = f'{rdir}{version}/'
     #     for x in files:
     #         start = time.time()
-    #         print ('Uploading', x)
+    #         print('Uploading', x)
     #         for i in range(5):
     #             try:
     #                 check_call(['rsync', '-h', '-z', '--progress', '-e', 'ssh -x', x,
-    #                 'root@%s:%s'%(server, rdir)])
+    #                 f'root@{server}:{rdir}'])
     #             except KeyboardInterrupt:
     #                 raise SystemExit(1)
     #             except:
-    #                 print ('\nUpload failed, trying again in 30 seconds')
+    #                 print('\nUpload failed, trying again in 30 seconds')
     #                 time.sleep(30)
     #             else:
     #                 break
-    #         print ('Uploaded in', int(time.time() - start), 'seconds\n\n')
-    #
-
-
+    #         print('Uploaded in', int(time.time() - start), 'seconds\n\n')
 # }}}
 
 
diff --git a/setup/hyphenation.py b/setup/hyphenation.py
index 66a475054f..308db1d26d 100644
--- a/setup/hyphenation.py
+++ b/setup/hyphenation.py
@@ -84,7 +84,7 @@ class Hyphenation(ReVendor):
     NAME = 'hyphenation'
     TAR_NAME = 'hyphenation dictionaries'
     VERSION = 'master'
-    DOWNLOAD_URL = 'https://github.com/LibreOffice/dictionaries/archive/%s.tar.gz' % VERSION
+    DOWNLOAD_URL = f'https://github.com/LibreOffice/dictionaries/archive/{VERSION}.tar.gz'
     CAN_USE_SYSTEM_VERSION = False
 
     def run(self, opts):
diff --git a/setup/install.py b/setup/install.py
index 38930b5595..b15ee0b532 100644
--- a/setup/install.py
+++ b/setup/install.py
@@ -68,7 +68,7 @@ class Develop(Command):
                       dest='fatal_errors', help='If set die on post install errors.')
         parser.add_option('--no-postinstall', action='store_false',
             dest='postinstall', default=True,
-            help='Don\'t run post install actions like creating MAN pages, setting'+
+            help="Don't run post install actions like creating MAN pages, setting"+
                     ' up desktop integration and so on')
 
     def add_options(self, parser):
@@ -288,14 +288,14 @@ class Install(Develop):
 class Sdist(Command):
 
     description = 'Create a source distribution'
-    DEST = os.path.join('dist', '%s-%s.tar.xz'%(__appname__, __version__))
+    DEST = os.path.join('dist', f'{__appname__}-{__version__}.tar.xz')
 
     def run(self, opts):
         if not self.e(self.d(self.DEST)):
             os.makedirs(self.d(self.DEST))
         tdir = tempfile.mkdtemp()
         atexit.register(shutil.rmtree, tdir)
-        tdir = self.j(tdir, 'calibre-%s' % __version__)
+        tdir = self.j(tdir, f'calibre-{__version__}')
         self.info('\tRunning git export...')
         os.mkdir(tdir)
         subprocess.check_call('git archive HEAD | tar -x -C ' + tdir, shell=True)
@@ -336,7 +336,7 @@ class Sdist(Command):
         self.info('\tCreating tarfile...')
         dest = self.DEST.rpartition('.')[0]
         shutil.rmtree(os.path.join(tdir, '.github'))
-        subprocess.check_call(['tar', '--mtime=now', '-cf', self.a(dest), 'calibre-%s' % __version__], cwd=self.d(tdir))
+        subprocess.check_call(['tar', '--mtime=now', '-cf', self.a(dest), f'calibre-{__version__}'], cwd=self.d(tdir))
         self.info('\tCompressing tarfile...')
         if os.path.exists(self.a(self.DEST)):
             os.remove(self.a(self.DEST))
@@ -388,7 +388,7 @@ class Bootstrap(Command):
             st = time.time()
             clone_cmd.insert(2, '--depth=1')
             subprocess.check_call(clone_cmd, cwd=self.d(self.SRC))
-            print('Downloaded translations in %d seconds' % int(time.time() - st))
+            print('Downloaded translations in {} seconds'.format(int(time.time() - st)))
         else:
             if os.path.exists(tdir):
                 subprocess.check_call(['git', 'pull'], cwd=tdir)
@@ -396,4 +396,4 @@ class Bootstrap(Command):
                 subprocess.check_call(clone_cmd, cwd=self.d(self.SRC))
 
     def run(self, opts):
-        self.info('\n\nAll done! You should now be able to run "%s setup.py install" to install calibre' % sys.executable)
+        self.info(f'\n\nAll done! You should now be able to run "{sys.executable} setup.py install" to install calibre')
diff --git a/setup/installers.py b/setup/installers.py
index 2a2de8809d..fa21a25605 100644
--- a/setup/installers.py
+++ b/setup/installers.py
@@ -163,7 +163,7 @@ class BuildInstaller(Command):
 class BuildInstallers(BuildInstaller):
 
     OS = ''
-    ALL_ARCHES = '64',
+    ALL_ARCHES = ('64',)
 
     def run(self, opts):
         for bitness in self.ALL_ARCHES:
@@ -253,7 +253,7 @@ class ExtDev(Command):
             ext_dir = build_only(which, '', ext)
             src = os.path.join(ext_dir, f'{ext}.so')
             print(
-                "\n\n\x1b[33;1mWARNING: This does not work on macOS, unless you use un-signed builds with ",
+                '\n\n\x1b[33;1mWARNING: This does not work on macOS, unless you use un-signed builds with ',
                 ' ./update-on-ox develop\x1b[m',
                 file=sys.stderr, end='\n\n\n')
             host = 'ox'
diff --git a/setup/iso_codes.py b/setup/iso_codes.py
index 1f9ed9a426..2da0088b87 100644
--- a/setup/iso_codes.py
+++ b/setup/iso_codes.py
@@ -22,7 +22,7 @@ def iso_codes_data():
 
 class ISOData(Command):
     description = 'Get ISO codes name localization data'
-    top_level_filename =  'iso-codes-main'
+    top_level_filename = 'iso-codes-main'
     _zip_data = None
 
     def add_options(self, parser):
diff --git a/setup/lc_data.py b/setup/lc_data.py
index 91abf51c8d..307a4d74da 100644
--- a/setup/lc_data.py
+++ b/setup/lc_data.py
@@ -20,13 +20,14 @@ def generate_data():
     ans = []
     for x, limit in (('day', 8), ('mon', 13)):
         for attr in ('ab' + x, x):
-            ans.append((attr, tuple(map(nl, (getattr(locale, '%s_%d' % (attr.upper(), i)) for i in range(1, limit)))))),
+            ans.append((attr, tuple(map(nl, (getattr(locale, f'{attr.upper()}_{i}') for i in range(1, limit))))))
     for x in ('d_t_fmt', 'd_fmt', 't_fmt', 't_fmt_ampm', 'radixchar', 'thousep', 'yesexpr', 'noexpr'):
         ans.append((x, nl(getattr(locale, x.upper()))))
     return ans
 
+
 def main():
-    if sys.version_info[0] < 3:
+    if sys.version_info[0] < 3:  # noqa: UP036
         raise RuntimeError('Must be run using python 3.x')
     locale.setlocale(locale.LC_ALL, '')
     dest = os.path.abspath(__file__)
diff --git a/setup/mathjax.py b/setup/mathjax.py
index cf23e7b330..e2ea87367a 100644
--- a/setup/mathjax.py
+++ b/setup/mathjax.py
@@ -18,7 +18,7 @@ class MathJax(ReVendor):
     NAME = 'mathjax'
     TAR_NAME = 'MathJax'
     VERSION = '3.1.4'
-    DOWNLOAD_URL = 'https://github.com/mathjax/MathJax/archive/%s.tar.gz' % VERSION
+    DOWNLOAD_URL = f'https://github.com/mathjax/MathJax/archive/{VERSION}.tar.gz'
 
     def add_file_pre(self, name, raw):
         self.h.update(raw)
diff --git a/setup/plugins_mirror.py b/setup/plugins_mirror.py
index 2c94378540..019b508bbd 100644
--- a/setup/plugins_mirror.py
+++ b/setup/plugins_mirror.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # License: GPLv3 Copyright: 2013, Kovid Goyal <kovid at kovidgoyal.net>
 
-
 # Imports {{{
 import argparse
 import ast
@@ -62,7 +61,7 @@ socket.setdefaulttimeout(30)
 
 
 def read(url, get_info=False):  # {{{
-    if url.startswith("file://"):
+    if url.startswith('file://'):
         return urlopen(url).read()
     opener = build_opener()
     opener.addheaders = [
@@ -151,8 +150,8 @@ def load_plugins_index():
         raise
     return json.loads(bz2.decompress(raw))
 
-# Get metadata from plugin zip file {{{
 
+# Get metadata from plugin zip file {{{
 
 def convert_node(fields, x, names={}, import_data=None):
     name = x.__class__.__name__
@@ -222,7 +221,7 @@ def get_import_data(name, mod, zf, names):
             return module
         raise ValueError(f'Failed to find name: {name!r} in module: {mod!r}')
     else:
-        raise ValueError('Failed to find module: %r' % mod)
+        raise ValueError(f'Failed to find module: {mod!r}')
 
 
 def parse_metadata(raw, namelist, zf):
@@ -327,7 +326,7 @@ def parse_plugin(raw, names, zf):
 
 def get_plugin_init(zf):
     metadata = None
-    names = {x.decode('utf-8') if isinstance(x, bytes) else x : x for x in zf.namelist()}
+    names = {x.decode('utf-8') if isinstance(x, bytes) else x: x for x in zf.namelist()}
     inits = [x for x in names if x.rpartition('/')[-1] == '__init__.py']
     inits.sort(key=lambda x:x.count('/'))
     if inits and inits[0] == '__init__.py':
@@ -357,9 +356,9 @@ def get_plugin_info(raw_zip):
                     return json.loads(res.stdout)
             raise
 
-
 # }}}
 
+
 def update_plugin_from_entry(plugin, entry):
     plugin['index_name'] = entry.name
     plugin['thread_url'] = entry.url
@@ -372,14 +371,14 @@ def fetch_plugin(old_index, entry):
     raw = read(entry.url).decode('utf-8', 'replace')
     url, name = parse_plugin_zip_url(raw)
     if url is None:
-        raise ValueError('Failed to find zip file URL for entry: %s' % repr(entry))
+        raise ValueError(f'Failed to find zip file URL for entry: {entry!r}')
     plugin = lm_map.get(entry.thread_id, None)
 
     if plugin is not None:
         # Previously downloaded plugin
         lm = datetime(*tuple(map(int, re.split(r'\D', plugin['last_modified'])))[:6])
         request = Request(url)
-        request.get_method = lambda : 'HEAD'
+        request.get_method = lambda: 'HEAD'
         with closing(urlopen(request)) as response:
             info = response.info()
         slm = datetime(*parsedate(info.get('Last-Modified'))[:6])
@@ -392,7 +391,7 @@ def fetch_plugin(old_index, entry):
     slm = datetime(*parsedate(info.get('Last-Modified'))[:6])
     plugin = get_plugin_info(raw)
     plugin['last_modified'] = slm.isoformat()
-    plugin['file'] = 'staging_%s.zip' % entry.thread_id
+    plugin['file'] = f'staging_{entry.thread_id}.zip'
     plugin['size'] = len(raw)
     plugin['original_url'] = url
     update_plugin_from_entry(plugin, entry)
@@ -456,32 +455,32 @@ def fetch_plugins(old_index):
 
 
 def plugin_to_index(plugin, count):
-    title = '<h3><img src="plugin-icon.png"><a href={} title="Plugin forum thread">{}</a></h3>'.format(  # noqa
+    title = '<h3><img src="plugin-icon.png"><a href={} title="Plugin forum thread">{}</a></h3>'.format(
         quoteattr(plugin['thread_url']), escape(plugin['name']))
     released = datetime(*tuple(map(int, re.split(r'\D', plugin['last_modified'])))[:6]).strftime('%e %b, %Y').lstrip()
     details = [
-        'Version: <b>%s</b>' % escape('.'.join(map(str, plugin['version']))),
-        'Released: <b>%s</b>' % escape(released),
-        'Author: %s' % escape(plugin['author']),
-        'calibre: %s' % escape('.'.join(map(str, plugin['minimum_calibre_version']))),
-        'Platforms: %s' % escape(', '.join(sorted(plugin['supported_platforms']) or ['all'])),
+        'Version: <b>{}</b>'.format(escape('.'.join(map(str, plugin['version'])))),
+        'Released: <b>{}</b>'.format(escape(released)),
+        'Author: {}'.format(escape(plugin['author'])),
+        'calibre: {}'.format(escape('.'.join(map(str, plugin['minimum_calibre_version'])))),
+        'Platforms: {}'.format(escape(', '.join(sorted(plugin['supported_platforms']) or ['all']))),
     ]
     if plugin['uninstall']:
-        details.append('Uninstall: %s' % escape(', '.join(plugin['uninstall'])))
+        details.append('Uninstall: {}'.format(escape(', '.join(plugin['uninstall']))))
     if plugin['donate']:
-        details.append('<a href=%s title="Donate">Donate</a>' % quoteattr(plugin['donate']))
+        details.append('<a href={} title="Donate">Donate</a>'.format(quoteattr(plugin['donate'])))
     block = []
     for li in details:
         if li.startswith('calibre:'):
             block.append('<br>')
-        block.append('<li>%s</li>' % li)
-    block = '<ul>%s</ul>' % ('\n'.join(block))
-    downloads = ('\xa0<span class="download-count">[%d total downloads]</span>' % count) if count else ''
+        block.append(f'<li>{li}</li>')
+    block = '<ul>{}</ul>'.format('\n'.join(block))
+    downloads = (f'\xa0<span class="download-count">[{count} total downloads]</span>') if count else ''
     zipfile = '<div class="end"><a href={} title="Download plugin" download={}>Download plugin \u2193</a>{}</div>'.format(
         quoteattr(plugin['file']), quoteattr(plugin['name'] + '.zip'), downloads)
     desc = plugin['description'] or ''
     if desc:
-        desc = '<p>%s</p>' % desc
+        desc = f'<p>{desc}</p>'
     return f'{title}\n{desc}\n{block}\n{zipfile}\n\n'
 
 
@@ -520,7 +519,7 @@ h1 { text-align: center }
 <div style="text-align:center"><a href="stats.html">Download counts for all plugins</a></div>
 %s
 </body>
-</html>''' % ('\n'.join(plugins))
+</html>''' % ('\n'.join(plugins))  # noqa: UP031
     raw = index.encode('utf-8')
     try:
         with open('index.html', 'rb') as f:
@@ -554,7 +553,7 @@ h1 { text-align: center }
 </table>
 </body>
 </html>
-    ''' % ('\n'.join(pstats))
+    ''' % ('\n'.join(pstats))  # noqa: UP031
     raw = stats.encode('utf-8')
     try:
         with open('stats.html', 'rb') as f:
@@ -706,7 +705,6 @@ def test_parse():  # {{{
         if new_url != full_url:
             print(f'new url ({aname}): {new_url} != {full_url} for plugin at: {url}')
             raise SystemExit(1)
-
 # }}}
 
 
@@ -722,7 +720,7 @@ class HelloWorld(FileTypePlugin):
     name                = _('name') # Name of the plugin
     description         = {1, 2}
     supported_platforms = ['windows', 'osx', 'linux'] # Platforms this plugin will run on
-    author              = u'Acme Inc.' # The author of this plugin
+    author              = 'Acme Inc.' # The author of this plugin
     version             = {1:'a', 'b':2}
     file_types          = set(['epub', 'mobi']) # The file types that this plugin will be applied to
     on_postprocess      = True # Run this plugin after conversion is complete
@@ -740,7 +738,6 @@ class HelloWorld(FileTypePlugin):
         zf.writestr('very/ver.py', b'MV = (0, 7, 53)')
         zf.writestr('__init__.py', b'from xxx import yyy\nfrom very.lovely import HelloWorld')
     assert get_plugin_info(buf.getvalue()) == vals
-
 # }}}
 
 
diff --git a/setup/polib.py b/setup/polib.py
index 64073d0b98..92e0f3ae0f 100644
--- a/setup/polib.py
+++ b/setup/polib.py
@@ -30,9 +30,8 @@ __all__ = ['pofile', 'POFile', 'POEntry', 'mofile', 'MOFile', 'MOEntry',
 # the default encoding to use when encoding cannot be detected
 default_encoding = 'utf-8'
 
+
 # python 2/3 compatibility helpers {{{
-
-
 PY3 = True
 text_type = str
 
@@ -42,9 +41,9 @@ def b(s):
 def u(s):
     return s
 # }}}
+
+
 # _pofile_or_mofile {{{
-
-
 def _pofile_or_mofile(f, type, **kwargs):
     """
     Internal function used by :func:`polib.pofile` and :func:`polib.mofile` to
@@ -67,9 +66,9 @@ def _pofile_or_mofile(f, type, **kwargs):
     instance.wrapwidth = kwargs.get('wrapwidth', 78)
     return instance
 # }}}
+
+
 # _is_file {{{
-
-
 def _is_file(filename_or_contents):
     """
     Safely returns the value of os.path.exists(filename_or_contents).
@@ -85,9 +84,9 @@ def _is_file(filename_or_contents):
     except (TypeError, ValueError, UnicodeEncodeError):
         return False
 # }}}
+
+
 # function pofile() {{{
-
-
 def pofile(pofile, **kwargs):
     """
     Convenience function that parses the po or pot file ``pofile`` and returns
@@ -117,9 +116,9 @@ def pofile(pofile, **kwargs):
     """
     return _pofile_or_mofile(pofile, 'pofile', **kwargs)
 # }}}
+
+
 # function mofile() {{{
-
-
 def mofile(mofile, **kwargs):
     """
     Convenience function that parses the mo file ``mofile`` and returns a
@@ -151,9 +150,9 @@ def mofile(mofile, **kwargs):
     """
     return _pofile_or_mofile(mofile, 'mofile', **kwargs)
 # }}}
+
+
 # function detect_encoding() {{{
-
-
 def detect_encoding(file, binary_mode=False):
     """
     Try to detect the encoding used by the ``file``. The ``file`` argument can
@@ -212,9 +211,9 @@ def detect_encoding(file, binary_mode=False):
                         return enc
     return default_encoding
 # }}}
+
+
 # function escape() {{{
-
-
 def escape(st):
     """
     Escapes the characters ``\\\\``, ``\\t``, ``\\n``, ``\\r``, ``\\v``,
@@ -229,9 +228,9 @@ def escape(st):
              .replace('\f', r'\f')\
              .replace('\"', r'\"')
 # }}}
+
+
 # function unescape() {{{
-
-
 def unescape(st):
     """
     Unescapes the characters ``\\\\``, ``\\t``, ``\\n``, ``\\r``, ``\\v``,
@@ -256,9 +255,9 @@ def unescape(st):
         return m  # handles escaped double quote
     return re.sub(r'\\(\\|n|t|r|v|b|f|")', unescape_repl, st)
 # }}}
+
+
 # function natural_sort() {{{
-
-
 def natural_sort(lst):
     """
     Sort naturally the given list.
@@ -271,11 +270,10 @@ def natural_sort(lst):
         return [convert(c) for c in re.split('([0-9]+)', key)]
 
     return sorted(lst, key=alphanum_key)
-
 # }}}
+
+
 # class _BaseFile {{{
-
-
 class _BaseFile(list):
     """
     Common base class for the :class:`~polib.POFile` and :class:`~polib.MOFile`
@@ -626,9 +624,9 @@ class _BaseFile(list):
             mixed = mixed.encode(self.encoding)
         return mixed
 # }}}
+
+
 # class POFile {{{
-
-
 class POFile(_BaseFile):
     """
     Po (or Pot) file reader/writer.
@@ -734,9 +732,9 @@ class POFile(_BaseFile):
             if entry.msgid_with_context not in refpot_msgids:
                 entry.obsolete = True
 # }}}
+
+
 # class MOFile {{{
-
-
 class MOFile(_BaseFile):
     """
     Mo file reader/writer.
@@ -807,9 +805,9 @@ class MOFile(_BaseFile):
         """
         return []
 # }}}
+
+
 # class _BaseEntry {{{
-
-
 class _BaseEntry:
     """
     Base class for :class:`~polib.POEntry` and :class:`~polib.MOEntry` classes.
@@ -942,9 +940,9 @@ class _BaseEntry:
             return '{}{}{}'.format(self.msgctxt, "\x04", self.msgid)
         return self.msgid
 # }}}
+
+
 # class POEntry {{{
-
-
 class POEntry(_BaseEntry):
     """
     Represents a po file entry.
@@ -1186,9 +1184,9 @@ class POEntry(_BaseEntry):
     def __hash__(self):
         return hash((self.msgid, self.msgstr))
 # }}}
+
+
 # class MOEntry {{{
-
-
 class MOEntry(_BaseEntry):
     """
     Represents a mo file entry.
@@ -1221,11 +1219,10 @@ class MOEntry(_BaseEntry):
 
     def __hash__(self):
         return hash((self.msgid, self.msgstr))
-
 # }}}
+
+
 # class _POFileParser {{{
-
-
 class _POFileParser:
     """
     A finite state machine to efficiently and correctly parse po
@@ -1658,9 +1655,9 @@ class _POFileParser:
         # don't change the current state
         return False
 # }}}
+
+
 # class _MOFileParser {{{
-
-
 class _MOFileParser:
     """
     A class to parse binary mo files.
diff --git a/setup/publish.py b/setup/publish.py
index 968860a8f5..69a213f10c 100644
--- a/setup/publish.py
+++ b/setup/publish.py
@@ -67,9 +67,7 @@ class Stage2(Command):
         for installer in installer_names(include_source=False):
             installer = self.j(self.d(self.SRC), installer)
             if not os.path.exists(installer) or os.path.getsize(installer) < 10000:
-                raise SystemExit(
-                    'The installer %s does not exist' % os.path.basename(installer)
-                )
+                raise SystemExit(f'The installer {os.path.basename(installer)} does not exist')
 
 
 class Stage3(Command):
@@ -129,8 +127,7 @@ class PublishBetas(Command):
     def run(self, opts):
         dist = self.a(self.j(self.d(self.SRC), 'dist'))
         subprocess.check_call((
-            'rsync --partial -rh --info=progress2 --delete-after %s/ download.calibre-ebook.com:/srv/download/betas/'
-            % dist
+            f'rsync --partial -rh --info=progress2 --delete-after {dist}/ download.calibre-ebook.com:/srv/download/betas/'
         ).split())
 
 
@@ -203,8 +200,8 @@ class Manual(Command):
             jobs.append(create_job([
                 sys.executable, self.j(self.d(self.SRC), 'manual', 'build.py'),
                 language, self.j(tdir, language)
-            ], '\n\n**************** Building translations for: %s' % language))
-        self.info('Building manual for %d languages' % len(jobs))
+            ], f'\n\n**************** Building translations for: {language}'))
+        self.info(f'Building manual for {len(jobs)} languages')
         subprocess.check_call(jobs[0].cmd)
         if not parallel_build(jobs[1:], self.info):
             raise SystemExit(1)
@@ -223,8 +220,8 @@ class Manual(Command):
                 if x and not os.path.exists(x):
                     os.symlink('.', x)
             self.info(
-                'Built manual for %d languages in %s minutes' %
-                (len(jobs), int((time.time() - st) / 60.))
+                'Built manual for {} languages in {} minutes'
+                .format(len(jobs), int((time.time() - st) / 60.))
             )
         finally:
             os.chdir(cwd)
@@ -237,13 +234,13 @@ class Manual(Command):
         from polyglot.http_server import HTTPServer, SimpleHTTPRequestHandler
         HandlerClass = SimpleHTTPRequestHandler
         ServerClass = HTTPServer
-        Protocol = "HTTP/1.0"
+        Protocol = 'HTTP/1.0'
         server_address = ('127.0.0.1', 8000)
 
         HandlerClass.protocol_version = Protocol
         httpd = ServerClass(server_address, HandlerClass)
 
-        print("Serving User Manual on localhost:8000")
+        print('Serving User Manual on localhost:8000')
         from calibre.gui2 import open_url
         open_url('http://localhost:8000')
         httpd.serve_forever()
@@ -299,7 +296,7 @@ class ManPages(Command):
         for l in languages:
             jobs.append(create_job(
                 [sys.executable, self.j(base, 'build.py'), '--man-pages', l, dest],
-                '\n\n**************** Building translations for: %s' % l)
+                f'\n\n**************** Building translations for: {l}')
             )
         self.info(f'\tCreating man pages in {dest} for {len(jobs)} languages...')
         subprocess.check_call(jobs[0].cmd)
diff --git a/setup/revendor.py b/setup/revendor.py
index 5417de8074..620c25c077 100755
--- a/setup/revendor.py
+++ b/setup/revendor.py
@@ -16,12 +16,12 @@ class ReVendor(Command):
     CAN_USE_SYSTEM_VERSION = True
 
     def add_options(self, parser):
-        parser.add_option('--path-to-%s' % self.NAME, help='Path to the extracted %s source' % self.TAR_NAME)
-        parser.add_option('--%s-url' % self.NAME, default=self.DOWNLOAD_URL,
-                help='URL to %s source archive in tar.gz format' % self.TAR_NAME)
+        parser.add_option(f'--path-to-{self.NAME}', help=f'Path to the extracted {self.TAR_NAME} source')
+        parser.add_option(f'--{self.NAME}-url', default=self.DOWNLOAD_URL,
+                help=f'URL to {self.TAR_NAME} source archive in tar.gz format')
         if self.CAN_USE_SYSTEM_VERSION:
-            parser.add_option('--system-%s' % self.NAME, default=False, action='store_true',
-                    help='Treat %s as system copy and symlink instead of copy' % self.TAR_NAME)
+            parser.add_option(f'--system-{self.NAME}', default=False, action='store_true',
+                    help=f'Treat {self.TAR_NAME} as system copy and symlink instead of copy')
 
     def download_securely(self, url: str) -> bytes:
         num = 5 if is_ci else 1
@@ -35,7 +35,7 @@ class ReVendor(Command):
                 time.sleep(2)
 
     def download_vendor_release(self, tdir, url):
-        self.info('Downloading %s:' % self.TAR_NAME, url)
+        self.info(f'Downloading {self.TAR_NAME}:', url)
         raw = self.download_securely(url)
         with tarfile.open(fileobj=BytesIO(raw)) as tf:
             tf.extractall(tdir)
diff --git a/setup/test.py b/setup/test.py
index 50d875053e..32f26cc879 100644
--- a/setup/test.py
+++ b/setup/test.py
@@ -37,14 +37,14 @@ class Test(BaseTest):
         super().add_options(parser)
         parser.add_option('--test-verbosity', type=int, default=4, help='Test verbosity (0-4)')
         parser.add_option('--test-module', '--test-group', default=[], action='append', type='choice', choices=sorted(map(str, TEST_MODULES)),
-                          help='The test module to run (can be specified more than once for multiple modules). Choices: %s' % ', '.join(sorted(TEST_MODULES)))
+                    help='The test module to run (can be specified more than once for multiple modules). Choices: {}'.format(', '.join(sorted(TEST_MODULES))))
         parser.add_option('--test-name', '-n', default=[], action='append',
                           help='The name of an individual test to run. Can be specified more than once for multiple tests. The name of the'
                           ' test is the name of the test function without the leading test_. For example, the function test_something()'
                           ' can be run by specifying the name "something".')
         parser.add_option('--exclude-test-module', default=[], action='append', type='choice', choices=sorted(map(str, TEST_MODULES)),
                           help='A test module to be excluded from the test run (can be specified more than once for multiple modules).'
-                          ' Choices: %s' % ', '.join(sorted(TEST_MODULES)))
+                          ' Choices: {}'.format(', '.join(sorted(TEST_MODULES))))
         parser.add_option('--exclude-test-name', default=[], action='append',
                           help='The name of an individual test to be excluded from the test run. Can be specified more than once for multiple tests.')
 
@@ -65,7 +65,6 @@ class Test(BaseTest):
                 ffmpeg_dll_dir = os.path.join(SW, 'ffmpeg', 'bin')
                 os.add_dll_directory(ffmpeg_dll_dir)
 
-
         from calibre.utils.run_tests import filter_tests_by_name, find_tests, remove_tests_by_name, run_cli
         tests = find_tests(which_tests=frozenset(opts.test_module), exclude_tests=frozenset(opts.exclude_test_module))
         if opts.test_name:
diff --git a/setup/translations.py b/setup/translations.py
index 8f19527684..29f0228914 100644
--- a/setup/translations.py
+++ b/setup/translations.py
@@ -93,11 +93,11 @@ class POT(Command):  # {{{
 
         ans = []
         for lineno, msg in msgs:
-            ans.append('#: %s:%d'%(path, lineno))
+            ans.append(f'#: {path}:{lineno}')
             slash = codepoint_to_chr(92)
             msg = msg.replace(slash, slash*2).replace('"', r'\"').replace('\n',
                     r'\n').replace('\r', r'\r').replace('\t', r'\t')
-            ans.append('msgid "%s"'%msg)
+            ans.append(f'msgid "{msg}"')
             ans.append('msgstr ""')
             ans.append('')
 
@@ -135,8 +135,8 @@ class POT(Command):  # {{{
                     lines = f.read().decode('utf-8').splitlines()
                     for i in range(len(lines)):
                         line = lines[i].strip()
-                        if line == '[calibre.%s]' % slug:
-                            lines.insert(i+1, 'file_filter = manual/<lang>/%s.po' % bname)
+                        if line == f'[calibre.{slug}]':
+                            lines.insert(i+1, f'file_filter = manual/<lang>/{bname}.po')
                             f.seek(0), f.truncate(), f.write('\n'.join(lines).encode('utf-8'))
                             break
                     else:
@@ -171,14 +171,14 @@ class POT(Command):  # {{{
     def pot_header(self, appname=__appname__, version=__version__):
         return textwrap.dedent('''\
         # Translation template file..
-        # Copyright (C) %(year)s Kovid Goyal
-        # Kovid Goyal <kovid@kovidgoyal.net>, %(year)s.
+        # Copyright (C) {year} Kovid Goyal
+        # Kovid Goyal <kovid@kovidgoyal.net>, {year}.
         #
         msgid ""
         msgstr ""
-        "Project-Id-Version: %(appname)s %(version)s\\n"
-        "POT-Creation-Date: %(time)s\\n"
-        "PO-Revision-Date: %(time)s\\n"
+        "Project-Id-Version: {appname} {version}\\n"
+        "POT-Creation-Date: {time}\\n"
+        "PO-Revision-Date: {time}\\n"
         "Last-Translator: Automatically generated\\n"
         "Language-Team: LANGUAGE\\n"
         "MIME-Version: 1.0\\n"
@@ -187,7 +187,7 @@ class POT(Command):  # {{{
         "Content-Type: text/plain; charset=UTF-8\\n"
         "Content-Transfer-Encoding: 8bit\\n"
 
-        ''')%dict(appname=appname, version=version,
+        ''').format(appname=appname, version=version,
                 year=time.strftime('%Y'),
                 time=time.strftime('%Y-%m-%d %H:%M+%Z'))
 
@@ -357,7 +357,7 @@ class Translations(POT):  # {{{
         l = {}
         lc_dataf = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lc_data.py')
         exec(compile(open(lc_dataf, 'rb').read(), lc_dataf, 'exec'), l, l)
-        lcdata = {k:{k1:v1 for k1, v1 in v} for k, v in l['data']}
+        lcdata = {k:dict(v) for k, v in l['data']}
         self.info('Compiling main UI translation files...')
         fmap = {f:self.mo_file(f) for f in self.po_files()}
         files = [(f, fmap[f][1]) for f in self.po_files()]
@@ -397,12 +397,12 @@ class Translations(POT):  # {{{
             iso_data.extract_po_files('iso_639-3', tdir)
             for f, (locale, dest) in iteritems(fmap):
                 iscpo = {'zh_HK':'zh_CN'}.get(locale, locale)
-                iso639 = self.j(tdir, '%s.po'%iscpo)
+                iso639 = self.j(tdir, f'{iscpo}.po')
                 if os.path.exists(iso639):
                     files.append((iso639, self.j(self.d(dest), 'iso639.mo')))
                 else:
                     iscpo = iscpo.partition('_')[0]
-                    iso639 = self.j(tdir, '%s.po'%iscpo)
+                    iso639 = self.j(tdir, f'{iscpo}.po')
                     if os.path.exists(iso639):
                         files.append((iso639, self.j(self.d(dest), 'iso639.mo')))
                     elif locale not in skip_iso:
@@ -566,7 +566,7 @@ class Translations(POT):  # {{{
         srcbase = self.j(self.d(self.SRC), 'translations', 'manual')
         destbase = self.j(self.d(self.SRC), 'manual', 'locale')
         complete = {}
-        all_stats = defaultdict(lambda : {'translated': 0, 'untranslated': 0})
+        all_stats = defaultdict(lambda: {'translated': 0, 'untranslated': 0})
         files = []
         for x in os.listdir(srcbase):
             q = self.j(srcbase, x)
@@ -607,7 +607,6 @@ class Translations(POT):  # {{{
         if os.path.exists(destbase):
             shutil.rmtree(destbase)
         shutil.rmtree(self.cache_dir)
-
 # }}}
 
 
@@ -756,7 +755,6 @@ class GetTranslations(Translations):  # {{{
         cc('git add */*.po'.split())
         cc('git commit -am'.split() + [msg or 'Updated translations'])
         cc('git push'.split())
-
 # }}}
 
 
@@ -817,7 +815,6 @@ class ISO639(Command):  # {{{
     def clean(self):
         if os.path.exists(self.DEST):
             os.remove(self.DEST)
-
 # }}}
 
 
diff --git a/setup/upload.py b/setup/upload.py
index 7c0076d339..487461104e 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -28,8 +28,8 @@ if __name__ == '__main__':
 from setup import Command, __appname__, __version__, installer_names
 
 DOWNLOADS = '/srv/main/downloads'
-HTML2LRF = "calibre/ebooks/lrf/html/demo"
-TXT2LRF = "src/calibre/ebooks/lrf/txt/demo"
+HTML2LRF = 'calibre/ebooks/lrf/html/demo'
+TXT2LRF = 'src/calibre/ebooks/lrf/txt/demo'
 STAGING_HOST = 'download.calibre-ebook.com'
 BACKUP_HOST = 'code.calibre-ebook.com'
 STAGING_USER = BACKUP_USER = 'root'
@@ -72,9 +72,9 @@ def upload_signatures():
                 f.write(fingerprint)
             scp.append(sha512)
         for srv in 'code main'.split():
-            check_call(scp + ['{0}:/srv/{0}/signatures/'.format(srv)])
+            check_call(scp + [f'{srv}:/srv/{srv}/signatures/'])
             check_call(
-                ['ssh', srv, 'chown', '-R', 'http:http', '/srv/%s/signatures' % srv]
+                ['ssh', srv, 'chown', '-R', 'http:http', f'/srv/{srv}/signatures']
             )
     finally:
         shutil.rmtree(tdir)
@@ -98,7 +98,6 @@ class ReUpload(Command):  # {{{
             if os.path.exists(x):
                 os.remove(x)
 
-
 # }}}
 
 
@@ -159,7 +158,6 @@ def run_remote_upload(args):
         'python', 'hosting.py'
     ] + args)
 
-
 # }}}
 
 
@@ -199,9 +197,7 @@ def upload_to_fosshub():
     entries = []
     for fname in files:
         desc = installer_description(fname)
-        url = 'https://download.calibre-ebook.com/{}/{}'.format(
-            __version__, os.path.basename(fname)
-        )
+        url = f'https://download.calibre-ebook.com/{__version__}/{os.path.basename(fname)}'
         entries.append({
             'fileUrl': url,
             'type': desc,
@@ -315,7 +311,6 @@ class UploadInstallers(Command):  # {{{
     def upload_to_calibre(self):
         run_remote_upload(calibre_cmdline(__version__))
 
-
 # }}}
 
 
@@ -357,7 +352,6 @@ class UploadUserManual(Command):  # {{{
         )
         check_call('ssh main chown -R http:http /srv/manual'.split())
 
-
 # }}}
 
 
@@ -367,24 +361,23 @@ class UploadDemo(Command):  # {{{
 
     def run(self, opts):
         check_call(
-            '''ebook-convert %s/demo.html /tmp/html2lrf.lrf '''
+            '''ebook-convert {}/demo.html /tmp/html2lrf.lrf '''
             '''--title='Demonstration of html2lrf' --authors='Kovid Goyal' '''
             '''--header '''
             '''--serif-family "/usr/share/fonts/corefonts, Times New Roman" '''
             '''--mono-family  "/usr/share/fonts/corefonts, Andale Mono" '''
-            '''''' % self.j(self.SRC, HTML2LRF),
+            ''''''.format(self.j(self.SRC, HTML2LRF)),
             shell=True
         )
 
         lrf = self.j(self.SRC, 'calibre', 'ebooks', 'lrf', 'html', 'demo')
         check_call(
-            'cd %s && zip -j /tmp/html-demo.zip * /tmp/html2lrf.lrf' % lrf,
+            f'cd {lrf} && zip -j /tmp/html-demo.zip * /tmp/html2lrf.lrf',
             shell=True
         )
 
         check_call(f'scp /tmp/html-demo.zip main:{DOWNLOADS}/', shell=True)
 
-
 # }}}
 
 
@@ -409,9 +402,7 @@ class UploadToServer(Command):  # {{{
             ('ssh code /apps/update-calibre-version.py ' + __version__).split()
         )
         check_call((
-            'ssh main /usr/local/bin/update-calibre-version.py %s && /usr/local/bin/update-calibre-code.py && /apps/static/generate.py'
-            % __version__
+            f'ssh main /usr/local/bin/update-calibre-version.py {__version__} && /usr/local/bin/update-calibre-code.py && /apps/static/generate.py'
         ).split())
 
-
 # }}}
diff --git a/setup/vcvars.py b/setup/vcvars.py
index 2461e4fc9c..ee88f444a6 100644
--- a/setup/vcvars.py
+++ b/setup/vcvars.py
@@ -26,8 +26,8 @@ def get_program_files_location(which=CSIDL_PROGRAM_FILESX86):
 def find_vswhere():
     for which in (CSIDL_PROGRAM_FILESX86, CSIDL_PROGRAM_FILES):
         root = get_program_files_location(which)
-        vswhere = os.path.join(root, "Microsoft Visual Studio", "Installer",
-                               "vswhere.exe")
+        vswhere = os.path.join(root, 'Microsoft Visual Studio', 'Installer',
+                               'vswhere.exe')
         if os.path.exists(vswhere):
             return vswhere
     raise SystemExit('Could not find vswhere.exe')
@@ -41,24 +41,24 @@ def get_output(*cmd):
 def find_visual_studio():
     path = get_output(
         find_vswhere(),
-        "-latest",
-        "-requires",
-        "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
-        "-property",
-        "installationPath",
-        "-products",
-        "*"
+        '-latest',
+        '-requires',
+        'Microsoft.VisualStudio.Component.VC.Tools.x86.x64',
+        '-property',
+        'installationPath',
+        '-products',
+        '*'
     ).strip()
-    return os.path.join(path, "VC", "Auxiliary", "Build")
+    return os.path.join(path, 'VC', 'Auxiliary', 'Build')
 
 
 @lru_cache
 def find_msbuild():
     base_path = get_output(
         find_vswhere(),
-        "-latest",
-        "-requires", "Microsoft.Component.MSBuild",
-        "-property", 'installationPath'
+        '-latest',
+        '-requires', 'Microsoft.Component.MSBuild',
+        '-property', 'installationPath'
     ).strip()
     return glob(os.path.join(
         base_path, 'MSBuild', '*', 'Bin', 'MSBuild.exe'))[0]
@@ -66,10 +66,10 @@ def find_msbuild():
 
 def find_vcvarsall():
     productdir = find_visual_studio()
-    vcvarsall = os.path.join(productdir, "vcvarsall.bat")
+    vcvarsall = os.path.join(productdir, 'vcvarsall.bat')
     if os.path.isfile(vcvarsall):
         return vcvarsall
-    raise SystemExit("Unable to find vcvarsall.bat in productdir: " +
+    raise SystemExit('Unable to find vcvarsall.bat in productdir: ' +
                      productdir)
 
 
@@ -92,9 +92,9 @@ def query_process(cmd, is64bit):
     try:
         stdout, stderr = popen.communicate()
         if popen.wait() != 0:
-            raise RuntimeError(stderr.decode("mbcs"))
+            raise RuntimeError(stderr.decode('mbcs'))
 
-        stdout = stdout.decode("mbcs")
+        stdout = stdout.decode('mbcs')
         for line in stdout.splitlines():
             if '=' not in line:
                 continue
@@ -128,7 +128,6 @@ def query_vcvarsall(is64bit=True):
             comn_tools[k] = int(m.group(1))
     comntools = sorted(comn_tools, key=comn_tools.__getitem__)[-1]
 
-
     def g(k):
         try:
             return env[k]
diff --git a/setup/win-ci.py b/setup/win-ci.py
index ae1160ee11..6b00d3bdaa 100644
--- a/setup/win-ci.py
+++ b/setup/win-ci.py
@@ -49,9 +49,7 @@ def sanitize_path():
                 needed_paths.append(p)
                 executables.remove(x)
     sw = os.environ['SW']
-    paths = r'{0}\private\python\bin {0}\private\python\Lib\site-packages\pywin32_system32 {0}\bin {0}\qt\bin C:\Windows\System32'.format(
-        sw
-    ).split() + needed_paths
+    paths = rf'{sw}\private\python\bin {sw}\private\python\Lib\site-packages\pywin32_system32 {sw}\bin {sw}\qt\bin C:\Windows\System32'.split() + needed_paths
     os.environ['PATH'] = os.pathsep.join(paths)
     print('PATH:', os.environ['PATH'])
 
@@ -100,7 +98,7 @@ def main():
     else:
         if len(sys.argv) == 1:
             raise SystemExit('Usage: win-ci.py sw|build|test')
-        raise SystemExit('%r is not a valid action' % sys.argv[-1])
+        raise SystemExit('{!r} is not a valid action'.format(sys.argv[-1]))
 
 
 if __name__ == '__main__':
diff --git a/setup/wincross.py b/setup/wincross.py
index a8da16de41..ccc460169f 100644
--- a/setup/wincross.py
+++ b/setup/wincross.py
@@ -88,7 +88,7 @@ class Packages:
                 self.files_to_download.append(File(pf))
 
         # CRT headers
-        add_package(f"Microsoft.VC.{self.crt_version}.CRT.Headers.base")
+        add_package(f'Microsoft.VC.{self.crt_version}.CRT.Headers.base')
         # CRT libs
         prefix = f'Microsoft.VC.{self.crt_version}.CRT.{arch}.'.lower()
         variants = {}
@@ -102,7 +102,7 @@ class Packages:
                         variants[variant] = pid
         add_package(variants[crt_variant])
         # ATL headers
-        add_package(f"Microsoft.VC.{self.crt_version}.ATL.Headers.base")
+        add_package(f'Microsoft.VC.{self.crt_version}.ATL.Headers.base')
         # ATL libs
         add_package(f'Microsoft.VC.{self.crt_version}.ATL.{arch}.Spectre.base')
         add_package(f'Microsoft.VC.{self.crt_version}.ATL.{arch}.base')
@@ -176,6 +176,7 @@ def download_item(dest_dir: str, file: File):
         raise SystemExit(f'The hash for {file.filename} does not match.'
                          f' {m.hexdigest()} != {file.sha256}')
 
+
 def cabinets_in_msi(path):
     raw = subprocess.check_output(['msiinfo', 'export', path, 'Media']).decode('utf-8')
     return re.findall(r'\S+\.cab', raw)
@@ -188,18 +189,17 @@ def download(dest_dir, manifest_version=17, manifest_type='release', manifest_pa
         url = f'https://aka.ms/vs/{manifest_version}/{manifest_type}/channel'
         print('Downloading top-level manifest from', url)
         tm = json.loads(urlopen(url).read())
-        print("Got toplevel manifest for", (tm["info"]["productDisplayVersion"]))
-        for item in tm["channelItems"]:
-            if item.get('type') == "Manifest":
-                url = item["payloads"][0]["url"]
+        print('Got toplevel manifest for', (tm['info']['productDisplayVersion']))
+        for item in tm['channelItems']:
+            if item.get('type') == 'Manifest':
+                url = item['payloads'][0]['url']
                 print('Downloading actual manifest...')
                 manifest = urlopen(url).read()
 
     pkgs = Packages(manifest, crt_variant, arch)
     os.makedirs(dest_dir, exist_ok=True)
     total = sum(x.size for x in pkgs.files_to_download)
-    print('Downloading', int(total/(1024*1024)), 'MB in', len(pkgs.files_to_download),
-          'files...')
+    print('Downloading', int(total/(1024*1024)), 'MB in', len(pkgs.files_to_download), 'files...')
     with concurrent.futures.ThreadPoolExecutor(max_workers=4) as executor:
         for _ in executor.map(partial(download_item, dest_dir), pkgs.files_to_download):
             pass
@@ -244,7 +244,7 @@ def extract_msi(path, dest_dir):
 
 
 def extract_zipfile(zf, dest_dir):
-    tmp = os.path.join(dest_dir, "extract")
+    tmp = os.path.join(dest_dir, 'extract')
     os.mkdir(tmp)
     for f in zf.infolist():
         name = unquote(f.filename)
@@ -259,7 +259,7 @@ def extract_vsix(path, dest_dir):
     print('Extracting', os.path.basename(path), '...')
     with TemporaryDirectory(dir=dest_dir) as tdir, ZipFile(path, 'r') as zf:
         extract_zipfile(zf, tdir)
-        contents = os.path.join(tdir, "Contents")
+        contents = os.path.join(tdir, 'Contents')
         merge_trees(contents, dest_dir)
         names = zf.namelist()
     with open(os.path.join(dest_dir, os.path.basename(path) + '.listing'), 'w') as ls:
diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index 37bb1bb635..d7a69bfe19 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -256,20 +256,20 @@ def get_parsed_proxy(typ='http', debug=True):
     proxy = proxies.get(typ, None)
     if proxy:
         pattern = re.compile((
-            '(?:ptype://)?'
-            '(?:(?P<user>\\w+):(?P<pass>.*)@)?'
-            '(?P<host>[\\w\\-\\.]+)'
-            '(?::(?P<port>\\d+))?').replace('ptype', typ)
+            r'(?:ptype://)?'
+            r'(?:(?P<user>\w+):(?P<pass>.*)@)?'
+            r'(?P<host>[\w\-\.]+)'
+            r'(?::(?P<port>\d+))?').replace('ptype', typ)
         )
 
         match = pattern.match(proxies[typ])
         if match:
             try:
                 ans = {
-                        'host' : match.group('host'),
-                        'port' : match.group('port'),
-                        'user' : match.group('user'),
-                        'pass' : match.group('pass')
+                        'host': match.group('host'),
+                        'port': match.group('port'),
+                        'user': match.group('user'),
+                        'pass': match.group('pass')
                     }
                 if ans['port']:
                     ans['port'] = int(ans['port'])
@@ -450,14 +450,16 @@ def my_unichr(num):
     except (ValueError, OverflowError):
         return '?'
 
+
 XML_ENTITIES = {
-    '"' : '&quot;',
-    "'" : '&apos;',
-    '<' : '&lt;',
-    '>' : '&gt;',
-    '&' : '&amp;'
+    '"': '&quot;',
+    "'": '&apos;',
+    '<': '&lt;',
+    '>': '&gt;',
+    '&': '&amp;'
 }
 
+
 def entity_to_unicode(match, exceptions=(), encoding=None, result_exceptions={}):
     '''
     :param match: A match object such that '&'+match.group(1)';' is the entity.
@@ -560,15 +562,15 @@ def url_slash_cleaner(url):
 
 
 def human_readable(size, sep=' '):
-    """ Convert a size in bytes into a human readable form """
-    divisor, suffix = 1, "B"
+    ''' Convert a size in bytes into a human readable form '''
+    divisor, suffix = 1, 'B'
     for i, candidate in enumerate(('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB')):
         if size < (1 << ((i + 1) * 10)):
             divisor, suffix = (1 << (i * 10)), candidate
             break
     size = str(float(size)/divisor)
-    if size.find(".") > -1:
-        size = size[:size.find(".")+2]
+    if size.find('.') > -1:
+        size = size[:size.find('.')+2]
     if size.endswith('.0'):
         size = size[:-2]
     return size + sep + suffix
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index e91f24b47d..e94c6ff7ea 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -14,7 +14,7 @@ __appname__   = 'calibre'
 numeric_version = (7, 24, 101)
 __version__   = '.'.join(map(str, numeric_version))
 git_version   = None
-__author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
+__author__    = 'Kovid Goyal <kovid@kovidgoyal.net>'
 
 '''
 Various run time constants.
@@ -410,7 +410,6 @@ else:
         atexit.register(cleanup_cdir)
 # }}}
 
-
 is_running_from_develop = False
 if getattr(sys, 'frozen', False):
     try:
diff --git a/src/calibre/customize/__init__.py b/src/calibre/customize/__init__.py
index a50a76ac94..df0b6a6759 100644
--- a/src/calibre/customize/__init__.py
+++ b/src/calibre/customize/__init__.py
@@ -475,6 +475,7 @@ class MetadataReaderPlugin(Plugin):  # {{{
         :return: A :class:`calibre.ebooks.metadata.book.Metadata` object
         '''
         return None
+
 # }}}
 
 
@@ -573,11 +574,11 @@ class CatalogPlugin(Plugin):  # {{{
             # Validate requested_fields
             if requested_fields - all_fields:
                 from calibre.library import current_library_name
-                invalid_fields = sorted(list(requested_fields - all_fields))
-                print("invalid --fields specified: %s" % ', '.join(invalid_fields))
+                invalid_fields = sorted(requested_fields - all_fields)
+                print('invalid --fields specified: %s' % ', '.join(invalid_fields))
                 print("available fields in '%s': %s" %
-                      (current_library_name(), ', '.join(sorted(list(all_fields)))))
-                raise ValueError("unable to generate catalog with specified fields")
+                      (current_library_name(), ', '.join(sorted(all_fields))))
+                raise ValueError('unable to generate catalog with specified fields')
 
             fields = [x for x in of if x in all_fields]
         else:
@@ -600,7 +601,7 @@ class CatalogPlugin(Plugin):  # {{{
         from calibre.ptempfile import PersistentTemporaryDirectory
 
         if type(self) not in builtin_plugins and self.name not in config['disabled_plugins']:
-            files_to_copy = [f"{self.name.lower()}.{ext}" for ext in ["ui","py"]]
+            files_to_copy = [f'{self.name.lower()}.{ext}' for ext in ['ui','py']]
             resources = zipfile.ZipFile(self.plugin_path,'r')
 
             if self.resources_path is None:
@@ -610,7 +611,7 @@ class CatalogPlugin(Plugin):  # {{{
                 try:
                     resources.extract(file, self.resources_path)
                 except:
-                    print(f" customize:__init__.initialize(): {file} not found in {os.path.basename(self.plugin_path)}")
+                    print(f' customize:__init__.initialize(): {file} not found in {os.path.basename(self.plugin_path)}')
                     continue
             resources.close()
 
diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 52ea221a46..497f08e345 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -11,8 +11,8 @@ from calibre.ebooks.metadata.archive import ArchiveExtract, KPFExtract, get_comi
 
 plugins = []
 
-# To archive plugins {{{
 
+# To archive plugins {{{
 
 class PML2PMLZ(FileTypePlugin):
     name = 'PML to PMLZ'
@@ -96,8 +96,8 @@ class TXT2TXTZ(FileTypePlugin):
 plugins += [HTML2ZIP, PML2PMLZ, TXT2TXTZ, ArchiveExtract, KPFExtract]
 # }}}
 
-# Metadata reader plugins {{{
 
+# Metadata reader plugins {{{
 
 class ComicMetadataReader(MetadataReaderPlugin):
 
@@ -434,8 +434,8 @@ plugins += [x for x in list(locals().values()) if isinstance(x, type) and
 
 # }}}
 
-# Metadata writer plugins {{{
 
+# Metadata writer plugins {{{
 
 class EPUBMetadataWriter(MetadataWriterPlugin):
 
@@ -835,7 +835,6 @@ plugins += [
     USER_DEFINED,
 ]
 
-
 # }}}
 
 # New metadata download plugins {{{
@@ -850,8 +849,8 @@ plugins += [GoogleBooks, GoogleImages, Amazon, Edelweiss, OpenLibrary, BigBookSe
 
 # }}}
 
-# Interface Actions {{{
 
+# Interface Actions {{{
 
 class ActionAdd(InterfaceActionBase):
     name = 'Add Books'
@@ -1137,6 +1136,7 @@ class ActionAllActions(InterfaceActionBase):
     actual_plugin = 'calibre.gui2.actions.all_actions:AllGUIActions'
     description = _('Open a menu showing all installed GUI actions')
 
+
 class ActionVirtualLibrary(InterfaceActionBase):
     name = 'Virtual Library'
     actual_plugin = 'calibre.gui2.actions.virtual_library:VirtualLibraryAction'
@@ -1171,7 +1171,7 @@ class ActionPluginUpdater(InterfaceActionBase):
 plugins += [ActionAdd, ActionAllActions, ActionFetchAnnotations, ActionGenerateCatalog,
         ActionConvert, ActionDelete, ActionEditMetadata, ActionView,
         ActionFetchNews, ActionSaveToDisk, ActionQuickview, ActionPolish,
-        ActionShowBookDetails,ActionRestart, ActionOpenFolder, ActionConnectShare,
+        ActionShowBookDetails, ActionRestart, ActionOpenFolder, ActionConnectShare,
         ActionSendToDevice, ActionHelp, ActionPreferences, ActionSimilarBooks,
         ActionAddToLibrary, ActionEditCollections, ActionMatchBooks, ActionShowMatchedBooks, ActionChooseLibrary,
         ActionCopyToLibrary, ActionTweakEpub, ActionUnpackBook, ActionNextMatch, ActionStore,
@@ -1183,8 +1183,8 @@ plugins += [ActionAdd, ActionAllActions, ActionFetchAnnotations, ActionGenerateC
 
 # }}}
 
-# Preferences Plugins {{{
 
+# Preferences Plugins {{{
 
 class LookAndFeel(PreferencesPlugin):
     name = 'Look & Feel'
@@ -1460,8 +1460,8 @@ plugins += [LookAndFeel, Behavior, Columns, Toolbar, Search, InputOptions,
 
 # }}}
 
-# Store plugins {{{
 
+# Store plugins {{{
 
 class StoreAmazonKindleStore(StoreBase):
     name = 'Amazon Kindle'
@@ -1546,7 +1546,7 @@ class StoreAmazonESKindleStore(StoreBase):
 class StoreAmazonUKKindleStore(StoreBase):
     name = 'Amazon UK Kindle'
     author = 'Kovid Goyal'
-    description = 'Kindle books from Amazon\'s UK web site. Also, includes French language e-books.'
+    description = "Kindle books from Amazon's UK web site. Also, includes French language e-books."
     actual_plugin = 'calibre.gui2.store.stores.amazon_uk_plugin:AmazonKindleStore'
 
     headquarters = 'UK'
@@ -1555,7 +1555,7 @@ class StoreAmazonUKKindleStore(StoreBase):
 
 class StoreArchiveOrgStore(StoreBase):
     name = 'Archive.org'
-    description = 'An Internet library offering permanent access for researchers, historians, scholars, people with disabilities, and the general public to historical collections that exist in digital format.'  # noqa
+    description = 'An Internet library offering permanent access for researchers, historians, scholars, people with disabilities, and the general public to historical collections that exist in digital format.'  # noqa: E501
     actual_plugin = 'calibre.gui2.store.stores.archive_org_plugin:ArchiveOrgStore'
 
     drm_free_only = True
@@ -1565,7 +1565,7 @@ class StoreArchiveOrgStore(StoreBase):
 
 class StoreBubokPublishingStore(StoreBase):
     name = 'Bubok Spain'
-    description = 'Bubok Publishing is a publisher, library and store of books of authors from all around the world. They have a big amount of books of a lot of topics'  # noqa
+    description = 'Bubok Publishing is a publisher, library and store of books of authors from all around the world. They have a big amount of books of a lot of topics'  # noqa: E501
     actual_plugin = 'calibre.gui2.store.stores.bubok_publishing_plugin:BubokPublishingStore'
 
     drm_free_only = True
@@ -1575,7 +1575,7 @@ class StoreBubokPublishingStore(StoreBase):
 
 class StoreBubokPortugalStore(StoreBase):
     name = 'Bubok Portugal'
-    description = 'Bubok Publishing Portugal is a publisher, library and store of books of authors from Portugal. They have a big amount of books of a lot of topics'  # noqa
+    description = 'Bubok Publishing Portugal is a publisher, library and store of books of authors from Portugal. They have a big amount of books of a lot of topics'  # noqa: E501
     actual_plugin = 'calibre.gui2.store.stores.bubok_portugal_plugin:BubokPortugalStore'
 
     drm_free_only = True
@@ -1595,7 +1595,7 @@ class StoreBaenWebScriptionStore(StoreBase):
 
 class StoreBNStore(StoreBase):
     name = 'Barnes and Noble'
-    description = 'The world\'s largest book seller. As the ultimate destination for book lovers, Barnes & Noble.com offers an incredible array of content.'
+    description = "The world's largest book seller. As the ultimate destination for book lovers, Barnes & Noble.com offers an incredible array of content."
     actual_plugin = 'calibre.gui2.store.stores.bn_plugin:BNStore'
 
     headquarters = 'US'
@@ -1605,7 +1605,7 @@ class StoreBNStore(StoreBase):
 class StoreBeamEBooksDEStore(StoreBase):
     name = 'Beam EBooks DE'
     author = 'Charles Haley'
-    description = 'Bei uns finden Sie: Tausende deutschsprachige e-books; Alle e-books ohne hartes DRM; PDF, ePub und Mobipocket Format; Sofortige Verfügbarkeit - 24 Stunden am Tag; Günstige Preise; e-books für viele Lesegeräte, PC,Mac und Smartphones; Viele Gratis e-books'  # noqa
+    description = 'Bei uns finden Sie: Tausende deutschsprachige e-books; Alle e-books ohne hartes DRM; PDF, ePub und Mobipocket Format; Sofortige Verfügbarkeit - 24 Stunden am Tag; Günstige Preise; e-books für viele Lesegeräte, PC, Mac und Smartphones; Viele Gratis e-books'  # noqa: E501
     actual_plugin = 'calibre.gui2.store.stores.beam_ebooks_de_plugin:BeamEBooksDEStore'
 
     drm_free_only = True
@@ -1658,7 +1658,7 @@ class StoreEbookpointStore(StoreBase):
 
 class StoreEbookscomStore(StoreBase):
     name = 'eBooks.com'
-    description = 'Sells books in multiple electronic formats in all categories. Technical infrastructure is cutting edge, robust and scalable, with servers in the US and Europe.'  # noqa
+    description = 'Sells books in multiple electronic formats in all categories. Technical infrastructure is cutting edge, robust and scalable, with servers in the US and Europe.'  # noqa: E501
     actual_plugin = 'calibre.gui2.store.stores.ebooks_com_plugin:EbookscomStore'
 
     headquarters = 'US'
@@ -1689,7 +1689,7 @@ class StoreEbooksGratuitsStore(StoreBase):
 class StoreEmpikStore(StoreBase):
     name = 'Empik'
     author = 'Tomasz Długosz'
-    description  = 'Empik to marka o unikalnym dziedzictwie i legendarne miejsce, dawne “okno na świat”. Jest obecna w polskim krajobrazie kulturalnym od 60 lat (wcześniej jako Kluby Międzynarodowej Prasy i Książki).'  # noqa
+    description  = 'Empik to marka o unikalnym dziedzictwie i legendarne miejsce, dawne “okno na świat”. Jest obecna w polskim krajobrazie kulturalnym od 60 lat (wcześniej jako Kluby Międzynarodowej Prasy i Książki).'  # noqa: E501
     actual_plugin = 'calibre.gui2.store.stores.empik_plugin:EmpikStore'
 
     headquarters = 'PL'
@@ -1699,7 +1699,7 @@ class StoreEmpikStore(StoreBase):
 
 class StoreFeedbooksStore(StoreBase):
     name = 'Feedbooks'
-    description = 'Feedbooks is a cloud publishing and distribution service, connected to a large ecosystem of reading systems and social networks. Provides a variety of genres from independent and classic books.'  # noqa
+    description = 'Feedbooks is a cloud publishing and distribution service, connected to a large ecosystem of reading systems and social networks. Provides a variety of genres from independent and classic books.'  # noqa: E501
     actual_plugin = 'calibre.gui2.store.stores.feedbooks_plugin:FeedbooksStore'
 
     headquarters = 'FR'
@@ -1717,7 +1717,7 @@ class StoreGoogleBooksStore(StoreBase):
 
 class StoreGutenbergStore(StoreBase):
     name = 'Project Gutenberg'
-    description = 'The first producer of free e-books. Free in the United States because their copyright has expired. They may not be free of copyright in other countries. Readers outside of the United States must check the copyright laws of their countries before downloading or redistributing our e-books.'  # noqa
+    description = 'The first producer of free e-books. Free in the United States because their copyright has expired. They may not be free of copyright in other countries. Readers outside of the United States must check the copyright laws of their countries before downloading or redistributing our e-books.'  # noqa: E501
     actual_plugin = 'calibre.gui2.store.stores.gutenberg_plugin:GutenbergStore'
 
     drm_free_only = True
@@ -1727,7 +1727,7 @@ class StoreGutenbergStore(StoreBase):
 
 class StoreKoboStore(StoreBase):
     name = 'Kobo'
-    description = 'With over 2.3 million e-books to browse we have engaged readers in over 200 countries in Kobo eReading. Our e-book listings include New York Times Bestsellers, award winners, classics and more!'  # noqa
+    description = 'With over 2.3 million e-books to browse we have engaged readers in over 200 countries in Kobo eReading. Our e-book listings include New York Times Bestsellers, award winners, classics and more!'  # noqa: E501
     actual_plugin = 'calibre.gui2.store.stores.kobo_plugin:KoboStore'
 
     headquarters = 'CA'
@@ -1825,7 +1825,7 @@ class StoreOzonRUStore(StoreBase):
 
 class StorePragmaticBookshelfStore(StoreBase):
     name = 'Pragmatic Bookshelf'
-    description = 'The Pragmatic Bookshelf\'s collection of programming and tech books available as e-books.'
+    description = "The Pragmatic Bookshelf's collection of programming and tech books available as e-books."
     actual_plugin = 'calibre.gui2.store.stores.pragmatic_bookshelf_plugin:PragmaticBookshelfStore'
 
     drm_free_only = True
@@ -1902,7 +1902,7 @@ class StoreWeightlessBooksStore(StoreBase):
 class StoreWolneLekturyStore(StoreBase):
     name = 'Wolne Lektury'
     author = 'Tomasz Długosz'
-    description = 'Wolne Lektury to biblioteka internetowa czynna 24 godziny na dobę, 365 dni w roku, której zasoby dostępne są całkowicie za darmo. Wszystkie dzieła są odpowiednio opracowane - opatrzone przypisami, motywami i udostępnione w kilku formatach - HTML, TXT, PDF, EPUB, MOBI, FB2.'  # noqa
+    description = 'Wolne Lektury to biblioteka internetowa czynna 24 godziny na dobę, 365 dni w roku, której zasoby dostępne są całkowicie za darmo. Wszystkie dzieła są odpowiednio opracowane - opatrzone przypisami, motywami i udostępnione w kilku formatach - HTML, TXT, PDF, EPUB, MOBI, FB2.'  # noqa: E501
     actual_plugin = 'calibre.gui2.store.stores.wolnelektury_plugin:WolneLekturyStore'
 
     headquarters = 'PL'
@@ -1975,10 +1975,10 @@ if __name__ == '__main__':
     try:
         subprocess.check_call(['python', '-c', textwrap.dedent(
         '''
-        import init_calibre  # noqa
+        import init_calibre
 
         def doit():
-            import calibre.customize.builtins as b  # noqa
+            import calibre.customize.builtins as b
 
         def show_stats():
             from pstats import Stats
@@ -1997,7 +1997,7 @@ if __name__ == '__main__':
     try:
         subprocess.check_call(['python', '-c', textwrap.dedent(
         '''
-        import time, sys, init_calibre
+        import time, sys, init_calibre  # noqa: F401
         st = time.time()
         import calibre.customize.builtins
         t = time.time() - st
diff --git a/src/calibre/customize/conversion.py b/src/calibre/customize/conversion.py
index 59a641bad6..54e61dc24a 100644
--- a/src/calibre/customize/conversion.py
+++ b/src/calibre/customize/conversion.py
@@ -11,7 +11,6 @@ from calibre.customize import Plugin
 
 
 class ConversionOption:
-
     '''
     Class representing conversion options
     '''
@@ -127,7 +126,6 @@ def gui_configuration_widget(name, parent, get_option_by_name,
 
 
 class InputFormatPlugin(Plugin):
-
     '''
     InputFormatPlugins are responsible for converting a document into
     HTML+OPF+CSS+etc.
@@ -275,7 +273,6 @@ class InputFormatPlugin(Plugin):
 
 
 class OutputFormatPlugin(Plugin):
-
     '''
     OutputFormatPlugins are responsible for converting an OEB document
     (OPF+HTML) into an output e-book.
diff --git a/src/calibre/customize/profiles.py b/src/calibre/customize/profiles.py
index 318d54f30e..ba285fbf27 100644
--- a/src/calibre/customize/profiles.py
+++ b/src/calibre/customize/profiles.py
@@ -34,8 +34,8 @@ class Plugin(_Plugin):
         self.width_pts = self.width * 72./self.dpi
         self.height_pts = self.height * 72./self.dpi
 
-# Input profiles {{{
 
+# Input profiles {{{
 
 class InputProfile(Plugin):
 
@@ -299,8 +299,8 @@ class iPadOutput(OutputProfile):
         }
     ]
 
-    ratings_char = '\u2605'            # filled star
-    empty_ratings_char = '\u2606'      # hollow star
+    ratings_char = '★'            # filled star
+    empty_ratings_char = '☆'      # hollow star
 
     touchscreen = True
     # touchscreen_news_css {{{
@@ -677,8 +677,8 @@ class KindleOutput(OutputProfile):
     supports_mobi_indexing = True
     periodical_date_in_title = False
 
-    empty_ratings_char = '\u2606'
-    ratings_char = '\u2605'
+    empty_ratings_char = '☆'
+    ratings_char = '★'
 
     mobi_ems_per_blockquote = 2.0
 
@@ -696,8 +696,8 @@ class KindleDXOutput(OutputProfile):
     # comic_screen_size         = (741, 1022)
     supports_mobi_indexing = True
     periodical_date_in_title = False
-    empty_ratings_char = '\u2606'
-    ratings_char = '\u2605'
+    empty_ratings_char = '☆'
+    ratings_char = '★'
     mobi_ems_per_blockquote = 2.0
 
 
diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py
index 6c75784aa6..3911c738e1 100644
--- a/src/calibre/customize/ui.py
+++ b/src/calibre/customize/ui.py
@@ -74,11 +74,10 @@ def load_plugin(path_to_zip_file):  # {{{
     :return: A :class:`Plugin` instance.
     '''
     return loader.load(path_to_zip_file)
-
 # }}}
 
-# Enable/disable plugins {{{
 
+# Enable/disable plugins {{{
 
 def disable_plugin(plugin_or_name):
     x = getattr(plugin_or_name, 'name', plugin_or_name)
@@ -131,8 +130,8 @@ def is_disabled(plugin):
             plugin.name in default_disabled_plugins
 # }}}
 
-# File type plugins {{{
 
+# File type plugins {{{
 
 _on_import           = {}
 _on_postimport       = {}
@@ -270,8 +269,8 @@ def run_plugins_on_postadd(db, book_id, fmt_map):
 
 # }}}
 
-# Plugin customization {{{
 
+# Plugin customization {{{
 
 def customize_plugin(plugin, custom):
     d = config['plugin_customization']
@@ -284,8 +283,8 @@ def plugin_customization(plugin):
 
 # }}}
 
-# Input/Output profiles {{{
 
+# Input/Output profiles {{{
 
 def input_profiles():
     for plugin in _initialized_plugins:
@@ -299,8 +298,8 @@ def output_profiles():
             yield plugin
 # }}}
 
-# Interface Actions # {{{
 
+# Interface Actions # {{{
 
 def interface_actions():
     customization = config['plugin_customization']
@@ -311,8 +310,8 @@ def interface_actions():
                 yield plugin
 # }}}
 
-# Preferences Plugins # {{{
 
+# Preferences Plugins # {{{
 
 def preferences_plugins():
     customization = config['plugin_customization']
@@ -323,8 +322,8 @@ def preferences_plugins():
                 yield plugin
 # }}}
 
-# Library Closed Plugins # {{{
 
+# Library Closed Plugins # {{{
 
 def available_library_closed_plugins():
     customization = config['plugin_customization']
@@ -343,8 +342,8 @@ def has_library_closed_plugins():
     return False
 # }}}
 
-# Store Plugins # {{{
 
+# Store Plugins # {{{
 
 def store_plugins():
     customization = config['plugin_customization']
@@ -375,8 +374,8 @@ def available_stores():
 
 # }}}
 
-# Metadata read/write {{{
 
+# Metadata read/write {{{
 
 _metadata_readers = {}
 _metadata_writers = {}
@@ -519,8 +518,8 @@ def can_set_metadata(ftype):
 
 # }}}
 
-# Add/remove plugins {{{
 
+# Add/remove plugins {{{
 
 def add_plugin(path_to_zip_file):
     make_config_dir()
@@ -565,8 +564,8 @@ def remove_plugin(plugin_or_name):
 
 # }}}
 
-# Input/Output format plugins {{{
 
+# Input/Output format plugins {{{
 
 def input_format_plugins():
     for plugin in _initialized_plugins:
@@ -623,8 +622,8 @@ def available_output_formats():
 
 # }}}
 
-# Catalog plugins {{{
 
+# Catalog plugins {{{
 
 def catalog_plugins():
     for plugin in _initialized_plugins:
@@ -648,8 +647,8 @@ def plugin_for_catalog_format(fmt):
 
 # }}}
 
-# Device plugins {{{
 
+# Device plugins {{{
 
 def device_plugins(include_disabled=False):
     for plugin in _initialized_plugins:
@@ -670,8 +669,8 @@ def disabled_device_plugins():
                     yield plugin
 # }}}
 
-# Metadata sources2 {{{
 
+# Metadata sources2 {{{
 
 def metadata_plugins(capabilities):
     capabilities = frozenset(capabilities)
@@ -702,8 +701,8 @@ def patch_metadata_plugins(possibly_updated_plugins):
         _initialized_plugins[i] = pup
 # }}}
 
-# Editor plugins {{{
 
+# Editor plugins {{{
 
 def all_edit_book_tool_plugins():
     for plugin in _initialized_plugins:
@@ -711,8 +710,8 @@ def all_edit_book_tool_plugins():
             yield plugin
 # }}}
 
-# Initialize plugins {{{
 
+# Initialize plugins {{{
 
 _initialized_plugins = []
 
@@ -823,8 +822,8 @@ def initialized_plugins():
 
 # }}}
 
-# CLI {{{
 
+# CLI {{{
 
 def build_plugin(path):
     from calibre import prints
diff --git a/src/calibre/customize/zipplugin.py b/src/calibre/customize/zipplugin.py
index efb988d005..72bb7da4c4 100644
--- a/src/calibre/customize/zipplugin.py
+++ b/src/calibre/customize/zipplugin.py
@@ -118,8 +118,8 @@ def load_translations(namespace, zfp):
             _translations_cache[zfp] = None
             return
         with zipfile.ZipFile(zfp) as zf:
-            mo_path = zipfile.Path(zf, f"translations/{lang}.mo")
-            if not mo_path.exists() and "_" in lang:
+            mo_path = zipfile.Path(zf, f'translations/{lang}.mo')
+            if not mo_path.exists() and '_' in lang:
                 mo_path = zipfile.Path(zf, f"translations/{lang.split('_')[0]}.mo")
             if mo_path.exists():
                 mo = mo_path.read_bytes()
@@ -138,8 +138,13 @@ def load_translations(namespace, zfp):
 class CalibrePluginLoader:
 
     __slots__ = (
-        'plugin_name', 'fullname_in_plugin', 'zip_file_path', '_is_package', 'names',
-        'filename', 'all_names'
+        '_is_package',
+        'all_names',
+        'filename',
+        'fullname_in_plugin',
+        'names',
+        'plugin_name',
+        'zip_file_path',
     )
 
     def __init__(self, plugin_name, fullname_in_plugin, zip_file_path, names, filename, is_package, all_names):
diff --git a/src/calibre/db/__init__.py b/src/calibre/db/__init__.py
index 05481f3625..e5ac6dd5b2 100644
--- a/src/calibre/db/__init__.py
+++ b/src/calibre/db/__init__.py
@@ -56,16 +56,16 @@ def _get_series_values(val):
     import re
     series_index_pat = re.compile(r'(.*)\s+\[([.0-9]+)\]$')
     if not val:
-        return (val, None)
+        return val, None
     match = series_index_pat.match(val.strip())
     if match is not None:
         idx = match.group(2)
         try:
             idx = float(idx)
-            return (match.group(1).strip(), idx)
+            return match.group(1).strip(), idx
         except:
             pass
-    return (val, None)
+    return val, None
 
 
 def get_data_as_dict(self, prefix=None, authors_as_string=False, ids=None, convert_to_local_tz=True):
diff --git a/src/calibre/db/adding.py b/src/calibre/db/adding.py
index 749983681d..11a8fa65a6 100644
--- a/src/calibre/db/adding.py
+++ b/src/calibre/db/adding.py
@@ -78,7 +78,7 @@ def metadata_extensions():
     # but not actually added)
     global _metadata_extensions
     if _metadata_extensions is None:
-        _metadata_extensions =  frozenset(BOOK_EXTENSIONS) | {'opf'}
+        _metadata_extensions = frozenset(BOOK_EXTENSIONS) | {'opf'}
     return _metadata_extensions
 
 
diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
index c6ceba1e3c..592bbfd6db 100644
--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@@ -197,8 +197,8 @@ class DBPrefs(dict):  # {{{
             return json.load(f, object_hook=from_json)
 # }}}
 
-# Extra collators {{{
 
+# Extra collators {{{
 
 def pynocase(one, two, encoding='utf-8'):
     if isbytestring(one):
@@ -226,8 +226,8 @@ def icu_collator(s1, s2):
 
 # }}}
 
-# Unused aggregators {{{
 
+# Unused aggregators {{{
 
 def Concatenate(sep=','):
     '''String concatenation aggregator for sqlite'''
@@ -697,7 +697,7 @@ class DB:
         self.deleted_fields = []
         with self.conn:
             # Delete previously marked custom columns
-            for (num, label) in self.conn.get(
+            for num, label in self.conn.get(
                     'SELECT id,label FROM custom_columns WHERE mark_for_delete=1'):
                 table, lt = self.custom_table_names(num)
                 self.execute('''\
@@ -1516,8 +1516,8 @@ class DB:
     @property
     def custom_tables(self):
         return {x[0] for x in self.conn.get(
-            'SELECT name FROM sqlite_master WHERE type=\'table\' AND '
-            '(name GLOB \'custom_column_*\' OR name GLOB \'books_custom_column_*\')')}
+            "SELECT name FROM sqlite_master WHERE type='table' AND "
+            "(name GLOB 'custom_column_*' OR name GLOB 'books_custom_column_*')")}
 
     @classmethod
     def exists_at(cls, path):
@@ -2399,7 +2399,7 @@ class DB:
                 text = "snippet({fts_table}, 0, ?, ?, '…', {snippet_size})".format(
                         fts_table=fts_table, snippet_size=max(1, min(snippet_size, 64)))
             else:
-                text = f"highlight({fts_table}, 0, ?, ?)"
+                text = f'highlight({fts_table}, 0, ?, ?)'
             data.append(highlight_start)
             data.append(highlight_end)
         query = 'SELECT {0}.id, {0}.book, {0}.format, {0}.user_type, {0}.user, {0}.annot_data, {1} FROM {0} '
@@ -2455,9 +2455,7 @@ class DB:
         ts = now.isoformat()
         timestamp = (now - EPOCH).total_seconds()
         for annot_id in annot_ids:
-            for (raw_annot_data, annot_type) in self.execute(
-                'SELECT annot_data, annot_type FROM annotations WHERE id=?', (annot_id,)
-            ):
+            for raw_annot_data, annot_type in self.execute('SELECT annot_data, annot_type FROM annotations WHERE id=?', (annot_id,)):
                 try:
                     annot_data = json.loads(raw_annot_data)
                 except Exception:
diff --git a/src/calibre/db/cache.py b/src/calibre/db/cache.py
index 4c472b57cd..1c7193993b 100644
--- a/src/calibre/db/cache.py
+++ b/src/calibre/db/cache.py
@@ -135,7 +135,6 @@ dynamic_category_preferences = frozenset({'grouped_search_make_user_categories',
 
 
 class Cache:
-
     '''
     An in-memory cache of the metadata.db file from a calibre library.
     This class also serves as a threadsafe API for accessing the database.
@@ -1093,7 +1092,7 @@ class Cache:
                 # We can't clear the composite caches because a read lock is set.
                 # As a consequence the value of a composite column that calls
                 # virtual_libraries() might be wrong. Oh well. Log and keep running.
-                print('Couldn\'t get write lock after vls_for_books_cache was loaded', file=sys.stderr)
+                print("Couldn't get write lock after vls_for_books_cache was loaded", file=sys.stderr)
                 traceback.print_exc()
 
         if get_cover:
@@ -2114,7 +2113,7 @@ class Cache:
 
     @read_api
     def has_id(self, book_id):
-        ' Return True iff the specified book_id exists in the db '''
+        ' Return True iff the specified book_id exists in the db '
         return book_id in self.fields['title'].table.book_col_map
 
     @write_api
diff --git a/src/calibre/db/categories.py b/src/calibre/db/categories.py
index fe25e70641..df5829347e 100644
--- a/src/calibre/db/categories.py
+++ b/src/calibre/db/categories.py
@@ -21,9 +21,23 @@ CATEGORY_SORTS = ('name', 'popularity', 'rating')  # This has to be a tuple not
 
 class Tag:
 
-    __slots__ = ('name', 'original_name', 'id', 'count', 'state', 'is_hierarchical',
-            'is_editable', 'is_searchable', 'id_set', 'avg_rating', 'sort',
-            'use_sort_as_name', 'category', 'search_expression', 'original_categories')
+    __slots__ = (
+        'avg_rating',
+        'category',
+        'count',
+        'id',
+        'id_set',
+        'is_editable',
+        'is_hierarchical',
+        'is_searchable',
+        'name',
+        'original_categories',
+        'original_name',
+        'search_expression',
+        'sort',
+        'state',
+        'use_sort_as_name',
+    )
 
     def __init__(self, name, id=None, count=0, state=0, avg=0, sort=None,
                  category=None, id_set=None, search_expression=None,
@@ -175,6 +189,7 @@ def sort_key_for_name_and_first_letter(x, hierarchical_categories=()):
     return (c if numeric_collation and c.isdigit() else '9999999999',
             collation_order(v2), sort_key(v1))
 
+
 def sort_key_for_name(x, hierarchical_categories=()):
     v = x.sort or x.name
     if x.category not in hierarchical_categories:
@@ -279,7 +294,7 @@ def get_categories(dbcache, sort='name', book_ids=None, first_letter_sort=False,
         # temporarily duplicating the categories lists.
         taglist = {}
         for c, items in iteritems(categories):
-            taglist[c] = dict(map(lambda t:(icu_lower(t.name), t), items))
+            taglist[c] = {icu_lower(t.name): t for t in items}
 
         # Add the category values to the user categories
         for user_cat in sorted(user_categories, key=sort_key):
diff --git a/src/calibre/db/cli/cmd_add.py b/src/calibre/db/cli/cmd_add.py
index dd527d63ae..7e8b9e60d9 100644
--- a/src/calibre/db/cli/cmd_add.py
+++ b/src/calibre/db/cli/cmd_add.py
@@ -163,7 +163,7 @@ def format_group(db, notify_changes, is_remote, args):
         mi = metadata_from_formats(paths)
         if mi.title is None:
             return None, set(), set(), False
-        if cover_data and not mi.cover_data or not mi.cover_data[1]:
+        if (cover_data and not mi.cover_data) or not mi.cover_data[1]:
             mi.cover_data = 'jpeg', cover_data
         format_map = create_format_map(paths)
         added_ids, updated_ids, duplicates = do_adding(
diff --git a/src/calibre/db/cli/cmd_catalog.py b/src/calibre/db/cli/cmd_catalog.py
index 9f75301a64..0f01c23719 100644
--- a/src/calibre/db/cli/cmd_catalog.py
+++ b/src/calibre/db/cli/cmd_catalog.py
@@ -61,9 +61,9 @@ see the different options, specify the name of the output file and then the
         default=None,
         dest='ids',
         help=_(
-            "Comma-separated list of database IDs to catalog.\n"
-            "If declared, --search is ignored.\n"
-            "Default: all"
+            'Comma-separated list of database IDs to catalog.\n'
+            'If declared, --search is ignored.\n'
+            'Default: all'
         )
     )
     parser.add_option(
@@ -72,10 +72,10 @@ see the different options, specify the name of the output file and then the
         default=None,
         dest='search_text',
         help=_(
-            "Filter the results by the search query. "
-            "For the format of the search query, please see "
-            "the search-related documentation in the User Manual.\n"
-            "Default: no filtering"
+            'Filter the results by the search query. '
+            'For the format of the search query, please see '
+            'the search-related documentation in the User Manual.\n'
+            'Default: no filtering'
         )
     )
     parser.add_option(
@@ -96,8 +96,6 @@ see the different options, specify the name of the output file and then the
     add_plugin_parser_options(fmt, parser)
 
     return parser
-
-
 # }}}
 
 
diff --git a/src/calibre/db/cli/cmd_check_library.py b/src/calibre/db/cli/cmd_check_library.py
index 59852c29e3..a0812a1040 100644
--- a/src/calibre/db/cli/cmd_check_library.py
+++ b/src/calibre/db/cli/cmd_check_library.py
@@ -39,8 +39,8 @@ Perform some checks on the filesystem representing a library. Reports are {0}
         '--report',
         default=None,
         dest='report',
-        help=_("Comma-separated list of reports.\n"
-               "Default: all")
+        help=_('Comma-separated list of reports.\n'
+               'Default: all')
     )
 
     parser.add_option(
@@ -48,8 +48,8 @@ Perform some checks on the filesystem representing a library. Reports are {0}
         '--ignore_extensions',
         default=None,
         dest='exts',
-        help=_("Comma-separated list of extensions to ignore.\n"
-               "Default: all")
+        help=_('Comma-separated list of extensions to ignore.\n'
+               'Default: all')
     )
 
     parser.add_option(
@@ -57,8 +57,8 @@ Perform some checks on the filesystem representing a library. Reports are {0}
         '--ignore_names',
         default=None,
         dest='names',
-        help=_("Comma-separated list of names to ignore.\n"
-               "Default: all")
+        help=_('Comma-separated list of names to ignore.\n'
+               'Default: all')
     )
     parser.add_option(
         '--vacuum-fts-db',
diff --git a/src/calibre/db/cli/cmd_fts_index.py b/src/calibre/db/cli/cmd_fts_index.py
index baabbd8c10..f0f85d9311 100644
--- a/src/calibre/db/cli/cmd_fts_index.py
+++ b/src/calibre/db/cli/cmd_fts_index.py
@@ -179,7 +179,7 @@ def main(opts, args, dbctx):
             parts = x.split(':', 1)
             book_id = int(parts[0])
             if len(parts) == 1:
-                return book_id,
+                return (book_id,)
             fmts = tuple(x.upper() for x in parts[1].split(','))
             return (book_id,) + fmts
 
diff --git a/src/calibre/db/cli/cmd_list.py b/src/calibre/db/cli/cmd_list.py
index 032b12e670..a030c20bb6 100644
--- a/src/calibre/db/cli/cmd_list.py
+++ b/src/calibre/db/cli/cmd_list.py
@@ -97,7 +97,7 @@ def implementation(
                     data[field] = {k: cover(db, k) for k in book_ids}
                     continue
             data[field] = db.all_field_for(field, book_ids)
-    return {'book_ids': book_ids, "data": data, 'metadata': metadata, 'fields':fields}
+    return {'book_ids': book_ids, 'data': data, 'metadata': metadata, 'fields':fields}
 
 
 def stringify(data, metadata, for_machine):
@@ -205,7 +205,7 @@ def do_list(
     from calibre.utils.terminal import ColoredStream, geometry
 
     output_table = prepare_output_table(fields, book_ids, data, metadata)
-    widths = list(map(lambda x: 0, fields))
+    widths = [0 for x in fields]
 
     for record in output_table:
         for j in range(len(fields)):
@@ -215,7 +215,7 @@ def do_list(
     if not screen_width:
         screen_width = 80
     field_width = screen_width // len(fields)
-    base_widths = list(map(lambda x: min(x + 1, field_width), widths))
+    base_widths = [min(x + 1, field_width) for x in widths]
 
     while sum(base_widths) < screen_width:
         adjusted = False
diff --git a/src/calibre/db/cli/cmd_list_categories.py b/src/calibre/db/cli/cmd_list_categories.py
index fe9822cd31..b474beaed2 100644
--- a/src/calibre/db/cli/cmd_list_categories.py
+++ b/src/calibre/db/cli/cmd_list_categories.py
@@ -54,8 +54,8 @@ information is the equivalent of what is shown in the Tag browser.
         '--categories',
         default='',
         dest='report',
-        help=_("Comma-separated list of category lookup names. "
-               "Default: all")
+        help=_('Comma-separated list of category lookup names. '
+               'Default: all')
     )
     parser.add_option(
         '-w',
@@ -74,7 +74,7 @@ def do_list(fields, data, opts):
     from calibre.utils.terminal import ColoredStream, geometry
 
     separator = ' '
-    widths = list(map(lambda x: 0, fields))
+    widths = [0 for x in fields]
     for i in data:
         for j, field in enumerate(fields):
             widths[j] = max(widths[j], max(len(field), len(str(i[field]))))
@@ -83,7 +83,7 @@ def do_list(fields, data, opts):
     if not screen_width:
         screen_width = 80
     field_width = screen_width // len(fields)
-    base_widths = list(map(lambda x: min(x + 1, field_width), widths))
+    base_widths = [min(x + 1, field_width) for x in widths]
 
     while sum(base_widths) < screen_width:
         adjusted = False
@@ -104,7 +104,7 @@ def do_list(fields, data, opts):
     with ColoredStream(sys.stdout, fg='green'):
         prints(''.join(titles))
 
-    wrappers = list(map(lambda x: TextWrapper(x - 1), widths))
+    wrappers = [TextWrapper(x - 1) for x in widths]
 
     for record in data:
         text = [
diff --git a/src/calibre/db/cli/cmd_restore_database.py b/src/calibre/db/cli/cmd_restore_database.py
index 3488d6585d..88169e711e 100644
--- a/src/calibre/db/cli/cmd_restore_database.py
+++ b/src/calibre/db/cli/cmd_restore_database.py
@@ -78,6 +78,6 @@ def main(opts, args, dbctx):
             name = 'calibre_db_restore_report.txt'
             open('calibre_db_restore_report.txt',
                   'wb').write(r.report.encode('utf-8'))
-            prints('Some errors occurred. A detailed report was ' 'saved to', name)
+            prints('Some errors occurred. A detailed report was saved to', name)
 
     return 0
diff --git a/src/calibre/db/cli/cmd_set_metadata.py b/src/calibre/db/cli/cmd_set_metadata.py
index 7724b152ee..aa18a6ce72 100644
--- a/src/calibre/db/cli/cmd_set_metadata.py
+++ b/src/calibre/db/cli/cmd_set_metadata.py
@@ -152,7 +152,7 @@ def main(opts, args, dbctx):
             raise SystemExit(_('No book with id: %s in the database') % book_id)
 
     if opts.field:
-        fields = {k: v for k, v in get_fields(dbctx)}
+        fields = dict(get_fields(dbctx))
         fields['title_sort'] = fields['sort']
         vals = {}
         for x in opts.field:
diff --git a/src/calibre/db/cli/tests.py b/src/calibre/db/cli/tests.py
index a258da3525..7c51c99f17 100644
--- a/src/calibre/db/cli/tests.py
+++ b/src/calibre/db/cli/tests.py
@@ -23,9 +23,9 @@ class Checker:
 
 
 class PrintCheckLibraryResultsTest(unittest.TestCase):
-    """
+    '''
     Asserts the format of the output to the CLI to avoid regressions
-    """
+    '''
 
     check = ('dummy_check', 'Dummy Check')
 
@@ -38,11 +38,11 @@ class PrintCheckLibraryResultsTest(unittest.TestCase):
         self.assertEqual(stdout.getvalue(), b'')
 
     def test_human_readable_output(self):
-        """
+        '''
         Basic check of the human-readable output.
 
         Does not test: the full line format, truncation
-        """
+        '''
         data = [['first', 'second']]
         checker = Checker(dict.fromkeys(self.check))
         setattr(checker, self.check[0], data)
@@ -62,9 +62,9 @@ class PrintCheckLibraryResultsTest(unittest.TestCase):
         self.assertEqual(result[-1], '')
 
     def test_basic_csv_output(self):
-        """
+        '''
         Test simple csv output
-        """
+        '''
         data = [['first', 'second']]
         checker = Checker(dict.fromkeys(self.check))
         setattr(checker, self.check[0], data)
@@ -76,9 +76,9 @@ class PrintCheckLibraryResultsTest(unittest.TestCase):
         self.assertEqual(parsed_result, [[self.check[1], data[0][0], data[0][1]]])
 
     def test_escaped_csv_output(self):
-        """
+        '''
         Test more complex csv output
-        """
+        '''
         data = [['I, Caesar', 'second']]
         checker = Checker(dict.fromkeys(self.check))
         setattr(checker, self.check[0], data)
diff --git a/src/calibre/db/constants.py b/src/calibre/db/constants.py
index a7d3f7beb8..b412bbda05 100644
--- a/src/calibre/db/constants.py
+++ b/src/calibre/db/constants.py
@@ -7,14 +7,15 @@ from dataclasses import dataclass
 COVER_FILE_NAME = 'cover.jpg'
 METADATA_FILE_NAME = 'metadata.opf'
 DEFAULT_TRASH_EXPIRY_TIME_SECONDS = 14 * 86400
-TRASH_DIR_NAME =  '.caltrash'
+TRASH_DIR_NAME = '.caltrash'
 NOTES_DIR_NAME = '.calnotes'
 NOTES_DB_NAME = 'notes.db'
 DATA_DIR_NAME = 'data'
 DATA_FILE_PATTERN = f'{DATA_DIR_NAME}/**/*'
 BOOK_ID_PATH_TEMPLATE = ' ({})'
 RESOURCE_URL_SCHEME = 'calres'
-TEMPLATE_ICON_INDICATOR = ' template ' # Item values cannot start or end with space
+TEMPLATE_ICON_INDICATOR = ' template '  # Item values cannot start or end with space
+
 
 @dataclass
 class TrashEntry:
diff --git a/src/calibre/db/fields.py b/src/calibre/db/fields.py
index bfa62101bd..0380734746 100644
--- a/src/calibre/db/fields.py
+++ b/src/calibre/db/fields.py
@@ -97,7 +97,7 @@ class Field:
             self._default_sort_key = ''
 
         if self.name == 'languages':
-            self._sort_key = lambda x:sort_key(calibre_langcode_to_name(x))
+            self._sort_key = lambda x: sort_key(calibre_langcode_to_name(x))
         self.is_multiple = (bool(self.metadata['is_multiple']) or self.name ==
                 'formats')
         self.sort_sort_key = True
@@ -224,8 +224,8 @@ class OneToOneField(Field):
                         ans = dk
                     return ans
                 return none_safe_key
-            return lambda book_id:bcmg(book_id, dk)
-        return lambda book_id:sk(bcmg(book_id, dk))
+            return lambda book_id: bcmg(book_id, dk)
+        return lambda book_id: sk(bcmg(book_id, dk))
 
     def iter_searchable_values(self, get_metadata, candidates, default_value=None):
         cbm = self.table.book_col_map
@@ -339,8 +339,8 @@ class CompositeField(OneToOneField):
         gv = self.get_value_with_cache
         sk = self._sort_key
         if sk is IDENTITY:
-            return lambda book_id:gv(book_id, get_metadata)
-        return lambda book_id:sk(gv(book_id, get_metadata))
+            return lambda book_id: gv(book_id, get_metadata)
+        return lambda book_id: sk(gv(book_id, get_metadata))
 
     def iter_searchable_values(self, get_metadata, candidates, default_value=None):
         val_map = defaultdict(set)
@@ -366,7 +366,7 @@ class CompositeField(OneToOneField):
         for book_id in candidates:
             vals = self.get_value_with_cache(book_id, get_metadata)
             if splitter:
-                length = len(list(vv.strip() for vv in vals.split(splitter) if vv.strip()))
+                length = len([vv.strip() for vv in vals.split(splitter) if vv.strip()])
             elif vals.strip():
                 length = 1
             else:
@@ -471,7 +471,7 @@ class OnDeviceField(OneToOneField):
 
 class LazySortMap:
 
-    __slots__ = ('default_sort_key', 'sort_key_func', 'id_map', 'cache')
+    __slots__ = ('cache', 'default_sort_key', 'id_map', 'sort_key_func')
 
     def __init__(self, default_sort_key, sort_key_func, id_map):
         self.default_sort_key = default_sort_key
@@ -517,7 +517,7 @@ class ManyToOneField(Field):
     def sort_keys_for_books(self, get_metadata, lang_map):
         sk_map = LazySortMap(self._default_sort_key, self._sort_key, self.table.id_map)
         bcmg = self.table.book_col_map.get
-        return lambda book_id:sk_map(bcmg(book_id, None))
+        return lambda book_id: sk_map(bcmg(book_id, None))
 
     def iter_searchable_values(self, get_metadata, candidates, default_value=None):
         cbm = self.table.col_book_map
@@ -701,7 +701,7 @@ class FormatsField(ManyToManyField):
 
 class LazySeriesSortMap:
 
-    __slots__ = ('default_sort_key', 'sort_key_func', 'id_map', 'cache')
+    __slots__ = ('cache', 'default_sort_key', 'id_map', 'sort_key_func')
 
     def __init__(self, default_sort_key, sort_key_func, id_map):
         self.default_sort_key = default_sort_key
diff --git a/src/calibre/db/fts/connect.py b/src/calibre/db/fts/connect.py
index 32f9e04393..ce9a54dedc 100644
--- a/src/calibre/db/fts/connect.py
+++ b/src/calibre/db/fts/connect.py
@@ -39,7 +39,7 @@ class FTS:
             if conn.fts_dbpath is None:
                 main_db_path = os.path.abspath(conn.db_filename('main'))
                 dbpath = os.path.join(os.path.dirname(main_db_path), 'full-text-search.db')
-                conn.execute("ATTACH DATABASE ? AS fts_db", (dbpath,))
+                conn.execute('ATTACH DATABASE ? AS fts_db', (dbpath,))
                 SchemaUpgrade(conn)
                 conn.execute('UPDATE fts_db.dirtied_formats SET in_progress=FALSE WHERE in_progress=TRUE')
                 num_dirty = conn.get('''SELECT COUNT(*) from fts_db.dirtied_formats''')[0][0]
diff --git a/src/calibre/db/fts/text.py b/src/calibre/db/fts/text.py
index 3e8938140f..432d471704 100644
--- a/src/calibre/db/fts/text.py
+++ b/src/calibre/db/fts/text.py
@@ -43,7 +43,7 @@ def html_to_text(root):
     pat = re.compile(r'\n{3,}')
     for body in root.xpath('h:body', namespaces=XPNSMAP):
         body.tail = ''
-        yield pat.sub('\n\n', ''.join(tag_to_text(body)).strip())
+        yield pat.sub(r'\n\n', ''.join(tag_to_text(body)).strip())
 
 
 def to_text(container, name):
diff --git a/src/calibre/db/lazy.py b/src/calibre/db/lazy.py
index 2d0d7de036..d96f033e3a 100644
--- a/src/calibre/db/lazy.py
+++ b/src/calibre/db/lazy.py
@@ -384,8 +384,8 @@ class ProxyMetadata(Metadata):
     # compatibility, flag __iter__ as unimplemented. This won't break anything
     # because the Metadata version raises AttributeError
     def __iter__(self):
-        raise NotImplementedError("__iter__() cannot be used in this context. "
-                                   "Use the explicit methods such as all_field_keys()")
+        raise NotImplementedError('__iter__() cannot be used in this context. '
+                                   'Use the explicit methods such as all_field_keys()')
 
     def has_key(self, key):
         return key in STANDARD_METADATA_FIELDS or key in ga(self, '_user_metadata')
diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py
index b8a9ff5d11..b54e515bb2 100644
--- a/src/calibre/db/legacy.py
+++ b/src/calibre/db/legacy.py
@@ -164,7 +164,6 @@ class ThreadSafePrefs(MutableMapping):
 
 
 class LibraryDatabase:
-
     ''' Emulate the old LibraryDatabase2 interface '''
 
     PATH_LIMIT = DB.PATH_LIMIT
@@ -287,7 +286,7 @@ class LibraryDatabase:
         return [[k, v] for k, v in iteritems(self.new_api.get_usage_count_by_id(field))]
 
     def field_id_map(self, field):
-        return [(k, v) for k, v in iteritems(self.new_api.get_id_map(field))]
+        return list(iteritems(self.new_api.get_id_map(field)))
 
     def get_custom_items_with_ids(self, label=None, num=None):
         try:
@@ -515,7 +514,7 @@ class LibraryDatabase:
         with self.new_api.safe_read_lock:
             book_ids = self.new_api._books_for_field('series', series_id)
             ff = self.new_api._field_for
-            return sorted(book_ids, key=lambda x:ff('series_index', x))
+            return sorted(book_ids, key=lambda x: ff('series_index', x))
 
     def books_in_series_of(self, index, index_is_id=False):
         book_id = index if index_is_id else self.id(index)
@@ -722,8 +721,8 @@ class LibraryDatabase:
         if isinstance(ans, tuple):
             ans = list(ans)
         if data['datatype'] != 'series':
-            return (ans, None)
-        return (ans, self.new_api.field_for(self.custom_field_name(label, num) + '_index', book_id))
+            return ans, None
+        return ans, self.new_api.field_for(self.custom_field_name(label, num) + '_index', book_id)
 
     def get_next_cc_series_num_for(self, series, label=None, num=None):
         data = self.backend.custom_field_metadata(label, num)
@@ -799,7 +798,7 @@ class LibraryDatabase:
             with self.new_api.write_lock:
                 self.new_api._set_field(field, {book_id:val for book_id in ids}, allow_case_change=False)
             if extras is not None:
-                self.new_api._set_field(field + '_index', {book_id:val for book_id, val in zip(ids, extras)})
+                self.new_api._set_field(field + '_index', dict(zip(ids, extras)))
         if notify:
             self.notify('metadata', list(ids))
 
@@ -893,10 +892,10 @@ LibraryDatabase.get_tags = lambda self, book_id:set(self.new_api.field_for('tags
 LibraryDatabase.get_categories = lambda self, sort='name', ids=None:self.new_api.get_categories(sort=sort, book_ids=ids)
 LibraryDatabase.get_identifiers = lambda self, index, index_is_id=False: self.new_api.field_for('identifiers', index if index_is_id else self.id(index))
 LibraryDatabase.isbn = lambda self, index, index_is_id=False: self.get_identifiers(index, index_is_id=index_is_id).get('isbn', None)
-LibraryDatabase.get_books_for_category = lambda self, category, id_:self.new_api.get_books_for_category(category, id_)
+LibraryDatabase.get_books_for_category = lambda self, category, id_: self.new_api.get_books_for_category(category, id_)
 LibraryDatabase.get_data_as_dict = get_data_as_dict
-LibraryDatabase.find_identical_books = lambda self, mi:self.new_api.find_identical_books(mi)
-LibraryDatabase.get_top_level_move_items = lambda self:self.new_api.get_top_level_move_items()
+LibraryDatabase.find_identical_books = lambda self, mi: self.new_api.find_identical_books(mi)
+LibraryDatabase.get_top_level_move_items = lambda self: self.new_api.get_top_level_move_items()
 # }}}
 
 # Legacy setter API {{{
@@ -956,7 +955,7 @@ for field in ('authors', 'tags', 'publisher', 'series'):
         return func
     name = field[:-1] if field in {'authors', 'tags'} else field
     setattr(LibraryDatabase, 'all_%s_names' % name, getter(field))
-LibraryDatabase.all_formats = lambda self:self.new_api.all_field_names('formats')
+LibraryDatabase.all_formats = lambda self: self.new_api.all_field_names('formats')
 LibraryDatabase.all_custom = lambda self, label=None, num=None:self.new_api.all_field_names(self.custom_field_name(label, num))
 
 for func, field in iteritems({'all_authors':'authors', 'all_titles':'title', 'all_tags2':'tags', 'all_series':'series', 'all_publishers':'publisher'}):
@@ -1031,12 +1030,12 @@ for meth in ('get_next_series_num_for', 'has_book',):
         return func
     setattr(LibraryDatabase, meth, getter(meth))
 
-LibraryDatabase.saved_search_names = lambda self:self.new_api.saved_search_names()
-LibraryDatabase.saved_search_lookup = lambda self, x:self.new_api.saved_search_lookup(x)
-LibraryDatabase.saved_search_set_all = lambda self, smap:self.new_api.saved_search_set_all(smap)
-LibraryDatabase.saved_search_delete = lambda self, x:self.new_api.saved_search_delete(x)
-LibraryDatabase.saved_search_add = lambda self, x, y:self.new_api.saved_search_add(x, y)
-LibraryDatabase.saved_search_rename = lambda self, x, y:self.new_api.saved_search_rename(x, y)
+LibraryDatabase.saved_search_names = lambda self: self.new_api.saved_search_names()
+LibraryDatabase.saved_search_lookup = lambda self, x: self.new_api.saved_search_lookup(x)
+LibraryDatabase.saved_search_set_all = lambda self, smap: self.new_api.saved_search_set_all(smap)
+LibraryDatabase.saved_search_delete = lambda self, x: self.new_api.saved_search_delete(x)
+LibraryDatabase.saved_search_add = lambda self, x, y: self.new_api.saved_search_add(x, y)
+LibraryDatabase.saved_search_rename = lambda self, x, y: self.new_api.saved_search_rename(x, y)
 LibraryDatabase.commit_dirty_cache = lambda self: self.new_api.commit_dirty_cache()
 LibraryDatabase.author_sort_from_authors = lambda self, x: self.new_api.author_sort_from_authors(x)
 # Cleaning is not required anymore
diff --git a/src/calibre/db/locking.py b/src/calibre/db/locking.py
index 6b9d1fedf3..7bd797f917 100644
--- a/src/calibre/db/locking.py
+++ b/src/calibre/db/locking.py
@@ -73,21 +73,21 @@ class SHLock:  # {{{
 
     def __init__(self):
         self._lock = Lock()
-        #  When a shared lock is held, is_shared will give the cumulative
-        #  number of locks and _shared_owners maps each owning thread to
-        #  the number of locks is holds.
+        # When a shared lock is held, is_shared will give the cumulative
+        # number of locks and _shared_owners maps each owning thread to
+        # the number of locks is holds.
         self.is_shared = 0
         self._shared_owners = {}
-        #  When an exclusive lock is held, is_exclusive will give the number
-        #  of locks held and _exclusive_owner will give the owning thread
+        # When an exclusive lock is held, is_exclusive will give the number
+        # of locks held and _exclusive_owner will give the owning thread
         self.is_exclusive = 0
         self._exclusive_owner = None
-        #  When someone is forced to wait for a lock, they add themselves
-        #  to one of these queues along with a "waiter" condition that
-        #  is used to wake them up.
+        # When someone is forced to wait for a lock, they add themselves
+        # to one of these queues along with a "waiter" condition that
+        # is used to wake them up.
         self._shared_queue = []
         self._exclusive_queue = []
-        #  This is for recycling waiter objects.
+        # This is for recycling waiter objects.
         self._free_waiters = []
 
     def acquire(self, blocking=True, shared=False):
@@ -111,29 +111,29 @@ class SHLock:  # {{{
 
     def release(self):
         ''' Release the lock. '''
-        #  This decrements the appropriate lock counters, and if the lock
-        #  becomes free, it looks for a queued thread to hand it off to.
-        #  By doing the handoff here we ensure fairness.
+        # This decrements the appropriate lock counters, and if the lock
+        # becomes free, it looks for a queued thread to hand it off to.
+        # By doing the handoff here we ensure fairness.
         me = current_thread()
         with self._lock:
             if self.is_exclusive:
                 if self._exclusive_owner is not me:
-                    raise LockingError("release() called on unheld lock")
+                    raise LockingError('release() called on unheld lock')
                 self.is_exclusive -= 1
                 if not self.is_exclusive:
                     self._exclusive_owner = None
-                    #  If there are waiting shared locks, issue them
-                    #  all and them wake everyone up.
+                    # If there are waiting shared locks, issue them
+                    # all and them wake everyone up.
                     if self._shared_queue:
-                        for (thread, waiter) in self._shared_queue:
+                        for thread, waiter in self._shared_queue:
                             self.is_shared += 1
                             self._shared_owners[thread] = 1
                             waiter.notify()
                         del self._shared_queue[:]
-                    #  Otherwise, if there are waiting exclusive locks,
-                    #  they get first dibbs on the lock.
+                    # Otherwise, if there are waiting exclusive locks,
+                    # they get first dibbs on the lock.
                     elif self._exclusive_queue:
-                        (thread, waiter) = self._exclusive_queue.pop(0)
+                        thread, waiter = self._exclusive_queue.pop(0)
                         self._exclusive_owner = thread
                         self.is_exclusive += 1
                         waiter.notify()
@@ -143,30 +143,30 @@ class SHLock:  # {{{
                     if self._shared_owners[me] == 0:
                         del self._shared_owners[me]
                 except KeyError:
-                    raise LockingError("release() called on unheld lock")
+                    raise LockingError('release() called on unheld lock')
                 self.is_shared -= 1
                 if not self.is_shared:
-                    #  If there are waiting exclusive locks,
-                    #  they get first dibbs on the lock.
+                    # If there are waiting exclusive locks,
+                    # they get first dibbs on the lock.
                     if self._exclusive_queue:
-                        (thread, waiter) = self._exclusive_queue.pop(0)
+                        thread, waiter = self._exclusive_queue.pop(0)
                         self._exclusive_owner = thread
                         self.is_exclusive += 1
                         waiter.notify()
                     else:
                         assert not self._shared_queue
             else:
-                raise LockingError("release() called on unheld lock")
+                raise LockingError('release() called on unheld lock')
 
     def _acquire_shared(self, blocking=True):
         me = current_thread()
-        #  Each case: acquiring a lock we already hold.
+        # Each case: acquiring a lock we already hold.
         if self.is_shared and me in self._shared_owners:
             self.is_shared += 1
             self._shared_owners[me] += 1
             return True
-        #  If the lock is already spoken for by an exclusive, add us
-        #  to the shared queue and it will give us the lock eventually.
+        # If the lock is already spoken for by an exclusive, add us
+        # to the shared queue and it will give us the lock eventually.
         if self.is_exclusive or self._exclusive_queue:
             if self._exclusive_owner is me:
                 raise DowngradeLockError("can't downgrade SHLock object")
@@ -186,7 +186,7 @@ class SHLock:  # {{{
 
     def _acquire_exclusive(self, blocking=True):
         me = current_thread()
-        #  Each case: acquiring a lock we already hold.
+        # Each case: acquiring a lock we already hold.
         if self._exclusive_owner is me:
             assert self.is_exclusive
             self.is_exclusive += 1
@@ -194,8 +194,8 @@ class SHLock:  # {{{
         # Do not allow upgrade of lock
         if self.is_shared and me in self._shared_owners:
             raise LockingError("can't upgrade SHLock object")
-        #  If the lock is already spoken for, add us to the exclusive queue.
-        #  This will eventually give us the lock when it's our turn.
+        # If the lock is already spoken for, add us to the exclusive queue.
+        # This will eventually give us the lock when it's our turn.
         if self.is_shared or self.is_exclusive:
             if not blocking:
                 return False
diff --git a/src/calibre/db/notes/connect.py b/src/calibre/db/notes/connect.py
index 77c191fd2e..97ac783cf7 100644
--- a/src/calibre/db/notes/connect.py
+++ b/src/calibre/db/notes/connect.py
@@ -16,16 +16,16 @@ from calibre import sanitize_file_name
 from calibre.constants import iswindows
 from calibre.db import FTSQueryError
 from calibre.db.annotations import unicode_normalize
+from calibre.db.constants import NOTES_DB_NAME, NOTES_DIR_NAME
+from calibre.db.notes.schema_upgrade import SchemaUpgrade
 from calibre.utils.copy_files import WINDOWS_SLEEP_FOR_RETRY_TIME
 from calibre.utils.filenames import copyfile_using_links, make_long_path_useable
 from calibre.utils.icu import lower as icu_lower
 
-from .schema_upgrade import SchemaUpgrade
-from ..constants import NOTES_DB_NAME, NOTES_DIR_NAME
-
 if iswindows:
     from calibre_extensions import winutil
 
+
 class cmt(str):
     pass
 
@@ -83,7 +83,7 @@ class Notes:
     def reopen(self, backend):
         conn = backend.get_connection()
         conn.notes_dbpath = os.path.join(self.notes_dir, NOTES_DB_NAME)
-        conn.execute("ATTACH DATABASE ? AS notes_db", (conn.notes_dbpath,))
+        conn.execute('ATTACH DATABASE ? AS notes_db', (conn.notes_dbpath,))
         self.allowed_fields = set()
         triggers = []
         for table in backend.tables.values():
@@ -280,7 +280,7 @@ class Notes:
         if field_name:
             return {item_id for (item_id,) in conn.execute('SELECT item FROM notes_db.notes WHERE colname=?', (field_name,))}
         ans = defaultdict(set)
-        for (note_id, field_name) in conn.execute('SELECT item, colname FROM notes_db.notes'):
+        for note_id, field_name in conn.execute('SELECT item, colname FROM notes_db.notes'):
             ans[field_name].add(note_id)
         return ans
 
diff --git a/src/calibre/db/restore.py b/src/calibre/db/restore.py
index 7a5da13232..1ddc75b364 100644
--- a/src/calibre/db/restore.py
+++ b/src/calibre/db/restore.py
@@ -107,8 +107,8 @@ class Restore(Thread):
 
         if self.conflicting_custom_cols:
             ans += '\n\n'
-            ans += 'The following custom columns have conflicting definitions ' \
-                    'and were not fully restored:\n'
+            ans += ('The following custom columns have conflicting definitions '
+                    'and were not fully restored:\n')
             for x in self.conflicting_custom_cols:
                 ans += '\t#'+x+'\n'
                 ans += '\tused:\t%s, %s, %s, %s\n'%(self.custom_columns[x][1],
@@ -162,10 +162,10 @@ class Restore(Thread):
             self.tb = traceback.format_exc()
             if self.failed_dirs:
                 for x in self.failed_dirs:
-                    for (dirpath, tb) in self.failed_dirs:
+                    for dirpath, tb in self.failed_dirs:
                         self.tb += f'\n\n-------------\nFailed to restore: {dirpath}\n{tb}'
             if self.failed_restores:
-                for (book, tb) in self.failed_restores:
+                for book, tb in self.failed_restores:
                     self.tb += f'\n\n-------------\nFailed to restore: {book["path"]}\n{tb}'
 
     def load_preferences(self):
@@ -253,7 +253,7 @@ class Restore(Thread):
             dest = self.link_maps.setdefault(field, {})
             for item, link in lmap.items():
                 existing_link, timestamp = dest.get(item, (None, None))
-                if existing_link is None or existing_link != link and timestamp < mi.timestamp:
+                if existing_link is None or (existing_link != link and timestamp < mi.timestamp):
                     dest[item] = link, mi.timestamp
 
     def create_cc_metadata(self):
diff --git a/src/calibre/db/schema_upgrades.py b/src/calibre/db/schema_upgrades.py
index 6e9a9ef318..1dd5a7d1d0 100644
--- a/src/calibre/db/schema_upgrades.py
+++ b/src/calibre/db/schema_upgrades.py
@@ -300,7 +300,7 @@ class SchemaUpgrade:
         for field in itervalues(self.field_metadata):
             if field['is_category'] and not field['is_custom'] and 'link_column' in field:
                 table = self.db.get(
-                    'SELECT name FROM sqlite_master WHERE type=\'table\' AND name=?',
+                    "SELECT name FROM sqlite_master WHERE type='table' AND name=?",
                     ('books_%s_link'%field['table'],), all=False)
                 if table is not None:
                     create_tag_browser_view(field['table'], field['link_column'], field['column'])
@@ -376,7 +376,7 @@ class SchemaUpgrade:
         for field in itervalues(self.field_metadata):
             if field['is_category'] and not field['is_custom'] and 'link_column' in field:
                 table = self.db.get(
-                    'SELECT name FROM sqlite_master WHERE type=\'table\' AND name=?',
+                    "SELECT name FROM sqlite_master WHERE type='table' AND name=?",
                     ('books_%s_link'%field['table'],), all=False)
                 if table is not None:
                     create_std_tag_browser_view(field['table'], field['link_column'],
diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py
index a871399e45..649fda2703 100644
--- a/src/calibre/db/search.py
+++ b/src/calibre/db/search.py
@@ -28,8 +28,8 @@ EQUALS_MATCH   = 1
 REGEXP_MATCH   = 2
 ACCENT_MATCH   = 3
 
-# Utils {{{
 
+# Utils {{{
 
 def _matchkind(query, case_sensitive=False):
     matchkind = CONTAINS_MATCH
@@ -416,7 +416,7 @@ class SavedSearchQueries:  # {{{
             self._db = weakref.ref(db)
         except TypeError:
             # db could be None
-            self._db = lambda : None
+            self._db = lambda: None
         self.load_from_db()
 
     def load_from_db(self):
@@ -657,7 +657,7 @@ class Parser(SearchQueryParser):  # {{{
 
         if location == 'template':
             try:
-                template, sep, query = regex.split('#@#:([tdnb]):', query, flags=regex.IGNORECASE)
+                template, sep, query = regex.split(r'#@#:([tdnb]):', query, flags=regex.IGNORECASE)
                 if sep:
                     sep = sep.lower()
                 else:
diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py
index 269a8a189a..2cc83cb08a 100644
--- a/src/calibre/db/tables.py
+++ b/src/calibre/db/tables.py
@@ -20,6 +20,7 @@ from polyglot.builtins import iteritems, itervalues
 def identity(x):
     return x
 
+
 def c_parse(val):
     try:
         year, month, day, hour, minutes, seconds, tzsecs = _c_speedup(val)
@@ -90,7 +91,6 @@ class Table:
 
 
 class VirtualTable(Table):
-
     '''
     A dummy table used for fields that only exist in memory like ondevice
     '''
@@ -102,7 +102,6 @@ class VirtualTable(Table):
 
 
 class OneToOneTable(Table):
-
     '''
     Represents data that is unique per book (it may not actually be unique) but
     each item is assigned to a book in a one-to-one mapping. For example: uuid,
@@ -197,7 +196,6 @@ class CompositeTable(OneToOneTable):
 
 
 class ManyToOneTable(Table):
-
     '''
     Represents data where one data item can map to many books, for example:
     series or publisher.
@@ -234,7 +232,7 @@ class ManyToOneTable(Table):
             bcm[book] = item_id
 
     def fix_link_table(self, db):
-        linked_item_ids = {item_id for item_id in itervalues(self.book_col_map)}
+        linked_item_ids = set(itervalues(self.book_col_map))
         extra_item_ids = linked_item_ids - set(self.id_map)
         if extra_item_ids:
             for item_id in extra_item_ids:
@@ -409,7 +407,6 @@ class RatingTable(ManyToOneTable):
 
 
 class ManyToManyTable(ManyToOneTable):
-
     '''
     Represents data that has a many-to-many mapping with books. i.e. each book
     can have more than one value and each value can be mapped to more than one
diff --git a/src/calibre/db/tests/__init__.py b/src/calibre/db/tests/__init__.py
index ad82601065..1f6b29ebfa 100644
--- a/src/calibre/db/tests/__init__.py
+++ b/src/calibre/db/tests/__init__.py
@@ -4,6 +4,3 @@
 __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
-
-
-
diff --git a/src/calibre/db/tests/base.py b/src/calibre/db/tests/base.py
index 010f1d744e..6af4ec2510 100644
--- a/src/calibre/db/tests/base.py
+++ b/src/calibre/db/tests/base.py
@@ -19,7 +19,7 @@ from calibre.utils.resources import get_image_path as I
 
 rmtree = partial(shutil.rmtree, ignore_errors=True)
 
-IMG = b'\xff\xd8\xff\xe0\x00\x10JFIF\x00\x01\x01\x01\x00`\x00`\x00\x00\xff\xe1\x00\x16Exif\x00\x00II*\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xdb\x00C\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xff\xdb\x00C\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xff\xc0\x00\x11\x08\x00\x01\x00\x01\x03\x01"\x00\x02\x11\x01\x03\x11\x01\xff\xc4\x00\x15\x00\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\xff\xc4\x00\x14\x10\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xda\x00\x0c\x03\x01\x00\x02\x11\x03\x11\x00?\x00\xbf\x80\x01\xff\xd9'  # noqa {{{ }}}
+IMG = b'\xff\xd8\xff\xe0\x00\x10JFIF\x00\x01\x01\x01\x00`\x00`\x00\x00\xff\xe1\x00\x16Exif\x00\x00II*\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xdb\x00C\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xff\xdb\x00C\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xff\xc0\x00\x11\x08\x00\x01\x00\x01\x03\x01"\x00\x02\x11\x01\x03\x11\x01\xff\xc4\x00\x15\x00\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\xff\xc4\x00\x14\x10\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xda\x00\x0c\x03\x01\x00\x02\x11\x03\x11\x00?\x00\xbf\x80\x01\xff\xd9'  # noqa: E501
 
 
 class BaseTest(unittest.TestCase):
@@ -110,7 +110,7 @@ class BaseTest(unittest.TestCase):
                 continue
             attr1, attr2 = getattr(mi1, attr), getattr(mi2, attr)
             if attr == 'formats':
-                attr1, attr2 = map(lambda x:tuple(x) if x else (), (attr1, attr2))
+                attr1, attr2 = (tuple(x) if x else () for x in (attr1, attr2))
             if isinstance(attr1, (tuple, list)) and 'authors' not in attr and 'languages' not in attr:
                 attr1, attr2 = set(attr1), set(attr2)
             self.assertEqual(attr1, attr2,
diff --git a/src/calibre/db/tests/filesystem.py b/src/calibre/db/tests/filesystem.py
index 3dc5bd5607..86e1178ec8 100644
--- a/src/calibre/db/tests/filesystem.py
+++ b/src/calibre/db/tests/filesystem.py
@@ -160,7 +160,6 @@ class FilesystemTest(BaseTest):
         self.assertEqual(cache.rename_extra_files(1, {'B': 'data/c'}), set())
         self.assertEqual(cache.rename_extra_files(1, {'B': 'data/c'}, replace=True), {'B'})
 
-
     @unittest.skipUnless(iswindows, 'Windows only')
     def test_windows_atomic_move(self):
         'Test book file open in another process when changing metadata'
diff --git a/src/calibre/db/tests/fts.py b/src/calibre/db/tests/fts.py
index b607be21ba..8690888c83 100644
--- a/src/calibre/db/tests/fts.py
+++ b/src/calibre/db/tests/fts.py
@@ -83,7 +83,7 @@ class FTSTest(BaseTest):
             self.ae(q, expected_tokens)
 
         self.ae(
-            tokenize("Some wörds"),
+            tokenize('Some wörds'),
             [t('some', 0, 4), t('wörds', 5, 11), t('words', 5, 11, 1)]
         )
         self.ae(
@@ -91,20 +91,20 @@ class FTSTest(BaseTest):
             [t("don't", 0, 5), t('bug', 7, 10)]
         )
         self.ae(
-            tokenize("a,b. c"),
-            [t("a", 0, 1), t('b', 2, 3), t('c', 5, 6)]
+            tokenize('a,b. c'),
+            [t('a', 0, 1), t('b', 2, 3), t('c', 5, 6)]
         )
         self.ae(
-            tokenize("a*b+c"),
-            [t("a", 0, 1), t('b', 2, 3), t('c', 4, 5)]
+            tokenize('a*b+c'),
+            [t('a', 0, 1), t('b', 2, 3), t('c', 4, 5)]
         )
         self.ae(
-            tokenize("a(b[{^c"),
-            [t("a", 0, 1), t('b', 2, 3), t('c', 6, 7)]
+            tokenize('a(b[{^c'),
+            [t('a', 0, 1), t('b', 2, 3), t('c', 6, 7)]
         )
         self.ae(
-            tokenize("a😀smile"),
-            [t("a", 0, 1), t('😀', 1, 5), t('smile', 5, 10)]
+            tokenize('a😀smile'),
+            [t('a', 0, 1), t('😀', 1, 5), t('smile', 5, 10)]
         )
 
         tt("你don't叫mess", '你', "don't", '叫', 'mess')
@@ -125,14 +125,14 @@ class FTSTest(BaseTest):
         conn = TestConn()
         conn.insert_text('two words, and a period. With another.')
         conn.insert_text('and another re-init')
-        self.ae(conn.search("another"), [('and >another< re-init',), ('…With >another<.',)])
-        self.ae(conn.search("period"), [('…a >period<. With another.',)])
+        self.ae(conn.search('another'), [('and >another< re-init',), ('…With >another<.',)])
+        self.ae(conn.search('period'), [('…a >period<. With another.',)])
         self.ae(conn.term_row_counts(), {'a': 1, 're': 1, 'init': 1, 'and': 2, 'another': 2, 'period': 1, 'two': 1, 'with': 1, 'words': 1})
         conn = TestConn()
         conn.insert_text('coộl')
         self.ae(conn.term_row_counts(), {'cool': 1, 'coộl': 1})
-        self.ae(conn.search("cool"), [('>coộl<',)])
-        self.ae(conn.search("coộl"), [('>coộl<',)])
+        self.ae(conn.search('cool'), [('>coộl<',)])
+        self.ae(conn.search('coộl'), [('>coộl<',)])
         conn = TestConn(remove_diacritics=False)
         conn.insert_text('coộl')
         self.ae(conn.term_row_counts(), {'coộl': 1})
@@ -140,13 +140,13 @@ class FTSTest(BaseTest):
         conn = TestConn()
         conn.insert_text("你don't叫mess")
         self.ae(conn.term_row_counts(), {"don't": 1, 'mess': 1, '你': 1, '叫': 1})
-        self.ae(conn.search("mess"), [("你don't叫>mess<",)])
+        self.ae(conn.search('mess'), [("你don't叫>mess<",)])
         self.ae(conn.search('''"don't"'''), [("你>don't<叫mess",)])
-        self.ae(conn.search("你"), [(">你<don't叫mess",)])
+        self.ae(conn.search('你'), [(">你<don't叫mess",)])
         import apsw
         if apsw.sqlitelibversion() not in ('3.44.0', '3.44.1', '3.44.2'):
             # see https://www.sqlite.org/forum/forumpost/d16aeb397d
-            self.ae(conn.search("叫"), [("你don't>叫<mess",)])
+            self.ae(conn.search('叫'), [("你don't>叫<mess",)])
     # }}}
 
     def test_fts_stemming(self):  # {{{
@@ -162,10 +162,10 @@ class FTSTest(BaseTest):
         conn = TestConn(stem_words=True)
         conn.insert_text('a simplistic connection')
         self.ae(conn.term_row_counts(), {'a': 1, 'connect': 1, 'simplist': 1})
-        self.ae(conn.search("connection"), [('a simplistic >connection<',),])
-        self.ae(conn.search("connect"), [('a simplistic >connection<',),])
-        self.ae(conn.search("simplistic connect"), [('a >simplistic< >connection<',),])
-        self.ae(conn.search("simplist"), [('a >simplistic< connection',),])
+        self.ae(conn.search('connection'), [('a simplistic >connection<',),])
+        self.ae(conn.search('connect'), [('a simplistic >connection<',),])
+        self.ae(conn.search('simplistic connect'), [('a >simplistic< >connection<',),])
+        self.ae(conn.search('simplist'), [('a >simplistic< connection',),])
 
     # }}}
 
diff --git a/src/calibre/db/tests/legacy.py b/src/calibre/db/tests/legacy.py
index 82ba8b76ac..86e157aa6f 100644
--- a/src/calibre/db/tests/legacy.py
+++ b/src/calibre/db/tests/legacy.py
@@ -78,7 +78,6 @@ def run_funcs(self, db, ndb, funcs):
 
 
 class LegacyTest(BaseTest):
-
     ''' Test the emulation of the legacy interface. '''
 
     def test_library_wide_properties(self):  # {{{
@@ -356,9 +355,9 @@ class LegacyTest(BaseTest):
     def test_legacy_adding_books(self):  # {{{
         'Test various adding/deleting books methods'
         import sqlite3
-        con = sqlite3.connect(":memory:")
+        con = sqlite3.connect(':memory:')
         try:
-            con.execute("create virtual table recipe using fts5(name, ingredients)")
+            con.execute('create virtual table recipe using fts5(name, ingredients)')
         except Exception:
             self.skipTest('python sqlite3 module does not have FTS5 support')
         con.close()
@@ -463,7 +462,7 @@ class LegacyTest(BaseTest):
             'find_books_in_directory', 'import_book_directory', 'import_book_directory_multiple', 'recursive_import',
 
             # Internal API
-            'clean_user_categories',  'cleanup_tags',  'books_list_filter', 'conn', 'connect', 'construct_file_name',
+            'clean_user_categories', 'cleanup_tags', 'books_list_filter', 'conn', 'connect', 'construct_file_name',
             'construct_path_name', 'clear_dirtied', 'initialize_database', 'initialize_dynamic',
             'run_import_plugins', 'vacuum', 'set_path', 'row_factory', 'rows', 'rmtree', 'series_index_pat',
             'import_old_database', 'dirtied_lock', 'dirtied_cache', 'dirty_books_referencing',
diff --git a/src/calibre/db/tests/locking.py b/src/calibre/db/tests/locking.py
index 56eaf7c52c..3c17c04358 100644
--- a/src/calibre/db/tests/locking.py
+++ b/src/calibre/db/tests/locking.py
@@ -22,7 +22,7 @@ def wait_for(period):
 
 
 class TestLock(BaseTest):
-    """Tests for db locking """
+    '''Tests for db locking '''
 
     def test_owns_locks(self):
         lock = SHLock()
diff --git a/src/calibre/db/tests/main.py b/src/calibre/db/tests/main.py
index 94d972ad6d..19c2d80689 100644
--- a/src/calibre/db/tests/main.py
+++ b/src/calibre/db/tests/main.py
@@ -14,7 +14,7 @@ def find_tests():
 
 if __name__ == '__main__':
     try:
-        import init_calibre  # noqa
+        import init_calibre  # noqa: F401
     except ImportError:
         pass
     run_tests(find_tests)
diff --git a/src/calibre/db/tests/notes.py b/src/calibre/db/tests/notes.py
index 65bd5c0ae9..822a235505 100644
--- a/src/calibre/db/tests/notes.py
+++ b/src/calibre/db/tests/notes.py
@@ -22,6 +22,7 @@ def test_notes_restore(self: 'NotesTest'):
     doc2 = 'simple notes for an author2'
     cache.set_notes_for('authors', authors[1], doc2, resource_hashes=(h2,))
 
+
 def test_notes_api(self: 'NotesTest'):
     cache, notes = self.create_notes_db()
     authors = sorted(cache.all_field_ids('authors'))
@@ -81,6 +82,7 @@ def test_notes_api(self: 'NotesTest'):
     cache.set_notes_for('authors', authors[0], '', resource_hashes=())
     self.ae(len(os.listdir(notes.retired_dir)), 1)
 
+
 def test_cache_api(self: 'NotesTest'):
     cache, notes = self.create_notes_db()
     authors = cache.field_for('authors', 1)
diff --git a/src/calibre/db/tests/profiling.py b/src/calibre/db/tests/profiling.py
index 3732c8ec47..761e019f6e 100644
--- a/src/calibre/db/tests/profiling.py
+++ b/src/calibre/db/tests/profiling.py
@@ -29,7 +29,7 @@ def main():
     stats = os.path.join(gettempdir(), 'read_db.stats')
     pr = cProfile.Profile()
     initdb('~/test library')
-    all_ids = db.new_api.all_book_ids()  # noqa
+    all_ids = db.new_api.all_book_ids()
     pr.enable()
     for book_id in all_ids:
         db.new_api._composite_for('#isbn', book_id)
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 411f05fe7c..f30eeaa81b 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -26,12 +26,12 @@ class ReadingTest(BaseTest):
         'Test the reading of data from the database'
         cache = self.init_cache(self.library_path)
         tests = {
-                3  : {
+                3: {
                     'title': 'Unknown',
                     'sort': 'Unknown',
                     'authors': ('Unknown',),
                     'author_sort': 'Unknown',
-                    'series' : None,
+                    'series': None,
                     'series_index': 1.0,
                     'rating': None,
                     'tags': (),
@@ -58,12 +58,12 @@ class ReadingTest(BaseTest):
                     'size':None,
                 },
 
-                2 : {
+                2: {
                     'title': 'Title One',
                     'sort': 'One',
                     'authors': ('Author One',),
                     'author_sort': 'One, Author',
-                    'series' : 'A Series One',
+                    'series': 'A Series One',
                     'series_index': 1.0,
                     'tags':('Tag One', 'Tag Two'),
                     'formats': ('FMT1',),
@@ -88,12 +88,12 @@ class ReadingTest(BaseTest):
                     '#comments': '<div>My Comments One<p></p></div>',
                     'size':9,
                 },
-                1  : {
+                1: {
                     'title': 'Title Two',
                     'sort': 'Title Two',
                     'authors': ('Author Two', 'Author One'),
                     'author_sort': 'Two, Author & One, Author',
-                    'series' : 'A Series One',
+                    'series': 'A Series One',
                     'series_index': 2.0,
                     'rating': 6.0,
                     'tags': ('Tag One', 'News'),
@@ -217,7 +217,7 @@ class ReadingTest(BaseTest):
         cache.set_field('#two', {10:2})
         cache.set_field('#three', {i:i for i in range(1, 11)})
         ae(list(range(1, 11)), cache.multisort([('#one', True), ('#two', True)], ids_to_sort=sorted(cache.all_book_ids())))
-        ae([4, 5, 1, 2, 3, 7,8, 9, 10, 6], cache.multisort([('#one', True), ('#two', False)], ids_to_sort=sorted(cache.all_book_ids())))
+        ae([4, 5, 1, 2, 3, 7, 8, 9, 10, 6], cache.multisort([('#one', True), ('#two', False)], ids_to_sort=sorted(cache.all_book_ids())))
         ae([5, 4, 3, 2, 1, 10, 9, 8, 7, 6], cache.multisort([('#one', True), ('#two', False), ('#three', False)], ids_to_sort=sorted(cache.all_book_ids())))
     # }}}
 
@@ -371,8 +371,8 @@ class ReadingTest(BaseTest):
         cache.set_field('timestamp', {1:p('2002-02-06'), 2:p('2000-10-06'), 3:p('2001-06-06')})
         # Test numeric compare search
         self.assertEqual(cache.search("template:\"program: "
-                                      "floor(days_between(field(\'pubdate\'), "
-                                      "field(\'timestamp\')))#@#:n:>0\""), {2,3})
+                                      "floor(days_between(field('pubdate'), "
+                                      "field('timestamp')))#@#:n:>0\""), {2,3})
         # Test date search
         self.assertEqual(cache.search('template:{pubdate}#@#:d:<2001-09-01"'), {1,3})
         # Test boolean search
@@ -380,7 +380,7 @@ class ReadingTest(BaseTest):
         self.assertEqual(cache.search('template:{series}#@#:b:false'), {3})
 
         # test primary search
-        cache.set_field('title', {1: "Gravity’s Raiñbow"})
+        cache.set_field('title', {1: 'Gravity’s Raiñbow'})
         self.assertEqual(cache.search('title:"Gravity\'s Rainbow"'), {1})
         # Note that the old db searched uuid for un-prefixed searches, the new
         # db does not, for performance
@@ -712,7 +712,6 @@ class ReadingTest(BaseTest):
         self.assertRaises(NotImplementedError, pmi.template_to_attribute, {}, {})
         self.assertRaises(NotImplementedError, pmi.smart_update, {})
 
-
     # }}}
 
     def test_marked_field(self):  # {{{
@@ -945,7 +944,7 @@ def evaluate(book, ctx):
         from calibre.utils.formatter_functions import load_user_template_functions, unload_user_template_functions
         load_user_template_functions('aaaaa',
                                      [['python_stored_template',
-                                      "",
+                                      '',
                                       0,
                                       '''python:
 def evaluate(book, ctx):
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index 27ba21e845..929b54b5e1 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -790,7 +790,7 @@ class WritingTest(BaseTest):
             self.assertNotIn(uid, t.id_map)
             self.assertNotIn(uid, t.col_book_map)
             for bid in (1, 2, 3):
-                ae(c.field_for('publisher', bid), "mūs")
+                ae(c.field_for('publisher', bid), 'mūs')
             c.close()
 
         cache = self.init_cache()
@@ -829,7 +829,7 @@ class WritingTest(BaseTest):
         changes = []
         cache.backend.conn.setupdatehook(lambda typ, dbname, tblname, rowid: changes.append(rowid))
         prefs = cache.backend.prefs
-        prefs['test mutable'] =  [1, 2, 3]
+        prefs['test mutable'] = [1, 2, 3]
         self.assertEqual(len(changes), 1)
         a = prefs['test mutable']
         a.append(4)
@@ -920,7 +920,6 @@ class WritingTest(BaseTest):
         cache.restore_annotations(1, list(opf.read_annotations()))
         amap = cache.annotations_map_for_book(1, 'moo')
         self.assertEqual([x[0] for x in annot_list], map_as_list(amap))
-
     # }}}
 
     def test_changed_events(self):  # {{{
@@ -1019,31 +1018,30 @@ class WritingTest(BaseTest):
         cache.set_field('publisher', {1:'random'})
         cache.set_link_map('publisher', {'random': 'url2'})
         links = cache.get_all_link_maps_for_book(1)
-        self.assertSetEqual({v for v in links.keys()}, {'tags', 'publisher'}, 'Wrong link keys')
-        self.assertSetEqual({v for v in links['tags'].keys()}, {'foo', }, 'Should be "foo"')
-        self.assertSetEqual({v for v in links['publisher'].keys()}, {'random', }, 'Should be "random"')
+        self.assertSetEqual(set(links.keys()), {'tags', 'publisher'}, 'Wrong link keys')
+        self.assertSetEqual(set(links['tags'].keys()), {'foo', }, 'Should be "foo"')
+        self.assertSetEqual(set(links['publisher'].keys()), {'random', }, 'Should be "random"')
         self.assertEqual('url', links['tags']['foo'], 'link for tag foo is wrong')
         self.assertEqual('url2', links['publisher']['random'], 'link for publisher random is wrong')
 
         # Check that renaming a tag keeps the link and clears the link map cache for the book
-        self.assertTrue(1 in cache.link_maps_cache, "book not in link_map_cache")
+        self.assertTrue(1 in cache.link_maps_cache, 'book not in link_map_cache')
         tag_id = cache.get_item_id('tags', 'foo')
         cache.rename_items('tags', {tag_id: 'foobar'})
-        self.assertTrue(1 not in cache.link_maps_cache, "book still in link_map_cache")
+        self.assertTrue(1 not in cache.link_maps_cache, 'book still in link_map_cache')
         links = cache.get_link_map('tags')
-        self.assertTrue('foobar' in links, "rename foo lost the link")
-        self.assertEqual(links['foobar'], 'url', "The link changed contents")
+        self.assertTrue('foobar' in links, 'rename foo lost the link')
+        self.assertEqual(links['foobar'], 'url', 'The link changed contents')
         links = cache.get_all_link_maps_for_book(1)
-        self.assertTrue(1 in cache.link_maps_cache, "book not put back into link_map_cache")
+        self.assertTrue(1 in cache.link_maps_cache, 'book not put back into link_map_cache')
         self.assertDictEqual({'publisher': {'random': 'url2'}, 'tags': {'foobar': 'url'}},
-                             links, "book links incorrect after tag rename")
+                             links, 'book links incorrect after tag rename')
 
         # Check ProxyMetadata
         mi = cache.get_proxy_metadata(1)
         self.assertDictEqual({'publisher': {'random': 'url2'}, 'tags': {'foobar': 'url'}},
                              mi.link_maps, "ProxyMetadata didn't return the right link map")
 
-
         # Now test deleting the links.
         links = cache.get_link_map('tags')
         to_del = {l:'' for l in links.keys()}
@@ -1054,6 +1052,4 @@ class WritingTest(BaseTest):
         cache.set_link_map('publisher', to_del)
         self.assertEqual({}, cache.get_link_map('publisher'), 'links on publisher were not deleted')
         self.assertEqual({}, cache.get_all_link_maps_for_book(1), 'Not all links for book were deleted')
-
-
     # }}}
diff --git a/src/calibre/db/utils.py b/src/calibre/db/utils.py
index 1442253ebf..d35067af72 100644
--- a/src/calibre/db/utils.py
+++ b/src/calibre/db/utils.py
@@ -107,7 +107,6 @@ class CacheError(Exception):
 
 
 class ThumbnailCache:
-
     ' This is a persistent disk cache to speed up loading and resizing of covers '
 
     def __init__(self,
@@ -116,8 +115,8 @@ class ThumbnailCache:
                  thumbnail_size=(100, 100),   # The size of the thumbnails, can be changed
                  location=None,   # The location for this cache, if None cache_dir() is used
                  test_mode=False,  # Used for testing
-                 min_disk_cache=0, # If the size is set less than or equal to this value, the cache is disabled.
-                 version=0 # Increase this if the cache content format might have changed.
+                 min_disk_cache=0,  # If the size is set less than or equal to this value, the cache is disabled.
+                 version=0  # Increase this if the cache content format might have changed.
                  ):
         self.version = version
         self.location = os.path.join(location or cache_dir(), name)
@@ -202,7 +201,7 @@ class ThumbnailCache:
                     try:
                         uuid, book_id = line.partition(' ')[0::2]
                         book_id = int(book_id)
-                        return (uuid, book_id)
+                        return uuid, book_id
                     except Exception:
                         return None
                 invalidate = {record(x) for x in raw.splitlines()}
@@ -226,7 +225,7 @@ class ThumbnailCache:
         except OSError as err:
             self.log('Failed to read thumbnail cache dir:', as_unicode(err))
 
-        self.items = OrderedDict(sorted(items, key=lambda x:order.get(x[0], 0)))
+        self.items = OrderedDict(sorted(items, key=lambda x: order.get(x[0], 0)))
         self._apply_size()
 
     def _invalidate_sizes(self):
diff --git a/src/calibre/db/view.py b/src/calibre/db/view.py
index a97cf93e6e..ade2131ecf 100644
--- a/src/calibre/db/view.py
+++ b/src/calibre/db/view.py
@@ -99,7 +99,6 @@ def format_identifiers(x):
 
 
 class View:
-
     ''' A table view of the database, with rows and columns. Also supports
     filtering and sorting.  '''
 
diff --git a/src/calibre/db/write.py b/src/calibre/db/write.py
index 61319fef4b..7d9065bc8a 100644
--- a/src/calibre/db/write.py
+++ b/src/calibre/db/write.py
@@ -19,8 +19,8 @@ from polyglot.builtins import iteritems, itervalues
 
 missing = object()
 
-# Convert data into values suitable for the db {{{
 
+# Convert data into values suitable for the db {{{
 
 def sqlite_datetime(x):
     return isoformat(x, sep=' ') if isinstance(x, datetime) else x
@@ -40,16 +40,16 @@ series_index_pat = re.compile(r'(.*)\s+\[([.0-9]+)\]$')
 
 def get_series_values(val):
     if not val:
-        return (val, None)
+        return val, None
     match = series_index_pat.match(val.strip())
     if match is not None:
         idx = match.group(2)
         try:
             idx = float(idx)
-            return (match.group(1).strip(), idx)
+            return match.group(1).strip(), idx
         except:
             pass
-    return (val, None)
+    return val, None
 
 
 def multiple_text(sep, ui_sep, x):
@@ -129,7 +129,7 @@ def clean_identifier(typ, val):
 
 def adapt_identifiers(to_tuple, x):
     if not isinstance(x, dict):
-        x = {k:v for k, v in (y.partition(':')[0::2] for y in to_tuple(x))}
+        x = dict(y.partition(':')[0::2] for y in to_tuple(x))
     ans = {}
     for k, v in iteritems(x):
         k, v = clean_identifier(k, v)
@@ -190,8 +190,8 @@ def get_adapter(name, metadata):
     return ans
 # }}}
 
-# One-One fields {{{
 
+# One-One fields {{{
 
 def one_one_in_books(book_id_val_map, db, field, *args):
     'Set a one-one field in the books table'
@@ -265,8 +265,8 @@ def custom_series_index(book_id_val_map, db, field, *args):
     return {s[1] for s in sequence}
 # }}}
 
-# Many-One fields {{{
 
+# Many-One fields {{{
 
 def safe_lower(x):
     try:
@@ -392,8 +392,8 @@ def many_one(book_id_val_map, db, field, allow_case_change, *args):
     return dirtied
 # }}}
 
-# Many-Many fields {{{
 
+# Many-Many fields {{{
 
 def uniq(vals, kmap=lambda x:x):
     ''' Remove all duplicates from vals, while preserving order. kmap must be a
diff --git a/src/calibre/debug.py b/src/calibre/debug.py
index 36310bfe28..ddadff37da 100644
--- a/src/calibre/debug.py
+++ b/src/calibre/debug.py
@@ -56,15 +56,15 @@ as a shebang in scripts, like this:
                       help=_('Subset the specified font. Use -- after this option to pass option to the font subsetting program.'))
     parser.add_option('-d', '--debug-device-driver', default=False, action='store_true',
                       help=_('Debug device detection'))
-    parser.add_option('-g', '--gui',  default=False, action='store_true',
+    parser.add_option('-g', '--gui', default=False, action='store_true',
                       help=_('Run the GUI with debugging enabled. Debug output is '
                       'printed to stdout and stderr.'))
-    parser.add_option('--gui-debug',  default=None,
+    parser.add_option('--gui-debug', default=None,
                       help=_('Run the GUI with a debug console, logging to the'
                       ' specified path. For internal use only, use the -g'
                       ' option to run the GUI in debug mode'))
-    parser.add_option('--run-without-debug', default=False, action='store_true', help=_('Don\'t run with the DEBUG flag set'))
-    parser.add_option('-w', '--viewer',  default=False, action='store_true',
+    parser.add_option('--run-without-debug', default=False, action='store_true', help=_("Don't run with the DEBUG flag set"))
+    parser.add_option('-w', '--viewer', default=False, action='store_true',
                       help=_('Run the E-book viewer in debug mode'))
     parser.add_option('--paths', default=False, action='store_true',
             help=_('Output the paths necessary to setup the calibre environment'))
diff --git a/src/calibre/devices/__init__.py b/src/calibre/devices/__init__.py
index be170ca627..317a30e4b4 100644
--- a/src/calibre/devices/__init__.py
+++ b/src/calibre/devices/__init__.py
@@ -25,7 +25,7 @@ def strptime(src):
 
 
 def strftime(epoch, zone=time.gmtime):
-    src = time.strftime("%w, %d %m %Y %H:%M:%S GMT", zone(epoch)).split()
+    src = time.strftime('%w, %d %m %Y %H:%M:%S GMT', zone(epoch)).split()
     src[0] = INVERSE_DAY_MAP[int(src[0][:-1])]+','
     src[2] = INVERSE_MONTH_MAP[int(src[2])]
     return ' '.join(src)
diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index 3c75c760a2..08964f3217 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -26,151 +26,153 @@ class ANDROID(USBMS):
 
     VENDOR_ID   = {
             # HTC
-            0x0bb4 : {0xc02  : HTC_BCDS,
-                       0xc01  : HTC_BCDS,
-                       0xff9  : HTC_BCDS,
-                       0xc86  : HTC_BCDS,
-                       0xc87  : HTC_BCDS,
-                       0xc8d  : HTC_BCDS,
-                       0xc91  : HTC_BCDS,
-                       0xc92  : HTC_BCDS,
-                       0xc97  : HTC_BCDS,
-                       0xc99  : HTC_BCDS,
-                       0xca2  : HTC_BCDS,
-                       0xca3  : HTC_BCDS,
-                       0xca4  : HTC_BCDS,
-                       0xca9  : HTC_BCDS,
-                       0xcac  : HTC_BCDS,
-                       0xcba  : HTC_BCDS,
-                       0xccf  : HTC_BCDS,
-                       0xcd6  : HTC_BCDS,
-                       0xce5  : HTC_BCDS,
-                       0xcec  : HTC_BCDS,
-                       0x0cf5 : HTC_BCDS,
-                       0x2910 : HTC_BCDS,
-                       0xe77  : HTC_BCDS,
-                       0x0001 : [0x255],
+            0x0bb4: {
+                0xc02 : HTC_BCDS,
+                0xc01 : HTC_BCDS,
+                0xff9 : HTC_BCDS,
+                0xc86 : HTC_BCDS,
+                0xc87 : HTC_BCDS,
+                0xc8d : HTC_BCDS,
+                0xc91 : HTC_BCDS,
+                0xc92 : HTC_BCDS,
+                0xc97 : HTC_BCDS,
+                0xc99 : HTC_BCDS,
+                0xca2 : HTC_BCDS,
+                0xca3 : HTC_BCDS,
+                0xca4 : HTC_BCDS,
+                0xca9 : HTC_BCDS,
+                0xcac : HTC_BCDS,
+                0xcba : HTC_BCDS,
+                0xccf : HTC_BCDS,
+                0xcd6 : HTC_BCDS,
+                0xce5 : HTC_BCDS,
+                0xcec : HTC_BCDS,
+                0x0cf5: HTC_BCDS,
+                0x2910: HTC_BCDS,
+                0xe77 : HTC_BCDS,
+                0x0001: [0x255],
             },
 
             # Eken
-            0x040d : {0x8510 : [0x0001], 0x0851 : [0x1]},
+            0x040d: {0x8510: [0x0001], 0x0851: [0x1]},
 
             # Trekstor
-            0x1e68 : {
-                0x006a : [0x0231],
-                0x0062 : [0x222],  # Surftab ventos https://bugs.launchpad.net/bugs/1204885
+            0x1e68: {
+                0x006a: [0x0231],
+                0x0062: [0x222],  # Surftab ventos https://bugs.launchpad.net/bugs/1204885
             },
 
             # Motorola
-            0x22b8 : {
-                0x41d9 : [0x216], 0x2d61 : [0x100], 0x2d67 : [0x100],
-                0x2de8 : [0x229],
-                0x41db : [0x216], 0x4285 : [0x216], 0x42a3 : [0x216],
-                0x4286 : [0x216], 0x42b3 : [0x216], 0x42b4 : [0x216],
-                0x7086 : [0x0226], 0x70a8: [0x9999], 0x42c4 : [0x216],
-                0x70c6 : [0x226], 0x70c7: [0x226],
-                0x4316 : [0x216],
-                0x4317 : [0x216],
-                0x42d6 : [0x216],
-                0x42d7 : [0x216],
-                0x42f7 : [0x216],
-                0x4365 : [0x216],
-                0x4366 : [0x216],
-                0x4371 : [0x216],
+            0x22b8: {
+                0x41d9: [0x216], 0x2d61: [0x100], 0x2d67: [0x100],
+                0x2de8: [0x229],
+                0x41db: [0x216], 0x4285: [0x216], 0x42a3: [0x216],
+                0x4286: [0x216], 0x42b3: [0x216], 0x42b4: [0x216],
+                0x7086: [0x0226], 0x70a8: [0x9999], 0x42c4: [0x216],
+                0x70c6: [0x226], 0x70c7: [0x226],
+                0x4316: [0x216],
+                0x4317: [0x216],
+                0x42d6: [0x216],
+                0x42d7: [0x216],
+                0x42f7: [0x216],
+                0x4365: [0x216],
+                0x4366: [0x216],
+                0x4371: [0x216],
             },
             # Freescale
-            0x15a2 : {
-                0x0c01 : [0x226]
+            0x15a2: {
+                0x0c01: [0x226]
             },
 
             # Alcatel
-            0x05c6 : {
-                0x9018 : [0x0226],
+            0x05c6: {
+                0x9018: [0x0226],
             },
 
             # Sony Ericsson
             0xfce : {
-                0xa173 : [0x216],
-                0xd12e : [0x0100],
-                0xe156 : [0x226],
-                0xe15d : [0x226],
-                0xe14f : [0x0226],
-                0x614f : [0x0226, 0x100],
-                0x6156 : [0x0226, 0x100],
-                },
+                0xa173: [0x216],
+                0xd12e: [0x0100],
+                0xe156: [0x226],
+                0xe15d: [0x226],
+                0xe14f: [0x0226],
+                0x614f: [0x0226, 0x100],
+                0x6156: [0x0226, 0x100],
+            },
 
             # Google
-            0x18d1 : {
-                0x0001 : [0x0222, 0x0223, 0x230, 0x255, 0x9999],
-                0x0002 : [0x9999],
-                0x0003 : [0x0230, 0x9999],
-                0x4e11 : [0x0100, 0x226, 0x227],
-                0x4e12 : [0x0100, 0x226, 0x227],
-                0x4e21 : [0x0100, 0x226, 0x227, 0x231],
-                0x4e22 : [0x0100, 0x226, 0x227, 0x231],
-                0xb058 : [0x0222, 0x226, 0x227],
-                0x0ff9 : [0x0226],
-                0xc91  : HTC_BCDS,
-                0xdddd : [0x216],
-                0x0d01 : [0x9999],
-                0x0d02 : [0x9999],
-                0x2d01 : [0x9999],
-                0xdeed : [0x231, 0x226],
+            0x18d1: {
+                0x0001: [0x0222, 0x0223, 0x230, 0x255, 0x9999],
+                0x0002: [0x9999],
+                0x0003: [0x0230, 0x9999],
+                0x4e11: [0x0100, 0x226, 0x227],
+                0x4e12: [0x0100, 0x226, 0x227],
+                0x4e21: [0x0100, 0x226, 0x227, 0x231],
+                0x4e22: [0x0100, 0x226, 0x227, 0x231],
+                0xb058: [0x0222, 0x226, 0x227],
+                0x0ff9: [0x0226],
+                0xc91 : HTC_BCDS,
+                0xdddd: [0x216],
+                0x0d01: [0x9999],
+                0x0d02: [0x9999],
+                0x2d01: [0x9999],
+                0xdeed: [0x231, 0x226],
             },
 
             # Samsung
-            0x04e8 : {0x681d : [0x0222, 0x0223, 0x0224, 0x0400],
-                       0x681c : [0x0222, 0x0223, 0x0224, 0x0400],
-                       0x6640 : [0x0100],
-                       0x685b : [0x0400, 0x0226],
-                       0x685e : [0x0400, 0x226],
-                       0x6860 : [0x0400],
-                       0x6863 : [0x226],
-                       0x6877 : [0x0400],
-                       0x689e : [0x0400],
-                       0xdeed : [0x0222],
-                       0x1234 : [0x0400],
-                     },
+            0x04e8: {
+                0x681d: [0x0222, 0x0223, 0x0224, 0x0400],
+                0x681c: [0x0222, 0x0223, 0x0224, 0x0400],
+                0x6640: [0x0100],
+                0x685b: [0x0400, 0x0226],
+                0x685e: [0x0400, 0x226],
+                0x6860: [0x0400],
+                0x6863: [0x226],
+                0x6877: [0x0400],
+                0x689e: [0x0400],
+                0xdeed: [0x0222],
+                0x1234: [0x0400],
+            },
 
             # Viewsonic/Vizio
-            0x0489 : {
-                    0xc000 : [0x0226],
-                    0xc001 : [0x0226],
-                    0xc004 : [0x0226],
-                    0x8801 : [0x0226, 0x0227],
-                    0xe115 : [0x0216],  # PocketBook A10
+            0x0489: {
+                0xc000: [0x0226],
+                0xc001: [0x0226],
+                0xc004: [0x0226],
+                0x8801: [0x0226, 0x0227],
+                0xe115: [0x0216],  # PocketBook A10
             },
 
             # Another Viewsonic
-            0x0bb0 : {
-                    0x2a2b : [0x0226, 0x0227],
+            0x0bb0: {
+                0x2a2b: [0x0226, 0x0227],
             },
 
             # Acer
-            0x502 : {0x3203 : [0x0100, 0x224]},
+            0x502 : {0x3203: [0x0100, 0x224]},
 
             # Dell
-            0x413c : {0xb007 : [0x0100, 0x0224, 0x0226]},
+            0x413c: {0xb007: [0x0100, 0x0224, 0x0226]},
 
             # LG
-            0x1004 : {
-                    0x61c5 : [0x100, 0x226, 0x227, 0x229, 0x9999],
-                    0x61cc : [0x226, 0x227, 0x9999, 0x100],
-                    0x61ce : [0x226, 0x227, 0x9999, 0x100],
-                    0x618e : [0x226, 0x227, 0x9999, 0x100],
-                    0x6205 : [0x226, 0x227, 0x9999, 0x100],
-                    0x6234 : [0x231],
+            0x1004: {
+                    0x61c5: [0x100, 0x226, 0x227, 0x229, 0x9999],
+                    0x61cc: [0x226, 0x227, 0x9999, 0x100],
+                    0x61ce: [0x226, 0x227, 0x9999, 0x100],
+                    0x618e: [0x226, 0x227, 0x9999, 0x100],
+                    0x6205: [0x226, 0x227, 0x9999, 0x100],
+                    0x6234: [0x231],
                     },
 
             # Archos
-            0x0e79 : {
-                0x1400 : [0x0222, 0x0216],
-                0x1408 : [0x0222, 0x0216],
-                0x1411 : [0x216],
-                0x1417 : [0x0216],
-                0x1419 : [0x0216],
-                0x1420 : [0x0216],
-                0x1422 : [0x0216]
+            0x0e79: {
+                0x1400: [0x0222, 0x0216],
+                0x1408: [0x0222, 0x0216],
+                0x1411: [0x216],
+                0x1417: [0x0216],
+                0x1419: [0x0216],
+                0x1420: [0x0216],
+                0x1422: [0x0216]
             },
 
             # Huawei
@@ -178,44 +180,44 @@ class ANDROID(USBMS):
             # 0x45e : { 0x00e1 : [0x007], },
 
             # T-Mobile
-            0x0408 : {0x03ba : [0x0109], },
+            0x0408: {0x03ba: [0x0109]},
 
             # Xperia
-            0x13d3 : {0x3304 : [0x0001, 0x0002]},
+            0x13d3: {0x3304: [0x0001, 0x0002]},
 
             # ZTE
-            0x19d2 : {0x1353 : [0x226], 0x1351 : [0x227]},
+            0x19d2: {0x1353: [0x226], 0x1351: [0x227]},
 
             # Advent
-            0x0955 : {0x7100 : [0x9999]},  # This is the same as the Notion Ink Adam
+            0x0955: {0x7100: [0x9999]},  # This is the same as the Notion Ink Adam
 
             # Kobo
-            0x2237: {0x2208 : [0x0226]},
+            0x2237: {0x2208: [0x0226]},
 
             # Lenovo
-            0x17ef : {
-                    0x7421 : [0x0216],
-                    0x741b : [0x9999],
-                    0x7640 : [0x0255],
+            0x17ef: {
+                    0x7421: [0x0216],
+                    0x741b: [0x9999],
+                    0x7640: [0x0255],
             },
 
             # Pantech
-            0x10a9 : {0x6050 : [0x227]},
+            0x10a9: {0x6050: [0x227]},
 
             # Prestigio and Teclast
-            0x2207 : {0 : [0x222], 0x10 : [0x222]},
+            0x2207: {0: [0x222], 0x10: [0x222]},
 
             # OPPO
-            0x22d9 : {0x2768: [0x228]},
+            0x22d9: {0x2768: [0x228]},
 
             }
     EBOOK_DIR_MAIN = ['eBooks/import', 'wordplayer/calibretransfer', 'Books',
             'sdcard/ebooks']
     EXTRA_CUSTOMIZATION_MESSAGE = [_('Comma separated list of folders to '
-            'send e-books to on the device\'s <b>main memory</b>. The first one that exists will '
+            "send e-books to on the device's <b>main memory</b>. The first one that exists will "
             'be used'),
             _('Comma separated list of folders to '
-            'send e-books to on the device\'s <b>storage cards</b>. The first one that exists will '
+            "send e-books to on the device's <b>storage cards</b>. The first one that exists will "
             'be used')
             ]
 
diff --git a/src/calibre/devices/cli.py b/src/calibre/devices/cli.py
index 3a3fd2387b..2b7bbb633f 100755
--- a/src/calibre/devices/cli.py
+++ b/src/calibre/devices/cli.py
@@ -3,11 +3,11 @@
 
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-"""
+'''
 Provides a command-line interface to ebook devices.
 
 For usage information run the script.
-"""
+'''
 
 import os
 import sys
@@ -37,14 +37,14 @@ class FileFormatter:
 
     @property
     def mode_string(self):
-        """ The mode string for this file. There are only two modes read-only and read-write """
-        mode, x = "-", "-"
+        ''' The mode string for this file. There are only two modes read-only and read-write '''
+        mode, x = '-', '-'
         if self.is_dir:
-            mode, x = "d", "x"
+            mode, x = 'd', 'x'
         if self.is_readonly:
-            mode += "r-"+x+"r-"+x+"r-"+x
+            mode += 'r-'+x+'r-'+x+'r-'+x
         else:
-            mode += "rw"+x+"rw"+x+"rw"+x
+            mode += 'rw'+x+'rw'+x+'rw'+x
         return mode
 
     @property
@@ -57,41 +57,41 @@ class FileFormatter:
 
     @property
     def name_in_color(self):
-        """ The name in ANSI text. Directories are blue, ebooks are green """
+        ''' The name in ANSI text. Directories are blue, ebooks are green '''
         cname = self.name
-        blue, green, normal = "", "", ""
+        blue, green, normal = '', '', ''
         if self.term:
             blue, green, normal = self.term.BLUE, self.term.GREEN, self.term.NORMAL
         if self.is_dir:
             cname = blue + self.name + normal
         else:
-            ext = self.name[self.name.rfind("."):]
-            if ext in (".pdf", ".rtf", ".lrf", ".lrx", ".txt"):
+            ext = self.name[self.name.rfind('.'):]
+            if ext in ('.pdf', '.rtf', '.lrf', '.lrx', '.txt'):
                 cname = green + self.name + normal
         return cname
 
     @property
     def human_readable_size(self):
-        """ File size in human readable form """
+        ''' File size in human readable form '''
         return human_readable(self.size)
 
     @property
     def modification_time(self):
-        """ Last modified time in the Linux ls -l format """
-        return time.strftime("%Y-%m-%d %H:%M", time.localtime(self.wtime))
+        ''' Last modified time in the Linux ls -l format '''
+        return time.strftime('%Y-%m-%d %H:%M', time.localtime(self.wtime))
 
     @property
     def creation_time(self):
-        """ Last modified time in the Linux ls -l format """
-        return time.strftime("%Y-%m-%d %H:%M", time.localtime(self.ctime))
+        ''' Last modified time in the Linux ls -l format '''
+        return time.strftime('%Y-%m-%d %H:%M', time.localtime(self.ctime))
 
 
 def info(dev):
     info = dev.get_device_information()
-    print("Device name:     ", info[0])
-    print("Device version:  ", info[1])
-    print("Software version:", info[2])
-    print("Mime type:       ", info[3])
+    print('Device name:     ', info[0])
+    print('Device version:  ', info[1])
+    print('Software version:', info[2])
+    print('Mime type:       ', info[3])
 
 
 def ls(dev, path, recurse=False, human_readable_size=False, ll=False, cols=0):
@@ -115,12 +115,12 @@ def ls(dev, path, recurse=False, human_readable_size=False, ll=False, cols=0):
         return rowwidths
 
     output = PolyglotStringIO()
-    if path.endswith("/") and len(path) > 1:
+    if path.endswith('/') and len(path) > 1:
         path = path[:-1]
     dirs = dev.list(path, recurse)
     for dir in dirs:
         if recurse:
-            prints(dir[0] + ":", file=output)
+            prints(dir[0] + ':', file=output)
         lsoutput, lscoloutput = [], []
         files = dir[1]
         maxlen = 0
@@ -141,7 +141,7 @@ def ls(dev, path, recurse=False, human_readable_size=False, ll=False, cols=0):
                 size = str(file.size)
                 if human_readable_size:
                     size = file.human_readable_size
-                prints(file.mode_string, ("%"+str(maxlen)+"s")%size, file.modification_time, name, file=output)
+                prints(file.mode_string, ('%'+str(maxlen)+'s')%size, file.modification_time, name, file=output)
         if not ll and len(lsoutput) > 0:
             trytable = []
             for colwidth in range(MINIMUM_COL_WIDTH, cols):
@@ -163,10 +163,10 @@ def ls(dev, path, recurse=False, human_readable_size=False, ll=False, cols=0):
             for r in range(len(trytable)):
                 for c in range(len(trytable[r])):
                     padding = rowwidths[c] - len(trytable[r][c])
-                    prints(trytablecol[r][c], "".ljust(padding), end=' ', file=output)
+                    prints(trytablecol[r][c], ''.ljust(padding), end=' ', file=output)
                 prints(file=output)
         prints(file=output)
-    listing = output.getvalue().rstrip() + "\n"
+    listing = output.getvalue().rstrip() + '\n'
     output.close()
     return listing
 
@@ -183,13 +183,13 @@ def main():
     from calibre.utils.terminal import geometry
     cols = geometry()[0]
 
-    parser = OptionParser(usage="usage: %prog [options] command args\n\ncommand "+
-            "is one of: info, books, df, ls, cp, mkdir, touch, cat, rm, eject, test_file\n\n"+
-    "For help on a particular command: %prog command", version=__appname__+" version: " + __version__)
-    parser.add_option("--log-packets", help="print out packet stream to stdout. "+
-                    "The numbers in the left column are byte offsets that allow the packet size to be read off easily.",
-    dest="log_packets", action="store_true", default=False)
-    parser.remove_option("-h")
+    parser = OptionParser(usage='usage: %prog [options] command args\n\ncommand '+
+            'is one of: info, books, df, ls, cp, mkdir, touch, cat, rm, eject, test_file\n\n'+
+    'For help on a particular command: %prog command', version=__appname__+' version: ' + __version__)
+    parser.add_option('--log-packets', help='print out packet stream to stdout. '+
+                    'The numbers in the left column are byte offsets that allow the packet size to be read off easily.',
+    dest='log_packets', action='store_true', default=False)
+    parser.remove_option('-h')
     parser.disable_interspersed_args()  # Allow unrecognized options
     options, args = parser.parse_args()
 
@@ -238,55 +238,55 @@ def main():
             break
 
     try:
-        if command == "df":
+        if command == 'df':
             total = dev.total_space(end_session=False)
             free = dev.free_space()
-            where = ("Memory", "Card A", "Card B")
-            print("Filesystem\tSize \tUsed \tAvail \tUse%")
+            where = ('Memory', 'Card A', 'Card B')
+            print('Filesystem\tSize \tUsed \tAvail \tUse%')
             for i in range(3):
-                print("%-10s\t%s\t%s\t%s\t%s"%(where[i], human_readable(total[i]), human_readable(total[i]-free[i]), human_readable(free[i]),
-                                                                            str(0 if total[i]==0 else int(100*(total[i]-free[i])/(total[i]*1.)))+"%"))
+                print('%-10s\t%s\t%s\t%s\t%s'%(where[i], human_readable(total[i]), human_readable(total[i]-free[i]), human_readable(free[i]),
+                                                                            str(0 if total[i]==0 else int(100*(total[i]-free[i])/(total[i]*1.)))+'%'))
         elif command == 'eject':
             dev.eject()
-        elif command == "books":
-            print("Books in main memory:")
+        elif command == 'books':
+            print('Books in main memory:')
             for book in dev.books():
                 print(book)
-            print("\nBooks on storage carda:")
+            print('\nBooks on storage carda:')
             for book in dev.books(oncard='carda'):
                 print(book)
-            print("\nBooks on storage cardb:")
+            print('\nBooks on storage cardb:')
             for book in dev.books(oncard='cardb'):
                 print(book)
-        elif command == "mkdir":
-            parser = OptionParser(usage="usage: %prog mkdir [options] path\nCreate a folder on the device\n\npath must begin with / or card:/")
+        elif command == 'mkdir':
+            parser = OptionParser(usage='usage: %prog mkdir [options] path\nCreate a folder on the device\n\npath must begin with / or card:/')
             if len(args) != 1:
                 parser.print_help()
                 sys.exit(1)
             dev.mkdir(args[0])
-        elif command == "ls":
-            parser = OptionParser(usage="usage: %prog ls [options] path\nList files on the device\n\npath must begin with / or card:/")
+        elif command == 'ls':
+            parser = OptionParser(usage='usage: %prog ls [options] path\nList files on the device\n\npath must begin with / or card:/')
             parser.add_option(
-                "-l", help="In addition to the name of each file, print the file type, permissions, and  timestamp  (the  modification time, in the local timezone). Times are local.",  # noqa
-                dest="ll", action="store_true", default=False)
-            parser.add_option("-R", help="Recursively list subfolders encountered. /dev and /proc are omitted",
-                              dest="recurse", action="store_true", default=False)
-            parser.remove_option("-h")
-            parser.add_option("-h", "--human-readable", help="show sizes in human readable format", dest="hrs", action="store_true", default=False)
+                '-l', help='In addition to the name of each file, print the file type, permissions, and  timestamp  (the  modification time, in the local timezone). Times are local.',  # noqa: E501
+                dest='ll', action='store_true', default=False)
+            parser.add_option('-R', help='Recursively list subfolders encountered. /dev and /proc are omitted',
+                              dest='recurse', action='store_true', default=False)
+            parser.remove_option('-h')
+            parser.add_option('-h', '--human-readable', help='show sizes in human readable format', dest='hrs', action='store_true', default=False)
             options, args = parser.parse_args(args)
             if len(args) != 1:
                 parser.print_help()
                 return 1
             print(ls(dev, args[0], recurse=options.recurse, ll=options.ll, human_readable_size=options.hrs, cols=cols), end=' ')
-        elif command == "info":
+        elif command == 'info':
             info(dev)
-        elif command == "cp":
-            usage="usage: %prog cp [options] source destination\nCopy files to/from the device\n\n"+\
-            "One of source or destination must be a path on the device. \n\nDevice paths have the form\n"+\
-            "dev:mountpoint/my/path\n"+\
-            "where mountpoint is one of / or carda: or cardb:/\n\n"+\
-            "source must point to a file for which you have read permissions\n"+\
-            "destination must point to a file or folder for which you have write permissions"
+        elif command == 'cp':
+            usage=('usage: %prog cp [options] source destination\nCopy files to/from the device\n\n'
+                   'One of source or destination must be a path on the device. \n\nDevice paths have the form\n'
+                   'dev:mountpoint/my/path\n'
+                   'where mountpoint is one of / or carda: or cardb:/\n\n'
+                   'source must point to a file for which you have read permissions\n'
+                   'destination must point to a file or folder for which you have write permissions')
             parser = OptionParser(usage=usage)
             parser.add_option('-f', '--force', dest='force', action='store_true', default=False,
                               help='Overwrite the destination file if it exists already.')
@@ -294,15 +294,15 @@ def main():
             if len(args) != 2:
                 parser.print_help()
                 return 1
-            if args[0].startswith("dev:"):
+            if args[0].startswith('dev:'):
                 outfile = args[1]
                 path = args[0][4:]
-                if path.endswith("/"):
+                if path.endswith('/'):
                     path = path[:-1]
                 if os.path.isdir(outfile):
-                    outfile = os.path.join(outfile, path[path.rfind("/")+1:])
+                    outfile = os.path.join(outfile, path[path.rfind('/')+1:])
                 try:
-                    outfile = open(outfile, "wb")
+                    outfile = open(outfile, 'wb')
                 except OSError as e:
                     print(e, file=sys.stderr)
                     parser.print_help()
@@ -310,9 +310,9 @@ def main():
                 dev.get_file(path, outfile)
                 fsync(outfile)
                 outfile.close()
-            elif args[1].startswith("dev:"):
+            elif args[1].startswith('dev:'):
                 try:
-                    infile = open(args[0], "rb")
+                    infile = open(args[0], 'rb')
                 except OSError as e:
                     print(e, file=sys.stderr)
                     parser.print_help()
@@ -322,31 +322,31 @@ def main():
             else:
                 parser.print_help()
                 return 1
-        elif command == "cat":
+        elif command == 'cat':
             outfile = sys.stdout
             parser = OptionParser(
-                usage="usage: %prog cat path\nShow file on the device\n\npath should point to a file on the device and must begin with /,a:/ or b:/")
+                usage='usage: %prog cat path\nShow file on the device\n\npath should point to a file on the device and must begin with /,a:/ or b:/')
             options, args = parser.parse_args(args)
             if len(args) != 1:
                 parser.print_help()
                 return 1
-            if args[0].endswith("/"):
+            if args[0].endswith('/'):
                 path = args[0][:-1]
             else:
                 path = args[0]
             outfile = sys.stdout
             dev.get_file(path, outfile)
-        elif command == "rm":
-            parser = OptionParser(usage="usage: %prog rm path\nDelete files from the device\n\npath should point to a file or empty folder on the device "+
-                                  "and must begin with / or card:/\n\n"+
-                                  "rm will DELETE the file. Be very CAREFUL")
+        elif command == 'rm':
+            parser = OptionParser(usage='usage: %prog rm path\nDelete files from the device\n\npath should point to a file or empty folder on the device '+
+                                  'and must begin with / or card:/\n\n'+
+                                  'rm will DELETE the file. Be very CAREFUL')
             options, args = parser.parse_args(args)
             if len(args) != 1:
                 parser.print_help()
                 return 1
             dev.rm(args[0])
-        elif command == "touch":
-            parser = OptionParser(usage="usage: %prog touch path\nCreate an empty file on the device\n\npath should point to a file on the device and must begin with /,a:/ or b:/\n\n"+  # noqa
+        elif command == 'touch':
+            parser = OptionParser(usage='usage: %prog touch path\nCreate an empty file on the device\n\npath should point to a file on the device and must begin with /,a:/ or b:/\n\n'+  # noqa: E501
             "Unfortunately, I can't figure out how to update file times on the device, so if path already exists, touch does nothing")
             options, args = parser.parse_args(args)
             if len(args) != 1:
@@ -354,7 +354,7 @@ def main():
                 return 1
             dev.touch(args[0])
         elif command == 'test_file':
-            parser = OptionParser(usage=("usage: %prog test_file path\n"
+            parser = OptionParser(usage=('usage: %prog test_file path\n'
                 'Open device, copy file specified by path to device and '
                 'then eject device.'))
             options, args = parser.parse_args(args)
@@ -373,7 +373,7 @@ def main():
                 dev.close()
             return 1
     except DeviceLocked:
-        print("The device is locked. Use the --unlock option", file=sys.stderr)
+        print('The device is locked. Use the --unlock option', file=sys.stderr)
     except (ArgumentError, DeviceError) as e:
         print(e, file=sys.stderr)
         return 1
diff --git a/src/calibre/devices/cybook/driver.py b/src/calibre/devices/cybook/driver.py
index 61ba5c7018..07ef10bb77 100644
--- a/src/calibre/devices/cybook/driver.py
+++ b/src/calibre/devices/cybook/driver.py
@@ -34,7 +34,7 @@ class CYBOOK(USBMS):
 
     VENDOR_NAME = 'BOOKEEN'
     WINDOWS_MAIN_MEM = re.compile(r'CYBOOK_(OPUS|GEN3)__-FD')
-    WINDOWS_CARD_A_MEM = re.compile('CYBOOK_(OPUS|GEN3)__-SD')
+    WINDOWS_CARD_A_MEM = re.compile(r'CYBOOK_(OPUS|GEN3)__-SD')
     OSX_MAIN_MEM_VOL_PAT = re.compile(r'/Cybook')
 
     EBOOK_DIR_MAIN = 'eBooks'
@@ -72,7 +72,7 @@ class ORIZON(CYBOOK):
 
     VENDOR_NAME = ['BOOKEEN', 'LINUX']
     WINDOWS_MAIN_MEM = re.compile(r'(CYBOOK_ORIZON__-FD)|(FILE-STOR_GADGET)')
-    WINDOWS_CARD_A_MEM = re.compile('(CYBOOK_ORIZON__-SD)|(FILE-STOR_GADGET)')
+    WINDOWS_CARD_A_MEM = re.compile(r'(CYBOOK_ORIZON__-SD)|(FILE-STOR_GADGET)')
 
     EBOOK_DIR_MAIN = EBOOK_DIR_CARD_A = 'Digital Editions'
 
diff --git a/src/calibre/devices/cybook/t2b.py b/src/calibre/devices/cybook/t2b.py
index aa33eb7577..22ccbcef3c 100644
--- a/src/calibre/devices/cybook/t2b.py
+++ b/src/calibre/devices/cybook/t2b.py
@@ -8,7 +8,7 @@ import io
 
 from polyglot.builtins import int_to_byte
 
-DEFAULT_T2B_DATA = b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0f\xff\xff\xff\xf0\xff\x0f\xc3\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf8\x00\x00\xff\xff\xff\xf0\xff\x0f\xc3\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xe0\xff\xf0\xff\xff\xff\xf0\xff\xff\xc3\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc3\xff\xff\xff\xff\xff\xf0\xff\xff\xc3\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x07\xff\xff\xfc\x00?\xf0\xff\x0f\xc3\x00?\xf0\xc0\xfe\x00?\xff\xff\xff\xff\xff\xff\xff\x0f\xff\xff\xf0<\x0f\xf0\xff\x0f\xc0,\x0f\xf0\x0e\xf0,\x0f\xff\xff\xff\xff\xff\xff\xff\x0f\xff\xff\xff\xff\xc3\xf0\xff\x0f\xc0\xff\x0f\xf0\xff\xf0\xff\xc7\xff\xff\xff\xff\xff\xff\xff\x0f\xff\xff\xff\xff\xc3\xf0\xff\x0f\xc3\xff\xc3\xf0\xff\xc3\xff\xc3\xff\xff\xff\xff\xff\xff\xff\x0f\xff\xff\xff\x00\x03\xf0\xff\x0f\xc3\xff\xc3\xf0\xff\xc3\xff\xc3\xff\xff\xff\xff\xff\xff\xff\x0f\xff\xff\xf0\x1f\xc3\xf0\xff\x0f\xc3\xff\xc3\xf0\xff\xc0\x00\x03\xff\xff\xff\xff\xff\xff\xff\x0b\xff\xff\xf0\xff\xc3\xf0\xff\x0f\xc3\xff\xc3\xf0\xff\xc3\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc3\xff\xff\xf3\xff\xc3\xf0\xff\x0f\xc3\xff\xc3\xf0\xff\xc3\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc0\xff\xfc\xf0\xff\x03\xf0\xff\x0f\xc0\xff\x0f\xf0\xff\xf0\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf0\x0f\x00\xf08\x03\xf0\xff\x0f\xc0,\x0f\xf0\xff\xf0\x1f\x03\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0f\xfc\x00\xc3\xf0\xff\x0f\xc3\x00?\xf0\xff\xff\x00\x0f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf0\x0f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf0\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x03\xfe\x94\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc0\x00\x00\x00\x0f\xff\xff\xff\xff\xff\xff\xfc\x7f\xfe\x94\xff\xff\xff\xff\xff\xff\xff\xff\xfc\x0f\xff\xfe\xa9@\xff\xff\xff\xff\xff\xff\xfc?\xfe\xa4\xff\xff\xff\xff\xff\xff\xff\xff\xfc\xff\xff\xff\xe9P\xff\xff\xff\xff\xff\xff\xfe/\xfe\xa8\xff\xff\xff\xff\xff\xff\xff\xff\xfc\xff\xff\xff\xf9T\xff\xff\xff\xff\xf0@\x00+\xfa\xa8?\xff\xff\xff\xff\xff\xff\xff\xfc\xbf\xff\xff\xf9T\xff\xff\xff\xff\xcb\xe4}*\xaa\xaa?\xff\xff\xff\xff\xff\xff\xff\xfc\xbf\xff\xff\xe9T\xff\xff\xff\xff\xc7\xe4\xfd\x1a\xaa\xaa?\xff\xff\xff\xff\xff\xff\xff\xfc\xaf\xea\xaa\xa6\xa4\xff@\x00\x0f\xc3\xe8\xfe\x1a\xaa\xaa?\xff\xff\xff\xff\xff\xff\xff\xfcj\x95UZ\xa4\x00\x7f\xfe\x90\x03\xe8\xfe\n\xaa\xaa?\xff\xff\xff\xff\xff\xff\xff\xfcj\x95UZ\xa4?\xff\xff\xa5C\xe8\xfe\x06\xaa\xaa?\xff\xff\xff\xff\xff\xff\xff\xfcj\x95UZ\xa4?\xff\xff\xeaC\xe8\xbe\x06\xaa\xaa\x0f\xff\xff\xff\xff\xff\xff\xff\xfcj\x95UZ\xa4/\xff\xff\xea\x82\xe8j\x06\xaa\xaa\x0f\xff\xff\xff\xff\xff\xff\xff\xfcj\x95UZ\xa4/\xff\xff\xaa\x82\xe8*F\xaa\xaa\x8f\xff\xff\xff\xff\xff\xff\xff\xfcj\x95UZ\xa4+\xff\xfe\xaa\x82\xe8*\x86\xaa\xaa\x8f\xff\xff\x80\xff\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xe8*\x86\xaa\xaa\x8f\xf0\x00T?\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xe8*\x81\xaa\xaa\x8c\x03\xff\x95?\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xe8*\x81\xaa\xaa\x80\xbf\xff\x95?\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xe8*\x81\xaa\xaa\x9b\xff\xff\x95\x0f\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xe8\x1a\x81\xaa\xaa\x9a\xff\xfe\x95\x0f\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xe8\n\x81\xaa\xaa\xa6\xbf\xfeUO\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xa8\n\x91j\xaa\xa5\xaa\xa9ZO\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xa8\n\xa0j\xaa\xa5Z\x95ZO\xff\xff\xff\xfcj\x95UV\xa4*\xfa\xaa\xaa\x82\xa9\n\xa0j\xaa\xa5UUZC\xff\xff\xff\xfcj\x95UV\xa4*\xfa\xaa\xaa\x82\xaa\n\xa0j\xaa\xa4UUZS\xff\xff\xff\xfcZ\x95UV\xa4*\xfa\xaa\xaa\x82\xaa\n\xa0j\xaa\xa4UUZS\xff\xff\xff\xfcZ\x95UU\xa4*\xfa\xaa\xaa\x82\xaa\n\xa0j\xaa\xa8UUVS\xff\xff\xff\xfcZ\x95UU\xa4*\xea\xaa\xaa\x82\xaa\x06\xa0Z\xaa\xa8UUV\x93\xff\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x81\xaa\x02\xa0\x1a\xaa\xa8UUV\x90\xff\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x80\xaa\x02\xa0\x1a\xaa\xa8\x15UU\x94\xff\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x80\xaa"\xa0\x1a\xaa\xa8\x15UU\x94\xff\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x80\xaa2\xa4\x16\xaa\xa8\x15UU\x94\xff\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x80\xaa2\xa8\x16\xa6\xa9\x15UU\x94\xff\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x80\xaa2\xa8\x16\xa6\xa9\x05UUT?\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x84\xaa2\xa8\x16\xaa\xaa\x05UUU?\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x88\xaa2\xa8\x06\xaa\xaa\x05UUU?\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa1\xa8\xc5\xaa\xaa\x05UUU?\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa0\xa8E\xa9\xaa\x05UUU/\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa<\xa8\x05\xa9\xaaAUUU\x0f\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa<\xa8\x05\xa9\xaaAUUUO\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa<\xa9\x05\xaa\xaaAUUUO\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x1c\xaa\x01\xaa\xaa\x81UUUO\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x0c\xaa\x01\xaa\xaa\x81UUUO\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x0c\xaa1j\xaa\x80UUUC\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x0cj1jj\x90UUUS\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x0c*1jj\x90UUUS\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaaL*1jj\xa0UUUS\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x8f* j\xaa\xa0\x15UUS\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x8f*@j\xaa\xa0\x15UUP\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x8f*\x8cZ\xaa\xa1\x15UUT\xff\xff\xfcZ\x95UU\xa4j\xaa\xaa\xaa\x8c\xaa\x8f*\x8cZ\x9a\xa0\x15UUT\xff\xff\xfcZ\x95UU\xa4j\xaa\xaa\xaa\x8c\xaa\x8f*\x8cZ\x9a\xa0\x15UUT\xff\xff\xfcZ\x95UU\xa4j\xaa\xaa\xaa\x8c\xaa\x8f\x1a\x8cZ\x9a\xa4\x15UUT?\xff\xfcZ\x95UU\x94j\xaa\xaa\xaa\x8cj\x8f\n\x8cVj\xa4\x05UU\xa4?\xff\xfcVUUU\xa4j\xaa\xaa\xaa\x8cj\x8fJ\x8c\x16\xaa\xa8\xc5UZ\xa5?\xff\xfcUUUV\xa4j\xaa\xaa\xaa\x8cj\x8f\xca\x8f\x16\xaa\xa8\xc5V\xaa\xa5?\xff\xfcUj\xaa\xaa\xa4j\xaa\xaa\xaa\x8cj\x8f\xca\x8f\x1a\xaa\xa8\x05Z\xaaU?\xff\xfcV\xaa\xaa\xaa\xa5j\xaa\xaa\xaa\x8e*\x8f\xca\x83\x1a\xaa\xa4\x01eUU?\xff\xfcZ\xaa\xaa\xaa\xa5j\xaa\xaa\xaa\x8f*\x8f\xca\x83\x1a\xa5U\x01U\x00\x00\x0f\xff\xfcUUUUUZ\xaa\xaa\xaaO%\x8f\xc6\x93\x15\x00\x001@\x0f\xff\xff\xff\xfcP\x00\x00\x00\x15\x00\x00\x00\x00\x0f\x00\x07\xc0\x03\x00\xff\xff0\x1f\xff\xff\xff\xff\xfc\x00\xff\xff\xf8\x00?\xff\xff\xff\x0f?\xc7\xc3\xf7\x0f\xff\xff\xf1\xff\xff\xff\xff\xff\xfc\xff\xff\xff\xff\xf4\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'  # noqa
+DEFAULT_T2B_DATA = b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0f\xff\xff\xff\xf0\xff\x0f\xc3\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf8\x00\x00\xff\xff\xff\xf0\xff\x0f\xc3\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xe0\xff\xf0\xff\xff\xff\xf0\xff\xff\xc3\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc3\xff\xff\xff\xff\xff\xf0\xff\xff\xc3\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x07\xff\xff\xfc\x00?\xf0\xff\x0f\xc3\x00?\xf0\xc0\xfe\x00?\xff\xff\xff\xff\xff\xff\xff\x0f\xff\xff\xf0<\x0f\xf0\xff\x0f\xc0,\x0f\xf0\x0e\xf0,\x0f\xff\xff\xff\xff\xff\xff\xff\x0f\xff\xff\xff\xff\xc3\xf0\xff\x0f\xc0\xff\x0f\xf0\xff\xf0\xff\xc7\xff\xff\xff\xff\xff\xff\xff\x0f\xff\xff\xff\xff\xc3\xf0\xff\x0f\xc3\xff\xc3\xf0\xff\xc3\xff\xc3\xff\xff\xff\xff\xff\xff\xff\x0f\xff\xff\xff\x00\x03\xf0\xff\x0f\xc3\xff\xc3\xf0\xff\xc3\xff\xc3\xff\xff\xff\xff\xff\xff\xff\x0f\xff\xff\xf0\x1f\xc3\xf0\xff\x0f\xc3\xff\xc3\xf0\xff\xc0\x00\x03\xff\xff\xff\xff\xff\xff\xff\x0b\xff\xff\xf0\xff\xc3\xf0\xff\x0f\xc3\xff\xc3\xf0\xff\xc3\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc3\xff\xff\xf3\xff\xc3\xf0\xff\x0f\xc3\xff\xc3\xf0\xff\xc3\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc0\xff\xfc\xf0\xff\x03\xf0\xff\x0f\xc0\xff\x0f\xf0\xff\xf0\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf0\x0f\x00\xf08\x03\xf0\xff\x0f\xc0,\x0f\xf0\xff\xf0\x1f\x03\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0f\xfc\x00\xc3\xf0\xff\x0f\xc3\x00?\xf0\xff\xff\x00\x0f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf0\x0f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf0\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x03\xfe\x94\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc0\x00\x00\x00\x0f\xff\xff\xff\xff\xff\xff\xfc\x7f\xfe\x94\xff\xff\xff\xff\xff\xff\xff\xff\xfc\x0f\xff\xfe\xa9@\xff\xff\xff\xff\xff\xff\xfc?\xfe\xa4\xff\xff\xff\xff\xff\xff\xff\xff\xfc\xff\xff\xff\xe9P\xff\xff\xff\xff\xff\xff\xfe/\xfe\xa8\xff\xff\xff\xff\xff\xff\xff\xff\xfc\xff\xff\xff\xf9T\xff\xff\xff\xff\xf0@\x00+\xfa\xa8?\xff\xff\xff\xff\xff\xff\xff\xfc\xbf\xff\xff\xf9T\xff\xff\xff\xff\xcb\xe4}*\xaa\xaa?\xff\xff\xff\xff\xff\xff\xff\xfc\xbf\xff\xff\xe9T\xff\xff\xff\xff\xc7\xe4\xfd\x1a\xaa\xaa?\xff\xff\xff\xff\xff\xff\xff\xfc\xaf\xea\xaa\xa6\xa4\xff@\x00\x0f\xc3\xe8\xfe\x1a\xaa\xaa?\xff\xff\xff\xff\xff\xff\xff\xfcj\x95UZ\xa4\x00\x7f\xfe\x90\x03\xe8\xfe\n\xaa\xaa?\xff\xff\xff\xff\xff\xff\xff\xfcj\x95UZ\xa4?\xff\xff\xa5C\xe8\xfe\x06\xaa\xaa?\xff\xff\xff\xff\xff\xff\xff\xfcj\x95UZ\xa4?\xff\xff\xeaC\xe8\xbe\x06\xaa\xaa\x0f\xff\xff\xff\xff\xff\xff\xff\xfcj\x95UZ\xa4/\xff\xff\xea\x82\xe8j\x06\xaa\xaa\x0f\xff\xff\xff\xff\xff\xff\xff\xfcj\x95UZ\xa4/\xff\xff\xaa\x82\xe8*F\xaa\xaa\x8f\xff\xff\xff\xff\xff\xff\xff\xfcj\x95UZ\xa4+\xff\xfe\xaa\x82\xe8*\x86\xaa\xaa\x8f\xff\xff\x80\xff\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xe8*\x86\xaa\xaa\x8f\xf0\x00T?\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xe8*\x81\xaa\xaa\x8c\x03\xff\x95?\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xe8*\x81\xaa\xaa\x80\xbf\xff\x95?\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xe8*\x81\xaa\xaa\x9b\xff\xff\x95\x0f\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xe8\x1a\x81\xaa\xaa\x9a\xff\xfe\x95\x0f\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xe8\n\x81\xaa\xaa\xa6\xbf\xfeUO\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xa8\n\x91j\xaa\xa5\xaa\xa9ZO\xff\xff\xff\xfcj\x95UV\xa4\x1a\xfa\xaa\xaa\x82\xa8\n\xa0j\xaa\xa5Z\x95ZO\xff\xff\xff\xfcj\x95UV\xa4*\xfa\xaa\xaa\x82\xa9\n\xa0j\xaa\xa5UUZC\xff\xff\xff\xfcj\x95UV\xa4*\xfa\xaa\xaa\x82\xaa\n\xa0j\xaa\xa4UUZS\xff\xff\xff\xfcZ\x95UV\xa4*\xfa\xaa\xaa\x82\xaa\n\xa0j\xaa\xa4UUZS\xff\xff\xff\xfcZ\x95UU\xa4*\xfa\xaa\xaa\x82\xaa\n\xa0j\xaa\xa8UUVS\xff\xff\xff\xfcZ\x95UU\xa4*\xea\xaa\xaa\x82\xaa\x06\xa0Z\xaa\xa8UUV\x93\xff\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x81\xaa\x02\xa0\x1a\xaa\xa8UUV\x90\xff\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x80\xaa\x02\xa0\x1a\xaa\xa8\x15UU\x94\xff\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x80\xaa"\xa0\x1a\xaa\xa8\x15UU\x94\xff\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x80\xaa2\xa4\x16\xaa\xa8\x15UU\x94\xff\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x80\xaa2\xa8\x16\xa6\xa9\x15UU\x94\xff\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x80\xaa2\xa8\x16\xa6\xa9\x05UUT?\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x84\xaa2\xa8\x16\xaa\xaa\x05UUU?\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x88\xaa2\xa8\x06\xaa\xaa\x05UUU?\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa1\xa8\xc5\xaa\xaa\x05UUU?\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa0\xa8E\xa9\xaa\x05UUU/\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa<\xa8\x05\xa9\xaaAUUU\x0f\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa<\xa8\x05\xa9\xaaAUUUO\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa<\xa9\x05\xaa\xaaAUUUO\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x1c\xaa\x01\xaa\xaa\x81UUUO\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x0c\xaa\x01\xaa\xaa\x81UUUO\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x0c\xaa1j\xaa\x80UUUC\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x0cj1jj\x90UUUS\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x0c*1jj\x90UUUS\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaaL*1jj\xa0UUUS\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x8f* j\xaa\xa0\x15UUS\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x8f*@j\xaa\xa0\x15UUP\xff\xff\xfcZ\x95UU\xa4*\xaa\xaa\xaa\x8c\xaa\x8f*\x8cZ\xaa\xa1\x15UUT\xff\xff\xfcZ\x95UU\xa4j\xaa\xaa\xaa\x8c\xaa\x8f*\x8cZ\x9a\xa0\x15UUT\xff\xff\xfcZ\x95UU\xa4j\xaa\xaa\xaa\x8c\xaa\x8f*\x8cZ\x9a\xa0\x15UUT\xff\xff\xfcZ\x95UU\xa4j\xaa\xaa\xaa\x8c\xaa\x8f\x1a\x8cZ\x9a\xa4\x15UUT?\xff\xfcZ\x95UU\x94j\xaa\xaa\xaa\x8cj\x8f\n\x8cVj\xa4\x05UU\xa4?\xff\xfcVUUU\xa4j\xaa\xaa\xaa\x8cj\x8fJ\x8c\x16\xaa\xa8\xc5UZ\xa5?\xff\xfcUUUV\xa4j\xaa\xaa\xaa\x8cj\x8f\xca\x8f\x16\xaa\xa8\xc5V\xaa\xa5?\xff\xfcUj\xaa\xaa\xa4j\xaa\xaa\xaa\x8cj\x8f\xca\x8f\x1a\xaa\xa8\x05Z\xaaU?\xff\xfcV\xaa\xaa\xaa\xa5j\xaa\xaa\xaa\x8e*\x8f\xca\x83\x1a\xaa\xa4\x01eUU?\xff\xfcZ\xaa\xaa\xaa\xa5j\xaa\xaa\xaa\x8f*\x8f\xca\x83\x1a\xa5U\x01U\x00\x00\x0f\xff\xfcUUUUUZ\xaa\xaa\xaaO%\x8f\xc6\x93\x15\x00\x001@\x0f\xff\xff\xff\xfcP\x00\x00\x00\x15\x00\x00\x00\x00\x0f\x00\x07\xc0\x03\x00\xff\xff0\x1f\xff\xff\xff\xff\xfc\x00\xff\xff\xf8\x00?\xff\xff\xff\x0f?\xc7\xc3\xf7\x0f\xff\xff\xf1\xff\xff\xff\xff\xff\xfc\xff\xff\xff\xff\xf4\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'  # noqa: E501
 
 
 def reduce_color(c):
@@ -23,7 +23,7 @@ def reduce_color(c):
 
 
 def i2b(n):
-    return "".join([str((n >> y) & 1) for y in range(1, -1, -1)])
+    return ''.join([str((n >> y) & 1) for y in range(1, -1, -1)])
 
 
 def write_t2b(t2bfile, coverdata=None):
@@ -34,7 +34,7 @@ def write_t2b(t2bfile, coverdata=None):
     from PIL import Image
     if coverdata is not None:
         coverdata = io.BytesIO(coverdata)
-        cover = Image.open(coverdata).convert("L")
+        cover = Image.open(coverdata).convert('L')
         cover.thumbnail((96, 144), Image.Resampling.LANCZOS)
         t2bcover = Image.new('L', (96, 144), 'white')
 
diff --git a/src/calibre/devices/cybook/t4b.py b/src/calibre/devices/cybook/t4b.py
index bc9fc5a108..da5c9e51f9 100644
--- a/src/calibre/devices/cybook/t4b.py
+++ b/src/calibre/devices/cybook/t4b.py
@@ -6,7 +6,7 @@ Write a t4b file to disk.
 
 from io import BytesIO
 
-DEFAULT_T4B_DATA = b'\x74\x34\x62\x70\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc4\x00\x16\xdf\xff\xff\xf7\x6d\xff\xff\xfd\x7a\xff\xff\xff\xe7\x77\x76\xff\xf6\x77\x77\x8d\xff\xff\xe7\x77\x78\xbf\xff\xff\xf7\x77\x77\x77\x7d\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xe4\x03\x78\x61\x07\xff\xff\x90\x04\xff\xff\xfc\x05\xff\xff\xff\xd5\x30\x35\xff\xf0\x13\x32\x00\x5f\xff\xd0\x03\x32\x01\xbf\xff\xe0\x00\x00\x00\x0b\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x50\x8f\xff\xff\x75\xff\xff\x40\x30\xef\xff\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x6f\xff\xf5\x0d\xff\xd0\x4f\xff\xd0\x0f\xff\xe0\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfd\x05\xff\xff\xff\xfe\xff\xfe\x03\xa0\x8f\xff\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x6f\xff\xfb\x0b\xff\xd0\x4f\xff\xf7\x0d\xff\xe0\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf6\x0e\xff\xff\xff\xff\xff\xfa\x0b\xe0\x3f\xff\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x6f\xff\xf5\x0e\xff\xd0\x4f\xff\xf8\x0e\xff\xe0\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf1\x1f\xff\xff\xff\xff\xff\xf2\x0f\xf3\x0d\xff\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x39\x88\x30\xaf\xff\xd0\x4f\xff\xf2\x1f\xff\xe0\x18\x88\x88\x8d\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf0\x3f\xff\xff\xff\xff\xff\xd0\x6f\xfc\x09\xff\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x01\x11\x00\x2c\xff\xd0\x3a\xa8\x20\xcf\xff\xe0\x00\x00\x00\x0b\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf0\x2f\xff\xff\xff\xff\xff\x60\xaf\xff\x11\xff\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x6f\xff\xfd\x10\xef\xd0\x00\x00\x1e\xff\xff\xe0\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf2\x0f\xff\xff\xff\xff\xfe\x20\x12\x22\x00\xcf\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x6f\xff\xff\x90\x9f\xd0\x3d\xd8\x09\xff\xff\xe0\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf8\x0b\xff\xff\xff\xff\xfc\x03\x88\x88\x60\x4f\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x6f\xff\xff\xa0\x8f\xd0\x4f\xff\x40\xcf\xff\xe0\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\xef\xff\xff\xfb\xf7\x0d\xff\xff\xf1\x1e\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x6f\xff\xff\x60\xcf\xd0\x4f\xff\xf3\x0d\xff\xe0\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x80\x2c\xff\xfa\x05\xf0\x2f\xff\xff\xf6\x0b\xfc\x03\x88\x88\x88\xff\xb0\xaf\xff\xf0\x5d\xcc\xa3\x05\xff\xd0\x4f\xff\xfe\x11\xef\xe0\x18\x88\x88\x8d\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf8\x10\x01\x00\x3b\xb0\x9f\xff\xff\xfd\x06\xfc\x00\x00\x00\x00\xd0\x00\x00\xff\xf0\x00\x00\x02\x7f\xff\xe1\x5f\xff\xff\xc0\x5f\xe1\x00\x00\x00\x0b\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xed\xa9\xbd\xff\xed\xff\xff\xff\xff\xde\xff\xdd\xdd\xdd\xdd\xfd\xdd\xdd\xff\xfd\xdd\xdd\xee\xff\xff\xfd\xef\xff\xff\xfe\xdf\xfd\xdd\xdd\xdd\xdf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xed\xdb\x86\x8e\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xb7\x42\x00\x00\x0b\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfd\x00\x00\x00\x00\x09\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfd\x00\x00\x01\x11\x17\xef\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xee\xee\xee\xee\xee\xee\xee\xee\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\x22\x45\x78\x9b\x95\xef\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xb8\x77\x78\x88\x88\x88\x87\x87\x89\xdf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\x57\x9a\xaa\xaa\x94\xdf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\x00\x00\x11\x11\x22\x12\x11\x11\x10\x7e\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x76\xaa\xaa\xab\xa4\xcf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x33\x33\x33\x33\x32\x21\x6e\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xa5\xaa\xa9\x99\xa5\xaf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x33\x44\x44\x44\x33\x21\x6d\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xb4\xaa\xa9\xa9\xb6\x8f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x23\x34\x44\x54\x55\x44\x44\x31\x6d\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc5\x9a\x99\x9a\xb8\x7e\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x23\x34\x44\x44\x55\x45\x44\x31\x6d\xff\xff\xff\xff\xff\xff\xff\xff\xee\xdd\xdd\xee\xee\xc5\x9a\x88\x8a\xa9\x6e\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x44\x44\x44\x44\x44\x31\x6d\xff\xff\xff\xff\xff\xff\xff\xfe\xdc\xbb\xab\xcc\xca\x84\x8a\xa9\x99\xaa\x5d\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x44\x44\x44\x44\x44\x31\x6d\xff\xff\xff\xff\xff\xff\xff\xed\xa9\x99\x78\x87\x78\x84\x7a\xaa\x89\x9a\x6c\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x23\x34\x44\x45\x55\x55\x44\x31\x6d\xff\xff\xff\xff\xff\xff\xff\xec\x98\x88\x76\x98\x88\x74\x7a\xaa\xa7\x9a\x6b\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x23\x33\x34\x44\x54\x44\x44\x31\x6d\xff\xff\xff\xff\xff\xff\xff\xdb\x98\x88\x76\x98\x88\x74\x5a\xaa\x89\x9b\x7a\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x44\x45\x55\x54\x43\x31\x6d\xff\xff\xff\xff\xff\xff\xfe\xdb\x98\x88\x76\x98\x88\x84\x4a\xaa\x97\xbb\x79\xef\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x34\x44\x44\x44\x44\x31\x5b\xcc\xcc\xcc\xcc\xcc\xcc\xcb\xba\x98\x88\x76\x88\x88\x85\x39\xa9\x8a\xab\x97\xef\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x33\x34\x44\x44\x43\x31\x34\x44\x44\x55\x55\x55\x55\x44\x46\x98\x88\x76\x78\x88\x85\x28\xa8\x9a\xab\xa5\xef\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf9\x00\x11\x11\x11\x12\x22\x22\x11\x10\x00\x01\x22\x23\x33\x33\x33\x31\x11\x88\x88\x76\x68\x88\x85\x27\xa9\xa9\xab\xa5\xdf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x33\x33\x44\x43\x33\x21\x00\x12\x33\x44\x55\x55\x65\x42\x11\x78\x88\x76\x68\x88\x85\x36\xaa\xaa\xab\xb5\xcf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x34\x44\x54\x44\x44\x21\x01\x23\x44\x55\x66\x66\x66\x53\x21\x78\x88\x86\x68\x88\x85\x45\xaa\xaa\xbb\xb6\xaf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x34\x44\x44\x44\x33\x21\x01\x23\x45\x56\x67\x77\x77\x54\x21\x78\x88\x86\x68\x88\x85\x54\xaa\xab\xbb\xb7\x8f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x44\x44\x44\x44\x43\x21\x01\x23\x57\x8a\xaa\xaa\x99\x74\x21\x79\x88\x86\x68\x88\x75\x44\x9a\xab\xbb\xb9\x6e\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x34\x44\x44\x55\x43\x21\x01\x24\x56\x78\x89\x99\x88\x74\x21\x69\x88\x87\x68\x88\x75\x53\x9a\xab\xbb\xba\x5e\xff\xff\xff\xff\xff\xed\xa7\x9e\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x44\x34\x44\x54\x44\x21\x01\x23\x45\x56\x67\x77\x77\x64\x21\x69\x88\x87\x68\x88\x65\x53\x8a\xaa\xaa\xba\x5d\xff\xff\xff\xed\xb9\x75\x54\x5b\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x84\x66\x48\x54\x43\x21\x01\x23\x45\x56\x67\x77\x76\x64\x21\x6a\x88\x87\x68\x88\x66\x54\x7a\xaa\x9a\xbb\x6b\xff\xee\xb9\x66\x66\x78\x75\x69\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x64\x54\x47\x54\x43\x21\x01\x23\x45\x66\x77\x67\x67\x64\x21\x6a\x88\x87\x68\x88\x76\x54\x6a\xbb\xba\xbb\x79\xca\x75\x56\x77\x88\x88\x85\x68\xef\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x23\x33\xba\xba\xac\x44\x43\x21\x01\x23\x45\x56\x66\x66\x76\x64\x21\x6a\x88\x87\x67\x88\x66\x54\x5a\xbb\xa9\xbb\x83\x45\x67\x78\x64\x78\x88\x86\x66\xdf\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x87\x77\x79\x54\x43\x21\x01\x23\x45\x56\x66\x67\x77\x54\x21\x6a\x88\x87\x67\x88\x66\x54\x4a\xbb\xab\xbb\x93\x47\x88\x88\x66\x38\x88\x98\x66\xbf\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x44\x44\x44\x54\x44\x21\x01\x23\x45\x56\x66\x67\x77\x64\x21\x6a\x88\x88\x66\x98\x66\x55\x3a\xab\xba\xab\xa4\x47\x88\x87\x68\x43\x89\x99\x57\x8f\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x32\x34\x3a\x44\x43\x21\x01\x23\x45\x56\x66\x67\x66\x64\x31\x69\x88\x88\x65\x98\x66\x55\x39\xbb\xba\xbc\xa4\x47\x88\x87\x77\x85\x37\xaa\x78\x7e\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\xad\x76\xc5\x44\x33\x21\x01\x23\x44\x56\x66\x77\x76\x54\x21\x69\x98\x88\x65\x98\x66\x65\x38\xbb\xb9\xbb\xb5\x46\x77\x86\x68\x87\x78\x9a\x87\x7c\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x84\x7b\x44\x44\x33\x21\x01\x23\x44\x56\x67\x76\x76\x63\x21\x79\x98\x88\x76\x87\x66\x65\x46\xaa\x99\xab\xb5\x45\x88\x76\x67\x77\x78\x9a\x96\x8a\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x63\x54\x46\x54\x43\x21\x01\x23\x44\x55\x66\x67\x76\x64\x21\x79\x98\x88\x76\x77\x66\x65\x44\xab\xbb\xaa\xb7\x35\x88\x87\x77\x89\x99\x9a\x96\x89\xef\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\xbb\xba\xbc\x44\x43\x21\x01\x23\x44\x56\x67\x66\x76\x63\x21\x79\x98\x88\x76\x68\x66\x65\x53\xab\xba\xaa\xb8\x35\x78\x88\x89\x99\x99\x9a\xa7\x88\xef\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x54\x44\x45\x44\x34\x21\x01\x23\x44\x56\x66\x86\x66\x54\x21\x79\x98\x88\x76\x68\x66\x65\x63\x9a\xba\xab\xb9\x35\x68\x88\x99\x99\x9a\x9a\xa8\x77\xcf\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x33\x43\x43\x44\x43\x21\x01\x23\x44\x55\x66\x76\x66\x54\x21\x7a\x98\x88\x76\x68\x66\x65\x63\x8a\xab\xa9\xba\x35\x58\x88\x99\x99\x99\x9a\xa9\x67\xaf\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x69\x2a\xd9\x34\x33\x21\x01\x23\x44\x55\x67\x67\x66\x53\x21\x7a\x98\x88\x76\x67\x66\x66\x54\x7a\xa9\x9a\xbb\x44\x48\x99\x99\x89\x99\xaa\xaa\x68\x8e\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x97\x98\x47\x44\x34\x21\x01\x23\x44\x56\x66\x76\x66\x53\x21\x7a\x98\x88\x76\x67\x66\x66\x55\x6a\xbb\x9a\xbb\x54\x57\x99\x98\x79\x9a\xaa\xaa\x87\x7d\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x53\x44\x36\x54\x44\x21\x00\x23\x44\x55\x66\x66\x66\x53\x21\x7a\x98\x87\x76\x67\x66\x66\x55\x5a\xaa\xaa\xbb\x73\x66\x99\x66\x59\x77\xaa\xaa\x97\x8b\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\xcc\xcc\xcd\x44\x33\x21\x01\x23\x34\x55\x66\x66\x66\x53\x21\x7b\x98\x88\x76\x66\x66\x66\x65\x4a\xaa\xab\xab\x83\x66\x88\x55\x48\x84\x5a\xaa\xa6\x89\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x44\x34\x45\x44\x33\x21\x01\x23\x44\x55\x56\x66\x66\x53\x21\x7b\x98\x88\x76\x66\x66\x66\x56\x49\x9a\xaa\x9b\x94\x55\x88\x66\x78\x86\x98\xaa\xa7\x88\xef\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x33\x33\x44\x44\x33\x21\x00\x22\x34\x55\x66\x66\x66\x53\x21\x8b\xa7\x88\x86\x66\x66\x66\x56\x38\xa7\x99\xaa\x95\x56\x79\x99\x97\x76\x96\xaa\xa8\x88\xdf\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x76\x77\x78\x44\x33\x21\x01\x22\x34\x45\x54\x66\x66\x53\x21\x8b\xa7\x78\x86\x56\x66\x66\x55\x48\xaa\xaa\xaa\xa5\x56\x69\x99\x99\x85\x79\x7a\xa9\x68\xbf\xff\xff\xff\xff\xff\xff\xfa\x11\x12\x33\xaa\xaa\xab\x34\x33\x21\x00\x23\x34\x45\x6b\x66\x66\x53\x21\x8b\xa8\x78\x76\x56\x76\x66\x65\x47\xaa\xa9\x9a\xa6\x66\x59\x99\x99\xa6\x6a\x6a\xaa\x68\x9f\xff\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x43\x33\x33\x34\x33\x21\x00\x22\x34\x45\x68\x86\x66\x53\x21\x8c\xa8\x77\x76\x56\x76\x66\x66\x45\xaa\xa9\xab\xb6\x85\x58\x99\x99\x99\x6a\x69\xaa\x67\x7e\xff\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x33\x34\x49\x75\x33\x21\x00\x22\x34\x45\x66\x66\x65\x53\x21\x8c\xa8\x77\x66\x55\x76\x66\x66\x54\xa9\x99\x9b\xa7\x76\x66\x99\x99\xa6\x69\x88\xaa\x87\x6c\xff\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x33\x33\x37\x34\x33\x21\x00\x12\x34\x45\x59\x86\x66\x53\x21\x8c\xb9\x77\x66\x55\x76\x66\x65\x63\x9a\xaa\xba\xb8\x67\x66\x99\x99\x97\x68\x96\xaa\xa6\x7a\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x23\x54\x44\x46\x44\x43\x21\x00\x22\x34\x58\x59\xa5\x65\x53\x21\x8c\xb9\x77\x76\x56\x76\x66\x65\x63\x8a\xaa\xaa\xb9\x58\x65\x89\x99\x99\x86\xa3\xaa\xa6\x88\xef\xff\xff\xff\xff\xff\xfa\x11\x12\x23\xab\xbb\xbc\x33\x33\x21\x00\x12\x34\x46\x66\x66\x55\x43\x21\x8c\xb9\x77\x76\x56\x76\x66\x65\x64\x7a\xaa\x9a\xba\x49\x66\x89\x99\x99\x95\xa4\x5a\xa7\x87\xdf\xff\xff\xff\xff\xff\xfa\x11\x12\x22\x42\x33\x35\x44\x33\x21\x00\x12\x34\x48\x86\x85\x55\x43\x21\x8c\xb9\x67\x77\x56\x67\x66\x66\x65\x6a\xaa\x9a\xba\x4a\x67\x79\x99\x86\x76\x86\x27\xa8\x67\xcf\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x33\x33\x35\x33\x33\x21\x00\x12\x33\x54\x88\x56\x65\x43\x21\x8d\xba\x66\x77\x56\x57\x66\x66\x65\x5a\xab\xaa\xbb\x59\x76\x59\x99\x99\x97\x98\x24\xa9\x67\xaf\xff\xff\xff\xff\xff\xfa\x11\x12\x22\x21\x36\x9b\x33\x33\x21\x00\x12\x34\x45\x56\x76\x55\x43\x21\x8d\xca\x76\x77\x66\x57\x66\x65\x65\x5a\xaa\x9a\xbb\x78\x96\x58\x99\x99\x88\x9a\x44\xa9\x67\x8e\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x6a\xb7\x44\x43\x33\x21\x00\x12\x34\x44\x55\x85\x55\x43\x21\x8d\xca\x77\x67\x66\x67\x66\x66\x66\x49\xaa\xaa\xab\x87\xc5\x57\x98\x98\x87\x68\x85\x99\x76\x6d\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x96\x33\x43\x33\x33\x21\x00\x12\x33\x44\x65\x55\x55\x43\x21\x8d\xca\x87\x76\x66\x67\x66\x66\x56\x59\xa9\x99\xab\x96\xc6\x65\x98\x89\x99\x68\x98\x99\x86\x6b\xff\xff\xff\xff\xff\xfa\x11\x12\x22\x44\x75\x23\x33\x33\x21\x00\x12\x33\x44\x6a\x65\x55\x43\x21\x8d\xca\x87\x76\x66\x67\x66\x66\x66\x58\xa8\x9a\x9b\xa5\xc9\x65\x88\x89\x99\x77\x98\x99\x95\x68\xff\xff\xff\xff\xff\xfa\x11\x12\x22\x22\x24\x79\x33\x33\x21\x00\x12\x34\x44\x56\x75\x55\x43\x21\x8d\xda\x87\x77\x66\x67\x66\x66\x66\x47\xa9\x9a\xbb\xa6\xcb\x65\x78\x88\x88\x85\x68\x99\x96\x66\xef\xff\xff\xff\xff\xfa\x11\x12\x23\x11\x33\x34\x33\x32\x21\x00\x12\x33\x44\x57\x65\x55\x43\x21\x8d\xda\x87\x77\x65\x76\x76\x66\x67\x56\xaa\xbb\xaa\xa6\xbc\x66\x68\x88\x88\x85\x88\x89\x97\x66\xcf\xff\xff\xff\xff\xfa\x11\x12\x23\x95\x23\x36\x33\x33\x21\x00\x12\x33\x44\x58\x65\x55\x43\x21\x8d\xda\x96\x77\x65\x77\x66\x66\x57\x55\xaa\xaa\xaa\xb6\xad\x66\x58\x88\x88\x85\x78\x88\x98\x66\xaf\xff\xff\xff\xff\xfa\x11\x12\x22\x52\x33\x35\x33\x33\x21\x00\x12\x33\x44\x55\x65\x55\x42\x21\x8e\xdb\x97\x67\x75\x77\x66\x66\x56\x64\xaa\xbb\xaa\xa7\x8e\x85\x58\x87\x88\x87\x88\x88\x88\x56\x8f\xff\xff\xff\xff\xfa\x11\x12\x22\x42\x23\x35\x43\x32\x21\x00\x12\x33\x44\x48\x85\x55\x43\x21\x8e\xdb\x97\x67\x75\x77\x66\x66\x66\x73\x9b\xaa\xaa\xb8\x6e\xb4\x57\x87\x87\x77\x78\x88\x88\x56\x7e\xff\xff\xff\xff\xfa\x11\x12\x22\x42\x33\x28\x33\x32\x21\x00\x12\x33\x44\x55\x55\x55\x43\x21\x8e\xdb\x97\x76\x76\x67\x76\x66\x66\x74\x8a\xba\xaa\xb9\x5d\xd5\x55\x77\x77\x77\x47\x88\x88\x65\x5d\xff\xff\xff\xff\xfa\x10\x12\x22\x63\x11\x78\x33\x32\x20\x00\x12\x33\x34\x47\x84\x55\x42\x21\x8e\xec\x97\x77\x66\x67\x87\x76\x66\x74\x7a\xaa\xaa\xba\x4d\xe7\x54\x77\x77\x77\x56\x87\x88\x74\x5a\xff\xff\xff\xff\xfa\x11\x12\x22\x28\x9a\x83\x33\x32\x20\x00\x12\x33\x44\x55\x55\x55\x42\x21\x9e\xec\x97\x77\x66\x67\x76\x66\x66\x76\x6a\xaa\x99\xba\x4b\xfa\x54\x67\x77\x77\x65\x77\x77\x84\x57\xef\xff\xff\xff\xfa\x11\x12\x22\x22\x33\x33\x33\x22\x10\x00\x12\x33\x33\x56\x45\x54\x42\x11\x9e\xec\x97\x77\x75\x67\x76\x66\x65\x67\x5a\xaa\x99\xba\x59\xfc\x54\x57\x77\x76\x65\x77\x77\x75\x55\xdf\xff\xff\xff\xfa\x11\x12\x22\x22\x33\x33\x33\x22\x20\x00\x12\x33\x35\x45\x65\x54\x42\x21\x9e\xec\xa7\x77\x76\x67\x86\x66\x65\x68\x4a\xa9\x8a\xbb\x77\xfd\x65\x56\x76\x76\x64\x67\x77\x76\x55\xbf\xff\xff\xff\xfa\x11\x12\x22\x22\x32\x33\x23\x22\x20\x00\x12\x23\x45\x55\x54\x44\x42\x11\x9e\xec\xa7\x67\x76\x68\x77\x66\x66\x68\x4a\xb9\x88\xaa\x96\xef\x75\x46\x66\x66\x65\x45\x77\x77\x45\x9f\xff\xff\xff\xfa\x10\x12\x22\x22\x22\x33\x32\x22\x20\x00\x12\x23\x33\x44\x54\x54\x42\x21\x8e\xed\xa8\x76\x76\x58\x77\x66\x66\x67\x59\xba\xa8\xa9\xa5\xef\x94\x46\x66\x66\x66\x46\x67\x77\x45\x7e\xff\xff\xff\xfa\x11\x12\x22\x22\x33\x33\x23\x32\x21\x00\x12\x23\x34\x54\x44\x44\x42\x11\x8e\xfd\xb8\x76\x67\x67\x68\x77\x66\x67\x68\xaa\xa9\x7b\xa5\xcf\xc3\x45\x66\x66\x66\x67\x66\x67\x55\x5d\xff\xff\xff\xf9\x00\x00\x11\x11\x11\x11\x11\x11\x10\x00\x12\x23\x34\x34\x44\x44\x42\x11\x8e\xfd\xb8\x77\x66\x67\x77\x66\x66\x67\x77\xaa\xa8\xa9\xb6\xbf\xe5\x44\x66\x66\x66\x66\x66\x67\x54\x4b\xff\xff\xff\xf9\x00\x01\x11\x11\x11\x11\x11\x11\x10\x00\x12\x23\x33\x44\x44\x44\x32\x11\x8e\xfd\xb8\x77\x76\x67\x77\x66\x66\x57\x76\xba\xa8\x7a\xb6\xaf\xf8\x43\x66\x66\x66\x66\x66\x66\x63\x48\xff\xff\xff\xfa\x10\x11\x22\x22\x22\x22\x32\x22\x10\x00\x12\x23\x34\x44\x44\x44\x32\x11\x8e\xfd\xb9\x77\x76\x57\x87\x66\x66\x66\x85\xbb\xa8\x8b\xa7\x9f\xfb\x43\x56\x66\x66\x66\x66\x66\x64\x45\xef\xff\xff\xfa\x10\x12\x22\x22\x22\x32\x22\x22\x10\x00\x12\x23\x33\x44\x44\x44\x32\x11\x8e\xfe\xb9\x67\x77\x57\x87\x76\x66\x66\x84\xab\x89\xaa\xb8\x8e\xfd\x54\x46\x66\x55\x55\x55\x66\x65\x43\xdf\xff\xff\xfa\x10\x12\x22\x22\x22\x32\x22\x22\x20\x00\x12\x23\x33\x44\x44\x44\x32\x11\x8e\xfe\xca\x66\x77\x57\x87\x77\x66\x67\x84\xab\x9a\xa9\xb9\x6e\xfe\x64\x35\x66\x55\x66\x65\x56\x66\x34\x9f\xff\xff\xfa\x10\x11\x12\x22\x22\x33\x22\x22\x10\x00\x11\x23\x34\x44\x55\x44\x32\x11\x8e\xfe\xca\x76\x77\x66\x87\x76\x66\x57\x84\x9b\x9a\x9a\xaa\x5d\xff\x84\x35\x66\x56\x66\x55\x45\x66\x44\x7f\xff\xff\xfa\x00\x11\x22\x22\x22\x22\x32\x22\x10\x00\x12\x34\x67\x78\x88\x76\x53\x11\x8e\xfe\xca\x76\x67\x66\x88\x66\x66\x56\x85\x7b\xaa\xba\xaa\x4c\xff\xb4\x45\x66\x55\x55\x45\x45\x66\x44\x5d\xff\xff\xfa\x10\x11\x22\x22\x33\x33\x23\x32\x10\x00\x12\x23\x34\x44\x44\x44\x42\x11\x8e\xfe\xca\x77\x66\x66\x88\x66\x66\x66\x87\x6b\xba\xab\xbb\x4b\xff\xd4\x44\x65\x54\x44\x44\x45\x55\x43\x4c\xff\xff\xfa\x00\x11\x22\x22\x22\x22\x22\x22\x10\x00\x11\x22\x33\x34\x44\x44\x32\x11\x8d\xed\xb9\x87\x76\x66\x78\x76\x66\x66\x78\x4b\xba\x98\x65\x18\xff\xe6\x33\x55\x54\x44\x55\x55\x54\x42\x5d\xff\xff\xea\x00\x11\x11\x22\x22\x22\x22\x21\x10\x00\x11\x12\x22\x22\x33\x32\x21\x10\x6a\xba\x98\x87\x77\x66\x66\x77\x76\x66\x77\x23\x11\x11\x11\x05\xcd\xd8\x33\x55\x55\x55\x54\x44\x34\x7b\xdf\xee\xee\xd8\x00\x01\x11\x11\x11\x11\x11\x11\x00\x00\x00\x11\x11\x12\x22\x12\x11\x00\x59\x99\x87\x87\x77\x66\x66\x76\x76\x66\x77\x10\x11\x11\x11\x02\xaa\xa9\x33\x45\x55\x44\x44\x58\xbd\xee\xff\xdd\xcc\xb8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11\x11\x11\x11\x10\x00\x69\x99\x87\x97\x77\x76\x76\x76\x65\x55\x67\x20\x10\x00\x00\x05\x99\x98\x43\x24\x33\x46\x89\xbc\xcd\xde\xee\xdc\xcc\xba\x42\x22\x22\x22\x22\x22\x22\x22\x22\x42\x11\x22\x22\x22\x22\x22\x21\x24\x79\x99\x88\x97\x66\x77\x77\x86\x67\x77\x88\x50\x00\x23\x46\x88\x99\x99\x63\x25\x78\x9a\xab\xbc\xcd\xde\xee\xee\xed\xdc\xbb\xaa\xa9\x99\x99\x99\x88\x88\x88\x88\x77\x77\x77\x77\x77\x77\x77\x78\x99\x99\x98\x88\x88\x88\x88\x88\x88\x88\x99\x87\x78\x99\x99\xaa\xaa\xaa\xa9\xaa\xbb\xcc\xcd\xdd\xee\xef\xff\xff\xff\xff\xee\xee\xed\xdd\xdd\xdc\xcc\xcc\xcc\xbb\xbb\xbb\xbb\xbb\xbb\xba\xaa\xaa\xab\xba\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcd\xdd\xdd\xde\xee\xee\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xee\xee\xee\xee\xee\xee\xee\xee\xee\xee\xee\xed\xdd\xdd\xdd\xee\xee\xee\xee\xee\xee\xee\xee\xee\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'  # noqa
+DEFAULT_T4B_DATA = b'\x74\x34\x62\x70\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc4\x00\x16\xdf\xff\xff\xf7\x6d\xff\xff\xfd\x7a\xff\xff\xff\xe7\x77\x76\xff\xf6\x77\x77\x8d\xff\xff\xe7\x77\x78\xbf\xff\xff\xf7\x77\x77\x77\x7d\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xe4\x03\x78\x61\x07\xff\xff\x90\x04\xff\xff\xfc\x05\xff\xff\xff\xd5\x30\x35\xff\xf0\x13\x32\x00\x5f\xff\xd0\x03\x32\x01\xbf\xff\xe0\x00\x00\x00\x0b\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x50\x8f\xff\xff\x75\xff\xff\x40\x30\xef\xff\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x6f\xff\xf5\x0d\xff\xd0\x4f\xff\xd0\x0f\xff\xe0\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfd\x05\xff\xff\xff\xfe\xff\xfe\x03\xa0\x8f\xff\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x6f\xff\xfb\x0b\xff\xd0\x4f\xff\xf7\x0d\xff\xe0\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf6\x0e\xff\xff\xff\xff\xff\xfa\x0b\xe0\x3f\xff\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x6f\xff\xf5\x0e\xff\xd0\x4f\xff\xf8\x0e\xff\xe0\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf1\x1f\xff\xff\xff\xff\xff\xf2\x0f\xf3\x0d\xff\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x39\x88\x30\xaf\xff\xd0\x4f\xff\xf2\x1f\xff\xe0\x18\x88\x88\x8d\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf0\x3f\xff\xff\xff\xff\xff\xd0\x6f\xfc\x09\xff\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x01\x11\x00\x2c\xff\xd0\x3a\xa8\x20\xcf\xff\xe0\x00\x00\x00\x0b\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf0\x2f\xff\xff\xff\xff\xff\x60\xaf\xff\x11\xff\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x6f\xff\xfd\x10\xef\xd0\x00\x00\x1e\xff\xff\xe0\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf2\x0f\xff\xff\xff\xff\xfe\x20\x12\x22\x00\xcf\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x6f\xff\xff\x90\x9f\xd0\x3d\xd8\x09\xff\xff\xe0\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf8\x0b\xff\xff\xff\xff\xfc\x03\x88\x88\x60\x4f\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x6f\xff\xff\xa0\x8f\xd0\x4f\xff\x40\xcf\xff\xe0\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\xef\xff\xff\xfb\xf7\x0d\xff\xff\xf1\x1e\xfc\x06\xff\xff\xff\xff\xa0\x9f\xff\xf0\x6f\xff\xff\x60\xcf\xd0\x4f\xff\xf3\x0d\xff\xe0\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x80\x2c\xff\xfa\x05\xf0\x2f\xff\xff\xf6\x0b\xfc\x03\x88\x88\x88\xff\xb0\xaf\xff\xf0\x5d\xcc\xa3\x05\xff\xd0\x4f\xff\xfe\x11\xef\xe0\x18\x88\x88\x8d\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf8\x10\x01\x00\x3b\xb0\x9f\xff\xff\xfd\x06\xfc\x00\x00\x00\x00\xd0\x00\x00\xff\xf0\x00\x00\x02\x7f\xff\xe1\x5f\xff\xff\xc0\x5f\xe1\x00\x00\x00\x0b\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xed\xa9\xbd\xff\xed\xff\xff\xff\xff\xde\xff\xdd\xdd\xdd\xdd\xfd\xdd\xdd\xff\xfd\xdd\xdd\xee\xff\xff\xfd\xef\xff\xff\xfe\xdf\xfd\xdd\xdd\xdd\xdf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xed\xdb\x86\x8e\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xb7\x42\x00\x00\x0b\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfd\x00\x00\x00\x00\x09\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfd\x00\x00\x01\x11\x17\xef\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xee\xee\xee\xee\xee\xee\xee\xee\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\x22\x45\x78\x9b\x95\xef\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xb8\x77\x78\x88\x88\x88\x87\x87\x89\xdf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\x57\x9a\xaa\xaa\x94\xdf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\x00\x00\x11\x11\x22\x12\x11\x11\x10\x7e\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x76\xaa\xaa\xab\xa4\xcf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x33\x33\x33\x33\x32\x21\x6e\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xa5\xaa\xa9\x99\xa5\xaf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x33\x44\x44\x44\x33\x21\x6d\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xb4\xaa\xa9\xa9\xb6\x8f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x23\x34\x44\x54\x55\x44\x44\x31\x6d\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc5\x9a\x99\x9a\xb8\x7e\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x23\x34\x44\x44\x55\x45\x44\x31\x6d\xff\xff\xff\xff\xff\xff\xff\xff\xee\xdd\xdd\xee\xee\xc5\x9a\x88\x8a\xa9\x6e\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x44\x44\x44\x44\x44\x31\x6d\xff\xff\xff\xff\xff\xff\xff\xfe\xdc\xbb\xab\xcc\xca\x84\x8a\xa9\x99\xaa\x5d\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x44\x44\x44\x44\x44\x31\x6d\xff\xff\xff\xff\xff\xff\xff\xed\xa9\x99\x78\x87\x78\x84\x7a\xaa\x89\x9a\x6c\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x23\x34\x44\x45\x55\x55\x44\x31\x6d\xff\xff\xff\xff\xff\xff\xff\xec\x98\x88\x76\x98\x88\x74\x7a\xaa\xa7\x9a\x6b\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x23\x33\x34\x44\x54\x44\x44\x31\x6d\xff\xff\xff\xff\xff\xff\xff\xdb\x98\x88\x76\x98\x88\x74\x5a\xaa\x89\x9b\x7a\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x44\x45\x55\x54\x43\x31\x6d\xff\xff\xff\xff\xff\xff\xfe\xdb\x98\x88\x76\x98\x88\x84\x4a\xaa\x97\xbb\x79\xef\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x34\x44\x44\x44\x44\x31\x5b\xcc\xcc\xcc\xcc\xcc\xcc\xcb\xba\x98\x88\x76\x88\x88\x85\x39\xa9\x8a\xab\x97\xef\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x33\x34\x44\x44\x43\x31\x34\x44\x44\x55\x55\x55\x55\x44\x46\x98\x88\x76\x78\x88\x85\x28\xa8\x9a\xab\xa5\xef\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf9\x00\x11\x11\x11\x12\x22\x22\x11\x10\x00\x01\x22\x23\x33\x33\x33\x31\x11\x88\x88\x76\x68\x88\x85\x27\xa9\xa9\xab\xa5\xdf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x33\x33\x44\x43\x33\x21\x00\x12\x33\x44\x55\x55\x65\x42\x11\x78\x88\x76\x68\x88\x85\x36\xaa\xaa\xab\xb5\xcf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x34\x44\x54\x44\x44\x21\x01\x23\x44\x55\x66\x66\x66\x53\x21\x78\x88\x86\x68\x88\x85\x45\xaa\xaa\xbb\xb6\xaf\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x34\x44\x44\x44\x33\x21\x01\x23\x45\x56\x67\x77\x77\x54\x21\x78\x88\x86\x68\x88\x85\x54\xaa\xab\xbb\xb7\x8f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x44\x44\x44\x44\x43\x21\x01\x23\x57\x8a\xaa\xaa\x99\x74\x21\x79\x88\x86\x68\x88\x75\x44\x9a\xab\xbb\xb9\x6e\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x34\x44\x44\x55\x43\x21\x01\x24\x56\x78\x89\x99\x88\x74\x21\x69\x88\x87\x68\x88\x75\x53\x9a\xab\xbb\xba\x5e\xff\xff\xff\xff\xff\xed\xa7\x9e\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x44\x34\x44\x54\x44\x21\x01\x23\x45\x56\x67\x77\x77\x64\x21\x69\x88\x87\x68\x88\x65\x53\x8a\xaa\xaa\xba\x5d\xff\xff\xff\xed\xb9\x75\x54\x5b\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x84\x66\x48\x54\x43\x21\x01\x23\x45\x56\x67\x77\x76\x64\x21\x6a\x88\x87\x68\x88\x66\x54\x7a\xaa\x9a\xbb\x6b\xff\xee\xb9\x66\x66\x78\x75\x69\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x64\x54\x47\x54\x43\x21\x01\x23\x45\x66\x77\x67\x67\x64\x21\x6a\x88\x87\x68\x88\x76\x54\x6a\xbb\xba\xbb\x79\xca\x75\x56\x77\x88\x88\x85\x68\xef\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x23\x33\xba\xba\xac\x44\x43\x21\x01\x23\x45\x56\x66\x66\x76\x64\x21\x6a\x88\x87\x67\x88\x66\x54\x5a\xbb\xa9\xbb\x83\x45\x67\x78\x64\x78\x88\x86\x66\xdf\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x87\x77\x79\x54\x43\x21\x01\x23\x45\x56\x66\x67\x77\x54\x21\x6a\x88\x87\x67\x88\x66\x54\x4a\xbb\xab\xbb\x93\x47\x88\x88\x66\x38\x88\x98\x66\xbf\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x44\x44\x44\x54\x44\x21\x01\x23\x45\x56\x66\x67\x77\x64\x21\x6a\x88\x88\x66\x98\x66\x55\x3a\xab\xba\xab\xa4\x47\x88\x87\x68\x43\x89\x99\x57\x8f\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x32\x34\x3a\x44\x43\x21\x01\x23\x45\x56\x66\x67\x66\x64\x31\x69\x88\x88\x65\x98\x66\x55\x39\xbb\xba\xbc\xa4\x47\x88\x87\x77\x85\x37\xaa\x78\x7e\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\xad\x76\xc5\x44\x33\x21\x01\x23\x44\x56\x66\x77\x76\x54\x21\x69\x98\x88\x65\x98\x66\x65\x38\xbb\xb9\xbb\xb5\x46\x77\x86\x68\x87\x78\x9a\x87\x7c\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x84\x7b\x44\x44\x33\x21\x01\x23\x44\x56\x67\x76\x76\x63\x21\x79\x98\x88\x76\x87\x66\x65\x46\xaa\x99\xab\xb5\x45\x88\x76\x67\x77\x78\x9a\x96\x8a\xff\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x63\x54\x46\x54\x43\x21\x01\x23\x44\x55\x66\x67\x76\x64\x21\x79\x98\x88\x76\x77\x66\x65\x44\xab\xbb\xaa\xb7\x35\x88\x87\x77\x89\x99\x9a\x96\x89\xef\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\xbb\xba\xbc\x44\x43\x21\x01\x23\x44\x56\x67\x66\x76\x63\x21\x79\x98\x88\x76\x68\x66\x65\x53\xab\xba\xaa\xb8\x35\x78\x88\x89\x99\x99\x9a\xa7\x88\xef\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x54\x44\x45\x44\x34\x21\x01\x23\x44\x56\x66\x86\x66\x54\x21\x79\x98\x88\x76\x68\x66\x65\x63\x9a\xba\xab\xb9\x35\x68\x88\x99\x99\x9a\x9a\xa8\x77\xcf\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x33\x43\x43\x44\x43\x21\x01\x23\x44\x55\x66\x76\x66\x54\x21\x7a\x98\x88\x76\x68\x66\x65\x63\x8a\xab\xa9\xba\x35\x58\x88\x99\x99\x99\x9a\xa9\x67\xaf\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x69\x2a\xd9\x34\x33\x21\x01\x23\x44\x55\x67\x67\x66\x53\x21\x7a\x98\x88\x76\x67\x66\x66\x54\x7a\xa9\x9a\xbb\x44\x48\x99\x99\x89\x99\xaa\xaa\x68\x8e\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x97\x98\x47\x44\x34\x21\x01\x23\x44\x56\x66\x76\x66\x53\x21\x7a\x98\x88\x76\x67\x66\x66\x55\x6a\xbb\x9a\xbb\x54\x57\x99\x98\x79\x9a\xaa\xaa\x87\x7d\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x53\x44\x36\x54\x44\x21\x00\x23\x44\x55\x66\x66\x66\x53\x21\x7a\x98\x87\x76\x67\x66\x66\x55\x5a\xaa\xaa\xbb\x73\x66\x99\x66\x59\x77\xaa\xaa\x97\x8b\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\xcc\xcc\xcd\x44\x33\x21\x01\x23\x34\x55\x66\x66\x66\x53\x21\x7b\x98\x88\x76\x66\x66\x66\x65\x4a\xaa\xab\xab\x83\x66\x88\x55\x48\x84\x5a\xaa\xa6\x89\xff\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x44\x34\x45\x44\x33\x21\x01\x23\x44\x55\x56\x66\x66\x53\x21\x7b\x98\x88\x76\x66\x66\x66\x56\x49\x9a\xaa\x9b\x94\x55\x88\x66\x78\x86\x98\xaa\xa7\x88\xef\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x33\x33\x44\x44\x33\x21\x00\x22\x34\x55\x66\x66\x66\x53\x21\x8b\xa7\x88\x86\x66\x66\x66\x56\x38\xa7\x99\xaa\x95\x56\x79\x99\x97\x76\x96\xaa\xa8\x88\xdf\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x33\x76\x77\x78\x44\x33\x21\x01\x22\x34\x45\x54\x66\x66\x53\x21\x8b\xa7\x78\x86\x56\x66\x66\x55\x48\xaa\xaa\xaa\xa5\x56\x69\x99\x99\x85\x79\x7a\xa9\x68\xbf\xff\xff\xff\xff\xff\xff\xfa\x11\x12\x33\xaa\xaa\xab\x34\x33\x21\x00\x23\x34\x45\x6b\x66\x66\x53\x21\x8b\xa8\x78\x76\x56\x76\x66\x65\x47\xaa\xa9\x9a\xa6\x66\x59\x99\x99\xa6\x6a\x6a\xaa\x68\x9f\xff\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x43\x33\x33\x34\x33\x21\x00\x22\x34\x45\x68\x86\x66\x53\x21\x8c\xa8\x77\x76\x56\x76\x66\x66\x45\xaa\xa9\xab\xb6\x85\x58\x99\x99\x99\x6a\x69\xaa\x67\x7e\xff\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x33\x34\x49\x75\x33\x21\x00\x22\x34\x45\x66\x66\x65\x53\x21\x8c\xa8\x77\x66\x55\x76\x66\x66\x54\xa9\x99\x9b\xa7\x76\x66\x99\x99\xa6\x69\x88\xaa\x87\x6c\xff\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x33\x33\x37\x34\x33\x21\x00\x12\x34\x45\x59\x86\x66\x53\x21\x8c\xb9\x77\x66\x55\x76\x66\x65\x63\x9a\xaa\xba\xb8\x67\x66\x99\x99\x97\x68\x96\xaa\xa6\x7a\xff\xff\xff\xff\xff\xff\xfa\x11\x22\x23\x54\x44\x46\x44\x43\x21\x00\x22\x34\x58\x59\xa5\x65\x53\x21\x8c\xb9\x77\x76\x56\x76\x66\x65\x63\x8a\xaa\xaa\xb9\x58\x65\x89\x99\x99\x86\xa3\xaa\xa6\x88\xef\xff\xff\xff\xff\xff\xfa\x11\x12\x23\xab\xbb\xbc\x33\x33\x21\x00\x12\x34\x46\x66\x66\x55\x43\x21\x8c\xb9\x77\x76\x56\x76\x66\x65\x64\x7a\xaa\x9a\xba\x49\x66\x89\x99\x99\x95\xa4\x5a\xa7\x87\xdf\xff\xff\xff\xff\xff\xfa\x11\x12\x22\x42\x33\x35\x44\x33\x21\x00\x12\x34\x48\x86\x85\x55\x43\x21\x8c\xb9\x67\x77\x56\x67\x66\x66\x65\x6a\xaa\x9a\xba\x4a\x67\x79\x99\x86\x76\x86\x27\xa8\x67\xcf\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x33\x33\x35\x33\x33\x21\x00\x12\x33\x54\x88\x56\x65\x43\x21\x8d\xba\x66\x77\x56\x57\x66\x66\x65\x5a\xab\xaa\xbb\x59\x76\x59\x99\x99\x97\x98\x24\xa9\x67\xaf\xff\xff\xff\xff\xff\xfa\x11\x12\x22\x21\x36\x9b\x33\x33\x21\x00\x12\x34\x45\x56\x76\x55\x43\x21\x8d\xca\x76\x77\x66\x57\x66\x65\x65\x5a\xaa\x9a\xbb\x78\x96\x58\x99\x99\x88\x9a\x44\xa9\x67\x8e\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x6a\xb7\x44\x43\x33\x21\x00\x12\x34\x44\x55\x85\x55\x43\x21\x8d\xca\x77\x67\x66\x67\x66\x66\x66\x49\xaa\xaa\xab\x87\xc5\x57\x98\x98\x87\x68\x85\x99\x76\x6d\xff\xff\xff\xff\xff\xfa\x11\x12\x23\x96\x33\x43\x33\x33\x21\x00\x12\x33\x44\x65\x55\x55\x43\x21\x8d\xca\x87\x76\x66\x67\x66\x66\x56\x59\xa9\x99\xab\x96\xc6\x65\x98\x89\x99\x68\x98\x99\x86\x6b\xff\xff\xff\xff\xff\xfa\x11\x12\x22\x44\x75\x23\x33\x33\x21\x00\x12\x33\x44\x6a\x65\x55\x43\x21\x8d\xca\x87\x76\x66\x67\x66\x66\x66\x58\xa8\x9a\x9b\xa5\xc9\x65\x88\x89\x99\x77\x98\x99\x95\x68\xff\xff\xff\xff\xff\xfa\x11\x12\x22\x22\x24\x79\x33\x33\x21\x00\x12\x34\x44\x56\x75\x55\x43\x21\x8d\xda\x87\x77\x66\x67\x66\x66\x66\x47\xa9\x9a\xbb\xa6\xcb\x65\x78\x88\x88\x85\x68\x99\x96\x66\xef\xff\xff\xff\xff\xfa\x11\x12\x23\x11\x33\x34\x33\x32\x21\x00\x12\x33\x44\x57\x65\x55\x43\x21\x8d\xda\x87\x77\x65\x76\x76\x66\x67\x56\xaa\xbb\xaa\xa6\xbc\x66\x68\x88\x88\x85\x88\x89\x97\x66\xcf\xff\xff\xff\xff\xfa\x11\x12\x23\x95\x23\x36\x33\x33\x21\x00\x12\x33\x44\x58\x65\x55\x43\x21\x8d\xda\x96\x77\x65\x77\x66\x66\x57\x55\xaa\xaa\xaa\xb6\xad\x66\x58\x88\x88\x85\x78\x88\x98\x66\xaf\xff\xff\xff\xff\xfa\x11\x12\x22\x52\x33\x35\x33\x33\x21\x00\x12\x33\x44\x55\x65\x55\x42\x21\x8e\xdb\x97\x67\x75\x77\x66\x66\x56\x64\xaa\xbb\xaa\xa7\x8e\x85\x58\x87\x88\x87\x88\x88\x88\x56\x8f\xff\xff\xff\xff\xfa\x11\x12\x22\x42\x23\x35\x43\x32\x21\x00\x12\x33\x44\x48\x85\x55\x43\x21\x8e\xdb\x97\x67\x75\x77\x66\x66\x66\x73\x9b\xaa\xaa\xb8\x6e\xb4\x57\x87\x87\x77\x78\x88\x88\x56\x7e\xff\xff\xff\xff\xfa\x11\x12\x22\x42\x33\x28\x33\x32\x21\x00\x12\x33\x44\x55\x55\x55\x43\x21\x8e\xdb\x97\x76\x76\x67\x76\x66\x66\x74\x8a\xba\xaa\xb9\x5d\xd5\x55\x77\x77\x77\x47\x88\x88\x65\x5d\xff\xff\xff\xff\xfa\x10\x12\x22\x63\x11\x78\x33\x32\x20\x00\x12\x33\x34\x47\x84\x55\x42\x21\x8e\xec\x97\x77\x66\x67\x87\x76\x66\x74\x7a\xaa\xaa\xba\x4d\xe7\x54\x77\x77\x77\x56\x87\x88\x74\x5a\xff\xff\xff\xff\xfa\x11\x12\x22\x28\x9a\x83\x33\x32\x20\x00\x12\x33\x44\x55\x55\x55\x42\x21\x9e\xec\x97\x77\x66\x67\x76\x66\x66\x76\x6a\xaa\x99\xba\x4b\xfa\x54\x67\x77\x77\x65\x77\x77\x84\x57\xef\xff\xff\xff\xfa\x11\x12\x22\x22\x33\x33\x33\x22\x10\x00\x12\x33\x33\x56\x45\x54\x42\x11\x9e\xec\x97\x77\x75\x67\x76\x66\x65\x67\x5a\xaa\x99\xba\x59\xfc\x54\x57\x77\x76\x65\x77\x77\x75\x55\xdf\xff\xff\xff\xfa\x11\x12\x22\x22\x33\x33\x33\x22\x20\x00\x12\x33\x35\x45\x65\x54\x42\x21\x9e\xec\xa7\x77\x76\x67\x86\x66\x65\x68\x4a\xa9\x8a\xbb\x77\xfd\x65\x56\x76\x76\x64\x67\x77\x76\x55\xbf\xff\xff\xff\xfa\x11\x12\x22\x22\x32\x33\x23\x22\x20\x00\x12\x23\x45\x55\x54\x44\x42\x11\x9e\xec\xa7\x67\x76\x68\x77\x66\x66\x68\x4a\xb9\x88\xaa\x96\xef\x75\x46\x66\x66\x65\x45\x77\x77\x45\x9f\xff\xff\xff\xfa\x10\x12\x22\x22\x22\x33\x32\x22\x20\x00\x12\x23\x33\x44\x54\x54\x42\x21\x8e\xed\xa8\x76\x76\x58\x77\x66\x66\x67\x59\xba\xa8\xa9\xa5\xef\x94\x46\x66\x66\x66\x46\x67\x77\x45\x7e\xff\xff\xff\xfa\x11\x12\x22\x22\x33\x33\x23\x32\x21\x00\x12\x23\x34\x54\x44\x44\x42\x11\x8e\xfd\xb8\x76\x67\x67\x68\x77\x66\x67\x68\xaa\xa9\x7b\xa5\xcf\xc3\x45\x66\x66\x66\x67\x66\x67\x55\x5d\xff\xff\xff\xf9\x00\x00\x11\x11\x11\x11\x11\x11\x10\x00\x12\x23\x34\x34\x44\x44\x42\x11\x8e\xfd\xb8\x77\x66\x67\x77\x66\x66\x67\x77\xaa\xa8\xa9\xb6\xbf\xe5\x44\x66\x66\x66\x66\x66\x67\x54\x4b\xff\xff\xff\xf9\x00\x01\x11\x11\x11\x11\x11\x11\x10\x00\x12\x23\x33\x44\x44\x44\x32\x11\x8e\xfd\xb8\x77\x76\x67\x77\x66\x66\x57\x76\xba\xa8\x7a\xb6\xaf\xf8\x43\x66\x66\x66\x66\x66\x66\x63\x48\xff\xff\xff\xfa\x10\x11\x22\x22\x22\x22\x32\x22\x10\x00\x12\x23\x34\x44\x44\x44\x32\x11\x8e\xfd\xb9\x77\x76\x57\x87\x66\x66\x66\x85\xbb\xa8\x8b\xa7\x9f\xfb\x43\x56\x66\x66\x66\x66\x66\x64\x45\xef\xff\xff\xfa\x10\x12\x22\x22\x22\x32\x22\x22\x10\x00\x12\x23\x33\x44\x44\x44\x32\x11\x8e\xfe\xb9\x67\x77\x57\x87\x76\x66\x66\x84\xab\x89\xaa\xb8\x8e\xfd\x54\x46\x66\x55\x55\x55\x66\x65\x43\xdf\xff\xff\xfa\x10\x12\x22\x22\x22\x32\x22\x22\x20\x00\x12\x23\x33\x44\x44\x44\x32\x11\x8e\xfe\xca\x66\x77\x57\x87\x77\x66\x67\x84\xab\x9a\xa9\xb9\x6e\xfe\x64\x35\x66\x55\x66\x65\x56\x66\x34\x9f\xff\xff\xfa\x10\x11\x12\x22\x22\x33\x22\x22\x10\x00\x11\x23\x34\x44\x55\x44\x32\x11\x8e\xfe\xca\x76\x77\x66\x87\x76\x66\x57\x84\x9b\x9a\x9a\xaa\x5d\xff\x84\x35\x66\x56\x66\x55\x45\x66\x44\x7f\xff\xff\xfa\x00\x11\x22\x22\x22\x22\x32\x22\x10\x00\x12\x34\x67\x78\x88\x76\x53\x11\x8e\xfe\xca\x76\x67\x66\x88\x66\x66\x56\x85\x7b\xaa\xba\xaa\x4c\xff\xb4\x45\x66\x55\x55\x45\x45\x66\x44\x5d\xff\xff\xfa\x10\x11\x22\x22\x33\x33\x23\x32\x10\x00\x12\x23\x34\x44\x44\x44\x42\x11\x8e\xfe\xca\x77\x66\x66\x88\x66\x66\x66\x87\x6b\xba\xab\xbb\x4b\xff\xd4\x44\x65\x54\x44\x44\x45\x55\x43\x4c\xff\xff\xfa\x00\x11\x22\x22\x22\x22\x22\x22\x10\x00\x11\x22\x33\x34\x44\x44\x32\x11\x8d\xed\xb9\x87\x76\x66\x78\x76\x66\x66\x78\x4b\xba\x98\x65\x18\xff\xe6\x33\x55\x54\x44\x55\x55\x54\x42\x5d\xff\xff\xea\x00\x11\x11\x22\x22\x22\x22\x21\x10\x00\x11\x12\x22\x22\x33\x32\x21\x10\x6a\xba\x98\x87\x77\x66\x66\x77\x76\x66\x77\x23\x11\x11\x11\x05\xcd\xd8\x33\x55\x55\x55\x54\x44\x34\x7b\xdf\xee\xee\xd8\x00\x01\x11\x11\x11\x11\x11\x11\x00\x00\x00\x11\x11\x12\x22\x12\x11\x00\x59\x99\x87\x87\x77\x66\x66\x76\x76\x66\x77\x10\x11\x11\x11\x02\xaa\xa9\x33\x45\x55\x44\x44\x58\xbd\xee\xff\xdd\xcc\xb8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11\x11\x11\x11\x10\x00\x69\x99\x87\x97\x77\x76\x76\x76\x65\x55\x67\x20\x10\x00\x00\x05\x99\x98\x43\x24\x33\x46\x89\xbc\xcd\xde\xee\xdc\xcc\xba\x42\x22\x22\x22\x22\x22\x22\x22\x22\x42\x11\x22\x22\x22\x22\x22\x21\x24\x79\x99\x88\x97\x66\x77\x77\x86\x67\x77\x88\x50\x00\x23\x46\x88\x99\x99\x63\x25\x78\x9a\xab\xbc\xcd\xde\xee\xee\xed\xdc\xbb\xaa\xa9\x99\x99\x99\x88\x88\x88\x88\x77\x77\x77\x77\x77\x77\x77\x78\x99\x99\x98\x88\x88\x88\x88\x88\x88\x88\x99\x87\x78\x99\x99\xaa\xaa\xaa\xa9\xaa\xbb\xcc\xcd\xdd\xee\xef\xff\xff\xff\xff\xee\xee\xed\xdd\xdd\xdc\xcc\xcc\xcc\xbb\xbb\xbb\xbb\xbb\xbb\xba\xaa\xaa\xab\xba\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcd\xdd\xdd\xde\xee\xee\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xee\xee\xee\xee\xee\xee\xee\xee\xee\xee\xee\xed\xdd\xdd\xdd\xee\xee\xee\xee\xee\xee\xee\xee\xee\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'  # noqa: E501
 
 
 def reduce_color(c):
@@ -21,7 +21,7 @@ def write_t4b(t4bfile, coverdata=None):
     from PIL import Image
     if coverdata is not None:
         coverdata = BytesIO(coverdata)
-        cover = Image.open(coverdata).convert("L")
+        cover = Image.open(coverdata).convert('L')
         cover.thumbnail((96, 144), Image.Resampling.LANCZOS)
         t4bcover = Image.new('L', (96, 144), 'white')
 
diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py
index 2c0d65772a..b27201b352 100644
--- a/src/calibre/devices/eb600/driver.py
+++ b/src/calibre/devices/eb600/driver.py
@@ -7,9 +7,9 @@ Device driver for the Netronix EB600
 
 Windows PNP strings:
  ('USBSTOR\\DISK&VEN_NETRONIX&PROD_EBOOK&REV_062E\\6&1A275569&0&EB6001009
-2W00000&0', 2, u'F:\\')
+2W00000&0', 2, 'F:\\')
         ('USBSTOR\\DISK&VEN_NETRONIX&PROD_EBOOK&REV_062E\\6&1A275569&0&EB6001009
-2W00000&1', 3, u'G:\\')
+2W00000&1', 3, 'G:\\')
 
 '''
 import re
@@ -71,7 +71,7 @@ class TOLINO(EB600):
     EXTRA_CUSTOMIZATION_MESSAGE = [
         _('Swap main and card A') +
         ':::' +
-        _('Check this box if the device\'s main memory is being seen as card a and the card '
+        _("Check this box if the device's main memory is being seen as card a and the card "
             'is being seen as main memory. Some tolino devices may need this option.'),
     ]
 
@@ -184,7 +184,7 @@ class SHINEBOOK(EB600):
 class POCKETBOOK360(EB600):
 
     # Device info on OS X
-    # (8069L, 5768L, 272L, u'', u'', u'1.00')
+    # (8069L, 5768L, 272L,'', '', '1.00')
 
     name = 'PocketBook 360 Device Interface'
 
diff --git a/src/calibre/devices/errors.py b/src/calibre/devices/errors.py
index 7449bbcb71..36d6b03c54 100644
--- a/src/calibre/devices/errors.py
+++ b/src/calibre/devices/errors.py
@@ -1,36 +1,36 @@
 __license__ = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-"""
+'''
 Defines the errors that the device drivers generate.
 
 G{classtree ProtocolError}
-"""
+'''
 
 
 class ProtocolError(Exception):
-    """ The base class for all exceptions in this package """
+    ''' The base class for all exceptions in this package '''
 
     def __init__(self, msg):
         Exception.__init__(self, msg)
 
 
 class TimeoutError(ProtocolError):
-    """ There was a timeout during communication """
+    ''' There was a timeout during communication '''
 
     def __init__(self, func_name):
         ProtocolError.__init__(
             self,
-            "There was a timeout while communicating with the device in function: " +
+            'There was a timeout while communicating with the device in function: ' +
             func_name
         )
 
 
 class DeviceError(ProtocolError):
-    """ Raised when device is not found """
+    ''' Raised when device is not found '''
 
     def __init__(self, msg=None):
         if msg is None:
-            msg = "Unable to find SONY Reader. Is it connected?"
+            msg = 'Unable to find SONY Reader. Is it connected?'
         ProtocolError.__init__(self, msg)
 
 
@@ -71,14 +71,14 @@ class OpenActionNeeded(DeviceError):
 
 
 class InitialConnectionError(OpenFeedback):
-    """ Errors detected during connection after detection but before open, for
-    e.g. in the is_connected() method. """
+    ''' Errors detected during connection after detection but before open, for
+    e.g. in the is_connected() method. '''
 
 
 class OpenFailed(ProtocolError):
-    """ Raised when device cannot be opened this time. No retry is to be done.
+    ''' Raised when device cannot be opened this time. No retry is to be done.
         The device should continue to be polled for future opens. If the
-        message is empty, no exception trace is produced. """
+        message is empty, no exception trace is produced. '''
 
     def __init__(self, msg):
         ProtocolError.__init__(self, msg)
@@ -86,36 +86,36 @@ class OpenFailed(ProtocolError):
 
 
 class DeviceBusy(ProtocolError):
-    """ Raised when device is busy """
+    ''' Raised when device is busy '''
 
-    def __init__(self, uerr=""):
+    def __init__(self, uerr=''):
         ProtocolError.__init__(
-            self, "Device is in use by another application:"
-            "\nUnderlying error:" + str(uerr)
+            self, 'Device is in use by another application:'
+            '\nUnderlying error:' + str(uerr)
         )
 
 
 class DeviceLocked(ProtocolError):
-    """ Raised when device has been locked """
+    ''' Raised when device has been locked '''
 
     def __init__(self):
-        ProtocolError.__init__(self, "Device is locked")
+        ProtocolError.__init__(self, 'Device is locked')
 
 
 class PacketError(ProtocolError):
-    """ Errors with creating/interpreting packets """
+    ''' Errors with creating/interpreting packets '''
 
 
 class FreeSpaceError(ProtocolError):
-    """ Errors caused when trying to put files onto an overcrowded device """
+    ''' Errors caused when trying to put files onto an overcrowded device '''
 
 
 class ArgumentError(ProtocolError):
-    """ Errors caused by invalid arguments to a public interface function """
+    ''' Errors caused by invalid arguments to a public interface function '''
 
 
 class PathError(ArgumentError):
-    """ When a user supplies an incorrect/invalid path """
+    ''' When a user supplies an incorrect/invalid path '''
 
     def __init__(self, msg, path=None):
         ArgumentError.__init__(self, msg)
@@ -123,7 +123,7 @@ class PathError(ArgumentError):
 
 
 class ControlError(ProtocolError):
-    """ Errors in Command/Response pairs while communicating with the device """
+    ''' Errors in Command/Response pairs while communicating with the device '''
 
     def __init__(self, query=None, response=None, desc=None):
         self.query = query
@@ -133,13 +133,13 @@ class ControlError(ProtocolError):
 
     def __str__(self):
         if self.query and self.response:
-            return "Got unexpected response:\n" + \
-           "query:\n"+str(self.query.query)+"\n"+\
-           "expected:\n"+str(self.query.response)+"\n" +\
-           "actual:\n"+str(self.response)
+            return ('Got unexpected response:\n'
+                    'query:\n'+str(self.query.query)+'\n'
+                    'expected:\n'+str(self.query.response)+'\n'
+                    'actual:\n'+str(self.response))
         if self.desc:
             return self.desc
-        return "Unknown control error occurred"
+        return 'Unknown control error occurred'
 
 
 class WrongDestinationError(PathError):
diff --git a/src/calibre/devices/folder_device/driver.py b/src/calibre/devices/folder_device/driver.py
index ea5f67e28d..b32e34a617 100644
--- a/src/calibre/devices/folder_device/driver.py
+++ b/src/calibre/devices/folder_device/driver.py
@@ -92,7 +92,7 @@ class FOLDER_DEVICE(USBMS):
         self.report_progress = report_progress
 
     def card_prefix(self, end_session=True):
-        return (None, None)
+        return None, None
 
     def eject(self):
         self.is_connected = False
diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py
index 2c2df90771..e8f69f575e 100644
--- a/src/calibre/devices/interface.py
+++ b/src/calibre/devices/interface.py
@@ -18,14 +18,14 @@ class OpenPopupMessage:
 
 
 class DevicePlugin(Plugin):
-    """
+    '''
     Defines the interface that should be implemented by backends that
     communicate with an e-book reader.
-    """
+    '''
     type = _('Device interface')
 
     #: Ordered list of supported formats
-    FORMATS     = ["lrf", "rtf", "pdf", "txt"]
+    FORMATS     = ['lrf', 'rtf', 'pdf', 'txt']
     # If True, the config dialog will not show the formats box
     HIDE_FORMATS_CONFIG_BOX = False
 
@@ -226,7 +226,7 @@ class DevicePlugin(Plugin):
 
     def reset(self, key='-1', log_packets=False, report_progress=None,
             detected_device=None):
-        """
+        '''
         :param key: The key to unlock the device
         :param log_packets: If true the packet stream to/from the device is logged
         :param report_progress: Function that is called with a % progress
@@ -235,7 +235,7 @@ class DevicePlugin(Plugin):
                                 task does not have any progress information
         :param detected_device: Device information from the device scanner
 
-        """
+        '''
         raise NotImplementedError()
 
     def can_handle_windows(self, usbdevice, debug=False):
@@ -324,14 +324,14 @@ class DevicePlugin(Plugin):
         raise NotImplementedError()
 
     def get_device_information(self, end_session=True):
-        """
+        '''
         Ask device for device information. See L{DeviceInfoQuery}.
 
         :return: (device name, device version, software version on device, MIME type)
                  The tuple can optionally have a fifth element, which is a
                  drive information dictionary. See usbms.driver for an example.
 
-        """
+        '''
         raise NotImplementedError()
 
     def get_driveinfo(self):
@@ -359,7 +359,7 @@ class DevicePlugin(Plugin):
         raise NotImplementedError()
 
     def total_space(self, end_session=True):
-        """
+        '''
         Get total space available on the mountpoints:
             1. Main memory
             2. Memory Card A
@@ -368,11 +368,11 @@ class DevicePlugin(Plugin):
         :return: A 3 element list with total space in bytes of (1, 2, 3). If a
                  particular device doesn't have any of these locations it should return 0.
 
-        """
+        '''
         raise NotImplementedError()
 
     def free_space(self, end_session=True):
-        """
+        '''
         Get free space available on the mountpoints:
           1. Main memory
           2. Card A
@@ -381,11 +381,11 @@ class DevicePlugin(Plugin):
         :return: A 3 element list with free space in bytes of (1, 2, 3). If a
                  particular device doesn't have any of these locations it should return -1.
 
-        """
+        '''
         raise NotImplementedError()
 
     def books(self, oncard=None, end_session=True):
-        """
+        '''
         Return a list of e-books on the device.
 
         :param oncard:  If 'carda' or 'cardb' return a list of e-books on the
@@ -395,7 +395,7 @@ class DevicePlugin(Plugin):
 
         :return: A BookList.
 
-        """
+        '''
         raise NotImplementedError()
 
     def upload_books(self, files, names, on_card=None, end_session=True,
@@ -791,9 +791,9 @@ class CurrentlyConnectedDevice:
 
 # A device driver can check if a device is currently connected to calibre using
 # the following code::
-#   from calibre.device.interface import currently_connected_device
-#   if currently_connected_device.device is None:
-#      # no device connected
+#     from calibre.device.interface import currently_connected_device
+#     if currently_connected_device.device is None:
+#         # no device connected
 # The device attribute will be either None or the device driver object
 # (DevicePlugin instance) for the currently connected device.
 currently_connected_device = CurrentlyConnectedDevice()
diff --git a/src/calibre/devices/jetbook/driver.py b/src/calibre/devices/jetbook/driver.py
index 98c20167ea..824467daa3 100644
--- a/src/calibre/devices/jetbook/driver.py
+++ b/src/calibre/devices/jetbook/driver.py
@@ -38,8 +38,8 @@ class JETBOOK(USBMS):
     MAIN_MEMORY_VOLUME_LABEL  = 'Jetbook Main Memory'
     STORAGE_CARD_VOLUME_LABEL = 'Jetbook Storage Card'
 
-    EBOOK_DIR_MAIN = "Books"
-    EBOOK_DIR_CARD_A = "Books"
+    EBOOK_DIR_MAIN = 'Books'
+    EBOOK_DIR_CARD_A = 'Books'
     SUPPORTS_SUB_DIRS = True
 
     JETBOOK_FILE_NAME_PATTERN = re.compile(
@@ -99,14 +99,13 @@ class MIBUK(USBMS):
 
 
 class JETBOOK_MINI(USBMS):
-
     '''
     ['0x4b8',
-  '0x507',
-  '0x100',
-  'ECTACO',
-  'ECTACO ATA/ATAPI Bridge (Bulk-Only)',
-  'Rev.0.20']
+     '0x507',
+     '0x100',
+     'ECTACO',
+     'ECTACO ATA/ATAPI Bridge (Bulk-Only)',
+     'Rev.0.20']
     '''
     FORMATS     = ['fb2', 'txt']
 
@@ -126,14 +125,13 @@ class JETBOOK_MINI(USBMS):
 
 
 class JETBOOK_COLOR(USBMS):
-
     '''
-set([(u'0x951',
-      u'0x160b',
-      u'0x0',
-      u'Freescale',
-      u'Mass Storage Device',
-      u'0802270905553')])
+    set(['0x951',
+         '0x160b',
+         '0x0',
+         'Freescale',
+         'Mass Storage Device',
+         '0802270905553'])
     '''
 
     FORMATS = ['epub', 'mobi', 'prc', 'fb2', 'rtf', 'txt', 'pdf', 'djvu']
diff --git a/src/calibre/devices/kindle/apnx.py b/src/calibre/devices/kindle/apnx.py
index d92d409ec4..9321b1fd53 100644
--- a/src/calibre/devices/kindle/apnx.py
+++ b/src/calibre/devices/kindle/apnx.py
@@ -24,9 +24,9 @@ from polyglot.builtins import as_bytes, as_unicode
 
 
 class APNXBuilder:
-    """
+    '''
     Create an APNX file using a pseudo page mapping.
-    """
+    '''
 
     generators: dict[str, IPageGenerator] = {
         FastPageGenerator.instance.name(): FastPageGenerator.instance,
@@ -36,11 +36,11 @@ class APNXBuilder:
     }
 
     def write_apnx(self, mobi_file_path: str, apnx_path: str, method: str | None = None, page_count: int = 0):
-        """
+        '''
         If you want a fixed number of pages (such as from a custom column) then
         pass in a value to page_count, otherwise a count will be estimated
         using either the fast or accurate algorithm.
-        """
+        '''
         apnx_meta = self.get_apnx_meta(mobi_file_path)
 
         if page_count:
@@ -105,7 +105,7 @@ class APNXBuilder:
 
         # Updated header if we have a KF8 file...
         if apnx_meta['format'] == 'MOBI_8':
-            content_header = '{"contentGuid":"%(guid)s","asin":"%(asin)s","cdeType":"%(cdetype)s","format":"%(format)s","fileRevisionId":"1","acr":"%(acr)s"}' % apnx_meta  # noqa
+            content_header = '{"contentGuid":"%(guid)s","asin":"%(asin)s","cdeType":"%(cdetype)s","format":"%(format)s","fileRevisionId":"1","acr":"%(acr)s"}' % apnx_meta  # noqa: E501
         else:
             # My 5.1.x Touch & 3.4 K3 seem to handle the 'extended' header fine for
             # legacy mobi files, too. But, since they still handle this one too, let's
diff --git a/src/calibre/devices/kindle/apnx_page_generator/generators/accurate_page_generator.py b/src/calibre/devices/kindle/apnx_page_generator/generators/accurate_page_generator.py
index fa297d32bf..e657a09705 100644
--- a/src/calibre/devices/kindle/apnx_page_generator/generators/accurate_page_generator.py
+++ b/src/calibre/devices/kindle/apnx_page_generator/generators/accurate_page_generator.py
@@ -13,13 +13,13 @@ class AccuratePageGenerator(IPageGenerator):
     instance = None
 
     def name(self) -> str:
-        return "accurate"
+        return 'accurate'
 
     def _generate_fallback(self, mobi_file_path: str, real_count: int | None) -> Pages:
         return FastPageGenerator.instance.generate(mobi_file_path, real_count)
 
     def _generate(self, mobi_file_path: str, real_count: int | None) -> Pages:
-        """
+        '''
         A more accurate but much more resource intensive and slower
         method to calculate the page length.
 
@@ -35,7 +35,7 @@ class AccuratePageGenerator(IPageGenerator):
         This can be make more accurate by accounting for
         <div class="mbp_pagebreak" /> as a new page marker.
         And <br> elements as an empty line.
-        """
+        '''
         pages = []
 
         html = mobi_html(mobi_file_path)
diff --git a/src/calibre/devices/kindle/apnx_page_generator/generators/exact_page_generator.py b/src/calibre/devices/kindle/apnx_page_generator/generators/exact_page_generator.py
index 37341b2e03..d492312426 100644
--- a/src/calibre/devices/kindle/apnx_page_generator/generators/exact_page_generator.py
+++ b/src/calibre/devices/kindle/apnx_page_generator/generators/exact_page_generator.py
@@ -13,17 +13,17 @@ class ExactPageGenerator(IPageGenerator):
     instance = None
 
     def name(self) -> str:
-        return "exact"
+        return 'exact'
 
     def _generate_fallback(self, mobi_file_path: str, real_count: int | None) -> Pages:
         return FastPageGenerator.instance.generate(mobi_file_path, real_count)
 
     def _generate(self, mobi_file_path: str, real_count: int | None) -> Pages:
-        """
+        '''
         Given a specified page count (such as from a custom column),
         create our array of pages for the apnx file by dividing by
         the content size of the book.
-        """
+        '''
         pages = []
         count = 0
 
diff --git a/src/calibre/devices/kindle/apnx_page_generator/generators/fast_page_generator.py b/src/calibre/devices/kindle/apnx_page_generator/generators/fast_page_generator.py
index 3a4dbce532..e759a14477 100644
--- a/src/calibre/devices/kindle/apnx_page_generator/generators/fast_page_generator.py
+++ b/src/calibre/devices/kindle/apnx_page_generator/generators/fast_page_generator.py
@@ -10,13 +10,13 @@ from calibre.devices.kindle.apnx_page_generator.pages import Pages
 class FastPageGenerator(IPageGenerator):
 
     def name(self) -> str:
-        return "fast"
+        return 'fast'
 
     def _generate_fallback(self, mobi_file_path: str, real_count: int | None) -> Pages:
-        raise Exception("Fast calculation impossible.")
+        raise Exception('Fast calculation impossible.')
 
     def _generate(self, mobi_file_path: str, real_count: int | None) -> Pages:
-        """
+        '''
         2300 characters of uncompressed text per page. This is
         not meant to map 1 to 1 to a print book but to be a
         close enough measure.
@@ -30,7 +30,7 @@ class FastPageGenerator(IPageGenerator):
         accessible in MOBI files (part of the header). Also,
         It's faster to work off of the length then to
         decompress and parse the actual text.
-        """
+        '''
 
         pages = []
         count = 0
diff --git a/src/calibre/devices/kindle/apnx_page_generator/generators/pagebreak_page_generator.py b/src/calibre/devices/kindle/apnx_page_generator/generators/pagebreak_page_generator.py
index e71346bd77..0d8870ebb7 100644
--- a/src/calibre/devices/kindle/apnx_page_generator/generators/pagebreak_page_generator.py
+++ b/src/calibre/devices/kindle/apnx_page_generator/generators/pagebreak_page_generator.py
@@ -12,16 +12,16 @@ from calibre.devices.kindle.apnx_page_generator.pages import Pages
 class PagebreakPageGenerator(IPageGenerator):
 
     def name(self) -> str:
-        return "pagebreak"
+        return 'pagebreak'
 
     def _generate_fallback(self, mobi_file_path: str, real_count: int | None) -> Pages:
         return FastPageGenerator.instance.generate(mobi_file_path, real_count)
 
     def _generate(self, mobi_file_path: str, real_count: int | None) -> Pages:
-        """ Determine pages based on the presence of <*pagebreak*/>. """
+        ''' Determine pages based on the presence of <*pagebreak*/>. '''
         html = mobi_html(mobi_file_path)
         pages = []
-        for m in re.finditer(b'<[^>]*pagebreak[^>]*>', html):
+        for m in re.finditer(br'<[^>]*pagebreak[^>]*>', html):
             pages.append(m.end())
 
         return Pages(pages)
diff --git a/src/calibre/devices/kindle/apnx_page_generator/i_page_generator.py b/src/calibre/devices/kindle/apnx_page_generator/i_page_generator.py
index 315ce59fe6..5388c96ee9 100644
--- a/src/calibre/devices/kindle/apnx_page_generator/i_page_generator.py
+++ b/src/calibre/devices/kindle/apnx_page_generator/i_page_generator.py
@@ -28,7 +28,7 @@ class IPageGenerator(metaclass=ABCMeta):
                 return result
             return self._generate_fallback(mobi_file_path, real_count)
         except Exception as e:
-            if self.__class__.__name__ == "FastPageGenerator":
+            if self.__class__.__name__ == 'FastPageGenerator':
                 raise e
             return self._generate_fallback(mobi_file_path, real_count)
 
@@ -41,7 +41,7 @@ def mobi_html(mobi_file_path: str) -> bytes:
     from calibre.ebooks.mobi.reader.mobi6 import MobiReader
     mr = MobiReader(mobi_file_path, default_log)
     if mr.book_header.encryption_type != 0:
-        raise Exception("DRMed book")
+        raise Exception('DRMed book')
     mr.extract_text()
     return as_bytes(mr.mobi_html.lower())
 
diff --git a/src/calibre/devices/kindle/apnx_page_generator/page_group.py b/src/calibre/devices/kindle/apnx_page_generator/page_group.py
index e9504a0ad7..1b777756a4 100644
--- a/src/calibre/devices/kindle/apnx_page_generator/page_group.py
+++ b/src/calibre/devices/kindle/apnx_page_generator/page_group.py
@@ -7,7 +7,7 @@ from calibre.devices.kindle.apnx_page_generator.page_number_type import PageNumb
 
 
 class PageGroup:
-    """Simulate constructor overloading"""
+    '''Simulate constructor overloading'''
     def __init__(self, page_locations: int | list[int], page_number_type: PageNumberTypes, first_value: int,
                  page_labels: str | list[str] | None = None):
         if page_locations.__class__ is int:
@@ -52,5 +52,5 @@ class PageGroup:
         if self.__page_number_type != PageNumberTypes.Custom:
             values = str(self.__first_value)
         else:
-            values = "|".join(self.__page_number_labels)
-        return f"({starting_location},{self.__page_number_type.value},{values})"
+            values = '|'.join(self.__page_number_labels)
+        return f'({starting_location},{self.__page_number_type.value},{values})'
diff --git a/src/calibre/devices/kindle/apnx_page_generator/page_number_type.py b/src/calibre/devices/kindle/apnx_page_generator/page_number_type.py
index 4f468ab204..e8c49573b1 100644
--- a/src/calibre/devices/kindle/apnx_page_generator/page_number_type.py
+++ b/src/calibre/devices/kindle/apnx_page_generator/page_number_type.py
@@ -6,6 +6,6 @@ import enum
 
 
 class PageNumberTypes(enum.Enum):
-    Arabic = "a"
-    Roman = "r"
-    Custom = "c"
+    Arabic = 'a'
+    Roman = 'r'
+    Custom = 'c'
diff --git a/src/calibre/devices/kindle/apnx_page_generator/pages.py b/src/calibre/devices/kindle/apnx_page_generator/pages.py
index 37f4a6528b..bd74568dce 100644
--- a/src/calibre/devices/kindle/apnx_page_generator/pages.py
+++ b/src/calibre/devices/kindle/apnx_page_generator/pages.py
@@ -30,14 +30,12 @@ class Pages:
         for group in self.__pages_groups:
             result.append(group.get_page_map(location))
             location += group.number_of_pages
-        return ",".join(result)
+        return ','.join(result)
 
     @property
     def page_locations(self) -> list[int]:
-        return list(itertools.chain.from_iterable(list(map(lambda pg: pg.page_locations, self.__pages_groups))))
+        return list(itertools.chain.from_iterable([pg.page_locations for pg in self.__pages_groups]))
 
     @property
     def number_of_pages(self) -> int:
-        return sum(list(map(lambda pg: len(pg.page_locations), self.__pages_groups)))
-
-
+        return sum(len(pg.page_locations) for pg in self.__pages_groups)
diff --git a/src/calibre/devices/kindle/bookmark.py b/src/calibre/devices/kindle/bookmark.py
index b794c963e5..3104ddc5cd 100644
--- a/src/calibre/devices/kindle/bookmark.py
+++ b/src/calibre/devices/kindle/bookmark.py
@@ -6,7 +6,7 @@ import os
 from struct import unpack
 
 
-class Bookmark():  # {{{
+class Bookmark:  # {{{
     '''
     A simple class fetching bookmark data
     Kindle-specific
@@ -61,11 +61,11 @@ class Bookmark():  # {{{
                 bpl = bpar_offset + 4
                 bpar_len, = unpack('>I', data[bpl:bpl+4])
                 bpar_len += 8
-                # print "bpar_len: 0x%x" % bpar_len
+                # print('bpar_len: 0x%x' % bpar_len)
                 eo = bpar_offset + bpar_len
 
                 # Walk bookmark entries
-                # print " --- %s --- " % self.path
+                # print(' --- %s --- ' % self.path)
                 current_entry = 1
                 sig = data[eo:eo+4]
                 previous_block = None
@@ -75,14 +75,14 @@ class Bookmark():  # {{{
                     entry_type = None
                     rec_len, = unpack('>I', data[eo+4:eo+8])
                     if rec_len == 0:
-                        current_block = "empty_data"
-                    elif data[eo+8:eo+12] == b"EBAR":
-                        current_block = "data_header"
+                        current_block = 'empty_data'
+                    elif data[eo+8:eo+12] == b'EBAR':
+                        current_block = 'data_header'
                         # entry_type = "data_header"
                         location, = unpack('>I', data[eo+0x34:eo+0x38])
-                        # print "data_header location: %d" % location
+                        # print('data_header location: %d' % location)
                     else:
-                        current_block = "text_block"
+                        current_block = 'text_block'
                         if previous_block == 'empty_data':
                             entry_type = 'Note'
                         elif previous_block == 'data_header':
@@ -91,10 +91,10 @@ class Bookmark():  # {{{
 
                     if entry_type:
                         displayed_location = location // MAGIC_MOBI_CONSTANT + 1
-                        user_notes[location] = dict(id=self.id,
-                                                    displayed_location=displayed_location,
-                                                    type=entry_type,
-                                                    text=text)
+                        user_notes[location] = {'id': self.id,
+                                                'displayed_location': displayed_location,
+                                                'type': entry_type,
+                                                'text': text}
 
                     eo += rec_len + 8
                     current_entry += 1
@@ -111,13 +111,11 @@ class Bookmark():  # {{{
                         # Switch location to start (0x08:0x0c)
                         start, = unpack('>I', data[eo+8:eo+12])
                         user_notes[start] = user_notes[end_loc]
-                        '''
-                        print " %s: swapping 0x%x (%d) to 0x%x (%d)" % (user_notes[end_loc]['type'],
-                                                                    end_loc,
-                                                                    end_loc/MAGIC_MOBI_CONSTANT + 1,
-                                                                    start,
-                                                                    start//MAGIC_MOBI_CONSTANT + 1)
-                        '''
+                        # print(" %s: swapping 0x%x (%d) to 0x%x (%d)" % (user_notes[end_loc]['type'],
+                        #                                             end_loc,
+                        #                                             end_loc/MAGIC_MOBI_CONSTANT + 1,
+                        #                                             start,
+                        #                                             start//MAGIC_MOBI_CONSTANT + 1))
                         user_notes[start]['displayed_location'] = start // MAGIC_MOBI_CONSTANT + 1
                         user_notes.pop(end_loc)
                     else:
@@ -125,12 +123,12 @@ class Bookmark():  # {{{
                         # be the same - cheat by nudging -1
                         # Skip bookmark for last_read_location
                         if end_loc != self.last_read:
-                            # print " adding Bookmark at 0x%x (%d)" % (end_loc, end_loc/MAGIC_MOBI_CONSTANT + 1)
+                            # print(' adding Bookmark at 0x%x (%d)' % (end_loc, end_loc/MAGIC_MOBI_CONSTANT + 1))
                             displayed_location = end_loc // MAGIC_MOBI_CONSTANT + 1
-                            user_notes[end_loc - 1] = dict(id=self.id,
-                                                           displayed_location=displayed_location,
-                                                           type='Bookmark',
-                                                           text=None)
+                            user_notes[end_loc - 1] = {'id': self.id,
+                                                       'displayed_location': displayed_location,
+                                                       'type': 'Bookmark',
+                                                       'text': None}
                     rec_len, = unpack('>I', data[eo+4:eo+8])
                     eo += rec_len + 8
                     sig = data[eo:eo+4]
@@ -149,7 +147,7 @@ class Bookmark():  # {{{
                     mi = get_topaz_metadata(stream)
                 my_clippings = self.path
                 split = my_clippings.find('documents') + len('documents/')
-                my_clippings = my_clippings[:split] + "My Clippings.txt"
+                my_clippings = my_clippings[:split] + 'My Clippings.txt'
                 try:
                     with open(my_clippings, encoding='utf-8', errors='replace') as f2:
                         marker_found = 0
@@ -200,10 +198,10 @@ class Bookmark():  # {{{
                         e_type = 'Unknown annotation type'
 
                     displayed_location = location/MAGIC_TOPAZ_CONSTANT + 1
-                    user_notes[location] = dict(id=self.id,
-                                                displayed_location=displayed_location,
-                                                type=e_type,
-                                                text=text)
+                    user_notes[location] = {'id': self.id,
+                                            'displayed_location': displayed_location,
+                                            'type': e_type,
+                                            'text': text}
                     if text_len == 0xFFFFFFFF:
                         e_base = e_base + 14
                     else:
@@ -225,37 +223,36 @@ class Bookmark():  # {{{
                 e_base = 0x0d
                 self.pdf_page_offset = 0
                 while current_entry < entries:
-                    '''
-                    location, = unpack('>I', data[e_base+2:e_base+6])
-                    text = None
-                    text_len, = unpack('>I', data[e_base+0xA:e_base+0xE])
-                    e_type, = unpack('>B', data[e_base+1])
-                    if e_type == 0:
-                        e_type = 'Bookmark'
-                    elif e_type == 1:
-                        e_type = 'Highlight'
-                        text = get_topaz_highlight(location/MAGIC_TOPAZ_CONSTANT + 1)
-                    elif e_type == 2:
-                        e_type = 'Note'
-                        text = data[e_base+0x10:e_base+0x10+text_len]
-                    else:
-                        e_type = 'Unknown annotation type'
+                    # location, = unpack('>I', data[e_base+2:e_base+6])
+                    # text = None
+                    # text_len, = unpack('>I', data[e_base+0xA:e_base+0xE])
+                    # e_type, = unpack('>B', data[e_base+1])
+                    # if e_type == 0:
+                    #     e_type = 'Bookmark'
+                    # elif e_type == 1:
+                    #     e_type = 'Highlight'
+                    #     text = get_topaz_highlight(location/MAGIC_TOPAZ_CONSTANT + 1)
+                    # elif e_type == 2:
+                    #     e_type = 'Note'
+                    #     text = data[e_base+0x10:e_base+0x10+text_len]
+                    # else:
+                    #     e_type = 'Unknown annotation type'
+                    #
+                    # if self.book_format in ['tpz','azw1']:
+                    #     displayed_location = location/MAGIC_TOPAZ_CONSTANT + 1
+                    # elif self.book_format == 'pdf':
+                    #     # *** This needs implementation
+                    #     displayed_location = location
+                    # user_notes[location] = dict(id=self.id,
+                    #                             displayed_location=displayed_location,
+                    #                             type=e_type,
+                    #                             text=text)
+                    # if text_len == 0xFFFFFFFF:
+                    #     e_base = e_base + 14
+                    # else:
+                    #     e_base = e_base + 14 + 2 + text_len
+                    # current_entry += 1
 
-                    if self.book_format in ['tpz','azw1']:
-                        displayed_location = location/MAGIC_TOPAZ_CONSTANT + 1
-                    elif self.book_format == 'pdf':
-                        # *** This needs implementation
-                        displayed_location = location
-                    user_notes[location] = dict(id=self.id,
-                                                displayed_location=displayed_location,
-                                                type=e_type,
-                                                text=text)
-                    if text_len == 0xFFFFFFFF:
-                        e_base = e_base + 14
-                    else:
-                        e_base = e_base + 14 + 2 + text_len
-                    current_entry += 1
-                    '''
                     # Use label as page number
                     pdf_location, = unpack('>I', data[e_base+1:e_base+5])
                     label_len, = unpack('>H', data[e_base+5:e_base+7])
@@ -263,10 +260,10 @@ class Bookmark():  # {{{
                     displayed_location = location
                     e_type = 'Bookmark'
                     text = None
-                    user_notes[location] = dict(id=self.id,
-                                                displayed_location=displayed_location,
-                                                type=e_type,
-                                                text=text)
+                    user_notes[location] = {'id': self.id,
+                                            'displayed_location': displayed_location,
+                                            'type': e_type,
+                                            'text': text}
                     self.pdf_page_offset = pdf_location - location
                     e_base += (7 + label_len)
                     current_entry += 1
@@ -274,7 +271,7 @@ class Bookmark():  # {{{
                 self.last_read_location = self.last_read - self.pdf_page_offset
 
         else:
-            print("unsupported bookmark_extension: %s" % self.bookmark_extension)
+            print('unsupported bookmark_extension: %s' % self.bookmark_extension)
         self.user_notes = user_notes
 
     def get_book_length(self):
@@ -303,6 +300,6 @@ class Bookmark():  # {{{
             except:
                 pass
         else:
-            print("unsupported bookmark_extension: %s" % self.bookmark_extension)
+            print('unsupported bookmark_extension: %s' % self.bookmark_extension)
 
 # }}}
diff --git a/src/calibre/devices/kindle/driver.py b/src/calibre/devices/kindle/driver.py
index 9b022966ac..6c3e08f698 100644
--- a/src/calibre/devices/kindle/driver.py
+++ b/src/calibre/devices/kindle/driver.py
@@ -245,7 +245,7 @@ class KINDLE(USBMS):
         if mc_path:
             timestamp = utcfromtimestamp(os.path.getmtime(mc_path))
             bookmarked_books['clippings'] = self.UserAnnotation(type='kindle_clippings',
-                                              value=dict(path=mc_path, timestamp=timestamp))
+                                              value={'path': mc_path, 'timestamp': timestamp})
 
         # This returns as job.result in gui2.ui.annotations_fetched(self,job)
         return bookmarked_books
@@ -264,12 +264,12 @@ class KINDLE(USBMS):
 
         # Add the last-read location
         if bookmark.book_format == 'pdf':
-            markup = _("%(time)s<br />Last page read: %(loc)d (%(pr)d%%)") % dict(
+            markup = _('%(time)s<br />Last page read: %(loc)d (%(pr)d%%)') % dict(
                     time=strftime('%x', timestamp.timetuple()),
                     loc=last_read_location,
                     pr=percent_read)
         else:
-            markup = _("%(time)s<br />Last page read: Location %(loc)d (%(pr)d%%)") % dict(
+            markup = _('%(time)s<br />Last page read: Location %(loc)d (%(pr)d%%)') % dict(
                     time=strftime('%x', timestamp.timetuple()),
                     loc=last_read_location,
                     pr=percent_read)
@@ -312,7 +312,7 @@ class KINDLE(USBMS):
                 divTag.insert(dtc, annot)
                 dtc += 1
 
-        ka_soup.insert(0,divTag)
+        ka_soup.insert(0, divTag)
         return ka_soup
 
     def add_annotation_to_library(self, db, db_id, annotation):
@@ -610,7 +610,7 @@ class KINDLE2(KINDLE):
 
         # Create the sidecar folder if necessary
         if (self.sidecar_apnx):
-            path = os.path.join(os.path.dirname(filepath), filename+".sdr")
+            path = os.path.join(os.path.dirname(filepath), filename+'.sdr')
 
             if not os.path.exists(path):
                 os.makedirs(path)
@@ -636,7 +636,7 @@ class KINDLE2(KINDLE):
                         if temp in self.EXTRA_CUSTOMIZATION_CHOICES[self.OPT_APNX_METHOD]:
                             method = temp
                         else:
-                            print("Invalid method choice for this book (%r), ignoring." % temp)
+                            print('Invalid method choice for this book (%r), ignoring.' % temp)
                     except:
                         print('Could not retrieve override method choice, using default.')
                 apnx_builder.write_apnx(filepath, apnx_path, method=method, page_count=custom_page_count)
diff --git a/src/calibre/devices/kobo/bookmark.py b/src/calibre/devices/kobo/bookmark.py
index 75b53c9f06..63269ef685 100644
--- a/src/calibre/devices/kobo/bookmark.py
+++ b/src/calibre/devices/kobo/bookmark.py
@@ -7,7 +7,7 @@ import os
 from calibre.prints import debug_print
 
 
-class Bookmark():  # {{{
+class Bookmark:  # {{{
     '''
     A simple class fetching bookmark data
     kobo-specific
@@ -54,7 +54,7 @@ class Bookmark():  # {{{
             'ORDER BY bm.ContentID, bm.chapterprogress'
         )
 
-        debug_print(f"Kobo::Bookmark::get_bookmark_data - getting kepub chapters: contentId={self.contentId}")
+        debug_print(f'Kobo::Bookmark::get_bookmark_data - getting kepub chapters: contentId={self.contentId}')
         cursor.execute(kepub_chapter_query, book_query_values)
         kepub_chapters = {}
         if self.kepub:
@@ -66,9 +66,9 @@ class Bookmark():  # {{{
                                                          'chapter_title': chapter_row['Title'],
                                                          'chapter_index': chapter_row['VolumeIndex']
                                                         }
-                debug_print(f"Kobo::Bookmark::get_bookmark_data - getting kepub chapter: kepub chapters={kepub_chapters}")
+                debug_print(f'Kobo::Bookmark::get_bookmark_data - getting kepub chapter: kepub chapters={kepub_chapters}')
             except:
-                debug_print("Kobo::Bookmark::get_bookmark_data - No chapters found")
+                debug_print('Kobo::Bookmark::get_bookmark_data - No chapters found')
 
         cursor.execute(bookmark_query, book_query_values)
 
@@ -90,9 +90,9 @@ class Bookmark():  # {{{
                 debug_print(f"Kobo::Bookmark::get_bookmark_data - getting kepub: chapter opf_reference='{opf_reference}'")
                 file_contentID_part = file_contentID_part[filename_index + 1:]
                 debug_print(f"Kobo::Bookmark::get_bookmark_data - getting kepub: chapter file_contentID_part='{file_contentID_part}'")
-#                 from urllib import quote
-#                 file_contentID_part = quote(file_contentID_part)
-                chapter_contentID = book_contentID_part + "!" + opf_reference + "!" + file_contentID_part
+                # from urllib import quote
+                # file_contentID_part = quote(file_contentID_part)
+                chapter_contentID = book_contentID_part + '!' + opf_reference + '!' + file_contentID_part
                 debug_print(f"Kobo::Bookmark::get_bookmark_data - getting kepub chapter chapter_contentID='{chapter_contentID}'")
                 kepub_chapter = kepub_chapters.get(chapter_contentID, None)
                 if kepub_chapter is not None:
@@ -115,7 +115,7 @@ class Bookmark():  # {{{
                 e_type = 'Bookmark'
                 text = row['Title']
             # highlight is text with no annotation
-            elif text is not None and (annotation is None or annotation == ""):
+            elif text is not None and (annotation is None or annotation == ''):
                 e_type = 'Highlight'
             elif text and annotation:
                 e_type = 'Annotation'
@@ -126,16 +126,16 @@ class Bookmark():  # {{{
 
             # book_title = row[8]
             chapter_progress = min(round(float(100*row['ChapterProgress']),2),100)
-            user_notes[note_id] = dict(id=self.id,
-                                    displayed_location=note_id,
-                                    type=e_type,
-                                    text=text,
-                                    annotation=annotation,
-                                    chapter=current_chapter,
-                                    chapter_title=chapter_title,
-                                    chapter_progress=chapter_progress)
+            user_notes[note_id] = {'id': self.id,
+                                   'displayed_location': note_id,
+                                   'type': e_type,
+                                   'text': text,
+                                   'annotation': annotation,
+                                   'chapter': current_chapter,
+                                   'chapter_title': chapter_title,
+                                   'chapter_progress': chapter_progress}
             previous_chapter = current_chapter
-            # debug_print("e_type:" , e_type, '\t', 'loc: ', note_id, 'text: ', text,
+            # debug_print("e_type:", e_type, '\t', 'loc: ', note_id, 'text: ', text,
             # 'annotation: ', annotation, 'chapter_title: ', chapter_title,
             # 'chapter_progress: ', chapter_progress, 'date: ')
 
@@ -149,10 +149,10 @@ class Bookmark():  # {{{
         for row in cursor:
             self.last_read = row['DateLastRead']
             self.percent_read = 100 if (row['ReadStatus'] == 2) else row['___PercentRead']
-            # print row[1]
+            # print(row[1])
         cursor.close()
 
-#                self.last_read_location = self.last_read - self.pdf_page_offset
+        # self.last_read_location = self.last_read - self.pdf_page_offset
         self.user_notes = user_notes
 
     def get_book_length(self):
@@ -165,7 +165,7 @@ class Bookmark():  # {{{
         A string representation of this object, suitable for printing to
         console
         '''
-        ans = ["Kobo bookmark:"]
+        ans = ['Kobo bookmark:']
 
         def fmt(x, y):
             ans.append('%-20s: %s'%(str(x), str(y)))
@@ -181,9 +181,8 @@ class Bookmark():  # {{{
         if self.user_notes:
             fmt('User Notes', self.user_notes)
 
-        ans = '\n'.join(ans) + "\n"
+        ans = '\n'.join(ans) + '\n'
 
         return ans
 
-
 # }}}
diff --git a/src/calibre/devices/kobo/books.py b/src/calibre/devices/kobo/books.py
index 4e4f8b5aac..786ae89fef 100644
--- a/src/calibre/devices/kobo/books.py
+++ b/src/calibre/devices/kobo/books.py
@@ -1,5 +1,5 @@
 __license__   = 'GPL v3'
-__copyright__ = '2010-2012, , Timothy Legge <timlegge at gmail.com> and David Forrester <davidfor@internode.on.net>'
+__copyright__ = '2010-2012, Timothy Legge <timlegge at gmail.com> and David Forrester <davidfor@internode.on.net>'
 __docformat__ = 'restructuredtext en'
 
 import os
@@ -21,14 +21,14 @@ class Book(Book_):
     def __init__(self, prefix, lpath, title=None, authors=None, mime=None, date=None, ContentType=None,
                  thumbnail_name=None, size=None, other=None):
         from calibre.utils.date import parse_date
-#         debug_print('Book::__init__ - title=', title)
-        show_debug = title is not None and title.lower().find("xxxxx") >= 0
+        # debug_print('Book::__init__ - title=', title)
+        show_debug = title is not None and title.lower().find('xxxxx') >= 0
         if other is not None:
             other.title = title
             other.published_date = date
         if show_debug:
-            debug_print("Book::__init__ - title=", title, 'authors=', authors)
-            debug_print("Book::__init__ - other=", other)
+            debug_print('Book::__init__ - title=', title, 'authors=', authors)
+            debug_print('Book::__init__ - other=', other)
         super().__init__(prefix, lpath, size, other)
 
         if title is not None and len(title) > 0:
@@ -36,7 +36,7 @@ class Book(Book_):
 
         if authors is not None and len(authors) > 0:
             self.authors_from_string(authors)
-            if self.author_sort is None or self.author_sort == "Unknown":
+            if self.author_sort is None or self.author_sort == 'Unknown':
                 self.author_sort = author_to_author_sort(authors)
 
         self.mime = mime
@@ -45,13 +45,13 @@ class Book(Book_):
 
         if ContentType == '6' and date is not None:
             try:
-                self.datetime = time.strptime(date, "%Y-%m-%dT%H:%M:%S.%f")
+                self.datetime = time.strptime(date, '%Y-%m-%dT%H:%M:%S.%f')
             except:
                 try:
-                    self.datetime = time.strptime(date.split('+')[0], "%Y-%m-%dT%H:%M:%S")
+                    self.datetime = time.strptime(date.split('+')[0], '%Y-%m-%dT%H:%M:%S')
                 except:
                     try:
-                        self.datetime = time.strptime(date.split('+')[0], "%Y-%m-%d")
+                        self.datetime = time.strptime(date.split('+')[0], '%Y-%m-%d')
                     except:
                         try:
                             self.datetime = parse_date(date,
@@ -77,13 +77,13 @@ class Book(Book_):
             self.thumbnail = ImageWrapper(thumbnail_name)
 
         if show_debug:
-            debug_print("Book::__init__ end - self=", self)
-            debug_print("Book::__init__ end - title=", title, 'authors=', authors)
+            debug_print('Book::__init__ end - self=', self)
+            debug_print('Book::__init__ end - title=', title, 'authors=', authors)
 
     @property
     def is_sideloaded(self):
         # If we don't have a content Id, we don't know what type it is.
-        return self.contentID and self.contentID.startswith("file")
+        return self.contentID and self.contentID.startswith('file')
 
     @property
     def has_kobo_series(self):
@@ -91,14 +91,14 @@ class Book(Book_):
 
     @property
     def is_purchased_kepub(self):
-        return self.contentID and not self.contentID.startswith("file")
+        return self.contentID and not self.contentID.startswith('file')
 
     def __str__(self):
         '''
         A string representation of this object, suitable for printing to
         console
         '''
-        ans = ["Kobo metadata:"]
+        ans = ['Kobo metadata:']
 
         def fmt(x, y):
             ans.append('%-20s: %s'%(str(x), str(y)))
@@ -118,7 +118,7 @@ class Book(Book_):
 
         ans = '\n'.join(ans)
 
-        return super().__str__() + "\n" + ans
+        return super().__str__() + '\n' + ans
 
 
 class ImageWrapper:
@@ -134,7 +134,7 @@ class KTCollectionsBookList(CollectionsBookList):
         self.set_device_managed_collections([])
 
     def get_collections(self, collection_attributes, collections_template=None, template_globals=None):
-        debug_print("KTCollectionsBookList:get_collections - start - collection_attributes=", collection_attributes)
+        debug_print('KTCollectionsBookList:get_collections - start - collection_attributes=', collection_attributes)
 
         collections = {}
 
@@ -142,7 +142,7 @@ class KTCollectionsBookList(CollectionsBookList):
         for c in collection_attributes:
             ca.append(c.lower())
         collection_attributes = ca
-        debug_print("KTCollectionsBookList:get_collections - collection_attributes=", collection_attributes)
+        debug_print('KTCollectionsBookList:get_collections - collection_attributes=', collection_attributes)
 
         for book in self:
             tsval = book.get('title_sort', book.title)
@@ -151,7 +151,7 @@ class KTCollectionsBookList(CollectionsBookList):
 
             show_debug = self.is_debugging_title(tsval) or tsval is None
             if show_debug:  # or len(book.device_collections) > 0:
-                debug_print('KTCollectionsBookList:get_collections - tsval=', tsval, "book.title=", book.title, "book.title_sort=", book.title_sort)
+                debug_print('KTCollectionsBookList:get_collections - tsval=', tsval, 'book.title=', book.title, 'book.title_sort=', book.title_sort)
                 debug_print('KTCollectionsBookList:get_collections - book.device_collections=', book.device_collections)
                 # debug_print(book)
             # Make sure we can identify this book via the lpath
@@ -168,7 +168,7 @@ class KTCollectionsBookList(CollectionsBookList):
             # book in all existing collections. Do not add any new ones.
             attrs = ['device_collections']
             if getattr(book, '_new_book', False):
-                debug_print("KTCollectionsBookList:get_collections - sending new book")
+                debug_print('KTCollectionsBookList:get_collections - sending new book')
                 if prefs['manage_device_metadata'] == 'manual':
                     # Ensure that the book is in all the book's existing
                     # collections plus all metadata collections
@@ -187,14 +187,14 @@ class KTCollectionsBookList(CollectionsBookList):
                         if cat_name not in collections:
                             collections[cat_name] = {}
                             if show_debug:
-                                debug_print("KTCollectionsBookList:get_collections - Device Managed Collection:", cat_name)
+                                debug_print('KTCollectionsBookList:get_collections - Device Managed Collection:', cat_name)
                         if lpath not in collections[cat_name]:
                             collections[cat_name][lpath] = book
                             if show_debug:
-                                debug_print("KTCollectionsBookList:get_collections - Device Managed Collection -added book to cat_name", cat_name)
+                                debug_print('KTCollectionsBookList:get_collections - Device Managed Collection -added book to cat_name', cat_name)
                 book.device_collections = []
             if show_debug:
-                debug_print("KTCollectionsBookList:get_collections - attrs=", attrs)
+                debug_print('KTCollectionsBookList:get_collections - attrs=', attrs)
 
             if collections_template is not None:
                 attrs.append('%template%')
@@ -212,7 +212,7 @@ class KTCollectionsBookList(CollectionsBookList):
                     doing_dc = True
                     val = book.device_collections  # is a list
                     if show_debug:
-                        debug_print("KTCollectionsBookList:get_collections - adding book.device_collections", book.device_collections)
+                        debug_print('KTCollectionsBookList:get_collections - adding book.device_collections', book.device_collections)
                 elif attr == '%template%':
                     doing_dc = False
                     val = ''
@@ -220,7 +220,7 @@ class KTCollectionsBookList(CollectionsBookList):
                         nv = SafeFormat().safe_format(collections_template, book,
                                                       'KOBO', book, global_vars=template_globals)
                         if show_debug:
-                            debug_print("KTCollectionsBookList:get_collections collections_template - result", nv)
+                            debug_print('KTCollectionsBookList:get_collections collections_template - result', nv)
                         if nv:
                             val = [v.strip() for v in nv.split(':@:') if v.strip()]
                 else:
@@ -228,7 +228,7 @@ class KTCollectionsBookList(CollectionsBookList):
                     ign, val, orig_val, fm = book.format_field_extended(attr)
                     val = book.get(attr, None)
                     if show_debug:
-                        debug_print("KTCollectionsBookList:get_collections - not device_collections")
+                        debug_print('KTCollectionsBookList:get_collections - not device_collections')
                         debug_print('          ign=', ign, ', val=', val, ' orig_val=', orig_val, 'fm=', fm)
                         debug_print('          val=', val)
 
@@ -249,16 +249,16 @@ class KTCollectionsBookList(CollectionsBookList):
                     else:
                         val = [orig_val]
                     if show_debug:
-                        debug_print("KTCollectionsBookList:get_collections - val is text and multiple", val)
+                        debug_print('KTCollectionsBookList:get_collections - val is text and multiple', val)
                 elif fm is not None and fm['datatype'] == 'composite' and fm['is_multiple']:
                     if show_debug:
-                        debug_print("KTCollectionsBookList:get_collections - val is compositeand multiple", val)
+                        debug_print('KTCollectionsBookList:get_collections - val is compositeand multiple', val)
                     val = [v.strip() for v in
                            val.split(fm['is_multiple']['ui_to_list'])]
                 else:
                     val = [val]
                 if show_debug:
-                    debug_print("KTCollectionsBookList:get_collections - val=", val)
+                    debug_print('KTCollectionsBookList:get_collections - val=', val)
 
                 for category in val:
                     # debug_print("KTCollectionsBookList:get_collections - category=", category)
@@ -282,13 +282,13 @@ class KTCollectionsBookList(CollectionsBookList):
                     if cat_name not in collections:
                         collections[cat_name] = {}
                         if show_debug:
-                            debug_print("KTCollectionsBookList:get_collections - created collection for cat_name", cat_name)
+                            debug_print('KTCollectionsBookList:get_collections - created collection for cat_name', cat_name)
                     if lpath not in collections[cat_name]:
                         collections[cat_name][lpath] = book
                         if show_debug:
-                            debug_print("KTCollectionsBookList:get_collections - added book to collection for cat_name", cat_name)
+                            debug_print('KTCollectionsBookList:get_collections - added book to collection for cat_name', cat_name)
                     if show_debug:
-                        debug_print("KTCollectionsBookList:get_collections - cat_name", cat_name)
+                        debug_print('KTCollectionsBookList:get_collections - cat_name', cat_name)
 
         # Sort collections
         result = {}
@@ -296,7 +296,7 @@ class KTCollectionsBookList(CollectionsBookList):
         for category, lpaths in collections.items():
             result[category] = lpaths.values()
         # debug_print("KTCollectionsBookList:get_collections - result=", result.keys())
-        debug_print("KTCollectionsBookList:get_collections - end")
+        debug_print('KTCollectionsBookList:get_collections - end')
         return result
 
     def set_device_managed_collections(self, collection_names):
@@ -308,9 +308,9 @@ class KTCollectionsBookList(CollectionsBookList):
     def is_debugging_title(self, title):
         if not DEBUG:
             return False
-#        debug_print("KTCollectionsBookList:is_debugging - title=", title, "self.debugging_title=", self.debugging_title)
+        # debug_print("KTCollectionsBookList:is_debugging - title=", title, "self.debugging_title=", self.debugging_title)
         is_debugging = self.debugging_title is not None and len(self.debugging_title) > 0 and title is not None and (
             title.lower().find(self.debugging_title.lower()) >= 0 or len(title) == 0)
-#        debug_print("KTCollectionsBookList:is_debugging - is_debugging=", is_debugging)
+        # debug_print("KTCollectionsBookList:is_debugging - is_debugging=", is_debugging)
 
         return is_debugging
diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index d1a7b739ae..5c376c0004 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -37,7 +37,7 @@ from polyglot.builtins import iteritems, itervalues, string_or_bytes
 
 EPUB_EXT  = '.epub'
 KEPUB_EXT = '.kepub'
-KOBO_ROOT_DIR_NAME = ".kobo"
+KOBO_ROOT_DIR_NAME = '.kobo'
 
 DEFAULT_COVER_LETTERBOX_COLOR = '#000000'
 
@@ -45,11 +45,11 @@ DEFAULT_COVER_LETTERBOX_COLOR = '#000000'
 
 
 def qhash(inputstr):
-    instr = b""
+    instr = b''
     if isinstance(inputstr, bytes):
         instr = inputstr
     elif isinstance(inputstr, str):
-        instr = inputstr.encode("utf8")
+        instr = inputstr.encode('utf8')
     else:
         return -1
 
@@ -206,15 +206,15 @@ class KOBO(USBMS):
         return dbversion
 
     def device_version_info(self):
-        debug_print("device_version_info - start")
+        debug_print('device_version_info - start')
         if not self._device_version_info:
-            version_file = os.path.join(self._main_prefix, KOBO_ROOT_DIR_NAME, "version")
-            debug_print(f"device_version_info - version_file={version_file}")
+            version_file = os.path.join(self._main_prefix, KOBO_ROOT_DIR_NAME, 'version')
+            debug_print(f'device_version_info - version_file={version_file}')
             if os.path.isfile(version_file):
-                debug_print("device_version_info - have opened version_file")
+                debug_print('device_version_info - have opened version_file')
                 with open(version_file) as vf:
-                    self._device_version_info = vf.read().strip().split(",")
-                debug_print("device_version_info - self._device_version_info=", self._device_version_info)
+                    self._device_version_info = vf.read().strip().split(',')
+                debug_print('device_version_info - self._device_version_info=', self._device_version_info)
         return self._device_version_info
 
     def device_serial_no(self):
@@ -292,7 +292,7 @@ class KOBO(USBMS):
                 if lpath.startswith(os.sep):
                     lpath = lpath[len(os.sep):]
                 lpath = lpath.replace('\\', '/')
-                # debug_print("LPATH: ", lpath, "  - Title:  " , title)
+                # debug_print("LPATH: ", lpath, "  - Title:  ", title)
 
                 playlist_map = {}
 
@@ -321,7 +321,7 @@ class KOBO(USBMS):
                     playlist_map[lpath].append('Recommendation')
 
                 path = self.normalize_path(path)
-                # print "Normalized FileName: " + path
+                # print('Normalized FileName: ' + path)
 
                 idx = bl_cache.get(lpath, None)
                 if idx is not None:
@@ -332,18 +332,18 @@ class KOBO(USBMS):
                             # Try the Touch version if the image does not exist
                             imagename = self.normalize_path(self._main_prefix + KOBO_ROOT_DIR_NAME + '/images/' + ImageID + ' - N3_LIBRARY_FULL.parsed')
 
-                        # print "Image name Normalized: " + imagename
+                        # print('Image name Normalized: ' + imagename)
                         if not os.path.exists(imagename):
-                            debug_print("Strange - The image name does not exist - title: ", title)
+                            debug_print('Strange - The image name does not exist - title: ', title)
                         if imagename is not None:
                             bl[idx].thumbnail = ImageWrapper(imagename)
                     if (ContentType != '6' and MimeType != 'Shortcover'):
                         if os.path.exists(self.normalize_path(os.path.join(prefix, lpath))):
                             if self.update_metadata_item(bl[idx]):
-                                # print 'update_metadata_item returned true'
+                                # print('update_metadata_item returned true')
                                 changed = True
                         else:
-                            debug_print("    Strange:  The file: ", prefix, lpath, " does not exist!")
+                            debug_print('    Strange:  The file: ', prefix, lpath, ' does not exist!')
                     if lpath in playlist_map and \
                         playlist_map[lpath] not in bl[idx].device_collections:
                         bl[idx].device_collections = playlist_map.get(lpath,[])
@@ -355,16 +355,16 @@ class KOBO(USBMS):
                             if os.path.exists(self.normalize_path(os.path.join(prefix, lpath))):
                                 book = self.book_from_path(prefix, lpath, title, authors, mime, date, ContentType, ImageID)
                             else:
-                                debug_print("    Strange:  The file: ", prefix, lpath, " does not exist!")
-                                title = "FILE MISSING: " + title
+                                debug_print('    Strange:  The file: ', prefix, lpath, ' does not exist!')
+                                title = 'FILE MISSING: ' + title
                                 book = self.book_class(prefix, lpath, title, authors, mime, date, ContentType, ImageID, size=1048576)
 
                         except:
-                            debug_print("prefix: ", prefix, "lpath: ", lpath, "title: ", title, "authors: ", authors,
-                                        "mime: ", mime, "date: ", date, "ContentType: ", ContentType, "ImageID: ", ImageID)
+                            debug_print('prefix: ', prefix, 'lpath: ', lpath, 'title: ', title, 'authors: ', authors,
+                                        'mime: ', mime, 'date: ', date, 'ContentType: ', ContentType, 'ImageID: ', ImageID)
                             raise
 
-                    # print 'Update booklist'
+                    # print('Update booklist')
                     book.device_collections = playlist_map.get(lpath,[])  # if lpath in playlist_map else []
 
                     if bl.add_book(book, replace_metadata=False):
@@ -377,7 +377,7 @@ class KOBO(USBMS):
         with closing(self.device_database_connection(use_row_factory=True)) as connection:
 
             self.dbversion = self.get_database_version(connection)
-            debug_print("Database Version: ", self.dbversion)
+            debug_print('Database Version: ', self.dbversion)
 
             cursor = connection.cursor()
             opts = self.settings()
@@ -387,7 +387,7 @@ class KOBO(USBMS):
                     'BookID is Null %(previews)s %(recommendations)s and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(
                         expiry=' and ContentType = 6)' if opts.extra_customization[self.OPT_SHOW_EXPIRED_BOOK_RECORDS] else ')',
                     previews=' and Accessibility <> 6' if not self.show_previews else '',
-                    recommendations=' and IsDownloaded in (\'true\', 1)' if opts.extra_customization[self.OPT_SHOW_RECOMMENDATIONS] is False else '')
+                    recommendations=" and IsDownloaded in ('true', 1)" if opts.extra_customization[self.OPT_SHOW_RECOMMENDATIONS] is False else '')
             elif self.dbversion >= 16 and self.dbversion < 33:
                 query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, '
                     'ImageID, ReadStatus, ___ExpirationStatus, FavouritesIndex, Accessibility, "1" as IsDownloaded from content where '
@@ -422,16 +422,16 @@ class KOBO(USBMS):
 
             changed = False
             for row in cursor:
-                #  self.report_progress((i+1) / float(numrows), _('Getting list of books on device...'))
-                if not hasattr(row['ContentID'], 'startswith') or row['ContentID'].startswith("file:///usr/local/Kobo/help/"):
+                # self.report_progress((i+1) / float(numrows), _('Getting list of books on device...'))
+                if not hasattr(row['ContentID'], 'startswith') or row['ContentID'].startswith('file:///usr/local/Kobo/help/'):
                     # These are internal to the Kobo device and do not exist
                     continue
                 path = self.path_from_contentid(row['ContentID'], row['ContentType'], row['MimeType'], oncard)
                 mime = mime_type_ext(path_to_ext(path)) if path.find('kepub') == -1 else 'application/epub+zip'
                 # debug_print("mime:", mime)
-                if oncard != 'carda' and oncard != 'cardb' and not row['ContentID'].startswith("file:///mnt/sd/"):
+                if oncard != 'carda' and oncard != 'cardb' and not row['ContentID'].startswith('file:///mnt/sd/'):
                     prefix = self._main_prefix
-                elif oncard == 'carda' and row['ContentID'].startswith("file:///mnt/sd/"):
+                elif oncard == 'carda' and row['ContentID'].startswith('file:///mnt/sd/'):
                     prefix = self._card_a_prefix
                 changed = update_booklist(self._main_prefix, path,
                                           row['Title'], row['Attribution'], mime, row['DateCreated'], row['ContentType'],
@@ -452,8 +452,8 @@ class KOBO(USBMS):
                 need_sync = True
                 del bl[idx]
 
-        # print "count found in cache: %d, count of files in metadata: %d, need_sync: %s" % \
-        #      (len(bl_cache), len(bl), need_sync)
+        # print('count found in cache: %d, count of files in metadata: %d, need_sync: %s' % \
+        #      (len(bl_cache), len(bl), need_sync))
         if need_sync:  # self.count_found_in_bl != len(bl) or need_sync:
             if oncard == 'cardb':
                 self.sync_booklists((None, None, bl))
@@ -466,21 +466,21 @@ class KOBO(USBMS):
         return bl
 
     def filename_callback(self, path, mi):
-        #        debug_print("Kobo:filename_callback:Path - {0}".format(path))
+        # debug_print("Kobo:filename_callback:Path - {0}".format(path))
 
         idx = path.rfind('.')
         ext = path[idx:]
         if ext == KEPUB_EXT:
             path = path + EPUB_EXT
-#            debug_print("Kobo:filename_callback:New path - {0}".format(path))
+            # debug_print("Kobo:filename_callback:New path - {0}".format(path))
 
         return path
 
     def delete_via_sql(self, ContentID, ContentType):
         # Delete Order:
-        #    1) shortcover_page
-        #    2) volume_shorcover
-        #    2) content
+        # 1) shortcover_page
+        # 2) volume_shorcover
+        # 2) content
 
         debug_print('delete_via_sql: ContentID: ', ContentID, 'ContentType: ', ContentType)
         with closing(self.device_database_connection()) as connection:
@@ -514,26 +514,26 @@ class KOBO(USBMS):
             cursor.execute('delete from content where BookID = ?', t)
             if ContentType == 6:
                 try:
-                    cursor.execute('update content set ReadStatus=0, FirstTimeReading = \'true\', ___PercentRead=0, ___ExpirationStatus=3 '
+                    cursor.execute("update content set ReadStatus=0, FirstTimeReading = 'true', ___PercentRead=0, ___ExpirationStatus=3 "
                         'where BookID is Null and ContentID =?',t)
                 except Exception as e:
                     if 'no such column' not in str(e):
                         raise
                     try:
-                        cursor.execute('update content set ReadStatus=0, FirstTimeReading = \'true\', ___PercentRead=0 '
+                        cursor.execute("update content set ReadStatus=0, FirstTimeReading = 'true', ___PercentRead=0 "
                             'where BookID is Null and ContentID =?',t)
                     except Exception as e:
                         if 'no such column' not in str(e):
                             raise
-                        cursor.execute('update content set ReadStatus=0, FirstTimeReading = \'true\' '
+                        cursor.execute("update content set ReadStatus=0, FirstTimeReading = 'true' "
                             'where BookID is Null and ContentID =?',t)
             else:
                 cursor.execute('delete from content where BookID is Null and ContentID =?',t)
 
             cursor.close()
             if ImageID is None:
-                print("Error condition ImageID was not found")
-                print("You likely tried to delete a book that the kobo has not yet added to the database")
+                print('Error condition ImageID was not found')
+                print('You likely tried to delete a book that the kobo has not yet added to the database')
 
         # If all this succeeds we need to delete the images files via the ImageID
         return ImageID
@@ -551,69 +551,69 @@ class KOBO(USBMS):
                 fpath = self.normalize_path(fpath)
 
                 if os.path.exists(fpath):
-                    # print 'Image File Exists: ' + fpath
+                    # print('Image File Exists: ' + fpath)
                     os.unlink(fpath)
 
     def delete_books(self, paths, end_session=True):
-        if self.modify_database_check("delete_books") is False:
+        if self.modify_database_check('delete_books') is False:
             return
 
         for i, path in enumerate(paths):
             self.report_progress((i+1) / float(len(paths)), _('Removing books from device...'))
             path = self.normalize_path(path)
-            # print "Delete file normalized path: " + path
-            extension =  os.path.splitext(path)[1]
+            # print('Delete file normalized path: ' + path)
+            extension = os.path.splitext(path)[1]
             ContentType = self.get_content_type_from_extension(extension) if extension else self.get_content_type_from_path(path)
 
             ContentID = self.contentid_from_path(path, ContentType)
 
             ImageID = self.delete_via_sql(ContentID, ContentType)
-            # print " We would now delete the Images for" + ImageID
+            # print(' We would now delete the Images for' + ImageID)
             self.delete_images(ImageID, path)
 
             if os.path.exists(path):
                 # Delete the ebook
-                # print "Delete the ebook: " + path
+                # print('Delete the ebook: ' + path)
                 os.unlink(path)
 
                 filepath = os.path.splitext(path)[0]
                 for ext in self.DELETE_EXTS:
                     if os.path.exists(filepath + ext):
-                        # print "Filename: " + filename
+                        # print('Filename: ' + filename)
                         os.unlink(filepath + ext)
                     if os.path.exists(path + ext):
-                        # print "Filename: " + filename
+                        # print('Filename: ' + filename)
                         os.unlink(path + ext)
 
                 if self.SUPPORTS_SUB_DIRS:
                     try:
-                        # print "removed"
+                        # print('removed')
                         os.removedirs(os.path.dirname(path))
                     except Exception:
                         pass
         self.report_progress(1.0, _('Removing books from device...'))
 
     def remove_books_from_metadata(self, paths, booklists):
-        if self.modify_database_check("remove_books_from_metatata") is False:
+        if self.modify_database_check('remove_books_from_metatata') is False:
             return
 
         for i, path in enumerate(paths):
             self.report_progress((i+1) / float(len(paths)), _('Removing books from device metadata listing...'))
             for bl in booklists:
                 for book in bl:
-                    # print "Book Path: " + book.path
+                    # print('Book Path: ' + book.path)
                     if path.endswith(book.path):
-                        # print "    Remove: " + book.path
+                        # print('    Remove: ' + book.path)
                         bl.remove_book(book)
         self.report_progress(1.0, _('Removing books from device metadata listing...'))
 
     def add_books_to_metadata(self, locations, metadata, booklists):
-        debug_print("KoboTouch::add_books_to_metadata - start. metadata=%s" % metadata[0])
+        debug_print('KoboTouch::add_books_to_metadata - start. metadata=%s' % metadata[0])
         metadata = iter(metadata)
         for i, location in enumerate(locations):
             self.report_progress((i+1) / float(len(locations)), _('Adding books to device metadata listing...'))
             info = next(metadata)
-            debug_print("KoboTouch::add_books_to_metadata - info=%s" % info)
+            debug_print('KoboTouch::add_books_to_metadata - info=%s' % info)
             blist = 2 if location[1] == 'cardb' else 1 if location[1] == 'carda' else 0
 
             # Extract the correct prefix from the pathname. To do this correctly,
@@ -634,24 +634,24 @@ class KOBO(USBMS):
                 prints('in add_books_to_metadata. Prefix is None!', path,
                         self._main_prefix)
                 continue
-            # print "Add book to metadata: "
-            # print "prefix: " + prefix
+            # print('Add book to metadata: ')
+            # print('prefix: ' + prefix)
             lpath = path.partition(prefix)[2]
-            if lpath.startswith('/') or lpath.startswith('\\'):
+            if lpath.startswith(('/', '\\')):
                 lpath = lpath[1:]
-            # print "path: " + lpath
+            # print('path: ' + lpath)
             book = self.book_class(prefix, lpath, info.title, other=info)
             if book.size is None or book.size == 0:
                 book.size = os.stat(self.normalize_path(path)).st_size
             b = booklists[blist].add_book(book, replace_metadata=True)
             if b:
-                debug_print("KoboTouch::add_books_to_metadata - have a new book - book=%s" % book)
+                debug_print('KoboTouch::add_books_to_metadata - have a new book - book=%s' % book)
                 b._new_book = True
         self.report_progress(1.0, _('Adding books to device metadata listing...'))
 
     def contentid_from_path(self, path, ContentType):
         if ContentType == 6:
-            extension =  os.path.splitext(path)[1]
+            extension = os.path.splitext(path)[1]
             if extension == '.kobo':
                 ContentID = os.path.splitext(path)[0]
                 # Remove the prefix on the file.  it could be either
@@ -664,15 +664,15 @@ class KOBO(USBMS):
                 ContentID = ContentID.replace(self._card_a_prefix, '')
         elif ContentType == 999:  # HTML Files
             ContentID = path
-            ContentID = ContentID.replace(self._main_prefix, "/mnt/onboard/")
+            ContentID = ContentID.replace(self._main_prefix, '/mnt/onboard/')
             if self._card_a_prefix is not None:
-                ContentID = ContentID.replace(self._card_a_prefix, "/mnt/sd/")
+                ContentID = ContentID.replace(self._card_a_prefix, '/mnt/sd/')
         else:  # ContentType = 16
             ContentID = path
-            ContentID = ContentID.replace(self._main_prefix, "file:///mnt/onboard/")
+            ContentID = ContentID.replace(self._main_prefix, 'file:///mnt/onboard/')
             if self._card_a_prefix is not None:
-                ContentID = ContentID.replace(self._card_a_prefix, "file:///mnt/sd/")
-        ContentID = ContentID.replace("\\", '/')
+                ContentID = ContentID.replace(self._card_a_prefix, 'file:///mnt/sd/')
+        ContentID = ContentID.replace('\\', '/')
         return ContentID
 
     def get_content_type_from_path(self, path):
@@ -686,13 +686,13 @@ class KOBO(USBMS):
     def get_content_type_from_extension(self, extension):
         if extension == '.kobo':
             # Kobo books do not have book files.  They do have some images though
-            # print "kobo book"
+            # print('kobo book')
             ContentType = 6
         elif extension == '.pdf' or extension == '.epub':
-            # print "ePub or pdf"
+            # print('ePub or pdf')
             ContentType = 16
         elif extension == '.rtf' or extension == '.txt' or extension == '.htm' or extension == '.html':
-            # print "txt"
+            # print('txt')
             if self.fwversion == (1,0) or self.fwversion == (1,4) or self.fwversion == (1,7,4):
                 ContentType = 999
             else:
@@ -707,29 +707,29 @@ class KOBO(USBMS):
         if oncard == 'cardb':
             print('path from_contentid cardb')
         elif oncard == 'carda':
-            path = path.replace("file:///mnt/sd/", self._card_a_prefix)
-            # print "SD Card: " + path
+            path = path.replace('file:///mnt/sd/', self._card_a_prefix)
+            # print('SD Card: ' + path)
         else:
-            if ContentType == "6" and MimeType == 'Shortcover':
+            if ContentType == '6' and MimeType == 'Shortcover':
                 # This is a hack as the kobo files do not exist
                 # but the path is required to make a unique id
                 # for calibre's reference
                 path = self._main_prefix + path + '.kobo'
-                # print "Path: " + path
-            elif (ContentType == "6" or ContentType == "10") and (
+                # print('Path: ' + path)
+            elif (ContentType == '6' or ContentType == '10') and (
                 MimeType == 'application/x-kobo-epub+zip' or (
                 MimeType == 'application/epub+zip' and self.isTolinoDevice())
             ):
-                if path.startswith("file:///mnt/onboard/"):
-                    path = self._main_prefix + path.replace("file:///mnt/onboard/", '')
+                if path.startswith('file:///mnt/onboard/'):
+                    path = self._main_prefix + path.replace('file:///mnt/onboard/', '')
                 else:
                     path = self._main_prefix + KOBO_ROOT_DIR_NAME + '/kepub/' + path
-                # print "Internal: " + path
+                # print('Internal: ' + path)
             else:
-                # if path.startswith("file:///mnt/onboard/"):
-                path = path.replace("file:///mnt/onboard/", self._main_prefix)
-                path = path.replace("/mnt/onboard/", self._main_prefix)
-                # print "Internal: " + path
+                # if path.startswith('file:///mnt/onboard/'):
+                path = path.replace('file:///mnt/onboard/', self._main_prefix)
+                path = path.replace('/mnt/onboard/', self._main_prefix)
+                # print('Internal: ' + path)
 
         return path
 
@@ -743,7 +743,7 @@ class KOBO(USBMS):
                 debug_print('The database has been upgraded past supported version')
                 self.report_progress(1.0, _('Removing books from device...'))
                 from calibre.devices.errors import UserFeedback
-                raise UserFeedback(_("Kobo database version unsupported - See details"),
+                raise UserFeedback(_('Kobo database version unsupported - See details'),
                     _('Your Kobo is running an updated firmware/database version.'
                     ' As calibre does not know about this updated firmware,'
                     ' database editing is disabled, to prevent corruption.'
@@ -770,10 +770,10 @@ class KOBO(USBMS):
 
     def get_file(self, path, *args, **kwargs):
         tpath = self.munge_path(path)
-        extension =  os.path.splitext(tpath)[1]
+        extension = os.path.splitext(tpath)[1]
         if extension == '.kobo':
             from calibre.devices.errors import UserFeedback
-            raise UserFeedback(_("Not Implemented"),
+            raise UserFeedback(_('Not Implemented'),
                     _('".kobo" files do not exist on the device as books; '
                         'instead they are rows in the sqlite database. '
                     'Currently they cannot be exported or viewed.'),
@@ -796,7 +796,7 @@ class KOBO(USBMS):
             mi = MetaInformation(os.path.splitext(os.path.basename(lpath))[0],
                     [_('Unknown')])
         size = os.stat(cls.normalize_path(os.path.join(prefix, lpath))).st_size
-        book =  cls.book_class(prefix, lpath, title, authors, mime, date, ContentType, ImageID, size=size, other=mi)
+        book = cls.book_class(prefix, lpath, title, authors, mime, date, ContentType, ImageID, size=size, other=mi)
 
         return book
 
@@ -817,9 +817,9 @@ class KOBO(USBMS):
 
         # Reset Im_Reading list in the database
         if oncard == 'carda':
-            query= 'update content set ReadStatus=0, FirstTimeReading = \'true\' where BookID is Null and ContentID like \'file:///mnt/sd/%\''
+            query= "update content set ReadStatus=0, FirstTimeReading = 'true' where BookID is Null and ContentID like 'file:///mnt/sd/%'"
         elif oncard != 'carda' and oncard != 'cardb':
-            query= 'update content set ReadStatus=0, FirstTimeReading = \'true\' where BookID is Null and ContentID not like \'file:///mnt/sd/%\''
+            query= "update content set ReadStatus=0, FirstTimeReading = 'true' where BookID is Null and ContentID not like 'file:///mnt/sd/%'"
 
         try:
             cursor.execute(query)
@@ -830,7 +830,7 @@ class KOBO(USBMS):
             cursor.close()
 
     def set_readstatus(self, connection, ContentID, ReadStatus):
-        debug_print("Kobo::set_readstatus - ContentID=%s, ReadStatus=%d" % (ContentID, ReadStatus))
+        debug_print('Kobo::set_readstatus - ContentID=%s, ReadStatus=%d' % (ContentID, ReadStatus))
         cursor = connection.cursor()
         t = (ContentID,)
         cursor.execute('select DateLastRead, ReadStatus  from Content where BookID is Null and ContentID = ?', t)
@@ -851,8 +851,8 @@ class KOBO(USBMS):
             t = (ReadStatus, datelastread, ContentID,)
 
             try:
-                debug_print("Kobo::set_readstatus - Making change - ContentID=%s, ReadStatus=%d, DateLastRead=%s" % (ContentID, ReadStatus, datelastread))
-                cursor.execute('update content set ReadStatus=?,FirstTimeReading=\'false\',DateLastRead=? where BookID is Null and ContentID = ?', t)
+                debug_print('Kobo::set_readstatus - Making change - ContentID=%s, ReadStatus=%d, DateLastRead=%s' % (ContentID, ReadStatus, datelastread))
+                cursor.execute("update content set ReadStatus=?,FirstTimeReading='false',DateLastRead=? where BookID is Null and ContentID = ?", t)
             except:
                 debug_print('    Database Exception: Unable to update ReadStatus')
                 raise
@@ -862,9 +862,9 @@ class KOBO(USBMS):
     def reset_favouritesindex(self, connection, oncard):
         # Reset FavouritesIndex list in the database
         if oncard == 'carda':
-            query= 'update content set FavouritesIndex=-1 where BookID is Null and ContentID like \'file:///mnt/sd/%\''
+            query= "update content set FavouritesIndex=-1 where BookID is Null and ContentID like 'file:///mnt/sd/%'"
         elif oncard != 'carda' and oncard != 'cardb':
-            query= 'update content set FavouritesIndex=-1 where BookID is Null and ContentID not like \'file:///mnt/sd/%\''
+            query= "update content set FavouritesIndex=-1 where BookID is Null and ContentID not like 'file:///mnt/sd/%'"
 
         cursor = connection.cursor()
         try:
@@ -892,37 +892,37 @@ class KOBO(USBMS):
 
     def update_device_database_collections(self, booklists, collections_attributes, oncard):
         debug_print("Kobo:update_device_database_collections - oncard='%s'"%oncard)
-        if self.modify_database_check("update_device_database_collections") is False:
+        if self.modify_database_check('update_device_database_collections') is False:
             return
 
         # Only process categories in this list
         supportedcategories = {
-            "Im_Reading":1,
-            "Read":2,
-            "Closed":3,
-            "Shortlist":4,
+            'Im_Reading':1,
+            'Read':2,
+            'Closed':3,
+            'Shortlist':4,
             # "Preview":99, # Unsupported as we don't want to change it
         }
 
         # Define lists for the ReadStatus
         readstatuslist = {
-            "Im_Reading":1,
-            "Read":2,
-            "Closed":3,
+            'Im_Reading':1,
+            'Read':2,
+            'Closed':3,
         }
 
         accessibilitylist = {
-            "Preview":6,
-            "Recommendation":4,
+            'Preview':6,
+            'Recommendation':4,
        }
-#        debug_print('Starting update_device_database_collections', collections_attributes)
+        # debug_print('Starting update_device_database_collections', collections_attributes)
 
         # Force collections_attributes to be 'tags' as no other is currently supported
-#        debug_print('KOBO: overriding the provided collections_attributes:', collections_attributes)
+        # debug_print('KOBO: overriding the provided collections_attributes:', collections_attributes)
         collections_attributes = ['tags']
 
         collections = booklists.get_collections(collections_attributes)
-#         debug_print('Kobo:update_device_database_collections - Collections:', collections)
+        # debug_print('Kobo:update_device_database_collections - Collections:', collections)
 
         # Create a connection to the sqlite database
         # Needs to be outside books collection as in the case of removing
@@ -948,7 +948,7 @@ class KOBO(USBMS):
                             if category not in book.device_collections:
                                 book.device_collections.append(category)
 
-                            extension =  os.path.splitext(book.path)[1]
+                            extension = os.path.splitext(book.path)[1]
                             ContentType = self.get_content_type_from_extension(extension) if extension else self.get_content_type_from_path(book.path)
 
                             ContentID = self.contentid_from_path(book.path, ContentType)
@@ -964,13 +964,13 @@ class KOBO(USBMS):
                                 pass
             else:  # No collections
                 # Since no collections exist the ReadStatus needs to be reset to 0 (Unread)
-                debug_print("No Collections - resetting ReadStatus")
+                debug_print('No Collections - resetting ReadStatus')
                 self.reset_readstatus(connection, oncard)
                 if self.dbversion >= 14:
-                    debug_print("No Collections - resetting FavouritesIndex")
+                    debug_print('No Collections - resetting FavouritesIndex')
                     self.reset_favouritesindex(connection, oncard)
 
-#        debug_print('Finished update_device_database_collections', collections_attributes)
+        # debug_print('Finished update_device_database_collections', collections_attributes)
 
     def get_collections_attributes(self):
         collections = [x.lower().strip() for x in self.collections_columns.split(',')]
@@ -999,7 +999,7 @@ class KOBO(USBMS):
     def sync_booklists(self, booklists, end_session=True):
         debug_print('KOBO:sync_booklists - start')
         paths = self.get_device_paths()
-#         debug_print('KOBO:sync_booklists - booklists:', booklists)
+        # debug_print('KOBO:sync_booklists - booklists:', booklists)
 
         blists = {}
         for i in paths:
@@ -1062,7 +1062,7 @@ class KOBO(USBMS):
 
             if os.path.exists(cover):
                 # Get ContentID for Selected Book
-                extension =  os.path.splitext(filepath)[1]
+                extension = os.path.splitext(filepath)[1]
                 ContentType = self.get_content_type_from_extension(extension) if extension != '' else self.get_content_type_from_path(filepath)
                 ContentID = self.contentid_from_path(filepath, ContentType)
 
@@ -1073,10 +1073,10 @@ class KOBO(USBMS):
                     cursor.execute('select ImageId from Content where BookID is Null and ContentID = ?', t)
                     try:
                         result = next(cursor)
-#                        debug_print("ImageId: ", result[0])
+                        # debug_print("ImageId: ", result[0])
                         ImageID = result[0]
                     except StopIteration:
-                        debug_print("No rows exist in the database - cannot upload")
+                        debug_print('No rows exist in the database - cannot upload')
                         return
                     finally:
                         cursor.close()
@@ -1111,7 +1111,7 @@ class KOBO(USBMS):
                                 fsync(f)
 
                 else:
-                    debug_print("ImageID could not be retrieved from the database")
+                    debug_print('ImageID could not be retrieved from the database')
 
     def prepare_addable_books(self, paths):
         '''
@@ -1129,7 +1129,7 @@ class KOBO(USBMS):
                 with closing(open(path, 'rb')) as r:
                     tf = PersistentTemporaryFile(suffix='.epub')
                     shutil.copyfileobj(r, tf)
-#                    tf.write(r.read())
+                    # tf.write(r.read())
                     paths[idx] = tf.name
         return paths
 
@@ -1231,17 +1231,17 @@ class KOBO(USBMS):
         bookmarked_books = {}
         with closing(self.device_database_connection(use_row_factory=True)) as connection:
             for book_id in path_map:
-                extension =  os.path.splitext(path_map[book_id])[1]
+                extension = os.path.splitext(path_map[book_id])[1]
                 ContentType = self.get_content_type_from_extension(extension) if extension else self.get_content_type_from_path(path_map[book_id])
                 ContentID = self.contentid_from_path(path_map[book_id], ContentType)
-                debug_print("get_annotations - ContentID: ",  ContentID, "ContentType: ", ContentType)
+                debug_print('get_annotations - ContentID: ', ContentID, 'ContentType: ', ContentType)
 
                 bookmark_ext = extension
 
                 myBookmark = Bookmark(connection, ContentID, path_map[book_id], book_id, book_ext[book_id], bookmark_ext)
                 bookmarked_books[book_id] = self.UserAnnotation(type='kobo_bookmark', value=myBookmark)
 
-        # This returns as job.result in gui2.ui.annotations_fetched(self,job)
+        # This returns as job.result in gui2.ui.annotations_fetched(self, job)
         return bookmarked_books
 
     def generate_annotation_html(self, bookmark):
@@ -1252,21 +1252,21 @@ class KOBO(USBMS):
         # last_read_location = bookmark.last_read_location
         # timestamp = bookmark.timestamp
         percent_read = bookmark.percent_read
-        debug_print("Kobo::generate_annotation_html - last_read: ",  bookmark.last_read)
+        debug_print('Kobo::generate_annotation_html - last_read: ', bookmark.last_read)
         if bookmark.last_read is not None:
             try:
-                last_read = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(calendar.timegm(time.strptime(bookmark.last_read, "%Y-%m-%dT%H:%M:%S"))))
+                last_read = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(calendar.timegm(time.strptime(bookmark.last_read, '%Y-%m-%dT%H:%M:%S'))))
             except:
                 try:
-                    last_read = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(calendar.timegm(time.strptime(bookmark.last_read, "%Y-%m-%dT%H:%M:%S.%f"))))
+                    last_read = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(calendar.timegm(time.strptime(bookmark.last_read, '%Y-%m-%dT%H:%M:%S.%f'))))
                 except:
                     try:
-                        last_read = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(calendar.timegm(time.strptime(bookmark.last_read, "%Y-%m-%dT%H:%M:%SZ"))))
+                        last_read = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(calendar.timegm(time.strptime(bookmark.last_read, '%Y-%m-%dT%H:%M:%SZ'))))
                     except:
-                        last_read = time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime())
+                        last_read = time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime())
         else:
             # self.datetime = time.gmtime()
-            last_read = time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime())
+            last_read = time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime())
 
         # debug_print("Percent read: ", percent_read)
         ka_soup = BeautifulSoup()
@@ -1276,12 +1276,12 @@ class KOBO(USBMS):
 
         # Add the last-read location
         if bookmark.book_format == 'epub':
-            markup = _("<hr /><b>Book last read:</b> %(time)s<br /><b>Percentage read:</b> %(pr)d%%<hr />") % dict(
+            markup = _('<hr /><b>Book last read:</b> %(time)s<br /><b>Percentage read:</b> %(pr)d%%<hr />') % dict(
                     time=last_read,
                     # loc=last_read_location,
                     pr=percent_read)
         else:
-            markup = _("<hr /><b>Book last read:</b> %(time)s<br /><b>Percentage read:</b> %(pr)d%%<hr />") % dict(
+            markup = _('<hr /><b>Book last read:</b> %(time)s<br /><b>Percentage read:</b> %(pr)d%%<hr />') % dict(
                     time=last_read,
                     # loc=last_read_location,
                     pr=percent_read)
@@ -1307,7 +1307,7 @@ class KOBO(USBMS):
                             typ=user_notes[location]['type'],
                             chapter_title=user_notes[location]['chapter_title'],
                             chapter_progress=user_notes[location]['chapter_progress'],
-                            annotation=user_notes[location]['annotation'] if user_notes[location]['annotation'] is not None else ""))
+                            annotation=user_notes[location]['annotation'] if user_notes[location]['annotation'] is not None else ''))
                 elif user_notes[location]['type'] == 'Highlight':
                     annotations.append(
                         _('<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br />'
@@ -1348,7 +1348,7 @@ class KOBO(USBMS):
                 divTag.insert(dtc, annot)
                 dtc += 1
 
-        ka_soup.insert(0,divTag)
+        ka_soup.insert(0, divTag)
         return ka_soup
 
     def add_annotation_to_library(self, db, db_id, annotation):
@@ -1358,7 +1358,7 @@ class KOBO(USBMS):
 
         if bm.type == 'kobo_bookmark' and bm.value.last_read:
             mi = db.get_metadata(db_id, index_is_id=True)
-            debug_print("KOBO:add_annotation_to_library - Title: ",  mi.title)
+            debug_print('KOBO:add_annotation_to_library - Title: ', mi.title)
             user_notes_soup = self.generate_annotation_html(bm.value)
             if mi.comments:
                 a_offset = mi.comments.find('<div class="user_annotations">')
@@ -1385,8 +1385,8 @@ class KOBO(USBMS):
             # NOTE: As it is, this copied the book from the device back to the library. That meant it replaced the
             #     existing file. Taking this out for that reason, but some books have a ANNOT file that could be
             #     copied.
-#            db.add_format_with_hooks(db_id, bm.value.bookmark_extension,
-#                                            bm.value.path, index_is_id=True)
+            # db.add_format_with_hooks(db_id, bm.value.bookmark_extension,
+            #                                 bm.value.path, index_is_id=True)
 
 
 class KOBOTOUCH(KOBO):
@@ -1402,7 +1402,7 @@ class KOBOTOUCH(KOBO):
         ' as well as tolino shine 5, shine color and'
         ' vision color eReaders.'
         ' Based on the existing Kobo driver by %s.') % KOBO.author
-#    icon        = 'devices/kobotouch.jpg'
+    # icon        = 'devices/kobotouch.jpg'
 
     supported_dbversion             = 190
     min_supported_dbversion         = 53
@@ -1414,7 +1414,7 @@ class KOBOTOUCH(KOBO):
     min_dbversion_keywords          = 82
     min_dbversion_seriesid          = 136
     min_dbversion_bookstats         = 168
-    min_dbversion_real_bools        = 188 # newer (tolino) 5.x fw uses 0 and 1 as boolean values
+    min_dbversion_real_bools        = 188  # newer (tolino) 5.x fw uses 0 and 1 as boolean values
 
     # Starting with firmware version 3.19.x, the last number appears to be is a
     # build number. A number will be recorded here but it can be safely ignored
@@ -1428,9 +1428,9 @@ class KOBOTOUCH(KOBO):
     min_aurah2o_fwversion           = (3, 7, 0)
     min_reviews_fwversion           = (3, 12, 0)
     min_glohd_fwversion             = (3, 14, 0)
-    min_auraone_fwversion           = (3, 20,  7280)
-    min_fwversion_overdrive         = (4,  0,  7523)
-    min_clarahd_fwversion           = (4,  8, 11090)
+    min_auraone_fwversion           = (3, 20, 7280)
+    min_fwversion_overdrive         = (4, 0, 7523)
+    min_clarahd_fwversion           = (4, 8, 11090)
     min_forma_fwversion             = (4, 11, 11879)
     min_librah20_fwversion          = (4, 16, 13337)  # "Reviewers" release.
     min_fwversion_epub_location     = (4, 17, 13651)  # ePub reading location without full contentid.
@@ -1443,9 +1443,9 @@ class KOBOTOUCH(KOBO):
     min_clara2e_fwversion           = (4, 33, 19759)
     min_fwversion_audiobooks        = (4, 29, 18730)
     min_fwversion_bookstats         = (4, 32, 19501)
-    min_clarabw_fwversion           = (4, 39, 22801) # not sure whether needed
-    min_claracolor_fwversion        = (4, 39, 22801) # not sure whether needed
-    min_libracolor_fwversion        = (4, 39, 22801) # not sure whether needed
+    min_clarabw_fwversion           = (4, 39, 22801)  # not sure whether needed
+    min_claracolor_fwversion        = (4, 39, 22801)  # not sure whether needed
+    min_libracolor_fwversion        = (4, 39, 22801)  # not sure whether needed
 
     has_kepubs = True
 
@@ -1465,7 +1465,7 @@ class KOBOTOUCH(KOBO):
 
     opts = None
 
-    TIMESTAMP_STRING = "%Y-%m-%dT%H:%M:%SZ"
+    TIMESTAMP_STRING = '%Y-%m-%dT%H:%M:%SZ'
 
     AURA_PRODUCT_ID     = [0x4203]
     AURA_EDITION2_PRODUCT_ID    = [0x4226]
@@ -1487,8 +1487,8 @@ class KOBOTOUCH(KOBO):
     SAGE_PRODUCT_ID     = [0x4231]
     TOUCH_PRODUCT_ID    = [0x4163]
     TOUCH2_PRODUCT_ID   = [0x4224]
-    LIBRA_COLOR_PRODUCT_ID = [0x4237]  # This is shared by Kobo Libra Color, Clara Color and Clara BW
-                                       # as well as tolino shine 5, shine color and vision color. Sigh.
+    LIBRA_COLOR_PRODUCT_ID = [0x4237]   # This is shared by Kobo Libra Color, Clara Color and Clara BW
+                                        # as well as tolino shine 5, shine color and vision color. Sigh.
     # Kobo says the following will be used in future firmware (end 2024/2025)
     CLARA_COLOR_PRODUCT_ID = [0x4238]
     CLARA_BW_PRODUCT_ID    = [0x4239]
@@ -1586,14 +1586,14 @@ class KOBOTOUCH(KOBO):
                           '':                         [(1264,1680), 0, 200,True,],
     }
     # Following are the sizes used with pre2.1.4 firmware
-#    COVER_FILE_ENDINGS = {
-# ' - N3_LIBRARY_FULL.parsed':[(355,530),0, 99,],   # Used for Details screen
-# ' - N3_LIBRARY_FULL.parsed':[(600,800),0, 99,],
-# ' - N3_LIBRARY_GRID.parsed':[(149,223),0, 99,],   # Used for library lists
-#                          ' - N3_LIBRARY_LIST.parsed':[(60,90),0, 53,],
-#                          ' - N3_LIBRARY_SHELF.parsed': [(40,60),0, 52,],
-# ' - N3_FULL.parsed':[(600,800),0, 99,],           # Used for screensaver if "Full screen" is checked.
-#                          }
+    # COVER_FILE_ENDINGS = {
+    #    ' - N3_LIBRARY_FULL.parsed':[(355,530),0, 99,],   # Used for Details screen
+    #    ' - N3_LIBRARY_FULL.parsed':[(600,800),0, 99,],
+    #    ' - N3_LIBRARY_GRID.parsed':[(149,223),0, 99,],   # Used for library lists
+    #    ' - N3_LIBRARY_LIST.parsed':[(60,90),0, 53,],
+    #    ' - N3_LIBRARY_SHELF.parsed': [(40,60),0, 52,],
+    #    ' - N3_FULL.parsed':[(600,800),0, 99,],           # Used for screensaver if "Full screen" is checked.
+    # }
 
     def __init__(self, *args, **kwargs):
         KOBO.__init__(self, *args, **kwargs)
@@ -1693,7 +1693,7 @@ class KOBOTOUCH(KOBO):
             return dummy_bl
         elif oncard and oncard != 'carda' and oncard != 'cardb':
             self.report_progress(1.0, _('Getting list of books on device...'))
-            debug_print("KoboTouch:books - unknown card")
+            debug_print('KoboTouch:books - unknown card')
             return dummy_bl
 
         prefix = self._card_a_prefix if oncard == 'carda' else \
@@ -1714,15 +1714,15 @@ class KOBOTOUCH(KOBO):
         bl = self.booklist_class(oncard, prefix, self.settings)
 
         opts = self.settings()
-        debug_print("KoboTouch:books - opts.extra_customization=", opts.extra_customization)
-        debug_print("KoboTouch:books - driver options=", self)
+        debug_print('KoboTouch:books - opts.extra_customization=', opts.extra_customization)
+        debug_print('KoboTouch:books - driver options=', self)
         debug_print("KoboTouch:books - prefs['manage_device_metadata']=", prefs['manage_device_metadata'])
         debugging_title = self.debugging_title
         debug_print("KoboTouch:books - set_debugging_title to '%s'" % debugging_title)
         bl.set_debugging_title(debugging_title)
-        debug_print("KoboTouch:books - length bl=%d"%len(bl))
+        debug_print('KoboTouch:books - length bl=%d'%len(bl))
         need_sync = self.parse_metadata_cache(bl, prefix, self.METADATA_CACHE)
-        debug_print("KoboTouch:books - length bl after sync=%d"%len(bl))
+        debug_print('KoboTouch:books - length bl after sync=%d'%len(bl))
 
         # make a dict cache of paths so the lookup in the loop below is faster.
         bl_cache = {}
@@ -1737,11 +1737,11 @@ class KOBOTOUCH(KOBO):
                             userid, bookshelves, book_stats=None
                             ):
             show_debug = self.is_debugging_title(title)
-#            show_debug = authors == 'L. Frank Baum'
+            # show_debug = authors == 'L. Frank Baum'
             if show_debug:
-                debug_print("KoboTouch:update_booklist - title='%s'"%title, "ContentType=%s"%ContentType, "isdownloaded=", isdownloaded)
+                debug_print("KoboTouch:update_booklist - title='%s'"%title, 'ContentType=%s'%ContentType, 'isdownloaded=', isdownloaded)
                 debug_print(
-                    "         prefix=%s, DateCreated=%s, readstatus=%d, MimeType=%s, expired=%d, favouritesindex=%d, accessibility=%d, isdownloaded=%s"%
+                    '         prefix=%s, DateCreated=%s, readstatus=%d, MimeType=%s, expired=%d, favouritesindex=%d, accessibility=%d, isdownloaded=%s'%
                 (prefix, DateCreated, readstatus, MimeType, expired, favouritesindex, accessibility, isdownloaded,))
             changed = False
             try:
@@ -1749,7 +1749,7 @@ class KOBOTOUCH(KOBO):
                 if lpath.startswith(os.sep):
                     lpath = lpath[len(os.sep):]
                 lpath = lpath.replace('\\', '/')
-#                 debug_print("KoboTouch:update_booklist - LPATH: ", lpath, "  - Title:  " , title)
+                # debug_print("KoboTouch:update_booklist - LPATH: ", lpath, "  - Title:  ", title)
 
                 playlist_map = {}
 
@@ -1782,11 +1782,11 @@ class KOBOTOUCH(KOBO):
                 # - FW2.1.2 beta, DBVersion == 56, accessibility == -1:
                 # So, the following should be OK
                 if self.is_false_value(isdownloaded):
-                    if self.dbversion < 56 and accessibility <= 1 or self.dbversion >= 56 and accessibility == -1:
+                    if (self.dbversion < 56 and accessibility <= 1) or (self.dbversion >= 56 and accessibility == -1):
                         playlist_map[lpath].append('Deleted')
                         allow_shelves = False
                         if show_debug:
-                            debug_print("KoboTouch:update_booklist - have a deleted book")
+                            debug_print('KoboTouch:update_booklist - have a deleted book')
                     elif self.supports_kobo_archive() and (accessibility == 1 or accessibility == 2):
                         playlist_map[lpath].append('Archived')
                         allow_shelves = True
@@ -1820,10 +1820,10 @@ class KOBOTOUCH(KOBO):
                     debug_print('KoboTouch:update_booklist - playlist_map=', playlist_map)
 
                 path = self.normalize_path(path)
-                # print "Normalized FileName: " + path
+                # print('Normalized FileName: ' + path)
 
                 # Collect the Kobo metadata
-                authors_list = [a.strip() for a in authors.split("&")] if authors is not None else [_('Unknown')]
+                authors_list = [a.strip() for a in authors.split('&')] if authors is not None else [_('Unknown')]
                 kobo_metadata = Metadata(title, authors_list)
                 kobo_metadata.series       = series
                 kobo_metadata.series_index = seriesnumber
@@ -1836,7 +1836,7 @@ class KOBOTOUCH(KOBO):
                         kobo_metadata.pubdate     = parse_date(DateCreated, assume_utc=True)
                     except:
                         try:
-                            kobo_metadata.pubdate = datetime.strptime(DateCreated, "%Y-%m-%dT%H:%M:%S.%fZ")
+                            kobo_metadata.pubdate = datetime.strptime(DateCreated, '%Y-%m-%dT%H:%M:%S.%fZ')
                         except:
                             debug_print("KoboTouch:update_booklist - Cannot convert date - DateCreated='%s'"%DateCreated)
 
@@ -1844,8 +1844,8 @@ class KOBOTOUCH(KOBO):
                 if idx is not None:  # and not (accessibility == 1 and isdownloaded == 'false'):
                     if show_debug:
                         self.debug_index = idx
-                        debug_print("KoboTouch:update_booklist - idx=%d"%idx)
-                        debug_print("KoboTouch:update_booklist - lpath=%s"%lpath)
+                        debug_print('KoboTouch:update_booklist - idx=%d'%idx)
+                        debug_print('KoboTouch:update_booklist - lpath=%s'%lpath)
                         debug_print('KoboTouch:update_booklist - bl[idx].device_collections=', bl[idx].device_collections)
                         debug_print('KoboTouch:update_booklist - playlist_map=', playlist_map)
                         debug_print('KoboTouch:update_booklist - bookshelves=', bookshelves)
@@ -1867,8 +1867,8 @@ class KOBOTOUCH(KOBO):
                                 # debug_print("KoboTouch:update_booklist - update_metadata_item returned true")
                                 changed = True
                         else:
-                            debug_print("    Strange:  The file: ", prefix, lpath, " does not exist!")
-                            debug_print("KoboTouch:update_booklist - book size=", bl[idx].size)
+                            debug_print('    Strange:  The file: ', prefix, lpath, ' does not exist!')
+                            debug_print('KoboTouch:update_booklist - book size=', bl[idx].size)
 
                     if show_debug:
                         debug_print("KoboTouch:update_booklist - ContentID='%s'"%ContentID)
@@ -1896,9 +1896,9 @@ class KOBOTOUCH(KOBO):
                     if show_debug:
                         debug_print('KoboTouch:update_booklist - updated bl[idx].device_collections=', bl[idx].device_collections)
                         debug_print('KoboTouch:update_booklist - playlist_map=', playlist_map, 'changed=', changed)
-#                        debug_print('KoboTouch:update_booklist - book=', bl[idx])
-                        debug_print("KoboTouch:update_booklist - book class=%s"%bl[idx].__class__)
-                        debug_print("KoboTouch:update_booklist - book title=%s"%bl[idx].title)
+                        # debug_print('KoboTouch:update_booklist - book=', bl[idx])
+                        debug_print('KoboTouch:update_booklist - book class=%s'%bl[idx].__class__)
+                        debug_print('KoboTouch:update_booklist - book title=%s'%bl[idx].title)
                 else:
                     if show_debug:
                         debug_print('KoboTouch:update_booklist - idx is none')
@@ -1907,29 +1907,29 @@ class KOBOTOUCH(KOBO):
                             book = self.book_from_path(prefix, lpath, title, authors, MimeType, DateCreated, ContentType, ImageID)
                         else:
                             if isdownloaded == 'true':  # A recommendation or preview is OK to not have a file
-                                debug_print("    Strange:  The file: ", prefix, lpath, " does not exist!")
-                                title = "FILE MISSING: " + title
-                            book =  self.book_class(prefix, lpath, title, authors, MimeType, DateCreated, ContentType, ImageID, size=0)
+                                debug_print('    Strange:  The file: ', prefix, lpath, ' does not exist!')
+                                title = 'FILE MISSING: ' + title
+                            book = self.book_class(prefix, lpath, title, authors, MimeType, DateCreated, ContentType, ImageID, size=0)
                             if show_debug:
                                 debug_print('KoboTouch:update_booklist - book file does not exist. ContentID="%s"'%ContentID)
 
                     except Exception as e:
                         debug_print("KoboTouch:update_booklist - exception creating book: '%s'"%str(e))
-                        debug_print("        prefix: ", prefix, "lpath: ", lpath, "title: ", title, "authors: ", authors,
-                                    "MimeType: ", MimeType, "DateCreated: ", DateCreated, "ContentType: ", ContentType, "ImageID: ", ImageID)
+                        debug_print('        prefix: ', prefix, 'lpath: ', lpath, 'title: ', title, 'authors: ', authors,
+                                    'MimeType: ', MimeType, 'DateCreated: ', DateCreated, 'ContentType: ', ContentType, 'ImageID: ', ImageID)
                         raise
 
                     if show_debug:
                         debug_print('KoboTouch:update_booklist - class:', book.__class__)
-#                        debug_print('    resolution:', book.__class__.__mro__)
+                        # debug_print('    resolution:', book.__class__.__mro__)
                         debug_print("    contentid: '%s'"%book.contentID)
                         debug_print("    title:'%s'"%book.title)
-                        debug_print("    the book:", book)
+                        debug_print('    the book:', book)
                         debug_print("    author_sort:'%s'"%book.author_sort)
-                        debug_print("    bookshelves:", bookshelves)
-                        debug_print("    kobo_collections:", kobo_collections)
+                        debug_print('    bookshelves:', bookshelves)
+                        debug_print('    kobo_collections:', kobo_collections)
 
-                    # print 'Update booklist'
+                    # print('Update booklist')
                     book.device_collections = playlist_map.get(lpath,[])  # if lpath in playlist_map else []
                     book.current_shelves    = bookshelves
                     book.kobo_collections   = kobo_collections
@@ -1942,7 +1942,7 @@ class KOBOTOUCH(KOBO):
                     book.kobo_subtitle      = Subtitle
                     book.kobo_bookstats     = book_stats
                     book.can_put_on_shelves = allow_shelves
-#                    debug_print('KoboTouch:update_booklist - title=', title, 'book.device_collections', book.device_collections)
+                    # debug_print('KoboTouch:update_booklist - title=', title, 'book.device_collections', book.device_collections)
 
                     if not book.is_sideloaded and book.has_kobo_series and SeriesID is not None:
                         if show_debug:
@@ -1966,30 +1966,30 @@ class KOBOTOUCH(KOBO):
                 return bookshelves
 
             cursor = connection.cursor()
-            query = "select ShelfName "     \
-                "from ShelfContent "        \
-                "where ContentId = ? "      \
-                f"and _IsDeleted = {self.bool_for_query(False)} "   \
-                "and ShelfName is not null"         # This should never be null, but it is protection against an error cause by a sync to the Kobo server
+            query = ('select ShelfName '
+                     'from ShelfContent '
+                     'where ContentId = ? '
+                    f'and _IsDeleted = {self.bool_for_query(False)} '
+                     'and ShelfName is not null')         # This should never be null, but it is protection against an error cause by a sync to the Kobo server
             values = (ContentID, )
             cursor.execute(query, values)
             for i, row in enumerate(cursor):
                 bookshelves.append(row['ShelfName'])
 
             cursor.close()
-#            debug_print("KoboTouch:get_bookshelvesforbook - count bookshelves=" + str(count_bookshelves))
+            # debug_print("KoboTouch:get_bookshelvesforbook - count bookshelves=" + str(count_bookshelves))
             return bookshelves
 
         self.debug_index = 0
 
         with closing(self.device_database_connection(use_row_factory=True)) as connection:
-            debug_print("KoboTouch:books - reading device database")
+            debug_print('KoboTouch:books - reading device database')
 
             self.dbversion = self.get_database_version(connection)
-            debug_print("Database Version: ", self.dbversion)
+            debug_print('Database Version: ', self.dbversion)
 
             self.bookshelvelist = self.get_bookshelflist(connection)
-            debug_print("KoboTouch:books - shelf list:", self.bookshelvelist)
+            debug_print('KoboTouch:books - shelf list:', self.bookshelvelist)
 
             columns = 'Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ImageId, ReadStatus, Description, Publisher '
             if self.dbversion >= 16:
@@ -2005,15 +2005,15 @@ class KOBOTOUCH(KOBO):
             else:
                 columns += ', NULL AS ISBN'
             if self.supports_series():
-                columns += ", Series, SeriesNumber, ___UserID, ExternalId, Subtitle"
+                columns += ', Series, SeriesNumber, ___UserID, ExternalId, Subtitle'
             else:
                 columns += ', null as Series, null as SeriesNumber, ___UserID, null as ExternalId, null as Subtitle'
             if self.supports_series_list:
-                columns += ", SeriesID, SeriesNumberFloat"
+                columns += ', SeriesID, SeriesNumberFloat'
             else:
                 columns += ', null as SeriesID, null as SeriesNumberFloat'
             if self.supports_bookstats:
-                columns += ", StorePages, StoreWordCount, StoreTimeToReadLowerEstimate, StoreTimeToReadUpperEstimate"
+                columns += ', StorePages, StoreWordCount, StoreTimeToReadLowerEstimate, StoreTimeToReadUpperEstimate'
             else:
                 columns += ', null as StorePages, null as StoreWordCount, null as StoreTimeToReadLowerEstimate, null as StoreTimeToReadUpperEstimate'
 
@@ -2025,10 +2025,10 @@ class KOBOTOUCH(KOBO):
                         "      %(previews)s %(recommendations)s ) "                                  # Previews or Recommendations
                     ) % \
                     dict(
-                         expiry="" if self.show_archived_books else "and IsDownloaded in ('true', 1)",
-                         previews=" OR (Accessibility in (6) AND ___UserID <> '')" if self.show_previews else "",
-                         recommendations=" OR (Accessibility IN (-1, 4, 6) AND ___UserId = '')" if self.show_recommendations else "",
-                         downloaded_accessibility="1,2,8,9" if self.supports_overdrive() else "1,2"
+                         expiry='' if self.show_archived_books else "and IsDownloaded in ('true', 1)",
+                         previews=" OR (Accessibility in (6) AND ___UserID <> '')" if self.show_previews else '',
+                         recommendations=" OR (Accessibility IN (-1, 4, 6) AND ___UserId = '')" if self.show_recommendations else '',
+                         downloaded_accessibility='1,2,8,9' if self.supports_overdrive() else '1,2'
                          )
             elif self.supports_series():
                 where_clause = (" WHERE BookID IS NULL "
@@ -2036,9 +2036,9 @@ class KOBOTOUCH(KOBO):
                     " AND NOT ((___ExpirationStatus=3 OR ___ExpirationStatus is Null) %(expiry)s)"
                     ) % \
                     dict(
-                         expiry=" AND ContentType = 6" if self.show_archived_books else "",
-                         previews=" or (Accessibility IN (6) AND ___UserID <> '')" if self.show_previews else "",
-                         recommendations=" or (Accessibility in (-1, 4, 6) AND ___UserId = '')" if self.show_recommendations else ""
+                         expiry=' AND ContentType = 6' if self.show_archived_books else '',
+                         previews=" or (Accessibility IN (6) AND ___UserID <> '')" if self.show_previews else '',
+                         recommendations=" or (Accessibility in (-1, 4, 6) AND ___UserId = '')" if self.show_recommendations else ''
                          )
             elif self.dbversion >= 33:
                 where_clause = (' WHERE BookID IS NULL %(previews)s %(recommendations)s AND NOT'
@@ -2047,7 +2047,7 @@ class KOBOTOUCH(KOBO):
                     dict(
                          expiry=' AND ContentType = 6' if self.show_archived_books else '',
                          previews=' AND Accessibility <> 6' if not self.show_previews else '',
-                         recommendations=' AND IsDownloaded IN (\'true\', 1)' if not self.show_recommendations else ''
+                         recommendations=" AND IsDownloaded IN ('true', 1)" if not self.show_recommendations else ''
                          )
             elif self.dbversion >= 16:
                 where_clause = (' WHERE BookID IS NULL '
@@ -2068,7 +2068,7 @@ class KOBOTOUCH(KOBO):
                 card_condition = " AND contentId LIKE 'file:///mnt/sd/%'" if oncard == 'carda' else " AND contentId NOT LIKE'file:///mnt/sd/%'"
 
             query = 'SELECT ' + columns + ' FROM content ' + where_clause + card_condition
-            debug_print("KoboTouch:books - query=", query)
+            debug_print('KoboTouch:books - query=', query)
 
             cursor = connection.cursor()
             try:
@@ -2090,20 +2090,20 @@ class KOBOTOUCH(KOBO):
             i = 0
             for row in cursor:
                 i += 1
-#                 self.report_progress((i) / float(books_on_device), _('Getting list of books on device...'))
+                # self.report_progress((i) / float(books_on_device), _('Getting list of books on device...'))
                 show_debug = self.is_debugging_title(row['Title'])
                 if show_debug:
-                    debug_print("KoboTouch:books - looping on database - row=%d" % i)
-                    debug_print("KoboTouch:books - title='%s'"%row['Title'], "authors=", row['Attribution'])
-                    debug_print("KoboTouch:books - row=", row)
+                    debug_print('KoboTouch:books - looping on database - row=%d' % i)
+                    debug_print("KoboTouch:books - title='%s'"%row['Title'], 'authors=', row['Attribution'])
+                    debug_print('KoboTouch:books - row=', row)
                 if not hasattr(row['ContentID'], 'startswith') or row['ContentID'].lower().startswith(
-                        "file:///usr/local/kobo/help/") or row['ContentID'].lower().startswith("/usr/local/kobo/help/"):
+                        'file:///usr/local/kobo/help/') or row['ContentID'].lower().startswith('/usr/local/kobo/help/'):
                     # These are internal to the Kobo device and do not exist
                     continue
                 externalId = None if row['ExternalId'] and len(row['ExternalId']) == 0 else row['ExternalId']
                 path = self.path_from_contentid(row['ContentID'], row['ContentType'], row['MimeType'], oncard, externalId)
                 if show_debug:
-                    debug_print("KoboTouch:books - path='%s'"%path, "  ContentID='%s'"%row['ContentID'], " externalId=%s" % externalId)
+                    debug_print("KoboTouch:books - path='%s'"%path, "  ContentID='%s'"%row['ContentID'], ' externalId=%s' % externalId)
 
                 bookshelves = get_bookshelvesforbook(connection, row['ContentID'])
 
@@ -2131,8 +2131,8 @@ class KOBOTOUCH(KOBO):
             if not prefs['manage_device_metadata'] == 'on_connect':
                 self.dump_bookshelves(connection)
             else:
-                debug_print("KoboTouch:books - automatically managing metadata")
-            debug_print("KoboTouch:books - self.kobo_series_dict=", self.kobo_series_dict)
+                debug_print('KoboTouch:books - automatically managing metadata')
+            debug_print('KoboTouch:books - self.kobo_series_dict=', self.kobo_series_dict)
         # Remove books that are no longer in the filesystem. Cache contains
         # indices into the booklist if book not in filesystem, None otherwise
         # Do the operation in reverse order so indices remain valid
@@ -2144,19 +2144,19 @@ class KOBOTOUCH(KOBO):
                 else:
                     debug_print("KoboTouch:books - Book in mtadata.calibre, on file system but not database - bl[idx].title:'%s'"%bl[idx].title)
 
-        # print "count found in cache: %d, count of files in metadata: %d, need_sync: %s" % \
-        #      (len(bl_cache), len(bl), need_sync)
+        # print('count found in cache: %d, count of files in metadata: %d, need_sync: %s' % \
+        #      (len(bl_cache), len(bl), need_sync))
         # Bypassing the KOBO sync_booklists as that does things we don't need to do
         # Also forcing sync to see if this solves issues with updating shelves and matching books.
         if need_sync or True:  # self.count_found_in_bl != len(bl) or need_sync:
-            debug_print("KoboTouch:books - about to sync_booklists")
+            debug_print('KoboTouch:books - about to sync_booklists')
             if oncard == 'cardb':
                 USBMS.sync_booklists(self, (None, None, bl))
             elif oncard == 'carda':
                 USBMS.sync_booklists(self, (None, bl, None))
             else:
                 USBMS.sync_booklists(self, (bl, None, None))
-            debug_print("KoboTouch:books - have done sync_booklists")
+            debug_print('KoboTouch:books - have done sync_booklists')
 
         self.report_progress(1.0, _('Getting list of books on device...'))
         debug_print("KoboTouch:books - end - oncard='%s'"%oncard)
@@ -2164,7 +2164,7 @@ class KOBOTOUCH(KOBO):
 
     @classmethod
     def book_from_path(cls, prefix, lpath, title, authors, mime, date, ContentType, ImageID):
-        debug_print("KoboTouch:book_from_path - title=%s"%title)
+        debug_print('KoboTouch:book_from_path - title=%s'%title)
         book = super().book_from_path(prefix, lpath, title, authors, mime, date, ContentType, ImageID)
 
         # Kobo Audiobooks are directories with files in them.
@@ -2177,7 +2177,7 @@ class KOBOTOUCH(KOBO):
                     size = audiofile.stat().st_size
                     # debug_print("KoboTouch:book_from_path - size=", size)
                     book.size += size
-            debug_print("KoboTouch:book_from_path - book.size=", book.size)
+            debug_print('KoboTouch:book_from_path - book.size=', book.size)
 
         return book
 
@@ -2190,25 +2190,25 @@ class KOBOTOUCH(KOBO):
         if oncard == 'cardb':
             print('path from_contentid cardb')
         else:
-            if (ContentType == "6" or ContentType == "10"):
+            if (ContentType == '6' or ContentType == '10'):
                 if (MimeType == 'application/octet-stream'):  # Audiobooks purchased from Kobo are in a different location.
                     path = self._main_prefix + KOBO_ROOT_DIR_NAME + '/audiobook/' + path
                 elif (MimeType == 'audio/mpeg' and self.isTolinoDevice()):
                     path = self._main_prefix + KOBO_ROOT_DIR_NAME + '/audiobook/' + path
-                elif path.startswith("file:///mnt/onboard/"):
-                    path = self._main_prefix + path.replace("file:///mnt/onboard/", '')
-                elif path.startswith("file:///mnt/sd/"):
-                    path = self._card_a_prefix + path.replace("file:///mnt/sd/", '')
+                elif path.startswith('file:///mnt/onboard/'):
+                    path = self._main_prefix + path.replace('file:///mnt/onboard/', '')
+                elif path.startswith('file:///mnt/sd/'):
+                    path = self._card_a_prefix + path.replace('file:///mnt/sd/', '')
                 elif externalId:
                     path = self._card_a_prefix + 'koboExtStorage/kepub/' + path
                 else:
                     path = self._main_prefix + KOBO_ROOT_DIR_NAME + '/kepub/' + path
             else:   # Should never get here, but, just in case...
-                # if path.startswith("file:///mnt/onboard/"):
-                path = path.replace("file:///mnt/onboard/", self._main_prefix)
-                path = path.replace("file:///mnt/sd/", self._card_a_prefix)
-                path = path.replace("/mnt/onboard/", self._main_prefix)
-                # print "Internal: " + path
+                # if path.startswith('file:///mnt/onboard/'):
+                path = path.replace('file:///mnt/onboard/', self._main_prefix)
+                path = path.replace('file:///mnt/sd/', self._card_a_prefix)
+                path = path.replace('/mnt/onboard/', self._main_prefix)
+                # print('Internal: ' + path)
 
         return path
 
@@ -2222,11 +2222,11 @@ class KOBOTOUCH(KOBO):
                 fpath = path + ending
                 if os.path.exists(fpath):
                     if show_debug:
-                        debug_print("KoboTouch:imagefilename_from_imageID - have cover image fpath=%s" % (fpath))
+                        debug_print('KoboTouch:imagefilename_from_imageID - have cover image fpath=%s' % (fpath))
                     return fpath
 
             if show_debug:
-                debug_print("KoboTouch:imagefilename_from_imageID - no cover image found - ImageID=%s" % (ImageID))
+                debug_print('KoboTouch:imagefilename_from_imageID - no cover image found - ImageID=%s' % (ImageID))
         return None
 
     def get_extra_css(self):
@@ -2239,13 +2239,13 @@ class KOBOTOUCH(KOBO):
                 from css_parser import parseFile as cssparseFile
                 try:
                     extra_sheet = cssparseFile(extra_css_path)
-                    debug_print(f"KoboTouch:get_extra_css: Using extra CSS in {extra_css_path} ({len(extra_sheet.cssRules)} rules)")
+                    debug_print(f'KoboTouch:get_extra_css: Using extra CSS in {extra_css_path} ({len(extra_sheet.cssRules)} rules)')
                     if len(extra_sheet.cssRules) ==0:
-                        debug_print("KoboTouch:get_extra_css: Extra CSS file has no valid rules. CSS will not be modified.")
+                        debug_print('KoboTouch:get_extra_css: Extra CSS file has no valid rules. CSS will not be modified.')
                         extra_sheet = None
                 except Exception as e:
-                    debug_print(f"KoboTouch:get_extra_css: Problem parsing extra CSS file {extra_css_path}")
-                    debug_print(f"KoboTouch:get_extra_css: Exception {e}")
+                    debug_print(f'KoboTouch:get_extra_css: Problem parsing extra CSS file {extra_css_path}')
+                    debug_print(f'KoboTouch:get_extra_css: Exception {e}')
 
         # create dictionary of features enabled in kobo extra css
         self.extra_css_options = {}
@@ -2260,7 +2260,7 @@ class KOBOTOUCH(KOBO):
         return extra_sheet
 
     def get_extra_css_rules(self, sheet, css_rule):
-        return [r for r in sheet.cssRules.rulesOfType(css_rule)]
+        return list(sheet.cssRules.rulesOfType(css_rule))
 
     def get_extra_css_rules_widow_orphan(self, sheet):
         from css_parser.css import CSSRule
@@ -2276,9 +2276,9 @@ class KOBOTOUCH(KOBO):
             self.extra_sheet = self.get_extra_css()
             i = 0
             for file, n, mi in zip(files, names, metadata):
-                debug_print("KoboTouch:upload_books: Processing book: {} by {}".format(mi.title, " and ".join(mi.authors)))
-                debug_print(f"KoboTouch:upload_books: file={file}, name={n}")
-                self.report_progress(i / float(len(files)), "Processing book: {} by {}".format(mi.title, " and ".join(mi.authors)))
+                debug_print('KoboTouch:upload_books: Processing book: {} by {}'.format(mi.title, ' and '.join(mi.authors)))
+                debug_print(f'KoboTouch:upload_books: file={file}, name={n}')
+                self.report_progress(i / float(len(files)), 'Processing book: {} by {}'.format(mi.title, ' and '.join(mi.authors)))
                 mi.kte_calibre_name = n
                 self._modify_epub(file, mi)
                 i += 1
@@ -2286,13 +2286,13 @@ class KOBOTOUCH(KOBO):
         self.report_progress(0, 'Working...')
 
         result = super().upload_books(files, names, on_card, end_session, metadata)
-#        debug_print('KoboTouch:upload_books - result=', result)
+        # debug_print('KoboTouch:upload_books - result=', result)
 
         if self.dbversion >= 53:
             try:
                 with closing(self.device_database_connection()) as connection:
                     cursor = connection.cursor()
-                    cleanup_query = f"DELETE FROM content WHERE ContentID = ? AND Accessibility = 1 AND IsDownloaded = {self.bool_for_query(False)}"
+                    cleanup_query = f'DELETE FROM content WHERE ContentID = ? AND Accessibility = 1 AND IsDownloaded = {self.bool_for_query(False)}'
                     for fname, cycle in result:
                         show_debug = self.is_debugging_title(fname)
                         contentID = self.contentid_from_path(fname, 6)
@@ -2301,7 +2301,7 @@ class KOBOTOUCH(KOBO):
                             debug_print('KoboTouch:upload_books: contentID=', contentID)
 
                         cleanup_values = (contentID,)
-#                        debug_print('KoboTouch:upload_books: Delete record left if deleted on Touch')
+                        # debug_print('KoboTouch:upload_books: Delete record left if deleted on Touch')
                         cursor.execute(cleanup_query, cleanup_values)
 
                         if self.override_kobo_replace_existing:
@@ -2318,11 +2318,11 @@ class KOBOTOUCH(KOBO):
         return result
 
     def _modify_epub(self, book_file, metadata, container=None):
-        debug_print(f"KoboTouch:_modify_epub:Processing {metadata.author_sort} - {metadata.title}")
+        debug_print(f'KoboTouch:_modify_epub:Processing {metadata.author_sort} - {metadata.title}')
 
         # Currently only modifying CSS, so if no stylesheet, don't do anything
         if not self.extra_sheet:
-            debug_print("KoboTouch:_modify_epub: no CSS file")
+            debug_print('KoboTouch:_modify_epub: no CSS file')
             return True
 
         container, commit_container = self.create_container(book_file, metadata, container)
@@ -2339,14 +2339,14 @@ class KOBOTOUCH(KOBO):
 
                 # future css mods may be epub/kepub specific, so pass file extension arg
                 fileext = os.path.splitext(book_file)[-1].lower()
-                debug_print(f"KoboTouch:_modify_epub: Modifying {cssname}")
+                debug_print(f'KoboTouch:_modify_epub: Modifying {cssname}')
                 if self._modify_stylesheet(newsheet, fileext):
-                    debug_print(f"KoboTouch:_modify_epub:CSS rules {oldrules} -> {len(newsheet.cssRules)} ({cssname})")
+                    debug_print(f'KoboTouch:_modify_epub:CSS rules {oldrules} -> {len(newsheet.cssRules)} ({cssname})')
                     container.dirty(cssname)
                     is_dirty = True
 
         if commit_container:
-            debug_print("KoboTouch:_modify_epub: committing container.")
+            debug_print('KoboTouch:_modify_epub: committing container.')
             self.commit_container(container, is_dirty)
 
         return True
@@ -2361,7 +2361,7 @@ class KOBOTOUCH(KOBO):
         if self.extra_css_options.get('has_atpage', False):
             page_rules = self.get_extra_css_rules(sheet, CSSRule.PAGE_RULE)
             if len(page_rules) > 0:
-                debug_print("KoboTouch:_modify_stylesheet: Removing existing @page rules")
+                debug_print('KoboTouch:_modify_stylesheet: Removing existing @page rules')
                 for rule in page_rules:
                     rule.style = ''
                 is_dirty = True
@@ -2371,14 +2371,14 @@ class KOBOTOUCH(KOBO):
         if self.extra_css_options.get('has_widows_orphans', False):
             widow_orphan_rules = self.get_extra_css_rules_widow_orphan(sheet)
             if len(widow_orphan_rules) > 0:
-                debug_print("KoboTouch:_modify_stylesheet: Removing existing widows/orphans attribs")
+                debug_print('KoboTouch:_modify_stylesheet: Removing existing widows/orphans attribs')
                 for rule in widow_orphan_rules:
                     rule.style.removeProperty('widows')
                     rule.style.removeProperty('orphans')
                 is_dirty = True
 
         # append all rules from kobo extra css
-        debug_print("KoboTouch:_modify_stylesheet: Append all kobo extra css rules")
+        debug_print('KoboTouch:_modify_stylesheet: Append all kobo extra css rules')
         for extra_rule in self.extra_sheet.cssRules:
             sheet.insertRule(extra_rule)
             is_dirty = True
@@ -2391,25 +2391,25 @@ class KOBOTOUCH(KOBO):
             commit_container = True
             try:
                 from calibre.ebooks.oeb.polish.container import get_container
-                debug_print("KoboTouch:create_container: try to create new container")
+                debug_print('KoboTouch:create_container: try to create new container')
                 container = get_container(book_file)
                 container.css_preprocessor = DummyCSSPreProcessor()
             except Exception as e:
-                debug_print(f"KoboTouch:create_container: exception from get_container {metadata.author_sort} - {metadata.title}")
-                debug_print(f"KoboTouch:create_container: exception is: {e}")
+                debug_print(f'KoboTouch:create_container: exception from get_container {metadata.author_sort} - {metadata.title}')
+                debug_print(f'KoboTouch:create_container: exception is: {e}')
         else:
             commit_container = False
-            debug_print("KoboTouch:create_container: received container")
+            debug_print('KoboTouch:create_container: received container')
         return container, commit_container
 
     def commit_container(self, container, is_dirty=True):
         # commit container if changes have been made
         if is_dirty:
-            debug_print("KoboTouch:commit_container: commit container.")
+            debug_print('KoboTouch:commit_container: commit container.')
             container.commit()
 
         # Clean-up-AYGO prevents build-up of TEMP exploded epub/kepub files
-        debug_print("KoboTouch:commit_container: removing container temp files.")
+        debug_print('KoboTouch:commit_container: removing container temp files.')
         try:
             shutil.rmtree(container.root)
         except Exception:
@@ -2466,18 +2466,18 @@ class KOBOTOUCH(KOBO):
         return imageId
 
     def delete_images(self, ImageID, book_path):
-        debug_print("KoboTouch:delete_images - ImageID=", ImageID)
+        debug_print('KoboTouch:delete_images - ImageID=', ImageID)
         if ImageID is not None:
             path = self.images_path(book_path, ImageID)
-            debug_print("KoboTouch:delete_images - path=%s" % path)
+            debug_print('KoboTouch:delete_images - path=%s' % path)
 
             for ending in self.cover_file_endings().keys():
                 fpath = path + ending
                 fpath = self.normalize_path(fpath)
-                debug_print("KoboTouch:delete_images - fpath=%s" % fpath)
+                debug_print('KoboTouch:delete_images - fpath=%s' % fpath)
 
                 if os.path.exists(fpath):
-                    debug_print("KoboTouch:delete_images - Image File Exists")
+                    debug_print('KoboTouch:delete_images - Image File Exists')
                     os.unlink(fpath)
 
             try:
@@ -2491,7 +2491,7 @@ class KOBOTOUCH(KOBO):
             debug_print("KoboTouch:contentid_from_path - path='%s'"%path, "ContentType='%s'"%ContentType)
             debug_print("KoboTouch:contentid_from_path - self._main_prefix='%s'"%self._main_prefix, "self._card_a_prefix='%s'"%self._card_a_prefix)
         if ContentType == 6:
-            extension =  os.path.splitext(path)[1]
+            extension = os.path.splitext(path)[1]
             if extension == '.kobo':
                 ContentID = os.path.splitext(path)[0]
                 # Remove the prefix on the file.  it could be either
@@ -2501,20 +2501,20 @@ class KOBOTOUCH(KOBO):
                 ContentID = ContentID.replace(self._main_prefix + self.normalize_path(KOBO_ROOT_DIR_NAME + '/kepub/'), '')
             else:
                 ContentID = path
-                ContentID = ContentID.replace(self._main_prefix, "file:///mnt/onboard/")
+                ContentID = ContentID.replace(self._main_prefix, 'file:///mnt/onboard/')
 
             if show_debug:
                 debug_print("KoboTouch:contentid_from_path - 1 ContentID='%s'"%ContentID)
 
             if self._card_a_prefix is not None:
-                ContentID = ContentID.replace(self._card_a_prefix,  "file:///mnt/sd/")
+                ContentID = ContentID.replace(self._card_a_prefix, 'file:///mnt/sd/')
         else:  # ContentType = 16
             debug_print("KoboTouch:contentid_from_path ContentType other than 6 - ContentType='%d'"%ContentType, "path='%s'"%path)
             ContentID = path
-            ContentID = ContentID.replace(self._main_prefix, "file:///mnt/onboard/")
+            ContentID = ContentID.replace(self._main_prefix, 'file:///mnt/onboard/')
             if self._card_a_prefix is not None:
-                ContentID = ContentID.replace(self._card_a_prefix, "file:///mnt/sd/")
-        ContentID = ContentID.replace("\\", '/')
+                ContentID = ContentID.replace(self._card_a_prefix, 'file:///mnt/sd/')
+        ContentID = ContentID.replace('\\', '/')
         if show_debug:
             debug_print("KoboTouch:contentid_from_path - end - ContentID='%s'"%ContentID)
         return ContentID
@@ -2526,7 +2526,7 @@ class KOBOTOUCH(KOBO):
         return ContentType
 
     def get_content_type_from_extension(self, extension):
-        debug_print("KoboTouch:get_content_type_from_extension - start")
+        debug_print('KoboTouch:get_content_type_from_extension - start')
         # With new firmware, ContentType appears to be 6 for all types of sideloaded books.
         ContentType = 6
         if self.fwversion < (1,9,17):
@@ -2540,32 +2540,32 @@ class KOBOTOUCH(KOBO):
     def update_device_database_collections(self, booklists, collections_attributes, oncard):
         debug_print("KoboTouch:update_device_database_collections - oncard='%s'"%oncard)
         debug_print("KoboTouch:update_device_database_collections - device='%s'" % self)
-        if self.modify_database_check("update_device_database_collections") is False:
+        if self.modify_database_check('update_device_database_collections') is False:
             return
 
         # Only process categories in this list
         supportedcategories = {
-            "Im_Reading":   1,
-            "Read":         2,
-            "Closed":       3,
-            "Shortlist":    4,
-            "Archived":     5,
+            'Im_Reading':   1,
+            'Read':         2,
+            'Closed':       3,
+            'Shortlist':    4,
+            'Archived':     5,
             }
 
         # Define lists for the ReadStatus
         readstatuslist = {
-            "Im_Reading":1,
-            "Read":2,
-            "Closed":3,
+            'Im_Reading':1,
+            'Read':2,
+            'Closed':3,
             }
 
         accessibilitylist = {
-            "Deleted":1,
-            "OverDrive":9,
-            "Preview":6,
-            "Recommendation":4,
+            'Deleted':1,
+            'OverDrive':9,
+            'Preview':6,
+            'Recommendation':4,
             }
-#        debug_print('KoboTouch:update_device_database_collections - collections_attributes=', collections_attributes)
+        # debug_print('KoboTouch:update_device_database_collections - collections_attributes=', collections_attributes)
 
         create_collections       = self.create_collections
         delete_empty_collections = self.delete_empty_collections
@@ -2588,7 +2588,7 @@ class KOBOTOUCH(KOBO):
                             'dbversion': self.dbversion,
                             }
                         ) if have_bookshelf_attributes else None
-#        debug_print('KoboTouch:update_device_database_collections - Collections:', collections)
+        # debug_print('KoboTouch:update_device_database_collections - Collections:', collections)
 
         # Create a connection to the sqlite database
         # Needs to be outside books collection as in the case of removing
@@ -2604,27 +2604,27 @@ class KOBOTOUCH(KOBO):
                     # Need to reset the collections outside the particular loops
                     # otherwise the last item will not be removed
                     if self.dbversion < 53:
-                        debug_print("KoboTouch:update_device_database_collections - calling reset_readstatus")
+                        debug_print('KoboTouch:update_device_database_collections - calling reset_readstatus')
                         self.reset_readstatus(connection, oncard)
                     if self.dbversion >= 14 and self.fwversion < self.min_fwversion_shelves:
-                        debug_print("KoboTouch:update_device_database_collections - calling reset_favouritesindex")
+                        debug_print('KoboTouch:update_device_database_collections - calling reset_favouritesindex')
                         self.reset_favouritesindex(connection, oncard)
 
-#                     debug_print("KoboTouch:update_device_database_collections - length collections=", len(collections))
-#                     debug_print("KoboTouch:update_device_database_collections - self.bookshelvelist=", self.bookshelvelist)
+                    # debug_print("KoboTouch:update_device_database_collections - length collections=", len(collections))
+                    # debug_print("KoboTouch:update_device_database_collections - self.bookshelvelist=", self.bookshelvelist)
                     # Process any collections that exist
                     for category, books in collections.items():
                         debug_print("KoboTouch:update_device_database_collections - category='%s' books=%d"%(category, len(books)))
                         if create_collections and not (category in supportedcategories or category in readstatuslist or category in accessibilitylist):
                             self.check_for_bookshelf(connection, category)
-#                         if category in self.bookshelvelist:
-#                             debug_print("Category: ", category, " id = ", readstatuslist.get(category))
+                        # if category in self.bookshelvelist:
+                        #     debug_print("Category: ", category, " id = ", readstatuslist.get(category))
                         for book in books:
                             # debug_print('    Title:', book.title, 'category: ', category)
                             show_debug = self.is_debugging_title(book.title)
                             if show_debug:
                                 debug_print('    Title="%s"'%book.title, 'category="%s"'%category)
-#                                 debug_print(book)
+                                # debug_print(book)
                                 debug_print('    class=%s'%book.__class__)
                                 debug_print('    book.contentID="%s"'%book.contentID)
                                 debug_print('    book.application_id="%s"'%book.application_id)
@@ -2636,7 +2636,7 @@ class KOBOTOUCH(KOBO):
 
                             if book.contentID is None:
                                 debug_print('    Do not know ContentID - Title="%s", Authors="%s", path="%s"'%(book.title, book.author, book.path))
-                                extension =  os.path.splitext(book.path)[1]
+                                extension = os.path.splitext(book.path)[1]
                                 ContentType = self.get_content_type_from_extension(extension) if extension else self.get_content_type_from_path(book.path)
                                 book.contentID = self.contentid_from_path(book.path, ContentType)
 
@@ -2681,17 +2681,17 @@ class KOBOTOUCH(KOBO):
 
                 elif have_bookshelf_attributes:  # No collections but have set the shelf option
                     # Since no collections exist the ReadStatus needs to be reset to 0 (Unread)
-                    debug_print("No Collections - resetting ReadStatus")
+                    debug_print('No Collections - resetting ReadStatus')
                     if self.dbversion < 53:
                         self.reset_readstatus(connection, oncard)
                     if self.dbversion >= 14 and self.fwversion < self.min_fwversion_shelves:
-                        debug_print("No Collections - resetting FavouritesIndex")
+                        debug_print('No Collections - resetting FavouritesIndex')
                         self.reset_favouritesindex(connection, oncard)
 
             # Set the series info and cleanup the bookshelves only if the firmware supports them and the user has set the options.
-            if (self.supports_bookshelves and self.manage_collections or self.supports_series()) and (
+            if ((self.supports_bookshelves and self.manage_collections) or self.supports_series()) and (
                     have_bookshelf_attributes or update_series_details or update_core_metadata):
-                debug_print("KoboTouch:update_device_database_collections - managing bookshelves and series.")
+                debug_print('KoboTouch:update_device_database_collections - managing bookshelves and series.')
 
                 self.series_set        = 0
                 self.core_metadata_set = 0
@@ -2702,29 +2702,29 @@ class KOBOTOUCH(KOBO):
                         books_in_library += 1
                         show_debug = self.is_debugging_title(book.title)
                         if show_debug:
-                            debug_print("KoboTouch:update_device_database_collections - book.title=%s" % book.title)
+                            debug_print('KoboTouch:update_device_database_collections - book.title=%s' % book.title)
                             debug_print(
-                                "KoboTouch:update_device_database_collections - contentId=%s,"
-                                "update_core_metadata=%s,update_purchased_kepubs=%s, book.is_sideloaded=%s" % (
+                                'KoboTouch:update_device_database_collections - contentId=%s,'
+                                'update_core_metadata=%s,update_purchased_kepubs=%s, book.is_sideloaded=%s' % (
                                 book.contentID, update_core_metadata, update_purchased_kepubs, book.is_sideloaded))
                         if update_core_metadata and (update_purchased_kepubs or book.is_sideloaded):
                             if show_debug:
-                                debug_print("KoboTouch:update_device_database_collections - calling set_core_metadata")
+                                debug_print('KoboTouch:update_device_database_collections - calling set_core_metadata')
                             self.set_core_metadata(connection, book)
                         elif update_series_details:
                             if show_debug:
-                                debug_print("KoboTouch:update_device_database_collections - calling set_core_metadata - series only")
+                                debug_print('KoboTouch:update_device_database_collections - calling set_core_metadata - series only')
                             self.set_core_metadata(connection, book, series_only=True)
                         if self.manage_collections and have_bookshelf_attributes:
                             if show_debug:
-                                debug_print("KoboTouch:update_device_database_collections - about to remove a book from shelves book.title=%s" % book.title)
+                                debug_print('KoboTouch:update_device_database_collections - about to remove a book from shelves book.title=%s' % book.title)
                             self.remove_book_from_device_bookshelves(connection, book)
                             book.device_collections.extend(book.kobo_collections)
                 if not prefs['manage_device_metadata'] == 'manual' and delete_empty_collections:
-                    debug_print("KoboTouch:update_device_database_collections - about to clear empty bookshelves")
+                    debug_print('KoboTouch:update_device_database_collections - about to clear empty bookshelves')
                     self.delete_empty_bookshelves(connection)
-                debug_print("KoboTouch:update_device_database_collections - Number of series set=%d Number of books=%d" % (self.series_set, books_in_library))
-                debug_print("KoboTouch:update_device_database_collections - Number of core metadata set=%d Number of books=%d" % (
+                debug_print('KoboTouch:update_device_database_collections - Number of series set=%d Number of books=%d' % (self.series_set, books_in_library))
+                debug_print('KoboTouch:update_device_database_collections - Number of core metadata set=%d Number of books=%d' % (
                     self.core_metadata_set, books_in_library))
 
                 self.dump_bookshelves(connection)
@@ -2732,7 +2732,7 @@ class KOBOTOUCH(KOBO):
         debug_print('KoboTouch:update_device_database_collections - Finished ')
 
     def rebuild_collections(self, booklist, oncard):
-        debug_print("KoboTouch:rebuild_collections")
+        debug_print('KoboTouch:rebuild_collections')
         collections_attributes = self.get_collections_attributes()
 
         debug_print('KoboTouch:rebuild_collections: collection fields:', collections_attributes)
@@ -2761,7 +2761,7 @@ class KOBOTOUCH(KOBO):
         if self._card_a_prefix and os.path.abspath(path).startswith(os.path.abspath(self._card_a_prefix)) and not self.supports_covers_on_sdcard():
             return
 
-#        debug_print('KoboTouch: uploading cover')
+        # debug_print('KoboTouch: uploading cover')
         try:
             self._upload_cover(
                 path, filename, metadata, filepath,
@@ -2793,7 +2793,7 @@ class KOBOTOUCH(KOBO):
             hash1 = qhash(imageId)
             dir1  = hash1 & (0xff * 1)
             dir2  = (hash1 & (0xff00 * 1)) >> 8
-            path = os.path.join(path, "%s" % dir1, "%s" % dir2)
+            path = os.path.join(path, '%s' % dir1, '%s' % dir2)
 
         if imageId:
             path = os.path.join(path, imageId)
@@ -2823,7 +2823,7 @@ class KOBOTOUCH(KOBO):
             # Did we actually want to letterbox?
             if not letterbox:
                 canvas_size = kobo_size
-        return (kobo_size, canvas_size)
+        return kobo_size, canvas_size
 
     def _create_cover_data(
         self, cover_data, resize_to, minify_to, kobo_size,
@@ -2854,7 +2854,7 @@ class KOBOTOUCH(KOBO):
         from calibre.utils.img import save_cover_data_to
         data = save_cover_data_to(
             cover_data, resize_to=resize_to, compression_quality=quality, minify_to=minify_to, grayscale=upload_grayscale, eink=dithered_covers,
-            letterbox=letterbox, data_fmt="png" if png_covers else "jpeg", letterbox_color=letterbox_color)
+            letterbox=letterbox, data_fmt='png' if png_covers else 'jpeg', letterbox_color=letterbox_color)
         return data
 
     def _upload_cover(
@@ -2876,11 +2876,11 @@ class KOBOTOUCH(KOBO):
         cover = self.normalize_path(metadata.cover.replace('/', os.sep))
 
         if not os.path.exists(cover):
-            debug_print("KoboTouch:_upload_cover - Cover file does not exist in library")
+            debug_print('KoboTouch:_upload_cover - Cover file does not exist in library')
             return
 
         # Get ContentID for Selected Book
-        extension =  os.path.splitext(filepath)[1]
+        extension = os.path.splitext(filepath)[1]
         ContentType = self.get_content_type_from_extension(extension) if extension else self.get_content_type_from_path(filepath)
         ContentID = self.contentid_from_path(filepath, ContentType)
 
@@ -2903,7 +2903,7 @@ class KOBOTOUCH(KOBO):
                 path = self.images_path(path, ImageID)
 
                 if show_debug:
-                    debug_print("KoboTouch:_upload_cover - About to loop over cover endings")
+                    debug_print('KoboTouch:_upload_cover - About to loop over cover endings')
 
                 image_dir = os.path.dirname(os.path.abspath(path))
                 if not os.path.exists(image_dir):
@@ -2919,7 +2919,7 @@ class KOBOTOUCH(KOBO):
                 for ending, cover_options in self.cover_file_endings().items():
                     kobo_size, min_dbversion, max_dbversion, is_full_size = cover_options
                     if show_debug:
-                        debug_print("KoboTouch:_upload_cover - library_cover_size=%s -> kobo_size=%s, min_dbversion=%d max_dbversion=%d, is_full_size=%s" % (
+                        debug_print('KoboTouch:_upload_cover - library_cover_size=%s -> kobo_size=%s, min_dbversion=%d max_dbversion=%d, is_full_size=%s' % (
                             library_cover_size, kobo_size, min_dbversion, max_dbversion, is_full_size))
 
                     if self.dbversion >= min_dbversion and self.dbversion <= max_dbversion:
@@ -2943,8 +2943,8 @@ class KOBOTOUCH(KOBO):
                         resize_to, expand_to = self._calculate_kobo_cover_size(library_cover_size, kobo_size, not is_full_size, keep_cover_aspect, letterbox)
                         if show_debug:
                             debug_print(
-                                "KoboTouch:_calculate_kobo_cover_size - expand_to=%s"
-                                " (vs. kobo_size=%s) & resize_to=%s, keep_cover_aspect=%s & letterbox_fs_covers=%s, png_covers=%s" % (
+                                'KoboTouch:_calculate_kobo_cover_size - expand_to=%s'
+                                ' (vs. kobo_size=%s) & resize_to=%s, keep_cover_aspect=%s & letterbox_fs_covers=%s, png_covers=%s' % (
                                  expand_to, kobo_size, resize_to, keep_cover_aspect, letterbox_fs_covers, png_covers))
 
                         # NOTE: To speed things up, we enforce a lower
@@ -2983,7 +2983,7 @@ class KOBOTOUCH(KOBO):
                                 fsync(f)
         except Exception as e:
             err = str(e)
-            debug_print("KoboTouch:_upload_cover - Exception string: %s"%err)
+            debug_print('KoboTouch:_upload_cover - Exception string: %s'%err)
             raise
 
     def remove_book_from_device_bookshelves(self, connection, book):
@@ -3025,16 +3025,16 @@ class KOBOTOUCH(KOBO):
         if show_debug:
             debug_print('KoboTouch:set_filesize_in_device_database contentID="%s"'%contentID)
 
-        test_query = 'SELECT ___FileSize '     \
-                        'FROM content '        \
-                        'WHERE ContentID = ? ' \
-                        ' AND ContentType = 6'
+        test_query = ('SELECT ___FileSize '
+                        'FROM content '
+                        'WHERE ContentID = ? '
+                        ' AND ContentType = 6')
         test_values = (contentID, )
 
-        updatequery = 'UPDATE content '         \
-                        'SET ___FileSize = ? '  \
-                        'WHERE ContentId = ? '  \
-                        'AND ContentType = 6'
+        updatequery = ('UPDATE content '
+                        'SET ___FileSize = ? '
+                        'WHERE ContentId = ? '
+                        'AND ContentType = 6')
 
         cursor = connection.cursor()
         cursor.execute(test_query, test_values)
@@ -3058,10 +3058,10 @@ class KOBOTOUCH(KOBO):
 
         cursor.close()
 
-#        debug_print("KoboTouch:set_filesize_in_device_database - end")
+        # debug_print("KoboTouch:set_filesize_in_device_database - end")
 
     def delete_empty_bookshelves(self, connection):
-        debug_print("KoboTouch:delete_empty_bookshelves - start")
+        debug_print('KoboTouch:delete_empty_bookshelves - start')
 
         ignore_collections_placeholder = ''
         ignore_collections_values = []
@@ -3069,8 +3069,8 @@ class KOBOTOUCH(KOBO):
             placeholder = ',?'
             ignore_collections_placeholder = ''.join(placeholder for unused in self.ignore_collections_names)
             ignore_collections_values.extend(self.ignore_collections_names)
-            debug_print("KoboTouch:delete_empty_bookshelves - ignore_collections_in=", ignore_collections_placeholder)
-            debug_print("KoboTouch:delete_empty_bookshelves - ignore_collections=", ignore_collections_values)
+            debug_print('KoboTouch:delete_empty_bookshelves - ignore_collections_in=', ignore_collections_placeholder)
+            debug_print('KoboTouch:delete_empty_bookshelves - ignore_collections=', ignore_collections_values)
 
         true, false = self.bool_for_query(True), self.bool_for_query(False)
         delete_query = ("DELETE FROM Shelf "
@@ -3081,7 +3081,7 @@ class KOBOTOUCH(KOBO):
                     "(SELECT 1 FROM ShelfContent c "
                     "WHERE Shelf.Name = c.ShelfName "
                     f"AND c._IsDeleted <> {true})")
-        debug_print("KoboTouch:delete_empty_bookshelves - delete_query=", delete_query)
+        debug_print('KoboTouch:delete_empty_bookshelves - delete_query=', delete_query)
 
         update_query = ("UPDATE Shelf "
                     f"SET _IsDeleted = {true} "
@@ -3092,7 +3092,7 @@ class KOBOTOUCH(KOBO):
                     "(SELECT 1 FROM ShelfContent c "
                     "WHERE Shelf.Name = c.ShelfName "
                     f"AND c._IsDeleted <> {true})")
-        debug_print("KoboTouch:delete_empty_bookshelves - update_query=", update_query)
+        debug_print('KoboTouch:delete_empty_bookshelves - update_query=', update_query)
 
         delete_activity_query = ("DELETE FROM Activity "
                                 "WHERE Type = 'Shelf' "
@@ -3101,7 +3101,7 @@ class KOBOTOUCH(KOBO):
                                 "WHERE Shelf.Name = Activity.Id "
                                 f"AND Shelf._IsDeleted = {false})"
                                 )
-        debug_print("KoboTouch:delete_empty_bookshelves - delete_activity_query=", delete_activity_query)
+        debug_print('KoboTouch:delete_empty_bookshelves - delete_activity_query=', delete_activity_query)
 
         cursor = connection.cursor()
         cursor.execute(delete_query, ignore_collections_values)
@@ -3110,11 +3110,11 @@ class KOBOTOUCH(KOBO):
             cursor.execute(delete_activity_query)
         cursor.close()
 
-        debug_print("KoboTouch:delete_empty_bookshelves - end")
+        debug_print('KoboTouch:delete_empty_bookshelves - end')
 
     def get_bookshelflist(self, connection):
         # Retrieve the list of booksehelves
-        #        debug_print('KoboTouch:get_bookshelflist')
+        # debug_print('KoboTouch:get_bookshelflist')
         bookshelves = []
 
         if not self.supports_bookshelves:
@@ -3123,13 +3123,13 @@ class KOBOTOUCH(KOBO):
         query = f'SELECT Name FROM Shelf WHERE _IsDeleted = {self.bool_for_query(False)}'
         cursor = connection.cursor()
         cursor.execute(query)
-#        count_bookshelves = 0
+        # count_bookshelves = 0
         for row in cursor:
             bookshelves.append(row['Name'])
-#            count_bookshelves = i + 1
+            # count_bookshelves = i + 1
 
         cursor.close()
-#        debug_print("KoboTouch:get_bookshelflist - count bookshelves=" + str(count_bookshelves))
+        # debug_print("KoboTouch:get_bookshelflist - count bookshelves=" + str(count_bookshelves))
 
         return bookshelves
 
@@ -3170,7 +3170,7 @@ class KOBOTOUCH(KOBO):
 
         cursor.close()
 
-#        debug_print("KoboTouch:set_bookshelf - end")
+        # debug_print("KoboTouch:set_bookshelf - end")
 
     def check_for_bookshelf(self, connection, bookshelf_name):
         show_debug = self.is_debugging_title(bookshelf_name)
@@ -3193,17 +3193,17 @@ class KOBOTOUCH(KOBO):
                       bookshelf_name,
                       time.strftime(self.TIMESTAMP_STRING, time.gmtime()),
                       bookshelf_name,
-                      "false",
-                      "true",
-                      "false",
+                      'false',
+                      'true',
+                      'false',
                       )
-        shelf_type = "UserTag"  # if self.supports_reading_list else None
+        shelf_type = 'UserTag'  # if self.supports_reading_list else None
         if self.dbversion < 64:
-            addquery += ' ("CreationDate","InternalName","LastModified","Name","_IsDeleted","_IsVisible","_IsSynced")'\
-                        ' VALUES (?, ?, ?, ?, ?, ?, ?)'
+            addquery += ' ("CreationDate","InternalName","LastModified","Name","_IsDeleted","_IsVisible","_IsSynced")'
+            addquery += ' VALUES (?, ?, ?, ?, ?, ?, ?)'
         else:
-            addquery += ' ("CreationDate", "InternalName","LastModified","Name","_IsDeleted","_IsVisible","_IsSynced", "Id", "Type")'\
-                        ' VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)'
+            addquery += ' ("CreationDate", "InternalName","LastModified","Name","_IsDeleted","_IsVisible","_IsSynced", "Id", "Type")'
+            addquery += ' VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)'
             add_values = add_values +(bookshelf_name, shelf_type)
 
         if show_debug:
@@ -3232,7 +3232,7 @@ class KOBOTOUCH(KOBO):
         # Update the bookshelf list.
         self.bookshelvelist = self.get_bookshelflist(connection)
 
-#        debug_print("KoboTouch:set_bookshelf - end")
+        # debug_print("KoboTouch:set_bookshelf - end")
 
     def remove_from_bookshelves(self, connection, oncard, ContentID=None, bookshelves=None):
         debug_print('KoboTouch:remove_from_bookshelf ContentID=', ContentID)
@@ -3246,9 +3246,9 @@ class KOBOTOUCH(KOBO):
             values.append(ContentID)
         else:
             if oncard == 'carda':
-                query += ' WHERE ContentID like \'file:///mnt/sd/%\''
+                query += " WHERE ContentID like 'file:///mnt/sd/%'"
             elif oncard != 'carda' and oncard != 'cardb':
-                query += ' WHERE ContentID not like \'file:///mnt/sd/%\''
+                query += " WHERE ContentID not like 'file:///mnt/sd/%'"
 
         if bookshelves:
             placeholder = '?'
@@ -3261,7 +3261,7 @@ class KOBOTOUCH(KOBO):
         cursor.execute(query, values)
         cursor.close()
 
-        debug_print("KoboTouch:remove_from_bookshelf - end")
+        debug_print('KoboTouch:remove_from_bookshelf - end')
 
     # No longer used, but keep for a little bit.
     def set_series(self, connection, book):
@@ -3289,7 +3289,7 @@ class KOBOTOUCH(KOBO):
         elif book.series_index is None:         # This should never happen, but...
             update_values = (book.series, None, book.contentID, )
         else:
-            update_values = (book.series, "%g"%book.series_index, book.contentID, )
+            update_values = (book.series, '%g'%book.series_index, book.contentID, )
 
         cursor = connection.cursor()
         try:
@@ -3304,7 +3304,7 @@ class KOBOTOUCH(KOBO):
             cursor.close()
 
         if show_debug:
-            debug_print("KoboTouch:set_series - end")
+            debug_print('KoboTouch:set_series - end')
 
     def set_core_metadata(self, connection, book, series_only=False):
         # debug_print('KoboTouch:set_core_metadata book="%s"' % book.title)
@@ -3319,9 +3319,9 @@ class KOBOTOUCH(KOBO):
                 new_value = None
             else:
                 new_value = new_value if len(new_value.strip()) else None
-                if new_value is not None and new_value.startswith("PLUGBOARD TEMPLATE ERROR"):
+                if new_value is not None and new_value.startswith('PLUGBOARD TEMPLATE ERROR'):
                     debug_print("KoboTouch:generate_update_from_template  template error - template='%s'" % template)
-                    debug_print("KoboTouch:generate_update_from_template - new_value=", new_value)
+                    debug_print('KoboTouch:generate_update_from_template - new_value=', new_value)
 
             # debug_print(
             #     f"KoboTouch:generate_update_from_template - {book.title} - column_name='{column_name}',"
@@ -3366,7 +3366,7 @@ class KOBOTOUCH(KOBO):
         if newmi.series is not None:
             new_series = newmi.series
             try:
-                new_series_number = "%g" % newmi.series_index
+                new_series_number = '%g' % newmi.series_index
             except:
                 new_series_number = None
         else:
@@ -3462,9 +3462,9 @@ class KOBOTOUCH(KOBO):
                     new_subtitle = None
                 else:
                     new_subtitle = book.subtitle if len(book.subtitle.strip()) else None
-                    if new_subtitle is not None and new_subtitle.startswith("PLUGBOARD TEMPLATE ERROR"):
+                    if new_subtitle is not None and new_subtitle.startswith('PLUGBOARD TEMPLATE ERROR'):
                         debug_print("KoboTouch:set_core_metadata subtitle template error - self.subtitle_template='%s'" % self.subtitle_template)
-                        debug_print("KoboTouch:set_core_metadata - new_subtitle=", new_subtitle)
+                        debug_print('KoboTouch:set_core_metadata - new_subtitle=', new_subtitle)
 
                 if (new_subtitle is not None and (book.kobo_subtitle is None or book.subtitle != book.kobo_subtitle)) or \
                     (new_subtitle is None and book.kobo_subtitle is not None):
@@ -3531,7 +3531,7 @@ class KOBOTOUCH(KOBO):
                 cursor.close()
 
         if show_debug:
-            debug_print("KoboTouch:set_core_metadata - end")
+            debug_print('KoboTouch:set_core_metadata - end')
 
     @classmethod
     def config_widget(cls):
@@ -3550,13 +3550,13 @@ class KOBOTOUCH(KOBO):
         ''' Get the setting named key. First looks for a device specific setting.
         If that is not found looks for a device default and if that is not
         found uses the global default.'''
-#         debug_print("KoboTouch::get_prefs - key=", key, "cls=", cls)
+        # debug_print("KoboTouch::get_prefs - key=", key, "cls=", cls)
         if not cls.opts:
             cls.opts = cls.settings()
         try:
             return getattr(cls.opts, key)
         except:
-            debug_print("KoboTouch::get_prefs - probably an extra_customization:", key)
+            debug_print('KoboTouch::get_prefs - probably an extra_customization:', key)
         return None
 
     @classmethod
@@ -4068,7 +4068,7 @@ class KOBOTOUCH(KOBO):
                 debug_print('The database has been upgraded past supported version')
                 self.report_progress(1.0, _('Removing books from device...'))
                 from calibre.devices.errors import UserFeedback
-                raise UserFeedback(_("Kobo database version unsupported - See details"),
+                raise UserFeedback(_('Kobo database version unsupported - See details'),
                     _('Your Kobo is running an updated firmware/database version.'
                     ' As calibre does not know about this updated firmware,'
                     ' database editing is disabled, to prevent corruption.'
@@ -4105,14 +4105,14 @@ class KOBOTOUCH(KOBO):
     def is_supported_fwversion(self):
         # Starting with firmware version 3.19.x, the last number appears to be is a
         # build number. It can be safely ignored when testing the firmware version.
-        debug_print("KoboTouch::is_supported_fwversion - self.fwversion[:2]", self.fwversion[:2])
+        debug_print('KoboTouch::is_supported_fwversion - self.fwversion[:2]', self.fwversion[:2])
         return self.fwversion[:2] > self.max_supported_fwversion
 
     @classmethod
     def migrate_old_settings(cls, settings):
-        debug_print("KoboTouch::migrate_old_settings - start")
-        debug_print("KoboTouch::migrate_old_settings - settings.extra_customization=", settings.extra_customization)
-        debug_print("KoboTouch::migrate_old_settings - For class=", cls.name)
+        debug_print('KoboTouch::migrate_old_settings - start')
+        debug_print('KoboTouch::migrate_old_settings - settings.extra_customization=', settings.extra_customization)
+        debug_print('KoboTouch::migrate_old_settings - For class=', cls.name)
 
         count_options = 0
         OPT_COLLECTIONS                 = count_options
@@ -4146,11 +4146,11 @@ class KOBOTOUCH(KOBO):
         # the total number of options.
         if cls == KOBOTOUCH or len(settings.extra_customization) >= count_options:
             config = cls._config()
-            debug_print("KoboTouch::migrate_old_settings - config.preferences=", config.preferences)
-            debug_print("KoboTouch::migrate_old_settings - settings need to be migrated")
+            debug_print('KoboTouch::migrate_old_settings - config.preferences=', config.preferences)
+            debug_print('KoboTouch::migrate_old_settings - settings need to be migrated')
             settings.manage_collections = True
             settings.collections_columns = settings.extra_customization[OPT_COLLECTIONS]
-            debug_print("KoboTouch::migrate_old_settings - settings.collections_columns=", settings.collections_columns)
+            debug_print('KoboTouch::migrate_old_settings - settings.collections_columns=', settings.collections_columns)
             settings.create_collections = settings.extra_customization[OPT_CREATE_BOOKSHELVES]
             settings.delete_empty_collections = settings.extra_customization[OPT_DELETE_BOOKSHELVES]
 
@@ -4183,7 +4183,7 @@ class KOBOTOUCH(KOBO):
                 debugging_title = settings.extra_customization[OPT_SUPPORT_NEWER_FIRMWARE]
                 start_subclass_extra_options = OPT_SUPPORT_NEWER_FIRMWARE + 1
             else:
-                debug_print("KoboTouch::migrate_old_settings - Have all options")
+                debug_print('KoboTouch::migrate_old_settings - Have all options')
                 settings.update_series = settings.extra_customization[OPT_UPDATE_SERIES_DETAILS]
                 settings.modify_css = settings.extra_customization[OPT_MODIFY_CSS]
                 settings.support_newer_firmware = settings.extra_customization[OPT_SUPPORT_NEWER_FIRMWARE]
@@ -4199,12 +4199,12 @@ class KOBOTOUCH(KOBO):
     def is_debugging_title(self, title):
         if not DEBUG:
             return False
-#         debug_print("KoboTouch:is_debugging - title=", title)
+        # debug_print("KoboTouch:is_debugging - title=", title)
 
         if not self.debugging_title and not self.debugging_title == '':
             self.debugging_title = self.get_debugging_title()
         try:
-            is_debugging = len(self.debugging_title) > 0 and title.lower().find(self.debugging_title.lower()) >= 0 or len(title) == 0
+            is_debugging = (len(self.debugging_title) > 0 and title.lower().find(self.debugging_title.lower()) >= 0) or len(title) == 0
         except:
             debug_print(("KoboTouch::is_debugging_title - Exception checking debugging title for title '{}'.").format(title))
             is_debugging = False
@@ -4230,9 +4230,9 @@ class KOBOTOUCH(KOBO):
             prints(placeholders%row)
             i += 1
         if i == 0:
-            prints("No shelves found!!")
+            prints('No shelves found!!')
         else:
-            prints("Number of shelves=%d"%i)
+            prints('Number of shelves=%d'%i)
 
         prints('\nBooks on shelves on device:')
         cursor.execute(shelfcontent_query)
@@ -4242,16 +4242,16 @@ class KOBOTOUCH(KOBO):
             prints(placeholders%row)
             i += 1
         if i == 0:
-            prints("No books are on any shelves!!")
+            prints('No books are on any shelves!!')
         else:
-            prints("Number of shelved books=%d"%i)
+            prints('Number of shelved books=%d'%i)
 
         cursor.close()
         debug_print('KoboTouch:dump_bookshelves - end')
 
     def __str__(self, *args, **kwargs):
         options = ', '.join([f'{x.name}: {self.get_pref(x.name)}' for x in self._config().preferences])
-        return f"Driver:{self.name}, Options - {options}"
+        return f'Driver:{self.name}, Options - {options}'
 
 
 if __name__ == '__main__':
@@ -4263,16 +4263,16 @@ if __name__ == '__main__':
         scanner = DeviceScanner()
         scanner.scan()
         devs = scanner.devices
-#         debug_print("unit test: devs.__class__=", devs.__class__)
-#         debug_print("unit test: devs.__class__=", devs.__class__.__name__)
-        debug_print("unit test: devs=", devs)
-        debug_print("unit test: dev=", dev)
-    #         cd = dev.detect_managed_devices(devs)
-    #         if cd is None:
-    #             raise ValueError('Failed to detect KOBOTOUCH device')
+        # debug_print("unit test: devs.__class__=", devs.__class__)
+        # debug_print("unit test: devs.__class__=", devs.__class__.__name__)
+        debug_print('unit test: devs=', devs)
+        debug_print('unit test: dev=', dev)
+        # cd = dev.detect_managed_devices(devs)
+        # if cd is None:
+        #     raise ValueError('Failed to detect KOBOTOUCH device')
         dev.set_progress_reporter(prints)
-#         dev.open(cd, None)
-#         dev.filesystem_cache.dump()
+        # dev.open(cd, None)
+        # dev.filesystem_cache.dump()
         print('Prefix for main memory:', dev.dbversion)
     finally:
         dev.shutdown()
diff --git a/src/calibre/devices/kobo/kobotouch_config.py b/src/calibre/devices/kobo/kobotouch_config.py
index eb3a7459b9..f32773c6f5 100644
--- a/src/calibre/devices/kobo/kobotouch_config.py
+++ b/src/calibre/devices/kobo/kobotouch_config.py
@@ -52,7 +52,7 @@ class KOBOTOUCHConfig(TabbedDeviceConfig):
         self.tab1 = Tab1Config(self, self.device)
         self.tab2 = Tab2Config(self, self.device)
 
-        self.addDeviceTab(self.tab1, _("Collections, covers && uploads"))
+        self.addDeviceTab(self.tab1, _('Collections, covers && uploads'))
         self.addDeviceTab(self.tab2, _('Metadata, on device && advanced'))
 
     def get_pref(self, key):
@@ -92,7 +92,7 @@ class KOBOTOUCHConfig(TabbedDeviceConfig):
         return self.tab2.metadata_options
 
     def commit(self):
-        debug_print("KOBOTOUCHConfig::commit: start")
+        debug_print('KOBOTOUCHConfig::commit: start')
         p = super().commit()
 
         p['manage_collections'] = self.manage_collections
@@ -195,14 +195,14 @@ class BookUploadsGroupBox(DeviceOptionsGroupBox):
 
     def __init__(self, parent, device):
         super().__init__(parent, device)
-        self.setTitle(_("Uploading of books"))
+        self.setTitle(_('Uploading of books'))
 
         self.options_layout = QGridLayout()
-        self.options_layout.setObjectName("options_layout")
+        self.options_layout.setObjectName('options_layout')
         self.setLayout(self.options_layout)
 
         self.modify_css_checkbox = create_checkbox(
-                _("Modify CSS"),
+                _('Modify CSS'),
                 _('This allows addition of user CSS rules and removal of some CSS. '
                 'When sending a book, the driver adds the contents of {0} to all stylesheets in the EPUB. '
                 'This file is searched for in the root folder of the main memory of the device. '
@@ -211,7 +211,7 @@ class BookUploadsGroupBox(DeviceOptionsGroupBox):
                 device.get_pref('modify_css')
                 )
         self.override_kobo_replace_existing_checkbox = create_checkbox(
-                _("Do not treat replacements as new books"),
+                _('Do not treat replacements as new books'),
                 _('When a new book is side-loaded, the Kobo firmware imports details of the book into the internal database. '
                 'Even if the book is a replacement for an existing book, the Kobo will remove the book from the database and then treat it as a new book. '
                 'This means that the reading status, bookmarks and collections for the book will be lost. '
@@ -237,10 +237,10 @@ class CollectionsGroupBox(DeviceOptionsGroupBox):
 
     def __init__(self, parent, device):
         super().__init__(parent, device)
-        self.setTitle(_("Collections"))
+        self.setTitle(_('Collections'))
 
         self.options_layout = QGridLayout()
-        self.options_layout.setObjectName("options_layout")
+        self.options_layout.setObjectName('options_layout')
         self.setLayout(self.options_layout)
 
         self.setCheckable(True)
@@ -248,7 +248,7 @@ class CollectionsGroupBox(DeviceOptionsGroupBox):
         self.setToolTip(wrap_msg(_('Create new collections on the Kobo if they do not exist. This is only for firmware V2.0.0 or later.')))
 
         self.use_collections_columns_checkbox = create_checkbox(
-                             _("Collections columns:"),
+                             _('Collections columns:'),
                              _('Use a column to generate collections.'),
                              device.get_pref('use_collections_columns')
                              )
@@ -259,7 +259,7 @@ class CollectionsGroupBox(DeviceOptionsGroupBox):
         self.collections_columns_edit.setText(device.get_pref('collections_columns'))
 
         self.use_collections_template_checkbox = create_checkbox(
-                             _("Collections template:"),
+                             _('Collections template:'),
                              _('Use a template to generate collections.'),
                              device.get_pref('use_collections_template')
                              )
@@ -272,7 +272,7 @@ class CollectionsGroupBox(DeviceOptionsGroupBox):
                             )
 
         self.create_collections_checkbox = create_checkbox(
-                         _("Create collections"),
+                         _('Create collections'),
                          _('Create new collections on the Kobo if they do not exist. This is only for firmware V2.0.0 or later.'),
                          device.get_pref('create_collections')
                          )
@@ -346,10 +346,10 @@ class CoversGroupBox(DeviceOptionsGroupBox):
 
     def __init__(self, parent, device):
         super().__init__(parent, device)
-        self.setTitle(_("Upload covers"))
+        self.setTitle(_('Upload covers'))
 
         self.options_layout = QGridLayout()
-        self.options_layout.setObjectName("options_layout")
+        self.options_layout.setObjectName('options_layout')
         self.setLayout(self.options_layout)
 
         self.setCheckable(True)
@@ -465,14 +465,14 @@ class DeviceListGroupBox(DeviceOptionsGroupBox):
 
     def __init__(self, parent, device):
         super().__init__(parent, device)
-        self.setTitle(_("Show as on device"))
+        self.setTitle(_('Show as on device'))
 
         self.options_layout = QGridLayout()
-        self.options_layout.setObjectName("options_layout")
+        self.options_layout.setObjectName('options_layout')
         self.setLayout(self.options_layout)
 
         self.show_recommendations_checkbox = create_checkbox(
-                             _("Show recommendations"),
+                             _('Show recommendations'),
                              _('Kobo shows recommendations on the device.  In some cases these have '
                                'files but in other cases they are just pointers to the web site to buy. '
                                'Enable if you wish to see/delete them.'),
@@ -480,7 +480,7 @@ class DeviceListGroupBox(DeviceOptionsGroupBox):
                              )
 
         self.show_archived_books_checkbox = create_checkbox(
-                             _("Show archived books"),
+                             _('Show archived books'),
                              _('Archived books are listed on the device but need to be downloaded to read.'
                                ' Use this option to show these books and match them with books in the calibre library.'),
                              device.get_pref('show_archived_books')
@@ -514,15 +514,15 @@ class DeviceListGroupBox(DeviceOptionsGroupBox):
 class AdvancedGroupBox(DeviceOptionsGroupBox):
 
     def __init__(self, parent, device):
-        super().__init__(parent, device, _("Advanced options"))
-#         self.setTitle(_("Advanced Options"))
+        super().__init__(parent, device, _('Advanced options'))
+        # self.setTitle(_("Advanced Options"))
 
         self.options_layout = QGridLayout()
-        self.options_layout.setObjectName("options_layout")
+        self.options_layout.setObjectName('options_layout')
         self.setLayout(self.options_layout)
 
         self.support_newer_firmware_checkbox = create_checkbox(
-                            _("Attempt to support newer firmware"),
+                            _('Attempt to support newer firmware'),
                             _('Kobo routinely updates the firmware and the '
                               'database version. With this option calibre will attempt '
                               'to perform full read-write functionality - Here be Dragons!! '
@@ -533,7 +533,7 @@ class AdvancedGroupBox(DeviceOptionsGroupBox):
                              )
 
         self.debugging_title_checkbox = create_checkbox(
-                             _("Title to test when debugging"),
+                             _('Title to test when debugging'),
                              _('Part of title of a book that can be used when doing some tests for debugging. '
                                'The test is to see if the string is contained in the title of a book. '
                                'The better the match, the less extraneous output.'),
@@ -564,10 +564,10 @@ class MetadataGroupBox(DeviceOptionsGroupBox):
 
     def __init__(self, parent, device):
         super().__init__(parent, device)
-        self.setTitle(_("Update metadata on the device"))
+        self.setTitle(_('Update metadata on the device'))
 
         self.options_layout = QGridLayout()
-        self.options_layout.setObjectName("options_layout")
+        self.options_layout.setObjectName('options_layout')
         self.setLayout(self.options_layout)
 
         self.setCheckable(True)
@@ -576,7 +576,7 @@ class MetadataGroupBox(DeviceOptionsGroupBox):
                                'Be careful when doing this as it will take time and could make the initial connection take a long time.')))
 
         self.update_series_checkbox = create_checkbox(
-                             _("Set series information"),
+                             _('Set series information'),
                              _('The book lists on the Kobo devices can display series information. '
                                'This is not read by the device from the sideloaded books. '
                                'Series information can only be added to the device after the '
@@ -585,7 +585,7 @@ class MetadataGroupBox(DeviceOptionsGroupBox):
                              device.get_pref('update_series')
                              )
         self.force_series_id_checkbox = create_checkbox(
-                             _("Force series ID"),
+                             _('Force series ID'),
                              _('Kobo devices use a SeriesID to distinguish between different series. '
                                'Purchased books have a SeriesID assigned by Kobo. Sideloaded books '
                                'have a SeriesID assigned by calibre, which is usually different. '
@@ -595,7 +595,7 @@ class MetadataGroupBox(DeviceOptionsGroupBox):
                              device.get_pref('force_series_id')
                              )
         self.update_core_metadata_checkbox = create_checkbox(
-                             _("Update metadata on Book Details pages"),
+                             _('Update metadata on Book Details pages'),
                              _('This will update the metadata in the device database when the device is connected. '
                                'The metadata updated is displayed on the device in the library and the Book details page. '
                                'This is the title, authors, comments/synopsis, series name and number, publisher and published Date, ISBN and language. '
@@ -605,57 +605,57 @@ class MetadataGroupBox(DeviceOptionsGroupBox):
                              )
 
         self.update_purchased_kepubs_checkbox = create_checkbox(
-                             _("Update purchased books"),
+                             _('Update purchased books'),
                              _('Update books purchased from Kobo and downloaded to the device.'
                                ),
                              device.get_pref('update_purchased_kepubs')
                              )
         self.update_subtitle_checkbox = create_checkbox(
-                             _("Subtitle"),
+                             _('Subtitle'),
                              _('Update the subtitle on the device using a template.'),
                              device.get_pref('update_subtitle')
                              )
         self.subtitle_template_edit = TemplateConfig(
                             device.get_pref('subtitle_template'),
-                            tooltip=_("Enter a template to use to set the subtitle. "
-                                      "If the template is empty, the subtitle will be cleared."
+                            tooltip=_('Enter a template to use to set the subtitle. '
+                                      'If the template is empty, the subtitle will be cleared.'
                                       )
                             )
         self.update_bookstats_checkbox = create_checkbox(
-                             _("Book stats"),
+                             _('Book stats'),
                              _('Update the book stats '),
                              device.get_pref('update_bookstats')
                              )
         self.bookstats_wordcount_template_edit = TemplateConfig(
                             device.get_pref('bookstats_wordcount_template'),
-                            label=_("Words:"),
-                            tooltip=_("Enter a template to use to set the word count for the book. "
-                                      "If the template is empty, the word count will be cleared."
+                            label=_('Words:'),
+                            tooltip=_('Enter a template to use to set the word count for the book. '
+                                      'If the template is empty, the word count will be cleared.'
                                       )
                             )
         self.bookstats_pagecount_template_edit = TemplateConfig(
                             device.get_pref('bookstats_pagecount_template'),
-                            label=_("Pages:"),
-                            tooltip=_("Enter a template to use to set the page count for the book. "
-                                      "If the template is empty, the page count will be cleared."
+                            label=_('Pages:'),
+                            tooltip=_('Enter a template to use to set the page count for the book. '
+                                      'If the template is empty, the page count will be cleared.'
                                       )
                             )
 
         self.bookstats_timetoread_label = QLabel(_('Hours to read estimates:'))
         self.bookstats_timetoread_upper_template_edit = TemplateConfig(
                             device.get_pref('bookstats_timetoread_upper_template'),
-                            label=_("Upper:"),
-                            tooltip=_("Enter a template to use to set the upper estimate of the time to read for the book. "
-                                      "The estimate is in hours. "
-                                      "If the template is empty, the time will be cleared."
+                            label=_('Upper:'),
+                            tooltip=_('Enter a template to use to set the upper estimate of the time to read for the book. '
+                                      'The estimate is in hours. '
+                                      'If the template is empty, the time will be cleared.'
                                       )
                             )
         self.bookstats_timetoread_lower_template_edit = TemplateConfig(
                             device.get_pref('bookstats_timetoread_lower_template'),
-                            label=_("Lower:"),
-                            tooltip=_("Enter a template to use to set the lower estimate of the time to read for the book. "
-                                      "The estimate is in hours. "
-                                      "If the template is empty, the time will be cleared."
+                            label=_('Lower:'),
+                            tooltip=_('Enter a template to use to set the lower estimate of the time to read for the book. '
+                                      'The estimate is in hours. '
+                                      'If the template is empty, the time will be cleared.'
                                       )
                             )
 
@@ -842,11 +842,11 @@ if __name__ == '__main__':
     s = DeviceScanner()
     s.scan()
     app = Application([])
-    debug_print("KOBOTOUCH:", KOBOTOUCH)
+    debug_print('KOBOTOUCH:', KOBOTOUCH)
     dev = KOBOTOUCH(None)
-#     dev.startup()
-#     cd = dev.detect_managed_devices(s.devices)
-#     dev.open(cd, 'test')
+    # dev.startup()
+    # cd = dev.detect_managed_devices(s.devices)
+    # dev.open(cd, 'test')
     cw = dev.config_widget()
     d = QDialog()
     d.l = QVBoxLayout()
diff --git a/src/calibre/devices/misc.py b/src/calibre/devices/misc.py
index 770cb39fc5..d02f89a69f 100644
--- a/src/calibre/devices/misc.py
+++ b/src/calibre/devices/misc.py
@@ -319,36 +319,34 @@ class NEXTBOOK(USBMS):
     SUPPORTS_SUB_DIRS = True
     THUMBNAIL_HEIGHT = 120
 
-    '''
-    def upload_cover(self, path, filename, metadata, filepath):
-        if metadata.thumbnail and metadata.thumbnail[-1]:
-            path = path.replace('/', os.sep)
-            is_main = path.startswith(self._main_prefix)
-            prefix = None
-            if is_main:
-                prefix = self._main_prefix
-            else:
-                if self._card_a_prefix and \
-                    path.startswith(self._card_a_prefix):
-                    prefix = self._card_a_prefix
-                elif self._card_b_prefix and \
-                        path.startswith(self._card_b_prefix):
-                    prefix = self._card_b_prefix
-            if prefix is None:
-                prints('WARNING: Failed to find prefix for:', filepath)
-                return
-            thumbnail_dir = os.path.join(prefix, '.Cover')
-
-            relpath = os.path.relpath(filepath, prefix)
-            if relpath.startswith('..\\'):
-                relpath = relpath[3:]
-            thumbnail_dir = os.path.join(thumbnail_dir, relpath)
-            if not os.path.exists(thumbnail_dir):
-                os.makedirs(thumbnail_dir)
-            with open(os.path.join(thumbnail_dir, filename+'.jpg'), 'wb') as f:
-                f.write(metadata.thumbnail[-1])
-                fsync(f)
-    '''
+    # def upload_cover(self, path, filename, metadata, filepath):
+    #     if metadata.thumbnail and metadata.thumbnail[-1]:
+    #         path = path.replace('/', os.sep)
+    #         is_main = path.startswith(self._main_prefix)
+    #         prefix = None
+    #         if is_main:
+    #             prefix = self._main_prefix
+    #         else:
+    #             if self._card_a_prefix and \
+    #                 path.startswith(self._card_a_prefix):
+    #                 prefix = self._card_a_prefix
+    #             elif self._card_b_prefix and \
+    #                     path.startswith(self._card_b_prefix):
+    #                 prefix = self._card_b_prefix
+    #         if prefix is None:
+    #             prints('WARNING: Failed to find prefix for:', filepath)
+    #             return
+    #         thumbnail_dir = os.path.join(prefix, '.Cover')
+    #
+    #         relpath = os.path.relpath(filepath, prefix)
+    #         if relpath.startswith('..\\'):
+    #             relpath = relpath[3:]
+    #         thumbnail_dir = os.path.join(thumbnail_dir, relpath)
+    #         if not os.path.exists(thumbnail_dir):
+    #             os.makedirs(thumbnail_dir)
+    #         with open(os.path.join(thumbnail_dir, filename+'.jpg'), 'wb') as f:
+    #             f.write(metadata.thumbnail[-1])
+    #             fsync(f)
 
 
 class MOOVYBOOK(USBMS):
diff --git a/src/calibre/devices/mtp/__init__.py b/src/calibre/devices/mtp/__init__.py
index c2a96b7708..3c0958cb29 100644
--- a/src/calibre/devices/mtp/__init__.py
+++ b/src/calibre/devices/mtp/__init__.py
@@ -4,6 +4,3 @@
 __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
-
-
-
diff --git a/src/calibre/devices/mtp/driver.py b/src/calibre/devices/mtp/driver.py
index ec51c48694..21852bd911 100644
--- a/src/calibre/devices/mtp/driver.py
+++ b/src/calibre/devices/mtp/driver.py
@@ -50,7 +50,6 @@ class MTP_DEVICE(BASE):
 
     METADATA_CACHE = 'metadata.calibre'
     DRIVEINFO = 'driveinfo.calibre'
-    CAN_SET_METADATA = []
     NEWS_IN_FOLDER = True
     MAX_PATH_LEN = 230
     THUMBNAIL_HEIGHT = DEFAULT_THUMBNAIL_HEIGHT
@@ -487,7 +486,7 @@ class MTP_DEVICE(BASE):
         self.report_progress(0, _('Transferring books to device...'))
         i, total = 0, len(files)
 
-        routing = {fmt:dest for fmt,dest in self.get_pref('rules')}
+        routing = dict(self.get_pref('rules'))
 
         for infile, fname, mi in zip(files, names, metadata):
             path = self.create_upload_path(prefix, mi, fname, routing)
diff --git a/src/calibre/devices/mtp/filesystem_cache.py b/src/calibre/devices/mtp/filesystem_cache.py
index 22d9331983..674abeebdc 100644
--- a/src/calibre/devices/mtp/filesystem_cache.py
+++ b/src/calibre/devices/mtp/filesystem_cache.py
@@ -22,6 +22,7 @@ from calibre.utils.icu import lower, sort_key
 
 bexts = frozenset(BOOK_EXTENSIONS) - {'mbp', 'tan', 'rar', 'zip', 'xml'}
 
+
 def convert_timestamp(md):
     try:
         if isinstance(md, tuple):
@@ -176,7 +177,7 @@ class FileOrFolder:
         line = '%s%s %s [id:%s %s]'%(prefix, c, self.name, self.object_id, data)
         prints(line, file=out)
         for c in (self.folders, self.files):
-            for e in sorted(c, key=lambda x:sort_key(x.name)):
+            for e in sorted(c, key=lambda x: sort_key(x.name)):
                 e.dump(prefix=prefix+'  ', out=out)
 
     def list(self, recurse=False):
diff --git a/src/calibre/devices/mtp/unix/__init__.py b/src/calibre/devices/mtp/unix/__init__.py
index a2ec8c43b0..ad672c4ee0 100644
--- a/src/calibre/devices/mtp/unix/__init__.py
+++ b/src/calibre/devices/mtp/unix/__init__.py
@@ -9,4 +9,3 @@ __docformat__ = 'restructuredtext en'
 '''
 libmtp based drivers for MTP devices on Unix like platforms.
 '''
-
diff --git a/src/calibre/devices/mtp/unix/driver.py b/src/calibre/devices/mtp/unix/driver.py
index d3d8047e51..33ef45461c 100644
--- a/src/calibre/devices/mtp/unix/driver.py
+++ b/src/calibre/devices/mtp/unix/driver.py
@@ -234,7 +234,7 @@ class MTP_DEVICE(MTPDeviceBase):
         try:
             storage = sorted_storage(self.dev.storage_info)
         except self.libmtp.MTPError as e:
-            if "The device has no storage information." in str(e):
+            if 'The device has no storage information.' in str(e):
                 # This happens on newer Android devices while waiting for
                 # the user to allow access. Apparently what happens is
                 # that when the user clicks allow, the device disconnects
diff --git a/src/calibre/devices/mtp/windows/__init__.py b/src/calibre/devices/mtp/windows/__init__.py
index fba7748a38..c555cf1377 100644
--- a/src/calibre/devices/mtp/windows/__init__.py
+++ b/src/calibre/devices/mtp/windows/__init__.py
@@ -4,6 +4,3 @@
 __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
-
-
-
diff --git a/src/calibre/devices/mtp/windows/driver.py b/src/calibre/devices/mtp/windows/driver.py
index 6f8efb3425..5203a30495 100644
--- a/src/calibre/devices/mtp/windows/driver.py
+++ b/src/calibre/devices/mtp/windows/driver.py
@@ -169,7 +169,7 @@ class MTP_DEVICE(MTPDeviceBase):
         try:
             pnp_ids = frozenset(self.wpd.enumerate_devices())
         except:
-            p("Failed to get list of PNP ids on system")
+            p('Failed to get list of PNP ids on system')
             p(traceback.format_exc())
             return False
 
diff --git a/src/calibre/devices/paladin/driver.py b/src/calibre/devices/paladin/driver.py
index 54d60f00ac..750aef630e 100644
--- a/src/calibre/devices/paladin/driver.py
+++ b/src/calibre/devices/paladin/driver.py
@@ -82,7 +82,7 @@ class PALADIN(USBMS):
         bl = USBMS.books(self, oncard=oncard, end_session=end_session)
 
         dbpath = self.normalize_path(prefix + DBPATH)
-        debug_print("SQLite DB Path: " + dbpath)
+        debug_print('SQLite DB Path: ' + dbpath)
 
         with closing(apsw.Connection(dbpath)) as connection:
             cursor = connection.cursor()
@@ -122,10 +122,10 @@ class PALADIN(USBMS):
 
                 try:
                     device_offset = max(time_offsets, key=lambda a: time_offsets.get(a))
-                    debug_print("Device Offset: %d ms"%device_offset)
+                    debug_print('Device Offset: %d ms'%device_offset)
                     self.device_offset = device_offset
                 except ValueError:
-                    debug_print("No Books To Detect Device Offset.")
+                    debug_print('No Books To Detect Device Offset.')
 
             for idx, book in enumerate(bl):
                 query = 'SELECT _id, thumbnail FROM books WHERE filename = ?'
@@ -174,7 +174,7 @@ class PALADIN(USBMS):
         if self.plugboard_func:
             plugboard = self.plugboard_func(self.__class__.__name__,
                     'device_db', self.plugboards)
-            debug_print("PALADIN: Using Plugboard", plugboard)
+            debug_print('PALADIN: Using Plugboard', plugboard)
 
         prefix = self._card_a_prefix if oncard == 'carda' else self._main_prefix
         if prefix is None:
@@ -183,7 +183,7 @@ class PALADIN(USBMS):
         source_id = 1 if oncard == 'carda' else 0
 
         dbpath = self.normalize_path(prefix + DBPATH)
-        debug_print("SQLite DB Path: " + dbpath)
+        debug_print('SQLite DB Path: ' + dbpath)
 
         collections = booklist.get_collections(collections_attributes)
 
@@ -199,7 +199,7 @@ class PALADIN(USBMS):
         try:
             cursor = connection.cursor()
 
-            debug_print("Removing Orphaned Collection Records")
+            debug_print('Removing Orphaned Collection Records')
 
             # Purge any collections references that point into the abyss
             query = 'DELETE FROM booktags WHERE book_id NOT IN (SELECT _id FROM books)'
@@ -207,7 +207,7 @@ class PALADIN(USBMS):
             query = 'DELETE FROM booktags WHERE tag_id NOT IN (SELECT _id FROM tags)'
             cursor.execute(query)
 
-            debug_print("Removing Orphaned Book Records")
+            debug_print('Removing Orphaned Book Records')
 
             cursor.close()
         except Exception:
@@ -249,7 +249,7 @@ class PALADIN(USBMS):
         sequence_max = sequence_min
         sequence_dirty = 0
 
-        debug_print("Book Sequence Min: %d, Source Id: %d"%(sequence_min,source_id))
+        debug_print('Book Sequence Min: %d, Source Id: %d'%(sequence_min,source_id))
 
         try:
             cursor = connection.cursor()
@@ -283,7 +283,7 @@ class PALADIN(USBMS):
 
         # If the database is 'dirty', then we should fix up the Ids and the sequence number
         if sequence_dirty == 1:
-            debug_print("Book Sequence Dirty for Source Id: %d"%source_id)
+            debug_print('Book Sequence Dirty for Source Id: %d'%source_id)
             sequence_max = sequence_max + 1
             for book, bookId in db_books.items():
                 if bookId < sequence_min:
@@ -302,7 +302,7 @@ class PALADIN(USBMS):
                     cursor.execute(query, t)
 
             self.set_database_sequence_id(connection, 'books', sequence_max)
-            debug_print("Book Sequence Max: %d, Source Id: %d"%(sequence_max,source_id))
+            debug_print('Book Sequence Max: %d, Source Id: %d'%(sequence_max,source_id))
 
         cursor.close()
         return db_books
@@ -386,7 +386,7 @@ class PALADIN(USBMS):
         sequence_max = sequence_min
         sequence_dirty = 0
 
-        debug_print("Collection Sequence Min: %d, Source Id: %d"%(sequence_min,source_id))
+        debug_print('Collection Sequence Min: %d, Source Id: %d'%(sequence_min,source_id))
 
         try:
             cursor = connection.cursor()
@@ -415,7 +415,7 @@ class PALADIN(USBMS):
 
         # If the database is 'dirty', then we should fix up the Ids and the sequence number
         if sequence_dirty == 1:
-            debug_print("Collection Sequence Dirty for Source Id: %d"%source_id)
+            debug_print('Collection Sequence Dirty for Source Id: %d'%source_id)
             sequence_max = sequence_max + 1
             for collection, collectionId in db_collections.items():
                 if collectionId < sequence_min:
@@ -434,13 +434,13 @@ class PALADIN(USBMS):
                     cursor.execute(query, t)
 
             self.set_database_sequence_id(connection, 'tags', sequence_max)
-            debug_print("Collection Sequence Max: %d, Source Id: %d"%(sequence_max,source_id))
+            debug_print('Collection Sequence Max: %d, Source Id: %d'%(sequence_max,source_id))
 
         # Fix up the collections table now...
         sequence_dirty = 0
         sequence_max = sequence_min
 
-        debug_print("Collections Sequence Min: %d, Source Id: %d"%(sequence_min,source_id))
+        debug_print('Collections Sequence Min: %d, Source Id: %d'%(sequence_min,source_id))
 
         query = 'SELECT _id FROM booktags'
         cursor.execute(query)
@@ -454,7 +454,7 @@ class PALADIN(USBMS):
                 sequence_max = max(sequence_max, row[0])
 
         if sequence_dirty == 1:
-            debug_print("Collections Sequence Dirty for Source Id: %d"%source_id)
+            debug_print('Collections Sequence Dirty for Source Id: %d'%source_id)
             sequence_max = sequence_max + 1
             for pairId in db_collection_pairs:
                 if pairId < sequence_min:
@@ -465,7 +465,7 @@ class PALADIN(USBMS):
                     sequence_max = sequence_max + 1
 
             self.set_database_sequence_id(connection, 'booktags', sequence_max)
-            debug_print("Collections Sequence Max: %d, Source Id: %d"%(sequence_max,source_id))
+            debug_print('Collections Sequence Max: %d, Source Id: %d'%(sequence_max,source_id))
 
         cursor.close()
         return db_collections
diff --git a/src/calibre/devices/prs505/sony_cache.py b/src/calibre/devices/prs505/sony_cache.py
index a676cfad08..bced104cf4 100644
--- a/src/calibre/devices/prs505/sony_cache.py
+++ b/src/calibre/devices/prs505/sony_cache.py
@@ -47,11 +47,11 @@ EMPTY_EXT_CACHE = b'''\
 '''
 
 MIME_MAP   = {
-                "lrf" : "application/x-sony-bbeb",
+                'lrf' : 'application/x-sony-bbeb',
                 'lrx' : 'application/x-sony-bbeb',
-                "rtf" : "application/rtf",
-                "pdf" : "application/pdf",
-                "txt" : "text/plain" ,
+                'rtf' : 'application/rtf',
+                'pdf' : 'application/pdf',
+                'txt' : 'text/plain',
                 'epub': 'application/epub+zip',
               }
 
@@ -71,9 +71,9 @@ def strptime(src):
 
 def strftime(epoch, zone=time.localtime):
     try:
-        src = time.strftime("%w, %d %m %Y %H:%M:%S GMT", zone(epoch)).split()
+        src = time.strftime('%w, %d %m %Y %H:%M:%S GMT', zone(epoch)).split()
     except:
-        src = time.strftime("%w, %d %m %Y %H:%M:%S GMT", zone()).split()
+        src = time.strftime('%w, %d %m %Y %H:%M:%S GMT', zone()).split()
 
     src[0] = INVERSE_DAY_MAP[int(src[0][:-1])]+','
     src[2] = INVERSE_MONTH_MAP[int(src[2])]
@@ -460,7 +460,7 @@ class XMLCache:
         if not self.is_sony_periodical(book):
             return
         record.set('conformsTo',
-            "http://xmlns.sony.net/e-book/prs/periodicals/1.0/newspaper/1.0")
+            'http://xmlns.sony.net/e-book/prs/periodicals/1.0/newspaper/1.0')
 
         record.set('description', '')
 
@@ -482,7 +482,7 @@ class XMLCache:
 
         try:
             pubdate = strftime(book.pubdate.utctimetuple(),
-                    zone=lambda x : x)
+                    zone=lambda x: x)
             record.set('publicationDate', pubdate)
         except:
             pass
@@ -649,10 +649,10 @@ class XMLCache:
                 debug_print("Use localtime TZ and tz='0' for new book", book.lpath)
             elif ltz_count >= gtz_count:
                 tz = time.localtime
-                debug_print("Use localtime TZ for new book", book.lpath)
+                debug_print('Use localtime TZ for new book', book.lpath)
             else:
                 tz = time.gmtime
-                debug_print("Use GMT TZ for new book", book.lpath)
+                debug_print('Use GMT TZ for new book', book.lpath)
             date = strftime(timestamp, zone=tz)
             record.set('date', clean(date))
         try:
@@ -687,7 +687,7 @@ class XMLCache:
         if 'id' not in record.attrib:
             num = self.max_id(record.getroottree().getroot())
             record.set('id', str(num+1))
-        return (gtz_count, ltz_count, use_tz_var)
+        return gtz_count, ltz_count, use_tz_var
     # }}}
 
     # Writing the XML files {{{
diff --git a/src/calibre/devices/prst1/driver.py b/src/calibre/devices/prst1/driver.py
index 47158e6bc2..2e678df3dc 100644
--- a/src/calibre/devices/prst1/driver.py
+++ b/src/calibre/devices/prst1/driver.py
@@ -167,7 +167,7 @@ class PRST1(USBMS):
         bl = USBMS.books(self, oncard=oncard, end_session=end_session)
 
         dbpath = self.normalize_path(prefix + DBPATH)
-        debug_print("SQLite DB Path: " + dbpath)
+        debug_print('SQLite DB Path: ' + dbpath)
 
         with closing(sqlite.connect(dbpath)) as connection:
             # Replace undecodable characters in the db instead of erroring out
@@ -210,10 +210,10 @@ class PRST1(USBMS):
 
                 try:
                     device_offset = max(time_offsets, key=lambda a: time_offsets.get(a))
-                    debug_print("Device Offset: %d ms"%device_offset)
+                    debug_print('Device Offset: %d ms'%device_offset)
                     self.device_offset = device_offset
                 except ValueError:
-                    debug_print("No Books To Detect Device Offset.")
+                    debug_print('No Books To Detect Device Offset.')
 
             for idx, book in enumerate(bl):
                 query = 'SELECT _id, thumbnail FROM books WHERE file_path = ?'
@@ -263,7 +263,7 @@ class PRST1(USBMS):
         if self.plugboard_func:
             plugboard = self.plugboard_func(self.__class__.__name__,
                     'device_db', self.plugboards)
-            debug_print("PRST1: Using Plugboard", plugboard)
+            debug_print('PRST1: Using Plugboard', plugboard)
 
         prefix = self._card_a_prefix if oncard == 'carda' else self._main_prefix
         if prefix is None:
@@ -272,7 +272,7 @@ class PRST1(USBMS):
         source_id = 1 if oncard == 'carda' else 0
 
         dbpath = self.normalize_path(prefix + DBPATH)
-        debug_print("SQLite DB Path: " + dbpath)
+        debug_print('SQLite DB Path: ' + dbpath)
 
         collections = booklist.get_collections(collections_attributes)
 
@@ -290,7 +290,7 @@ class PRST1(USBMS):
         try:
             cursor = connection.cursor()
 
-            debug_print("Removing Orphaned Collection Records")
+            debug_print('Removing Orphaned Collection Records')
 
             # Purge any collections references that point into the abyss
             query = 'DELETE FROM collections WHERE content_id NOT IN (SELECT _id FROM books)'
@@ -298,7 +298,7 @@ class PRST1(USBMS):
             query = 'DELETE FROM collections WHERE collection_id NOT IN (SELECT _id FROM collection)'
             cursor.execute(query)
 
-            debug_print("Removing Orphaned Book Records")
+            debug_print('Removing Orphaned Book Records')
 
             # Purge any references to books not in this database
             # Idea is to prevent any spill-over where these wind up applying to some other book
@@ -362,7 +362,7 @@ class PRST1(USBMS):
         sequence_max = sequence_min
         sequence_dirty = 0
 
-        debug_print("Book Sequence Min: %d, Source Id: %d"%(sequence_min,source_id))
+        debug_print('Book Sequence Min: %d, Source Id: %d'%(sequence_min,source_id))
 
         try:
             cursor = connection.cursor()
@@ -396,7 +396,7 @@ class PRST1(USBMS):
 
         # If the database is 'dirty', then we should fix up the Ids and the sequence number
         if sequence_dirty == 1:
-            debug_print("Book Sequence Dirty for Source Id: %d"%source_id)
+            debug_print('Book Sequence Dirty for Source Id: %d'%source_id)
             sequence_max = sequence_max + 1
             for book, bookId in db_books.items():
                 if bookId < sequence_min:
@@ -433,7 +433,7 @@ class PRST1(USBMS):
                     cursor.execute(query, t)
 
             self.set_database_sequence_id(connection, 'books', sequence_max)
-            debug_print("Book Sequence Max: %d, Source Id: %d"%(sequence_max,source_id))
+            debug_print('Book Sequence Max: %d, Source Id: %d'%(sequence_max,source_id))
 
         cursor.close()
         return db_books
@@ -534,7 +534,7 @@ class PRST1(USBMS):
         sequence_max = sequence_min
         sequence_dirty = 0
 
-        debug_print("Collection Sequence Min: %d, Source Id: %d"%(sequence_min,source_id))
+        debug_print('Collection Sequence Min: %d, Source Id: %d'%(sequence_min,source_id))
 
         try:
             cursor = connection.cursor()
@@ -563,7 +563,7 @@ class PRST1(USBMS):
 
         # If the database is 'dirty', then we should fix up the Ids and the sequence number
         if sequence_dirty == 1:
-            debug_print("Collection Sequence Dirty for Source Id: %d"%source_id)
+            debug_print('Collection Sequence Dirty for Source Id: %d'%source_id)
             sequence_max = sequence_max + 1
             for collection, collectionId in db_collections.items():
                 if collectionId < sequence_min:
@@ -582,13 +582,13 @@ class PRST1(USBMS):
                     cursor.execute(query, t)
 
             self.set_database_sequence_id(connection, 'collection', sequence_max)
-            debug_print("Collection Sequence Max: %d, Source Id: %d"%(sequence_max,source_id))
+            debug_print('Collection Sequence Max: %d, Source Id: %d'%(sequence_max,source_id))
 
         # Fix up the collections table now...
         sequence_dirty = 0
         sequence_max = sequence_min
 
-        debug_print("Collections Sequence Min: %d, Source Id: %d"%(sequence_min,source_id))
+        debug_print('Collections Sequence Min: %d, Source Id: %d'%(sequence_min,source_id))
 
         query = 'SELECT _id FROM collections'
         cursor.execute(query)
@@ -602,7 +602,7 @@ class PRST1(USBMS):
                 sequence_max = max(sequence_max, row[0])
 
         if sequence_dirty == 1:
-            debug_print("Collections Sequence Dirty for Source Id: %d"%source_id)
+            debug_print('Collections Sequence Dirty for Source Id: %d'%source_id)
             sequence_max = sequence_max + 1
             for pairId in db_collection_pairs:
                 if pairId < sequence_min:
@@ -613,7 +613,7 @@ class PRST1(USBMS):
                     sequence_max = sequence_max + 1
 
             self.set_database_sequence_id(connection, 'collections', sequence_max)
-            debug_print("Collections Sequence Max: %d, Source Id: %d"%(sequence_max,source_id))
+            debug_print('Collections Sequence Max: %d, Source Id: %d'%(sequence_max,source_id))
 
         cursor.close()
         return db_collections
@@ -727,7 +727,7 @@ class PRST1(USBMS):
         metadata.lpath = filepath.partition(prefix)[2]
         metadata.lpath = metadata.lpath.replace('\\', '/')
         dbpath = self.normalize_path(prefix + DBPATH)
-        debug_print("SQLite DB Path: " + dbpath)
+        debug_print('SQLite DB Path: ' + dbpath)
 
         with closing(sqlite.connect(dbpath)) as connection:
             cursor = connection.cursor()
diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 2da096f7bc..123fff02cd 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -48,7 +48,7 @@ from polyglot.builtins import as_bytes, iteritems, itervalues
 
 
 def synchronous(tlockname):
-    """A decorator to place an instance based lock around a method """
+    '''A decorator to place an instance based lock around a method '''
 
     def _synched(func):
         @wraps(func)
@@ -66,7 +66,7 @@ class ConnectionListener(Thread):
         self.daemon = True
         self.driver = driver
         self.keep_running = True
-        self.all_ip_addresses = dict()
+        self.all_ip_addresses = {}
 
     def stop(self):
         self.keep_running = False
@@ -96,7 +96,7 @@ class ConnectionListener(Thread):
             if not self.all_ip_addresses:
                 self.all_ip_addresses = get_all_ips()
                 if self.all_ip_addresses:
-                    self.driver._debug("All IP addresses", self.all_ip_addresses)
+                    self.driver._debug('All IP addresses', self.all_ip_addresses)
 
             if not self.driver.connection_queue.empty():
                 d = currently_connected_device.device
@@ -166,7 +166,7 @@ class ConnectionListener(Thread):
                         self.driver._debug('unexpected socket exception', x.args[0])
                         self._close_socket(device_socket)
                         device_socket = None
-#                        raise
+                        # raise
 
 
 class SDBook(Book):
@@ -291,7 +291,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         '',
         _('Use fixed network port') + ':::<p>' +
         _('If checked, use the port number in the "Port" box, otherwise '
-              'the driver will pick a random port') + '</p>',
+            'the driver will pick a random port') + '</p>',
         _('Port number: ') + ':::<p>' +
         _('Enter the port number the driver is to use if the "fixed port" box is checked') + '</p>',
         _('Print extra debug information') + ':::<p>' +
@@ -300,52 +300,52 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         _('Comma separated list of metadata fields '
             'to turn into collections on the device.') + ':::<p>' +
         _('Possibilities include: series, tags, authors, etc' +
-              '. Three special collections are available: %(abt)s:%(abtv)s, '
-              '%(aba)s:%(abav)s, and %(abs)s:%(absv)s. Add  '
-              'these values to the list to enable them. The collections will be '
-              'given the name provided after the ":" character.')%dict(
-                    abt='abt', abtv=ALL_BY_TITLE, aba='aba', abav=ALL_BY_AUTHOR,
-                    abs='abs', absv=ALL_BY_SOMETHING),
+            '. Three special collections are available: %(abt)s:%(abtv)s, '
+            '%(aba)s:%(abav)s, and %(abs)s:%(absv)s. Add  '
+            'these values to the list to enable them. The collections will be '
+            'given the name provided after the ":" character.')%dict(
+                abt='abt', abtv=ALL_BY_TITLE, aba='aba', abav=ALL_BY_AUTHOR,
+                abs='abs', absv=ALL_BY_SOMETHING),
         '',
         _('Enable the no-activity timeout') + ':::<p>' +
         _('If this box is checked, calibre will automatically disconnect if '
-              'a connected device does nothing for %d minutes. Unchecking this '
-              ' box disables this timeout, so calibre will never automatically '
-              'disconnect.')%(DISCONNECT_AFTER_N_SECONDS/60,) + '</p>',
+            'a connected device does nothing for %d minutes. Unchecking this '
+            ' box disables this timeout, so calibre will never automatically '
+            'disconnect.')%(DISCONNECT_AFTER_N_SECONDS/60,) + '</p>',
         _('Use this IP address') + ':::<p>' +
         _('Use this option if you want to force the driver to listen on a '
-              'particular IP address. The driver will listen only on the '
-              'entered address, and this address will be the one advertised '
-              'over mDNS (BonJour).') + '</p>',
+            'particular IP address. The driver will listen only on the '
+            'entered address, and this address will be the one advertised '
+            'over mDNS (BonJour).') + '</p>',
         _('Replace books with same calibre ID') + ':::<p>' +
         _('Use this option to overwrite a book on the device if that book '
-              'has the same calibre identifier as the book being sent. The file name of the '
-              'book will not change even if the save template produces a '
-              'different result. Using this option in most cases prevents '
-              'having multiple copies of a book on the device.') + '</p>',
+            'has the same calibre identifier as the book being sent. The file name of the '
+            'book will not change even if the save template produces a '
+            'different result. Using this option in most cases prevents '
+            'having multiple copies of a book on the device.') + '</p>',
         _('Cover thumbnail compression quality') + ':::<p>' +
         _('Use this option to control the size and quality of the cover '
-              'file sent to the device. It must be between 50 and 99. '
-              'The larger the number the higher quality the cover, but also '
-              'the larger the file. For example, changing this from 70 to 90 '
-              'results in a much better cover that is approximately 2.5 '
-              'times as big. To see the changes you must force calibre '
-              'to resend metadata to the device, either by changing '
-              'the metadata for the book (updating the last modification '
-              'time) or resending the book itself.') + '</p>',
+            'file sent to the device. It must be between 50 and 99. '
+            'The larger the number the higher quality the cover, but also '
+            'the larger the file. For example, changing this from 70 to 90 '
+            'results in a much better cover that is approximately 2.5 '
+            'times as big. To see the changes you must force calibre '
+            'to resend metadata to the device, either by changing '
+            'the metadata for the book (updating the last modification '
+            'time) or resending the book itself.') + '</p>',
         _('Use metadata cache') + ':::<p>' +
         _('Setting this option allows calibre to keep a copy of metadata '
-              'on the device, speeding up device connections. Unsetting this '
-              'option disables keeping the copy, forcing the device to send '
-              'metadata to calibre on every connect. Unset this option if '
-              'you think that the cache might not be operating correctly.') + '</p>',
+            'on the device, speeding up device connections. Unsetting this '
+            'option disables keeping the copy, forcing the device to send '
+            'metadata to calibre on every connect. Unset this option if '
+            'you think that the cache might not be operating correctly.') + '</p>',
         '',
         _('Additional file extensions to send to the device') + ':::<p>' +
         _('This is a comma-separated list of format file extensions you want '
-              'to be able to send to the device. For example, you might have '
-              'audio books in your library with the extension "m4b" that you '
-              'want to listen to on your device. Don\'t worry about the "extra '
-              'enabled extensions" warning.'),
+            'to be able to send to the device. For example, you might have '
+            'audio books in your library with the extension "m4b" that you '
+            'want to listen to on your device. Don\'t worry about the "extra '
+            'enabled extensions" warning.'),
         _('Ignore device free space') + ':::<p>' +
         _("Check this box to ignore the amount of free space reported by your "
           "devices. This might be needed if you store books on an SD card and "
@@ -472,7 +472,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         special_tag = None
         if mdata.tags:
             for t in mdata.tags:
-                if t.startswith(_('News')) or t.startswith('/'):
+                if t.startswith((_('News'), '/')):
                     special_tag = t
                     break
 
@@ -485,7 +485,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             except:
                 today = time.localtime()
                 date = (today[0], today[1], today[2])
-            template = "{title}_%d-%d-%d" % date
+            template = '{title}_%d-%d-%d' % date
         use_subdirs = self.SUPPORTS_SUB_DIRS and settings.use_subdirs
 
         from calibre.library.save_to_disk import config, get_components
@@ -705,8 +705,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                                'metadata': book_metadata, 'thisBook': this_book,
                                'totalBooks': total_books,
                                'willStreamBooks': True,
-                               'willStreamBinary' : True,
-                               'wantsSendOkToSendbook' : self.can_send_ok_to_sendbook,
+                               'willStreamBinary': True,
+                               'wantsSendOkToSendbook': self.can_send_ok_to_sendbook,
                                'canSupportLpathChanges': True},
                           print_debug_info=False,
                           wait_for_response=self.can_send_ok_to_sendbook)
@@ -744,7 +744,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                 lastmod = parse_date(lastmod)
             if key in self.device_book_cache and self.device_book_cache[key]['book'].last_modified == lastmod:
                 self.device_book_cache[key]['last_used'] = now()
-                return self.device_book_cache[key]['book'].deepcopy(lambda : SDBook('', ''))
+                return self.device_book_cache[key]['book'].deepcopy(lambda: SDBook('', ''))
         except:
             traceback.print_exc()
         return None
@@ -854,7 +854,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                     json_metadata[key]['book'] = self.json_codec.encode_book_metadata(book['book'])
                     json_metadata[key]['last_used'] = book['last_used']
                     result = as_bytes(json.dumps(json_metadata, indent=2, default=to_json))
-                    fd.write(("%0.7d\n"%(len(result)+1)).encode('ascii'))
+                    fd.write(('%0.7d\n'%(len(result)+1)).encode('ascii'))
                     fd.write(result)
                     fd.write(b'\n')
                     count += 1
@@ -980,7 +980,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                 self._debug('timeout -- disconnected')
             else:
                 try:
-                    if self._call_client('NOOP', dict())[0] is None:
+                    if self._call_client('NOOP', {})[0] is None:
                         self._close_device_socket()
                 except:
                     self._close_device_socket()
@@ -1014,14 +1014,14 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         from functools import partial
         p = partial(prints, file=output)
         if self.is_connected:
-            p("A wireless device is connected")
+            p('A wireless device is connected')
             return True
         all_ip_addresses = get_all_ips()
         if all_ip_addresses:
-            p("All IP addresses", all_ip_addresses)
+            p('All IP addresses', all_ip_addresses)
         else:
-            p("No IP addresses found")
-        p("No device is connected")
+            p('No IP addresses found')
+        p('No device is connected')
         return False
 
     @synchronous('sync_lock')
@@ -1123,7 +1123,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             self.client_device_name = result.get('deviceName', self.client_device_kind)
             self._debug('Client device name', self.client_device_name)
 
-            self.client_app_name = result.get('appName', "")
+            self.client_app_name = result.get('appName', '')
             self._debug('Client app name', self.client_app_name)
             self.app_version_number = result.get('ccVersionNumber', '0')
             self._debug('App version #:', self.app_version_number)
@@ -1132,7 +1132,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                 if (self.client_app_name == 'CalibreCompanion' and
                          self.app_version_number < self.CURRENT_CC_VERSION):
                     self._debug('Telling client to update')
-                    self._call_client("DISPLAY_MESSAGE",
+                    self._call_client('DISPLAY_MESSAGE',
                             {'messageKind': self.MESSAGE_UPDATE_NEEDED,
                              'lastestKnownAppVersion': self.CURRENT_CC_VERSION})
             except:
@@ -1185,7 +1185,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                     # bad password
                     self._debug('password mismatch')
                     try:
-                        self._call_client("DISPLAY_MESSAGE",
+                        self._call_client('DISPLAY_MESSAGE',
                                 {'messageKind': self.MESSAGE_PASSWORD_ERROR,
                                  'currentLibraryName': self.current_library_name,
                                  'currentLibraryUUID': library_uuid})
@@ -1229,7 +1229,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
     def get_device_information(self, end_session=True):
         self._debug()
         self.report_progress(1.0, _('Get device information...'))
-        opcode, result = self._call_client('GET_DEVICE_INFORMATION', dict())
+        opcode, result = self._call_client('GET_DEVICE_INFORMATION', {})
         if opcode == 'OK':
             self.driveinfo = result['device_info']
             self._update_driveinfo_record(self.driveinfo, self.PREFIX, 'main')
@@ -1242,13 +1242,12 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
 
     @synchronous('sync_lock')
     def set_driveinfo_name(self, location_code, name):
-        self._update_driveinfo_record(self.driveinfo, "main", name)
+        self._update_driveinfo_record(self.driveinfo, 'main', name)
         self._call_client('SET_CALIBRE_DEVICE_NAME',
                          {'location_code': 'main', 'name':name})
 
     @synchronous('sync_lock')
-    def reset(self, key='-1', log_packets=False, report_progress=None,
-            detected_device=None) :
+    def reset(self, key='-1', log_packets=False, report_progress=None, detected_device=None):
         self._debug()
         self.set_progress_reporter(report_progress)
 
@@ -1262,16 +1261,16 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
     @synchronous('sync_lock')
     def card_prefix(self, end_session=True):
         self._debug()
-        return (None, None)
+        return None, None
 
     @synchronous('sync_lock')
     def total_space(self, end_session=True):
         self._debug()
         opcode, result = self._call_client('TOTAL_SPACE', {})
         if opcode == 'OK':
-            return (result['total_space_on_device'], 0, 0)
+            return result['total_space_on_device'], 0, 0
         # protocol error if we get here
-        return (0, 0, 0)
+        return 0, 0, 0
 
     @synchronous('sync_lock')
     def free_space(self, end_session=True):
@@ -1281,7 +1280,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             self._debug('free space:', result['free_space_on_device'])
             return (result['free_space_on_device'], 0, 0)
         # protocol error if we get here
-        return (0, 0, 0)
+        return 0, 0, 0
 
     @synchronous('sync_lock')
     def books(self, oncard=None, end_session=True):
@@ -1303,7 +1302,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             if will_use_cache:
                 books_on_device = []
                 self._debug('caching. count=', count)
-                for i in range(0, count):
+                for i in range(count):
                     opcode, result = self._receive_from_client(print_debug_info=False)
                     books_on_device.append(result)
 
@@ -1356,7 +1355,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                     self._call_client('NOOP', {'priKey':priKey},
                                   print_debug_info=False, wait_for_response=False)
 
-            for i in range(0, count):
+            for i in range(count):
                 if (i % 100) == 0:
                     self._debug('getting book metadata. Done', i, 'of', count)
                 opcode, result = self._receive_from_client(print_debug_info=False)
@@ -1539,7 +1538,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         for path in paths:
             new_paths.append(self._strip_prefix(path))
         opcode, result = self._call_client('DELETE_BOOK', {'lpaths': new_paths})
-        for i in range(0, len(new_paths)):
+        for i in range(len(new_paths)):
             opcode, result = self._receive_from_client(False)
             self._debug('removed book with UUID', result['uuid'])
         self._debug('removed', len(new_paths), 'books')
@@ -1573,7 +1572,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         position = 0
         while not eof:
             opcode, result = self._call_client('GET_BOOK_FILE_SEGMENT',
-                                    {'lpath' : path, 'position': position,
+                                    {'lpath': path, 'position': position,
                                      'thisBook': this_book, 'totalBooks': total_books,
                                      'canStream':True, 'canStreamBinary': True},
                                     print_debug_info=False)
@@ -1592,7 +1591,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
     @synchronous('sync_lock')
     def prepare_addable_books(self, paths, this_book=None, total_books=None):
         for idx, path in enumerate(paths):
-            (ign, ext) = os.path.splitext(path)
+            ign, ext = os.path.splitext(path)
             with PersistentTemporaryFile(suffix=ext) as tf:
                 self.get_file(path, tf, this_book=this_book, total_books=total_books)
                 paths[idx] = tf.name
@@ -1614,7 +1613,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
             other_info['id_link_rules'] = msprefs.get('id_link_rules', {})
 
             self._call_client('SET_LIBRARY_INFO',
-                                    {'libraryName' : library_name,
+                                    {'libraryName': library_name,
                                      'libraryUuid': library_uuid,
                                      'fieldMetadata': field_metadata.all_metadata(),
                                      'otherInfo': other_info},
@@ -1625,18 +1624,18 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
         device_prefs.set_overrides(manage_device_metadata='on_connect')
 
     def _show_message(self, message):
-        self._call_client("DISPLAY_MESSAGE",
+        self._call_client('DISPLAY_MESSAGE',
                 {'messageKind': self.MESSAGE_SHOW_TOAST,
                  'message': message})
 
     def _check_if_format_send_needed(self, db, id_, book):
         if not self.will_ask_for_update_books:
-            return (None, False)
+            return None, False
 
         from calibre.utils.date import isoformat, parse_date
         try:
             if not hasattr(book, '_format_mtime_'):
-                return (None, False)
+                return None, False
 
             ext = posixpath.splitext(book.lpath)[1][1:]
             fmt_metadata = db.new_api.format_metadata(id_, ext)
@@ -1648,17 +1647,17 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                         self._show_message(_('You have book formats in your library '
                                              'with dates in the future. See calibre '
                                              'for details'))
-                    return (None, True)
+                    return None, True
 
                 cc_mtime = parse_date(book.get('_format_mtime_'), as_utc=True)
                 self._debug(book.title, 'cal_mtime', calibre_mtime, 'cc_mtime', cc_mtime)
                 if cc_mtime < calibre_mtime:
                     book.set('_format_mtime_', isoformat(self.now))
-                    return (posixpath.basename(book.lpath), False)
+                    return posixpath.basename(book.lpath), False
         except:
             self._debug('exception checking if must send format', book.title)
             traceback.print_exc()
-        return (None, False)
+        return None, False
 
     @synchronous('sync_lock')
     def synchronize_with_db(self, db, id_, book, first_call):
@@ -1685,8 +1684,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                     self.have_bad_sync_columns = True
                 elif fm[self.is_read_sync_col]['datatype'] != 'bool':
                     self._debug('is_read_sync_col not bool type')
-                    self._show_message(_("The read sync column %s is "
-                             "not a Yes/No column")%self.is_read_sync_col)
+                    self._show_message(_('The read sync column %s is '
+                             'not a Yes/No column')%self.is_read_sync_col)
                     self.have_bad_sync_columns = True
 
             if self.is_read_date_sync_col:
@@ -1697,8 +1696,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                     self.have_bad_sync_columns = True
                 elif fm[self.is_read_date_sync_col]['datatype'] != 'datetime':
                     self._debug('is_read_date_sync_col not date type')
-                    self._show_message(_("The read date sync column %s is "
-                             "not a date column")%self.is_read_date_sync_col)
+                    self._show_message(_('The read date sync column %s is '
+                             'not a date column')%self.is_read_date_sync_col)
                     self.have_bad_sync_columns = True
 
             self.have_checked_sync_columns = True
diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py
index 8825eb5503..a37cca5c3d 100644
--- a/src/calibre/devices/usbms/books.py
+++ b/src/calibre/devices/usbms/books.py
@@ -299,7 +299,7 @@ class CollectionsBookList(BookList):
                 if all_by_title not in collections:
                     collections[all_by_title] = {}
                 collections[all_by_title][lpath] = (book, tsval, asval)
-            for (n, sb) in all_by_something:
+            for n,sb in all_by_something:
                 if n not in collections:
                     collections[n] = {}
                 collections[n][lpath] = (book, book.get(sb, ''), tsval)
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index 1f51d8fb86..eb08cb6525 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -1,6 +1,6 @@
 __license__   = 'GPL v3'
-__copyright__ = '2009, John Schember <john at nachtimwald.com> ' \
-                '2009, Kovid Goyal <kovid@kovidgoyal.net>'
+__copyright__ = ('2009, John Schember <john at nachtimwald.com> '
+                 '2009, Kovid Goyal <kovid@kovidgoyal.net>')
 __docformat__ = 'restructuredtext en'
 
 '''
@@ -73,7 +73,6 @@ class USBDevice:
 
 
 class Device(DeviceConfig, DevicePlugin):
-
     '''
     This class provides logic common to all drivers for devices that export themselves
     as USB Mass Storage devices. Provides implementations for mounting/ejecting
@@ -175,7 +174,7 @@ class Device(DeviceConfig, DevicePlugin):
             casz = self._windows_space(self._card_a_prefix)[0]
             cbsz = self._windows_space(self._card_b_prefix)[0]
 
-        return (msz, casz, cbsz)
+        return msz, casz, cbsz
 
     def free_space(self, end_session=True):
         msz = casz = cbsz = 0
@@ -194,7 +193,7 @@ class Device(DeviceConfig, DevicePlugin):
             casz = self._windows_space(self._card_a_prefix)[1]
             cbsz = self._windows_space(self._card_b_prefix)[1]
 
-        return (msz, casz, cbsz)
+        return msz, casz, cbsz
 
     def windows_filter_pnp_id(self, pnp_id):
         return False
@@ -517,7 +516,7 @@ class Device(DeviceConfig, DevicePlugin):
                     devnodes.append(node)
 
         devnodes += list(repeat(None, 3))
-        ans = ['/dev/'+x if ok.get(x, False) else None for x in devnodes]
+        ans = ['/dev/'+x if ok.get(x) else None for x in devnodes]
         ans.sort(key=lambda x: x[5:] if x else 'zzzzz')
         return self.linux_swap_drives(ans[:3])
 
@@ -673,7 +672,7 @@ class Device(DeviceConfig, DevicePlugin):
         hal = get_hal()
         vols = hal.get_volumes(d)
         if verbose:
-            print("FBSD:\t", vols)
+            print('FBSD:\t', vols)
 
         ok, mv = hal.mount_volumes(vols)
         if not ok:
diff --git a/src/calibre/devices/usbms/deviceconfig.py b/src/calibre/devices/usbms/deviceconfig.py
index 87309988a3..6d488f631d 100644
--- a/src/calibre/devices/usbms/deviceconfig.py
+++ b/src/calibre/devices/usbms/deviceconfig.py
@@ -98,7 +98,7 @@ class DeviceConfig:
         if cls.EXTRA_CUSTOMIZATION_MESSAGE:
             if isinstance(cls.EXTRA_CUSTOMIZATION_MESSAGE, list):
                 ec = []
-                for i in range(0, len(cls.EXTRA_CUSTOMIZATION_MESSAGE)):
+                for i in range(len(cls.EXTRA_CUSTOMIZATION_MESSAGE)):
                     if config_widget.opt_extra_customization[i] is None:
                         ec.append(None)
                         continue
diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py
index a0199b2c52..9810fc9d4f 100644
--- a/src/calibre/devices/usbms/driver.py
+++ b/src/calibre/devices/usbms/driver.py
@@ -67,7 +67,6 @@ def safe_walk(top, topdown=True, onerror=None, followlinks=False, maxdepth=128):
 # CLI must come before Device as it implements the CLI functions that
 # are inherited from the device interface in Device.
 class USBMS(CLI, Device):
-
     '''
     The base class for all USBMS devices. Implements the logic for
     sending/getting/updating metadata/caching metadata/etc.
@@ -235,7 +234,7 @@ class USBMS(CLI, Device):
         def update_booklist(filename, path, prefix):
             changed = False
             # Ignore AppleDouble files
-            if filename.startswith("._"):
+            if filename.startswith('._'):
                 return False
             if path_to_ext(filename) in all_formats and self.is_allowed_book_file(filename, path, prefix):
                 try:
@@ -247,7 +246,7 @@ class USBMS(CLI, Device):
                     if idx is not None:
                         bl_cache[lpath] = None
                         if self.update_metadata_item(bl[idx]):
-                            # print 'update_metadata_item returned true'
+                            # print('update_metadata_item returned true')
                             changed = True
                     else:
                         if bl.add_book(self.book_from_path(prefix, lpath),
@@ -387,7 +386,7 @@ class USBMS(CLI, Device):
                         self._main_prefix)
                 continue
             lpath = path.partition(prefix)[2]
-            if lpath.startswith('/') or lpath.startswith('\\'):
+            if lpath.startswith(('/', '\\')):
                 lpath = lpath[1:]
             book = self.book_class(prefix, lpath, other=info)
             if book.size is None:
diff --git a/src/calibre/devices/usbms/hal.py b/src/calibre/devices/usbms/hal.py
index 89880eadc7..f6ca5e87f6 100644
--- a/src/calibre/devices/usbms/hal.py
+++ b/src/calibre/devices/usbms/hal.py
@@ -87,7 +87,7 @@ class HAL:
                 time.sleep(1)
                 loops += 1
                 if loops > 100:
-                    raise Exception("ERROR: Timeout waiting for mount to complete")
+                    raise Exception('ERROR: Timeout waiting for mount to complete')
         return self.prop(vol['dev'], 'volume.mount_point')
 
     def mount_volumes(self, volumes):
@@ -106,19 +106,19 @@ class HAL:
             # Mount Point becomes Mount Path
             mp += '/'
             if DEBUG:
-                print("FBSD:\tmounted", vol['label'], "on", mp)
+                print('FBSD:\tmounted', vol['label'], 'on', mp)
             if mtd == 0:
                 ans['_main_prefix'], ans['_main_vol'] = mp, vol['vol']
                 if DEBUG:
-                    print("FBSD:\tmain = ", mp)
+                    print('FBSD:\tmain = ', mp)
             elif mtd == 1:
                 ans['_card_a_prefix'], ans['_card_a_vol'] = mp, vol['vol']
                 if DEBUG:
-                    print("FBSD:\tcard a = ", mp)
+                    print('FBSD:\tcard a = ', mp)
             elif mtd == 2:
                 ans['_card_b_prefix'], ans['_card_b_vol'] = mp, vol['vol']
                 if DEBUG:
-                    print("FBSD:\tcard b = ", mp)
+                    print('FBSD:\tcard b = ', mp)
                 break
             mtd += 1
 
diff --git a/src/calibre/devices/user_defined/driver.py b/src/calibre/devices/user_defined/driver.py
index 8b4a75dd4f..c1f421b561 100644
--- a/src/calibre/devices/user_defined/driver.py
+++ b/src/calibre/devices/user_defined/driver.py
@@ -58,7 +58,7 @@ class USER_DEFINED(USBMS):
             'Enter the folder where the books are to be stored. This folder '
             'is prepended to any send_to_device template') + '</p>',
         _('Swap main and card A') + ':::<p>' + _(
-            'Check this box if the device\'s main memory is being seen as '
+            "Check this box if the device's main memory is being seen as "
             'card a and the card is being seen as main memory') + '</p>',
     ]
     EXTRA_CUSTOMIZATION_DEFAULT = [
diff --git a/src/calibre/devices/utils.py b/src/calibre/devices/utils.py
index 071c3be9b6..56ce60e81c 100644
--- a/src/calibre/devices/utils.py
+++ b/src/calibre/devices/utils.py
@@ -34,11 +34,11 @@ def sanity_check(on_card, files, card_prefixes, free_space):
         size += os.path.getsize(getattr(f, 'name', f))
 
     if not on_card and size > free_space[0] - 2*1024*1024:
-        raise FreeSpaceError(_("There is insufficient free space in main memory"))
+        raise FreeSpaceError(_('There is insufficient free space in main memory'))
     if on_card == 'carda' and size > free_space[1] - 1024*1024:
-        raise FreeSpaceError(_("There is insufficient free space on the storage card"))
+        raise FreeSpaceError(_('There is insufficient free space on the storage card'))
     if on_card == 'cardb' and size > free_space[2] - 1024*1024:
-        raise FreeSpaceError(_("There is insufficient free space on the storage card"))
+        raise FreeSpaceError(_('There is insufficient free space on the storage card'))
 
 
 def build_template_regexp(template):
@@ -58,11 +58,11 @@ def build_template_regexp(template):
 
     try:
         template = template.rpartition('/')[2]
-        return re.compile(re.sub('{([^}]*)}', f, template) + r'([_\d]*$)')
+        return re.compile(re.sub(r'{([^}]*)}', f, template) + r'([_\d]*$)')
     except:
         prints('Failed to parse template: %r'%template)
         template = '{title} - {authors}'
-        return re.compile(re.sub('{([^}]*)}', f, template) + r'([_\d]*$)')
+        return re.compile(re.sub(r'{([^}]*)}', f, template) + r'([_\d]*$)')
 
 
 def create_upload_path(mdata, fname, template, sanitize,
@@ -80,7 +80,7 @@ def create_upload_path(mdata, fname, template, sanitize,
     special_tag = None
     if mdata.tags:
         for t in mdata.tags:
-            if t.startswith(_('News')) or t.startswith('/'):
+            if t.startswith((_('News'), '/')):
                 special_tag = t
                 break
 
@@ -91,7 +91,7 @@ def create_upload_path(mdata, fname, template, sanitize,
         except:
             today = time.localtime()
             date = (today[0], today[1], today[2])
-        template = "{title}_%d-%d-%d" % date
+        template = '{title}_%d-%d-%d' % date
 
     fname = sanitize(fname)
     ext = path_type.splitext(fname)[1]
diff --git a/src/calibre/devices/winusb.py b/src/calibre/devices/winusb.py
index a7839e795a..6a17123ac5 100644
--- a/src/calibre/devices/winusb.py
+++ b/src/calibre/devices/winusb.py
@@ -44,13 +44,12 @@ except ImportError:
 
 # Data and function type definitions {{{
 
-
 class GUID(Structure):
     _fields_ = [
-        ("data1", DWORD),
-        ("data2", WORD),
-        ("data3", WORD),
-        ("data4", c_ubyte * 8)]
+        ('data1', DWORD),
+        ('data2', WORD),
+        ('data3', WORD),
+        ('data4', c_ubyte * 8)]
 
     def __init__(self, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8):
         self.data1 = l
@@ -66,12 +65,12 @@ class GUID(Structure):
         self.data4[7] = b8
 
     def __str__(self):
-        return "{{{:08x}-{:04x}-{:04x}-{}-{}}}".format(
+        return '{{{:08x}-{:04x}-{:04x}-{}-{}}}'.format(
             self.data1,
             self.data2,
             self.data3,
-            ''.join(["%02x" % d for d in self.data4[:2]]),
-            ''.join(["%02x" % d for d in self.data4[2:]]),
+            ''.join(['%02x' % d for d in self.data4[:2]]),
+            ''.join(['%02x' % d for d in self.data4[2:]]),
         )
 
 
@@ -130,7 +129,7 @@ class SP_DEVINFO_DATA(Structure):
     ]
 
     def __str__(self):
-        return f"ClassGuid:{self.ClassGuid} DevInst:{self.DevInst}"
+        return f'ClassGuid:{self.ClassGuid} DevInst:{self.DevInst}'
 
 
 PSP_DEVINFO_DATA = POINTER(SP_DEVINFO_DATA)
@@ -145,7 +144,7 @@ class SP_DEVICE_INTERFACE_DATA(Structure):
     ]
 
     def __str__(self):
-        return f"InterfaceClassGuid:{self.InterfaceClassGuid} Flags:{self.Flags}"
+        return f'InterfaceClassGuid:{self.InterfaceClassGuid} Flags:{self.Flags}'
 
 
 ANYSIZE_ARRAY = 1
@@ -153,8 +152,8 @@ ANYSIZE_ARRAY = 1
 
 class SP_DEVICE_INTERFACE_DETAIL_DATA(Structure):
     _fields_ = [
-        ("cbSize", DWORD),
-        ("DevicePath", c_wchar*ANYSIZE_ARRAY)
+        ('cbSize', DWORD),
+        ('DevicePath', c_wchar*ANYSIZE_ARRAY)
     ]
 
 
@@ -665,7 +664,7 @@ def get_volume_information(drive_letter):
     flags, serial_number, max_component_length = DWORD(0), DWORD(0), DWORD(0)
     GetVolumeInformation(drive_letter, vname, len(vname), byref(serial_number), byref(max_component_length), byref(flags), fsname, len(fsname))
     flags = flags.value
-    ans =  {
+    ans = {
         'name': vname.value,
         'filesystem': fsname.value,
         'serial_number': serial_number.value,
@@ -701,8 +700,8 @@ def get_volume_pathnames(volume_id, buf=None):
 
 # }}}
 
-# def scan_usb_devices(): {{{
 
+# def scan_usb_devices(): {{{
 
 _USBDevice = namedtuple('USBDevice', 'vendor_id product_id bcd devid devinst')
 
diff --git a/src/calibre/ebooks/BeautifulSoup.py b/src/calibre/ebooks/BeautifulSoup.py
index 98c4297575..0306314cfe 100644
--- a/src/calibre/ebooks/BeautifulSoup.py
+++ b/src/calibre/ebooks/BeautifulSoup.py
@@ -3,7 +3,7 @@
 
 
 import bs4
-from bs4 import CData, Comment, Declaration, NavigableString, ProcessingInstruction, SoupStrainer, Tag, __version__  # noqa
+from bs4 import CData, Comment, Declaration, NavigableString, ProcessingInstruction, SoupStrainer, Tag, __version__  # noqa: F401
 
 
 def parse_html(markup):
diff --git a/src/calibre/ebooks/__init__.py b/src/calibre/ebooks/__init__.py
index cd4b5edcec..7fe8ab3dfc 100644
--- a/src/calibre/ebooks/__init__.py
+++ b/src/calibre/ebooks/__init__.py
@@ -239,7 +239,7 @@ def generate_masthead(title, output_path=None, width=600, height=60):
 def escape_xpath_attr(value):
     if '"' in value:
         if "'" in value:
-            parts = re.split('("+)', value)
+            parts = re.split(r'("+)', value)
             ans = []
             for x in parts:
                 if x:
diff --git a/src/calibre/ebooks/chardet.py b/src/calibre/ebooks/chardet.py
index 402d28bd3c..362c764def 100644
--- a/src/calibre/ebooks/chardet.py
+++ b/src/calibre/ebooks/chardet.py
@@ -100,7 +100,7 @@ def find_declared_encoding(raw, limit=50*1024):
                 return ans
 
 
-_CHARSET_ALIASES = {"macintosh" : "mac-roman", "x-sjis" : "shift-jis", 'mac-centraleurope': 'cp1250'}
+_CHARSET_ALIASES = {'macintosh': 'mac-roman', 'x-sjis': 'shift-jis', 'mac-centraleurope': 'cp1250'}
 
 
 def detect(bytestring):
diff --git a/src/calibre/ebooks/chm/metadata.py b/src/calibre/ebooks/chm/metadata.py
index 18736d2ecc..3e43f086e3 100644
--- a/src/calibre/ebooks/chm/metadata.py
+++ b/src/calibre/ebooks/chm/metadata.py
@@ -22,11 +22,11 @@ def _clean(s):
 
 
 def _detag(tag):
-    ans = ""
+    ans = ''
     if tag is None:
         return ans
     for elem in tag:
-        if hasattr(elem, "contents"):
+        if hasattr(elem, 'contents'):
             ans += _detag(elem)
         else:
             ans += _clean(elem)
@@ -42,7 +42,7 @@ def _metadata_from_table(soup, searchfor):
     # on the home page. cue some nasty special-case hacks...
     if re.match(r'^\s*'+searchfor+r'\s*$', td.decode_contents(), flags=re.I):
         meta = _detag(td.findNextSibling('td'))
-        return re.sub('^:', '', meta).strip()
+        return re.sub(r'^:', '', meta).strip()
     else:
         meta = _detag(td)
         return re.sub(r'^[^:]+:', '', meta).strip()
@@ -77,7 +77,7 @@ def _get_comments(soup):
     pages = (_metadata_from_span(soup, 'pages') or _metadata_from_table(soup, 'pages'))
     try:
         # date span can have copyright symbols in it...
-        date = date.replace('\u00a9', '').strip()
+        date = date.replace('©', '').strip()
         # and pages often comes as '(\d+ pages)'
         pages = re.search(r'\d+', pages).group(0)
         return f'Published {date}, {pages} pages.'
@@ -89,7 +89,7 @@ def _get_comments(soup):
 def _get_cover(soup, rdr):
     ans = None
     try:
-        ans = soup.find('img', alt=re.compile('cover', flags=re.I))['src']
+        ans = soup.find('img', alt=re.compile(r'cover', flags=re.I))['src']
     except TypeError:
         # meeehh, no handy alt-tag goodness, try some hackery
         # the basic idea behind this is that in general, the cover image
@@ -119,7 +119,7 @@ def _get_cover(soup, rdr):
         try:
             ans = rdr.GetFile(ans)
         except:
-            ans = rdr.root + "/" + ans
+            ans = rdr.root + '/' + ans
             try:
                 ans = rdr.GetFile(ans)
             except:
diff --git a/src/calibre/ebooks/chm/reader.py b/src/calibre/ebooks/chm/reader.py
index 9bdd1a1c99..b4b0d8efa6 100644
--- a/src/calibre/ebooks/chm/reader.py
+++ b/src/calibre/ebooks/chm/reader.py
@@ -1,7 +1,7 @@
 ''' CHM File decoding support '''
 __license__ = 'GPL v3'
-__copyright__  = '2008, Kovid Goyal <kovid at kovidgoyal.net>,' \
-                 ' and Alex Bramley <a.bramley at gmail.com>.'
+__copyright__  = ('2008, Kovid Goyal <kovid at kovidgoyal.net>,'
+                  ' and Alex Bramley <a.bramley at gmail.com>.')
 
 import codecs
 import os
@@ -73,7 +73,7 @@ class CHMReader(CHMFile):
         # location of '.hhc' file, which is the CHM TOC.
         base = self.topics or self.home
         self.root = os.path.splitext(base.lstrip('/'))[0]
-        self.hhc_path = self.root + ".hhc"
+        self.hhc_path = self.root + '.hhc'
 
     def relpath_to_first_html_file(self):
         # See https://www.nongnu.org/chmspec/latest/Internal.html#SYSTEM
@@ -141,14 +141,14 @@ class CHMReader(CHMFile):
             else:
                 frag = None
             name = self._deentity(li.object('param', {'name': 'Name'})[0]['value'])
-            # print "========>", name
+            # print('========>', name)
             toc.add_item(href, frag, name, play_order=self._playorder)
             self._playorder += 1
             if li.ul:
                 child = self._parse_toc(li.ul)
                 child.parent = toc
                 toc.append(child)
-        # print toc
+        # print(toc)
         return toc
 
     def ResolveObject(self, path):
@@ -170,10 +170,10 @@ class CHMReader(CHMFile):
             path = '/' + path
         res, ui = self.ResolveObject(path)
         if res != chmlib.CHM_RESOLVE_SUCCESS:
-            raise CHMError(f"Unable to locate {path!r} within CHM file {self.filename!r}")
+            raise CHMError(f'Unable to locate {path!r} within CHM file {self.filename!r}')
         size, data = self.RetrieveObject(ui)
         if size == 0:
-            raise CHMError(f"{path!r} is zero bytes in length!")
+            raise CHMError(f'{path!r} is zero bytes in length!')
         return data
 
     def get_home(self):
@@ -254,7 +254,7 @@ class CHMReader(CHMFile):
             soup = BeautifulSoup(data)
         except ValueError:
             # hit some strange encoding problems...
-            self.log.exception("Unable to parse html for cleaning, leaving it")
+            self.log.exception('Unable to parse html for cleaning, leaving it')
             return data
         # nuke javascript...
         [s.extract() for s in soup('script')]
diff --git a/src/calibre/ebooks/compression/tcr.py b/src/calibre/ebooks/compression/tcr.py
index 76e63e958e..e5ffb65bc0 100644
--- a/src/calibre/ebooks/compression/tcr.py
+++ b/src/calibre/ebooks/compression/tcr.py
@@ -32,7 +32,7 @@ class TCRCompressor:
         The intent is to create more unused codes.
         '''
         possible_codes = []
-        a_code = set(re.findall(b'(?ms).', self.coded_txt))
+        a_code = set(re.findall(br'(?ms).', self.coded_txt))
 
         for code in a_code:
             single_code = set(re.findall(b'(?ms)%s.' % re.escape(code), self.coded_txt))
@@ -57,7 +57,7 @@ class TCRCompressor:
         '''
         Create new codes from codes that occur in pairs often.
         '''
-        possible_new_codes = list(set(re.findall(b'(?ms)..', self.coded_txt)))
+        possible_new_codes = list(set(re.findall(br'(?ms)..', self.coded_txt)))
         new_codes_count = []
 
         for c in possible_new_codes:
@@ -74,7 +74,7 @@ class TCRCompressor:
     def compress(self, txt):
         self._reset()
 
-        self.codes = list(set(re.findall(b'(?ms).', txt)))
+        self.codes = list(set(re.findall(br'(?ms).', txt)))
 
         # Replace the text with their corresponding code
         # FIXME: python3 is native bytearray, but all we want are bytes
@@ -105,7 +105,7 @@ class TCRCompressor:
 
         # Generate the code dictionary.
         code_dict = []
-        for i in range(0, 256):
+        for i in range(256):
             if i in self.unused_codes:
                 code_dict.append(b'\0')
             else:
diff --git a/src/calibre/ebooks/conversion/cli.py b/src/calibre/ebooks/conversion/cli.py
index 0b43300c2e..54e6e86cbd 100644
--- a/src/calibre/ebooks/conversion/cli.py
+++ b/src/calibre/ebooks/conversion/cli.py
@@ -88,7 +88,7 @@ def option_recommendation_to_cli_option(add_option, rec):
     switches = ['-'+opt.short_switch] if opt.short_switch else []
     switches.append('--'+opt.long_switch)
     attrs = dict(dest=opt.name, help=opt.help,
-                     choices=opt.choices, default=rec.recommended_value)
+                 choices=opt.choices, default=rec.recommended_value)
     if isinstance(rec.recommended_value, bool):
         attrs['action'] = 'store_false' if rec.recommended_value else \
                           'store_true'
@@ -151,10 +151,10 @@ def recipe_test(option, opt_str, value, parser):
 
     for arg in parser.rargs:
         # stop on --foo like options
-        if arg[:2] == "--":
+        if arg[:2] == '--':
             break
         # stop on -a, but not on -3 or -3.0
-        if arg[:1] == "-" and len(arg) > 1 and not floatable(arg):
+        if arg[:1] == '-' and len(arg) > 1 and not floatable(arg):
             break
         try:
             value.append(int(arg))
@@ -198,13 +198,13 @@ def add_input_output_options(parser, plumber):
 
 def add_pipeline_options(parser, plumber):
     groups = OrderedDict((
-              ('' , ('',
+              ('', ('',
                     [
                      'input_profile',
                      'output_profile',
                      ]
                     )),
-              (_('LOOK AND FEEL') , (
+              (_('LOOK AND FEEL'), (
                   _('Options to control the look and feel of the output'),
                   [
                       'base_font_size', 'disable_font_rescaling',
@@ -223,7 +223,7 @@ def add_pipeline_options(parser, plumber):
                   ]
                   )),
 
-              (_('HEURISTIC PROCESSING') , (
+              (_('HEURISTIC PROCESSING'), (
                   _('Modify the document text and structure using common'
                      ' patterns. Disabled by default. Use %(en)s to enable. '
                      ' Individual actions can be disabled with the %(dis)s options.')
@@ -231,7 +231,7 @@ def add_pipeline_options(parser, plumber):
                   ['enable_heuristics'] + HEURISTIC_OPTIONS
                   )),
 
-              (_('SEARCH AND REPLACE') , (
+              (_('SEARCH AND REPLACE'), (
                  _('Modify the document text and structure using user defined patterns.'),
                  [
                      'sr1_search', 'sr1_replace',
@@ -241,7 +241,7 @@ def add_pipeline_options(parser, plumber):
                  ]
               )),
 
-              (_('STRUCTURE DETECTION') , (
+              (_('STRUCTURE DETECTION'), (
                   _('Control auto-detection of document structure.'),
                   [
                       'chapter', 'chapter_mark',
@@ -251,7 +251,7 @@ def add_pipeline_options(parser, plumber):
                   ]
                   )),
 
-              (_('TABLE OF CONTENTS') , (
+              (_('TABLE OF CONTENTS'), (
                   _('Control the automatic generation of a Table of Contents. By '
                   'default, if the source file has a Table of Contents, it will '
                   'be used in preference to the automatically generated one.'),
@@ -262,7 +262,7 @@ def add_pipeline_options(parser, plumber):
                   ]
                   )),
 
-              (_('METADATA') , (_('Options to set metadata in the output'),
+              (_('METADATA'), (_('Options to set metadata in the output'),
                             plumber.metadata_option_names + ['read_metadata_from_opf'],
                             )),
               (_('DEBUG'), (_('Options to help with debugging the conversion'),
@@ -347,7 +347,7 @@ def create_option_parser(args, log):
 
 
 def abspath(x):
-    if x.startswith('http:') or x.startswith('https:'):
+    if x.startswith(('http:', 'https:')):
         return x
     return os.path.abspath(os.path.expanduser(x))
 
diff --git a/src/calibre/ebooks/conversion/plugins/__init__.py b/src/calibre/ebooks/conversion/plugins/__init__.py
index c2a96b7708..3c0958cb29 100644
--- a/src/calibre/ebooks/conversion/plugins/__init__.py
+++ b/src/calibre/ebooks/conversion/plugins/__init__.py
@@ -4,6 +4,3 @@
 __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
-
-
-
diff --git a/src/calibre/ebooks/conversion/plugins/chm_input.py b/src/calibre/ebooks/conversion/plugins/chm_input.py
index 4fc30bf8de..7168985f93 100644
--- a/src/calibre/ebooks/conversion/plugins/chm_input.py
+++ b/src/calibre/ebooks/conversion/plugins/chm_input.py
@@ -1,7 +1,7 @@
 ''' CHM File decoding support '''
 __license__ = 'GPL v3'
-__copyright__  = '2008, Kovid Goyal <kovid at kovidgoyal.net>,' \
-                 ' and Alex Bramley <a.bramley at gmail.com>.'
+__copyright__  = ('2008, Kovid Goyal <kovid at kovidgoyal.net>, '
+                  'and Alex Bramley <a.bramley at gmail.com>.')
 
 import os
 
@@ -127,12 +127,12 @@ class CHMInput(InputFormatPlugin):
                             strip_encoding_pats=True, resolve_entities=True)[0]
         hhcroot = html.fromstring(hhcdata)
         toc = self._process_nodes(hhcroot)
-        # print("=============================")
-        # print("Printing hhcroot")
+        # print('=============================')
+        # print('Printing hhcroot')
         # print(etree.tostring(hhcroot, pretty_print=True))
-        # print("=============================")
+        # print('=============================')
         log.debug('Found %d section nodes' % toc.count())
-        htmlpath = os.path.splitext(hhcpath)[0] + ".html"
+        htmlpath = os.path.splitext(hhcpath)[0] + '.html'
         base = os.path.dirname(os.path.abspath(htmlpath))
 
         def unquote(x):
diff --git a/src/calibre/ebooks/conversion/plugins/comic_input.py b/src/calibre/ebooks/conversion/plugins/comic_input.py
index 08bfd6c437..c07bac599e 100644
--- a/src/calibre/ebooks/conversion/plugins/comic_input.py
+++ b/src/calibre/ebooks/conversion/plugins/comic_input.py
@@ -44,8 +44,8 @@ class ComicInput(InputFormatPlugin):
         OptionRecommendation(name='landscape', recommended_value=False,
             help=_("Don't split landscape images into two portrait images")),
         OptionRecommendation(name='wide', recommended_value=False,
-            help=_("Keep aspect ratio and scale image using screen height as "
-            "image width for viewing in landscape mode.")),
+            help=_('Keep aspect ratio and scale image using screen height as '
+            'image width for viewing in landscape mode.')),
         OptionRecommendation(name='right2left', recommended_value=False,
               help=_('Used for right-to-left publications like manga. '
               'Causes landscape pages to be split into portrait pages '
@@ -62,7 +62,7 @@ class ComicInput(InputFormatPlugin):
                 'are converted to. You can experiment to see which format gives '
                 'you optimal size and look on your device.')),
         OptionRecommendation(name='no_process', recommended_value=False,
-              help=_("Apply no processing to the image")),
+              help=_('Apply no processing to the image')),
         OptionRecommendation(name='dont_grayscale', recommended_value=False,
             help=_('Do not convert the image to grayscale (black and white)')),
         OptionRecommendation(name='comic_image_size', recommended_value=None,
@@ -77,11 +77,11 @@ class ComicInput(InputFormatPlugin):
 
     recommendations = {
         ('margin_left', 0, OptionRecommendation.HIGH),
-        ('margin_top',  0, OptionRecommendation.HIGH),
+        ('margin_top', 0, OptionRecommendation.HIGH),
         ('margin_right', 0, OptionRecommendation.HIGH),
         ('margin_bottom', 0, OptionRecommendation.HIGH),
         ('insert_blank_line', False, OptionRecommendation.HIGH),
-        ('remove_paragraph_spacing',  False, OptionRecommendation.HIGH),
+        ('remove_paragraph_spacing', False, OptionRecommendation.HIGH),
         ('change_justification', 'left', OptionRecommendation.HIGH),
         ('dont_split_on_pagebreaks', True, OptionRecommendation.HIGH),
         ('chapter', None, OptionRecommendation.HIGH),
diff --git a/src/calibre/ebooks/conversion/plugins/djvu_input.py b/src/calibre/ebooks/conversion/plugins/djvu_input.py
index dd38176da4..34587376ed 100644
--- a/src/calibre/ebooks/conversion/plugins/djvu_input.py
+++ b/src/calibre/ebooks/conversion/plugins/djvu_input.py
@@ -28,7 +28,7 @@ class DJVUInput(InputFormatPlugin):
             raise ValueError('The DJVU file contains no text, only images, probably page scans.'
                     ' calibre only supports conversion of DJVU files with actual text in them.')
 
-        html = convert_basic(raw_text.replace(b"\n", b' ').replace(
+        html = convert_basic(raw_text.replace(b'\n', b' ').replace(
             b'\037', b'\n\n'))
         # Run the HTMLized text through the html processing plugin.
         from calibre.customize.ui import plugin_for_input_format
diff --git a/src/calibre/ebooks/conversion/plugins/epub_input.py b/src/calibre/ebooks/conversion/plugins/epub_input.py
index f919e64e34..f60e6230d0 100644
--- a/src/calibre/ebooks/conversion/plugins/epub_input.py
+++ b/src/calibre/ebooks/conversion/plugins/epub_input.py
@@ -9,7 +9,7 @@ from itertools import cycle
 
 from calibre.customize.conversion import InputFormatPlugin, OptionRecommendation
 
-ADOBE_OBFUSCATION =  'http://ns.adobe.com/pdf/enc#RC'
+ADOBE_OBFUSCATION = 'http://ns.adobe.com/pdf/enc#RC'
 IDPF_OBFUSCATION = 'http://www.idpf.org/2008/embedding'
 
 
@@ -46,7 +46,7 @@ class EPUBInput(InputFormatPlugin):
         from lxml import etree
         idpf_key = opf.raw_unique_identifier
         if idpf_key:
-            idpf_key = re.sub('[\u0020\u0009\u000d\u000a]', '', idpf_key)
+            idpf_key = re.sub(r'[\u0020\u0009\u000d\u000a]', '', idpf_key)
             idpf_key = hashlib.sha1(idpf_key.encode('utf-8')).digest()
         key = None
         for item in opf.identifier_iter():
@@ -244,7 +244,7 @@ class EPUBInput(InputFormatPlugin):
             with open('META-INF/container.xml', 'rb') as f:
                 root = safe_xml_fromstring(f.read())
                 for r in root.xpath('//*[local-name()="rootfile"]'):
-                    if attr(r, 'media-type') != "application/oebps-package+xml":
+                    if attr(r, 'media-type') != 'application/oebps-package+xml':
                         continue
                     path = attr(r, 'full-path')
                     if not path:
diff --git a/src/calibre/ebooks/conversion/plugins/epub_output.py b/src/calibre/ebooks/conversion/plugins/epub_output.py
index 39ce9c7b4c..d2554bedec 100644
--- a/src/calibre/ebooks/conversion/plugins/epub_output.py
+++ b/src/calibre/ebooks/conversion/plugins/epub_output.py
@@ -15,31 +15,31 @@ from calibre.ptempfile import TemporaryDirectory
 from polyglot.builtins import as_bytes
 
 block_level_tags = (
-      'address',
-      'body',
-      'blockquote',
-      'center',
-      'dir',
-      'div',
-      'dl',
-      'fieldset',
-      'form',
-      'h1',
-      'h2',
-      'h3',
-      'h4',
-      'h5',
-      'h6',
-      'hr',
-      'isindex',
-      'menu',
-      'noframes',
-      'noscript',
-      'ol',
-      'p',
-      'pre',
-      'table',
-      'ul',
+    'address',
+    'body',
+    'blockquote',
+    'center',
+    'dir',
+    'div',
+    'dl',
+    'fieldset',
+    'form',
+    'h1',
+    'h2',
+    'h3',
+    'h4',
+    'h5',
+    'h6',
+    'hr',
+    'isindex',
+    'menu',
+    'noframes',
+    'noscript',
+    'ol',
+    'p',
+    'pre',
+    'table',
+    'ul',
 )
 
 
@@ -77,7 +77,7 @@ class EPUBOutput(OutputFormatPlugin):
         ),
 
         OptionRecommendation(name='no_default_epub_cover', recommended_value=False,
-            help=_('Normally, if the input file has no cover and you don\'t'
+            help=_("Normally, if the input file has no cover and you don't"
             ' specify one, a default cover is generated with the title, '
             'authors, etc. This option disables the generation of this cover.')
         ),
@@ -452,7 +452,7 @@ class EPUBOutput(OutputFormatPlugin):
                     br.tag = XHTML('p')
                     br.text = '\u00a0'
                     style = br.get('style', '').split(';')
-                    style = list(filter(None, map(lambda x: x.strip(), style)))
+                    style = list(filter(None, (x.strip() for x in style)))
                     style.append('margin:0pt; border:0pt')
                     # If the prior tag is a block (including a <br> we replaced)
                     # then this <br> replacement should have a 1-line height.
@@ -503,7 +503,7 @@ class EPUBOutput(OutputFormatPlugin):
                     tag.tag = XHTML('div')
 
             # ADE fails to render non breaking hyphens/soft hyphens/zero width spaces
-            special_chars = re.compile('[\u200b\u00ad]')
+            special_chars = re.compile(r'[\u200b\u00ad]')
             for elem in root.iterdescendants('*'):
                 if elem.text:
                     elem.text = special_chars.sub('', elem.text)
diff --git a/src/calibre/ebooks/conversion/plugins/fb2_input.py b/src/calibre/ebooks/conversion/plugins/fb2_input.py
index e192c58071..fcd27aa093 100644
--- a/src/calibre/ebooks/conversion/plugins/fb2_input.py
+++ b/src/calibre/ebooks/conversion/plugins/fb2_input.py
@@ -1,8 +1,8 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Anatoly Shipitsin <norguhtar at gmail.com>'
-"""
+'''
 Convert .fb2 files to .lrf
-"""
+'''
 import os
 import re
 
@@ -91,7 +91,7 @@ class FB2Input(InputFormatPlugin):
         log.debug('Converting XML to HTML...')
         with open(P('templates/fb2.xsl'), 'rb') as f:
             ss = f.read().decode('utf-8')
-        ss = ss.replace("__FB_NS__", fb_ns)
+        ss = ss.replace('__FB_NS__', fb_ns)
         if options.no_inline_fb2_toc:
             log('Disabling generation of inline FB2 TOC')
             ss = re.compile(r'<!-- BUILD TOC -->.*<!-- END BUILD TOC -->',
@@ -105,7 +105,7 @@ class FB2Input(InputFormatPlugin):
         # Handle links of type note and cite
         notes = {a.get('href')[1:]: a for a in result.xpath('//a[@link_note and @href]') if a.get('href').startswith('#')}
         cites = {a.get('link_cite'): a for a in result.xpath('//a[@link_cite]') if not a.get('href', '')}
-        all_ids = {x for x in result.xpath('//*/@id')}
+        all_ids = set(result.xpath('//*/@id'))
         for cite, a in iteritems(cites):
             note = notes.get(cite, None)
             if note:
diff --git a/src/calibre/ebooks/conversion/plugins/html_output.py b/src/calibre/ebooks/conversion/plugins/html_output.py
index 9a0a61ee85..ea64c70cb3 100644
--- a/src/calibre/ebooks/conversion/plugins/html_output.py
+++ b/src/calibre/ebooks/conversion/plugins/html_output.py
@@ -213,7 +213,7 @@ class HTMLOutput(OutputFormatPlugin):
                     f.write(t.encode('utf-8'))
                 item.unload_data_from_memory(memory=path)
 
-        zfile = zipfile.ZipFile(output_path, "w")
+        zfile = zipfile.ZipFile(output_path, 'w')
         zfile.add_dir(output_dir, basename(output_dir))
         zfile.write(output_file, basename(output_file), zipfile.ZIP_DEFLATED)
 
diff --git a/src/calibre/ebooks/conversion/plugins/htmlz_output.py b/src/calibre/ebooks/conversion/plugins/htmlz_output.py
index 3c87c57492..98b5c6057b 100644
--- a/src/calibre/ebooks/conversion/plugins/htmlz_output.py
+++ b/src/calibre/ebooks/conversion/plugins/htmlz_output.py
@@ -39,7 +39,7 @@ class HTMLZOutput(OutputFormatPlugin):
         OptionRecommendation(name='htmlz_class_style', recommended_value='external',
             level=OptionRecommendation.LOW,
             choices=list(ui_data['sheet_choices']),
-            help=_('How to handle the CSS when using css-type = \'class\'.\n'
+            help=_("How to handle the CSS when using css-type = 'class'.\n"
                    'Default is external.\n'
                    'external: {external}\n'
                    'inline: {inline}'
diff --git a/src/calibre/ebooks/conversion/plugins/lrf_output.py b/src/calibre/ebooks/conversion/plugins/lrf_output.py
index b3d11d52a3..dfcc15dcb4 100644
--- a/src/calibre/ebooks/conversion/plugins/lrf_output.py
+++ b/src/calibre/ebooks/conversion/plugins/lrf_output.py
@@ -102,7 +102,7 @@ class LRFOutput(OutputFormatPlugin):
         OptionRecommendation(name='header', recommended_value=False,
             help=_('Add a header to all the pages with title and author.')
         ),
-        OptionRecommendation(name='header_format', recommended_value="%t by %a",
+        OptionRecommendation(name='header_format', recommended_value='%t by %a',
             help=_('Set the format of the header. %a is replaced by the author '
             'and %t by the title. Default is %default')
         ),
diff --git a/src/calibre/ebooks/conversion/plugins/mobi_output.py b/src/calibre/ebooks/conversion/plugins/mobi_output.py
index 15278d2838..cfe03aa79e 100644
--- a/src/calibre/ebooks/conversion/plugins/mobi_output.py
+++ b/src/calibre/ebooks/conversion/plugins/mobi_output.py
@@ -49,7 +49,7 @@ class MOBIOutput(OutputFormatPlugin):
         ),
         OptionRecommendation(name='no_inline_toc',
             recommended_value=False, level=OptionRecommendation.LOW,
-            help=_('Don\'t add Table of Contents to the book. Useful if '
+            help=_("Don't add Table of Contents to the book. Useful if "
                 'the book has its own table of contents.')),
         OptionRecommendation(name='toc_title', recommended_value=None,
             help=_('Title for any generated inline table of contents.')
@@ -280,7 +280,7 @@ class AZW3Output(OutputFormatPlugin):
         ),
         OptionRecommendation(name='no_inline_toc',
             recommended_value=False, level=OptionRecommendation.LOW,
-            help=_('Don\'t add Table of Contents to the book. Useful if '
+            help=_("Don't add Table of Contents to the book. Useful if "
                 'the book has its own table of contents.')),
         OptionRecommendation(name='toc_title', recommended_value=None,
             help=_('Title for any generated inline table of contents.')
diff --git a/src/calibre/ebooks/conversion/plugins/pdf_output.py b/src/calibre/ebooks/conversion/plugins/pdf_output.py
index 54458f299b..79f9ee0293 100644
--- a/src/calibre/ebooks/conversion/plugins/pdf_output.py
+++ b/src/calibre/ebooks/conversion/plugins/pdf_output.py
@@ -13,7 +13,7 @@ from calibre.customize.conversion import OptionRecommendation, OutputFormatPlugi
 from calibre.ptempfile import TemporaryDirectory
 from polyglot.builtins import iteritems
 
-UNITS = ('millimeter', 'centimeter', 'point', 'inch' , 'pica' , 'didot',
+UNITS = ('millimeter', 'centimeter', 'point', 'inch', 'pica', 'didot',
         'cicero', 'devicepixel')
 
 PAPER_SIZES = ('a0', 'a1', 'a2', 'a3', 'a4', 'a5', 'a6', 'b0', 'b1',
@@ -151,9 +151,10 @@ class PDFOutput(OutputFormatPlugin):
         # Ensure Qt is setup to be used with WebEngine
         # specialize_options is called early enough in the pipeline
         # that hopefully no Qt application has been constructed as yet
-        from qt.webengine import QWebEnginePage  # noqa
+        from qt.webengine import QWebEnginePage  # noqa: F401
+
         from calibre.gui2 import must_use_qt
-        from calibre.utils.webengine import setup_fake_protocol, setup_default_profile
+        from calibre.utils.webengine import setup_default_profile, setup_fake_protocol
         setup_fake_protocol()
         must_use_qt()
         setup_default_profile()
diff --git a/src/calibre/ebooks/conversion/plugins/rtf_input.py b/src/calibre/ebooks/conversion/plugins/rtf_input.py
index 5f5d8f206d..982d5fb0e3 100644
--- a/src/calibre/ebooks/conversion/plugins/rtf_input.py
+++ b/src/calibre/ebooks/conversion/plugins/rtf_input.py
@@ -11,8 +11,8 @@ from calibre.utils.resources import get_path as P
 from polyglot.builtins import as_bytes, iteritems
 
 border_style_map = {
-        'single' : 'solid',
-        'double-thickness-border' : 'double',
+        'single': 'solid',
+        'double-thickness-border': 'double',
         'shadowed-border': 'outset',
         'double-border': 'double',
         'dotted-border': 'dotted',
@@ -288,7 +288,7 @@ class RTFInput(InputFormatPlugin):
         self.log('Converting XML to HTML...')
         inline_class = InlineClass(self.log)
         styledoc = safe_xml_fromstring(P('templates/rtf.xsl', data=True), recover=False)
-        extensions = {('calibre', 'inline-class') : inline_class}
+        extensions = {('calibre', 'inline-class'): inline_class}
         transform = etree.XSLT(styledoc, extensions=extensions)
         result = transform(doc)
         html = 'index.xhtml'
@@ -296,11 +296,11 @@ class RTFInput(InputFormatPlugin):
             res = as_bytes(transform.tostring(result))
             # res = res[:100].replace('xmlns:html', 'xmlns') + res[100:]
             # clean multiple \n
-            res = re.sub(b'\n+', b'\n', res)
+            res = re.sub(br'\n+', b'\n', res)
             # Replace newlines inserted by the 'empty_paragraphs' option in rtf2xml with html blank lines
-            # res = re.sub('\s*<body>', '<body>', res)
-            # res = re.sub('(?<=\n)\n{2}',
-            # u'<p>\u00a0</p>\n'.encode('utf-8'), res)
+            # res = re.sub(br'\s*<body>', '<body>', res)
+            # res = re.sub(br'(?<=\n)\n{2}',
+            # '<p>\u00a0</p>\n'.encode('utf-8'), res)
             f.write(res)
         self.write_inline_css(inline_class, border_styles)
         stream.seek(0)
diff --git a/src/calibre/ebooks/conversion/plugins/snb_input.py b/src/calibre/ebooks/conversion/plugins/snb_input.py
index 4c1762d8cf..95f08d9b20 100644
--- a/src/calibre/ebooks/conversion/plugins/snb_input.py
+++ b/src/calibre/ebooks/conversion/plugins/snb_input.py
@@ -12,7 +12,7 @@ HTML_TEMPLATE = '<html><head><meta http-equiv="Content-Type" content="text/html;
 
 
 def html_encode(s):
-    return s.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;').replace("'", '&apos;').replace('\n', '<br/>').replace(' ', '&nbsp;')  # noqa
+    return s.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;').replace("'", '&apos;').replace('\n', '<br/>').replace(' ', '&nbsp;')  # noqa: E501
 
 
 class SNBInput(InputFormatPlugin):
@@ -33,28 +33,30 @@ class SNBInput(InputFormatPlugin):
         from calibre.ebooks.snb.snbfile import SNBFile
         from calibre.utils.xml_parse import safe_xml_fromstring
 
-        log.debug("Parsing SNB file...")
+        log.debug('Parsing SNB file...')
         snbFile = SNBFile()
         try:
             snbFile.Parse(stream)
         except:
-            raise ValueError("Invalid SNB file")
+            raise ValueError('Invalid SNB file')
         if not snbFile.IsValid():
-            log.debug("Invalid SNB file")
-            raise ValueError("Invalid SNB file")
-        log.debug("Handle meta data ...")
+            log.debug('Invalid SNB file')
+            raise ValueError('Invalid SNB file')
+        log.debug('Handle meta data ...')
         from calibre.ebooks.conversion.plumber import create_oebbook
         oeb = create_oebbook(log, None, options,
                 encoding=options.input_encoding, populate=False)
         meta = snbFile.GetFileStream('snbf/book.snbf')
         if meta is not None:
             meta = safe_xml_fromstring(meta)
-            l = {'title'    : './/head/name',
+            l = {
+                  'title'    : './/head/name',
                   'creator'  : './/head/author',
                   'language' : './/head/language',
                   'generator': './/head/generator',
                   'publisher': './/head/publisher',
-                  'cover'    : './/head/cover', }
+                  'cover'    : './/head/cover',
+            }
             d = {}
             for item in l:
                 node = meta.find(l[item])
diff --git a/src/calibre/ebooks/conversion/plugins/snb_output.py b/src/calibre/ebooks/conversion/plugins/snb_output.py
index 3a74b634f9..cfffbde523 100644
--- a/src/calibre/ebooks/conversion/plugins/snb_output.py
+++ b/src/calibre/ebooks/conversion/plugins/snb_output.py
@@ -97,27 +97,27 @@ class SNBOutput(OutputFormatPlugin):
                     href = g['cover'].href
 
             # Output book info file
-            bookInfoTree = etree.Element("book-snbf", version="1.0")
-            headTree = etree.SubElement(bookInfoTree, "head")
-            etree.SubElement(headTree, "name").text = title
-            etree.SubElement(headTree, "author").text = ' '.join(authors)
-            etree.SubElement(headTree, "language").text = lang
-            etree.SubElement(headTree, "rights")
-            etree.SubElement(headTree, "publisher").text = publishers
-            etree.SubElement(headTree, "generator").text = __appname__ + ' ' + __version__
-            etree.SubElement(headTree, "created")
-            etree.SubElement(headTree, "abstract").text = abstract
+            bookInfoTree = etree.Element('book-snbf', version='1.0')
+            headTree = etree.SubElement(bookInfoTree, 'head')
+            etree.SubElement(headTree, 'name').text = title
+            etree.SubElement(headTree, 'author').text = ' '.join(authors)
+            etree.SubElement(headTree, 'language').text = lang
+            etree.SubElement(headTree, 'rights')
+            etree.SubElement(headTree, 'publisher').text = publishers
+            etree.SubElement(headTree, 'generator').text = __appname__ + ' ' + __version__
+            etree.SubElement(headTree, 'created')
+            etree.SubElement(headTree, 'abstract').text = abstract
             if href is not None:
-                etree.SubElement(headTree, "cover").text = ProcessFileName(href)
+                etree.SubElement(headTree, 'cover').text = ProcessFileName(href)
             else:
-                etree.SubElement(headTree, "cover")
+                etree.SubElement(headTree, 'cover')
             with open(os.path.join(snbfDir, 'book.snbf'), 'wb') as f:
                 f.write(etree.tostring(bookInfoTree, pretty_print=True, encoding='utf-8'))
 
             # Output TOC
-            tocInfoTree = etree.Element("toc-snbf")
-            tocHead = etree.SubElement(tocInfoTree, "head")
-            tocBody = etree.SubElement(tocInfoTree, "body")
+            tocInfoTree = etree.Element('toc-snbf')
+            tocHead = etree.SubElement(tocInfoTree, 'head')
+            tocBody = etree.SubElement(tocInfoTree, 'body')
             outputFiles = {}
             if oeb_book.toc.count() == 0:
                 log.warn('This SNB file has no Table of Contents. '
@@ -131,11 +131,11 @@ class SNBOutput(OutputFormatPlugin):
                     # "Cover Pages".
                     # oeb_book.toc does not support "insert", so we generate
                     # the tocInfoTree directly instead of modifying the toc
-                    ch = etree.SubElement(tocBody, "chapter")
-                    ch.set("src", ProcessFileName(first.href) + ".snbc")
+                    ch = etree.SubElement(tocBody, 'chapter')
+                    ch.set('src', ProcessFileName(first.href) + '.snbc')
                     ch.text = _('Cover pages')
                     outputFiles[first.href] = []
-                    outputFiles[first.href].append(("", _("Cover pages")))
+                    outputFiles[first.href].append(('', _('Cover pages')))
 
             for tocitem in oeb_book.toc:
                 if tocitem.href.find('#') != -1:
@@ -147,23 +147,23 @@ class SNBOutput(OutputFormatPlugin):
                             outputFiles[item[0]].append((item[1], tocitem.title))
                         else:
                             outputFiles[item[0]] = []
-                            if "" not in outputFiles[item[0]]:
-                                outputFiles[item[0]].append(("", tocitem.title + _(" (Preface)")))
-                                ch = etree.SubElement(tocBody, "chapter")
-                                ch.set("src", ProcessFileName(item[0]) + ".snbc")
-                                ch.text = tocitem.title + _(" (Preface)")
+                            if '' not in outputFiles[item[0]]:
+                                outputFiles[item[0]].append(('', tocitem.title + _(' (Preface)')))
+                                ch = etree.SubElement(tocBody, 'chapter')
+                                ch.set('src', ProcessFileName(item[0]) + '.snbc')
+                                ch.text = tocitem.title + _(' (Preface)')
                             outputFiles[item[0]].append((item[1], tocitem.title))
                 else:
                     if tocitem.href in outputFiles:
-                        outputFiles[tocitem.href].append(("", tocitem.title))
+                        outputFiles[tocitem.href].append(('', tocitem.title))
                     else:
                         outputFiles[tocitem.href] = []
-                        outputFiles[tocitem.href].append(("", tocitem.title))
-                ch = etree.SubElement(tocBody, "chapter")
-                ch.set("src", ProcessFileName(tocitem.href) + ".snbc")
+                        outputFiles[tocitem.href].append(('', tocitem.title))
+                ch = etree.SubElement(tocBody, 'chapter')
+                ch.set('src', ProcessFileName(tocitem.href) + '.snbc')
                 ch.text = tocitem.title
 
-            etree.SubElement(tocHead, "chapters").text = '%d' % len(tocBody)
+            etree.SubElement(tocHead, 'chapters').text = '%d' % len(tocBody)
 
             with open(os.path.join(snbfDir, 'toc.snbf'), 'wb') as f:
                 f.write(etree.tostring(tocInfoTree, pretty_print=True, encoding='utf-8'))
@@ -194,13 +194,13 @@ class SNBOutput(OutputFormatPlugin):
                             postfix = ''
                             if subName != '':
                                 postfix = '_' + subName
-                            lastName = ProcessFileName(item.href + postfix + ".snbc")
+                            lastName = ProcessFileName(item.href + postfix + '.snbc')
                             oldTree = snbcTrees[subName]
                             with open(os.path.join(snbcDir, lastName), 'wb') as f:
                                 f.write(etree.tostring(oldTree, pretty_print=True, encoding='utf-8'))
                     else:
                         log.debug('Merge %s with last TOC item...' % item.href)
-                        snbwriter.merge_content(oldTree, oeb_book, item, [('', _("Start"))], opts)
+                        snbwriter.merge_content(oldTree, oeb_book, item, [('', _('Start'))], opts)
 
             # Output the last one if needed
             log.debug('Output the last modified chapter again: %s' % lastName)
diff --git a/src/calibre/ebooks/conversion/plugins/txt_input.py b/src/calibre/ebooks/conversion/plugins/txt_input.py
index 048a02c316..c4d620720d 100644
--- a/src/calibre/ebooks/conversion/plugins/txt_input.py
+++ b/src/calibre/ebooks/conversion/plugins/txt_input.py
@@ -21,7 +21,7 @@ MD_EXTENSIONS = {
     'meta': _('Metadata in the document'),
     'nl2br': _('Treat newlines as hard breaks'),
     'sane_lists': _('Do not allow mixing list types'),
-    'smarty': _('Use Markdown\'s internal smartypants parser'),
+    'smarty': _("Use Markdown's internal smartypants parser"),
     'tables': _('Support tables'),
     'toc': _('Generate a table of contents'),
     'wikilinks': _('Wiki style links'),
@@ -43,7 +43,7 @@ class TXTInput(InputFormatPlugin):
             'single': _('Assume every line is a paragraph'),
             'print': _('Assume every line starting with 2+ spaces or a tab starts a paragraph'),
             'unformatted': _('Most lines have hard line breaks, few/no blank lines or indents'),
-            'off': _('Don\'t modify the paragraph structure'),
+            'off': _("Don't modify the paragraph structure"),
         },
         'formatting_types': {
             'auto': _('Automatically decide which formatting processor to use'),
@@ -83,7 +83,7 @@ class TXTInput(InputFormatPlugin):
         OptionRecommendation(name='txt_in_remove_indents', recommended_value=False,
             help=_('Normally extra space at the beginning of lines is retained. '
                    'With this option they will be removed.')),
-        OptionRecommendation(name="markdown_extensions", recommended_value='footnotes, tables, toc',
+        OptionRecommendation(name='markdown_extensions', recommended_value='footnotes, tables, toc',
             help=_('Enable extensions to Markdown syntax. Extensions are formatting that is not part '
                    'of the standard Markdown format. The extensions enabled by default: %default.\n'
                    'To learn more about Markdown extensions, see {}\n'
diff --git a/src/calibre/ebooks/conversion/plugins/txt_output.py b/src/calibre/ebooks/conversion/plugins/txt_output.py
index d90ff6d802..faea8f6b56 100644
--- a/src/calibre/ebooks/conversion/plugins/txt_output.py
+++ b/src/calibre/ebooks/conversion/plugins/txt_output.py
@@ -30,9 +30,9 @@ class TXTOutput(OutputFormatPlugin):
         OptionRecommendation(name='newline', recommended_value='system',
             level=OptionRecommendation.LOW,
             short_switch='n', choices=NEWLINE_TYPES,
-            help=_('Type of newline to use. Options are %s. Default is \'system\'. '
-                'Use \'old_mac\' for compatibility with Mac OS 9 and earlier. '
-                'For macOS use \'unix\'. \'system\' will default to the newline '
+            help=_("Type of newline to use. Options are %s. Default is 'system'. "
+                "Use 'old_mac' for compatibility with Mac OS 9 and earlier. "
+                "For macOS use 'unix'. 'system' will default to the newline "
                 'type used by this OS.') % sorted(NEWLINE_TYPES)),
         OptionRecommendation(name='txt_output_encoding', recommended_value='utf-8',
             level=OptionRecommendation.LOW,
diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
index 6f3cf4a087..b7c562509c 100644
--- a/src/calibre/ebooks/conversion/plumber.py
+++ b/src/calibre/ebooks/conversion/plumber.py
@@ -78,7 +78,6 @@ ARCHIVE_FMTS = ('zip', 'rar', 'oebzip')
 
 
 class Plumber:
-
     '''
     The `Plumber` manages the conversion pipeline. An UI should call the methods
     :method:`merge_ui_recommendations` and then :method:`run`. The plumber will
@@ -187,7 +186,7 @@ OptionRecommendation(name='disable_font_rescaling',
 OptionRecommendation(name='minimum_line_height',
             recommended_value=120.0, level=OptionRecommendation.LOW,
             help=_(
-            'The minimum line height, as a percentage of the element\'s '
+            "The minimum line height, as a percentage of the element's "
             'calculated font size. calibre will ensure that every element '
             'has a line height of at least this setting, irrespective of '
             'what the input document specifies. Set to zero to disable. '
@@ -1073,7 +1072,7 @@ OptionRecommendation(name='search_replace',
         self.flush()
         if self.opts.embed_all_fonts or self.opts.embed_font_family:
             # Start the threaded font scanner now, for performance
-            from calibre.utils.fonts.scanner import font_scanner  # noqa
+            from calibre.utils.fonts.scanner import font_scanner  # noqa: F401
         import logging
 
         import css_parser
diff --git a/src/calibre/ebooks/conversion/preprocess.py b/src/calibre/ebooks/conversion/preprocess.py
index 83a8a9dadd..6815967380 100644
--- a/src/calibre/ebooks/conversion/preprocess.py
+++ b/src/calibre/ebooks/conversion/preprocess.py
@@ -16,23 +16,23 @@ XMLDECL_RE    = re.compile(r'^\s*<[?]xml.*?[?]>')
 SVG_NS       = 'http://www.w3.org/2000/svg'
 XLINK_NS     = 'http://www.w3.org/1999/xlink'
 
-_span_pat = re.compile('<span.*?</span>', re.DOTALL|re.IGNORECASE)
+_span_pat = re.compile(r'<span.*?</span>', re.DOTALL|re.IGNORECASE)
 
 LIGATURES = {
-#        '\u00c6': 'AE',
-#        '\u00e6': 'ae',
-#        '\u0152': 'OE',
-#        '\u0153': 'oe',
-#        '\u0132': 'IJ',
-#        '\u0133': 'ij',
-#        '\u1D6B': 'ue',
-        '\uFB00': 'ff',
-        '\uFB01': 'fi',
-        '\uFB02': 'fl',
-        '\uFB03': 'ffi',
-        '\uFB04': 'ffl',
-        '\uFB05': 'ft',
-        '\uFB06': 'st',
+        # 'Æ': 'AE',
+        # 'æ': 'ae',
+        # 'Œ': 'OE',
+        # 'œ': 'oe',
+        # 'IJ': 'IJ',
+        # 'ij': 'ij',
+        # 'ᵫ': 'ue',
+        'ff': 'ff',
+        'fi': 'fi',
+        'fl': 'fl',
+        'ffi': 'ffi',
+        'ffl': 'ffl',
+        'ſt': 'ft',
+        'st': 'st',
         }
 
 _ligpat = re.compile('|'.join(LIGATURES))
@@ -92,9 +92,9 @@ class DocAnalysis:
         elif format == 'pdf':
             linere = re.compile(r'(?<=<br>)(?!\s*<br>).*?(?=<br>)', re.DOTALL)
         elif format == 'spanned_html':
-            linere = re.compile('(?<=<span).*?(?=</span>)', re.DOTALL)
+            linere = re.compile(r'(?<=<span).*?(?=</span>)', re.DOTALL)
         elif format == 'txt':
-            linere = re.compile('.*?\n')
+            linere = re.compile(r'.*?\n')
         self.lines = linere.findall(raw)
 
     def line_length(self, percent):
@@ -143,20 +143,20 @@ class DocAnalysis:
         maxLineLength=1900  # Discard larger than this to stay in range
         buckets=20  # Each line is divided into a bucket based on length
 
-        # print("there are "+str(len(lines))+" lines")
+        # print('there are '+str(len(lines))+' lines')
         # max = 0
         # for line in self.lines:
-        #    l = len(line)
-        #    if l > max:
-        #        max = l
-        # print("max line found is "+str(max))
+        #     l = len(line)
+        #     if l > max:
+        #         max = l
+        # print('max line found is '+str(max))
         # Build the line length histogram
-        hRaw = [0 for i in range(0,buckets)]
+        hRaw = [0 for i in range(buckets)]
         for line in self.lines:
             l = len(line)
             if l > minLineLength and l < maxLineLength:
                 l = int(l // 100)
-                # print("adding "+str(l))
+                # print('adding '+str(l))
                 hRaw[l]+=1
 
         # Normalize the histogram into percents
@@ -165,20 +165,20 @@ class DocAnalysis:
             h = [float(count)/totalLines for count in hRaw]
         else:
             h = []
-        # print("\nhRaw histogram lengths are: "+str(hRaw))
-        # print("              percents are: "+str(h)+"\n")
+        # print('\nhRaw histogram lengths are: '+str(hRaw))
+        # print('              percents are: '+str(h)+'\n')
 
         # Find the biggest bucket
         maxValue = 0
-        for i in range(0,len(h)):
+        for i in range(len(h)):
             if h[i] > maxValue:
                 maxValue = h[i]
 
         if maxValue < percent:
-            # print("Line lengths are too variable. Not unwrapping.")
+            # print('Line lengths are too variable. Not unwrapping.')
             return False
         else:
-            # print(str(maxValue)+" of the lines were in one bucket")
+            # print(str(maxValue)+' of the lines were in one bucket')
             return True
 
 
@@ -200,8 +200,8 @@ class Dehyphenator:
             "((ed)?ly|'?e?s||a?(t|s)?ion(s|al(ly)?)?|ings?|er|(i)?ous|"
             "(i|a)ty|(it)?ies|ive|gence|istic(ally)?|(e|a)nce|m?ents?|ism|ated|"
             "(e|u)ct(ed)?|ed|(i|ed)?ness|(e|a)ncy|ble|ier|al|ex|ian)$")
-        self.suffixes = re.compile(r"^%s" % self.suffix_string, re.IGNORECASE)
-        self.removesuffixes = re.compile(r"%s" % self.suffix_string, re.IGNORECASE)
+        self.suffixes = re.compile(r'^%s' % self.suffix_string, re.IGNORECASE)
+        self.removesuffixes = re.compile(r'%s' % self.suffix_string, re.IGNORECASE)
         # remove prefixes if the prefix was not already the point of hyphenation
         self.prefix_string = '^(dis|re|un|in|ex)'
         self.prefixes = re.compile(r'%s$' % self.prefix_string, re.IGNORECASE)
@@ -214,7 +214,7 @@ class Dehyphenator:
             wraptags = match.group('wraptags')
         except:
             wraptags = ''
-        hyphenated = str(firsthalf) + "-" + str(secondhalf)
+        hyphenated = str(firsthalf) + '-' + str(secondhalf)
         dehyphenated = str(firsthalf) + str(secondhalf)
         if self.suffixes.match(secondhalf) is None:
             lookupword = self.removesuffixes.sub('', dehyphenated)
@@ -223,7 +223,7 @@ class Dehyphenator:
         if len(firsthalf) > 4 and self.prefixes.match(firsthalf) is None:
             lookupword = self.removeprefix.sub('', lookupword)
         if self.verbose > 2:
-            self.log("lookup word is: "+lookupword+", orig is: " + hyphenated)
+            self.log('lookup word is: '+lookupword+', orig is: ' + hyphenated)
         try:
             searchresult = self.html.find(lookupword.lower())
         except:
@@ -231,33 +231,33 @@ class Dehyphenator:
         if self.format == 'html_cleanup' or self.format == 'txt_cleanup':
             if self.html.find(lookupword) != -1 or searchresult != -1:
                 if self.verbose > 2:
-                    self.log("    Cleanup:returned dehyphenated word: " + dehyphenated)
+                    self.log('    Cleanup:returned dehyphenated word: ' + dehyphenated)
                 return dehyphenated
             elif self.html.find(hyphenated) != -1:
                 if self.verbose > 2:
-                    self.log("        Cleanup:returned hyphenated word: " + hyphenated)
+                    self.log('        Cleanup:returned hyphenated word: ' + hyphenated)
                 return hyphenated
             else:
                 if self.verbose > 2:
-                    self.log("            Cleanup:returning original text "+firsthalf+" + linefeed "+secondhalf)
-                return firsthalf+'\u2014'+wraptags+secondhalf
+                    self.log('            Cleanup:returning original text '+firsthalf+' + linefeed '+secondhalf)
+                return firsthalf+'—'+wraptags+secondhalf
 
         else:
             if self.format == 'individual_words' and len(firsthalf) + len(secondhalf) <= 6:
                 if self.verbose > 2:
-                    self.log("too short, returned hyphenated word: " + hyphenated)
+                    self.log('too short, returned hyphenated word: ' + hyphenated)
                 return hyphenated
             if len(firsthalf) <= 2 and len(secondhalf) <= 2:
                 if self.verbose > 2:
-                    self.log("too short, returned hyphenated word: " + hyphenated)
+                    self.log('too short, returned hyphenated word: ' + hyphenated)
                 return hyphenated
             if self.html.find(lookupword) != -1 or searchresult != -1:
                 if self.verbose > 2:
-                    self.log("     returned dehyphenated word: " + dehyphenated)
+                    self.log('     returned dehyphenated word: ' + dehyphenated)
                 return dehyphenated
             else:
                 if self.verbose > 2:
-                    self.log("          returned hyphenated word: " + hyphenated)
+                    self.log('          returned hyphenated word: ' + hyphenated)
                 return hyphenated
 
     def __call__(self, html, format, length=1):
@@ -274,7 +274,7 @@ class Dehyphenator:
                 r'</[iub]>\s*<p>\s*<[iub]>)\s*(?P<secondpart>[\w\d]+)')% length)
         elif format == 'txt':
             intextmatch = re.compile(
-                '(?<=.{%i})(?P<firstpart>[^\\W\\-]+)(-|‐)(\u0020|\u0009)*(?P<wraptags>(\n(\u0020|\u0009)*)+)(?P<secondpart>[\\w\\d]+)'% length)
+                r'(?<=.{%i})(?P<firstpart>[^\W\-]+)(-|‐)( |\t)*(?P<wraptags>(\n( |\t)*)+)(?P<secondpart>[\w\d]+)'% length)
         elif format == 'individual_words':
             intextmatch = re.compile(
                 r'(?!<)(?P<firstpart>[^\W\-]+)(-|‐)\s*(?P<secondpart>\w+)(?![^<]*?>)', re.UNICODE)
@@ -326,8 +326,7 @@ class CSSPreProcessor:
         ans, namespaced = [], False
         for line in data.splitlines():
             ll = line.lstrip()
-            if not (namespaced or ll.startswith('@import') or not ll or
-                        ll.startswith('@charset')):
+            if not (namespaced or ll.startswith(('@import', '@charset')) or not ll):
                 ans.append(XHTML_CSS_NAMESPACE.strip())
                 namespaced = True
             ans.append(line)
@@ -430,16 +429,16 @@ def book_designer_rules():
     if ans is None:
         ans = book_designer_rules.ans = [
         # HR
-        (re.compile('<hr>', re.IGNORECASE),
+        (re.compile(r'<hr>', re.IGNORECASE),
         lambda match : '<span style="page-break-after:always"> </span>'),
         # Create header tags
         (re.compile(r'<h2[^><]*?id=BookTitle[^><]*?(align=)*(?(1)(\w+))*[^><]*?>[^><]*?</h2>', re.IGNORECASE),
         lambda match : '<h1 id="BookTitle" align="%s">%s</h1>'%(match.group(2) if match.group(2) else 'center', match.group(3))),
         (re.compile(r'<h2[^><]*?id=BookAuthor[^><]*?(align=)*(?(1)(\w+))*[^><]*?>[^><]*?</h2>', re.IGNORECASE),
         lambda match : '<h2 id="BookAuthor" align="%s">%s</h2>'%(match.group(2) if match.group(2) else 'center', match.group(3))),
-        (re.compile('<span[^><]*?id=title[^><]*?>(.*?)</span>', re.IGNORECASE|re.DOTALL),
+        (re.compile(r'<span[^><]*?id=title[^><]*?>(.*?)</span>', re.IGNORECASE|re.DOTALL),
         lambda match : '<h2 class="title">%s</h2>'%(match.group(1),)),
-        (re.compile('<span[^><]*?id=subtitle[^><]*?>(.*?)</span>', re.IGNORECASE|re.DOTALL),
+        (re.compile(r'<span[^><]*?id=subtitle[^><]*?>(.*?)</span>', re.IGNORECASE|re.DOTALL),
         lambda match : '<h3 class="subtitle">%s</h3>'%(match.group(1),)),
     ]
     return ans
@@ -458,10 +457,10 @@ class HTMLPreProcessor:
                           re.IGNORECASE).search(src) is not None
 
     def is_book_designer(self, raw):
-        return re.search('<H2[^><]*id=BookTitle', raw) is not None
+        return re.search(r'<H2[^><]*id=BookTitle', raw) is not None
 
     def is_pdftohtml(self, src):
-        return '<!-- created by calibre\'s pdftohtml -->' in src[:1000]
+        return "<!-- created by calibre's pdftohtml -->" in src[:1000]
 
     def __call__(self, html, remove_special_chars=None,
             get_preprocess_html=False):
@@ -481,7 +480,7 @@ class HTMLPreProcessor:
         start_rules = []
 
         if not getattr(self.extra_opts, 'keep_ligatures', False):
-            html = _ligpat.sub(lambda m:LIGATURES[m.group()], html)
+            html = _ligpat.sub(lambda m: LIGATURES[m.group()], html)
 
         user_sr_rules = {}
         # Function for processing search and replace
@@ -528,7 +527,7 @@ class HTMLPreProcessor:
             docanalysis = DocAnalysis('pdf', html)
             length = docanalysis.line_length(getattr(self.extra_opts, 'unwrap_factor'))
             if length:
-                # print("The pdf line length returned is " + str(length))
+                # print('The pdf line length returned is ' + str(length))
                 # unwrap em/en dashes
                 end_rules.append((re.compile(
                     r'(?<=.{%i}[–—])\s*<p>\s*(?=[\[a-z\d])' % length), lambda match: ''))
@@ -617,7 +616,7 @@ class HTMLPreProcessor:
             html = preprocessor(html)
 
         if is_pdftohtml:
-            html = html.replace('<!-- created by calibre\'s pdftohtml -->', '')
+            html = html.replace("<!-- created by calibre's pdftohtml -->", '')
 
         if getattr(self.extra_opts, 'smarten_punctuation', False):
             html = smarten_punctuation(html, self.log)
diff --git a/src/calibre/ebooks/conversion/utils.py b/src/calibre/ebooks/conversion/utils.py
index 5c074a69f1..6e40d32a31 100644
--- a/src/calibre/ebooks/conversion/utils.py
+++ b/src/calibre/ebooks/conversion/utils.py
@@ -27,22 +27,22 @@ class HeuristicProcessor:
         self.chapters_with_title = 0
         self.blanks_deleted = False
         self.blanks_between_paragraphs = False
-        self.linereg = re.compile('(?<=<p).*?(?=</p>)', re.IGNORECASE|re.DOTALL)
+        self.linereg = re.compile(r'(?<=<p).*?(?=</p>)', re.IGNORECASE|re.DOTALL)
         self.blankreg = re.compile(r'\s*(?P<openline><p(?!\sclass=\"(softbreak|whitespace)\")[^>]*>)\s*(?P<closeline></p>)', re.IGNORECASE)
         self.anyblank = re.compile(r'\s*(?P<openline><p[^>]*>)\s*(?P<closeline></p>)', re.IGNORECASE)
         self.multi_blank = re.compile(r'(\s*<p[^>]*>\s*</p>(\s*<div[^>]*>\s*</div>\s*)*){2,}(?!\s*<h\d)', re.IGNORECASE)
         self.any_multi_blank = re.compile(r'(\s*<p[^>]*>\s*</p>(\s*<div[^>]*>\s*</div>\s*)*){2,}', re.IGNORECASE)
         self.line_open = (
-            r"<(?P<outer>p|div)[^>]*>\s*(<(?P<inner1>font|span|[ibu])[^>]*>)?\s*"
-            r"(<(?P<inner2>font|span|[ibu])[^>]*>)?\s*(<(?P<inner3>font|span|[ibu])[^>]*>)?\s*")
-        self.line_close = "(</(?P=inner3)>)?\\s*(</(?P=inner2)>)?\\s*(</(?P=inner1)>)?\\s*</(?P=outer)>"
+            r'<(?P<outer>p|div)[^>]*>\s*(<(?P<inner1>font|span|[ibu])[^>]*>)?\s*'
+            r'(<(?P<inner2>font|span|[ibu])[^>]*>)?\s*(<(?P<inner3>font|span|[ibu])[^>]*>)?\s*')
+        self.line_close = r'(</(?P=inner3)>)?\s*(</(?P=inner2)>)?\s*(</(?P=inner1)>)?\s*</(?P=outer)>'
         self.single_blank = re.compile(r'(\s*<(p|div)[^>]*>\s*</(p|div)>)', re.IGNORECASE)
         self.scene_break_open = '<p class="scenebreak" style="text-align:center; text-indent:0%; margin-top:1em; margin-bottom:1em; page-break-before:avoid">'
-        self.common_in_text_endings = '[\"\'—’”,\\.!\\?\\…\\)„\\w]'
-        self.common_in_text_beginnings = '[\\w\'\"“‘‛]'
+        self.common_in_text_endings = r'["\'—’”,\.!\?\…\)„\w]'
+        self.common_in_text_beginnings = r'[\w\'"“‘‛]'
 
     def is_pdftohtml(self, src):
-        return '<!-- created by calibre\'s pdftohtml -->' in src[:1000]
+        return "<!-- created by calibre's pdftohtml -->" in src[:1000]
 
     def is_abbyy(self, src):
         return '<meta name="generator" content="ABBYY FineReader' in src[:1000]
@@ -53,25 +53,25 @@ class HeuristicProcessor:
         title = match.group('title')
         if not title:
             self.html_preprocess_sections = self.html_preprocess_sections + 1
-            self.log.debug("marked " + str(self.html_preprocess_sections) +
-                    " chapters. - " + str(chap))
+            self.log.debug('marked ' + str(self.html_preprocess_sections) +
+                    ' chapters. - ' + str(chap))
             return '<h2>'+chap+'</h2>\n'
         else:
-            delete_whitespace = re.compile('^\\s*(?P<c>.*?)\\s*$')
-            delete_quotes = re.compile('\'\"')
-            txt_chap = delete_quotes.sub('', delete_whitespace.sub('\\g<c>', html2text(chap)))
-            txt_title = delete_quotes.sub('', delete_whitespace.sub('\\g<c>', html2text(title)))
+            delete_whitespace = re.compile(r'^\s*(?P<c>.*?)\s*$')
+            delete_quotes = re.compile(r'\'"')
+            txt_chap = delete_quotes.sub('', delete_whitespace.sub(r'\g<c>', html2text(chap)))
+            txt_title = delete_quotes.sub('', delete_whitespace.sub(r'\g<c>', html2text(title)))
             self.html_preprocess_sections = self.html_preprocess_sections + 1
-            self.log.debug("marked " + str(self.html_preprocess_sections) +
-                    " chapters & titles. - " + str(chap) + ", " + str(title))
+            self.log.debug('marked ' + str(self.html_preprocess_sections) +
+                    ' chapters & titles. - ' + str(chap) + ', ' + str(title))
             return '<h2 title="'+txt_chap+', '+txt_title+'">'+chap+'</h2>\n<h3 class="sigilNotInTOC">'+title+'</h3>\n'
 
     def chapter_break(self, match):
         chap = match.group('section')
         styles = match.group('styles')
         self.html_preprocess_sections = self.html_preprocess_sections + 1
-        self.log.debug("marked " + str(self.html_preprocess_sections) +
-                " section markers based on punctuation. - " + str(chap))
+        self.log.debug('marked ' + str(self.html_preprocess_sections) +
+                ' section markers based on punctuation. - ' + str(chap))
         return '<'+styles+' style="page-break-before:always">'+chap
 
     def analyze_title_matches(self, match):
@@ -108,14 +108,14 @@ class HeuristicProcessor:
         inspect.  Percent is the minimum percent of line endings which should
         be marked up to return true.
         '''
-        htm_end_ere = re.compile('</(p|div)>', re.DOTALL)
-        line_end_ere = re.compile('(\n|\r|\r\n)', re.DOTALL)
+        htm_end_ere = re.compile(r'</(p|div)>', re.DOTALL)
+        line_end_ere = re.compile(r'(\n|\r|\r\n)', re.DOTALL)
         htm_end = htm_end_ere.findall(raw)
         line_end = line_end_ere.findall(raw)
         tot_htm_ends = len(htm_end)
         tot_ln_fds = len(line_end)
         # self.log.debug("There are " + str(tot_ln_fds) + " total Line feeds, and " +
-        #        str(tot_htm_ends) + " marked up endings")
+        #         str(tot_htm_ends) + " marked up endings")
 
         if percent > 1:
             percent = 1
@@ -208,60 +208,60 @@ class HeuristicProcessor:
             if wordcount > 200000:
                 typical_chapters = 15000.
             self.min_chapters = int(ceil(wordcount / typical_chapters))
-        self.log.debug("minimum chapters required are: "+str(self.min_chapters))
-        heading = re.compile('<h[1-3][^>]*>', re.IGNORECASE)
+        self.log.debug('minimum chapters required are: '+str(self.min_chapters))
+        heading = re.compile(r'<h[1-3][^>]*>', re.IGNORECASE)
         self.html_preprocess_sections = len(heading.findall(html))
-        self.log.debug("found " + str(self.html_preprocess_sections) + " pre-existing headings")
+        self.log.debug('found ' + str(self.html_preprocess_sections) + ' pre-existing headings')
 
         # Build the Regular Expressions in pieces
-        init_lookahead = "(?=<(p|div))"
+        init_lookahead = r'(?=<(p|div))'
         chapter_line_open = self.line_open
-        title_line_open = (r"<(?P<outer2>p|div)[^>]*>\s*(<(?P<inner4>font|span|[ibu])[^>]*>)?"
-        r"\s*(<(?P<inner5>font|span|[ibu])[^>]*>)?\s*(<(?P<inner6>font|span|[ibu])[^>]*>)?\s*")
-        chapter_header_open = r"(?P<chap>"
-        title_header_open = r"(?P<title>"
-        chapter_header_close = ")\\s*"
-        title_header_close = ")"
+        title_line_open = (r'<(?P<outer2>p|div)[^>]*>\s*(<(?P<inner4>font|span|[ibu])[^>]*>)?'
+            r'\s*(<(?P<inner5>font|span|[ibu])[^>]*>)?\s*(<(?P<inner6>font|span|[ibu])[^>]*>)?\s*')
+        chapter_header_open = r'(?P<chap>'
+        title_header_open = r'(?P<title>'
+        chapter_header_close = r')\s*'
+        title_header_close = r')'
         chapter_line_close = self.line_close
-        title_line_close = "(</(?P=inner6)>)?\\s*(</(?P=inner5)>)?\\s*(</(?P=inner4)>)?\\s*</(?P=outer2)>"
+        title_line_close = r'(</(?P=inner6)>)?\s*(</(?P=inner5)>)?\s*(</(?P=inner4)>)?\s*</(?P=outer2)>'
 
         is_pdftohtml = self.is_pdftohtml(html)
         if is_pdftohtml:
-            title_line_open = "<(?P<outer2>p)[^>]*>\\s*"
-            title_line_close = "\\s*</(?P=outer2)>"
+            title_line_open = r'<(?P<outer2>p)[^>]*>\s*'
+            title_line_close = r'\s*</(?P=outer2)>'
 
         if blanks_between_paragraphs:
-            blank_lines = "(\\s*<p[^>]*>\\s*</p>){0,2}\\s*"
+            blank_lines = r'(\s*<p[^>]*>\s*</p>){0,2}\s*'
         else:
-            blank_lines = ""
-        opt_title_open = "("
-        opt_title_close = ")?"
-        n_lookahead_open = "(?!\\s*"
-        n_lookahead_close = ")\\s*"
+            blank_lines = ''
+        opt_title_open = r'('
+        opt_title_close = r')?'
+        n_lookahead_open = r'(?!\s*'
+        n_lookahead_close = r')\s*'
 
         default_title = r"(<[ibu][^>]*>)?\s{0,3}(?!Chapter)([\w\:\'’\"-]+\s{0,3}){1,5}?(</[ibu][^>]*>)?(?=<)"
-        simple_title = r"(<[ibu][^>]*>)?\s{0,3}(?!(Chapter|\s+<)).{0,65}?(</[ibu][^>]*>)?(?=<)"
+        simple_title = r'(<[ibu][^>]*>)?\s{0,3}(?!(Chapter|\s+<)).{0,65}?(</[ibu][^>]*>)?(?=<)'
 
         analysis_result = []
 
         chapter_types = [
             [(
                 r"[^'\"]?(Introduction|Synopsis|Acknowledgements|Epilogue|CHAPTER|Kapitel|Volume\b|Prologue|Book\b|Part\b|Dedication|Preface)"
-                r"\s*([\d\w-]+\:?\'?\s*){0,5}"), True, True, True, False, "Searching for common section headings", 'common'],
+                r"\s*([\d\w-]+\:?\'?\s*){0,5}"), True, True, True, False, 'Searching for common section headings', 'common'],
             # Highest frequency headings which include titles
-            [r"[^'\"]?(CHAPTER|Kapitel)\s*([\dA-Z\-\'\"\?!#,]+\s*){0,7}\s*", True, True, True, False, "Searching for most common chapter headings", 'chapter'],
-            [r"<b[^>]*>\s*(<span[^>]*>)?\s*(?!([*#•=]+\s*)+)(\s*(?=[\d.\w#\-*\s]+<)([\d.\w#-*]+\s*){1,5}\s*)(?!\.)(</span>)?\s*</b>",
-                           True, True, True, False, "Searching for emphasized lines", 'emphasized'],  # Emphasized lines
+            [r"[^'\"]?(CHAPTER|Kapitel)\s*([\dA-Z\-\'\"\?!#,]+\s*){0,7}\s*", True, True, True, False, 'Searching for most common chapter headings', 'chapter'],
+            [r'<b[^>]*>\s*(<span[^>]*>)?\s*(?!([*#•=]+\s*)+)(\s*(?=[\d.\w#\-*\s]+<)([\d.\w#-*]+\s*){1,5}\s*)(?!\.)(</span>)?\s*</b>',
+                           True, True, True, False, 'Searching for emphasized lines', 'emphasized'],  # Emphasized lines
             [r"[^'\"]?(\d+(\.|:))\s*([\w\-\'\"#,]+\s*){0,7}\s*", True, True, True, False,
-                       "Searching for numeric chapter headings", 'numeric'],  # Numeric Chapters
-            [r"([A-Z]\s+){3,}\s*([\d\w-]+\s*){0,3}\s*", True, True, True, False, "Searching for letter spaced headings", 'letter_spaced'],  # Spaced Lettering
+                       'Searching for numeric chapter headings', 'numeric'],  # Numeric Chapters
+            [r'([A-Z]\s+){3,}\s*([\d\w-]+\s*){0,3}\s*', True, True, True, False, 'Searching for letter spaced headings', 'letter_spaced'],  # Spaced Lettering
             [r"[^'\"]?(\d+\.?\s+([\d\w-]+\:?\'?-?\s?){0,5})\s*", True, True, True, False,
-                       "Searching for numeric chapters with titles", 'numeric_title'],  # Numeric Titles
+                       'Searching for numeric chapters with titles', 'numeric_title'],  # Numeric Titles
             [r"[^'\"]?(\d+)\s*([\dA-Z\-\'\"\?!#,]+\s*){0,7}\s*", True, True, True, False,
-                       "Searching for simple numeric headings", 'plain_number'],  # Numeric Chapters, no dot or colon
+                       'Searching for simple numeric headings', 'plain_number'],  # Numeric Chapters, no dot or colon
             [r"\s*[^'\"]?([A-Z#]+(\s|-){0,3}){1,5}\s*", False, True, False, False,
-                          "Searching for chapters with Uppercase Characters", 'uppercase']  # Uppercase Chapters
-            ]
+                          'Searching for chapters with Uppercase Characters', 'uppercase'],  # Uppercase Chapters
+        ]
 
         def recurse_patterns(html, analyze):
             # Start with most typical chapter headings, get more aggressive until one works
@@ -299,9 +299,9 @@ class HeuristicProcessor:
                     break
                 full_chapter_line = chapter_line_open+chapter_header_open+chapter_type+chapter_header_close+chapter_line_close
                 if n_lookahead_req:
-                    n_lookahead = re.sub("(ou|in|cha)", "lookahead_", full_chapter_line)
+                    n_lookahead = re.sub(r'(ou|in|cha)', 'lookahead_', full_chapter_line)
                 if not analyze:
-                    self.log.debug("Marked " + str(self.html_preprocess_sections) + " headings, " + log_message)
+                    self.log.debug('Marked ' + str(self.html_preprocess_sections) + ' headings, ' + log_message)
 
                 chapter_marker = arg_ignorecase+init_lookahead+full_chapter_line+blank_lines+lp_n_lookahead_open+n_lookahead+lp_n_lookahead_close+ \
                     lp_opt_title_open+title_line_open+title_header_open+lp_title+title_header_close+title_line_close+lp_opt_title_close
@@ -315,10 +315,10 @@ class HeuristicProcessor:
                             title_req = True
                             strict_title = False
                         self.log.debug(
-                                str(type_name)+" had "+str(hits)+
-                                " hits - "+str(self.chapters_no_title)+" chapters with no title, "+
-                                str(self.chapters_with_title)+" chapters with titles, "+
-                                str(float(self.chapters_with_title) / float(hits))+" percent. ")
+                                str(type_name)+' had '+str(hits)+
+                                ' hits - '+str(self.chapters_no_title)+' chapters with no title, '+
+                                str(self.chapters_with_title)+' chapters with titles, '+
+                                str(float(self.chapters_with_title) / float(hits))+' percent. ')
                         if type_name == 'common':
                             analysis_result.append([chapter_type, n_lookahead_req, strict_title, ignorecase, title_req, log_message, type_name])
                         elif self.min_chapters <= hits < max_chapters or self.min_chapters < 3 > hits:
@@ -335,8 +335,8 @@ class HeuristicProcessor:
         words_per_chptr = wordcount
         if words_per_chptr > 0 and self.html_preprocess_sections > 0:
             words_per_chptr = wordcount // self.html_preprocess_sections
-        self.log.debug("Total wordcount is: "+ str(wordcount)+", Average words per section is: "+
-                       str(words_per_chptr)+", Marked up "+str(self.html_preprocess_sections)+" chapters")
+        self.log.debug('Total wordcount is: '+ str(wordcount)+', Average words per section is: '+
+                       str(words_per_chptr)+', Marked up '+str(self.html_preprocess_sections)+' chapters')
         return html
 
     def punctuation_unwrap(self, length, content, format):
@@ -366,13 +366,13 @@ class HeuristicProcessor:
 
         # define the pieces of the regex
         # (?<!\&\w{4});) is a semicolon not part of an entity
-        lookahead = "(?<=.{"+str(length)+r"}([a-zა-ჰäëïöüàèìòùáćéíĺóŕńśúýźâêîôûçąężłıãõñæøþðßěľščťžňďřůёђєіїјљњћўџѣа-я,:)\\IAß]|(?<!\&\w{4});))"
-        em_en_lookahead = "(?<=.{"+str(length)+"}[\u2013\u2014])"
-        soft_hyphen = "\xad"
-        line_ending = "\\s*(?P<style_close></(span|[iub])>)?\\s*(</(p|div)>)?"
-        blanklines = "\\s*(?P<up2threeblanks><(p|span|div)[^>]*>\\s*(<(p|span|div)[^>]*>\\s*</(span|p|div)>\\s*)</(span|p|div)>\\s*){0,3}\\s*"
-        line_opening = "<(p|div)[^>]*>\\s*(?P<style_open><(span|[iub])[^>]*>)?\\s*"
-        txt_line_wrap = "((\u0020|\u0009)*\n){1,4}"
+        lookahead = '(?<=.{'+str(length)+r'}([a-zა-ჰäëïöüàèìòùáćéíĺóŕńśúýźâêîôûçąężłıãõñæøþðßěľščťžňďřůёђєіїјљњћўџѣа-я,:)\\IAß]|(?<!\&\w{4});))'
+        em_en_lookahead = '(?<=.{'+str(length)+'}[\u2013\u2014])'
+        soft_hyphen = '\xad'
+        line_ending = r'\s*(?P<style_close></(span|[iub])>)?\s*(</(p|div)>)?'
+        blanklines = r'\s*(?P<up2threeblanks><(p|span|div)[^>]*>\s*(<(p|span|div)[^>]*>\s*</(span|p|div)>\s*)</(span|p|div)>\s*){0,3}\s*'
+        line_opening = r'<(p|div)[^>]*>\s*(?P<style_open><(span|[iub])[^>]*>)?\s*'
+        txt_line_wrap = r'((\u0020|\u0009)*\n){1,4}'
 
         if format == 'txt':
             unwrap_regex = lookahead+txt_line_wrap
@@ -383,9 +383,9 @@ class HeuristicProcessor:
             em_en_unwrap_regex = em_en_lookahead+line_ending+blanklines+line_opening
             shy_unwrap_regex = soft_hyphen+line_ending+blanklines+line_opening
 
-        unwrap = re.compile("%s" % unwrap_regex, re.UNICODE)
-        em_en_unwrap = re.compile("%s" % em_en_unwrap_regex, re.UNICODE)
-        shy_unwrap = re.compile("%s" % shy_unwrap_regex, re.UNICODE)
+        unwrap = re.compile('%s' % unwrap_regex, re.UNICODE)
+        em_en_unwrap = re.compile('%s' % em_en_unwrap_regex, re.UNICODE)
+        shy_unwrap = re.compile('%s' % shy_unwrap_regex, re.UNICODE)
 
         if format == 'txt':
             content = unwrap.sub(' ', content)
@@ -408,7 +408,7 @@ class HeuristicProcessor:
     def markup_pre(self, html):
         pre = re.compile(r'<pre>', re.IGNORECASE)
         if len(pre.findall(html)) >= 1:
-            self.log.debug("Running Text Processing")
+            self.log.debug('Running Text Processing')
             outerhtml = re.compile(r'.*?(?<=<pre>)(?P<text>.*?)</pre>', re.IGNORECASE|re.DOTALL)
             html = outerhtml.sub(self.txt_process, html)
             from calibre.ebooks.conversion.preprocess import convert_entities
@@ -417,20 +417,20 @@ class HeuristicProcessor:
             # Add markup naively
             # TODO - find out if there are cases where there are more than one <pre> tag or
             # other types of unmarked html and handle them in some better fashion
-            add_markup = re.compile('(?<!>)(\n)')
-            html = add_markup.sub('</p>\n<p>', html)
+            add_markup = re.compile(r'(?<!>)(\n)')
+            html = add_markup.sub(r'</p>\n<p>', html)
         return html
 
     def arrange_htm_line_endings(self, html):
-        html = re.sub(r"\s*</(?P<tag>p|div)>", "</"+"\\g<tag>"+">\n", html)
-        html = re.sub(r"\s*<(?P<tag>p|div)(?P<style>[^>]*)>\s*", "\n<"+"\\g<tag>"+"\\g<style>"+">", html)
+        html = re.sub(r'\s*</(?P<tag>p|div)>', r'</\g<tag>'+'>\n', html)
+        html = re.sub(r'\s*<(?P<tag>p|div)(?P<style>[^>]*)>\s*', r'\n<\g<tag>\g<style>'+'>', html)
         return html
 
     def fix_nbsp_indents(self, html):
         txtindent = re.compile(r'<(?P<tagtype>p|div)(?P<formatting>[^>]*)>\s*(?P<span>(<span[^>]*>\s*)+)?\s*(\u00a0){2,}', re.IGNORECASE)
         html = txtindent.sub(self.insert_indent, html)
         if self.found_indents > 1:
-            self.log.debug("replaced "+str(self.found_indents)+ " nbsp indents with inline styles")
+            self.log.debug('replaced '+str(self.found_indents)+ ' nbsp indents with inline styles')
         return html
 
     def cleanup_markup(self, html):
@@ -440,18 +440,18 @@ class HeuristicProcessor:
         # Get rid of empty <o:p> tags to simplify other processing
         html = re.sub(r'\s*<o:p>\s*</o:p>', ' ', html)
         # Delete microsoft 'smart' tags
-        html = re.sub('(?i)</?st1:\\w+>', '', html)
+        html = re.sub(r'(?i)</?st1:\w+>', '', html)
         # Re-open self closing paragraph tags
-        html = re.sub('<p[^>/]*/>', '<p> </p>', html)
+        html = re.sub(r'<p[^>/]*/>', '<p> </p>', html)
         # Get rid of empty span, bold, font, em, & italics tags
         fmt_tags = 'font|[ibu]|em|strong'
         open_fmt_pat, close_fmt_pat = fr'<(?:{fmt_tags})(?:\s[^>]*)?>', f'</(?:{fmt_tags})>'
         for i in range(2):
-            html = re.sub(r"\s*<span[^>]*>\s*(<span[^>]*>\s*</span>){0,2}\s*</span>\s*", " ", html)
+            html = re.sub(r'\s*<span[^>]*>\s*(<span[^>]*>\s*</span>){0,2}\s*</span>\s*', ' ', html)
             html = re.sub(
-                r"\s*{open}\s*({open}\s*{close}\s*){{0,2}}\s*{close}".format(open=open_fmt_pat, close=close_fmt_pat) , " ", html)
+                r'\s*{open}\s*({open}\s*{close}\s*){{0,2}}\s*{close}'.format(open=open_fmt_pat, close=close_fmt_pat), ' ', html)
         # delete surrounding divs from empty paragraphs
-        html = re.sub('<div[^>]*>\\s*<p[^>]*>\\s*</p>\\s*</div>', '<p> </p>', html)
+        html = re.sub(r'<div[^>]*>\s*<p[^>]*>\s*</p>\s*</div>', '<p> </p>', html)
         # Empty heading tags
         html = re.sub(r'(?i)<h\d+>\s*</h\d+>', '', html)
         self.deleted_nbsps = True
@@ -462,8 +462,8 @@ class HeuristicProcessor:
         determines the type of html line ending used most commonly in a document
         use before calling docanalysis functions
         '''
-        paras_reg = re.compile('<p[^>]*>', re.IGNORECASE)
-        spans_reg = re.compile('<span[^>]*>', re.IGNORECASE)
+        paras_reg = re.compile(r'<p[^>]*>', re.IGNORECASE)
+        spans_reg = re.compile(r'<span[^>]*>', re.IGNORECASE)
         paras = len(paras_reg.findall(html))
         spans = len(spans_reg.findall(html))
         if spans > 1:
@@ -478,8 +478,8 @@ class HeuristicProcessor:
         blanklines = self.blankreg.findall(html)
         lines = self.linereg.findall(html)
         if len(lines) > 1:
-            self.log.debug("There are " + str(len(blanklines)) + " blank lines. " +
-                    str(float(len(blanklines)) / float(len(lines))) + " percent blank")
+            self.log.debug('There are ' + str(len(blanklines)) + ' blank lines. ' +
+                    str(float(len(blanklines)) / float(len(lines))) + ' percent blank')
 
             if float(len(blanklines)) / float(len(lines)) > 0.40:
                 return True
@@ -538,7 +538,7 @@ class HeuristicProcessor:
             elif content.find('scenebreak') != -1:
                 return content
             else:
-                content = re.sub('(?i)<h(?P<hnum>\\d+)[^>]*>', '\n\n<h'+'\\g<hnum>'+' style="'+top_margin+bottom_margin+'">', content)
+                content = re.sub(r'(?i)<h(?P<hnum>\d+)[^>]*>', r'\n\n<h\g<hnum> style="'+top_margin+bottom_margin+'">', content)
             return content
 
         html = blanks_around_headings.sub(merge_header_whitespace, html)
@@ -546,20 +546,20 @@ class HeuristicProcessor:
 
         def markup_whitespaces(match):
             blanks = match.group(0)
-            blanks = self.blankreg.sub('\n<p class="whitespace" style="text-align:center; margin-top:0em; margin-bottom:0em"> </p>', blanks)
+            blanks = self.blankreg.sub(r'\n<p class="whitespace" style="text-align:center; margin-top:0em; margin-bottom:0em"> </p>', blanks)
             return blanks
 
         html = blanks_n_nopunct.sub(markup_whitespaces, html)
         if self.html_preprocess_sections > self.min_chapters:
-            html = re.sub('(?si)^.*?(?=<h\\d)', markup_whitespaces, html)
+            html = re.sub(r'(?si)^.*?(?=<h\d)', markup_whitespaces, html)
 
         return html
 
     def detect_soft_breaks(self, html):
-        line = '(?P<initline>'+self.line_open+'\\s*(?P<init_content>.*?)'+self.line_close+')'
-        line_two = '(?P<line_two>'+re.sub('(ou|in|cha)', 'linetwo_', self.line_open)+ \
-                     '\\s*(?P<line_two_content>.*?)'+re.sub('(ou|in|cha)', 'linetwo_', self.line_close)+')'
-        div_break_candidate_pattern = line+'\\s*<div[^>]*>\\s*</div>\\s*'+line_two
+        line = '(?P<initline>'+self.line_open+r'\s*(?P<init_content>.*?)'+self.line_close+')'
+        line_two = '(?P<line_two>'+re.sub(r'(ou|in|cha)', 'linetwo_', self.line_open)+ \
+                     r'\s*(?P<line_two_content>.*?)'+re.sub(r'(ou|in|cha)', 'linetwo_', self.line_close)+')'
+        div_break_candidate_pattern = line+r'\s*<div[^>]*>\s*</div>\s*'+line_two
         div_break_candidate = re.compile(r'%s' % div_break_candidate_pattern, re.IGNORECASE|re.UNICODE)
 
         def convert_div_softbreaks(match):
@@ -575,16 +575,16 @@ class HeuristicProcessor:
         html = div_break_candidate.sub(convert_div_softbreaks, html)
 
         if not self.blanks_deleted and self.blanks_between_paragraphs:
-            html = self.multi_blank.sub('\n<p class="softbreak" style="margin-top:1em; page-break-before:avoid; text-align:center"> </p>', html)
+            html = self.multi_blank.sub(r'\n<p class="softbreak" style="margin-top:1em; page-break-before:avoid; text-align:center"> </p>', html)
         else:
-            html = self.blankreg.sub('\n<p class="softbreak" style="margin-top:.5em; page-break-before:avoid; text-align:center"> </p>', html)
+            html = self.blankreg.sub(r'\n<p class="softbreak" style="margin-top:.5em; page-break-before:avoid; text-align:center"> </p>', html)
         return html
 
     def detect_scene_breaks(self, html):
         scene_break_regex = self.line_open+'(?!('+self.common_in_text_beginnings+'|.*?'+self.common_in_text_endings+ \
-                                             '<))(?P<break>((?P<break_char>((?!\\s)\\W))\\s*(?P=break_char)?){1,10})\\s*'+self.line_close
+                                             r'<))(?P<break>((?P<break_char>((?!\s)\W))\s*(?P=break_char)?){1,10})\s*'+self.line_close
         scene_breaks = re.compile(r'%s' % scene_break_regex, re.IGNORECASE|re.UNICODE)
-        html = scene_breaks.sub(self.scene_break_open+'\\g<break>'+'</p>', html)
+        html = scene_breaks.sub(self.scene_break_open+r'\g<break></p>', html)
         return html
 
     def markup_user_break(self, replacement_break):
@@ -596,54 +596,54 @@ class HeuristicProcessor:
         All other html is converted to text.
         '''
         hr_open = '<div id="scenebreak" style="margin-left: 45%; margin-right: 45%; margin-top:1.5em; margin-bottom:1.5em; page-break-before:avoid">'
-        if re.findall('(<|>)', replacement_break):
-            if re.match('^<hr', replacement_break):
+        if re.findall(r'(<|>)', replacement_break):
+            if re.match(r'^<hr', replacement_break):
                 if replacement_break.find('width') != -1:
                     try:
-                        width = int(re.sub('.*?width(:|=)(?P<wnum>\\d+).*', '\\g<wnum>', replacement_break))
+                        width = int(re.sub(r'.*?width(:|=)(?P<wnum>\d+).*', r'\g<wnum>', replacement_break))
                     except:
                         scene_break = hr_open+'<hr style="height: 3px; background:#505050" /></div>'
                         self.log.warn('Invalid replacement scene break'
                                 ' expression, using default')
                     else:
-                        replacement_break = re.sub('(?i)(width=\\d+\\%?|width:\\s*\\d+(\\%|px|pt|em)?;?)', '', replacement_break)
+                        replacement_break = re.sub(r'(?i)(width=\d+\\%?|width:\s*\d+(\%|px|pt|em)?;?)', '', replacement_break)
                         divpercent = (100 - width) // 2
-                        hr_open = re.sub('45', str(divpercent), hr_open)
+                        hr_open = re.sub(r'45', str(divpercent), hr_open)
                         scene_break = hr_open+replacement_break+'</div>'
                 else:
                     scene_break = hr_open+'<hr style="height: 3px; background:#505050" /></div>'
-            elif re.match('^<img', replacement_break):
+            elif re.match(r'^<img', replacement_break):
                 scene_break = self.scene_break_open+replacement_break+'</p>'
             else:
                 from calibre.utils.html2text import html2text
                 replacement_break = html2text(replacement_break)
-                replacement_break = re.sub('\\s', '&nbsp;', replacement_break)
+                replacement_break = re.sub(r'\s', '&nbsp;', replacement_break)
                 scene_break = self.scene_break_open+replacement_break+'</p>'
         else:
-            replacement_break = re.sub('\\s', '&nbsp;', replacement_break)
+            replacement_break = re.sub(r'\s', '&nbsp;', replacement_break)
             scene_break = self.scene_break_open+replacement_break+'</p>'
 
         return scene_break
 
     def check_paragraph(self, content):
-        content = re.sub('\\s*</?span[^>]*>\\s*', '', content)
-        if re.match('.*[\"\'.!?:]$', content):
-            # print "detected this as a paragraph"
+        content = re.sub(r'\s*</?span[^>]*>\s*', '', content)
+        if re.match(r'.*["\'.!?:]$', content):
+            # print('detected this as a paragraph')
             return True
         else:
             return False
 
     def abbyy_processor(self, html):
-        abbyy_line = re.compile('((?P<linestart><p\\sstyle="(?P<styles>[^\"]*?);?">)(?P<content>.*?)(?P<lineend></p>)|(?P<image><img[^>]*>))', re.IGNORECASE)
+        abbyy_line = re.compile(r'((?P<linestart><p\sstyle="(?P<styles>[^"]*?);?">)(?P<content>.*?)(?P<lineend></p>)|(?P<image><img[^>]*>))', re.IGNORECASE)
         empty_paragraph = '\n<p> </p>\n'
         self.in_blockquote = False
         self.previous_was_paragraph = False
-        html = re.sub('</?a[^>]*>', '', html)
+        html = re.sub(r'</?a[^>]*>', '', html)
 
         def convert_styles(match):
-            # print "raw styles are: "+match.group('styles')
+            # print('raw styles are: '+match.group('styles'))
             content = match.group('content')
-            # print "raw content is: "+match.group('content')
+            # print('raw content is: '+match.group('content'))
             image = match.group('image')
 
             is_paragraph = False
@@ -668,25 +668,25 @@ class HeuristicProcessor:
             else:
                 styles = match.group('styles').split(';')
                 is_paragraph = self.check_paragraph(content)
-                # print "styles for this line are: "+str(styles)
+                # print('styles for this line are: '+str(styles))
                 split_styles = []
                 for style in styles:
-                    # print "style is: "+str(style)
+                    # print('style is: '+str(style))
                     newstyle = style.split(':')
-                    # print "newstyle is: "+str(newstyle)
+                    # print('newstyle is: '+str(newstyle))
                     split_styles.append(newstyle)
                 styles = split_styles
                 for style, setting in styles:
                     if style == 'text-align' and setting != 'left':
                         text_align = style+':'+setting+';'
                     if style == 'text-indent':
-                        setting = int(re.sub('\\s*pt\\s*', '', setting))
+                        setting = int(re.sub(r'\s*pt\s*', '', setting))
                         if 9 < setting < 14:
                             text_indent = indented_text
                         else:
                             text_indent = style+':'+str(setting)+'pt;'
                     if style == 'padding':
-                        setting = re.sub('pt', '', setting).split(' ')
+                        setting = setting.replace('pt', '').split(' ')
                         if int(setting[1]) < 16 and int(setting[3]) < 16:
                             if self.in_blockquote:
                                 debugabby = True
@@ -710,25 +710,25 @@ class HeuristicProcessor:
                             self.log.debug('padding bottom is: ' + str(setting[2]))
                             self.log.debug('padding left is: ' +str(setting[3]))
 
-                # print "text-align is: "+str(text_align)
-                # print "\n***\nline is:\n     "+str(match.group(0))+'\n'
+                # print('text-align is: '+str(text_align))
+                # print('\n***\nline is:\n     '+str(match.group(0))+'\n')
                 if debugabby:
-                    # print "this line is a paragraph = "+str(is_paragraph)+", previous line was "+str(self.previous_was_paragraph)
-                    self.log.debug("styles for this line were:", styles)
+                    # print('this line is a paragraph = '+str(is_paragraph)+', previous line was '+str(self.previous_was_paragraph))
+                    self.log.debug('styles for this line were:', styles)
                     self.log.debug('newline is:')
                     self.log.debug(blockquote_open_loop+blockquote_close_loop+
                             paragraph_before+'<p style="'+text_indent+text_align+
                             '">'+content+'</p>'+paragraph_after+'\n\n\n\n\n')
-                # print "is_paragraph is "+str(is_paragraph)+", previous_was_paragraph is "+str(self.previous_was_paragraph)
+                # print('is_paragraph is '+str(is_paragraph)+', previous_was_paragraph is '+str(self.previous_was_paragraph))
                 self.previous_was_paragraph = is_paragraph
-                # print "previous_was_paragraph is now set to "+str(self.previous_was_paragraph)+"\n\n\n"
+                # print('previous_was_paragraph is now set to '+str(self.previous_was_paragraph)+'\n\n\n')
                 return blockquote_open_loop+blockquote_close_loop+paragraph_before+'<p style="'+text_indent+text_align+'">'+content+'</p>'+paragraph_after
 
         html = abbyy_line.sub(convert_styles, html)
         return html
 
     def __call__(self, html):
-        self.log.debug("*********  Heuristic processing HTML  *********")
+        self.log.debug('*********  Heuristic processing HTML  *********')
         # Count the words in the document to estimate how many chapters to look for and whether
         # other types of processing are attempted
         try:
@@ -737,7 +737,7 @@ class HeuristicProcessor:
             self.log.warn("Can't get wordcount")
 
         if self.totalwords < 50:
-            self.log.warn("flow is too short, not running heuristics")
+            self.log.warn('flow is too short, not running heuristics')
             return html
 
         is_abbyy = self.is_abbyy(html)
@@ -754,7 +754,7 @@ class HeuristicProcessor:
             # <pre> tags), check and  mark up line endings if required before proceeding
             # fix indents must run after this step
             if self.no_markup(html, 0.1):
-                self.log.debug("not enough paragraph markers, adding now")
+                self.log.debug('not enough paragraph markers, adding now')
                 # markup using text processing
                 html = self.markup_pre(html)
 
@@ -768,11 +768,11 @@ class HeuristicProcessor:
 
         is_pdftohtml = self.is_pdftohtml(html)
         if is_pdftohtml:
-            self.line_open = "<(?P<outer>p)[^>]*>(\\s*<[ibu][^>]*>)?\\s*"
-            self.line_close = "\\s*(</[ibu][^>]*>\\s*)?</(?P=outer)>"
+            self.line_open = r'<(?P<outer>p)[^>]*>(\s*<[ibu][^>]*>)?\s*'
+            self.line_close = r'\s*(</[ibu][^>]*>\s*)?</(?P=outer)>'
 
         # ADE doesn't render <br />, change to empty paragraphs
-        # html = re.sub('<br[^>]*>', u'<p>\u00a0</p>', html)
+        # html = re.sub(r'<br[^>]*>', '<p>\u00a0</p>', html)
 
         # Determine whether the document uses interleaved blank lines
         self.blanks_between_paragraphs = self.analyze_blanks(html)
@@ -789,9 +789,9 @@ class HeuristicProcessor:
         # If more than 40% of the lines are empty paragraphs and the user has enabled delete
         # blank paragraphs then delete blank lines to clean up spacing
         if self.blanks_between_paragraphs and getattr(self.extra_opts, 'delete_blank_paragraphs', False):
-            self.log.debug("deleting blank lines")
+            self.log.debug('deleting blank lines')
             self.blanks_deleted = True
-            html = self.multi_blank.sub('\n<p class="softbreak" style="margin-top:.5em; page-break-before:avoid; text-align:center"> </p>', html)
+            html = self.multi_blank.sub(r'\n<p class="softbreak" style="margin-top:.5em; page-break-before:avoid; text-align:center"> </p>', html)
             html = self.blankreg.sub('', html)
 
         # Determine line ending type
@@ -804,18 +804,18 @@ class HeuristicProcessor:
         # more of the lines break in the same region of the document then unwrapping is required
         docanalysis = DocAnalysis(format, html)
         hardbreaks = docanalysis.line_histogram(.50)
-        self.log.debug("Hard line breaks check returned "+str(hardbreaks))
+        self.log.debug('Hard line breaks check returned '+str(hardbreaks))
 
         # Calculate Length
         unwrap_factor = getattr(self.extra_opts, 'html_unwrap_factor', 0.4)
         length = docanalysis.line_length(unwrap_factor)
-        self.log.debug("Median line length is " + str(length) + ", calculated with " + format + " format")
+        self.log.debug('Median line length is ' + str(length) + ', calculated with ' + format + ' format')
 
         # ##### Unwrap lines ######
         if getattr(self.extra_opts, 'unwrap_lines', False):
             # only go through unwrapping code if the histogram shows unwrapping is required or if the user decreased the default unwrap_factor
             if hardbreaks or unwrap_factor < 0.4:
-                self.log.debug("Unwrapping required, unwrapping Lines")
+                self.log.debug('Unwrapping required, unwrapping Lines')
                 # Dehyphenate with line length limiters
                 dehyphenator = Dehyphenator(self.extra_opts.verbose, self.log)
                 html = dehyphenator(html,'html', length)
@@ -823,15 +823,15 @@ class HeuristicProcessor:
 
         if getattr(self.extra_opts, 'dehyphenate', False):
             # dehyphenate in cleanup mode to fix anything previous conversions/editing missed
-            self.log.debug("Fixing hyphenated content")
+            self.log.debug('Fixing hyphenated content')
             dehyphenator = Dehyphenator(self.extra_opts.verbose, self.log)
             html = dehyphenator(html,'html_cleanup', length)
             html = dehyphenator(html, 'individual_words', length)
 
         # If still no sections after unwrapping mark split points on lines with no punctuation
         if self.html_preprocess_sections < self.min_chapters and getattr(self.extra_opts, 'markup_chapter_headings', False):
-            self.log.debug("Looking for more split points based on punctuation,"
-                    " currently have " + str(self.html_preprocess_sections))
+            self.log.debug('Looking for more split points based on punctuation,'
+                    ' currently have ' + str(self.html_preprocess_sections))
             chapdetect3 = re.compile(
                 r'<(?P<styles>(p|div)[^>]*)>\s*(?P<section>(<span[^>]*>)?\s*(?!([\W]+\s*)+)'
                 r'(<[ibu][^>]*>){0,2}\s*(<span[^>]*>)?\s*(<[ibu][^>]*>){0,2}\s*(<span[^>]*>)?\s*'
@@ -845,7 +845,7 @@ class HeuristicProcessor:
             # headings and titles, images, etc
             doubleheading = re.compile(
                 r'(?P<firsthead><h(1|2)[^>]*>.+?</h(1|2)>\s*(<(?!h\d)[^>]*>\s*)*)<h(1|2)(?P<secondhead>[^>]*>.+?)</h(1|2)>', re.IGNORECASE)
-            html = doubleheading.sub('\\g<firsthead>'+'\n<h3'+'\\g<secondhead>'+'</h3>', html)
+            html = doubleheading.sub(r'\g<firsthead>\n<h3\g<secondhead></h3>', html)
 
         # If scene break formatting is enabled, find all blank paragraphs that definitely aren't scenebreaks,
         # style it with the 'whitespace' class.  All remaining blank lines are styled as softbreaks.
@@ -853,7 +853,7 @@ class HeuristicProcessor:
         # If non-blank scene breaks exist they are center aligned and styled with appropriate margins.
         if getattr(self.extra_opts, 'format_scene_breaks', False):
             self.log.debug('Formatting scene breaks')
-            html = re.sub('(?i)<div[^>]*>\\s*<br(\\s?/)?>\\s*</div>', '<p></p>', html)
+            html = re.sub(r'(?i)<div[^>]*>\s*<br(\s?/)?>\s*</div>', '<p></p>', html)
             html = self.detect_scene_breaks(html)
             html = self.detect_whitespace(html)
             html = self.detect_soft_breaks(html)
@@ -870,11 +870,11 @@ class HeuristicProcessor:
                 replacement_break = self.markup_user_break(replacement_break)
                 if scene_break_count >= 1:
                     html = detected_scene_break.sub(replacement_break, html)
-                    html = re.sub('<p\\s+class="softbreak"[^>]*>\\s*</p>', replacement_break, html)
+                    html = re.sub(r'<p\s+class="softbreak"[^>]*>\s*</p>', replacement_break, html)
                 else:
-                    html = re.sub('<p\\s+class="softbreak"[^>]*>\\s*</p>', replacement_break, html)
+                    html = re.sub(r'<p\s+class="softbreak"[^>]*>\s*</p>', replacement_break, html)
 
         if self.deleted_nbsps:
             # put back non-breaking spaces in empty paragraphs so they render correctly
-            html = self.anyblank.sub('\n'+r'\g<openline>'+'\u00a0'+r'\g<closeline>', html)
+            html = self.anyblank.sub(r'\n\g<openline>\u00a0\g<closeline>', html)
         return html
diff --git a/src/calibre/ebooks/covers.py b/src/calibre/ebooks/covers.py
index 048d1f0bef..8b106f7663 100644
--- a/src/calibre/ebooks/covers.py
+++ b/src/calibre/ebooks/covers.py
@@ -192,7 +192,7 @@ class Block:
 
     @position.setter
     def position(self, new_pos):
-        (x, y) = new_pos
+        x, y = new_pos
         self._position = Point(x, y)
         if self.layouts:
             self.layouts[0].setPosition(QPointF(x, y))
@@ -246,8 +246,8 @@ def layout_text(prefs, img, title, subtitle, footer, max_height, style):
 
 # }}}
 
-# Format text using templates {{{
 
+# Format text using templates {{{
 
 def sanitize(s):
     return unicodedata.normalize('NFC', clean_xml_chars(clean_ascii_chars(force_unicode(s or ''))))
@@ -318,7 +318,7 @@ ColorTheme = namedtuple('ColorTheme', 'color1 color2 contrast_color1 contrast_co
 
 
 def to_theme(x):
-    return {k:v for k, v in zip(ColorTheme._fields[:4], x.split())}
+    return dict(zip(ColorTheme._fields[:4], x.split()))
 
 
 fallback_colors = to_theme('ffffff 000000 000000 ffffff')
@@ -355,8 +355,8 @@ def color(color_theme, name):
 
 # }}}
 
-# Styles {{{
 
+# Styles {{{
 
 class Style:
 
@@ -499,7 +499,7 @@ class Ornamental(Style):
     GUI_NAME = _('Ornamental')
 
     # SVG vectors {{{
-    CORNER_VECTOR = "m 67.791903,64.260958 c -4.308097,-2.07925 -4.086719,-8.29575 0.334943,-9.40552 4.119758,-1.03399 8.732363,5.05239 5.393055,7.1162 -0.55,0.33992 -1,1.04147 -1,1.55902 0,1.59332 2.597425,1.04548 5.365141,-1.1316 1.999416,-1.57274 2.634859,-2.96609 2.634859,-5.7775 0,-9.55787 -9.827495,-13.42961 -24.43221,-9.62556 -3.218823,0.83839 -5.905663,1.40089 -5.970755,1.25 -0.06509,-0.1509 -0.887601,-1.19493 -1.827799,-2.32007 -1.672708,-2.00174 -1.636693,-2.03722 1.675668,-1.65052 1.861815,0.21736 6.685863,-0.35719 10.720107,-1.27678 12.280767,-2.79934 20.195487,-0.0248 22.846932,8.0092 3.187273,9.65753 -6.423297,17.7497 -15.739941,13.25313 z m 49.881417,-20.53932 c -3.19204,-2.701 -3.72967,-6.67376 -1.24009,-9.16334 2.48236,-2.48236 5.35141,-2.67905 7.51523,-0.51523 1.85966,1.85966 2.07045,6.52954 0.37143,8.22857 -2.04025,2.04024 3.28436,1.44595 6.92316,-0.77272 9.66959,-5.89579 0.88581,-18.22422 -13.0777,-18.35516 -5.28594,-0.0496 -10.31098,1.88721 -14.26764,5.4991 -1.98835,1.81509 -2.16454,1.82692 -2.7936,0.18763 -0.40973,-1.06774 0.12141,-2.82197 1.3628,-4.50104 2.46349,-3.33205 1.67564,-4.01299 -2.891784,-2.49938 -2.85998,0.94777 -3.81038,2.05378 -5.59837,6.51495 -1.184469,2.95536 -3.346819,6.86882 -4.805219,8.69657 -1.4584,1.82776 -2.65164,4.02223 -2.65164,4.87662 0,3.24694 -4.442667,0.59094 -5.872557,-3.51085 -1.361274,-3.90495 0.408198,-8.63869 4.404043,-11.78183 5.155844,-4.05558 1.612374,-3.42079 -9.235926,1.65457 -12.882907,6.02725 -16.864953,7.18038 -24.795556,7.18038 -8.471637,0 -13.38802,-1.64157 -17.634617,-5.88816 -2.832233,-2.83224 -3.849773,-4.81378 -4.418121,-8.6038 -1.946289,-12.9787795 8.03227,-20.91713135 19.767685,-15.7259993 5.547225,2.4538018 6.993631,6.1265383 3.999564,10.1557393 -5.468513,7.35914 -15.917883,-0.19431 -10.657807,-7.7041155 1.486298,-2.1219878 1.441784,-2.2225068 -0.984223,-2.2225068 -1.397511,0 -4.010527,1.3130878 -5.806704,2.9179718 -2.773359,2.4779995 -3.265777,3.5977995 -3.265777,7.4266705 0,5.10943 2.254112,8.84197 7.492986,12.40748 8.921325,6.07175 19.286666,5.61396 37.12088,-1.63946 15.35037,-6.24321 21.294999,-7.42408 34.886123,-6.92999 11.77046,0.4279 19.35803,3.05537 24.34054,8.42878 4.97758,5.3681 2.53939,13.58271 -4.86733,16.39873 -4.17361,1.58681 -11.00702,1.19681 -13.31978,-0.76018 z m 26.50156,-0.0787 c -2.26347,-2.50111 -2.07852,-7.36311 0.39995,-10.51398 2.68134,-3.40877 10.49035,-5.69409 18.87656,-5.52426 l 6.5685,0.13301 -7.84029,0.82767 c -8.47925,0.89511 -12.76997,2.82233 -16.03465,7.20213 -1.92294,2.57976 -1.96722,3.00481 -0.57298,5.5 1.00296,1.79495 2.50427,2.81821 4.46514,3.04333 2.92852,0.33623 2.93789,0.32121 1.08045,-1.73124 -1.53602,-1.69728 -1.64654,-2.34411 -0.61324,-3.58916 2.84565,-3.4288 7.14497,-0.49759 5.03976,3.43603 -1.86726,3.48903 -8.65528,4.21532 -11.3692,1.21647 z m -4.17462,-14.20302 c -0.38836,-0.62838 -0.23556,-1.61305 0.33954,-2.18816 1.3439,-1.34389 4.47714,-0.17168 3.93038,1.47045 -0.5566,1.67168 -3.38637,2.14732 -4.26992,0.71771 z m -8.48037,-9.1829 c -12.462,-4.1101 -12.53952,-4.12156 -25.49998,-3.7694 -24.020921,0.65269 -32.338219,0.31756 -37.082166,-1.49417 -5.113999,-1.95305 -8.192504,-6.3647405 -6.485463,-9.2940713 0.566827,-0.972691 1.020091,-1.181447 1.037211,-0.477701 0.01685,0.692606 1.268676,1.2499998 2.807321,1.2499998 1.685814,0 4.868609,1.571672 8.10041,4.0000015 4.221481,3.171961 6.182506,3.999221 9.473089,3.996261 l 4.149585,-0.004 -3.249996,-1.98156 c -3.056252,-1.863441 -4.051566,-3.8760635 -2.623216,-5.3044145 0.794,-0.794 6.188222,1.901516 9.064482,4.5295635 1.858669,1.698271 3.461409,1.980521 10.559493,1.859621 11.30984,-0.19266 20.89052,1.29095 31.97905,4.95208 7.63881,2.52213 11.51931,3.16471 22.05074,3.65141 7.02931,0.32486 13.01836,0.97543 13.30902,1.44571 0.29065,0.47029 -5.2356,0.83436 -12.28056,0.80906 -12.25942,-0.044 -13.34537,-0.2229 -25.30902,-4.16865 z"  # noqa
+    CORNER_VECTOR = 'm 67.791903,64.260958 c -4.308097,-2.07925 -4.086719,-8.29575 0.334943,-9.40552 4.119758,-1.03399 8.732363,5.05239 5.393055,7.1162 -0.55,0.33992 -1,1.04147 -1,1.55902 0,1.59332 2.597425,1.04548 5.365141,-1.1316 1.999416,-1.57274 2.634859,-2.96609 2.634859,-5.7775 0,-9.55787 -9.827495,-13.42961 -24.43221,-9.62556 -3.218823,0.83839 -5.905663,1.40089 -5.970755,1.25 -0.06509,-0.1509 -0.887601,-1.19493 -1.827799,-2.32007 -1.672708,-2.00174 -1.636693,-2.03722 1.675668,-1.65052 1.861815,0.21736 6.685863,-0.35719 10.720107,-1.27678 12.280767,-2.79934 20.195487,-0.0248 22.846932,8.0092 3.187273,9.65753 -6.423297,17.7497 -15.739941,13.25313 z m 49.881417,-20.53932 c -3.19204,-2.701 -3.72967,-6.67376 -1.24009,-9.16334 2.48236,-2.48236 5.35141,-2.67905 7.51523,-0.51523 1.85966,1.85966 2.07045,6.52954 0.37143,8.22857 -2.04025,2.04024 3.28436,1.44595 6.92316,-0.77272 9.66959,-5.89579 0.88581,-18.22422 -13.0777,-18.35516 -5.28594,-0.0496 -10.31098,1.88721 -14.26764,5.4991 -1.98835,1.81509 -2.16454,1.82692 -2.7936,0.18763 -0.40973,-1.06774 0.12141,-2.82197 1.3628,-4.50104 2.46349,-3.33205 1.67564,-4.01299 -2.891784,-2.49938 -2.85998,0.94777 -3.81038,2.05378 -5.59837,6.51495 -1.184469,2.95536 -3.346819,6.86882 -4.805219,8.69657 -1.4584,1.82776 -2.65164,4.02223 -2.65164,4.87662 0,3.24694 -4.442667,0.59094 -5.872557,-3.51085 -1.361274,-3.90495 0.408198,-8.63869 4.404043,-11.78183 5.155844,-4.05558 1.612374,-3.42079 -9.235926,1.65457 -12.882907,6.02725 -16.864953,7.18038 -24.795556,7.18038 -8.471637,0 -13.38802,-1.64157 -17.634617,-5.88816 -2.832233,-2.83224 -3.849773,-4.81378 -4.418121,-8.6038 -1.946289,-12.9787795 8.03227,-20.91713135 19.767685,-15.7259993 5.547225,2.4538018 6.993631,6.1265383 3.999564,10.1557393 -5.468513,7.35914 -15.917883,-0.19431 -10.657807,-7.7041155 1.486298,-2.1219878 1.441784,-2.2225068 -0.984223,-2.2225068 -1.397511,0 -4.010527,1.3130878 -5.806704,2.9179718 -2.773359,2.4779995 -3.265777,3.5977995 -3.265777,7.4266705 0,5.10943 2.254112,8.84197 7.492986,12.40748 8.921325,6.07175 19.286666,5.61396 37.12088,-1.63946 15.35037,-6.24321 21.294999,-7.42408 34.886123,-6.92999 11.77046,0.4279 19.35803,3.05537 24.34054,8.42878 4.97758,5.3681 2.53939,13.58271 -4.86733,16.39873 -4.17361,1.58681 -11.00702,1.19681 -13.31978,-0.76018 z m 26.50156,-0.0787 c -2.26347,-2.50111 -2.07852,-7.36311 0.39995,-10.51398 2.68134,-3.40877 10.49035,-5.69409 18.87656,-5.52426 l 6.5685,0.13301 -7.84029,0.82767 c -8.47925,0.89511 -12.76997,2.82233 -16.03465,7.20213 -1.92294,2.57976 -1.96722,3.00481 -0.57298,5.5 1.00296,1.79495 2.50427,2.81821 4.46514,3.04333 2.92852,0.33623 2.93789,0.32121 1.08045,-1.73124 -1.53602,-1.69728 -1.64654,-2.34411 -0.61324,-3.58916 2.84565,-3.4288 7.14497,-0.49759 5.03976,3.43603 -1.86726,3.48903 -8.65528,4.21532 -11.3692,1.21647 z m -4.17462,-14.20302 c -0.38836,-0.62838 -0.23556,-1.61305 0.33954,-2.18816 1.3439,-1.34389 4.47714,-0.17168 3.93038,1.47045 -0.5566,1.67168 -3.38637,2.14732 -4.26992,0.71771 z m -8.48037,-9.1829 c -12.462,-4.1101 -12.53952,-4.12156 -25.49998,-3.7694 -24.020921,0.65269 -32.338219,0.31756 -37.082166,-1.49417 -5.113999,-1.95305 -8.192504,-6.3647405 -6.485463,-9.2940713 0.566827,-0.972691 1.020091,-1.181447 1.037211,-0.477701 0.01685,0.692606 1.268676,1.2499998 2.807321,1.2499998 1.685814,0 4.868609,1.571672 8.10041,4.0000015 4.221481,3.171961 6.182506,3.999221 9.473089,3.996261 l 4.149585,-0.004 -3.249996,-1.98156 c -3.056252,-1.863441 -4.051566,-3.8760635 -2.623216,-5.3044145 0.794,-0.794 6.188222,1.901516 9.064482,4.5295635 1.858669,1.698271 3.461409,1.980521 10.559493,1.859621 11.30984,-0.19266 20.89052,1.29095 31.97905,4.95208 7.63881,2.52213 11.51931,3.16471 22.05074,3.65141 7.02931,0.32486 13.01836,0.97543 13.30902,1.44571 0.29065,0.47029 -5.2356,0.83436 -12.28056,0.80906 -12.25942,-0.044 -13.34537,-0.2229 -25.30902,-4.16865 z'  # noqa: E501
     # }}}
     PATH_CACHE = {}
     VIEWPORT = (400, 500)
diff --git a/src/calibre/ebooks/djvu/__init__.py b/src/calibre/ebooks/djvu/__init__.py
index 1d58fcfdd7..9280f81b7d 100644
--- a/src/calibre/ebooks/djvu/__init__.py
+++ b/src/calibre/ebooks/djvu/__init__.py
@@ -8,4 +8,3 @@ __docformat__ = 'restructuredtext en'
 '''
 Used for DJVU input
 '''
-
diff --git a/src/calibre/ebooks/djvu/djvu.py b/src/calibre/ebooks/djvu/djvu.py
index df029e5de9..f7124d7349 100644
--- a/src/calibre/ebooks/djvu/djvu.py
+++ b/src/calibre/ebooks/djvu/djvu.py
@@ -37,7 +37,7 @@ class DjvuChunk:
         self.dataend = pos + self.size - (8 if inclheader else 0)
         if self.type == b'FORM':
             oldpos, pos = pos, pos+4
-            # print oldpos, pos
+            # print(oldpos, pos)
             self.subtype = buf[oldpos:pos]
             # self.headersize += 4
         self.datastart = pos
@@ -109,7 +109,7 @@ class DJVUFile:
     def __init__(self, instream, verbose=0):
         self.instream = instream
         buf = self.instream.read(4)
-        assert(buf == b'AT&T')
+        assert buf == b'AT&T'
         buf = self.instream.read()
         self.dc = DjvuChunk(buf, 0, len(buf), verbose=verbose)
 
diff --git a/src/calibre/ebooks/djvu/djvubzzdec.py b/src/calibre/ebooks/djvu/djvubzzdec.py
index 5748af9682..d518cdee63 100644
--- a/src/calibre/ebooks/djvu/djvubzzdec.py
+++ b/src/calibre/ebooks/djvu/djvubzzdec.py
@@ -78,15 +78,14 @@ MAXLEN = 1024 ** 2
 
 
 class BZZDecoderError(Exception):
-
-    """This exception is raised when BZZDecode runs into trouble
-    """
+    '''This exception is raised when BZZDecode runs into trouble
+    '''
 
     def __init__(self, msg):
         self.msg = msg
 
     def __str__(self):
-        return "BZZDecoderError: %s" % (self.msg)
+        return 'BZZDecoderError: %s' % (self.msg)
 
 
 # This table has been designed for the ZPCoder
@@ -389,7 +388,7 @@ xmtf = (
 # }}}
 
 
-class BZZDecoder():
+class BZZDecoder:
 
     def __init__(self, infile, outfile):
         self.instream = infile
@@ -417,7 +416,7 @@ class BZZDecoder():
         # Create machine independent ffz table
         for i in range(256):
             j = i
-            while(j & 0x80):
+            while j & 0x80:
                 self.ffzt[i] += 1
                 j <<= 1
         # Initialize table
@@ -468,7 +467,7 @@ class BZZDecoder():
                 self.byte = 0xff
                 self.delay -= 1
                 if self.delay < 1:
-                    raise BZZDecoderError("BiteStream EOF")
+                    raise BZZDecoderError('BiteStream EOF')
             self.bufint = (self.bufint << 8) | self.byte
             self.scount += 8
 
@@ -486,7 +485,7 @@ class BZZDecoder():
         if not self.xsize:
             return 0
         if self.xsize > MAXBLOCK * 1024:        # 4MB (4096 * 1024) is max block
-            raise BZZDecoderError("BiteStream.corrupt")
+            raise BZZDecoderError('BiteStream.corrupt')
         # Dec11ode Estimation Speed
         fshift = 0
         if self.zpcodec_decoder():
@@ -571,7 +570,7 @@ class BZZDecoder():
         # //////// Reconstruct the string
 
         if markerpos < 1 or markerpos >= self.xsize:
-            raise BZZDecoderError("BiteStream.corrupt")
+            raise BZZDecoderError('BiteStream.corrupt')
         # Allocate pointers
         posn = [0] * self.xsize
         # Prepare count buffer
@@ -602,7 +601,7 @@ class BZZDecoder():
             i = count[c] + (n & 0xffffff)
         # Free and check
         if i != markerpos:
-            raise BZZDecoderError("BiteStream.corrupt")
+            raise BZZDecoderError('BiteStream.corrupt')
         return self.xsize
 
     def decode_raw(self, bits):
@@ -733,10 +732,10 @@ def main():
     import sys
 
     from calibre_extensions import bzzdec as d
-    with open(sys.argv[1], "rb") as f:
+    with open(sys.argv[1], 'rb') as f:
         raw = f.read()
     print(d.decompress(raw))
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     main()
diff --git a/src/calibre/ebooks/docx/__init__.py b/src/calibre/ebooks/docx/__init__.py
index fd10297f12..fc5e470722 100644
--- a/src/calibre/ebooks/docx/__init__.py
+++ b/src/calibre/ebooks/docx/__init__.py
@@ -7,4 +7,3 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 class InvalidDOCX(ValueError):
     pass
-
diff --git a/src/calibre/ebooks/docx/block_styles.py b/src/calibre/ebooks/docx/block_styles.py
index 6e5f548cd8..258a244581 100644
--- a/src/calibre/ebooks/docx/block_styles.py
+++ b/src/calibre/ebooks/docx/block_styles.py
@@ -88,7 +88,7 @@ LINE_STYLES = {  # {{{
     'thick': 'solid',
     'thickThinLargeGap': 'double',
     'thickThinMediumGap': 'double',
-    'thickThinSmallGap' : 'double',
+    'thickThinSmallGap': 'double',
     'thinThickLargeGap': 'double',
     'thinThickMediumGap': 'double',
     'thinThickSmallGap': 'double',
@@ -128,7 +128,7 @@ def read_single_border(parent, edge, XPath, get):
                 width = min(96, max(2, float(sz))) / 8
             except (ValueError, TypeError):
                 pass
-    return {p:v for p, v in zip(border_props, (padding, width, style, color))}
+    return dict(zip(border_props, (padding, width, style, color)))
 
 
 def read_border(parent, dest, XPath, get, border_edges=border_edges, name='pBdr'):
diff --git a/src/calibre/ebooks/docx/char_styles.py b/src/calibre/ebooks/docx/char_styles.py
index 1cc7f5ba2a..8bc673eb91 100644
--- a/src/calibre/ebooks/docx/char_styles.py
+++ b/src/calibre/ebooks/docx/char_styles.py
@@ -6,7 +6,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 from collections import OrderedDict
 
-from calibre.ebooks.docx.block_styles import LINE_STYLES, binary_property, inherit, read_shd, simple_color, simple_float  # noqa
+from calibre.ebooks.docx.block_styles import LINE_STYLES, binary_property, inherit, read_shd, simple_color, simple_float
 
 # Read from XML {{{
 
diff --git a/src/calibre/ebooks/docx/cleanup.py b/src/calibre/ebooks/docx/cleanup.py
index 5507a20772..a4fb122566 100644
--- a/src/calibre/ebooks/docx/cleanup.py
+++ b/src/calibre/ebooks/docx/cleanup.py
@@ -231,7 +231,7 @@ def cleanup_markup(log, root, styles, dest_dir, detect_cover, XPath, uuid):
                     with open(path, 'rb') as imf:
                         fmt, width, height = identify(imf)
                 except:
-                    width, height, fmt = 0, 0, None  # noqa
+                    width, height, fmt = 0, 0, None
                 del fmt
                 try:
                     is_cover = 0.8 <= height/width <= 1.8 and height*width >= 160000
diff --git a/src/calibre/ebooks/docx/container.py b/src/calibre/ebooks/docx/container.py
index bdea8cdb25..b7157d9749 100644
--- a/src/calibre/ebooks/docx/container.py
+++ b/src/calibre/ebooks/docx/container.py
@@ -25,8 +25,8 @@ from calibre.utils.zipfile import ZipFile
 def fromstring(raw, parser=None):
     return safe_xml_fromstring(raw)
 
-# Read metadata {{{
 
+# Read metadata {{{
 
 def read_doc_props(raw, mi, XPath):
     root = fromstring(raw)
diff --git a/src/calibre/ebooks/docx/dump.py b/src/calibre/ebooks/docx/dump.py
index 2e566571dc..5de53987fd 100644
--- a/src/calibre/ebooks/docx/dump.py
+++ b/src/calibre/ebooks/docx/dump.py
@@ -17,7 +17,7 @@ from calibre.utils.zipfile import ZipFile
 
 def pretty_all_xml_in_dir(path):
     for f in walk(path):
-        if f.endswith('.xml') or f.endswith('.rels'):
+        if f.endswith(('.xml', '.rels')):
             with open(f, 'r+b') as stream:
                 raw = stream.read()
                 if raw:
diff --git a/src/calibre/ebooks/docx/fonts.py b/src/calibre/ebooks/docx/fonts.py
index b6733323f9..81b5cfc1f9 100644
--- a/src/calibre/ebooks/docx/fonts.py
+++ b/src/calibre/ebooks/docx/fonts.py
@@ -96,15 +96,15 @@ class Family:
 
 
 SYMBOL_MAPS = {  # {{{
-    'Wingdings': (' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '🖉', '✂', '✁', '👓', '🕭', '🕮', '🕯', '🕿', '✆', '🖂', '🖃', '📪', '📫', '📬', '📭', '🗀', '🗁', '🗎', '🗏', '🗐', '🗄', '⏳', '🖮', '🖰', '🖲', '🖳', '🖴', '🖫', '🖬', '✇', '✍', '🖎', '✌', '🖏', '👍', '👎', '☜', '☞', '☜', '🖗', '🖐', '☺', '😐', '☹', '💣', '🕱', '🏳', '🏱', '✈', '☼', '🌢', '❄', '🕆', '✞', '🕈', '✠', '✡', '☪', '☯', '🕉', '☸', '♈', '♉', '♊', '♋', '♌', '♍', '♎', '♏', '♐', '♑', '♒', '♓', '🙰', '🙵', '⚫', '🔾', '◼', '🞏', '🞐', '❑', '❒', '🞟', '⧫', '◆', '❖', '🞙', '⌧', '⮹', '⌘', '🏵', '🏶', '🙶', '🙷', ' ', '🄋', '➀', '➁', '➂', '➃', '➄', '➅', '➆', '➇', '➈', '➉', '🄌', '➊', '➋', '➌', '➍', '➎', '➏', '➐', '➑', '➒', '➓', '🙢', '🙠', '🙡', '🙣', '🙦', '🙤', '🙥', '🙧', '∙', '•', '⬝', '⭘', '🞆', '🞈', '🞊', '🞋', '🔿', '▪', '🞎', '🟀', '🟁', '★', '🟋', '🟏', '🟓', '🟑', '⯐', '⌖', '⯎', '⯏', '⯑', '✪', '✰', '🕐', '🕑', '🕒', '🕓', '🕔', '🕕', '🕖', '🕗', '🕘', '🕙', '🕚', '🕛', '⮰', '⮱', '⮲', '⮳', '⮴', '⮵', '⮶', '⮷', '🙪', '🙫', '🙕', '🙔', '🙗', '🙖', '🙐', '🙑', '🙒', '🙓', '⌫', '⌦', '⮘', '⮚', '⮙', '⮛', '⮈', '⮊', '⮉', '⮋', '🡨', '🡪', '🡩', '🡫', '🡬', '🡭', '🡯', '🡮', '🡸', '🡺', '🡹', '🡻', '🡼', '🡽', '🡿', '🡾', '⇦', '⇨', '⇧', '⇩', '⬄', '⇳', '⬁', '⬀', '⬃', '⬂', '🢬', '🢭', '🗶', '✓', '🗷', '🗹', ' '),  # noqa
+    'Wingdings': (' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '🖉', '✂', '✁', '👓', '🕭', '🕮', '🕯', '🕿', '✆', '🖂', '🖃', '📪', '📫', '📬', '📭', '🗀', '🗁', '🗎', '🗏', '🗐', '🗄', '⏳', '🖮', '🖰', '🖲', '🖳', '🖴', '🖫', '🖬', '✇', '✍', '🖎', '✌', '🖏', '👍', '👎', '☜', '☞', '☜', '🖗', '🖐', '☺', '😐', '☹', '💣', '🕱', '🏳', '🏱', '✈', '☼', '🌢', '❄', '🕆', '✞', '🕈', '✠', '✡', '☪', '☯', '🕉', '☸', '♈', '♉', '♊', '♋', '♌', '♍', '♎', '♏', '♐', '♑', '♒', '♓', '🙰', '🙵', '⚫', '🔾', '◼', '🞏', '🞐', '❑', '❒', '🞟', '⧫', '◆', '❖', '🞙', '⌧', '⮹', '⌘', '🏵', '🏶', '🙶', '🙷', ' ', '🄋', '➀', '➁', '➂', '➃', '➄', '➅', '➆', '➇', '➈', '➉', '🄌', '➊', '➋', '➌', '➍', '➎', '➏', '➐', '➑', '➒', '➓', '🙢', '🙠', '🙡', '🙣', '🙦', '🙤', '🙥', '🙧', '∙', '•', '⬝', '⭘', '🞆', '🞈', '🞊', '🞋', '🔿', '▪', '🞎', '🟀', '🟁', '★', '🟋', '🟏', '🟓', '🟑', '⯐', '⌖', '⯎', '⯏', '⯑', '✪', '✰', '🕐', '🕑', '🕒', '🕓', '🕔', '🕕', '🕖', '🕗', '🕘', '🕙', '🕚', '🕛', '⮰', '⮱', '⮲', '⮳', '⮴', '⮵', '⮶', '⮷', '🙪', '🙫', '🙕', '🙔', '🙗', '🙖', '🙐', '🙑', '🙒', '🙓', '⌫', '⌦', '⮘', '⮚', '⮙', '⮛', '⮈', '⮊', '⮉', '⮋', '🡨', '🡪', '🡩', '🡫', '🡬', '🡭', '🡯', '🡮', '🡸', '🡺', '🡹', '🡻', '🡼', '🡽', '🡿', '🡾', '⇦', '⇨', '⇧', '⇩', '⬄', '⇳', '⬁', '⬀', '⬃', '⬂', '🢬', '🢭', '🗶', '✓', '🗷', '🗹', ' '),  # noqa: E501
 
-    'Wingdings 2': (' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '🖊', '🖋', '🖌', '🖍', '✄', '✀', '🕾', '🕽', '🗅', '🗆', '🗇', '🗈', '🗉', '🗊', '🗋', '🗌', '🗍', '📋', '🗑', '🗔', '🖵', '🖶', '🖷', '🖸', '🖭', '🖯', '🖱', '🖒', '🖓', '🖘', '🖙', '🖚', '🖛', '👈', '👉', '🖜', '🖝', '🖞', '🖟', '🖠', '🖡', '👆', '👇', '🖢', '🖣', '🖑', '🗴', '🗸', '🗵', '☑', '⮽', '☒', '⮾', '⮿', '🛇', '⦸', '🙱', '🙴', '🙲', '🙳', '‽', '🙹', '🙺', '🙻', '🙦', '🙤', '🙥', '🙧', '🙚', '🙘', '🙙', '🙛', '⓪', '①', '②', '③', '④', '⑤', '⑥', '⑦', '⑧', '⑨', '⑩', '⓿', '❶', '❷', '❸', '❹', '❺', '❻', '❼', '❽', '❾', '❿', ' ', '☉', '🌕', '☽', '☾', '⸿', '✝', '🕇', '🕜', '🕝', '🕞', '🕟', '🕠', '🕡', '🕢', '🕣', '🕤', '🕥', '🕦', '🕧', '🙨', '🙩', '⋅', '🞄', '⦁', '●', '●', '🞅', '🞇', '🞉', '⊙', '⦿', '🞌', '🞍', '◾', '■', '□', '🞑', '🞒', '🞓', '🞔', '▣', '🞕', '🞖', '🞗', '🞘', '⬩', '⬥', '◇', '🞚', '◈', '🞛', '🞜', '🞝', '🞞', '⬪', '⬧', '◊', '🞠', '◖', '◗', '⯊', '⯋', '⯀', '⯁', '⬟', '⯂', '⬣', '⬢', '⯃', '⯄', '🞡', '🞢', '🞣', '🞤', '🞥', '🞦', '🞧', '🞨', '🞩', '🞪', '🞫', '🞬', '🞭', '🞮', '🞯', '🞰', '🞱', '🞲', '🞳', '🞴', '🞵', '🞶', '🞷', '🞸', '🞹', '🞺', '🞻', '🞼', '🞽', '🞾', '🞿', '🟀', '🟂', '🟄', '🟆', '🟉', '🟊', '✶', '🟌', '🟎', '🟐', '🟒', '✹', '🟃', '🟇', '✯', '🟍', '🟔', '⯌', '⯍', '※', '⁂', ' ', ' ', ' ', ' ', ' ', ' ',),  # noqa
+    'Wingdings 2': (' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '🖊', '🖋', '🖌', '🖍', '✄', '✀', '🕾', '🕽', '🗅', '🗆', '🗇', '🗈', '🗉', '🗊', '🗋', '🗌', '🗍', '📋', '🗑', '🗔', '🖵', '🖶', '🖷', '🖸', '🖭', '🖯', '🖱', '🖒', '🖓', '🖘', '🖙', '🖚', '🖛', '👈', '👉', '🖜', '🖝', '🖞', '🖟', '🖠', '🖡', '👆', '👇', '🖢', '🖣', '🖑', '🗴', '🗸', '🗵', '☑', '⮽', '☒', '⮾', '⮿', '🛇', '⦸', '🙱', '🙴', '🙲', '🙳', '‽', '🙹', '🙺', '🙻', '🙦', '🙤', '🙥', '🙧', '🙚', '🙘', '🙙', '🙛', '⓪', '①', '②', '③', '④', '⑤', '⑥', '⑦', '⑧', '⑨', '⑩', '⓿', '❶', '❷', '❸', '❹', '❺', '❻', '❼', '❽', '❾', '❿', ' ', '☉', '🌕', '☽', '☾', '⸿', '✝', '🕇', '🕜', '🕝', '🕞', '🕟', '🕠', '🕡', '🕢', '🕣', '🕤', '🕥', '🕦', '🕧', '🙨', '🙩', '⋅', '🞄', '⦁', '●', '●', '🞅', '🞇', '🞉', '⊙', '⦿', '🞌', '🞍', '◾', '■', '□', '🞑', '🞒', '🞓', '🞔', '▣', '🞕', '🞖', '🞗', '🞘', '⬩', '⬥', '◇', '🞚', '◈', '🞛', '🞜', '🞝', '🞞', '⬪', '⬧', '◊', '🞠', '◖', '◗', '⯊', '⯋', '⯀', '⯁', '⬟', '⯂', '⬣', '⬢', '⯃', '⯄', '🞡', '🞢', '🞣', '🞤', '🞥', '🞦', '🞧', '🞨', '🞩', '🞪', '🞫', '🞬', '🞭', '🞮', '🞯', '🞰', '🞱', '🞲', '🞳', '🞴', '🞵', '🞶', '🞷', '🞸', '🞹', '🞺', '🞻', '🞼', '🞽', '🞾', '🞿', '🟀', '🟂', '🟄', '🟆', '🟉', '🟊', '✶', '🟌', '🟎', '🟐', '🟒', '✹', '🟃', '🟇', '✯', '🟍', '🟔', '⯌', '⯍', '※', '⁂', ' ', ' ', ' ', ' ', ' ', ' ',),  # noqa: E501
 
-    'Wingdings 3': (' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '⭠', '⭢', '⭡', '⭣', '⭤', '⭥', '⭧', '⭦', '⭰', '⭲', '⭱', '⭳', '⭶', '⭸', '⭻', '⭽', '⭤', '⭥', '⭪', '⭬', '⭫', '⭭', '⭍', '⮠', '⮡', '⮢', '⮣', '⮤', '⮥', '⮦', '⮧', '⮐', '⮑', '⮒', '⮓', '⮀', '⮃', '⭾', '⭿', '⮄', '⮆', '⮅', '⮇', '⮏', '⮍', '⮎', '⮌', '⭮', '⭯', '⎋', '⌤', '⌃', '⌥', '␣', '⍽', '⇪', '⮸', '🢠', '🢡', '🢢', '🢣', '🢤', '🢥', '🢦', '🢧', '🢨', '🢩', '🢪', '🢫', '🡐', '🡒', '🡑', '🡓', '🡔', '🡕', '🡗', '🡖', '🡘', '🡙', '▲', '▼', '△', '▽', '◀', '▶', '◁', '▷', '◣', '◢', '◤', '◥', '🞀', '🞂', '🞁', ' ', '🞃', '⯅', '⯆', '⯇', '⯈', '⮜', '⮞', '⮝', '⮟', '🠐', '🠒', '🠑', '🠓', '🠔', '🠖', '🠕', '🠗', '🠘', '🠚', '🠙', '🠛', '🠜', '🠞', '🠝', '🠟', '🠀', '🠂', '🠁', '🠃', '🠄', '🠆', '🠅', '🠇', '🠈', '🠊', '🠉', '🠋', '🠠', '🠢', '🠤', '🠦', '🠨', '🠪', '🠬', '🢜', '🢝', '🢞', '🢟', '🠮', '🠰', '🠲', '🠴', '🠶', '🠸', '🠺', '🠹', '🠻', '🢘', '🢚', '🢙', '🢛', '🠼', '🠾', '🠽', '🠿', '🡀', '🡂', '🡁', '🡃', '🡄', '🡆', '🡅', '🡇', '⮨', '⮩', '⮪', '⮫', '⮬', '⮭', '⮮', '⮯', '🡠', '🡢', '🡡', '🡣', '🡤', '🡥', '🡧', '🡦', '🡰', '🡲', '🡱', '🡳', '🡴', '🡵', '🡷', '🡶', '🢀', '🢂', '🢁', '🢃', '🢄', '🢅', '🢇', '🢆', '🢐', '🢒', '🢑', '🢓', '🢔', '🢕', '🢗', '🢖', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',),  # noqa
+    'Wingdings 3': (' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '⭠', '⭢', '⭡', '⭣', '⭤', '⭥', '⭧', '⭦', '⭰', '⭲', '⭱', '⭳', '⭶', '⭸', '⭻', '⭽', '⭤', '⭥', '⭪', '⭬', '⭫', '⭭', '⭍', '⮠', '⮡', '⮢', '⮣', '⮤', '⮥', '⮦', '⮧', '⮐', '⮑', '⮒', '⮓', '⮀', '⮃', '⭾', '⭿', '⮄', '⮆', '⮅', '⮇', '⮏', '⮍', '⮎', '⮌', '⭮', '⭯', '⎋', '⌤', '⌃', '⌥', '␣', '⍽', '⇪', '⮸', '🢠', '🢡', '🢢', '🢣', '🢤', '🢥', '🢦', '🢧', '🢨', '🢩', '🢪', '🢫', '🡐', '🡒', '🡑', '🡓', '🡔', '🡕', '🡗', '🡖', '🡘', '🡙', '▲', '▼', '△', '▽', '◀', '▶', '◁', '▷', '◣', '◢', '◤', '◥', '🞀', '🞂', '🞁', ' ', '🞃', '⯅', '⯆', '⯇', '⯈', '⮜', '⮞', '⮝', '⮟', '🠐', '🠒', '🠑', '🠓', '🠔', '🠖', '🠕', '🠗', '🠘', '🠚', '🠙', '🠛', '🠜', '🠞', '🠝', '🠟', '🠀', '🠂', '🠁', '🠃', '🠄', '🠆', '🠅', '🠇', '🠈', '🠊', '🠉', '🠋', '🠠', '🠢', '🠤', '🠦', '🠨', '🠪', '🠬', '🢜', '🢝', '🢞', '🢟', '🠮', '🠰', '🠲', '🠴', '🠶', '🠸', '🠺', '🠹', '🠻', '🢘', '🢚', '🢙', '🢛', '🠼', '🠾', '🠽', '🠿', '🡀', '🡂', '🡁', '🡃', '🡄', '🡆', '🡅', '🡇', '⮨', '⮩', '⮪', '⮫', '⮬', '⮭', '⮮', '⮯', '🡠', '🡢', '🡡', '🡣', '🡤', '🡥', '🡧', '🡦', '🡰', '🡲', '🡱', '🡳', '🡴', '🡵', '🡷', '🡶', '🢀', '🢂', '🢁', '🢃', '🢄', '🢅', '🢇', '🢆', '🢐', '🢒', '🢑', '🢓', '🢔', '🢕', '🢗', '🢖', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',),  # noqa: E501
 
-    'Webdings': (' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '🕷', '🕸', '🕲', '🕶', '🏆', '🎖', '🖇', '🗨', '🗩', '🗰', '🗱', '🌶', '🎗', '🙾', '🙼', '🗕', '🗖', '🗗', '⏴', '⏵', '⏶', '⏷', '⏪', '⏩', '⏮', '⏭', '⏸', '⏹', '⏺', '🗚', '🗳', '🛠', '🏗', '🏘', '🏙', '🏚', '🏜', '🏭', '🏛', '🏠', '🏖', '🏝', '🛣', '🔍', '🏔', '👁', '👂', '🏞', '🏕', '🛤', '🏟', '🛳', '🕬', '🕫', '🕨', '🔈', '🎔', '🎕', '🗬', '🙽', '🗭', '🗪', '🗫', '⮔', '✔', '🚲', '⬜', '🛡', '📦', '🛱', '⬛', '🚑', '🛈', '🛩', '🛰', '🟈', '🕴', '⬤', '🛥', '🚔', '🗘', '🗙', '❓', '🛲', '🚇', '🚍', '⛳', '⦸', '⊖', '🚭', '🗮', '⏐', '🗯', '🗲', ' ', '🚹', '🚺', '🛉', '🛊', '🚼', '👽', '🏋', '⛷', '🏂', '🏌', '🏊', '🏄', '🏍', '🏎', '🚘', '🗠', '🛢', '📠', '🏷', '📣', '👪', '🗡', '🗢', '🗣', '✯', '🖄', '🖅', '🖃', '🖆', '🖹', '🖺', '🖻', '🕵', '🕰', '🖽', '🖾', '📋', '🗒', '🗓', '🕮', '📚', '🗞', '🗟', '🗃', '🗂', '🖼', '🎭', '🎜', '🎘', '🎙', '🎧', '💿', '🎞', '📷', '🎟', '🎬', '📽', '📹', '📾', '📻', '🎚', '🎛', '📺', '💻', '🖥', '🖦', '🖧', '🍹', '🎮', '🎮', '🕻', '🕼', '🖁', '🖀', '🖨', '🖩', '🖿', '🖪', '🗜', '🔒', '🔓', '🗝', '📥', '📤', '🕳', '🌣', '🌤', '🌥', '🌦', '☁', '🌨', '🌧', '🌩', '🌪', '🌬', '🌫', '🌜', '🌡', '🛋', '🛏', '🍽', '🍸', '🛎', '🛍', 'Ⓟ', '♿', '🛆', '🖈', '🎓', '🗤', '🗥', '🗦', '🗧', '🛪', '🐿', '🐦', '🐟', '🐕', '🐈', '🙬', '🙮', '🙭', '🙯', '🗺', '🌍', '🌏', '🌎', '🕊',),  # noqa
+    'Webdings': (' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '🕷', '🕸', '🕲', '🕶', '🏆', '🎖', '🖇', '🗨', '🗩', '🗰', '🗱', '🌶', '🎗', '🙾', '🙼', '🗕', '🗖', '🗗', '⏴', '⏵', '⏶', '⏷', '⏪', '⏩', '⏮', '⏭', '⏸', '⏹', '⏺', '🗚', '🗳', '🛠', '🏗', '🏘', '🏙', '🏚', '🏜', '🏭', '🏛', '🏠', '🏖', '🏝', '🛣', '🔍', '🏔', '👁', '👂', '🏞', '🏕', '🛤', '🏟', '🛳', '🕬', '🕫', '🕨', '🔈', '🎔', '🎕', '🗬', '🙽', '🗭', '🗪', '🗫', '⮔', '✔', '🚲', '⬜', '🛡', '📦', '🛱', '⬛', '🚑', '🛈', '🛩', '🛰', '🟈', '🕴', '⬤', '🛥', '🚔', '🗘', '🗙', '❓', '🛲', '🚇', '🚍', '⛳', '⦸', '⊖', '🚭', '🗮', '⏐', '🗯', '🗲', ' ', '🚹', '🚺', '🛉', '🛊', '🚼', '👽', '🏋', '⛷', '🏂', '🏌', '🏊', '🏄', '🏍', '🏎', '🚘', '🗠', '🛢', '📠', '🏷', '📣', '👪', '🗡', '🗢', '🗣', '✯', '🖄', '🖅', '🖃', '🖆', '🖹', '🖺', '🖻', '🕵', '🕰', '🖽', '🖾', '📋', '🗒', '🗓', '🕮', '📚', '🗞', '🗟', '🗃', '🗂', '🖼', '🎭', '🎜', '🎘', '🎙', '🎧', '💿', '🎞', '📷', '🎟', '🎬', '📽', '📹', '📾', '📻', '🎚', '🎛', '📺', '💻', '🖥', '🖦', '🖧', '🍹', '🎮', '🎮', '🕻', '🕼', '🖁', '🖀', '🖨', '🖩', '🖿', '🖪', '🗜', '🔒', '🔓', '🗝', '📥', '📤', '🕳', '🌣', '🌤', '🌥', '🌦', '☁', '🌨', '🌧', '🌩', '🌪', '🌬', '🌫', '🌜', '🌡', '🛋', '🛏', '🍽', '🍸', '🛎', '🛍', 'Ⓟ', '♿', '🛆', '🖈', '🎓', '🗤', '🗥', '🗦', '🗧', '🛪', '🐿', '🐦', '🐟', '🐕', '🐈', '🙬', '🙮', '🙭', '🙯', '🗺', '🌍', '🌏', '🌎', '🕊',),  # noqa: E501
 
-    'Symbol': (' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '!', '∀', '#', '∃', '%', '&', '∍', '(', ')', '*', '+', ',', '−', '.', '/', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?', '≅', 'Α', 'Β', 'Χ', 'Δ', 'Ε', 'Φ', 'Γ', 'Η', 'Ι', 'ϑ', 'Λ', 'Μ', 'Ν', 'Ξ', 'Ο', 'Π', 'Θ', 'Ρ', 'Σ', 'Τ', 'Υ', 'ς', 'Ω', 'Ξ', 'Ψ', 'Ζ', '[', '∴', ']', '⊥', '_', '', 'α', 'β', 'χ', 'δ', 'ε', 'φ', 'γ', 'η', 'ι', 'ϕ', 'λ', 'μ', 'ν', 'ξ', 'ο', 'π', 'θ', 'ρ', 'σ', 'τ', 'υ', 'ϖ', 'ω', 'ξ', 'ψ', 'ζ', '{', '|', '}', '~', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '€', 'ϒ', '′', '≤', '⁄', '∞', 'ƒ', '♣', '♥', '♦', '♠', '↔', '←', '↑', '→', '↓', '°', '±', '″', '≥', '×', '∝', '∂', '•', '÷', '≠', '≡', '≈', '…', '⏐', '⎯', '↲', 'ℵ', 'ℑ', 'ℜ', '℘', '⊗', '⊕', '∅', '∩', '∪', '⊃', '⊇', '⊄', '⊂', '⊆', '∈', '∉', '∠', '∂', '®', '©', '™', '∏', '√', '⋅', '¬', '∦', '∧', '⇔', '⇐', '⇑', '⇒', '⇓', '◊', '〈', '®', '©', '™', '∑', '⎛', '⎜', '⎝', '⎡', '⎢', '⎣', '⎧', '⎨', '⎩', '⎪', ' ', '〉', '∫', '⌠', '⎮', '⌡', '⎞', '⎟', '⎠', '⎤', '⎥', '⎦', '⎪', '⎫', '⎬', ' ',),  # noqa
+    'Symbol': (' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '!', '∀', '#', '∃', '%', '&', '∍', '(', ')', '*', '+', ',', '−', '.', '/', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?', '≅', 'Α', 'Β', 'Χ', 'Δ', 'Ε', 'Φ', 'Γ', 'Η', 'Ι', 'ϑ', 'Λ', 'Μ', 'Ν', 'Ξ', 'Ο', 'Π', 'Θ', 'Ρ', 'Σ', 'Τ', 'Υ', 'ς', 'Ω', 'Ξ', 'Ψ', 'Ζ', '[', '∴', ']', '⊥', '_', '', 'α', 'β', 'χ', 'δ', 'ε', 'φ', 'γ', 'η', 'ι', 'ϕ', 'λ', 'μ', 'ν', 'ξ', 'ο', 'π', 'θ', 'ρ', 'σ', 'τ', 'υ', 'ϖ', 'ω', 'ξ', 'ψ', 'ζ', '{', '|', '}', '~', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '€', 'ϒ', '′', '≤', '⁄', '∞', 'ƒ', '♣', '♥', '♦', '♠', '↔', '←', '↑', '→', '↓', '°', '±', '″', '≥', '×', '∝', '∂', '•', '÷', '≠', '≡', '≈', '…', '⏐', '⎯', '↲', 'ℵ', 'ℑ', 'ℜ', '℘', '⊗', '⊕', '∅', '∩', '∪', '⊃', '⊇', '⊄', '⊂', '⊆', '∈', '∉', '∠', '∂', '®', '©', '™', '∏', '√', '⋅', '¬', '∦', '∧', '⇔', '⇐', '⇑', '⇒', '⇓', '◊', '〈', '®', '©', '™', '∑', '⎛', '⎜', '⎝', '⎡', '⎢', '⎣', '⎧', '⎨', '⎩', '⎪', ' ', '〉', '∫', '⌠', '⎮', '⌡', '⎞', '⎟', '⎠', '⎤', '⎥', '⎦', '⎪', '⎫', '⎬', ' ',),  # noqa: E501
 }  # }}}
 
 SYMBOL_FONT_NAMES = frozenset(n.lower() for n in SYMBOL_MAPS)
diff --git a/src/calibre/ebooks/docx/index.py b/src/calibre/ebooks/docx/index.py
index a00b158392..39d9913989 100644
--- a/src/calibre/ebooks/docx/index.py
+++ b/src/calibre/ebooks/docx/index.py
@@ -106,7 +106,7 @@ def process_index(field, index, xe_fields, log, XPath, expand):
         if styles:
             heading_style = styles[0]
     else:
-        items = sorted(xe_fields, key=lambda x:sort_key(x['text']))
+        items = sorted(xe_fields, key=lambda x: sort_key(x['text']))
 
     hyperlinks = []
     blocks = []
@@ -143,7 +143,7 @@ def split_up_block(block, a, text, parts, ldict):
     ldict[span]    = len(prefix)
 
 
-"""
+'''
 The merge algorithm is a little tricky.
 We start with a list of elementary blocks. Each is an HtmlElement, a p node
 with a list of child nodes. The last child may be a link, and the earlier ones are
@@ -175,7 +175,7 @@ If we find such a matching entry, go back to the start with (p ... pk+1) and (n
 
 If there is no matching entry, then because of the original reversed order we want
 to insert nk+1 and all following entries from n into p immediately following pk.
-"""
+'''
 
 
 def find_match(prev_block, pind, nextent, ldict):
@@ -208,7 +208,7 @@ def add_link(pent, nent, ldict):
         p.insert(p.index(pa) + 1, na)
     else:
         # substitute link na for plain text in pent
-        pent.text = ""
+        pent.text = ''
         pent.append(na)
 
 
diff --git a/src/calibre/ebooks/docx/names.py b/src/calibre/ebooks/docx/names.py
index 702177f2b4..34c1d9951d 100644
--- a/src/calibre/ebooks/docx/names.py
+++ b/src/calibre/ebooks/docx/names.py
@@ -13,24 +13,24 @@ from polyglot.builtins import iteritems
 
 # Names {{{
 TRANSITIONAL_NAMES = {
-    'DOCUMENT'  : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument',
-    'DOCPROPS'  : 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties',
-    'APPPROPS'  : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties',
-    'STYLES'    : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles',
-    'NUMBERING' : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering',
-    'FONTS'     : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable',
-    'EMBEDDED_FONT' : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/font',
-    'IMAGES'    : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
-    'LINKS'     : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
-    'FOOTNOTES' : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes',
-    'ENDNOTES'  : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes',
-    'THEMES'    : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme',
-    'SETTINGS'  : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings',
+    'DOCUMENT'     : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument',
+    'DOCPROPS'     : 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties',
+    'APPPROPS'     : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties',
+    'STYLES'       : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles',
+    'NUMBERING'    : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering',
+    'FONTS'        : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable',
+    'EMBEDDED_FONT': 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/font',
+    'IMAGES'       : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
+    'LINKS'        : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
+    'FOOTNOTES'    : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes',
+    'ENDNOTES'     : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes',
+    'THEMES'       : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme',
+    'SETTINGS'     : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings',
     'WEB_SETTINGS' : 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings',
 }
 
 STRICT_NAMES = {
-    k:v.replace('http://schemas.openxmlformats.org/officeDocument/2006',  'http://purl.oclc.org/ooxml/officeDocument')
+    k:v.replace('http://schemas.openxmlformats.org/officeDocument/2006', 'http://purl.oclc.org/ooxml/officeDocument')
     for k, v in iteritems(TRANSITIONAL_NAMES)
 }
 
diff --git a/src/calibre/ebooks/docx/numbering.py b/src/calibre/ebooks/docx/numbering.py
index a7cf7451bf..37138e3a96 100644
--- a/src/calibre/ebooks/docx/numbering.py
+++ b/src/calibre/ebooks/docx/numbering.py
@@ -39,7 +39,7 @@ def alphabet(val, lower=True):
 
 alphabet_map = {
     'lower-alpha':alphabet, 'upper-alpha':partial(alphabet, lower=False),
-    'lower-roman':lambda x:roman(x).lower(), 'upper-roman':roman,
+    'lower-roman':lambda x: roman(x).lower(), 'upper-roman':roman,
     'decimal-leading-zero': lambda x: '0%d' % x
 }
 
@@ -361,7 +361,7 @@ class Numbering:
                 if child.tag == 'li':
                     if current_run:
                         last = current_run[-1]
-                        if (last.get('list-id') , last.get('list-lvl')) != (child.get('list-id'), child.get('list-lvl')):
+                        if (last.get('list-id'), last.get('list-lvl')) != (child.get('list-id'), child.get('list-lvl')):
                             commit(current_run)
                     current_run.append(child)
                 else:
diff --git a/src/calibre/ebooks/docx/settings.py b/src/calibre/ebooks/docx/settings.py
index d0a6823947..5276e7b517 100644
--- a/src/calibre/ebooks/docx/settings.py
+++ b/src/calibre/ebooks/docx/settings.py
@@ -17,4 +17,3 @@ class Settings:
                 self.default_tab_stop = int(self.namespace.get(dts, 'w:val')) / 20
             except (ValueError, TypeError, AttributeError):
                 pass
-
diff --git a/src/calibre/ebooks/docx/styles.py b/src/calibre/ebooks/docx/styles.py
index fe48b380a7..ed7aea361a 100644
--- a/src/calibre/ebooks/docx/styles.py
+++ b/src/calibre/ebooks/docx/styles.py
@@ -14,7 +14,6 @@ from polyglot.builtins import iteritems, itervalues
 
 
 class PageProperties:
-
     '''
     Class representing page level properties (page size/margins) read from
     sectPr elements.
@@ -104,7 +103,6 @@ class Style:
 
 
 class Styles:
-
     '''
     Collection of all styles defined in the document. Used to get the final styles applicable to elements in the document markup.
     '''
@@ -501,7 +499,7 @@ class Styles:
             prefix = ef + '\n' + prefix
 
         ans = []
-        for (cls, css) in sorted(itervalues(self.classes), key=lambda x:x[0]):
+        for cls, css in sorted(itervalues(self.classes), key=lambda x:x[0]):
             b = (f'\t{k}: {v};' for k, v in iteritems(css))
             b = '\n'.join(b)
             ans.append('.{} {{\n{}\n}}\n'.format(cls, b.rstrip(';')))
diff --git a/src/calibre/ebooks/docx/tables.py b/src/calibre/ebooks/docx/tables.py
index 11e657e2a9..1a00af4456 100644
--- a/src/calibre/ebooks/docx/tables.py
+++ b/src/calibre/ebooks/docx/tables.py
@@ -280,7 +280,7 @@ class CellStyle(Style):
             for x in edges:
                 val = getattr(self, 'cell_padding_%s' % x)
                 if val not in (inherit, 'auto'):
-                    c['padding-%s' % x] =  val
+                    c['padding-%s' % x] = val
                 elif val is inherit and x in {'left', 'right'}:
                     c['padding-%s' % x] = '%.3gpt' % (115/20)
             # In Word, tables are apparently rendered with some default top and
diff --git a/src/calibre/ebooks/docx/to_html.py b/src/calibre/ebooks/docx/to_html.py
index 54b9578573..4560006c30 100644
--- a/src/calibre/ebooks/docx/to_html.py
+++ b/src/calibre/ebooks/docx/to_html.py
@@ -683,7 +683,7 @@ class Convert:
                 multi_spaces = self.ms_pat.search(ctext) is not None
                 preserve = multi_spaces or self.ws_pat.search(ctext) is not None
                 if preserve:
-                    text.add_elem(SPAN(ctext, style="white-space:pre-wrap"))
+                    text.add_elem(SPAN(ctext, style='white-space:pre-wrap'))
                     ans.append(text.elem)
                 else:
                     text.buf.append(ctext)
diff --git a/src/calibre/ebooks/docx/writer/__init__.py b/src/calibre/ebooks/docx/writer/__init__.py
index 0cbf055ec8..fb2e4b74e1 100644
--- a/src/calibre/ebooks/docx/writer/__init__.py
+++ b/src/calibre/ebooks/docx/writer/__init__.py
@@ -3,6 +3,3 @@
 
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
-
-
-
diff --git a/src/calibre/ebooks/docx/writer/container.py b/src/calibre/ebooks/docx/writer/container.py
index 0b8bff1917..03f2ea90e7 100644
--- a/src/calibre/ebooks/docx/writer/container.py
+++ b/src/calibre/ebooks/docx/writer/container.py
@@ -70,7 +70,7 @@ def create_skeleton(opts, namespaces=None):
         E.pgSz(**{w('w'):str(width), w('h'):str(height)}),
         E.pgMar(**dict(map(margin, 'left top right bottom'.split()))),
         E.cols(**{w('space'):'720'}),
-        E.docGrid(**{w('linePitch'):"360"}),
+        E.docGrid(**{w('linePitch'):'360'}),
     ))
 
     dn = {k:v for k, v in iteritems(namespaces) if k in tuple('wra') + ('wp',)}
@@ -79,15 +79,15 @@ def create_skeleton(opts, namespaces=None):
         E.docDefaults(
             E.rPrDefault(
                 E.rPr(
-                    E.rFonts(**{w('asciiTheme'):"minorHAnsi", w('eastAsiaTheme'):"minorEastAsia", w('hAnsiTheme'):"minorHAnsi", w('cstheme'):"minorBidi"}),
+                    E.rFonts(**{w('asciiTheme'):'minorHAnsi', w('eastAsiaTheme'):'minorEastAsia', w('hAnsiTheme'):'minorHAnsi', w('cstheme'):'minorBidi'}),
                     E.sz(**{w('val'):'22'}),
                     E.szCs(**{w('val'):'22'}),
-                    E.lang(**{w('val'):'en-US', w('eastAsia'):"en-US", w('bidi'):"ar-SA"})
+                    E.lang(**{w('val'):'en-US', w('eastAsia'):'en-US', w('bidi'):'ar-SA'})
                 )
             ),
             E.pPrDefault(
                 E.pPr(
-                    E.spacing(**{w('after'):"0", w('line'):"276", w('lineRule'):"auto"})
+                    E.spacing(**{w('after'):'0', w('line'):'276', w('lineRule'):'auto'})
                 )
             )
         )
@@ -173,25 +173,25 @@ class DOCX:
         E = ElementMaker(namespace=self.namespace.namespaces['ct'], nsmap={None:self.namespace.namespaces['ct']})
         types = E.Types()
         for partname, mt in iteritems({
-            "/word/footnotes.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml",
-            "/word/document.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml",
-            "/word/numbering.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml",
-            "/word/styles.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml",
-            "/word/endnotes.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml",
-            "/word/settings.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml",
-            "/word/theme/theme1.xml": "application/vnd.openxmlformats-officedocument.theme+xml",
-            "/word/fontTable.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml",
-            "/word/webSettings.xml": "application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml",
-            "/docProps/core.xml": "application/vnd.openxmlformats-package.core-properties+xml",
-            "/docProps/app.xml": "application/vnd.openxmlformats-officedocument.extended-properties+xml",
+            '/word/footnotes.xml': 'application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml',
+            '/word/document.xml': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml',
+            '/word/numbering.xml': 'application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml',
+            '/word/styles.xml': 'application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml',
+            '/word/endnotes.xml': 'application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml',
+            '/word/settings.xml': 'application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml',
+            '/word/theme/theme1.xml': 'application/vnd.openxmlformats-officedocument.theme+xml',
+            '/word/fontTable.xml': 'application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml',
+            '/word/webSettings.xml': 'application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml',
+            '/docProps/core.xml': 'application/vnd.openxmlformats-package.core-properties+xml',
+            '/docProps/app.xml': 'application/vnd.openxmlformats-officedocument.extended-properties+xml',
         }):
             types.append(E.Override(PartName=partname, ContentType=mt))
         added = {'png', 'gif', 'jpeg', 'jpg', 'svg', 'xml'}
         for ext in added:
             types.append(E.Default(Extension=ext, ContentType=guess_type('a.'+ext)[0]))
         for ext, mt in iteritems({
-            "rels": "application/vnd.openxmlformats-package.relationships+xml",
-            "odttf": "application/vnd.openxmlformats-officedocument.obfuscatedFont",
+            'rels': 'application/vnd.openxmlformats-package.relationships+xml',
+            'odttf': 'application/vnd.openxmlformats-officedocument.obfuscatedFont',
         }):
             added.add(ext)
             types.append(E.Default(Extension=ext, ContentType=mt))
@@ -242,7 +242,7 @@ class DOCX:
     def convert_metadata(self, mi):
         namespaces = self.namespace.namespaces
         E = ElementMaker(namespace=namespaces['cp'], nsmap={x:namespaces[x] for x in 'cp dc dcterms xsi'.split()})
-        cp = E.coreProperties(E.revision("1"), E.lastModifiedBy('calibre'))
+        cp = E.coreProperties(E.revision('1'), E.lastModifiedBy('calibre'))
         ts = utcnow().isoformat(native_string_type('T')).rpartition('.')[0] + 'Z'
         for x in 'created modified'.split():
             x = cp.makeelement('{{{}}}{}'.format(namespaces['dcterms'], x), **{'{%s}type' % namespaces['xsi']:'dcterms:W3CDTF'})
diff --git a/src/calibre/ebooks/docx/writer/fonts.py b/src/calibre/ebooks/docx/writer/fonts.py
index de02ad4eec..22e3989f2c 100644
--- a/src/calibre/ebooks/docx/writer/fonts.py
+++ b/src/calibre/ebooks/docx/writer/fonts.py
@@ -73,4 +73,4 @@ class FontsManager:
                 font_data_map['word/' + fname] = obfuscate_font_data(item.data, key)
             makeelement(font, 'w:embed' + tag, r_id=rid,
                         w_fontKey='{%s}' % key.urn.rpartition(':')[-1].upper(),
-                        w_subsetted="true" if self.opts.subset_embedded_fonts else "false")
+                        w_subsetted='true' if self.opts.subset_embedded_fonts else 'false')
diff --git a/src/calibre/ebooks/docx/writer/from_html.py b/src/calibre/ebooks/docx/writer/from_html.py
index b82e6ca7aa..c0b53ad756 100644
--- a/src/calibre/ebooks/docx/writer/from_html.py
+++ b/src/calibre/ebooks/docx/writer/from_html.py
@@ -62,7 +62,7 @@ class TextRun:
         self.first_html_parent = first_html_parent
         if self.ws_pat is None:
             TextRun.ws_pat = self.ws_pat = re.compile(r'\s+')
-            TextRun.soft_hyphen_pat = self.soft_hyphen_pat = re.compile('(\u00ad)')
+            TextRun.soft_hyphen_pat = self.soft_hyphen_pat = re.compile(r'(\u00ad)')
         self.style = style
         self.texts = []
         self.link = None
diff --git a/src/calibre/ebooks/docx/writer/images.py b/src/calibre/ebooks/docx/writer/images.py
index 5e4d6d946d..214c014efc 100644
--- a/src/calibre/ebooks/docx/writer/images.py
+++ b/src/calibre/ebooks/docx/writer/images.py
@@ -145,8 +145,8 @@ class ImagesManager:
             parent = makeelement(ans, 'wp:anchor', **get_image_margins(style))
             # The next three lines are boilerplate that Word requires, even
             # though the DOCX specs define defaults for all of them
-            parent.set('simplePos', '0'), parent.set('relativeHeight', '1'), parent.set('behindDoc',"0"), parent.set('locked', "0")
-            parent.set('layoutInCell', "1"), parent.set('allowOverlap', '1')
+            parent.set('simplePos', '0'), parent.set('relativeHeight', '1'), parent.set('behindDoc','0'), parent.set('locked', '0')
+            parent.set('layoutInCell', '1'), parent.set('allowOverlap', '1')
             makeelement(parent, 'wp:simplePos', x='0', y='0')
             makeelement(makeelement(parent, 'wp:positionH', relativeFrom='margin'), 'wp:align').text = floating
             makeelement(makeelement(parent, 'wp:positionV', relativeFrom='line'), 'wp:align').text = 'top'
@@ -169,7 +169,7 @@ class ImagesManager:
     def create_docx_image_markup(self, parent, name, alt, img_rid, width, height, svg_rid=''):
         makeelement, namespaces = self.document_relationships.namespace.makeelement, self.document_relationships.namespace.namespaces
         makeelement(parent, 'wp:docPr', id=str(self.count), name=name, descr=alt)
-        makeelement(makeelement(parent, 'wp:cNvGraphicFramePr'), 'a:graphicFrameLocks', noChangeAspect="1")
+        makeelement(makeelement(parent, 'wp:cNvGraphicFramePr'), 'a:graphicFrameLocks', noChangeAspect='1')
         g = makeelement(parent, 'a:graphic')
         gd = makeelement(g, 'a:graphicData', uri=namespaces['pic'])
         pic = makeelement(gd, 'pic:pic')
@@ -231,8 +231,8 @@ class ImagesManager:
         root = etree.Element('root', nsmap=namespaces)
         ans = makeelement(root, 'w:drawing', append=False)
         parent = makeelement(ans, 'wp:anchor', **{'dist'+edge:'0' for edge in 'LRTB'})
-        parent.set('simplePos', '0'), parent.set('relativeHeight', '1'), parent.set('behindDoc',"0"), parent.set('locked', "0")
-        parent.set('layoutInCell', "1"), parent.set('allowOverlap', '1')
+        parent.set('simplePos', '0'), parent.set('relativeHeight', '1'), parent.set('behindDoc','0'), parent.set('locked', '0')
+        parent.set('layoutInCell', '1'), parent.set('allowOverlap', '1')
         makeelement(parent, 'wp:simplePos', x='0', y='0')
         makeelement(makeelement(parent, 'wp:positionH', relativeFrom='page'), 'wp:align').text = 'center'
         makeelement(makeelement(parent, 'wp:positionV', relativeFrom='page'), 'wp:align').text = 'center'
diff --git a/src/calibre/ebooks/docx/writer/links.py b/src/calibre/ebooks/docx/writer/links.py
index 647b06298e..b34c2c215f 100644
--- a/src/calibre/ebooks/docx/writer/links.py
+++ b/src/calibre/ebooks/docx/writer/links.py
@@ -36,7 +36,7 @@ class TOCItem:
     def serialize(self, body, makeelement):
         p = makeelement(body, 'w:p', append=False)
         ppr = makeelement(p, 'w:pPr')
-        makeelement(ppr, 'w:pStyle', w_val="Normal")
+        makeelement(ppr, 'w:pStyle', w_val='Normal')
         makeelement(ppr, 'w:ind', w_left='0', w_firstLineChars='0', w_firstLine='0', w_leftChars=str(200 * self.level))
         if self.is_first:
             makeelement(ppr, 'w:pageBreakBefore', w_val='off')
diff --git a/src/calibre/ebooks/docx/writer/lists.py b/src/calibre/ebooks/docx/writer/lists.py
index 0859530d55..aced84081b 100644
--- a/src/calibre/ebooks/docx/writer/lists.py
+++ b/src/calibre/ebooks/docx/writer/lists.py
@@ -121,7 +121,7 @@ class Level:
         makeelement(makeelement(lvl, 'w:pPr'), 'w:ind', w_hanging='360', w_left=str(1152 + self.ilvl * 360))
         if self.num_fmt == 'bullet':
             ff = {'\uf0b7':'Symbol', '\uf0a7':'Wingdings'}.get(self.lvl_text, 'Courier New')
-            makeelement(makeelement(lvl, 'w:rPr'), 'w:rFonts', w_ascii=ff, w_hAnsi=ff, w_hint="default")
+            makeelement(makeelement(lvl, 'w:rPr'), 'w:rFonts', w_ascii=ff, w_hAnsi=ff, w_hint='default')
 
 
 class ListsManager:
diff --git a/src/calibre/ebooks/docx/writer/styles.py b/src/calibre/ebooks/docx/writer/styles.py
index 73f85d49eb..5b299c4076 100644
--- a/src/calibre/ebooks/docx/writer/styles.py
+++ b/src/calibre/ebooks/docx/writer/styles.py
@@ -199,6 +199,7 @@ LINE_STYLES = {
     'outset': 'outset',
 }
 
+
 def convert_underline(items):
     style = 'solid'
     has_underline = False
@@ -478,9 +479,9 @@ def read_css_block_borders(self, css, store_css_style=False):
             setattr(self, 'css_margin_' + edge, '')
             setattr(self, 'border_%s_width' % edge, 2)
             setattr(self, 'border_%s_color' % edge, None)
-            setattr(self, 'border_%s_style' %  edge, 'none')
+            setattr(self, 'border_%s_style' % edge, 'none')
             if store_css_style:
-                setattr(self, 'border_%s_css_style' %  edge, 'none')
+                setattr(self, 'border_%s_css_style' % edge, 'none')
         else:
             # In DOCX padding can only be a positive integer
             try:
@@ -499,9 +500,9 @@ def read_css_block_borders(self, css, store_css_style=False):
             val = min(96, max(2, int(val * 8)))
             setattr(self, 'border_%s_width' % edge, val)
             setattr(self, 'border_%s_color' % edge, convert_color(css['border-%s-color' % edge]) or 'auto')
-            setattr(self, 'border_%s_style' %  edge, LINE_STYLES.get(css['border-%s-style' % edge].lower(), 'none'))
+            setattr(self, 'border_%s_style' % edge, LINE_STYLES.get(css['border-%s-style' % edge].lower(), 'none'))
             if store_css_style:
-                setattr(self, 'border_%s_css_style' %  edge, css['border-%s-style' % edge].lower())
+                setattr(self, 'border_%s_css_style' % edge, css['border-%s-style' % edge].lower())
 
 
 class BlockStyle(DOCXStyle):
diff --git a/src/calibre/ebooks/docx/writer/tables.py b/src/calibre/ebooks/docx/writer/tables.py
index 3f65d6a381..7f2e83b28c 100644
--- a/src/calibre/ebooks/docx/writer/tables.py
+++ b/src/calibre/ebooks/docx/writer/tables.py
@@ -121,7 +121,7 @@ class Cell:
         # cell level
         bc = self.background_color or self.row.background_color or self.row.table.background_color
         if bc:
-            makeelement(tcPr, 'w:shd', w_val="clear", w_color="auto", w_fill=bc)
+            makeelement(tcPr, 'w:shd', w_val='clear', w_color='auto', w_fill=bc)
 
         b = makeelement(tcPr, 'w:tcBorders', append=False)
         for edge, border in iteritems(self.borders):
diff --git a/src/calibre/ebooks/docx/writer/utils.py b/src/calibre/ebooks/docx/writer/utils.py
index e0ff6d9f66..1f7d5f6817 100644
--- a/src/calibre/ebooks/docx/writer/utils.py
+++ b/src/calibre/ebooks/docx/writer/utils.py
@@ -13,8 +13,8 @@ def int_or_zero(raw):
     except (ValueError, TypeError, AttributeError):
         return 0
 
-# convert_color() {{{
 
+# convert_color() {{{
 
 def convert_color(value):
     if not value:
diff --git a/src/calibre/ebooks/epub/cfi/parse.py b/src/calibre/ebooks/epub/cfi/parse.py
index a3fd308e1e..c43bb3775b 100644
--- a/src/calibre/ebooks/epub/cfi/parse.py
+++ b/src/calibre/ebooks/epub/cfi/parse.py
@@ -8,7 +8,6 @@ import regex
 
 
 class Parser:
-
     ''' See epubcfi.ebnf for the specification that this parser tries to
     follow. I have implemented it manually, since I dont want to depend on
     grako, and the grammar is pretty simple. This parser is thread-safe, i.e.
diff --git a/src/calibre/ebooks/epub/pages.py b/src/calibre/ebooks/epub/pages.py
index 7f58aa728c..bfccca2090 100644
--- a/src/calibre/ebooks/epub/pages.py
+++ b/src/calibre/ebooks/epub/pages.py
@@ -48,7 +48,7 @@ def add_page_map(opfpath, opts):
     oeb = OEBBook(opfpath)
     selector = XPath(opts.page, namespaces=NSMAP)
     name_for = build_name_for(opts.page_names)
-    idgen = ("calibre-page-%d" % n for n in count(1))
+    idgen = ('calibre-page-%d' % n for n in count(1))
     for item in oeb.spine:
         data = item.data
         for elem in selector(data):
diff --git a/src/calibre/ebooks/html/input.py b/src/calibre/ebooks/html/input.py
index 7b67ad15cd..54f8b6e019 100644
--- a/src/calibre/ebooks/html/input.py
+++ b/src/calibre/ebooks/html/input.py
@@ -24,7 +24,6 @@ from polyglot.urllib import urlparse, urlunparse
 
 
 class Link:
-
     '''
     Represents a link in a HTML file.
     '''
@@ -79,7 +78,6 @@ class IgnoreFile(Exception):
 
 
 class HTMLFile:
-
     '''
     Contains basic information about an HTML file. This
     includes a list of links to other files as well as
@@ -91,7 +89,7 @@ class HTMLFile:
 
     HTML_PAT  = re.compile(r'<\s*html', re.IGNORECASE)
     HTML_PAT_BIN  = re.compile(br'<\s*html', re.IGNORECASE)
-    TITLE_PAT = re.compile('<title>([^<>]+)</title>', re.IGNORECASE)
+    TITLE_PAT = re.compile(r'<title>([^<>]+)</title>', re.IGNORECASE)
     LINK_PAT  = re.compile(
     r'<\s*a\s+.*?href\s*=\s*(?:(?:"(?P<url1>[^"]+)")|(?:\'(?P<url2>[^\']+)\')|(?P<url3>[^\s>]+))',
     re.DOTALL|re.IGNORECASE)
@@ -256,7 +254,7 @@ def traverse(path_to_html_file, max_levels=sys.maxsize, verbose=0, encoding=None
     '''
     assert max_levels >= 0
     level = 0
-    flat =  [HTMLFile(path_to_html_file, level, encoding, verbose, correct_case_mismatches=correct_case_mismatches)]
+    flat = [HTMLFile(path_to_html_file, level, encoding, verbose, correct_case_mismatches=correct_case_mismatches)]
     seen = {flat[0].path}
     next_level = list(flat)
     while level < max_levels and len(next_level) > 0:
diff --git a/src/calibre/ebooks/html_entities.py b/src/calibre/ebooks/html_entities.py
index 6817ac03c8..397537923a 100644
--- a/src/calibre/ebooks/html_entities.py
+++ b/src/calibre/ebooks/html_entities.py
@@ -2194,8 +2194,8 @@ def find_tests():
             t('a&amp;b&lt;c', 'a&b<c')
             t('a&acE;b', 'a∾̳b')
             t('a&#1234;b', 'aӒb')
-            t('a&#X1234;b', 'a\u1234b')
-            t('a&#x1034fA;b', 'a\U001034fAb')
+            t('a&#X1234;b', 'aሴb')
+            t('a&#x1034fA;b', 'a\U001034FAb')
             t('a&#0;b&#x000;c', 'abc')
             x('&amp;&lt;&gt;&apos;&quot;', '&amp;&lt;&gt;&apos;&quot;')
 
diff --git a/src/calibre/ebooks/html_transform_rules.py b/src/calibre/ebooks/html_transform_rules.py
index f5e2634c88..7bb85adacb 100644
--- a/src/calibre/ebooks/html_transform_rules.py
+++ b/src/calibre/ebooks/html_transform_rules.py
@@ -380,7 +380,7 @@ class Rule:
             self.css_selector = '.' + q
             self.selector = self.css
         elif mt == 'not_has_class':
-            self.css_selector = f":not(.{q})"
+            self.css_selector = f':not(.{q})'
             self.selector = self.css
         elif mt == 'contains_text':
             self.xpath_selector = XPath(f'//*[contains(text(), {text_as_xpath_literal(q)})]')
@@ -627,7 +627,7 @@ def test(return_tests=False):  # {{{
             self.assertTrue(t('add_attrs', "class='c' data-m=n")(p))
             self.ae(p.items(), [('class', 'c'), ('data-m', 'n')])
             p = r('<p a=1>')[0]
-            self.assertTrue(t('add_attrs', "a=2")(p))
+            self.assertTrue(t('add_attrs', 'a=2')(p))
             self.ae(p.items(), [('a', '2')])
 
             p = r('<p>t<span>s')[0]
diff --git a/src/calibre/ebooks/htmlz/oeb2html.py b/src/calibre/ebooks/htmlz/oeb2html.py
index a950fce2c3..23710d0fb1 100644
--- a/src/calibre/ebooks/htmlz/oeb2html.py
+++ b/src/calibre/ebooks/htmlz/oeb2html.py
@@ -269,7 +269,7 @@ class OEB2HTMLInlineCSSizer(OEB2HTML):
             tag = 'div'
             # Add page-break-brefore: always because renders typically treat a new file (we're merging files)
             # as a page break and remove all other page break types that might be set.
-            style_a = 'page-break-before: always; %s' % re.sub('page-break-[^:]+:[^;]+;?', '', style_a)
+            style_a = 'page-break-before: always; %s' % re.sub(r'page-break-[^:]+:[^;]+;?', '', style_a)
         # Remove unnecessary spaces.
         style_a = re.sub(r'\s{2,}', ' ', style_a).strip()
         tags.append(tag)
@@ -338,7 +338,7 @@ class OEB2HTMLClassCSSizer(OEB2HTML):
         if self.opts.htmlz_class_style == 'external':
             css = '<link href="style.css" rel="stylesheet" type="text/css" />'
         else:
-            css =  '<style type="text/css">' + self.get_css(oeb_book) + '</style>'
+            css = '<style type="text/css">' + self.get_css(oeb_book) + '</style>'
         title = '<title>%s</title>' % prepare_string_for_xml(self.book_title)
         output = ['<html><head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" />'] + \
             [css] + [title, '</head><body>'] + output + ['</body></html>']
@@ -411,14 +411,14 @@ def oeb2html_no_css(oeb_book, log, opts):
     izer = OEB2HTMLNoCSSizer(log)
     html = izer.oeb2html(oeb_book, opts)
     images = izer.images
-    return (html, images)
+    return html, images
 
 
 def oeb2html_inline_css(oeb_book, log, opts):
     izer = OEB2HTMLInlineCSSizer(log)
     html = izer.oeb2html(oeb_book, opts)
     images = izer.images
-    return (html, images)
+    return html, images
 
 
 def oeb2html_class_css(oeb_book, log, opts):
@@ -426,4 +426,4 @@ def oeb2html_class_css(oeb_book, log, opts):
     setattr(opts, 'class_style', 'inline')
     html = izer.oeb2html(oeb_book, opts)
     images = izer.images
-    return (html, images)
+    return html, images
diff --git a/src/calibre/ebooks/hyphenate.py b/src/calibre/ebooks/hyphenate.py
index 78480cdf57..6a19eaeb1a 100644
--- a/src/calibre/ebooks/hyphenate.py
+++ b/src/calibre/ebooks/hyphenate.py
@@ -1,4 +1,4 @@
-""" Hyphenation, using Frank Liang's algorithm.
+''' Hyphenation, using Frank Liang's algorithm.
 
     This module provides a single function to hyphenate words.  hyphenate_word takes
     a string (the word), and returns a list of parts that can be separated by hyphens.
@@ -12,7 +12,7 @@
 
     Ned Batchelder, July 2007.
     This Python code is in the public domain.
-"""
+'''
 
 import re
 
@@ -29,13 +29,13 @@ class Hyphenator:
         self.exceptions = {}
         for ex in exceptions.split():
             # Convert the hyphenated pattern into a point array for use later.
-            self.exceptions[ex.replace('-', '')] = [0] + [int(h == '-') for h in re.split(r"[a-z]", ex)]
+            self.exceptions[ex.replace('-', '')] = [0] + [int(h == '-') for h in re.split(r'[a-z]', ex)]
 
     def _insert_pattern(self, pattern):
         # Convert a pattern like 'a1bc3d4' into a string of chars 'abcd'
         # and a list of points [ 1, 0, 3, 4 ].
-        chars = re.sub('[0-9]', '', pattern)
-        points = [int(d or 0) for d in re.split("[.a-z]", pattern)]
+        chars = re.sub(r'[0-9]', '', pattern)
+        points = [int(d or 0) for d in re.split(r'[.a-z]', pattern)]
 
         # Insert the pattern into the tree.  Each character finds a dict
         # another level down in the tree, and leaf nodes have the list of
@@ -48,9 +48,9 @@ class Hyphenator:
         t[None] = points
 
     def hyphenate_word(self, word):
-        """ Given a word, returns a list of pieces, broken at the possible
+        ''' Given a word, returns a list of pieces, broken at the possible
             hyphenation points.
-        """
+        '''
         # Short words aren't hyphenated.
         if len(word) <= 4:
             return [word]
@@ -86,7 +86,7 @@ class Hyphenator:
 patterns = (
 # Knuth and Liang's original hyphenation patterns from classic TeX.
 # In the public domain.
-"""
+'''
 .ach4 .ad4der .af1t .al3t .am5at .an5c .ang4 .ani5m .ant4 .an3te .anti5s .ar5s
 .ar4tie .ar4ty .as3c .as1p .as1s .aster5 .atom5 .au1d .av4i .awn4 .ba4g .ba5na
 .bas4e .ber4 .be5ra .be3sm .be5sto .bri2 .but4ti .cam4pe .can5c .capa5b .car5ol
@@ -436,7 +436,7 @@ ympa3 yn3chr yn5d yn5g yn5ic 5ynx y1o4 yo5d y4o5g yom4 yo5net y4ons y4os y4ped
 yper5 yp3i y3po y4poc yp2ta y5pu yra5m yr5ia y3ro yr4r ys4c y3s2e ys3ica ys3io
 3ysis y4so yss4 ys1t ys3ta ysur4 y3thin yt3ic y1w za1 z5a2b zar2 4zb 2ze ze4n
 ze4p z1er ze3ro zet4 2z1i z4il z4is 5zl 4zm 1zo zo4m zo5ol zte4 4z1z2 z4zy
-"""
+'''
 # Extra patterns, from ushyphmax.tex, dated 2005-05-30.
 # Copyright (C) 1990, 2004, 2005 Gerard D.C. Kuiken.
 # Copying and distribution of this file, with or without modification,
@@ -446,7 +446,7 @@ ze4p z1er ze3ro zet4 2z1i z4il z4is 5zl 4zm 1zo zo4m zo5ol zte4 4z1z2 z4zy
 # These patterns are based on the Hyphenation Exception Log
 # published in TUGboat, Volume 10 (1989), No. 3, pp. 337-341,
 # and a large number of incorrectly hyphenated words not yet published.
-"""
+'''
 .con5gr .de5riva .dri5v4 .eth1y6l1 .eu4ler .ev2 .ever5si5b .ga4s1om1 .ge4ome
 .ge5ot1 .he3mo1 .he3p6a .he3roe .in5u2t .kil2n3i .ko6r1te1 .le6ices .me4ga1l
 .met4ala .mim5i2c1 .mi1s4ers .ne6o3f .noe1th .non1e2m .poly1s .post1am .pre1am
@@ -502,13 +502,13 @@ uea1m u2r1al. uri4al. us2er. v1ativ v1oir5du1 va6guer vaude3v 1verely. v1er1eig
 ves1tite vi1vip3a3r voice1p waste3w6a2 wave1g4 w3c week1n wide5sp wo4k1en
 wrap3aro writ6er. x1q xquis3 y5che3d ym5e5try y1stro yes5ter1y z3ian. z3o1phr
 z2z3w
-""")
+''')
 
-exceptions = """
+exceptions = '''
 as-so-ciate as-so-ciates dec-li-na-tion oblig-a-tory phil-an-thropic present
 presents project projects reci-procity re-cog-ni-zance ref-or-ma-tion
 ret-ri-bu-tion ta-ble
-"""
+'''
 
 hyphenator = Hyphenator(patterns, exceptions)
 hyphenate_word = hyphenator.hyphenate_word
diff --git a/src/calibre/ebooks/lit/maps/__init__.py b/src/calibre/ebooks/lit/maps/__init__.py
index 13114268d9..9b381662e3 100644
--- a/src/calibre/ebooks/lit/maps/__init__.py
+++ b/src/calibre/ebooks/lit/maps/__init__.py
@@ -1,9 +1,9 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 
-"""
+'''
 Microsoft LIT tag and attribute tables.
-"""
+'''
 
 from calibre.ebooks.lit.maps.html import MAP as HTML_MAP
 from calibre.ebooks.lit.maps.opf import MAP as OPF_MAP
diff --git a/src/calibre/ebooks/lit/maps/html.py b/src/calibre/ebooks/lit/maps/html.py
index c144d55ea8..92c249d25c 100644
--- a/src/calibre/ebooks/lit/maps/html.py
+++ b/src/calibre/ebooks/lit/maps/html.py
@@ -1,903 +1,903 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 
-"""
+'''
 Microsoft LIT HTML tag and attribute tables, copied from ConvertLIT.
-"""
+'''
 
 TAGS = [
     None,
     None,
     None,
-    "a",
-    "acronym",
-    "address",
-    "applet",
-    "area",
-    "b",
-    "base",
-    "basefont",
-    "bdo",
-    "bgsound",
-    "big",
-    "blink",
-    "blockquote",
-    "body",
-    "br",
-    "button",
-    "caption",
-    "center",
-    "cite",
-    "code",
-    "col",
-    "colgroup",
+    'a',
+    'acronym',
+    'address',
+    'applet',
+    'area',
+    'b',
+    'base',
+    'basefont',
+    'bdo',
+    'bgsound',
+    'big',
+    'blink',
+    'blockquote',
+    'body',
+    'br',
+    'button',
+    'caption',
+    'center',
+    'cite',
+    'code',
+    'col',
+    'colgroup',
     None,
     None,
-    "dd",
-    "del",
-    "dfn",
-    "dir",
-    "div",
-    "dl",
-    "dt",
-    "em",
-    "embed",
-    "fieldset",
-    "font",
-    "form",
-    "frame",
-    "frameset",
+    'dd',
+    'del',
+    'dfn',
+    'dir',
+    'div',
+    'dl',
+    'dt',
+    'em',
+    'embed',
+    'fieldset',
+    'font',
+    'form',
+    'frame',
+    'frameset',
     None,
-    "h1",
-    "h2",
-    "h3",
-    "h4",
-    "h5",
-    "h6",
-    "head",
-    "hr",
-    "html",
-    "i",
-    "iframe",
-    "img",
-    "input",
-    "ins",
-    "kbd",
-    "label",
-    "legend",
-    "li",
-    "link",
-    "tag61",
-    "map",
-    "tag63",
-    "tag64",
-    "meta",
-    "nextid",
-    "nobr",
-    "noembed",
-    "noframes",
-    "noscript",
-    "object",
-    "ol",
-    "option",
-    "p",
-    "param",
-    "plaintext",
-    "pre",
-    "q",
-    "rp",
-    "rt",
-    "ruby",
-    "s",
-    "samp",
-    "script",
-    "select",
-    "small",
-    "span",
-    "strike",
-    "strong",
-    "style",
-    "sub",
-    "sup",
-    "table",
-    "tbody",
-    "tc",
-    "td",
-    "textarea",
-    "tfoot",
-    "th",
-    "thead",
-    "title",
-    "tr",
-    "tt",
-    "u",
-    "ul",
-    "var",
-    "wbr",
+    'h1',
+    'h2',
+    'h3',
+    'h4',
+    'h5',
+    'h6',
+    'head',
+    'hr',
+    'html',
+    'i',
+    'iframe',
+    'img',
+    'input',
+    'ins',
+    'kbd',
+    'label',
+    'legend',
+    'li',
+    'link',
+    'tag61',
+    'map',
+    'tag63',
+    'tag64',
+    'meta',
+    'nextid',
+    'nobr',
+    'noembed',
+    'noframes',
+    'noscript',
+    'object',
+    'ol',
+    'option',
+    'p',
+    'param',
+    'plaintext',
+    'pre',
+    'q',
+    'rp',
+    'rt',
+    'ruby',
+    's',
+    'samp',
+    'script',
+    'select',
+    'small',
+    'span',
+    'strike',
+    'strong',
+    'style',
+    'sub',
+    'sup',
+    'table',
+    'tbody',
+    'tc',
+    'td',
+    'textarea',
+    'tfoot',
+    'th',
+    'thead',
+    'title',
+    'tr',
+    'tt',
+    'u',
+    'ul',
+    'var',
+    'wbr',
     None,
     ]
 
 ATTRS0 = {
-    0x8010: "tabindex",
-    0x8046: "title",
-    0x804b: "style",
-    0x804d: "disabled",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x83fe: "datafld",
-    0x83ff: "datasrc",
-    0x8400: "dataformatas",
-    0x87d6: "accesskey",
-    0x9392: "lang",
-    0x93ed: "language",
-    0x93fe: "dir",
-    0x9771: "onmouseover",
-    0x9772: "onmouseout",
-    0x9773: "onmousedown",
-    0x9774: "onmouseup",
-    0x9775: "onmousemove",
-    0x9776: "onkeydown",
-    0x9777: "onkeyup",
-    0x9778: "onkeypress",
-    0x9779: "onclick",
-    0x977a: "ondblclick",
-    0x977e: "onhelp",
-    0x977f: "onfocus",
-    0x9780: "onblur",
-    0x9783: "onrowexit",
-    0x9784: "onrowenter",
-    0x9786: "onbeforeupdate",
-    0x9787: "onafterupdate",
-    0x978a: "onreadystatechange",
-    0x9790: "onscroll",
-    0x9794: "ondragstart",
-    0x9795: "onresize",
-    0x9796: "onselectstart",
-    0x9797: "onerrorupdate",
-    0x9799: "ondatasetchanged",
-    0x979a: "ondataavailable",
-    0x979b: "ondatasetcomplete",
-    0x979c: "onfilterchange",
-    0x979f: "onlosecapture",
-    0x97a0: "onpropertychange",
-    0x97a2: "ondrag",
-    0x97a3: "ondragend",
-    0x97a4: "ondragenter",
-    0x97a5: "ondragover",
-    0x97a6: "ondragleave",
-    0x97a7: "ondrop",
-    0x97a8: "oncut",
-    0x97a9: "oncopy",
-    0x97aa: "onpaste",
-    0x97ab: "onbeforecut",
-    0x97ac: "onbeforecopy",
-    0x97ad: "onbeforepaste",
-    0x97af: "onrowsdelete",
-    0x97b0: "onrowsinserted",
-    0x97b1: "oncellchange",
-    0x97b2: "oncontextmenu",
-    0x97b6: "onbeforeeditfocus",
+    0x8010: 'tabindex',
+    0x8046: 'title',
+    0x804b: 'style',
+    0x804d: 'disabled',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x83fe: 'datafld',
+    0x83ff: 'datasrc',
+    0x8400: 'dataformatas',
+    0x87d6: 'accesskey',
+    0x9392: 'lang',
+    0x93ed: 'language',
+    0x93fe: 'dir',
+    0x9771: 'onmouseover',
+    0x9772: 'onmouseout',
+    0x9773: 'onmousedown',
+    0x9774: 'onmouseup',
+    0x9775: 'onmousemove',
+    0x9776: 'onkeydown',
+    0x9777: 'onkeyup',
+    0x9778: 'onkeypress',
+    0x9779: 'onclick',
+    0x977a: 'ondblclick',
+    0x977e: 'onhelp',
+    0x977f: 'onfocus',
+    0x9780: 'onblur',
+    0x9783: 'onrowexit',
+    0x9784: 'onrowenter',
+    0x9786: 'onbeforeupdate',
+    0x9787: 'onafterupdate',
+    0x978a: 'onreadystatechange',
+    0x9790: 'onscroll',
+    0x9794: 'ondragstart',
+    0x9795: 'onresize',
+    0x9796: 'onselectstart',
+    0x9797: 'onerrorupdate',
+    0x9799: 'ondatasetchanged',
+    0x979a: 'ondataavailable',
+    0x979b: 'ondatasetcomplete',
+    0x979c: 'onfilterchange',
+    0x979f: 'onlosecapture',
+    0x97a0: 'onpropertychange',
+    0x97a2: 'ondrag',
+    0x97a3: 'ondragend',
+    0x97a4: 'ondragenter',
+    0x97a5: 'ondragover',
+    0x97a6: 'ondragleave',
+    0x97a7: 'ondrop',
+    0x97a8: 'oncut',
+    0x97a9: 'oncopy',
+    0x97aa: 'onpaste',
+    0x97ab: 'onbeforecut',
+    0x97ac: 'onbeforecopy',
+    0x97ad: 'onbeforepaste',
+    0x97af: 'onrowsdelete',
+    0x97b0: 'onrowsinserted',
+    0x97b1: 'oncellchange',
+    0x97b2: 'oncontextmenu',
+    0x97b6: 'onbeforeeditfocus',
     }
 ATTRS3 = {
-    0x0001: "href",
-    0x03ec: "target",
-    0x03ee: "rel",
-    0x03ef: "rev",
-    0x03f0: "urn",
-    0x03f1: "methods",
-    0x8001: "name",
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x0001: 'href',
+    0x03ec: 'target',
+    0x03ee: 'rel',
+    0x03ef: 'rev',
+    0x03f0: 'urn',
+    0x03f1: 'methods',
+    0x8001: 'name',
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS5 = {
-    0x9399: "clear",
+    0x9399: 'clear',
     }
 ATTRS6 = {
-    0x8001: "name",
-    0x8006: "width",
-    0x8007: "height",
-    0x804a: "align",
-    0x8bbb: "classid",
-    0x8bbc: "data",
-    0x8bbf: "codebase",
-    0x8bc0: "codetype",
-    0x8bc1: "code",
-    0x8bc2: "type",
-    0x8bc5: "vspace",
-    0x8bc6: "hspace",
-    0x978e: "onerror",
+    0x8001: 'name',
+    0x8006: 'width',
+    0x8007: 'height',
+    0x804a: 'align',
+    0x8bbb: 'classid',
+    0x8bbc: 'data',
+    0x8bbf: 'codebase',
+    0x8bc0: 'codetype',
+    0x8bc1: 'code',
+    0x8bc2: 'type',
+    0x8bc5: 'vspace',
+    0x8bc6: 'hspace',
+    0x978e: 'onerror',
     }
 ATTRS7 = {
-    0x0001: "href",
-    0x03ea: "shape",
-    0x03eb: "coords",
-    0x03ed: "target",
-    0x03ee: "alt",
-    0x03ef: "nohref",
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x0001: 'href',
+    0x03ea: 'shape',
+    0x03eb: 'coords',
+    0x03ed: 'target',
+    0x03ee: 'alt',
+    0x03ef: 'nohref',
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS8 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS9 = {
-    0x03ec: "href",
-    0x03ed: "target",
+    0x03ec: 'href',
+    0x03ed: 'target',
     }
 ATTRS10 = {
-    0x938b: "color",
-    0x939b: "face",
-    0x93a3: "size",
+    0x938b: 'color',
+    0x939b: 'face',
+    0x93a3: 'size',
     }
 ATTRS12 = {
-    0x03ea: "src",
-    0x03eb: "loop",
-    0x03ec: "volume",
-    0x03ed: "balance",
+    0x03ea: 'src',
+    0x03eb: 'loop',
+    0x03ec: 'volume',
+    0x03ed: 'balance',
     }
 ATTRS13 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS15 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x9399: "clear",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x9399: 'clear',
     }
 ATTRS16 = {
-    0x07db: "link",
-    0x07dc: "alink",
-    0x07dd: "vlink",
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x938a: "background",
-    0x938b: "text",
-    0x938e: "nowrap",
-    0x93ae: "topmargin",
-    0x93af: "rightmargin",
-    0x93b0: "bottommargin",
-    0x93b1: "leftmargin",
-    0x93b6: "bgproperties",
-    0x93d8: "scroll",
-    0x977b: "onselect",
-    0x9791: "onload",
-    0x9792: "onunload",
-    0x9798: "onbeforeunload",
-    0x97b3: "onbeforeprint",
-    0x97b4: "onafterprint",
-    0xfe0c: "bgcolor",
+    0x07db: 'link',
+    0x07dc: 'alink',
+    0x07dd: 'vlink',
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x938a: 'background',
+    0x938b: 'text',
+    0x938e: 'nowrap',
+    0x93ae: 'topmargin',
+    0x93af: 'rightmargin',
+    0x93b0: 'bottommargin',
+    0x93b1: 'leftmargin',
+    0x93b6: 'bgproperties',
+    0x93d8: 'scroll',
+    0x977b: 'onselect',
+    0x9791: 'onload',
+    0x9792: 'onunload',
+    0x9798: 'onbeforeunload',
+    0x97b3: 'onbeforeprint',
+    0x97b4: 'onafterprint',
+    0xfe0c: 'bgcolor',
     }
 ATTRS17 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x9399: "clear",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x9399: 'clear',
     }
 ATTRS18 = {
-    0x07d1: "type",
-    0x8001: "name",
+    0x07d1: 'type',
+    0x8001: 'name',
     }
 ATTRS19 = {
-    0x8046: "title",
-    0x8049: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x93a8: "valign",
+    0x8046: 'title',
+    0x8049: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x93a8: 'valign',
     }
 ATTRS20 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x9399: "clear",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x9399: 'clear',
     }
 ATTRS21 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS22 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS23 = {
-    0x03ea: "span",
-    0x8006: "width",
-    0x8049: "align",
-    0x93a8: "valign",
-    0xfe0c: "bgcolor",
+    0x03ea: 'span',
+    0x8006: 'width',
+    0x8049: 'align',
+    0x93a8: 'valign',
+    0xfe0c: 'bgcolor',
     }
 ATTRS24 = {
-    0x03ea: "span",
-    0x8006: "width",
-    0x8049: "align",
-    0x93a8: "valign",
-    0xfe0c: "bgcolor",
+    0x03ea: 'span',
+    0x8006: 'width',
+    0x8049: 'align',
+    0x93a8: 'valign',
+    0xfe0c: 'bgcolor',
     }
 ATTRS27 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x938e: "nowrap",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x938e: 'nowrap',
     }
 ATTRS29 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS31 = {
-    0x8046: "title",
-    0x8049: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x938e: "nowrap",
+    0x8046: 'title',
+    0x8049: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x938e: 'nowrap',
     }
 ATTRS32 = {
-    0x03ea: "compact",
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x03ea: 'compact',
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS33 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x938e: "nowrap",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x938e: 'nowrap',
     }
 ATTRS34 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS35 = {
-    0x8001: "name",
-    0x8006: "width",
-    0x8007: "height",
-    0x804a: "align",
-    0x8bbd: "palette",
-    0x8bbe: "pluginspage",
+    0x8001: 'name',
+    0x8006: 'width',
+    0x8007: 'height',
+    0x804a: 'align',
+    0x8bbd: 'palette',
+    0x8bbe: 'pluginspage',
     # 0x8bbf: "codebase",
-    0x8bbf: "src",
-    0x8bc1: "units",
-    0x8bc2: "type",
-    0x8bc3: "hidden",
+    0x8bbf: 'src',
+    0x8bc1: 'units',
+    0x8bc2: 'type',
+    0x8bc3: 'hidden',
     }
 ATTRS36 = {
-    0x804a: "align",
+    0x804a: 'align',
     }
 ATTRS37 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x938b: "color",
-    0x939b: "face",
-    0x939c: "size",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x938b: 'color',
+    0x939b: 'face',
+    0x939c: 'size',
     }
 ATTRS38 = {
-    0x03ea: "action",
-    0x03ec: "enctype",
-    0x03ed: "method",
-    0x03ef: "target",
-    0x03f4: "accept-charset",
-    0x8001: "name",
-    0x977c: "onsubmit",
-    0x977d: "onreset",
+    0x03ea: 'action',
+    0x03ec: 'enctype',
+    0x03ed: 'method',
+    0x03ef: 'target',
+    0x03f4: 'accept-charset',
+    0x8001: 'name',
+    0x977c: 'onsubmit',
+    0x977d: 'onreset',
     }
 ATTRS39 = {
-    0x8000: "align",
-    0x8001: "name",
-    0x8bb9: "src",
-    0x8bbb: "border",
-    0x8bbc: "frameborder",
-    0x8bbd: "framespacing",
-    0x8bbe: "marginwidth",
-    0x8bbf: "marginheight",
-    0x8bc0: "noresize",
-    0x8bc1: "scrolling",
-    0x8fa2: "bordercolor",
+    0x8000: 'align',
+    0x8001: 'name',
+    0x8bb9: 'src',
+    0x8bbb: 'border',
+    0x8bbc: 'frameborder',
+    0x8bbd: 'framespacing',
+    0x8bbe: 'marginwidth',
+    0x8bbf: 'marginheight',
+    0x8bc0: 'noresize',
+    0x8bc1: 'scrolling',
+    0x8fa2: 'bordercolor',
     }
 ATTRS40 = {
-    0x03e9: "rows",
-    0x03ea: "cols",
-    0x03eb: "border",
-    0x03ec: "bordercolor",
-    0x03ed: "frameborder",
-    0x03ee: "framespacing",
-    0x8001: "name",
-    0x9791: "onload",
-    0x9792: "onunload",
-    0x9798: "onbeforeunload",
-    0x97b3: "onbeforeprint",
-    0x97b4: "onafterprint",
+    0x03e9: 'rows',
+    0x03ea: 'cols',
+    0x03eb: 'border',
+    0x03ec: 'bordercolor',
+    0x03ed: 'frameborder',
+    0x03ee: 'framespacing',
+    0x8001: 'name',
+    0x9791: 'onload',
+    0x9792: 'onunload',
+    0x9798: 'onbeforeunload',
+    0x97b3: 'onbeforeprint',
+    0x97b4: 'onafterprint',
     }
 ATTRS42 = {
-    0x8046: "title",
-    0x8049: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x9399: "clear",
+    0x8046: 'title',
+    0x8049: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x9399: 'clear',
     }
 ATTRS43 = {
-    0x8046: "title",
-    0x8049: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x9399: "clear",
+    0x8046: 'title',
+    0x8049: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x9399: 'clear',
     }
 ATTRS44 = {
-    0x8046: "title",
-    0x8049: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x9399: "clear",
+    0x8046: 'title',
+    0x8049: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x9399: 'clear',
     }
 ATTRS45 = {
-    0x8046: "title",
-    0x8049: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x9399: "clear",
+    0x8046: 'title',
+    0x8049: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x9399: 'clear',
     }
 ATTRS46 = {
-    0x8046: "title",
-    0x8049: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x9399: "clear",
+    0x8046: 'title',
+    0x8049: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x9399: 'clear',
     }
 ATTRS47 = {
-    0x8046: "title",
-    0x8049: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x9399: "clear",
+    0x8046: 'title',
+    0x8049: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x9399: 'clear',
     }
 ATTRS49 = {
-    0x03ea: "noshade",
-    0x8006: "width",
-    0x8007: "size",
-    0x8046: "title",
-    0x8049: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x938b: "color",
+    0x03ea: 'noshade',
+    0x8006: 'width',
+    0x8007: 'size',
+    0x8046: 'title',
+    0x8049: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x938b: 'color',
     }
 ATTRS51 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS52 = {
-    0x8001: "name",
-    0x8006: "width",
-    0x8007: "height",
-    0x804a: "align",
-    0x8bb9: "src",
-    0x8bbb: "border",
-    0x8bbc: "frameborder",
-    0x8bbd: "framespacing",
-    0x8bbe: "marginwidth",
-    0x8bbf: "marginheight",
-    0x8bc0: "noresize",
-    0x8bc1: "scrolling",
-    0x8fa2: "vspace",
-    0x8fa3: "hspace",
+    0x8001: 'name',
+    0x8006: 'width',
+    0x8007: 'height',
+    0x804a: 'align',
+    0x8bb9: 'src',
+    0x8bbb: 'border',
+    0x8bbc: 'frameborder',
+    0x8bbd: 'framespacing',
+    0x8bbe: 'marginwidth',
+    0x8bbf: 'marginheight',
+    0x8bc0: 'noresize',
+    0x8bc1: 'scrolling',
+    0x8fa2: 'vspace',
+    0x8fa3: 'hspace',
     }
 ATTRS53 = {
-    0x03eb: "alt",
-    0x03ec: "src",
-    0x03ed: "border",
-    0x03ee: "vspace",
-    0x03ef: "hspace",
-    0x03f0: "lowsrc",
-    0x03f1: "vrml",
-    0x03f2: "dynsrc",
-    0x03f4: "loop",
-    0x03f6: "start",
-    0x07d3: "ismap",
-    0x07d9: "usemap",
-    0x8001: "name",
-    0x8006: "width",
-    0x8007: "height",
-    0x8046: "title",
-    0x804a: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x978d: "onabort",
-    0x978e: "onerror",
-    0x9791: "onload",
+    0x03eb: 'alt',
+    0x03ec: 'src',
+    0x03ed: 'border',
+    0x03ee: 'vspace',
+    0x03ef: 'hspace',
+    0x03f0: 'lowsrc',
+    0x03f1: 'vrml',
+    0x03f2: 'dynsrc',
+    0x03f4: 'loop',
+    0x03f6: 'start',
+    0x07d3: 'ismap',
+    0x07d9: 'usemap',
+    0x8001: 'name',
+    0x8006: 'width',
+    0x8007: 'height',
+    0x8046: 'title',
+    0x804a: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x978d: 'onabort',
+    0x978e: 'onerror',
+    0x9791: 'onload',
     }
 ATTRS54 = {
-    0x07d1: "type",
-    0x07d3: "size",
-    0x07d4: "maxlength",
-    0x07d6: "readonly",
-    0x07d8: "indeterminate",
-    0x07da: "checked",
-    0x07db: "alt",
-    0x07dc: "src",
-    0x07dd: "border",
-    0x07de: "vspace",
-    0x07df: "hspace",
-    0x07e0: "lowsrc",
-    0x07e1: "vrml",
-    0x07e2: "dynsrc",
-    0x07e4: "loop",
-    0x07e5: "start",
-    0x8001: "name",
-    0x8006: "width",
-    0x8007: "height",
-    0x804a: "align",
-    0x93ee: "value",
-    0x977b: "onselect",
-    0x978d: "onabort",
-    0x978e: "onerror",
-    0x978f: "onchange",
-    0x9791: "onload",
+    0x07d1: 'type',
+    0x07d3: 'size',
+    0x07d4: 'maxlength',
+    0x07d6: 'readonly',
+    0x07d8: 'indeterminate',
+    0x07da: 'checked',
+    0x07db: 'alt',
+    0x07dc: 'src',
+    0x07dd: 'border',
+    0x07de: 'vspace',
+    0x07df: 'hspace',
+    0x07e0: 'lowsrc',
+    0x07e1: 'vrml',
+    0x07e2: 'dynsrc',
+    0x07e4: 'loop',
+    0x07e5: 'start',
+    0x8001: 'name',
+    0x8006: 'width',
+    0x8007: 'height',
+    0x804a: 'align',
+    0x93ee: 'value',
+    0x977b: 'onselect',
+    0x978d: 'onabort',
+    0x978e: 'onerror',
+    0x978f: 'onchange',
+    0x9791: 'onload',
     }
 ATTRS56 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS57 = {
-    0x03e9: "for",
+    0x03e9: 'for',
     }
 ATTRS58 = {
-    0x804a: "align",
+    0x804a: 'align',
     }
 ATTRS59 = {
-    0x03ea: "value",
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x939a: "type",
+    0x03ea: 'value',
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x939a: 'type',
     }
 ATTRS60 = {
-    0x03ee: "href",
-    0x03ef: "rel",
-    0x03f0: "rev",
-    0x03f1: "type",
-    0x03f9: "media",
-    0x03fa: "target",
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x978e: "onerror",
-    0x9791: "onload",
+    0x03ee: 'href',
+    0x03ef: 'rel',
+    0x03f0: 'rev',
+    0x03f1: 'type',
+    0x03f9: 'media',
+    0x03fa: 'target',
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x978e: 'onerror',
+    0x9791: 'onload',
     }
 ATTRS61 = {
-    0x9399: "clear",
+    0x9399: 'clear',
     }
 ATTRS62 = {
-    0x8001: "name",
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8001: 'name',
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS63 = {
-    0x1771: "scrolldelay",
-    0x1772: "direction",
-    0x1773: "behavior",
-    0x1774: "scrollamount",
-    0x1775: "loop",
-    0x1776: "vspace",
-    0x1777: "hspace",
-    0x1778: "truespeed",
-    0x8006: "width",
-    0x8007: "height",
-    0x9785: "onbounce",
-    0x978b: "onfinish",
-    0x978c: "onstart",
-    0xfe0c: "bgcolor",
+    0x1771: 'scrolldelay',
+    0x1772: 'direction',
+    0x1773: 'behavior',
+    0x1774: 'scrollamount',
+    0x1775: 'loop',
+    0x1776: 'vspace',
+    0x1777: 'hspace',
+    0x1778: 'truespeed',
+    0x8006: 'width',
+    0x8007: 'height',
+    0x9785: 'onbounce',
+    0x978b: 'onfinish',
+    0x978c: 'onstart',
+    0xfe0c: 'bgcolor',
     }
 ATTRS65 = {
-    0x03ea: "http-equiv",
-    0x03eb: "content",
-    0x03ec: "url",
-    0x03f6: "charset",
-    0x8001: "name",
+    0x03ea: 'http-equiv',
+    0x03eb: 'content',
+    0x03ec: 'url',
+    0x03f6: 'charset',
+    0x8001: 'name',
     }
 ATTRS66 = {
-    0x03f5: "n",
+    0x03f5: 'n',
     }
 ATTRS71 = {
     # 0x8000: "border",
-    0x8000: "usemap",
-    0x8001: "name",
-    0x8006: "width",
-    0x8007: "height",
-    0x8046: "title",
-    0x804a: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x8bbb: "classid",
-    0x8bbc: "data",
-    0x8bbf: "codebase",
-    0x8bc0: "codetype",
-    0x8bc1: "code",
-    0x8bc2: "type",
-    0x8bc5: "vspace",
-    0x8bc6: "hspace",
-    0x978e: "onerror",
+    0x8000: 'usemap',
+    0x8001: 'name',
+    0x8006: 'width',
+    0x8007: 'height',
+    0x8046: 'title',
+    0x804a: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x8bbb: 'classid',
+    0x8bbc: 'data',
+    0x8bbf: 'codebase',
+    0x8bc0: 'codetype',
+    0x8bc1: 'code',
+    0x8bc2: 'type',
+    0x8bc5: 'vspace',
+    0x8bc6: 'hspace',
+    0x978e: 'onerror',
     }
 ATTRS72 = {
-    0x03eb: "compact",
-    0x03ec: "start",
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x939a: "type",
+    0x03eb: 'compact',
+    0x03ec: 'start',
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x939a: 'type',
     }
 ATTRS73 = {
-    0x03ea: "selected",
-    0x03eb: "value",
+    0x03ea: 'selected',
+    0x03eb: 'value',
     }
 ATTRS74 = {
-    0x8046: "title",
-    0x8049: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x9399: "clear",
+    0x8046: 'title',
+    0x8049: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x9399: 'clear',
     }
 ATTRS75 = {
     # 0x8000: "name",
     # 0x8000: "value",
-    0x8000: "type",
+    0x8000: 'type',
     }
 ATTRS76 = {
-    0x9399: "clear",
+    0x9399: 'clear',
     }
 ATTRS77 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x9399: "clear",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x9399: 'clear',
     }
 ATTRS78 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS82 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS83 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS84 = {
-    0x03ea: "src",
-    0x03ed: "for",
-    0x03ee: "event",
-    0x03f0: "defer",
-    0x03f2: "type",
-    0x978e: "onerror",
+    0x03ea: 'src',
+    0x03ed: 'for',
+    0x03ee: 'event',
+    0x03f0: 'defer',
+    0x03f2: 'type',
+    0x978e: 'onerror',
     }
 ATTRS85 = {
-    0x03eb: "size",
-    0x03ec: "multiple",
-    0x8000: "align",
-    0x8001: "name",
-    0x978f: "onchange",
+    0x03eb: 'size',
+    0x03ec: 'multiple',
+    0x8000: 'align',
+    0x8001: 'name',
+    0x978f: 'onchange',
     }
 ATTRS86 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS87 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS88 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS89 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS90 = {
-    0x03eb: "type",
-    0x03ef: "media",
-    0x8046: "title",
-    0x978e: "onerror",
-    0x9791: "onload",
+    0x03eb: 'type',
+    0x03ef: 'media',
+    0x8046: 'title',
+    0x978e: 'onerror',
+    0x9791: 'onload',
     }
 ATTRS91 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS92 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS93 = {
-    0x03ea: "cols",
-    0x03eb: "border",
-    0x03ec: "rules",
-    0x03ed: "frame",
-    0x03ee: "cellspacing",
-    0x03ef: "cellpadding",
-    0x03fa: "datapagesize",
-    0x8006: "width",
-    0x8007: "height",
-    0x8046: "title",
-    0x804a: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x938a: "background",
-    0x93a5: "bordercolor",
-    0x93a6: "bordercolorlight",
-    0x93a7: "bordercolordark",
-    0xfe0c: "bgcolor",
+    0x03ea: 'cols',
+    0x03eb: 'border',
+    0x03ec: 'rules',
+    0x03ed: 'frame',
+    0x03ee: 'cellspacing',
+    0x03ef: 'cellpadding',
+    0x03fa: 'datapagesize',
+    0x8006: 'width',
+    0x8007: 'height',
+    0x8046: 'title',
+    0x804a: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x938a: 'background',
+    0x93a5: 'bordercolor',
+    0x93a6: 'bordercolorlight',
+    0x93a7: 'bordercolordark',
+    0xfe0c: 'bgcolor',
     }
 ATTRS94 = {
-    0x8049: "align",
-    0x93a8: "valign",
-    0xfe0c: "bgcolor",
+    0x8049: 'align',
+    0x93a8: 'valign',
+    0xfe0c: 'bgcolor',
     }
 ATTRS95 = {
-    0x8049: "align",
-    0x93a8: "valign",
+    0x8049: 'align',
+    0x93a8: 'valign',
     }
 ATTRS96 = {
-    0x07d2: "rowspan",
-    0x07d3: "colspan",
-    0x8006: "width",
-    0x8007: "height",
-    0x8046: "title",
-    0x8049: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x938a: "background",
-    0x938e: "nowrap",
-    0x93a5: "bordercolor",
-    0x93a6: "bordercolorlight",
-    0x93a7: "bordercolordark",
-    0x93a8: "valign",
-    0xfe0c: "bgcolor",
+    0x07d2: 'rowspan',
+    0x07d3: 'colspan',
+    0x8006: 'width',
+    0x8007: 'height',
+    0x8046: 'title',
+    0x8049: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x938a: 'background',
+    0x938e: 'nowrap',
+    0x93a5: 'bordercolor',
+    0x93a6: 'bordercolorlight',
+    0x93a7: 'bordercolordark',
+    0x93a8: 'valign',
+    0xfe0c: 'bgcolor',
     }
 ATTRS97 = {
-    0x1b5a: "rows",
-    0x1b5b: "cols",
-    0x1b5c: "wrap",
-    0x1b5d: "readonly",
-    0x8001: "name",
-    0x977b: "onselect",
-    0x978f: "onchange",
+    0x1b5a: 'rows',
+    0x1b5b: 'cols',
+    0x1b5c: 'wrap',
+    0x1b5d: 'readonly',
+    0x8001: 'name',
+    0x977b: 'onselect',
+    0x978f: 'onchange',
     }
 ATTRS98 = {
-    0x8049: "align",
-    0x93a8: "valign",
-    0xfe0c: "bgcolor",
+    0x8049: 'align',
+    0x93a8: 'valign',
+    0xfe0c: 'bgcolor',
     }
 ATTRS99 = {
-    0x07d2: "rowspan",
-    0x07d3: "colspan",
-    0x8006: "width",
-    0x8007: "height",
-    0x8046: "title",
-    0x8049: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x938a: "background",
-    0x938e: "nowrap",
-    0x93a5: "bordercolor",
-    0x93a6: "bordercolorlight",
-    0x93a7: "bordercolordark",
-    0x93a8: "valign",
-    0xfe0c: "bgcolor",
+    0x07d2: 'rowspan',
+    0x07d3: 'colspan',
+    0x8006: 'width',
+    0x8007: 'height',
+    0x8046: 'title',
+    0x8049: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x938a: 'background',
+    0x938e: 'nowrap',
+    0x93a5: 'bordercolor',
+    0x93a6: 'bordercolorlight',
+    0x93a7: 'bordercolordark',
+    0x93a8: 'valign',
+    0xfe0c: 'bgcolor',
     }
 ATTRS100 = {
-    0x8049: "align",
-    0x93a8: "valign",
-    0xfe0c: "bgcolor",
+    0x8049: 'align',
+    0x93a8: 'valign',
+    0xfe0c: 'bgcolor',
     }
 ATTRS102 = {
-    0x8007: "height",
-    0x8046: "title",
-    0x8049: "align",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x93a5: "bordercolor",
-    0x93a6: "bordercolorlight",
-    0x93a7: "bordercolordark",
-    0x93a8: "valign",
-    0xfe0c: "bgcolor",
+    0x8007: 'height',
+    0x8046: 'title',
+    0x8049: 'align',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x93a5: 'bordercolor',
+    0x93a6: 'bordercolorlight',
+    0x93a7: 'bordercolordark',
+    0x93a8: 'valign',
+    0xfe0c: 'bgcolor',
     }
 ATTRS103 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS104 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS105 = {
-    0x03eb: "compact",
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
-    0x939a: "type",
+    0x03eb: 'compact',
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
+    0x939a: 'type',
     }
 ATTRS106 = {
-    0x8046: "title",
-    0x804b: "style",
-    0x83ea: "class",
-    0x83eb: "id",
+    0x8046: 'title',
+    0x804b: 'style',
+    0x83ea: 'class',
+    0x83eb: 'id',
     }
 ATTRS108 = {
-    0x9399: "clear",
+    0x9399: 'clear',
     }
 
 TAGS_ATTRS = [
diff --git a/src/calibre/ebooks/lit/maps/opf.py b/src/calibre/ebooks/lit/maps/opf.py
index af1355612b..8247ebb326 100644
--- a/src/calibre/ebooks/lit/maps/opf.py
+++ b/src/calibre/ebooks/lit/maps/opf.py
@@ -1,16 +1,16 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 
-"""
+'''
 Microsoft LIT OPF tag and attribute tables, copied from ConvertLIT.
-"""
+'''
 
 
 TAGS = [
     None,
-    "package",
-    "dc:Title",
-    "dc:Creator",
+    'package',
+    'dc:Title',
+    'dc:Creator',
     None,
     None,
     None,
@@ -23,58 +23,58 @@ TAGS = [
     None,
     None,
     None,
-    "manifest",
-    "item",
-    "spine",
-    "itemref",
-    "metadata",
-    "dc-metadata",
-    "dc:Subject",
-    "dc:Description",
-    "dc:Publisher",
-    "dc:Contributor",
-    "dc:Date",
-    "dc:Type",
-    "dc:Format",
-    "dc:Identifier",
-    "dc:Source",
-    "dc:Language",
-    "dc:Relation",
-    "dc:Coverage",
-    "dc:Rights",
-    "x-metadata",
-    "meta",
-    "tours",
-    "tour",
-    "site",
-    "guide",
-    "reference",
+    'manifest',
+    'item',
+    'spine',
+    'itemref',
+    'metadata',
+    'dc-metadata',
+    'dc:Subject',
+    'dc:Description',
+    'dc:Publisher',
+    'dc:Contributor',
+    'dc:Date',
+    'dc:Type',
+    'dc:Format',
+    'dc:Identifier',
+    'dc:Source',
+    'dc:Language',
+    'dc:Relation',
+    'dc:Coverage',
+    'dc:Rights',
+    'x-metadata',
+    'meta',
+    'tours',
+    'tour',
+    'site',
+    'guide',
+    'reference',
     None,
    ]
 
 ATTRS = {
-    0x0001: "href",
-    0x0002: "%never-used",
-    0x0003: "%guid",
-    0x0004: "%minimum_level",
-    0x0005: "%attr5",
-    0x0006: "id",
-    0x0007: "href",
-    0x0008: "media-type",
-    0x0009: "fallback",
-    0x000A: "idref",
-    0x000B: "xmlns:dc",
-    0x000C: "xmlns:oebpackage",
-    0x000D: "role",
-    0x000E: "file-as",
-    0x000F: "event",
-    0x0010: "scheme",
-    0x0011: "title",
-    0x0012: "type",
-    0x0013: "unique-identifier",
-    0x0014: "name",
-    0x0015: "content",
-    0x0016: "xml:lang",
+    0x0001: 'href',
+    0x0002: '%never-used',
+    0x0003: '%guid',
+    0x0004: '%minimum_level',
+    0x0005: '%attr5',
+    0x0006: 'id',
+    0x0007: 'href',
+    0x0008: 'media-type',
+    0x0009: 'fallback',
+    0x000A: 'idref',
+    0x000B: 'xmlns:dc',
+    0x000C: 'xmlns:oebpackage',
+    0x000D: 'role',
+    0x000E: 'file-as',
+    0x000F: 'event',
+    0x0010: 'scheme',
+    0x0011: 'title',
+    0x0012: 'type',
+    0x0013: 'unique-identifier',
+    0x0014: 'name',
+    0x0015: 'content',
+    0x0016: 'xml:lang',
     }
 
 TAGS_ATTRS = [{} for i in range(43)]
diff --git a/src/calibre/ebooks/lit/mssha1.py b/src/calibre/ebooks/lit/mssha1.py
index ccd735cd94..2a5eb6a721 100644
--- a/src/calibre/ebooks/lit/mssha1.py
+++ b/src/calibre/ebooks/lit/mssha1.py
@@ -1,8 +1,8 @@
-"""
+'''
 Modified version of SHA-1 used in Microsoft LIT files.
 
 Adapted from the PyPy pure-Python SHA-1 implementation.
-"""
+'''
 
 __license__   = 'GPL v3'
 __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
@@ -21,12 +21,12 @@ from polyglot.builtins import long_type
 
 
 def _long2bytesBigEndian(n, blocksize=0):
-    """Convert a long integer to a byte string.
+    '''Convert a long integer to a byte string.
 
     If optional blocksize is given and greater than zero, pad the front
     of the byte string with binary zeros so that the length is a multiple
     of blocksize.
-    """
+    '''
 
     # After much testing, this algorithm was deemed to be the fastest.
     s = b''
@@ -47,7 +47,7 @@ def _long2bytesBigEndian(n, blocksize=0):
 
 
 def _bytelist2longBigEndian(blist):
-    "Transform a list of characters into a list of longs."
+    'Transform a list of characters into a list of longs.'
 
     imax = len(blist)//4
     hl = [0] * imax
@@ -67,7 +67,7 @@ def _bytelist2longBigEndian(blist):
 
 
 def _rotateLeft(x, n):
-    "Rotate x (32 bit) left n bits circular."
+    'Rotate x (32 bit) left n bits circular.'
 
     return (x << n) | (x >> (32-n))
 
@@ -123,10 +123,10 @@ K = [
 
 
 class mssha1:
-    "An implementation of the MD5 hash function in pure Python."
+    'An implementation of the MD5 hash function in pure Python.'
 
     def __init__(self):
-        "Initialisation."
+        'Initialisation.'
 
         # Initial message length in bits(!).
         self.length = 0
@@ -140,7 +140,7 @@ class mssha1:
         self.init()
 
     def init(self):
-        "Initialize the message-digest and set all fields to zero."
+        'Initialize the message-digest and set all fields to zero.'
 
         self.length = 0
         self.input = []
@@ -164,7 +164,7 @@ class mssha1:
         D = self.H3
         E = self.H4
 
-        for t in range(0, 80):
+        for t in range(80):
             TEMP = _rotateLeft(A, 5) + f[t](B, C, D) + E + W[t] + K[t//20]
             E = D
             D = C
@@ -182,7 +182,7 @@ class mssha1:
     # API of the sha module.
 
     def update(self, inBuf):
-        """Add to the current message.
+        '''Add to the current message.
 
         Update the mssha1 object with the string arg. Repeated calls
         are equivalent to a single call with the concatenation of all
@@ -195,7 +195,7 @@ class mssha1:
         keep an intermediate value for the hash, so that we only need to
         make minimal recalculation if we call update() to add more data
         to the hashed string.
-        """
+        '''
 
         inBuf = bytearray(inBuf)
         leninBuf = long_type(len(inBuf))
@@ -225,12 +225,12 @@ class mssha1:
             self.input = self.input + inBuf
 
     def digest(self):
-        """Terminate the message-digest computation and return digest.
+        '''Terminate the message-digest computation and return digest.
 
         Return the digest of the strings passed to the update()
         method so far. This is a 16-byte string which may contain
         non-ASCII characters, including null bytes.
-        """
+        '''
 
         H0 = self.H0
         H1 = self.H1
@@ -273,22 +273,22 @@ class mssha1:
         return digest
 
     def hexdigest(self):
-        """Terminate and return digest in HEX form.
+        '''Terminate and return digest in HEX form.
 
         Like digest() except the digest is returned as a string of
         length 32, containing only hexadecimal digits. This may be
         used to exchange the value safely in email or other non-
         binary environments.
-        """
+        '''
         return ''.join(['%02x' % c for c in bytearray(self.digest())])
 
     def copy(self):
-        """Return a clone object.
+        '''Return a clone object.
 
         Return a copy ('clone') of the md5 object. This can be used
         to efficiently compute the digests of strings that share
         a common initial substring.
-        """
+        '''
 
         return copy.deepcopy(self)
 
@@ -306,10 +306,10 @@ blocksize = 1
 
 
 def new(arg=None):
-    """Return a new mssha1 crypto object.
+    '''Return a new mssha1 crypto object.
 
     If arg is present, the method call update(arg) is made.
-    """
+    '''
 
     crypto = mssha1()
     if arg:
@@ -323,7 +323,7 @@ if __name__ == '__main__':
         import sys
         file = None
         if len(sys.argv) > 2:
-            print("usage: %s [FILE]" % sys.argv[0])
+            print('usage: %s [FILE]' % sys.argv[0])
             return
         elif len(sys.argv) < 2:
             file = sys.stdin
diff --git a/src/calibre/ebooks/lit/reader.py b/src/calibre/ebooks/lit/reader.py
index a0899a7491..ea9f86588f 100644
--- a/src/calibre/ebooks/lit/reader.py
+++ b/src/calibre/ebooks/lit/reader.py
@@ -3,8 +3,8 @@ Support for reading LIT files.
 '''
 
 __license__   = 'GPL v3'
-__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net> ' \
-    'and Marshall T. Vandegrift <llasram@gmail.com>'
+__copyright__ = ('2008, Kovid Goyal <kovid at kovidgoyal.net> '
+                 'and Marshall T. Vandegrift <llasram@gmail.com>')
 
 import functools
 import io
@@ -25,23 +25,23 @@ from polyglot.builtins import codepoint_to_chr, itervalues, string_or_bytes
 from polyglot.urllib import unquote as urlunquote
 from polyglot.urllib import urldefrag
 
-__all__ = ["LitReader"]
+__all__ = ['LitReader']
 
-XML_DECL = """<?xml version="1.0" encoding="UTF-8" ?>
-"""
-OPF_DECL = """<?xml version="1.0" encoding="UTF-8" ?>
+XML_DECL = '''<?xml version="1.0" encoding="UTF-8" ?>
+'''
+OPF_DECL = '''<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE package
   PUBLIC "+//ISBN 0-9673008-1-9//DTD OEB 1.0.1 Package//EN"
   "http://openebook.org/dtds/oeb-1.0.1/oebpkg101.dtd">
-"""
-HTML_DECL = """<?xml version="1.0" encoding="UTF-8" ?>
+'''
+HTML_DECL = '''<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE html PUBLIC
  "+//ISBN 0-9673008-1-9//DTD OEB 1.0.1 Document//EN"
  "http://openebook.org/dtds/oeb-1.0.1/oebdoc101.dtd">
-"""
+'''
 
-DESENCRYPT_GUID = "{67F6E4A2-60BF-11D3-8540-00C04F58C3CF}"
-LZXCOMPRESS_GUID = "{0A9007C6-4076-11D3-8789-0000F8105754}"
+DESENCRYPT_GUID = '{67F6E4A2-60BF-11D3-8540-00C04F58C3CF}'
+LZXCOMPRESS_GUID = '{0A9007C6-4076-11D3-8789-0000F8105754}'
 
 CONTROL_TAG = 4
 CONTROL_WINDOW_SIZE = 12
@@ -84,8 +84,8 @@ def encint(byts, remaining):
 
 
 def msguid(bytes):
-    values = struct.unpack("<LHHBBBBBBBB", bytes[:16])
-    return "{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}" % values
+    values = struct.unpack('<LHHBBBBBBBB', bytes[:16])
+    return '{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}' % values
 
 
 def read_utf8_char(bytes, pos):
@@ -242,7 +242,7 @@ class UnBinary:
                     if flags & FLAG_ATOM:
                         if not self.tag_atoms or tag not in self.tag_atoms:
                             raise LitError(
-                                "atom tag %d not in atom tag list" % tag)
+                                'atom tag %d not in atom tag list' % tag)
                         tag_name = self.tag_atoms[tag]
                         current_map = self.attr_atoms
                     elif tag < len(self.tag_map):
@@ -397,7 +397,7 @@ class DirectoryEntry:
         self.size = size
 
     def __repr__(self):
-        return "DirectoryEntry(name=%s, section=%d, offset=%d, size=%d)" \
+        return 'DirectoryEntry(name=%s, section=%d, offset=%d, size=%d)' \
             % (repr(self.name), self.section, self.offset, self.size)
 
     def __str__(self):
@@ -429,10 +429,9 @@ class ManifestItem:
         return self.internal == other
 
     def __repr__(self):
-        return "ManifestItem(internal=%r, path=%r, mime_type=%r, " \
-            "offset=%d, root=%r, state=%r)" \
-            % (self.internal, self.path, self.mime_type, self.offset,
-               self.root, self.state)
+        return (
+            'ManifestItem(internal=%r, path=%r, mime_type=%r, offset=%d, root=%r, state=%r)'
+            ) % (self.internal, self.path, self.mime_type, self.offset, self.root, self.state)
 
 
 def preserve(function):
@@ -649,7 +648,7 @@ class LitFile:
             raise LitError('Invalid Namelist section')
         pos = 4
         num_sections = u16(raw[2:pos])
-        self.section_names = [""] * num_sections
+        self.section_names = [''] * num_sections
         self.section_data = [None] * num_sections
         for section in range(num_sections):
             size = u16(raw[pos:pos+2])
@@ -698,7 +697,7 @@ class LitFile:
                 path = item.path
                 while shared and not path.startswith(shared):
                     try:
-                        shared = shared[:shared.rindex("/", 0, -2) + 1]
+                        shared = shared[:shared.rindex('/', 0, -2) + 1]
                     except ValueError:
                         shared = None
                 if not shared:
@@ -730,7 +729,7 @@ class LitFile:
                 raise LitError('Unable to decrypt title key!')
             self.bookkey = bookkey[1:9]
         else:
-            raise DRMError("Cannot access DRM-protected book")
+            raise DRMError('Cannot access DRM-protected book')
 
     def calculate_deskey(self):
         hashfiles = ['/meta', '/DRMStorage/DRMSource']
@@ -741,11 +740,11 @@ class LitFile:
         for name in hashfiles:
             data = self.get_file(name)
             if prepad > 0:
-                data = (b"\000" * prepad) + data
+                data = (b'\000' * prepad) + data
                 prepad = 0
             postpad = 64 - (len(data) % 64)
             if postpad < 64:
-                data = data + (b"\000" * postpad)
+                data = data + (b'\000' * postpad)
             hash.update(data)
         digest = hash.digest()
         if not isinstance(digest, bytes):
@@ -779,7 +778,7 @@ class LitFile:
         while len(transform) >= 16:
             csize = (int32(control) + 1) * 4
             if csize > len(control) or csize <= 0:
-                raise LitError("ControlData is too short")
+                raise LitError('ControlData is too short')
             guid = msguid(transform)
             if guid == DESENCRYPT_GUID:
                 content = self.decrypt(content)
@@ -791,7 +790,7 @@ class LitFile:
                 content = self.decompress(content, control, reset_table)
                 control = control[csize:]
             else:
-                raise LitError("Unrecognized transform: %s." % repr(guid))
+                raise LitError('Unrecognized transform: %s.' % repr(guid))
             transform = transform[16:]
         return content
 
@@ -799,18 +798,18 @@ class LitFile:
         length = len(content)
         extra = length & 0x7
         if extra > 0:
-            self.warn("content length not a multiple of block size")
-            content += b"\0" * (8 - extra)
+            self.warn('content length not a multiple of block size')
+            content += b'\0' * (8 - extra)
         msdes.deskey(self.bookkey, msdes.DE1)
         return msdes.des(content)
 
     def decompress(self, content, control, reset_table):
-        if len(control) < 32 or control[CONTROL_TAG:CONTROL_TAG+4] != b"LZXC":
-            raise LitError("Invalid ControlData tag value")
+        if len(control) < 32 or control[CONTROL_TAG:CONTROL_TAG+4] != b'LZXC':
+            raise LitError('Invalid ControlData tag value')
         if len(reset_table) < (RESET_INTERVAL + 8):
-            raise LitError("Reset table is too short")
+            raise LitError('Reset table is too short')
         if u32(reset_table[RESET_UCLENGTH + 4:]) != 0:
-            raise LitError("Reset table has 64bit value for UCLENGTH")
+            raise LitError('Reset table has 64bit value for UCLENGTH')
 
         result = []
 
@@ -820,7 +819,7 @@ class LitFile:
             u >>= 1
             window_size += 1
         if window_size < 15 or window_size > 21:
-            raise LitError("Invalid window in ControlData")
+            raise LitError('Invalid window in ControlData')
         lzx.init(window_size)
 
         ofs_entry = int32(reset_table[RESET_HDRLEN:]) + 8
@@ -836,16 +835,16 @@ class LitFile:
                 size = int32(reset_table[ofs_entry:])
                 u = int32(reset_table[ofs_entry + 4:])
                 if u != 0:
-                    raise LitError("Reset table entry greater than 32 bits")
+                    raise LitError('Reset table entry greater than 32 bits')
                 if size >= len(content):
-                    self._warn("LZX reset table entry out of bounds")
+                    self._warn('LZX reset table entry out of bounds')
                 if bytes_remaining >= window_bytes:
                     lzx.reset()
                     try:
                         result.append(
                             lzx.decompress(content[base:size], window_bytes))
                     except lzx.LZXError:
-                        self.warn("LZX decompression error; skipping chunk")
+                        self.warn('LZX decompression error; skipping chunk')
                     bytes_remaining -= window_bytes
                     base = size
             accum += int32(reset_table[RESET_INTERVAL:])
@@ -855,16 +854,16 @@ class LitFile:
             try:
                 result.append(lzx.decompress(content[base:], bytes_remaining))
             except lzx.LZXError:
-                self.warn("LZX decompression error; skipping chunk")
+                self.warn('LZX decompression error; skipping chunk')
             bytes_remaining = 0
         if bytes_remaining > 0:
-            raise LitError("Failed to completely decompress section")
+            raise LitError('Failed to completely decompress section')
         return b''.join(result)
 
     def get_atoms(self, entry):
         name = '/'.join(('/data', entry.internal, 'atom'))
         if name not in self.entries:
-            return ({}, {})
+            return {}, {}
         data = self.get_file(name)
         nentries, data = u32(data), data[4:]
         tags = {}
@@ -876,9 +875,9 @@ class LitFile:
                 break
             tags[i], data = data[:size], data[size:]
         if len(tags) != nentries:
-            self._warn("damaged or invalid atoms tag table")
+            self._warn('damaged or invalid atoms tag table')
         if len(data) < 4:
-            return (tags, {})
+            return tags, {}
         attrs = {}
         nentries, data = u32(data), data[4:]
         for i in range(1, nentries + 1):
@@ -889,12 +888,12 @@ class LitFile:
                 break
             attrs[i], data = data[:size], data[size:]
         if len(attrs) != nentries:
-            self._warn("damaged or invalid atoms attributes table")
-        return (tags, attrs)
+            self._warn('damaged or invalid atoms attributes table')
+        return tags, attrs
 
 
 class LitContainer:
-    """Simple Container-interface, read-only accessor for LIT files."""
+    '''Simple Container-interface, read-only accessor for LIT files.'''
 
     def __init__(self, filename_or_stream, log):
         self._litfile = LitFile(filename_or_stream, log)
@@ -934,7 +933,7 @@ class LitContainer:
         except LitError:
             if b'PENGUIN group' not in raw:
                 raise
-            print("WARNING: attempting PENGUIN malformed OPF fix")
+            print('WARNING: attempting PENGUIN malformed OPF fix')
             raw = raw.replace(
                 b'PENGUIN group', b'\x00\x01\x18\x00PENGUIN group', 1)
             unbin = UnBinary(raw, path, self._litfile.manifest, OPF_MAP)
diff --git a/src/calibre/ebooks/lit/writer.py b/src/calibre/ebooks/lit/writer.py
index 044f88d340..29644d14b3 100644
--- a/src/calibre/ebooks/lit/writer.py
+++ b/src/calibre/ebooks/lit/writer.py
@@ -61,11 +61,11 @@ HTML_MAP = invert_tag_map(maps.HTML_MAP)
 
 LIT_MAGIC = b'ITOLITLS'
 
-LITFILE_GUID = "{0A9007C1-4076-11D3-8789-0000F8105754}"
-PIECE3_GUID = "{0A9007C3-4076-11D3-8789-0000F8105754}"
-PIECE4_GUID = "{0A9007C4-4076-11D3-8789-0000F8105754}"
-DESENCRYPT_GUID = "{67F6E4A2-60BF-11D3-8540-00C04F58C3CF}"
-LZXCOMPRESS_GUID = "{0A9007C6-4076-11D3-8789-0000F8105754}"
+LITFILE_GUID = '{0A9007C1-4076-11D3-8789-0000F8105754}'
+PIECE3_GUID = '{0A9007C3-4076-11D3-8789-0000F8105754}'
+PIECE4_GUID = '{0A9007C4-4076-11D3-8789-0000F8105754}'
+DESENCRYPT_GUID = '{67F6E4A2-60BF-11D3-8540-00C04F58C3CF}'
+LZXCOMPRESS_GUID = '{0A9007C6-4076-11D3-8789-0000F8105754}'
 
 
 def packguid(guid):
@@ -73,7 +73,7 @@ def packguid(guid):
         guid[20:22], guid[22:24], guid[25:27], guid[27:29], \
         guid[29:31], guid[31:33], guid[33:35], guid[35:37]
     values = [int(value, 16) for value in values]
-    return pack("<LHHBBBBBBBB", *values)
+    return pack('<LHHBBBBBBBB', *values)
 
 
 FLAG_OPENING = (1 << 0)
@@ -93,25 +93,28 @@ ULL_NEG1 = 0xffffffffffffffff
 ROOT_OFFSET = 1284508585713721976
 ROOT_SIZE = 4165955342166943123
 
-BLOCK_CAOL = \
-    b"\x43\x41\x4f\x4c\x02\x00\x00\x00" \
-    b"\x50\x00\x00\x00\x37\x13\x03\x00" \
-    b"\x00\x00\x00\x00\x00\x20\x00\x00" \
-    b"\x00\x02\x00\x00\x00\x00\x10\x00" \
-    b"\x00\x00\x02\x00\x00\x00\x00\x00" \
-    b"\x00\x00\x00\x00\x00\x00\x00\x00"
-BLOCK_ITSF = \
-    b"\x49\x54\x53\x46\x04\x00\x00\x00" \
-    b"\x20\x00\x00\x00\x01\x00\x00\x00"
-
-MSDES_CONTROL = \
-    b"\x03\x00\x00\x00\x29\x17\x00\x00" \
-    b"\x01\x00\x00\x00\xa5\xa5\x00\x00"
-LZXC_CONTROL = \
-    b"\x07\x00\x00\x00\x4c\x5a\x58\x43" \
-    b"\x03\x00\x00\x00\x04\x00\x00\x00" \
-    b"\x04\x00\x00\x00\x02\x00\x00\x00" \
-    b"\x00\x00\x00\x00\x00\x00\x00\x00"
+BLOCK_CAOL = (
+    b'\x43\x41\x4f\x4c\x02\x00\x00\x00'
+    b'\x50\x00\x00\x00\x37\x13\x03\x00'
+    b'\x00\x00\x00\x00\x00\x20\x00\x00'
+    b'\x00\x02\x00\x00\x00\x00\x10\x00'
+    b'\x00\x00\x02\x00\x00\x00\x00\x00'
+    b'\x00\x00\x00\x00\x00\x00\x00\x00'
+)
+BLOCK_ITSF = (
+    b'\x49\x54\x53\x46\x04\x00\x00\x00'
+    b'\x20\x00\x00\x00\x01\x00\x00\x00'
+)
+MSDES_CONTROL = (
+    b'\x03\x00\x00\x00\x29\x17\x00\x00'
+    b'\x01\x00\x00\x00\xa5\xa5\x00\x00'
+)
+LZXC_CONTROL = (
+    b'\x07\x00\x00\x00\x4c\x5a\x58\x43'
+    b'\x03\x00\x00\x00\x04\x00\x00\x00'
+    b'\x04\x00\x00\x00\x02\x00\x00\x00'
+    b'\x00\x00\x00\x00\x00\x00\x00\x00'
+)
 
 COLLAPSE = re.compile(r'[ \t\r\n\v]+')
 
@@ -275,8 +278,8 @@ class ReBinary:
 
     def build_ahc(self):
         if len(self.anchors) > 6:
-            self.logger.warn("More than six anchors in file %r. "
-                "Some links may not work properly." % self.item.href)
+            self.logger.warn('More than six anchors in file %r. '
+                'Some links may not work properly.' % self.item.href)
         data = io.BytesIO()
         data.write(codepoint_to_chr(len(self.anchors)).encode('utf-8'))
         for anchor, offset in self.anchors:
@@ -469,8 +472,8 @@ class LitWriter:
         self._add_folder('/data')
         for item in self._oeb.manifest.values():
             if item.media_type not in LIT_MIMES:
-                self._logger.warn("File %r of unknown media-type %r "
-                    "excluded from output." % (item.href, item.media_type))
+                self._logger.warn('File %r of unknown media-type %r '
+                    'excluded from output.' % (item.href, item.media_type))
                 continue
             name = '/data/' + item.id
             data = item.data
@@ -579,7 +582,7 @@ class LitWriter:
         self._add_file('/DRMStorage/DRMSource', drmsource)
         tempkey = self._calculate_deskey([self._meta, drmsource])
         msdes.deskey(tempkey, msdes.EN0)
-        self._add_file('/DRMStorage/DRMSealed', msdes.des(b"\0" * 16))
+        self._add_file('/DRMStorage/DRMSealed', msdes.des(b'\0' * 16))
         self._bookkey = b'\0' * 8
         self._add_file('/DRMStorage/ValidationStream', b'MSReader', 3)
 
@@ -651,11 +654,11 @@ class LitWriter:
         hash = mssha1.new()
         for data in hashdata:
             if prepad > 0:
-                data = (b"\000" * prepad) + data
+                data = (b'\000' * prepad) + data
                 prepad = 0
             postpad = 64 - (len(data) % 64)
             if postpad < 64:
-                data = data + (b"\000" * postpad)
+                data = data + (b'\000' * postpad)
             hash.update(data)
         digest = hash.digest()
         if not isinstance(digest, bytes):
diff --git a/src/calibre/ebooks/lrf/__init__.py b/src/calibre/ebooks/lrf/__init__.py
index 4a324b3f40..865b6a31fc 100644
--- a/src/calibre/ebooks/lrf/__init__.py
+++ b/src/calibre/ebooks/lrf/__init__.py
@@ -1,16 +1,16 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-"""
+'''
 This package contains logic to read and write LRF files.
 The LRF file format is documented at U{http://www.sven.de/librie/Librie/LrfFormat}.
-"""
+'''
 
 from calibre.ebooks import ConversionError
 from calibre.ebooks.lrf.fonts import FONT_FILE_MAP
 from calibre.ebooks.lrf.pylrs.pylrs import BlockStyle, Header, TextBlock, TextStyle
 from calibre.ebooks.lrf.pylrs.pylrs import Book as _Book
 
-__docformat__ = "epytext"
+__docformat__ = 'epytext'
 
 
 class LRFParseError(Exception):
@@ -28,15 +28,15 @@ class PRS500_PROFILE:
     line_space    = 1.2  # : Default (in pt)
     header_font_size = 6  #: In pt
     header_height    = 30  # : In px
-    default_fonts    = {'sans': "Swis721 BT Roman", 'mono': "Courier10 BT Roman",
-                         'serif': "Dutch801 Rm BT Roman"}
+    default_fonts    = {'sans': 'Swis721 BT Roman', 'mono': 'Courier10 BT Roman',
+                         'serif': 'Dutch801 Rm BT Roman'}
 
     name = 'prs500'
 
 
 def find_custom_fonts(options, logger):
     from calibre.utils.fonts.scanner import font_scanner
-    fonts = {'serif' : None, 'sans' : None, 'mono' : None}
+    fonts = {'serif': None, 'sans': None, 'mono': None}
 
     def family(cmd):
         return cmd.split(',')[-1].strip()
@@ -106,7 +106,7 @@ def Book(options, logger, font_delta=0, header=None,
 
     for family in ['serif', 'sans', 'mono']:
         if not fonts[family]:
-            fonts[family] = {'normal' : (None, profile.default_fonts[family])}
+            fonts[family] = {'normal': (None, profile.default_fonts[family])}
         elif 'normal' not in fonts[family]:
             raise ConversionError('Could not find the normal version of the ' + family + ' font')
     return book, fonts
diff --git a/src/calibre/ebooks/lrf/fonts.py b/src/calibre/ebooks/lrf/fonts.py
index eafc65b95f..9cdda9b282 100644
--- a/src/calibre/ebooks/lrf/fonts.py
+++ b/src/calibre/ebooks/lrf/fonts.py
@@ -9,9 +9,9 @@ Default fonts used in the PRS500
 
 
 LIBERATION_FONT_MAP = {
-            'Swis721 BT Roman'     : 'LiberationSans-Regular',
-            'Dutch801 Rm BT Roman' : 'LiberationSerif-Regular',
-            'Courier10 BT Roman'   : 'LiberationMono-Regular',
+            'Swis721 BT Roman'    : 'LiberationSans-Regular',
+            'Dutch801 Rm BT Roman': 'LiberationSerif-Regular',
+            'Courier10 BT Roman'  : 'LiberationMono-Regular',
             }
 
 FONT_FILE_MAP = {}
diff --git a/src/calibre/ebooks/lrf/html/__init__.py b/src/calibre/ebooks/lrf/html/__init__.py
index 9e110971bf..24cb7ee249 100644
--- a/src/calibre/ebooks/lrf/html/__init__.py
+++ b/src/calibre/ebooks/lrf/html/__init__.py
@@ -1,8 +1,8 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-"""
+'''
 This package contains code to convert HTML ebooks to LRF ebooks.
-"""
+'''
 
-__docformat__ = "epytext"
-__author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
+__docformat__ = 'epytext'
+__author__    = 'Kovid Goyal <kovid@kovidgoyal.net>'
diff --git a/src/calibre/ebooks/lrf/html/color_map.py b/src/calibre/ebooks/lrf/html/color_map.py
index 0260fd4ab4..1fc4464256 100644
--- a/src/calibre/ebooks/lrf/html/color_map.py
+++ b/src/calibre/ebooks/lrf/html/color_map.py
@@ -4,97 +4,97 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import re
 
 NAME_MAP = {
-             'aliceblue': '#F0F8FF',
-             'antiquewhite': '#FAEBD7',
-             'aqua': '#00FFFF',
-             'aquamarine': '#7FFFD4',
-             'azure': '#F0FFFF',
-             'beige': '#F5F5DC',
-             'bisque': '#FFE4C4',
-             'black': '#000000',
-             'blanchedalmond': '#FFEBCD',
-             'blue': '#0000FF',
-             'brown': '#A52A2A',
-             'burlywood': '#DEB887',
-             'cadetblue': '#5F9EA0',
-             'chartreuse': '#7FFF00',
-             'chocolate': '#D2691E',
-             'coral': '#FF7F50',
-             'crimson': '#DC143C',
-             'cyan': '#00FFFF',
-             'darkblue': '#00008B',
-             'darkgoldenrod': '#B8860B',
-             'darkgreen': '#006400',
-             'darkkhaki': '#BDB76B',
-             'darkmagenta': '#8B008B',
-             'darkolivegreen': '#556B2F',
-             'darkorange': '#FF8C00',
-             'darkorchid': '#9932CC',
-             'darkred': '#8B0000',
-             'darksalmon': '#E9967A',
-             'darkslateblue': '#483D8B',
-             'darkslategrey': '#2F4F4F',
-             'darkviolet': '#9400D3',
-             'deeppink': '#FF1493',
-             'dodgerblue': '#1E90FF',
-             'firebrick': '#B22222',
-             'floralwhite': '#FFFAF0',
-             'forestgreen': '#228B22',
-             'fuchsia': '#FF00FF',
-             'gainsboro': '#DCDCDC',
-             'ghostwhite': '#F8F8FF',
-             'gold': '#FFD700',
-             'goldenrod': '#DAA520',
-             'indianred ': '#CD5C5C',
-             'indigo  ': '#4B0082',
-             'khaki': '#F0E68C',
-             'lavenderblush': '#FFF0F5',
-             'lawngreen': '#7CFC00',
-             'lightblue': '#ADD8E6',
-             'lightcoral': '#F08080',
-             'lightgoldenrodyellow': '#FAFAD2',
-             'lightgray': '#D3D3D3',
-             'lightgrey': '#D3D3D3',
-             'lightskyblue': '#87CEFA',
-             'lightslategrey': '#778899',
-             'lightsteelblue': '#B0C4DE',
-             'lime': '#87CEFA',
-             'linen': '#FAF0E6',
-             'magenta': '#FF00FF',
-             'maroon': '#800000',
-             'mediumaquamarine': '#66CDAA',
-             'mediumblue': '#0000CD',
-             'mediumorchid': '#BA55D3',
-             'mediumpurple': '#9370D8',
-             'mediumseagreen': '#3CB371',
-             'mediumslateblue': '#7B68EE',
-             'midnightblue': '#191970',
-             'moccasin': '#FFE4B5',
-             'navajowhite': '#FFDEAD',
-             'navy': '#000080',
-             'oldlace': '#FDF5E6',
-             'olive': '#808000',
-             'orange': '#FFA500',
-             'orangered': '#FF4500',
-             'orchid': '#DA70D6',
-             'paleturquoise': '#AFEEEE',
-             'papayawhip': '#FFEFD5',
-             'peachpuff': '#FFDAB9',
-             'powderblue': '#B0E0E6',
-             'rosybrown': '#BC8F8F',
-             'royalblue': '#4169E1',
-             'saddlebrown': '#8B4513',
-             'sandybrown': '#8B4513',
-             'seashell': '#FFF5EE',
-             'sienna': '#A0522D',
-             'silver': '#C0C0C0',
-             'skyblue': '#87CEEB',
-             'slategrey': '#708090',
-             'snow': '#FFFAFA',
-             'springgreen': '#00FF7F',
-             'violet': '#EE82EE',
-             'yellowgreen': '#9ACD32'
-            }
+            'aliceblue': '#F0F8FF',
+            'antiquewhite': '#FAEBD7',
+            'aqua': '#00FFFF',
+            'aquamarine': '#7FFFD4',
+            'azure': '#F0FFFF',
+            'beige': '#F5F5DC',
+            'bisque': '#FFE4C4',
+            'black': '#000000',
+            'blanchedalmond': '#FFEBCD',
+            'blue': '#0000FF',
+            'brown': '#A52A2A',
+            'burlywood': '#DEB887',
+            'cadetblue': '#5F9EA0',
+            'chartreuse': '#7FFF00',
+            'chocolate': '#D2691E',
+            'coral': '#FF7F50',
+            'crimson': '#DC143C',
+            'cyan': '#00FFFF',
+            'darkblue': '#00008B',
+            'darkgoldenrod': '#B8860B',
+            'darkgreen': '#006400',
+            'darkkhaki': '#BDB76B',
+            'darkmagenta': '#8B008B',
+            'darkolivegreen': '#556B2F',
+            'darkorange': '#FF8C00',
+            'darkorchid': '#9932CC',
+            'darkred': '#8B0000',
+            'darksalmon': '#E9967A',
+            'darkslateblue': '#483D8B',
+            'darkslategrey': '#2F4F4F',
+            'darkviolet': '#9400D3',
+            'deeppink': '#FF1493',
+            'dodgerblue': '#1E90FF',
+            'firebrick': '#B22222',
+            'floralwhite': '#FFFAF0',
+            'forestgreen': '#228B22',
+            'fuchsia': '#FF00FF',
+            'gainsboro': '#DCDCDC',
+            'ghostwhite': '#F8F8FF',
+            'gold': '#FFD700',
+            'goldenrod': '#DAA520',
+            'indianred ': '#CD5C5C',
+            'indigo  ': '#4B0082',
+            'khaki': '#F0E68C',
+            'lavenderblush': '#FFF0F5',
+            'lawngreen': '#7CFC00',
+            'lightblue': '#ADD8E6',
+            'lightcoral': '#F08080',
+            'lightgoldenrodyellow': '#FAFAD2',
+            'lightgray': '#D3D3D3',
+            'lightgrey': '#D3D3D3',
+            'lightskyblue': '#87CEFA',
+            'lightslategrey': '#778899',
+            'lightsteelblue': '#B0C4DE',
+            'lime': '#87CEFA',
+            'linen': '#FAF0E6',
+            'magenta': '#FF00FF',
+            'maroon': '#800000',
+            'mediumaquamarine': '#66CDAA',
+            'mediumblue': '#0000CD',
+            'mediumorchid': '#BA55D3',
+            'mediumpurple': '#9370D8',
+            'mediumseagreen': '#3CB371',
+            'mediumslateblue': '#7B68EE',
+            'midnightblue': '#191970',
+            'moccasin': '#FFE4B5',
+            'navajowhite': '#FFDEAD',
+            'navy': '#000080',
+            'oldlace': '#FDF5E6',
+            'olive': '#808000',
+            'orange': '#FFA500',
+            'orangered': '#FF4500',
+            'orchid': '#DA70D6',
+            'paleturquoise': '#AFEEEE',
+            'papayawhip': '#FFEFD5',
+            'peachpuff': '#FFDAB9',
+            'powderblue': '#B0E0E6',
+            'rosybrown': '#BC8F8F',
+            'royalblue': '#4169E1',
+            'saddlebrown': '#8B4513',
+            'sandybrown': '#8B4513',
+            'seashell': '#FFF5EE',
+            'sienna': '#A0522D',
+            'silver': '#C0C0C0',
+            'skyblue': '#87CEEB',
+            'slategrey': '#708090',
+            'snow': '#FFFAFA',
+            'springgreen': '#00FF7F',
+            'violet': '#EE82EE',
+            'yellowgreen': '#9ACD32'
+}
 
 hex_pat = re.compile(r'#(\d{2})(\d{2})(\d{2})')
 rgb_pat = re.compile(r'rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)', re.IGNORECASE)
diff --git a/src/calibre/ebooks/lrf/html/convert_from.py b/src/calibre/ebooks/lrf/html/convert_from.py
index c4169d9a32..a1e7b8731c 100644
--- a/src/calibre/ebooks/lrf/html/convert_from.py
+++ b/src/calibre/ebooks/lrf/html/convert_from.py
@@ -46,12 +46,12 @@ from calibre.ptempfile import PersistentTemporaryFile
 from polyglot.builtins import itervalues, string_or_bytes
 from polyglot.urllib import unquote, urlparse
 
-"""
+'''
 Code to convert HTML ebooks into LRF ebooks.
 
 I am indebted to esperanc for the initial CSS->Xylog Style conversion code
 and to Falstaff for pylrs.
-"""
+'''
 
 from PIL import Image as PILImage
 
@@ -98,7 +98,7 @@ def tag_regex(tagname):
 
 
 class HTMLConverter:
-    SELECTOR_PAT   = re.compile(r"([A-Za-z0-9\-\_\:\.]+[A-Za-z0-9\-\_\:\.\s\,]*)\s*\{([^\}]*)\}")
+    SELECTOR_PAT   = re.compile(r'([A-Za-z0-9\-\_\:\.]+[A-Za-z0-9\-\_\:\.\s\,]*)\s*\{([^\}]*)\}')
     PAGE_BREAK_PAT = re.compile(r'page-break-(?:after|before)\s*:\s*(\w+)', re.IGNORECASE)
     IGNORED_TAGS   = (Comment, Declaration, ProcessingInstruction)
 
@@ -108,7 +108,7 @@ class HTMLConverter:
                          lambda match: '<a'+match.group(1)+'></a>'),
                         # Strip comments from <style> tags. This is needed as
                         # sometimes there are unterminated comments
-                        (re.compile(r"<\s*style.*?>(.*?)<\/\s*style\s*>", re.DOTALL|re.IGNORECASE),
+                        (re.compile(r'<\s*style.*?>(.*?)</\s*style\s*>', re.DOTALL|re.IGNORECASE),
                          lambda match: match.group().replace('<!--', '').replace('-->', '')),
                         # remove <p> tags from within <a href> tags
                         (re.compile(r'<\s*a\s+[^<>]*href\s*=[^<>]*>(.*?)<\s*/\s*a\s*>', re.DOTALL|re.IGNORECASE),
@@ -153,7 +153,7 @@ class HTMLConverter:
                   # Remove <br> and replace <br><br> with <p>
                   (re.compile(r'<br.*?>\s*<br.*?>', re.IGNORECASE), lambda match: '<p>'),
                   (re.compile(r'(.*)<br.*?>', re.IGNORECASE),
-                   lambda match: match.group() if re.match('<', match.group(1).lstrip()) or len(match.group(1)) < 40
+                   lambda match: match.group() if match.group(1).lstrip().startswith('<') or len(match.group(1)) < 40
                                 else match.group(1)),
                   # Remove hyphenation
                   (re.compile(r'-\n\r?'), lambda match: ''),
@@ -163,7 +163,7 @@ class HTMLConverter:
     # Fix Book Designer markup
     BOOK_DESIGNER = [
                      # HR
-                     (re.compile('<hr>', re.IGNORECASE),
+                     (re.compile(r'<hr>', re.IGNORECASE),
                       lambda match : '<span style="page-break-after:always"> </span>'),
                      # Create header tags
                      (re.compile(r'<h2[^><]*?id=BookTitle[^><]*?(align=)*(?(1)(\w+))*[^><]*?>[^><]*?</h2>', re.IGNORECASE),
@@ -196,28 +196,28 @@ class HTMLConverter:
             object.__setattr__(self, attr, val)
 
     CSS = {
-           'h1'     : {"font-size"   : "xx-large", "font-weight":"bold", 'text-indent':'0pt'},
-           'h2'     : {"font-size"   : "x-large", "font-weight":"bold", 'text-indent':'0pt'},
-           'h3'     : {"font-size"   : "large", "font-weight":"bold", 'text-indent':'0pt'},
-           'h4'     : {"font-size"   : "large", 'text-indent':'0pt'},
-           'h5'     : {"font-weight" : "bold", 'text-indent':'0pt'},
-           'b'      : {"font-weight" : "bold"},
-           'strong' : {"font-weight" : "bold"},
-           'i'      : {"font-style"  : "italic"},
-           'cite'   : {'font-style'  : 'italic'},
-           'em'     : {"font-style"  : "italic"},
-           'small'  : {'font-size'   : 'small'},
-           'pre'    : {'font-family' : 'monospace', 'white-space': 'pre'},
-           'code'   : {'font-family' : 'monospace'},
-           'tt'     : {'font-family' : 'monospace'},
-           'center' : {'text-align'  : 'center'},
-           'th'     : {'font-size'   : 'large', 'font-weight':'bold'},
-           'big'    : {'font-size'   : 'large', 'font-weight':'bold'},
-           '.libprs500_dropcaps' : {'font-size': 'xx-large'},
-           'u'      : {'text-decoration': 'underline'},
-           'sup'    : {'vertical-align': 'super', 'font-size': '60%'},
-           'sub'    : {'vertical-align': 'sub', 'font-size': '60%'},
-           }
+            'h1'     : {'font-size'   : 'xx-large', 'font-weight':'bold', 'text-indent':'0pt'},
+            'h2'     : {'font-size'   : 'x-large', 'font-weight':'bold', 'text-indent':'0pt'},
+            'h3'     : {'font-size'   : 'large', 'font-weight':'bold', 'text-indent':'0pt'},
+            'h4'     : {'font-size'   : 'large', 'text-indent':'0pt'},
+            'h5'     : {'font-weight' : 'bold', 'text-indent':'0pt'},
+            'b'      : {'font-weight' : 'bold'},
+            'strong' : {'font-weight' : 'bold'},
+            'i'      : {'font-style'  : 'italic'},
+            'cite'   : {'font-style'  : 'italic'},
+            'em'     : {'font-style'  : 'italic'},
+            'small'  : {'font-size'   : 'small'},
+            'pre'    : {'font-family' : 'monospace', 'white-space': 'pre'},
+            'code'   : {'font-family' : 'monospace'},
+            'tt'     : {'font-family' : 'monospace'},
+            'center' : {'text-align'  : 'center'},
+            'th'     : {'font-size'   : 'large', 'font-weight':'bold'},
+            'big'    : {'font-size'   : 'large', 'font-weight':'bold'},
+            '.libprs500_dropcaps' : {'font-size': 'xx-large'},
+            'u'      : {'text-decoration': 'underline'},
+            'sup'    : {'vertical-align': 'super', 'font-size': '60%'},
+            'sub'    : {'vertical-align': 'sub', 'font-size': '60%'},
+    }
 
     def __init__(self, book, fonts, options, logger, paths):
         '''
@@ -279,7 +279,7 @@ class HTMLConverter:
             if isinstance(src, bytes):
                 src = src.decode('utf-8', 'replace')
             match = self.PAGE_BREAK_PAT.search(src)
-            if match and not re.match('avoid', match.group(1), re.IGNORECASE):
+            if match and not re.match(r'avoid', match.group(1), re.IGNORECASE):
                 self.page_break_found = True
             ncss, npcss = self.parse_css(src)
             if ncss:
@@ -324,10 +324,10 @@ class HTMLConverter:
 
     def is_baen(self, soup):
         return bool(soup.find('meta', attrs={'name':'Publisher',
-                        'content':re.compile('Baen', re.IGNORECASE)}))
+                        'content':re.compile(r'Baen', re.IGNORECASE)}))
 
     def is_book_designer(self, raw):
-        return bool(re.search('<H2[^><]*id=BookTitle', raw))
+        return bool(re.search(r'<H2[^><]*id=BookTitle', raw))
 
     def preprocess(self, raw):
         nmassage = []
@@ -409,12 +409,12 @@ class HTMLConverter:
         self.processed_files.append(path)
 
     def parse_css(self, style):
-        """
+        '''
         Parse the contents of a <style> tag or .css file.
         @param style: C{str(style)} should be the CSS to parse.
         @return: A dictionary with one entry per selector where the key is the
         selector name and the value is a dictionary of properties
-        """
+        '''
         sdict, pdict = {}, {}
         style = re.sub(r'/\*.*?\*/', '', style)  # Remove /*...*/ comments
         for sel in re.findall(HTMLConverter.SELECTOR_PAT, style):
@@ -440,13 +440,13 @@ class HTMLConverter:
         return sdict, pdict
 
     def parse_style_properties(self, props):
-        """
+        '''
         Parses a style attribute. The code within a CSS selector block or in
         the style attribute of an HTML element.
         @return: A dictionary with one entry for each property where the key
                 is the property name and the value is the property value.
-        """
-        prop = dict()
+        '''
+        prop = {}
         for s in props.split(';'):
             l = s.split(':',1)
             if len(l)==2:
@@ -456,9 +456,9 @@ class HTMLConverter:
         return prop
 
     def tag_css(self, tag, parent_css={}):
-        """
+        '''
         Return a dictionary of style properties applicable to Tag tag.
-        """
+        '''
         def merge_parent_css(prop, pcss):
             # float should not be inherited according to the CSS spec
             # however we need to as we don't do alignment at a block level.
@@ -479,29 +479,29 @@ class HTMLConverter:
         tagname = tag.name.lower()
         if parent_css:
             merge_parent_css(prop, parent_css)
-        if tag.has_attr("align"):
+        if tag.has_attr('align'):
             al = tag['align'].lower()
             if al in ('left', 'right', 'center', 'justify'):
-                prop["text-align"] = al
+                prop['text-align'] = al
         if tagname in self.css:
             prop.update(self.css[tagname])
         if tagname in self.pseudo_css:
             pprop.update(self.pseudo_css[tagname])
-        if tag.has_attr("class"):
+        if tag.has_attr('class'):
             cls = tag['class']
             if isinstance(cls, list):
                 cls = ' '.join(cls)
             cls = cls.lower()
             for cls in cls.split():
-                for classname in ["."+cls, tagname+"."+cls]:
+                for classname in ['.'+cls, tagname+'.'+cls]:
                     if classname in self.css:
                         prop.update(self.css[classname])
                     if classname in self.pseudo_css:
                         pprop.update(self.pseudo_css[classname])
         if tag.has_attr('id') and tag['id'] in self.css:
             prop.update(self.css[tag['id']])
-        if tag.has_attr("style"):
-            prop.update(self.parse_style_properties(tag["style"]))
+        if tag.has_attr('style'):
+            prop.update(self.parse_style_properties(tag['style']))
         return prop, pprop
 
     def parse_file(self, soup):
@@ -614,7 +614,7 @@ class HTMLConverter:
                hasattr(target.parent, 'objId'):
                 self.book.addTocEntry(ascii_text, tb)
             else:
-                self.log.debug("Cannot add link %s to TOC"%ascii_text)
+                self.log.debug('Cannot add link %s to TOC'%ascii_text)
 
         def get_target_block(fragment, targets):
             '''Return the correct block for the <a name> element'''
@@ -644,7 +644,7 @@ class HTMLConverter:
                 ans = ntb
 
             if found:
-                targets[fragment] =  ans
+                targets[fragment] = ans
                 page.contents.remove(bs)
             return ans
 
@@ -689,10 +689,10 @@ class HTMLConverter:
                     self.book.addTocEntry(ascii_text, self.targets[url])
 
     def end_page(self):
-        """
+        '''
         End the current page, ensuring that any further content is displayed
         on a new page.
-        """
+        '''
         if self.current_para.has_text():
             self.current_para.append_to(self.current_block)
             self.current_para = Paragraph()
@@ -726,7 +726,7 @@ class HTMLConverter:
             self.book.append(page)
 
     def process_children(self, ptag, pcss, ppcss={}):
-        """ Process the children of ptag """
+        ''' Process the children of ptag '''
         # Need to make a copy of contents as when
         # extract is called on a child, it will
         # mess up the iteration.
@@ -748,10 +748,10 @@ class HTMLConverter:
         val = css['text-align'].lower() if 'text-align' in css else None
         align = 'head'
         if val is not None:
-            if val in ["right", "foot"]:
-                align = "foot"
-            elif val == "center":
-                align = "center"
+            if val in ['right', 'foot']:
+                align = 'foot'
+            elif val == 'center':
+                align = 'center'
         if 'float' in css:
             val = css['float'].lower()
             if val == 'left':
@@ -803,7 +803,7 @@ class HTMLConverter:
             src = src.lstrip()
             f = src[0]
             next = 1
-            if f in ("'", '"', '\u201c', '\u2018', '\u201d', '\u2019'):
+            if f in ("'", '"', '“', '‘', '”', '’'):
                 if len(src) >= 2:
                     next = 2
                     f = src[:2]
@@ -819,7 +819,7 @@ class HTMLConverter:
 
         def append_text(src):
             fp, key, variant = self.font_properties(css)
-            for x, y in [('\xad', ''), ('\xa0', ' '), ('\ufb00', 'ff'), ('\ufb01', 'fi'), ('\ufb02', 'fl'), ('\ufb03', 'ffi'), ('\ufb04', 'ffl')]:
+            for x, y in [('\xad', ''), ('\xa0', ' '), ('ff', 'ff'), ('fi', 'fi'), ('fl', 'fl'), ('ffi', 'ffi'), ('ffl', 'ffl')]:
                 src = src.replace(x, y)
 
             def valigner(x):
@@ -828,7 +828,7 @@ class HTMLConverter:
                 valign = css['vertical-align']
                 if valign in ('sup', 'super', 'sub'):
                     fp['fontsize'] = int(fp['fontsize']) * 5 // 3
-                    valigner = Sub if valign == 'sub' else Sup  # noqa
+                    valigner = Sub if valign == 'sub' else Sup
             normal_font_size = int(fp['fontsize'])
 
             if variant == 'small-caps':
@@ -1152,10 +1152,10 @@ class HTMLConverter:
 
         def font_weight(val):
             ans = 0
-            m = re.search("([0-9]+)", val)
+            m = re.search(r'([0-9]+)', val)
             if m:
                 ans = int(m.group(1))
-            elif val.find("bold") >= 0 or val.find("strong") >= 0:
+            elif val.find('bold') >= 0 or val.find('strong') >= 0:
                 ans = 700
             return 'bold' if ans >= 700 else 'normal'
 
@@ -1167,10 +1167,10 @@ class HTMLConverter:
 
         def font_family(val):
             ans = 'serif'
-            if max(val.find("courier"), val.find("mono"), val.find("fixed"), val.find("typewriter"))>=0:
+            if max(val.find('courier'), val.find('mono'), val.find('fixed'), val.find('typewriter'))>=0:
                 ans = 'mono'
-            elif max(val.find("arial"), val.find("helvetica"), val.find("verdana"),
-                 val.find("trebuchet"), val.find("sans")) >= 0:
+            elif max(val.find('arial'), val.find('helvetica'), val.find('verdana'),
+                 val.find('trebuchet'), val.find('sans')) >= 0:
                 ans = 'sans'
             return ans
 
@@ -1201,29 +1201,29 @@ class HTMLConverter:
                 if ans <= 0:
                     ans += normal
                     if ans == 0:  # Common case of using -1em to mean "smaller"
-                        ans = int(font_size("smaller"))
+                        ans = int(font_size('smaller'))
                     if ans < 0:
                         ans = normal
             else:
                 if ans == 0:
-                    ans = int(font_size("smaller"))
-                elif "smaller" in val:
+                    ans = int(font_size('smaller'))
+                elif 'smaller' in val:
                     ans = normal - 20
-                elif "xx-small" in val:
+                elif 'xx-small' in val:
                     ans = 40
-                elif "x-small" in val:
+                elif 'x-small' in val:
                     ans = 60
-                elif "small" in val:
+                elif 'small' in val:
                     ans = 80
-                elif "medium" in val:
+                elif 'medium' in val:
                     ans = 100
-                elif "larger" in val:
+                elif 'larger' in val:
                     ans = normal + 20
-                elif "xx-large" in val:
+                elif 'xx-large' in val:
                     ans = 180
-                elif "x-large" in val:
+                elif 'x-large' in val:
                     ans = 140
-                elif "large" in val:
+                elif 'large' in val:
                     ans = 120
             if ans is not None:
                 ans += int(self.font_delta * 20)
@@ -1259,7 +1259,7 @@ class HTMLConverter:
                         break
             elif key in ['font-family', 'font-name']:
                 family = font_family(val)
-            elif key == "font-size":
+            elif key == 'font-size':
                 ans = font_size(val)
                 if ans:
                     t['fontsize'] = ans
@@ -1299,7 +1299,7 @@ class HTMLConverter:
             result = int(val)
         except ValueError:
             pass
-        m = re.search(r"\s*(-*[0-9]*\.?[0-9]*)\s*(%|em|px|mm|cm|in|dpt|pt|pc)", val)
+        m = re.search(r'\s*(-*[0-9]*\.?[0-9]*)\s*(%|em|px|mm|cm|in|dpt|pt|pc)', val)
 
         if m is not None and m.group(1):
             unit = float(m.group(1))
@@ -1481,7 +1481,7 @@ class HTMLConverter:
 
         end_page = self.process_page_breaks(tag, tagname, tag_css)
         try:
-            if tagname in ["title", "script", "meta", 'del', 'frameset']:
+            if tagname in ['title', 'script', 'meta', 'del', 'frameset']:
                 pass
             elif tagname == 'a' and self.link_levels >= 0:
                 if tag.has_attr('href') and not self.link_exclude.match(tag['href']):
@@ -1498,7 +1498,7 @@ class HTMLConverter:
                             else:
                                 text = self.get_text(tag, limit=1000)
                                 if not text.strip():
-                                    text = "Link"
+                                    text = 'Link'
                                 self.add_text(text, tag_css, {}, force_span_use=True)
                                 self.links.append(self.create_link(self.current_para.contents, tag))
                                 if tag.has_attr('id') or tag.has_attr('name'):
@@ -1530,7 +1530,7 @@ class HTMLConverter:
                     elif not urlparse(tag['src'])[0]:
                         self.log.warn('Could not find image: '+tag['src'])
                 else:
-                    self.log.debug("Failed to process: %s"%str(tag))
+                    self.log.debug('Failed to process: %s'%str(tag))
             elif tagname in ['style', 'link']:
                 ncss, npcss = {}, {}
                 if tagname == 'style':
@@ -1538,13 +1538,13 @@ class HTMLConverter:
                     css, pcss = self.parse_css(text)
                     ncss.update(css)
                     npcss.update(pcss)
-                elif (tag.has_attr('type') and tag['type'] in ("text/css", "text/x-oeb1-css") and tag.has_attr('href')):
+                elif (tag.has_attr('type') and tag['type'] in ('text/css', 'text/x-oeb1-css') and tag.has_attr('href')):
                     path = munge_paths(self.target_prefix, tag['href'])[0]
                     try:
                         with open(path, 'rb') as f:
                             src = f.read().decode('utf-8', 'replace')
                         match = self.PAGE_BREAK_PAT.search(src)
-                        if match and not re.match('avoid', match.group(1), re.IGNORECASE):
+                        if match and not re.match(r'avoid', match.group(1), re.IGNORECASE):
                             self.page_break_found = True
                         ncss, npcss = self.parse_css(src)
                     except OSError:
@@ -1624,7 +1624,7 @@ class HTMLConverter:
                             in_ol = parent.name.lower() == 'ol'
                             break
                         parent = parent.parent
-                    prepend = str(self.list_counter)+'. ' if in_ol else '\u2022' + ' '
+                    prepend = str(self.list_counter)+'. ' if in_ol else '•' + ' '
                     self.current_para.append(Span(prepend))
                     self.process_children(tag, tag_css, tag_pseudo_css)
                     if in_ol:
@@ -1706,7 +1706,7 @@ class HTMLConverter:
 
                 self.process_children(tag, tag_css, tag_pseudo_css)
 
-                if self.current_para.contents :
+                if self.current_para.contents:
                     self.current_block.append(self.current_para)
                 self.current_para = Paragraph()
                 if tagname.startswith('h') or self.blank_after_para:
@@ -1815,13 +1815,13 @@ def process_file(path, options, logger):
             try:
                 cim = im.resize((width, height), PILImage.BICUBIC).convert('RGB') if \
                       scaled else im
-                cf = PersistentTemporaryFile(prefix=__appname__+"_", suffix=".jpg")
+                cf = PersistentTemporaryFile(prefix=__appname__+'_', suffix='.jpg')
                 cf.close()
                 cim.convert('RGB').save(cf.name)
                 options.cover = cf.name
 
                 tim = im.resize((int(0.75*th), th), PILImage.Resampling.LANCZOS).convert('RGB')
-                tf = PersistentTemporaryFile(prefix=__appname__+'_', suffix=".jpg")
+                tf = PersistentTemporaryFile(prefix=__appname__+'_', suffix='.jpg')
                 tf.close()
                 tim.save(tf.name)
                 tpath = tf.name
@@ -1861,19 +1861,19 @@ def process_file(path, options, logger):
         if not options.author:
             options.author = _('Unknown')
         if not fheader:
-            fheader = "%t by %a"
+            fheader = '%t by %a'
         fheader = re.sub(r'(?<!%)%t', options.title, fheader)
         fheader = re.sub(r'(?<!%)%a', options.author, fheader)
-        fheader = re.sub(r'%%a','%a',fheader)
-        fheader = re.sub(r'%%t','%t',fheader)
-        header.append(fheader + "  ")
+        fheader = fheader.replace('%%a', '%a')
+        fheader = fheader.replace('%%t', '%t')
+        header.append(fheader + '  ')
     book, fonts = Book(options, logger, header=header, **args)
     le = re.compile(options.link_exclude) if options.link_exclude else \
-         re.compile('$')
+         re.compile(r'$')
     pb = re.compile(options.page_break, re.IGNORECASE) if options.page_break else \
-         re.compile('$')
+         re.compile(r'$')
     fpb = re.compile(options.force_page_break, re.IGNORECASE) if options.force_page_break else \
-         re.compile('$')
+         re.compile(r'$')
     cq = options.chapter_attr.split(',')
     if len(cq) < 3:
         raise ValueError('The --chapter-attr setting must have 2 commas.')
diff --git a/src/calibre/ebooks/lrf/html/table.py b/src/calibre/ebooks/lrf/html/table.py
index 2568893722..1f968601ca 100644
--- a/src/calibre/ebooks/lrf/html/table.py
+++ b/src/calibre/ebooks/lrf/html/table.py
@@ -145,7 +145,7 @@ class Cell:
             if not token.strip():
                 continue
             word = token.split()
-            word = word[0] if word else ""
+            word = word[0] if word else ''
             fl, ft, fr, fb = font.getbbox(word)
             width = fr - fl
             if width > mwidth:
@@ -213,7 +213,7 @@ class Row:
     def __init__(self, conv, row, css, colpad):
         self.cells = []
         self.colpad = colpad
-        cells = row.findAll(re.compile('td|th', re.IGNORECASE))
+        cells = row.findAll(re.compile(r'td|th', re.IGNORECASE))
         self.targets = []
         for cell in cells:
             ccss = conv.tag_css(cell, css)[0]
@@ -244,7 +244,7 @@ class Row:
         i = -1
         cell = None
         for cell in self.cells:
-            for k in range(0, cell.colspan):
+            for k in range(cell.colspan):
                 if i == col:
                     break
                 i += 1
diff --git a/src/calibre/ebooks/lrf/input.py b/src/calibre/ebooks/lrf/input.py
index 5d46a201be..876e9de36c 100644
--- a/src/calibre/ebooks/lrf/input.py
+++ b/src/calibre/ebooks/lrf/input.py
@@ -66,8 +66,8 @@ class Canvas(etree.XSLTExtension):
         div = etree.Element('div')
         div.set('id', input_node.get('objid', 'scuzzy'))
         div.set('class', 'image_page')
-        width = self.styles.to_num(block.get("xsize", None))
-        height = self.styles.to_num(block.get("ysize", None))
+        width = self.styles.to_num(block.get('xsize', None))
+        height = self.styles.to_num(block.get('ysize', None))
         img = div.makeelement('img')
         if width is not None:
             img.set('width', str(int(width)))
@@ -177,7 +177,7 @@ class TextBlock(etree.XSLTExtension):
 
         self.log.warn('Found deeply nested spans. Flattening.')
         # with open('/t/before.xml', 'wb') as f:
-        #    f.write(etree.tostring(node, method='xml'))
+        #     f.write(etree.tostring(node, method='xml'))
 
         spans = [(depth(span), span) for span in node.xpath('descendant::Span')]
         spans.sort(key=operator.itemgetter(0), reverse=True)
@@ -197,7 +197,7 @@ class TextBlock(etree.XSLTExtension):
             pattrib = dict(**p.attrib) if p.tag == 'Span' else {}
             for child in children:
                 p.remove(child)
-                if pattrib and child.tag == "Span":
+                if pattrib and child.tag == 'Span':
                     attrib = copy(pattrib)
                     attrib.update(child.attrib)
                     child.attrib.update(attrib)
@@ -206,7 +206,7 @@ class TextBlock(etree.XSLTExtension):
                 gp.insert(pidx+1, child)
 
         # with open('/t/after.xml', 'wb') as f:
-        #    f.write(etree.tostring(node, method='xml'))
+        #     f.write(etree.tostring(node, method='xml'))
 
     def add_text(self, text):
         if text:
@@ -300,7 +300,7 @@ class Styles(etree.XSLTExtension):
 
         with open(name, 'wb') as f:
             f.write(as_bytes(self.CSS))
-            for (w, sel) in [(self.text_styles, 'ts'), (self.block_styles,
+            for w,sel in [(self.text_styles, 'ts'), (self.block_styles,
                 'bs')]:
                 for i, s in enumerate(w):
                     if not s:
@@ -377,8 +377,8 @@ class Styles(etree.XSLTExtension):
             ans['font-weight'] = ('bold' if fw >= 700 else 'normal')
         # fn = getattr(obj, 'fontfacename', None)
         # if fn is not None:
-        #    fn = cls.FONT_MAP[fn]
-        #    item('font-family: %s;'%fn)
+        #     fn = cls.FONT_MAP[fn]
+        #     item('font-family: %s;'%fn)
         fg = self.color(node.get('textcolor', None))
         if fg is not None:
             ans['color'] = fg
@@ -391,7 +391,7 @@ class Styles(etree.XSLTExtension):
             ans['text-align'] = all.get(al, 'left')
         # lh = self.to_num(node.get('linespace', None), 0.1)
         # if lh is not None:
-        #    ans['line-height'] = '%fpt'%lh
+        #     ans['line-height'] = '%fpt'%lh
         pi = self.to_num(node.get('parindent', None), 0.1)
         if pi is not None:
             ans['text-indent'] = '%fpt'%pi
diff --git a/src/calibre/ebooks/lrf/lrfparser.py b/src/calibre/ebooks/lrf/lrfparser.py
index 44bf1f80f3..59837c1718 100644
--- a/src/calibre/ebooks/lrf/lrfparser.py
+++ b/src/calibre/ebooks/lrf/lrfparser.py
@@ -49,8 +49,8 @@ class LRFDocument(LRFMetaFile):
     def _parse_objects(self):
         self.objects = {}
         self._file.seek(self.object_index_offset)
-        obj_array = array.array("I", self._file.read(4*4*self.number_of_objects))
-        if ord(array.array("i",[1]).tobytes()[0:1])==0:  # big-endian
+        obj_array = array.array('I', self._file.read(4*4*self.number_of_objects))
+        if ord(array.array('i',[1]).tobytes()[0:1])==0:  # big-endian
             obj_array.byteswap()
         for i in range(self.number_of_objects):
             if not self.keep_parsing:
@@ -163,7 +163,7 @@ def main(args=sys.argv, logger=None):
         parser.print_help()
         return 1
     if opts.out is None:
-        opts.out = os.path.join(os.path.dirname(args[1]), os.path.splitext(os.path.basename(args[1]))[0]+".lrs")
+        opts.out = os.path.join(os.path.dirname(args[1]), os.path.splitext(os.path.basename(args[1]))[0]+'.lrs')
     logger.info(_('Parsing LRF...'))
     d = LRFDocument(open(args[1], 'rb'))
     d.parse()
diff --git a/src/calibre/ebooks/lrf/lrs/convert_from.py b/src/calibre/ebooks/lrf/lrs/convert_from.py
index f1fed2806c..821a60f32a 100644
--- a/src/calibre/ebooks/lrf/lrs/convert_from.py
+++ b/src/calibre/ebooks/lrf/lrs/convert_from.py
@@ -80,15 +80,15 @@ class LrsParser:
 
     def text_tag_to_element(self, tag):
         map = {
-               'span'    : Span,
-               'italic'  : Italic,
-               'bold'    : Bold,
-               'empline' : EmpLine,
-               'sup'     : Sup,
-               'sub'     : Sub,
-               'cr'      : CR,
-               'drawchar': DropCaps,
-               }
+            'span'    : Span,
+            'italic'  : Italic,
+            'bold'    : Bold,
+            'empline' : EmpLine,
+            'sup'     : Sup,
+            'sub'     : Sub,
+            'cr'      : CR,
+            'drawchar': DropCaps,
+        }
         if tag.name == 'charbutton':
             return CharButton(self.parsed_objects[tag.get('refobj')], None)
         if tag.name == 'plot':
@@ -108,7 +108,7 @@ class LrsParser:
 
     def process_paragraph(self, tag):
         p = Paragraph()
-        contents = [i for i in tag.contents]
+        contents = list(tag.contents)
         if contents:
             if isinstance(contents[0], NavigableString):
                 contents[0] = contents[0].string.lstrip()
@@ -252,7 +252,7 @@ class LrsParser:
             tag = base.find(tagname.lower())
             if tag is None:
                 return ('', '', '')
-            tag = (self.tag_to_string(tag), tag.get('reading') if 'reading' in tag else '')  # noqa
+            tag = (self.tag_to_string(tag), tag.get('reading') if 'reading' in tag else '')
             return tag
 
         title          = me(bookinfo, 'Title')
@@ -327,7 +327,7 @@ def main(args=sys.argv, logger=None):
         warnings.defaultaction = 'error'
 
     logger.info('Parsing LRS file...')
-    converter =  LrsParser(open(args[1], 'rb'), logger)
+    converter = LrsParser(open(args[1], 'rb'), logger)
     logger.info('Writing to output file...')
     converter.render(opts.output, to_lrs=opts.lrs)
     logger.info('Output written to '+opts.output)
diff --git a/src/calibre/ebooks/lrf/meta.py b/src/calibre/ebooks/lrf/meta.py
index 7893c66fb7..435c0a7a54 100644
--- a/src/calibre/ebooks/lrf/meta.py
+++ b/src/calibre/ebooks/lrf/meta.py
@@ -1,7 +1,7 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 
-"""
+'''
 This module presents an easy to use interface for getting and setting
 meta information in LRF files.
 Just create an L{LRFMetaFile} object and use its properties
@@ -10,7 +10,7 @@ to get and set meta information. For example:
 >>> lrf = LRFMetaFile("mybook.lrf")
 >>> print(lrf.title, lrf.author)
 >>> lrf.category = "History"
-"""
+'''
 
 import io
 import os
@@ -26,23 +26,23 @@ from calibre.ebooks.metadata import MetaInformation, string_to_authors
 from calibre.utils.cleantext import clean_xml_chars
 from polyglot.builtins import string_or_bytes
 
-BYTE      = "<B"  #: Unsigned char little endian encoded in 1 byte
-WORD      = "<H"  #: Unsigned short little endian encoded in 2 bytes
-DWORD     = "<I"  #: Unsigned integer little endian encoded in 4 bytes
-QWORD     = "<Q"  #: Unsigned long long little endian encoded in 8 bytes
+BYTE      = '<B'  #: Unsigned char little endian encoded in 1 byte
+WORD      = '<H'  #: Unsigned short little endian encoded in 2 bytes
+DWORD     = '<I'  #: Unsigned integer little endian encoded in 4 bytes
+QWORD     = '<Q'  #: Unsigned long long little endian encoded in 8 bytes
 
 
 class field:
-    """ A U{Descriptor<http://www.cafepy.com/article/python_attributes_and_methods/python_attributes_and_methods.html>}, that implements access
+    ''' A U{Descriptor<http://www.cafepy.com/article/python_attributes_and_methods/python_attributes_and_methods.html>}, that implements access
     to protocol packets in a human readable way.
-    """
+    '''
 
     def __init__(self, start=16, fmt=DWORD):
-        """
+        '''
         @param start: The byte at which this field is stored in the buffer
         @param fmt:   The packing format for this field.
         See U{struct<http://docs.python.org/lib/module-struct.html>}.
-        """
+        '''
         self._fmt, self._start = fmt, start
 
     def __get__(self, obj, typ=None):
@@ -53,9 +53,7 @@ class field:
 
     def __repr__(self):
         typ = {DWORD: 'unsigned int', 'QWORD': 'unsigned long long', BYTE: 'unsigned char', WORD: 'unsigned short'}.get(self._fmt, '')
-        return "An " + typ + " stored in " + \
-        str(struct.calcsize(self._fmt)) + \
-        " bytes starting at byte " + str(self._start)
+        return 'An ' + typ + ' stored in ' + str(struct.calcsize(self._fmt)) + ' bytes starting at byte ' + str(self._start)
 
 
 class versioned_field(field):
@@ -75,7 +73,7 @@ class versioned_field(field):
 
     def __set__(self, obj, val):
         if not self.enabled(obj):
-            raise LRFException("Trying to set disabled field")
+            raise LRFException('Trying to set disabled field')
         else:
             field.__set__(self, obj, val)
 
@@ -85,19 +83,19 @@ class LRFException(Exception):
 
 
 class fixed_stringfield:
-    """ A field storing a variable length string. """
+    ''' A field storing a variable length string. '''
 
     def __init__(self, length=8, start=0):
-        """
+        '''
         @param length: Size of this string
         @param start: The byte at which this field is stored in the buffer
-        """
+        '''
         self._length = length
         self._start = start
 
     def __get__(self, obj, typ=None):
         length = str(self._length)
-        return obj.unpack(start=self._start, fmt="<"+length+"s")[0]
+        return obj.unpack(start=self._start, fmt='<'+length+'s')[0]
 
     def __set__(self, obj, val):
         if not isinstance(val, string_or_bytes):
@@ -105,13 +103,13 @@ class fixed_stringfield:
         if isinstance(val, str):
             val = val.encode('utf-8')
         if len(val) != self._length:
-            raise LRFException("Trying to set fixed_stringfield with a " +
-                               "string of  incorrect length")
-        obj.pack(val, start=self._start, fmt="<"+str(len(val))+"s")
+            raise LRFException('Trying to set fixed_stringfield with a ' +
+                               'string of  incorrect length')
+        obj.pack(val, start=self._start, fmt='<'+str(len(val))+'s')
 
     def __repr__(self):
-        return "A string of length " + str(self._length) + \
-                " starting at byte " + str(self._start)
+        return ('A string of length ' + str(self._length) +
+                ' starting at byte ' + str(self._start))
 
 
 class xml_attr_field:
@@ -122,7 +120,7 @@ class xml_attr_field:
         self.attr= attr
 
     def __get__(self, obj, typ=None):
-        """ Return the data in this field or '' if the field is empty """
+        ''' Return the data in this field or '' if the field is empty '''
         document = obj.info
         elems = document.getElementsByTagName(self.tag_name)
         if len(elems):
@@ -136,7 +134,7 @@ class xml_attr_field:
 
     def __set__(self, obj, val):
         if val is None:
-            val = ""
+            val = ''
         document = obj.info
         elems = document.getElementsByTagName(self.tag_name)
         if len(elems):
@@ -149,28 +147,28 @@ class xml_attr_field:
         obj.info = document
 
     def __repr__(self):
-        return "XML Attr Field: " + self.tag_name + " in " + self.parent
+        return 'XML Attr Field: ' + self.tag_name + ' in ' + self.parent
 
     def __str__(self):
         return self.tag_name+'.'+self.attr
 
 
 class xml_field:
-    """
+    '''
     Descriptor that gets and sets XML based meta information from an LRF file.
     Works for simple XML fields of the form <tagname>data</tagname>
-    """
+    '''
 
-    def __init__(self, tag_name, parent="BookInfo"):
-        """
+    def __init__(self, tag_name, parent='BookInfo'):
+        '''
         @param tag_name: The XML tag whose data we operate on
         @param parent: The tagname of the parent element of C{tag_name}
-        """
+        '''
         self.tag_name = tag_name
         self.parent = parent
 
     def __get__(self, obj, typ=None):
-        """ Return the data in this field or '' if the field is empty """
+        ''' Return the data in this field or '' if the field is empty '''
         document = obj.info
 
         elems = document.getElementsByTagName(self.tag_name)
@@ -223,11 +221,11 @@ class xml_field:
         return self.tag_name
 
     def __repr__(self):
-        return "XML Field: " + self.tag_name + " in " + self.parent
+        return 'XML Field: ' + self.tag_name + ' in ' + self.parent
 
 
 def insert_into_file(fileobj, data, start, end):
-    """
+    '''
     Insert data into fileobj at position C{start}.
 
     This function inserts data into a file, overwriting all data between start
@@ -239,7 +237,7 @@ def insert_into_file(fileobj, data, start, end):
     @param start:   The position at which to start inserting data
     @param end:     The position in fileobj of data that must not be overwritten
     @return:        C{start + len(data) - end}
-    """
+    '''
     buffer = io.BytesIO()
     fileobj.seek(end)
     copyfileobj(fileobj, buffer, -1)
@@ -257,11 +255,11 @@ def insert_into_file(fileobj, data, start, end):
 
 
 def get_metadata(stream):
-    """
+    '''
     Return basic meta-data about the LRF file in C{stream} as a
     L{MetaInformation} object.
     @param stream: A file like object or an instance of L{LRFMetaFile}
-    """
+    '''
     lrf = stream if isinstance(stream, LRFMetaFile) else LRFMetaFile(stream)
     authors = string_to_authors(lrf.author)
     mi = MetaInformation(lrf.title.strip(), authors)
@@ -303,7 +301,7 @@ def get_metadata(stream):
 
 
 class LRFMetaFile:
-    """ Has properties to read and write all Meta information in a LRF file. """
+    ''' Has properties to read and write all Meta information in a LRF file. '''
     #: The first 6 bytes of all valid LRF files
     LRF_HEADER = 'LRF'.encode('utf-16le')
 
@@ -326,30 +324,30 @@ class LRFMetaFile:
     uncompressed_info_size   = versioned_field(compressed_info_size, 0,
                                              fmt=DWORD, start=0x54)
 
-    title                 = xml_field("Title", parent="BookInfo")
-    title_reading         = xml_attr_field("Title", 'reading', parent="BookInfo")
-    author                = xml_field("Author", parent="BookInfo")
-    author_reading        = xml_attr_field("Author", 'reading', parent="BookInfo")
+    title                 = xml_field('Title', parent='BookInfo')
+    title_reading         = xml_attr_field('Title', 'reading', parent='BookInfo')
+    author                = xml_field('Author', parent='BookInfo')
+    author_reading        = xml_attr_field('Author', 'reading', parent='BookInfo')
     # 16 characters. First two chars should be FB for personal use ebooks.
-    book_id               = xml_field("BookID", parent="BookInfo")
-    publisher             = xml_field("Publisher", parent="BookInfo")
-    label                 = xml_field("Label", parent="BookInfo")
-    category              = xml_field("Category", parent="BookInfo")
-    classification        = xml_field("Classification", parent="BookInfo")
-    free_text             = xml_field("FreeText", parent="BookInfo")
+    book_id               = xml_field('BookID', parent='BookInfo')
+    publisher             = xml_field('Publisher', parent='BookInfo')
+    label                 = xml_field('Label', parent='BookInfo')
+    category              = xml_field('Category', parent='BookInfo')
+    classification        = xml_field('Classification', parent='BookInfo')
+    free_text             = xml_field('FreeText', parent='BookInfo')
     # Should use ISO 639 language codes
-    language              = xml_field("Language", parent="DocInfo")
-    creator               = xml_field("Creator", parent="DocInfo")
+    language              = xml_field('Language', parent='DocInfo')
+    creator               = xml_field('Creator', parent='DocInfo')
     # Format is %Y-%m-%d
-    creation_date         = xml_field("CreationDate", parent="DocInfo")
-    producer              = xml_field("Producer", parent="DocInfo")
-    page                  = xml_field("SumPage", parent="DocInfo")
+    creation_date         = xml_field('CreationDate', parent='DocInfo')
+    producer              = xml_field('Producer', parent='DocInfo')
+    page                  = xml_field('SumPage', parent='DocInfo')
 
     def safe(func):
-        """
+        '''
         Decorator that ensures that function calls leave the pos
         in the underlying file unchanged
-        """
+        '''
         @wraps(func)
         def restore_pos(*args, **kwargs):
             obj = args[0]
@@ -362,10 +360,10 @@ class LRFMetaFile:
         return restore_pos
 
     def safe_property(func):
-        """
+        '''
         Decorator that ensures that read or writing a property leaves
         the position in the underlying file unchanged
-        """
+        '''
         def decorator(f):
             def restore_pos(*args, **kwargs):
                 obj = args[0]
@@ -378,34 +376,34 @@ class LRFMetaFile:
             return restore_pos
         locals_ = func()
         if 'fget' in locals_:
-            locals_["fget"] = decorator(locals_["fget"])
+            locals_['fget'] = decorator(locals_['fget'])
         if 'fset' in locals_:
-            locals_["fset"] = decorator(locals_["fset"])
+            locals_['fset'] = decorator(locals_['fset'])
         return property(**locals_)
 
     @safe_property
     def info():
         doc = \
-        """
+        '''
         Document meta information as a minidom Document object.
         To set use a minidom document object.
-        """
+        '''
 
         def fget(self):
             if self.compressed_info_size == 0:
-                raise LRFException("This document has no meta info")
+                raise LRFException('This document has no meta info')
             size = self.compressed_info_size - 4
             self._file.seek(self.info_start)
             try:
-                src =  zlib.decompress(self._file.read(size))
+                src = zlib.decompress(self._file.read(size))
                 if len(src) != self.uncompressed_info_size:
-                    raise LRFException("Decompression of document meta info\
-                                        yielded unexpected results")
+                    raise LRFException('Decompression of document meta info\
+                                        yielded unexpected results')
 
                 src = xml_to_unicode(src, strip_encoding_pats=True, resolve_entities=True, assume_utf8=True)[0]
                 return dom.parseString(clean_xml_chars(src))
             except zlib.error:
-                raise LRFException("Unable to decompress document meta information")
+                raise LRFException('Unable to decompress document meta information')
 
         def fset(self, document):
             info = document.toxml('utf-8')
@@ -421,36 +419,36 @@ class LRFMetaFile:
             self.object_index_offset += delta
             self.update_object_offsets(delta)
 
-        return {"fget":fget, "fset":fset, "doc":doc}
+        return {'fget':fget, 'fset':fset, 'doc':doc}
 
     @safe_property
     def thumbnail_pos():
-        doc = """ The position of the thumbnail in the LRF file """
+        doc = ''' The position of the thumbnail in the LRF file '''
 
         def fget(self):
             return self.info_start + self.compressed_info_size-4
-        return {"fget":fget, "doc":doc}
+        return {'fget':fget, 'doc':doc}
 
     @classmethod
     def _detect_thumbnail_type(cls, slice):
-        """ @param slice: The first 16 bytes of the thumbnail """
+        ''' @param slice: The first 16 bytes of the thumbnail '''
         ttype = 0x14  # GIF
-        if "PNG" in slice:
+        if 'PNG' in slice:
             ttype = 0x12
-        if "BM" in slice:
+        if 'BM' in slice:
             ttype = 0x13
-        if "JFIF" in slice:
+        if 'JFIF' in slice:
             ttype = 0x11
         return ttype
 
     @safe_property
     def thumbnail():
         doc = \
-        """
+        '''
         The thumbnail.
         Represented as a string.
         The string you would get from the file read function.
-        """
+        '''
 
         def fget(self):
             size = self.thumbnail_size
@@ -460,8 +458,8 @@ class LRFMetaFile:
 
         def fset(self, data):
             if self.version <= 800:
-                raise LRFException("Cannot store thumbnails in LRF files \
-                                    of version <= 800")
+                raise LRFException('Cannot store thumbnails in LRF files \
+                                    of version <= 800')
             slice = data[0:16]
             orig_size = self.thumbnail_size
             self.thumbnail_size = len(data)
@@ -472,22 +470,22 @@ class LRFMetaFile:
             self.thumbnail_type = self._detect_thumbnail_type(slice)
             self.update_object_offsets(delta)
 
-        return {"fget":fget, "fset":fset, "doc":doc}
+        return {'fget':fget, 'fset':fset, 'doc':doc}
 
     def __init__(self, file):
-        """ @param file: A file object opened in the r+b mode """
+        ''' @param file: A file object opened in the r+b mode '''
         file.seek(0, 2)
         self.size = file.tell()
         self._file = file
         if self.lrf_header != LRFMetaFile.LRF_HEADER:
             raise LRFException(file.name +
-                " has an invalid LRF header. Are you sure it is an LRF file?")
+                ' has an invalid LRF header. Are you sure it is an LRF file?')
         # Byte at which the compressed meta information starts
         self.info_start = 0x58 if self.version > 800 else 0x53
 
     @safe
     def update_object_offsets(self, delta):
-        """ Run through the LRF Object index changing the offset by C{delta}. """
+        ''' Run through the LRF Object index changing the offset by C{delta}. '''
         self._file.seek(self.object_index_offset)
         count = self.number_of_objects
         while count > 0:
@@ -503,70 +501,70 @@ class LRFMetaFile:
 
     @safe
     def unpack(self, fmt=DWORD, start=0):
-        """
+        '''
         Return decoded data from file.
 
         @param fmt: See U{struct<http://docs.python.org/lib/module-struct.html>}
         @param start: Position in file from which to decode
-        """
+        '''
         end = start + struct.calcsize(fmt)
         self._file.seek(start)
-        ret =  struct.unpack(fmt, self._file.read(end-start))
+        ret = struct.unpack(fmt, self._file.read(end-start))
         return ret
 
     @safe
     def pack(self, *args, **kwargs):
-        """
+        '''
         Encode C{args} and write them to file.
         C{kwargs} must contain the keywords C{fmt} and C{start}
 
         @param args: The values to pack
         @param fmt: See U{struct<http://docs.python.org/lib/module-struct.html>}
         @param start: Position in file at which to write encoded data
-        """
-        encoded = struct.pack(kwargs["fmt"], *args)
-        self._file.seek(kwargs["start"])
+        '''
+        encoded = struct.pack(kwargs['fmt'], *args)
+        self._file.seek(kwargs['start'])
         self._file.write(encoded)
         self._file.flush()
 
     def thumbail_extension(self):
-        """
+        '''
         Return the extension for the thumbnail image type as specified
         by L{self.thumbnail_type}. If the LRF file was created by buggy
         software, the extension maye be incorrect. See L{self.fix_thumbnail_type}.
-        """
-        ext = "gif"
+        '''
+        ext = 'gif'
         ttype = self.thumbnail_type
         if ttype == 0x11:
-            ext = "jpeg"
+            ext = 'jpeg'
         elif ttype == 0x12:
-            ext = "png"
+            ext = 'png'
         elif ttype == 0x13:
-            ext = "bmp"
+            ext = 'bmp'
         return ext
 
     def fix_thumbnail_type(self):
-        """
+        '''
         Attempt to guess the thumbnail image format and set
         L{self.thumbnail_type} accordingly.
-        """
+        '''
         slice = self.thumbnail[0:16]
         self.thumbnail_type = self._detect_thumbnail_type(slice)
 
     def seek(self, *args):
-        """ See L{file.seek} """
+        ''' See L{file.seek} '''
         return self._file.seek(*args)
 
     def tell(self):
-        """ See L{file.tell} """
+        ''' See L{file.tell} '''
         return self._file.tell()
 
     def read(self):
-        """ See L{file.read} """
+        ''' See L{file.read} '''
         return self._file.read()
 
     def write(self, val):
-        """ See L{file.write} """
+        ''' See L{file.write} '''
         self._file.write(val)
 
     def _objects(self):
@@ -586,7 +584,7 @@ class LRFMetaFile:
             self._file.seek(offset)
             tag = Tag(self._file)
             if tag.id == 0xF500:
-                obj_id, obj_type = struct.unpack("<IH", tag.contents)
+                obj_id, obj_type = struct.unpack('<IH', tag.contents)
                 if obj_type == type:
                     objects.append((obj_id, offset, size))
         return objects
@@ -597,7 +595,7 @@ class LRFMetaFile:
             self._file.seek(offset)
             tag = Tag(self._file)
             if tag.id == 0xF500:
-                obj_id, obj_type = struct.unpack("<IH", tag.contents)
+                obj_id, obj_type = struct.unpack('<IH', tag.contents)
                 if obj_id == tid:
                     return obj_id, offset, size, obj_type
         return (False, False, False, False)
@@ -623,26 +621,26 @@ def option_parser():
 Show/edit the metadata in an LRF file.\n\n'''),
       version=__appname__+' '+__version__,
       epilog='Created by Kovid Goyal')
-    parser.add_option("-t", "--title", action="store", type="string",
-                    dest="title", help=_("Set the book title"))
+    parser.add_option('-t', '--title', action='store', type='string',
+                    dest='title', help=_('Set the book title'))
     parser.add_option('--title-sort', action='store', type='string', default=None,
                       dest='title_reading', help=_('Set sort key for the title'))
-    parser.add_option("-a", "--author", action="store", type="string",
-                    dest="author", help=_("Set the author"))
+    parser.add_option('-a', '--author', action='store', type='string',
+                    dest='author', help=_('Set the author'))
     parser.add_option('--author-sort', action='store', type='string', default=None,
                       dest='author_reading', help=_('Set sort key for the author'))
-    parser.add_option("-c", "--category", action="store", type="string",
-                    dest="category", help=_("The category this book belongs"
-                    " to. E.g.: History"))
-    parser.add_option("--thumbnail", action="store", type="string",
-                    dest="thumbnail", help=_("Path to a graphic that will be"
+    parser.add_option('-c', '--category', action='store', type='string',
+                    dest='category', help=_('The category this book belongs'
+                    ' to. E.g.: History'))
+    parser.add_option('--thumbnail', action='store', type='string',
+                    dest='thumbnail', help=_("Path to a graphic that will be"
                     " set as this files' thumbnail"))
-    parser.add_option("--comment", action="store", type="string",
-                    dest="comment", help=_("Path to a TXT file containing the "
-                    "comment to be stored in the LRF file."))
-    parser.add_option("--get-thumbnail", action="store_true",
-                    dest="get_thumbnail", default=False,
-                    help=_("Extract thumbnail from LRF file"))
+    parser.add_option('--comment', action='store', type='string',
+                    dest='comment', help=_('Path to a TXT file containing the '
+                    'comment to be stored in the LRF file.'))
+    parser.add_option('--get-thumbnail', action='store_true',
+                    dest='get_thumbnail', default=False,
+                    help=_('Extract thumbnail from LRF file'))
     parser.add_option('--publisher', default=None, help=_('Set the publisher'))
     parser.add_option('--classification', default=None, help=_('Set the book classification'))
     parser.add_option('--creator', default=None, help=_('Set the book creator'))
@@ -687,7 +685,7 @@ def main(args=sys.argv):
         print()
         print('No lrf file specified')
         return 1
-    lrf = LRFMetaFile(open(args[1], "r+b"))
+    lrf = LRFMetaFile(open(args[1], 'r+b'))
 
     if options.title:
         lrf.title        = options.title
@@ -709,7 +707,7 @@ def main(args=sys.argv):
         lrf.producer = options.producer
     if options.thumbnail:
         path = os.path.expanduser(os.path.expandvars(options.thumbnail))
-        with open(path, "rb") as f:
+        with open(path, 'rb') as f:
             lrf.thumbnail = f.read()
     if options.book_id is not None:
         lrf.book_id = options.book_id
@@ -719,26 +717,26 @@ def main(args=sys.argv):
             lrf.free_text = f.read().decode('utf-8', 'replace')
     if options.get_thumbnail:
         t = lrf.thumbnail
-        td = "None"
+        td = 'None'
         if t and len(t) > 0:
-            td = os.path.basename(args[1])+"_thumbnail."+lrf.thumbail_extension()
-            with open(td, "wb") as f:
+            td = os.path.basename(args[1])+'_thumbnail.'+lrf.thumbail_extension()
+            with open(td, 'wb') as f:
                 f.write(t)
 
     fields = LRFMetaFile.__dict__.items()
     fields.sort()
     for f in fields:
-        if "XML" in str(f):
-            print(str(f[1]) + ":", lrf.__getattribute__(f[0]).encode('utf-8'))
+        if 'XML' in str(f):
+            print(str(f[1]) + ':', lrf.__getattribute__(f[0]).encode('utf-8'))
     if options.get_thumbnail:
-        print("Thumbnail:", td)
+        print('Thumbnail:', td)
     if options.get_cover:
         try:
             ext, data = lrf.get_cover()
         except:  # Fails on books created by LRFCreator 1.0
             ext, data = None, None
         if data:
-            cover = os.path.splitext(os.path.basename(args[1]))[0]+"_cover."+ext
+            cover = os.path.splitext(os.path.basename(args[1]))[0]+'_cover.'+ext
             with open(cover, 'wb') as f:
                 f.write(data)
             print('Cover:', cover)
diff --git a/src/calibre/ebooks/lrf/objects.py b/src/calibre/ebooks/lrf/objects.py
index 9f9f0d92c6..286aac9994 100644
--- a/src/calibre/ebooks/lrf/objects.py
+++ b/src/calibre/ebooks/lrf/objects.py
@@ -75,7 +75,7 @@ class LRFObject:
             self.handle_tag(tag, stream)
 
     def parse_bg_image(self, tag, f):
-        self.bg_image_mode, self.bg_image_id = struct.unpack("<HI", tag.contents)
+        self.bg_image_mode, self.bg_image_id = struct.unpack('<HI', tag.contents)
 
     def handle_tag(self, tag, stream, tag_map=None):
         if tag_map is None:
@@ -86,7 +86,7 @@ class LRFObject:
             if h[1] != '' and h[0] != '':
                 setattr(self, h[0], val)
         else:
-            raise LRFParseError(f"Unknown tag in {self.__class__.__name__}: {str(tag)}")
+            raise LRFParseError(f'Unknown tag in {self.__class__.__name__}: {tag}')
 
     def __iter__(self):
         yield from range(0)
@@ -129,7 +129,7 @@ class LRFContentObject(LRFObject):
                 func, args = action[0], (action[1],)
             getattr(self, func)(tag, *args)
         else:
-            raise LRFParseError(f"Unknown tag in {self.__class__.__name__}: {str(tag)}")
+            raise LRFParseError(f'Unknown tag in {self.__class__.__name__}: {tag}')
 
     def __iter__(self):
         yield from self._contents
@@ -173,12 +173,12 @@ class LRFStream(LRFObject):
                 l = 0x400
             self.stream = self.descramble_buffer(self.stream, l, key)
         if self.stream_flags & 0x100 !=0:
-            decomp_size = struct.unpack("<I", self.stream[:4])[0]
+            decomp_size = struct.unpack('<I', self.stream[:4])[0]
             self.stream = zlib.decompress(self.stream[4:])
             if len(self.stream) != decomp_size:
-                raise LRFParseError("Stream decompressed size is wrong!")
+                raise LRFParseError('Stream decompressed size is wrong!')
         if stream.read(2) != b'\x06\xF5':
-            print("Warning: corrupted end-of-stream tag at %08X; skipping it"%(stream.tell()-2))
+            print('Warning: corrupted end-of-stream tag at %08X; skipping it'%(stream.tell()-2))
         self.end_stream(None, None)
 
 
@@ -237,7 +237,7 @@ class PageAttr(StyleObject, LRFObject):
         0xF52B: ['pageposition', 'W', {0: 'any', 1:'upper', 2: 'lower'}],
         0xF52A: ['setemptyview', 'W', {1: 'show', 0: 'empty'}],
         0xF5DA: ['setwaitprop', 'W', {1: 'replay', 2: 'noreplay'}],
-        0xF529: ['', "parse_bg_image"],
+        0xF529: ['', 'parse_bg_image'],
       }
     tag_map.update(LRFObject.tag_map)
 
@@ -338,11 +338,11 @@ class Page(LRFStream):
       }
     tag_map.update(PageAttr.tag_map)
     tag_map.update(LRFStream.tag_map)
-    style = property(fget=lambda self : self._document.objects[self.style_id])
-    evenheader = property(fget=lambda self : self._document.objects[self.style.evenheaderid])
-    evenfooter = property(fget=lambda self : self._document.objects[self.style.evenfooterid])
-    oddheader  = property(fget=lambda self : self._document.objects[self.style.oddheaderid])
-    oddfooter  = property(fget=lambda self : self._document.objects[self.style.oddfooterid])
+    style = property(fget=lambda self: self._document.objects[self.style_id])
+    evenheader = property(fget=lambda self: self._document.objects[self.style.evenheaderid])
+    evenfooter = property(fget=lambda self: self._document.objects[self.style.evenfooterid])
+    oddheader  = property(fget=lambda self: self._document.objects[self.style.oddheaderid])
+    oddfooter  = property(fget=lambda self: self._document.objects[self.style.oddfooterid])
 
     class Content(LRFContentObject):
         tag_map = {
@@ -366,7 +366,7 @@ class Page(LRFStream):
 
         def page_div(self, tag):
             self.close_blockspace()
-            pars = struct.unpack("<HIHI", tag.contents)
+            pars = struct.unpack('<HIHI', tag.contents)
             self._contents.append(PageDiv(*pars))
 
         def x_space(self, tag):
@@ -383,7 +383,7 @@ class Page(LRFStream):
 
         def ruled_line(self, tag):
             self.close_blockspace()
-            pars = struct.unpack("<HHHI", tag.contents)
+            pars = struct.unpack('<HHHI', tag.contents)
             self._contents.append(RuledLine(*pars))
 
         def wait(self, tag):
@@ -440,12 +440,12 @@ class BlockAttr(StyleObject, LRFObject):
         0xF531: ['blockwidth', 'W'],
         0xF532: ['blockheight', 'W'],
         0xF533: ['blockrule', 'W', {
-            0x14: "horz-fixed",
-            0x12: "horz-adjustable",
-            0x41: "vert-fixed",
-            0x21: "vert-adjustable",
-            0x44: "block-fixed",
-            0x22: "block-adjustable"}],
+            0x14: 'horz-fixed',
+            0x12: 'horz-adjustable',
+            0x41: 'vert-fixed',
+            0x21: 'vert-adjustable',
+            0x44: 'block-fixed',
+            0x22: 'block-adjustable'}],
         0xF534: ['bgcolor', 'D', Color],
         0xF535: ['layout', 'W', {0x41: 'TbRl', 0x34: 'LrTb'}],
         0xF536: ['framewidth', 'W'],
@@ -531,7 +531,7 @@ class TextCSS:
 
 class TextAttr(StyleObject, LRFObject, TextCSS):
 
-    FONT_MAP = collections.defaultdict(lambda : 'serif')
+    FONT_MAP = collections.defaultdict(lambda: 'serif')
     for key, value in PRS500_PROFILE.default_fonts.items():
         FONT_MAP[value] = key
 
@@ -571,15 +571,15 @@ class Block(LRFStream, TextCSS):
     extra_attrs = [i[0] for i in BlockAttr.tag_map.values()]
     extra_attrs.extend([i[0] for i in TextAttr.tag_map.values()])
 
-    style = property(fget=lambda self : self._document.objects[self.style_id])
-    textstyle = property(fget=lambda self : self._document.objects[self.textstyle_id])
+    style = property(fget=lambda self: self._document.objects[self.style_id])
+    textstyle = property(fget=lambda self: self._document.objects[self.textstyle_id])
 
     def initialize(self):
         self.attrs = {}
         stream = io.BytesIO(self.stream)
         tag = Tag(stream)
         if tag.id != 0xF503:
-            raise LRFParseError("Bad block content")
+            raise LRFParseError('Bad block content')
         obj = self._document.objects[tag.dword]
         if isinstance(obj, SimpleText):
             self.name = 'SimpleTextBlock'
@@ -595,7 +595,7 @@ class Block(LRFStream, TextCSS):
         elif isinstance(obj, Button):
             self.name = 'ButtonBlock'
         else:
-            raise LRFParseError("Unexpected block type: "+obj.__class__.__name__)
+            raise LRFParseError('Unexpected block type: '+obj.__class__.__name__)
 
         self.content = obj
 
@@ -638,9 +638,9 @@ class Text(LRFStream):
     tag_map.update(TextAttr.tag_map)
     tag_map.update(LRFStream.tag_map)
 
-    style = property(fget=lambda self : self._document.objects[self.style_id])
+    style = property(fget=lambda self: self._document.objects[self.style_id])
 
-    text_map = {0x22: '"', 0x26: '&amp;', 0x27: '\'', 0x3c: '&lt;', 0x3e: '&gt;'}
+    text_map = {0x22: '"', 0x26: '&amp;', 0x27: "'", 0x3c: '&lt;', 0x3e: '&gt;'}
     entity_pattern = re.compile(r'&amp;(\S+?);')
 
     text_tags = {
@@ -709,7 +709,7 @@ class Text(LRFStream):
     lineposition_map = {1:'before', 2:'after'}
 
     def add_text(self, text):
-        s = str(text, "utf-16-le")
+        s = str(text, 'utf-16-le')
         if s:
             s = s.translate(self.text_map)
             self.content.append(self.entity_pattern.sub(entity_to_unicode_in_python, s))
@@ -789,7 +789,7 @@ class Text(LRFStream):
                                         self_closing=True))
 
     def plot(self, tag, stream):
-        xsize, ysize, refobj, adjustment = struct.unpack("<HHII", tag.contents)
+        xsize, ysize, refobj, adjustment = struct.unpack('<HHII', tag.contents)
         plot = self.__class__.TextTag('Plot',
             {'xsize': xsize, 'ysize': ysize, 'refobj':refobj,
              'adjustment':self.adjustment_map[adjustment]}, self_closing=True)
@@ -926,13 +926,13 @@ class Image(LRFObject):
       }
 
     def parse_image_rect(self, tag, f):
-        self.x0, self.y0, self.x1, self.y1 = struct.unpack("<HHHH", tag.contents)
+        self.x0, self.y0, self.x1, self.y1 = struct.unpack('<HHHH', tag.contents)
 
     def parse_image_size(self, tag, f):
-        self.xsize, self.ysize = struct.unpack("<HH", tag.contents)
+        self.xsize, self.ysize = struct.unpack('<HH', tag.contents)
 
-    encoding = property(fget=lambda self : self._document.objects[self.refstream].encoding)
-    data = property(fget=lambda self : self._document.objects[self.refstream].stream)
+    encoding = property(fget=lambda self: self._document.objects[self.refstream].encoding)
+    data = property(fget=lambda self: self._document.objects[self.refstream].stream)
 
     def __str__(self):
         return '<Image objid="%s" x0="%d" y0="%d" x1="%d" y1="%d" xsize="%d" ysize="%d" refstream="%d" />\n'%\
@@ -954,7 +954,7 @@ class Canvas(LRFStream):
         0xF551: ['canvaswidth', 'W'],
         0xF552: ['canvasheight', 'W'],
         0xF5DA: ['', 'parse_waits'],
-        0xF533: ['blockrule', 'W', {0x44: "block-fixed", 0x22: "block-adjustable"}],
+        0xF533: ['blockrule', 'W', {0x44: 'block-fixed', 0x22: 'block-adjustable'}],
         0xF534: ['bgcolor', 'D', Color],
         0xF535: ['layout', 'W', {0x41: 'TbRl', 0x34: 'LrTb'}],
         0xF536: ['framewidth', 'W'],
@@ -983,7 +983,7 @@ class Canvas(LRFStream):
             try:
                 self._contents.append(
                     PutObj(self._document.objects,
-                        *struct.unpack("<HHI", tag.contents)))
+                        *struct.unpack('<HHI', tag.contents)))
             except struct.error:
                 print('Canvas object has errors, skipping.')
 
@@ -1021,7 +1021,7 @@ class ImageStream(LRFStream):
 
     tag_map.update(LRFStream.tag_map)
 
-    encoding = property(fget=lambda self : self.imgext[self.stream_flags & 0xFF].upper())
+    encoding = property(fget=lambda self: self.imgext[self.stream_flags & 0xFF].upper())
 
     def end_stream(self, *args):
         LRFStream.end_stream(self, *args)
@@ -1087,7 +1087,7 @@ class Button(LRFObject):
         self.actions[self.button_type] = []
 
     def parse_jump_to(self, tag, f):
-        self.actions[self.button_type].append((1, struct.unpack("<II", tag.contents)))
+        self.actions[self.button_type].append((1, struct.unpack('<II', tag.contents)))
 
     def parse_send_message(self, tag, f):
         params = (tag.word, Tag.string_parser(f), Tag.string_parser(f))
@@ -1100,13 +1100,13 @@ class Button(LRFObject):
         self.actions[self.button_type].append((4,))
 
     def parse_run(self, tag, f):
-        self.actions[self.button_type].append((5, struct.unpack("<HI", tag.contents)))
+        self.actions[self.button_type].append((5, struct.unpack('<HI', tag.contents)))
 
     def jump_action(self, button_type):
         for i in self.actions[button_type]:
             if i[0] == 1:
                 return i[1:][0]
-        return (None, None)
+        return None, None
 
     def __str__(self):
         s = '<Button objid="%s">\n'%(self.id,)
@@ -1122,8 +1122,8 @@ class Button(LRFObject):
         s += '</Button>\n'
         return s
 
-    refpage = property(fget=lambda self : self.jump_action(2)[0])
-    refobj = property(fget=lambda self : self.jump_action(2)[1])
+    refpage = property(fget=lambda self: self.jump_action(2)[0])
+    refobj = property(fget=lambda self: self.jump_action(2)[1])
 
 
 class Window(LRFObject):
@@ -1173,7 +1173,7 @@ class BookAttr(StyleObject, LRFObject):
       }
     tag_map.update(ruby_tags)
     tag_map.update(LRFObject.tag_map)
-    binding_map = {1: 'Lr', 16 : 'Rl'}
+    binding_map = {1: 'Lr', 16: 'Rl'}
 
     def __init__(self, document, stream, id, scramble_key, boundary):
         self.font_link_list = []
@@ -1211,13 +1211,13 @@ class TOCObject(LRFStream):
 
     def initialize(self):
         stream = io.BytesIO(self.stream or b'')
-        c = struct.unpack("<H", stream.read(2))[0]
+        c = struct.unpack('<H', stream.read(2))[0]
         stream.seek(4*(c+1))
         self._contents = []
         while c > 0:
-            refpage = struct.unpack("<I", stream.read(4))[0]
-            refobj  = struct.unpack("<I", stream.read(4))[0]
-            cnt = struct.unpack("<H", stream.read(2))[0]
+            refpage = struct.unpack('<I', stream.read(4))[0]
+            refobj  = struct.unpack('<I', stream.read(4))[0]
+            cnt = struct.unpack('<H', stream.read(2))[0]
             raw = stream.read(cnt)
             label = raw.decode('utf_16_le')
             self._contents.append(TocLabel(refpage, refobj, label))
@@ -1273,8 +1273,8 @@ def get_object(document, stream, id, offset, size, scramble_key):
     start_tag = Tag(stream)
     if start_tag.id != 0xF500:
         raise LRFParseError('Bad object start')
-    obj_id, obj_type = struct.unpack("<IH", start_tag.contents)
+    obj_id, obj_type = struct.unpack('<IH', start_tag.contents)
     if obj_type < len(object_map) and object_map[obj_type] is not None:
         return object_map[obj_type](document, stream, obj_id, scramble_key, offset+size-Tag.tags[0][0])
 
-    raise LRFParseError("Unknown object type: %02X!" % obj_type)
+    raise LRFParseError('Unknown object type: %02X!' % obj_type)
diff --git a/src/calibre/ebooks/lrf/pylrs/__init__.py b/src/calibre/ebooks/lrf/pylrs/__init__.py
index f4d0439228..70ea7dc0dc 100644
--- a/src/calibre/ebooks/lrf/pylrs/__init__.py
+++ b/src/calibre/ebooks/lrf/pylrs/__init__.py
@@ -1,5 +1,5 @@
-"""
+'''
 This package contains code to generate ebooks in the SONY LRS/F format. It was
 originally developed by Mike Higgins and has been extended and modified by Kovid
 Goyal.
-"""
+'''
diff --git a/src/calibre/ebooks/lrf/pylrs/elements.py b/src/calibre/ebooks/lrf/pylrs/elements.py
index 79ee5ba864..c5326ea043 100644
--- a/src/calibre/ebooks/lrf/pylrs/elements.py
+++ b/src/calibre/ebooks/lrf/pylrs/elements.py
@@ -1,12 +1,12 @@
-""" elements.py -- replacements and helpers for ElementTree """
+''' elements.py -- replacements and helpers for ElementTree '''
 
 from polyglot.builtins import string_or_bytes
 
 
 class ElementWriter:
 
-    def __init__(self, e, header=False, sourceEncoding="ascii",
-                 spaceBeforeClose=True, outputEncodingName="UTF-16"):
+    def __init__(self, e, header=False, sourceEncoding='ascii',
+                 spaceBeforeClose=True, outputEncodingName='UTF-16'):
         self.header = header
         self.e = e
         self.sourceEncoding=sourceEncoding
@@ -17,9 +17,9 @@ class ElementWriter:
         if isinstance(rawText, bytes):
             rawText = rawText.decode(self.sourceEncoding)
 
-        text = rawText.replace("&", "&amp;")
-        text = text.replace("<", "&lt;")
-        text = text.replace(">", "&gt;")
+        text = rawText.replace('&', '&amp;')
+        text = text.replace('<', '&lt;')
+        text = text.replace('>', '&gt;')
         return text
 
     def _writeAttribute(self, f, name, value):
diff --git a/src/calibre/ebooks/lrf/pylrs/pylrf.py b/src/calibre/ebooks/lrf/pylrs/pylrf.py
index b27e3ca130..073b893430 100644
--- a/src/calibre/ebooks/lrf/pylrs/pylrf.py
+++ b/src/calibre/ebooks/lrf/pylrs/pylrf.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
 
-"""
+'''
     pylrf.py -- very low level interface to create lrf files.  See pylrs for
     higher level interface that can use this module to render books to lrf.
-"""
+'''
 import codecs
 import io
 import os
@@ -15,7 +15,7 @@ from polyglot.builtins import iteritems, string_or_bytes
 
 from .pylrfopt import tagListOptimizer
 
-PYLRF_VERSION = "1.0"
+PYLRF_VERSION = '1.0'
 
 #
 # Acknowledgement:
@@ -79,7 +79,7 @@ class LrfError(Exception):
 
 
 def writeByte(f, byte):
-    f.write(struct.pack("<B", byte))
+    f.write(struct.pack('<B', byte))
 
 
 def writeWord(f, word):
@@ -87,31 +87,31 @@ def writeWord(f, word):
         raise LrfError('Cannot encode a number greater than 65535 in a word.')
     if int(word) < 0:
         raise LrfError('Cannot encode a number < 0 in a word: '+str(word))
-    f.write(struct.pack("<H", int(word)))
+    f.write(struct.pack('<H', int(word)))
 
 
 def writeSignedWord(f, sword):
-    f.write(struct.pack("<h", int(float(sword))))
+    f.write(struct.pack('<h', int(float(sword))))
 
 
 def writeWords(f, *words):
-    f.write(struct.pack("<%dH" % len(words), *words))
+    f.write(struct.pack('<%dH' % len(words), *words))
 
 
 def writeDWord(f, dword):
-    f.write(struct.pack("<I", int(dword)))
+    f.write(struct.pack('<I', int(dword)))
 
 
 def writeDWords(f, *dwords):
-    f.write(struct.pack("<%dI" % len(dwords), *dwords))
+    f.write(struct.pack('<%dI' % len(dwords), *dwords))
 
 
 def writeQWord(f, qword):
-    f.write(struct.pack("<Q", qword))
+    f.write(struct.pack('<Q', qword))
 
 
 def writeZeros(f, nZeros):
-    f.write(b"\0" * nZeros)
+    f.write(b'\0' * nZeros)
 
 
 def writeString(f, s):
@@ -125,7 +125,7 @@ def writeIdList(f, idList):
 
 def writeColor(f, color):
     # TODO: allow color names, web format
-    f.write(struct.pack(">I", int(color, 0)))
+    f.write(struct.pack('>I', int(color, 0)))
 
 
 def writeLineWidth(f, width):
@@ -135,7 +135,7 @@ def writeLineWidth(f, width):
 def writeUnicode(f, string, encoding):
     if isinstance(string, bytes):
         string = string.decode(encoding)
-    string = string.encode("utf-16-le")
+    string = string.encode('utf-16-le')
     length = len(string)
     if length > 65535:
         raise LrfError('Cannot write strings longer than 65535 characters.')
@@ -147,20 +147,20 @@ def writeRaw(f, string, encoding):
     if isinstance(string, bytes):
         string = string.decode(encoding)
 
-    string = string.encode("utf-16-le")
+    string = string.encode('utf-16-le')
     writeString(f, string)
 
 
 def writeRubyAA(f, rubyAA):
     ralign, radjust = rubyAA
-    radjust = {"line-edge":0x10, "none":0}[radjust]
-    ralign = {"start":1, "center":2}[ralign]
+    radjust = {'line-edge':0x10, 'none':0}[radjust]
+    ralign = {'start':1, 'center':2}[ralign]
     writeWord(f, ralign | radjust)
 
 
 def writeBgImage(f, bgInfo):
     imode, iid = bgInfo
-    imode = {"pfix": 0, "fix":1, "tile":2, "centering":3}[imode]
+    imode = {'pfix': 0, 'fix':1, 'tile':2, 'centering':3}[imode]
     writeWord(f, imode)
     writeDWord(f, iid)
 
@@ -168,7 +168,7 @@ def writeBgImage(f, bgInfo):
 def writeEmpDots(f, dotsInfo, encoding):
     refDotsFont, dotsFontName, dotsCode = dotsInfo
     writeDWord(f, refDotsFont)
-    LrfTag("fontfacename", dotsFontName).write(f, encoding)
+    LrfTag('fontfacename', dotsFontName).write(f, encoding)
     writeWord(f, int(dotsCode, 0))
 
 
@@ -180,7 +180,7 @@ def writeRuledLine(f, lineInfo):
     writeColor(f, lineColor)
 
 
-LRF_SIGNATURE = b"L\x00R\x00F\x00\x00\x00"
+LRF_SIGNATURE = b'L\x00R\x00F\x00\x00\x00'
 
 # XOR_KEY = 48
 XOR_KEY = 65024  # that's what lrf2lrs says -- not used, anyway...
@@ -217,7 +217,7 @@ OBJECT_TYPE_ENCODING = dict(
         TOC=0x1E
 )
 
-LINE_TYPE_ENCODING =  {
+LINE_TYPE_ENCODING = {
         'none':0, 'solid':0x10, 'dashed':0x20, 'double':0x30, 'dotted':0x40
 }
 
@@ -226,10 +226,10 @@ BINDING_DIRECTION_ENCODING = dict(Lr=1, Rl=16)
 
 TAG_INFO = dict(
         rawtext=(0, writeRaw),
-        ObjectStart=(0xF500, "<IH"),
+        ObjectStart=(0xF500, '<IH'),
         ObjectEnd=(0xF501,),
         # InfoLink (0xF502)
-        Link=(0xF503, "<I"),
+        Link=(0xF503, '<I'),
         StreamSize=(0xF504, writeDWord),
         StreamData=(0xF505, writeString),
         StreamEnd=(0xF506,),
@@ -267,14 +267,13 @@ TAG_INFO = dict(
         setemptyview=(0xF52A, {'show':1, 'empty':0}, writeWord),
         pageposition=(0xF52B, {'any':0,'upper':1, 'lower':2}, writeWord),
         evensidemargin=(0xF52C, writeWord),
-        framemode=(0xF52E,
-                           {'None':0, 'curve':2, 'square':1}, writeWord),
+        framemode=(0xF52E, {'None':0, 'curve':2, 'square':1}, writeWord),
         blockwidth=(0xF531, writeWord),
         blockheight=(0xF532, writeWord),
-        blockrule=(0xF533, {"horz-fixed":0x14, "horz-adjustable":0x12,
-                                 "vert-fixed":0x41, "vert-adjustable":0x21,
-                                 "block-fixed":0x44, "block-adjustable":0x22},
-                                 writeWord),
+        blockrule=(0xF533, {'horz-fixed':0x14, 'horz-adjustable':0x12,
+                            'vert-fixed':0x41, 'vert-adjustable':0x21,
+                            'block-fixed':0x44, 'block-adjustable':0x22},
+                                writeWord),
         bgcolor=(0xF534, writeColor),
         layout=(0xF535, {'TbRl':0x41, 'LrTb':0x34}, writeWord),
         framewidth=(0xF536, writeWord),
@@ -289,11 +288,11 @@ TAG_INFO = dict(
         minipageheight=(0xF542, writeWord),
         yspace=(0xF546, writeWord),
         xspace=(0xF547, writeWord),
-        PutObj=(0xF549, "<HHI"),
-        ImageRect=(0xF54A, "<HHHH"),
-        ImageSize=(0xF54B, "<HH"),
-        RefObjId=(0xF54C, "<I"),
-        PageDiv=(0xF54E, "<HIHI"),
+        PutObj=(0xF549, '<HHI'),
+        ImageRect=(0xF54A, '<HHHH'),
+        ImageSize=(0xF54B, '<HH'),
+        RefObjId=(0xF54C, '<I'),
+        PageDiv=(0xF54E, '<HIHI'),
         StreamFlags=(0xF554, writeWord),
         Comment=(0xF555, writeUnicode),
         FontFilename=(0xF559, writeUnicode),
@@ -304,7 +303,7 @@ TAG_INFO = dict(
         PushButtonEnd=(0xF567,),
         buttonactions=(0xF56A,),
         endbuttonactions=(0xF56B,),
-        jumpto=(0xF56C, "<II"),
+        jumpto=(0xF56C, '<II'),
         RuledLine=(0xF573, writeRuledLine),
         rubyaa=(0xF575, writeRubyAA),
         rubyoverhang=(0xF576, {'none':0, 'auto':1}, writeWord),
@@ -312,8 +311,8 @@ TAG_INFO = dict(
         empdots=(0xF578, writeEmpDots),
         emplineposition=(0xF579, {'before':1, 'after':2}, writeWord),
         emplinetype=(0xF57A, LINE_TYPE_ENCODING, writeWord),
-        ChildPageTree=(0xF57B, "<I"),
-        ParentPageTree=(0xF57C, "<I"),
+        ChildPageTree=(0xF57B, '<I'),
+        ParentPageTree=(0xF57C, '<I'),
         Italic=(0xF581,),
         ItalicEnd=(0xF582,),
         pstart=(0xF5A1, writeDWord),  # what goes in the dword? refesound
@@ -348,7 +347,7 @@ TAG_INFO = dict(
         BoxEnd=(0xF5C7,),
         Space=(0xF5CA, writeSignedWord),
         textstring=(0xF5CC, writeUnicode),
-        Plot=(0xF5D1, "<HHII"),
+        Plot=(0xF5D1, '<HHII'),
         CR=(0xF5D2,),
         RegisterFont=(0xF5D8, writeDWord),
         setwaitprop=(0xF5DA, {'replay':1, 'noreplay':2}, writeWord),
@@ -375,14 +374,14 @@ class LrfTag:
         try:
             tagInfo = TAG_INFO[name]
         except KeyError:
-            raise LrfError("tag name %s not recognized" % name)
+            raise LrfError('tag name %s not recognized' % name)
 
         self.name = name
         self.type = tagInfo[0]
         self.format = tagInfo[1:]
 
         if len(parameters) > 1:
-            raise LrfError("only one parameter allowed on tag %s" % name)
+            raise LrfError('only one parameter allowed on tag %s' % name)
 
         if len(parameters) == 0:
             self.parameter = None
@@ -397,7 +396,7 @@ class LrfTag:
         if p is None:
             return
 
-        # print "   Writing tag", self.name
+        # print('   Writing tag', self.name)
         for f in self.format:
             if isinstance(f, dict):
                 p = f[p]
@@ -409,7 +408,7 @@ class LrfTag:
             else:
                 if f in [writeUnicode, writeRaw, writeEmpDots]:
                     if encoding is None:
-                        raise LrfError("Tag requires encoding")
+                        raise LrfError('Tag requires encoding')
                     f(lrf, p, encoding)
                 else:
                     f(lrf, p)
@@ -455,12 +454,12 @@ class LrfStreamBase:
             if optimize and uncompLen <= len(compStreamBuffer) + 4:
                 flags &= ~STREAM_COMPRESSED
             else:
-                streamBuffer = struct.pack("<I", uncompLen) + compStreamBuffer
+                streamBuffer = struct.pack('<I', uncompLen) + compStreamBuffer
 
-        return [LrfTag("StreamFlags", flags & 0x01FF),
-                LrfTag("StreamSize", len(streamBuffer)),
-                LrfTag("StreamData", streamBuffer),
-                LrfTag("StreamEnd")]
+        return [LrfTag('StreamFlags', flags & 0x01FF),
+                LrfTag('StreamSize', len(streamBuffer)),
+                LrfTag('StreamData', streamBuffer),
+                LrfTag('StreamEnd')]
 
 
 class LrfTagStream(LrfStreamBase):
@@ -493,7 +492,7 @@ class LrfFileStream(LrfStreamBase):
 
     def __init__(self, streamFlags, filename):
         LrfStreamBase.__init__(self, streamFlags)
-        with open(filename, "rb") as f:
+        with open(filename, 'rb') as f:
             self.streamData = f.read()
 
 
@@ -501,7 +500,7 @@ class LrfObject:
 
     def __init__(self, name, objId):
         if objId <= 0:
-            raise LrfError("invalid objId for " + name)
+            raise LrfError('invalid objId for ' + name)
 
         self.name = name
         self.objId = objId
@@ -509,10 +508,10 @@ class LrfObject:
         try:
             self.type = OBJECT_TYPE_ENCODING[name]
         except KeyError:
-            raise LrfError("object name %s not recognized" % name)
+            raise LrfError('object name %s not recognized' % name)
 
     def __str__(self):
-        return 'LRFObject: ' + self.name + ", " + str(self.objId)
+        return 'LRFObject: ' + self.name + ', ' + str(self.objId)
 
     def appendLrfTag(self, tag):
         self.tags.append(tag)
@@ -533,55 +532,55 @@ class LrfObject:
             if name == 'rubyAlignAndAdjust':
                 continue
             if name in {
-                    "bgimagemode", "bgimageid", "rubyalign", "rubyadjust",
-                    "empdotscode", "empdotsfontname", "refempdotsfont"}:
+                    'bgimagemode', 'bgimageid', 'rubyalign', 'rubyadjust',
+                    'empdotscode', 'empdotsfontname', 'refempdotsfont'}:
                 composites[name] = value
             else:
                 self.append(LrfTag(name, value))
 
-        if "rubyalign" in composites or "rubyadjust" in composites:
-            ralign = composites.get("rubyalign", "none")
-            radjust = composites.get("rubyadjust", "start")
-            self.append(LrfTag("rubyaa", (ralign, radjust)))
+        if 'rubyalign' in composites or 'rubyadjust' in composites:
+            ralign = composites.get('rubyalign', 'none')
+            radjust = composites.get('rubyadjust', 'start')
+            self.append(LrfTag('rubyaa', (ralign, radjust)))
 
-        if "bgimagemode" in composites or "bgimageid" in composites:
-            imode = composites.get("bgimagemode", "fix")
-            iid = composites.get("bgimageid", 0)
+        if 'bgimagemode' in composites or 'bgimageid' in composites:
+            imode = composites.get('bgimagemode', 'fix')
+            iid = composites.get('bgimageid', 0)
 
             # for some reason, page style uses 0 for "fix"
             # we call this pfix to differentiate it
-            if genClass == "PageStyle" and imode == "fix":
-                imode = "pfix"
+            if genClass == 'PageStyle' and imode == 'fix':
+                imode = 'pfix'
 
-            self.append(LrfTag("bgimage", (imode, iid)))
+            self.append(LrfTag('bgimage', (imode, iid)))
 
-        if "empdotscode" in composites or "empdotsfontname" in composites or \
-                "refempdotsfont" in composites:
-            dotscode = composites.get("empdotscode", "0x002E")
-            dotsfontname = composites.get("empdotsfontname",
-                    "Dutch801 Rm BT Roman")
-            refdotsfont = composites.get("refempdotsfont", 0)
-            self.append(LrfTag("empdots", (refdotsfont, dotsfontname,
+        if 'empdotscode' in composites or 'empdotsfontname' in composites or \
+                'refempdotsfont' in composites:
+            dotscode = composites.get('empdotscode', '0x002E')
+            dotsfontname = composites.get('empdotsfontname',
+                    'Dutch801 Rm BT Roman')
+            refdotsfont = composites.get('refempdotsfont', 0)
+            self.append(LrfTag('empdots', (refdotsfont, dotsfontname,
                 dotscode)))
 
     def write(self, lrf, encoding=None):
-        # print "Writing object", self.name
-        LrfTag("ObjectStart", (self.objId, self.type)).write(lrf)
+        # print('Writing object', self.name)
+        LrfTag('ObjectStart', (self.objId, self.type)).write(lrf)
 
         for tag in self.tags:
             tag.write(lrf, encoding)
 
-        LrfTag("ObjectEnd").write(lrf)
+        LrfTag('ObjectEnd').write(lrf)
 
 
 class LrfToc(LrfObject):
-    """
+    '''
         Table of contents.  Format of toc is:
         [ (pageid, objid, string)...]
-    """
+    '''
 
     def __init__(self, objId, toc, se):
-        LrfObject.__init__(self, "TOC", objId)
+        LrfObject.__init__(self, 'TOC', objId)
         streamData = self._makeTocStream(toc, se)
         self._makeStreamTags(streamData)
 
@@ -606,9 +605,9 @@ class LrfToc(LrfObject):
         for entry in toc:
             pageId, objId, label = entry
             if pageId <= 0:
-                raise LrfError("page id invalid in toc: " + label)
+                raise LrfError('page id invalid in toc: ' + label)
             if objId <= 0:
-                raise LrfError("textblock id invalid in toc: " + label)
+                raise LrfError('textblock id invalid in toc: ' + label)
 
             writeDWord(stream, pageId)
             writeDWord(stream, objId)
@@ -644,9 +643,9 @@ class LrfWriter:
         self.height = 800
         self.colorDepth = 24
         self.tocObjId = 0
-        self.docInfoXml = ""
-        self.thumbnailEncoding = "JPEG"
-        self.thumbnailData = b""
+        self.docInfoXml = ''
+        self.thumbnailEncoding = 'JPEG'
+        self.thumbnailData = b''
         self.objects = []
         self.objectTable = []
 
@@ -670,7 +669,7 @@ class LrfWriter:
 
     def setRootObject(self, obj):
         if self.rootObjId != 0:
-            raise LrfError("root object already set")
+            raise LrfError('root object already set')
 
         self.rootObjId = obj.objId
         self.rootObj = obj
@@ -679,16 +678,16 @@ class LrfWriter:
         if self.rootObj is None:
             raise LrfError("can't register font -- no root object")
 
-        self.rootObj.append(LrfTag("RegisterFont", id))
+        self.rootObj.append(LrfTag('RegisterFont', id))
 
     def setTocObject(self, obj):
         if self.tocObjId != 0:
-            raise LrfError("toc object already set")
+            raise LrfError('toc object already set')
 
         self.tocObjId = obj.objId
 
     def setThumbnailFile(self, filename, encoding=None):
-        with open(filename, "rb") as f:
+        with open(filename, 'rb') as f:
             self.thumbnailData = f.read()
 
         if encoding is None:
@@ -696,7 +695,7 @@ class LrfWriter:
 
         encoding = encoding.upper()
         if encoding not in IMAGE_TYPE_ENCODING:
-            raise LrfError("unknown image type: " + encoding)
+            raise LrfError('unknown image type: ' + encoding)
 
         self.thumbnailEncoding = encoding
 
@@ -708,7 +707,7 @@ class LrfWriter:
 
     def writeFile(self, lrf):
         if self.rootObjId == 0:
-            raise LrfError("no root object has been set")
+            raise LrfError('no root object has been set')
 
         self.writeHeader(lrf)
         self.writeObjects(lrf)
@@ -730,7 +729,7 @@ class LrfWriter:
         writeZeros(lrf, 20)  # 0x30 unknown
         writeDWord(lrf, self.tocObjId)
         writeDWord(lrf, 0)  # 0x48 tocObjectOffset -- will be updated
-        docInfoXml = codecs.BOM_UTF8 + self.docInfoXml.encode("utf-8")
+        docInfoXml = codecs.BOM_UTF8 + self.docInfoXml.encode('utf-8')
         compDocInfo = zlib.compress(docInfoXml)
         writeWord(lrf, len(compDocInfo) + 4)
         writeWord(lrf, IMAGE_TYPE_ENCODING[self.thumbnailEncoding])
@@ -767,7 +766,7 @@ class LrfWriter:
                 lrf.seek(0, 2)
                 break
         else:
-            raise LrfError("toc object not in object table")
+            raise LrfError('toc object not in object table')
 
     def writeObjectTable(self, lrf):
         for tableEntry in self.objectTable:
diff --git a/src/calibre/ebooks/lrf/pylrs/pylrfopt.py b/src/calibre/ebooks/lrf/pylrs/pylrfopt.py
index 64648c565e..0461122e6b 100644
--- a/src/calibre/ebooks/lrf/pylrs/pylrfopt.py
+++ b/src/calibre/ebooks/lrf/pylrs/pylrfopt.py
@@ -2,7 +2,7 @@ def _optimize(tagList, tagName, conversion):
     # copy the tag of interest plus any text
     newTagList = []
     for tag in tagList:
-        if tag.name == tagName or tag.name == "rawtext":
+        if tag.name == tagName or tag.name == 'rawtext':
             newTagList.append(tag)
 
     # now, eliminate any duplicates (leaving the last one)
@@ -36,6 +36,6 @@ def tagListOptimizer(tagList):
     # should be:
     # fontsize=200 text
     oldSize = len(tagList)
-    _optimize(tagList, "fontsize", int)
-    _optimize(tagList, "fontweight", int)
+    _optimize(tagList, 'fontsize', int)
+    _optimize(tagList, 'fontweight', int)
     return oldSize - len(tagList)
diff --git a/src/calibre/ebooks/lrf/pylrs/pylrs.py b/src/calibre/ebooks/lrf/pylrs/pylrs.py
index e6956e14c7..9c08c554c2 100644
--- a/src/calibre/ebooks/lrf/pylrs/pylrs.py
+++ b/src/calibre/ebooks/lrf/pylrs/pylrs.py
@@ -62,8 +62,8 @@ from .pylrf import (
     LrfWriter,
 )
 
-DEFAULT_SOURCE_ENCODING = "cp1252"      # default is us-windows character set
-DEFAULT_GENREADING      = "fs"          # default is yes to both lrf and lrs
+DEFAULT_SOURCE_ENCODING = 'cp1252'      # default is us-windows character set
+DEFAULT_GENREADING      = 'fs'          # default is yes to both lrf and lrs
 
 from calibre import __appname__, __version__, replace_entities
 from polyglot.builtins import iteritems, native_string_type, string_or_bytes
@@ -83,28 +83,28 @@ def _checkExists(filename):
 
 
 def _formatXml(root):
-    """ A helper to make the LRS output look nicer. """
+    ''' A helper to make the LRS output look nicer. '''
     for elem in root.iter():
         if len(elem) > 0 and (not elem.text or not elem.text.strip()):
-            elem.text = "\n"
+            elem.text = '\n'
         if not elem.tail or not elem.tail.strip():
-            elem.tail = "\n"
+            elem.tail = '\n'
 
 
 def ElementWithText(tag, text, **extra):
-    """ A shorthand function to create Elements with text. """
+    ''' A shorthand function to create Elements with text. '''
     e = Element(tag, **extra)
     e.text = text
     return e
 
 
 def ElementWithReading(tag, text, reading=False):
-    """ A helper function that creates reading attributes. """
+    ''' A helper function that creates reading attributes. '''
 
     # note: old lrs2lrf parser only allows reading = ""
 
     if text is None:
-        readingText = ""
+        readingText = ''
     elif isinstance(text, string_or_bytes):
         readingText = text
     else:
@@ -113,12 +113,12 @@ def ElementWithReading(tag, text, reading=False):
         text = text[0]
 
     if not reading:
-        readingText = ""
+        readingText = ''
     return ElementWithText(tag, text, reading=readingText)
 
 
 def appendTextElements(e, contentsList, se):
-    """ A helper function to convert text streams into the proper elements. """
+    ''' A helper function to convert text streams into the proper elements. '''
 
     def uconcat(text, newText, se):
         if isinstance(text, bytes):
@@ -128,7 +128,7 @@ def appendTextElements(e, contentsList, se):
 
         return text + newText
 
-    e.text = ""
+    e.text = ''
     lastElement = None
 
     for content in contentsList:
@@ -137,7 +137,7 @@ def appendTextElements(e, contentsList, se):
             if newElement is None:
                 continue
             lastElement = newElement
-            lastElement.tail = ""
+            lastElement.tail = ''
             e.append(lastElement)
         else:
             if lastElement is None:
@@ -147,7 +147,7 @@ def appendTextElements(e, contentsList, se):
 
 
 class Delegator:
-    """ A mixin class to create delegated methods that create elements. """
+    ''' A mixin class to create delegated methods that create elements. '''
 
     def __init__(self, delegates):
         self.delegates = delegates
@@ -161,15 +161,13 @@ class Delegator:
             for m in methods:
                 setattr(self, m, getattr(d, m))
 
-            """
-            for setting in d.getSettings():
-                if isinstance(setting, string_or_bytes):
-                    setting = (d, setting)
-                delegates = \
-                        self.delegatedSettingsDict.setdefault(setting[1], [])
-                delegates.append(setting[0])
-                self.delegatedSettings.append(setting)
-            """
+            # for setting in d.getSettings():
+            #     if isinstance(setting, string_or_bytes):
+            #         setting = (d, setting)
+            #     delegates = \
+            #             self.delegatedSettingsDict.setdefault(setting[1], [])
+            #     delegates.append(setting[0])
+            #     self.delegatedSettings.append(setting)
 
     def applySetting(self, name, value, testValid=False):
         applied = False
@@ -178,7 +176,7 @@ class Delegator:
             applied = True
 
         for d in self.delegates:
-            if hasattr(d, "applySetting"):
+            if hasattr(d, 'applySetting'):
                 applied = applied or d.applySetting(name, value)
             else:
                 if name in d.getSettings():
@@ -186,20 +184,18 @@ class Delegator:
                     applied = True
 
         if testValid and not applied:
-            raise LrsError("setting %s not valid" % name)
+            raise LrsError('setting %s not valid' % name)
 
         return applied
 
     def applySettings(self, settings, testValid=False):
-        for (setting, value) in settings.items():
+        for setting, value in settings.items():
             self.applySetting(setting, value, testValid)
-            """
-            if setting not in self.delegatedSettingsDict:
-                raise LrsError, "setting %s not valid" % setting
-            delegates = self.delegatedSettingsDict[setting]
-            for d in delegates:
-                setattr(d, setting, value)
-            """
+            # if setting not in self.delegatedSettingsDict:
+            #     raise LrsError("setting %s not valid" % setting)
+            # delegates = self.delegatedSettingsDict[setting]
+            # for d in delegates:
+            #     setattr(d, setting, value)
 
     def appendDelegates(self, element, sourceEncoding):
         for d in self.delegates:
@@ -230,15 +226,15 @@ class Delegator:
 
 
 class LrsAttributes:
-    """ A mixin class to handle default and user supplied attributes. """
+    ''' A mixin class to handle default and user supplied attributes. '''
 
     def __init__(self, defaults, alsoAllow=None, **settings):
         if alsoAllow is None:
             alsoAllow = []
         self.attrs = defaults.copy()
-        for (name, value) in settings.items():
+        for name, value in settings.items():
             if name not in self.attrs and name not in alsoAllow:
-                raise LrsError("%s does not support setting %s" %
+                raise LrsError('%s does not support setting %s' %
                         (self.__class__.__name__, name))
             if isinstance(value, int):
                 value = str(value)
@@ -246,9 +242,9 @@ class LrsAttributes:
 
 
 class LrsContainer:
-    """ This class is a mixin class for elements that are contained in or
+    ''' This class is a mixin class for elements that are contained in or
         contain an unknown number of other elements.
-    """
+    '''
 
     def __init__(self, validChildren):
         self.parent = None
@@ -284,15 +280,15 @@ class LrsContainer:
 
     def setParent(self, parent):
         if self.parent is not None:
-            raise LrsError("object already has parent")
+            raise LrsError('object already has parent')
 
         self.parent = parent
 
     def append(self, content, convertText=True):
-        """
+        '''
             Appends valid objects to container.  Can auto-covert text strings
             to Text objects.
-        """
+        '''
         for validChild in self.validChildren:
             if isinstance(content, validChild):
                 break
@@ -321,7 +317,7 @@ class LrsContainer:
 
 
 class LrsObject:
-    """ A mixin class for elements that need an object id. """
+    ''' A mixin class for elements that need an object id. '''
     nextObjId = 0
 
     @classmethod
@@ -337,18 +333,18 @@ class LrsObject:
 
     def assignId(self):
         if self.objId != 0:
-            raise LrsError("id already assigned to " + self.__class__.__name__)
+            raise LrsError('id already assigned to ' + self.__class__.__name__)
 
         self.objId = LrsObject.getNextObjId()
 
-    def lrsObjectElement(self, name, objlabel="objlabel", labelName=None,
+    def lrsObjectElement(self, name, objlabel='objlabel', labelName=None,
             labelDecorate=True, **settings):
         element = Element(name)
-        element.attrib["objid"] = str(self.objId)
+        element.attrib['objid'] = str(self.objId)
         if labelName is None:
             labelName = name
         if labelDecorate:
-            label = "%s.%d" % (labelName, self.objId)
+            label = '%s.%d' % (labelName, self.objId)
         else:
             label = str(self.objId)
         element.attrib[objlabel] = label
@@ -357,7 +353,7 @@ class LrsObject:
 
 
 class Book(Delegator):
-    """
+    '''
         Main class for any lrs or lrf.  All objects must be appended to
         the Book class in some way or another in order to be rendered as
         an LRS or LRF file.
@@ -396,7 +392,7 @@ class Book(Delegator):
         Override the default SetDefault.
 
         There are several other settings -- see the BookInfo class for more.
-    """
+    '''
 
     def __init__(self, textstyledefault=None, blockstyledefault=None,
                        pagestyledefault=None,
@@ -406,8 +402,8 @@ class Book(Delegator):
 
         self.parent = None  # we are the top of the parent chain
 
-        if "thumbnail" in settings:
-            _checkExists(settings["thumbnail"])
+        if 'thumbnail' in settings:
+            _checkExists(settings['thumbnail'])
 
         # highly experimental -- use with caution
         self.optimizeTags = optimizeTags
@@ -440,8 +436,8 @@ class Book(Delegator):
         self.sourceencoding = None
 
         # apply default settings
-        self.applySetting("genreading", DEFAULT_GENREADING)
-        self.applySetting("sourceencoding", DEFAULT_SOURCE_ENCODING)
+        self.applySetting('genreading', DEFAULT_GENREADING)
+        self.applySetting('sourceencoding', DEFAULT_SOURCE_ENCODING)
 
         self.applySettings(settings, testValid=True)
 
@@ -524,14 +520,14 @@ class Book(Delegator):
         self.append(f)
 
     def getSettings(self):
-        return ["sourceencoding"]
+        return ['sourceencoding']
 
     def append(self, content):
-        """ Find and invoke the correct appender for this content. """
+        ''' Find and invoke the correct appender for this content. '''
 
         className = content.__class__.__name__
         try:
-            method = getattr(self, "append" + className)
+            method = getattr(self, 'append' + className)
         except AttributeError:
             raise LrsError("can't append %s to Book" % className)
 
@@ -593,16 +589,16 @@ class Book(Delegator):
             ts.attrs['fontsize'] = rescale(ts.attrs['fontsize'])
             ts.attrs['baselineskip'] = rescale(ts.attrs['baselineskip'])
 
-    def renderLrs(self, lrsFile, encoding="UTF-8"):
+    def renderLrs(self, lrsFile, encoding='UTF-8'):
         if isinstance(lrsFile, string_or_bytes):
-            lrsFile = codecs.open(lrsFile, "wb", encoding=encoding)
+            lrsFile = codecs.open(lrsFile, 'wb', encoding=encoding)
         self.render(lrsFile, outputEncodingName=encoding)
         lrsFile.close()
 
     def renderLrf(self, lrfFile):
         self.appendReferencedObjects(self)
         if isinstance(lrfFile, string_or_bytes):
-            lrfFile = open(lrfFile, "wb")
+            lrfFile = open(lrfFile, 'wb')
         lrfWriter = LrfWriter(self.sourceencoding)
 
         lrfWriter.optimizeTags = self.optimizeTags
@@ -613,13 +609,13 @@ class Book(Delegator):
         lrfFile.close()
 
     def toElement(self, se):
-        root = Element("BBeBXylog", version="1.0")
-        root.append(Element("Property"))
+        root = Element('BBeBXylog', version='1.0')
+        root.append(Element('Property'))
         self.appendDelegates(root, self.sourceencoding)
         return root
 
     def render(self, f, outputEncodingName='UTF-8'):
-        """ Write the book as an LRS to file f. """
+        ''' Write the book as an LRS to file f. '''
 
         self.appendReferencedObjects(self)
 
@@ -635,46 +631,46 @@ class Book(Delegator):
 
 
 class BookInformation(Delegator):
-    """ Just a container for the Info and TableOfContents elements. """
+    ''' Just a container for the Info and TableOfContents elements. '''
 
     def __init__(self):
         Delegator.__init__(self, [Info(), TableOfContents()])
 
     def toElement(self, se):
-        bi = Element("BookInformation")
+        bi = Element('BookInformation')
         self.appendDelegates(bi, se)
         return bi
 
 
 class Info(Delegator):
-    """ Just a container for the BookInfo and DocInfo elements. """
+    ''' Just a container for the BookInfo and DocInfo elements. '''
 
     def __init__(self):
         self.genreading = DEFAULT_GENREADING
         Delegator.__init__(self, [BookInfo(), DocInfo()])
 
     def getSettings(self):
-        return ["genreading"]  # + self.delegatedSettings
+        return ['genreading']  # + self.delegatedSettings
 
     def toElement(self, se):
-        info = Element("Info", version="1.1")
+        info = Element('Info', version='1.1')
         info.append(
-            self.delegates[0].toElement(se, reading="s" in self.genreading))
+            self.delegates[0].toElement(se, reading='s' in self.genreading))
         info.append(self.delegates[1].toElement(se))
         return info
 
     def toLrf(self, lrfWriter):
         # this info is set in XML form in the LRF
-        info = Element("Info", version="1.1")
+        info = Element('Info', version='1.1')
         # self.appendDelegates(info)
         info.append(
-            self.delegates[0].toElement(lrfWriter.getSourceEncoding(), reading="f" in self.genreading))
+            self.delegates[0].toElement(lrfWriter.getSourceEncoding(), reading='f' in self.genreading))
         info.append(self.delegates[1].toElement(lrfWriter.getSourceEncoding()))
 
         # look for the thumbnail file and get the filename
-        tnail = info.find("DocInfo/CThumbnail")
+        tnail = info.find('DocInfo/CThumbnail')
         if tnail is not None:
-            lrfWriter.setThumbnailFile(tnail.get("file"))
+            lrfWriter.setThumbnailFile(tnail.get('file'))
             # does not work: info.remove(tnail)
 
         _formatXml(info)
@@ -685,8 +681,8 @@ class Info(Delegator):
         f = io.BytesIO()
         tree.write(f, encoding=native_string_type('utf-8'), xml_declaration=True)
         xmlInfo = f.getvalue().decode('utf-8')
-        xmlInfo = re.sub(r"<CThumbnail.*?>\n", "", xmlInfo)
-        xmlInfo = xmlInfo.replace("SumPage>", "Page>")
+        xmlInfo = re.sub(r'<CThumbnail.*?>\n', '', xmlInfo)
+        xmlInfo = xmlInfo.replace('SumPage>', 'Page>')
         lrfWriter.docInfoXml = xmlInfo
 
 
@@ -699,24 +695,24 @@ class TableOfContents:
         pass
 
     def getMethods(self):
-        return ["addTocEntry"]
+        return ['addTocEntry']
 
     def getSettings(self):
         return []
 
     def addTocEntry(self, tocLabel, textBlock):
         if not isinstance(textBlock, (Canvas, TextBlock, ImageBlock, RuledLine)):
-            raise LrsError("TOC destination must be a Canvas, TextBlock, ImageBlock or RuledLine"+
-                            " not a " + str(type(textBlock)))
+            raise LrsError('TOC destination must be a Canvas, TextBlock, ImageBlock or RuledLine'+
+                            ' not a ' + str(type(textBlock)))
 
         if textBlock.parent is None:
-            raise LrsError("TOC text block must be already appended to a page")
+            raise LrsError('TOC text block must be already appended to a page')
 
         if False and textBlock.parent.parent is None:
-            raise LrsError("TOC destination page must be already appended to a book")
+            raise LrsError('TOC destination page must be already appended to a book')
 
         if not hasattr(textBlock.parent, 'objId'):
-            raise LrsError("TOC destination must be appended to a container with an objID")
+            raise LrsError('TOC destination must be appended to a container with an objID')
 
         for tl in self.tocEntries:
             if tl.label == tocLabel and tl.textBlock == textBlock:
@@ -729,7 +725,7 @@ class TableOfContents:
         if len(self.tocEntries) == 0:
             return None
 
-        toc = Element("TOC")
+        toc = Element('TOC')
 
         for t in self.tocEntries:
             toc.append(t.toElement(se))
@@ -756,7 +752,7 @@ class TocLabel:
         self.textBlock = textBlock
 
     def toElement(self, se):
-        return ElementWithText("TocLabel", self.label,
+        return ElementWithText('TocLabel', self.label,
                  refobj=str(self.textBlock.objId),
                  refpage=str(self.textBlock.parent.objId))
 
@@ -764,13 +760,13 @@ class TocLabel:
 class BookInfo:
 
     def __init__(self):
-        self.title = "Untitled"
-        self.author = "Anonymous"
+        self.title = 'Untitled'
+        self.author = 'Anonymous'
         self.bookid = None
         self.pi = None
         self.isbn = None
         self.publisher = None
-        self.freetext = "\n\n"
+        self.freetext = '\n\n'
         self.label = None
         self.category = None
         self.classification = None
@@ -782,34 +778,34 @@ class BookInfo:
         return []
 
     def getSettings(self):
-        return ["author", "title", "bookid", "isbn", "publisher",
-                "freetext", "label", "category", "classification"]
+        return ['author', 'title', 'bookid', 'isbn', 'publisher',
+                'freetext', 'label', 'category', 'classification']
 
     def _appendISBN(self, bi):
-        pi = Element("ProductIdentifier")
-        isbnElement = ElementWithText("ISBNPrintable", self.isbn)
-        isbnValueElement = ElementWithText("ISBNValue",
-                self.isbn.replace("-", ""))
+        pi = Element('ProductIdentifier')
+        isbnElement = ElementWithText('ISBNPrintable', self.isbn)
+        isbnValueElement = ElementWithText('ISBNValue',
+                self.isbn.replace('-', ''))
 
         pi.append(isbnElement)
         pi.append(isbnValueElement)
         bi.append(pi)
 
     def toElement(self, se, reading=True):
-        bi = Element("BookInfo")
-        bi.append(ElementWithReading("Title", self.title, reading=reading))
-        bi.append(ElementWithReading("Author", self.author, reading=reading))
-        bi.append(ElementWithText("BookID", self.bookid))
+        bi = Element('BookInfo')
+        bi.append(ElementWithReading('Title', self.title, reading=reading))
+        bi.append(ElementWithReading('Author', self.author, reading=reading))
+        bi.append(ElementWithText('BookID', self.bookid))
         if self.isbn is not None:
             self._appendISBN(bi)
 
         if self.publisher is not None:
-            bi.append(ElementWithReading("Publisher", self.publisher))
+            bi.append(ElementWithReading('Publisher', self.publisher))
 
-        bi.append(ElementWithReading("Label", self.label, reading=reading))
-        bi.append(ElementWithText("Category", self.category))
-        bi.append(ElementWithText("Classification", self.classification))
-        bi.append(ElementWithText("FreeText", self.freetext))
+        bi.append(ElementWithReading('Label', self.label, reading=reading))
+        bi.append(ElementWithText('Category', self.category))
+        bi.append(ElementWithText('Classification', self.classification))
+        bi.append(ElementWithText('FreeText', self.freetext))
         return bi
 
 
@@ -817,11 +813,11 @@ class DocInfo:
 
     def __init__(self):
         self.thumbnail = None
-        self.language = "en"
+        self.language = 'en'
         self.creator  = None
         self.creationdate = str(isoformat(date.today()))
-        self.producer = "%s v%s"%(__appname__, __version__)
-        self.numberofpages = "0"
+        self.producer = '%s v%s'%(__appname__, __version__)
+        self.numberofpages = '0'
 
     def appendReferencedObjects(self, parent):
         pass
@@ -830,20 +826,20 @@ class DocInfo:
         return []
 
     def getSettings(self):
-        return ["thumbnail", "language", "creator", "creationdate",
-                "producer", "numberofpages"]
+        return ['thumbnail', 'language', 'creator', 'creationdate',
+                'producer', 'numberofpages']
 
     def toElement(self, se):
-        docInfo = Element("DocInfo")
+        docInfo = Element('DocInfo')
 
         if self.thumbnail is not None:
-            docInfo.append(Element("CThumbnail", file=self.thumbnail))
+            docInfo.append(Element('CThumbnail', file=self.thumbnail))
 
-        docInfo.append(ElementWithText("Language", self.language))
-        docInfo.append(ElementWithText("Creator", self.creator))
-        docInfo.append(ElementWithText("CreationDate", self.creationdate))
-        docInfo.append(ElementWithText("Producer", self.producer))
-        docInfo.append(ElementWithText("SumPage", str(self.numberofpages)))
+        docInfo.append(ElementWithText('Language', self.language))
+        docInfo.append(ElementWithText('Creator', self.creator))
+        docInfo.append(ElementWithText('CreationDate', self.creationdate))
+        docInfo.append(ElementWithText('Producer', self.producer))
+        docInfo.append(ElementWithText('SumPage', str(self.numberofpages)))
         return docInfo
 
 
@@ -853,7 +849,7 @@ class Main(LrsContainer):
         LrsContainer.__init__(self, [Page])
 
     def getMethods(self):
-        return ["appendPage", "Page"]
+        return ['appendPage', 'Page']
 
     def getSettings(self):
         return []
@@ -889,8 +885,8 @@ class Main(LrsContainer):
 
         # create a page tree object
 
-        pageTree = LrfObject("PageTree", pageTreeId)
-        pageTree.appendLrfTag(LrfTag("PageList", pageIds))
+        pageTree = LrfObject('PageTree', pageTreeId)
+        pageTree.appendLrfTag(LrfTag('PageList', pageIds))
 
         lrfWriter.append(pageTree)
 
@@ -901,7 +897,7 @@ class Solos(LrsContainer):
         LrsContainer.__init__(self, [Solo])
 
     def getMethods(self):
-        return ["appendSolo", "Solo"]
+        return ['appendSolo', 'Solo']
 
     def getSettings(self):
         return []
@@ -934,7 +930,7 @@ class Solo(Main):
 
 
 class Template:
-    """ Does nothing that I know of. """
+    ''' Does nothing that I know of. '''
 
     def appendReferencedObjects(self, parent):
         pass
@@ -946,8 +942,8 @@ class Template:
         return []
 
     def toElement(self, se):
-        t = Element("Template")
-        t.attrib["version"] = "1.0"
+        t = Element('Template')
+        t.attrib['version'] = '1.0'
         return t
 
     def toLrf(self, lrfWriter):
@@ -956,25 +952,25 @@ class Template:
 
 
 class StyleDefault(LrsAttributes):
-    """
+    '''
         Supply some defaults for all TextBlocks.
         The legal values are a subset of what is allowed on a
         TextBlock -- ruby, emphasis, and waitprop settings.
-    """
-    defaults = dict(rubyalign="start", rubyadjust="none",
-                rubyoverhang="none", empdotsposition="before",
-                empdotsfontname="Dutch801 Rm BT Roman",
-                empdotscode="0x002e", emplineposition="after",
-                emplinetype="solid", setwaitprop="noreplay")
+    '''
+    defaults = dict(rubyalign='start', rubyadjust='none',
+                rubyoverhang='none', empdotsposition='before',
+                empdotsfontname='Dutch801 Rm BT Roman',
+                empdotscode='0x002e', emplineposition='after',
+                emplinetype='solid', setwaitprop='noreplay')
 
-    alsoAllow = ["refempdotsfont", "rubyAlignAndAdjust"]
+    alsoAllow = ['refempdotsfont', 'rubyAlignAndAdjust']
 
     def __init__(self, **settings):
         LrsAttributes.__init__(self, self.defaults,
                 alsoAllow=self.alsoAllow, **settings)
 
     def toElement(self, se):
-        return Element("SetDefault", self.attrs)
+        return Element('SetDefault', self.attrs)
 
 
 class Style(LrsContainer, Delegator):
@@ -990,8 +986,8 @@ class Style(LrsContainer, Delegator):
         LrsContainer.appendReferencedObjects(self, parent)
 
     def getMethods(self):
-        return ["PageStyle", "TextStyle", "BlockStyle",
-                "appendPageStyle", "appendTextStyle", "appendBlockStyle"] + \
+        return ['PageStyle', 'TextStyle', 'BlockStyle',
+                'appendPageStyle', 'appendTextStyle', 'appendBlockStyle'] + \
                         self.delegatedMethods
 
     def getSettings(self):
@@ -1013,7 +1009,7 @@ class Style(LrsContainer, Delegator):
         return bs
 
     def toElement(self, se):
-        style = Element("Style")
+        style = Element('Style')
         style.append(self.bookStyle.toElement(se))
 
         for content in self.contents:
@@ -1038,18 +1034,17 @@ class BookStyle(LrsObject, LrsContainer):
         self.appendFont = self.append
 
     def getSettings(self):
-        return ["styledefault", "booksetting"]
+        return ['styledefault', 'booksetting']
 
     def getMethods(self):
-        return ["Font", "appendFont"]
+        return ['Font', 'appendFont']
 
     def Font(self, *args, **kwargs):
         f = Font(*args, **kwargs)
         self.append(f)
-        return
 
     def toElement(self, se):
-        bookStyle = self.lrsObjectElement("BookStyle", objlabel="stylelabel",
+        bookStyle = self.lrsObjectElement('BookStyle', objlabel='stylelabel',
                 labelDecorate=False)
         bookStyle.append(self.styledefault.toElement(se))
         bookStyle.append(self.booksetting.toElement(se))
@@ -1059,8 +1054,8 @@ class BookStyle(LrsObject, LrsContainer):
         return bookStyle
 
     def toLrf(self, lrfWriter):
-        bookAtr = LrfObject("BookAtr", self.objId)
-        bookAtr.appendLrfTag(LrfTag("ChildPageTree", lrfWriter.getPageTreeId()))
+        bookAtr = LrfObject('BookAtr', self.objId)
+        bookAtr.appendLrfTag(LrfTag('ChildPageTree', lrfWriter.getPageTreeId()))
         bookAtr.appendTagDict(self.styledefault.attrs)
 
         self.booksetting.toLrf(lrfWriter)
@@ -1075,25 +1070,25 @@ class BookStyle(LrsObject, LrsContainer):
 class BookSetting(LrsAttributes):
 
     def __init__(self, **settings):
-        defaults = dict(bindingdirection="Lr", dpi="1660",
-                screenheight="800", screenwidth="600", colordepth="24")
+        defaults = dict(bindingdirection='Lr', dpi='1660',
+                screenheight='800', screenwidth='600', colordepth='24')
         LrsAttributes.__init__(self, defaults, **settings)
 
     def toLrf(self, lrfWriter):
         a = self.attrs
-        lrfWriter.dpi = int(a["dpi"])
+        lrfWriter.dpi = int(a['dpi'])
         lrfWriter.bindingdirection = \
-                BINDING_DIRECTION_ENCODING[a["bindingdirection"]]
-        lrfWriter.height = int(a["screenheight"])
-        lrfWriter.width = int(a["screenwidth"])
-        lrfWriter.colorDepth = int(a["colordepth"])
+                BINDING_DIRECTION_ENCODING[a['bindingdirection']]
+        lrfWriter.height = int(a['screenheight'])
+        lrfWriter.width = int(a['screenwidth'])
+        lrfWriter.colorDepth = int(a['colordepth'])
 
     def toElement(self, se):
-        return Element("BookSetting", self.attrs)
+        return Element('BookSetting', self.attrs)
 
 
 class LrsStyle(LrsObject, LrsAttributes, LrsContainer):
-    """ A mixin class for styles. """
+    ''' A mixin class for styles. '''
 
     def __init__(self, elementName, defaults=None, alsoAllow=None, **overrides):
         if defaults is None:
@@ -1111,7 +1106,7 @@ class LrsStyle(LrsObject, LrsAttributes, LrsContainer):
     def update(self, settings):
         for name, value in settings.items():
             if name not in self.__class__.validSettings:
-                raise LrsError(f"{name} not a valid setting for {self.__class__.__name__}")
+                raise LrsError(f'{name} not a valid setting for {self.__class__.__name__}')
             self.attrs[name] = value
 
     def getLabel(self):
@@ -1135,7 +1130,7 @@ class LrsStyle(LrsObject, LrsAttributes, LrsContainer):
 
 
 class TextStyle(LrsStyle):
-    """
+    '''
         The text style of a TextBlock.  Default is 10 pt. Times Roman.
 
         Setting         Value                   Default
@@ -1149,27 +1144,27 @@ class TextStyle(LrsStyle):
         linespace       points * 10             10 (min space btw. lines?)
         wordspace       points * 10             25 (min space btw. each word)
 
-    """
+    '''
     baseDefaults = dict(
-            columnsep="0", charspace="0",
-            textlinewidth="2", align="head", linecolor="0x00000000",
-            column="1", fontsize="100", fontwidth="-10", fontescapement="0",
-            fontorientation="0", fontweight="400",
-            fontfacename="Dutch801 Rm BT Roman",
-            textcolor="0x00000000", wordspace="25", letterspace="0",
-            baselineskip="120", linespace="10", parindent="0", parskip="0",
-            textbgcolor="0xFF000000")
+            columnsep='0', charspace='0',
+            textlinewidth='2', align='head', linecolor='0x00000000',
+            column='1', fontsize='100', fontwidth='-10', fontescapement='0',
+            fontorientation='0', fontweight='400',
+            fontfacename='Dutch801 Rm BT Roman',
+            textcolor='0x00000000', wordspace='25', letterspace='0',
+            baselineskip='120', linespace='10', parindent='0', parskip='0',
+            textbgcolor='0xFF000000')
 
-    alsoAllow = ["empdotscode", "empdotsfontname", "refempdotsfont",
-                 "rubyadjust", "rubyalign", "rubyoverhang",
-                 "empdotsposition", 'emplinetype', 'emplineposition']
+    alsoAllow = ['empdotscode', 'empdotsfontname', 'refempdotsfont',
+                 'rubyadjust', 'rubyalign', 'rubyoverhang',
+                 'empdotsposition', 'emplinetype', 'emplineposition']
 
     validSettings = list(baseDefaults) + alsoAllow
 
     defaults = baseDefaults.copy()
 
     def __init__(self, **overrides):
-        LrsStyle.__init__(self, "TextStyle", self.defaults,
+        LrsStyle.__init__(self, 'TextStyle', self.defaults,
                 alsoAllow=self.alsoAllow, **overrides)
 
     def copy(self):
@@ -1179,7 +1174,7 @@ class TextStyle(LrsStyle):
 
 
 class BlockStyle(LrsStyle):
-    """
+    '''
         The block style of a TextBlock.  Default is an expandable 560 pixel
         wide area with no space for headers or footers.
 
@@ -1187,19 +1182,19 @@ class BlockStyle(LrsStyle):
         --------     -----                  -------
         blockwidth   pixels                 560
         sidemargin   pixels                 0
-    """
+    '''
 
     baseDefaults = dict(
-            bgimagemode="fix", framemode="square", blockwidth="560",
-            blockheight="100", blockrule="horz-adjustable", layout="LrTb",
-            framewidth="0", framecolor="0x00000000", topskip="0",
-            sidemargin="0", footskip="0", bgcolor="0xFF000000")
+            bgimagemode='fix', framemode='square', blockwidth='560',
+            blockheight='100', blockrule='horz-adjustable', layout='LrTb',
+            framewidth='0', framecolor='0x00000000', topskip='0',
+            sidemargin='0', footskip='0', bgcolor='0xFF000000')
 
     validSettings = baseDefaults.keys()
     defaults = baseDefaults.copy()
 
     def __init__(self, **overrides):
-        LrsStyle.__init__(self, "BlockStyle", self.defaults, **overrides)
+        LrsStyle.__init__(self, 'BlockStyle', self.defaults, **overrides)
 
     def copy(self):
         tb = BlockStyle()
@@ -1208,35 +1203,35 @@ class BlockStyle(LrsStyle):
 
 
 class PageStyle(LrsStyle):
-    """
+    '''
         Setting         Value                   Default
         --------        -----                   -------
         evensidemargin  pixels                  20
         oddsidemargin   pixels                  20
         topmargin       pixels                  20
-    """
+    '''
     baseDefaults = dict(
-            topmargin="20", headheight="0", headsep="0",
-            oddsidemargin="20", textheight="747", textwidth="575",
-            footspace="0", evensidemargin="20", footheight="0",
-            layout="LrTb", bgimagemode="fix", pageposition="any",
-            setwaitprop="noreplay", setemptyview="show")
+            topmargin='20', headheight='0', headsep='0',
+            oddsidemargin='20', textheight='747', textwidth='575',
+            footspace='0', evensidemargin='20', footheight='0',
+            layout='LrTb', bgimagemode='fix', pageposition='any',
+            setwaitprop='noreplay', setemptyview='show')
 
-    alsoAllow = ["header", "evenheader", "oddheader",
-                 "footer", "evenfooter", "oddfooter"]
+    alsoAllow = ['header', 'evenheader', 'oddheader',
+                 'footer', 'evenfooter', 'oddfooter']
 
     validSettings = list(baseDefaults) + alsoAllow
     defaults = baseDefaults.copy()
 
     @classmethod
     def translateHeaderAndFooter(selfClass, parent, settings):
-        selfClass._fixup(parent, "header", settings)
-        selfClass._fixup(parent, "footer", settings)
+        selfClass._fixup(parent, 'header', settings)
+        selfClass._fixup(parent, 'footer', settings)
 
     @classmethod
     def _fixup(selfClass, parent, basename, settings):
-        evenbase = "even" + basename
-        oddbase = "odd" + basename
+        evenbase = 'even' + basename
+        oddbase = 'odd' + basename
         if basename in settings:
             baseObj = settings[basename]
             del settings[basename]
@@ -1247,14 +1242,14 @@ class PageStyle(LrsStyle):
             del settings[evenbase]
             if evenObj.parent is None:
                 parent.append(evenObj)
-            settings[evenbase + "id"] = str(evenObj.objId)
+            settings[evenbase + 'id'] = str(evenObj.objId)
 
         if oddbase in settings:
             oddObj = settings[oddbase]
             del settings[oddbase]
             if oddObj.parent is None:
                 parent.append(oddObj)
-            settings[oddbase + "id"] = str(oddObj.objId)
+            settings[oddbase + 'id'] = str(oddObj.objId)
 
     def appendReferencedObjects(self, parent):
         if self.objectsAppended:
@@ -1264,15 +1259,15 @@ class PageStyle(LrsStyle):
 
     def __init__(self, **settings):
         # self.fixHeaderSettings(settings)
-        LrsStyle.__init__(self, "PageStyle", self.defaults,
+        LrsStyle.__init__(self, 'PageStyle', self.defaults,
                 alsoAllow=self.alsoAllow, **settings)
 
 
 class Page(LrsObject, LrsContainer):
-    """
+    '''
         Pages are added to Books.  Pages can be supplied a PageStyle.
         If they are not, Page.defaultPageStyle will be used.
-    """
+    '''
     defaultPageStyle = PageStyle()
 
     def __init__(self, pageStyle=defaultPageStyle, **settings):
@@ -1285,7 +1280,7 @@ class Page(LrsObject, LrsContainer):
         for settingName in settings.keys():
             if settingName not in PageStyle.defaults and \
                     settingName not in PageStyle.alsoAllow:
-                raise LrsError("setting %s not allowed on Page" % settingName)
+                raise LrsError('setting %s not allowed on Page' % settingName)
 
         self.settings = settings.copy()
 
@@ -1310,19 +1305,19 @@ class Page(LrsObject, LrsContainer):
         return bs
 
     def TextBlock(self, *args, **kwargs):
-        """ Create and append a new text block (shortcut). """
+        ''' Create and append a new text block (shortcut). '''
         tb = TextBlock(*args, **kwargs)
         self.append(tb)
         return tb
 
     def ImageBlock(self, *args, **kwargs):
-        """ Create and append and new Image block (shorthand). """
+        ''' Create and append and new Image block (shorthand). '''
         ib = ImageBlock(*args, **kwargs)
         self.append(ib)
         return ib
 
     def addLrfObject(self, objId):
-        self.stream.appendLrfTag(LrfTag("Link", objId))
+        self.stream.appendLrfTag(LrfTag('Link', objId))
 
     def appendLrfTag(self, lrfTag):
         self.stream.appendLrfTag(lrfTag)
@@ -1334,27 +1329,27 @@ class Page(LrsObject, LrsContainer):
         # Parent page tree id
         # stream of tags
 
-        p = LrfObject("Page", self.objId)
+        p = LrfObject('Page', self.objId)
         lrfWriter.append(p)
 
         pageContent = set()
         self.stream = LrfTagStream(0)
         for content in self.contents:
             content.toLrfContainer(lrfWriter, self)
-            if hasattr(content, "getReferencedObjIds"):
+            if hasattr(content, 'getReferencedObjIds'):
                 pageContent.update(content.getReferencedObjIds())
 
-        # print "page contents:", pageContent
+        # print('page contents:', pageContent)
         # ObjectList not needed and causes slowdown in SONY LRF renderer
         # p.appendLrfTag(LrfTag("ObjectList", pageContent))
-        p.appendLrfTag(LrfTag("Link", self.pageStyle.objId))
-        p.appendLrfTag(LrfTag("ParentPageTree", lrfWriter.getPageTreeId()))
+        p.appendLrfTag(LrfTag('Link', self.pageStyle.objId))
+        p.appendLrfTag(LrfTag('ParentPageTree', lrfWriter.getPageTreeId()))
         p.appendTagDict(self.settings)
         p.appendLrfTags(self.stream.getStreamTags(lrfWriter.getSourceEncoding()))
 
     def toElement(self, sourceEncoding):
-        page = self.lrsObjectElement("Page")
-        page.set("pagestyle", self.pageStyle.getLabel())
+        page = self.lrsObjectElement('Page')
+        page.set('pagestyle', self.pageStyle.getLabel())
         page.attrib.update(self.settings)
 
         for content in self.contents:
@@ -1364,12 +1359,12 @@ class Page(LrsObject, LrsContainer):
 
 
 class TextBlock(LrsObject, LrsContainer):
-    """
+    '''
         TextBlocks are added to Pages.  They hold Paragraphs or CRs.
 
         If a TextBlock is used in a header, it should be appended to
         the Book, not to a specific Page.
-    """
+    '''
     defaultTextStyle = TextStyle()
     defaultBlockStyle = BlockStyle()
 
@@ -1396,7 +1391,7 @@ class TextBlock(LrsObject, LrsContainer):
             elif name == 'toclabel':
                 self.tocLabel = value
             else:
-                raise LrsError("%s not a valid setting for TextBlock" % name)
+                raise LrsError('%s not a valid setting for TextBlock' % name)
 
         self.textStyle = textStyle
         self.blockStyle = blockStyle
@@ -1415,25 +1410,25 @@ class TextBlock(LrsObject, LrsContainer):
         LrsContainer.appendReferencedObjects(self, parent)
 
     def Paragraph(self, *args, **kwargs):
-        """
+        '''
             Create and append a Paragraph to this TextBlock.  A CR is
             automatically inserted after the Paragraph.  To avoid this
             behavior, create the Paragraph and append it to the TextBlock
             in a separate call.
-        """
+        '''
         p = Paragraph(*args, **kwargs)
         self.append(p)
         self.append(CR())
         return p
 
     def toElement(self, sourceEncoding):
-        tb = self.lrsObjectElement("TextBlock", labelName="Block")
+        tb = self.lrsObjectElement('TextBlock', labelName='Block')
         tb.attrib.update(self.textSettings)
         tb.attrib.update(self.blockSettings)
-        tb.set("textstyle", self.textStyle.getLabel())
-        tb.set("blockstyle", self.blockStyle.getLabel())
-        if hasattr(self, "tocLabel"):
-            tb.set("toclabel", self.tocLabel)
+        tb.set('textstyle', self.textStyle.getLabel())
+        tb.set('blockstyle', self.blockStyle.getLabel())
+        if hasattr(self, 'tocLabel'):
+            tb.set('toclabel', self.tocLabel)
 
         for content in self.contents:
             tb.append(content.toElement(sourceEncoding))
@@ -1444,7 +1439,7 @@ class TextBlock(LrsObject, LrsContainer):
         ids = [self.objId, self.extraId, self.blockStyle.objId,
                 self.textStyle.objId]
         for content in self.contents:
-            if hasattr(content, "getReferencedObjIds"):
+            if hasattr(content, 'getReferencedObjIds'):
                 ids.extend(content.getReferencedObjIds())
 
         return ids
@@ -1456,16 +1451,16 @@ class TextBlock(LrsObject, LrsContainer):
         # id really belongs to the outer block
         extraId = LrsObject.getNextObjId()
 
-        b = LrfObject("Block", self.objId)
-        b.appendLrfTag(LrfTag("Link", self.blockStyle.objId))
+        b = LrfObject('Block', self.objId)
+        b.appendLrfTag(LrfTag('Link', self.blockStyle.objId))
         b.appendLrfTags(
-                LrfTagStream(0, [LrfTag("Link", extraId)]).getStreamTags(lrfWriter.getSourceEncoding()))
+                LrfTagStream(0, [LrfTag('Link', extraId)]).getStreamTags(lrfWriter.getSourceEncoding()))
         b.appendTagDict(self.blockSettings)
         container.addLrfObject(b.objId)
         lrfWriter.append(b)
 
-        tb = LrfObject("TextBlock", extraId)
-        tb.appendLrfTag(LrfTag("Link", self.textStyle.objId))
+        tb = LrfObject('TextBlock', extraId)
+        tb.appendLrfTag(LrfTag('Link', self.textStyle.objId))
         tb.appendTagDict(self.textSettings)
 
         stream = LrfTagStream(STREAM_COMPRESSED)
@@ -1485,7 +1480,7 @@ class TextBlock(LrsObject, LrsContainer):
 
 
 class Paragraph(LrsContainer):
-    """
+    '''
         Note: <P> alone does not make a paragraph.  Only a CR inserted
         into a text block right after a <P> makes a real paragraph.
         Two Paragraphs appended in a row act like a single Paragraph.
@@ -1493,7 +1488,7 @@ class Paragraph(LrsContainer):
         Also note that there are few autoappenders for Paragraph (and
         the things that can go in it.)  It's less confusing (to me) to use
         explicit .append methods to build up the text stream.
-    """
+    '''
 
     def __init__(self, text=None):
         LrsContainer.__init__(self, [Text, CR, DropCaps, CharButton,
@@ -1512,19 +1507,19 @@ class Paragraph(LrsContainer):
     def getReferencedObjIds(self):
         ids = []
         for content in self.contents:
-            if hasattr(content, "getReferencedObjIds"):
+            if hasattr(content, 'getReferencedObjIds'):
                 ids.extend(content.getReferencedObjIds())
 
         return ids
 
     def toLrfContainer(self, lrfWriter, parent):
-        parent.appendLrfTag(LrfTag("pstart", 0))
+        parent.appendLrfTag(LrfTag('pstart', 0))
         for content in self.contents:
             content.toLrfContainer(lrfWriter, parent)
-        parent.appendLrfTag(LrfTag("pend"))
+        parent.appendLrfTag(LrfTag('pend'))
 
     def toElement(self, sourceEncoding):
-        p = Element("P")
+        p = Element('P')
         appendTextElements(p, self.contents, sourceEncoding)
         return p
 
@@ -1537,7 +1532,7 @@ class LrsTextTag(LrsContainer):
             self.append(text)
 
     def toLrfContainer(self, lrfWriter, parent):
-        if hasattr(self, "tagName"):
+        if hasattr(self, 'tagName'):
             tagName = self.tagName
         else:
             tagName = self.__class__.__name__
@@ -1547,10 +1542,10 @@ class LrsTextTag(LrsContainer):
         for content in self.contents:
             content.toLrfContainer(lrfWriter, parent)
 
-        parent.appendLrfTag(LrfTag(tagName + "End"))
+        parent.appendLrfTag(LrfTag(tagName + 'End'))
 
     def toElement(self, se):
-        if hasattr(self, "tagName"):
+        if hasattr(self, 'tagName'):
             tagName = self.tagName
         else:
             tagName = self.__class__.__name__
@@ -1591,7 +1586,7 @@ class DropCaps(LrsTextTag):
         return self.text is None or not self.text.strip()
 
     def toElement(self, se):
-        elem =  Element('DrawChar', line=str(self.line))
+        elem = Element('DrawChar', line=str(self.line))
         appendTextElements(elem, self.contents, se)
         return elem
 
@@ -1601,7 +1596,7 @@ class DropCaps(LrsTextTag):
         for content in self.contents:
             content.toLrfContainer(lrfWriter, parent)
 
-        parent.appendLrfTag(LrfTag("DrawCharEnd"))
+        parent.appendLrfTag(LrfTag('DrawCharEnd'))
 
 
 class Button(LrsObject, LrsContainer):
@@ -1616,22 +1611,22 @@ class Button(LrsObject, LrsContainer):
                 for sub2 in sub1.contents:
                     if isinstance(sub2, JumpTo):
                         return (sub2.textBlock.objId, sub2.textBlock.parent.objId)
-        raise LrsError("%s has no PushButton or JumpTo subs"%self.__class__.__name__)
+        raise LrsError('%s has no PushButton or JumpTo subs'%self.__class__.__name__)
 
     def toLrf(self, lrfWriter):
-        (refobj, refpage) = self.findJumpToRefs()
-        # print "Button writing JumpTo refobj=", jumpto.refobj, ", and refpage=", jumpto.refpage
-        button = LrfObject("Button", self.objId)
-        button.appendLrfTag(LrfTag("buttonflags", 0x10))  # pushbutton
-        button.appendLrfTag(LrfTag("PushButtonStart"))
-        button.appendLrfTag(LrfTag("buttonactions"))
-        button.appendLrfTag(LrfTag("jumpto", (int(refpage), int(refobj))))
-        button.append(LrfTag("endbuttonactions"))
-        button.appendLrfTag(LrfTag("PushButtonEnd"))
+        refobj, refpage = self.findJumpToRefs()
+        # print('Button writing JumpTo refobj=', jumpto.refobj, ', and refpage=', jumpto.refpage)
+        button = LrfObject('Button', self.objId)
+        button.appendLrfTag(LrfTag('buttonflags', 0x10))  # pushbutton
+        button.appendLrfTag(LrfTag('PushButtonStart'))
+        button.appendLrfTag(LrfTag('buttonactions'))
+        button.appendLrfTag(LrfTag('jumpto', (int(refpage), int(refobj))))
+        button.append(LrfTag('endbuttonactions'))
+        button.appendLrfTag(LrfTag('PushButtonEnd'))
         lrfWriter.append(button)
 
     def toElement(self, se):
-        b = self.lrsObjectElement("Button")
+        b = self.lrsObjectElement('Button')
 
         for content in self.contents:
             b.append(content.toElement(se))
@@ -1649,7 +1644,7 @@ class PushButton(LrsContainer):
         LrsContainer.__init__(self, [JumpTo])
 
     def toElement(self, se):
-        b = Element("PushButton")
+        b = Element('PushButton')
 
         for content in self.contents:
             b.append(content.toElement(se))
@@ -1667,7 +1662,7 @@ class JumpTo(LrsContainer):
         self.textBlock = textBlock
 
     def toElement(self, se):
-        return Element("JumpTo", refpage=str(self.textBlock.parent.objId), refobj=str(self.textBlock.objId))
+        return Element('JumpTo', refpage=str(self.textBlock.parent.objId), refobj=str(self.textBlock.objId))
 
 
 class Plot(LrsSimpleChar1, LrsContainer):
@@ -1699,7 +1694,7 @@ class Plot(LrsSimpleChar1, LrsContainer):
             parent.append(self.obj)
 
     def toElement(self, se):
-        elem =  Element('Plot', xsize=str(self.xsize), ysize=str(self.ysize),
+        elem = Element('Plot', xsize=str(self.xsize), ysize=str(self.ysize),
                                 refobj=str(self.obj.objId))
         if self.adjustment:
             elem.set('adjustment', self.adjustment)
@@ -1709,11 +1704,11 @@ class Plot(LrsSimpleChar1, LrsContainer):
         adj = self.adjustment if self.adjustment else 'bottom'
         params = (int(self.xsize), int(self.ysize), int(self.obj.objId),
                   Plot.ADJUSTMENT_VALUES[adj])
-        parent.appendLrfTag(LrfTag("Plot", params))
+        parent.appendLrfTag(LrfTag('Plot', params))
 
 
 class Text(LrsContainer):
-    """ A object that represents raw text.  Does not have a toElement. """
+    ''' A object that represents raw text.  Does not have a toElement. '''
 
     def __init__(self, text):
         LrsContainer.__init__(self, [])
@@ -1725,25 +1720,25 @@ class Text(LrsContainer):
     def toLrfContainer(self, lrfWriter, parent):
         if self.text:
             if isinstance(self.text, bytes):
-                parent.appendLrfTag(LrfTag("rawtext", self.text))
+                parent.appendLrfTag(LrfTag('rawtext', self.text))
             else:
-                parent.appendLrfTag(LrfTag("textstring", self.text))
+                parent.appendLrfTag(LrfTag('textstring', self.text))
 
 
 class CR(LrsSimpleChar1, LrsContainer):
-    """
+    '''
         A line break (when appended to a Paragraph) or a paragraph break
         (when appended to a TextBlock).
-    """
+    '''
 
     def __init__(self):
         LrsContainer.__init__(self, [])
 
     def toElement(self, se):
-        return Element("CR")
+        return Element('CR')
 
     def toLrfContainer(self, lrfWriter, parent):
-        parent.appendLrfTag(LrfTag("CR"))
+        parent.appendLrfTag(LrfTag('CR'))
 
 
 class Italic(LrsSimpleChar1, LrsTextTag):
@@ -1782,35 +1777,35 @@ class Space(LrsSimpleChar1, LrsContainer):
         if self.xsize == 0:
             return
 
-        return Element("Space", xsize=str(self.xsize))
+        return Element('Space', xsize=str(self.xsize))
 
     def toLrfContainer(self, lrfWriter, container):
         if self.xsize != 0:
-            container.appendLrfTag(LrfTag("Space", self.xsize))
+            container.appendLrfTag(LrfTag('Space', self.xsize))
 
 
 class Box(LrsSimpleChar1, LrsContainer):
-    """
+    '''
         Draw a box around text.  Unfortunately, does not seem to do
         anything on the PRS-500.
-    """
+    '''
 
-    def __init__(self, linetype="solid"):
+    def __init__(self, linetype='solid'):
         LrsContainer.__init__(self, [Text, bytes, str])
         if linetype not in LINE_TYPE_ENCODING:
-            raise LrsError(linetype + " is not a valid line type")
+            raise LrsError(linetype + ' is not a valid line type')
         self.linetype = linetype
 
     def toElement(self, se):
-        e = Element("Box", linetype=self.linetype)
+        e = Element('Box', linetype=self.linetype)
         appendTextElements(e, self.contents, se)
         return e
 
     def toLrfContainer(self, lrfWriter, container):
-        container.appendLrfTag(LrfTag("Box", self.linetype))
+        container.appendLrfTag(LrfTag('Box', self.linetype))
         for content in self.contents:
             content.toLrfContainer(lrfWriter, container)
-        container.appendLrfTag(LrfTag("BoxEnd"))
+        container.appendLrfTag(LrfTag('BoxEnd'))
 
 
 class Span(LrsSimpleChar1, LrsContainer):
@@ -1825,18 +1820,18 @@ class Span(LrsSimpleChar1, LrsContainer):
         for attrname in attrs.keys():
             if attrname not in TextStyle.defaults and \
                     attrname not in TextStyle.alsoAllow:
-                raise LrsError("setting %s not allowed on Span" % attrname)
+                raise LrsError('setting %s not allowed on Span' % attrname)
         self.attrs = attrs
 
     def findCurrentTextStyle(self):
         parent = self.parent
         while 1:
-            if parent is None or hasattr(parent, "currentTextStyle"):
+            if parent is None or hasattr(parent, 'currentTextStyle'):
                 break
             parent = parent.parent
 
         if parent is None:
-            raise LrsError("no enclosing current TextStyle found")
+            raise LrsError('no enclosing current TextStyle found')
 
         return parent.currentTextStyle
 
@@ -1846,7 +1841,7 @@ class Span(LrsSimpleChar1, LrsContainer):
         oldTextStyle = self.findCurrentTextStyle()
 
         # set the attributes we want changed
-        for (name, value) in tuple(iteritems(self.attrs)):
+        for name, value in tuple(iteritems(self.attrs)):
             if name in oldTextStyle.attrs and oldTextStyle.attrs[name] == self.attrs[name]:
                 self.attrs.pop(name)
             else:
@@ -1868,7 +1863,7 @@ class Span(LrsSimpleChar1, LrsContainer):
 
     def toElement(self, se):
         element = Element('Span')
-        for (key, value) in self.attrs.items():
+        for key, value in self.attrs.items():
             element.set(key, str(value))
 
         appendTextElements(element, self.contents, se)
@@ -1896,7 +1891,7 @@ class EmpLine(LrsTextTag, LrsSimpleChar1):
         for content in self.contents:
             content.toLrfContainer(lrfWriter, parent)
 
-        parent.appendLrfTag(LrfTag(self.__class__.__name__ + "End"))
+        parent.appendLrfTag(LrfTag(self.__class__.__name__ + 'End'))
 
     def toElement(self, se):
         element = Element(self.__class__.__name__)
@@ -1908,22 +1903,22 @@ class EmpLine(LrsTextTag, LrsSimpleChar1):
 
 
 class Bold(Span):
-    """
+    '''
         There is no known "bold" lrf tag. Use Span with a fontweight in LRF,
         but use the word Bold in the LRS.
-    """
+    '''
 
     def __init__(self, text=None):
         Span.__init__(self, text, fontweight=800)
 
     def toElement(self, se):
-        e = Element("Bold")
+        e = Element('Bold')
         appendTextElements(e, self.contents, se)
         return e
 
 
 class BlockSpace(LrsContainer):
-    """ Can be appended to a page to move the text point. """
+    ''' Can be appended to a page to move the text point. '''
 
     def __init__(self, xspace=0, yspace=0, x=0, y=0):
         LrsContainer.__init__(self, [])
@@ -1936,28 +1931,28 @@ class BlockSpace(LrsContainer):
 
     def toLrfContainer(self, lrfWriter, container):
         if self.xspace != 0:
-            container.appendLrfTag(LrfTag("xspace", self.xspace))
+            container.appendLrfTag(LrfTag('xspace', self.xspace))
         if self.yspace != 0:
-            container.appendLrfTag(LrfTag("yspace", self.yspace))
+            container.appendLrfTag(LrfTag('yspace', self.yspace))
 
     def toElement(self, se):
-        element = Element("BlockSpace")
+        element = Element('BlockSpace')
 
         if self.xspace != 0:
-            element.attrib["xspace"] = str(self.xspace)
+            element.attrib['xspace'] = str(self.xspace)
         if self.yspace != 0:
-            element.attrib["yspace"] = str(self.yspace)
+            element.attrib['yspace'] = str(self.yspace)
 
         return element
 
 
 class CharButton(LrsSimpleChar1, LrsContainer):
-    """
+    '''
         Define the text and target of a CharButton.  Must be passed a
         JumpButton that is the destination of the CharButton.
 
         Only text or SimpleChars can be appended to the CharButton.
-    """
+    '''
 
     def __init__(self, button, text=None):
         LrsContainer.__init__(self, [bytes, str, Text, LrsSimpleChar1])
@@ -1970,7 +1965,7 @@ class CharButton(LrsSimpleChar1, LrsContainer):
 
     def setButton(self, button):
         if not isinstance(button, (JumpButton, Button)):
-            raise LrsError("CharButton button must be a JumpButton or Button")
+            raise LrsError('CharButton button must be a JumpButton or Button')
 
         self.button = button
 
@@ -1982,15 +1977,15 @@ class CharButton(LrsSimpleChar1, LrsContainer):
         return [self.button.objId]
 
     def toLrfContainer(self, lrfWriter, container):
-        container.appendLrfTag(LrfTag("CharButton", self.button.objId))
+        container.appendLrfTag(LrfTag('CharButton', self.button.objId))
 
         for content in self.contents:
             content.toLrfContainer(lrfWriter, container)
 
-        container.appendLrfTag(LrfTag("CharButtonEnd"))
+        container.appendLrfTag(LrfTag('CharButtonEnd'))
 
     def toElement(self, se):
-        cb = Element("CharButton", refobj=str(self.button.objId))
+        cb = Element('CharButton', refobj=str(self.button.objId))
         appendTextElements(cb, self.contents, se)
         return cb
 
@@ -2005,10 +2000,10 @@ class Objects(LrsContainer):
                 self.appendImage = self.appendImageBlock = self.append
 
     def getMethods(self):
-        return ["JumpButton", "appendJumpButton", "TextBlock",
-                "appendTextBlock", "Header", "appendHeader",
-                "Footer", "appendFooter", "ImageBlock",
-                "ImageStream", "appendImageStream",
+        return ['JumpButton', 'appendJumpButton', 'TextBlock',
+                'appendTextBlock', 'Header', 'appendHeader',
+                'Footer', 'appendFooter', 'ImageBlock',
+                'ImageStream', 'appendImageStream',
                 'Image','appendImage', 'appendImageBlock']
 
     def getSettings(self):
@@ -2050,7 +2045,7 @@ class Objects(LrsContainer):
         return i
 
     def toElement(self, se):
-        o = Element("Objects")
+        o = Element('Objects')
 
         for content in self.contents:
             o.append(content.toElement(se))
@@ -2063,11 +2058,11 @@ class Objects(LrsContainer):
 
 
 class JumpButton(LrsObject, LrsContainer):
-    """
+    '''
         The target of a CharButton.  Needs a parented TextBlock to jump to.
         Actually creates several elements in the XML.  JumpButtons must
         be eventually appended to a Book (actually, an Object.)
-    """
+    '''
 
     def __init__(self, textBlock):
         LrsObject.__init__(self)
@@ -2078,31 +2073,31 @@ class JumpButton(LrsObject, LrsContainer):
         self.textBlock = textBlock
 
     def toLrf(self, lrfWriter):
-        button = LrfObject("Button", self.objId)
-        button.appendLrfTag(LrfTag("buttonflags", 0x10))  # pushbutton
-        button.appendLrfTag(LrfTag("PushButtonStart"))
-        button.appendLrfTag(LrfTag("buttonactions"))
-        button.appendLrfTag(LrfTag("jumpto",
+        button = LrfObject('Button', self.objId)
+        button.appendLrfTag(LrfTag('buttonflags', 0x10))  # pushbutton
+        button.appendLrfTag(LrfTag('PushButtonStart'))
+        button.appendLrfTag(LrfTag('buttonactions'))
+        button.appendLrfTag(LrfTag('jumpto',
             (self.textBlock.parent.objId, self.textBlock.objId)))
-        button.append(LrfTag("endbuttonactions"))
-        button.appendLrfTag(LrfTag("PushButtonEnd"))
+        button.append(LrfTag('endbuttonactions'))
+        button.appendLrfTag(LrfTag('PushButtonEnd'))
         lrfWriter.append(button)
 
     def toElement(self, se):
-        b = self.lrsObjectElement("Button")
-        pb = SubElement(b, "PushButton")
-        SubElement(pb, "JumpTo",
+        b = self.lrsObjectElement('Button')
+        pb = SubElement(b, 'PushButton')
+        SubElement(pb, 'JumpTo',
             refpage=str(self.textBlock.parent.objId),
             refobj=str(self.textBlock.objId))
         return b
 
 
 class RuledLine(LrsContainer, LrsAttributes, LrsObject):
-    """ A line.  Default is 500 pixels long, 2 pixels wide. """
+    ''' A line.  Default is 500 pixels long, 2 pixels wide. '''
 
     defaults = dict(
-            linelength="500", linetype="solid", linewidth="2",
-            linecolor="0x00000000")
+            linelength='500', linetype='solid', linewidth='2',
+            linecolor='0x00000000')
 
     def __init__(self, **settings):
         LrsContainer.__init__(self, [])
@@ -2111,23 +2106,23 @@ class RuledLine(LrsContainer, LrsAttributes, LrsObject):
 
     def toLrfContainer(self, lrfWriter, container):
         a = self.attrs
-        container.appendLrfTag(LrfTag("RuledLine",
-            (a["linelength"], a["linetype"], a["linewidth"], a["linecolor"])))
+        container.appendLrfTag(LrfTag('RuledLine',
+            (a['linelength'], a['linetype'], a['linewidth'], a['linecolor'])))
 
     def toElement(self, se):
-        return Element("RuledLine", self.attrs)
+        return Element('RuledLine', self.attrs)
 
 
 class HeaderOrFooter(LrsObject, LrsContainer, LrsAttributes):
-    """
+    '''
         Creates empty header or footer objects.  Append PutObj objects to
         the header or footer to create the text.
 
         Note: it seems that adding multiple PutObjs to a header or footer
               only shows the last one.
-    """
-    defaults = dict(framemode="square", layout="LrTb", framewidth="0",
-                framecolor="0x00000000", bgcolor="0xFF000000")
+    '''
+    defaults = dict(framemode='square', layout='LrTb', framewidth='0',
+                framecolor='0x00000000', bgcolor='0xFF000000')
 
     def __init__(self, **settings):
         LrsObject.__init__(self)
@@ -2155,7 +2150,7 @@ class HeaderOrFooter(LrsObject, LrsContainer, LrsAttributes):
 
     def toElement(self, se):
         name = self.__class__.__name__
-        labelName = name.lower() + "label"
+        labelName = name.lower() + 'label'
         hd = self.lrsObjectElement(name, objlabel=labelName)
         hd.attrib.update(self.attrs)
 
@@ -2174,8 +2169,8 @@ class Footer(HeaderOrFooter):
 
 
 class Canvas(LrsObject, LrsContainer, LrsAttributes):
-    defaults = dict(framemode="square", layout="LrTb", framewidth="0",
-                framecolor="0x00000000", bgcolor="0xFF000000",
+    defaults = dict(framemode='square', layout='LrTb', framewidth='0',
+                framecolor='0x00000000', bgcolor='0xFF000000',
                 canvasheight=0, canvaswidth=0, blockrule='block-adjustable')
 
     def __init__(self, width, height, **settings):
@@ -2192,7 +2187,7 @@ class Canvas(LrsObject, LrsContainer, LrsAttributes):
         self.append(PutObj(obj, x1, y1))
 
     def toElement(self, source_encoding):
-        el = self.lrsObjectElement("Canvas", **self.settings)
+        el = self.lrsObjectElement('Canvas', **self.settings)
         for po in self.contents:
             el.append(po.toElement(source_encoding))
         return el
@@ -2201,7 +2196,7 @@ class Canvas(LrsObject, LrsContainer, LrsAttributes):
         self.toLrfContainer(lrfWriter, lrfWriter)
 
     def toLrfContainer(self, lrfWriter, container):
-        c = LrfObject("Canvas", self.objId)
+        c = LrfObject('Canvas', self.objId)
         c.appendTagDict(self.settings)
         stream = LrfTagStream(STREAM_COMPRESSED)
         for content in self.contents:
@@ -2221,7 +2216,7 @@ class Canvas(LrsObject, LrsContainer, LrsAttributes):
 
 
 class PutObj(LrsContainer):
-    """ PutObj holds other objects that are drawn on a Canvas or Header. """
+    ''' PutObj holds other objects that are drawn on a Canvas or Header. '''
 
     def __init__(self, content, x1=0, y1=0):
         LrsContainer.__init__(self, [TextBlock, ImageBlock])
@@ -2237,21 +2232,21 @@ class PutObj(LrsContainer):
             parent.append(self.content)
 
     def toLrfContainer(self, lrfWriter, container):
-        container.appendLrfTag(LrfTag("PutObj", (self.x1, self.y1,
+        container.appendLrfTag(LrfTag('PutObj', (self.x1, self.y1,
             self.content.objId)))
 
     def toElement(self, se):
-        el = Element("PutObj", x1=str(self.x1), y1=str(self.y1),
+        el = Element('PutObj', x1=str(self.x1), y1=str(self.y1),
                     refobj=str(self.content.objId))
         return el
 
 
 class ImageStream(LrsObject, LrsContainer):
-    """
+    '''
         Embed an image file into an Lrf.
-    """
+    '''
 
-    VALID_ENCODINGS = ["JPEG", "GIF", "BMP", "PNG"]
+    VALID_ENCODINGS = ['JPEG', 'GIF', 'BMP', 'PNG']
 
     def __init__(self, file=None, encoding=None, comment=None):
         LrsObject.__init__(self)
@@ -2263,28 +2258,28 @@ class ImageStream(LrsObject, LrsContainer):
         if encoding is None:
             extension = os.path.splitext(file)[1]
             if not extension:
-                raise LrsError("file must have extension if encoding is not specified")
+                raise LrsError('file must have extension if encoding is not specified')
             extension = extension[1:].upper()
 
-            if extension == "JPG":
-                extension = "JPEG"
+            if extension == 'JPG':
+                extension = 'JPEG'
 
             encoding = extension
         else:
             encoding = encoding.upper()
 
         if encoding not in self.VALID_ENCODINGS:
-            raise LrsError("encoding or file extension not JPEG, GIF, BMP, or PNG")
+            raise LrsError('encoding or file extension not JPEG, GIF, BMP, or PNG')
 
         self.encoding = encoding
 
     def toLrf(self, lrfWriter):
-        with open(self.filename, "rb") as f:
+        with open(self.filename, 'rb') as f:
             imageData = f.read()
 
-        isObj = LrfObject("ImageStream", self.objId)
+        isObj = LrfObject('ImageStream', self.objId)
         if self.comment is not None:
-            isObj.appendLrfTag(LrfTag("comment", self.comment))
+            isObj.appendLrfTag(LrfTag('comment', self.comment))
 
         streamFlags = IMAGE_TYPE_ENCODING[self.encoding]
         stream = LrfStreamBase(streamFlags, imageData)
@@ -2292,8 +2287,8 @@ class ImageStream(LrsObject, LrsContainer):
         lrfWriter.append(isObj)
 
     def toElement(self, se):
-        element = self.lrsObjectElement("ImageStream",
-                                objlabel="imagestreamlabel",
+        element = self.lrsObjectElement('ImageStream',
+                                objlabel='imagestreamlabel',
                                 encoding=self.encoding, file=self.filename)
         element.text = self.comment
         return element
@@ -2301,7 +2296,7 @@ class ImageStream(LrsObject, LrsContainer):
 
 class Image(LrsObject, LrsContainer, LrsAttributes):
 
-    defaults = dict()
+    defaults = {}
 
     def __init__(self, refstream, x0=0, x1=0,
                  y0=0, y1=0, xsize=0, ysize=0, **settings):
@@ -2323,29 +2318,29 @@ class Image(LrsObject, LrsContainer, LrsAttributes):
         return [self.objId, self.refstream.objId]
 
     def toElement(self, se):
-        element = self.lrsObjectElement("Image", **self.attrs)
-        element.set("refstream", str(self.refstream.objId))
-        for name in ["x0", "y0", "x1", "y1", "xsize", "ysize"]:
+        element = self.lrsObjectElement('Image', **self.attrs)
+        element.set('refstream', str(self.refstream.objId))
+        for name in ['x0', 'y0', 'x1', 'y1', 'xsize', 'ysize']:
             element.set(name, str(getattr(self, name)))
         return element
 
     def toLrf(self, lrfWriter):
-        ib = LrfObject("Image", self.objId)
-        ib.appendLrfTag(LrfTag("ImageRect",
+        ib = LrfObject('Image', self.objId)
+        ib.appendLrfTag(LrfTag('ImageRect',
             (self.x0, self.y0, self.x1, self.y1)))
-        ib.appendLrfTag(LrfTag("ImageSize", (self.xsize, self.ysize)))
-        ib.appendLrfTag(LrfTag("RefObjId", self.refstream.objId))
+        ib.appendLrfTag(LrfTag('ImageSize', (self.xsize, self.ysize)))
+        ib.appendLrfTag(LrfTag('RefObjId', self.refstream.objId))
         lrfWriter.append(ib)
 
 
 class ImageBlock(LrsObject, LrsContainer, LrsAttributes):
-    """ Create an image on a page. """
+    ''' Create an image on a page. '''
     # TODO: allow other block attributes
 
     defaults = BlockStyle.baseDefaults.copy()
 
-    def __init__(self, refstream, x0="0", y0="0", x1="600", y1="800",
-                       xsize="600", ysize="800",
+    def __init__(self, refstream, x0='0', y0='0', x1='600', y1='800',
+                       xsize='600', ysize='800',
                        blockStyle=BlockStyle(blockrule='block-fixed'),
                        alttext=None, **settings):
         LrsObject.__init__(self)
@@ -2368,7 +2363,7 @@ class ImageBlock(LrsObject, LrsContainer, LrsAttributes):
             parent.append(self.blockStyle)
 
     def getReferencedObjIds(self):
-        objects =  [self.objId, self.extraId, self.refstream.objId]
+        objects = [self.objId, self.extraId, self.refstream.objId]
         if self.blockStyle is not None:
             objects.append(self.blockStyle.objId)
 
@@ -2382,40 +2377,40 @@ class ImageBlock(LrsObject, LrsContainer, LrsAttributes):
 
         extraId = LrsObject.getNextObjId()
 
-        b = LrfObject("Block", self.objId)
+        b = LrfObject('Block', self.objId)
         if self.blockStyle is not None:
-            b.appendLrfTag(LrfTag("Link", self.blockStyle.objId))
+            b.appendLrfTag(LrfTag('Link', self.blockStyle.objId))
         b.appendTagDict(self.attrs)
 
         b.appendLrfTags(
             LrfTagStream(0,
-                [LrfTag("Link", extraId)]).getStreamTags(lrfWriter.getSourceEncoding()))
+                [LrfTag('Link', extraId)]).getStreamTags(lrfWriter.getSourceEncoding()))
         container.addLrfObject(b.objId)
         lrfWriter.append(b)
 
-        ib = LrfObject("Image", extraId)
+        ib = LrfObject('Image', extraId)
 
-        ib.appendLrfTag(LrfTag("ImageRect",
+        ib.appendLrfTag(LrfTag('ImageRect',
             (self.x0, self.y0, self.x1, self.y1)))
-        ib.appendLrfTag(LrfTag("ImageSize", (self.xsize, self.ysize)))
-        ib.appendLrfTag(LrfTag("RefObjId", self.refstream.objId))
+        ib.appendLrfTag(LrfTag('ImageSize', (self.xsize, self.ysize)))
+        ib.appendLrfTag(LrfTag('RefObjId', self.refstream.objId))
         if self.alttext:
-            ib.appendLrfTag("Comment", self.alttext)
+            ib.appendLrfTag('Comment', self.alttext)
 
         lrfWriter.append(ib)
         self.extraId = extraId
 
     def toElement(self, se):
-        element = self.lrsObjectElement("ImageBlock", **self.attrs)
-        element.set("refstream", str(self.refstream.objId))
-        for name in ["x0", "y0", "x1", "y1", "xsize", "ysize"]:
+        element = self.lrsObjectElement('ImageBlock', **self.attrs)
+        element.set('refstream', str(self.refstream.objId))
+        for name in ['x0', 'y0', 'x1', 'y1', 'xsize', 'ysize']:
             element.set(name, str(getattr(self, name)))
         element.text = self.alttext
         return element
 
 
 class Font(LrsContainer):
-    """ Allows a TrueType file to be embedded in an Lrf. """
+    ''' Allows a TrueType file to be embedded in an Lrf. '''
 
     def __init__(self, file=None, fontname=None, fontfilename=None, encoding=None):
         LrsContainer.__init__(self, [])
@@ -2435,11 +2430,11 @@ class Font(LrsContainer):
         self.encoding = encoding
 
     def toLrf(self, lrfWriter):
-        font = LrfObject("Font", LrsObject.getNextObjId())
+        font = LrfObject('Font', LrsObject.getNextObjId())
         lrfWriter.registerFontId(font.objId)
-        font.appendLrfTag(LrfTag("FontFilename",
+        font.appendLrfTag(LrfTag('FontFilename',
                                  lrfWriter.toUnicode(self.truefile)))
-        font.appendLrfTag(LrfTag("FontFacename",
+        font.appendLrfTag(LrfTag('FontFacename',
                                  lrfWriter.toUnicode(self.fontname)))
 
         stream = LrfFileStream(STREAM_FORCE_COMPRESSED, self.truefile)
@@ -2448,6 +2443,6 @@ class Font(LrsContainer):
         lrfWriter.append(font)
 
     def toElement(self, se):
-        element = Element("RegistFont", encoding="TTF", fontname=self.fontname,
+        element = Element('RegistFont', encoding='TTF', fontname=self.fontname,
                 file=self.file, fontfilename=self.file)
         return element
diff --git a/src/calibre/ebooks/lrf/tags.py b/src/calibre/ebooks/lrf/tags.py
index 13c56fbf51..7e166f11e3 100644
--- a/src/calibre/ebooks/lrf/tags.py
+++ b/src/calibre/ebooks/lrf/tags.py
@@ -10,18 +10,18 @@ from calibre.ebooks.lrf import LRFParseError
 class Tag:
 
     tags = {
-                0x00 : (6, "*ObjectStart"),
-                0x01 : (0, "*ObjectEnd"),
-                0x02 : (4, "*ObjectInfoLink"),
-                0x03 : (4, "*Link"),
-                0x04 : (4, "*StreamSize"),
-                0x05 : (0, "*StreamStart"),
-                0x06 : (0, "*StreamEnd"),
+                0x00 : (6, '*ObjectStart'),
+                0x01 : (0, '*ObjectEnd'),
+                0x02 : (4, '*ObjectInfoLink'),
+                0x03 : (4, '*Link'),
+                0x04 : (4, '*StreamSize'),
+                0x05 : (0, '*StreamStart'),
+                0x06 : (0, '*StreamEnd'),
                 0x07 : (4, None),
                 0x08 : (4, None),
                 0x09 : (4, None),
                 0x0A : (4, None),
-                0x0B : ("type_one", "*ContainedObjectsList"),
+                0x0B : ('type_one', '*ContainedObjectsList'),
                 0x0D : (2, None),
                 0x0E : (2, None),
                 0x11 : (2, None),
@@ -29,7 +29,7 @@ class Tag:
                 0x13 : (2, None),
                 0x14 : (2, None),
                 0x15 : (2, None),
-                0x16 : ("string", None),
+                0x16 : ('string', None),
                 0x17 : (4, None),
                 0x18 : (4, None),
                 0x19 : (2, None),
@@ -81,16 +81,16 @@ class Tag:
                 0x51 : (2, None),
                 0x52 : (2, None),
                 0x53 : (4, None),
-                0x54 : (2, "*StreamFlags"),
-                0x55 : ("string", None),
+                0x54 : (2, '*StreamFlags'),
+                0x55 : ('string', None),
                 0x56 : (2, None),
                 0x57 : (2, None),
                 0x58 : (2, None),
-                0x59 : ("string", None),
-                0x5A : ("string", None),
+                0x59 : ('string', None),
+                0x5A : ('string', None),
                 0x5B : (4, None),
-                0x5C : ("type_one", None),
-                0x5D : ("string", None),
+                0x5C : ('type_one', None),
+                0x5D : ('string', None),
                 0x5E : (2, None),
                 0x61 : (2, None),
                 0x62 : (0, None),
@@ -112,16 +112,16 @@ class Tag:
                 0x75 : (2, None),
                 0x76 : (2, None),
                 0x77 : (2, None),
-                0x78 : ("tag_78", None),
+                0x78 : ('tag_78', None),
                 0x79 : (2, None),
                 0x7A : (2, None),
                 0x7B : (4, None),
-                0x7C : (4, "*ParentPageTree"),
+                0x7C : (4, '*ParentPageTree'),
                 0x81 : (0, None),
                 0x82 : (0, None),
                 0xA1 : (4, None),
                 0xA2 : (0, None),
-                0xA5 : ("unknown", None),
+                0xA5 : ('unknown', None),
                 0xA6 : (0, None),
                 0xA7 : (4, None),
                 0xA8 : (0, None),
@@ -155,7 +155,7 @@ class Tag:
                 0xC8 : (2, None),
                 0xC9 : (0, None),
                 0xCA : (2, None),
-                0xCB : ("unknown", None),
+                0xCB : ('unknown', None),
                 0xCC : (2, None),
                 0xD1 : (12, None),
                 0xD2 : (0, None),
@@ -177,7 +177,7 @@ class Tag:
                 0xF7 : (4, None),
                 0xF8 : (4, None),
                 0xF9 : (6, None),
-                }
+            }
     name_map = {}
     for key in tags.keys():
         temp = tags[key][1]
@@ -186,11 +186,11 @@ class Tag:
 
     def __init__(self, stream):
         self.offset = stream.tell()
-        tag_id = struct.unpack("<BB", stream.read(2))
+        tag_id = struct.unpack('<BB', stream.read(2))
         if tag_id[1] != 0xF5:
-            raise LRFParseError("Bad tag ID %02X at %d"%(tag_id[1], self.offset))
+            raise LRFParseError('Bad tag ID %02X at %d'%(tag_id[1], self.offset))
         if tag_id[0] not in self.__class__.tags:
-            raise LRFParseError("Unknown tag ID: F5%02X" % tag_id[0])
+            raise LRFParseError('Unknown tag ID: F5%02X' % tag_id[0])
 
         self.id = 0xF500 + tag_id[0]
 
@@ -202,59 +202,59 @@ class Tag:
             self.contents = stream.read(size)
 
     def __str__(self):
-        s = "Tag %04X " % self.id
+        s = 'Tag %04X ' % self.id
         if self.name:
             s += self.name
-        s += f" at {self.offset:08X}, contents: {repr(self.contents)}"
+        s += f' at {self.offset:08X}, contents: {self.contents!r}'
         return s
 
     @property
     def byte(self):
         if len(self.contents) != 1:
-            raise LRFParseError("Bad parameter for tag ID: %04X" % self.id)
-        return struct.unpack("<B", self.contents)[0]
+            raise LRFParseError('Bad parameter for tag ID: %04X' % self.id)
+        return struct.unpack('<B', self.contents)[0]
 
     @property
     def word(self):
         if len(self.contents) != 2:
-            raise LRFParseError("Bad parameter for tag ID: %04X" % self.id)
-        return struct.unpack("<H", self.contents)[0]
+            raise LRFParseError('Bad parameter for tag ID: %04X' % self.id)
+        return struct.unpack('<H', self.contents)[0]
 
     @property
     def sword(self):
         if len(self.contents) != 2:
-            raise LRFParseError("Bad parameter for tag ID: %04X" % self.id)
-        return struct.unpack("<h", self.contents)[0]
+            raise LRFParseError('Bad parameter for tag ID: %04X' % self.id)
+        return struct.unpack('<h', self.contents)[0]
 
     @property
     def dword(self):
         if len(self.contents) != 4:
-            raise LRFParseError("Bad parameter for tag ID: %04X" % self.id)
-        return struct.unpack("<I", self.contents)[0]
+            raise LRFParseError('Bad parameter for tag ID: %04X' % self.id)
+        return struct.unpack('<I', self.contents)[0]
 
     def dummy_parser(self, stream):
-        raise LRFParseError("Unknown tag at %08X" % stream.tell())
+        raise LRFParseError('Unknown tag at %08X' % stream.tell())
 
     @classmethod
     def string_parser(self, stream):
-        size = struct.unpack("<H", stream.read(2))[0]
-        return str(stream.read(size), "utf_16")
+        size = struct.unpack('<H', stream.read(2))[0]
+        return str(stream.read(size), 'utf_16')
 
     def type_one_parser(self, stream):
-        cnt = struct.unpack("<H", stream.read(2))[0]
+        cnt = struct.unpack('<H', stream.read(2))[0]
         res = []
         while cnt > 0:
-            res.append(struct.unpack("<I", stream.read(4))[0])
+            res.append(struct.unpack('<I', stream.read(4))[0])
             cnt -= 1
         return res
 
     def tag_78_parser(self, stream):
         pos = stream.tell()
         res = []
-        res.append(struct.unpack("<I", stream.read(4))[0])
+        res.append(struct.unpack('<I', stream.read(4))[0])
         tag = Tag(stream)
         if tag.id != 0xF516:
-            raise LRFParseError("Bad tag 78 at %08X" % pos)
+            raise LRFParseError('Bad tag 78 at %08X' % pos)
         res.append(tag.contents)
-        res.append(struct.unpack("<H", stream.read(2))[0])
+        res.append(struct.unpack('<H', stream.read(2))[0])
         return res
diff --git a/src/calibre/ebooks/metadata/__init__.py b/src/calibre/ebooks/metadata/__init__.py
index 5d82b0a666..93e022cb22 100644
--- a/src/calibre/ebooks/metadata/__init__.py
+++ b/src/calibre/ebooks/metadata/__init__.py
@@ -5,9 +5,9 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 
-"""
+'''
 Provides abstraction for metadata reading.writing from a variety of ebook formats.
-"""
+'''
 import os
 import re
 import sys
@@ -172,7 +172,7 @@ def get_title_sort_pat(lang=None):
         except:
             ans = re.compile(r'^(A|The|An)\s+', re.IGNORECASE)
     else:
-        ans = re.compile('^$')  # matches only the empty string
+        ans = re.compile(r'^$')  # matches only the empty string
     _title_pats[lang] = ans
     return ans
 
@@ -228,7 +228,7 @@ def title_sort(title, order=None, lang=None):
 
 coding = list(zip(
 [1000,900,500,400,100,90,50,40,10,9,5,4,1],
-["M","CM","D","CD","C","XC","L","XL","X","IX","V","IV","I"]
+['M','CM','D','CD','C','XC','L','XL','X','IX','V','IV','I']
 ))
 
 
@@ -259,7 +259,6 @@ def fmt_sidx(i, fmt='%.2f', use_roman=False):
 
 
 class Resource:
-
     '''
     Represents a resource (usually a file on the filesystem or a URL pointing
     to the web. Such resources are commonly referred to in OPF files.
diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py
index 301d611894..c86f1c5dcb 100644
--- a/src/calibre/ebooks/metadata/archive.py
+++ b/src/calibre/ebooks/metadata/archive.py
@@ -60,6 +60,7 @@ class KPFExtract(FileTypePlugin):
                 of.write(zf.read(candidates[0]))
         return of.name
 
+
 class RAR:
 
     def __init__(self, archive):
@@ -242,7 +243,7 @@ def get_comic_images(path, tdir, first=1, last=0):  # first and last use 1 based
     if fmt == 'rar':
         from calibre.utils.unrar import headers
         for h in headers(path):
-            items[h['filename']] = lambda : partial(h.get, 'file_time', 0)
+            items[h['filename']] = lambda: partial(h.get, 'file_time', 0)
     else:
         from zipfile import ZipFile
         with ZipFile(path) as zf:
diff --git a/src/calibre/ebooks/metadata/author_mapper.py b/src/calibre/ebooks/metadata/author_mapper.py
index 56643deecf..6c31c11baa 100644
--- a/src/calibre/ebooks/metadata/author_mapper.py
+++ b/src/calibre/ebooks/metadata/author_mapper.py
@@ -127,7 +127,7 @@ def uniq(vals, kmap=icu_lower):
     lvals = (kmap(x) for x in vals)
     seen = set()
     seen_add = seen.add
-    return list(x for x, k in zip(vals, lvals) if k not in seen and not seen_add(k))
+    return [x for x, k in zip(vals, lvals) if k not in seen and not seen_add(k)]
 
 
 def compile_rules(rules):
diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index 1e42a10426..e72a135256 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -25,7 +25,7 @@ SIMPLE_SET = frozenset(SIMPLE_GET - {'identifiers'})
 
 
 def human_readable(size, precision=2):
-    """ Convert a size in bytes into megabytes """
+    ''' Convert a size in bytes into megabytes '''
     ans = size/(1024*1024)
     if ans < 0.1:
         return '<0.1 MB'
@@ -65,7 +65,6 @@ def cv(val):
 
 
 class Metadata:
-
     '''
     A class representing all the metadata for a book. The various standard metadata
     fields are available as attributes of this object. You can also stick
@@ -214,7 +213,7 @@ class Metadata:
             if f['datatype'] == 'composite' and f['#value#'] is None:
                 self.get(field)
 
-    def deepcopy(self, class_generator=lambda : Metadata(None)):
+    def deepcopy(self, class_generator=lambda: Metadata(None)):
         ''' Do not use this method unless you know what you are doing, if you
         want to create a simple clone of this object, use :meth:`deepcopy_metadata`
         instead. Class_generator must be a function that returns an instance
@@ -448,7 +447,7 @@ class Metadata:
         if field is not None:
             if not field.startswith('#'):
                 raise AttributeError(
-                        'Custom field name %s must begin with \'#\''%repr(field))
+                        "Custom field name %s must begin with '#'"%repr(field))
             if metadata is None:
                 traceback.print_stack()
                 return
@@ -669,7 +668,7 @@ class Metadata:
         Returns the tuple (display_name, formatted_value)
         '''
         name, val, ign, ign = self.format_field_extended(key, series_with_index)
-        return (name, val)
+        return name, val
 
     def format_field_extended(self, key, series_with_index=True):
         from calibre.ebooks.metadata import authors_to_string
@@ -703,8 +702,7 @@ class Metadata:
                 res = cmeta['is_multiple']['list_to_ui'].join(res)
             elif datatype == 'series' and series_with_index:
                 if self.get_extra(key) is not None:
-                    res = res + \
-                        ' [%s]'%self.format_series_index(val=self.get_extra(key))
+                    res = res + ' [%s]'%self.format_series_index(val=self.get_extra(key))
             elif datatype == 'datetime':
                 res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy'))
             elif datatype == 'bool':
@@ -773,7 +771,7 @@ class Metadata:
         if self.title_sort:
             fmt('Title sort', self.title_sort)
         if self.authors:
-            fmt('Author(s)',  authors_to_string(self.authors) +
+            fmt('Author(s)', authors_to_string(self.authors) +
                ((' [' + self.author_sort + ']')
                 if self.author_sort and self.author_sort != _('Unknown') else ''))
         if self.publisher:
@@ -804,7 +802,7 @@ class Metadata:
         for key in self.custom_field_keys():
             val = self.get(key, None)
             if val:
-                (name, val) = self.format_field(key)
+                name, val = self.format_field(key)
                 fmt(name, str(val))
         return '\n'.join(ans)
 
@@ -833,7 +831,7 @@ class Metadata:
         for key in self.custom_field_keys():
             val = self.get(key, None)
             if val:
-                (name, val) = self.format_field(key)
+                name, val = self.format_field(key)
                 ans += [(name, val)]
         for i, x in enumerate(ans):
             ans[i] = '<tr><td><b>%s</b></td><td>%s</td></tr>'%x
diff --git a/src/calibre/ebooks/metadata/book/json_codec.py b/src/calibre/ebooks/metadata/book/json_codec.py
index 093ec68147..9495bac505 100644
--- a/src/calibre/ebooks/metadata/book/json_codec.py
+++ b/src/calibre/ebooks/metadata/book/json_codec.py
@@ -21,7 +21,7 @@ from polyglot.builtins import as_bytes, iteritems, itervalues
 
 def string_to_datetime(src):
     from calibre.utils.iso8601 import parse_iso8601
-    if src != "None":
+    if src != 'None':
         try:
             return parse_iso8601(src)
         except Exception:
@@ -32,13 +32,13 @@ def string_to_datetime(src):
 def datetime_to_string(dateval):
     from calibre.utils.date import UNDEFINED_DATE, isoformat, local_tz
     if dateval is None:
-        return "None"
+        return 'None'
     if not isinstance(dateval, datetime):
         dateval = datetime.combine(dateval, time())
     if hasattr(dateval, 'tzinfo') and dateval.tzinfo is None:
         dateval = dateval.replace(tzinfo=local_tz)
     if dateval <= UNDEFINED_DATE:
-        return "None"
+        return 'None'
     return isoformat(dateval)
 
 
@@ -96,20 +96,20 @@ def encode_is_multiple(fm):
         if dt == 'composite':
             fm['is_multiple'] = ','
         else:
-            fm['is_multiple'] =  '|'
+            fm['is_multiple'] = '|'
     else:
         fm['is_multiple'] = None
         fm['is_multiple2'] = {}
 
 
 def decode_is_multiple(fm):
-    im = fm.get('is_multiple2',  None)
+    im = fm.get('is_multiple2', None)
     if im:
         fm['is_multiple'] = im
         del fm['is_multiple2']
     else:
         # Must migrate the is_multiple from char to dict
-        im = fm.get('is_multiple',  {})
+        im = fm.get('is_multiple', {})
         if im:
             dt = fm.get('datatype', None)
             if dt == 'composite':
diff --git a/src/calibre/ebooks/metadata/book/render.py b/src/calibre/ebooks/metadata/book/render.py
index 4418213291..d29490685e 100644
--- a/src/calibre/ebooks/metadata/book/render.py
+++ b/src/calibre/ebooks/metadata/book/render.py
@@ -111,7 +111,7 @@ def mi_to_html(
         link_note_icon_size=16
     ):
 
-    link_markup =  '↗️'
+    link_markup = '↗️'
     if for_qt:
         s = link_note_icon_size
         link_markup = f'<img valign="bottom" src="calibre-icon:///external-link.png" width={s} height={s}>'
@@ -355,7 +355,7 @@ def mi_to_html(
                     val = _(
                         '%(sidx)s of <a href="%(href)s" title="%(tt)s">'
                         '<span class="%(cls)s">%(series)s</span></a>') % dict(
-                            sidx=fmt_sidx(sidx, use_roman=use_roman_numbers), cls="series_name",
+                            sidx=fmt_sidx(sidx, use_roman=use_roman_numbers), cls='series_name',
                             series=p(series), href=search_action_with_data(st, series, book_id, field),
                             tt=p(_('Click to see books in this series')))
                     val += add_other_links(field, series)
@@ -439,7 +439,7 @@ def mi_to_html(
 
     ans = ['<tr id="%s" class="%s">%s</tr>'%(fieldl.replace('#', '_'),
         classname(fieldl), html) for fieldl, html in ans]
-    # print '\n'.join(ans)
+    # print('\n'.join(ans))
     direction = 'rtl' if rtl else 'ltr'
     rans = f'<table class="fields" style="direction: {direction}; '
     if not for_qt:
diff --git a/src/calibre/ebooks/metadata/docx.py b/src/calibre/ebooks/metadata/docx.py
index 00d0e8807a..ca0dec0b68 100644
--- a/src/calibre/ebooks/metadata/docx.py
+++ b/src/calibre/ebooks/metadata/docx.py
@@ -30,7 +30,7 @@ def get_cover(docx):
             if width < 0 or height < 0:
                 continue
             if 0.8 <= height/width <= 1.8 and height*width >= 160000:
-                return (fmt, raw)
+                return fmt, raw
 
 
 def get_metadata(stream):
diff --git a/src/calibre/ebooks/metadata/epub.py b/src/calibre/ebooks/metadata/epub.py
index 70cbd08b8c..5f0a89f153 100644
--- a/src/calibre/ebooks/metadata/epub.py
+++ b/src/calibre/ebooks/metadata/epub.py
@@ -42,14 +42,14 @@ class Container(dict):
             return
         container = safe_xml_fromstring(stream.read())
         if container.get('version', None) != '1.0':
-            raise EPubException("unsupported version of OCF")
+            raise EPubException('unsupported version of OCF')
         rootfiles = container.xpath('./*[local-name()="rootfiles"]')
         if not rootfiles:
-            raise EPubException("<rootfiles/> element missing")
+            raise EPubException('<rootfiles/> element missing')
         for rootfile in rootfiles[0].xpath('./*[local-name()="rootfile"]'):
             mt, fp = rootfile.get('media-type'), rootfile.get('full-path')
             if not mt or not fp:
-                raise EPubException("<rootfile/> element malformed")
+                raise EPubException('<rootfile/> element malformed')
 
             if file_exists and not file_exists(fp):
                 # Some Kobo epubs have multiple rootfile entries, but only one
@@ -98,16 +98,16 @@ class OCFReader(OCF):
             if mimetype != OCF.MIMETYPE:
                 print('WARNING: Invalid mimetype declaration', mimetype)
         except:
-            print('WARNING: Epub doesn\'t contain a valid mimetype declaration')
+            print("WARNING: Epub doesn't contain a valid mimetype declaration")
 
         try:
             with closing(self.open(OCF.CONTAINER_PATH)) as f:
                 self.container = Container(f, self.exists)
         except KeyError:
-            raise EPubException("missing OCF container.xml file")
+            raise EPubException('missing OCF container.xml file')
         self.opf_path = self.container[OPF.MIMETYPE]
         if not self.opf_path:
-            raise EPubException("missing OPF package file entry in container")
+            raise EPubException('missing OPF package file entry in container')
         self._opf_cached = self._encryption_meta_cached = None
 
     @property
@@ -117,7 +117,7 @@ class OCFReader(OCF):
                 with closing(self.open(self.opf_path)) as f:
                     self._opf_cached = OPF(f, self.root, populate_spine=False)
             except KeyError:
-                raise EPubException("missing OPF package file")
+                raise EPubException('missing OPF package file')
         return self._opf_cached
 
     @property
@@ -140,7 +140,6 @@ class OCFReader(OCF):
             return False
 
 
-
 class OCFZipReader(OCFReader):
 
     def __init__(self, stream, mode='r', root=None):
@@ -150,7 +149,7 @@ class OCFZipReader(OCFReader):
             try:
                 self.archive = ZipFile(stream, mode=mode)
             except BadZipfile:
-                raise EPubException("not a ZIP .epub OCF container")
+                raise EPubException('not a ZIP .epub OCF container')
         self.root = root
         if self.root is None:
             name = getattr(stream, 'name', False)
@@ -219,12 +218,12 @@ def render_cover(cpage, zf, reader=None):
                 # In the case of manga, the first spine item may be an image
                 # already, so treat it as a raster cover.
                 file_format = what_image_type(cpage)
-                if file_format == "jpeg":
+                if file_format == 'jpeg':
                     # Only JPEG is allowed since elsewhere we assume raster covers
                     # are JPEG.  In principle we could convert other image formats
                     # but this is already an out-of-spec case that happens to
                     # arise in books from some stores.
-                    with open(cpage, "rb") as source:
+                    with open(cpage, 'rb') as source:
                         return source.read()
 
             return render_html_svg_workaround(cpage, default_log, root=tdir)
@@ -260,7 +259,7 @@ def get_cover(raster_cover, first_spine_item, reader):
 
 
 def get_metadata(stream, extract_cover=True):
-    """ Return metadata as a :class:`Metadata` object """
+    ''' Return metadata as a :class:`Metadata` object '''
     stream.seek(0)
     reader = get_zip_reader(stream)
     opfbytes = reader.read_bytes(reader.opf_path)
diff --git a/src/calibre/ebooks/metadata/ereader.py b/src/calibre/ebooks/metadata/ereader.py
index 2ffe6685ab..92c2a01b4f 100644
--- a/src/calibre/ebooks/metadata/ereader.py
+++ b/src/calibre/ebooks/metadata/ereader.py
@@ -28,9 +28,9 @@ def get_cover(pheader, eheader):
 
 
 def get_metadata(stream, extract_cover=True):
-    """
+    '''
     Return metadata as a L{MetaInfo} object
-    """
+    '''
     mi = MetaInformation(None, [_('Unknown')])
     stream.seek(0)
 
@@ -68,7 +68,7 @@ def set_metadata(stream, mi):
     if pheader.section_data(0) != 132:
         return
 
-    sections = [pheader.section_data(x) for x in range(0, pheader.section_count())]
+    sections = [pheader.section_data(x) for x in range(pheader.section_count())]
     hr = HeaderRecord(sections[0])
 
     if hr.compression not in (2, 10):
diff --git a/src/calibre/ebooks/metadata/fb2.py b/src/calibre/ebooks/metadata/fb2.py
index bf0b17bc70..387af167b9 100644
--- a/src/calibre/ebooks/metadata/fb2.py
+++ b/src/calibre/ebooks/metadata/fb2.py
@@ -2,8 +2,8 @@
 
 
 __license__   = 'GPL v3'
-__copyright__ = '2011, Roman Mukhin <ramses_ru at hotmail.com>, '\
-                '2008, Anatoly Shipitsin <norguhtar at gmail.com>'
+__copyright__ = ('2011, Roman Mukhin <ramses_ru at hotmail.com>, '
+                 '2008, Anatoly Shipitsin <norguhtar at gmail.com>')
 '''Read meta information from fb2 files'''
 
 import os
@@ -179,7 +179,7 @@ def _parse_authors(root, ctx):
 
 
 def _parse_author(elm_author, ctx):
-    """ Returns a list of display author and sortable author"""
+    ''' Returns a list of display author and sortable author'''
 
     xp_templ = 'normalize-space(fb:%s/text())'
 
diff --git a/src/calibre/ebooks/metadata/html.py b/src/calibre/ebooks/metadata/html.py
index 00a4f40e42..2d452f4372 100644
--- a/src/calibre/ebooks/metadata/html.py
+++ b/src/calibre/ebooks/metadata/html.py
@@ -43,7 +43,7 @@ COMMENT_NAMES = {
 }
 
 META_NAMES = {
-    'title' : ('dc.title', 'dcterms.title', 'title'),
+    'title': ('dc.title', 'dcterms.title', 'title'),
     'authors': ('author', 'dc.creator.aut', 'dcterms.creator.aut', 'dc.creator'),
     'publisher': ('publisher', 'dc.publisher', 'dcterms.publisher'),
     'isbn': ('isbn',),
@@ -232,7 +232,7 @@ def get_metadata_(src, encoding=None):
             mi.tags = tags
 
     # IDENTIFIERS
-    for (k,v) in iteritems(meta_tag_ids):
+    for k,v in iteritems(meta_tag_ids):
         v = [x.strip() for x in v if x.strip()]
         if v:
             mi.set_identifier(k, v[0])
diff --git a/src/calibre/ebooks/metadata/imp.py b/src/calibre/ebooks/metadata/imp.py
index e244eb2621..46de408ef2 100644
--- a/src/calibre/ebooks/metadata/imp.py
+++ b/src/calibre/ebooks/metadata/imp.py
@@ -10,13 +10,13 @@ MAGIC = (b'\x00\x01BOOKDOUG', b'\x00\x02BOOKDOUG')
 
 
 def get_metadata(stream):
-    """ Return metadata as a L{MetaInfo} object """
+    ''' Return metadata as a L{MetaInfo} object '''
     title = 'Unknown'
     mi = MetaInformation(title, ['Unknown'])
     stream.seek(0)
     try:
         if stream.read(10) not in MAGIC:
-            print('Couldn\'t read IMP header from file', file=sys.stderr)
+            print("Couldn't read IMP header from file", file=sys.stderr)
             return mi
 
         def cString(skip=0):
@@ -42,6 +42,6 @@ def get_metadata(stream):
         if category:
             mi.category = category
     except Exception as err:
-        msg = 'Couldn\'t read metadata from imp: %s with error %s'%(mi.title, str(err))
+        msg = "Couldn't read metadata from imp: %s with error %s"%(mi.title, str(err))
         print(msg.encode('utf8'), file=sys.stderr)
     return mi
diff --git a/src/calibre/ebooks/metadata/kdl.py b/src/calibre/ebooks/metadata/kdl.py
index 37acbb60b3..31f0e13bc1 100644
--- a/src/calibre/ebooks/metadata/kdl.py
+++ b/src/calibre/ebooks/metadata/kdl.py
@@ -17,8 +17,7 @@ from calibre.ebooks.metadata.book.base import Metadata
 from polyglot.builtins import codepoint_to_chr
 from polyglot.urllib import parse_qs, quote_plus
 
-URL = \
-"http://ww2.kdl.org/libcat/WhatsNext.asp?AuthorLastName={0}&AuthorFirstName=&SeriesName=&BookTitle={1}&CategoryID=0&cmdSearch=Search&Search=1&grouping="
+URL = 'http://ww2.kdl.org/libcat/WhatsNext.asp?AuthorLastName={0}&AuthorFirstName=&SeriesName=&BookTitle={1}&CategoryID=0&cmdSearch=Search&Search=1&grouping='
 
 _ignore_starts = '\'"'+''.join(codepoint_to_chr(x) for x in list(range(0x2018, 0x201e))+[0x2032, 0x2033])
 
diff --git a/src/calibre/ebooks/metadata/kfx.py b/src/calibre/ebooks/metadata/kfx.py
index 992cd53048..654d70f3b9 100644
--- a/src/calibre/ebooks/metadata/kfx.py
+++ b/src/calibre/ebooks/metadata/kfx.py
@@ -50,14 +50,14 @@ PROP_METADATA_VALUE = b'P307'
 PROP_IMAGE = b'P417'
 
 METADATA_PROPERTIES = {
-    b'P10' : "languages",
-    b'P153': "title",
-    b'P154': "description",
-    b'P222': "author",
-    b'P232': "publisher",
+    b'P10' : 'languages',
+    b'P153': 'title',
+    b'P154': 'description',
+    b'P222': 'author',
+    b'P232': 'publisher',
 }
 
-COVER_KEY = "cover_image_base64"
+COVER_KEY = 'cover_image_base64'
 
 
 def hexs(string, sep=' '):
@@ -69,7 +69,6 @@ def hexs(string, sep=' '):
 
 
 class PackedData:
-
     '''
     Simplify unpacking of packed binary data structures
     '''
@@ -101,7 +100,6 @@ class PackedData:
 
 
 class PackedBlock(PackedData):
-
     '''
     Common header structure of container and entity blocks
     '''
@@ -119,7 +117,6 @@ class PackedBlock(PackedData):
 
 
 class Container(PackedBlock):
-
     '''
     Container file containing data entities
     '''
@@ -143,7 +140,6 @@ class Container(PackedBlock):
 
 
 class Entity(PackedBlock):
-
     '''
     Data entity inside a container
     '''
@@ -164,7 +160,6 @@ class Entity(PackedBlock):
 
 
 class PackedIon(PackedData):
-
     '''
     Packed structured binary data format used by KFX
     '''
@@ -248,7 +243,7 @@ class PackedIon(PackedData):
 def property_name(property_number):
     # This should be changed to translate property numbers to the proper
     # strings using a symbol table
-    return b"P%d" % property_number
+    return b'P%d' % property_number
 
 
 def extract_metadata(container_data):
diff --git a/src/calibre/ebooks/metadata/meta.py b/src/calibre/ebooks/metadata/meta.py
index 1499eb69c6..03f2a2d6f9 100644
--- a/src/calibre/ebooks/metadata/meta.py
+++ b/src/calibre/ebooks/metadata/meta.py
@@ -139,7 +139,7 @@ def metadata_from_filename(name, pat=None, fallback_pat=None):
             try:
                 pat = regex.compile(prefs.get('filename_pattern'), flags=regex.UNICODE | regex.VERSION0 | regex.FULLCASE)
             except Exception:
-                pat = regex.compile('(?P<title>.+) - (?P<author>[^_]+)', flags=regex.UNICODE | regex.VERSION0 | regex.FULLCASE)
+                pat = regex.compile(r'(?P<title>.+) - (?P<author>[^_]+)', flags=regex.UNICODE | regex.VERSION0 | regex.FULLCASE)
 
     name = name.replace('_', ' ')
     match = pat.search(name)
@@ -227,7 +227,6 @@ def opf_metadata(opfpath):
     except Exception:
         import traceback
         traceback.print_exc()
-        pass
 
 
 def forked_read_metadata(original_path, tdir):
diff --git a/src/calibre/ebooks/metadata/mobi.py b/src/calibre/ebooks/metadata/mobi.py
index dbba75145a..18c6e4f579 100644
--- a/src/calibre/ebooks/metadata/mobi.py
+++ b/src/calibre/ebooks/metadata/mobi.py
@@ -53,20 +53,20 @@ class StreamSlicer:
                 start, stop = stop, start
             size = stop - start
             if size <= 0:
-                return b""
+                return b''
             stream.seek(base + start)
             data = stream.read(size)
             if stride != 1:
                 data = data[::stride]
             return data
-        raise TypeError("stream indices must be integers")
+        raise TypeError('stream indices must be integers')
 
     def __setitem__(self, key, value):
         stream = self._stream
         base = self.start
         if isinstance(key, numbers.Integral):
             if len(value) != 1:
-                raise ValueError("key and value lengths must match")
+                raise ValueError('key and value lengths must match')
             stream.seek(base + key)
             return stream.write(value)
         if isinstance(key, slice):
@@ -77,10 +77,10 @@ class StreamSlicer:
             if stride != 1:
                 value = value[::stride]
             if len(value) != size:
-                raise ValueError("key and value lengths must match")
+                raise ValueError('key and value lengths must match')
             stream.seek(base + start)
             return stream.write(value)
-        raise TypeError("stream indices must be integers")
+        raise TypeError('stream indices must be integers')
 
     def update(self, data_blocks):
         # Rewrite the stream
@@ -103,7 +103,7 @@ class MetadataUpdater:
         data = self.data = StreamSlicer(stream)
         self.type = data[60:68]
 
-        if self.type != b"BOOKMOBI":
+        if self.type != b'BOOKMOBI':
             return
 
         self.nrecs, = unpack('>H', data[76:78])
@@ -181,7 +181,7 @@ class MetadataUpdater:
     def patch(self, off, new_record0):
         # Save the current size of each record
         record_sizes = [len(new_record0)]
-        for i in range(1,self.nrecs-1):
+        for i in range(1, self.nrecs-1):
             record_sizes.append(self.pdbrecords[i+1][0]-self.pdbrecords[i][0])
         # And the last one
         record_sizes.append(self.data.stop - self.pdbrecords[self.nrecs-1][0])
@@ -192,7 +192,7 @@ class MetadataUpdater:
         record0_offset = self.pdbrecords[0][0]
         updated_offset = record0_offset + len(new_record0)
 
-        for i in range(1,self.nrecs-1):
+        for i in range(1, self.nrecs-1):
             updated_pdbrecords.append(updated_offset)
             updated_offset += record_sizes[i]
         # Update the last pdbrecord
@@ -200,7 +200,7 @@ class MetadataUpdater:
 
         # Read in current records 1 to last
         data_blocks = [new_record0]
-        for i in range(1,self.nrecs):
+        for i in range(1, self.nrecs):
             data_blocks.append(self.data[self.pdbrecords[i][0]:self.pdbrecords[i][0] + record_sizes[i]])
 
         # Rewrite the stream
@@ -233,7 +233,7 @@ class MetadataUpdater:
         mobi_header_length, = unpack('>L', self.record0[0x14:0x18])
         if mobi_header_length == 0xe4:
             # Patch mobi_header_length to 0xE8
-            self.record0[0x17] = b"\xe8"
+            self.record0[0x17] = b'\xe8'
             self.record0[0xf4:0xf8] = pack('>L', 0xFFFFFFFF)
             mobi_header_length = 0xe8
 
@@ -272,21 +272,21 @@ class MetadataUpdater:
         new_record0.write(b'\0'*(1024*8))
 
         # Rebuild the stream, update the pdbrecords pointers
-        self.patchSection(0,new_record0.getvalue())
+        self.patchSection(0, new_record0.getvalue())
 
         # Update record0
         self.record0 = self.record(0)
 
     def hexdump(self, src, length=16):
         # Diagnostic
-        FILTER=''.join([(len(repr(codepoint_to_chr(x)))==3) and codepoint_to_chr(x) or '.' for x in range(256)])
+        FILTER=''.join([((len(repr(codepoint_to_chr(x)))==3) and codepoint_to_chr(x)) or '.' for x in range(256)])
         N=0
         result=''
         while src:
-            s,src = src[:length],src[length:]
-            hexa = ' '.join(["%02X"%ord(x) for x in s])
+            s, src = src[:length],src[length:]
+            hexa = ' '.join(['%02X'%ord(x) for x in s])
             s = s.translate(FILTER)
-            result += "%04X   %-*s   %s\n" % (N, length*3, hexa, s)
+            result += '%04X   %-*s   %s\n' % (N, length*3, hexa, s)
             N+=length
         print(result)
 
@@ -299,7 +299,7 @@ class MetadataUpdater:
         return pdbrecords
 
     def update_pdbrecords(self, updated_pdbrecords):
-        for (i, pdbrecord) in enumerate(updated_pdbrecords):
+        for i,pdbrecord in enumerate(updated_pdbrecords):
             self.data[78+i*8:78+i*8 + 4] = pack('>L',pdbrecord)
 
         # Refresh local copy
@@ -307,11 +307,11 @@ class MetadataUpdater:
 
     def dump_pdbrecords(self):
         # Diagnostic
-        print("MetadataUpdater.dump_pdbrecords()")
-        print("%10s %10s %10s" % ("offset","flags","val"))
+        print('MetadataUpdater.dump_pdbrecords()')
+        print('%10s %10s %10s' % ('offset','flags','val'))
         for i in range(len(self.pdbrecords)):
             pdbrecord = self.pdbrecords[i]
-            print(f"{pdbrecord[0]:10X} {pdbrecord[1]:10X} {pdbrecord[2]:10X}")
+            print(f'{pdbrecord[0]:10X} {pdbrecord[1]:10X} {pdbrecord[2]:10X}')
 
     def record(self, n):
         if n >= self.nrecs:
@@ -331,7 +331,7 @@ class MetadataUpdater:
             if rec[0] in self.original_exth_records:
                 self.original_exth_records.pop(rec[0])
 
-        if self.type != b"BOOKMOBI":
+        if self.type != b'BOOKMOBI':
             raise MobiError("Setting metadata only supported for MOBI files of type 'BOOK'.\n"
                             "\tThis is a %r file of type %r" % (self.type[0:4], self.type[4:8]))
 
@@ -406,7 +406,7 @@ class MetadataUpdater:
         # Add a 112 record with actual UUID
         if getattr(mi, 'uuid', None):
             update_exth_record((112,
-                    ("calibre:%s" % mi.uuid).encode(self.codec, 'replace')))
+                    ('calibre:%s' % mi.uuid).encode(self.codec, 'replace')))
         if 503 in self.original_exth_records:
             update_exth_record((503, mi.title.encode(self.codec, 'replace')))
 
@@ -448,7 +448,7 @@ class MetadataUpdater:
 
         if mi.cover_data[1] or mi.cover:
             try:
-                data =  mi.cover_data[1]
+                data = mi.cover_data[1]
                 if not data:
                     with open(mi.cover, 'rb') as f:
                         data = f.read()
@@ -473,7 +473,6 @@ class MetadataUpdater:
 def set_metadata(stream, mi):
     mu = MetadataUpdater(stream)
     mu.update(mi)
-    return
 
 
 def get_metadata(stream):
diff --git a/src/calibre/ebooks/metadata/odt.py b/src/calibre/ebooks/metadata/odt.py
index 932a088f05..c0c660004e 100644
--- a/src/calibre/ebooks/metadata/odt.py
+++ b/src/calibre/ebooks/metadata/odt.py
@@ -63,7 +63,7 @@ def uniq(vals):
     vals = vals or ()
     seen = set()
     seen_add = seen.add
-    return list(x for x in vals if x not in seen and not seen_add(x))
+    return [x for x in vals if x not in seen and not seen_add(x)]
 
 
 def get_metadata(stream, extract_cover=True):
@@ -119,19 +119,19 @@ def get_metadata(stream, extract_cover=True):
         if data.get('opf.metadata'):
             # custom metadata contains OPF information
             opfmeta = True
-            if data.get('opf.titlesort', ''):
+            if data.get('opf.titlesort'):
                 mi.title_sort = data['opf.titlesort']
-            if data.get('opf.authors', ''):
+            if data.get('opf.authors'):
                 mi.authors = string_to_authors(data['opf.authors'])
-            if data.get('opf.authorsort', ''):
+            if data.get('opf.authorsort'):
                 mi.author_sort = data['opf.authorsort']
-            if data.get('opf.isbn', ''):
+            if data.get('opf.isbn'):
                 isbn = check_isbn(data['opf.isbn'])
                 if isbn is not None:
                     mi.isbn = isbn
-            if data.get('opf.publisher', ''):
+            if data.get('opf.publisher'):
                 mi.publisher = data['opf.publisher']
-            if data.get('opf.pubdate', ''):
+            if data.get('opf.pubdate'):
                 mi.pubdate = parse_date(data['opf.pubdate'], assume_utc=True)
             if data.get('opf.identifiers'):
                 try:
@@ -143,14 +143,14 @@ def get_metadata(stream, extract_cover=True):
                     mi.rating = max(0, min(float(data['opf.rating']), 10))
                 except Exception:
                     pass
-            if data.get('opf.series', ''):
+            if data.get('opf.series'):
                 mi.series = data['opf.series']
-                if data.get('opf.seriesindex', ''):
+                if data.get('opf.seriesindex'):
                     try:
                         mi.series_index = float(data['opf.seriesindex'])
                     except Exception:
                         mi.series_index = 1.0
-            if data.get('opf.language', ''):
+            if data.get('opf.language'):
                 cl = canonicalize_lang(data['opf.language'])
                 if cl:
                     mi.languages = [cl]
@@ -171,7 +171,7 @@ def set_metadata(stream, mi):
         # print(raw.decode('utf-8'))
 
     stream.seek(os.SEEK_SET)
-    safe_replace(stream, "meta.xml", io.BytesIO(raw))
+    safe_replace(stream, 'meta.xml', io.BytesIO(raw))
 
 
 def _set_metadata(raw, mi):
diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py
index ac8216ed40..628db3f5e1 100644
--- a/src/calibre/ebooks/metadata/opf2.py
+++ b/src/calibre/ebooks/metadata/opf2.py
@@ -529,9 +529,9 @@ def serialize_user_metadata(metadata_elem, all_user_metadata, tail='\n'+(' '*8))
     for name, fm in all_user_metadata.items():
         try:
             fm = copy.copy(fm)
-            if (fm.get('datatype', 'text') == 'composite' and
-                not fm.get('display', {}).get('composite_store_template_value_in_opf', True)):
-                    fm['#value#'] = ''
+            if (fm.get('datatype', 'text') == 'composite'
+              and not fm.get('display', {}).get('composite_store_template_value_in_opf', True)):
+                fm['#value#'] = ''
             encode_is_multiple(fm)
             fm = object_to_unicode(fm)
             fm = json.dumps(fm, default=to_json, ensure_ascii=False)
@@ -566,9 +566,10 @@ def dump_dict(cats):
     return json.dumps(object_to_unicode(cats), ensure_ascii=False,
             skipkeys=True)
 
+
 XPATH_NS = {
-    'dc': "http://purl.org/dc/elements/1.1/",
-    'opf': "http://www.idpf.org/2007/opf",
+    'dc' : 'http://purl.org/dc/elements/1.1/',
+    'opf': 'http://www.idpf.org/2007/opf',
     're' : 'http://exslt.org/regular-expressions'
 }
 XPath = functools.partial(etree.XPath, namespaces=XPATH_NS)
@@ -578,9 +579,9 @@ class OPF:  # {{{
 
     MIMETYPE         = 'application/oebps-package+xml'
     NAMESPACES       = {
-                        None: "http://www.idpf.org/2007/opf",
-                        'dc': "http://purl.org/dc/elements/1.1/",
-                        'opf': "http://www.idpf.org/2007/opf",
+                        None: 'http://www.idpf.org/2007/opf',
+                        'dc': 'http://purl.org/dc/elements/1.1/',
+                        'opf': 'http://www.idpf.org/2007/opf',
                        }
     META             = '{%s}meta' % NAMESPACES['opf']
     CONTENT          = XPath('self::*[re:match(name(), "meta$", "i")]/@content')
@@ -842,7 +843,7 @@ class OPF:  # {{{
     def create_guide_element(self):
         e = etree.SubElement(self.root, '{%s}guide'%self.NAMESPACES['opf'])
         e.text = '\n        '
-        e.tail =  '\n'
+        e.tail = '\n'
         return e
 
     def remove_guide(self):
@@ -1432,9 +1433,8 @@ class OPFCreator(Metadata):
 
         `entries`: List of (path, mime-type) If mime-type is None it is autodetected
         '''
-        entries = list(map(lambda x: x if os.path.isabs(x[0]) else
-                      (os.path.abspath(os.path.join(self.base_path, x[0])), x[1]),
-                      entries))
+        entries = [x if os.path.isabs(x[0]) else
+                      (os.path.abspath(os.path.join(self.base_path, x[0])), x[1]) for x in entries]
         self.manifest = Manifest.from_paths(entries)
         self.manifest.set_basedir(self.base_path)
 
@@ -1464,8 +1464,8 @@ class OPFCreator(Metadata):
 
         `entries`: List of paths
         '''
-        entries = list(map(lambda x: x if os.path.isabs(x) else
-                      os.path.abspath(os.path.join(self.base_path, x)), entries))
+        entries = [x if os.path.isabs(x) else
+                      os.path.abspath(os.path.join(self.base_path, x)) for x in entries]
         self.spine = Spine.from_paths(entries, self.manifest)
 
     def set_toc(self, toc):
@@ -1645,8 +1645,7 @@ def metadata_to_opf(mi, as_string=True, default_lang=None):
         mi.uuid = str(uuid.uuid4())
 
     if not mi.book_producer:
-        mi.book_producer = __appname__ + ' (%s) '%__version__ + \
-            '[https://calibre-ebook.com]'
+        mi.book_producer = __appname__ + ' (%s) '%__version__ + '[https://calibre-ebook.com]'
 
     if not mi.languages:
         lang = (get_lang().replace('_', '-').partition('-')[0] if default_lang
@@ -1841,7 +1840,7 @@ def suite():
 
         def testWriting(self):
             for test in [('title', 'New & Title'), ('authors', ['One', 'Two']),
-                        ('author_sort', "Kitchen"), ('tags', ['Three']),
+                        ('author_sort', 'Kitchen'), ('tags', ['Three']),
                         ('isbn', 'a'), ('rating', 3), ('series_index', 1),
                         ('title_sort', 'ts')]:
                 setattr(self.opf, *test)
diff --git a/src/calibre/ebooks/metadata/opf3.py b/src/calibre/ebooks/metadata/opf3.py
index b4619fbb60..8ab47ac73e 100644
--- a/src/calibre/ebooks/metadata/opf3.py
+++ b/src/calibre/ebooks/metadata/opf3.py
@@ -34,7 +34,7 @@ def uniq(vals):
     vals = vals or ()
     seen = set()
     seen_add = seen.add
-    return list(x for x in vals if x not in seen and not seen_add(x))
+    return [x for x in vals if x not in seen and not seen_add(x)]
 
 
 def dump_dict(cats):
@@ -135,7 +135,7 @@ def items_with_property(root, q, prefixes=None):
     if prefixes is None:
         prefixes = read_prefixes(root)
     q = expand_prefix(q, known_prefixes).lower()
-    for item in XPath("./opf:manifest/opf:item[@properties]")(root):
+    for item in XPath('./opf:manifest/opf:item[@properties]')(root):
         for prop in (item.get('properties') or '').lower().split():
             prop = expand_prefix(prop, prefixes)
             if prop == q:
@@ -191,8 +191,8 @@ def ensure_prefix(root, prefixes, prefix, value=None):
 
 # }}}
 
-# Refines {{{
 
+# Refines {{{
 
 def read_refines(root):
     ans = defaultdict(list)
@@ -204,7 +204,7 @@ def read_refines(root):
 
 
 def refdef(prop, val, scheme=None):
-    return (prop, val, scheme)
+    return prop, val, scheme
 
 
 def set_refines(elem, existing_refines, *new_refines):
@@ -221,8 +221,8 @@ def set_refines(elem, existing_refines, *new_refines):
         p.insert(p.index(elem)+1, r)
 # }}}
 
-# Identifiers {{{
 
+# Identifiers {{{
 
 def parse_identifier(ident, val, refines):
     idid = ident.get('id')
@@ -330,8 +330,8 @@ set_uuid = identifier_writer('uuid')
 
 # }}}
 
-# Title {{{
 
+# Title {{{
 
 def find_main_title(root, refines, remove_blanks=False):
     first_title = main_title = None
@@ -404,8 +404,8 @@ def set_title(root, prefixes, refines, title, title_sort=None):
 
 # }}}
 
-# Languages {{{
 
+# Languages {{{
 
 def read_languages(root, prefixes, refines):
     ans = []
@@ -434,8 +434,8 @@ def set_languages(root, prefixes, refines, languages):
         metadata.append(l)
 # }}}
 
-# Creator/Contributor {{{
 
+# Creator/Contributor {{{
 
 Author = namedtuple('Author', 'name sort seq', defaults=(0,))
 
@@ -558,8 +558,8 @@ def set_book_producers(root, prefixes, refines, producers):
             metadata.append(m)
 # }}}
 
-# Dates {{{
 
+# Dates {{{
 
 def parse_date(raw, is_w3cdtf=False):
     raw = raw.strip()
@@ -668,8 +668,8 @@ def set_last_modified(root, prefixes, refines, val=None):
     meta.text = val
 # }}}
 
-# Comments {{{
 
+# Comments {{{
 
 def read_comments(root, prefixes, refines):
     ans = ''
@@ -691,8 +691,8 @@ def set_comments(root, prefixes, refines, val):
             m.append(c)
 # }}}
 
-# Publisher {{{
 
+# Publisher {{{
 
 @simple_text
 def read_publisher(root, prefixes, refines):
@@ -713,8 +713,8 @@ def set_publisher(root, prefixes, refines, val):
             m.append(c)
 # }}}
 
-# Tags {{{
 
+# Tags {{{
 
 def read_tags(root, prefixes, refines):
     ans = []
@@ -737,8 +737,8 @@ def set_tags(root, prefixes, refines, val):
                 m.append(c)
 # }}}
 
-# Rating {{{
 
+# Rating {{{
 
 def read_rating(root, prefixes, refines):
     pq = '%s:rating' % CALIBRE_PREFIX
@@ -780,8 +780,8 @@ def set_rating(root, prefixes, refines, val):
         create_rating(root, prefixes, '%.2g' % float(val))
 # }}}
 
-# Series {{{
 
+# Series {{{
 
 def read_series(root, prefixes, refines):
     series_index = 1.0
@@ -825,8 +825,8 @@ def set_series(root, prefixes, refines, series, series_index):
         create_series(root, refines, series, fmt_sidx(series_index))
 # }}}
 
-# User metadata {{{
 
+# User metadata {{{
 
 def dict_reader(name, load=json.loads, try2=True):
     pq = f'{CALIBRE_PREFIX}:{name}'
@@ -951,17 +951,17 @@ def set_user_metadata(root, prefixes, refines, val):
         nval = {}
         for name, fm in val.items():
             fm = fm.copy()
-            if (fm.get('datatype', 'text') == 'composite' and
-                not fm.get('display', {}).get('composite_store_template_value_in_opf', True)):
-                    fm['#value#'] = ''
+            if (fm.get('datatype', 'text') == 'composite'
+              and not fm.get('display', {}).get('composite_store_template_value_in_opf', True)):
+                fm['#value#'] = ''
             encode_is_multiple(fm)
             nval[name] = fm
         set_user_metadata3(root, prefixes, refines, nval)
 
 # }}}
 
-# Covers {{{
 
+# Covers {{{
 
 def read_raster_cover(root, prefixes, refines):
 
@@ -1008,8 +1008,8 @@ def ensure_is_only_raster_cover(root, prefixes, refines, raster_cover_item_href)
 
 # }}}
 
-# Reading/setting Metadata objects {{{
 
+# Reading/setting Metadata objects {{{
 
 def first_spine_item(root, prefixes, refines):
     for i in XPath('./opf:spine/opf:itemref/@idref')(root):
diff --git a/src/calibre/ebooks/metadata/opf3_test.py b/src/calibre/ebooks/metadata/opf3_test.py
index 94be1cb287..0dc9e84c79 100644
--- a/src/calibre/ebooks/metadata/opf3_test.py
+++ b/src/calibre/ebooks/metadata/opf3_test.py
@@ -58,12 +58,12 @@ from calibre.ebooks.metadata.opf3 import (
 )
 
 # This import is needed to prevent a test from running slowly
-from calibre.ebooks.oeb.polish.pretty import pretty_opf, pretty_xml_tree  # noqa
+from calibre.ebooks.oeb.polish.pretty import pretty_opf, pretty_xml_tree  # noqa: F401
 from calibre.utils.xml_parse import safe_xml_fromstring
 
 read_user_categories, set_user_categories, read_link_maps, set_link_maps
 
-TEMPLATE = '''<package xmlns="http://www.idpf.org/2007/opf" version="3.0" prefix="calibre: %s" unique-identifier="uid"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">{metadata}</metadata><manifest>{manifest}</manifest></package>''' % CALIBRE_PREFIX  # noqa
+TEMPLATE = '''<package xmlns="http://www.idpf.org/2007/opf" version="3.0" prefix="calibre: %s" unique-identifier="uid"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">{metadata}</metadata><manifest>{manifest}</manifest></package>''' % CALIBRE_PREFIX  # noqa: E501
 default_refines = defaultdict(list)
 
 
@@ -339,11 +339,11 @@ class TestOPF3(unittest.TestCase):
             set_user_metadata(root, read_prefixes(root), read_refines(root), val)
             return ru(root)
         root = self.get_opf('''<meta name="calibre:user_metadata:#a" content='{"1":1}'/>''')
-        self.ae({'#a': {'1': 1, 'is_multiple': dict()}}, ru(root))
+        self.ae({'#a': {'1': 1, 'is_multiple': {}}}, ru(root))
         root = self.get_opf('''<meta name="calibre:user_metadata:#a" content='{"1":1}'/>'''
                             '''<meta property="calibre:user_metadata">{"#b":{"2":2}}</meta>''')
-        self.ae({'#b': {'2': 2, 'is_multiple': dict()}}, ru(root))
-        self.ae({'#c': {'3': 3, 'is_multiple': {}, 'is_multiple2': dict()}}, su(root, {'#c':{'3':3}}))
+        self.ae({'#b': {'2': 2, 'is_multiple': {}}}, ru(root))
+        self.ae({'#c': {'3': 3, 'is_multiple': {}, 'is_multiple2': {}}}, su(root, {'#c':{'3':3}}))
 
     # }}}
 
@@ -587,8 +587,8 @@ class TestOPF3(unittest.TestCase):
         self.ae('xxx/cover.jpg', apply_metadata(root, mi3, cover_data=b'x', cover_prefix='xxx'))
     # }}}
 
-# Run tests {{{
 
+# Run tests {{{
 
 def suite():
     return unittest.TestLoader().loadTestsFromTestCase(TestOPF3)
diff --git a/src/calibre/ebooks/metadata/pdb.py b/src/calibre/ebooks/metadata/pdb.py
index 783cd77bbe..931c8707ce 100644
--- a/src/calibre/ebooks/metadata/pdb.py
+++ b/src/calibre/ebooks/metadata/pdb.py
@@ -15,25 +15,25 @@ from calibre.ebooks.metadata.plucker import get_metadata as get_plucker
 from calibre.ebooks.pdb.header import PdbHeaderReader
 
 MREADER = {
-    'PNPdPPrs' : get_eReader,
-    'PNRdPPrs' : get_eReader,
-    'DataPlkr' : get_plucker,
-    'BOOKMTIT' : get_Haodoo,
-    'BOOKMTIU' : get_Haodoo,
+    'PNPdPPrs': get_eReader,
+    'PNRdPPrs': get_eReader,
+    'DataPlkr': get_plucker,
+    'BOOKMTIT': get_Haodoo,
+    'BOOKMTIU': get_Haodoo,
 }
 
 from calibre.ebooks.metadata.ereader import set_metadata as set_eReader
 
 MWRITER = {
-    'PNPdPPrs' : set_eReader,
-    'PNRdPPrs' : set_eReader,
+    'PNPdPPrs': set_eReader,
+    'PNRdPPrs': set_eReader,
 }
 
 
 def get_metadata(stream, extract_cover=True):
-    """
+    '''
     Return metadata as a L{MetaInfo} object
-    """
+    '''
 
     pheader = PdbHeaderReader(stream)
 
@@ -59,4 +59,4 @@ def set_metadata(stream, mi):
         MetadataWriter(stream, mi)
 
     stream.seek(0)
-    stream.write(re.sub('[^-A-Za-z0-9 ]+', '_', mi.title).ljust(31, '\x00')[:31].encode('ascii', 'replace') + b'\x00')
+    stream.write(re.sub(r'[^-A-Za-z0-9 ]+', '_', mi.title).ljust(31, '\x00')[:31].encode('ascii', 'replace') + b'\x00')
diff --git a/src/calibre/ebooks/metadata/pdf.py b/src/calibre/ebooks/metadata/pdf.py
index e8897e3d8a..98dfdd4ae1 100644
--- a/src/calibre/ebooks/metadata/pdf.py
+++ b/src/calibre/ebooks/metadata/pdf.py
@@ -138,7 +138,7 @@ def get_metadata(stream, cover=True):
         au = string_to_authors(au)
     mi = MetaInformation(title, au)
     # if isbn is not None:
-    #    mi.isbn = isbn
+    #     mi.isbn = isbn
 
     creator = info.get('Creator', None)
     if creator:
diff --git a/src/calibre/ebooks/metadata/pml.py b/src/calibre/ebooks/metadata/pml.py
index db33a946d5..e0df26a905 100644
--- a/src/calibre/ebooks/metadata/pml.py
+++ b/src/calibre/ebooks/metadata/pml.py
@@ -18,7 +18,7 @@ from calibre.utils.zipfile import ZipFile
 
 
 def get_metadata(stream, extract_cover=True):
-    """ Return metadata as a L{MetaInfo} object """
+    ''' Return metadata as a L{MetaInfo} object '''
     mi = MetaInformation(_('Unknown'), [_('Unknown')])
     stream.seek(0)
 
@@ -42,21 +42,21 @@ def get_metadata(stream, extract_cover=True):
     for comment in re.findall(br'(?ms)\\v.*?\\v', pml):
         m = re.search(br'TITLE="(.*?)"', comment)
         if m:
-            mi.title = re.sub('[\x00-\x1f]', '', prepare_string_for_xml(m.group(1).strip().decode('cp1252', 'replace')))
+            mi.title = re.sub(r'[\x00-\x1f]', '', prepare_string_for_xml(m.group(1).strip().decode('cp1252', 'replace')))
         m = re.search(br'AUTHOR="(.*?)"', comment)
         if m:
             if mi.authors == [_('Unknown')]:
                 mi.authors = []
-            mi.authors.append(re.sub('[\x00-\x1f]', '', prepare_string_for_xml(m.group(1).strip().decode('cp1252', 'replace'))))
+            mi.authors.append(re.sub(r'[\x00-\x1f]', '', prepare_string_for_xml(m.group(1).strip().decode('cp1252', 'replace'))))
         m = re.search(br'PUBLISHER="(.*?)"', comment)
         if m:
-            mi.publisher = re.sub('[\x00-\x1f]', '', prepare_string_for_xml(m.group(1).strip().decode('cp1252', 'replace')))
+            mi.publisher = re.sub(r'[\x00-\x1f]', '', prepare_string_for_xml(m.group(1).strip().decode('cp1252', 'replace')))
         m = re.search(br'COPYRIGHT="(.*?)"', comment)
         if m:
-            mi.rights = re.sub('[\x00-\x1f]', '', prepare_string_for_xml(m.group(1).strip().decode('cp1252', 'replace')))
+            mi.rights = re.sub(r'[\x00-\x1f]', '', prepare_string_for_xml(m.group(1).strip().decode('cp1252', 'replace')))
         m = re.search(br'ISBN="(.*?)"', comment)
         if m:
-            mi.isbn = re.sub('[\x00-\x1f]', '', prepare_string_for_xml(m.group(1).strip().decode('cp1252', 'replace')))
+            mi.isbn = re.sub(r'[\x00-\x1f]', '', prepare_string_for_xml(m.group(1).strip().decode('cp1252', 'replace')))
 
     return mi
 
diff --git a/src/calibre/ebooks/metadata/rb.py b/src/calibre/ebooks/metadata/rb.py
index b19a995346..7fbbbed075 100644
--- a/src/calibre/ebooks/metadata/rb.py
+++ b/src/calibre/ebooks/metadata/rb.py
@@ -12,13 +12,13 @@ MAGIC = b'\xb0\x0c\xb0\x0c\x02\x00NUVO\x00\x00\x00\x00'
 
 
 def get_metadata(stream):
-    """ Return metadata as a L{MetaInfo} object """
+    ''' Return metadata as a L{MetaInfo} object '''
     title = 'Unknown'
     mi = MetaInformation(title, ['Unknown'])
     stream.seek(0)
     try:
         if not stream.read(14) == MAGIC:
-            print('Couldn\'t read RB header from file', file=sys.stderr)
+            print("Couldn't read RB header from file", file=sys.stderr)
             return mi
         stream.read(10)
 
@@ -34,7 +34,7 @@ def get_metadata(stream):
             if flag == 2:
                 break
         else:
-            print('Couldn\'t find INFO from RB file', file=sys.stderr)
+            print("Couldn't find INFO from RB file", file=sys.stderr)
             return mi
 
         stream.seek(offset)
@@ -48,7 +48,7 @@ def get_metadata(stream):
             elif key.strip() == 'AUTHOR':
                 mi.authors = string_to_authors(value)
     except Exception as err:
-        msg = 'Couldn\'t read metadata from rb: %s with error %s'%(mi.title, str(err))
+        msg = "Couldn't read metadata from rb: %s with error %s"%(mi.title, str(err))
         prints(msg, file=sys.stderr)
         raise
     return mi
diff --git a/src/calibre/ebooks/metadata/rtf.py b/src/calibre/ebooks/metadata/rtf.py
index 07af613fa2..3a4c5b1e1c 100644
--- a/src/calibre/ebooks/metadata/rtf.py
+++ b/src/calibre/ebooks/metadata/rtf.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # License: GPLv3 Copyright: 2008, Kovid Goyal <kovid at kovidgoyal.net>
 
-"""
+'''
 Edit metadata in RTF files.
-"""
+'''
 
 import codecs
 import re
@@ -20,15 +20,15 @@ publisher_pat = re.compile(br'\{\\info.*?\{\\manager(.*?)(?<!\\)\}', re.DOTALL)
 
 
 def get_document_info(stream):
-    """
+    '''
     Extract the \\info block from an RTF file.
     Return the info block as a string and the position in the file at which it
     starts.
     @param stream: File like object pointing to the RTF file.
-    """
+    '''
     block_size = 4096
     stream.seek(0)
-    found, block = False, b""
+    found, block = False, b''
     while not found:
         prefix = block[-6:]
         block = prefix + stream.read(block_size)
@@ -109,9 +109,9 @@ def decode(raw, codec):
 
 
 def get_metadata(stream):
-    """
+    '''
     Return metadata as a L{MetaInfo} object
-    """
+    '''
     stream.seek(0)
     if stream.read(5) != br'{\rtf':
         return MetaInformation(_('Unknown'))
diff --git a/src/calibre/ebooks/metadata/snb.py b/src/calibre/ebooks/metadata/snb.py
index 3c5593b3c5..d7c0a330cd 100644
--- a/src/calibre/ebooks/metadata/snb.py
+++ b/src/calibre/ebooks/metadata/snb.py
@@ -13,7 +13,7 @@ from calibre.utils.xml_parse import safe_xml_fromstring
 
 
 def get_metadata(stream, extract_cover=True):
-    """ Return metadata as a L{MetaInfo} object """
+    ''' Return metadata as a L{MetaInfo} object '''
     mi = MetaInformation(_('Unknown'), [_('Unknown')])
     snbFile = SNBFile()
 
diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index ad7450923f..4a623d00dc 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -333,7 +333,7 @@ class Worker(Thread):  # Get details {{{
         self.publisher_names = {'Publisher', 'Uitgever', 'Verlag', 'Utgivare', 'Herausgeber',
                                 'Editore', 'Editeur', 'Éditeur', 'Editor', 'Editora', '出版社'}
 
-        self.language_xpath =    '''
+        self.language_xpath = '''
             descendant::*[
                 starts-with(text(), "Language:") \
                 or text() = "Language" \
@@ -365,7 +365,7 @@ class Worker(Thread):  # Get details {{{
             r'([0-9.,]+) ?(out of|von|van|su|étoiles sur|つ星のうち|de un máximo de|de|av) '
             r'([\d\.]+)( (stars|Sternen|stelle|estrellas|estrelas|sterren|stjärnor)){0,1}'
         )
-        self.ratings_pat_cn = re.compile('([0-9.]+) 颗星，最多 5 颗星')
+        self.ratings_pat_cn = re.compile(r'([0-9.]+) 颗星，最多 5 颗星')
         self.ratings_pat_jp = re.compile(r'\d+つ星のうち([\d\.]+)')
 
         lm = {
@@ -564,9 +564,9 @@ class Worker(Thread):  # Get details {{{
         res = self.tostring(elem, encoding='unicode', method='text')
         if only_printable:
             try:
-                filtered_characters = list(s for s in res if s.isprintable())
+                filtered_characters = [s for s in res if s.isprintable()]
             except AttributeError:
-                filtered_characters = list(s for s in res if s in string.printable)
+                filtered_characters = [s for s in res if s in string.printable]
             res = ''.join(filtered_characters)
         return res.strip()
 
@@ -724,8 +724,8 @@ class Worker(Thread):  # Get details {{{
         # remove all attributes from tags
         desc = re.sub(r'<([a-zA-Z0-9]+)\s[^>]+>', r'<\1>', desc)
         # Collapse whitespace
-        # desc = re.sub('\n+', '\n', desc)
-        # desc = re.sub(' +', ' ', desc)
+        # desc = re.sub(r'\n+', '\n', desc)
+        # desc = re.sub(r' +', ' ', desc)
         # Remove the notice about text referring to out of print editions
         desc = re.sub(r'(?s)<em>--This text ref.*?</em>', '', desc)
         # Remove comments
@@ -910,7 +910,7 @@ class Worker(Thread):  # Get details {{{
                         seen.add(lraw)
         return ans
 
-    def parse_cover(self, root, raw=b""):
+    def parse_cover(self, root, raw=b''):
         # Look for the image URL in javascript, using the first image in the
         # image gallery as the cover
         import json
@@ -919,7 +919,7 @@ class Worker(Thread):  # Get details {{{
             m = imgpat.search(script.text or '')
             if m is not None:
                 return m.group(1)
-        imgpat = re.compile(r"""'imageGalleryData'\s*:\s*(\[\s*{.+])""")
+        imgpat = re.compile(r''''imageGalleryData'\s*:\s*(\[\s*{.+])''')
         for script in root.xpath('//script'):
             m = imgpat.search(script.text or '')
             if m is not None:
@@ -1131,7 +1131,7 @@ class Amazon(Source):
     options = (
         Option('domain', 'choices', 'com', _('Amazon country website to use:'),
                _('Metadata from Amazon will be fetched using this '
-                 'country\'s Amazon website.'), choices=AMAZON_DOMAINS),
+                 "country's Amazon website."), choices=AMAZON_DOMAINS),
         Option('server', 'choices', 'auto', _('Server to get data from:'),
                _(
                    'Amazon has started blocking attempts to download'
@@ -1219,7 +1219,7 @@ class Amazon(Source):
         self.set_amazon_id_touched_fields()
 
     def set_amazon_id_touched_fields(self):
-        ident_name = "identifier:amazon"
+        ident_name = 'identifier:amazon'
         if self.domain != 'com':
             ident_name += '_' + self.domain
         tf = [x for x in self.touched_fields if not
@@ -1344,7 +1344,7 @@ class Amazon(Source):
         terms = []
         q = {'search-alias': 'aps',
              'unfiltered': '1',
-             }
+        }
 
         if domain == 'com':
             q['sort'] = 'relevanceexprank'
@@ -1395,8 +1395,7 @@ class Amazon(Source):
                 q['field-keywords'] += ' ' + q.pop(f, '')
             q['field-keywords'] = q['field-keywords'].strip()
 
-        encoded_q = dict([(x.encode('utf-8', 'ignore'), y.encode(
-            'utf-8', 'ignore')) for x, y in q.items()])
+        encoded_q = {x.encode('utf-8', 'ignore'): y.encode('utf-8', 'ignore') for x, y in q.items()}
         url_query = urlencode(encoded_q)
         # amazon's servers want IRIs with unicode characters not percent esaped
         parts = []
@@ -1776,7 +1775,7 @@ def manual_tests(domain, **kw):  # {{{
     from calibre.ebooks.metadata.sources.test import authors_test, comments_test, isbn_test, series_test, test_identify_plugin, title_test
     all_tests = {}
     all_tests['com'] = [  # {{{
-        (  # # in title
+        (  # in title
             {'title': 'Expert C# 2008 Business Objects',
              'authors': ['Lhotka']},
             [title_test('Expert C#'),
@@ -1880,7 +1879,7 @@ def manual_tests(domain, **kw):  # {{{
         ),
         (
             {'identifiers': {'isbn': '2221116798'}},
-            [title_test('L\'étrange voyage de Monsieur Daldry',
+            [title_test("L'étrange voyage de Monsieur Daldry",
                         exact=True), authors_test(['Marc Levy'])
              ]
 
@@ -1971,7 +1970,7 @@ def manual_tests(domain, **kw):  # {{{
             [title_test('Parting Shot', exact=True),
              authors_test(['Mary Calmes'])]
         ),
-        (  # # in title
+        (  # in title
             {'title': 'Expert C# 2008 Business Objects',
              'authors': ['Lhotka']},
             [title_test('Expert C# 2008 Business Objects'),
diff --git a/src/calibre/ebooks/metadata/sources/base.py b/src/calibre/ebooks/metadata/sources/base.py
index 62148400f8..cc9b16f789 100644
--- a/src/calibre/ebooks/metadata/sources/base.py
+++ b/src/calibre/ebooks/metadata/sources/base.py
@@ -26,8 +26,8 @@ def create_log(ostream=None):
 
 
 # Comparing Metadata objects for relevance {{{
-words = ("the", "a", "an", "of", "and")
-prefix_pat = re.compile(r'^(%s)\s+'%("|".join(words)))
+words = ('the', 'a', 'an', 'of', 'and')
+prefix_pat = re.compile(r'^(%s)\s+'%('|'.join(words)))
 trailing_paren_pat = re.compile(r'\(.*\)$')
 whitespace_pat = re.compile(r'\s+')
 
@@ -44,7 +44,6 @@ def cleanup_title(s):
 
 @total_ordering
 class InternalMetadataCompareKeyGen:
-
     '''
     Generate a sort key for comparison of the relevance of Metadata objects,
     given a search query. This is used only to compare results from the same
@@ -164,7 +163,7 @@ def fixcase(x):
 
 
 class Option:
-    __slots__ = ['type', 'default', 'label', 'desc', 'name', 'choices']
+    __slots__ = ('choices', 'default', 'desc', 'label', 'name', 'type')
 
     def __init__(self, name, type_, default, label, desc, choices=None):
         '''
@@ -180,7 +179,7 @@ class Option:
         self.name, self.type, self.default, self.label, self.desc = (name,
                 type_, default, label, desc)
         if choices and not isinstance(choices, dict):
-            choices = dict([(x, x) for x in choices])
+            choices = {x: x for x in choices}
         self.choices = choices
 
 
diff --git a/src/calibre/ebooks/metadata/sources/edelweiss.py b/src/calibre/ebooks/metadata/sources/edelweiss.py
index 0326e22995..55c1d3baf5 100644
--- a/src/calibre/ebooks/metadata/sources/edelweiss.py
+++ b/src/calibre/ebooks/metadata/sources/edelweiss.py
@@ -120,8 +120,8 @@ class Worker(Thread):  # {{{
         # remove all attributes from tags
         desc = re.sub(r'<([a-zA-Z0-9]+)\s[^>]+>', r'<\1>', desc)
         # Collapse whitespace
-        # desc = re.sub('\n+', '\n', desc)
-        # desc = re.sub(' +', ' ', desc)
+        # desc = re.sub(r'\n+', '\n', desc)
+        # desc = re.sub(r' +', ' ', desc)
         # Remove comments
         desc = re.sub(r'(?s)<!--.*?-->', '', desc)
         return sanitize_comments_html(desc)
@@ -384,26 +384,26 @@ if __name__ == '__main__':
     from calibre.ebooks.metadata.sources.test import authors_test, comments_test, pubdate_test, test_identify_plugin, title_test
     tests = [
         (  # A title and author search
-         {'title': 'The Husband\'s Secret', 'authors':['Liane Moriarty']},
-         [title_test('The Husband\'s Secret', exact=True),
-                authors_test(['Liane Moriarty'])]
+         {'title': "The Husband's Secret", 'authors':['Liane Moriarty']},
+         [title_test("The Husband's Secret", exact=True),
+          authors_test(['Liane Moriarty'])]
         ),
 
         (  # An isbn present in edelweiss
          {'identifiers':{'isbn': '9780312621360'}, },
          [title_test('Flame: A Sky Chasers Novel', exact=True),
-                authors_test(['Amy Kathleen Ryan'])]
+          authors_test(['Amy Kathleen Ryan'])]
         ),
 
         # Multiple authors and two part title and no general description
         ({'identifiers':{'edelweiss':'0321180607'}},
-        [title_test(
-        "XQuery From the Experts: A Guide to the W3C XML Query Language"
-        , exact=True), authors_test([
+        [title_test('XQuery From the Experts: A Guide to the W3C XML Query Language', exact=True),
+         authors_test([
             'Howard Katz', 'Don Chamberlin', 'Denise Draper', 'Mary Fernandez',
             'Michael Kay', 'Jonathan Robie', 'Michael Rys', 'Jerome Simeon',
-            'Jim Tivy', 'Philip Wadler']), pubdate_test(2003, 8, 22),
-            comments_test('Jérôme Siméon'), lambda mi: bool(mi.comments and 'No title summary' not in mi.comments)
+            'Jim Tivy', 'Philip Wadler']),
+         pubdate_test(2003, 8, 22),
+         comments_test('Jérôme Siméon'), lambda mi: bool(mi.comments and 'No title summary' not in mi.comments)
         ]),
     ]
     start, stop = 0, len(tests)
diff --git a/src/calibre/ebooks/metadata/sources/google.py b/src/calibre/ebooks/metadata/sources/google.py
index 5dee08e26b..99238ca487 100644
--- a/src/calibre/ebooks/metadata/sources/google.py
+++ b/src/calibre/ebooks/metadata/sources/google.py
@@ -60,10 +60,9 @@ def get_details(browser, url, timeout):  # {{{
         raw = browser.open_novisit(url, timeout=timeout).read()
 
     return raw
-
-
 # }}}
 
+
 xpath_cache = {}
 
 
@@ -197,7 +196,6 @@ def to_metadata(browser, log, entry_, timeout, running_a_test=False):  # {{{
 
     return mi
 
-
 # }}}
 
 
diff --git a/src/calibre/ebooks/metadata/sources/google_images.py b/src/calibre/ebooks/metadata/sources/google_images.py
index ef3c2397ff..6532fbfa02 100644
--- a/src/calibre/ebooks/metadata/sources/google_images.py
+++ b/src/calibre/ebooks/metadata/sources/google_images.py
@@ -58,7 +58,6 @@ def parse_google_markup(raw):
     return list(ans)
 
 
-
 class GoogleImages(Source):
 
     name = 'Google Images'
diff --git a/src/calibre/ebooks/metadata/sources/identify.py b/src/calibre/ebooks/metadata/sources/identify.py
index f69eaa4454..4d0fceb43f 100644
--- a/src/calibre/ebooks/metadata/sources/identify.py
+++ b/src/calibre/ebooks/metadata/sources/identify.py
@@ -62,8 +62,8 @@ def is_worker_alive(workers):
 
 # }}}
 
-# Merge results from different sources {{{
 
+# Merge results from different sources {{{
 
 class xISBN(Thread):
 
diff --git a/src/calibre/ebooks/metadata/sources/search_engines.py b/src/calibre/ebooks/metadata/sources/search_engines.py
index dbbfdef934..91c08b2a4f 100644
--- a/src/calibre/ebooks/metadata/sources/search_engines.py
+++ b/src/calibre/ebooks/metadata/sources/search_engines.py
@@ -118,7 +118,6 @@ def quote_term(x):
 
 # DDG + Wayback machine {{{
 
-
 def ddg_url_processor(url):
     return url
 
@@ -165,7 +164,7 @@ def wayback_url_processor(url):
     if url.startswith('/'):
         # Use original URL instead of absolutizing to wayback URL as wayback is
         # slow
-        m = re.search('https?:', url)
+        m = re.search(r'https?:', url)
         if m is None:
             url = 'https://web.archive.org' + url
         else:
@@ -207,8 +206,8 @@ def ddg_develop():
             print()
 # }}}
 
-# Bing {{{
 
+# Bing {{{
 
 def bing_term(t):
     t = t.replace('"', '')
@@ -225,7 +224,7 @@ def resolve_bing_wrapper_page(url, br, log):
     raw = br.open_novisit(url).read().decode('utf-8', 'replace')
     m = re.search(r'var u = "(.+)"', raw)
     if m is None:
-        log('Failed to resolve bing wrapper page for url: ' +  url)
+        log('Failed to resolve bing wrapper page for url: ' + url)
         return url
     log('Resolved bing wrapped URL: ' + url + ' to ' + m.group(1))
     return m.group(1)
@@ -278,8 +277,8 @@ def bing_develop(terms='heroes abercrombie'):
             print()
 # }}}
 
-# Google {{{
 
+# Google {{{
 
 def google_term(t):
     t = t.replace('"', '')
diff --git a/src/calibre/ebooks/metadata/sources/test.py b/src/calibre/ebooks/metadata/sources/test.py
index 307ad6f065..775d637de3 100644
--- a/src/calibre/ebooks/metadata/sources/test.py
+++ b/src/calibre/ebooks/metadata/sources/test.py
@@ -28,7 +28,7 @@ def isbn_test(isbn):
         misbn = check_isbn(mi.isbn)
         if misbn and misbn == isbn_:
             return True
-        prints('ISBN test failed. Expected: \'%s\' found \'%s\''%(isbn_, misbn))
+        prints("ISBN test failed. Expected: '%s' found '%s'"%(isbn_, misbn))
         return False
 
     return test
@@ -43,7 +43,7 @@ def title_test(title, exact=False):
         if (exact and mt == title) or \
                 (not exact and title in mt):
             return True
-        prints('Title test failed. Expected: \'%s\' found \'%s\''%(title, mt))
+        prints("Title test failed. Expected: '%s' found '%s'"%(title, mt))
         return False
 
     return test
@@ -70,7 +70,7 @@ def authors_test(authors, subset=False):
             return True
         if au == authors:
             return True
-        prints('Author test failed. Expected: \'%s\' found \'%s\''%(authors, au))
+        prints("Author test failed. Expected: '%s' found '%s'"%(authors, au))
         return False
 
     return test
@@ -83,7 +83,7 @@ def tags_test(tags):
         t = {x.lower() for x in mi.tags}
         if t == tags:
             return True
-        prints('Tags test failed. Expected: \'%s\' found \'%s\''%(tags, t))
+        prints("Tags test failed. Expected: '%s' found '%s'"%(tags, t))
         return False
 
     return test
@@ -97,10 +97,10 @@ def series_test(series, series_index):
         if (ms == series) and (series_index == mi.series_index):
             return True
         if mi.series:
-            prints('Series test failed. Expected: \'%s [%d]\' found \'%s[%d]\''%
+            prints("Series test failed. Expected: '%s [%d]' found '%s[%d]'"%
                         (series, series_index, ms, mi.series_index))
         else:
-            prints('Series test failed. Expected: \'%s [%d]\' found no series'%
+            prints("Series test failed. Expected: '%s [%d]' found no series"%
                         (series, series_index))
         return False
 
@@ -204,7 +204,6 @@ def test_identify(tests):  # {{{
         log('\n\n')
 
     prints('Average time per query', sum(times)/len(times))
-
 # }}}
 
 
diff --git a/src/calibre/ebooks/metadata/tag_mapper.py b/src/calibre/ebooks/metadata/tag_mapper.py
index 904dc0038f..84e3997e55 100644
--- a/src/calibre/ebooks/metadata/tag_mapper.py
+++ b/src/calibre/ebooks/metadata/tag_mapper.py
@@ -119,7 +119,7 @@ def uniq(vals, kmap=icu_lower):
     lvals = (kmap(x) for x in vals)
     seen = set()
     seen_add = seen.add
-    return list(x for x, k in zip(vals, lvals) if k not in seen and not seen_add(k))
+    return [x for x, k in zip(vals, lvals) if k not in seen and not seen_add(k)]
 
 
 def map_tags(tags, rules=()):
diff --git a/src/calibre/ebooks/metadata/toc.py b/src/calibre/ebooks/metadata/toc.py
index 80956e3ac7..e3edb062a1 100644
--- a/src/calibre/ebooks/metadata/toc.py
+++ b/src/calibre/ebooks/metadata/toc.py
@@ -19,8 +19,8 @@ from calibre.utils.cleantext import clean_xml_chars
 from calibre.utils.xml_parse import safe_xml_fromstring
 from polyglot.urllib import unquote, urlparse
 
-NCX_NS = "http://www.daisy.org/z3986/2005/ncx/"
-CALIBRE_NS = "http://calibre.kovidgoyal.net/2009/metadata"
+NCX_NS = 'http://www.daisy.org/z3986/2005/ncx/'
+CALIBRE_NS = 'http://calibre.kovidgoyal.net/2009/metadata'
 NSMAP = {None: NCX_NS, 'calibre':CALIBRE_NS}
 E = ElementMaker(namespace=NCX_NS, nsmap=NSMAP)
 C = ElementMaker(namespace=CALIBRE_NS, nsmap=NSMAP)
diff --git a/src/calibre/ebooks/metadata/topaz.py b/src/calibre/ebooks/metadata/topaz.py
index 137f750dda..847010cb06 100644
--- a/src/calibre/ebooks/metadata/topaz.py
+++ b/src/calibre/ebooks/metadata/topaz.py
@@ -52,20 +52,20 @@ class StreamSlicer:
                 start, stop = stop, start
             size = stop - start
             if size <= 0:
-                return b""
+                return b''
             stream.seek(base + start)
             data = stream.read(size)
             if stride != 1:
                 data = data[::stride]
             return data
-        raise TypeError("stream indices must be integers")
+        raise TypeError('stream indices must be integers')
 
     def __setitem__(self, key, value):
         stream = self._stream
         base = self.start
         if isinstance(key, numbers.Integral):
             if len(value) != 1:
-                raise ValueError("key and value lengths must match")
+                raise ValueError('key and value lengths must match')
             stream.seek(base + key)
             return stream.write(value)
         if isinstance(key, slice):
@@ -76,10 +76,10 @@ class StreamSlicer:
             if stride != 1:
                 value = value[::stride]
             if len(value) != size:
-                raise ValueError("key and value lengths must match")
+                raise ValueError('key and value lengths must match')
             stream.seek(base + start)
             return stream.write(value)
-        raise TypeError("stream indices must be integers")
+        raise TypeError('stream indices must be integers')
 
     def update(self, data_blocks):
         # Rewrite the stream
@@ -144,33 +144,33 @@ class MetadataUpdater:
 
     def dump_headers(self):
         ''' Diagnostic '''
-        print("\ndump_headers():")
+        print('\ndump_headers():')
         for tag in self.topaz_headers:
-            print("%s: " % (tag))
+            print('%s: ' % (tag))
             num_recs = len(self.topaz_headers[tag]['blocks'])
-            print(" num_recs: %d" % num_recs)
+            print(' num_recs: %d' % num_recs)
             if num_recs:
-                print(" starting offset: 0x%x" % self.topaz_headers[tag]['blocks'][0]['offset'])
+                print(' starting offset: 0x%x' % self.topaz_headers[tag]['blocks'][0]['offset'])
 
     def dump_hex(self, src, length=16):
         ''' Diagnostic '''
-        FILTER=''.join([(len(repr(codepoint_to_chr(x)))==3) and codepoint_to_chr(x) or '.' for x in range(256)])
+        FILTER=''.join([((len(repr(codepoint_to_chr(x)))==3) and codepoint_to_chr(x)) or '.' for x in range(256)])
         N=0
         result=''
         while src:
-            s,src = src[:length],src[length:]
-            hexa = ' '.join(["%02X"%ord(x) for x in s])
+            s, src = src[:length],src[length:]
+            hexa = ' '.join(['%02X'%ord(x) for x in s])
             s = s.translate(FILTER)
-            result += "%04X   %-*s   %s\n" % (N, length*3, hexa, s)
+            result += '%04X   %-*s   %s\n' % (N, length*3, hexa, s)
             N+=length
         print(result)
 
     def dump_metadata(self):
         ''' Diagnostic '''
         for tag in self.metadata:
-            print(f'{tag}: {repr(self.metadata[tag])}')
+            print(f'{tag}: {self.metadata[tag]!r}')
 
-    def encode_vwi(self,value):
+    def encode_vwi(self, value):
         ans = []
         multi_byte = (value > 0x7f)
         while value:
@@ -238,8 +238,8 @@ class MetadataUpdater:
                 offset += consumed
                 len_comp, consumed = self.decode_vwi(self.data[offset:offset+4])
                 offset += consumed
-                blocks[val] = dict(offset=hdr_offset,len_uncomp=len_uncomp,len_comp=len_comp)
-            topaz_headers[tag] = dict(blocks=blocks)
+                blocks[val] = {'offset': hdr_offset,'len_uncomp': len_uncomp,'len_comp': len_comp}
+            topaz_headers[tag] = {'blocks': blocks}
             th_seq.append(tag)
         self.eoth = self.data[offset]
         offset += 1
@@ -281,7 +281,7 @@ class MetadataUpdater:
         offset += 1
         self.md_header['num_recs'] = ord(self.data[offset:offset+1])
         offset += 1
-        # print "self.md_header: %s" % self.md_header
+        # print('self.md_header: %s' % self.md_header)
 
         self.metadata = {}
         self.md_seq = []
@@ -333,7 +333,7 @@ class MetadataUpdater:
         self.original_md_len = original_md_len
         return ths.getvalue().encode('iso-8859-1')
 
-    def update(self,mi):
+    def update(self, mi):
         # Collect the original metadata
         self.get_original_metadata()
 
@@ -394,7 +394,7 @@ if __name__ == '__main__':
         stream = io.BytesIO()
         with open(sys.argv[1], 'rb') as data:
             stream.write(data.read())
-        mi = MetaInformation(title="Updated Title", authors=['Author, Random'])
+        mi = MetaInformation(title='Updated Title', authors=['Author, Random'])
         set_metadata(stream, mi)
 
         # Write the result
diff --git a/src/calibre/ebooks/metadata/txt.py b/src/calibre/ebooks/metadata/txt.py
index 496ee9c03f..a4887b8667 100644
--- a/src/calibre/ebooks/metadata/txt.py
+++ b/src/calibre/ebooks/metadata/txt.py
@@ -22,7 +22,7 @@ def get_metadata(stream, extract_cover=True):
     stream.seek(0)
 
     mdata = ''
-    for x in range(0, 4):
+    for x in range(4):
         line = stream.readline().decode('utf-8', 'replace')
         if not line:
             break
@@ -31,7 +31,7 @@ def get_metadata(stream, extract_cover=True):
 
     mdata = mdata[:1024]
 
-    mo = re.search('(?u)^[ ]*(?P<title>.+)[ ]*(\n{3}|(\r\n){3}|\r{3})[ ]*(?P<author>.+)[ ]*(\n|\r\n|\r)$', mdata)
+    mo = re.search(r'(?u)^[ ]*(?P<title>.+)[ ]*(\n{3}|(\r\n){3}|\r{3})[ ]*(?P<author>.+)[ ]*(\n|\r\n|\r)$', mdata)
     if mo is not None:
         mi.title = mo.group('title')
         mi.authors = mo.group('author').split(',')
diff --git a/src/calibre/ebooks/metadata/xisbn.py b/src/calibre/ebooks/metadata/xisbn.py
index 571e318fa0..732efdc47c 100644
--- a/src/calibre/ebooks/metadata/xisbn.py
+++ b/src/calibre/ebooks/metadata/xisbn.py
@@ -13,7 +13,6 @@ from calibre import browser
 
 
 class xISBN:
-
     '''
     This class is used to find the ISBN numbers of "related" editions of a
     book, given its ISBN. Useful when querying services for metadata by ISBN,
diff --git a/src/calibre/ebooks/metadata/xmp.py b/src/calibre/ebooks/metadata/xmp.py
index 1dfabe3194..b2eb7021c9 100644
--- a/src/calibre/ebooks/metadata/xmp.py
+++ b/src/calibre/ebooks/metadata/xmp.py
@@ -495,7 +495,7 @@ def metadata_to_xmp_packet(mi):
     if not mi.is_null('pubdate'):
         create_sequence_property(dc, 'dc:date', [isoformat(mi.pubdate, as_utc=False)])  # Adobe spec recommends local time
     if not mi.is_null('languages'):
-        langs = list(filter(None, map(lambda x:lang_as_iso639_1(x) or canonicalize_lang(x), mi.languages)))
+        langs = list(filter(None, (lang_as_iso639_1(x) or canonicalize_lang(x) for x in mi.languages)))
         if langs:
             create_sequence_property(dc, 'dc:language', langs, ordered=False)
 
diff --git a/src/calibre/ebooks/mobi/debug/__init__.py b/src/calibre/ebooks/mobi/debug/__init__.py
index 65b1c31f65..673178a74e 100644
--- a/src/calibre/ebooks/mobi/debug/__init__.py
+++ b/src/calibre/ebooks/mobi/debug/__init__.py
@@ -10,5 +10,3 @@ def format_bytes(byts):
     byts = bytearray(byts)
     byts = [hex(b)[2:] for b in byts]
     return ' '.join(byts)
-
-
diff --git a/src/calibre/ebooks/mobi/debug/headers.py b/src/calibre/ebooks/mobi/debug/headers.py
index 15677599f6..56d801b805 100644
--- a/src/calibre/ebooks/mobi/debug/headers.py
+++ b/src/calibre/ebooks/mobi/debug/headers.py
@@ -40,7 +40,7 @@ class PalmDOCAttributes:
                 ('Backup this database', 0x08),
                 ('Okay to install newer over existing copy, if present on PalmPilot', 0x10),
                 ('Force the PalmPilot to reset after this database is installed', 0x12),
-                ('Don\'t allow copy of file to be beamed to other Pilot',
+                ("Don't allow copy of file to be beamed to other Pilot",
                     0x14)]:
             self.attributes.append(PalmDOCAttributes.Attr(name, field,
                 self.val))
@@ -123,8 +123,8 @@ class Record:  # {{{
                 self.uid, self.raw[:4], len(self.raw))
 # }}}
 
-# EXTH {{{
 
+# EXTH {{{
 
 class EXTHRecord:
 
@@ -298,18 +298,18 @@ class MOBIHeader:  # {{{
         self.length, = struct.unpack(b'>I', self.raw[20:24])
         self.type_raw, = struct.unpack(b'>I', self.raw[24:28])
         self.type = {
-                2 : 'Mobipocket book',
-                3 : 'PalmDOC book',
-                4 : 'Audio',
-                257 : 'News',
-                258 : 'News Feed',
-                259 : 'News magazine',
-                513 : 'PICS',
-                514 : 'Word',
-                515 : 'XLS',
-                516 : 'PPT',
-                517 : 'TEXT',
-                518 : 'HTML',
+                2  : 'Mobipocket book',
+                3  : 'PalmDOC book',
+                4  : 'Audio',
+                257: 'News',
+                258: 'News Feed',
+                259: 'News magazine',
+                513: 'PICS',
+                514: 'Word',
+                515: 'XLS',
+                516: 'PPT',
+                517: 'TEXT',
+                518: 'HTML',
             }.get(self.type_raw, repr(self.type_raw))
 
         self.encoding_raw, = struct.unpack(b'>I', self.raw[28:32])
diff --git a/src/calibre/ebooks/mobi/debug/mobi6.py b/src/calibre/ebooks/mobi/debug/mobi6.py
index 5cc26b8961..8e0bfec64c 100644
--- a/src/calibre/ebooks/mobi/debug/mobi6.py
+++ b/src/calibre/ebooks/mobi/debug/mobi6.py
@@ -32,7 +32,7 @@ class TagX:  # {{{
     def __repr__(self):
         return 'TAGX(tag=%02d, num_values=%d, bitmask=%r, eof=%d)' % (self.tag,
                 self.num_values, bin(self.bitmask), self.eof)
-    # }}}
+# }}}
 
 
 class SecondaryIndexHeader:  # {{{
@@ -231,7 +231,7 @@ class IndexHeader:  # {{{
         a('Number of entries in the NCX: %d'% self.ncx_count)
 
         return '\n'.join(ans)
-    # }}}
+# }}}
 
 
 class Tag:  # {{{
@@ -242,12 +242,12 @@ class Tag:  # {{{
     '''
 
     TAG_MAP = {
-            1: ('offset', 'Offset in HTML'),
-            2: ('size', 'Size in HTML'),
-            3: ('label_offset', 'Label offset in CNCX'),
-            4: ('depth', 'Depth of this entry in TOC'),
-            5: ('class_offset', 'Class offset in CNCX'),
-            6: ('pos_fid', 'File Index'),
+            1 : ('offset', 'Offset in HTML'),
+            2 : ('size', 'Size in HTML'),
+            3 : ('label_offset', 'Label offset in CNCX'),
+            4 : ('depth', 'Depth of this entry in TOC'),
+            5 : ('class_offset', 'Class offset in CNCX'),
+            6 : ('pos_fid', 'File Index'),
 
             11: ('secondary', '[unknown, unknown, '
                 'tag type from TAGX in primary index header]'),
@@ -256,14 +256,14 @@ class Tag:  # {{{
             22: ('first_child_index', 'First child'),
             23: ('last_child_index', 'Last child'),
 
-            69 : ('image_index', 'Offset from first image record to the'
+            69: ('image_index', 'Offset from first image record to the'
                                 ' image record associated with this entry'
                                 ' (masthead for periodical or thumbnail for'
                                 ' article entry).'),
-            70 : ('desc_offset', 'Description offset in cncx'),
-            71 : ('author_offset', 'Author offset in cncx'),
-            72 : ('image_caption_offset', 'Image caption offset in cncx'),
-            73 : ('image_attr_offset', 'Image attribution offset in cncx'),
+            70: ('desc_offset', 'Description offset in cncx'),
+            71: ('author_offset', 'Author offset in cncx'),
+            72: ('image_caption_offset', 'Image caption offset in cncx'),
+            73: ('image_attr_offset', 'Image attribution offset in cncx'),
 
     }
 
@@ -405,7 +405,7 @@ class IndexRecord:  # {{{
 
     def get_parent(self, index):
         if index.depth < 1:
-            return None
+            return
         parent_depth = index.depth - 1
         for p in self.indices:
             if p.depth != parent_depth:
@@ -475,9 +475,9 @@ class CNCX:  # {{{
             ans.append('%10d : %s'%(k, v))
         return '\n'.join(ans)
 
-
 # }}}
 
+
 class ImageRecord:  # {{{
 
     def __init__(self, idx, record, fmt):
@@ -844,5 +844,4 @@ def inspect_mobi(mobi_file, ddir):
         for rec in getattr(f, attr):
             rec.dump(tdir)
 
-
 # }}}
diff --git a/src/calibre/ebooks/mobi/huffcdic.py b/src/calibre/ebooks/mobi/huffcdic.py
index 20e6089ce1..21b7855e1d 100644
--- a/src/calibre/ebooks/mobi/huffcdic.py
+++ b/src/calibre/ebooks/mobi/huffcdic.py
@@ -31,7 +31,7 @@ class Reader:
             if codelen <= 8:
                 assert term
             maxcode = ((maxcode + 1) << (32 - codelen)) - 1
-            return (codelen, term, maxcode)
+            return codelen, term, maxcode
         self.dict1 = tuple(map(dict1_unpack, struct.unpack_from(b'>256L', huff, off1)))
 
         dict2 = struct.unpack_from(b'>64L', huff, off2)
diff --git a/src/calibre/ebooks/mobi/langcodes.py b/src/calibre/ebooks/mobi/langcodes.py
index 26b22ce847..2adc1b74bc 100644
--- a/src/calibre/ebooks/mobi/langcodes.py
+++ b/src/calibre/ebooks/mobi/langcodes.py
@@ -13,87 +13,87 @@ lang_codes = {
         }
 
 main_language = {
-         0 : "NEUTRAL",
-         54 : "AFRIKAANS",
-         28 : "ALBANIAN",
-         1 : "ARABIC",
-         43 : "ARMENIAN",
-         77 : "ASSAMESE",
-         44 : "AZERI",
-         45 : "BASQUE",
-         35 : "BELARUSIAN",
-         69 : "BENGALI",
-         2 : "BULGARIAN",
-         3 : "CATALAN",
-         4 : "CHINESE",
+         0 : 'NEUTRAL',
+         54 : 'AFRIKAANS',
+         28 : 'ALBANIAN',
+         1 : 'ARABIC',
+         43 : 'ARMENIAN',
+         77 : 'ASSAMESE',
+         44 : 'AZERI',
+         45 : 'BASQUE',
+         35 : 'BELARUSIAN',
+         69 : 'BENGALI',
+         2 : 'BULGARIAN',
+         3 : 'CATALAN',
+         4 : 'CHINESE',
          # 26 : "CROATIAN",
-         5 : "CZECH",
-         6 : "DANISH",
-         19 : "DUTCH",
-         9 : "ENGLISH",
-         37 : "ESTONIAN",
-         56 : "FAEROESE",
-         41 : "FARSI",
-         11 : "FINNISH",
-         12 : "FRENCH",
-         55 : "GEORGIAN",
-         7 : "GERMAN",
-         8 : "GREEK",
-         71 : "GUJARATI",
-         13 : "HEBREW",
-         57 : "HINDI",
-         14 : "HUNGARIAN",
-         15 : "ICELANDIC",
-         33 : "INDONESIAN",
-         16 : "ITALIAN",
-         17 : "JAPANESE",
-         75 : "KANNADA",
-         63 : "KAZAK",
-         87 : "KONKANI",
-         18 : "KOREAN",
-         38 : "LATVIAN",
-         39 : "LITHUANIAN",
-         47 : "MACEDONIAN",
-         62 : "MALAY",
-         76 : "MALAYALAM",
-         58 : "MALTESE",
-         78 : "MARATHI",
-         97 : "NEPALI",
-         20 : "NORWEGIAN",
-         72 : "ORIYA",
-         21 : "POLISH",
-         22 : "PORTUGUESE",
-         70 : "PUNJABI",
-         23 : "RHAETOROMANIC",
-         24 : "ROMANIAN",
-         25 : "RUSSIAN",
-         59 : "SAMI",
-         79 : "SANSKRIT",
-         26 : "SERBIAN",
-         27 : "SLOVAK",
-         36 : "SLOVENIAN",
-         46 : "SORBIAN",
-         10 : "SPANISH",
-         48 : "SUTU",
-         65 : "SWAHILI",
-         29 : "SWEDISH",
-         73 : "TAMIL",
-         68 : "TATAR",
-         74 : "TELUGU",
-         30 : "THAI",
-         49 : "TSONGA",
-         50 : "TSWANA",
-         31 : "TURKISH",
-         34 : "UKRAINIAN",
-         32 : "URDU",
-         67 : "UZBEK",
-         42 : "VIETNAMESE",
-         52 : "XHOSA",
-         53 : "ZULU",
+         5 : 'CZECH',
+         6 : 'DANISH',
+         19 : 'DUTCH',
+         9 : 'ENGLISH',
+         37 : 'ESTONIAN',
+         56 : 'FAEROESE',
+         41 : 'FARSI',
+         11 : 'FINNISH',
+         12 : 'FRENCH',
+         55 : 'GEORGIAN',
+         7 : 'GERMAN',
+         8 : 'GREEK',
+         71 : 'GUJARATI',
+         13 : 'HEBREW',
+         57 : 'HINDI',
+         14 : 'HUNGARIAN',
+         15 : 'ICELANDIC',
+         33 : 'INDONESIAN',
+         16 : 'ITALIAN',
+         17 : 'JAPANESE',
+         75 : 'KANNADA',
+         63 : 'KAZAK',
+         87 : 'KONKANI',
+         18 : 'KOREAN',
+         38 : 'LATVIAN',
+         39 : 'LITHUANIAN',
+         47 : 'MACEDONIAN',
+         62 : 'MALAY',
+         76 : 'MALAYALAM',
+         58 : 'MALTESE',
+         78 : 'MARATHI',
+         97 : 'NEPALI',
+         20 : 'NORWEGIAN',
+         72 : 'ORIYA',
+         21 : 'POLISH',
+         22 : 'PORTUGUESE',
+         70 : 'PUNJABI',
+         23 : 'RHAETOROMANIC',
+         24 : 'ROMANIAN',
+         25 : 'RUSSIAN',
+         59 : 'SAMI',
+         79 : 'SANSKRIT',
+         26 : 'SERBIAN',
+         27 : 'SLOVAK',
+         36 : 'SLOVENIAN',
+         46 : 'SORBIAN',
+         10 : 'SPANISH',
+         48 : 'SUTU',
+         65 : 'SWAHILI',
+         29 : 'SWEDISH',
+         73 : 'TAMIL',
+         68 : 'TATAR',
+         74 : 'TELUGU',
+         30 : 'THAI',
+         49 : 'TSONGA',
+         50 : 'TSWANA',
+         31 : 'TURKISH',
+         34 : 'UKRAINIAN',
+         32 : 'URDU',
+         67 : 'UZBEK',
+         42 : 'VIETNAMESE',
+         52 : 'XHOSA',
+         53 : 'ZULU',
 }
 
 sub_language = {
-           0 : "NEUTRAL",
+           0 : 'NEUTRAL',
            # 1 : "ARABIC_SAUDI_ARABIA",
            # 2 : "ARABIC_IRAQ",
            # 3 : "ARABIC_EGYPT",
@@ -140,30 +140,30 @@ sub_language = {
            # 2 : "PORTUGUESE",
            # 1 : "PORTUGUESE_BRAZILIAN",
            # 2 : "SERBIAN_LATIN",
-           3 : "SERBIAN_CYRILLIC",
+           3 : 'SERBIAN_CYRILLIC',
            # 1 : "SPANISH",
            # 2 : "SPANISH_MEXICAN",
-           4 : "SPANISH_GUATEMALA",
-           5 : "SPANISH_COSTA_RICA",
-           6 : "SPANISH_PANAMA",
-           7 : "SPANISH_DOMINICAN_REPUBLIC",
-           8 : "SPANISH_VENEZUELA",
-           9 : "SPANISH_COLOMBIA",
-           10 : "SPANISH_PERU",
-           11 : "SPANISH_ARGENTINA",
-           12 : "SPANISH_ECUADOR",
-           13 : "SPANISH_CHILE",
-           14 : "SPANISH_URUGUAY",
-           15 : "SPANISH_PARAGUAY",
-           16 : "SPANISH_BOLIVIA",
-           17 : "SPANISH_EL_SALVADOR",
-           18 : "SPANISH_HONDURAS",
-           19 : "SPANISH_NICARAGUA",
-           20 : "SPANISH_PUERTO_RICO",
+           4 : 'SPANISH_GUATEMALA',
+           5 : 'SPANISH_COSTA_RICA',
+           6 : 'SPANISH_PANAMA',
+           7 : 'SPANISH_DOMINICAN_REPUBLIC',
+           8 : 'SPANISH_VENEZUELA',
+           9 : 'SPANISH_COLOMBIA',
+           10 : 'SPANISH_PERU',
+           11 : 'SPANISH_ARGENTINA',
+           12 : 'SPANISH_ECUADOR',
+           13 : 'SPANISH_CHILE',
+           14 : 'SPANISH_URUGUAY',
+           15 : 'SPANISH_PARAGUAY',
+           16 : 'SPANISH_BOLIVIA',
+           17 : 'SPANISH_EL_SALVADOR',
+           18 : 'SPANISH_HONDURAS',
+           19 : 'SPANISH_NICARAGUA',
+           20 : 'SPANISH_PUERTO_RICO',
            # 1 : "SWEDISH",
            # 2 : "SWEDISH_FINLAND",
-           1 : "UZBEK_LATIN",
-           2 : "UZBEK_CYRILLIC",
+           1 : 'UZBEK_LATIN',
+           2 : 'UZBEK_CYRILLIC',
            }
 
 IANA_MOBI = \
diff --git a/src/calibre/ebooks/mobi/mobiml.py b/src/calibre/ebooks/mobi/mobiml.py
index 3d6aa19148..e60d7dc59e 100644
--- a/src/calibre/ebooks/mobi/mobiml.py
+++ b/src/calibre/ebooks/mobi/mobiml.py
@@ -160,8 +160,8 @@ class MobiMLizer:
             return ptsize
         embase = self.profile.fbase
         if round(ptsize) < embase:
-            return "%dpt" % int(round(ptsize))
-        return "%dem" % int(round(ptsize / embase))
+            return '%dpt' % int(round(ptsize))
+        return '%dem' % int(round(ptsize / embase))
 
     def preize_text(self, text, pre_wrap=False):
         text = str(text)
@@ -305,7 +305,7 @@ class MobiMLizer:
                 inline = etree.SubElement(inline, XHTML('i'))
             if istate.bold:
                 inline = etree.SubElement(inline, XHTML('b'))
-            if istate.bgcolor is not None and istate.bgcolor != 'transparent' :
+            if istate.bgcolor is not None and istate.bgcolor != 'transparent':
                 inline = etree.SubElement(inline, XHTML('span'),
                         bgcolor=convert_color_for_font_tag(istate.bgcolor))
             if istate.fgcolor != 'black':
@@ -503,7 +503,7 @@ class MobiMLizer:
                 istate.attrib['width'] = raww
             else:
                 prop = style['width'] / self.profile.width
-                istate.attrib['width'] = "%d%%" % int(round(prop * 100))
+                istate.attrib['width'] = '%d%%' % int(round(prop * 100))
         elif display == 'table':
             tag = 'table'
         elif display == 'table-row':
@@ -529,11 +529,11 @@ class MobiMLizer:
             t = elem.text
             if not t:
                 t = ''
-            elem.text = '\u201c' + t
+            elem.text = '“' + t
             t = elem.tail
             if not t:
                 t = ''
-            elem.tail = '\u201d' + t
+            elem.tail = '”' + t
         text = None
         if elem.text:
             if istate.preserve or istate.pre_wrap:
diff --git a/src/calibre/ebooks/mobi/reader/__init__.py b/src/calibre/ebooks/mobi/reader/__init__.py
index c2a96b7708..3c0958cb29 100644
--- a/src/calibre/ebooks/mobi/reader/__init__.py
+++ b/src/calibre/ebooks/mobi/reader/__init__.py
@@ -4,6 +4,3 @@
 __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
-
-
-
diff --git a/src/calibre/ebooks/mobi/reader/containers.py b/src/calibre/ebooks/mobi/reader/containers.py
index 5d367cd823..ab964ed5a2 100644
--- a/src/calibre/ebooks/mobi/reader/containers.py
+++ b/src/calibre/ebooks/mobi/reader/containers.py
@@ -44,5 +44,3 @@ class Container:
             if imgtype != 'unknown':
                 return data, imgtype
         return None, None
-
-
diff --git a/src/calibre/ebooks/mobi/reader/headers.py b/src/calibre/ebooks/mobi/reader/headers.py
index 9f0021cc43..68f77b80bb 100644
--- a/src/calibre/ebooks/mobi/reader/headers.py
+++ b/src/calibre/ebooks/mobi/reader/headers.py
@@ -26,7 +26,7 @@ def uniq(vals):
     vals = vals or ()
     seen = set()
     seen_add = seen.add
-    return list(x for x in vals if x not in seen and not seen_add(x))
+    return [x for x in vals if x not in seen and not seen_add(x)]
 
 
 class EXTHHeader:  # {{{
@@ -45,7 +45,7 @@ class EXTHHeader:  # {{{
         self.page_progression_direction = None
         self.primary_writing_mode = None
 
-        self.decode = lambda x : clean_ascii_chars(x.decode(codec, 'replace'))
+        self.decode = lambda x: clean_ascii_chars(x.decode(codec, 'replace'))
 
         while left > 0:
             left -= 1
@@ -108,7 +108,7 @@ class EXTHHeader:  # {{{
                 except Exception:
                     pass
             # else:
-            #    print 'unknown record', idx, repr(content)
+            #     print('unknown record', idx, repr(content))
         if title:
             self.mi.title = replace_entities(clean_xml_chars(clean_ascii_chars(title)))
 
@@ -184,7 +184,7 @@ class EXTHHeader:  # {{{
             if self.kf8_header == NULL_INDEX:
                 self.kf8_header = None
         # else:
-        #    print 'unhandled metadata record', idx, repr(content)
+        #     print('unhandled metadata record', idx, repr(content))
 # }}}
 
 
diff --git a/src/calibre/ebooks/mobi/reader/index.py b/src/calibre/ebooks/mobi/reader/index.py
index aeb2f5d1d7..fe7b69c672 100644
--- a/src/calibre/ebooks/mobi/reader/index.py
+++ b/src/calibre/ebooks/mobi/reader/index.py
@@ -193,7 +193,7 @@ def get_tag_map(control_byte_count, tagx, data, strict=False):
                 total_consumed += consumed
                 values.append(byts)
             if total_consumed != x.value_bytes:
-                err = ("Error: Should consume %s bytes, but consumed %s" %
+                err = ('Error: Should consume %s bytes, but consumed %s' %
                         (x.value_bytes, total_consumed))
                 if strict:
                     raise ValueError(err)
@@ -202,7 +202,7 @@ def get_tag_map(control_byte_count, tagx, data, strict=False):
         ans[x.tag] = values
     # Test that all bytes have been processed
     if data.replace(b'\0', b''):
-        err = ("Warning: There are unprocessed index bytes left: %s" %
+        err = ('Warning: There are unprocessed index bytes left: %s' %
                 format_bytes(data))
         if strict:
             raise ValueError(err)
diff --git a/src/calibre/ebooks/mobi/reader/markup.py b/src/calibre/ebooks/mobi/reader/markup.py
index 3578d63dcb..c4aec0b073 100644
--- a/src/calibre/ebooks/mobi/reader/markup.py
+++ b/src/calibre/ebooks/mobi/reader/markup.py
@@ -83,7 +83,7 @@ def remove_kindlegen_markup(parts, aid_anchor_suffix, linked_aids):
                         replacement = ' id="%s"' % (aid + '-' + aid_anchor_suffix)
                     tag = within_tag_aid_position_pattern.sub(replacement, tag, 1)
                 srcpieces[j] = tag
-        part = "".join(srcpieces)
+        part = ''.join(srcpieces)
         parts[i] = part
 
     # we can safely remove all of the Kindlegen generated data-AmznPageBreak
@@ -101,7 +101,7 @@ def remove_kindlegen_markup(parts, aid_anchor_suffix, linked_aids):
             if tag.startswith('<'):
                 srcpieces[j] = within_tag_AmznPageBreak_position_pattern.sub(
                     lambda m:' style="page-break-after:%s"'%m.group(1), tag)
-        part = "".join(srcpieces)
+        part = ''.join(srcpieces)
         parts[i] = part
 
 
@@ -145,7 +145,7 @@ def update_flow_links(mobi8_reader, resource_map, log):
 
         for j in range(1, len(srcpieces), 2):
             tag = srcpieces[j]
-            if tag.startswith('<im') or tag.startswith('<svg:image'):
+            if tag.startswith(('<im', '<svg:image')):
                 for m in img_index_pattern.finditer(tag):
                     num = int(m.group(1), 32)
                     href = resource_map[num-1]
@@ -156,7 +156,7 @@ def update_flow_links(mobi8_reader, resource_map, log):
                         log.warn('Referenced image %s was not recognized '
                                 'as a valid image in %s' % (num, tag))
                 srcpieces[j] = tag
-        flow = "".join(srcpieces)
+        flow = ''.join(srcpieces)
 
         # replacements inside css url():
         srcpieces = url_pattern.split(flow)
@@ -195,7 +195,7 @@ def update_flow_links(mobi8_reader, resource_map, log):
                 tag = url_css_index_pattern.sub(replacement, tag, 1)
 
             srcpieces[j] = tag
-        flow = "".join(srcpieces)
+        flow = ''.join(srcpieces)
 
         # flow pattern not inside url()
         srcpieces = re.split(tag_pattern, flow)
@@ -217,7 +217,7 @@ def update_flow_links(mobi8_reader, resource_map, log):
                             replacement = '"../' + fi.dir + '/' + fi.fname + '"'
                             tag = flow_pattern.sub(replacement, tag, 1)
                 srcpieces[j] = tag
-        flow = "".join(srcpieces)
+        flow = ''.join(srcpieces)
 
         flows.append(flow)
 
@@ -253,7 +253,7 @@ def insert_flows_into_markup(parts, flows, mobi8_reader, log):
                             replacement = '"../' + fi.dir + '/' + fi.fname + '"'
                             tag = flow_pattern.sub(replacement, tag, 1)
                 srcpieces[j] = tag
-        part = "".join(srcpieces)
+        part = ''.join(srcpieces)
         # store away modified version
         parts[i] = part
 
@@ -286,7 +286,7 @@ def insert_images_into_markup(parts, resource_map, log):
                         log.warn('Referenced image %s was not recognized as '
                                 'a valid image in %s' % (num, tag))
                 srcpieces[j] = tag
-        part = "".join(srcpieces)
+        part = ''.join(srcpieces)
         # store away modified version
         parts[i] = part
 
@@ -309,7 +309,7 @@ def insert_images_into_markup(parts, resource_map, log):
                         log.warn('Referenced image %s was not recognized as '
                                 'a valid image in %s' % (num, tag))
                 srcpieces[j] = tag
-        part = "".join(srcpieces)
+        part = ''.join(srcpieces)
         # store away modified version
         parts[i] = part
 
@@ -328,7 +328,7 @@ def upshift_markup(parts):
                 tag = tag.replace('preserveaspectratio','preserveAspectRatio')
                 tag = tag.replace('viewbox','viewBox')
             srcpieces[j] = tag
-        part = "".join(srcpieces)
+        part = ''.join(srcpieces)
         # store away modified version
         parts[i] = part
 
diff --git a/src/calibre/ebooks/mobi/reader/mobi6.py b/src/calibre/ebooks/mobi/reader/mobi6.py
index b6051136d8..1bc3b351b7 100644
--- a/src/calibre/ebooks/mobi/reader/mobi6.py
+++ b/src/calibre/ebooks/mobi/reader/mobi6.py
@@ -368,19 +368,19 @@ class MobiReader:
         self.processed_html = self.processed_html.replace('> <', '>\n<')
         self.processed_html = self.processed_html.replace('<mbp: ', '<mbp:')
         self.processed_html = re.sub(r'<\?xml[^>]*>', '', self.processed_html)
-        self.processed_html = re.sub(r'<\s*(/?)\s*o:p[^>]*>', r'', self.processed_html)
+        self.processed_html = re.sub(r'<\s*(/?)\s*o:p[^>]*>', '', self.processed_html)
         # Swap inline and block level elements, and order block level elements according to priority
         # - lxml and beautifulsoup expect/assume a specific order based on xhtml spec
         self.processed_html = re.sub(
-            r'(?i)(?P<styletags>(<(h\d+|i|b|u|em|small|big|strong|tt)>\s*){1,})(?P<para><p[^>]*>)', r'\g<para>'+r'\g<styletags>', self.processed_html)
+            r'(?i)(?P<styletags>(<(h\d+|i|b|u|em|small|big|strong|tt)>\s*){1,})(?P<para><p[^>]*>)', r'\g<para>\g<styletags>', self.processed_html)
         self.processed_html = re.sub(
-            r'(?i)(?P<para></p[^>]*>)\s*(?P<styletags>(</(h\d+|i|b|u|em|small|big|strong|tt)>\s*){1,})', r'\g<styletags>'+r'\g<para>', self.processed_html)
+            r'(?i)(?P<para></p[^>]*>)\s*(?P<styletags>(</(h\d+|i|b|u|em|small|big|strong|tt)>\s*){1,})', r'\g<styletags>\g<para>', self.processed_html)
         self.processed_html = re.sub(
-            r'(?i)(?P<blockquote>(</(blockquote|div)[^>]*>\s*){1,})(?P<para></p[^>]*>)', r'\g<para>'+r'\g<blockquote>', self.processed_html)
+            r'(?i)(?P<blockquote>(</(blockquote|div)[^>]*>\s*){1,})(?P<para></p[^>]*>)', r'\g<para>\g<blockquote>', self.processed_html)
         self.processed_html = re.sub(
-            r'(?i)(?P<para><p[^>]*>)\s*(?P<blockquote>(<(blockquote|div)[^>]*>\s*){1,})', r'\g<blockquote>'+r'\g<para>', self.processed_html)
+            r'(?i)(?P<para><p[^>]*>)\s*(?P<blockquote>(<(blockquote|div)[^>]*>\s*){1,})', r'\g<blockquote>\g<para>', self.processed_html)
         bods = htmls = 0
-        for x in re.finditer('</body>|</html>', self.processed_html):
+        for x in re.finditer(r'</body>|</html>', self.processed_html):
             if x == '</body>':
                 bods +=1
             else:
@@ -393,8 +393,7 @@ class MobiReader:
             self.processed_html = self.processed_html.replace('</html>', '')
 
     def remove_random_bytes(self, html):
-        return re.sub('\x14|\x15|\x19|\x1c|\x1d|\xef|\x12|\x13|\xec|\x08|\x01|\x02|\x03|\x04|\x05|\x06|\x07',
-                    '', html)
+        return re.sub(r'\x14|\x15|\x19|\x1c|\x1d|\xef|\x12|\x13|\xec|\x08|\x01|\x02|\x03|\x04|\x05|\x06|\x07', '', html)
 
     def ensure_unit(self, raw, unit='px'):
         if re.search(r'\d+$', raw) is not None:
@@ -535,7 +534,7 @@ class MobiReader:
                             try:
                                 nval = float(val[:-2])
                                 nval *= 16 * (168.451/72)  # Assume this was set using the Kindle profile
-                                attrib[attr] = "%dpx"%int(nval)
+                                attrib[attr] = '%dpx'%int(nval)
                             except:
                                 del attrib[attr]
                         elif val.lower().endswith('%'):
@@ -560,7 +559,7 @@ class MobiReader:
             if 'filepos' in attrib:
                 filepos = attrib.pop('filepos')
                 try:
-                    attrib['href'] = "#filepos%d" % int(filepos)
+                    attrib['href'] = '#filepos%d' % int(filepos)
                 except ValueError:
                     pass
             if (tag.tag == 'a' and attrib.get('id', '').startswith('filepos') and
diff --git a/src/calibre/ebooks/mobi/reader/mobi8.py b/src/calibre/ebooks/mobi/reader/mobi8.py
index 558dfb7da0..eef3871d0a 100644
--- a/src/calibre/ebooks/mobi/reader/mobi8.py
+++ b/src/calibre/ebooks/mobi/reader/mobi8.py
@@ -37,8 +37,8 @@ Elem = namedtuple('Elem',
 FlowInfo = namedtuple('FlowInfo',
         'type format dir fname')
 
-# locate beginning and ending positions of tag with specific aid attribute
 
+# locate beginning and ending positions of tag with specific aid attribute
 
 def locate_beg_end_of_tag(ml, aid):
     pattern = br'''<[^>]*\said\s*=\s*['"]%s['"][^>]*>''' % aid
@@ -272,7 +272,7 @@ class Mobi8Reader:
                     flowpart = from_svg
                 else:
                     format = 'file'
-                    dir = "images"
+                    dir = 'images'
                     fname = 'svgimg' + nstr + '.svg'
             else:
                 # search for CDATA and if exists inline it
@@ -286,7 +286,7 @@ class Mobi8Reader:
                     # css - assume as standalone css file
                     typ = 'css'
                     format = 'file'
-                    dir = "styles"
+                    dir = 'styles'
                     fname = nstr + '.css'
 
             self.flows[j] = flowpart
@@ -430,7 +430,7 @@ class Mobi8Reader:
                     pass  # Ignore these records
                 elif typ == b'FONT':
                     font = read_font_record(data)
-                    href = "fonts/%05d.%s" % (fname_idx, font['ext'])
+                    href = 'fonts/%05d.%s' % (fname_idx, font['ext'])
                     if font['err']:
                         self.log.warn('Reading font record %d failed: %s'%(
                             fname_idx, font['err']))
diff --git a/src/calibre/ebooks/mobi/reader/ncx.py b/src/calibre/ebooks/mobi/reader/ncx.py
index b9f9a735cb..c4de800492 100644
--- a/src/calibre/ebooks/mobi/reader/ncx.py
+++ b/src/calibre/ebooks/mobi/reader/ncx.py
@@ -24,10 +24,10 @@ tag_fieldname_map = {
         22: ['child1',0],
         23: ['childn',0],
         69: ['image_index',0],
-        70 : ['desc_offset', 0],  # 'Description offset in cncx'
-        71 : ['author_offset', 0],  # 'Author offset in cncx'
-        72 : ['image_caption_offset', 0],  # 'Image caption offset in cncx',
-        73 : ['image_attr_offset', 0],  # 'Image attribution offset in cncx',
+        70: ['desc_offset', 0],  # 'Description offset in cncx'
+        71: ['author_offset', 0],  # 'Author offset in cncx'
+        72: ['image_caption_offset', 0],  # 'Image caption offset in cncx',
+        73: ['image_attr_offset', 0],  # 'Image attribution offset in cncx',
 
 }
 
@@ -35,13 +35,13 @@ default_entry = {
                     'pos':  -1,
                     'len':  0,
                     'noffs': -1,
-                    'text' : "Unknown Text",
-                    'hlvl' : -1,
-                    'kind' : "Unknown Class",
-                    'pos_fid' : None,
-                    'parent' : -1,
-                    'child1' : -1,
-                    'childn' : -1,
+                    'text': 'Unknown Text',
+                    'hlvl': -1,
+                    'kind': 'Unknown Class',
+                    'pos_fid': None,
+                    'parent': -1,
+                    'child1': -1,
+                    'childn': -1,
                     'description': None,
                     'author': None,
                     'image_caption': None,
diff --git a/src/calibre/ebooks/mobi/utils.py b/src/calibre/ebooks/mobi/utils.py
index 59bcc513d1..09c971beb2 100644
--- a/src/calibre/ebooks/mobi/utils.py
+++ b/src/calibre/ebooks/mobi/utils.py
@@ -424,8 +424,8 @@ def mobify_image(data):
         data = png_data_to_gif_data(data)
     return data
 
-# Font records {{{
 
+# Font records {{{
 
 def read_font_record(data, extent=1040):
     '''
@@ -647,4 +647,4 @@ def convert_color_for_font_tag(val):
     def clamp(x):
         return min(x, max(0, x), 1)
     rgb = map(clamp, rgba[:3])
-    return '#' + ''.join(map(lambda x:'%02x' % int(x * 255), rgb))
+    return '#' + ''.join('%02x' % int(x * 255) for x in rgb)
diff --git a/src/calibre/ebooks/mobi/writer2/__init__.py b/src/calibre/ebooks/mobi/writer2/__init__.py
index ee0e098f16..b36984a9ba 100644
--- a/src/calibre/ebooks/mobi/writer2/__init__.py
+++ b/src/calibre/ebooks/mobi/writer2/__init__.py
@@ -10,4 +10,3 @@ UNCOMPRESSED = 1
 PALMDOC = 2
 HUFFDIC = 17480
 PALM_MAX_IMAGE_SIZE = 63 * 1024
-
diff --git a/src/calibre/ebooks/mobi/writer2/indexer.py b/src/calibre/ebooks/mobi/writer2/indexer.py
index 357b357d52..0aeb1bbf75 100644
--- a/src/calibre/ebooks/mobi/writer2/indexer.py
+++ b/src/calibre/ebooks/mobi/writer2/indexer.py
@@ -37,7 +37,7 @@ class TAGX:  # {{{
     BITMASKS.update({x:(1 << i) for i, x in enumerate([1, 2, 3, 4, 5, 21, 22, 23])})
     BITMASKS.update({x:(1 << i) for i, x in enumerate([69, 70, 71, 72, 73])})
 
-    NUM_VALUES = defaultdict(lambda :1)
+    NUM_VALUES = defaultdict(lambda:1)
     NUM_VALUES[11] = 3
     NUM_VALUES[0] = 0
 
@@ -64,7 +64,7 @@ class TAGX:  # {{{
         '''
         TAGX block for the Primary index header of a periodical
         '''
-        for i in (1, 2, 3, 4, 5, 21, 22, 23, 0, 69, 70, 71, 72,73, 0):
+        for i in (1, 2, 3, 4, 5, 21, 22, 23, 0, 69, 70, 71, 72, 73, 0):
             self.add_tag(i)
         return self.header(2) + bytes(self.byts)
 
@@ -86,9 +86,9 @@ class TAGX:  # {{{
             self.add_tag(i)
         return self.header(1) + bytes(self.byts)
 
-
 # }}}
 
+
 # Index Entries {{{
 
 class IndexEntry:
@@ -108,7 +108,7 @@ class IndexEntry:
             'author_offset': 71,
 
     }
-    RTAG_MAP = {v:k for k, v in iteritems(TAG_VALUES)}  # noqa
+    RTAG_MAP = {v:k for k, v in iteritems(TAG_VALUES)}
 
     def __init__(self, offset, label_offset):
         self.offset, self.label_offset = offset, label_offset
diff --git a/src/calibre/ebooks/mobi/writer2/resources.py b/src/calibre/ebooks/mobi/writer2/resources.py
index 52c44e1f09..7b8bc1831c 100644
--- a/src/calibre/ebooks/mobi/writer2/resources.py
+++ b/src/calibre/ebooks/mobi/writer2/resources.py
@@ -18,7 +18,7 @@ from calibre.ptempfile import PersistentTemporaryFile
 from calibre.utils.imghdr import what
 from polyglot.builtins import iteritems
 
-PLACEHOLDER_GIF = b'GIF89a\x01\x00\x01\x00\xf0\x00\x00\x00\x00\x00\xff\xff\xff!\xf9\x04\x01\x00\x00\x00\x00!\xfe calibre-placeholder-gif-for-azw3\x00,\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02D\x01\x00;'  # noqa
+PLACEHOLDER_GIF = b'GIF89a\x01\x00\x01\x00\xf0\x00\x00\x00\x00\x00\xff\xff\xff!\xf9\x04\x01\x00\x00\x00\x00!\xfe calibre-placeholder-gif-for-azw3\x00,\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02D\x01\x00;'  # noqa: E501
 
 
 def process_jpegs_for_amazon(data: bytes) -> bytes:
diff --git a/src/calibre/ebooks/mobi/writer2/serializer.py b/src/calibre/ebooks/mobi/writer2/serializer.py
index fd25a58f39..d26660b25d 100644
--- a/src/calibre/ebooks/mobi/writer2/serializer.py
+++ b/src/calibre/ebooks/mobi/writer2/serializer.py
@@ -163,7 +163,7 @@ class Serializer:
                 continue
 
             buf.write(b'<reference type="')
-            if ref.type.startswith('other.') :
+            if ref.type.startswith('other.'):
                 self.serialize_text(ref.type.replace('other.',''), quot=True)
             else:
                 self.serialize_text(ref.type, quot=True)
@@ -223,7 +223,7 @@ class Serializer:
                 buf.write(b'<mbp:pagebreak />')
                 self.id_offsets[urlnormalize(href)] = buf.tell()
 
-            if tocref.klass == "periodical":
+            if tocref.klass == 'periodical':
                 buf.write(b'<div> <div height="1em"></div>')
             else:
                 t = tocref.title
@@ -362,7 +362,7 @@ class Serializer:
         text = text.replace('&', '&amp;')
         text = text.replace('<', '&lt;')
         text = text.replace('>', '&gt;')
-        text = text.replace('\u00AD', '')  # Soft-hyphen
+        text = text.replace('\u00ad', '')  # Soft-hyphen
         if quot:
             text = text.replace('"', '&quot;')
         if isinstance(text, str):
diff --git a/src/calibre/ebooks/mobi/writer8/__init__.py b/src/calibre/ebooks/mobi/writer8/__init__.py
index c2a96b7708..3c0958cb29 100644
--- a/src/calibre/ebooks/mobi/writer8/__init__.py
+++ b/src/calibre/ebooks/mobi/writer8/__init__.py
@@ -4,6 +4,3 @@
 __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
-
-
-
diff --git a/src/calibre/ebooks/mobi/writer8/exth.py b/src/calibre/ebooks/mobi/writer8/exth.py
index ff69a45eef..24c8024136 100644
--- a/src/calibre/ebooks/mobi/writer8/exth.py
+++ b/src/calibre/ebooks/mobi/writer8/exth.py
@@ -142,7 +142,7 @@ def build_exth(metadata, prefer_author_sort=False, is_periodical=False,
         datestr = str(metadata['timestamp'][0])
 
     if datestr is None:
-        raise ValueError("missing date or timestamp")
+        raise ValueError('missing date or timestamp')
 
     datestr = datestr.encode('utf-8')
     exth.write(pack(b'>II', EXTH_CODES['pubdate'], len(datestr) + 8))
diff --git a/src/calibre/ebooks/mobi/writer8/header.py b/src/calibre/ebooks/mobi/writer8/header.py
index 839445128e..5eb07960a5 100644
--- a/src/calibre/ebooks/mobi/writer8/header.py
+++ b/src/calibre/ebooks/mobi/writer8/header.py
@@ -15,10 +15,16 @@ from calibre.ebooks.mobi.utils import align_block
 from polyglot.builtins import as_bytes, iteritems
 
 NULL = 0xffffffff
+
+
 def zeroes(x):
     return (b'\x00' * x)
+
+
 def nulls(x):
     return (b'\xff' * x)
+
+
 def short(x):
     return pack(b'>H', x)
 
diff --git a/src/calibre/ebooks/mobi/writer8/index.py b/src/calibre/ebooks/mobi/writer8/index.py
index 51b73d00e9..d07d105e7f 100644
--- a/src/calibre/ebooks/mobi/writer8/index.py
+++ b/src/calibre/ebooks/mobi/writer8/index.py
@@ -11,10 +11,13 @@ from struct import pack
 from calibre.ebooks.mobi.utils import CNCX, align_block, encint
 from calibre.ebooks.mobi.writer8.header import Header
 
-TagMeta_ = namedtuple('TagMeta',
-        'name number values_per_entry bitmask end_flag')
+TagMeta_ = namedtuple('TagMeta', 'name number values_per_entry bitmask end_flag')
+
+
 def TagMeta(x):
     return TagMeta_(*x)
+
+
 EndTagTable = TagMeta(('eof', 0, 0, 0, 1))
 
 # map of mask to number of shifts needed, works with 1 bit and two-bit wide masks
@@ -278,8 +281,8 @@ class ChunkIndex(Index):
 class GuideIndex(Index):
 
     tag_types = tuple(map(TagMeta, (
-        ('title',           1, 1, 1, 0),
-        ('pos_fid',         6, 2, 2, 0),
+        ('title',   1, 1, 1, 0),
+        ('pos_fid', 6, 2, 2, 0),
         EndTagTable
     )))
 
@@ -296,7 +299,6 @@ class GuideIndex(Index):
 
 
 class NCXIndex(Index):
-
     ''' The commented out parts have been seen in NCX indexes from MOBI 6
     periodicals. Since we have no MOBI 8 periodicals to reverse engineer, leave
     it for now. '''
diff --git a/src/calibre/ebooks/mobi/writer8/main.py b/src/calibre/ebooks/mobi/writer8/main.py
index 08f4c560e7..1cc0da1f7c 100644
--- a/src/calibre/ebooks/mobi/writer8/main.py
+++ b/src/calibre/ebooks/mobi/writer8/main.py
@@ -241,7 +241,7 @@ class KF8Writer:
                 p = svg.getparent()
                 pos = p.index(svg)
                 img = etree.Element(XHTML('img'),
-                        src="kindle:flow:%s?mime=image/svg+xml"%to_ref(idx))
+                        src='kindle:flow:%s?mime=image/svg+xml'%to_ref(idx))
                 p.insert(pos, img)
                 extract(svg)
 
diff --git a/src/calibre/ebooks/mobi/writer8/skeleton.py b/src/calibre/ebooks/mobi/writer8/skeleton.py
index fceb018c9d..9d0df844f4 100644
--- a/src/calibre/ebooks/mobi/writer8/skeleton.py
+++ b/src/calibre/ebooks/mobi/writer8/skeleton.py
@@ -73,7 +73,7 @@ def tostring(raw, **kwargs):
     ans = etree.tostring(raw, **kwargs)
     if xml_declaration:
         ans = '<?xml version="1.0" encoding="%s"?>\n'%encoding + ans
-    return re.sub(r'&#x([0-9A-Fa-f]+);', lambda m:my_unichr(int(m.group(1), 16)),
+    return re.sub(r'&#x([0-9A-Fa-f]+);', lambda m: my_unichr(int(m.group(1), 16)),
             ans).encode(encoding)
 
 
@@ -432,9 +432,9 @@ class Chunker:
                         'wb') as f:
                     f.write(chunk.raw)
             oraw, rraw = orig_dumps[i], skeleton.rebuild()
-            with open(os.path.join(orig, '%04d.html'%i),  'wb') as f:
+            with open(os.path.join(orig, '%04d.html'%i), 'wb') as f:
                 f.write(oraw)
-            with open(os.path.join(rebuilt, '%04d.html'%i),  'wb') as f:
+            with open(os.path.join(rebuilt, '%04d.html'%i), 'wb') as f:
                 f.write(rraw)
             if oraw != rraw:
                 error = True
diff --git a/src/calibre/ebooks/odt/input.py b/src/calibre/ebooks/odt/input.py
index 73e0c21e8d..9ea8aa8ed1 100644
--- a/src/calibre/ebooks/odt/input.py
+++ b/src/calibre/ebooks/odt/input.py
@@ -239,14 +239,14 @@ class Extract(ODF2XHTML):
                         # now it should be safe to remove the text:p
                         parent = para.parentNode
                         parent.removeChild(para)
-                        log("Removed cover image paragraph from document...")
+                        log('Removed cover image paragraph from document...')
                         break
 
     def filter_load(self, odffile, mi, log):
-        """ This is an adaption from ODF2XHTML. It adds a step between
+        ''' This is an adaption from ODF2XHTML. It adds a step between
             load and parse of the document where the Element tree can be
             modified.
-        """
+        '''
         # first load the odf structure
         self.lines = []
         self._wfunc = self._wlines
diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py
index 09d242f222..7c81929f13 100644
--- a/src/calibre/ebooks/oeb/base.py
+++ b/src/calibre/ebooks/oeb/base.py
@@ -455,7 +455,8 @@ ASCII_CHARS   = frozenset(codepoint_to_chr(x) for x in range(128))
 UNIBYTE_CHARS = frozenset(x.encode('ascii') for x in ASCII_CHARS)
 USAFE         = ('ABCDEFGHIJKLMNOPQRSTUVWXYZ'
                  'abcdefghijklmnopqrstuvwxyz'
-                 '0123456789' '_.-/~')
+                 '0123456789'
+                 '_.-/~')
 URL_SAFE      = frozenset(USAFE)
 URL_SAFE_BYTES = frozenset(USAFE.encode('ascii'))
 URL_UNSAFE = [ASCII_CHARS - URL_SAFE, UNIBYTE_CHARS - URL_SAFE_BYTES]
@@ -463,13 +464,13 @@ del USAFE
 
 
 def urlquote(href):
-    """ Quote URL-unsafe characters, allowing IRI-safe characters.
+    ''' Quote URL-unsafe characters, allowing IRI-safe characters.
     That is, this function returns valid IRIs not valid URIs. In particular,
-    IRIs can contain non-ascii characters.  """
+    IRIs can contain non-ascii characters.  '''
     result = []
     isbytes = isinstance(href, bytes)
     unsafe = URL_UNSAFE[int(isbytes)]
-    esc, join = "%%%02x", ''
+    esc, join = '%%%02x', ''
     if isbytes:
         esc, join = esc.encode('ascii'), b''
     for char in href:
@@ -480,9 +481,9 @@ def urlquote(href):
 
 
 def urlnormalize(href):
-    """Convert a URL into normalized form, with all and only URL-unsafe
+    '''Convert a URL into normalized form, with all and only URL-unsafe
     characters URL quoted.
-    """
+    '''
     try:
         parts = urlparse(href)
     except ValueError as e:
@@ -497,11 +498,11 @@ def urlnormalize(href):
 
 
 def extract(elem):
-    """
+    '''
     Removes this element from the tree, including its children and
     text.  The tail text is joined to the previous element or
     parent.
-    """
+    '''
     parent = elem.getparent()
     if parent is not None:
         if elem.tail:
@@ -535,15 +536,15 @@ _css_logger.addHandler(_css_log_handler)
 
 
 class OEBError(Exception):
-    """Generic OEB-processing error."""
+    '''Generic OEB-processing error.'''
     pass
 
 
 class NullContainer:
-    """An empty container.
+    '''An empty container.
 
     For use with book formats which do not support container-like access.
-    """
+    '''
 
     def __init__(self, log):
         self.log = log
@@ -562,7 +563,7 @@ class NullContainer:
 
 
 class DirContainer:
-    """Filesystem directory container."""
+    '''Filesystem directory container.'''
 
     def __init__(self, path, log, ignore_opf=False):
         self.log = log
@@ -585,7 +586,7 @@ class DirContainer:
     def _unquote(self, path):
         # unquote must run on a bytestring and will return a bytestring
         # If it runs on a unicode object, it returns a double encoded unicode
-        # string: unquote(u'%C3%A4') != unquote(b'%C3%A4').decode('utf-8')
+        # string: unquote('%C3%A4') != unquote(b'%C3%A4').decode('utf-8')
         # and the latter is correct
         if isinstance(path, str):
             path = path.encode('utf-8')
@@ -619,7 +620,7 @@ class DirContainer:
             # On linux, if LANG is unset, the os.stat call tries to encode the
             # unicode path using ASCII
             # To replicate try:
-            # LANG=en_US.ASCII python -c "import os; os.stat(u'Espa\xf1a')"
+            # LANG=en_US.ASCII python -c "import os; os.stat('Espa\xf1a')"
             return os.path.isfile(path.encode(filesystem_encoding))
 
     def namelist(self):
@@ -642,13 +643,13 @@ class DirContainer:
 
 
 class Metadata:
-    """A collection of OEB data model metadata.
+    '''A collection of OEB data model metadata.
 
     Provides access to the list of items associated with a particular metadata
     term via the term's local name using either Python container or attribute
     syntax.  Return an empty list for any terms with no currently associated
     metadata items.
-    """
+    '''
 
     DC_TERMS      = {'contributor', 'coverage', 'creator', 'date',
                          'description', 'format', 'identifier', 'language',
@@ -664,7 +665,7 @@ class Metadata:
                      'xsi': XSI_NS, 'calibre': CALIBRE_NS}
 
     class Item:
-        """An item of OEB data model metadata.
+        '''An item of OEB data model metadata.
 
         The metadata term or name may be accessed via the :attr:`term` or
         :attr:`name` attributes.  The metadata value or content may be accessed
@@ -675,9 +676,9 @@ class Metadata:
         fully-qualified names using the Python container access syntax, or via
         their local names using Python attribute syntax.  Only attributes
         allowed by the OPF 2.0 specification are supported.
-        """
+        '''
         class Attribute:
-            """Smart accessor for allowed OEB metadata item attributes."""
+            '''Smart accessor for allowed OEB metadata item attributes.'''
 
             def __init__(self, attr, allowed=None):
                 if not callable(attr):
@@ -815,7 +816,7 @@ class Metadata:
         self.primary_writing_mode = None
 
     def add(self, term, value, attrib={}, nsmap={}, **kwargs):
-        """Add a new metadata item."""
+        '''Add a new metadata item.'''
         item = self.Item(term, value, attrib, nsmap, **kwargs)
         items = self.items[barename(item.term)]
         items.append(item)
@@ -894,7 +895,7 @@ class Metadata:
 
 
 class Manifest:
-    """Collection of files composing an OEB data model book.
+    '''Collection of files composing an OEB data model book.
 
     Provides access to the content of the files composing the book and
     attributes associated with those files, including their internal paths,
@@ -907,10 +908,10 @@ class Manifest:
         the manifest items and the values are the items themselves.
     :attr:`hrefs`: A dictionary in which the keys are the internal paths of the
         manifest items and the values are the items themselves.
-    """
+    '''
 
     class Item:
-        """An OEB data model book content file.
+        '''An OEB data model book content file.
 
         Provides the following data members for accessing the file content and
         metadata associated with this particular file.
@@ -927,7 +928,7 @@ class Manifest:
             primary linear reading order and `False` for textual content items
             which are not (such as footnotes).  Meaningless for items which
             have a :attr:`spine_position` of `None`.
-        """
+        '''
 
         def __init__(self, oeb, id, href, media_type,
                      fallback=None, loader=str, data=None):
@@ -1014,14 +1015,14 @@ class Manifest:
             hrefs = self.oeb.manifest.hrefs
             if path not in hrefs:
                 self.oeb.logger.warn('CSS import of missing file %r' % path)
-                return (None, None)
+                return None, None
             item = hrefs[path]
             if item.media_type not in OEB_STYLES:
                 self.oeb.logger.warn('CSS import of non-CSS file %r' % path)
-                return (None, None)
+                return None, None
             data = item.data.cssText
             enc = None if isinstance(data, str) else 'utf-8'
-            return (enc, data)
+            return enc, data
 
         # }}}
 
@@ -1033,7 +1034,7 @@ class Manifest:
 
         @property
         def data(self):
-            """Provides MIME type sensitive access to the manifest
+            '''Provides MIME type sensitive access to the manifest
             entry's associated content.
 
             - XHTML, HTML, and variant content is parsed as necessary to
@@ -1044,7 +1045,7 @@ class Manifest:
               CSS DOM stylesheet.
             - All other content is returned as a :class:`str` or :class:`bytes`
               object with no special parsing.
-            """
+            '''
             data = self._data
             if data is None:
                 data = self.data_as_bytes_or_none
@@ -1138,15 +1139,15 @@ class Manifest:
             return sp, (self.media_type or '').lower(), numeric_sort_key(href), self.id
 
         def relhref(self, href):
-            """Convert the URL provided in :param:`href` from a book-absolute
+            '''Convert the URL provided in :param:`href` from a book-absolute
             reference to a reference relative to this manifest item.
-            """
+            '''
             return rel_href(self.href, href)
 
         def abshref(self, href):
-            """Convert the URL provided in :param:`href` from a reference
+            '''Convert the URL provided in :param:`href` from a reference
             relative to this manifest item to a book-absolute reference.
-            """
+            '''
             try:
                 purl = urlparse(href)
             except ValueError:
@@ -1177,7 +1178,7 @@ class Manifest:
         self.hrefs = {}
 
     def add(self, id, href, media_type, fallback=None, loader=None, data=None):
-        """Add a new item to the book manifest.
+        '''Add a new item to the book manifest.
 
         The item's :param:`id`, :param:`href`, and :param:`media_type` are all
         required.  A :param:`fallback` item-id is required for any items with a
@@ -1185,7 +1186,7 @@ class Manifest:
         item's data itself may be provided with :param:`data`, or a loader
         function for the data may be provided with :param:`loader`, or the
         item's data may later be set manually via the :attr:`data` attribute.
-        """
+        '''
         item = self.Item(
             self.oeb, id, href, media_type, fallback, loader, data)
         self.items.add(item)
@@ -1194,7 +1195,7 @@ class Manifest:
         return item
 
     def remove(self, item):
-        """Removes :param:`item` from the manifest."""
+        '''Removes :param:`item` from the manifest.'''
         if item in self.ids:
             item = self.ids[item]
         del self.ids[item.id]
@@ -1211,14 +1212,14 @@ class Manifest:
         self.items.remove(item)
 
     def generate(self, id=None, href=None):
-        """Generate a new unique identifier and/or internal path for use in
+        '''Generate a new unique identifier and/or internal path for use in
         creating a new manifest item, using the provided :param:`id` and/or
         :param:`href` as bases.
 
         Returns an two-tuple of the new id and path.  If either :param:`id` or
         :param:`href` are `None` then the corresponding item in the return
         tuple will also be `None`.
-        """
+        '''
         if id is not None:
             base = id
             index = 1
@@ -1293,13 +1294,13 @@ class Manifest:
 
 
 class Spine:
-    """Collection of manifest items composing an OEB data model book's main
+    '''Collection of manifest items composing an OEB data model book's main
     textual content.
 
     The spine manages which manifest items compose the book's main textual
     content and the sequence in which they appear.  Provides Python container
     access as a list-like object.
-    """
+    '''
 
     def __init__(self, oeb):
         self.oeb = oeb
@@ -1316,14 +1317,14 @@ class Spine:
         return linear
 
     def add(self, item, linear=None):
-        """Append :param:`item` to the end of the `Spine`."""
+        '''Append :param:`item` to the end of the `Spine`.'''
         item.linear = self._linear(linear)
         item.spine_position = len(self.items)
         self.items.append(item)
         return item
 
     def insert(self, index, item, linear):
-        """Insert :param:`item` at position :param:`index` in the `Spine`."""
+        '''Insert :param:`item` at position :param:`index` in the `Spine`.'''
         item.linear = self._linear(linear)
         item.spine_position = index
         self.items.insert(index, item)
@@ -1332,7 +1333,7 @@ class Spine:
         return item
 
     def remove(self, item):
-        """Remove :param:`item` from the `Spine`."""
+        '''Remove :param:`item` from the `Spine`.'''
         index = item.spine_position
         self.items.pop(index)
         for i in range(index, len(self.items)):
@@ -1375,15 +1376,15 @@ class Spine:
 
 
 class Guide:
-    """Collection of references to standard frequently-occurring sections
+    '''Collection of references to standard frequently-occurring sections
     within an OEB data model book.
 
     Provides dictionary-like access, in which the keys are the OEB reference
     type identifiers and the values are `Reference` objects.
-    """
+    '''
 
     class Reference:
-        """Reference to a standard book section.
+        '''Reference to a standard book section.
 
         Provides the following instance data members:
 
@@ -1392,7 +1393,7 @@ class Guide:
         :attr:`title`: Human-readable section title.
         :attr:`href`: Book-internal URL of the referenced section.  May include
             a fragment identifier.
-        """
+        '''
         _TYPES_TITLES = [('cover', __('Cover')),
                          ('title-page', __('Title page')),
                          ('toc', __('Table of Contents')),
@@ -1433,7 +1434,7 @@ class Guide:
 
         @property
         def item(self):
-            """The manifest item associated with this reference."""
+            '''The manifest item associated with this reference.'''
             path = urldefrag(self.href)[0]
             hrefs = self.oeb.manifest.hrefs
             return hrefs.get(path, None)
@@ -1443,7 +1444,7 @@ class Guide:
         self.refs = {}
 
     def add(self, type, title, href):
-        """Add a new reference to the `Guide`."""
+        '''Add a new reference to the `Guide`.'''
         if href:
             href = str(href)
         ref = self.Reference(self.oeb, type, title, href)
@@ -1505,7 +1506,7 @@ class Guide:
 
 
 class TOC:
-    """Represents a hierarchical table of contents or navigation tree for
+    '''Represents a hierarchical table of contents or navigation tree for
     accessing arbitrary semantic sections within an OEB data model book.
 
     Acts as a node within the navigation tree.  Provides list-like access to
@@ -1518,7 +1519,7 @@ class TOC:
     :attr:`author`: Optional author attribution for periodicals <mbp:>
     :attr:`description`: Optional description attribute for periodicals <mbp:>
     :attr:`toc_thumbnail`: Optional toc thumbnail image
-    """
+    '''
 
     def __init__(self, title=None, href=None, klass=None, id=None,
             play_order=None, author=None, description=None, toc_thumbnail=None):
@@ -1536,7 +1537,7 @@ class TOC:
         self.toc_thumbnail = toc_thumbnail
 
     def add(self, title, href, klass=None, id=None, play_order=0, author=None, description=None, toc_thumbnail=None):
-        """Create and return a new sub-node of this node."""
+        '''Create and return a new sub-node of this node.'''
         node = TOC(title, href, klass, id, play_order, author, description, toc_thumbnail)
         self.nodes.append(node)
         return node
@@ -1552,7 +1553,7 @@ class TOC:
         return False
 
     def iter(self):
-        """Iterate over this node and all descendants in depth-first order."""
+        '''Iterate over this node and all descendants in depth-first order.'''
         yield self
         for child in self.nodes:
             yield from child.iter()
@@ -1578,7 +1579,7 @@ class TOC:
         return False
 
     def iterdescendants(self, breadth_first=False):
-        """Iterate over all descendant nodes in depth-first order."""
+        '''Iterate over all descendant nodes in depth-first order.'''
         if breadth_first:
             for child in self.nodes:
                 yield child
@@ -1589,16 +1590,16 @@ class TOC:
                 yield from child.iter()
 
     def __iter__(self):
-        """Iterate over all immediate child nodes."""
+        '''Iterate over all immediate child nodes.'''
         yield from self.nodes
 
     def __getitem__(self, index):
         return self.nodes[index]
 
     def autolayer(self):
-        """Make sequences of children pointing to the same content file into
+        '''Make sequences of children pointing to the same content file into
         children of the first node referencing that file.
-        """
+        '''
         prev = None
         for node in list(self.nodes):
             if prev and urldefrag(prev.href)[0] == urldefrag(node.href)[0]:
@@ -1608,7 +1609,7 @@ class TOC:
                 prev = node
 
     def depth(self):
-        """The maximum depth of the navigation tree rooted at this node."""
+        '''The maximum depth of the navigation tree rooted at this node.'''
         try:
             return max(node.depth() for node in self.nodes) + 1
         except ValueError:
@@ -1684,14 +1685,14 @@ class TOC:
 
 
 class PageList:
-    """Collection of named "pages" to mapped positions within an OEB data model
+    '''Collection of named "pages" to mapped positions within an OEB data model
     book's textual content.
 
     Provides list-like access to the pages.
-    """
+    '''
 
     class Page:
-        """Represents a mapping between a page name and a position within
+        '''Represents a mapping between a page name and a position within
         the book content.
 
         Provides the following instance data attributes:
@@ -1705,7 +1706,7 @@ class PageList:
             fashion in print, such as the cover and title pages).
         :attr:`klass`: Optional semantic class of this page.
         :attr:`id`: Optional unique identifier for this page.
-        """
+        '''
         TYPES = {'front', 'normal', 'special'}
 
         def __init__(self, name, href, type='normal', klass=None, id=None):
@@ -1719,7 +1720,7 @@ class PageList:
         self.pages = []
 
     def add(self, name, href, type='normal', klass=None, id=None):
-        """Create a new page and add it to the `PageList`."""
+        '''Create a new page and add it to the `PageList`.'''
         page = self.Page(name, href, type, klass, id)
         self.pages.append(page)
         return page
@@ -1763,7 +1764,7 @@ class PageList:
 
 
 class OEBBook:
-    """Representation of a book in the IDPF OEB data model."""
+    '''Representation of a book in the IDPF OEB data model.'''
 
     COVER_SVG_XP    = XPath('h:body//svg:svg[position() = 1]')
     COVER_OBJECT_XP = XPath('h:body//h:object[@data][position() = 1]')
@@ -1773,7 +1774,7 @@ class OEBBook:
             css_preprocessor=CSSPreProcessor(),
             encoding='utf-8', pretty_print=False,
             input_encoding='utf-8'):
-        """Create empty book.  Arguments:
+        '''Create empty book.  Arguments:
 
         :param:`encoding`: Default encoding for textual content read
             from an external container.
@@ -1802,7 +1803,7 @@ class OEBBook:
         :attr:`toc`: Hierarchical table of contents.
         :attr:`pages`: List of "pages," such as indexed to a print edition of
             the same text.
-        """
+        '''
         _css_log_handler.log = logger
         self.encoding = encoding
         self.input_encoding = input_encoding
@@ -1830,7 +1831,6 @@ class OEBBook:
                     self.spine.page_progression_direction = 'rtl'
             except Exception:
                 raise
-                pass
 
     def clean_temp_files(self):
         for path in self._temp_files:
@@ -1841,19 +1841,19 @@ class OEBBook:
 
     @classmethod
     def generate(cls, opts):
-        """Generate an OEBBook instance from command-line options."""
+        '''Generate an OEBBook instance from command-line options.'''
         encoding = opts.encoding
         pretty_print = opts.pretty_print
         return cls(encoding=encoding, pretty_print=pretty_print)
 
     def translate(self, text):
-        """Translate :param:`text` into the book's primary language."""
+        '''Translate :param:`text` into the book's primary language.'''
         lang = str(self.metadata.language[0])
         lang = lang.split('-', 1)[0].lower()
         return translate(lang, text)
 
     def decode(self, data):
-        """Automatically decode :param:`data` into a `unicode` object."""
+        '''Automatically decode :param:`data` into a `unicode` object.'''
         def fix_data(d):
             return d.replace('\r\n', '\n').replace('\r', '\n')
         if isinstance(data, str):
@@ -1887,11 +1887,11 @@ class OEBBook:
         return fix_data(data)
 
     def to_opf1(self):
-        """Produce OPF 1.2 representing the book's metadata and structure.
+        '''Produce OPF 1.2 representing the book's metadata and structure.
 
         Returns a dictionary in which the keys are MIME types and the values
         are tuples of (default) filenames and lxml.etree element structures.
-        """
+        '''
         package = etree.Element('package',
             attrib={'unique-identifier': self.uid.id})
         self.metadata.to_opf1(package)
@@ -1931,7 +1931,6 @@ class OEBBook:
             href = urlnormalize(selector(elem)[0])
             order = playorder.get(href, i)
             elem.attrib['playOrder'] = str(order)
-        return
 
     def _to_ncx(self):
         try:
@@ -1967,11 +1966,11 @@ class OEBBook:
         return ncx
 
     def to_opf2(self, page_map=False):
-        """Produce OPF 2.0 representing the book's metadata and structure.
+        '''Produce OPF 2.0 representing the book's metadata and structure.
 
         Returns a dictionary in which the keys are MIME types and the values
         are tuples of (default) filenames and lxml.etree element structures.
-        """
+        '''
         results = {}
         package = etree.Element(OPF('package'),
             attrib={'version': '2.0', 'unique-identifier': self.uid.id},
@@ -1998,8 +1997,8 @@ class OEBBook:
 
 
 def rel_href(base_href, href):
-    """Convert the URL provided in :param:`href` to a URL relative to the URL
-    in :param:`base_href`  """
+    '''Convert the URL provided in :param:`href` to a URL relative to the URL
+    in :param:`base_href`  '''
     if urlparse(href).scheme:
         return href
     if '/' not in base_href:
diff --git a/src/calibre/ebooks/oeb/display/__init__.py b/src/calibre/ebooks/oeb/display/__init__.py
index c2a96b7708..3c0958cb29 100644
--- a/src/calibre/ebooks/oeb/display/__init__.py
+++ b/src/calibre/ebooks/oeb/display/__init__.py
@@ -4,6 +4,3 @@
 __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
-
-
-
diff --git a/src/calibre/ebooks/oeb/iterator/book.py b/src/calibre/ebooks/oeb/iterator/book.py
index f58a870542..cede2cfc19 100644
--- a/src/calibre/ebooks/oeb/iterator/book.py
+++ b/src/calibre/ebooks/oeb/iterator/book.py
@@ -67,8 +67,7 @@ def extract_book(pathtoebook, tdir, log=None, view_kepub=False, processed=False,
         if not only_input_plugin:
             # Run the HTML preprocess/parsing from the conversion pipeline as
             # well
-            if (processed or plumber.input_fmt.lower() in {'pdb', 'pdf', 'rb'} and
-                    not hasattr(pathtoopf, 'manifest')):
+            if processed or (plumber.input_fmt.lower() in {'pdb', 'pdf', 'rb'} and not hasattr(pathtoopf, 'manifest')):
                 if hasattr(pathtoopf, 'manifest'):
                     pathtoopf = write_oebbook(pathtoopf, tdir)
                 pathtoopf = create_oebbook(log, pathtoopf, plumber.opts)
@@ -106,7 +105,7 @@ class EbookIterator(BookmarksMixin):
 
     def search(self, text, index, backwards=False):
         from calibre.ebooks.oeb.polish.parsing import parse
-        pmap = [(i, path) for i, path in enumerate(self.spine)]
+        pmap = list(enumerate(self.spine))
         if backwards:
             pmap.reverse()
         q = text.lower()
diff --git a/src/calibre/ebooks/oeb/normalize_css.py b/src/calibre/ebooks/oeb/normalize_css.py
index aed56f5691..5e2159ff65 100644
--- a/src/calibre/ebooks/oeb/normalize_css.py
+++ b/src/calibre/ebooks/oeb/normalize_css.py
@@ -193,7 +193,7 @@ def condense_edge(vals):
     if len(edges) != 4 or set(edges) != {'left', 'top', 'right', 'bottom'}:
         return
     ce = {}
-    for (x, y) in [('left', 'right'), ('top', 'bottom')]:
+    for x,y in [('left', 'right'), ('top', 'bottom')]:
         if edges[x] == edges[y]:
             ce[x] = edges[x]
         else:
@@ -343,7 +343,7 @@ def test_normalization(return_tests=False):  # {{{
 
         def test_edge_normalization(self):
             def edge_dict(prefix, expected):
-                return {f'{prefix}-{edge}' : x for edge, x in zip(EDGES, expected)}
+                return {f'{prefix}-{edge}': x for edge, x in zip(EDGES, expected)}
             for raw, expected in iteritems({
                 '2px': ('2px', '2px', '2px', '2px'),
                 '1em 2em': ('1em', '2em', '1em', '2em'),
@@ -356,7 +356,7 @@ def test_normalization(return_tests=False):  # {{{
 
         def test_list_style_normalization(self):
             def ls_dict(expected):
-                ans = {'list-style-%s' % x : DEFAULTS['list-style-%s' % x] for x in ('type', 'image', 'position')}
+                ans = {'list-style-%s' % x: DEFAULTS['list-style-%s' % x] for x in ('type', 'image', 'position')}
                 for k, v in iteritems(expected):
                     ans['list-style-%s' % k] = v
                 return ans
@@ -385,17 +385,17 @@ def test_normalization(return_tests=False):  # {{{
 
         def test_edge_condensation(self):
             for s, v in iteritems({
-                (1, 1, 3) : None,
-                (1, 2, 3, 4) : '2pt 3pt 4pt 1pt',
-                (1, 2, 3, 2) : '2pt 3pt 2pt 1pt',
-                (1, 2, 1, 3) : '2pt 1pt 3pt',
-                (1, 2, 1, 2) : '2pt 1pt',
-                (1, 1, 1, 1) : '1pt',
-                ('2%', '2%', '2%', '2%') : '2%',
-                tuple('0 0 0 0'.split()) : '0',
+                (1, 1, 3): None,
+                (1, 2, 3, 4): '2pt 3pt 4pt 1pt',
+                (1, 2, 3, 2): '2pt 3pt 2pt 1pt',
+                (1, 2, 1, 3): '2pt 1pt 3pt',
+                (1, 2, 1, 2): '2pt 1pt',
+                (1, 1, 1, 1): '1pt',
+                ('2%', '2%', '2%', '2%'): '2%',
+                tuple('0 0 0 0'.split()): '0',
             }):
                 for prefix in ('margin', 'padding'):
-                    css = {f'{prefix}-{x}' : str(y)+'pt' if isinstance(y, numbers.Number) else y
+                    css = {f'{prefix}-{x}': str(y)+'pt' if isinstance(y, numbers.Number) else y
                             for x, y in zip(('left', 'top', 'right', 'bottom'), s)}
                     css = '; '.join((f'{k}:{v}' for k, v in iteritems(css)))
                     style = parseStyle(css)
diff --git a/src/calibre/ebooks/oeb/parse_utils.py b/src/calibre/ebooks/oeb/parse_utils.py
index 9b18af37e8..cc60faf286 100644
--- a/src/calibre/ebooks/oeb/parse_utils.py
+++ b/src/calibre/ebooks/oeb/parse_utils.py
@@ -198,7 +198,7 @@ def parse_html(data, log=None, decoder=None, preprocessor=None,
                 user_entities[match.group(1)] = val
             if user_entities:
                 pat = re.compile(r'&(%s);'%('|'.join(list(user_entities.keys()))))
-                data = pat.sub(lambda m:user_entities[m.group(1)], data)
+                data = pat.sub(lambda m: user_entities[m.group(1)], data)
 
     if preprocessor is not None:
         data = preprocessor(data)
diff --git a/src/calibre/ebooks/oeb/polish/__init__.py b/src/calibre/ebooks/oeb/polish/__init__.py
index d91f720858..9c3d29d79e 100644
--- a/src/calibre/ebooks/oeb/polish/__init__.py
+++ b/src/calibre/ebooks/oeb/polish/__init__.py
@@ -4,6 +4,3 @@
 __license__   = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
-
-
-
diff --git a/src/calibre/ebooks/oeb/polish/cascade.py b/src/calibre/ebooks/oeb/polish/cascade.py
index fb163e24f4..078fde148a 100644
--- a/src/calibre/ebooks/oeb/polish/cascade.py
+++ b/src/calibre/ebooks/oeb/polish/cascade.py
@@ -102,7 +102,6 @@ def iterdeclaration(decl):
 
 
 class Values(tuple):
-
     ''' A tuple of `css_parser.css.Value ` (and its subclasses) objects. Also has a
     `sheet_name` attribute that is the canonical name relative to which URLs
     for this property should be resolved. '''
diff --git a/src/calibre/ebooks/oeb/polish/check/__init__.py b/src/calibre/ebooks/oeb/polish/check/__init__.py
index 0cbf055ec8..fb2e4b74e1 100644
--- a/src/calibre/ebooks/oeb/polish/check/__init__.py
+++ b/src/calibre/ebooks/oeb/polish/check/__init__.py
@@ -3,6 +3,3 @@
 
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
-
-
-
diff --git a/src/calibre/ebooks/oeb/polish/check/css.py b/src/calibre/ebooks/oeb/polish/check/css.py
index dfcb791f52..27c23fbbdc 100644
--- a/src/calibre/ebooks/oeb/polish/check/css.py
+++ b/src/calibre/ebooks/oeb/polish/check/css.py
@@ -90,7 +90,7 @@ def create_profile():
     if ans is None:
         ans = create_profile.ans = QWebEngineProfile(QApplication.instance())
         setup_profile(ans)
-        for (name, code) in stylelint_js():
+        for name, code in stylelint_js():
             s = QWebEngineScript()
             s.setName(name)
             s.setSourceCode(code)
diff --git a/src/calibre/ebooks/oeb/polish/check/links.py b/src/calibre/ebooks/oeb/polish/check/links.py
index de558d997f..d45b345301 100644
--- a/src/calibre/ebooks/oeb/polish/check/links.py
+++ b/src/calibre/ebooks/oeb/polish/check/links.py
@@ -189,7 +189,7 @@ class Bookmarks(BadLink):
     HELP = _(
         'This file stores the bookmarks and last opened information from'
         ' the calibre E-book viewer. You can remove it if you do not'
-        ' need that information, or don\'t want to share it with'
+        " need that information, or don't want to share it with"
         ' other people you send this book to.')
     INDIVIDUAL_FIX = _('Remove this file')
     level = INFO
@@ -454,7 +454,7 @@ def check_external_links(container, progress_callback=(lambda num, total:None),
                 done.append(None)
                 progress_callback(len(done), len(external_links))
 
-    workers = [Thread(name="CheckLinks", target=check_links) for i in range(min(10, len(external_links)))]
+    workers = [Thread(name='CheckLinks', target=check_links) for i in range(min(10, len(external_links)))]
     for w in workers:
         w.daemon = True
         w.start()
diff --git a/src/calibre/ebooks/oeb/polish/check/opf.py b/src/calibre/ebooks/oeb/polish/check/opf.py
index 0c977b75fa..eb4c2c1eb0 100644
--- a/src/calibre/ebooks/oeb/polish/check/opf.py
+++ b/src/calibre/ebooks/oeb/polish/check/opf.py
@@ -214,7 +214,7 @@ class MultipleCovers(BaseError):
         self.all_locations = [(name, lnum, None) for lnum in sorted(locs)]
 
     def __call__(self, container):
-        items = [e for e in container.opf_xpath('/opf:package/opf:metadata/opf:meta[@name="cover"]')]
+        items = list(container.opf_xpath('/opf:package/opf:metadata/opf:meta[@name="cover"]'))
         [container.remove_from_xml(e) for e in items[1:]]
         container.dirty(self.name)
         return True
diff --git a/src/calibre/ebooks/oeb/polish/check/parsing.py b/src/calibre/ebooks/oeb/polish/check/parsing.py
index 0961fb2253..b25e2e7f17 100644
--- a/src/calibre/ebooks/oeb/polish/check/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/check/parsing.py
@@ -105,7 +105,7 @@ class NamedEntities(BaseError):
         for name, mt in iteritems(container.mime_map):
             if mt in check_types:
                 raw = container.raw_data(name)
-                nraw = replace_pat.sub(lambda m:html5_entities[m.group(1)], raw)
+                nraw = replace_pat.sub(lambda m: html5_entities[m.group(1)], raw)
                 if raw != nraw:
                     changed = True
                     with container.open(name, 'wb') as f:
diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index 7aaea2408f..e7142696f7 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -163,11 +163,11 @@ class ContainerBase:  # {{{
         return adjust_mime_for_epub(filename=name, opf_version=self.opf_version_parsed)
 
     def decode(self, data, normalize_to_nfc=True):
-        """
+        '''
         Automatically decode ``data`` into a ``unicode`` object.
 
         :param normalize_to_nfc: Normalize returned unicode to the NFC normal form as is required by both the EPUB and AZW3 formats.
-        """
+        '''
         def fix_data(d):
             return d.replace('\r\n', '\n').replace('\r', '\n')
         if isinstance(data, str):
@@ -911,12 +911,12 @@ class Container(ContainerBase):  # {{{
         metadata = self.opf_xpath('//opf:metadata')[0]
         total_duration = 0
         for item_id, duration in (duration_map or {}).items():
-            meta = metadata.makeelement(OPF('meta'), property="media:duration", refines="#" + item_id)
+            meta = metadata.makeelement(OPF('meta'), property='media:duration', refines='#' + item_id)
             meta.text = seconds_to_timestamp(duration)
             self.insert_into_xml(metadata, meta)
             total_duration += duration
         if duration_map:
-            meta = metadata.makeelement(OPF('meta'), property="media:duration")
+            meta = metadata.makeelement(OPF('meta'), property='media:duration')
             meta.text = seconds_to_timestamp(total_duration)
             self.insert_into_xml(metadata, meta)
 
@@ -1129,8 +1129,8 @@ class Container(ContainerBase):  # {{{
         return '\n'.join(mismatches)
 # }}}
 
-# EPUB {{{
 
+# EPUB {{{
 
 class InvalidEpub(InvalidBook):
     pass
@@ -1340,7 +1340,7 @@ class EpubContainer(Container):
                     break
         if raw_unique_identifier is not None:
             idpf_key = raw_unique_identifier
-            idpf_key = re.sub('[\u0020\u0009\u000d\u000a]', '', idpf_key)
+            idpf_key = re.sub(r'[\u0020\u0009\u000d\u000a]', '', idpf_key)
             idpf_key = hashlib.sha1(idpf_key.encode('utf-8')).digest()
         return package_id, raw_unique_identifier, idpf_key
 
@@ -1468,8 +1468,8 @@ class EpubContainer(Container):
 
 # }}}
 
-# AZW3 {{{
 
+# AZW3 {{{
 
 class InvalidMobi(InvalidBook):
     pass
diff --git a/src/calibre/ebooks/oeb/polish/cover.py b/src/calibre/ebooks/oeb/polish/cover.py
index 3e34c15aa7..508343c234 100644
--- a/src/calibre/ebooks/oeb/polish/cover.py
+++ b/src/calibre/ebooks/oeb/polish/cover.py
@@ -105,10 +105,10 @@ def mark_as_cover(container, name):
     else:
         mark_as_cover_epub(container, name)
 
+
 ###############################################################################
 # The delightful EPUB cover processing
 
-
 def is_raster_image(media_type):
     return media_type and media_type.lower() in {
         'image/png', 'image/jpeg', 'image/jpg', 'image/gif'}
@@ -379,7 +379,7 @@ def create_epub_cover(container, cover_path, existing_image, options=None):
                     with open(cover_path, 'rb') as csrc:
                         width, height = identify(csrc)[1:]
             except:
-                container.log.exception("Failed to get width and height of cover")
+                container.log.exception('Failed to get width and height of cover')
             ar = 'xMidYMid meet' if keep_aspect else 'none'
             templ = CoverManager.SVG_TEMPLATE.replace('__ar__', ar)
             templ = templ.replace('__viewbox__', '0 0 %d %d'%(width, height))
diff --git a/src/calibre/ebooks/oeb/polish/create.py b/src/calibre/ebooks/oeb/polish/create.py
index c1c9900917..74bf3faf0e 100644
--- a/src/calibre/ebooks/oeb/polish/create.py
+++ b/src/calibre/ebooks/oeb/polish/create.py
@@ -80,7 +80,7 @@ def create_book(mi, path, fmt='epub', opf_name='metadata.opf', html_name='start.
     i = m.makeelement('{%s}item' % opfns, href=toc_name, id='ncx')
     i.set('media-type', guess_type(toc_name))
     m.append(i)
-    s = opf.makeelement('{%s}spine' % opfns, toc="ncx")
+    s = opf.makeelement('{%s}spine' % opfns, toc='ncx')
     opf.insert(2, s)
     i = s.makeelement('{%s}itemref' % opfns, idref='start')
     s.append(i)
diff --git a/src/calibre/ebooks/oeb/polish/embed.py b/src/calibre/ebooks/oeb/polish/embed.py
index 164f43d4bd..c74cfe7121 100644
--- a/src/calibre/ebooks/oeb/polish/embed.py
+++ b/src/calibre/ebooks/oeb/polish/embed.py
@@ -58,8 +58,8 @@ def stretch_as_number(val):
         pass
     try:
         return ('ultra-condensed', 'extra-condensed', 'condensed', 'semi-condensed',
-         'normal', 'semi-expanded', 'expanded', 'extra-expanded',
-         'ultra-expanded').index(val)
+                'normal', 'semi-expanded', 'expanded', 'extra-expanded',
+                'ultra-expanded').index(val)
     except Exception:
         return 4  # normal
 
diff --git a/src/calibre/ebooks/oeb/polish/fonts.py b/src/calibre/ebooks/oeb/polish/fonts.py
index 28bd209eb9..1c94c50483 100644
--- a/src/calibre/ebooks/oeb/polish/fonts.py
+++ b/src/calibre/ebooks/oeb/polish/fonts.py
@@ -112,7 +112,7 @@ def change_font_in_sheet(container, sheet, old_name, new_name, sheet_name):
         elif rule.type == rule.FONT_FACE_RULE:
             ff = rule.style.getProperty('font-family')
             if ff is not None:
-                families = {x for x in parse_font_family(css_text(ff.propertyValue))}
+                families = set(parse_font_family(css_text(ff.propertyValue)))
                 if old_name in families:
                     changed = True
                     removals.append(rule)
diff --git a/src/calibre/ebooks/oeb/polish/jacket.py b/src/calibre/ebooks/oeb/polish/jacket.py
index 272315b6cd..d2e87992c5 100644
--- a/src/calibre/ebooks/oeb/polish/jacket.py
+++ b/src/calibre/ebooks/oeb/polish/jacket.py
@@ -105,4 +105,3 @@ def add_or_replace_jacket(container):
         container.insert_into_xml(container.opf_xpath('//opf:spine')[0], itemref,
                               index=index)
     return found
-
diff --git a/src/calibre/ebooks/oeb/polish/main.py b/src/calibre/ebooks/oeb/polish/main.py
index 005af7113c..37a3f159be 100644
--- a/src/calibre/ebooks/oeb/polish/main.py
+++ b/src/calibre/ebooks/oeb/polish/main.py
@@ -155,7 +155,7 @@ def hfix(name, raw):
     return raw
 
 
-CLI_HELP = {x:hfix(x, re.sub('<.*?>', '', y)) for x, y in iteritems(HELP)}
+CLI_HELP = {x:hfix(x, re.sub(r'<.*?>', '', y)) for x, y in iteritems(HELP)}
 # }}}
 
 
diff --git a/src/calibre/ebooks/oeb/polish/opf.py b/src/calibre/ebooks/oeb/polish/opf.py
index f4448e2fda..f951c019a5 100644
--- a/src/calibre/ebooks/oeb/polish/opf.py
+++ b/src/calibre/ebooks/oeb/polish/opf.py
@@ -48,4 +48,3 @@ def set_guide_item(container, item_type, title, name, frag=None):
             else:
                 container.remove_from_xml(m)
     container.dirty(container.opf_name)
-
diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py
index f0abc42e78..1f20b6a9a2 100644
--- a/src/calibre/ebooks/oeb/polish/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/parsing.py
@@ -57,7 +57,7 @@ def handle_private_entities(data):
             if user_entities:
                 data = ('\n' * num_of_nl_in_pre) + data[idx:]
                 pat = re.compile(r'&(%s);'%('|'.join(user_entities.keys())))
-                data = pat.sub(lambda m:user_entities[m.group(1)], data)
+                data = pat.sub(lambda m: user_entities[m.group(1)], data)
     return data
 
 
diff --git a/src/calibre/ebooks/oeb/polish/pretty.py b/src/calibre/ebooks/oeb/polish/pretty.py
index c30a31c7ff..369ccf199f 100644
--- a/src/calibre/ebooks/oeb/polish/pretty.py
+++ b/src/calibre/ebooks/oeb/polish/pretty.py
@@ -75,7 +75,7 @@ def pretty_opf(root):
             i = spine_ids.get(x.get('id', None), 1000000000)
         else:
             i = sort_key(href)
-        return (cat, i)
+        return cat, i
 
     for manifest in root.xpath('//opf:manifest', namespaces=OPF_NAMESPACES):
         try:
diff --git a/src/calibre/ebooks/oeb/polish/report.py b/src/calibre/ebooks/oeb/polish/report.py
index 00dc9f5ccf..9c3f95b0ab 100644
--- a/src/calibre/ebooks/oeb/polish/report.py
+++ b/src/calibre/ebooks/oeb/polish/report.py
@@ -270,7 +270,7 @@ def css_data(container, book_locale, result_data, *args):
                     html_sheets[name].append(
                         css_rules(name, parser.parse_stylesheet(force_unicode(style.text, 'utf-8')).rules, style.sourceline - 1))
 
-    rule_map = defaultdict(lambda : defaultdict(list))
+    rule_map = defaultdict(lambda: defaultdict(list))
 
     def rules_in_sheet(sheet):
         for rule in sheet:
@@ -323,11 +323,11 @@ def css_data(container, book_locale, result_data, *args):
 
         return (MatchLocation(tag_text(elem), elem.sourceline) for elem in matches)
 
-    class_map = defaultdict(lambda : defaultdict(list))
+    class_map = defaultdict(lambda: defaultdict(list))
 
     for name, inline_sheets in iteritems(html_sheets):
         root = container.parsed(name)
-        cmap = defaultdict(lambda : defaultdict(list))
+        cmap = defaultdict(lambda: defaultdict(list))
         for elem in root.xpath('//*[@class]'):
             for cls in elem.get('class', '').split():
                 cmap[cls][elem] = []
diff --git a/src/calibre/ebooks/oeb/polish/spell.py b/src/calibre/ebooks/oeb/polish/spell.py
index f33f7ccfd9..60debbe450 100644
--- a/src/calibre/ebooks/oeb/polish/spell.py
+++ b/src/calibre/ebooks/oeb/polish/spell.py
@@ -22,7 +22,7 @@ _patterns = None
 
 class Patterns:
 
-    __slots__ = ('sanitize_invisible_pat', 'split_pat', 'digit_pat', 'fr_elision_pat')
+    __slots__ = ('digit_pat', 'fr_elision_pat', 'sanitize_invisible_pat', 'split_pat')
 
     def __init__(self):
         import regex
@@ -36,7 +36,7 @@ class Patterns:
         # French words with prefixes are reduced to the stem word, so that the
         # words appear only once in the word list
         self.fr_elision_pat = regex.compile(
-            "^(?:l|d|m|t|s|j|c|ç|lorsqu|puisqu|quoiqu|qu)['’]", flags=regex.UNICODE | regex.VERSION1 | regex.IGNORECASE)
+            r"^(?:l|d|m|t|s|j|c|ç|lorsqu|puisqu|quoiqu|qu)['’]", flags=regex.UNICODE | regex.VERSION1 | regex.IGNORECASE)
 
 
 def patterns():
@@ -56,7 +56,7 @@ class CharCounter:
 
 class Location:
 
-    __slots__ = ('file_name', 'sourceline', 'original_word', 'location_node', 'node_item', 'elided_prefix')
+    __slots__ = ('elided_prefix', 'file_name', 'location_node', 'node_item', 'original_word', 'sourceline')
 
     def __init__(self, file_name=None, elided_prefix='', original_word=None, location_node=None, node_item=(None, None)):
         self.file_name, self.elided_prefix, self.original_word = file_name, elided_prefix, original_word
@@ -162,10 +162,10 @@ def count_chars_in_escaped_html(text, counter, file_name, node, attr, locale):
 _opf_file_as = '{%s}file-as' % OPF_NAMESPACES['opf']
 opf_spell_tags = {'title', 'creator', 'subject', 'description', 'publisher'}
 
+
 # We can only use barename() for tag names and simple attribute checks so that
 # this code matches up with the syntax highlighter base spell checking
 
-
 def read_words_from_opf(root, words, file_name, book_locale):
     for tag in root.iterdescendants('*'):
         if barename(tag.tag) in opf_spell_tags:
diff --git a/src/calibre/ebooks/oeb/polish/tests/__init__.py b/src/calibre/ebooks/oeb/polish/tests/__init__.py
index 0cbf055ec8..fb2e4b74e1 100644
--- a/src/calibre/ebooks/oeb/polish/tests/__init__.py
+++ b/src/calibre/ebooks/oeb/polish/tests/__init__.py
@@ -3,6 +3,3 @@
 
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
-
-
-
diff --git a/src/calibre/ebooks/oeb/polish/tests/container.py b/src/calibre/ebooks/oeb/polish/tests/container.py
index 0f58c40735..2846d70464 100644
--- a/src/calibre/ebooks/oeb/polish/tests/container.py
+++ b/src/calibre/ebooks/oeb/polish/tests/container.py
@@ -236,8 +236,8 @@ class ContainerTests(BaseTest):
         book = get_simple_book()
         c = get_container(book)
         one, two = 'one/one.html', 'two/two.html'
-        c.add_file(one, b'<head><link href="../stylesheet.css"><p><a name="one" href="../two/two.html">1</a><a name="two" href="../two/two.html#one">2</a>')  # noqa
-        c.add_file(two, b'<head><link href="../page_styles.css"><p><a name="one" href="two.html#two">1</a><a name="two" href="../one/one.html#one">2</a><a href="#one">3</a>')  # noqa
+        c.add_file(one, b'<head><link href="../stylesheet.css"><p><a name="one" href="../two/two.html">1</a><a name="two" href="../two/two.html#one">2</a>')  # noqa: E501
+        c.add_file(two, b'<head><link href="../page_styles.css"><p><a name="one" href="two.html#two">1</a><a name="two" href="../one/one.html#one">2</a><a href="#one">3</a>')  # noqa: E501
         merge(c, 'text', (one, two), one)
         self.check_links(c)
         root = c.parsed(one)
diff --git a/src/calibre/ebooks/oeb/polish/tests/main.py b/src/calibre/ebooks/oeb/polish/tests/main.py
index c383be43fa..91540bc232 100644
--- a/src/calibre/ebooks/oeb/polish/tests/main.py
+++ b/src/calibre/ebooks/oeb/polish/tests/main.py
@@ -13,7 +13,7 @@ def find_tests():
 
 if __name__ == '__main__':
     try:
-        import init_calibre  # noqa
+        import init_calibre  # noqa: F401
     except ImportError:
         pass
     run_tests(find_tests)
diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py
index b65b697af0..cf89a9e0c8 100644
--- a/src/calibre/ebooks/oeb/polish/tests/parsing.py
+++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -132,7 +132,7 @@ def entities(test, parse_function):
     markup = '<html><p>&nbsp;&apos;</p>'
     root = parse_function(markup)
     err = 'Entities not handled, parsed markup:\n' + etree.tostring(root, encoding='unicode')
-    test.assertEqual('\xa0\'', root.xpath('//*[local-name()="p"]')[0].text, err)
+    test.assertEqual("\xa0'", root.xpath('//*[local-name()="p"]')[0].text, err)
 
 
 def multiple_html_and_body(test, parse_function):
diff --git a/src/calibre/ebooks/oeb/polish/tests/structure.py b/src/calibre/ebooks/oeb/polish/tests/structure.py
index 833a530b01..5370f6d6ba 100644
--- a/src/calibre/ebooks/oeb/polish/tests/structure.py
+++ b/src/calibre/ebooks/oeb/polish/tests/structure.py
@@ -28,11 +28,11 @@ OPF_TEMPLATE = '''
     <manifest>{manifest}</manifest>
     <spine>{spine}</spine>
     <guide>{guide}</guide>
-</package>''' % CALIBRE_PREFIX  # noqa
+</package>''' % CALIBRE_PREFIX
 
 
 def create_manifest_item(name, data=b'', properties=None):
-    return (name, data, properties)
+    return name, data, properties
 
 
 cmi = create_manifest_item
@@ -93,7 +93,7 @@ class Structure(BaseTest):
         self.assertTrue(len(get_toc(c)))  # detect NCX toc even in epub 3 files
         c.add_file('nav.html', b'<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops">'
                    b'<body><nav epub:type="toc"><ol><li><a href="start.xhtml">EPUB 3 nav</a></li></ol></nav></body></html>',
-                   process_manifest_item=lambda item:item.set('properties', 'nav'))
+                   process_manifest_item=lambda item: item.set('properties', 'nav'))
         toc = get_toc(c)
         self.assertTrue(len(toc))
         self.assertEqual(toc.as_dict['children'][0]['title'], 'EPUB 3 nav')
@@ -133,7 +133,7 @@ class Structure(BaseTest):
                    b'<body><nav epub:type="landmarks"><ol><li><a epub:type="x" href="../xxx.html#moo">XXX </a></li>'
                    b'<li><a href="../a.html"> YYY </a></li>'
                    b'</ol></nav></body></html>',
-                   process_manifest_item=lambda item:item.set('properties', 'nav'))
+                   process_manifest_item=lambda item: item.set('properties', 'nav'))
         self.assertEqual([
             {'dest':'xxx.html', 'frag':'moo', 'type':'x', 'title':'XXX'}, {'dest':'a.html', 'frag':'', 'type':'', 'title':'YYY'}
         ], get_landmarks(c))
diff --git a/src/calibre/ebooks/oeb/polish/toc.py b/src/calibre/ebooks/oeb/polish/toc.py
index 602b278940..24b5b79299 100644
--- a/src/calibre/ebooks/oeb/polish/toc.py
+++ b/src/calibre/ebooks/oeb/polish/toc.py
@@ -93,7 +93,7 @@ class TOC:
 
     @property
     def depth(self):
-        """The maximum depth of the navigation tree rooted at this node."""
+        '''The maximum depth of the navigation tree rooted at this node.'''
         try:
             return max(node.depth for node in self) + 1
         except ValueError:
@@ -871,7 +871,7 @@ def toc_to_html(toc, container, toc_name, title, lang=None):
         E.body(
             E.h2(title),
             E.ul(),
-            id="calibre_generated_inline_toc",
+            id='calibre_generated_inline_toc',
         )
     )
 
diff --git a/src/calibre/ebooks/oeb/polish/tts.py b/src/calibre/ebooks/oeb/polish/tts.py
index 60bdef228d..b78ff24596 100644
--- a/src/calibre/ebooks/oeb/polish/tts.py
+++ b/src/calibre/ebooks/oeb/polish/tts.py
@@ -220,7 +220,7 @@ def mark_sentences_in_html(root, lang: str = '', voice: str = '') -> list[Senten
                 end_offset = len(self.texts[-1].text)
             assert start_chunk > -1
             s, e = self.texts[start_chunk], self.texts[end_chunk]
-            if s.child is None: # start in leading text of parent element
+            if s.child is None:  # start in leading text of parent element
                 if e is s:  # end also in leading text of parent element
                     before, sentence, after = s.text[:start_offset], s.text[start_offset:end_offset], s.text[end_offset:]
                     self.elem.text = before
diff --git a/src/calibre/ebooks/oeb/polish/upgrade.py b/src/calibre/ebooks/oeb/polish/upgrade.py
index 55846a12ad..06940639e7 100644
--- a/src/calibre/ebooks/oeb/polish/upgrade.py
+++ b/src/calibre/ebooks/oeb/polish/upgrade.py
@@ -90,50 +90,50 @@ def collect_properties(container):
 
 
 guide_epubtype_map = {
-     'acknowledgements'   : 'acknowledgments',
-     'other.afterword'    : 'afterword',
-     'other.appendix'     : 'appendix',
-     'other.backmatter'   : 'backmatter',
-     'bibliography'       : 'bibliography',
-     'text'               : 'bodymatter',
-     'other.chapter'      : 'chapter',
-     'colophon'           : 'colophon',
-     'other.conclusion'   : 'conclusion',
-     'other.contributors' : 'contributors',
-     'copyright-page'     : 'copyright-page',
-     'cover'              : 'cover',
-     'dedication'         : 'dedication',
-     'other.division'     : 'division',
-     'epigraph'           : 'epigraph',
-     'other.epilogue'     : 'epilogue',
-     'other.errata'       : 'errata',
-     'other.footnotes'    : 'footnotes',
-     'foreword'           : 'foreword',
-     'other.frontmatter'  : 'frontmatter',
-     'glossary'           : 'glossary',
-     'other.halftitlepage': 'halftitlepage',
-     'other.imprint'      : 'imprint',
-     'other.imprimatur'   : 'imprimatur',
-     'index'              : 'index',
-     'other.introduction' : 'introduction',
-     'other.landmarks'    : 'landmarks',
-     'other.loa'          : 'loa',
-     'loi'                : 'loi',
-     'lot'                : 'lot',
-     'other.lov'          : 'lov',
-     'notes'              : '',
-     'other.notice'       : 'notice',
-     'other.other-credits': 'other-credits',
-     'other.part'         : 'part',
-     'other.preamble'     : 'preamble',
-     'preface'            : 'preface',
-     'other.prologue'     : 'prologue',
-     'other.rearnotes'    : 'rearnotes',
-     'other.subchapter'   : 'subchapter',
-     'title-page'         : 'titlepage',
-     'toc'                : 'toc',
-     'other.volume'       : 'volume',
-     'other.warning'      : 'warning'
+    'acknowledgements'   : 'acknowledgments',
+    'other.afterword'    : 'afterword',
+    'other.appendix'     : 'appendix',
+    'other.backmatter'   : 'backmatter',
+    'bibliography'       : 'bibliography',
+    'text'               : 'bodymatter',
+    'other.chapter'      : 'chapter',
+    'colophon'           : 'colophon',
+    'other.conclusion'   : 'conclusion',
+    'other.contributors' : 'contributors',
+    'copyright-page'     : 'copyright-page',
+    'cover'              : 'cover',
+    'dedication'         : 'dedication',
+    'other.division'     : 'division',
+    'epigraph'           : 'epigraph',
+    'other.epilogue'     : 'epilogue',
+    'other.errata'       : 'errata',
+    'other.footnotes'    : 'footnotes',
+    'foreword'           : 'foreword',
+    'other.frontmatter'  : 'frontmatter',
+    'glossary'           : 'glossary',
+    'other.halftitlepage': 'halftitlepage',
+    'other.imprint'      : 'imprint',
+    'other.imprimatur'   : 'imprimatur',
+    'index'              : 'index',
+    'other.introduction' : 'introduction',
+    'other.landmarks'    : 'landmarks',
+    'other.loa'          : 'loa',
+    'loi'                : 'loi',
+    'lot'                : 'lot',
+    'other.lov'          : 'lov',
+    'notes'              : '',
+    'other.notice'       : 'notice',
+    'other.other-credits': 'other-credits',
+    'other.part'         : 'part',
+    'other.preamble'     : 'preamble',
+    'preface'            : 'preface',
+    'other.prologue'     : 'prologue',
+    'other.rearnotes'    : 'rearnotes',
+    'other.subchapter'   : 'subchapter',
+    'title-page'         : 'titlepage',
+    'toc'                : 'toc',
+    'other.volume'       : 'volume',
+    'other.warning'      : 'warning'
 }
 
 
diff --git a/src/calibre/ebooks/oeb/polish/utils.py b/src/calibre/ebooks/oeb/polish/utils.py
index 122aa3cb09..5af4d42e17 100644
--- a/src/calibre/ebooks/oeb/polish/utils.py
+++ b/src/calibre/ebooks/oeb/polish/utils.py
@@ -117,7 +117,7 @@ def corrected_case_for_name(container, name):
             correctx = x
         else:
             try:
-                candidates = {q for q in os.listdir(os.path.dirname(container.name_to_abspath(base)))}
+                candidates = set(os.listdir(os.path.dirname(container.name_to_abspath(base))))
             except OSError:
                 return None  # one of the non-terminal components of name is a file instead of a directory
             for q in candidates:
@@ -213,7 +213,7 @@ def lead_text(top_elem, num_words=10):
         if attr == 'text':
             if elem is not top_elem:
                 stack.append((elem, 'tail'))
-            stack.extend(reversed(list((c, 'text') for c in elem.iterchildren('*'))))
+            stack.extend(reversed([(c, 'text') for c in elem.iterchildren('*')]))
     return ' '.join(words[:num_words])
 
 
diff --git a/src/calibre/ebooks/oeb/reader.py b/src/calibre/ebooks/oeb/reader.py
index 632cce3344..83141ee051 100644
--- a/src/calibre/ebooks/oeb/reader.py
+++ b/src/calibre/ebooks/oeb/reader.py
@@ -1,6 +1,6 @@
-"""
+'''
 Container-/OPF-based input OEBBook reader.
-"""
+'''
 
 
 __license__   = 'GPL v3'
@@ -59,36 +59,36 @@ __all__ = ['OEBReader']
 
 
 class OEBReader:
-    """Read an OEBPS 1.x or OPF/OPS 2.0 file collection."""
+    '''Read an OEBPS 1.x or OPF/OPS 2.0 file collection.'''
 
     COVER_SVG_XP    = XPath('h:body//svg:svg[position() = 1]')
     COVER_OBJECT_XP = XPath('h:body//h:object[@data][position() = 1]')
 
     Container = DirContainer
-    """Container type used to access book files.  Override in sub-classes."""
+    '''Container type used to access book files.  Override in sub-classes.'''
 
     DEFAULT_PROFILE = 'PRS505'
-    """Default renderer profile for content read with this Reader."""
+    '''Default renderer profile for content read with this Reader.'''
 
     TRANSFORMS = []
-    """List of transforms to apply to content read with this Reader."""
+    '''List of transforms to apply to content read with this Reader.'''
 
     @classmethod
     def config(cls, cfg):
-        """Add any book-reading options to the :class:`Config` object
+        '''Add any book-reading options to the :class:`Config` object
         :param:`cfg`.
-        """
+        '''
         return
 
     @classmethod
     def generate(cls, opts):
-        """Generate a Reader instance from command-line options."""
+        '''Generate a Reader instance from command-line options.'''
         return cls()
 
     def __call__(self, oeb, path):
-        """Read the book at :param:`path` into the :class:`OEBBook` object
+        '''Read the book at :param:`path` into the :class:`OEBBook` object
         :param:`oeb`.
-        """
+        '''
         self.oeb = oeb
         self.logger = self.log = oeb.logger
         oeb.container = self.Container(path, self.logger)
@@ -368,7 +368,7 @@ class OEBReader:
                     self.oeb.log.warn('The item %s is not a XML document.'
                         ' Removing it from spine.'%item.href)
         if len(spine) == 0:
-            raise OEBError("Spine is empty")
+            raise OEBError('Spine is empty')
         self._spine_add_extra()
         for val in xpath(opf, '/o2:package/o2:spine/@page-progression-direction'):
             if val in {'ltr', 'rtl'}:
diff --git a/src/calibre/ebooks/oeb/stylizer.py b/src/calibre/ebooks/oeb/stylizer.py
index 4f662ecdf8..9bd7e6fca8 100644
--- a/src/calibre/ebooks/oeb/stylizer.py
+++ b/src/calibre/ebooks/oeb/stylizer.py
@@ -66,7 +66,7 @@ FONT_SIZE_NAMES = {
 }
 
 ALLOWED_MEDIA_TYPES = frozenset({'screen', 'all', 'aural', 'amzn-kf8'})
-IGNORED_MEDIA_FEATURES = frozenset('width min-width max-width height min-height max-height device-width min-device-width max-device-width device-height min-device-height max-device-height aspect-ratio min-aspect-ratio max-aspect-ratio device-aspect-ratio min-device-aspect-ratio max-device-aspect-ratio color min-color max-color color-index min-color-index max-color-index monochrome min-monochrome max-monochrome -webkit-min-device-pixel-ratio resolution min-resolution max-resolution scan grid'.split())  # noqa
+IGNORED_MEDIA_FEATURES = frozenset('width min-width max-width height min-height max-height device-width min-device-width max-device-width device-height min-device-height max-device-height aspect-ratio min-aspect-ratio max-aspect-ratio device-aspect-ratio min-device-aspect-ratio max-device-aspect-ratio color min-color max-color color-index min-color-index max-color-index monochrome min-monochrome max-monochrome -webkit-min-device-pixel-ratio resolution min-resolution max-resolution scan grid'.split())  # noqa: E501
 
 
 def media_ok(raw):
@@ -184,7 +184,7 @@ class StylizerRules:
             if size == 'smallest':
                 size = 'xx-small'
             if size in FONT_SIZE_NAMES:
-                style['font-size'] = "%.1frem" % (self.profile.fnames[size] / float(self.profile.fbase))
+                style['font-size'] = '%.1frem' % (self.profile.fnames[size] / float(self.profile.fbase))
         if '-epub-writing-mode' in style:
             for x in ('-webkit-writing-mode', 'writing-mode'):
                 style[x] = style.get(x, style['-epub-writing-mode'])
@@ -396,15 +396,15 @@ class Stylizer:
         hrefs = self.oeb.manifest.hrefs
         if path not in hrefs:
             self.logger.warn('CSS import of missing file %r' % path)
-            return (None, None)
+            return None, None
         item = hrefs[path]
         if item.media_type not in OEB_STYLES:
             self.logger.warn('CSS import of non-CSS file %r' % path)
-            return (None, None)
+            return None, None
         data = item.data.cssText
         if not isinstance(data, bytes):
             data = data.encode('utf-8')
-        return ('utf-8', data)
+        return 'utf-8', data
 
     def style(self, element):
         try:
@@ -421,7 +421,7 @@ class Stylizer:
                     style['font-size'].endswith('pt'):
                 style = copy.copy(style)
                 size = float(style['font-size'][:-2])
-                style['font-size'] = "%.2fpt" % (size * font_scale)
+                style['font-size'] = '%.2fpt' % (size * font_scale)
             style = ';\n    '.join(': '.join(item) for item in style.items())
             rules.append(f'{selector} {{\n    {style};\n}}')
         return '\n'.join(rules)
@@ -438,6 +438,7 @@ def is_only_number(x: str) -> bool:
     except Exception:
         return False
 
+
 def is_svg_text_tag(x):
     return getattr(x, 'tag', '') in svg_text_tags
 
@@ -628,7 +629,7 @@ class Style:
                 if not isinstance(result, numbers.Number):
                     return base
                 if result < 0:
-                    result = normalize_fontsize("smaller", base)
+                    result = normalize_fontsize('smaller', base)
             if factor:
                 result = factor * base
             return result
@@ -854,7 +855,7 @@ class Style:
 
     def __str__(self):
         items = sorted(iteritems(self._style))
-        return '; '.join(f"{key}: {val}" for key, val in items)
+        return '; '.join(f'{key}: {val}' for key, val in items)
 
     def cssdict(self):
         return dict(self._style)
diff --git a/src/calibre/ebooks/oeb/transforms/cover.py b/src/calibre/ebooks/oeb/transforms/cover.py
index 54ea9260d7..25571fd539 100644
--- a/src/calibre/ebooks/oeb/transforms/cover.py
+++ b/src/calibre/ebooks/oeb/transforms/cover.py
@@ -140,7 +140,7 @@ class CoverManager:
                 self.log.warning('Failed to read cover dimensions')
                 width, height = 600, 800
             # if self.preserve_aspect_ratio:
-            #    width, height = 600, 800
+            #     width, height = 600, 800
             self.svg_template = self.svg_template.replace('__viewbox__',
                     '0 0 %d %d'%(width, height))
             self.svg_template = self.svg_template.replace('__width__',
diff --git a/src/calibre/ebooks/oeb/transforms/embed_fonts.py b/src/calibre/ebooks/oeb/transforms/embed_fonts.py
index 3cb1740cf4..5f6a743354 100644
--- a/src/calibre/ebooks/oeb/transforms/embed_fonts.py
+++ b/src/calibre/ebooks/oeb/transforms/embed_fonts.py
@@ -86,7 +86,6 @@ def used_font(style, embedded_fonts):
 
 
 class EmbedFonts:
-
     '''
     Embed all referenced fonts, if found on system. Must be called after CSS flattening.
     '''
diff --git a/src/calibre/ebooks/oeb/transforms/filenames.py b/src/calibre/ebooks/oeb/transforms/filenames.py
index 36b55a30ce..485862fe39 100644
--- a/src/calibre/ebooks/oeb/transforms/filenames.py
+++ b/src/calibre/ebooks/oeb/transforms/filenames.py
@@ -154,7 +154,7 @@ class FlatFilenames:  # {{{
         for item in list(oeb.manifest.items):
             # Flatten URL by removing directories.
             # Example: a/b/c/index.html -> a_b_c_index.html
-            nhref = item.href.replace("/", "_")
+            nhref = item.href.replace('/', '_')
 
             if item.href == nhref:
                 # URL hasn't changed, skip item.
diff --git a/src/calibre/ebooks/oeb/transforms/flatcss.py b/src/calibre/ebooks/oeb/transforms/flatcss.py
index 1b5e057d0d..d3df1ebe3b 100644
--- a/src/calibre/ebooks/oeb/transforms/flatcss.py
+++ b/src/calibre/ebooks/oeb/transforms/flatcss.py
@@ -290,7 +290,7 @@ class CSSFlattener:
             body = html.find(XHTML('body'))
             if 'style' in html.attrib:
                 b = body.attrib.get('style', '')
-                body.set('style',  html.get('style') + ';' + b)
+                body.set('style', html.get('style') + ';' + b)
                 del html.attrib['style']
             bs = body.get('style', '').split(';')
             bs.append('margin-top: 0pt')
@@ -336,7 +336,7 @@ class CSSFlattener:
         except:
             sbase = 12.0
         self.oeb.logger.info(
-            "Source base font size is %0.05fpt" % sbase)
+            'Source base font size is %0.05fpt' % sbase)
         return sbase
 
     def clean_edges(self, cssdict, style, fsize):
@@ -344,7 +344,7 @@ class CSSFlattener:
         dlineh = self.lineh
         for kind in ('margin', 'padding'):
             for edge in ('bottom', 'top'):
-                property = f"{kind}-{edge}"
+                property = f'{kind}-{edge}'
                 if property not in cssdict:
                     continue
                 if '%' in cssdict[property]:
@@ -353,7 +353,7 @@ class CSSFlattener:
                 if value == 0 or not isinstance(value, numbers.Number):
                     continue
                 if value <= slineh:
-                    cssdict[property] = "%0.5fem" % (dlineh / fsize)
+                    cssdict[property] = '%0.5fem' % (dlineh / fsize)
                 else:
                     try:
                         value = round(value / slineh) * dlineh
@@ -361,7 +361,7 @@ class CSSFlattener:
                         self.oeb.logger.warning(
                                 'Invalid length:', value)
                         value = 0.0
-                    cssdict[property] = "%0.5fem" % (value / fsize)
+                    cssdict[property] = '%0.5fem' % (value / fsize)
 
     def flatten_node(self, node, stylizer, names, styles, pseudo_styles, psize, item_id, recurse=True):
         if not isinstance(node.tag, string_or_bytes) or namespace(node.tag) not in (XHTML_NS, SVG_NS):
@@ -388,7 +388,7 @@ class CSSFlattener:
                         if 'margin-left' not in cssdict and 'margin-right' not in cssdict:
                             cssdict['margin-left'] = cssdict['margin-right'] = 'auto'
                     else:
-                        for table in node.iterchildren(XHTML("table")):
+                        for table in node.iterchildren(XHTML('table')):
                             ts = stylizer.style(table)
                             if ts.get('margin-left') is None and ts.get('margin-right') is None:
                                 ts.set('margin-left', 'auto')
@@ -481,7 +481,7 @@ class CSSFlattener:
             elif 'font-size' in cssdict or tag == 'body':
                 fsize = self.fmap[font_size]
                 try:
-                    cssdict['font-size'] = "%0.5fem" % (fsize / psize)
+                    cssdict['font-size'] = '%0.5fem' % (fsize / psize)
                 except ZeroDivisionError:
                     cssdict['font-size'] = '%.1fpt'%fsize
                 psize = fsize
@@ -521,7 +521,7 @@ class CSSFlattener:
                 cssdict['vertical-align'] = 'super'
         if self.lineh and 'line-height' not in cssdict and tag != 'html':
             lineh = self.lineh / psize
-            cssdict['line-height'] = "%0.5fem" % lineh
+            cssdict['line-height'] = '%0.5fem' % lineh
 
         if (self.context.remove_paragraph_spacing or self.context.insert_blank_line) and tag in ('p', 'div'):
             if item_id != 'calibre_jacket' or self.context.output_profile.name == 'Kindle':
@@ -534,7 +534,7 @@ class CSSFlattener:
             indent_size = self.context.remove_paragraph_spacing_indent_size
             keep_indents = indent_size < 0.0
             if (self.context.remove_paragraph_spacing and not keep_indents and cssdict.get('text-align', None) not in ('center', 'right')):
-                cssdict['text-indent'] =  "%1.1fem" % indent_size
+                cssdict['text-indent'] = '%1.1fem' % indent_size
 
         pseudo_classes = style.pseudo_classes(self.filter_css)
         if cssdict or pseudo_classes:
@@ -659,7 +659,7 @@ class CSSFlattener:
                 stylizer.page_rule['margin-bottom'] = '%gpt'%\
                         float(self.context.margin_bottom)
             items = sorted(stylizer.page_rule.items())
-            css = ';\n'.join(f"{key}: {val}" for key, val in items)
+            css = ';\n'.join(f'{key}: {val}' for key, val in items)
             css = ('@page {\n%s\n}\n'%css) if items else ''
             rules = [css_text(r) for r in unique_font_face_rules(*stylizer.font_face_rules, *rules_in(self.embed_font_rules))]
             raw = '\n\n'.join(rules)
@@ -696,9 +696,9 @@ class CSSFlattener:
             fsize = self.context.dest.fbase
             self.flatten_node(html, stylizer, names, styles, pseudo_styles, fsize, item.id, recurse=False)
             self.flatten_node(html.find(XHTML('body')), stylizer, names, styles, pseudo_styles, fsize, item.id)
-        items = sorted(((key, val) for (val, key) in iteritems(styles)), key=lambda x:numeric_sort_key(x[0]))
+        items = sorted(((key, val) for (val, key) in iteritems(styles)), key=lambda x: numeric_sort_key(x[0]))
         # :hover must come after link and :active must come after :hover
-        psels = sorted(pseudo_styles, key=lambda x :
+        psels = sorted(pseudo_styles, key=lambda x:
                 {'hover':1, 'active':2}.get(x, 0))
         for psel in psels:
             styles = pseudo_styles[psel]
@@ -707,7 +707,7 @@ class CSSFlattener:
             x = sorted(((k+':'+psel, v) for v, k in iteritems(styles)))
             items.extend(x)
 
-        css = ''.join(f".{key} {{\n{val};\n}}\n\n" for key, val in items)
+        css = ''.join(f'.{key} {{\n{val};\n}}\n\n' for key, val in items)
 
         href = self.replace_css(css)
         global_css = self.collect_global_css()
diff --git a/src/calibre/ebooks/oeb/transforms/htmltoc.py b/src/calibre/ebooks/oeb/transforms/htmltoc.py
index bb93a58d61..b68a0b52ea 100644
--- a/src/calibre/ebooks/oeb/transforms/htmltoc.py
+++ b/src/calibre/ebooks/oeb/transforms/htmltoc.py
@@ -13,7 +13,7 @@ __all__ = ['HTMLTOCAdder']
 DEFAULT_TITLE = __('Table of Contents')
 
 STYLE_CSS = {
-    'nested': """
+    'nested': '''
 .calibre_toc_header {
   text-align: center;
 }
@@ -27,9 +27,9 @@ STYLE_CSS = {
 .calibre_toc_block .calibre_toc_block .calibre_toc_block {
   margin-left: 3.6em;
 }
-""",
+''',
 
-    'centered': """
+    'centered': '''
 .calibre_toc_header {
   text-align: center;
 }
@@ -39,7 +39,7 @@ STYLE_CSS = {
 body > .calibre_toc_block {
   margin-top: 1.2em;
 }
-"""
+'''
     }
 
 
diff --git a/src/calibre/ebooks/oeb/transforms/jacket.py b/src/calibre/ebooks/oeb/transforms/jacket.py
index 9e5932c191..26cabb09d2 100644
--- a/src/calibre/ebooks/oeb/transforms/jacket.py
+++ b/src/calibre/ebooks/oeb/transforms/jacket.py
@@ -160,8 +160,8 @@ class Jacket(Base):
         if opts.insert_metadata:
             self.insert_metadata(metadata)
 
-# Render Jacket {{{
 
+# Render Jacket {{{
 
 def get_rating(rating, rchar, e_rchar):
     ans = ''
@@ -174,7 +174,7 @@ def get_rating(rating, rchar, e_rchar):
     if num < 1:
         return ans
 
-    ans = ("%s%s") % (rchar * int(num), e_rchar * (5 - int(num)))
+    ans = ('%s%s') % (rchar * int(num), e_rchar * (5 - int(num)))
     return ans
 
 
@@ -332,23 +332,24 @@ def render_jacket(mi, output_profile,
 
     def generate_html(comments):
         display = Attributes()
-        args = dict(xmlns=XHTML_NS,
-            title_str=title_str,
-            identifiers=Identifiers(mi.identifiers),
-            css=css,
-            title=title,
-            author=author,
-            publisher=publisher, publisher_label=_('Publisher'),
-            pubdate_label=_('Published'), pubdate=Timestamp(pubdate, tweaks['gui_pubdate_display_format']),
-            series_label=ngettext('Series', 'Series', 1), series=series,
-            rating_label=_('Rating'), rating=rating,
-            tags_label=_('Tags'), tags=tags,
-            timestamp=Timestamp(timestamp, tweaks['gui_timestamp_display_format']), timestamp_label=_('Date'),
-            comments=comments,
-            footer='',
-            display=display,
-            searchable_tags=' '.join(escape(t)+'ttt' for t in tags.tags_list),
-        )
+        args = {
+            'xmlns': XHTML_NS,
+            'title_str': title_str,
+            'identifiers': Identifiers(mi.identifiers),
+            'css': css,
+            'title': title,
+            'author': author,
+            'publisher': publisher, 'publisher_label': _('Publisher'),
+            'pubdate_label': _('Published'), 'pubdate': Timestamp(pubdate, tweaks['gui_pubdate_display_format']),
+            'series_label': ngettext('Series', 'Series', 1), 'series': series,
+            'rating_label': _('Rating'), 'rating': rating,
+            'tags_label': _('Tags'), 'tags': tags,
+            'timestamp': Timestamp(timestamp, tweaks['gui_timestamp_display_format']), 'timestamp_label': _('Date'),
+            'comments': comments,
+            'footer': '',
+            'display': display,
+            'searchable_tags': ' '.join(escape(t)+'ttt' for t in tags.tags_list),
+        }
         for key in mi.custom_field_keys():
             m = mi.get_user_metadata(key, False) or {}
             try:
@@ -389,10 +390,10 @@ def render_jacket(mi, output_profile,
                 pass
 
         if False:
-            print("Custom column values available in jacket template:")
+            print('Custom column values available in jacket template:')
             for key in args.keys():
                 if key.startswith('_') and not key.endswith('_label'):
-                    print(" {}: {}".format('#' + key[1:], args[key]))
+                    print(' {}: {}'.format('#' + key[1:], args[key]))
 
         # Used in the comment describing use of custom columns in templates
         # Don't change this unless you also change it in template.xhtml
diff --git a/src/calibre/ebooks/oeb/transforms/manglecase.py b/src/calibre/ebooks/oeb/transforms/manglecase.py
index 7df2d9e330..aebd76a930 100644
--- a/src/calibre/ebooks/oeb/transforms/manglecase.py
+++ b/src/calibre/ebooks/oeb/transforms/manglecase.py
@@ -14,12 +14,12 @@ from calibre.utils.icu import title_case as icu_title
 from calibre.utils.icu import upper as icu_upper
 from polyglot.builtins import string_or_bytes
 
-CASE_MANGLER_CSS = """
+CASE_MANGLER_CSS = '''
 .calibre_lowercase {
     font-variant: normal;
     font-size: 0.65em;
 }
-"""
+'''
 
 TEXT_TRANSFORMS = {'capitalize', 'uppercase', 'lowercase'}
 
diff --git a/src/calibre/ebooks/oeb/transforms/metadata.py b/src/calibre/ebooks/oeb/transforms/metadata.py
index bd99f0d0bf..7893793c37 100644
--- a/src/calibre/ebooks/oeb/transforms/metadata.py
+++ b/src/calibre/ebooks/oeb/transforms/metadata.py
@@ -24,17 +24,17 @@ def meta_info_to_oeb_metadata(mi, m, log, override_input_metadata=False):
         m.clear('title_sort')
         m.add('title_sort', mi.title_sort)
     if not mi.is_null('authors'):
-        m.filter('creator', lambda x : x.role.lower() in ['aut', ''])
+        m.filter('creator', lambda x: x.role.lower() in ['aut', ''])
         for a in mi.authors:
             attrib = {'role':'aut'}
             if mi.author_sort:
                 attrib[OPF('file-as')] = mi.author_sort
             m.add('creator', a, attrib=attrib)
     if not mi.is_null('book_producer'):
-        m.filter('contributor', lambda x : x.role.lower() == 'bkp')
+        m.filter('contributor', lambda x: x.role.lower() == 'bkp')
         m.add('contributor', mi.book_producer, role='bkp')
     elif override_input_metadata:
-        m.filter('contributor', lambda x : x.role.lower() == 'bkp')
+        m.filter('contributor', lambda x: x.role.lower() == 'bkp')
     if not mi.is_null('comments'):
         m.clear('description')
         m.add('description', mi.comments)
diff --git a/src/calibre/ebooks/oeb/transforms/page_margin.py b/src/calibre/ebooks/oeb/transforms/page_margin.py
index 7b49788e15..dea03502d0 100644
--- a/src/calibre/ebooks/oeb/transforms/page_margin.py
+++ b/src/calibre/ebooks/oeb/transforms/page_margin.py
@@ -40,7 +40,6 @@ class NegativeTextIndent(Exception):
 
 
 class RemoveFakeMargins:
-
     '''
     Remove left and right margins from paragraph/divs if the same margin is specified
     on almost all the elements at that level.
@@ -88,8 +87,7 @@ class RemoveFakeMargins:
                 except:
                     pass
                 else:
-                    if ((hasattr(ti, 'startswith') and ti.startswith('-')) or
-                            isinstance(ti, numbers.Number) and ti < 0):
+                    if ((hasattr(ti, 'startswith') and ti.startswith('-')) or (isinstance(ti, numbers.Number) and ti < 0)):
                         raise NegativeTextIndent()
                 return style.marginLeft, style.marginRight, style
         return '', '', None
diff --git a/src/calibre/ebooks/oeb/transforms/rasterize.py b/src/calibre/ebooks/oeb/transforms/rasterize.py
index 6b2d583cbc..b35a8f044f 100644
--- a/src/calibre/ebooks/oeb/transforms/rasterize.py
+++ b/src/calibre/ebooks/oeb/transforms/rasterize.py
@@ -22,6 +22,7 @@ from polyglot.urllib import urldefrag
 IMAGE_TAGS = {XHTML('img'), XHTML('object')}
 KEEP_ATTRS = {'class', 'style', 'width', 'height', 'align'}
 
+
 def test_svg():  # {{{
     TEST_PNG_DATA_URI='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAWJQTFRFAAAAAAAAAAAAAAAAAAAAAQEAAgIBAwIBBgQCBwUCCAYDCggECwkEDgsFDwwFEA0GHRcKHxkLIBkLIxwMJR0NJx8OKCAOKCAPKSAPMScSPTAWQTQXQzUYSjsaSjsbSzsbUD8dUUAdVEMeWkggW0ggW0ghW0khXUohYk4ja1Umb1gocVoocVopclspc1spdV0qd18reF8riW0xjXEzl3g2mns3nn04nn45n345oIA6ooE7o4I7pII7pIM7pYQ7p4U8qYY8rYo+s45Bxp1Hx55Hy6FJy6JJzaRJz6RKz6RLz6VL0qdL1KpM1apM1qtN16xN2KxN2K1O2a1O2q1O265P3K9P3bBQ3rBP37FP37FQ37JQ4rNR47VR5LVR7LxV7bxV7r1V7r5W8L9W8MBW8b9V8b9W8cBW8cBX8sBW8sBX8sFW8sFX88BX88FW88FX88FY88JX88JY9MFX9MJX9MJY9MNYSw0rOAAAAAR0Uk5T2+rr8giKtGMAAAFDSURBVDjLhdNFUwNBEIbhJWkkuLu7u5PgHtwWl0CGnW34aJLl/3OgUlRlGfKepqafmstUW1Yw8E9By6IMWVn/z7OsQOpYNrE0H4lEwuFwZHmyLnUb+AUzIiLMItDgrWIfKH3mnz4RA6PX/8Im8xuEgVfxxG33g+rVi9OT46OdPQ0kDgv8gCg3FMrLphkNyCD9BYiIqEErraP5ZrDGDrw2MoIhsPACGUH5g2gVqzWDKQ/gETKCZmHwbo4ZbHhJ1q1kBMMJCKbJCCof35V+qjCDOUCrMTKCFkc8vU5GENpW8NwmMxhVccYsGUHVvWKOFhlBySJicV6u7+7s6Ozq6anxgT44Lwy4jlKK4br96WDl09GA/gA4zp7gLh2MM3MS+EgCGl+iD9JB4cDZzbV9ZV/atn1+frvfaPhuX4HMq0cZsjKt/zfXXmDab9zjGwAAAABJRU5ErkJggg=='
     return f'''
@@ -49,7 +50,7 @@ def rasterize_svg(data=None, sizes=(), width=0, height=0, print=None, fmt='PNG',
     if print is not None:
         print(f'Rasterizing SVG to {size.width()} x {size.height()}')
     image = QImage(size, QImage.Format.Format_ARGB32_Premultiplied)
-    image.fill(QColor("white").rgb())
+    image.fill(QColor('white').rgb())
     painter = QPainter(image)
     svg.render(painter)
     painter.end()
@@ -102,7 +103,7 @@ class SVGRasterizer:
 
         if view_box is not None:
             try:
-                box = [float(x) for x in filter(None, re.split('[, ]', view_box))]
+                box = [float(x) for x in filter(None, re.split(r'[, ]', view_box))]
                 sizes = [box[2]-box[0], box[3] - box[1]]
             except (TypeError, ValueError, IndexError):
                 logger.warn('SVG image has invalid viewBox="%s", ignoring the viewBox' % view_box)
@@ -219,7 +220,7 @@ class SVGRasterizer:
             logger.info('Rasterizing %r to %dx%d'
                         % (svgitem.href, size.width(), size.height()))
             image = QImage(size, QImage.Format.Format_ARGB32_Premultiplied)
-            image.fill(QColor("white").rgb())
+            image.fill(QColor('white').rgb())
             painter = QPainter(image)
             svg.render(painter)
             painter.end()
diff --git a/src/calibre/ebooks/oeb/transforms/rescale.py b/src/calibre/ebooks/oeb/transforms/rescale.py
index 78c9614979..422dca9526 100644
--- a/src/calibre/ebooks/oeb/transforms/rescale.py
+++ b/src/calibre/ebooks/oeb/transforms/rescale.py
@@ -9,7 +9,6 @@ from calibre import fit_image
 
 
 class RescaleImages:
-
     'Rescale all images to fit inside given screen size'
 
     def __init__(self, check_colorspaces=False):
diff --git a/src/calibre/ebooks/oeb/transforms/split.py b/src/calibre/ebooks/oeb/transforms/split.py
index 9cc17766f1..324e47e2bb 100644
--- a/src/calibre/ebooks/oeb/transforms/split.py
+++ b/src/calibre/ebooks/oeb/transforms/split.py
@@ -131,7 +131,7 @@ class Split:
                 continue
 
         page_breaks = list(page_breaks)
-        page_breaks.sort(key=lambda x:int(x.get('pb_order')))
+        page_breaks.sort(key=lambda x: int(x.get('pb_order')))
         page_break_ids, page_breaks_ = [], []
         for i, x in enumerate(page_breaks):
             x.set('id', x.get('id', 'calibre_pb_%d'%i))
@@ -312,7 +312,7 @@ class FlowSplitter:
     def split_text(self, text, root, size):
         self.log.debug('\t\t\tSplitting text of length: %d'%len(text))
         rest = text.replace('\r', '')
-        parts = re.split('\n\n', rest)
+        parts = rest.split('\n\n')
         self.log.debug('\t\t\t\tFound %d parts'%len(parts))
         if max(map(len, parts)) > size:
             raise SplitError('Cannot split as file contains a <pre> tag '
@@ -426,7 +426,7 @@ class FlowSplitter:
         '''
         if not self.was_split:
             return
-        self.anchor_map = collections.defaultdict(lambda :self.base%0)
+        self.anchor_map = collections.defaultdict(lambda: self.base%0)
         self.files = []
 
         for i, tree in enumerate(self.trees):
diff --git a/src/calibre/ebooks/oeb/transforms/structure.py b/src/calibre/ebooks/oeb/transforms/structure.py
index f715277ade..a816e4aaf8 100644
--- a/src/calibre/ebooks/oeb/transforms/structure.py
+++ b/src/calibre/ebooks/oeb/transforms/structure.py
@@ -132,7 +132,7 @@ class DetectStructure:
                 self.log('Setting start reading at position to %s in %s'%(
                     self.opts.start_reading_at, item.href))
                 return
-        self.log.warn("Failed to find start reading at position: %s"%
+        self.log.warn('Failed to find start reading at position: %s'%
                 self.opts.start_reading_at)
 
     def get_toc_parts_for_xpath(self, expr):
diff --git a/src/calibre/ebooks/oeb/transforms/subset.py b/src/calibre/ebooks/oeb/transforms/subset.py
index 40aa12f9cf..5531ba1141 100644
--- a/src/calibre/ebooks/oeb/transforms/subset.py
+++ b/src/calibre/ebooks/oeb/transforms/subset.py
@@ -123,7 +123,6 @@ def elem_style(style_rules, cls, inherited_style):
 
 
 class SubsetFonts:
-
     '''
     Subset all embedded fonts. Must be run after CSS flattening, as it requires
     CSS normalization and flattening to work.
@@ -302,7 +301,7 @@ class SubsetFonts:
 
     def find_chars(self, elem, style):
         ans = set()
-        transform = lambda x: x  # noqa
+        transform = lambda x: x  # noqa: E731
         tt = style.get('text-transform')
         if tt:
             if tt in ('uppercase', 'capitalize'):
diff --git a/src/calibre/ebooks/oeb/writer.py b/src/calibre/ebooks/oeb/writer.py
index b30138101b..4d0108c4d6 100644
--- a/src/calibre/ebooks/oeb/writer.py
+++ b/src/calibre/ebooks/oeb/writer.py
@@ -15,10 +15,10 @@ __all__ = ['OEBWriter']
 
 class OEBWriter:
     DEFAULT_PROFILE = 'PRS505'
-    """Default renderer profile for content written with this Writer."""
+    '''Default renderer profile for content written with this Writer.'''
 
     TRANSFORMS = []
-    """List of transforms to apply to content written with this Writer."""
+    '''List of transforms to apply to content written with this Writer.'''
 
     def __init__(self, version='2.0', page_map=False, pretty_print=False):
         self.version = version
@@ -27,9 +27,9 @@ class OEBWriter:
 
     @classmethod
     def config(cls, cfg):
-        """Add any book-writing options to the :class:`Config` object
+        '''Add any book-writing options to the :class:`Config` object
         :param:`cfg`.
-        """
+        '''
         oeb = cfg.add_group('oeb', _('OPF/NCX/etc. generation options.'))
         versions = ['1.2', '2.0']
         oeb('opf_version', ['--opf-version'], default='2.0', choices=versions,
@@ -41,7 +41,7 @@ class OEBWriter:
 
     @classmethod
     def generate(cls, opts):
-        """Generate a Writer instance from command-line options."""
+        '''Generate a Writer instance from command-line options.'''
         version = opts.opf_version
         page_map = opts.adobe_page_map
         pretty_print = opts.pretty_print
@@ -49,10 +49,10 @@ class OEBWriter:
                    pretty_print=pretty_print)
 
     def __call__(self, oeb, path):
-        """
+        '''
         Write the book in the :class:`OEBBook` object :param:`oeb` to a folder
         at :param:`path`.
-        """
+        '''
         version = int(self.version[0])
         opfname = None
         if os.path.splitext(path)[1].lower() == '.opf':
@@ -69,7 +69,7 @@ class OEBWriter:
         elif version == 2:
             metadata = oeb.to_opf2(page_map=self.page_map)
         else:
-            raise OEBError("Unrecognized OPF version %r" % self.version)
+            raise OEBError('Unrecognized OPF version %r' % self.version)
         pretty_print = self.pretty_print
         for mime, (href, data) in metadata.items():
             if opfname and mime == OPF_MIME:
diff --git a/src/calibre/ebooks/pdb/ereader/inspector.py b/src/calibre/ebooks/pdb/ereader/inspector.py
index 975c413467..3c344e0292 100644
--- a/src/calibre/ebooks/pdb/ereader/inspector.py
+++ b/src/calibre/ebooks/pdb/ereader/inspector.py
@@ -114,7 +114,7 @@ def section_lengths(header):
     print('Section Sizes')
     print('')
 
-    for i in range(0, header.section_count()):
+    for i in range(header.section_count()):
         size = len(header.section_data(i))
         if size > 65505:
             message = '<--- Over!'
diff --git a/src/calibre/ebooks/pdb/ereader/reader132.py b/src/calibre/ebooks/pdb/ereader/reader132.py
index f479862ad5..8fff1709ea 100644
--- a/src/calibre/ebooks/pdb/ereader/reader132.py
+++ b/src/calibre/ebooks/pdb/ereader/reader132.py
@@ -124,8 +124,8 @@ class Reader132(FormatReader):
 
         if self.header_record.footnote_count > 0:
             html += '<br /><h1>%s</h1>' % _('Footnotes')
-            footnoteids = re.findall(
-                '\\w+(?=\x00)', self.section_data(self.header_record.footnote_offset).decode('cp1252' if self.encoding is None else self.encoding))
+            footnoteids = re.findall(r'\w+(?=\x00)',
+                self.section_data(self.header_record.footnote_offset).decode('cp1252' if self.encoding is None else self.encoding))
             for fid, i in enumerate(range(self.header_record.footnote_offset + 1, self.header_record.footnote_offset + self.header_record.footnote_count)):
                 self.log.debug('Extracting footnote page %i' % i)
                 if fid < len(footnoteids):
@@ -136,8 +136,8 @@ class Reader132(FormatReader):
 
         if self.header_record.sidebar_count > 0:
             html += '<br /><h1>%s</h1>' % _('Sidebar')
-            sidebarids = re.findall(
-                '\\w+(?=\x00)', self.section_data(self.header_record.sidebar_offset).decode('cp1252' if self.encoding is None else self.encoding))
+            sidebarids = re.findall(r'\w+(?=\x00)',
+                self.section_data(self.header_record.sidebar_offset).decode('cp1252' if self.encoding is None else self.encoding))
             for sid, i in enumerate(range(self.header_record.sidebar_offset + 1, self.header_record.sidebar_offset + self.header_record.sidebar_count)):
                 self.log.debug('Extracting sidebar page %i' % i)
                 if sid < len(sidebarids):
@@ -157,7 +157,7 @@ class Reader132(FormatReader):
             os.makedirs(os.path.join(output_dir, 'images/'))
         images = []
         with CurrentDir(os.path.join(output_dir, 'images/')):
-            for i in range(0, self.header_record.num_image_pages):
+            for i in range(self.header_record.num_image_pages):
                 name, img = self.get_image(self.header_record.image_data_offset + i)
                 images.append(name)
                 with open(name, 'wb') as imgf:
@@ -210,7 +210,7 @@ class Reader132(FormatReader):
             os.makedirs(output_dir)
 
         with CurrentDir(output_dir):
-            for i in range(0, self.header_record.num_image_pages):
+            for i in range(self.header_record.num_image_pages):
                 name, img = self.get_image(self.header_record.image_data_offset + i)
                 with open(name, 'wb') as imgf:
                     imgf.write(img)
diff --git a/src/calibre/ebooks/pdb/ereader/reader202.py b/src/calibre/ebooks/pdb/ereader/reader202.py
index 152b3d17e9..def1e4272f 100644
--- a/src/calibre/ebooks/pdb/ereader/reader202.py
+++ b/src/calibre/ebooks/pdb/ereader/reader202.py
@@ -160,7 +160,7 @@ class Reader202(FormatReader):
             os.makedirs(output_dir)
 
         with CurrentDir(output_dir):
-            for i in range(0, self.header_record.num_image_pages):
+            for i in range(self.header_record.num_image_pages):
                 name, img = self.get_image(self.header_record.image_data_offset + i)
                 with open(name, 'wb') as imgf:
                     imgf.write(img)
diff --git a/src/calibre/ebooks/pdb/haodoo/__init__.py b/src/calibre/ebooks/pdb/haodoo/__init__.py
index c2a96b7708..3c0958cb29 100644
--- a/src/calibre/ebooks/pdb/haodoo/__init__.py
+++ b/src/calibre/ebooks/pdb/haodoo/__init__.py
@@ -4,6 +4,3 @@
 __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
-
-
-
diff --git a/src/calibre/ebooks/pdb/haodoo/reader.py b/src/calibre/ebooks/pdb/haodoo/reader.py
index 945efa7cdd..cda1cbe8af 100644
--- a/src/calibre/ebooks/pdb/haodoo/reader.py
+++ b/src/calibre/ebooks/pdb/haodoo/reader.py
@@ -19,37 +19,37 @@ BPDB_IDENT = 'BOOKMTIT'
 UPDB_IDENT = 'BOOKMTIU'
 
 punct_table = {
-    "︵": "（",
-    "︶": "）",
-    "︷": "｛",
-    "︸": "｝",
-    "︹": "〔",
-    "︺": "〕",
-    "︻": "【",
-    "︼": "】",
-    "︗": "〖",
-    "︘": "〗",
-    "﹇": "［］",
-    "﹈": "［］",
-    "︽": "《",
-    "︾": "》",
-    "︿": "〈",
-    "﹀": "〉",
-    "﹁": "「",
-    "﹂": "」",
-    "﹃": "『",
-    "﹄": "』",
-    "｜": "—",
-    "︙": "…",
-    "ⸯ": "～",
-    "│": "…",
-    "￤": "…",
-    "　": "  ",
+    '︵': '（',
+    '︶': '）',
+    '︷': '｛',
+    '︸': '｝',
+    '︹': '〔',
+    '︺': '〕',
+    '︻': '【',
+    '︼': '】',
+    '︗': '〖',
+    '︘': '〗',
+    '﹇': '［］',
+    '﹈': '［］',
+    '︽': '《',
+    '︾': '》',
+    '︿': '〈',
+    '﹀': '〉',
+    '﹁': '「',
+    '﹂': '」',
+    '﹃': '『',
+    '﹄': '』',
+    '｜': '—',
+    '︙': '…',
+    'ⸯ': '～',
+    '│': '…',
+    '￤': '…',
+    '　': '  ',
     }
 
 
 def fix_punct(line):
-    for (key, value) in punct_table.items():
+    for key, value in punct_table.items():
         line = line.replace(key, value)
     return line
 
@@ -60,9 +60,7 @@ class LegacyHeaderRecord:
         fields = raw.lstrip().replace(b'\x1b\x1b\x1b', b'\x1b').split(b'\x1b')
         self.title = fix_punct(fields[0].decode('cp950', 'replace'))
         self.num_records = int(fields[1])
-        self.chapter_titles = list(map(
-            lambda x: fix_punct(x.decode('cp950', 'replace').rstrip('\x00')),
-            fields[2:]))
+        self.chapter_titles = [fix_punct(x.decode('cp950', 'replace').rstrip('\x00')) for x in fields[2:]]
 
 
 class UnicodeHeaderRecord:
@@ -72,9 +70,7 @@ class UnicodeHeaderRecord:
                 b'\x1b\x00').split(b'\x1b\x00')
         self.title = fix_punct(fields[0].decode('utf_16_le', 'ignore'))
         self.num_records = int(fields[1])
-        self.chapter_titles = list(map(
-            lambda x: fix_punct(x.decode('utf_16_le', 'replace').rstrip('\x00')),
-            fields[2].split(b'\r\x00\n\x00')))
+        self.chapter_titles = [fix_punct(x.decode('utf_16_le', 'replace').rstrip('\x00')) for x in fields[2].split(b'\r\x00\n\x00')]
 
 
 class Reader(FormatReader):
diff --git a/src/calibre/ebooks/pdb/header.py b/src/calibre/ebooks/pdb/header.py
index 4c990abeae..2e72faf3b8 100644
--- a/src/calibre/ebooks/pdb/header.py
+++ b/src/calibre/ebooks/pdb/header.py
@@ -32,7 +32,7 @@ class PdbHeaderReader:
 
     def name(self):
         self.stream.seek(0)
-        return re.sub(b'[^-A-Za-z0-9 ]+', b'_', self.stream.read(32).replace(b'\x00', b''))
+        return re.sub(br'[^-A-Za-z0-9 ]+', b'_', self.stream.read(32).replace(b'\x00', b''))
 
     def full_section_info(self, number):
         if not (0 <= number < self.num_sections):
@@ -41,7 +41,7 @@ class PdbHeaderReader:
         self.stream.seek(78 + number * 8)
         offset, a1, a2, a3, a4 = struct.unpack('>LBBBB', self.stream.read(8))[0]
         flags, val = a1, a2 << 16 | a3 << 8 | a4
-        return (offset, flags, val)
+        return offset, flags, val
 
     def section_offset(self, number):
         if not (0 <= number < self.num_sections):
@@ -70,7 +70,7 @@ class PdbHeaderBuilder:
         self.identity = identity.ljust(3, '\x00')[:8].encode('utf-8')
         if isinstance(title, str):
             title = title.encode('ascii', 'replace')
-        self.title = b'%s\x00' % re.sub(b'[^-A-Za-z0-9 ]+', b'_', title).ljust(31, b'\x00')[:31]
+        self.title = b'%s\x00' % re.sub(br'[^-A-Za-z0-9 ]+', b'_', title).ljust(31, b'\x00')[:31]
 
     def build_header(self, section_lengths, out_stream):
         '''
diff --git a/src/calibre/ebooks/pdb/palmdoc/writer.py b/src/calibre/ebooks/pdb/palmdoc/writer.py
index b2f659d6d7..8d6e4e1504 100644
--- a/src/calibre/ebooks/pdb/palmdoc/writer.py
+++ b/src/calibre/ebooks/pdb/palmdoc/writer.py
@@ -32,7 +32,7 @@ class Writer(FormatWriter):
 
         section_lengths = [len(header_record)]
         self.log.info('Compessing data...')
-        for i in range(0, len(txt_records)):
+        for i in range(len(txt_records)):
             self.log.debug('\tCompressing record %i' % i)
             txt_records[i] = compress_doc(txt_records[i])
             section_lengths.append(len(txt_records[i]))
@@ -55,7 +55,7 @@ class Writer(FormatWriter):
         txt_length = len(txt)
 
         txt_records = []
-        for i in range(0, (len(txt) // MAX_RECORD_SIZE) + 1):
+        for i in range((len(txt) // MAX_RECORD_SIZE) + 1):
             txt_records.append(txt[i * MAX_RECORD_SIZE: (i * MAX_RECORD_SIZE) + MAX_RECORD_SIZE])
 
         return txt_records, txt_length
diff --git a/src/calibre/ebooks/pdb/ztxt/writer.py b/src/calibre/ebooks/pdb/ztxt/writer.py
index 01ce97c517..c9e8f81d51 100644
--- a/src/calibre/ebooks/pdb/ztxt/writer.py
+++ b/src/calibre/ebooks/pdb/ztxt/writer.py
@@ -32,7 +32,7 @@ class Writer(FormatWriter):
         section_lengths = []
         compressor = zlib.compressobj(9)
         self.log.info('Compressing data...')
-        for i in range(0, len(txt_records)):
+        for i in range(len(txt_records)):
             self.log.debug('\tCompressing record %i' % i)
             txt_records[i] = compressor.compress(txt_records[i])
             txt_records[i] = txt_records[i] + compressor.flush(zlib.Z_FULL_FLUSH)
@@ -60,7 +60,7 @@ class Writer(FormatWriter):
         txt_length = len(txt)
 
         txt_records = []
-        for i in range(0, (len(txt) / MAX_RECORD_SIZE) + 1):
+        for i in range((len(txt) / MAX_RECORD_SIZE) + 1):
             txt_records.append(txt[i * MAX_RECORD_SIZE : (i * MAX_RECORD_SIZE) + MAX_RECORD_SIZE])
 
         return txt_records, txt_length
diff --git a/src/calibre/ebooks/pdf/html_writer.py b/src/calibre/ebooks/pdf/html_writer.py
index 7478427323..08f9087d1f 100644
--- a/src/calibre/ebooks/pdf/html_writer.py
+++ b/src/calibre/ebooks/pdf/html_writer.py
@@ -45,10 +45,11 @@ from calibre.utils.webengine import secure_webengine, send_reply, setup_profile
 from polyglot.builtins import as_bytes, iteritems
 from polyglot.urllib import urlparse
 
-OK, KILL_SIGNAL = range(0, 2)
-HANG_TIME = 60  # seconds
 # }}}
 
+OK, KILL_SIGNAL = range(2)
+HANG_TIME = 60  # seconds
+
 
 # Utils {{{
 def data_as_pdf_doc(data):
@@ -131,6 +132,7 @@ def fix_fullscreen_images(container):
                 svg.set('width', '100vw')
                 svg.set('height', '100vh')
                 container.dirty(file_name)
+
 # }}}
 
 
@@ -220,7 +222,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler):
         if fail_code is None:
             fail_code = QWebEngineUrlRequestJob.Error.UrlNotFound
         rq.fail(fail_code)
-        print(f"Blocking FAKE_PROTOCOL request: {rq.requestUrl().toString()} with code: {fail_code}", file=sys.stderr)
+        print(f'Blocking FAKE_PROTOCOL request: {rq.requestUrl().toString()} with code: {fail_code}', file=sys.stderr)
 
 # }}}
 
@@ -480,6 +482,7 @@ def job_for_name(container, name, margins, page_layout):
         new_margins = QMarginsF(*resolve_margins(margins, page_layout))
         page_layout.setMargins(new_margins)
     return index_file, page_layout, name
+
 # }}}
 
 
@@ -515,10 +518,11 @@ def create_margin_files(container):
         if margins:
             margins = dict_to_margins(json.loads(margins))
         yield MarginFile(name, margins)
+
 # }}}
 
 
-# Link handling  {{{
+# Link handling {{{
 def add_anchors_markup(root, uuid, anchors):
     body = last_tag(root)
     div = body.makeelement(
@@ -624,7 +628,7 @@ def make_anchors_unique(container, log):
 
 class AnchorLocation:
 
-    __slots__ = ('pagenum', 'left', 'top', 'zoom')
+    __slots__ = ('left', 'pagenum', 'top', 'zoom')
 
     def __init__(self, pagenum=1, left=0, top=0, zoom=0):
         self.pagenum, self.left, self.top, self.zoom = pagenum, left, top, zoom
@@ -680,6 +684,7 @@ def fix_links(pdf_doc, anchor_locations, name_anchor_map, mark_links, log):
         return loc.as_tuple
 
     pdf_doc.alter_links(replace_link, mark_links)
+
 # }}}
 
 
@@ -745,7 +750,7 @@ def get_page_number_display_map(render_manager, opts, num_pages, log):
             if not isinstance(result, dict):
                 raise ValueError('Not a dict')
         except Exception:
-            log.warn(f'Could not do page number mapping, got unexpected result: {repr(result)}')
+            log.warn(f'Could not do page number mapping, got unexpected result: {result!r}')
         else:
             default_map = {int(k): int(v) for k, v in iteritems(result)}
     return default_map
@@ -801,7 +806,6 @@ def add_pagenum_toc(root, toc, opts, page_number_display_map):
 
 # Fonts {{{
 
-
 def all_glyph_ids_in_w_arrays(arrays, as_set=False):
     ans = set()
     for w in arrays:
@@ -1103,7 +1107,7 @@ def add_maths_script(container):
         has_maths[name] = hm = check_for_maths(root)
         if not hm:
             continue
-        script = root.makeelement(XHTML('script'), type="text/javascript", src=f'{FAKE_PROTOCOL}://{FAKE_HOST}/mathjax/loader/pdf-mathjax-loader.js')
+        script = root.makeelement(XHTML('script'), type='text/javascript', src=f'{FAKE_PROTOCOL}://{FAKE_HOST}/mathjax/loader/pdf-mathjax-loader.js')
         script.set('async', 'async')
         script.set('data-mathjax-path', f'{FAKE_PROTOCOL}://{FAKE_HOST}/mathjax/data/')
         last_tag(root).append(script)
@@ -1212,9 +1216,9 @@ def convert(opf_path, opts, metadata=None, output_path=None, log=default_log, co
             mult = -1 if i % 2 else 1
             val = opts.pdf_odd_even_offset
             if abs(val) < min(margins.left, margins.right):
-                box = list(pdf_doc.get_page_box("CropBox", i))
+                box = list(pdf_doc.get_page_box('CropBox', i))
                 box[0] += val * mult
-                pdf_doc.set_page_box("CropBox", i, *box)
+                pdf_doc.set_page_box('CropBox', i, *box)
 
     if cover_data:
         add_cover(pdf_doc, cover_data, page_layout, opts)
diff --git a/src/calibre/ebooks/pdf/image_writer.py b/src/calibre/ebooks/pdf/image_writer.py
index ceb2035b53..3809317c96 100644
--- a/src/calibre/ebooks/pdf/image_writer.py
+++ b/src/calibre/ebooks/pdf/image_writer.py
@@ -37,7 +37,6 @@ class PDFMetadata:  # {{{
 
 # Page layout {{{
 
-
 def parse_pdf_page_size(spec, unit='inch', dpi=72.0):
     width, sep, height = spec.lower().partition('x')
     if height:
diff --git a/src/calibre/ebooks/pdf/pdftohtml.py b/src/calibre/ebooks/pdf/pdftohtml.py
index 5044c83af8..9324d3fb24 100644
--- a/src/calibre/ebooks/pdf/pdftohtml.py
+++ b/src/calibre/ebooks/pdf/pdftohtml.py
@@ -75,7 +75,7 @@ def pdftohtml(output_dir, pdf_path, no_images, as_xml=False):
         if ret != 0:
             raise ConversionError('pdftohtml failed with return code: %d\n%s' % (ret, out))
         if out:
-            prints("pdftohtml log:")
+            prints('pdftohtml log:')
             prints(out)
         if not os.path.exists(index) or os.stat(index).st_size < 100:
             raise DRMError()
@@ -84,7 +84,7 @@ def pdftohtml(output_dir, pdf_path, no_images, as_xml=False):
             with open(index, 'r+b') as i:
                 raw = i.read().decode('utf-8', 'replace')
                 raw = flip_images(raw)
-                raw = raw.replace('<head', '<!-- created by calibre\'s pdftohtml -->\n  <head', 1)
+                raw = raw.replace('<head', "<!-- created by calibre's pdftohtml -->\n  <head", 1)
                 i.seek(0)
                 i.truncate()
                 # versions of pdftohtml >= 0.20 output self closing <br> tags, this
@@ -94,7 +94,7 @@ def pdftohtml(output_dir, pdf_path, no_images, as_xml=False):
                 raw = re.sub(r'<a id="(\d+)"', r'<a id="p\1"', raw, flags=re.I)
                 raw = re.sub(r'<a href="index.html#(\d+)"', r'<a href="#p\1"', raw, flags=re.I)
                 raw = xml_replace_entities(raw)
-                raw = re.sub('[\u00a0\u2029]', ' ', raw)
+                raw = re.sub(r'[\u00a0\u2029]', ' ', raw)
 
                 i.write(raw.encode('utf-8'))
 
@@ -152,7 +152,7 @@ def flip_image(img, flip):
 
 
 def flip_images(raw):
-    for match in re.finditer('<IMG[^>]+/?>', raw, flags=re.I):
+    for match in re.finditer(r'<IMG[^>]+/?>', raw, flags=re.I):
         img = match.group()
         m = re.search(r'class="(x|y|xy)flip"', img)
         if m is None:
@@ -174,5 +174,5 @@ def flip_images(raw):
         counter += 1
         return m.group(1).rstrip('/') + f' alt="Image {counter}"/>'
 
-    raw = re.sub('(<IMG[^>]+)/?>', add_alt, raw, flags=re.I)
+    raw = re.sub(r'(<IMG[^>]+)/?>', add_alt, raw, flags=re.I)
     return raw
diff --git a/src/calibre/ebooks/pdf/reflow.py b/src/calibre/ebooks/pdf/reflow.py
index aa2b7ea370..92100692a5 100644
--- a/src/calibre/ebooks/pdf/reflow.py
+++ b/src/calibre/ebooks/pdf/reflow.py
@@ -100,9 +100,10 @@ def adjacent_quotes(first_string, second_string):
     if fchar is not None:
         first_char = fchar.group(1)  # First non-space char
 
-    return bool((last_char == '\u0022' and first_char == '\u0022') \
-             or (last_char == '\u2019' and first_char == '\u2018') \
-             or (last_char == '\u201d' and first_char == '\u201c'))
+    return bool((last_char == '"' and first_char == '"') \
+             or (last_char == '’' and first_char == '‘') \
+             or (last_char == '”' and first_char == '“'))
+
 
 class Font:
 
@@ -113,6 +114,7 @@ class Font:
         self.color = spec.get('color')
         self.family = spec.get('family')
 
+
 class Element:
 
     def __init__(self):
@@ -125,6 +127,7 @@ class Element:
     def __hash__(self):
         return hash(self.id)
 
+
 class DocStats:
 
     def __init__(self):
@@ -132,6 +135,7 @@ class DocStats:
           = self.line_space = self.para_space = self.indent_min_odd = self.indent_min_even = 0
         self.font_size = 0
 
+
 class Image(Element):
 
     def __init__(self, img, opts, log, idc):
@@ -166,7 +170,7 @@ class Text(Element):
             ('top', 'left', 'width', 'height'))))
         # This does nothing, as expected,
         # but somewhere left (at least) is changed sometimes to not .0
-        if self.left != round(self.left) :
+        if self.left != round(self.left):
             self.left = round(self.left)
         self.bottom  = self.top + self.height
         self.right = self.left + self.width
@@ -195,7 +199,7 @@ class Text(Element):
             self.font = {}
             self.font_size = 0.0
             self.font_size_em = 0.0
-        #    self.color = 0
+            # self.color = 0
 
         text.tail = ''
         self.text_as_string = etree.tostring(text, method='text', encoding='unicode')
@@ -232,7 +236,7 @@ class Text(Element):
         # Or assume any gap = a space?
         if (self.top <= other.top and self.bottom >= other.bottom) \
           and abs(other.left - self.right) < 2.0:
-          #and abs(other.left - self.right) < self.average_character_width / 3.0:
+          # and abs(other.left - self.right) < self.average_character_width / 3.0:
             has_gap = 0
         else:  # Insert n spaces to fill gap.  Use TAB?  Columns?
             if other.left < self.right:
@@ -260,8 +264,8 @@ class Text(Element):
 
         self.left = min(self.left, other.left)
         self.right = max(self.right, other.right)
-        self.width +=  other.width
-        self.final_width =  other.left + other.width
+        self.width += other.width
+        self.final_width = other.left + other.width
         self.height = self.bottom - self.top
         # Need to check for </span> <span... as well
         # This test does not work in its present form
@@ -270,7 +274,7 @@ class Text(Element):
           and False \
           and self.font.id == other.font.id \
           and re.match(r'<span style="font-size:', self.raw) is not None \
-          and re.match(r'<span style="font-size:', other.raw) is not None :
+          and re.match(r'<span style="font-size:', other.raw) is not None:
             # We have the same class, so merge
             m_self = re.match(r'^(.+)</span>$', self.raw)
             m_other = re.match(r'^<span style="font-size:.+em">(.+</span>)$', other.raw)
@@ -278,12 +282,12 @@ class Text(Element):
                 self.raw = m_self.group(1)
                 other.raw = m_other.group(1)
         elif self.font_size_em != other.font_size_em \
-          and self.font_size_em != 1.00 :
-            if re.match(r'<span', self.raw) is None :
+          and self.font_size_em != 1.00:
+            if re.match(r'<span', self.raw) is None:
                 self.raw = '<span style="font-size:%sem">%s</span>'%(str(self.font_size_em),self.raw)
             # Try to allow for a very large initial character
             elif len(self.text_as_string) <= 2 \
-              and self.font_size_em >= other.font_size_em * 2.0 :
+              and self.font_size_em >= other.font_size_em * 2.0:
                 # Insert 'float: left' etc. into current font info
                 # Unfortunately, processing to generate the .epub file changes things.
                 # The line height gets set to the same as other parts of the file
@@ -296,13 +300,13 @@ class Text(Element):
 
         self.font_size = max(self.font_size, other.font_size)
         self.font_size_em = max(self.font_size_em, other.font_size_em)
-        self.font = other.font if self.font_size == other.font_size else other.font
+        self.font = other.font
         if has_gap > 0:
             if has_gap < 3:  # Small number of spaces = 1 space
                 if not (self.text_as_string.endswith(' ') \
                      or self.text_as_string.endswith('-') \
                      or other.text_as_string.startswith(' ') \
-                     or other.text_as_string.startswith('-') ):
+                     or other.text_as_string.startswith('-')):
                     has_gap = 1
                 else:
                     has_gap = 0
@@ -314,7 +318,7 @@ class Text(Element):
                   and other.right > right_margin - right_margin * RIGHT_FLOAT_FACTOR:
                     has_float = '<span style="float:right">'
                     has_gap = 1
-                #else leave has_gap
+                # else leave has_gap
             old_float = re.match(r'^(.*)(<span style="float:right">.*)</span>\s*$', self.raw)
             if old_float:
                 # There is already a float as parts of a line are near the right.
@@ -332,11 +336,11 @@ class Text(Element):
                 self.text_as_string += ' '
                 self.raw += ' '
                 self.width += self.average_character_width
-                #self.final_width += self.average_character_width
+                # self.final_width += self.average_character_width
                 has_gap -= 1
 
         self.text_as_string += other.text_as_string
-        #self.width += other.width
+        # self.width += other.width
 
         # Try to merge href where there are 2 for the same place
         # Beware multiple hrefs on the same line, but for different places
@@ -347,10 +351,10 @@ class Text(Element):
         # Are there problems if self.raw does not end </a>?
         # Note that the 2 parts could have different font sizes
         matchObj = re.match(r'^([^<]*)(<span[^>]*>)*(<a href[^>]+>)(.*)</a>(</span>)*(\s*)$', self.raw)
-        if matchObj is not None :
+        if matchObj is not None:
             otherObj = re.match(r'^([^<]*)(<span[^>]*>)*(<a href[^>]+>)(.*)(</a>)(</span>)*(.*)$', other.raw)
             # There is another href, but is it for the same place?
-            if otherObj is not None  and  matchObj.group(3) == otherObj.group(3) :
+            if otherObj is not None and matchObj.group(3) == otherObj.group(3):
                 m2 = matchObj.group(2)
                 if m2 is None:
                     m2 = ''
@@ -368,10 +372,10 @@ class Text(Element):
                 # Move the <span... after the <a... and remove the </a>
                 self.raw = matchObj.group(1)+matchObj.group(3)+m2+matchObj.group(4)+m5+matchObj.group(6)
         # This needs more work
-        #if sub_super < 0:
-        #    other.raw = '<sup>' + other.raw + '</sup>'
-        #elif sub_super > 0:
-        #    other.raw = '<sub>' + other.raw + '</sub>'
+        # if sub_super < 0:
+        #     other.raw = '<sup>' + other.raw + '</sup>'
+        # elif sub_super > 0:
+        #     other.raw = '<sub>' + other.raw + '</sub>'
 
         if has_float:
             self.raw += has_float
@@ -379,7 +383,7 @@ class Text(Element):
         if has_float:
             self.raw += '</span>'
         self.set_av_char_width()
-        #self.last_left = other.left
+        # self.last_left = other.left
 
     def to_html(self):
         return self.raw
@@ -389,6 +393,7 @@ class Text(Element):
         f.write(self.to_html().encode('utf-8'))
         f.write('\n')
 
+
 class Paragraph(Text):
 
     def __init__(self, text, font_map, opts, log, idc):
@@ -408,7 +413,7 @@ class Paragraph(Text):
         else:
             self.font = {}
             self.font_size = 0
-        #    self.color = 0
+            # self.color = 0
 
         text.tail = ''
         self.text_as_string = etree.tostring(text, method='text',
@@ -426,6 +431,7 @@ class Paragraph(Text):
         f.write(self.to_html().encode('utf-8'))
         f.write('\n')
 
+
 class FontSizeStats(dict):
 
     def __init__(self, stats):
@@ -437,6 +443,7 @@ class FontSizeStats(dict):
                 self.most_common_size, self.chars_at_most_common_size = sz, chars
             self[sz] = chars/total
 
+
 class Interval:
 
     def __init__(self, left, right):
@@ -462,13 +469,13 @@ class Interval:
     def __hash__(self):
         return hash('(%f,%f)'%self.left, self.right)
 
+
 class Column:
 
     # A column contains an element if the element bulges out to
     # the left or the right by at most HFUZZ*col width.
     HFUZZ = 0.2
 
-
     def __init__(self):
         self.left = self.right = self.top = self.bottom = 0
         self.width = self.height = 0
@@ -510,13 +517,13 @@ class Column:
     def collect_stats(self):
         if len(self.elements) > 1:
             gaps = [self.elements[i+1].top - self.elements[i].bottom for i in
-                    range(0, len(self.elements)-1)]
+                    range(len(self.elements)-1)]
             self.average_line_separation = sum(gaps)/len(gaps)
         for i, elem in enumerate(self.elements):
             left_margin = elem.left - self.left
             elem.indent_fraction = left_margin/self.width
             elem.width_fraction = elem.width/self.width
-            if i == 0  or  self.average_line_separation == 0:
+            if i == 0 or self.average_line_separation == 0:
                 elem.top_gap_ratio = None
             else:
                 elem.top_gap_ratio = (self.elements[i-1].bottom -
@@ -548,6 +555,7 @@ class Box(list):
         ans.append('</%s>'%self.tag)
         return ans
 
+
 class ImageBox(Box):
 
     def __init__(self, img):
@@ -640,12 +648,10 @@ class Region:
                             idx)
                 col.add(elem)
 
-
     def collect_stats(self):
         for column in self.columns:
             column.collect_stats()
-        self.average_line_separation = sum([x.average_line_separation for x in
-            self.columns])/float(len(self.columns))
+        self.average_line_separation = sum(x.average_line_separation for x in self.columns)/float(len(self.columns))
 
     def __iter__(self):
         yield from self.columns
@@ -725,7 +731,6 @@ class Region:
                 self.boxes[-1].append(elem)
 
 
-
 class Page:
 
     def __init__(self, page, font_map, opts, log, idc):
@@ -735,15 +740,15 @@ class Page:
             if (frst.top <= secnd.top and frst.bottom >= secnd.bottom-BOTTOM_FACTOR) \
               or (secnd.top <= frst.top and secnd.bottom >= frst.bottom-BOTTOM_FACTOR):
                 # Overlap = same line
-                if frst.left < secnd.left :
+                if frst.left < secnd.left:
                     return -1
-                elif frst.left == secnd.left :
+                elif frst.left == secnd.left:
                     return 0
                 return 1
             # Different line so sort into line number
-            if frst.bottom < secnd.bottom :
+            if frst.bottom < secnd.bottom:
                 return -1
-            elif frst.bottom == secnd.bottom :
+            elif frst.bottom == secnd.bottom:
                 return 0
             return 1
 
@@ -777,7 +782,7 @@ class Page:
               or text.top > self.height \
               or text.left > self.left+self.width \
               or text.left < self.left:
-              #and re.match(r'href=', text.raw) is None:
+              # and re.match(r'href=', text.raw) is None:
                 self.texts.remove(text)
             elif  (self.opts.pdf_header_skip <= 0 or text.top >= self.opts.pdf_header_skip) \
               and (self.opts.pdf_footer_skip <= 0 or text.top <= self.opts.pdf_footer_skip):
@@ -857,7 +862,7 @@ class Page:
         # Approximate the line spacing for checking overlapped lines
         line_height = frag.bottom - frag.top
         for t in self.texts:
-            if t is not frag :
+            if t is not frag:
                 # Do the parts of a line overlap?
                 # Some files can have separate lines overlapping slightly
                 # BOTTOM_FACTOR allows for this
@@ -955,19 +960,19 @@ class Page:
               and lmargin >= rmargin - rmargin*CENTER_FACTOR \
               and lmargin <= rmargin + rmargin*CENTER_FACTOR \
               and '"float:right"' not in t.raw:
-               #and t.left + t.width + t.left >= self.width + l_offset - t.average_character_width \
-               #and t.left + t.width + t.left <= self.width + l_offset + t.average_character_width:
+               # and t.left + t.width + t.left >= self.width + l_offset - t.average_character_width \
+               # and t.left + t.width + t.left <= self.width + l_offset + t.average_character_width:
                 t.align = 'C'
             # Right aligned if left > FACTOR% of right
             elif lmargin > indent_max \
               and lmargin > rmargin*RIGHT_FACTOR:
-              #and t.right >= self.width - t.average_character_width:
+              # and t.right >= self.width - t.average_character_width:
                 # What about right-aligned but indented on right?
                 # What about indented rather than right-aligned?
                 t.align = 'R'
             if not self.contents:
               # We can get <a href=...Chapter...  Should this check be done?
-              #if 'href=' not in t.raw:
+              # if 'href=' not in t.raw:
                 # Check for Roman numerals as the only thing on a line
                 if re.match(r'^\s*[iIxXvV]+\s*$', t.text_as_string) is not None:
                     t.tag = 'h3'
@@ -1077,7 +1082,7 @@ class Page:
                         if last_frag is not None \
                           and stats.para_space > 0 \
                           and frag.bottom - last_frag.bottom > stats.para_space*SECTION_FACTOR:
-                          #and frag.top - last_frag.bottom > frag.height + stats.line_space + (stats.line_space*LINE_FACTOR):
+                          # and frag.top - last_frag.bottom > frag.height + stats.line_space + (stats.line_space*LINE_FACTOR):
                             frag.blank_line_before = 1
                 last_frag = frag
                 tind += 1
@@ -1095,14 +1100,14 @@ class Page:
             for i in range(LINE_SCAN_COUNT):
                 if len(self.texts) < 1:
                     break
-                if re.match(opts.pdf_header_regex, self.texts[0].text_as_string) is not None :
+                if re.match(opts.pdf_header_regex, self.texts[0].text_as_string) is not None:
                     # There could be fragments which are spread out, so join_fragments has not coalesced them
                     # Not sure that this would work as it relies on the first fragment matching regex
                     t = self.texts[0]
-                    #match = self.find_match(t)
-                    #while match is not None:
-                    #    self.texts.remove(match)
-                    #    match = self.find_match(t)
+                    # match = self.find_match(t)
+                    # while match is not None:
+                    #     self.texts.remove(match)
+                    #     match = self.find_match(t)
                     self.texts.remove(t)
 
         if len(opts.pdf_footer_regex) > 0 \
@@ -1111,13 +1116,13 @@ class Page:
             for i in range(LINE_SCAN_COUNT):
                 if len(self.texts) < 1:
                     break
-                if re.match(opts.pdf_footer_regex, self.texts[-1].text_as_string) is not None :
+                if re.match(opts.pdf_footer_regex, self.texts[-1].text_as_string) is not None:
                     # There could be fragments which are spread out, so join_fragments has not coalesced them
                     t = self.texts[-1]
-                    #match = self.find_match(t)
-                    #while match is not None:
-                    #    self.texts.remove(match)
-                    #    match = self.find_match(t)
+                    # match = self.find_match(t)
+                    # while match is not None:
+                    #     self.texts.remove(match)
+                    #     match = self.find_match(t)
                     self.texts.remove(t)
 
     def create_page_format(self, stats, opts):
@@ -1135,7 +1140,7 @@ class Page:
 
     def find_margins(self, tops, indents, line_spaces, bottoms, rights):
 
-        #from collections import Counter
+        # from collections import Counter
 
         # Should check for left margin and indent for this page
         # Find the most used top, left margins, and gaps between lines
@@ -1144,15 +1149,15 @@ class Page:
         max_right = 0
         max_space = 0
         last_top = 0
-        #last_bottom = 0
+        # last_bottom = 0
         first = True
         for text in self.texts:
             top = text.top
             left = text.left
-            if round(left) != left :
+            if round(left) != left:
                 text.left = left = round(left)
             right = text.right
-            if round(right) != right :
+            if round(right) != right:
                 text.right = right = round(right)
             if first:
                 tops[top] = tops.get(top, 0) + 1
@@ -1261,18 +1266,13 @@ class Page:
                             absorb_into = None
                     else:
                         absorb_into = prev_region
-                        if self.regions[next_region].line_count >= \
-                                self.regions[prev_region].line_count:
-                            avg_column_count = sum([len(r.columns) for r in
-                                regions])/float(len(regions))
-                            if self.regions[next_region].line_count > \
-                                    self.regions[prev_region].line_count \
-                               or abs(avg_column_count -
-                                       len(self.regions[prev_region].columns)) \
-                               > abs(avg_column_count -
-                                       len(self.regions[next_region].columns)):
-                                   absorb_into = next_region
-                                   absorb_at = 'top'
+                        if self.regions[next_region].line_count >= self.regions[prev_region].line_count:
+                            avg_column_count = sum(len(r.columns) for r in regions)/float(len(regions))
+                            if self.regions[next_region].line_count > self.regions[prev_region].line_count \
+                              or abs(avg_column_count - len(self.regions[prev_region].columns)) \
+                               > abs(avg_column_count - len(self.regions[next_region].columns)):
+                                absorb_into = next_region
+                                absorb_at = 'top'
                     if absorb_into is not None:
                         self.regions[absorb_into].absorb_regions(regions, absorb_at)
                         absorbed.update(regions)
@@ -1341,10 +1341,10 @@ class Page:
 
         self.check_centered(stats)
 
-        #self.elements = list(self.texts)
-        #for img in page.xpath('descendant::img'):
-        #    self.elements.append(Image(img, self.opts, self.log, idc))
-        #self.elements.sort(cmp=lambda x,y:cmp(x.top, y.top))
+        # self.elements = list(self.texts)
+        # for img in page.xpath('descendant::img'):
+        #     self.elements.append(Image(img, self.opts, self.log, idc))
+        # self.elements.sort(cmp=lambda x,y:cmp(x.top, y.top))
 
         return
         # NOT IMPLEMENTED
@@ -1353,7 +1353,6 @@ class Page:
             region.collect_stats()
             region.linearize()
 
-
     def to_html(self):
         # If ans.append is used, newlines are inserted between each element
         ans = []
@@ -1392,7 +1391,7 @@ class Page:
             elif text.indented > 0:
                 ans[-1] += ' style="text-indent:'
                 ans[-1] += str(text.indented)
-                #ans[-1] += '1'
+                # ans[-1] += '1'
                 ans[-1] += 'em"'
             # The margins need more work.  e.g. can have indented + left + right
             elif text.margin_left > 0:
@@ -1424,10 +1423,11 @@ class Page:
 
         return ans
 
+
 class PDFDocument:
 
     def __init__(self, xml, opts, log):
-        #from calibre.rpdb import set_trace;  set_trace()
+        # from calibre.rpdb import set_trace;  set_trace()
 
         self.opts, self.log = opts, log
 
@@ -1451,11 +1451,11 @@ class PDFDocument:
             self.font_map[self.fonts[-1].id] = self.fonts[-1]
 
         self.pages = []
-        #self.page_map = {}
+        # self.page_map = {}
 
         for page in self.root.xpath('//page'):
             page = Page(page, self.font_map, opts, log, idc)
-            #self.page_map[page.id] = page
+            # self.page_map[page.id] = page
             self.pages.append(page)
 
         self.tops = {}
@@ -1496,7 +1496,7 @@ class PDFDocument:
         # Join paragraphs across page boundaries
         self.merge_pages(idc)
 
-        #self.linearize()
+        # self.linearize()
         self.render()
 
     def collect_font_statistics(self):
@@ -1752,7 +1752,7 @@ class PDFDocument:
         bcount = 0
         for b in self.bottoms:
             if bcount < self.bottoms[b]:
-              #and b > self.stats.bottom*0.9:
+              # and b > self.stats.bottom*0.9:
                 bcount = self.bottoms[b]
             if b > self.stats.bottom:
                 self.stats.bottom = b
@@ -1801,8 +1801,8 @@ class PDFDocument:
                       or page.texts[head_ind].top > page.height/2:
                         break  # Short page
                     t = page.texts[head_ind].text_as_string
-                    #if len(page.texts) > 1 and page.texts[0].top == page.texts[1].top:
-                    #    t += ' ' + page.texts[1].text_as_string
+                    # if len(page.texts) > 1 and page.texts[0].top == page.texts[1].top:
+                    #     t += ' ' + page.texts[1].text_as_string
                     if len(head_text[head_ind]) == 0:
                         head_text[head_ind] = t
                     else:
@@ -1834,8 +1834,8 @@ class PDFDocument:
                       or page.texts[-foot_ind-1].top < page.height/2:
                         break  # Short page
                     t = page.texts[-foot_ind-1].text_as_string
-                    #if len(page.texts) > 1 and page.texts[-1].top == page.texts[-2].top:
-                    #    t += ' ' + page.texts[-2].text_as_string
+                    # if len(page.texts) > 1 and page.texts[-1].top == page.texts[-2].top:
+                    #     t += ' ' + page.texts[-2].text_as_string
                     if len(foot_text[foot_ind]) == 0:
                         foot_text[foot_ind] = t
                     else:
@@ -1950,7 +1950,7 @@ class PDFDocument:
                 # Do not merge if the next paragraph is indented
                 if page.texts:
                     if candidate:
-                       last_line = candidate.texts[-1]
+                        last_line = candidate.texts[-1]
                     if candidate \
                       and last_line.bottom > orphan_space \
                       and page.texts[0].indented == 0:
@@ -1969,7 +1969,7 @@ class PDFDocument:
                             merged_len = 0  # No merge
                         # Allow where the last line ends with or next line starts with lower case.
                         if re.match(r'.*[a-z,-]\s*$', last_line.text_as_string) is not None \
-                          or re.match(r'^\s*[a-z,-]', merged_text.text_as_string) is not None :
+                          or re.match(r'^\s*[a-z,-]', merged_text.text_as_string) is not None:
                             merged_len = merged_text.right
 
                         # To use merged_len etc.
@@ -1984,7 +1984,7 @@ class PDFDocument:
                             merge_done = True
                             # We don't want to merge partial pages
                             # i.e. if this is the last line, preserve its top/bottom till after merge
-                            if len(page.texts) == 1 :
+                            if len(page.texts) == 1:
                                 save_bottom = merged_text.bottom
                             else:
                                 save_bottom = 0.0
@@ -2014,7 +2014,7 @@ class PDFDocument:
                                  or self.pages[pind+1].texts[0].top > self.pages[pind+1].imgs[0].top)):
                                 page.page_break_after = True
                     elif (re.match(r'.*[a-z, ]$', last_line.text_as_string) is not None \
-                      or  last_line.final_width > page.width*self.opts.unwrap_factor):
+                      or last_line.final_width > page.width*self.opts.unwrap_factor):
                         candidate = page
                 else:
                     candidate = None
@@ -2040,7 +2040,7 @@ class PDFDocument:
                 # Have we removed everything from this page (well, all texts and images)
                 if merged_page.is_empty:
                     # Empty page does/may not actually mean blank line
-                    #candidate.texts[-1].blank_line_before = 1
+                    # candidate.texts[-1].blank_line_before = 1
                     # If pages are merged, and the merged page gets removed (as here),
                     # and the next page is short (forced page break),
                     # then the merge would fail when this loop restarts.
@@ -2072,7 +2072,6 @@ class PDFDocument:
                     last_block = block
                 last_region = region
 
-
     def render(self):
         #### Where does the title come from if not run from command line?
         title = 'Converted Ebook'
diff --git a/src/calibre/ebooks/pdf/render/__init__.py b/src/calibre/ebooks/pdf/render/__init__.py
index fba7748a38..c555cf1377 100644
--- a/src/calibre/ebooks/pdf/render/__init__.py
+++ b/src/calibre/ebooks/pdf/render/__init__.py
@@ -4,6 +4,3 @@
 __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
-
-
-
diff --git a/src/calibre/ebooks/pdf/render/common.py b/src/calibre/ebooks/pdf/render/common.py
index ff5e18d5f1..5bee9f9f8a 100644
--- a/src/calibre/ebooks/pdf/render/common.py
+++ b/src/calibre/ebooks/pdf/render/common.py
@@ -74,7 +74,7 @@ def serialize(o, stream):
     elif o is None:
         stream.write_raw(b'null')
     elif isinstance(o, datetime):
-        val = o.strftime("D:%Y%m%d%H%M%%02d%z")%min(59, o.second)
+        val = o.strftime('D:%Y%m%d%H%M%%02d%z')%min(59, o.second)
         if datetime.tzinfo is not None:
             val = "(%s'%s')"%(val[:-2], val[-2:])
         stream.write(val.encode('ascii'))
diff --git a/src/calibre/ebooks/pdf/render/fonts.py b/src/calibre/ebooks/pdf/render/fonts.py
index b7a8fc510f..2b804e3c98 100644
--- a/src/calibre/ebooks/pdf/render/fonts.py
+++ b/src/calibre/ebooks/pdf/render/fonts.py
@@ -121,7 +121,7 @@ class Font:
         self.metrics, self.compress = metrics, compress
         self.is_otf = self.metrics.is_otf
         self.subset_tag = str(
-            re.sub('.', lambda m: codepoint_to_chr(int(m.group())+ord('A')), oct(num).replace('o', '')
+            re.sub(r'.', lambda m: codepoint_to_chr(int(m.group())+ord('A')), oct(num).replace('o', '')
         )).rjust(6, 'A')
         self.font_stream = FontStream(metrics.is_otf, compress=compress)
         try:
@@ -205,7 +205,7 @@ class Font:
         widths = {g:w for g, w in iteritems(widths) if w != most_common}
 
         groups = Array()
-        for k, g in groupby(enumerate(widths), lambda i_x:i_x[0]-i_x[1]):
+        for k, g in groupby(enumerate(widths), lambda i_x: i_x[0]-i_x[1]):
             group = list(map(itemgetter(1), g))
             gwidths = [widths[g] for g in group]
             if len(set(gwidths)) == 1 and len(group) > 1:
diff --git a/src/calibre/ebooks/pdf/render/gradients.py b/src/calibre/ebooks/pdf/render/gradients.py
index 6e9c1ae1fa..c042509aa8 100644
--- a/src/calibre/ebooks/pdf/render/gradients.py
+++ b/src/calibre/ebooks/pdf/render/gradients.py
@@ -79,7 +79,7 @@ class LinearGradientPattern(Dictionary):
                         matrix):
         start = gradient.start()
         stop = gradient.finalStop()
-        stops = list(map(lambda x: [x[0], x[1].getRgbF()], gradient.stops()))
+        stops = [[x[0], x[1].getRgbF()] for x in gradient.stops()]
         spread = gradient.spread()
         if spread != gradient.PadSpread:
             inv = matrix.inverted()[0]
diff --git a/src/calibre/ebooks/pdf/render/graphics.py b/src/calibre/ebooks/pdf/render/graphics.py
index 70b43a6224..a55bb6c5a8 100644
--- a/src/calibre/ebooks/pdf/render/graphics.py
+++ b/src/calibre/ebooks/pdf/render/graphics.py
@@ -70,154 +70,154 @@ class TilingPattern(Stream):
 class QtPattern(TilingPattern):
 
     qt_patterns = (  # {{{
-        "0 J\n"
-        "6 w\n"
-        "[] 0 d\n"
-        "4 0 m\n"
-        "4 8 l\n"
-        "0 4 m\n"
-        "8 4 l\n"
-        "S\n",  # Dense1Pattern
+        '0 J\n'
+        '6 w\n'
+        '[] 0 d\n'
+        '4 0 m\n'
+        '4 8 l\n'
+        '0 4 m\n'
+        '8 4 l\n'
+        'S\n',  # Dense1Pattern
 
-        "0 J\n"
-        "2 w\n"
-        "[6 2] 1 d\n"
-        "0 0 m\n"
-        "0 8 l\n"
-        "8 0 m\n"
-        "8 8 l\n"
-        "S\n"
-        "[] 0 d\n"
-        "2 0 m\n"
-        "2 8 l\n"
-        "6 0 m\n"
-        "6 8 l\n"
-        "S\n"
-        "[6 2] -3 d\n"
-        "4 0 m\n"
-        "4 8 l\n"
-        "S\n",  # Dense2Pattern
+        '0 J\n'
+        '2 w\n'
+        '[6 2] 1 d\n'
+        '0 0 m\n'
+        '0 8 l\n'
+        '8 0 m\n'
+        '8 8 l\n'
+        'S\n'
+        '[] 0 d\n'
+        '2 0 m\n'
+        '2 8 l\n'
+        '6 0 m\n'
+        '6 8 l\n'
+        'S\n'
+        '[6 2] -3 d\n'
+        '4 0 m\n'
+        '4 8 l\n'
+        'S\n',  # Dense2Pattern
 
-        "0 J\n"
-        "2 w\n"
-        "[6 2] 1 d\n"
-        "0 0 m\n"
-        "0 8 l\n"
-        "8 0 m\n"
-        "8 8 l\n"
-        "S\n"
-        "[2 2] -1 d\n"
-        "2 0 m\n"
-        "2 8 l\n"
-        "6 0 m\n"
-        "6 8 l\n"
-        "S\n"
-        "[6 2] -3 d\n"
-        "4 0 m\n"
-        "4 8 l\n"
-        "S\n",  # Dense3Pattern
+        '0 J\n'
+        '2 w\n'
+        '[6 2] 1 d\n'
+        '0 0 m\n'
+        '0 8 l\n'
+        '8 0 m\n'
+        '8 8 l\n'
+        'S\n'
+        '[2 2] -1 d\n'
+        '2 0 m\n'
+        '2 8 l\n'
+        '6 0 m\n'
+        '6 8 l\n'
+        'S\n'
+        '[6 2] -3 d\n'
+        '4 0 m\n'
+        '4 8 l\n'
+        'S\n',  # Dense3Pattern
 
-        "0 J\n"
-        "2 w\n"
-        "[2 2] 1 d\n"
-        "0 0 m\n"
-        "0 8 l\n"
-        "8 0 m\n"
-        "8 8 l\n"
-        "S\n"
-        "[2 2] -1 d\n"
-        "2 0 m\n"
-        "2 8 l\n"
-        "6 0 m\n"
-        "6 8 l\n"
-        "S\n"
-        "[2 2] 1 d\n"
-        "4 0 m\n"
-        "4 8 l\n"
-        "S\n",  # Dense4Pattern
+        '0 J\n'
+        '2 w\n'
+        '[2 2] 1 d\n'
+        '0 0 m\n'
+        '0 8 l\n'
+        '8 0 m\n'
+        '8 8 l\n'
+        'S\n'
+        '[2 2] -1 d\n'
+        '2 0 m\n'
+        '2 8 l\n'
+        '6 0 m\n'
+        '6 8 l\n'
+        'S\n'
+        '[2 2] 1 d\n'
+        '4 0 m\n'
+        '4 8 l\n'
+        'S\n',  # Dense4Pattern
 
-        "0 J\n"
-        "2 w\n"
-        "[2 6] -1 d\n"
-        "0 0 m\n"
-        "0 8 l\n"
-        "8 0 m\n"
-        "8 8 l\n"
-        "S\n"
-        "[2 2] 1 d\n"
-        "2 0 m\n"
-        "2 8 l\n"
-        "6 0 m\n"
-        "6 8 l\n"
-        "S\n"
-        "[2 6] 3 d\n"
-        "4 0 m\n"
-        "4 8 l\n"
-        "S\n",  # Dense5Pattern
+        '0 J\n'
+        '2 w\n'
+        '[2 6] -1 d\n'
+        '0 0 m\n'
+        '0 8 l\n'
+        '8 0 m\n'
+        '8 8 l\n'
+        'S\n'
+        '[2 2] 1 d\n'
+        '2 0 m\n'
+        '2 8 l\n'
+        '6 0 m\n'
+        '6 8 l\n'
+        'S\n'
+        '[2 6] 3 d\n'
+        '4 0 m\n'
+        '4 8 l\n'
+        'S\n',  # Dense5Pattern
 
-        "0 J\n"
-        "2 w\n"
-        "[2 6] -1 d\n"
-        "0 0 m\n"
-        "0 8 l\n"
-        "8 0 m\n"
-        "8 8 l\n"
-        "S\n"
-        "[2 6] 3 d\n"
-        "4 0 m\n"
-        "4 8 l\n"
-        "S\n",  # Dense6Pattern
+        '0 J\n'
+        '2 w\n'
+        '[2 6] -1 d\n'
+        '0 0 m\n'
+        '0 8 l\n'
+        '8 0 m\n'
+        '8 8 l\n'
+        'S\n'
+        '[2 6] 3 d\n'
+        '4 0 m\n'
+        '4 8 l\n'
+        'S\n',  # Dense6Pattern
 
-        "0 J\n"
-        "2 w\n"
-        "[2 6] -1 d\n"
-        "0 0 m\n"
-        "0 8 l\n"
-        "8 0 m\n"
-        "8 8 l\n"
-        "S\n",  # Dense7Pattern
+        '0 J\n'
+        '2 w\n'
+        '[2 6] -1 d\n'
+        '0 0 m\n'
+        '0 8 l\n'
+        '8 0 m\n'
+        '8 8 l\n'
+        'S\n',  # Dense7Pattern
 
-        "1 w\n"
-        "0 4 m\n"
-        "8 4 l\n"
-        "S\n",  # HorPattern
+        '1 w\n'
+        '0 4 m\n'
+        '8 4 l\n'
+        'S\n',  # HorPattern
 
-        "1 w\n"
-        "4 0 m\n"
-        "4 8 l\n"
-        "S\n",  # VerPattern
+        '1 w\n'
+        '4 0 m\n'
+        '4 8 l\n'
+        'S\n',  # VerPattern
 
-        "1 w\n"
-        "4 0 m\n"
-        "4 8 l\n"
-        "0 4 m\n"
-        "8 4 l\n"
-        "S\n",  # CrossPattern
+        '1 w\n'
+        '4 0 m\n'
+        '4 8 l\n'
+        '0 4 m\n'
+        '8 4 l\n'
+        'S\n',  # CrossPattern
 
-        "1 w\n"
-        "-1 5 m\n"
-        "5 -1 l\n"
-        "3 9 m\n"
-        "9 3 l\n"
-        "S\n",  # BDiagPattern
+        '1 w\n'
+        '-1 5 m\n'
+        '5 -1 l\n'
+        '3 9 m\n'
+        '9 3 l\n'
+        'S\n',  # BDiagPattern
 
-        "1 w\n"
-        "-1 3 m\n"
-        "5 9 l\n"
-        "3 -1 m\n"
-        "9 5 l\n"
-        "S\n",  # FDiagPattern
+        '1 w\n'
+        '-1 3 m\n'
+        '5 9 l\n'
+        '3 -1 m\n'
+        '9 5 l\n'
+        'S\n',  # FDiagPattern
 
-        "1 w\n"
-        "-1 3 m\n"
-        "5 9 l\n"
-        "3 -1 m\n"
-        "9 5 l\n"
-        "-1 5 m\n"
-        "5 -1 l\n"
-        "3 9 m\n"
-        "9 3 l\n"
-        "S\n",  # DiagCrossPattern
+        '1 w\n'
+        '-1 3 m\n'
+        '5 9 l\n'
+        '3 -1 m\n'
+        '9 5 l\n'
+        '-1 5 m\n'
+        '5 -1 l\n'
+        '3 9 m\n'
+        '9 3 l\n'
+        'S\n',  # DiagCrossPattern
     )  # }}}
 
     def __init__(self, pattern_num, matrix):
diff --git a/src/calibre/ebooks/pdf/render/serialize.py b/src/calibre/ebooks/pdf/render/serialize.py
index 0efe50e4ea..c363da5f33 100644
--- a/src/calibre/ebooks/pdf/render/serialize.py
+++ b/src/calibre/ebooks/pdf/render/serialize.py
@@ -228,7 +228,7 @@ class Image(Stream):
 
     def add_extra_keys(self, d):
         d['Type'] = Name('XObject')
-        d['Subtype']=  Name('Image')
+        d['Subtype']= Name('Image')
         d['Width'] = self.width
         d['Height'] = self.height
         if self.depth == 1:
@@ -260,14 +260,14 @@ class PDFStream:
 
     PATH_OPS = {
         # stroke fill   fill-rule
-        (False, False, 'winding')  : 'n',
-        (False, False, 'evenodd')  : 'n',
-        (False, True,  'winding')  : 'f',
-        (False, True,  'evenodd')  : 'f*',
-        (True,  False, 'winding')  : 'S',
-        (True,  False, 'evenodd')  : 'S',
-        (True,  True,  'winding')  : 'B',
-        (True,  True,  'evenodd')  : 'B*',
+        (False, False, 'winding'): 'n',
+        (False, False, 'evenodd'): 'n',
+        (False, True,  'winding'): 'f',
+        (False, True,  'evenodd'): 'f*',
+        (True,  False, 'winding'): 'S',
+        (True,  False, 'evenodd'): 'S',
+        (True,  True,  'winding'): 'B',
+        (True,  True,  'evenodd'): 'B*',
     }
 
     def __init__(self, stream, page_size, compress=False, mark_links=False,
diff --git a/src/calibre/ebooks/pml/pmlml.py b/src/calibre/ebooks/pml/pmlml.py
index f963956285..9232cf0150 100644
--- a/src/calibre/ebooks/pml/pmlml.py
+++ b/src/calibre/ebooks/pml/pmlml.py
@@ -34,10 +34,10 @@ TAG_MAP = {
 }
 
 STYLES = [
-    ('font-weight', {'bold' : 'B', 'bolder' : 'B'}),
-    ('font-style', {'italic' : 'i'}),
-    ('text-decoration', {'underline' : 'u'}),
-    ('text-align', {'right' : 'r', 'center' : 'c'}),
+    ('font-weight', {'bold': 'B', 'bolder': 'B'}),
+    ('font-style', {'italic': 'i'}),
+    ('text-decoration', {'underline': 'u'}),
+    ('text-align', {'right': 'r', 'center': 'c'}),
 ]
 
 BLOCK_TAGS = [
@@ -196,27 +196,27 @@ class PMLMLizer:
 
         # Turn all characters that cannot be represented by themself into their
         # PML code equivalent
-        text = re.sub('[^\x00-\x7f]', lambda x: unipmlcode(x.group()), text)
+        text = re.sub(r'[^\x00-\x7f]', lambda x: unipmlcode(x.group()), text)
 
         # Remove excess spaces at beginning and end of lines
-        text = re.sub('(?m)^[ ]+', '', text)
-        text = re.sub('(?m)[ ]+$', '', text)
+        text = re.sub(r'(?m)^[ ]+', '', text)
+        text = re.sub(r'(?m)[ ]+$', '', text)
 
         # Remove excessive spaces
-        text = re.sub('[ ]{2,}', ' ', text)
+        text = re.sub(r'[ ]{2,}', ' ', text)
 
         # Condense excessive \c empty line sequences.
         text = re.sub(r'(\\c\s*\\c\s*){2,}', r'\\c \n\\c\n', text)
 
         # Remove excessive newlines.
-        text = re.sub('\n[ ]+\n', '\n\n', text)
+        text = re.sub(r'\n[ ]+\n', '\n\n', text)
         if self.opts.remove_paragraph_spacing:
-            text = re.sub('\n{2,}', '\n', text)
+            text = re.sub(r'\n{2,}', '\n', text)
             # Only indent lines that don't have special formatting
-            text = re.sub('(?imu)^(?P<text>.+)$', lambda mo: mo.group('text')
+            text = re.sub(r'(?imu)^(?P<text>.+)$', lambda mo: mo.group('text')
                           if re.search(r'\\[XxCmrctTp]', mo.group('text')) else '        %s' % mo.group('text'), text)
         else:
-            text = re.sub('\n{3,}', '\n\n', text)
+            text = re.sub(r'\n{3,}', '\n\n', text)
 
         return text
 
@@ -356,7 +356,7 @@ class PMLMLizer:
         text += self.close_tags(tags)
 
         # if tag in SEPARATE_TAGS:
-        #    text.append('\n\n')
+        #     text.append('\n\n')
 
         if style['page-break-after'] == 'always':
             text.append(r'\p')
diff --git a/src/calibre/ebooks/rb/__init__.py b/src/calibre/ebooks/rb/__init__.py
index f7169e9583..7ca8e66cc7 100644
--- a/src/calibre/ebooks/rb/__init__.py
+++ b/src/calibre/ebooks/rb/__init__.py
@@ -18,7 +18,7 @@ def unique_name(name, used_names):
     else:
         ext = os.path.splitext(name)[1][:3]
         base_name = name[:22]
-        for i in range(0, 9999):
+        for i in range(9999):
             name = '{}-{}.{}'.format(str(i).rjust('0', 4)[:4], base_name, ext)
             if name not in used_names:
                 break
diff --git a/src/calibre/ebooks/rb/rbml.py b/src/calibre/ebooks/rb/rbml.py
index 908982269d..da0f8361fd 100644
--- a/src/calibre/ebooks/rb/rbml.py
+++ b/src/calibre/ebooks/rb/rbml.py
@@ -47,7 +47,7 @@ IMAGE_TAGS = [
 ]
 
 STYLES = [
-    ('font-weight', {'bold'   : 'b', 'bolder' : 'b'}),
+    ('font-weight', {'bold'  : 'b', 'bolder' : 'b'}),
     ('font-style', {'italic' : 'i'}),
     ('text-align', {'center' : 'center'}),
 ]
@@ -211,7 +211,7 @@ class RBMLizer:
             text += self.dump_text(item, stylizer, page, tag_stack)
 
         close_tag_list = []
-        for i in range(0, tag_count):
+        for i in range(tag_count):
             close_tag_list.insert(0, tag_stack.pop())
 
         text += self.close_tags(close_tag_list)
@@ -223,7 +223,7 @@ class RBMLizer:
 
     def close_tags(self, tags):
         text = ['']
-        for i in range(0, len(tags)):
+        for i in range(len(tags)):
             tag = tags.pop()
             text.append('</%s>' % tag)
 
diff --git a/src/calibre/ebooks/rb/writer.py b/src/calibre/ebooks/rb/writer.py
index 5c2bf7396a..18462eeccc 100644
--- a/src/calibre/ebooks/rb/writer.py
+++ b/src/calibre/ebooks/rb/writer.py
@@ -100,11 +100,11 @@ class RBWriter:
         size = len(text)
 
         pages = []
-        for i in range(0, (len(text) + TEXT_RECORD_SIZE-1) // TEXT_RECORD_SIZE):
+        for i in range((len(text) + TEXT_RECORD_SIZE-1) // TEXT_RECORD_SIZE):
             zobj = zlib.compressobj(9, zlib.DEFLATED, 13, 8, 0)
             pages.append(zobj.compress(text[i * TEXT_RECORD_SIZE : (i * TEXT_RECORD_SIZE) + TEXT_RECORD_SIZE]) + zobj.flush())
 
-        return (size, pages)
+        return size, pages
 
     def _images(self, manifest):
         from calibre.ebooks.oeb.base import OEB_RASTER_IMAGES
diff --git a/src/calibre/ebooks/readability/cleaners.py b/src/calibre/ebooks/readability/cleaners.py
index cd52fe2580..1256c01360 100644
--- a/src/calibre/ebooks/readability/cleaners.py
+++ b/src/calibre/ebooks/readability/cleaners.py
@@ -10,12 +10,12 @@ bad_attrs = ['width', 'height', 'style', '[-a-z]*color', 'background[-a-z]*', 'o
 single_quoted = "'[^']+'"
 double_quoted = '"[^"]+"'
 non_space = '[^ "\'>]+'
-htmlstrip = re.compile("<"  # open
-    "([^>]+) "  # prefix
-    "(?:%s) *" % ('|'.join(bad_attrs),) +  # undesirable attributes
+htmlstrip = re.compile('<'  # open
+    '([^>]+) '  # prefix
+    '(?:%s) *' % ('|'.join(bad_attrs),) +  # undesirable attributes
     f'= *(?:{non_space}|{single_quoted}|{double_quoted})' +  # value
-    "([^>]*)"  # postfix
-    ">"        # end
+    '([^>]*)'  # postfix
+    '>'        # end
 , re.I)
 
 
@@ -28,8 +28,8 @@ def clean_attributes(html):
 def normalize_spaces(s):
     if not s:
         return ''
-    """replace any sequence of whitespace
-    characters with a single space"""
+    '''replace any sequence of whitespace
+    characters with a single space'''
     return ' '.join(s.split())
 
 
diff --git a/src/calibre/ebooks/readability/debug.py b/src/calibre/ebooks/readability/debug.py
index 07b3f67dd1..3366eecfc5 100644
--- a/src/calibre/ebooks/readability/debug.py
+++ b/src/calibre/ebooks/readability/debug.py
@@ -9,7 +9,7 @@ uids = {}
 
 def describe(node, depth=2):
     if not hasattr(node, 'tag'):
-        return "[%s]" % type(node)
+        return '[%s]' % type(node)
     name = node.tag
     if node.get('id', ''):
         name += '#'+node.get('id')
@@ -22,7 +22,7 @@ def describe(node, depth=2):
             uid = uids[node] = len(uids)+1
         else:
             uid = uids.get(node)
-        name += "%02d" % (uid)
+        name += '%02d' % (uid)
     if depth and node.getparent() is not None:
         return name+' - '+describe(node.getparent(), depth-1)
     return name
diff --git a/src/calibre/ebooks/readability/htmls.py b/src/calibre/ebooks/readability/htmls.py
index c4b104a5b6..91091fbf78 100644
--- a/src/calibre/ebooks/readability/htmls.py
+++ b/src/calibre/ebooks/readability/htmls.py
@@ -24,9 +24,9 @@ def normalize_entities(cur_title):
         '\u2013':'-',
         '&mdash;': '-',
         '&ndash;': '-',
-        '\u00A0': ' ',
-        '\u00AB': '"',
-        '\u00BB': '"',
+        '\u00a0': ' ',
+        '\u00ab': '"',
+        '\u00bb': '"',
         '&quot;': '"',
     }
     for c, r in iteritems(entities):
diff --git a/src/calibre/ebooks/readability/readability.py b/src/calibre/ebooks/readability/readability.py
index bed0759a79..29b2a53c90 100644
--- a/src/calibre/ebooks/readability/readability.py
+++ b/src/calibre/ebooks/readability/readability.py
@@ -19,24 +19,24 @@ def tounicode(tree_or_node, **kwargs):
 
 
 REGEXES = {
-    'unlikelyCandidatesRe': re.compile('combx|comment|community|disqus|extra|foot|header|menu|remark|rss|shoutbox|sidebar|sponsor|ad-break|agegate|pagination|pager|popup|tweet|twitter',re.I),  # noqa
-    'okMaybeItsACandidateRe': re.compile('and|article|body|column|main|shadow',re.I),
-    'positiveRe': re.compile('article|body|content|entry|hentry|main|page|pagination|post|text|blog|story',re.I),
-    'negativeRe': re.compile('combx|comment|com-|contact|foot|footer|footnote|masthead|media|meta|outbrain|promo|related|scroll|shoutbox|sidebar|sponsor|shopping|tags|tool|widget',re.I),  # noqa
-    'divToPElementsRe': re.compile('<(a|blockquote|dl|div|img|ol|p|pre|table|ul)',re.I),
-    # 'replaceBrsRe': re.compile('(<br[^>]*>[ \n\r\t]*){2,}',re.I),
-    # 'replaceFontsRe': re.compile('<(\/?)font[^>]*>',re.I),
-    # 'trimRe': re.compile('^\s+|\s+$/'),
-    # 'normalizeRe': re.compile('\s{2,}/'),
-    # 'killBreaksRe': re.compile('(<br\s*\/?>(\s|&nbsp;?)*){1,}/'),
-    # 'videoRe': re.compile('http:\/\/(www\.)?(youtube|vimeo)\.com', re.I),
+    'unlikelyCandidatesRe': re.compile(r'combx|comment|community|disqus|extra|foot|header|menu|remark|rss|shoutbox|sidebar|sponsor|ad-break|agegate|pagination|pager|popup|tweet|twitter',re.I),  # noqa: E501
+    'okMaybeItsACandidateRe': re.compile(r'and|article|body|column|main|shadow',re.I),
+    'positiveRe': re.compile(r'article|body|content|entry|hentry|main|page|pagination|post|text|blog|story',re.I),
+    'negativeRe': re.compile(r'combx|comment|com-|contact|foot|footer|footnote|masthead|media|meta|outbrain|promo|related|scroll|shoutbox|sidebar|sponsor|shopping|tags|tool|widget',re.I),  # noqa: E501
+    'divToPElementsRe': re.compile(r'<(a|blockquote|dl|div|img|ol|p|pre|table|ul)',re.I),
+    # 'replaceBrsRe': re.compile(r'(<br[^>]*>[ \n\r\t]*){2,}',re.I),
+    # 'replaceFontsRe': re.compile(r'<(/?)font[^>]*>',re.I),
+    # 'trimRe': re.compile(r'^\s+|\s+$/'),
+    # 'normalizeRe': re.compile(r'\s{2,}/'),
+    # 'killBreaksRe': re.compile(r'(<br\s*/?>(\s|&nbsp;?)*){1,}/'),
+    # 'videoRe': re.compile(r'http://(www\.)?(youtube|vimeo)\.com', re.I),
     # skipFootnoteLink:    /^\s*(\[?[a-z0-9]{1,2}\]?|^|edit|citation needed)\s*$/i,
 }
 
 
 def describe(node, depth=1):
     if not hasattr(node, 'tag'):
-        return "[%s]" % type(node)
+        return '[%s]' % type(node)
     name = node.tag
     if node.get('id', ''):
         name += '#'+node.get('id')
@@ -61,13 +61,13 @@ def to_int(x):
 
 
 def clean(text):
-    text = re.sub('\\s*\n\\s*', '\n', text)
-    text = re.sub('[ \t]{2,}', ' ', text)
+    text = re.sub(r'\s*\n\s*', '\n', text)
+    text = re.sub(r'[ \t]{2,}', ' ', text)
     return text.strip()
 
 
 def text_length(i):
-    return len(clean(i.text_content() or ""))
+    return len(clean(i.text_content() or ''))
 
 
 class Unparsable(ValueError):
@@ -135,13 +135,13 @@ class Document:
                     article = self.get_article(candidates, best_candidate)
                 else:
                     if ruthless:
-                        self.log.debug("ruthless removal did not work. ")
+                        self.log.debug('ruthless removal did not work. ')
                         ruthless = False
-                        self.debug("ended up stripping too much - going for a safer _parse")
+                        self.debug('ended up stripping too much - going for a safer _parse')
                         # try again
                         continue
                     else:
-                        self.log.debug("Ruthless and lenient parsing did not work. Returning raw html")
+                        self.log.debug('Ruthless and lenient parsing did not work. Returning raw html')
                         article = self.html.find('body')
                         if article is None:
                             article = self.html
@@ -175,9 +175,9 @@ class Document:
             if sibling in self.keep_elements:
                 append = True
 
-            if sibling.tag == "p":
+            if sibling.tag == 'p':
                 link_density = self.get_link_density(sibling)
-                node_content = sibling.text or ""
+                node_content = sibling.text or ''
                 node_length = len(node_content)
 
                 if node_length > 80 and link_density < 0.25:
@@ -188,14 +188,14 @@ class Document:
             if append:
                 parent.append(sibling)
         # if output is not None:
-        #   output.append(best_elem)
+        #     output.append(best_elem)
         return output.find('body')
 
     def select_best_candidate(self, candidates):
         sorted_candidates = sorted(candidates.values(), key=lambda x: x['content_score'], reverse=True)
         for candidate in sorted_candidates[:5]:
             elem = candidate['elem']
-            self.debug("Top 5 : {:6.3f} {}".format(candidate['content_score'], describe(elem)))
+            self.debug('Top 5 : {:6.3f} {}'.format(candidate['content_score'], describe(elem)))
 
         if len(sorted_candidates) == 0:
             return None
@@ -205,10 +205,10 @@ class Document:
 
     def get_link_density(self, elem):
         link_length = 0
-        for i in elem.findall(".//a"):
+        for i in elem.findall('.//a'):
             link_length += text_length(i)
         # if len(elem.findall(".//div") or elem.findall(".//p")):
-        #   link_length = link_length
+        #     link_length = link_length
         total_length = text_length(elem)
         return float(link_length) / max(total_length, 1)
 
@@ -218,13 +218,13 @@ class Document:
         # self.debug(str([describe(node) for node in self.tags(self.html, "div")]))
 
         ordered = []
-        for elem in self.tags(self.html, "p", "pre", "td"):
+        for elem in self.tags(self.html, 'p', 'pre', 'td'):
             parent_node = elem.getparent()
             if parent_node is None:
                 continue
             grand_parent_node = parent_node.getparent()
 
-            inner_text = clean(elem.text_content() or "")
+            inner_text = clean(elem.text_content() or '')
             inner_text_len = len(inner_text)
 
             # If this paragraph is less than 25 characters, don't even count it.
@@ -243,7 +243,7 @@ class Document:
             content_score += len(inner_text.split(','))
             content_score += min((inner_text_len / 100), 3)
             # if elem not in candidates:
-            #   candidates[elem] = self.score_node(elem)
+            #     candidates[elem] = self.score_node(elem)
 
             # WTF? candidates[elem]['content_score'] += content_score
             candidates[parent_node]['content_score'] += content_score
@@ -256,7 +256,7 @@ class Document:
             candidate = candidates[elem]
             ld = self.get_link_density(elem)
             score = candidate['content_score']
-            self.debug(f"Candid: {score:6.3f} {describe(elem)} link density {ld:.3f} -> {score*(1-ld):6.3f}")
+            self.debug(f'Candid: {score:6.3f} {describe(elem)} link density {ld:.3f} -> {score*(1-ld):6.3f}')
             candidate['content_score'] *= (1 - ld)
 
         return candidates
@@ -282,13 +282,13 @@ class Document:
     def score_node(self, elem):
         content_score = self.class_weight(elem)
         name = elem.tag.lower()
-        if name == "div":
+        if name == 'div':
             content_score += 5
-        elif name in ["pre", "td", "blockquote"]:
+        elif name in ['pre', 'td', 'blockquote']:
             content_score += 3
-        elif name in ["address", "ol", "ul", "dl", "dd", "dt", "li", "form"]:
+        elif name in ['address', 'ol', 'ul', 'dl', 'dd', 'dt', 'li', 'form']:
             content_score -= 3
-        elif name in ["h1", "h2", "h3", "h4", "h5", "h6", "th"]:
+        elif name in ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'th']:
             content_score -= 5
         return {
             'content_score': content_score,
@@ -303,10 +303,10 @@ class Document:
         for elem in self.html.iter():
             if elem in self.keep_elements:
                 continue
-            s = "{} {}".format(elem.get('class', ''), elem.get('id', ''))
+            s = '{} {}'.format(elem.get('class', ''), elem.get('id', ''))
             # self.debug(s)
             if REGEXES['unlikelyCandidatesRe'].search(s) and (not REGEXES['okMaybeItsACandidateRe'].search(s)) and elem.tag != 'body':
-                self.debug("Removing unlikely candidate - %s" % describe(elem))
+                self.debug('Removing unlikely candidate - %s' % describe(elem))
                 elem.drop_tree()
 
     def transform_misused_divs_into_paragraphs(self):
@@ -314,8 +314,8 @@ class Document:
             # transform <div>s that do not contain other block elements into <p>s
             if not REGEXES['divToPElementsRe'].search(str(''.join(map(tounicode, list(elem))))):
                 # self.debug("Altering %s to p" % (describe(elem)))
-                elem.tag = "p"
-                # print("Fixed element "+describe(elem))
+                elem.tag = 'p'
+                # print('Fixed element '+describe(elem))
 
         for elem in self.tags(self.html, 'div'):
             if elem.text and elem.text.strip():
@@ -323,7 +323,7 @@ class Document:
                 p.text = elem.text
                 elem.text = None
                 elem.insert(0, p)
-                # print("Appended "+tounicode(p)+" to "+describe(elem))
+                # print('Appended '+tounicode(p)+' to '+describe(elem))
 
             for pos, child in reversed(list(enumerate(elem))):
                 if child.tail and child.tail.strip():
@@ -331,7 +331,7 @@ class Document:
                     p.text = child.tail
                     child.tail = None
                     elem.insert(pos + 1, p)
-                    # print("Inserted "+tounicode(p)+" to "+describe(elem))
+                    # print('Inserted '+tounicode(p)+' to '+describe(elem))
                 if child.tag == 'br':
                     # print('Dropped <br> at '+describe(elem))
                     child.drop_tree()
@@ -346,15 +346,15 @@ class Document:
 
     def sanitize(self, node, candidates):
         MIN_LEN = self.options.get('min_text_length', self.TEXT_LENGTH_THRESHOLD)
-        for header in self.tags(node, "h1", "h2", "h3", "h4", "h5", "h6"):
+        for header in self.tags(node, 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'):
             if self.class_weight(header) < 0 or self.get_link_density(header) > 0.33:
                 header.drop_tree()
 
-        for elem in self.tags(node, "form", "iframe", "textarea"):
+        for elem in self.tags(node, 'form', 'iframe', 'textarea'):
             elem.drop_tree()
         allowed = {}
         # Conditionally clean <table>s, <ul>s, and <div>s
-        for el in self.reverse_tags(node, "table", "ul", "div"):
+        for el in self.reverse_tags(node, 'table', 'ul', 'div'):
             if el in allowed or el in self.keep_elements:
                 continue
             weight = self.class_weight(el)
@@ -366,14 +366,14 @@ class Document:
             tag = el.tag
 
             if weight + content_score < 0:
-                self.debug("Cleaned %s with score %6.3f and weight %-3s" %
+                self.debug('Cleaned %s with score %6.3f and weight %-3s' %
                     (describe(el), content_score, weight, ))
                 el.drop_tree()
-            elif el.text_content().count(",") < 10:
+            elif el.text_content().count(',') < 10:
                 counts = {}
                 for kind in ['p', 'img', 'li', 'a', 'embed', 'input']:
                     counts[kind] = len(el.findall('.//%s' %kind))
-                counts["li"] -= 100
+                counts['li'] -= 100
 
                 content_length = text_length(el)  # Count the text length excluding any surrounding whitespace
                 link_density = self.get_link_density(el)
@@ -384,55 +384,55 @@ class Document:
                     else:
                         content_score = 0
                 # if parent_node is not None:
-                    # pweight = self.class_weight(parent_node) + content_score
-                    # pname = describe(parent_node)
+                #     pweight = self.class_weight(parent_node) + content_score
+                #     pname = describe(parent_node)
                 # else:
-                    # pweight = 0
-                    # pname = "no parent"
+                #     pweight = 0
+                #     pname = "no parent"
                 to_remove = False
-                reason = ""
+                reason = ''
 
                 # if el.tag == 'div' and counts["img"] >= 1:
-                #   continue
-                if counts["p"] and counts["img"] > counts["p"]:
-                    reason = "too many images (%s)" % counts["img"]
+                #     continue
+                if counts['p'] and counts['img'] > counts['p']:
+                    reason = 'too many images (%s)' % counts['img']
                     to_remove = True
-                elif counts["li"] > counts["p"] and tag != "ul" and tag != "ol":
-                    reason = "more <li>s than <p>s"
+                elif counts['li'] > counts['p'] and tag != 'ul' and tag != 'ol':
+                    reason = 'more <li>s than <p>s'
                     to_remove = True
-                elif counts["input"] > (counts["p"] / 3):
-                    reason = "less than 3x <p>s than <input>s"
+                elif counts['input'] > (counts['p'] / 3):
+                    reason = 'less than 3x <p>s than <input>s'
                     to_remove = True
-                elif content_length < (MIN_LEN) and (counts["img"] == 0 or counts["img"] > 2):
-                    reason = "too short content length %s without a single image" % content_length
+                elif content_length < (MIN_LEN) and (counts['img'] == 0 or counts['img'] > 2):
+                    reason = 'too short content length %s without a single image' % content_length
                     to_remove = True
                 elif weight < 25 and link_density > 0.2:
-                    reason = f"too many links {link_density:.3f} for its weight {weight}"
+                    reason = f'too many links {link_density:.3f} for its weight {weight}'
                     to_remove = True
                 elif weight >= 25 and link_density > 0.5:
-                    reason = f"too many links {link_density:.3f} for its weight {weight}"
+                    reason = f'too many links {link_density:.3f} for its weight {weight}'
                     to_remove = True
-                elif (counts["embed"] == 1 and content_length < 75) or counts["embed"] > 1:
-                    reason = "<embed>s with too short content length, or too many <embed>s"
+                elif (counts['embed'] == 1 and content_length < 75) or counts['embed'] > 1:
+                    reason = '<embed>s with too short content length, or too many <embed>s'
                     to_remove = True
-#               if el.tag == 'div' and counts['img'] >= 1 and to_remove:
-#                   imgs = el.findall('.//img')
-#                   valid_img = False
-#                   self.debug(tounicode(el))
-#                   for img in imgs:
-#
-#                       height = img.get('height')
-#                       text_length = img.get('text_length')
-#                       self.debug ("height %s text_length %s" %(repr(height), repr(text_length)))
-#                       if to_int(height) >= 100 or to_int(text_length) >= 100:
-#                           valid_img = True
-#                           self.debug("valid image" + tounicode(img))
-#                           break
-#                   if valid_img:
-#                       to_remove = False
-#                       self.debug("Allowing %s" %el.text_content())
-#                       for desnode in self.tags(el, "table", "ul", "div"):
-#                           allowed[desnode] = True
+                # if el.tag == 'div' and counts['img'] >= 1 and to_remove:
+                #     imgs = el.findall('.//img')
+                #     valid_img = False
+                #     self.debug(tounicode(el))
+                #     for img in imgs:
+                #
+                #         height = img.get('height')
+                #         text_length = img.get('text_length')
+                #         self.debug ("height %s text_length %s" %(repr(height), repr(text_length)))
+                #         if to_int(height) >= 100 or to_int(text_length) >= 100:
+                #             valid_img = True
+                #             self.debug("valid image" + tounicode(img))
+                #             break
+                #     if valid_img:
+                #         to_remove = False
+                #         self.debug("Allowing %s" %el.text_content())
+                #         for desnode in self.tags(el, "table", "ul", "div"):
+                #             allowed[desnode] = True
 
                     # find x non empty preceding and succeeding siblings
                     i, j = 0, 0
@@ -455,14 +455,14 @@ class Document:
                             if j == x:
                                 break
                     # self.debug(str(siblings))
-                    if siblings and sum(siblings) > 1000 :
+                    if siblings and sum(siblings) > 1000:
                         to_remove = False
-                        self.debug("Allowing %s" % describe(el))
-                        for desnode in self.tags(el, "table", "ul", "div"):
+                        self.debug('Allowing %s' % describe(el))
+                        for desnode in self.tags(el, 'table', 'ul', 'div'):
                             allowed[desnode] = True
 
                 if to_remove:
-                    self.debug("Cleaned %6.3f %s with weight %s cause it has %s." %
+                    self.debug('Cleaned %6.3f %s with weight %s cause it has %s.' %
                         (content_score, describe(el), weight, reason))
                     # print(tounicode(el))
                     # self.debug("pname %s pweight %.3f" %(pname, pweight))
diff --git a/src/calibre/ebooks/render_html.py b/src/calibre/ebooks/render_html.py
index e4100e607b..cf4baa9c94 100644
--- a/src/calibre/ebooks/render_html.py
+++ b/src/calibre/ebooks/render_html.py
@@ -79,7 +79,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler):
         if fail_code is None:
             fail_code = QWebEngineUrlRequestJob.Error.UrlNotFound
         rq.fail(fail_code)
-        print(f"Blocking FAKE_PROTOCOL request: {rq.requestUrl().toString()} with code: {fail_code}", file=sys.stderr)
+        print(f'Blocking FAKE_PROTOCOL request: {rq.requestUrl().toString()} with code: {fail_code}', file=sys.stderr)
 
 
 class Render(QWebEnginePage):
@@ -145,7 +145,7 @@ class Render(QWebEnginePage):
                     margins = QMarginsF(*data['margins'])
                 if 'size' in data:
                     sz = data['size']
-                    if type(getattr(QPageSize, sz, None)) is type(QPageSize.PageSizeId.A4):  # noqa
+                    if type(getattr(QPageSize, sz, None)) is type(QPageSize.PageSizeId.A4):
                         page_size = QPageSize(getattr(QPageSize, sz))
                     else:
                         from calibre.ebooks.pdf.image_writer import parse_pdf_page_size
diff --git a/src/calibre/ebooks/rtf/preprocess.py b/src/calibre/ebooks/rtf/preprocess.py
index 9d3412fc3a..66e90106c6 100644
--- a/src/calibre/ebooks/rtf/preprocess.py
+++ b/src/calibre/ebooks/rtf/preprocess.py
@@ -5,16 +5,16 @@ __license__   = 'GPL v3'
 __copyright__ = '2010, Gerendi Sandor Attila'
 __docformat__ = 'restructuredtext en'
 
-"""
+'''
 RTF tokenizer and token parser. v.1.0 (1/17/2010)
 Author: Gerendi Sandor Attila
 
 At this point this will tokenize a RTF file then rebuild it from the tokens.
 In the process the UTF8 tokens are altered to be supported by the RTF2XML and also remain RTF specification compliant.
-"""
+'''
 
 
-class tokenDelimitatorStart():
+class tokenDelimitatorStart:
 
     def __init__(self):
         pass
@@ -26,7 +26,7 @@ class tokenDelimitatorStart():
         return '{'
 
 
-class tokenDelimitatorEnd():
+class tokenDelimitatorEnd:
 
     def __init__(self):
         pass
@@ -38,7 +38,7 @@ class tokenDelimitatorEnd():
         return '}'
 
 
-class tokenControlWord():
+class tokenControlWord:
 
     def __init__(self, name, separator=''):
         self.name = name
@@ -51,7 +51,7 @@ class tokenControlWord():
         return self.name + self.separator
 
 
-class tokenControlWordWithNumericArgument():
+class tokenControlWordWithNumericArgument:
 
     def __init__(self, name, argument, separator=''):
         self.name = name
@@ -65,7 +65,7 @@ class tokenControlWordWithNumericArgument():
         return self.name + repr(self.argument) + self.separator
 
 
-class tokenControlSymbol():
+class tokenControlSymbol:
 
     def __init__(self, name):
         self.name = name
@@ -77,7 +77,7 @@ class tokenControlSymbol():
         return self.name
 
 
-class tokenData():
+class tokenData:
 
     def __init__(self, data):
         self.data = data
@@ -89,20 +89,20 @@ class tokenData():
         return self.data
 
 
-class tokenBinN():
+class tokenBinN:
 
     def __init__(self, data, separator=''):
         self.data = data
         self.separator = separator
 
     def toRTF(self):
-        return "\\bin" + repr(len(self.data)) + self.separator + self.data
+        return '\\bin' + repr(len(self.data)) + self.separator + self.data
 
     def __repr__(self):
-        return "\\bin" + repr(len(self.data)) + self.separator + self.data
+        return '\\bin' + repr(len(self.data)) + self.separator + self.data
 
 
-class token8bitChar():
+class token8bitChar:
 
     def __init__(self, data):
         self.data = data
@@ -114,7 +114,7 @@ class token8bitChar():
         return "\\'" + self.data
 
 
-class tokenUnicode():
+class tokenUnicode:
 
     def __init__(self, data, separator='', current_ucn=1, eqList=[]):
         self.data = data
@@ -127,7 +127,7 @@ class tokenUnicode():
         ucn = self.current_ucn
         if len(self.eqList) < ucn:
             ucn = len(self.eqList)
-            result =  tokenControlWordWithNumericArgument('\\uc', ucn).toRTF() + result
+            result = tokenControlWordWithNumericArgument('\\uc', ucn).toRTF() + result
         i = 0
         for eq in self.eqList:
             if i >= ucn:
@@ -155,7 +155,7 @@ def isString(buffer, string):
     return buffer == string
 
 
-class RtfTokenParser():
+class RtfTokenParser:
 
     def __init__(self, tokens):
         self.tokens = tokens
@@ -253,10 +253,10 @@ class RtfTokenParser():
         result = []
         for token in self.tokens:
             result.append(token.toRTF())
-        return "".join(result)
+        return ''.join(result)
 
 
-class RtfTokenizer():
+class RtfTokenizer:
 
     def __init__(self, rtfData):
         self.rtfData = []
@@ -321,7 +321,7 @@ class RtfTokenizer():
                                 break
                             l = l + 1
                             i = i + 1
-                            if l > 10 :
+                            if l > 10:
                                 raise Exception('Error (at:%d): Too many digits in control word numeric argument.'%[tokenStart])
 
                         if not consumed:
@@ -334,7 +334,7 @@ class RtfTokenizer():
                     controlWord = self.rtfData[tokenStart: tokenEnd]
                     if tokenEnd < i:
                         value = int(self.rtfData[tokenEnd: i])
-                        if isString(controlWord, "\\bin"):
+                        if isString(controlWord, '\\bin'):
                             i = i + value
                             self.tokens.append(tokenBinN(self.rtfData[tokenStart:i], separator))
                         else:
@@ -359,13 +359,13 @@ class RtfTokenizer():
         result = []
         for token in self.tokens:
             result.append(token.toRTF())
-        return "".join(result)
+        return ''.join(result)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     import sys
     if len(sys.argv) < 2:
-        print("Usage %prog rtfFileToConvert")
+        print('Usage %prog rtfFileToConvert')
         sys.exit()
     with open(sys.argv[1], 'rb') as f:
         data = f.read()
diff --git a/src/calibre/ebooks/rtf/rtfml.py b/src/calibre/ebooks/rtf/rtfml.py
index 52ac036f12..40f897879b 100644
--- a/src/calibre/ebooks/rtf/rtfml.py
+++ b/src/calibre/ebooks/rtf/rtfml.py
@@ -121,7 +121,7 @@ class RTFMLizer:
             self.log.debug('Converting %s to RTF markup...' % item.href)
             # Removing comments is needed as comments with -- inside them can
             # cause fromstring() to fail
-            content = re.sub('<!--.*?-->', '', etree.tostring(item.data, encoding='unicode'), flags=re.DOTALL)
+            content = re.sub(r'<!--.*?-->', '', etree.tostring(item.data, encoding='unicode'), flags=re.DOTALL)
             content = self.remove_newlines(content)
             content = self.remove_tabs(content)
             content = safe_xml_fromstring(content)
@@ -153,14 +153,14 @@ class RTFMLizer:
         header = '{{\\rtf1{{\\info{{\\title {}}}{{\\author {}}}}}\\ansi\\ansicpg1252\\deff0\\deflang1033\n'.format(
             self.oeb_book.metadata.title[0].value, authors_to_string([x.value for x in self.oeb_book.metadata.creator]))
         return header + (
-            '{\\fonttbl{\\f0\\froman\\fprq2\\fcharset128 Times New Roman;}{\\f1\\froman\\fprq2\\fcharset128 Times New Roman;}{\\f2\\fswiss\\fprq2\\fcharset128 Arial;}{\\f3\\fnil\\fprq2\\fcharset128 Arial;}{\\f4\\fnil\\fprq2\\fcharset128 MS Mincho;}{\\f5\\fnil\\fprq2\\fcharset128 Tahoma;}{\\f6\\fnil\\fprq0\\fcharset128 Tahoma;}}\n'  # noqa
-            '{\\stylesheet{\\ql \\li0\\ri0\\nowidctlpar\\wrapdefault\\faauto\\rin0\\lin0\\itap0 \\rtlch\\fcs1 \\af25\\afs24\\alang1033 \\ltrch\\fcs0 \\fs24\\lang1033\\langfe255\\cgrid\\langnp1033\\langfenp255 \\snext0 Normal;}\n'  # noqa
-            '{\\s1\\ql \\li0\\ri0\\sb240\\sa120\\keepn\\nowidctlpar\\wrapdefault\\faauto\\outlinelevel0\\rin0\\lin0\\itap0 \\rtlch\\fcs1 \\ab\\af0\\afs32\\alang1033 \\ltrch\\fcs0 \\b\\fs32\\lang1033\\langfe255\\loch\\f1\\hich\\af1\\dbch\\af26\\cgrid\\langnp1033\\langfenp255 \\sbasedon15 \\snext16 \\slink21 heading 1;}\n'  # noqa
-            '{\\s2\\ql \\li0\\ri0\\sb240\\sa120\\keepn\\nowidctlpar\\wrapdefault\\faauto\\outlinelevel1\\rin0\\lin0\\itap0 \\rtlch\\fcs1 \\ab\\ai\\af0\\afs28\\alang1033 \\ltrch\\fcs0 \\b\\i\\fs28\\lang1033\\langfe255\\loch\\f1\\hich\\af1\\dbch\\af26\\cgrid\\langnp1033\\langfenp255 \\sbasedon15 \\snext16 \\slink22 heading 2;}\n'  # noqa
-            '{\\s3\\ql \\li0\\ri0\\sb240\\sa120\\keepn\\nowidctlpar\\wrapdefault\\faauto\\outlinelevel2\\rin0\\lin0\\itap0 \\rtlch\\fcs1 \\ab\\af0\\afs28\\alang1033 \\ltrch\\fcs0 \\b\\fs28\\lang1033\\langfe255\\loch\\f1\\hich\\af1\\dbch\\af26\\cgrid\\langnp1033\\langfenp255 \\sbasedon15 \\snext16 \\slink23 heading 3;}\n'  # noqa
-            '{\\s4\\ql \\li0\\ri0\\sb240\\sa120\\keepn\\nowidctlpar\\wrapdefault\\faauto\\outlinelevel3\\rin0\\lin0\\itap0 \\rtlch\\fcs1 \\ab\\ai\\af0\\afs23\\alang1033 \\ltrch\\fcs0\\b\\i\\fs23\\lang1033\\langfe255\\loch\\f1\\hich\\af1\\dbch\\af26\\cgrid\\langnp1033\\langfenp255 \\sbasedon15 \\snext16 \\slink24 heading 4;}\n'  # noqa
-            '{\\s5\\ql \\li0\\ri0\\sb240\\sa120\\keepn\\nowidctlpar\\wrapdefault\\faauto\\outlinelevel4\\rin0\\lin0\\itap0 \\rtlch\\fcs1 \\ab\\af0\\afs23\\alang1033 \\ltrch\\fcs0 \\b\\fs23\\lang1033\\langfe255\\loch\\f1\\hich\\af1\\dbch\\af26\\cgrid\\langnp1033\\langfenp255 \\sbasedon15 \\snext16 \\slink25 heading 5;}\n'  # noqa
-            '{\\s6\\ql \\li0\\ri0\\sb240\\sa120\\keepn\\nowidctlpar\\wrapdefault\\faauto\\outlinelevel5\\rin0\\lin0\\itap0 \\rtlch\\fcs1 \\ab\\af0\\afs21\\alang1033 \\ltrch\\fcs0 \\b\\fs21\\lang1033\\langfe255\\loch\\f1\\hich\\af1\\dbch\\af26\\cgrid\\langnp1033\\langfenp255 \\sbasedon15 \\snext16 \\slink26 heading 6;}}\n'  # noqa
+            '{\\fonttbl{\\f0\\froman\\fprq2\\fcharset128 Times New Roman;}{\\f1\\froman\\fprq2\\fcharset128 Times New Roman;}{\\f2\\fswiss\\fprq2\\fcharset128 Arial;}{\\f3\\fnil\\fprq2\\fcharset128 Arial;}{\\f4\\fnil\\fprq2\\fcharset128 MS Mincho;}{\\f5\\fnil\\fprq2\\fcharset128 Tahoma;}{\\f6\\fnil\\fprq0\\fcharset128 Tahoma;}}\n'  # noqa: E501
+            '{\\stylesheet{\\ql \\li0\\ri0\\nowidctlpar\\wrapdefault\\faauto\\rin0\\lin0\\itap0 \\rtlch\\fcs1 \\af25\\afs24\\alang1033 \\ltrch\\fcs0 \\fs24\\lang1033\\langfe255\\cgrid\\langnp1033\\langfenp255 \\snext0 Normal;}\n'  # noqa: E501
+            '{\\s1\\ql \\li0\\ri0\\sb240\\sa120\\keepn\\nowidctlpar\\wrapdefault\\faauto\\outlinelevel0\\rin0\\lin0\\itap0 \\rtlch\\fcs1 \\ab\\af0\\afs32\\alang1033 \\ltrch\\fcs0 \\b\\fs32\\lang1033\\langfe255\\loch\\f1\\hich\\af1\\dbch\\af26\\cgrid\\langnp1033\\langfenp255 \\sbasedon15 \\snext16 \\slink21 heading 1;}\n'  # noqa: E501
+            '{\\s2\\ql \\li0\\ri0\\sb240\\sa120\\keepn\\nowidctlpar\\wrapdefault\\faauto\\outlinelevel1\\rin0\\lin0\\itap0 \\rtlch\\fcs1 \\ab\\ai\\af0\\afs28\\alang1033 \\ltrch\\fcs0 \\b\\i\\fs28\\lang1033\\langfe255\\loch\\f1\\hich\\af1\\dbch\\af26\\cgrid\\langnp1033\\langfenp255 \\sbasedon15 \\snext16 \\slink22 heading 2;}\n'  # noqa: E501
+            '{\\s3\\ql \\li0\\ri0\\sb240\\sa120\\keepn\\nowidctlpar\\wrapdefault\\faauto\\outlinelevel2\\rin0\\lin0\\itap0 \\rtlch\\fcs1 \\ab\\af0\\afs28\\alang1033 \\ltrch\\fcs0 \\b\\fs28\\lang1033\\langfe255\\loch\\f1\\hich\\af1\\dbch\\af26\\cgrid\\langnp1033\\langfenp255 \\sbasedon15 \\snext16 \\slink23 heading 3;}\n'  # noqa: E501
+            '{\\s4\\ql \\li0\\ri0\\sb240\\sa120\\keepn\\nowidctlpar\\wrapdefault\\faauto\\outlinelevel3\\rin0\\lin0\\itap0 \\rtlch\\fcs1 \\ab\\ai\\af0\\afs23\\alang1033 \\ltrch\\fcs0\\b\\i\\fs23\\lang1033\\langfe255\\loch\\f1\\hich\\af1\\dbch\\af26\\cgrid\\langnp1033\\langfenp255 \\sbasedon15 \\snext16 \\slink24 heading 4;}\n'  # noqa: E501
+            '{\\s5\\ql \\li0\\ri0\\sb240\\sa120\\keepn\\nowidctlpar\\wrapdefault\\faauto\\outlinelevel4\\rin0\\lin0\\itap0 \\rtlch\\fcs1 \\ab\\af0\\afs23\\alang1033 \\ltrch\\fcs0 \\b\\fs23\\lang1033\\langfe255\\loch\\f1\\hich\\af1\\dbch\\af26\\cgrid\\langnp1033\\langfenp255 \\sbasedon15 \\snext16 \\slink25 heading 5;}\n'  # noqa: E501
+            '{\\s6\\ql \\li0\\ri0\\sb240\\sa120\\keepn\\nowidctlpar\\wrapdefault\\faauto\\outlinelevel5\\rin0\\lin0\\itap0 \\rtlch\\fcs1 \\ab\\af0\\afs21\\alang1033 \\ltrch\\fcs0 \\b\\fs21\\lang1033\\langfe255\\loch\\f1\\hich\\af1\\dbch\\af26\\cgrid\\langnp1033\\langfenp255 \\sbasedon15 \\snext16 \\slink26 heading 6;}}\n'  # noqa: E501
         )
 
     def footer(self):
@@ -195,12 +195,12 @@ class RTFMLizer:
 
     def clean_text(self, text):
         # Remove excessive newlines
-        text = re.sub('%s{3,}' % os.linesep, f'{os.linesep}{os.linesep}', text)
+        text = re.sub(r'%s{3,}' % os.linesep, f'{os.linesep}{os.linesep}', text)
 
         # Remove excessive spaces
-        text = re.sub('[ ]{2,}', ' ', text)
-        text = re.sub('\t{2,}', '\t', text)
-        text = re.sub('\t ', '\t', text)
+        text = re.sub(r'[ ]{2,}', ' ', text)
+        text = re.sub(r'\t{2,}', '\t', text)
+        text = text.replace('\t ', '\t')
 
         # Remove excessive line breaks
         text = re.sub(r'(\{\\line \}\s*){3,}', r'{\\line }{\\line }', text)
@@ -278,8 +278,8 @@ class RTFMLizer:
         for item in elem:
             text += self.dump_text(item, stylizer, tag_stack)
 
-        for i in range(0, tag_count):
-            end_tag =  tag_stack.pop()
+        for i in range(tag_count):
+            end_tag = tag_stack.pop()
             if end_tag != 'block':
                 if tag in BLOCK_TAGS:
                     text += r'\par\pard\plain\hyphpar}'
diff --git a/src/calibre/ebooks/rtf2xml/ParseRtf.py b/src/calibre/ebooks/rtf2xml/ParseRtf.py
index 4c182370b9..0fc1fef992 100644
--- a/src/calibre/ebooks/rtf2xml/ParseRtf.py
+++ b/src/calibre/ebooks/rtf2xml/ParseRtf.py
@@ -57,13 +57,13 @@ from calibre.ebooks.rtf2xml.old_rtf import OldRtf
 
 from . import open_for_read, open_for_write
 
-"""
+'''
 Here is an example script using the ParseRTF module directly
 #!/usr/bin/env python
 
 def Handle_Main():
     # Handles options and creates a parse object
-    parse_obj =ParseRtf.ParseRtf(
+    parse_obj = ParseRtf.ParseRtf(
             in_file = 'in.rtf',
             # All values from here on are optional
             # determine the output file
@@ -98,27 +98,27 @@ def Handle_Main():
         sys.stderr.write(msg)
     except ParseRtf.RtfInvalidCodeException, msg:
         sys.stderr.write(msg)
-"""
+'''
 
 
 class InvalidRtfException(Exception):
-    """
+    '''
     handle invalid RTF
-    """
+    '''
     pass
 
 
 class RtfInvalidCodeException(Exception):
-    """
+    '''
     handle bugs in program
-    """
+    '''
     pass
 
 
 class ParseRtf:
-    """
+    '''
     Main class for controlling the rest of the parsing.
-    """
+    '''
 
     def __init__(self,
                 in_file,
@@ -142,7 +142,7 @@ class ParseRtf:
                 char_data='',
                 default_encoding='cp1252',
                 ):
-        """
+        '''
         Requires:
         'file' --file to parse
         'char_data' --file containing character maps
@@ -157,14 +157,14 @@ class ParseRtf:
             'check_brackets' -- make sure the brackets match up after each run
             through a file. Only for debugging.
         Returns: Nothing
-        """
+        '''
 
         self.__file = in_file
         self.__out_file = out_file
         self.__out_dir = out_dir
         self.__temp_dir = out_dir
         self.__dtd_path = dtd
-        self.__check_file(in_file,"file_to_parse")
+        self.__check_file(in_file,'file_to_parse')
         self.__char_data = char_data
         self.__debug_dir = deb_dir
         self.__check_dir(self.__temp_dir)
@@ -186,12 +186,12 @@ class ParseRtf:
         self.__default_encoding = default_encoding
 
     def __check_file(self, the_file, type):
-        """Check to see if files exist"""
+        '''Check to see if files exist'''
         if hasattr(the_file, 'read'):
             return
         if the_file is None:
-            if type == "file_to_parse":
-                msg = "\nYou must provide a file for the script to work"
+            if type == 'file_to_parse':
+                msg = '\nYou must provide a file for the script to work'
             raise RtfInvalidCodeException(msg)
         elif os.path.exists(the_file):
             pass  # do nothing
@@ -200,24 +200,24 @@ class ParseRtf:
             raise RtfInvalidCodeException(msg)
 
     def __check_dir(self, the_dir):
-        """Check to see if directory exists"""
-        if not the_dir :
+        '''Check to see if directory exists'''
+        if not the_dir:
             return
         dir_exists = os.path.isdir(the_dir)
         if not dir_exists:
-            msg = "\n%s is not a directory" % the_dir
+            msg = '\n%s is not a directory' % the_dir
             raise RtfInvalidCodeException(msg)
         return 1
 
     def parse_rtf(self):
-        """
+        '''
         Parse the file by calling on other classes.
         Requires:
             Nothing
         Returns:
             A parsed file in XML, either to standard output or to a file,
             depending on the value of 'output' when the instance was created.
-        """
+        '''
         self.__temp_file = self.__make_temp_file(self.__file)
         # if the self.__deb_dir is true, then create a copy object,
         # set the directory to write to, remove files, and copy
@@ -228,7 +228,7 @@ class ParseRtf:
                     )
             copy_obj.set_dir(self.__debug_dir)
             copy_obj.remove_files()
-            copy_obj.copy_file(self.__temp_file, "original_file")
+            copy_obj.copy_file(self.__temp_file, 'original_file')
         # Function to check if bracket are well handled
         if self.__debug_dir or self.__run_level > 2:
             self.__check_brack_obj = check_brackets.CheckBrackets(
@@ -415,8 +415,7 @@ class ParseRtf:
         old_rtf = old_rtf_obj.check_if_old_rtf()
         if old_rtf:
             if self.__run_level > 5:
-                msg = 'Older RTF\n' \
-                'self.__run_level is "%s"\n' % self.__run_level
+                msg = 'Older RTF\nself.__run_level is "%s"\n' % self.__run_level
                 raise RtfInvalidCodeException(msg)
             if self.__run_level > 1:
                 sys.stderr.write('File could be older RTF...\n')
@@ -495,7 +494,7 @@ class ParseRtf:
         table_info_obj.insert_info()
         self.__bracket_match('table__data_info')
         if self.__form_lists:
-            make_list_obj =  make_lists.MakeLists(
+            make_list_obj = make_lists.MakeLists(
                 in_file=self.__temp_file,
                 bug_handler=RtfInvalidCodeException,
                 copy=self.__copy,
@@ -506,7 +505,7 @@ class ParseRtf:
             make_list_obj.make_lists()
             self.__bracket_match('form_lists_info')
         if self.__headings_to_sections:
-            headings_to_sections_obj =  headings_to_sections.HeadingsToSections(
+            headings_to_sections_obj = headings_to_sections.HeadingsToSections(
                 in_file=self.__temp_file,
                 bug_handler=RtfInvalidCodeException,
                 copy=self.__copy,
@@ -576,7 +575,7 @@ class ParseRtf:
 
     def __bracket_match(self, file_name):
         if self.__run_level > 2:
-            good_br, msg =  self.__check_brack_obj.check_brackets()
+            good_br, msg = self.__check_brack_obj.check_brackets()
             if good_br:
                 pass
                 # sys.stderr.write( msg + ' in ' + file_name + "\n")
@@ -590,9 +589,9 @@ class ParseRtf:
         if int(num) > self.__exit_level:
             self.__exit_level = num
 
-    def __make_temp_file(self,file):
-        """Make a temporary file to parse"""
-        write_file="rtf_write_file"
+    def __make_temp_file(self, file):
+        '''Make a temporary file to parse'''
+        write_file='rtf_write_file'
         read_obj = file if hasattr(file, 'read') else open_for_read(file)
         with open_for_write(write_file) as write_obj:
             for line in read_obj:
diff --git a/src/calibre/ebooks/rtf2xml/add_brackets.py b/src/calibre/ebooks/rtf2xml/add_brackets.py
index 30b03d829c..b4fab208e1 100644
--- a/src/calibre/ebooks/rtf2xml/add_brackets.py
+++ b/src/calibre/ebooks/rtf2xml/add_brackets.py
@@ -22,20 +22,20 @@ from . import open_for_read, open_for_write
 
 
 class AddBrackets:
-    """
+    '''
     Add brackets for old RTF.
     Logic:
     When control words without their own brackets are encountered
     and in the list of allowed words, this will add brackets
     to facilitate the treatment of the file
-    """
+    '''
 
     def __init__(self, in_file,
             bug_handler,
             copy=None,
             run_level=1,
             ):
-        """
+        '''
         Required:
             'file'--file to parse
         Optional:
@@ -44,52 +44,52 @@ class AddBrackets:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
         self.__write_to = better_mktemp()
         self.__run_level = run_level
         self.__state_dict = {
-            'before_body'           : self.__before_body_func,
-            'in_body'               : self.__in_body_func,
-            'after_control_word'    : self.__after_control_word_func,
-            'in_ignore'             : self.__ignore_func,
+            'before_body'       : self.__before_body_func,
+            'in_body'           : self.__in_body_func,
+            'after_control_word': self.__after_control_word_func,
+            'in_ignore'         : self.__ignore_func,
         }
         self.__accept = [
-            'cw<ci<bold______' ,
-            'cw<ci<annotation' ,
-            'cw<ci<blue______' ,
-            # 'cw<ci<bold______' ,
-            'cw<ci<caps______' ,
-            'cw<ci<char-style' ,
-            'cw<ci<dbl-strike' ,
-            'cw<ci<emboss____' ,
-            'cw<ci<engrave___' ,
-            'cw<ci<font-color' ,
-            'cw<ci<font-down_' ,
-            'cw<ci<font-size_' ,
-            'cw<ci<font-style' ,
-            'cw<ci<font-up___' ,
-            'cw<ci<footnot-mk' ,
-            'cw<ci<green_____' ,
-            'cw<ci<hidden____' ,
-            'cw<ci<italics___' ,
-            'cw<ci<outline___' ,
-            'cw<ci<red_______' ,
-            'cw<ci<shadow____' ,
-            'cw<ci<small-caps' ,
-            'cw<ci<strike-thr' ,
-            'cw<ci<subscript_' ,
-            'cw<ci<superscrip' ,
-            'cw<ci<underlined' ,
-            # 'cw<ul<underlined' ,
+            'cw<ci<bold______',
+            'cw<ci<annotation',
+            'cw<ci<blue______',
+            # 'cw<ci<bold______',
+            'cw<ci<caps______',
+            'cw<ci<char-style',
+            'cw<ci<dbl-strike',
+            'cw<ci<emboss____',
+            'cw<ci<engrave___',
+            'cw<ci<font-color',
+            'cw<ci<font-down_',
+            'cw<ci<font-size_',
+            'cw<ci<font-style',
+            'cw<ci<font-up___',
+            'cw<ci<footnot-mk',
+            'cw<ci<green_____',
+            'cw<ci<hidden____',
+            'cw<ci<italics___',
+            'cw<ci<outline___',
+            'cw<ci<red_______',
+            'cw<ci<shadow____',
+            'cw<ci<small-caps',
+            'cw<ci<strike-thr',
+            'cw<ci<subscript_',
+            'cw<ci<superscrip',
+            'cw<ci<underlined',
+            # 'cw<ul<underlined',
         ]
 
     def __initiate_values(self):
-        """
+        '''
         Init temp values
-        """
+        '''
         self.__state = 'before_body'
         self.__inline = {}
         self.__temp_group = []
@@ -97,15 +97,15 @@ class AddBrackets:
         self.__found_brackets = False
 
     def __before_body_func(self, line):
-        """
+        '''
         If we are before the body, not interest in changing anything
-        """
+        '''
         if self.__token_info == 'mi<mk<body-open_':
             self.__state = 'in_body'
         self.__write_obj.write(line)
 
     def __in_body_func(self, line):
-        """
+        '''
         Select what action to take in body:
             1-At the end of the file close the braket if a bracket was opened
             This happens if there is achange
@@ -114,7 +114,7 @@ class AddBrackets:
             3-If an accepted control word is found put the line
             in a buffer then change state to after cw
             4-Else simply write the line
-        """
+        '''
         if line == 'cb<nu<clos-brack<0001\n' and self.__open_bracket:
             self.__write_obj.write(
                 'cb<nu<clos-brack<0003\n'
@@ -132,12 +132,12 @@ class AddBrackets:
             self.__write_obj.write(line)
 
     def __after_control_word_func(self, line):
-        """
+        '''
         After a cw either add next allowed cw to temporary list or
         change group and write it.
         If the token leading to an exit is an open bracket go to
         ignore otherwise goto in body
-        """
+        '''
         if self.__token_info in self.__accept:
             self.__temp_group.append(line)
         else:
@@ -151,13 +151,13 @@ class AddBrackets:
                 self.__state = 'in_body'
 
     def __write_group(self):
-        """
+        '''
         Write a temporary group after accepted control words end
         But this is mostly useless in my opinion as there is no list of rejected cw
         This may be a way to implement future old rtf processing for cw
         Utility: open a group to just put brackets but why be so complicated?
         Scheme: open brackets, write cw then go to body and back with cw after
-        """
+        '''
         if self.__open_bracket:
             self.__write_obj.write(
                 'cb<nu<clos-brack<0003\n'
@@ -174,36 +174,36 @@ class AddBrackets:
         self.__temp_group = []
 
     def __change_permanent_group(self):
-        """
+        '''
         Use temp group to change permanent group
         If the control word is not accepted remove it
         What is the interest as it is build to accept only accepted cw
         in __after_control_word_func?
-        """
-        self.__inline = {line[:16] : line[20:-1]
+        '''
+        self.__inline = {line[:16]: line[20:-1]
             for line in self.__temp_group\
             # Is this really necessary?
                 if line[:16] in self.__accept}
 
     def __ignore_func(self, line):
-        """
+        '''
         Just copy data inside of RTF brackets already here.
-        """
+        '''
         self.__write_obj.write(line)
         if self.__token_info == 'cb<nu<clos-brack'\
             and self.__cb_count == self.__ignore_count:
             self.__state = 'in_body'
 
     def __check_brackets(self, in_file):
-        """
+        '''
         Return True if brackets match
-        """
+        '''
         check_brack_obj = check_brackets.CheckBrackets(file=in_file)
         return check_brack_obj.check_brackets()[0]
 
     def add_brackets(self):
-        """
-        """
+        '''
+        '''
         self.__initiate_values()
         with open_for_read(self.__file) as read_obj:
             with open_for_write(self.__write_to) as self.__write_obj:
@@ -223,7 +223,7 @@ class AddBrackets:
         if self.__check_brackets(self.__write_to):
             copy_obj = copy.Copy(bug_handler=self.__bug_handler)
             if self.__copy:
-                copy_obj.copy_file(self.__write_to, "add_brackets.data")
+                copy_obj.copy_file(self.__write_to, 'add_brackets.data')
             copy_obj.rename(self.__write_to, self.__file)
         else:
             if self.__run_level > 0:
diff --git a/src/calibre/ebooks/rtf2xml/body_styles.py b/src/calibre/ebooks/rtf2xml/body_styles.py
index 65d784513a..f9208ab625 100644
--- a/src/calibre/ebooks/rtf2xml/body_styles.py
+++ b/src/calibre/ebooks/rtf2xml/body_styles.py
@@ -17,16 +17,16 @@ from calibre.ptempfile import better_mktemp
 
 from . import open_for_read, open_for_write
 
-"""
+'''
 Simply write the list of strings after style table
-"""
+'''
 
 
 class BodyStyles:
-    """
+    '''
     Insert table data for tables.
     Logic:
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -34,7 +34,7 @@ class BodyStyles:
             bug_handler,
             copy=None,
             run_level=1,):
-        """
+        '''
         Required:
             'file'--file to parse
             'table_data' -- a dictionary for each table.
@@ -44,7 +44,7 @@ class BodyStyles:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -54,8 +54,8 @@ class BodyStyles:
         # self.__write_to = 'table_info.data'
 
     def insert_info(self):
-        """
-        """
+        '''
+        '''
         read_obj = open_for_read(self.__file)
         self.__write_obj = open_for_write(self.__write_to)
         line_to_read = 1
@@ -80,6 +80,6 @@ class BodyStyles:
         self.__write_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "body_styles.data")
+            copy_obj.copy_file(self.__write_to, 'body_styles.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/border_parse.py b/src/calibre/ebooks/rtf2xml/border_parse.py
index 2bf4c001f5..38659c403e 100644
--- a/src/calibre/ebooks/rtf2xml/border_parse.py
+++ b/src/calibre/ebooks/rtf2xml/border_parse.py
@@ -14,74 +14,74 @@ import sys
 
 
 class BorderParse:
-    """
+    '''
     Parse a border line and return a dictionary of attributes and values
-    """
+    '''
 
     def __init__(self):
         # cw<bd<bor-t-r-hi<nu<true
         self.__border_dict = {
-        'bor-t-r-hi'    : 'border-table-row-horizontal-inside',
-        'bor-t-r-vi'    : 'border-table-row-vertical-inside',
-        'bor-t-r-to'    : 'border-table-row-top',
-        'bor-t-r-le'    : 'border-table-row-left',
-        'bor-t-r-bo'    : 'border-table-row-bottom',
-        'bor-t-r-ri'    : 'border-table-row-right',
-        'bor-cel-bo'    : 'border-cell-bottom',
-        'bor-cel-to'    : 'border-cell-top',
-        'bor-cel-le'    : 'border-cell-left',
-        'bor-cel-ri'    : 'border-cell-right',
-        'bor-par-bo'    : 'border-paragraph-bottom',
-        'bor-par-to'    : 'border-paragraph-top',
-        'bor-par-le'    : 'border-paragraph-left',
-        'bor-par-ri'    : 'border-paragraph-right',
-        'bor-par-bx'    : 'border-paragraph-box',
-        'bor-for-ev'    : 'border-for-every-paragraph',
-        'bor-outsid'    : 'border-outside',
-        'bor-none__'    : 'border',
+        'bor-t-r-hi': 'border-table-row-horizontal-inside',
+        'bor-t-r-vi': 'border-table-row-vertical-inside',
+        'bor-t-r-to': 'border-table-row-top',
+        'bor-t-r-le': 'border-table-row-left',
+        'bor-t-r-bo': 'border-table-row-bottom',
+        'bor-t-r-ri': 'border-table-row-right',
+        'bor-cel-bo': 'border-cell-bottom',
+        'bor-cel-to': 'border-cell-top',
+        'bor-cel-le': 'border-cell-left',
+        'bor-cel-ri': 'border-cell-right',
+        'bor-par-bo': 'border-paragraph-bottom',
+        'bor-par-to': 'border-paragraph-top',
+        'bor-par-le': 'border-paragraph-left',
+        'bor-par-ri': 'border-paragraph-right',
+        'bor-par-bx': 'border-paragraph-box',
+        'bor-for-ev': 'border-for-every-paragraph',
+        'bor-outsid': 'border-outside',
+        'bor-none__': 'border',
         # border type => bt
-        'bdr-li-wid'    : 'line-width',
-        'bdr-sp-wid'    :       'padding',
-        'bdr-color_'    :       'color',
+        'bdr-li-wid': 'line-width',
+        'bdr-sp-wid': 'padding',
+        'bdr-color_': 'color',
         }
         self.__border_style_dict = {
-        'bdr-single'    : 'single',
-        'bdr-doubtb'    : 'double-thickness-border',
-        'bdr-shadow'    : 'shadowed-border',
-        'bdr-double'    : 'double-border',
-        'bdr-dotted'    : 'dotted-border',
-        'bdr-dashed'    : 'dashed',
-        'bdr-hair__'    : 'hairline',
-        'bdr-inset_'    : 'inset',
-        'bdr-das-sm'    : 'dash-small',
-        'bdr-dot-sm'    : 'dot-dash',
-        'bdr-dot-do'    : 'dot-dot-dash',
-        'bdr-outset'    : 'outset',
-        'bdr-trippl'    : 'tripple',
-        'bdr-thsm__'    : 'thick-thin-small',
-        'bdr-htsm__'    : 'thin-thick-small',
-        'bdr-hthsm_'    : 'thin-thick-thin-small',
-        'bdr-thm___'     : 'thick-thin-medium',
-        'bdr-htm___'     : 'thin-thick-medium',
-        'bdr-hthm__'     : 'thin-thick-thin-medium',
-        'bdr-thl___'     : 'thick-thin-large',
-        'bdr-hthl__'     : 'thin-thick-thin-large',
-        'bdr-wavy__'     : 'wavy',
-        'bdr-d-wav_'     : 'double-wavy',
-        'bdr-strip_'     : 'striped',
-        'bdr-embos_'     : 'emboss',
-        'bdr-engra_'     : 'engrave',
-        'bdr-frame_'     : 'frame',
+        'bdr-single': 'single',
+        'bdr-doubtb': 'double-thickness-border',
+        'bdr-shadow': 'shadowed-border',
+        'bdr-double': 'double-border',
+        'bdr-dotted': 'dotted-border',
+        'bdr-dashed': 'dashed',
+        'bdr-hair__': 'hairline',
+        'bdr-inset_': 'inset',
+        'bdr-das-sm': 'dash-small',
+        'bdr-dot-sm': 'dot-dash',
+        'bdr-dot-do': 'dot-dot-dash',
+        'bdr-outset': 'outset',
+        'bdr-trippl': 'tripple',
+        'bdr-thsm__': 'thick-thin-small',
+        'bdr-htsm__': 'thin-thick-small',
+        'bdr-hthsm_': 'thin-thick-thin-small',
+        'bdr-thm___': 'thick-thin-medium',
+        'bdr-htm___': 'thin-thick-medium',
+        'bdr-hthm__': 'thin-thick-thin-medium',
+        'bdr-thl___': 'thick-thin-large',
+        'bdr-hthl__': 'thin-thick-thin-large',
+        'bdr-wavy__': 'wavy',
+        'bdr-d-wav_': 'double-wavy',
+        'bdr-strip_': 'striped',
+        'bdr-embos_': 'emboss',
+        'bdr-engra_': 'engrave',
+        'bdr-frame_': 'frame',
         }
 
     def parse_border(self, line):
-        """
+        '''
         Requires:
             line -- line with border definition in it
         Returns:
             ?
         Logic:
-        """
+        '''
         border_dict = {}
         border_style_dict = {}
         border_style_list = []
diff --git a/src/calibre/ebooks/rtf2xml/char_set.py b/src/calibre/ebooks/rtf2xml/char_set.py
index 7ea445cac4..a02f6f9f74 100644
--- a/src/calibre/ebooks/rtf2xml/char_set.py
+++ b/src/calibre/ebooks/rtf2xml/char_set.py
@@ -1,4 +1,4 @@
-char_set = """
+char_set = '''
 <ms_standard>
 NON-BREAKING HYPEHN:_:8290:&#x2011;
 LEFT DOUBLE QUOTATION MARK:ldblquote:8220:&#x201C;
@@ -16705,4 +16705,4 @@ HORIZONTAL TABULATION:TAB :9:&#x0009;
 NULL:\xef:0:&#xnull;
 </single_set>
 </unused>
-"""
+'''
diff --git a/src/calibre/ebooks/rtf2xml/check_brackets.py b/src/calibre/ebooks/rtf2xml/check_brackets.py
index 355af163b4..dd24d1bbb8 100644
--- a/src/calibre/ebooks/rtf2xml/check_brackets.py
+++ b/src/calibre/ebooks/rtf2xml/check_brackets.py
@@ -16,7 +16,7 @@ from . import open_for_read
 
 
 class CheckBrackets:
-    """Check that brackets match up"""
+    '''Check that brackets match up'''
 
     def __init__(self, bug_handler=None, file=None):
         self.__file=file
@@ -52,10 +52,10 @@ class CheckBrackets:
                     self.open_brack(line)
                 if self.__token_info == 'cb<nu<clos-brack':
                     if not self.close_brack(line):
-                        return (False, "closed bracket doesn't match, line %s" % line_count)
+                        return False, "closed bracket doesn't match, line %s" % line_count
 
         if self.__bracket_count != 0:
-            msg = ('At end of file open and closed brackets don\'t match\n'
+            msg = ("At end of file open and closed brackets don't match\n"
                         'total number of brackets is %s') % self.__bracket_count
-            return (False, msg)
-        return (True, "Brackets match!")
+            return False, msg
+        return True, 'Brackets match!'
diff --git a/src/calibre/ebooks/rtf2xml/check_encoding.py b/src/calibre/ebooks/rtf2xml/check_encoding.py
index f06a3dddb3..d32de41ccb 100644
--- a/src/calibre/ebooks/rtf2xml/check_encoding.py
+++ b/src/calibre/ebooks/rtf2xml/check_encoding.py
@@ -16,7 +16,7 @@ class CheckEncoding:
             try:
                 char.decode(encoding)
             except ValueError as msg:
-                sys.stderr.write('line: %s char: %s\n%s\n' %  (line_num, char_position, str(msg)))
+                sys.stderr.write('line: %s char: %s\n%s\n' % (line_num, char_position, str(msg)))
 
     def check_encoding(self, path, encoding='us-ascii', verbose=True):
         line_num = 0
diff --git a/src/calibre/ebooks/rtf2xml/colors.py b/src/calibre/ebooks/rtf2xml/colors.py
index 7f0fa81c7b..22a42167ce 100644
--- a/src/calibre/ebooks/rtf2xml/colors.py
+++ b/src/calibre/ebooks/rtf2xml/colors.py
@@ -21,9 +21,9 @@ from . import open_for_read, open_for_write
 
 
 class Colors:
-    """
+    '''
     Change lines with color info from color numbers to the actual color names.
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -31,7 +31,7 @@ class Colors:
             copy=None,
             run_level=1
             ):
-        """
+        '''
         Required:
             'file'--file to parse
         Optional:
@@ -40,7 +40,7 @@ class Colors:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__copy = copy
         self.__bug_handler = bug_handler
@@ -49,15 +49,15 @@ class Colors:
         self.__run_level = run_level
 
     def __initiate_values(self):
-        """
+        '''
         Initiate all values.
-        """
+        '''
         self.__color_dict = {}
         self.__state = 'before_color_table'
         self.__state_dict = {
         'before_color_table': self.__before_color_func,
         'in_color_table'    : self.__in_color_func,
-        'after_color_table'  : self.__after_color_func,
+        'after_color_table' : self.__after_color_func,
         'cw<ci<red_______'  : self.__default_color_func,
         'cw<ci<green_____'  : self.__default_color_func,
         'cw<ci<blue______'  : self.__blue_func,
@@ -69,7 +69,7 @@ class Colors:
         # cw<bd<bor-par-to<nu<bdr-hair__|bdr-li-wid:0.50|bdr-sp-wid:1.00|bdr-color_:2
 
     def __before_color_func(self, line):
-        """
+        '''
         Requires:
             line
         Returns:
@@ -78,26 +78,26 @@ class Colors:
             Check to see if the line marks the beginning of the color table.
             If so, change states.
             Always print out the line.
-        """
+        '''
         # mi<mk<clrtbl-beg
         if self.__token_info == 'mi<mk<clrtbl-beg':
             self.__state = 'in_color_table'
         self.__write_obj.write(line)
 
     def __default_color_func(self, line):
-        """
+        '''
         Requires:
             line
         Returns:
             nothing
         Logic:
             get the hex number from the line and add it to the color string.
-            """
+        '''
         hex_num = line[-3:-1]
         self.__color_string += hex_num
 
     def __blue_func(self, line):
-        """
+        '''
         Requires:
             line
         Returns:
@@ -108,9 +108,9 @@ class Colors:
             as the key, and the hex number as the value. Write an empty tag
             with the hex number and number as attributes. Add one to the color
             number. Reset the color string to '#'
-            """
+        '''
         hex_num = line[-3:-1]
-        self.__color_string +=  hex_num
+        self.__color_string += hex_num
         self.__color_dict[self.__color_num] = self.__color_string
         self.__write_obj.write(
         'mi<tg<empty-att_'
@@ -120,7 +120,7 @@ class Colors:
         self.__color_string = '#'
 
     def __in_color_func(self, line):
-        """
+        '''
         Requires:
             line
         Returns:
@@ -130,7 +130,7 @@ class Colors:
             change the state to after the color table.
             Otherwise, get a function by passing the self.__token_info to the
             state dictionary.
-            """
+        '''
         # mi<mk<clrtbl-beg
         # cw<ci<red_______<nu<00
         if self.__token_info == 'mi<mk<clrtbl-end':
@@ -145,14 +145,14 @@ class Colors:
             action(line)
 
     def __after_color_func(self, line):
-        """
+        '''
         Check the to see if it contains color info. If it does, extract the
         number and look up the hex value in the color dictionary. If the color
         dictionary has no key for the number, print out an error message.
         Otherwise, print out the line.
         Added Oct 10, 2003
         If the number is 0, that indicates no color
-        """
+        '''
         # cw<ci<font-color<nu<2
         if self.__token_info == 'cw<ci<font-color':
             hex_num = int(line[20:-1])
@@ -166,28 +166,26 @@ class Colors:
             if the_index > -1:
                 line = re.sub(self.__line_color_exp, self.__sub_from_line_color, line)
             self.__write_obj.write(line)
-            """
-            if num == 0:
-                hex_num = 'false'
-            else:
-                hex_num = self.__color_dict.get(num)
-            if hex_num == None:
-                if self.__run_level > 0:
-                    sys.stderr.write(
-                    'module is colors.py\n'
-                    'function is self.__after_color_func\n'
-                    'no value in self.__color_dict for key %s\n' % num
-                    )
-                if self.__run_level > 3:
-                    sys.stderr.write(
-                        'run level is %s\n'
-                        'Script will now quit\n'
-                        % self.__run_level)
-            else:
-                self.__write_obj.write(
-                'cw<ci<font-color<nu<%s\n' % hex_num
-                )
-            """
+            # if num == 0:
+            #     hex_num = 'false'
+            # else:
+            #     hex_num = self.__color_dict.get(num)
+            # if hex_num == None:
+            #     if self.__run_level > 0:
+            #         sys.stderr.write(
+            #         'module is colors.py\n'
+            #         'function is self.__after_color_func\n'
+            #         'no value in self.__color_dict for key %s\n' % num
+            #         )
+            #     if self.__run_level > 3:
+            #         sys.stderr.write(
+            #             'run level is %s\n'
+            #             'Script will now quit\n'
+            #             % self.__run_level)
+            # else:
+            #     self.__write_obj.write(
+            #     'cw<ci<font-color<nu<%s\n' % hex_num
+            #     )
         else:
             self.__write_obj.write(line)
         # cw<bd<bor-par-to<nu<bdr-hair__|bdr-li-wid:0.50|bdr-sp-wid:1.00|bdr-color_:2
@@ -198,7 +196,7 @@ class Colors:
             num = int(num)
         except ValueError:
             if self.__run_level > 3:
-                msg = 'can\'t make integer from string\n'
+                msg = "can't make integer from string\n"
                 raise self.__bug_handler(msg)
             else:
                 return 'bdr-color_:no-value'
@@ -213,19 +211,18 @@ class Colors:
         if hex_num is None:
             hex_num = '0'
             if self.__run_level > 3:
-                msg = 'no value in self.__color_dict' \
-                'for key %s at line %d\n' % (num, self.__line)
+                msg = 'no value in self.__color_dict for key %s at line %d\n' % (num, self.__line)
                 raise self.__bug_handler(msg)
         return hex_num
 
     def __do_nothing_func(self, line):
-        """
+        '''
         Bad RTF will have text in the color table
-        """
+        '''
         pass
 
     def convert_colors(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -238,7 +235,7 @@ class Colors:
             and print out the tags.
             If the state if after the color table, look for lines with color
             info, and substitute the number with the hex number.
-        """
+        '''
         self.__initiate_values()
         with open_for_read(self.__file) as read_obj:
             with open_for_write(self.__write_to) as self.__write_obj:
@@ -255,6 +252,6 @@ class Colors:
                     action(line)
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "color.data")
+            copy_obj.copy_file(self.__write_to, 'color.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/combine_borders.py b/src/calibre/ebooks/rtf2xml/combine_borders.py
index f8ed8d0b05..531339fea2 100644
--- a/src/calibre/ebooks/rtf2xml/combine_borders.py
+++ b/src/calibre/ebooks/rtf2xml/combine_borders.py
@@ -19,10 +19,10 @@ from . import open_for_read, open_for_write
 
 
 class CombineBorders:
-    """Combine borders in RTF tokens to make later processing easier"""
+    '''Combine borders in RTF tokens to make later processing easier'''
 
     def __init__(self,
-            in_file ,
+            in_file,
             bug_handler,
             copy=None,
             run_level=1,
@@ -48,7 +48,7 @@ class CombineBorders:
         return line
 
     def end_border(self, line, write_obj):
-        border_string = "|".join(self.__bord_att)
+        border_string = '|'.join(self.__bord_att)
         self.__bord_att = []
         write_obj.write('cw<bd<{}<nu<{}\n'.format(self.__bord_pos,
                                                 border_string))
@@ -88,6 +88,6 @@ class CombineBorders:
                         write_obj.write(self.__default_func(line))
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "combine_borders.data")
+            copy_obj.copy_file(self.__write_to, 'combine_borders.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/configure_txt.py b/src/calibre/ebooks/rtf2xml/configure_txt.py
index d0414f33a4..3c2039a138 100644
--- a/src/calibre/ebooks/rtf2xml/configure_txt.py
+++ b/src/calibre/ebooks/rtf2xml/configure_txt.py
@@ -12,14 +12,14 @@ class Configure:
                     debug_dir=None,
                     show_config_file=None,
                     ):
-        """
+        '''
         Requires:
             file --file to be read
             output --file to output to
         Returns:
             Nothing. Outputs a file
         Logic:
-        """
+        '''
         self.__configuration_file = configuration_file
         self.__debug_dir = debug_dir
         self.__bug_handler = bug_handler
@@ -48,7 +48,7 @@ class Configure:
                     continue
                 fields = line.split('=')
                 if len(fields) != 2:
-                    msg =  line
+                    msg = line
                     msg += ('Error in configuration.txt, line %s\n' % line_num)
                     msg += ('Options take the form of option = value.\n')
                     msg += ('Please correct the configuration file "%s" before continuing\n'
diff --git a/src/calibre/ebooks/rtf2xml/convert_to_tags.py b/src/calibre/ebooks/rtf2xml/convert_to_tags.py
index 150036c081..dd47c81517 100644
--- a/src/calibre/ebooks/rtf2xml/convert_to_tags.py
+++ b/src/calibre/ebooks/rtf2xml/convert_to_tags.py
@@ -10,9 +10,9 @@ public_dtd = 'rtf2xml1.0.dtd'
 
 
 class ConvertToTags:
-    """
+    '''
     Convert file to XML
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -24,7 +24,7 @@ class ConvertToTags:
             copy=None,
             run_level=1,
             ):
-        """
+        '''
         Required:
             'file'
         Optional:
@@ -33,7 +33,7 @@ class ConvertToTags:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -49,9 +49,9 @@ class ConvertToTags:
         self.__bad_encoding = False
 
     def __initiate_values(self):
-        """
+        '''
         Set values, including those for the dictionary.
-        """
+        '''
         self.__state = 'default'
         self.__new_line = 0
         self.__block = ('doc', 'preamble', 'rtf-definition', 'font-table',
@@ -66,22 +66,22 @@ class ConvertToTags:
                 'style-group', 'border-group','styles-in-body', 'paragraph-style-in-body',
                 'list-in-table', 'level-in-table', 'override-table','override-list',
                 )
-        self.__two_new_line = ('section',  'body',  'table', 'row' 'list-table')
+        self.__two_new_line = ('section', 'body', 'table', 'row', 'list-table')
         self.__state_dict = {
-        'default'           :   self.__default_func,
-        'mi<tg<open______'  :   self.__open_func,
-        'mi<tg<close_____'  :   self.__close_func,
-        'mi<tg<open-att__'  :   self.__open_att_func,
-        'mi<tg<empty-att_'  :   self.__empty_att_func,
-        'tx<nu<__________'  :   self.__text_func,
-        'tx<ut<__________'  :   self.__text_func,
-        'mi<tg<empty_____'  :   self.__empty_func,
+        'default'           : self.__default_func,
+        'mi<tg<open______'  : self.__open_func,
+        'mi<tg<close_____'  : self.__close_func,
+        'mi<tg<open-att__'  : self.__open_att_func,
+        'mi<tg<empty-att_'  : self.__empty_att_func,
+        'tx<nu<__________'  : self.__text_func,
+        'tx<ut<__________'  : self.__text_func,
+        'mi<tg<empty_____'  : self.__empty_func,
         }
 
     def __open_func(self, line):
-        """
+        '''
         Print the opening tag and newlines when needed.
-        """
+        '''
         # mi<tg<open______<style-sheet
         info = line[17:-1]
         self.__new_line = 0
@@ -92,9 +92,9 @@ class ConvertToTags:
         self.__write_obj.write('<%s>' % info)
 
     def __empty_func(self, line):
-        """
+        '''
         Print out empty tag and newlines when needed.
-        """
+        '''
         info = line[17:-1]
         self.__write_obj.write(
         '<%s/>' % info)
@@ -105,16 +105,16 @@ class ConvertToTags:
             self.__write_extra_new_line()
 
     def __open_att_func(self, line):
-        """
+        '''
         Process lines for open tags that have attributes.
         The important info is between [17:-1]. Take this info and split it
         with the delimiter '<'. The first token in this group is the element
         name. The rest are attributes, separated fromt their values by '>'. So
         read each token one at a time, and split them by '>'.
-        """
+        '''
         # mi<tg<open-att__<footnote<num>
         info = line[17:-1]
-        tokens = info.split("<")
+        tokens = info.split('<')
         element_name = tokens[0]
         tokens = tokens[1:]
         self.__write_obj.write('<%s' % element_name)
@@ -140,12 +140,12 @@ class ConvertToTags:
             self.__write_extra_new_line()
 
     def __empty_att_func(self, line):
-        """
+        '''
         Same as the __open_att_func, except a '/' is placed at the end of the tag.
-        """
+        '''
         # mi<tg<open-att__<footnote<num>
         info = line[17:-1]
-        tokens = info.split("<")
+        tokens = info.split('<')
         element_name = tokens[0]
         tokens = tokens[1:]
         self.__write_obj.write('<%s' % element_name)
@@ -165,9 +165,9 @@ class ConvertToTags:
             self.__write_extra_new_line()
 
     def __close_func(self, line):
-        """
+        '''
         Print out the closed tag and new lines, if appropriate.
-        """
+        '''
         # mi<tg<close_____<style-sheet\n
         info = line[17:-1]
         self.__write_obj.write(
@@ -179,18 +179,18 @@ class ConvertToTags:
             self.__write_extra_new_line()
 
     def __text_func(self, line):
-        """
+        '''
         Simply print out the information between [17:-1]
-        """
+        '''
         # tx<nu<__________<Normal;
         # change this!
         self.__write_obj.write(line[17:-1])
 
     def __write_extra_new_line(self):
-        """
+        '''
         Print out extra new lines if the new lines have not exceeded two. If
         the new lines are greater than two, do nothing.
-        """
+        '''
         if not self.__indent:
             return
         if self.__new_line < 2:
@@ -200,9 +200,9 @@ class ConvertToTags:
         pass
 
     def __write_new_line(self):
-        """
+        '''
         Print out a new line if a new line has not already been printed out.
-        """
+        '''
         if not self.__indent:
             return
         if not self.__new_line:
@@ -210,9 +210,9 @@ class ConvertToTags:
             self.__new_line += 1
 
     def __write_dec(self):
-        """
+        '''
         Write the XML declaration at the top of the document.
-        """
+        '''
         # keep maximum compatibility with previous version
         check_encoding_obj = check_encoding.CheckEncoding(
                     bug_handler=self.__bug_handler)
@@ -248,7 +248,7 @@ class ConvertToTags:
         self.__write_new_line()
 
     def convert_to_tags(self):
-        """
+        '''
         Read in the file one line at a time. Get the important info, between
         [:16]. Check if this info matches a dictionary entry. If it does, call
         the appropriate function.
@@ -260,7 +260,7 @@ class ConvertToTags:
             attributes.
             a closed function for closed tags.
             an empty tag function.
-            """
+        '''
         self.__initiate_values()
         with open_for_write(self.__write_to) as self.__write_obj:
             self.__write_dec()
@@ -280,6 +280,6 @@ class ConvertToTags:
                         write_obj.write(line)
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "convert_to_tags.data")
+            copy_obj.copy_file(self.__write_to, 'convert_to_tags.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/copy.py b/src/calibre/ebooks/rtf2xml/copy.py
index 7f2fab0898..fd2925b1c7 100644
--- a/src/calibre/ebooks/rtf2xml/copy.py
+++ b/src/calibre/ebooks/rtf2xml/copy.py
@@ -15,33 +15,33 @@ import shutil
 
 
 class Copy:
-    """Copy each changed file to a directory for debugging purposes"""
-    __dir = ""
+    '''Copy each changed file to a directory for debugging purposes'''
+    __dir = ''
 
     def __init__(self, bug_handler, file=None, deb_dir=None, ):
         self.__file = file
         self.__bug_handler = bug_handler
 
     def set_dir(self, deb_dir):
-        """Set the temporary directory to write files to"""
+        '''Set the temporary directory to write files to'''
         if deb_dir is None:
-            message = "No directory has been provided to write to in the copy.py"
+            message = 'No directory has been provided to write to in the copy.py'
             raise self.__bug_handler(message)
         check = os.path.isdir(deb_dir)
         if not check:
-            message = "%(deb_dir)s is not a directory" % vars()
+            message = '%(deb_dir)s is not a directory' % vars()
             raise self.__bug_handler(message)
         Copy.__dir = deb_dir
 
     def remove_files(self):
-        """Remove files from directory"""
+        '''Remove files from directory'''
         self.__remove_the_files(Copy.__dir)
 
     def __remove_the_files(self, the_dir):
-        """Remove files from directory"""
+        '''Remove files from directory'''
         list_of_files = os.listdir(the_dir)
         for file in list_of_files:
-            rem_file = os.path.join(Copy.__dir,file)
+            rem_file = os.path.join(Copy.__dir, file)
             if os.path.isdir(rem_file):
                 self.__remove_the_files(rem_file)
             else:
@@ -51,12 +51,12 @@ class Copy:
                     pass
 
     def copy_file(self, file, new_file):
-        """
+        '''
         Copy the file to a new name
         If the platform is linux, use the faster linux command
         of cp. Otherwise, use a safe python method.
-        """
-        write_file = os.path.join(Copy.__dir,new_file)
+        '''
+        write_file = os.path.join(Copy.__dir, new_file)
         shutil.copyfile(file, write_file)
 
     def rename(self, source, dest):
diff --git a/src/calibre/ebooks/rtf2xml/default_encoding.py b/src/calibre/ebooks/rtf2xml/default_encoding.py
index 6a9a99eb3a..ee7dc31ce8 100644
--- a/src/calibre/ebooks/rtf2xml/default_encoding.py
+++ b/src/calibre/ebooks/rtf2xml/default_encoding.py
@@ -61,9 +61,9 @@ from . import open_for_read
 
 
 class DefaultEncoding:
-    """
+    '''
     Find the default encoding for the doc
-    """
+    '''
 
     # Note: not all those encoding are really supported by rtf2xml
     # See http://msdn.microsoft.com/en-us/library/windows/desktop/dd317756%28v=vs.85%29.aspx
diff --git a/src/calibre/ebooks/rtf2xml/delete_info.py b/src/calibre/ebooks/rtf2xml/delete_info.py
index f5743f50d2..448f5d2011 100644
--- a/src/calibre/ebooks/rtf2xml/delete_info.py
+++ b/src/calibre/ebooks/rtf2xml/delete_info.py
@@ -20,10 +20,10 @@ from . import open_for_read, open_for_write
 
 
 class DeleteInfo:
-    """Delete unnecessary destination groups"""
+    '''Delete unnecessary destination groups'''
 
     def __init__(self,
-            in_file ,
+            in_file,
             bug_handler,
             copy=None,
             run_level=1,
@@ -42,9 +42,9 @@ class DeleteInfo:
         self.__found_delete = False
 
     def __initiate_allow(self):
-        """
+        '''
         Initiate a list of destination groups which should be printed out.
-        """
+        '''
         self.__allowable = ('cw<ss<char-style',
                             'cw<it<listtable_',
                             'cw<it<revi-table',
@@ -68,15 +68,15 @@ class DeleteInfo:
                 )
         self.__state = 'default'
         self.__state_dict = {
-            'default'           : self.__default_func,
-            'after_asterisk'    : self.__asterisk_func,
-            'delete'            : self.__delete_func,
-            'list'              : self.__list_func,
+            'default'       : self.__default_func,
+            'after_asterisk': self.__asterisk_func,
+            'delete'        : self.__delete_func,
+            'list'          : self.__list_func,
         }
 
-    def __default_func(self,line):
-        """Handle lines when in no special state. Look for an asterisk to
-        begin a special state. Otherwise, print out line."""
+    def __default_func(self, line):
+        '''Handle lines when in no special state. Look for an asterisk to
+        begin a special state. Otherwise, print out line.'''
         # cw<ml<asterisk__<nu<true
         if self.__token_info == 'cw<ml<asterisk__':
             self.__state = 'after_asterisk'
@@ -94,9 +94,9 @@ class DeleteInfo:
                 self.__ob = 0
             return True
 
-    def __delete_func(self,line):
-        """Handle lines when in delete state. Don't print out lines
-        unless the state has ended."""
+    def __delete_func(self, line):
+        '''Handle lines when in delete state. Don't print out lines
+        unless the state has ended.'''
         if self.__delete_count == self.__cb_count:
             self.__state = 'default'
             if self.__write_cb:
@@ -104,8 +104,8 @@ class DeleteInfo:
                 return True
             return False
 
-    def __asterisk_func(self,line):
-        """
+    def __asterisk_func(self, line):
+        '''
         Determine whether to delete info in group
         Note on self.__cb flag.
         If you find that you are in a delete group, and the previous
@@ -114,7 +114,7 @@ class DeleteInfo:
         destination group. In this case, you have already written
         the open bracket, so you will need to write the closed one
         as well.
-        """
+        '''
         # Test for {\*}, in which case don't enter
         # delete state
         self.__found_delete = True
@@ -131,13 +131,11 @@ class DeleteInfo:
                     msg = 'Flag problem\n'
                     raise self.__bug_handler(msg)
                 return True
-        elif self.__token_info in self.__allowable :
+        elif self.__token_info in self.__allowable:
             if self.__ob:
                 self.__write_obj.write(self.__ob)
                 self.__ob = 0
                 self.__state = 'default'
-            else:
-                pass
             return True
         elif self.__token_info == 'cw<ls<list______':
             self.__ob = 0
@@ -162,17 +160,17 @@ class DeleteInfo:
             return False
 
     def __found_list_func(self, line):
-        """
+        '''
         print out control words in this group
-        """
+        '''
         self.__state = 'list'
 
     def __list_func(self, line):
-        """
+        '''
         Check to see if the group has ended.
         Return True for all control words.
         Return False otherwise.
-        """
+        '''
         if self.__delete_count == self.__cb_count and \
                 self.__token_info == 'cb<nu<clos-brack':
             self.__state = 'default'
@@ -186,8 +184,8 @@ class DeleteInfo:
             return False
 
     def delete_info(self):
-        """Main method for handling other methods. Read one line at
-        a time, and determine whether to print the line based on the state."""
+        '''Main method for handling other methods. Read one line at
+        a time, and determine whether to print the line based on the state.'''
         with open_for_read(self.__file) as read_obj:
             with open_for_write(self.__write_to) as self.__write_obj:
                 for line in read_obj:
@@ -207,7 +205,7 @@ class DeleteInfo:
                         self.__write_obj.write(line)
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "delete_info.data")
+            copy_obj.copy_file(self.__write_to, 'delete_info.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
         return self.__found_delete
diff --git a/src/calibre/ebooks/rtf2xml/field_strings.py b/src/calibre/ebooks/rtf2xml/field_strings.py
index 3e1ec2849f..176932dcd6 100644
--- a/src/calibre/ebooks/rtf2xml/field_strings.py
+++ b/src/calibre/ebooks/rtf2xml/field_strings.py
@@ -15,24 +15,24 @@ import sys
 
 
 class FieldStrings:
-    """
+    '''
     This module is given a string. It processes the field instruction string and
     returns a list of three values.
-    """
+    '''
 
     def __init__(self, bug_handler, run_level=1):
-        """
+        '''
         Requires:
             nothing
         Returns:
             nothing
-        """
+        '''
         self.__run_level = run_level
         self.__bug_handler = bug_handler
         self.__initiate_values()
 
     def __initiate_values(self):
-        """
+        '''
         Requires:
             nothing.
         Returns:
@@ -41,95 +41,95 @@ class FieldStrings:
             initiate values for rest of class.
             self.__field_instruction_dict:
                 The dictionary for all field names.
-        """
+        '''
         self.__field_instruction_dict = {
         # number type (arabic, etc.) and number format (\# " ")
-        'EDITTIME'      :       (self.__num_type_and_format_func, 'editing-time'),
-        'NUMCHARS'      :       (self.__num_type_and_format_func, 'number-of-characters-in-doc'),
-        'NUMPAGES'      :       (self.__num_type_and_format_func, 'number-of-pages-in-doc'),
-        'NUMWORDS'      :       (self.__num_type_and_format_func, 'number-of-words-in-doc'),
-        'REVNUM'        :       (self.__num_type_and_format_func, 'revision-number'),
-        'SECTIONPAGES'  :       (self.__num_type_and_format_func, 'num-of-pages-in-section'),
-        'SECTION'       :       (self.__num_type_and_format_func, 'insert-section-number'),
-        'QUOTE'         :       (self.__num_type_and_format_func, 'quote'),
+        'EDITTIME'      : (self.__num_type_and_format_func, 'editing-time'),
+        'NUMCHARS'      : (self.__num_type_and_format_func, 'number-of-characters-in-doc'),
+        'NUMPAGES'      : (self.__num_type_and_format_func, 'number-of-pages-in-doc'),
+        'NUMWORDS'      : (self.__num_type_and_format_func, 'number-of-words-in-doc'),
+        'REVNUM'        : (self.__num_type_and_format_func, 'revision-number'),
+        'SECTIONPAGES'  : (self.__num_type_and_format_func, 'num-of-pages-in-section'),
+        'SECTION'       : (self.__num_type_and_format_func, 'insert-section-number'),
+        'QUOTE'         : (self.__num_type_and_format_func, 'quote'),
         # number formatting (\# "")
-        'PAGE'          :       (self.__default_inst_func, 'insert-page-number'),
-        'page'          :       (self.__default_inst_func, 'insert-page-number'),
+        'PAGE'          : (self.__default_inst_func, 'insert-page-number'),
+        'page'          : (self.__default_inst_func, 'insert-page-number'),
         # date format (\@ "")
-        'CREATEDATE'    :       (self.__date_func, 'insert-date'),
-        'PRINTDATE'     :       (self.__date_func, 'insert-date'),
+        'CREATEDATE'    : (self.__date_func, 'insert-date'),
+        'PRINTDATE'     : (self.__date_func, 'insert-date'),
         # PRINTDATE?
-        'SAVEDATE'      :       (self.__date_func, 'last-saved'),
-        'TIME'          :       (self.__date_func, 'insert-time'),
+        'SAVEDATE'      : (self.__date_func, 'last-saved'),
+        'TIME'          : (self.__date_func, 'insert-time'),
         # numbers?
         # these fields take four switches
-        'AUTHOR'        :       (self.__simple_info_func, 'user-name'),
-        'COMMENTS'      :       (self.__simple_info_func, 'comments'),
-        'FILENAME'      :       (self.__simple_info_func, 'file-name'),
-        'filename'      :       (self.__simple_info_func, 'file-name'),
-        'KEYWORDS'      :       (self.__simple_info_func, 'keywords'),
-        'LASTSAVEDBY'   :       (self.__simple_info_func, 'last-saved-by'),
-        'SUBJECT'       :       (self.__simple_info_func, 'subject'),
-        'TEMPLATE'      :       (self.__simple_info_func, 'based-on-template'),
-        'TITLE'         :       (self.__simple_info_func, 'document-title'),
-        'USERADDRESS'   :       (self.__simple_info_func, 'user-address'),
-        'USERINITIALS'  :       (self.__simple_info_func, 'user-initials'),
-        'USERNAME'      :       (self.__simple_info_func, 'user-name'),
-        'EQ'            :       (self.__equation_func, 'equation'),
-        'HYPERLINK'     :       (self.__hyperlink_func, 'hyperlink'),
-        'INCLUDEPICTURE':       (self.__include_pict_func, 'include-picture'),
-        'INCLUDETEXT'   :       (self.__include_text_func, 'include-text-from-file'),
-        'INDEX'         :       (self.__index_func, 'index'),
-        'NOTEREF'       :       (self.__note_ref_func, 'reference-to-note'),
-        'PAGEREF'       :       (self.__page_ref_func, 'reference-to-page'),
-        'REF'           :       (self.__ref_func, 'reference'),
-        'ref'           :       (self.__ref_func, 'reference'),
-        'SEQ'           :       (self.__sequence_func, 'numbering-sequence'),
-        'SYMBOL'        :       (self.__symbol_func, 'symbol'),
-        'TA'            :       (self.__ta_func, 'anchor-for-table-of-authorities'),
-        'TOA'           :       (self.__toc_table_func, 'table-of-authorities'),
-        'TOC'           :       (self.__toc_table_func, 'table-of-contents'),
+        'AUTHOR'        : (self.__simple_info_func, 'user-name'),
+        'COMMENTS'      : (self.__simple_info_func, 'comments'),
+        'FILENAME'      : (self.__simple_info_func, 'file-name'),
+        'filename'      : (self.__simple_info_func, 'file-name'),
+        'KEYWORDS'      : (self.__simple_info_func, 'keywords'),
+        'LASTSAVEDBY'   : (self.__simple_info_func, 'last-saved-by'),
+        'SUBJECT'       : (self.__simple_info_func, 'subject'),
+        'TEMPLATE'      : (self.__simple_info_func, 'based-on-template'),
+        'TITLE'         : (self.__simple_info_func, 'document-title'),
+        'USERADDRESS'   : (self.__simple_info_func, 'user-address'),
+        'USERINITIALS'  : (self.__simple_info_func, 'user-initials'),
+        'USERNAME'      : (self.__simple_info_func, 'user-name'),
+        'EQ'            : (self.__equation_func, 'equation'),
+        'HYPERLINK'     : (self.__hyperlink_func, 'hyperlink'),
+        'INCLUDEPICTURE': (self.__include_pict_func, 'include-picture'),
+        'INCLUDETEXT'   : (self.__include_text_func, 'include-text-from-file'),
+        'INDEX'         : (self.__index_func, 'index'),
+        'NOTEREF'       : (self.__note_ref_func, 'reference-to-note'),
+        'PAGEREF'       : (self.__page_ref_func, 'reference-to-page'),
+        'REF'           : (self.__ref_func, 'reference'),
+        'ref'           : (self.__ref_func, 'reference'),
+        'SEQ'           : (self.__sequence_func, 'numbering-sequence'),
+        'SYMBOL'        : (self.__symbol_func, 'symbol'),
+        'TA'            : (self.__ta_func, 'anchor-for-table-of-authorities'),
+        'TOA'           : (self.__toc_table_func, 'table-of-authorities'),
+        'TOC'           : (self.__toc_table_func, 'table-of-contents'),
         # no switches
-        'AUTONUMOUT'    :       (self.__no_switch_func, 'auto-num-out?'),
-        'COMPARE'       :       (self.__no_switch_func, 'compare'),
-        'DOCVARIABLE'   :       (self.__no_switch_func, 'document-variable'),
-        'GOTOBUTTON'    :       (self.__no_switch_func, 'go-button'),
-        'NEXT'          :       (self.__no_switch_func, 'next'),
-        'NEXTIF'        :       (self.__no_switch_func, 'next-if'),
-        'SKIPIF'        :       (self.__no_switch_func, 'skip-if'),
-        'IF'            :       (self.__no_switch_func, 'if'),
-        'MERGEFIELD'    :       (self.__no_switch_func, 'merge-field'),
-        'MERGEREC'      :       (self.__no_switch_func, 'merge-record'),
-        'MERGESEQ'      :       (self.__no_switch_func, 'merge-sequence'),
-        'PLACEHOLDER'   :       (self.__no_switch_func, 'place-holder'),
-        'PRIVATE'       :       (self.__no_switch_func, 'private'),
-        'RD'            :       (self.__no_switch_func, 'referenced-document'),
-        'SET'           :       (self.__no_switch_func, 'set'),
+        'AUTONUMOUT'    : (self.__no_switch_func, 'auto-num-out?'),
+        'COMPARE'       : (self.__no_switch_func, 'compare'),
+        'DOCVARIABLE'   : (self.__no_switch_func, 'document-variable'),
+        'GOTOBUTTON'    : (self.__no_switch_func, 'go-button'),
+        'NEXT'          : (self.__no_switch_func, 'next'),
+        'NEXTIF'        : (self.__no_switch_func, 'next-if'),
+        'SKIPIF'        : (self.__no_switch_func, 'skip-if'),
+        'IF'            : (self.__no_switch_func, 'if'),
+        'MERGEFIELD'    : (self.__no_switch_func, 'merge-field'),
+        'MERGEREC'      : (self.__no_switch_func, 'merge-record'),
+        'MERGESEQ'      : (self.__no_switch_func, 'merge-sequence'),
+        'PLACEHOLDER'   : (self.__no_switch_func, 'place-holder'),
+        'PRIVATE'       : (self.__no_switch_func, 'private'),
+        'RD'            : (self.__no_switch_func, 'referenced-document'),
+        'SET'           : (self.__no_switch_func, 'set'),
         # default instructions (haven't written a method for them
-        'ADVANCE'       :       (self.__default_inst_func, 'advance'),
-        'ASK'           :       (self.__default_inst_func, 'prompt-user'),
-        'AUTONUMLGL'    :       (self.__default_inst_func, 'automatic-number'),
+        'ADVANCE'       : (self.__default_inst_func, 'advance'),
+        'ASK'           : (self.__default_inst_func, 'prompt-user'),
+        'AUTONUMLGL'    : (self.__default_inst_func, 'automatic-number'),
         'AUTONUM'       : (self.__default_inst_func, 'automatic-number'),
-        'AUTOTEXTLIST'  :       (self.__default_inst_func, 'auto-list-text'),
-        'AUTOTEXT'      :       (self.__default_inst_func, 'auto-text'),
-        'BARCODE'       :       (self.__default_inst_func, 'barcode'),
-        'CONTACT'       :       (self.__default_inst_func, 'contact'),
-        'DATABASE'      :       (self.__default_inst_func, 'database'),
-        'DATE'          :       (self.__default_inst_func, 'date'),
-        'date'          :       (self.__default_inst_func, 'date'),
-        'DOCPROPERTY'   :       (self.__default_inst_func, 'document-property'),
-        'FILESIZE'      :       (self.__default_inst_func, 'file-size'),
-        'FILLIN'        :       (self.__default_inst_func, 'fill-in'),
-        'INFO'          :       (self.__default_inst_func, 'document-info'),
-        'LINK'          :       (self.__default_inst_func, 'link'),
-        'PA'            :       (self.__default_inst_func, 'page'),
-        'PRINT'         :       (self.__default_inst_func, 'print'),
-        'STYLEREF'      :       (self.__default_inst_func, 'style-reference'),
-        'USERPROPERTY'  :       (self.__default_inst_func, 'user-property'),
-        'FORMCHECKBOX'  :       (self.__default_inst_func, 'form-checkbox'),
-        'FORMTEXT'      :       (self.__default_inst_func, 'form-text'),
+        'AUTOTEXTLIST'  : (self.__default_inst_func, 'auto-list-text'),
+        'AUTOTEXT'      : (self.__default_inst_func, 'auto-text'),
+        'BARCODE'       : (self.__default_inst_func, 'barcode'),
+        'CONTACT'       : (self.__default_inst_func, 'contact'),
+        'DATABASE'      : (self.__default_inst_func, 'database'),
+        'DATE'          : (self.__default_inst_func, 'date'),
+        'date'          : (self.__default_inst_func, 'date'),
+        'DOCPROPERTY'   : (self.__default_inst_func, 'document-property'),
+        'FILESIZE'      : (self.__default_inst_func, 'file-size'),
+        'FILLIN'        : (self.__default_inst_func, 'fill-in'),
+        'INFO'          : (self.__default_inst_func, 'document-info'),
+        'LINK'          : (self.__default_inst_func, 'link'),
+        'PA'            : (self.__default_inst_func, 'page'),
+        'PRINT'         : (self.__default_inst_func, 'print'),
+        'STYLEREF'      : (self.__default_inst_func, 'style-reference'),
+        'USERPROPERTY'  : (self.__default_inst_func, 'user-property'),
+        'FORMCHECKBOX'  : (self.__default_inst_func, 'form-checkbox'),
+        'FORMTEXT'      : (self.__default_inst_func, 'form-text'),
         # buttons
-        'MACROBUTTON'   :       (self.__default_inst_func, 'macro-button'),
+        'MACROBUTTON'   : (self.__default_inst_func, 'macro-button'),
         }
         self.__number_dict = {
             'Arabic'        :   'arabic',
@@ -182,7 +182,7 @@ class FieldStrings:
         self.__link_switch = re.compile(r'\\l\s{1,}(.*?)\s')
 
     def process_string(self, my_string, type):
-        """
+        '''
         Requires:
             my_string --the string to parse.
             type -- the type of string.
@@ -195,7 +195,7 @@ class FieldStrings:
             resulting list. This item is the field's type. Check for the
             action in the field instructions dictionary for further parsing.
             If no action is found, print out an error message.
-        """
+        '''
         changed_string = ''
         lines = my_string.split('\n')
         for line in lines:
@@ -226,7 +226,7 @@ class FieldStrings:
         return the_list
 
     def __default_inst_func(self, field_name, name, line):
-        """
+        '''
         Requires:
             field_name -- the first word in the string
             name -- the changed name according to the dictionary
@@ -235,11 +235,11 @@ class FieldStrings:
             The name of the field.
         Logic:
             I only need the changed name for the field.
-        """
+        '''
         return [None, None, name]
 
-    def __fall_back_func(self, field_name,  line):
-        """
+    def __fall_back_func(self, field_name, line):
+        '''
         Requires:
             field_name -- the first word in the string
             name -- the changed name according to the dictionary
@@ -248,13 +248,13 @@ class FieldStrings:
             The name of the field.
         Logic:
             Used for fields not found in dict
-        """
+        '''
         the_string = field_name
         the_string += '<update>none'
         return [None, None, the_string]
 
     def __equation_func(self, field_name, name, line):
-        """
+        '''
         Required:
             field_name -- the first word in the string
             name --the changed name according to the dictionary
@@ -262,11 +262,11 @@ class FieldStrings:
         Returns:
             The name of the field
         Logic:
-        """
+        '''
         return [None, None, name]
 
     def __no_switch_func(self, field_name, name, line):
-        """
+        '''
         Required:
             field_name --the first
             field_name -- the first word in the string
@@ -275,11 +275,11 @@ class FieldStrings:
         Returns:
             The name of the field
         Logic:
-        """
+        '''
         return [None, None, name]
 
     def __num_type_and_format_func(self, field_name, name, line):
-        """
+        '''
         Required:
             field_name -- the first word in the string
             name --the changed name according to the dictionary
@@ -289,7 +289,7 @@ class FieldStrings:
         Logic:
             parse num_type
             parse num_format
-        """
+        '''
         the_string = name
         num_format = self.__parse_num_format(line)
         if num_format:
@@ -306,7 +306,7 @@ class FieldStrings:
         return [None, None, the_string]
 
     def __num_format_func(self, field_name, name, line):
-        """
+        '''
         Required:
             field_name -- the first word in the string
             name --the changed name according to the dictionary
@@ -314,7 +314,7 @@ class FieldStrings:
         Returns:
             list of None, None, and part of a tag
         Logic:
-        """
+        '''
         the_string = name
         num_format = self.__parse_num_format(line)
         if num_format:
@@ -322,20 +322,20 @@ class FieldStrings:
         return [None, None, the_string]
 
     def __parse_num_format(self, the_string):
-        """
+        '''
         Required:
             the_string -- the string to parse
         Returns:
             a string if the_string contains number formatting information
             None, otherwise
         Logic:
-        """
+        '''
         match_group = re.search(self.__date_exp, the_string)
         if match_group:
             return match_group(1)
 
     def __parse_num_type(self, the_string):
-        """
+        '''
         Required:
             the_string -- the string to parse
         Returns:
@@ -347,11 +347,11 @@ class FieldStrings:
             Get the \\* Upper part. Use a dictionary to convert the "Arabic" to
             a more-readable word for the value of the key "number-type".
             (<field number-type = "Arabic">
-        """
+        '''
         match_group = re.search(self.__num_type_exp, the_string)
         if match_group:
-            name =  match_group.group(1)
-            changed_name =   self.__number_dict.get(name)
+            name = match_group.group(1)
+            changed_name = self.__number_dict.get(name)
             if changed_name:
                 return changed_name
             else:
@@ -360,7 +360,7 @@ class FieldStrings:
                 sys.stderr.write('no dictionary entry for %s\n' % name)
 
     def __date_func(self, field_name, name, line):
-        """
+        '''
         Required:
             field_name --the fist
             field_name -- the first word in the string
@@ -369,7 +369,7 @@ class FieldStrings:
         Returns:
             list of None, None, and part of a tag
         Logic:
-        """
+        '''
         the_string = name
         match_group = re.search(self.__date_exp, line)
         if match_group:
@@ -377,7 +377,7 @@ class FieldStrings:
         return [None, None, the_string]
 
     def __simple_info_func(self, field_name, name, line):
-        """
+        '''
         Required:
             field_name -- the first word in the string
             name --the changed name according to the dictionary
@@ -390,12 +390,12 @@ class FieldStrings:
                 2. Lower
                 3. FirstCap
                 4. Caps
-        """
+        '''
         the_string = name
         match_group = re.search(self.__format_text_exp, line)
         if match_group:
-            name =  match_group.group(1)
-            changed_name =   self.__text_format_dict.get(name)
+            name = match_group.group(1)
+            changed_name = self.__text_format_dict.get(name)
             if changed_name:
                 the_string += '<format>%s' % changed_name
             else:
@@ -405,20 +405,20 @@ class FieldStrings:
         return [None, None, the_string]
 
     def __hyperlink_func(self, field_name, name, line):
-        """
+        '''
         Required:
             field_name -- the first word in the string
             name --the changed name according to the dictionary
             line -- the string to be parse
         Returns:
             The name of the field
-        """
+        '''
         self.__link_switch = re.compile(r'\\l\s{1,}"{0,1}(.*?)"{0,1}\s')
         the_string = name
         match_group = re.search(self.__link_switch, line)
         if match_group:
             link = match_group.group(1)
-            link = link.replace('"', "&quot;")
+            link = link.replace('"', '&quot;')
             the_string += '<link>%s' % link
         # \l "txt" "link"
         # want "file name" so must get rid of \c "txt"
@@ -427,8 +427,6 @@ class FieldStrings:
         if match_group:
             arg = match_group.group(1)
             the_string += '<argument>%s' % arg
-        else:
-            pass
         index = line.find('\\m')
         if index > -1:
             the_string += '<html2-image-map>true'
@@ -441,7 +439,7 @@ class FieldStrings:
         return [None, None, the_string]
 
     def __include_text_func(self, field_name, name, line):
-        """
+        '''
         Required:
             field_name -- the first word in the string
             name --the changed name according to the dictionary
@@ -449,12 +447,12 @@ class FieldStrings:
         Returns:
             The name of the field
         Logic:
-        """
+        '''
         the_string = name
         match_group = re.search(self.__format_text_exp, line)
         if match_group:
-            name =  match_group.group(1)
-            changed_name =   self.__text_format_dict.get(name)
+            name = match_group.group(1)
+            changed_name = self.__text_format_dict.get(name)
             if changed_name:
                 the_string += '<format>%s' % changed_name
             else:
@@ -471,7 +469,7 @@ class FieldStrings:
         match_group = re.search(self.__quote_exp, line)
         if match_group:
             arg = match_group.group(1)
-            arg = arg.replace('"', "&quot;")
+            arg = arg.replace('"', '&quot;')
             the_string += '<argument>%s' % arg
         else:
             sys.stderr.write('Module is field_strings\n')
@@ -483,7 +481,7 @@ class FieldStrings:
         return [None, None, the_string]
 
     def __include_pict_func(self, field_name, name, line):
-        """
+        '''
         Required:
             field_name -- the first word in the string
             name --the changed name according to the dictionary
@@ -491,12 +489,12 @@ class FieldStrings:
         Returns:
             The name of the field
         Logic:
-        """
+        '''
         the_string = name
         match_group = re.search(self.__filter_switch, line)
         if match_group:
             arg = match_group.group(1)
-            arg = arg.replace('"', "&quot;")
+            arg = arg.replace('"', '&quot;')
             the_string += '<filter>%s' % arg
         # \c "txt" "file name"
         # want "file name" so must get rid of \c "txt"
@@ -515,7 +513,7 @@ class FieldStrings:
         return [None, None, the_string]
 
     def __ref_func(self, field_name, name, line):
-        """
+        '''
         Requires:
             field_name -- the first word in the string
             name -- the changed name according to the dictionary
@@ -527,12 +525,12 @@ class FieldStrings:
                 PAGEREF _Toc440880424 \\h
             I want to extract the second line of info, which is used as an
             anchor in the resulting XML file.
-        """
+        '''
         the_string = name
         match_group = re.search(self.__format_text_exp, line)
         if match_group:
-            name =  match_group.group(1)
-            changed_name =   self.__text_format_dict.get(name)
+            name = match_group.group(1)
+            changed_name = self.__text_format_dict.get(name)
             if changed_name:
                 the_string += '<format>%s' % changed_name
             else:
@@ -569,7 +567,7 @@ class FieldStrings:
         return [None, None, the_string]
 
     def __toc_table_func(self, field_name, name, line):
-        """
+        '''
         Requires:
             field_name -- the name of the first word in the string
             name --the changed name, according to the dictionary.
@@ -579,7 +577,7 @@ class FieldStrings:
         Logic:
             If the string contains Figure, it is a table of figures.
             Otherwise, it is a plain old table of contents.
-        """
+        '''
         the_string = name
         index = line.find('\\c "Figure"')
         if index > -1:
@@ -588,7 +586,7 @@ class FieldStrings:
         return [name, None, the_string]
 
     def __sequence_func(self, field_name, name, line):
-        """
+        '''
         Requires:
             field_name --the name of the first word in the string.
             name --the changed name according to the dictionary.
@@ -600,14 +598,14 @@ class FieldStrings:
             whatever--is represented by the second word in the string. Extract
             and return.
             SEQ Figure \\* ARABIC
-        """
+        '''
         fields = line.split()
         label = fields[1]
         my_string = f'{name}<label>{label}'
         return [None, None, my_string]
 
     def __ta_func(self, field_name, name, line):
-        """
+        '''
         Requires:
             field_name --the name of the first word in the string.
             name --the changed name according to the dictionary.
@@ -615,19 +613,19 @@ class FieldStrings:
         Returns:
             A string with a value for the type and label attributes
         Logic:
-        """
+        '''
         the_string = name
         match_group = re.search(self.__ta_short_field_exp, line)
         if match_group:
-            short_name =  match_group.group(1)
+            short_name = match_group.group(1)
             the_string += '<short-field>%s' % short_name
         match_group = re.search(self.__ta_long_field_exp, line)
         if match_group:
-            long_name =  match_group.group(1)
+            long_name = match_group.group(1)
             the_string += '<long-field>%s' % long_name
         match_group = re.search(self.__ta_category_exp, line)
         if match_group:
-            category =  match_group.group(1)
+            category = match_group.group(1)
             the_string += '<category>%s' % category
         index = line.find('\\b')
         if index > -1:
@@ -638,7 +636,7 @@ class FieldStrings:
         return [None, None, the_string]
 
     def __index_func(self, field_name, name, line):
-        """
+        '''
         Requires:
             field_name --the name of the first word in the string.
             name --the changed name according to the dictionary.
@@ -646,7 +644,7 @@ class FieldStrings:
         Returns:
             A string with a value for the type and label attributes
         Logic:
-        """
+        '''
         # self.__index_insert_blank_line_exp = re.compile(r'\\h\s{1,}""')
         # self.__index_insert_letter_exp = re.compile(r'\\h\s{1,}(".*?")')
         the_string = name
@@ -711,7 +709,7 @@ class FieldStrings:
         return [None, None, the_string]
 
     def __page_ref_func(self, field_name, name, line):
-        """
+        '''
         Requires:
             field_name --first name in the string.
             name -- the changed name according to the dictionary.
@@ -719,7 +717,7 @@ class FieldStrings:
         Returns:
             A string .
         Logic:
-        """
+        '''
         the_string = name
         num_format = self.__parse_num_format(line)
         if num_format:
@@ -742,7 +740,7 @@ class FieldStrings:
         return [None, None, the_string]
 
     def __note_ref_func(self, field_name, name, line):
-        """
+        '''
         Requires:
             field_name --first name in the string.
             name -- the changed name according to the dictionary.
@@ -750,7 +748,7 @@ class FieldStrings:
         Returns:
             A string .
         Logic:
-        """
+        '''
         the_string = name
         line = re.sub(self.__merge_format_exp, '', line)
         words = line.split()
@@ -770,7 +768,7 @@ class FieldStrings:
         return [None, None, the_string]
 
     def __symbol_func(self, field_name, name, line):
-        """
+        '''
         Requires:
             field_name --first name in the string.
             name -- the changed name according to the dictionary.
@@ -792,7 +790,7 @@ class FieldStrings:
             string, and make this string the last item in a list. The first
             item in the list is the simple word 'symbol', which tells me that
             I don't really have  field, but UTF-8 data.
-        """
+        '''
         num = ''
         font = ''
         font_size = ''
@@ -812,5 +810,5 @@ class FieldStrings:
             font_size = int(font_size)
             font_size = '%.2f' % font_size
             changed_line += 'cw<ci<font-size_<nu<%s\n' % font_size
-        changed_line += 'tx<hx<__________<\'%s\n' % num
+        changed_line += "tx<hx<__________<'%s\n" % num
         return ['Symbol', None, changed_line]
diff --git a/src/calibre/ebooks/rtf2xml/fields_large.py b/src/calibre/ebooks/rtf2xml/fields_large.py
index 5a208d2eae..6beec68cbb 100644
--- a/src/calibre/ebooks/rtf2xml/fields_large.py
+++ b/src/calibre/ebooks/rtf2xml/fields_large.py
@@ -20,7 +20,7 @@ from . import open_for_read, open_for_write
 
 
 class FieldsLarge:
-    r"""
+    r'''
 =========================
 Logic
 =========================
@@ -92,7 +92,7 @@ Examples
         language="1024">1</inline></field></para>
         </paragraph-definition>
         </field-block>
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -100,7 +100,7 @@ Examples
             copy=None,
             run_level=1,
             ):
-        """
+        '''
         Required:
             'file'--file to parse
         Optional:
@@ -109,7 +109,7 @@ Examples
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -117,9 +117,9 @@ Examples
         self.__write_to = better_mktemp()
 
     def __initiate_values(self):
-        """
+        '''
         Initiate all values.
-        """
+        '''
         self.__text_string = ''
         self.__field_instruction_string = ''
         self.__marker = 'mi<mk<inline-fld\n'
@@ -136,7 +136,7 @@ Examples
         'cw<fd<field_____'  : self.__found_field_func,
         }
         self.__field_dict = {
-        'cw<fd<field-inst'  :   self.__found_field_instruction_func,
+        'cw<fd<field-inst'  : self.__found_field_instruction_func,
         'cw<fd<field_____'  : self.__found_field_func,
         'cw<pf<par-end___'  : self.__par_in_field_func,
         'cw<sc<section___'  : self.__sec_in_field_func,
@@ -151,7 +151,7 @@ Examples
         self.__field_string = []  # list of field strings
 
     def __before_body_func(self, line):
-        """
+        '''
         Required:
             line --line ro parse
         Returns:
@@ -159,27 +159,27 @@ Examples
         Logic:
             Check for the beginninf of the body. If found, changed the state.
             Always write out the line.
-        """
+        '''
         if self.__token_info == 'mi<mk<body-open_':
             self.__state = 'in_body'
         self.__write_obj.write(line)
 
     def __in_body_func(self, line):
-        """
+        '''
         Required:
             line --line to parse
         Returns:
             nothing. (Writes a line to the output file, or performs other actions.)
         Logic:
             Check of the beginning of a field. Always output the line.
-        """
+        '''
         action = self.__in_body_dict.get(self.__token_info)
         if action:
             action(line)
         self.__write_obj.write(line)
 
     def __found_field_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -187,7 +187,7 @@ Examples
         Logic:
             Set the values for parsing the field. Four lists have to have
             items appended to them.
-        """
+        '''
         self.__state = 'field'
         self.__cb_count = 0
         ob_count = self.__ob_count
@@ -197,7 +197,7 @@ Examples
         self.__par_in_field.append(0)
 
     def __in_field_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -206,7 +206,7 @@ Examples
             Check for the end of the field; a paragraph break; a section break;
             the beginning of another field; or the beginning of the field
             instruction.
-        """
+        '''
         if self.__cb_count == self.__field_count[-1]:
             self.__field_string[-1] += line
             self.__end_field_func()
@@ -218,7 +218,7 @@ Examples
                 self.__field_string[-1] += line
 
     def __par_in_field_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -226,12 +226,12 @@ Examples
         Logic:
             Write the line to the output file and set the last item in the
             paragraph in field list to true.
-        """
+        '''
         self.__field_string[-1] += line
         self.__par_in_field[-1] = 1
 
     def __sec_in_field_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -239,12 +239,12 @@ Examples
         Logic:
             Write the line to the output file and set the last item in the
             section in field list to true.
-        """
+        '''
         self.__field_string[-1] += line
         self.__sec_in_field[-1] = 1
 
     def __found_field_instruction_func(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -252,13 +252,13 @@ Examples
         Change the state to field instruction. Set the open bracket count of
         the beginning of this field so  you know when it ends. Set the closed
         bracket count to 0 so you don't prematureley exit this state.
-        """
+        '''
         self.__state = 'field_instruction'
         self.__field_instruction_count = self.__ob_count
         self.__cb_count = 0
 
     def __field_instruction_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -267,7 +267,7 @@ Examples
             Collect all the lines until the end of the field is reached.
             Process these lines with the module rtr.field_strings.
             Check if the field instruction is 'Symbol' (really UTF-8).
-        """
+        '''
         if self.__cb_count == self.__field_instruction_count:
             # The closing bracket should be written, since the opening bracket
             # was written
@@ -284,7 +284,7 @@ Examples
             self.__field_instruction_string += line
 
     def __end_field_func(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -301,7 +301,7 @@ Examples
             If the filed list contains more strings, add the latest
             (processed) string to the last string in the list. Otherwise,
             write the string to the output file.
-        """
+        '''
         last_bracket = self.__field_count.pop()
         instruction = self.__field_instruction.pop()
         inner_field_string = self.__field_string.pop()
@@ -313,23 +313,22 @@ Examples
             inner_field_string = '%scb<nu<clos-brack<%s\n' % \
             (instruction, last_bracket)
         elif sec_in_field or par_in_field:
-            inner_field_string = \
-            'mi<mk<fldbkstart\n'\
-            'mi<tg<open-att__<field-block<type>%s\n%s'\
-            'mi<mk<fldbk-end_\n' \
-            'mi<tg<close_____<field-block\n'\
-            'mi<mk<fld-bk-end\n' \
-            % (instruction, inner_field_string)
+            inner_field_string = (
+            'mi<mk<fldbkstart\n'
+            'mi<tg<open-att__<field-block<type>%s\n%s'
+            'mi<mk<fldbk-end_\n'
+            'mi<tg<close_____<field-block\n'
+            'mi<mk<fld-bk-end\n'
+            ) % (instruction, inner_field_string)
         # write a marker to show an inline field for later parsing
         else:
-            inner_field_string = \
-            '%s' \
-            'mi<tg<open-att__<field<type>%s\n%s'\
-            'mi<tg<close_____<field\n'\
-            % (self.__marker, instruction, inner_field_string)
+            inner_field_string = (
+            '%s'
+            'mi<tg<open-att__<field<type>%s\n%s'
+            'mi<tg<close_____<field\n'
+            ) % (self.__marker, instruction, inner_field_string)
         if sec_in_field:
-            inner_field_string = 'mi<mk<sec-fd-beg\n' + inner_field_string + \
-            'mi<mk<sec-fd-end\n'
+            inner_field_string = 'mi<mk<sec-fd-beg\n' + inner_field_string + 'mi<mk<sec-fd-end\n'
         if par_in_field:
             inner_field_string = 'mi<mk<par-in-fld\n' + inner_field_string
         if len(self.__field_string) == 0:
@@ -343,7 +342,7 @@ Examples
         self.__write_obj.write(the_string)
 
     def fix_fields(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -353,7 +352,7 @@ Examples
             the state. If the state is before the body, look for the
             beginning of the body.
             If the state is body, send the line to the body method.
-        """
+        '''
         self.__initiate_values()
         read_obj = open_for_read(self.__file)
         self.__write_obj = open_for_write(self.__write_to)
@@ -375,6 +374,6 @@ Examples
         self.__write_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "fields_large.data")
+            copy_obj.copy_file(self.__write_to, 'fields_large.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/fields_small.py b/src/calibre/ebooks/rtf2xml/fields_small.py
index d2a0fbd846..ca56348fb8 100644
--- a/src/calibre/ebooks/rtf2xml/fields_small.py
+++ b/src/calibre/ebooks/rtf2xml/fields_small.py
@@ -21,7 +21,7 @@ from . import open_for_read, open_for_write
 
 
 class FieldsSmall:
-    """
+    '''
 =================
 Purpose
 =================
@@ -36,7 +36,7 @@ is found, store the opening bracket count in a variable. Collect all the text
 until the closing bracket entry is found. Send the string to the module
 field_strings to process it. Write the processed string to the output
 file.
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -44,7 +44,7 @@ file.
             copy=None,
             run_level=1,
             ):
-        """
+        '''
         Required:
             'file'--file to parse
         Optional:
@@ -53,7 +53,7 @@ file.
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -61,24 +61,24 @@ file.
         self.__run_level = run_level
 
     def __initiate_values(self):
-        """
+        '''
         Initiate all values.
-        """
+        '''
         self.__string_obj = field_strings.FieldStrings(bug_handler=self.__bug_handler)
         self.__state = 'before_body'
         self.__text_string = ''
         self.__marker = 'mi<mk<inline-fld\n'
         self.__state_dict = {
         'before_body'   : self.__before_body_func,
-        'body'  : self.__body_func,
-        'bookmark'  : self.__bookmark_func,
-        'toc_index'       : self.__toc_index_func,
+        'body'          : self.__body_func,
+        'bookmark'      : self.__bookmark_func,
+        'toc_index'     : self.__toc_index_func,
         }
         self.__body_dict = {
-        'cw<an<book-mk-st'      : (self.__found_bookmark_func, 'start'),
-        'cw<an<book-mk-en'      : (self.__found_bookmark_func, 'end'),
-        'cw<an<toc_______'      : (self.__found_toc_index_func, 'toc'),
-        'cw<an<index-mark'      : (self.__found_toc_index_func, 'index'),
+        'cw<an<book-mk-st'  : (self.__found_bookmark_func, 'start'),
+        'cw<an<book-mk-en'  : (self.__found_bookmark_func, 'end'),
+        'cw<an<toc_______'  : (self.__found_toc_index_func, 'toc'),
+        'cw<an<index-mark'  : (self.__found_toc_index_func, 'index'),
         }
         ob = 'ob<nu<open-brack.....'
         cb = 'cb<nu<clos-brack'
@@ -88,7 +88,7 @@ file.
         self.__book_start = re.compile(r'%s' % reg_st)
 
     def __before_body_func(self, line):
-        """
+        '''
         Requires:
             line --the line to parse
         Returns:
@@ -96,13 +96,13 @@ file.
         Logic:
             Look for the beginning of the body. When found, change the state
             to body. Always print out the line.
-        """
+        '''
         if self.__token_info == 'mi<mk<body-open_':
             self.__state = 'body'
         self.__write_obj.write(line)
 
     def __body_func(self, line):
-        """
+        '''
         Requires:
             line --the line to parse
         Returns:
@@ -110,7 +110,7 @@ file.
         Logic:
             This function handles all the lines in the body of the documents.
             Look for a bookmark, index or toc entry and take the appropriate action.
-        """
+        '''
         action, tag = \
            self.__body_dict.get(self.__token_info, (None, None))
         if action:
@@ -119,7 +119,7 @@ file.
             self.__write_obj.write(line)
 
     def __found_bookmark_func(self, line, tag):
-        """
+        '''
         Requires:
             line --the line to parse
         Returns:
@@ -128,14 +128,14 @@ file.
             This function is called when a bookmark is found. The opening
             bracket count is stored int eh beginning bracket count. The state
             is changed to 'bookmark.'
-        """
+        '''
         self.__beg_bracket_count = self.__ob_count
         self.__cb_count = 0
         self.__state = 'bookmark'
         self.__type_of_bookmark = tag
 
     def __bookmark_func(self, line):
-        """
+        '''
         Requires:
             line --the line to parse
         Returns:
@@ -145,15 +145,12 @@ file.
             line to a string until the end of the bookmark is found. It
             processes the string with the fields_string module, and
             prints out the result.
-        """
+        '''
         if self.__beg_bracket_count == self.__cb_count:
             self.__state = 'body'
             type = 'bookmark-%s'  % self.__type_of_bookmark
             # change here
-            """
-            my_string = self.__string_obj.process_string(
-                self.__text_string, type)
-            """
+            # my_string = self.__string_obj.process_string(self.__text_string, type)
             my_string = self.__parse_bookmark_func(
                 self.__text_string, type)
             self.__write_obj.write(self.__marker)
@@ -164,7 +161,7 @@ file.
             self.__text_string += line[17:-1]
 
     def __parse_index_func(self, my_string):
-        """
+        '''
         Requires:
             my_string --string to parse
             type --type of string
@@ -179,7 +176,7 @@ file.
             sub entry element.
             If the token is a pargrah ending, ignore it, since I don't won't
             paragraphs within toc or index entries.
-        """
+        '''
         my_string, see_string = self.__index_see_func(my_string)
         my_string, bookmark_string = self.__index_bookmark_func(my_string)
         italics, bold = self.__index__format_func(my_string)
@@ -239,13 +236,13 @@ file.
         return changed_string, see_string
 
     def __index_bookmark_func(self, my_string):
-        """
+        '''
         Requires:
             my_string -- string in all the index
         Returns:
             bookmark_string -- the text string of the book mark
             index_string -- string minus the bookmark_string
-        """
+        '''
         # cw<an<place_____<nu<true
         in_bookmark = 0
         bracket_count = 0
@@ -277,7 +274,7 @@ file.
 
     def __index__format_func(self, my_string):
         italics = 0
-        bold =0
+        bold = 0
         lines = my_string.split('\n')
         for line in lines:
             token_info = line[:16]
@@ -288,13 +285,13 @@ file.
         return italics, bold
 
     def __parse_toc_func(self, my_string):
-        """
+        '''
         Requires:
             my_string -- all the string in the toc
         Returns:
             modidified string
         Logic:
-        """
+        '''
         toc_level = 0
         toc_suppress = 0
         my_string, book_start_string, book_end_string =\
@@ -324,14 +321,14 @@ file.
         return my_changed_string
 
     def __parse_bookmark_for_toc(self, my_string):
-        """
+        '''
         Requires:
             the_string --string of toc, with new lines
         Returns:
             the_string -- string minus bookmarks
             bookmark_string -- bookmarks
         Logic:
-        """
+        '''
         in_bookmark = 0
         bracket_count = 0
         book_start_string = ''
@@ -370,7 +367,7 @@ file.
         return toc_string, book_start_string, book_end_string
 
     def __parse_bookmark_func(self, my_string, type):
-        """
+        '''
         Requires:
             my_string --string to parse
             type --type of string
@@ -379,13 +376,13 @@ file.
         Logic:
             The type is the name (either bookmark-end or bookmark-start). The
             id is the complete text string.
-        """
+        '''
         my_changed_string = ('mi<tg<empty-att_<field<type>%s'
         '<number>%s<update>none\n' % (type, my_string))
         return my_changed_string
 
     def __found_toc_index_func(self, line, tag):
-        """
+        '''
         Requires:
             line --the line to parse
         Returns:
@@ -394,14 +391,14 @@ file.
             This function is called when a toc or index entry is found. The opening
             bracket count is stored in the beginning bracket count. The state
             is changed to 'toc_index.'
-        """
+        '''
         self.__beg_bracket_count = self.__ob_count
         self.__cb_count = 0
         self.__state = 'toc_index'
         self.__tag = tag
 
     def __toc_index_func(self, line):
-        """
+        '''
         Requires:
             line --the line to parse
         Returns:
@@ -411,7 +408,7 @@ file.
             adds each line to a string until the end of the entry is found. It
             processes the string with the fields_string module, and
             prints out the result.
-        """
+        '''
         if self.__beg_bracket_count == self.__cb_count:
             self.__state = 'body'
             type = self.__tag
@@ -429,7 +426,7 @@ file.
             self.__text_string += line
 
     def fix_fields(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -440,7 +437,7 @@ file.
             beginning of the body.
            The other two states are toc_index (for toc and index entries) and
            bookmark.
-        """
+        '''
         self.__initiate_values()
         with open_for_read(self.__file) as read_obj:
             with open_for_write(self.__write_to) as self.__write_obj:
@@ -457,6 +454,6 @@ file.
                     action(line)
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "fields_small.data")
+            copy_obj.copy_file(self.__write_to, 'fields_small.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/fonts.py b/src/calibre/ebooks/rtf2xml/fonts.py
index a3fd4b9d53..0217b39403 100644
--- a/src/calibre/ebooks/rtf2xml/fonts.py
+++ b/src/calibre/ebooks/rtf2xml/fonts.py
@@ -20,9 +20,9 @@ from . import open_for_read, open_for_write
 
 
 class Fonts:
-    """
+    '''
     Change lines with font info from font numbers to the actual font names.
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -31,7 +31,7 @@ class Fonts:
             copy=None,
             run_level=1,
             ):
-        """
+        '''
         Required:
             'file'--file to parse
             'default_font_num'--the default font number
@@ -41,7 +41,7 @@ class Fonts:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -50,13 +50,13 @@ class Fonts:
         self.__run_level = run_level
 
     def __initiate_values(self):
-        """
+        '''
         Initiate all values.
-        """
+        '''
         self.__special_font_dict = {
-        'Symbol'        :   0,
-        'Wingdings'     :   0,
-        'Zapf Dingbats'      :   0,
+        'Symbol'        : 0,
+        'Wingdings'     : 0,
+        'Zapf Dingbats' : 0,
         }
         self.__special_font_list = [
         'Symbol', 'Wingdings', 'Zapf Dingbats'
@@ -73,20 +73,20 @@ class Fonts:
         self.__wrote_ind_font = 0
 
     def __default_func(self, line):
-        """
+        '''
         Requires:
             line
         Returns:
             nothing
         Handle all lines before the font table. Check for the beginning of the
         font table. If found, change the state. Print out all lines.
-        """
+        '''
         if self.__token_info == 'mi<mk<fonttb-beg':
             self.__state = 'font_table'
         self.__write_obj.write(line)
 
     def __font_table_func(self, line):
-        """
+        '''
         Requires:
             line
         Returns:
@@ -99,7 +99,7 @@ class Fonts:
             font to the default font (in case there is no number provided, in
             which case RTF assumes the number will be the default font.) Reset
             the test string (for the font name) to ''
-            """
+        '''
         if self.__token_info == 'mi<mk<fonttb-end':
             self.__state = 'after_font_table'
         elif self.__token_info == 'mi<mk<fontit-beg':
@@ -109,7 +109,7 @@ class Fonts:
         # self.__write_obj.write(line)
 
     def __font_in_table_func(self, line):
-        """
+        '''
         Requires:
             line
         Returns:
@@ -125,7 +125,7 @@ class Fonts:
                 dictionary. Also create an empty tag with the name and number
                 as attributes.
                 Preamture end of font table
-            """
+        '''
         # cw<ci<font-style<nu<4
         # tx<nu<__________<Times;
         if self.__token_info == 'mi<mk<fontit-end':
@@ -147,21 +147,21 @@ class Fonts:
             self.__state = 'after_font_table'
 
     def __found_end_font_table_func(self):
-        """
+        '''
         Required:
             nothing
         Returns:
             nothing
         Logic:
             If not individual fonts have been written, write one out
-        """
+        '''
         if not self.__wrote_ind_font:
             self.__write_obj.write(
             'mi<tg<empty-att_'
             '<font-in-table<name>Times<num>0\n')
 
     def __after_font_table_func(self, line):
-        """
+        '''
         Required:
             line
         Returns:
@@ -174,7 +174,7 @@ class Fonts:
             the name rather than the number.
             If the line does not contain font info, simply print it out to the
             file.
-            """
+        '''
         if self.__token_info == 'cw<ci<font-style':
             font_num = line[20:-1]
             font_name = self.__font_table.get(font_num)
@@ -193,7 +193,7 @@ class Fonts:
             self.__write_obj.write(line)
 
     def convert_fonts(self):
-        """
+        '''
         Required:
             nothing
         Returns:
@@ -205,7 +205,7 @@ class Fonts:
             tag for each individual font in the font table.
             If the state is after the font table, look for lines with font
             info. Substitute a font name for a font number.
-            """
+        '''
         self.__initiate_values()
         with open_for_read(self.__file) as read_obj:
             with open_for_write(self.__write_to) as self.__write_obj:
@@ -221,7 +221,7 @@ class Fonts:
         self.__special_font_dict['default-font'] = default_font_name
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "fonts.data")
+            copy_obj.copy_file(self.__write_to, 'fonts.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
         return self.__special_font_dict
diff --git a/src/calibre/ebooks/rtf2xml/footnote.py b/src/calibre/ebooks/rtf2xml/footnote.py
index 7303f95011..7ea2c7b717 100644
--- a/src/calibre/ebooks/rtf2xml/footnote.py
+++ b/src/calibre/ebooks/rtf2xml/footnote.py
@@ -19,15 +19,15 @@ from . import open_for_read, open_for_write
 
 
 class Footnote:
-    """
+    '''
     Two public methods are available. The first separates all of the
     footnotes from the body and puts them at the bottom of the text, where
     they are easier to process. The second joins those footnotes to the
     proper places in the body.
-    """
+    '''
 
     def __init__(self,
-            in_file ,
+            in_file,
             bug_handler,
             copy=None,
             run_level=1,
@@ -39,10 +39,10 @@ class Footnote:
         self.__found_a_footnote = 0
 
     def __first_line_func(self, line):
-        """
+        '''
         Print the tag info for footnotes.  Check whether footnote is an
         endnote and make the tag according to that.
-        """
+        '''
         if self.__token_info == 'cw<nt<type______':
             self.__write_to_foot_obj.write(
             'mi<tg<open-att__<footnote<type>endnote<num>%s\n' % self.__footnote_count)
@@ -52,7 +52,7 @@ class Footnote:
         self.__first_line = 0
 
     def __in_footnote_func(self, line):
-        """Handle all tokens that are part of footnote"""
+        '''Handle all tokens that are part of footnote'''
         if self.__first_line:
             self.__first_line_func(line)
         if self.__token_info == 'cw<ci<footnot-mk':
@@ -74,7 +74,7 @@ class Footnote:
             self.__write_to_foot_obj.write(line)
 
     def __found_footnote(self, line):
-        """ Found a footnote"""
+        ''' Found a footnote'''
         self.__found_a_footnote = 1
         self.__in_footnote = 1
         self.__first_line = 1
@@ -88,7 +88,7 @@ class Footnote:
         'mi<mk<footnt-ope<%04d\n' % self.__footnote_count)
 
     def __default_sep(self, line):
-        """Handle all tokens that are not footnote tokens"""
+        '''Handle all tokens that are not footnote tokens'''
         if self.__token_info == 'cw<nt<footnote__':
             self.__found_footnote(line)
         self.__write_obj.write(line)
@@ -99,9 +99,9 @@ class Footnote:
             )
 
     def __initiate_sep_values(self):
-        """
+        '''
         initiate counters for separate_footnotes method.
-        """
+        '''
         self.__bracket_count=0
         self.__ob_count = 0
         self.__cb_count = 0
@@ -111,13 +111,13 @@ class Footnote:
         self.__footnote_count = 0
 
     def separate_footnotes(self):
-        """
+        '''
         Separate all the footnotes in an RTF file and put them at the bottom,
         where they are easier to process.  Each time a footnote is found,
         print all of its contents to a temporary file. Close both the main and
         temporary file. Print the footnotes from the temporary file to the
         bottom of the main file.
-        """
+        '''
         self.__initiate_sep_values()
         self.__footnote_holder = better_mktemp()
         with open_for_read(self.__file) as read_obj:
@@ -152,21 +152,21 @@ class Footnote:
         os.remove(self.__footnote_holder)
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "footnote_separate.data")
+            copy_obj.copy_file(self.__write_to, 'footnote_separate.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
 
     def update_info(self, file, copy):
-        """
+        '''
         Unused method
-        """
+        '''
         self.__file = file
         self.__copy = copy
 
     def __get_foot_body_func(self, line):
-        """
+        '''
         Process lines in main body and look for beginning of footnotes.
-        """
+        '''
         # mi<mk<footnt-end
         if self.__token_info == 'mi<mk<footnt-beg':
             self.__state = 'foot'
@@ -174,22 +174,22 @@ class Footnote:
             self.__write_obj.write(line)
 
     def __get_foot_foot_func(self, line):
-        """
+        '''
         Copy footnotes from bottom of file to a separate, temporary file.
-        """
+        '''
         if self.__token_info == 'mi<mk<footnt-end':
             self.__state = 'body'
         else:
             self.__write_to_foot_obj.write(line)
 
     def __get_footnotes(self):
-        """
+        '''
         Private method to remove footnotes from main file.  Read one line from
         the main file at a time. If the state is 'body', call on the private
         __get_foot_foot_func. Otherwise, call on the __get_foot_body_func.
         These two functions do the work of separating the footnotes form the
         body.
-        """
+        '''
         with open_for_read(self.__file) as read_obj:
             with open_for_write(self.__write_to) as self.__write_obj:
                 with open_for_write(self.__footnote_holder) as self.__write_to_foot_obj:
@@ -201,12 +201,12 @@ class Footnote:
                             self.__get_foot_foot_func(line)
 
     def __get_foot_from_temp(self, num):
-        """
+        '''
         Private method for joining footnotes to body. This method reads from
         the temporary file until the proper footnote marker is found. It
         collects all the tokens until the end of the footnote, and returns
         them as a string.
-        """
+        '''
         look_for = 'mi<mk<footnt-ope<' + num + '\n'
         found_foot = 0
         string_to_return = ''
@@ -220,14 +220,14 @@ class Footnote:
                     found_foot = 1
 
     def __join_from_temp(self):
-        """
+        '''
         Private method for rejoining footnotes to body.  Read from the
         newly-created, temporary file that contains the body text but no
         footnotes. Each time a footnote marker is found, call the private
         method __get_foot_from_temp(). This method will return a string to
         print out to the third file.
         If no footnote marker is found, simply print out the token (line).
-        """
+        '''
         with open_for_read(self.__footnote_holder) as self.__read_from_foot_obj:
             with open_for_read(self.__write_to) as read_obj:
                 with open_for_write(self.__write_to2) as self.__write_obj:
@@ -237,7 +237,7 @@ class Footnote:
                         self.__write_obj.write(line)
 
     def join_footnotes(self):
-        """
+        '''
         Join the footnotes from the bottom of the file and put them in their
         former places.  First, remove the footnotes from the bottom of the
         input file, outputting them to a temporary file. This creates two new
@@ -245,7 +245,7 @@ class Footnote:
         these files to read. When a marker is found in the main file, find the
         corresponding marker in the footnote file. Output the mix of body and
         footnotes to a third file.
-        """
+        '''
         if not self.__found_a_footnote:
             return
         self.__write_to2 = better_mktemp()
@@ -256,7 +256,7 @@ class Footnote:
         # self.__read_from_foot_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to2, "footnote_joined.data")
+            copy_obj.copy_file(self.__write_to2, 'footnote_joined.data')
         copy_obj.rename(self.__write_to2, self.__file)
         os.remove(self.__write_to2)
         os.remove(self.__footnote_holder)
diff --git a/src/calibre/ebooks/rtf2xml/get_char_map.py b/src/calibre/ebooks/rtf2xml/get_char_map.py
index 4ce42e37c8..7d20b96ddc 100644
--- a/src/calibre/ebooks/rtf2xml/get_char_map.py
+++ b/src/calibre/ebooks/rtf2xml/get_char_map.py
@@ -13,24 +13,19 @@
 
 
 class GetCharMap:
-    """
+    '''
 
     Return the character map for the given value
 
-    """
+    '''
 
     def __init__(self, bug_handler, char_file):
-        """
-
+        '''
         Required:
-
             'char_file'--the file with the mappings
-
         Returns:
-
             nothing
-
-            """
+        '''
         self.__char_file = char_file
         self.__bug_handler = bug_handler
 
diff --git a/src/calibre/ebooks/rtf2xml/get_options.py b/src/calibre/ebooks/rtf2xml/get_options.py
index 5c5fd60b2f..014b7190c7 100644
--- a/src/calibre/ebooks/rtf2xml/get_options.py
+++ b/src/calibre/ebooks/rtf2xml/get_options.py
@@ -10,9 +10,9 @@
 #                                                                       #
 #                                                                       #
 #########################################################################
-"""
+'''
 Gets options for main part of script
-"""
+'''
 import os
 import sys
 
@@ -33,43 +33,43 @@ class GetOptions:
         self.__bug_handler = bug_handler
 
     def get_options(self):
-        """
+        '''
         return valid, output, help, show_warnings, debug, file
-        """
+        '''
         return_options = self.__get_config_options()
         options_dict = {
-                        'dir'               :       [1],
-                        'help'              :       [0, 'h'],
-                        'show-warnings'     :       [0],
-                        'caps'              :       [0,],
-                        'no-caps'           :       [0],
-                        'symbol'            :       [0],
-                        'no-symbol'         :       [0],
-                        'windings'          :       [0],
-                        'no-wingdings'      :       [0],
-                        'zapf'              :       [0],
-                        'no-zapf'           :       [0],
-                        'font'              :       [0],
-                        'no-font'           :       [0],
-                        'dtd'               :       [1],
-                        'no-dtd'            :       [0],
-                        'version'           :       [0],
-                        'output'            :       [1, 'o'],
-                        'no-namespace'      :       [0],
-                        'level'             :       [1],
-                        'indent'            :       [1],
-                        'no-lists'          :       [0],
-                        'lists'             :       [0],
-                        'group-styles'      :       [0],
-                        'no-group-styles'   :       [0],
-                        'group-borders'      :       [0],
-                        'no-group-borders'   :       [0],
-                        'headings-to-sections'  :   [0],
-                        'no-headings-to-sections'   :   [0],
-                        'empty-para'  :       [0],
-                        'no-empty-para' :      [0],
-                        'format'            :       [1, 'f'],
-                        'config'            :       [0],
+                        'dir'                       : [1],
+                        'help'                      : [0, 'h'],
+                        'show-warnings'             : [0],
+                        'caps'                      : [0,],
+                        'no-caps'                   : [0],
+                        'symbol'                    : [0],
+                        'no-symbol'                 : [0],
+                        'windings'                  : [0],
+                        'no-wingdings'              : [0],
+                        'zapf'                      : [0],
+                        'no-zapf'                   : [0],
+                        'font'                      : [0],
+                        'no-font'                   : [0],
+                        'dtd'                       : [1],
+                        'no-dtd'                    : [0],
+                        'version'                   : [0],
+                        'output'                    : [1, 'o'],
+                        'no-namespace'              : [0],
+                        'level'                     : [1],
+                        'indent'                    : [1],
+                        'no-lists'                  : [0],
+                        'lists'                     : [0],
+                        'group-styles'              : [0],
+                        'no-group-styles'           : [0],
+                        'group-borders'             : [0],
+                        'no-group-borders'          : [0],
+                        'headings-to-sections'      : [0],
+                        'no-headings-to-sections'   : [0],
+                        'empty-para'                : [0],
+                        'no-empty-para'             : [0],
+                        'format'                    : [1, 'f'],
+                        'config'                    : [0],
                 }
         options_obj = options_trem.ParseOptions(
                         system_string=self.__system_arguments,
@@ -107,11 +107,8 @@ class GetOptions:
             return_options['out-file'] = options['output']
         else:
             pass
-            """
-            sys.stderr.write(
-                'You must provide an output file with the \'o\' option\n')
-            return_options['valid'] = 0
-            """
+            # sys.stderr.write("You must provide an output file with the 'o' option\n")
+            # return_options['valid'] = 0
         if 'level' in the_keys:
             return_options['level'] = options['level']
         the_level = return_options.get('level')
@@ -129,8 +126,8 @@ class GetOptions:
         if 'format' in the_keys:
             format = options['format']
             if format not in acceptable:
-                sys.stderr.write('--format must take either \'sdoc\' or '
-                        '\'tei\'\n')
+                sys.stderr.write("--format must take either 'sdoc' or "
+                        "'tei'\n")
                 return_options['valid'] = 0
                 return return_options
             else:
@@ -225,14 +222,12 @@ class GetOptions:
             else:
                 return_options['out-file'] = '%s.xml' % the_file_name
         if not smart_output and not return_options['out-file']:
-            """
-            sys.stderr.write(
-                'Please provide and file to output with the -o option.\n'
-                'Or set \'<smart-output value = "true"/>\'.\n'
-                'in the configuration file.\n'
-                )
-            return_options['valid'] = 0
-            """
+            # sys.stderr.write(
+            #     'Please provide and file to output with the -o option.\n'
+            #     'Or set \'<smart-output value = "true"/>\'.\n'
+            #     'in the configuration file.\n'
+            #     )
+            # return_options['valid'] = 0
             pass
         if 'indent' in the_keys:
             try:
@@ -242,28 +237,26 @@ class GetOptions:
                 sys.stderr.write('--indent must take an integer')
                 return_options['valid'] = 0
         # check for format and pyxml
-        """
-        the_format = return_options.get('format')
-        if the_format != 'raw':
-            no_pyxml = return_options.get('no-pyxml')
-            if no_pyxml:
-                sys.stderr.write('You want to convert your file to "%s".\n'
-                        'Sorry, but you must have pyxml installed\n'
-                        'in order to convert your document to anything but raw XML.\n'
-                        'Please do not use the --format option.\n\n'
-                        % the_format
-                    )
-                return_options['valid'] = 0
-            xslt_proc = return_options.get('xslt-processor')
-            if xslt_proc == None and not no_pyxml:
-                sys.stderr.write('You want to convert your file to "%s".\n'
-                        'Sorry, but you must have an xslt processor set up\n'
-                        'in order to conevert your document to anything but raw XML.\n'
-                        'Please use --format raw.\n\n'
-                        % the_format
-                        )
-                return_options['valid'] = 0
-        """
+        # the_format = return_options.get('format')
+        # if the_format != 'raw':
+        #     no_pyxml = return_options.get('no-pyxml')
+        #     if no_pyxml:
+        #         sys.stderr.write('You want to convert your file to "%s".\n'
+        #                 'Sorry, but you must have pyxml installed\n'
+        #                 'in order to convert your document to anything but raw XML.\n'
+        #                 'Please do not use the --format option.\n\n'
+        #                 % the_format
+        #             )
+        #         return_options['valid'] = 0
+        #     xslt_proc = return_options.get('xslt-processor')
+        #     if xslt_proc == None and not no_pyxml:
+        #         sys.stderr.write('You want to convert your file to "%s".\n'
+        #                 'Sorry, but you must have an xslt processor set up\n'
+        #                 'in order to conevert your document to anything but raw XML.\n'
+        #                 'Please use --format raw.\n\n'
+        #                 % the_format
+        #                 )
+        #         return_options['valid'] = 0
         return return_options
 
     def __get_config_options(self):
diff --git a/src/calibre/ebooks/rtf2xml/group_borders.py b/src/calibre/ebooks/rtf2xml/group_borders.py
index 3b6f118393..1fdb66f572 100644
--- a/src/calibre/ebooks/rtf2xml/group_borders.py
+++ b/src/calibre/ebooks/rtf2xml/group_borders.py
@@ -21,12 +21,12 @@ from . import open_for_read, open_for_write
 
 
 class GroupBorders:
-    """
+    '''
     Form lists.
     Use RTF's own formatting to determine if a paragraph definition is part of a
     list.
     Use indents to determine items and how lists are nested.
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -35,7 +35,7 @@ class GroupBorders:
             run_level=1,
             wrap=0,
             ):
-        """
+        '''
         Required:
             'file'
         Optional:
@@ -44,7 +44,7 @@ class GroupBorders:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -53,7 +53,7 @@ class GroupBorders:
         self.__wrap = wrap
 
     def __initiate_values(self):
-        """
+        '''
         Required:
             Nothing
         Return:
@@ -61,18 +61,18 @@ class GroupBorders:
         Logic:
             The self.__end_list is a list of tokens that will force a list to end.
             Likewise, the self.__end_lines is a list of lines that forces a list to end.
-        """
-        self.__state = "default"
+        '''
+        self.__state = 'default'
         self.__left_indent = 0
         self.__border_num = 0
         self.__list_type = 'not-defined'
-        self.__pard_def = ""
+        self.__pard_def = ''
         self.__all_lists = []
         self.__list_chunk = ''
         self.__state_dict={
-        'default'           :   self.__default_func,
-        'in_pard'           :   self.__in_pard_func,
-        'after_pard'        :   self.__after_pard_func,
+        'default'   : self.__default_func,
+        'in_pard'   : self.__in_pard_func,
+        'after_pard': self.__after_pard_func,
         }
         # section end
         self.__end_list = [
@@ -123,7 +123,7 @@ class GroupBorders:
         self.__last_border_string = ''
 
     def __in_pard_func(self, line):
-        """
+        '''
         Required:
             line -- the line of current text.
         Return:
@@ -131,7 +131,7 @@ class GroupBorders:
         Logic:
             You are in a list, but in the middle of a paragraph definition.
             Don't do anything until you find the end of the paragraph definition.
-        """
+        '''
         if self.__token_info == 'mi<tg<close_____' \
             and line[17:-1] == 'paragraph-definition':
             self.__state = 'after_pard'
@@ -139,13 +139,13 @@ class GroupBorders:
             self.__write_obj.write(line)
 
     def __after_pard_func(self, line):
-        """
+        '''
         Required:
             line -- the line of current text.
         Return:
             Nothing
         Logic:
-        """
+        '''
         if self.__token_info == 'mi<tg<open-att__' \
             and line[17:37] == 'paragraph-definition':
             # found paragraph definition
@@ -154,7 +154,7 @@ class GroupBorders:
             and line[17:-1] == 'paragraph-definition':
             sys.stderr.write('Wrong flag in __after_pard_func\n')
             if self.__run_level > 2:
-                msg =  'wrong flag'
+                msg = 'wrong flag'
                 raise self.__bug_handler(msg)
         elif self.__token_info in self.__end_list:
             self.__write_obj.write('mi<tg<close_____<paragraph-definition\n')
@@ -174,14 +174,14 @@ class GroupBorders:
         self.__state = 'default'
 
     def __pard_after_par_def_func(self, line):
-        """
+        '''
         Required:
             line -- the line of current text.
             id -- the id of the current list
         Return:
             Nothing
         Logic:
-        """
+        '''
         is_border = self.__is_border_func(line)
         if not is_border:
             self.__write_obj.write('mi<tg<close_____<paragraph-definition\n')
@@ -211,7 +211,7 @@ class GroupBorders:
                 self.__list_chunk = ''
 
     def __default_func(self, line):
-        """
+        '''
         Required:
             self, line
         Returns:
@@ -220,7 +220,7 @@ class GroupBorders:
             Look for the start of a paragraph definition. If one is found, check if
             it contains a list-id. If it does, start a list. Change the state to
             in_pard.
-            """
+        '''
         if self.__token_info == 'mi<tg<open-att__' \
             and line[17:37] == 'paragraph-definition':
             contains_border = self.__is_border_func(line)
@@ -282,13 +282,13 @@ class GroupBorders:
             self.__style_name = line[17:-1]
 
     def group_borders(self):
-        """
+        '''
         Required:
             nothing
         Returns:
             original file will be changed
         Logic:
-        """
+        '''
         self.__initiate_values()
         read_obj = open_for_read(self.__file)
         self.__write_obj = open_for_write(self.__write_to)
@@ -304,6 +304,6 @@ class GroupBorders:
         self.__write_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "group_borders.data")
+            copy_obj.copy_file(self.__write_to, 'group_borders.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/group_styles.py b/src/calibre/ebooks/rtf2xml/group_styles.py
index fa8bbaec44..5672055074 100644
--- a/src/calibre/ebooks/rtf2xml/group_styles.py
+++ b/src/calibre/ebooks/rtf2xml/group_styles.py
@@ -21,12 +21,12 @@ from . import open_for_read, open_for_write
 
 
 class GroupStyles:
-    """
+    '''
     Form lists.
     Use RTF's own formatting to determine if a paragraph definition is part of a
     list.
     Use indents to determine items and how lists are nested.
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -35,7 +35,7 @@ class GroupStyles:
             run_level=1,
             wrap=0,
             ):
-        """
+        '''
         Required:
             'file'
         Optional:
@@ -44,16 +44,16 @@ class GroupStyles:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
         self.__run_level = run_level
-        self.__write_to =  better_mktemp()
+        self.__write_to = better_mktemp()
         self.__wrap = wrap
 
     def __initiate_values(self):
-        """
+        '''
         Required:
             Nothing
         Return:
@@ -61,17 +61,17 @@ class GroupStyles:
         Logic:
             The self.__end_list is a list of tokens that will force a list to end.
             Likewise, the self.__end_lines is a list of lines that forces a list to end.
-        """
-        self.__state = "default"
+        '''
+        self.__state = 'default'
         self.__left_indent = 0
         self.__list_type = 'not-defined'
-        self.__pard_def = ""
+        self.__pard_def = ''
         self.__all_lists = []
         self.__list_chunk = ''
         self.__state_dict={
-        'default'           :   self.__default_func,
-        'in_pard'           :   self.__in_pard_func,
-        'after_pard'        :   self.__after_pard_func,
+        'default'   : self.__default_func,
+        'in_pard'   : self.__in_pard_func,
+        'after_pard': self.__after_pard_func,
         }
         # section end
         self.__end_list = [
@@ -112,7 +112,7 @@ class GroupStyles:
         self.__line_num = 0
 
     def __in_pard_func(self, line):
-        """
+        '''
         Required:
             line -- the line of current text.
         Return:
@@ -120,7 +120,7 @@ class GroupStyles:
         Logic:
             You are in a list, but in the middle of a paragraph definition.
             Don't do anything until you find the end of the paragraph definition.
-        """
+        '''
         if self.__token_info == 'mi<tg<close_____' \
             and line[17:-1] == 'paragraph-definition':
             self.__state = 'after_pard'
@@ -128,13 +128,13 @@ class GroupStyles:
             self.__write_obj.write(line)
 
     def __after_pard_func(self, line):
-        """
+        '''
         Required:
             line -- the line of current text.
         Return:
             Nothing
         Logic:
-        """
+        '''
         if self.__token_info == 'mi<tg<open-att__' \
             and line[17:37] == 'paragraph-definition':
             # found paragraph definition
@@ -143,7 +143,7 @@ class GroupStyles:
             and line[17:-1] == 'paragraph-definition':
             sys.stderr.write('Wrong flag in __after_pard_func\n')
             if self.__run_level > 2:
-                msg =  'wrong flag'
+                msg = 'wrong flag'
                 raise self.__bug_handler(msg)
         elif self.__token_info in self.__end_list:
             self.__write_obj.write('mi<tg<close_____<paragraph-definition\n')
@@ -175,14 +175,14 @@ class GroupStyles:
             self.__write_obj.write('mi<mk<stylegend_\n')
 
     def __pard_after_par_def_func(self, line):
-        """
+        '''
         Required:
             line -- the line of current text.
             id -- the id of the current list
         Return:
             Nothing
         Logic:
-        """
+        '''
         if self.__last_style_name == self.__style_name:
             # just keep going
             if self.__wrap:
@@ -204,7 +204,7 @@ class GroupStyles:
             self.__list_chunk = ''
 
     def __default_func(self, line):
-        """
+        '''
         Required:
             self, line
         Returns:
@@ -213,7 +213,7 @@ class GroupStyles:
             Look for the start of a paragraph definition. If one is found, check if
             it contains a list-id. If it does, start a list. Change the state to
             in_pard.
-            """
+        '''
         if self.__token_info == 'mi<tg<open-att__' \
             and line[17:37] == 'paragraph-definition':
             self.__state = 'in_pard'
@@ -228,13 +228,13 @@ class GroupStyles:
             self.__style_name = line[17:-1]
 
     def group_styles(self):
-        """
+        '''
         Required:
             nothing
         Returns:
             original file will be changed
         Logic:
-        """
+        '''
         self.__initiate_values()
         read_obj = open_for_read(self.__file)
         self.__write_obj = open_for_write(self.__write_to)
@@ -250,6 +250,6 @@ class GroupStyles:
         self.__write_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "group_styles.data")
+            copy_obj.copy_file(self.__write_to, 'group_styles.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/header.py b/src/calibre/ebooks/rtf2xml/header.py
index 85d8a384ed..bc9d0cd901 100644
--- a/src/calibre/ebooks/rtf2xml/header.py
+++ b/src/calibre/ebooks/rtf2xml/header.py
@@ -20,15 +20,15 @@ from . import open_for_read, open_for_write
 
 
 class Header:
-    """
+    '''
     Two public methods are available. The first separates all of the headers
     and footers from the body and puts them at the bottom of the text, where
     they are easier to process. The second joins those headers and footers to
     the proper places in the body.
-    """
+    '''
 
     def __init__(self,
-            in_file ,
+            in_file,
             bug_handler,
             copy=None,
             run_level=1,
@@ -40,9 +40,9 @@ class Header:
         self.__found_a_header = False
 
     def __in_header_func(self, line):
-        """
+        '''
         Handle all tokens that are part of header
-        """
+        '''
         if self.__cb_count == self.__header_bracket_count:
             self.__in_header = False
             self.__write_obj.write(line)
@@ -54,9 +54,9 @@ class Header:
             self.__write_to_head_obj.write(line)
 
     def __found_header(self, line):
-        """
+        '''
         Found a header
-        """
+        '''
         # but this could be header or footer
         self.__found_a_header = True
         self.__in_header = True
@@ -85,17 +85,17 @@ class Header:
                     )
 
     def __default_sep(self, line):
-        """
+        '''
         Handle all tokens that are not header tokens
-        """
+        '''
         if self.__token_info[3:5] == 'hf':
             self.__found_header(line)
         self.__write_obj.write(line)
 
     def __initiate_sep_values(self):
-        """
+        '''
         initiate counters for separate_footnotes method.
-        """
+        '''
         self.__bracket_count=0
         self.__ob_count = 0
         self.__cb_count = 0
@@ -103,24 +103,24 @@ class Header:
         self.__in_header = False
         self.__header_count = 0
         self.__head_dict = {
-            'head-left_'        :   ('header-left'),
-            'head-right'        :   ('header-right'),
-            'foot-left_'        :   ('footer-left'),
-            'foot-right'        :   ('footer-right'),
-            'head-first'        :   ('header-first'),
-            'foot-first'        :   ('footer-first'),
-            'header____'        :   ('header'),
-            'footer____'        :   ('footer'),
+            'head-left_': ('header-left'),
+            'head-right': ('header-right'),
+            'foot-left_': ('footer-left'),
+            'foot-right': ('footer-right'),
+            'head-first': ('header-first'),
+            'foot-first': ('footer-first'),
+            'header____': ('header'),
+            'footer____': ('footer'),
         }
 
     def separate_headers(self):
-        """
+        '''
         Separate all the footnotes in an RTF file and put them at the bottom,
         where they are easier to process.  Each time a footnote is found,
         print all of its contents to a temporary file. Close both the main and
         temporary file. Print the footnotes from the temporary file to the
         bottom of the main file.
-        """
+        '''
         self.__initiate_sep_values()
         self.__header_holder = better_mktemp()
         with open_for_read(self.__file) as read_obj:
@@ -152,21 +152,21 @@ class Header:
 
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "header_separate.data")
+            copy_obj.copy_file(self.__write_to, 'header_separate.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
 
     def update_info(self, file, copy):
-        """
+        '''
         Unused method
-        """
+        '''
         self.__file = file
         self.__copy = copy
 
     def __get_head_body_func(self, line):
-        """
+        '''
         Process lines in main body and look for beginning of headers.
-        """
+        '''
         # mi<mk<footnt-end
         if self.__token_info == 'mi<mk<header-beg':
             self.__state = 'head'
@@ -174,22 +174,22 @@ class Header:
             self.__write_obj.write(line)
 
     def __get_head_head_func(self, line):
-        """
+        '''
         Copy headers and footers from bottom of file to a separate, temporary file.
-        """
+        '''
         if self.__token_info == 'mi<mk<header-end':
             self.__state = 'body'
         else:
             self.__write_to_head_obj.write(line)
 
     def __get_headers(self):
-        """
+        '''
         Private method to remove footnotes from main file.  Read one line from
         the main file at a time. If the state is 'body', call on the private
         __get_foot_foot_func. Otherwise, call on the __get_foot_body_func.
         These two functions do the work of separating the footnotes form the
         body.
-        """
+        '''
         with open_for_read(self.__file) as read_obj:
             with open_for_write(self.__write_to) as self.__write_obj:
                 with open_for_write(self.__header_holder) as self.__write_to_head_obj:
@@ -201,12 +201,12 @@ class Header:
                             self.__get_head_head_func(line)
 
     def __get_head_from_temp(self, num):
-        """
+        '''
         Private method for joining headers and footers to body. This method
         reads from the temporary file until the proper footnote marker is
         found. It collects all the tokens until the end of the footnote, and
         returns them as a string.
-        """
+        '''
         look_for = 'mi<mk<header-ope<' + num + '\n'
         found_head = False
         string_to_return = ''
@@ -220,14 +220,14 @@ class Header:
                     found_head = True
 
     def __join_from_temp(self):
-        """
+        '''
         Private method for rejoining footnotes to body.  Read from the
         newly-created, temporary file that contains the body text but no
         footnotes. Each time a footnote marker is found, call the private
         method __get_foot_from_temp(). This method will return a string to
         print out to the third file.
         If no footnote marker is found, simply print out the token (line).
-        """
+        '''
         self.__read_from_head_obj = open_for_read(self.__header_holder)
         self.__write_obj = open_for_write(self.__write_to2)
         with open_for_read(self.__write_to) as read_obj:
@@ -237,7 +237,7 @@ class Header:
                 self.__write_obj.write(line)
 
     def join_headers(self):
-        """
+        '''
         Join the footnotes from the bottom of the file and put them in their
         former places.  First, remove the footnotes from the bottom of the
         input file, outputting them to a temporary file. This creates two new
@@ -245,7 +245,7 @@ class Header:
         these files to read. When a marker is found in the main file, find the
         corresponding marker in the footnote file. Output the mix of body and
         footnotes to a third file.
-        """
+        '''
         if not self.__found_a_header:
             return
         self.__write_to2 = better_mktemp()
@@ -256,7 +256,7 @@ class Header:
         self.__read_from_head_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "header_join.data")
+            copy_obj.copy_file(self.__write_to, 'header_join.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
         os.remove(self.__header_holder)
diff --git a/src/calibre/ebooks/rtf2xml/headings_to_sections.py b/src/calibre/ebooks/rtf2xml/headings_to_sections.py
index 6253f18f33..5debbc2026 100644
--- a/src/calibre/ebooks/rtf2xml/headings_to_sections.py
+++ b/src/calibre/ebooks/rtf2xml/headings_to_sections.py
@@ -20,8 +20,8 @@ from . import open_for_read, open_for_write
 
 
 class HeadingsToSections:
-    """
-    """
+    '''
+    '''
 
     def __init__(self,
             in_file,
@@ -29,7 +29,7 @@ class HeadingsToSections:
             copy=None,
             run_level=1,
             ):
-        """
+        '''
         Required:
             'file'
         Optional:
@@ -38,14 +38,14 @@ class HeadingsToSections:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
         self.__write_to = better_mktemp()
 
     def __initiate_values(self):
-        """
+        '''
         Required:
             Nothing
         Return:
@@ -53,15 +53,15 @@ class HeadingsToSections:
         Logic:
             The self.__end_list is a list of tokens that will force a list to end.
             Likewise, the self.__end_lines is a list of lines that forces a list to end.
-        """
-        self.__state = "default"
+        '''
+        self.__state = 'default'
         self.__all_sections = []
         self.__chunk = ''
         self.__state_dict={
-        'default'           :   self.__default_func,
-        'in_table'          :   self.__in_table_func,
-        'in_list'           :   self.__in_list_func,
-        'after_body'        :   self.__after_body_func,
+        'default'   : self.__default_func,
+        'in_table'  : self.__in_table_func,
+        'in_list'   : self.__in_list_func,
+        'after_body': self.__after_body_func,
         }
         self.__list_depth = 0
         self.__end_list = [
@@ -88,7 +88,7 @@ class HeadingsToSections:
         self.__id_regex = re.compile(r'\<list-id\>(\d+)')
 
     def __close_lists(self):
-        """
+        '''
         Required:
             Nothing
         Return:
@@ -100,7 +100,7 @@ class HeadingsToSections:
             Keep track of how many levels you close. Reduce the list by that
             many levels.
             Reverse the list again.
-        """
+        '''
         current_indent = self.__left_indent
         self.__all_lists.reverse()
         num_levels_closed = 0
@@ -145,7 +145,7 @@ class HeadingsToSections:
         self.__write_obj.write('mi<tg<close_____<section\n')
 
     def __default_func(self, line):
-        """
+        '''
         Required:
             self, line
         Returns:
@@ -154,7 +154,7 @@ class HeadingsToSections:
             Look for the start of a paragraph definition. If one is found, check if
             it contains a list-id. If it does, start a list. Change the state to
             in_pard.
-            """
+        '''
         if self.__token_info == 'mi<mk<sect-start':
             self.__section_num[0] += 1
             self.__section_num = self.__section_num[0:1]
@@ -203,13 +203,13 @@ class HeadingsToSections:
         self.__write_obj.write(line)
 
     def make_sections(self):
-        """
+        '''
         Required:
             nothing
         Returns:
             original file will be changed
         Logic:
-        """
+        '''
         self.__initiate_values()
         read_obj = open_for_read(self.__file)
         self.__write_obj = open_for_write(self.__write_to)
@@ -224,6 +224,6 @@ class HeadingsToSections:
         self.__write_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "sections_to_headings.data")
+            copy_obj.copy_file(self.__write_to, 'sections_to_headings.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/hex_2_utf8.py b/src/calibre/ebooks/rtf2xml/hex_2_utf8.py
index 86905baeff..5def50aa0b 100644
--- a/src/calibre/ebooks/rtf2xml/hex_2_utf8.py
+++ b/src/calibre/ebooks/rtf2xml/hex_2_utf8.py
@@ -22,9 +22,9 @@ from . import open_for_read, open_for_write
 
 
 class Hex2Utf8:
-    """
+    '''
     Convert Microsoft hexadecimal numbers to utf-8
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -42,7 +42,7 @@ class Hex2Utf8:
             dingbats=None,
             run_level=1,
             ):
-        """
+        '''
         Required:
             'file'
             'area_to_convert'--the area of file to convert
@@ -58,7 +58,7 @@ class Hex2Utf8:
             'convert_to_caps'--wether to convert caps to utf-8
         Returns:
             nothing
-        """
+        '''
         self.__file = in_file
         self.__copy = copy
         if area_to_convert not in ('preamble', 'body'):
@@ -99,7 +99,7 @@ class Hex2Utf8:
                         caps=None,
                         dingbats=None,
                     ):
-        """
+        '''
         Required:
             'file'
             'area_to_convert'--the area of file to convert
@@ -114,7 +114,7 @@ class Hex2Utf8:
             'convert_to_caps'--wether to convert caps to utf-8
         Returns:
             nothing
-            """
+        '''
         self.__file=file
         self.__copy = copy
         if area_to_convert not in ('preamble', 'body'):
@@ -139,7 +139,7 @@ class Hex2Utf8:
         # self.__convert_zapf = 0
 
     def __initiate_values(self):
-        """
+        '''
         Required:
             Nothing
         Set values, including those for the dictionaries.
@@ -147,13 +147,13 @@ class Hex2Utf8:
         sets. For example, for the Symbol font, there is the standard part for
         hexadecimal numbers, and the part for Microsoft characters. Read
         each part in, and then combine them.
-        """
+        '''
         # the default encoding system, the lower map for characters 0 through
         # 128, and the encoding system for Microsoft characters.
         # New on 2004-05-8: the self.__char_map is not in directory with other
         # modules
         self.__char_file = io.StringIO(char_set)
-        char_map_obj =  get_char_map.GetCharMap(
+        char_map_obj = get_char_map.GetCharMap(
                 char_file=self.__char_file,
                 bug_handler=self.__bug_handler,
                 )
@@ -188,36 +188,36 @@ class Hex2Utf8:
             self.__dingbats_dict.update(ms_dingbats_dict)
         # load dictionary for caps, and make a string for the replacement
         self.__caps_uni_dict = char_map_obj.get_char_map(map='caps_uni')
-        # # print self.__caps_uni_dict
+        # print(self.__caps_uni_dict)
         # don't think I'll need this
         # keys = self.__caps_uni_dict.keys()
         # self.__caps_uni_replace = '|'.join(keys)
         self.__preamble_state_dict = {
-            'preamble'      :       self.__preamble_func,
-            'body'          :       self.__body_func,
-            'mi<mk<body-open_'  :   self.__found_body_func,
-            'tx<hx<__________'  :   self.__hex_text_func,
+            'preamble'          : self.__preamble_func,
+            'body'              : self.__body_func,
+            'mi<mk<body-open_'  : self.__found_body_func,
+            'tx<hx<__________'  : self.__hex_text_func,
             }
         self.__body_state_dict = {
-            'preamble'      :       self.__preamble_for_body_func,
-            'body'          :       self.__body_for_body_func,
+            'preamble'  : self.__preamble_for_body_func,
+            'body'      : self.__body_for_body_func,
             }
         self.__in_body_dict = {
-            'mi<mk<body-open_'  :   self.__found_body_func,
-            'tx<ut<__________'  :   self.__utf_to_caps_func,
-            'tx<hx<__________'  :   self.__hex_text_func,
-            'tx<mc<__________'  :   self.__hex_text_func,
-            'tx<nu<__________'  :   self.__text_func,
-            'mi<mk<font______'  :   self.__start_font_func,
-            'mi<mk<caps______'  :   self.__start_caps_func,
-            'mi<mk<font-end__'  :   self.__end_font_func,
-            'mi<mk<caps-end__'  :   self.__end_caps_func,
+            'mi<mk<body-open_'  : self.__found_body_func,
+            'tx<ut<__________'  : self.__utf_to_caps_func,
+            'tx<hx<__________'  : self.__hex_text_func,
+            'tx<mc<__________'  : self.__hex_text_func,
+            'tx<nu<__________'  : self.__text_func,
+            'mi<mk<font______'  : self.__start_font_func,
+            'mi<mk<caps______'  : self.__start_caps_func,
+            'mi<mk<font-end__'  : self.__end_font_func,
+            'mi<mk<caps-end__'  : self.__end_caps_func,
         }
         self.__caps_list = ['false']
         self.__font_list = ['not-defined']
 
     def __hex_text_func(self, line):
-        """
+        '''
         Required:
             'line' -- the line
         Logic:
@@ -227,12 +227,12 @@ class Hex2Utf8:
             as normal text.
             If the hex_num is not in the dictionary, then a mistake has been
             made.
-            """
+        '''
         hex_num = line[17:-1]
         converted = self.__current_dict.get(hex_num)
         if converted is not None:
             # tag as utf-8
-            if converted[0:1] == "&":
+            if converted[0:1] == '&':
                 font = self.__current_dict_name
                 if self.__convert_caps\
                 and self.__caps_list[-1] == 'true'\
@@ -272,9 +272,9 @@ class Hex2Utf8:
         self.__write_obj.write(line)
 
     def __body_func(self, line):
-        """
+        '''
         When parsing preamble
-        """
+        '''
         self.__write_obj.write(line)
 
     def __preamble_func(self, line):
@@ -298,32 +298,32 @@ class Hex2Utf8:
                     action(line)
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "preamble_utf_convert.data")
+            copy_obj.copy_file(self.__write_to, 'preamble_utf_convert.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
 
     def __preamble_for_body_func(self, line):
-        """
+        '''
         Required:
             line -- line to parse
         Returns:
             nothing
         Logic:
             Used when parsing the body.
-        """
+        '''
         if self.__token_info == 'mi<mk<body-open_':
             self.__found_body_func(line)
         self.__write_obj.write(line)
 
     def __body_for_body_func(self, line):
-        """
+        '''
         Required:
             line -- line to parse
         Returns:
             nothing
         Logic:
             Used when parsing the body.
-        """
+        '''
         action = self.__in_body_dict.get(self.__token_info)
         if action is not None:
             action(line)
@@ -331,14 +331,14 @@ class Hex2Utf8:
             self.__write_obj.write(line)
 
     def __start_font_func(self, line):
-        """
+        '''
         Required:
             line -- line to parse
         Returns:
             nothing
         Logic:
             add font face to font_list
-        """
+        '''
         face = line[17:-1]
         self.__font_list.append(face)
         if face == 'Symbol' and self.__convert_symbol:
@@ -355,14 +355,14 @@ class Hex2Utf8:
             self.__current_dict = self.__def_dict
 
     def __end_font_func(self, line):
-        """
+        '''
         Required:
             line -- line to parse
         Returns:
             nothing
         Logic:
             pop font_list
-        """
+        '''
         if len(self.__font_list) > 1:
             self.__font_list.pop()
         else:
@@ -384,14 +384,14 @@ class Hex2Utf8:
             self.__current_dict = self.__def_dict
 
     def __start_special_font_func_old(self, line):
-        """
+        '''
         Required:
             line -- line
         Returns;
             nothing
         Logic:
             change the dictionary to use in conversion
-        """
+        '''
         # for error checking
         if self.__token_info == 'mi<mk<font-symbo':
             self.__current_dict.append(self.__symbol_dict)
@@ -407,18 +407,18 @@ class Hex2Utf8:
             self.__current_dict_name = 'Zapf Dingbats'
 
     def __end_special_font_func(self, line):
-        """
+        '''
         Required:
             line --line to parse
         Returns:
             nothing
         Logic:
             pop the last dictionary, which should be a special font
-        """
+        '''
         if len(self.__current_dict) < 2:
             sys.stderr.write('module is hex_2_utf 8\n')
             sys.stderr.write('method is __end_special_font_func\n')
-            sys.stderr.write('less than two dictionaries --can\'t pop\n')
+            sys.stderr.write("less than two dictionaries --can't pop\n")
             self.__special_fonts_found -= 1
         else:
             self.__current_dict.pop()
@@ -426,7 +426,7 @@ class Hex2Utf8:
             self.__dict_name = 'default'
 
     def __start_caps_func_old(self, line):
-        """
+        '''
         Required:
             line -- line to parse
         Returns:
@@ -434,11 +434,11 @@ class Hex2Utf8:
         Logic:
             A marker that marks the start of caps has been found. Set
             self.__in_caps to 1
-        """
+        '''
         self.__in_caps = 1
 
     def __start_caps_func(self, line):
-        """
+        '''
         Required:
             line -- line to parse
         Returns:
@@ -446,13 +446,13 @@ class Hex2Utf8:
         Logic:
             A marker that marks the start of caps has been found. Set
             self.__in_caps to 1
-        """
+        '''
         self.__in_caps = 1
         value = line[17:-1]
         self.__caps_list.append(value)
 
     def __end_caps_func(self, line):
-        """
+        '''
         Required:
             line -- line to parse
         Returns:
@@ -460,7 +460,7 @@ class Hex2Utf8:
         Logic:
             A marker that marks the end of caps has been found.
             set self.__in_caps to 0
-        """
+        '''
         if len(self.__caps_list) > 1:
             self.__caps_list.pop()
         else:
@@ -469,16 +469,16 @@ class Hex2Utf8:
             'caps list should be more than one?\n')  # self.__in_caps not set
 
     def __text_func(self, line):
-        """
+        '''
         Required:
             line -- line to parse
         Returns:
             nothing
         Logic:
             if in caps, convert. Otherwise, print out.
-        """
+        '''
         text = line[17:-1]
-        # print line
+        # print(line)
         if self.__current_dict_name in ('Symbol', 'Wingdings', 'Zapf Dingbats'):
             the_string = ''
             for letter in text:
@@ -486,7 +486,7 @@ class Hex2Utf8:
                 hex_num = str(hex_num)
                 hex_num = hex_num.upper()
                 hex_num = hex_num[2:]
-                hex_num = '\'%s' % hex_num
+                hex_num = "'%s" % hex_num
                 converted = self.__current_dict.get(hex_num)
                 if converted is None:
                     sys.stderr.write('module is hex_2_ut8\nmethod is __text_func\n')
@@ -494,7 +494,7 @@ class Hex2Utf8:
                 else:
                     the_string += converted
             self.__write_obj.write('tx<nu<__________<%s\n' % the_string)
-            # print the_string
+            # print(the_string)
         else:
             if self.__caps_list[-1] == 'true' \
                 and self.__convert_caps\
@@ -503,14 +503,14 @@ class Hex2Utf8:
             self.__write_obj.write('tx<nu<__________<%s\n' % text)
 
     def __utf_to_caps_func(self, line):
-        """
+        '''
         Required:
             line -- line to parse
         returns
             nothing
         Logic
             Get the text, and use another method to convert
-        """
+        '''
         utf_text = line[17:-1]
         if self.__caps_list[-1] == 'true' and self.__convert_caps:
             # utf_text = utf_text.upper()
@@ -518,7 +518,7 @@ class Hex2Utf8:
         self.__write_obj.write('tx<ut<__________<%s\n' % utf_text)
 
     def __utf_token_to_caps_func(self, char_entity):
-        """
+        '''
         Required:
             utf_text -- such as &xxx;
         Returns:
@@ -527,7 +527,7 @@ class Hex2Utf8:
             RTF often stores text in the improper values. For example, a
             capital umlaut o (?), is stores as ?. This function swaps the
             case by looking up the value in a dictionary.
-        """
+        '''
         hex_num = char_entity[3:]
         length = len(hex_num)
         if length == 3:
@@ -556,7 +556,7 @@ class Hex2Utf8:
                     action(line)
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "body_utf_convert.data")
+            copy_obj.copy_file(self.__write_to, 'body_utf_convert.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
 
@@ -568,22 +568,20 @@ class Hex2Utf8:
             self.__convert_body()
 
 
-"""
-how to swap case for non-capitals
-my_string.swapcase()
-An example of how to use a hash for the caps function
-(but I shouldn't need this, since utf text is separate
- from regular text?)
-sub_dict = {
-    "&#x0430;"   : "some other value"
-    }
-def my_sub_func(matchobj):
-    info =  matchobj.group(0)
-    value = sub_dict.get(info)
-    return value
-    return "f"
-line = "&#x0430; more text"
-reg_exp = re.compile(r'(?P<name>&#x0430;|&#x0431;)')
-line2 = re.sub(reg_exp, my_sub_func, line)
-print line2
-"""
+# how to swap case for non-capitals
+# my_string.swapcase()
+# An example of how to use a hash for the caps function
+# (but I shouldn't need this, since utf text is separate
+#  from regular text?)
+# sub_dict = {
+#     "&#x0430;"   : "some other value"
+#     }
+# def my_sub_func(matchobj):
+#     info =  matchobj.group(0)
+#     value = sub_dict.get(info)
+#     return value
+#     return "f"
+# line = "&#x0430; more text"
+# reg_exp = re.compile(r'(?P<name>&#x0430;|&#x0431;)')
+# line2 = re.sub(reg_exp, my_sub_func, line)
+# print line2
diff --git a/src/calibre/ebooks/rtf2xml/info.py b/src/calibre/ebooks/rtf2xml/info.py
index 821b3ee68e..26f12a51f3 100644
--- a/src/calibre/ebooks/rtf2xml/info.py
+++ b/src/calibre/ebooks/rtf2xml/info.py
@@ -21,9 +21,9 @@ from . import open_for_read, open_for_write
 
 
 class Info:
-    """
+    '''
     Make tags for document-information
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -31,7 +31,7 @@ class Info:
             copy=None,
             run_level=1,
             ):
-        """
+        '''
         Required:
             'file'--file to parse
         Optional:
@@ -40,7 +40,7 @@ class Info:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -48,18 +48,18 @@ class Info:
         self.__write_to = better_mktemp()
 
     def __initiate_values(self):
-        """
+        '''
         Initiate all values.
-        """
+        '''
         self.__text_string = ''
         self.__state = 'before_info_table'
         self.rmspace = re.compile(r'\s+')
         self.__state_dict = {
-        'before_info_table': self.__before_info_table_func,
-        'after_info_table': self.__after_info_table_func,
-        'in_info_table'    : self.__in_info_table_func,
+        'before_info_table' : self.__before_info_table_func,
+        'after_info_table'  : self.__after_info_table_func,
+        'in_info_table'     : self.__in_info_table_func,
         'collect_text'      : self.__collect_text_func,
-        'collect_tokens'      : self.__collect_tokens_func,
+        'collect_tokens'    : self.__collect_tokens_func,
         }
         self.__info_table_dict = {
         'cw<di<title_____'  : (self.__found_tag_with_text_func, 'title'),
@@ -88,27 +88,27 @@ class Info:
         'cw<di<internalID'  : (self.__single_field_func, 'internal-id-number'),
         }
         self.__token_dict = {
-        'year______'        : 'year',
-        'month_____'        : 'month',
-        'day_______'        : 'day',
-        'minute____'        : 'minute',
-        'second____'        : 'second',
-        'revis-time'        : 'revision-time',
-        'create-tim'        : 'creation-time',
-        'edit-time_'        : 'editing-time',
-        'print-time'        : 'printing-time',
-        'backuptime'        : 'backup-time',
-        'num-of-wor'        : 'number-of-words',
-        'num-of-chr'        : 'number-of-characters',
-        'numofchrws'        : 'number-of-characters-without-space',
-        'num-of-pag'        : 'number-of-pages',
-        'version___'        : 'version',
-        'intern-ver'        : 'internal-version-number',
-        'internalID'        : 'internal-id-number',
+        'year______': 'year',
+        'month_____': 'month',
+        'day_______': 'day',
+        'minute____': 'minute',
+        'second____': 'second',
+        'revis-time': 'revision-time',
+        'create-tim': 'creation-time',
+        'edit-time_': 'editing-time',
+        'print-time': 'printing-time',
+        'backuptime': 'backup-time',
+        'num-of-wor': 'number-of-words',
+        'num-of-chr': 'number-of-characters',
+        'numofchrws': 'number-of-characters-without-space',
+        'num-of-pag': 'number-of-pages',
+        'version___': 'version',
+        'intern-ver': 'internal-version-number',
+        'internalID': 'internal-id-number',
         }
 
     def __before_info_table_func(self, line):
-        """
+        '''
         Required:
             line -- the line to parse
         Returns:
@@ -116,13 +116,13 @@ class Info:
         Logic:
             Check for the beginning of the information table. When found, set
             the state to the information table. Always write the line.
-        """
+        '''
         if self.__token_info == 'mi<mk<doc-in-beg':
             self.__state = 'in_info_table'
         self.__write_obj.write(line)
 
     def __in_info_table_func(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -132,7 +132,7 @@ class Info:
             token has a special value in the info table dictionary. If it
             does, execute that function.
             Otherwise, output the line to the file.
-        """
+        '''
         if self.__token_info == 'mi<mk<doc-in-end':
             self.__state = 'after_info_table'
         else:
@@ -143,7 +143,7 @@ class Info:
                 self.__write_obj.write(line)
 
     def __found_tag_with_text_func(self, line, tag):
-        """
+        '''
         Requires:
             line -- line to parse
             tag --what kind of line
@@ -153,12 +153,12 @@ class Info:
             This function marks the beginning of information fields that have
             text that must be collected.  Set the type of information field
             with the tag option. Set the state to collecting text
-        """
+        '''
         self.__tag = tag
         self.__state = 'collect_text'
 
     def __collect_text_func(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -167,7 +167,7 @@ class Info:
             If the end of the information field is found, write the text
             string to the file.
             Otherwise, if the line contains text, add it to the text string.
-        """
+        '''
         if self.__token_info == 'mi<mk<docinf-end':
             self.__state = 'in_info_table'
             # Don't print empty tags
@@ -182,7 +182,7 @@ class Info:
             self.__text_string += line[17:-1]
 
     def __found_tag_with_tokens_func(self, line, tag):
-        """
+        '''
         Requires:
             line -- line to parse
             tag -- type of field
@@ -193,13 +193,13 @@ class Info:
             that must be parsed as attributes for the element.
             Set the state to collect tokesn, and set the text string to
             start an empty element with attributes.
-        """
+        '''
         self.__state = 'collect_tokens'
         self.__text_string = 'mi<tg<empty-att_<%s' % tag
         # mi<tg<empty-att_<page-definition<margin>33\n
 
     def __collect_tokens_func(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -217,7 +217,7 @@ class Info:
             dictionary, print out an error message. Otherwise add the value
             to the text string.
             (num-of-wor => number-of-words)
-        """
+        '''
         # cw<di<year______<nu<2003
         if self.__token_info == 'mi<mk<docinf-end':
             self.__state = 'in_info_table'
@@ -243,7 +243,7 @@ class Info:
         )
 
     def __after_info_table_func(self, line):
-        """
+        '''
         Requires:
             line --line to write to file
         Returns:
@@ -251,11 +251,11 @@ class Info:
         Logic:
             After the end of the information table, simple write the line to
             the file.
-        """
+        '''
         self.__write_obj.write(line)
 
     def fix_info(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -269,7 +269,7 @@ class Info:
             style table, look for lines with style info, and substitute the
             number with the name of the style.  If the state if after the
             information table, simply write the line to the output file.
-        """
+        '''
         self.__initiate_values()
         with open_for_read(self.__file) as read_obj:
             with open_for_write(self.__write_to) as self.__write_obj:
@@ -282,6 +282,6 @@ class Info:
                     action(line)
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "info.data")
+            copy_obj.copy_file(self.__write_to, 'info.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/inline.py b/src/calibre/ebooks/rtf2xml/inline.py
index eadb8d2daf..c22d39f53d 100644
--- a/src/calibre/ebooks/rtf2xml/inline.py
+++ b/src/calibre/ebooks/rtf2xml/inline.py
@@ -6,7 +6,7 @@ from calibre.ptempfile import better_mktemp
 
 from . import open_for_read, open_for_write
 
-"""
+'''
 States.
 1. default
     1. an open bracket ends this state.
@@ -16,21 +16,21 @@ States.
     1. The lack of a control word ends this state.
     2. paragraph end -- close out all tags
     3. footnote beg -- close out all tags
-"""
+'''
 
 
 class Inline:
-    """
+    '''
     Make inline tags within lists.
     Logic:
-    """
+    '''
 
     def __init__(self,
             in_file,
             bug_handler,
             copy=None,
             run_level=1,):
-        """
+        '''
         Required:
             'file'--file to parse
         Optional:
@@ -39,7 +39,7 @@ class Inline:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -47,37 +47,37 @@ class Inline:
         self.__write_to = better_mktemp()
 
     def __initiate_values(self):
-        """
+        '''
         Initiate all values.
-        """
+        '''
         self.__state_dict = {
-            'default':              self.__default_func,
-            'after_open_bracket':   self.__after_open_bracket_func,
+            'default'           : self.__default_func,
+            'after_open_bracket': self.__after_open_bracket_func,
         }
         self.__default_dict = {
-            'ob<nu<open-brack':         self.__found_open_bracket_func,
-            'tx<nu<__________'  :       self.__found_text_func,
-            'tx<hx<__________'  :       self.__found_text_func,
-            'tx<ut<__________'  :       self.__found_text_func,
-            'mi<mk<inline-fld'  :       self.__found_text_func,
-            'text'              :       self.__found_text_func,
-            'cb<nu<clos-brack'  :       self.__close_bracket_func,
-            'mi<mk<par-end___'  :       self.__end_para_func,
-            'mi<mk<footnt-ope'  :       self.__end_para_func,
-            'mi<mk<footnt-ind'  :       self.__end_para_func,
+            'ob<nu<open-brack'  : self.__found_open_bracket_func,
+            'tx<nu<__________'  : self.__found_text_func,
+            'tx<hx<__________'  : self.__found_text_func,
+            'tx<ut<__________'  : self.__found_text_func,
+            'mi<mk<inline-fld'  : self.__found_text_func,
+            'text'              : self.__found_text_func,
+            'cb<nu<clos-brack'  : self.__close_bracket_func,
+            'mi<mk<par-end___'  : self.__end_para_func,
+            'mi<mk<footnt-ope'  : self.__end_para_func,
+            'mi<mk<footnt-ind'  : self.__end_para_func,
         }
         self.__after_open_bracket_dict = {
-            'cb<nu<clos-brack'  :       self.__close_bracket_func,
-            'tx<nu<__________'  :       self.__found_text_func,
-            'tx<hx<__________'  :       self.__found_text_func,
-            'tx<ut<__________'  :       self.__found_text_func,
-            'text'              :       self.__found_text_func,
-            'mi<mk<inline-fld'  :       self.__found_text_func,
-            'ob<nu<open-brack':         self.__found_open_bracket_func,
-            'mi<mk<par-end___'  :       self.__end_para_func,
-            'mi<mk<footnt-ope'  :       self.__end_para_func,
-            'mi<mk<footnt-ind'  :       self.__end_para_func,
-            'cw<fd<field_____'  :       self.__found_field_func,
+            'cb<nu<clos-brack'  : self.__close_bracket_func,
+            'tx<nu<__________'  : self.__found_text_func,
+            'tx<hx<__________'  : self.__found_text_func,
+            'tx<ut<__________'  : self.__found_text_func,
+            'text'              : self.__found_text_func,
+            'mi<mk<inline-fld'  : self.__found_text_func,
+            'ob<nu<open-brack'  : self.__found_open_bracket_func,
+            'mi<mk<par-end___'  : self.__end_para_func,
+            'mi<mk<footnt-ope'  : self.__end_para_func,
+            'mi<mk<footnt-ind'  : self.__end_para_func,
+            'cw<fd<field_____'  : self.__found_field_func,
         }
         self.__state = 'default'
         self.__brac_count = 0  # do I need this?
@@ -91,42 +91,42 @@ class Inline:
         self.__in_para = 0  # not in paragraph
         self.__char_dict = {
             # character info => ci
-            'annotation'    :   'annotation',
-            'blue______'    :   'blue',
-            'bold______'    :   'bold',
-            'caps______'    :   'caps',
-            'char-style'    :   'character-style',
-            'dbl-strike'    :   'double-strike-through',
-            'emboss____'    :   'emboss',
-            'engrave___'    :   'engrave',
-            'font-color'    :   'font-color',
-            'font-down_'    :   'subscript',
-            'font-size_'    :   'font-size',
-            'font-style'    :   'font-style',
-            'font-up___'    :   'superscript',
-            'footnot-mk'    :   'footnote-marker',
-            'green_____'    :   'green',
-            'hidden____'    :   'hidden',
-            'italics___'    :   'italics',
-            'outline___'    :   'outline',
-            'red_______'    :   'red',
-            'shadow____'    :   'shadow',
-            'small-caps'    :   'small-caps',
-            'strike-thr'    :   'strike-through',
-            'subscript_'    :   'subscript',
-            'superscrip'    :   'superscript',
-            'underlined'    :   'underlined',
+            'annotation':   'annotation',
+            'blue______':   'blue',
+            'bold______':   'bold',
+            'caps______':   'caps',
+            'char-style':   'character-style',
+            'dbl-strike':   'double-strike-through',
+            'emboss____':   'emboss',
+            'engrave___':   'engrave',
+            'font-color':   'font-color',
+            'font-down_':   'subscript',
+            'font-size_':   'font-size',
+            'font-style':   'font-style',
+            'font-up___':   'superscript',
+            'footnot-mk':   'footnote-marker',
+            'green_____':   'green',
+            'hidden____':   'hidden',
+            'italics___':   'italics',
+            'outline___':   'outline',
+            'red_______':   'red',
+            'shadow____':   'shadow',
+            'small-caps':   'small-caps',
+            'strike-thr':   'strike-through',
+            'subscript_':   'subscript',
+            'superscrip':   'superscript',
+            'underlined':   'underlined',
         }
         self.__caps_list = ['false']
 
     def __set_list_func(self, line):
-        """
+        '''
         Requires:
             line--line of text
         Returns:
             nothing
         Logic:
-        """
+        '''
         if self.__place == 'in_list':
             if self.__token_info == 'mi<mk<lst-tx-end':
                 self.__place = 'not_in_list'
@@ -139,28 +139,28 @@ class Inline:
                 self.__groups_in_waiting = self.__groups_in_waiting_list
 
     def __default_func(self, line):
-        """
+        '''
         Requires:
             line-- line of text
         Returns:
             nothing
         Logic:
             Write if not hardline break
-        """
+        '''
         action = self.__default_dict.get(self.__token_info)
         if action:
             action(line)
         self.__write_obj.write(line)
 
     def __found_open_bracket_func(self, line):
-        """
+        '''
         Requires:
             line -- current line of text
         Returns:
             nothing
         Logic:
             Change the state to 'after_open_bracket'
-        """
+        '''
         self.__state = 'after_open_bracket'
         self.__brac_count += 1
         self.__groups_in_waiting[0] += 1
@@ -168,7 +168,7 @@ class Inline:
         self.__inline_list[-1]['contains_inline'] = 0
 
     def __after_open_bracket_func(self, line):
-        """
+        '''
         Requires:
             line --line of text
         Returns:
@@ -178,7 +178,7 @@ class Inline:
             method to add to the dictionary.
             Use the dictionary to get the appropriate function.
             Always print out the line.
-        """
+        '''
         if line[0:5] == 'cw<ci':  # calibre: bug in original function no diff between cw<ci and cw<pf
             self.__handle_control_word(line)
         else:
@@ -189,7 +189,7 @@ class Inline:
         self.__write_obj.write(line)
 
     def __handle_control_word(self, line):
-        """
+        '''
         Required:
             line --line of text
         Returns:
@@ -200,7 +200,7 @@ class Inline:
             If the font style of Symbol, Wingdings, or Dingbats is found,
             always mark this. I need this later to convert the text to
             the right utf.
-        """
+        '''
         # cw<ci<shadow_____<nu<true
         # self.__char_dict = {
         char_info = line[6:16]
@@ -209,18 +209,16 @@ class Inline:
         if name:
             self.__inline_list[-1]['contains_inline'] = 1
             self.__inline_list[-1][name] = char_value
-            """
-            if name == 'font-style':
-                if char_value == 'Symbol':
-                    self.__write_obj.write('mi<mk<font-symbo\n')
-                elif char_value == 'Wingdings':
-                    self.__write_obj.write('mi<mk<font-wingd\n')
-                elif char_value == 'Zapf Dingbats':
-                    self.__write_obj.write('mi<mk<font-dingb\n')
-            """
+            # if name == 'font-style':
+            #     if char_value == 'Symbol':
+            #         self.__write_obj.write('mi<mk<font-symbo\n')
+            #     elif char_value == 'Wingdings':
+            #         self.__write_obj.write('mi<mk<font-wingd\n')
+            #     elif char_value == 'Zapf Dingbats':
+            #         self.__write_obj.write('mi<mk<font-dingb\n')
 
     def __close_bracket_func(self, line):
-        """
+        '''
         Requires:
             line --line of text
         Returns:
@@ -230,7 +228,7 @@ class Inline:
             Get the keys of the last dictionary in the inline_groups.
             If 'contains_inline' in the keys, write a close tag.
             If the_dict contains font information, write a mk tag.
-        """
+        '''
         if len(self.__inline_list) == 0:
             # nothing to add
             return
@@ -259,7 +257,7 @@ class Inline:
             self.__groups_in_waiting[0] -= 1
 
     def __found_text_func(self, line):
-        """
+        '''
         Required:
             line--line of text
         Return:
@@ -271,7 +269,7 @@ class Inline:
                 Text can mark the start of a paragraph.
                 If already in a paragraph, check to see if any groups are waiting
                 to be added. If so, use another method to write these groups.
-        """
+        '''
         if self.__place == 'in_list':
             self.__write_inline()
         else:
@@ -282,7 +280,7 @@ class Inline:
                 self.__write_inline()
 
     def __write_inline(self):
-        """
+        '''
         Required:
             nothing
         Returns
@@ -298,7 +296,7 @@ class Inline:
             write a marker tag. (I will use this marker tag later when converting
             hext text to utf8.)
             Write a tag for the inline values.
-        """
+        '''
         if self.__groups_in_waiting[0] != 0:
             last_index = -1 * self.__groups_in_waiting[0]
             inline_list = self.__inline_list[last_index:]
@@ -326,7 +324,7 @@ class Inline:
         self.__groups_in_waiting[0] = 0
 
     def __end_para_func(self, line):
-        """
+        '''
         Requires:
             line -- line of text
         Returns:
@@ -335,7 +333,7 @@ class Inline:
             Slice from the end the groups in waiting.
             Iterate through the list. If the dictionary contaings info, write
             a closing tag.
-        """
+        '''
         if not self.__in_para:
             return
         if self.__groups_in_waiting[0] == 0:
@@ -355,7 +353,7 @@ class Inline:
         self.__in_para = 0
 
     def __start_para_func(self, line):
-        """
+        '''
         Requires:
             line -- line of text
         Returns:
@@ -364,10 +362,10 @@ class Inline:
             Iterate through the self.__inline_list to get each dict.
             If the dict containst inline info, get the keys.
             Iterate through the keys and print out the key and value.
-        """
+        '''
         for the_dict in self.__inline_list:
             contains_info = the_dict.get('contains_inline')
-            if contains_info :
+            if contains_info:
                 the_keys = the_dict.keys()
                 if 'font-style' in the_keys:
                     face = the_dict['font-style']
@@ -383,14 +381,14 @@ class Inline:
         self.__groups_in_waiting[0] = 0
 
     def __found_field_func(self, line):
-        """
+        '''
         Just a default function to make sure I don't prematurely exit
         default state
-        """
+        '''
         pass
 
     def form_tags(self):
-        """
+        '''
         Requires:
             area--area to parse (list or non-list)
         Returns:
@@ -398,7 +396,7 @@ class Inline:
         Logic:
             Read one line in at a time. Determine what action to take based on
             the state.
-        """
+        '''
         self.__initiate_values()
         with open_for_read(self.__file) as read_obj:
             with open_for_write(self.__write_to) as self.__write_obj:
@@ -423,6 +421,6 @@ class Inline:
                     action(line)
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "inline.data")
+            copy_obj.copy_file(self.__write_to, 'inline.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/line_endings.py b/src/calibre/ebooks/rtf2xml/line_endings.py
index e34c4a98dc..0f3058e775 100644
--- a/src/calibre/ebooks/rtf2xml/line_endings.py
+++ b/src/calibre/ebooks/rtf2xml/line_endings.py
@@ -18,7 +18,7 @@ from calibre.utils.cleantext import clean_ascii_chars
 
 
 class FixLineEndings:
-    """Fix line endings"""
+    '''Fix line endings'''
 
     def __init__(self,
             bug_handler,
@@ -50,6 +50,6 @@ class FixLineEndings:
         # copy
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "line_endings.data")
+            copy_obj.copy_file(self.__write_to, 'line_endings.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/list_numbers.py b/src/calibre/ebooks/rtf2xml/list_numbers.py
index d9379087ad..1c99168a72 100644
--- a/src/calibre/ebooks/rtf2xml/list_numbers.py
+++ b/src/calibre/ebooks/rtf2xml/list_numbers.py
@@ -19,10 +19,10 @@ from . import open_for_read, open_for_write
 
 
 class ListNumbers:
-    """
+    '''
         RTF puts list numbers outside of the paragraph. The public method
         in this class put the list numbers inside the paragraphs.
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -30,7 +30,7 @@ class ListNumbers:
             copy=None,
             run_level=1,
             ):
-        """
+        '''
         Required:
             'file'
         Optional:
@@ -39,39 +39,39 @@ class ListNumbers:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
         self.__write_to = better_mktemp()
 
     def __initiate_values(self):
-        """
+        '''
         initiate values for fix_list_numbers.
         Required:
             Nothing
         Return:
             Nothing
-        """
-        self.__state = "default"
+        '''
+        self.__state = 'default'
         self.__list_chunk = ''
         self.__previous_line = ''
         self.__list_text_ob_count = ''
         self.__state_dict={
-        'default'           :   self.__default_func,
-        'after_ob'          :   self.__after_ob_func,
-        'list_text'         :   self.__list_text_func,
-        'after_list_text'   :   self.__after_list_text_func
+        'default'           : self.__default_func,
+        'after_ob'          : self.__after_ob_func,
+        'list_text'         : self.__list_text_func,
+        'after_list_text'   : self.__after_list_text_func
         }
 
     def __after_ob_func(self, line):
-        """
+        '''
         Handle the line immediately after an open bracket.
         Required:
             self, line
         Returns:
             Nothing
-            """
+        '''
         if self.__token_info == 'cw<ls<list-text_':
             self.__state = 'list_text'
             self.__list_chunk = self.__list_chunk + \
@@ -84,10 +84,10 @@ class ListNumbers:
             self.__state = 'default'
 
     def __after_list_text_func(self, line):
-        """
+        '''
         Look for an open bracket or a line of text, and then print out the
         self.__list_chunk. Print out the line.
-        """
+        '''
         if line[0:2] == 'ob' or line[0:2] == 'tx':
             self.__state = 'default'
             self.__write_obj.write('mi<mk<lst-txbeg_\n')
@@ -103,15 +103,15 @@ class ListNumbers:
         self.__write_obj.write(line)
 
     def __determine_list_type(self, chunk):
-        """
+        '''
         Determine if the list is ordered or itemized
-        """
+        '''
         lines = chunk.split('\n')
         text_string = ''
         for line in lines:
             if line[0:5] == 'tx<hx':
-                if line[17:] == '\'B7':
-                    return "unordered"
+                if line[17:] == "'B7":
+                    return 'unordered'
             elif line[0:5] == 'tx<nu':
                 text_string += line[17:]
         text_string = text_string.replace('.', '')
@@ -119,16 +119,14 @@ class ListNumbers:
         text_string = text_string.replace(')', '')
         if text_string.isdigit():
             return 'ordered'
-        """
-        sys.stderr.write('module is list_numbers\n')
-        sys.stderr.write('method is __determine type\n')
-        sys.stderr.write('Couldn\'t get type of list\n')
-        """
+        # sys.stderr.write('module is list_numbers\n')
+        # sys.stderr.write('method is __determine type\n')
+        # sys.stderr.write('Couldn\'t get type of list\n')
         # must be some type of ordered list -- just a guess!
         return 'unordered'
 
     def __list_text_func(self, line):
-        """
+        '''
         Handle lines that are part of the list text. If the end of the list
         text is found (the closing bracket matches the self.__list_text_ob),
         then change  the state. Always add the line to the self.__list_chunk
@@ -136,7 +134,7 @@ class ListNumbers:
             self, line
         Returns:
             Nothing
-            """
+        '''
         if self.__list_text_ob == self.__cb_count:
             self.__state = 'after_list_text'
             self.__right_after_list_text = 1
@@ -146,7 +144,7 @@ class ListNumbers:
             self.__list_chunk = self.__list_chunk + line
 
     def __default_func(self, line):
-        """
+        '''
         Handle the lines that are not part of any special state. Look for an
         opening bracket. If an open bracket is found, add this line to a
         temporary self.__previous line, which other methods need. Otherwise,
@@ -155,7 +153,7 @@ class ListNumbers:
             self, line
         Returns:
             Nothing
-            """
+        '''
         if self.__token_info == 'ob<nu<open-brack':
             self.__state = 'after_ob'
             self.__previous_line = line
@@ -163,7 +161,7 @@ class ListNumbers:
             self.__write_obj.write(line)
 
     def fix_list_numbers(self):
-        """
+        '''
         Required:
             nothing
         Returns:
@@ -178,7 +176,7 @@ class ListNumbers:
             found.
             Next, look for an open bracket or text. When either is found,
             print out self.__list_chunk and the line.
-        """
+        '''
         self.__initiate_values()
         read_obj = open_for_read(self.__file)
         self.__write_obj = open_for_write(self.__write_to)
@@ -197,6 +195,6 @@ class ListNumbers:
         self.__write_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "list_numbers.data")
+            copy_obj.copy_file(self.__write_to, 'list_numbers.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/list_table.py b/src/calibre/ebooks/rtf2xml/list_table.py
index 06b9f6b42a..c33fde1e3c 100644
--- a/src/calibre/ebooks/rtf2xml/list_table.py
+++ b/src/calibre/ebooks/rtf2xml/list_table.py
@@ -13,10 +13,10 @@
 
 
 class ListTable:
-    """
+    '''
     Parse the list table line. Make a string. Form a dictionary.
     Return the string and the dictionary.
-    """
+    '''
 
     def __init__(
                 self,
@@ -49,42 +49,40 @@ class ListTable:
             'list_name'     : self.__list_name_func,
         }
         self.__main_list_dict = {
-            'cw<ls<ls-tem-id_'  :       'list-template-id',
-            'cw<ls<list-hybri'  :       'list-hybrid',
-            'cw<ls<lis-tbl-id'  :       'list-table-id',
+            'cw<ls<ls-tem-id_'  : 'list-template-id',
+            'cw<ls<list-hybri'  : 'list-hybrid',
+            'cw<ls<lis-tbl-id'  : 'list-table-id',
         }
         self.__level_dict = {
-            'cw<ls<level-star'  :       'list-number-start',
-            'cw<ls<level-spac'  :       'list-space',
-            'cw<ls<level-inde'  :       'level-indent',
-            'cw<ls<fir-ln-ind'  :       'first-line-indent',
-            'cw<ls<left-inden'  :       'left-indent',
-            'cw<ls<tab-stop__'  :       'tabs',
-            'cw<ls<level-type'  :       'numbering-type',
-            'cw<pf<right-inde'  :       'right-indent',
-            'cw<pf<left-inden'  :       'left-indent',
-            'cw<pf<fir-ln-ind'  :       'first-line-indent',
-            'cw<ci<italics___'  :       'italics',
-            'cw<ci<bold______'  :       'bold',
-            'cw<ss<para-style'  :       'paragraph-style-name',
+            'cw<ls<level-star'  : 'list-number-start',
+            'cw<ls<level-spac'  : 'list-space',
+            'cw<ls<level-inde'  : 'level-indent',
+            'cw<ls<fir-ln-ind'  : 'first-line-indent',
+            'cw<ls<left-inden'  : 'left-indent',
+            'cw<ls<tab-stop__'  : 'tabs',
+            'cw<ls<level-type'  : 'numbering-type',
+            'cw<pf<right-inde'  : 'right-indent',
+            'cw<pf<left-inden'  : 'left-indent',
+            'cw<pf<fir-ln-ind'  : 'first-line-indent',
+            'cw<ci<italics___'  : 'italics',
+            'cw<ci<bold______'  : 'bold',
+            'cw<ss<para-style'  : 'paragraph-style-name',
         }
-        """
-        all_lists =
-        [{anything here?}
-            [{list-templateid = ""}
-                [{level-indent}],[{level-indent}]
-            ]
-        ],
-        """
+        # all_lists =
+        # [{anything here?}
+        #     [{list-templateid = ""}
+        #         [{level-indent}],[{level-indent}]
+        #     ]
+        # ],
 
     def __parse_lines(self, line):
-        """
+        '''
         Required : line --line to parse
         Returns:  nothing
         Logic:
             Split the lines into a list by a new line. Process the line
             according to the state.
-        """
+        '''
         lines = line.split('\n')
         self.__ob_count = 0
         self.__ob_group = 0
@@ -104,18 +102,18 @@ class ListTable:
         # self.__add_to_final_line()
 
     def __default_func(self, line):
-        """
+        '''
         Requires: line --line to process
         Return: nothing
         Logic:
             This state is used at the start and end of a list. Look for an
             opening bracket, which marks the change of state.
-        """
+        '''
         if self.__token_info == 'ob<nu<open-brack':
             self.__state = 'unsure_ob'
 
     def __found_list_func(self, line):
-        """
+        '''
         Requires: line -- line to process
         Returns: nothing
         Logic:
@@ -127,7 +125,7 @@ class ListTable:
             "list-id" and the value of an empty list. Later, this empty list
             will be filled with all the ids for which the formatting is valid.
             Append the temporary dictionary to the new list.
-        """
+        '''
         self.__state = 'list'
         self.__list_ob_count = self.__ob_count
         self.__all_lists.append([])
@@ -135,14 +133,14 @@ class ListTable:
         self.__all_lists[-1].append(the_dict)
 
     def __list_func(self, line):
-        """
+        '''
         Requires: line --line to process
         Returns: nothing
         Logic:
             This method is called when you are in a list, but outside of a level.
             Check for the end of the list. Otherwise, use the self.__mainlist_dict
             to determine if you need to add a lines values to the main list.
-        """
+        '''
         if self.__token_info == 'cb<nu<clos-brack' and\
             self.__cb_count == self.__list_ob_count:
             self.__state = 'default'
@@ -157,7 +155,7 @@ class ListTable:
                 self.__all_lists[-1][0][att] = value
 
     def __found_level_func(self, line):
-        """
+        '''
         Requires: line -- line to process
         Returns: nothing
         Logic:
@@ -176,7 +174,7 @@ class ListTable:
                     self.__all_lists[-1][0] => a dictionary of the list attributes
                     self.__all_lists[-1][-1] => a list with just a dictionary
                     self.__all_lists[-1][-1][0] => the dictionary of level attributes
-        """
+        '''
         self.__state = 'level'
         self.__level_ob_count = self.__ob_count
         self.__all_lists[-1].append([])
@@ -185,7 +183,7 @@ class ListTable:
         self.__level_dict
 
     def __level_func(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -194,7 +192,7 @@ class ListTable:
             Look for the end of the this group.
             Change states if an open bracket is found.
             Add attributes to all_dicts if an appropriate token is found.
-        """
+        '''
         if self.__token_info == 'cb<nu<clos-brack' and\
             self.__cb_count == self.__level_ob_count:
             self.__state = 'list'
@@ -207,7 +205,7 @@ class ListTable:
                 self.__all_lists[-1][-1][0][att] = value
 
     def __level_number_func(self, line):
-        """
+        '''
         Requires:
             line -- line to process
         Returns:
@@ -219,7 +217,7 @@ class ListTable:
             this by 2 and round it. Remove the ".0". Sandwwhich the result to
             give you something like level1-show-level.
             The show-level attribute means the numbering for this level.
-        """
+        '''
         if self.__token_info == 'cb<nu<clos-brack' and\
             self.__cb_count == self.__level_number_ob_count:
             self.__state = 'level'
@@ -229,17 +227,15 @@ class ListTable:
             self.__level_numbers_string += '\\&#x0027;%s' % line[18:]
         elif self.__token_info == 'tx<nu<__________':
             self.__level_numbers_string += line[17:]
-            """
-            num = line[18:]
-            num = int(num, 16)
-            level = str(round((num - 1)/2, 0))
-            level = level[:-2]
-            level = 'level%s-show-level' % level
-            self.__all_lists[-1][-1][0][level] = 'true'
-            """
+            # num = line[18:]
+            # num = int(num, 16)
+            # level = str(round((num - 1)/2, 0))
+            # level = level[:-2]
+            # level = 'level%s-show-level' % level
+            # self.__all_lists[-1][-1][0][level] = 'true'
 
     def __level_text_func(self, line):
-        """
+        '''
         Requires:
             line --line to process
         Returns:
@@ -252,7 +248,7 @@ class ListTable:
             This attribute indicates the puncuation after a certain level.
             An example is "level1-marker = '.'"
             Otherwise, check for a level-template-id.
-        """
+        '''
         if self.__token_info == 'cb<nu<clos-brack' and\
             self.__cb_count == self.__level_text_ob_count:
             if self.__prefix_string:
@@ -278,14 +274,14 @@ class ListTable:
             self.__all_lists[-1][-1][0]['level-template-id'] = value
 
     def __parse_level_text_length(self, line):
-        """
+        '''
         Requires:
             line --line with hexadecimal number
         Returns:
             nothing
         Logic:
             Method is used for to parse text in the \\leveltext group.
-        """
+        '''
         num = line[18:]
         the_num = int(num, 16)
         if not self.__found_level_text_length:
@@ -304,20 +300,20 @@ class ListTable:
                 self.__prefix_string = None
 
     def __list_name_func(self, line):
-        """
+        '''
         Requires:
             line --line to process
         Returns:
             nothing
         Logic:
             Simply check for the end of the group and change states.
-        """
+        '''
         if self.__token_info == 'cb<nu<clos-brack' and\
             self.__cb_count == self.__list_name_ob_count:
             self.__state = 'list'
 
     def __after_bracket_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -327,7 +323,7 @@ class ListTable:
             you are now in.
             WARNING: this could cause problems. If no group is found, the state will remain
             unsure_ob, which means no other text will be parsed.
-        """
+        '''
         if self.__token_info == 'cw<ls<level-text':
             self.__state = 'level_text'
             self.__level_text_ob_count = self.__ob_count
@@ -348,18 +344,16 @@ class ListTable:
                 raise self.__bug_handler
 
     def __add_to_final_line(self):
-        """
+        '''
         Method no longer used.
-        """
+        '''
         self.__list_table_final = 'mi<mk<listabbeg_\n'
-        self.__list_table_final += 'mi<tg<open______<list-table\n' + \
-        'mi<mk<listab-beg\n' + self.__list_table_final
-        self.__list_table_final += \
-        'mi<mk<listab-end\n' + 'mi<tg<close_____<list-table\n'
+        self.__list_table_final += 'mi<tg<open______<list-table\n' + 'mi<mk<listab-beg\n' + self.__list_table_final
+        self.__list_table_final += 'mi<mk<listab-end\n' + 'mi<tg<close_____<list-table\n'
         self.__list_table_final += 'mi<mk<listabend_\n'
 
     def __write_final_string(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -372,12 +366,11 @@ class ListTable:
             Remove the first item (the dictionary) form this list. Now iterate
             through what is left in the list. Each list will contain one item,
             a dictionary. Get this dictionary and print out key => value pair.
-        """
+        '''
         not_allow = ['list-id',]
         id = 0
         self.__list_table_final = 'mi<mk<listabbeg_\n'
-        self.__list_table_final += 'mi<tg<open______<list-table\n' + \
-        'mi<mk<listab-beg\n' + self.__list_table_final
+        self.__list_table_final += 'mi<tg<open______<list-table\n' + 'mi<mk<listab-beg\n' + self.__list_table_final
         for list in self.__all_lists:
             id += 1
             self.__list_table_final += 'mi<tg<open-att__<list-in-table'
@@ -426,12 +419,11 @@ class ListTable:
                     # self.__list_table_final += '<bullet-type>%s' % (bullet_text)
                 self.__list_table_final += '\n'
             self.__list_table_final += 'mi<tg<close_____<list-in-table\n'
-        self.__list_table_final += \
-        'mi<mk<listab-end\n' + 'mi<tg<close_____<list-table\n'
+        self.__list_table_final += 'mi<mk<listab-end\n' + 'mi<tg<close_____<list-table\n'
         self.__list_table_final += 'mi<mk<listabend_\n'
 
     def parse_list_table(self, line):
-        """
+        '''
         Requires:
             line -- line with border definition in it
         Returns:
@@ -439,6 +431,6 @@ class ListTable:
         Logic:
             Call on the __parse_lines method, which splits the text string into
             lines (which will be tokens) and processes them.
-        """
+        '''
         self.__parse_lines(line)
         return self.__list_table_final, self.__all_lists
diff --git a/src/calibre/ebooks/rtf2xml/make_lists.py b/src/calibre/ebooks/rtf2xml/make_lists.py
index cd06075e47..6cce680b99 100644
--- a/src/calibre/ebooks/rtf2xml/make_lists.py
+++ b/src/calibre/ebooks/rtf2xml/make_lists.py
@@ -21,12 +21,12 @@ from . import open_for_read, open_for_write
 
 
 class MakeLists:
-    """
+    '''
     Form lists.
     Use RTF's own formatting to determine if a paragraph definition is part of a
     list.
     Use indents to determine items and how lists are nested.
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -38,7 +38,7 @@ class MakeLists:
             no_headings_as_list=1,
             write_list_info=0,
             ):
-        """
+        '''
         Required:
             'file'
         Optional:
@@ -47,7 +47,7 @@ class MakeLists:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__run_level = run_level
@@ -59,7 +59,7 @@ class MakeLists:
         self.__write_list_info = write_list_info
 
     def __initiate_values(self):
-        """
+        '''
         Required:
             Nothing
         Return:
@@ -67,18 +67,18 @@ class MakeLists:
         Logic:
             The self.__end_list is a list of tokens that will force a list to end.
             Likewise, the self.__end_lines is a list of lines that forces a list to end.
-        """
-        self.__state = "default"
+        '''
+        self.__state = 'default'
         self.__left_indent = 0
         self.__list_type = 'not-defined'
-        self.__pard_def = ""
+        self.__pard_def = ''
         self.__all_lists = []
         self.__level = 0
         self.__list_chunk = ''
         self.__state_dict={
-        'default'           :   self.__default_func,
-        'in_pard'           :   self.__in_pard_func,
-        'after_pard'        :   self.__after_pard_func,
+        'default'   : self.__default_func,
+        'in_pard'   : self.__in_pard_func,
+        'after_pard': self.__after_pard_func,
         }
         self.__headings = [
         'heading 1', 'heading 2', 'heading 3', 'heading 4',
@@ -114,7 +114,7 @@ class MakeLists:
         self.__line_num = 0
 
     def __in_pard_func(self, line):
-        """
+        '''
         Required:
             line -- the line of current text.
         Return:
@@ -122,13 +122,13 @@ class MakeLists:
         Logic:
             You are in a list, but in the middle of a paragraph definition.
             Don't do anything until you find the end of the paragraph definition.
-        """
+        '''
         if self.__token_info == 'mi<mk<pard-end__':
             self.__state = 'after_pard'
         self.__write_obj.write(line)
 
     def __after_pard_func(self, line):
-        """
+        '''
         Required:
             line -- the line of current text.
         Return:
@@ -145,7 +145,7 @@ class MakeLists:
             If a bigger block is found (such as a section or a cell), end all lists.
             indented.
             If no special line is found, add each line to a buffer.
-        """
+        '''
         if self.__token_info == 'mi<tg<open-att__' and line[17:37] == 'paragraph-definition':
             is_heading = self.__is_a_heading()
             # found paragraph definition and not heading 1
@@ -177,7 +177,7 @@ class MakeLists:
                 else:
                     self.__state = 'in_pard'
         # section to end lists
-        elif self.__token_info in self.__end_list :
+        elif self.__token_info in self.__end_list:
             self.__left_indent = -1000
             self.__close_lists()
             self.__write_obj.write(self.__list_chunk)
@@ -188,7 +188,7 @@ class MakeLists:
             self.__list_chunk += line
 
     def __list_after_par_def_func(self, line, id):
-        """
+        '''
         Required:
             line -- the line of current text.
             id -- the id of the current list
@@ -203,7 +203,7 @@ class MakeLists:
             If the list id is the same as the last one, check the indent on the
             current paragraph definition. If it is greater than the previous one,
             do not end the current list or item. Start a new list.
-        """
+        '''
         last_list_id = self.__all_lists[-1]['id']
         if id != last_list_id:
             self.__close_lists()
@@ -222,7 +222,7 @@ class MakeLists:
             self.__list_chunk = ''
 
     def __close_lists(self):
-        """
+        '''
         Required:
             Nothing
         Return:
@@ -234,7 +234,7 @@ class MakeLists:
             Keep track of how many levels you close. Reduce the list by that
             many levels.
             Reverse the list again.
-        """
+        '''
         if self.__line_num < 25 and self.__found_appt:
             sys.stderr.write('in closing out lists\n')
             sys.stderr.write('current_indent is "%s"\n' % self.__left_indent)
@@ -253,19 +253,19 @@ class MakeLists:
         self.__all_lists.reverse()
 
     def __write_end_list(self):
-        """
+        '''
         Required:
             Nothing
         Return:
             Nothing
         Logic:
             Write the end of a list.
-        """
+        '''
         self.__write_obj.write('mi<tg<close_____<list\n')
         self.__write_obj.write('mi<mk<list_close\n')
 
     def __write_start_list(self, id):
-        """
+        '''
         Required:
             id -- the id of the current list.
         Return:
@@ -281,7 +281,7 @@ class MakeLists:
             the first item of what I just got. This is a dictionary. Get the list-id.
             This is  a list. Check to see if the current id is in this list. If
             so, then get the list-type from the dictionary.
-        """
+        '''
         the_dict = {}
         the_dict['left-indent'] = self.__left_indent
         the_dict['id'] = id
@@ -341,7 +341,7 @@ class MakeLists:
         self.__write_start_item()
 
     def __get_index_of_list(self, id):
-        """
+        '''
         Requires:
             id -- id of current paragraph-definition
         Returns:
@@ -353,7 +353,7 @@ class MakeLists:
             track of how many times you iterate with the counter.
             Once you find a match, return the counter.
             If no match is found, print out an error message.
-        """
+        '''
         # some RTF use 0 indexed list. Don't know what to do?
         if id == '0':
             return
@@ -371,9 +371,9 @@ class MakeLists:
                 % (id)
                 )
             # sys.stderr.write(repr(self.__list_of_lists))
-#        if self.__run_level > 3:
-#            msg = 'level is "%s"\n' % self.__run_level
-#            self.__bug_handler
+        # if self.__run_level > 3:
+        #     msg = 'level is "%s"\n' % self.__run_level
+        #     self.__bug_handler
 
     def __write_start_item(self):
         self.__write_obj.write('mi<mk<item_start\n')
@@ -386,7 +386,7 @@ class MakeLists:
         self.__write_obj.write('mi<tg<item__end_\n')
 
     def __default_func(self, line):
-        """
+        '''
         Required:
             self, line
         Returns:
@@ -395,7 +395,7 @@ class MakeLists:
             Look for the start of a paragraph definition. If one is found, check if
             it contains a list-id. If it does, start a list. Change the state to
             in_pard.
-            """
+        '''
         if self.__token_info == 'mi<tg<open-att__' and line[17:37] == 'paragraph-definition':
             is_a_heading = self.__is_a_heading()
             if not is_a_heading:
@@ -429,20 +429,20 @@ class MakeLists:
         if self.__token_info == 'mi<mk<list-type_':  # <ordered
             self.__list_type = line[17:-1]
             if self.__list_type == 'item':
-                self.__list_type = "unordered"
+                self.__list_type = 'unordered'
 
     def __get_style_name(self, line):
         if self.__token_info == 'mi<mk<style-name':
             self.__style_name = line[17:-1]
 
     def make_lists(self):
-        """
+        '''
         Required:
             nothing
         Returns:
             original file will be changed
         Logic:
-        """
+        '''
         self.__initiate_values()
         read_obj = open_for_read(self.__file)
         self.__write_obj = open_for_write(self.__write_to)
@@ -460,6 +460,6 @@ class MakeLists:
         self.__write_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "make_lists.data")
+            copy_obj.copy_file(self.__write_to, 'make_lists.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/old_rtf.py b/src/calibre/ebooks/rtf2xml/old_rtf.py
index be49f7f306..392f91878f 100644
--- a/src/calibre/ebooks/rtf2xml/old_rtf.py
+++ b/src/calibre/ebooks/rtf2xml/old_rtf.py
@@ -16,18 +16,18 @@ from . import open_for_read
 
 
 class OldRtf:
-    """
+    '''
     Check to see if the RTF is an older version
     Logic:
     If allowable control word/properties happen in text without being enclosed
     in brackets the file will be considered old rtf
-    """
+    '''
 
     def __init__(self, in_file,
                 bug_handler,
                 run_level,
                 ):
-        """
+        '''
         Required:
             'file'--file to parse
             'table_data' -- a dictionary for each table.
@@ -37,36 +37,36 @@ class OldRtf:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__run_level = run_level
         self.__allowable = [
-            'annotation' ,
-            'blue______'  ,
+            'annotation',
+            'blue______',
             'bold______',
             'caps______',
-            'char-style' ,
-            'dbl-strike' ,
+            'char-style',
+            'dbl-strike',
             'emboss____',
-            'engrave___' ,
+            'engrave___',
             'font-color',
-            'font-down_' ,
+            'font-down_',
             'font-size_',
             'font-style',
             'font-up___',
-            'footnot-mk' ,
-            'green_____' ,
+            'footnot-mk',
+            'green_____',
             'hidden____',
             'italics___',
             'outline___',
             'red_______',
-            'shadow____' ,
+            'shadow____',
             'small-caps',
             'strike-thr',
             'subscript_',
-            'superscrip' ,
-            'underlined' ,
+            'superscrip',
+            'underlined',
         ]
         self.__action_dict = {
             'before_body'   : self.__before_body_func,
@@ -86,7 +86,7 @@ class OldRtf:
                 return 'old_rtf'
             else:
                 self.__found_new += 1
-        elif self.__token_info ==  'cw<pf<par-def___':
+        elif self.__token_info == 'cw<pf<par-def___':
             self.__state = 'after_pard'
 
     def __before_body_func(self, line):
@@ -99,13 +99,13 @@ class OldRtf:
             self.__state = 'in_body'
 
     def check_if_old_rtf(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
             True if file is older RTf
             False if file is newer RTF
-        """
+        '''
         self.__initiate_values()
         line_num = 0
         with open_for_read(self.__file) as read_obj:
diff --git a/src/calibre/ebooks/rtf2xml/options_trem.py b/src/calibre/ebooks/rtf2xml/options_trem.py
index c62e18910a..52261b4bf6 100644
--- a/src/calibre/ebooks/rtf2xml/options_trem.py
+++ b/src/calibre/ebooks/rtf2xml/options_trem.py
@@ -2,7 +2,7 @@ import sys
 
 
 class ParseOptions:
-    """
+    '''
         Requires:
            system_string --The string from the command line
            options_dict -- a dictionary with the key equal to the opition, and
@@ -29,29 +29,29 @@ class ParseOptions:
                 print arguments
             The result will be:
                 {indents:None, output:'/home/paul/file'}, ['/home/paul/input']
-        """
+        '''
 
     def __init__(self, system_string, options_dict):
         self.__system_string = system_string[1:]
         long_list  = self.__make_long_list_func(options_dict)
-        # # print long_list
+        # print(long_list)
         short_list = self.__make_short_list_func(options_dict)
-        # # print short_list
+        # print(short_list)
         self.__legal_options = long_list + short_list
-        # # print self.__legal_options
+        # print(self.__legal_options)
         self.__short_long_dict = self.__make_short_long_dict_func(options_dict)
-        # # print self.__short_long_dict
+        # print(self.__short_long_dict)
         self.__opt_with_args = self.__make_options_with_arg_list(options_dict)
-        # # print self.__opt_with_args
+        # print(self.__opt_with_args)
         self.__options_okay = 1
 
     def __make_long_list_func(self, options_dict):
-        """
+        '''
         Required:
             options_dict -- the dictionary mapping options to a list
         Returns:
             a list of legal options
-        """
+        '''
         legal_list = []
         keys = options_dict.keys()
         for key in keys:
@@ -60,12 +60,12 @@ class ParseOptions:
         return legal_list
 
     def __make_short_list_func(self, options_dict):
-        """
+        '''
         Required:
             options_dict --the dictionary mapping options to a list
         Returns:
             a list of legal short options
-        """
+        '''
         legal_list = []
         keys = options_dict.keys()
         for key in keys:
@@ -77,14 +77,14 @@ class ParseOptions:
         return legal_list
 
     def __make_short_long_dict_func(self, options_dict):
-        """
+        '''
         Required:
             options_dict --the dictionary mapping options to a list
         Returns:
             a dictionary with keys of short options and values of long options
         Logic:
             read through the options dictionary and pair short options with long options
-        """
+        '''
         short_long_dict = {}
         keys = options_dict.keys()
         for key in keys:
@@ -98,12 +98,12 @@ class ParseOptions:
         return short_long_dict
 
     def __make_options_with_arg_list(self, options_dict):
-        """
+        '''
         Required:
             options_dict --the dictionary mapping options to a list
         Returns:
             a list of options that take arguments.
-        """
+        '''
         opt_with_arg = []
         keys = options_dict.keys()
         for key in keys:
@@ -116,14 +116,14 @@ class ParseOptions:
         return opt_with_arg
 
     def __sub_short_with_long(self):
-        """
+        '''
         Required:
             nothing
         Returns:
             a new system string
         Logic:
             iterate through the system string and replace short options with long options
-        """
+        '''
         new_string = []
         sub_list = self.__short_long_dict.keys()
         for item in self.__system_string:
@@ -133,7 +133,7 @@ class ParseOptions:
         return new_string
 
     def __pair_arg_with_option(self):
-        """
+        '''
         Required:
             nothing
         Returns
@@ -142,7 +142,7 @@ class ParseOptions:
             iterate through the system string, and match arguments with options:
                 old_list = ['--foo', 'bar']
                 new_list = ['--foo=bar'
-        """
+        '''
         opt_len = len(self.__system_string)
         new_system_string = []
         counter = 0
@@ -184,7 +184,7 @@ class ParseOptions:
         return new_system_string
 
     def __get_just_options(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -194,7 +194,7 @@ class ParseOptions:
             option. The options are everything in the system string before the
             last option.
             Check to see that the options contain no arguments.
-        """
+        '''
         highest = 0
         counter = 0
         found_options = 0
@@ -217,7 +217,7 @@ class ParseOptions:
         return just_options, arguments
 
     def __is_legal_option_func(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -225,7 +225,7 @@ class ParseOptions:
         Logic:
             Check each value in the newly creatd options list to see if it
             matches what the user describes as a legal option.
-        """
+        '''
         illegal_options = []
         for arg in self.__system_string:
             if '=' in arg:
@@ -256,16 +256,16 @@ class ParseOptions:
 
     def parse_options(self):
         self.__system_string = self.__sub_short_with_long()
-        # # print 'subbed list is  %s' % self.__system_string
+        # print('subbed list is  %s' % self.__system_string)
         self.__system_string = self.__pair_arg_with_option()
-        # # print 'list with pairing is %s' % self.__system_string
+        # print('list with pairing is %s' % self.__system_string)
         options, arguments  = self.__get_just_options()
-        # # print 'options are %s ' % options
-        # # print 'arguments are %s ' % arguments
+        # print('options are %s ' % options)
+        # print('arguments are %s ' % arguments)
         self.__is_legal_option_func()
         if self.__options_okay:
             options_dict = self.__make_options_dict(options)
-            # # print options_dict
+            # print(options_dict)
             return options_dict, arguments
         else:
             return 0,0
@@ -282,7 +282,5 @@ if __name__ == '__main__':
             )
     options, the_args = test_obj.parse_options()
     print(options, the_args)
-    """
-    this_options = ['--foo', '-o']
-    this_opt_with_args = ['--foo']
-    """
+    # this_options = ['--foo', '-o']
+    # this_opt_with_args = ['--foo']
diff --git a/src/calibre/ebooks/rtf2xml/output.py b/src/calibre/ebooks/rtf2xml/output.py
index f9f11b4f5c..ac9cbb6ec9 100644
--- a/src/calibre/ebooks/rtf2xml/output.py
+++ b/src/calibre/ebooks/rtf2xml/output.py
@@ -15,13 +15,13 @@ import sys
 
 from . import open_for_read, open_for_write
 
-# , codecs
+# codecs
 
 
 class Output:
-    """
+    '''
     Output file
-    """
+    '''
 
     def __init__(self,
             file,
@@ -30,7 +30,7 @@ class Output:
             out_file=None,
             no_ask=True
             ):
-        """
+        '''
         Required:
             'file' -- xml file ready to output
             orig_file -- original rtf file
@@ -38,7 +38,7 @@ class Output:
             output_file -- the file to output to
         Returns:
             nothing
-            """
+        '''
         self.__file = file
         self.__orig_file = orig_file
         self.__output_dir = output_dir
@@ -46,7 +46,7 @@ class Output:
         self.__out_file = out_file
 
     def output(self):
-        """
+        '''
         Required:
             nothing
         Returns:
@@ -54,7 +54,7 @@ class Output:
         Logic:
             output the line to the screen if no output file given. Otherwise, output to
             the file.
-        """
+        '''
         if self.__output_dir:
             self.__output_to_dir_func()
         elif self.__out_file:
@@ -64,7 +64,7 @@ class Output:
             self.__output_to_standard_func()
 
     def __output_to_dir_func(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -72,7 +72,7 @@ class Output:
         Logic:
             Create a file within the output directory.
             Read one file at a time. Output line to the newly-created file.
-        """
+        '''
         base_name = os.path.basename(self.__orig_file)
         base_name, ext  = os.path.splitext(base_name)
         output_file = os.path.join(self.__output_dir, '%s.xml' % base_name)
@@ -95,28 +95,28 @@ class Output:
             self.__output_to_standard_func()
 
     def __output_to_file_func(self):
-        """
+        '''
         Required:
             nothing
         Returns:
             nothing
         Logic:
             read one line at a time. Output to standard
-        """
+        '''
         with open_for_read(self.__file) as read_obj:
             with open_for_write(self.__out_file) as write_obj:
                 for line in read_obj:
                     write_obj.write(line)
 
     def __output_to_standard_func(self):
-        """
+        '''
         Required:
             nothing
         Returns:
             nothing
         Logic:
             read one line at a time. Output to standard
-        """
+        '''
         with open_for_read(self.__file) as read_obj:
             for line in read_obj:
                 sys.stdout.write(line)
diff --git a/src/calibre/ebooks/rtf2xml/override_table.py b/src/calibre/ebooks/rtf2xml/override_table.py
index 8b01f8e4ec..eb16d3b067 100644
--- a/src/calibre/ebooks/rtf2xml/override_table.py
+++ b/src/calibre/ebooks/rtf2xml/override_table.py
@@ -13,13 +13,13 @@
 
 
 class OverrideTable:
-    """
+    '''
     Parse a line of text to make the override table. Return a string
     (which will convert to XML) and the dictionary containing all the
     information about the lists. This dictionary is the result of the
     dictionary that is first passed to this module. This module
     modifies the dictionary, assigning lists numbers to each list.
-    """
+    '''
 
     def __init__(
                 self,
@@ -35,17 +35,17 @@ class OverrideTable:
         self.__state = 'default'
         self.__override_list = []
         self.__state_dict = {
-            'default'       : self.__default_func,
-            'override'      : self.__override_func,
-            'unsure_ob'     : self.__after_bracket_func,
+            'default'   : self.__default_func,
+            'override'  : self.__override_func,
+            'unsure_ob' : self.__after_bracket_func,
         }
         self.__override_dict = {
-            'cw<ls<lis-tbl-id'  :       'list-table-id',
-            'cw<ls<list-id___'  :       'list-id',
+            'cw<ls<lis-tbl-id'  : 'list-table-id',
+            'cw<ls<list-id___'  : 'list-id',
         }
 
     def __override_func(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -54,7 +54,7 @@ class OverrideTable:
             The group {\\override has been found.
             Check for the end of the group.
             Otherwise, add appropriate tokens to the override dictionary.
-        """
+        '''
         if self.__token_info == 'cb<nu<clos-brack' and\
             self.__cb_count == self.__override_ob_count:
             self.__state = 'default'
@@ -66,7 +66,7 @@ class OverrideTable:
                 self.__override_list[-1][att] = value
 
     def __parse_override_dict(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -84,7 +84,7 @@ class OverrideTable:
                 [[{list-id:[HERE!],[{}]]
             This is a list, since one list in the table in the preamble of RTF can
             apply to multiple lists in the body.
-        """
+        '''
         override_dict = self.__override_list[-1]
         list_id = override_dict.get('list-id')
         if list_id is None and self.__level > 3:
@@ -104,7 +104,7 @@ class OverrideTable:
             counter += 1
 
     def __parse_lines(self, line):
-        """
+        '''
         Requires:
             line --ine to parse
         Returns:
@@ -112,7 +112,7 @@ class OverrideTable:
         Logic:
             Break the into tokens by splitting it on the newline.
             Call on the method according to the state.
-        """
+        '''
         lines = line.split('\n')
         self.__ob_count = 0
         self.__ob_group = 0
@@ -132,19 +132,19 @@ class OverrideTable:
         # self.__add_to_final_line()
 
     def __default_func(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Return:
             nothing
         Logic:
             Look for an open bracket and change states when found.
-        """
+        '''
         if self.__token_info == 'ob<nu<open-brack':
             self.__state = 'unsure_ob'
 
     def __after_bracket_func(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -156,7 +156,7 @@ class OverrideTable:
             state will remain unsure_ob, which means no other text will be
             parsed. I should do states by a list and simply pop this
             unsure_ob state to get the previous state.
-        """
+        '''
         if self.__token_info == 'cw<ls<lis-overid':
             self.__state = 'override'
             self.__override_ob_count = self.__ob_count
@@ -168,7 +168,7 @@ class OverrideTable:
             raise self.__bug_handler(msg)
 
     def __write_final_string(self):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -178,10 +178,9 @@ class OverrideTable:
             Iteratere through the dictionaries in the main override_list.
             For each dictionary, write an empty tag "override-list". Add
             the attributes and values of the tag from the dictionary.
-        """
+        '''
         self.__override_table_final = 'mi<mk<over_beg_\n'
-        self.__override_table_final += 'mi<tg<open______<override-table\n' + \
-        'mi<mk<overbeg__\n' + self.__override_table_final
+        self.__override_table_final += 'mi<tg<open______<override-table\n' + 'mi<mk<overbeg__\n' + self.__override_table_final
         for the_dict in self.__override_list:
             self.__override_table_final += 'mi<tg<empty-att_<override-list'
             the_keys = the_dict.keys()
@@ -190,18 +189,17 @@ class OverrideTable:
                     f'<{the_key}>{the_dict[the_key]}'
             self.__override_table_final += '\n'
         self.__override_table_final += '\n'
-        self.__override_table_final += \
-        'mi<mk<overri-end\n' + 'mi<tg<close_____<override-table\n'
+        self.__override_table_final += 'mi<mk<overri-end\n' + 'mi<tg<close_____<override-table\n'
         self.__override_table_final += 'mi<mk<overribend_\n'
 
     def parse_override_table(self, line):
-        """
+        '''
         Requires:
             line -- line with border definition in it
         Returns:
             A string that will be converted to XML, and a dictionary of
             all the properties of the RTF lists.
         Logic:
-        """
+        '''
         self.__parse_lines(line)
         return self.__override_table_final, self.__list_of_lists
diff --git a/src/calibre/ebooks/rtf2xml/paragraph_def.py b/src/calibre/ebooks/rtf2xml/paragraph_def.py
index 486690a30d..f74cba6de4 100644
--- a/src/calibre/ebooks/rtf2xml/paragraph_def.py
+++ b/src/calibre/ebooks/rtf2xml/paragraph_def.py
@@ -20,7 +20,7 @@ from . import open_for_read, open_for_write
 
 
 class ParagraphDef:
-    """
+    '''
 =================
 Purpose
 =================
@@ -52,7 +52,7 @@ be closed:
 5. after_para_def
 'mi<mk<para-start'  changes state to in_paragraphs
 if another paragraph_def is found, the state changes to collect_tokens.
-    """
+    '''
 
     def __init__(self,
         in_file,
@@ -60,7 +60,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
         default_font,
         copy=None,
         run_level=1,):
-        """
+        '''
         Required:
             'file'--file to parse
             'default_font' --document default font
@@ -70,7 +70,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__default_font = default_font
@@ -79,182 +79,182 @@ if another paragraph_def is found, the state changes to collect_tokens.
         self.__write_to = better_mktemp()
 
     def __initiate_values(self):
-        """
+        '''
         Initiate all values.
-        """
+        '''
         # Dictionary needed to convert shortened style names to readable names
         self.__token_dict={
         # paragraph formatting => pf
-        'par-end___'    : 'para',
-        'par-def___'    : 'paragraph-definition',
-        'keep-w-nex'    : 'keep-with-next',
-        'widow-cntl'    : 'widow-control',
-        'adjust-rgt'    : 'adjust-right',
-        'language__'    : 'language',
-        'right-inde'    : 'right-indent',
-        'fir-ln-ind'    : 'first-line-indent',
-        'left-inden'    : 'left-indent',
-        'space-befo'    : 'space-before',
-        'space-afte'    : 'space-after',
-        'line-space'    : 'line-spacing',
-        'default-ta'    : 'default-tab',
-        'align_____'    : 'align',
-        'widow-cntr'    : 'widow-control',
+        'par-end___': 'para',
+        'par-def___': 'paragraph-definition',
+        'keep-w-nex': 'keep-with-next',
+        'widow-cntl': 'widow-control',
+        'adjust-rgt': 'adjust-right',
+        'language__': 'language',
+        'right-inde': 'right-indent',
+        'fir-ln-ind': 'first-line-indent',
+        'left-inden': 'left-indent',
+        'space-befo': 'space-before',
+        'space-afte': 'space-after',
+        'line-space': 'line-spacing',
+        'default-ta': 'default-tab',
+        'align_____': 'align',
+        'widow-cntr': 'widow-control',
         # stylesheet = > ss
-        'style-shet'    : 'stylesheet',
-        'based-on__'    : 'based-on-style',
-        'next-style'    : 'next-style',
-        'char-style'    : 'character-style',
+        'style-shet': 'stylesheet',
+        'based-on__': 'based-on-style',
+        'next-style': 'next-style',
+        'char-style': 'character-style',
         # this is changed to get a nice attribute
-        'para-style'    : 'name',
+        'para-style': 'name',
         # graphics => gr
-        'picture___'    : 'pict',
-        'obj-class_'    : 'obj_class',
-        'mac-pic___'    : 'mac-pict',
+        'picture___': 'pict',
+        'obj-class_': 'obj_class',
+        'mac-pic___': 'mac-pict',
         # section => sc
-        'section___'    : 'section-new',
-        'sect-defin'    : 'section-reset',
-        'sect-note_'    : 'endnotes-in-section',
+        'section___': 'section-new',
+        'sect-defin': 'section-reset',
+        'sect-note_': 'endnotes-in-section',
         # list=> ls
-        'list-text_'    : 'list-text',
-        'list______'    : 'list',
-        'list-lev-d'    : 'list-level-definition',
-        'list-cardi'    : 'list-cardinal-numbering',
-        'list-decim'    : 'list-decimal-numbering',
-        'list-up-al'    : 'list-uppercase-alphabetic-numbering',
-        'list-up-ro'    : 'list-uppercae-roman-numbering',
-        'list-ord__'    : 'list-ordinal-numbering',
-        'list-ordte'    : 'list-ordinal-text-numbering',
-        'list-bulli'    : 'list-bullet',
-        'list-simpi'    : 'list-simple',
-        'list-conti'    : 'list-continue',
-        'list-hang_'    : 'list-hang',
+        'list-text_': 'list-text',
+        'list______': 'list',
+        'list-lev-d': 'list-level-definition',
+        'list-cardi': 'list-cardinal-numbering',
+        'list-decim': 'list-decimal-numbering',
+        'list-up-al': 'list-uppercase-alphabetic-numbering',
+        'list-up-ro': 'list-uppercae-roman-numbering',
+        'list-ord__': 'list-ordinal-numbering',
+        'list-ordte': 'list-ordinal-text-numbering',
+        'list-bulli': 'list-bullet',
+        'list-simpi': 'list-simple',
+        'list-conti': 'list-continue',
+        'list-hang_': 'list-hang',
         # 'list-tebef'    : 'list-text-before',
         # 'list-level'    : 'level',
-        'list-id___'    : 'list-id',
-        'list-start'    : 'list-start',
-        'nest-level'    : 'nest-level',
+        'list-id___': 'list-id',
+        'list-start': 'list-start',
+        'nest-level': 'nest-level',
         # duplicate
-        'list-level'    : 'list-level',
+        'list-level': 'list-level',
         # notes => nt
-        'footnote__'    : 'footnote',
-        'type______'    : 'type',
+        'footnote__': 'footnote',
+        'type______': 'type',
         # anchor => an
-        'toc_______'    : 'anchor-toc',
-        'book-mk-st'    : 'bookmark-start',
-        'book-mk-en'    : 'bookmark-end',
-        'index-mark'    : 'anchor-index',
-        'place_____'    : 'place',
+        'toc_______': 'anchor-toc',
+        'book-mk-st': 'bookmark-start',
+        'book-mk-en': 'bookmark-end',
+        'index-mark': 'anchor-index',
+        'place_____': 'place',
         # field => fd
-        'field_____'    : 'field',
-        'field-inst'    : 'field-instruction',
-        'field-rslt'    : 'field-result',
-        'datafield_'    : 'data-field',
+        'field_____': 'field',
+        'field-inst': 'field-instruction',
+        'field-rslt': 'field-result',
+        'datafield_': 'data-field',
         # info-tables => it
-        'font-table'    : 'font-table',
-        'colr-table'    : 'color-table',
-        'lovr-table'    : 'list-override-table',
-        'listtable_'    : 'list-table',
-        'revi-table'    : 'revision-table',
+        'font-table': 'font-table',
+        'colr-table': 'color-table',
+        'lovr-table': 'list-override-table',
+        'listtable_': 'list-table',
+        'revi-table': 'revision-table',
         # character info => ci
-        'hidden____'    : 'hidden',
-        'italics___'    : 'italics',
-        'bold______'    : 'bold',
-        'strike-thr'   : 'strike-through',
-        'shadow____'   : 'shadow',
-        'outline___'   : 'outline',
-        'small-caps'   : 'small-caps',
-        'caps______'   :       'caps',
-        'dbl-strike'   : 'double-strike-through',
-        'emboss____'    : 'emboss',
-        'engrave___'    : 'engrave',
-        'subscript_'    : 'subscript',
-        'superscrip'    : 'superscipt',
-        'font-style'    : 'font-style',
-        'font-color'    : 'font-color',
-        'font-size_'    : 'font-size',
-        'font-up___'    : 'superscript',
-        'font-down_'    : 'subscript',
-        'red_______'    : 'red',
-        'blue______'    : 'blue',
-        'green_____'    : 'green',
+        'hidden____': 'hidden',
+        'italics___': 'italics',
+        'bold______': 'bold',
+        'strike-thr': 'strike-through',
+        'shadow____': 'shadow',
+        'outline___': 'outline',
+        'small-caps': 'small-caps',
+        'caps______':       'caps',
+        'dbl-strike': 'double-strike-through',
+        'emboss____': 'emboss',
+        'engrave___': 'engrave',
+        'subscript_': 'subscript',
+        'superscrip': 'superscipt',
+        'font-style': 'font-style',
+        'font-color': 'font-color',
+        'font-size_': 'font-size',
+        'font-up___': 'superscript',
+        'font-down_': 'subscript',
+        'red_______': 'red',
+        'blue______': 'blue',
+        'green_____': 'green',
         # table => tb
-        'row-def___'    : 'row-definition',
-        'cell______'    : 'cell',
-        'row_______'    : 'row',
-        'in-table__'    : 'in-table',
-        'columns___'    : 'columns',
-        'row-pos-le'    : 'row-position-left',
-        'cell-posit'    : 'cell-position',
+        'row-def___': 'row-definition',
+        'cell______': 'cell',
+        'row_______': 'row',
+        'in-table__': 'in-table',
+        'columns___': 'columns',
+        'row-pos-le': 'row-position-left',
+        'cell-posit': 'cell-position',
         # preamble => pr
         # underline
-        'underlined'    : 'underlined',
+        'underlined': 'underlined',
         # border => bd
-        'bor-t-r-hi'    : 'border-table-row-horizontal-inside',
-        'bor-t-r-vi'    : 'border-table-row-vertical-inside',
-        'bor-t-r-to'    : 'border-table-row-top',
-        'bor-t-r-le'    : 'border-table-row-left',
-        'bor-t-r-bo'    : 'border-table-row-bottom',
-        'bor-t-r-ri'    : 'border-table-row-right',
-        'bor-cel-bo'    : 'border-cell-bottom',
-        'bor-cel-to'    : 'border-cell-top',
-        'bor-cel-le'    : 'border-cell-left',
-        'bor-cel-ri'    : 'border-cell-right',
+        'bor-t-r-hi': 'border-table-row-horizontal-inside',
+        'bor-t-r-vi': 'border-table-row-vertical-inside',
+        'bor-t-r-to': 'border-table-row-top',
+        'bor-t-r-le': 'border-table-row-left',
+        'bor-t-r-bo': 'border-table-row-bottom',
+        'bor-t-r-ri': 'border-table-row-right',
+        'bor-cel-bo': 'border-cell-bottom',
+        'bor-cel-to': 'border-cell-top',
+        'bor-cel-le': 'border-cell-left',
+        'bor-cel-ri': 'border-cell-right',
         # 'bor-par-bo'    : 'border-paragraph-bottom',
-        'bor-par-to'    : 'border-paragraph-top',
-        'bor-par-le'    : 'border-paragraph-left',
-        'bor-par-ri'    : 'border-paragraph-right',
-        'bor-par-bo'    : 'border-paragraph-box',
-        'bor-for-ev'    : 'border-for-every-paragraph',
-        'bor-outsid'    : 'border-outisde',
-        'bor-none__'    : 'border',
+        'bor-par-to': 'border-paragraph-top',
+        'bor-par-le': 'border-paragraph-left',
+        'bor-par-ri': 'border-paragraph-right',
+        'bor-par-bo': 'border-paragraph-box',
+        'bor-for-ev': 'border-for-every-paragraph',
+        'bor-outsid': 'border-outisde',
+        'bor-none__': 'border',
         # border type => bt
-        'bdr-single'    : 'single',
-        'bdr-doubtb'    : 'double-thickness-border',
-        'bdr-shadow'    : 'shadowed-border',
-        'bdr-double'    : 'double-border',
-        'bdr-dotted'    : 'dotted-border',
-        'bdr-dashed'    : 'dashed',
-        'bdr-hair__'    : 'hairline',
-        'bdr-inset_'    : 'inset',
-        'bdr-das-sm'    : 'dash-small',
-        'bdr-dot-sm'    : 'dot-dash',
-        'bdr-dot-do'    : 'dot-dot-dash',
-        'bdr-outset'    : 'outset',
-        'bdr-trippl'    : 'tripple',
-        'bdr-thsm__'    : 'thick-thin-small',
-        'bdr-htsm__'    : 'thin-thick-small',
-        'bdr-hthsm_'    : 'thin-thick-thin-small',
-        'bdr-thm__'     : 'thick-thin-medium',
-        'bdr-htm__'     : 'thin-thick-medium',
-        'bdr-hthm_'     : 'thin-thick-thin-medium',
-        'bdr-thl__'     : 'thick-thin-large',
-        'bdr-hthl_'     : 'think-thick-think-large',
-        'bdr-wavy_'     : 'wavy',
-        'bdr-d-wav'     : 'double-wavy',
-        'bdr-strip'     : 'striped',
-        'bdr-embos'     : 'emboss',
-        'bdr-engra'     : 'engrave',
-        'bdr-frame'     : 'frame',
-        'bdr-li-wid'    : 'line-width',
+        'bdr-single': 'single',
+        'bdr-doubtb': 'double-thickness-border',
+        'bdr-shadow': 'shadowed-border',
+        'bdr-double': 'double-border',
+        'bdr-dotted': 'dotted-border',
+        'bdr-dashed': 'dashed',
+        'bdr-hair__': 'hairline',
+        'bdr-inset_': 'inset',
+        'bdr-das-sm': 'dash-small',
+        'bdr-dot-sm': 'dot-dash',
+        'bdr-dot-do': 'dot-dot-dash',
+        'bdr-outset': 'outset',
+        'bdr-trippl': 'tripple',
+        'bdr-thsm__': 'thick-thin-small',
+        'bdr-htsm__': 'thin-thick-small',
+        'bdr-hthsm_': 'thin-thick-thin-small',
+        'bdr-thm__': 'thick-thin-medium',
+        'bdr-htm__': 'thin-thick-medium',
+        'bdr-hthm_': 'thin-thick-thin-medium',
+        'bdr-thl__': 'thick-thin-large',
+        'bdr-hthl_': 'think-thick-think-large',
+        'bdr-wavy_': 'wavy',
+        'bdr-d-wav': 'double-wavy',
+        'bdr-strip': 'striped',
+        'bdr-embos': 'emboss',
+        'bdr-engra': 'engrave',
+        'bdr-frame': 'frame',
+        'bdr-li-wid': 'line-width',
         }
         self.__tabs_dict = {
-        'cw<pf<tab-stop__'  :   self.__tab_stop_func,
-        'cw<pf<tab-center'  :   self.__tab_type_func,
-        'cw<pf<tab-right_'  :   self.__tab_type_func,
-        'cw<pf<tab-dec___'  :   self.__tab_type_func,
-        'cw<pf<leader-dot'  :   self.__tab_leader_func,
-        'cw<pf<leader-hyp'  :   self.__tab_leader_func,
-        'cw<pf<leader-und'  :   self.__tab_leader_func,
-        'cw<pf<tab-bar-st'  :   self.__tab_bar_func,
+        'cw<pf<tab-stop__'  : self.__tab_stop_func,
+        'cw<pf<tab-center'  : self.__tab_type_func,
+        'cw<pf<tab-right_'  : self.__tab_type_func,
+        'cw<pf<tab-dec___'  : self.__tab_type_func,
+        'cw<pf<leader-dot'  : self.__tab_leader_func,
+        'cw<pf<leader-hyp'  : self.__tab_leader_func,
+        'cw<pf<leader-und'  : self.__tab_leader_func,
+        'cw<pf<tab-bar-st'  : self.__tab_bar_func,
         }
         self.__tab_type_dict = {
-        'cw<pf<tab-center'  :   'center',
-        'cw<pf<tab-right_'  :   'right',
-        'cw<pf<tab-dec___'  :   'decimal',
-        'cw<pf<leader-dot'  :   'leader-dot',
-        'cw<pf<leader-hyp'  :   'leader-hyphen',
-        'cw<pf<leader-und'  :   'leader-underline',
+        'cw<pf<tab-center'  : 'center',
+        'cw<pf<tab-right_'  : 'right',
+        'cw<pf<tab-dec___'  : 'decimal',
+        'cw<pf<leader-dot'  : 'leader-dot',
+        'cw<pf<leader-hyp'  : 'leader-hyphen',
+        'cw<pf<leader-und'  : 'leader-underline',
         }
         self.__border_obj = border_parse.BorderParse()
         self.__style_num_strings = []
@@ -267,54 +267,54 @@ if another paragraph_def is found, the state changes to collect_tokens.
         self.__end_marker =    'mi<mk<pard-end__\n'  # outside para tags
         self.__text_string = ''
         self.__state_dict = {
-        'before_1st_para_def'   : self.__before_1st_para_def_func,
-        'collect_tokens'        : self.__collect_tokens_func,
-        'after_para_def'        : self.__after_para_def_func,
-        'in_paragraphs'         : self.__in_paragraphs_func,
-        'after_para_end'        : self.__after_para_end_func,
+        'before_1st_para_def': self.__before_1st_para_def_func,
+        'collect_tokens'     : self.__collect_tokens_func,
+        'after_para_def'     : self.__after_para_def_func,
+        'in_paragraphs'      : self.__in_paragraphs_func,
+        'after_para_end'     : self.__after_para_end_func,
         }
         self.__collect_tokens_dict = {
-        'mi<mk<para-start'  :  self.__end_para_def_func,
-        'cw<pf<par-def___'  :  self.__para_def_in_para_def_func,
-        'cw<tb<cell______'  : self.__empty_table_element_func,
-        'cw<tb<row_______'  : self.__empty_table_element_func,
+        'mi<mk<para-start': self.__end_para_def_func,
+        'cw<pf<par-def___': self.__para_def_in_para_def_func,
+        'cw<tb<cell______': self.__empty_table_element_func,
+        'cw<tb<row_______': self.__empty_table_element_func,
         }
         self.__after_para_def_dict = {
-        'mi<mk<para-start'  :   self.__start_para_after_def_func,
-        'cw<pf<par-def___'  :   self.__found_para_def_func,
-        'cw<tb<cell______'  :   self.__empty_table_element_func,
-        'cw<tb<row_______'  :   self.__empty_table_element_func,
+        'mi<mk<para-start': self.__start_para_after_def_func,
+        'cw<pf<par-def___': self.__found_para_def_func,
+        'cw<tb<cell______': self.__empty_table_element_func,
+        'cw<tb<row_______': self.__empty_table_element_func,
         }
         self.__in_paragraphs_dict = {
-        'mi<mk<para-end__'      : self.__found_para_end_func,
+        'mi<mk<para-end__': self.__found_para_end_func,
         }
         self.__after_para_end_dict = {
-        'mi<mk<para-start'      : self.__continue_block_func,
-        'mi<mk<para-end__'      : self.__continue_block_func,
-        'cw<pf<par-def___'      : self.__new_para_def_func,
-        'mi<mk<body-close'      : self.__stop_block_func,
-        'mi<mk<par-in-fld'      : self.__stop_block_func,
-        'cw<tb<cell______'      : self.__stop_block_func,
-        'cw<tb<row-def___'      : self.__stop_block_func,
-        'cw<tb<row_______'      : self.__stop_block_func,
-        'mi<mk<sect-close'      : self.__stop_block_func,
-        'mi<mk<sect-start'      : self.__stop_block_func,
-        'mi<mk<header-beg'      : self.__stop_block_func,
-        'mi<mk<header-end'      : self.__stop_block_func,
-        'mi<mk<head___clo'      : self.__stop_block_func,
-        'mi<mk<fldbk-end_'      : self.__stop_block_func,
-        'mi<mk<lst-txbeg_'      : self.__stop_block_func,
+        'mi<mk<para-start': self.__continue_block_func,
+        'mi<mk<para-end__': self.__continue_block_func,
+        'cw<pf<par-def___': self.__new_para_def_func,
+        'mi<mk<body-close': self.__stop_block_func,
+        'mi<mk<par-in-fld': self.__stop_block_func,
+        'cw<tb<cell______': self.__stop_block_func,
+        'cw<tb<row-def___': self.__stop_block_func,
+        'cw<tb<row_______': self.__stop_block_func,
+        'mi<mk<sect-close': self.__stop_block_func,
+        'mi<mk<sect-start': self.__stop_block_func,
+        'mi<mk<header-beg': self.__stop_block_func,
+        'mi<mk<header-end': self.__stop_block_func,
+        'mi<mk<head___clo': self.__stop_block_func,
+        'mi<mk<fldbk-end_': self.__stop_block_func,
+        'mi<mk<lst-txbeg_': self.__stop_block_func,
         }
 
     def __before_1st_para_def_func(self, line):
-        """
+        '''
         Required:
             line -- line to parse
         Returns:
             nothing
         Logic:
             Look for the beginning of a paragraph definition
-        """
+        '''
         # cw<pf<par-def___<nu<true
         if self.__token_info == 'cw<pf<par-def___':
             self.__found_para_def_func()
@@ -328,7 +328,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
         self.__reset_dict()
 
     def __collect_tokens_func(self, line):
-        """
+        '''
         Required:
             line --line to parse
         Returns:
@@ -341,7 +341,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
             change the state to after_para_def.
             Otherwise, check if the token is a paragraph definition word; if
             so, add it to the attributes and values dictionary.
-        """
+        '''
         action = self.__collect_tokens_dict.get(self.__token_info)
         if action:
             action(line)
@@ -360,15 +360,15 @@ if another paragraph_def is found, the state changes to collect_tokens.
                     self.__att_val_dict[token] = line[20:-1]
 
     def __tab_stop_func(self, line):
-        """
-        """
+        '''
+        '''
         self.__att_val_dict['tabs'] += '%s:' % self.__tab_type
         self.__att_val_dict['tabs'] += '%s;' % line[20:-1]
         self.__tab_type = 'left'
 
     def __tab_type_func(self, line):
-        """
-        """
+        '''
+        '''
         type = self.__tab_type_dict.get(self.__token_info)
         if type is not None:
             self.__tab_type = type
@@ -378,8 +378,8 @@ if another paragraph_def is found, the state changes to collect_tokens.
                 raise self.__bug_handler(msg)
 
     def __tab_leader_func(self, line):
-        """
-        """
+        '''
+        '''
         leader = self.__tab_type_dict.get(self.__token_info)
         if leader is not None:
             self.__att_val_dict['tabs'] += '%s^' % leader
@@ -389,14 +389,14 @@ if another paragraph_def is found, the state changes to collect_tokens.
                 raise self.__bug_handler(msg)
 
     def __tab_bar_func(self, line):
-        """
-        """
+        '''
+        '''
         # self.__att_val_dict['tabs-bar'] += '%s:' % line[20:-1]
         self.__att_val_dict['tabs'] += 'bar:%s;' % (line[20:-1])
         self.__tab_type = 'left'
 
     def __parse_border(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -404,12 +404,12 @@ if another paragraph_def is found, the state changes to collect_tokens.
         Logic:
             Uses the border_parse module to return a dictionary of attribute
             value pairs for a border line.
-        """
+        '''
         border_dict = self.__border_obj.parse_border(line)
         self.__att_val_dict.update(border_dict)
 
     def __para_def_in_para_def_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -417,13 +417,13 @@ if another paragraph_def is found, the state changes to collect_tokens.
         Logic:
             I have found a \\pard while I am collecting tokens. I want to reset
             the dectionary and do nothing else.
-        """
+        '''
         # Change this
         self.__state = 'collect_tokens'
         self.__reset_dict()
 
     def __end_para_def_func(self, line):
-        """
+        '''
         Requires:
             Nothing
         Returns:
@@ -433,13 +433,13 @@ if another paragraph_def is found, the state changes to collect_tokens.
             of a paragraph. I want to output the definition tag; output the line
             itself (telling me of the beginning of a paragraph);change the
             state to 'in_paragraphs';
-        """
+        '''
         self.__write_para_def_beg()
         self.__write_obj.write(line)
         self.__state = 'in_paragraphs'
 
     def __start_para_after_def_func(self, line):
-        """
+        '''
         Requires:
             Nothing
         Returns:
@@ -450,13 +450,13 @@ if another paragraph_def is found, the state changes to collect_tokens.
             itself (telling me of the beginning of a paragraph);change the
             state to 'in_paragraphs'.
             (I now realize that this is absolutely identical to the function above!)
-        """
+        '''
         self.__write_para_def_beg()
         self.__write_obj.write(line)
         self.__state = 'in_paragraphs'
 
     def __after_para_def_func(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -464,7 +464,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
         Logic:
             Check if the token info is the start of a paragraph. If so, call
             on the function found in the value of the dictionary.
-        """
+        '''
         action = self.__after_para_def_dict.get(self.__token_info)
         if self.__token_info == 'cw<pf<par-def___':
             self.__found_para_def_func()
@@ -474,22 +474,22 @@ if another paragraph_def is found, the state changes to collect_tokens.
             self.__write_obj.write(line)
 
     def __in_paragraphs_func(self, line):
-        """
+        '''
         Requires:
             line --current line
         Returns:
             nothing
         Logic:
             Look for the end of a paragraph, the start of a cell or row.
-        """
+        '''
         action = self.__in_paragraphs_dict.get(self.__token_info)
         if action:
             action(line)
         else:
             self.__write_obj.write(line)
 
-    def __found_para_end_func(self,line):
-        """
+    def __found_para_end_func(self, line):
+        '''
         Requires:
             line -- line to print out
         Returns:
@@ -498,12 +498,12 @@ if another paragraph_def is found, the state changes to collect_tokens.
             State is in paragraphs. You have found the end of a paragraph. You
             need to print out the line and change the state to after
             paragraphs.
-        """
+        '''
         self.__state = 'after_para_end'
         self.__write_obj.write(line)
 
     def __after_para_end_func(self, line):
-        """
+        '''
         Requires:
             line -- line to output
         Returns:
@@ -520,14 +520,14 @@ if another paragraph_def is found, the state changes to collect_tokens.
             If you find the beginning of a paragraph, then you don't need to
             write out the paragraph definition. Write out the string, and
             change the state to in paragraphs.
-        """
+        '''
         self.__text_string += line
         action = self.__after_para_end_dict.get(self.__token_info)
         if action:
             action(line)
 
     def __continue_block_func(self, line):
-        """
+        '''
         Requires:
             line --line to print out
         Returns:
@@ -537,14 +537,14 @@ if another paragraph_def is found, the state changes to collect_tokens.
             start of a paragraph, so you don't need to print out the paragraph
             definition. Print out the string, the line, and change the state
             to in paragraphs.
-        """
+        '''
         self.__state = 'in_paragraphs'
         self.__write_obj.write(self.__text_string)
         self.__text_string = ''
     # found a new paragraph definition after an end of a paragraph
 
     def __new_para_def_func(self, line):
-        """
+        '''
         Requires:
             line -- line to output
         Returns:
@@ -554,13 +554,13 @@ if another paragraph_def is found, the state changes to collect_tokens.
             paragraph. Output the end of the old paragraph definition. Output
             the text string. Output the line. Change the state to collect
             tokens. (And don't forget to set the text string to ''!)
-        """
+        '''
         self.__write_para_def_end_func()
         self.__found_para_def_func()
     # after a paragraph and found reason to stop this block
 
     def __stop_block_func(self, line):
-        """
+        '''
         Requires:
             line --(shouldn't be here?)
         Returns:
@@ -570,12 +570,12 @@ if another paragraph_def is found, the state changes to collect_tokens.
             than paragraph-definition. You want to write the end tag of the
             old definition and reset the text string (handled by other
             methods).
-        """
+        '''
         self.__write_para_def_end_func()
         self.__state = 'after_para_def'
 
     def __write_para_def_end_func(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -584,7 +584,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
             Print out the end of the pargraph definition tag, and the markers
             that let me know when I have reached this tag. (These markers are
             used for later parsing.)
-        """
+        '''
         self.__write_obj.write(self.__end2_marker)
         self.__write_obj.write('mi<tg<close_____<paragraph-definition\n')
         self.__write_obj.write(self.__end_marker)
@@ -597,14 +597,14 @@ if another paragraph_def is found, the state changes to collect_tokens.
             self.__write_obj.write('mi<mk<caps-end__\n')
 
     def __get_num_of_style(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
             nothing
         Logic:
             Get a unique value for each style.
-        """
+        '''
         my_string = ''
         new_style = 0
         # when determining uniqueness for a style, ingorne these values, since
@@ -644,7 +644,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
         self.__body_style_strings.append(style_string)
 
     def __write_para_def_beg(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -653,7 +653,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
             Print out the beginning of the pargraph definition tag, and the markers
             that let me know when I have reached this tag. (These markers are
             used for later parsing.)
-        """
+        '''
         self.__get_num_of_style()
         table = self.__att_val_dict.get('in-table')
         if table:
@@ -664,7 +664,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
         left_indent = self.__att_val_dict.get('left-indent')
         if left_indent:
             self.__write_obj.write('mi<mk<left_inden<%s\n' % left_indent)
-        is_list =  self.__att_val_dict.get('list-id')
+        is_list = self.__att_val_dict.get('list-id')
         if is_list:
             self.__write_obj.write('mi<mk<list-id___<%s\n' % is_list)
         else:
@@ -674,15 +674,12 @@ if another paragraph_def is found, the state changes to collect_tokens.
         self.__write_obj.write('mi<tg<open-att__<paragraph-definition')
         self.__write_obj.write('<name>%s' % self.__att_val_dict['name'])
         self.__write_obj.write('<style-number>%s' % self.__att_val_dict['style-num'])
-        tabs_list = ['tabs-left', 'tabs-right', 'tabs-decimal', 'tabs-center',
-            'tabs-bar', 'tabs']
-        """
-        for tab_item in tabs_list:
-            if self.__att_val_dict[tab_item] != '':
-                the_value = self.__att_val_dict[tab_item]
-                the_value = the_value[:-1]
-                self.__write_obj.write('<%s>%s' % (tab_item, the_value))
-        """
+        tabs_list = ['tabs-left', 'tabs-right', 'tabs-decimal', 'tabs-center', 'tabs-bar', 'tabs']
+        # for tab_item in tabs_list:
+        #     if self.__att_val_dict[tab_item] != '':
+        #         the_value = self.__att_val_dict[tab_item]
+        #         the_value = the_value[:-1]
+        #         self.__write_obj.write('<%s>%s' % (tab_item, the_value))
         if self.__att_val_dict['tabs'] != '':
             the_value = self.__att_val_dict['tabs']
             # the_value = the_value[:-1]
@@ -707,7 +704,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
         self.__state = 'after_para_def'
 
     def __reset_dict(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -715,7 +712,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
         Logic:
             The dictionary containing values and attributes must be reset each
             time a new paragraphs definition is found.
-        """
+        '''
         self.__att_val_dict.clear()
         self.__att_val_dict['name'] = 'Normal'
         self.__att_val_dict['font-style'] = self.__default_font
@@ -728,7 +725,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
         self.__att_val_dict['tabs'] = ''
 
     def make_paragraph_def(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -736,7 +733,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
         Logic:
             Read one line in at a time. Determine what action to take based on
             the state.
-        """
+        '''
         self.__initiate_values()
         read_obj = open_for_read(self.__file)
         self.__write_obj = open_for_write(self.__write_to)
@@ -754,7 +751,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
         self.__write_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "paragraphs_def.data")
+            copy_obj.copy_file(self.__write_to, 'paragraphs_def.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
         return self.__body_style_strings
diff --git a/src/calibre/ebooks/rtf2xml/paragraphs.py b/src/calibre/ebooks/rtf2xml/paragraphs.py
index a7786c4ea1..1a4477c54e 100644
--- a/src/calibre/ebooks/rtf2xml/paragraphs.py
+++ b/src/calibre/ebooks/rtf2xml/paragraphs.py
@@ -20,7 +20,7 @@ from . import open_for_read, open_for_write
 
 
 class Paragraphs:
-    """
+    '''
     =================
     Purpose
     =================
@@ -41,7 +41,7 @@ class Paragraphs:
     (\\par) marks the end of a paragraph. So does the end of a footnote or heading;
     a paragraph definition; the end of a field-block; and the beginning of a
     section. (How about the end of a section or the end of a field-block?)
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -50,7 +50,7 @@ class Paragraphs:
             write_empty_para=1,
             run_level=1,
             ):
-        """
+        '''
         Required:
             'file'--file to parse
         Optional:
@@ -59,7 +59,7 @@ class Paragraphs:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -68,47 +68,47 @@ class Paragraphs:
         self.__write_to = better_mktemp()
 
     def __initiate_values(self):
-        """
+        '''
         Initiate all values.
-        """
+        '''
         self.__state = 'before_body'
         self.__start_marker =  'mi<mk<para-start\n'  # outside para tags
         self.__start2_marker = 'mi<mk<par-start_\n'  # inside para tags
         self.__end2_marker =   'mi<mk<par-end___\n'  # inside para tags
         self.__end_marker =    'mi<mk<para-end__\n'  # outside para tags
         self.__state_dict = {
-        'before_body'       : self.__before_body_func,
-        'not_paragraph'     : self.__not_paragraph_func,
-        'paragraph'         : self.__paragraph_func,
+        'before_body'   : self.__before_body_func,
+        'not_paragraph' : self.__not_paragraph_func,
+        'paragraph'     : self.__paragraph_func,
         }
         self.__paragraph_dict = {
-        'cw<pf<par-end___'      : self.__close_para_func,   # end of paragraph
-        'mi<mk<headi_-end'      : self.__close_para_func,   # end of header or footer
-        # 'cw<pf<par-def___'      : self.__close_para_func,   # paragraph definition
-        # 'mi<mk<fld-bk-end'      : self.__close_para_func,   # end of field-block
-        'mi<mk<fldbk-end_'      : self.__close_para_func,   # end of field-block
-        'mi<mk<body-close'      : self.__close_para_func,   # end of body
-        'mi<mk<sect-close'      : self.__close_para_func,   # end of body
-        'mi<mk<sect-start'      : self.__close_para_func,   # start of section
-        'mi<mk<foot___clo'      : self.__close_para_func,   # end of footnote
-        'cw<tb<cell______'      : self.__close_para_func,   # end of cell
-        'mi<mk<par-in-fld'      : self.__close_para_func,   # start of block field
-        'cw<pf<par-def___'      : self.__bogus_para__def_func,   # paragraph definition
+        'cw<pf<par-end___'  : self.__close_para_func,   # end of paragraph
+        'mi<mk<headi_-end'  : self.__close_para_func,   # end of header or footer
+        # 'cw<pf<par-def___'  : self.__close_para_func,   # paragraph definition
+        # 'mi<mk<fld-bk-end'  : self.__close_para_func,   # end of field-block
+        'mi<mk<fldbk-end_'  : self.__close_para_func,   # end of field-block
+        'mi<mk<body-close'  : self.__close_para_func,   # end of body
+        'mi<mk<sect-close'  : self.__close_para_func,   # end of body
+        'mi<mk<sect-start'  : self.__close_para_func,   # start of section
+        'mi<mk<foot___clo'  : self.__close_para_func,   # end of footnote
+        'cw<tb<cell______'  : self.__close_para_func,   # end of cell
+        'mi<mk<par-in-fld'  : self.__close_para_func,   # start of block field
+        'cw<pf<par-def___'  : self.__bogus_para__def_func,   # paragraph definition
         }
         self.__not_paragraph_dict = {
-        'tx<nu<__________'      : self.__start_para_func,
-        'tx<hx<__________'      : self.__start_para_func,
-        'tx<ut<__________'      : self.__start_para_func,
-        'tx<mc<__________'      : self.__start_para_func,
-        'mi<mk<inline-fld'      : self.__start_para_func,
-        'mi<mk<para-beg__'      : self.__start_para_func,
-        'cw<pf<par-end___'      : self.__empty_para_func,
-        'mi<mk<pict-start'      : self.__start_para_func,
-        'cw<pf<page-break'      : self.__empty_pgbk_func,    # page break
+        'tx<nu<__________'  : self.__start_para_func,
+        'tx<hx<__________'  : self.__start_para_func,
+        'tx<ut<__________'  : self.__start_para_func,
+        'tx<mc<__________'  : self.__start_para_func,
+        'mi<mk<inline-fld'  : self.__start_para_func,
+        'mi<mk<para-beg__'  : self.__start_para_func,
+        'cw<pf<par-end___'  : self.__empty_para_func,
+        'mi<mk<pict-start'  : self.__start_para_func,
+        'cw<pf<page-break'  : self.__empty_pgbk_func,    # page break
         }
 
     def __before_body_func(self, line):
-        """
+        '''
         Required:
             line -- line to parse
         Returns:
@@ -116,13 +116,13 @@ class Paragraphs:
         Logic:
             This function handles all the lines before the start of the body.
             Once the body starts, the state is switched to 'not_paragraph'
-        """
+        '''
         if self.__token_info == 'mi<mk<body-open_':
             self.__state = 'not_paragraph'
         self.__write_obj.write(line)
 
     def __not_paragraph_func(self, line):
-        """
+        '''
         Required:
             line --line to parse
         Returns:
@@ -131,14 +131,14 @@ class Paragraphs:
             This function handles all lines that are outside of the paragraph.
             It looks for clues that start a paragraph, and when found,
             switches states and writes the start tags.
-        """
+        '''
         action = self.__not_paragraph_dict.get(self.__token_info)
         if action:
             action(line)
         self.__write_obj.write(line)
 
     def __paragraph_func(self, line):
-        """
+        '''
         Required:
             line --line to parse
         Returns:
@@ -148,7 +148,7 @@ class Paragraphs:
             looks for clues to the end of the paragraph. When a clue is found,
             it calls on another method to write the end of the tag and change
             the state.
-        """
+        '''
         action = self.__paragraph_dict.get(self.__token_info)
         if action:
             action(line)
@@ -156,7 +156,7 @@ class Paragraphs:
             self.__write_obj.write(line)
 
     def __start_para_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -164,7 +164,7 @@ class Paragraphs:
         Logic:
             This function writes the beginning tags for a paragraph and
             changes the state to paragraph.
-        """
+        '''
         self.__write_obj.write(self.__start_marker)  # marker for later parsing
         self.__write_obj.write(
         'mi<tg<open______<para\n'
@@ -173,7 +173,7 @@ class Paragraphs:
         self.__state = 'paragraph'
 
     def __empty_para_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -181,7 +181,7 @@ class Paragraphs:
         Logic:
             This function writes the empty tags for a paragraph.
             It does not do anything if self.__write_empty_para is 0.
-        """
+        '''
         if self.__write_empty_para:
             self.__write_obj.write(self.__start_marker)  # marker for later parsing
             self.__write_obj.write(
@@ -190,20 +190,20 @@ class Paragraphs:
             self.__write_obj.write(self.__end_marker)   # marker for later parsing
 
     def __empty_pgbk_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
             nothing
         Logic:
             This function writes the empty tags for a page break.
-        """
+        '''
         self.__write_obj.write(
         'mi<tg<empty_____<page-break\n'
         )
 
     def __close_para_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -211,7 +211,7 @@ class Paragraphs:
         Logic:
             This function writes the end tags for a paragraph and
             changes the state to not_paragraph.
-        """
+        '''
         self.__write_obj.write(self.__end2_marker)  # marker for later parser
         self.__write_obj.write(
         'mi<tg<close_____<para\n'
@@ -221,18 +221,18 @@ class Paragraphs:
         self.__state = 'not_paragraph'
 
     def __bogus_para__def_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
             nothing
         Logic:
             if a \\pard occurs in a paragraph, I want to ignore it. (I believe)
-        """
+        '''
         self.__write_obj.write('mi<mk<bogus-pard\n')
 
     def make_paragraphs(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -243,7 +243,7 @@ class Paragraphs:
             beginning of the body.
             When the body is found, change the state to 'not_paragraph'. The
             only other state is 'paragraph'.
-        """
+        '''
         self.__initiate_values()
         with open_for_read(self.__file) as read_obj:
             with open_for_write(self.__write_to) as self.__write_obj:
@@ -259,6 +259,6 @@ class Paragraphs:
                     action(line)
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "paragraphs.data")
+            copy_obj.copy_file(self.__write_to, 'paragraphs.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/pict.py b/src/calibre/ebooks/rtf2xml/pict.py
index 46c8f23a06..d2c5de44e8 100644
--- a/src/calibre/ebooks/rtf2xml/pict.py
+++ b/src/calibre/ebooks/rtf2xml/pict.py
@@ -20,7 +20,7 @@ from . import open_for_read, open_for_write
 
 
 class Pict:
-    """Process graphic information"""
+    '''Process graphic information'''
     def __init__(self,
             in_file,
             bug_handler,
@@ -46,23 +46,23 @@ class Pict:
 
     def __initiate_pict_dict(self):
         self.__pict_dict = {
-        'ob<nu<open-brack'    :   self.__open_br_func,
-        'cb<nu<clos-brack'    :   self.__close_br_func,
-        'tx<nu<__________'    :   self.__text_func,
+        'ob<nu<open-brack'  :   self.__open_br_func,
+        'cb<nu<clos-brack'  :   self.__close_br_func,
+        'tx<nu<__________'  :   self.__text_func,
         }
 
     def __open_br_func(self, line):
-        return "{\n"
+        return '{\n'
 
     def __close_br_func(self, line):
-        return "}\n"
+        return '}\n'
 
     def __text_func(self, line):
         # tx<nu<__________<true text
         return line[17:]
 
     def __make_dir(self):
-        """ Make a directory to put the image data in"""
+        ''' Make a directory to put the image data in'''
         base_name = os.path.basename(getattr(self.__orig_file, 'name',
             self.__orig_file))
         base_name = os.path.splitext(base_name)[0]
@@ -71,13 +71,13 @@ class Pict:
                 self.__out_file))
         else:
             dir_name = os.path.dirname(self.__orig_file)
-        self.__dir_name = base_name + "_rtf_pict_dir/"
+        self.__dir_name = base_name + '_rtf_pict_dir/'
         self.__dir_name = os.path.join(dir_name, self.__dir_name)
         if not os.path.isdir(self.__dir_name):
             try:
                 os.mkdir(self.__dir_name)
             except OSError as msg:
-                msg = f"{str(msg)}Couldn't make directory '{self.__dir_name}':\n"
+                msg = f"{msg}Couldn't make directory '{self.__dir_name}':\n"
                 raise self.__bug_handler
         else:
             if self.__run_level > 1:
@@ -93,15 +93,15 @@ class Pict:
                 sys.stderr.write('Files removed.\n')
 
     def __create_pict_file(self):
-        """Create a file for all the pict data to be written to.
-        """
+        '''Create a file for all the pict data to be written to.
+        '''
         self.__pict_file = os.path.join(self.__dir_name, 'picts.rtf')
         self.__write_pic_obj = open_for_write(self.__pict_file, append=True)
 
     def __in_pict_func(self, line):
         if self.__cb_count == self.__pict_br_count:
             self.__in_pict = False
-            self.__write_pic_obj.write("}\n")
+            self.__write_pic_obj.write('}\n')
             return True
         else:
             action = self.__pict_dict.get(self.__token_info)
@@ -110,16 +110,14 @@ class Pict:
             return False
 
     def __default(self, line, write_obj):
-        """Determine if each token marks the beginning of pict data.
+        '''Determine if each token marks the beginning of pict data.
         If it does, create a new file to write data to (if that file
         has not already been created.) Set the self.__in_pict flag to true.
         If the line does not contain pict data, return 1
-        """
-        """
-        $pict_count++;
-        $pict_count =  sprintf("%03d", $pict_count);
-        print OUTPUT "dv<xx<em<nu<pict<at<num>$pict_count\n";
-        """
+        '''
+        # $pict_count++;
+        # $pict_count =  sprintf("%03d", $pict_count);
+        # print OUTPUT "dv<xx<em<nu<pict<at<num>$pict_count\n";
         if self.__token_info == 'cw<gr<picture___':
             self.__pict_count += 1
             # write_obj.write("mi<tg<em<at<pict<num>%03d\n" % self.__pict_count)
@@ -133,16 +131,16 @@ class Pict:
             self.__in_pict = 1
             self.__pict_br_count = self.__ob_count
             self.__cb_count = 0
-            self.__write_pic_obj.write("{\\pict\n")
+            self.__write_pic_obj.write('{\\pict\n')
             return False
         return True
 
     def __print_rtf_header(self):
-        """Print to pict file the necessary RTF data for the file to be
+        '''Print to pict file the necessary RTF data for the file to be
         recognized as an RTF file.
-        """
-        self.__write_pic_obj.write("{\\rtf1 \n{\\fonttbl\\f0\\null;} \n")
-        self.__write_pic_obj.write("{\\colortbl\\red255\\green255\\blue255;} \n\\pard \n")
+        '''
+        self.__write_pic_obj.write('{\\rtf1 \n{\\fonttbl\\f0\\null;} \n')
+        self.__write_pic_obj.write('{\\colortbl\\red255\\green255\\blue255;} \n\\pard \n')
 
     def process_pict(self):
         self.__make_dir()
@@ -156,20 +154,20 @@ class Pict:
                         self.__cb_count = line[-5:-1]
                     if not self.__in_pict:
                         to_print = self.__default(line, write_obj)
-                        if to_print :
+                        if to_print:
                             write_obj.write(line)
                     else:
                         to_print = self.__in_pict_func(line)
-                        if to_print :
+                        if to_print:
                             write_obj.write(line)
                 if self.__already_found_pict:
-                    self.__write_pic_obj.write("}\n")
+                    self.__write_pic_obj.write('}\n')
                     self.__write_pic_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "pict.data")
+            copy_obj.copy_file(self.__write_to, 'pict.data')
             try:
-                copy_obj.copy_file(self.__pict_file, "pict.rtf")
+                copy_obj.copy_file(self.__pict_file, 'pict.rtf')
             except:
                 pass
         copy_obj.rename(self.__write_to, self.__file)
diff --git a/src/calibre/ebooks/rtf2xml/preamble_div.py b/src/calibre/ebooks/rtf2xml/preamble_div.py
index 92c5ddb01f..87e25a16b7 100644
--- a/src/calibre/ebooks/rtf2xml/preamble_div.py
+++ b/src/calibre/ebooks/rtf2xml/preamble_div.py
@@ -20,9 +20,9 @@ from . import open_for_read, open_for_write
 
 
 class PreambleDiv:
-    """
+    '''
     Break the preamble into divisions.
-    """
+    '''
 
     def __init__(self, in_file,
             bug_handler,
@@ -30,7 +30,7 @@ class PreambleDiv:
             no_namespace=None,
             run_level=1,
             ):
-        """
+        '''
         Required:
             'file'
         Optional:
@@ -39,7 +39,7 @@ class PreambleDiv:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -48,9 +48,9 @@ class PreambleDiv:
         self.__run_level = run_level
 
     def __initiate_values(self):
-        """
+        '''
         Set values, including those for the dictionary.
-        """
+        '''
         self.__all_lists = {}
         self.__page = {
         'margin-top'    : 72,
@@ -70,51 +70,51 @@ class PreambleDiv:
         self.__revision_table_final = ''
         self.__doc_info_table_final = ''
         self.__state_dict = {
-        'default'           :   self.__default_func,
-        'rtf_header'        :   self.__rtf_head_func,
-        'preamble'          :   self.__preamble_func,
-        'font_table'        :   self.__font_table_func,
-        'color_table'       :   self.__color_table_func,
-        'style_sheet'       :   self.__style_sheet_func,
-        'list_table'        :   self.__list_table_func,
-        'override_table'    :   self.__override_table_func,
-        'revision_table'    :   self.__revision_table_func,
-        'doc_info'          :   self.__doc_info_func,
-        'body'              :   self.__body_func,
-        'ignore'            :   self.__ignore_func,
-        'cw<ri<rtf_______'  :   self.__found_rtf_head_func,
-        'cw<pf<par-def___'  :   self.__para_def_func,
-        'tx<nu<__________'  :   self.__text_func,
-        'cw<tb<row-def___'  :   self.__row_def_func,
-        'cw<sc<section___'  :   self.__new_section_func,
-        'cw<sc<sect-defin'  :   self.__new_section_func,
-        'cw<it<font-table'  :   self.__found_font_table_func,
-        'cw<it<colr-table'  :   self.__found_color_table_func,
-        'cw<ss<style-shet'  :   self.__found_style_sheet_func,
-        'cw<it<listtable_'  :   self.__found_list_table_func,
-        'cw<it<lovr-table'  :   self.__found_override_table_func,
-        'cw<it<revi-table'  :   self.__found_revision_table_func,
-        'cw<di<doc-info__'  :   self.__found_doc_info_func,
-        'cw<pa<margin-lef'  :   self.__margin_func,
-        'cw<pa<margin-rig'  :   self.__margin_func,
-        'cw<pa<margin-top'  :   self.__margin_func,
-        'cw<pa<margin-bot'  :   self.__margin_func,
-        'cw<pa<gutter____'  :   self.__margin_func,
-        'cw<pa<paper-widt'  :   self.__margin_func,
-        'cw<pa<paper-hght'  :   self.__margin_func,
-        # 'cw<tb<columns___'  :   self.__section_func,
+        'default'           : self.__default_func,
+        'rtf_header'        : self.__rtf_head_func,
+        'preamble'          : self.__preamble_func,
+        'font_table'        : self.__font_table_func,
+        'color_table'       : self.__color_table_func,
+        'style_sheet'       : self.__style_sheet_func,
+        'list_table'        : self.__list_table_func,
+        'override_table'    : self.__override_table_func,
+        'revision_table'    : self.__revision_table_func,
+        'doc_info'          : self.__doc_info_func,
+        'body'              : self.__body_func,
+        'ignore'            : self.__ignore_func,
+        'cw<ri<rtf_______'  : self.__found_rtf_head_func,
+        'cw<pf<par-def___'  : self.__para_def_func,
+        'tx<nu<__________'  : self.__text_func,
+        'cw<tb<row-def___'  : self.__row_def_func,
+        'cw<sc<section___'  : self.__new_section_func,
+        'cw<sc<sect-defin'  : self.__new_section_func,
+        'cw<it<font-table'  : self.__found_font_table_func,
+        'cw<it<colr-table'  : self.__found_color_table_func,
+        'cw<ss<style-shet'  : self.__found_style_sheet_func,
+        'cw<it<listtable_'  : self.__found_list_table_func,
+        'cw<it<lovr-table'  : self.__found_override_table_func,
+        'cw<it<revi-table'  : self.__found_revision_table_func,
+        'cw<di<doc-info__'  : self.__found_doc_info_func,
+        'cw<pa<margin-lef'  : self.__margin_func,
+        'cw<pa<margin-rig'  : self.__margin_func,
+        'cw<pa<margin-top'  : self.__margin_func,
+        'cw<pa<margin-bot'  : self.__margin_func,
+        'cw<pa<gutter____'  : self.__margin_func,
+        'cw<pa<paper-widt'  : self.__margin_func,
+        'cw<pa<paper-hght'  : self.__margin_func,
+        # 'cw<tb<columns___'  : self.__section_func,
         }
         self.__margin_dict = {
-        'margin-lef'        :   'margin-left',
-        'margin-rig'        :   'margin-right',
-        'margin-top'        :   'margin-top',
-        'margin-bot'        :   'margin-bottom',
-        'gutter____'        :   'gutter',
-        'paper-widt'        :   'paper-width',
-        'paper-hght'        :   'paper-height',
+        'margin-lef': 'margin-left',
+        'margin-rig': 'margin-right',
+        'margin-top': 'margin-top',
+        'margin-bot': 'margin-bottom',
+        'gutter____': 'gutter',
+        'paper-widt': 'paper-width',
+        'paper-hght': 'paper-height',
         }
         self.__translate_sec = {
-        'columns___'        :   'column',
+        'columns___': 'column',
         }
         self.__section = {}
         # self.__write_obj.write(self.__color_table_final)
@@ -130,10 +130,10 @@ class PreambleDiv:
                 )
 
     def __ignore_func(self, line):
-        """
+        '''
         Ignore all  lines, until the bracket is found that marks the end of
         the group.
-        """
+        '''
         if self.__ignore_num == self.__cb_count:
             self.__state = self.__previous_state
 
@@ -163,22 +163,22 @@ class PreambleDiv:
             self.__rtf_final = self.__rtf_final + line
 
     def __make_default_font_table(self):
-        """
+        '''
         If not font table is found, need to write one out.
-        """
+        '''
         self.__font_table_final = 'mi<tg<open______<font-table\n'
         self.__font_table_final += 'mi<mk<fonttb-beg\n'
         self.__font_table_final += 'mi<mk<fontit-beg\n'
         self.__font_table_final += 'cw<ci<font-style<nu<0\n'
         self.__font_table_final += 'tx<nu<__________<Times;\n'
         self.__font_table_final += 'mi<mk<fontit-end\n'
-        self.__font_table_final +=  'mi<mk<fonttb-end\n'
+        self.__font_table_final += 'mi<mk<fonttb-end\n'
         self.__font_table_final += 'mi<tg<close_____<font-table\n'
 
     def __make_default_color_table(self):
-        """
+        '''
         If no color table is found, write a string for a default one
-        """
+        '''
         self.__color_table_final = 'mi<tg<open______<color-table\n'
         self.__color_table_final += 'mi<mk<clrtbl-beg\n'
         self.__color_table_final += 'cw<ci<red_______<nu<00\n'
@@ -188,19 +188,17 @@ class PreambleDiv:
         self.__color_table_final += 'mi<tg<close_____<color-table\n'
 
     def __make_default_style_table(self):
-        """
+        '''
         If not font table is found, make a string for a default one
-        """
-        """
-        self.__style_sheet_final = 'mi<tg<open______<style-table\n'
-        self.__style_sheet_final +=
-        self.__style_sheet_final +=
-        self.__style_sheet_final +=
-        self.__style_sheet_final +=
-        self.__style_sheet_final +=
-        self.__style_sheet_final += 'mi<tg<close_____<style-table\n'
-        """
-        self.__style_sheet_final = """mi<tg<open______<style-table
+        '''
+        # self.__style_sheet_final = 'mi<tg<open______<style-table\n'
+        # self.__style_sheet_final +=
+        # self.__style_sheet_final +=
+        # self.__style_sheet_final +=
+        # self.__style_sheet_final +=
+        # self.__style_sheet_final +=
+        # self.__style_sheet_final += 'mi<tg<close_____<style-table\n'
+        self.__style_sheet_final = '''mi<tg<open______<style-table
 mi<mk<styles-beg
 mi<mk<stylei-beg
 cw<ci<font-style<nu<0
@@ -212,7 +210,7 @@ tx<nu<__________<Default Paragraph Font;
 mi<mk<stylei-end
 mi<mk<styles-end
 mi<tg<close_____<style-table
-"""
+'''
 
     def __found_font_table_func(self, line):
         if self.__found_font_table:
@@ -225,23 +223,20 @@ mi<tg<close_____<style-table
         self.__found_font_table = 1
 
     def __font_table_func(self, line):
-        """
+        '''
         Keep adding to the self.__individual_font string until end of group
         found. If a bracket is found, check that it is only one bracket deep.
         If it is, then set the marker for an individual font. If it is not,
         then ignore all data in this group.
 cw<ci<font-style<nu<0
-        """
+        '''
         if self.__cb_count == self.__close_group_count:
             self.__state = 'preamble'
-            self.__font_table_final = 'mi<tg<open______<font-table\n' + \
-            'mi<mk<fonttb-beg\n' + self.__font_table_final
-            self.__font_table_final += \
-            'mi<mk<fonttb-end\n' + 'mi<tg<close_____<font-table\n'
+            self.__font_table_final = 'mi<tg<open______<font-table\n' + 'mi<mk<fonttb-beg\n' + self.__font_table_final
+            self.__font_table_final += 'mi<mk<fonttb-end\n' + 'mi<tg<close_____<font-table\n'
         elif self.__token_info == 'ob<nu<open-brack':
             if int(self.__ob_count) == int(self.__close_group_count) + 1:
-                self.__font_table_final +=  \
-                'mi<mk<fontit-beg\n'
+                self.__font_table_final += 'mi<mk<fontit-beg\n'
                 self.__individual_font = 1
             else:
                 # ignore
@@ -251,24 +246,23 @@ cw<ci<font-style<nu<0
         elif self.__token_info == 'cb<nu<clos-brack':
             if int(self.__cb_count) == int(self.__close_group_count) + 1:
                 self.__individual_font = 0
-                self.__font_table_final +=  \
-                'mi<mk<fontit-end\n'
+                self.__font_table_final += 'mi<mk<fontit-end\n'
         elif self.__individual_font:
             if self.__old_font and self.__token_info == 'tx<nu<__________':
                 if ';' in line:
-                    self.__font_table_final +=  line
-                    self.__font_table_final +=   'mi<mk<fontit-end\n'
+                    self.__font_table_final += line
+                    self.__font_table_final += 'mi<mk<fontit-end\n'
                     self.__individual_font = 0
             else:
-                self.__font_table_final +=  line
+                self.__font_table_final += line
         elif self.__token_info == 'cw<ci<font-style':
             self.__old_font = 1
             self.__individual_font = 1
-            self.__font_table_final +=   'mi<mk<fontit-beg\n'
-            self.__font_table_final +=  line
+            self.__font_table_final += 'mi<mk<fontit-beg\n'
+            self.__font_table_final += line
 
     def __old_font_func(self, line):
-        """
+        '''
         Required:
             line --line to parse
         Returns:
@@ -277,14 +271,14 @@ cw<ci<font-style<nu<0
             used for older forms of RTF:
             \f3\fswiss\fcharset77 Helvetica-Oblique;\f4\fnil\fcharset77 Geneva;}
             Note how each font is not divided by a bracket
-        """
+        '''
 
     def __found_color_table_func(self, line):
-        """
+        '''
         all functions that start with __found operate the same. They set the
         state, initiate a string, determine the self.__close_group_count, and
         set self.__cb_count to zero.
-        """
+        '''
         self.__state = 'color_table'
         self.__color_table_final = ''
         self.__close_group_count = self.__ob_count
@@ -293,10 +287,8 @@ cw<ci<font-style<nu<0
     def __color_table_func(self, line):
         if int(self.__cb_count) == int(self.__close_group_count):
             self.__state = 'preamble'
-            self.__color_table_final = 'mi<tg<open______<color-table\n' + \
-            'mi<mk<clrtbl-beg\n' + self.__color_table_final
-            self.__color_table_final += \
-            'mi<mk<clrtbl-end\n' + 'mi<tg<close_____<color-table\n'
+            self.__color_table_final = 'mi<tg<open______<color-table\n' + 'mi<mk<clrtbl-beg\n' + self.__color_table_final
+            self.__color_table_final += 'mi<mk<clrtbl-end\n' + 'mi<tg<close_____<color-table\n'
         else:
             self.__color_table_final += line
 
@@ -307,25 +299,21 @@ cw<ci<font-style<nu<0
         self.__cb_count = 0
 
     def __style_sheet_func(self, line):
-        """
+        '''
         Same logic as the  font_table_func.
-        """
+        '''
         if self.__cb_count == self.__close_group_count:
             self.__state = 'preamble'
-            self.__style_sheet_final = 'mi<tg<open______<style-table\n' + \
-            'mi<mk<styles-beg\n' + self.__style_sheet_final
-            self.__style_sheet_final += \
-            'mi<mk<styles-end\n' + 'mi<tg<close_____<style-table\n'
+            self.__style_sheet_final = 'mi<tg<open______<style-table\n' + 'mi<mk<styles-beg\n' + self.__style_sheet_final
+            self.__style_sheet_final += 'mi<mk<styles-end\n' + 'mi<tg<close_____<style-table\n'
         elif self.__token_info == 'ob<nu<open-brack':
             if int(self.__ob_count) == int(self.__close_group_count) + 1:
-                self.__style_sheet_final +=  \
-                'mi<mk<stylei-beg\n'
+                self.__style_sheet_final += 'mi<mk<stylei-beg\n'
         elif self.__token_info == 'cb<nu<clos-brack':
             if int(self.__cb_count) == int(self.__close_group_count) + 1:
-                self.__style_sheet_final +=  \
-                'mi<mk<stylei-end\n'
+                self.__style_sheet_final += 'mi<mk<stylei-end\n'
         else:
-            self.__style_sheet_final +=  line
+            self.__style_sheet_final += line
 
     def __found_list_table_func(self, line):
         self.__state = 'list_table'
@@ -344,7 +332,6 @@ cw<ci<font-style<nu<0
             pass
         else:
             self.__list_table_final += line
-            pass
 
     def __found_override_table_func(self, line):
         self.__override_table_obj = override_table.OverrideTable(
@@ -376,10 +363,8 @@ cw<ci<font-style<nu<0
     def __revision_table_func(self, line):
         if int(self.__cb_count) == int(self.__close_group_count):
             self.__state = 'preamble'
-            self.__revision_table_final = 'mi<tg<open______<revision-table\n' + \
-            'mi<mk<revtbl-beg\n' + self.__revision_table_final
-            self.__revision_table_final += \
-            'mi<mk<revtbl-end\n' + 'mi<tg<close_____<revision-table\n'
+            self.__revision_table_final = 'mi<tg<open______<revision-table\n' + 'mi<mk<revtbl-beg\n' + self.__revision_table_final
+            self.__revision_table_final += 'mi<mk<revtbl-end\n' + 'mi<tg<close_____<revision-table\n'
         else:
             self.__revision_table_final += line
 
@@ -392,26 +377,22 @@ cw<ci<font-style<nu<0
     def __doc_info_func(self, line):
         if self.__cb_count == self.__close_group_count:
             self.__state = 'preamble'
-            self.__doc_info_table_final = 'mi<tg<open______<doc-information\n' + \
-            'mi<mk<doc-in-beg\n' + self.__doc_info_table_final
-            self.__doc_info_table_final += \
-            'mi<mk<doc-in-end\n' + 'mi<tg<close_____<doc-information\n'
+            self.__doc_info_table_final = 'mi<tg<open______<doc-information\n' + 'mi<mk<doc-in-beg\n' + self.__doc_info_table_final
+            self.__doc_info_table_final += 'mi<mk<doc-in-end\n' + 'mi<tg<close_____<doc-information\n'
         elif self.__token_info == 'ob<nu<open-brack':
             if int(self.__ob_count) == int(self.__close_group_count) + 1:
-                self.__doc_info_table_final +=  \
-                'mi<mk<docinf-beg\n'
+                self.__doc_info_table_final += 'mi<mk<docinf-beg\n'
         elif self.__token_info == 'cb<nu<clos-brack':
             if int(self.__cb_count) == int(self.__close_group_count) + 1:
-                self.__doc_info_table_final +=  \
-                'mi<mk<docinf-end\n'
+                self.__doc_info_table_final += 'mi<mk<docinf-end\n'
         else:
-            self.__doc_info_table_final +=  line
+            self.__doc_info_table_final += line
 
     def __margin_func(self, line):
-        """
+        '''
         Handles lines that describe page info. Add the appropriate info in the
         token to the self.__margin_dict dictionary.
-        """
+        '''
         info = line[6:16]
         changed = self.__margin_dict.get(info)
         if changed is None:
@@ -430,10 +411,10 @@ cw<ci<font-style<nu<0
 # mi<tg<open-att__<footn
 
     def __print_sec_info(self):
-        """
+        '''
         Check if there is any section info. If so, print it out.
         If not, print out an empty tag to satisfy the dtd.
-        """
+        '''
         if len(self.__section.keys()) == 0:
             self.__write_obj.write(
             'mi<tg<open______<section-definition\n'
@@ -444,15 +425,15 @@ cw<ci<font-style<nu<0
             keys = self.__section.keys()
             for key in keys:
                 self.__write_obj.write(
-                '<%s>%s' %  (key, self.__section[key])
+                '<%s>%s' % (key, self.__section[key])
                 )
             self.__write_obj.write('\n')
 
     def __section_func(self, line):
-        """
+        '''
         Add info pertaining to section to the self.__section dictionary, to be
         printed out later.
-        """
+        '''
         info = self.__translate_sec.get(line[6:16])
         if info is None:
             sys.stderr.write('woops!\n')
@@ -475,11 +456,11 @@ cw<ci<font-style<nu<0
         self.__write_obj.write(line)
 
     def __text_func(self, line):
-        """
+        '''
         If the cb_count is less than 1, you have hit the body
         For older RTF
         Newer RTF should never have to use this function
-        """
+        '''
         if self.__cb_count == '':
             cb_count = '0002'
         else:
@@ -502,9 +483,9 @@ cw<ci<font-style<nu<0
         self.__write_obj.write(line)
 
     def __new_section_func(self, line):
-        """
+        '''
         This is new. The start of a section marks the end of the preamble
-        """
+        '''
         if self.__cb_count == '0002':
             self.__state = 'body'
             self.__write_preamble()
@@ -515,10 +496,10 @@ cw<ci<font-style<nu<0
         self.__write_obj.write(line)
 
     def __write_preamble(self):
-        """
+        '''
         Write all the strings, which represent all the data in the preamble.
         Write a body and section beginning.
-        """
+        '''
         if self.__no_namespace:
             self.__write_obj.write(
                 'mi<tg<open______<doc\n'
@@ -555,10 +536,10 @@ cw<ci<font-style<nu<0
         self.__write_obj.write('mi<mk<body-open_\n')
 
     def __preamble_func(self, line):
-        """
+        '''
         Check if the token info belongs to the dictionary. If so, take the
         appropriate action.
-        """
+        '''
         action = self.__state_dict.get(self.__token_info)
         if action:
             action(line)
@@ -586,7 +567,7 @@ cw<ci<font-style<nu<0
         self.__write_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "preamble_div.data")
+            copy_obj.copy_file(self.__write_to, 'preamble_div.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
         return self.__all_lists
diff --git a/src/calibre/ebooks/rtf2xml/preamble_rest.py b/src/calibre/ebooks/rtf2xml/preamble_rest.py
index 785325581d..2a208905d4 100644
--- a/src/calibre/ebooks/rtf2xml/preamble_rest.py
+++ b/src/calibre/ebooks/rtf2xml/preamble_rest.py
@@ -19,12 +19,12 @@ from . import open_for_read, open_for_write
 
 
 class Preamble:
-    """
+    '''
     Fix the reamaing parts of the preamble. This module does very little. It
     makes sure that no text gets put in the revision of list table. In the
     future, when I understand how to interpret the revision table and list
     table, I will make these methods more functional.
-    """
+    '''
 
     def __init__(self, file,
                 bug_handler,
@@ -34,7 +34,7 @@ class Preamble:
                 copy=None,
                 temp_dir=None,
                 ):
-        """
+        '''
         Required:
             file--file to parse
             platform --Windows or Macintosh
@@ -46,7 +46,7 @@ class Preamble:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file=file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -54,27 +54,27 @@ class Preamble:
         self.__code_page = code_page
         self.__platform = platform
         if temp_dir:
-            self.__write_to = os.path.join(temp_dir,"info_table_info.data")
+            self.__write_to = os.path.join(temp_dir,'info_table_info.data')
         else:
-            self.__write_to = "info_table_info.data"
+            self.__write_to = 'info_table_info.data'
 
     def __initiate_values(self):
-        """
+        '''
         Initiate all values.
-        """
+        '''
         self.__state = 'default'
         self.__text_string = ''
         self.__state_dict = {
         'default'   : self.__default_func,
         'revision'  : self.__revision_table_func,
-        'list_table'  : self.__list_table_func,
-        'body'        : self.__body_func,
+        'list_table': self.__list_table_func,
+        'body'      : self.__body_func,
         }
         self.__default_dict = {
-        'mi<mk<rtfhed-beg'      : self.__found_rtf_head_func,
-        'mi<mk<listabbeg_'      : self.__found_list_table_func,
-        'mi<mk<revtbl-beg'      : self.__found_revision_table_func,
-        'mi<mk<body-open_'      : self.__found_body_func,
+        'mi<mk<rtfhed-beg'  : self.__found_rtf_head_func,
+        'mi<mk<listabbeg_'  : self.__found_list_table_func,
+        'mi<mk<revtbl-beg'  : self.__found_revision_table_func,
+        'mi<mk<body-open_'  : self.__found_body_func,
         }
 
     def __default_func(self, line):
@@ -85,7 +85,7 @@ class Preamble:
             self.__write_obj.write(line)
 
     def __found_rtf_head_func(self, line):
-        """
+        '''
         Requires:
             line -- the line to parse
         Returns:
@@ -93,7 +93,7 @@ class Preamble:
         Logic:
             Write to the output file the default font info, the code page
             info, and the platform info.
-        """
+        '''
         self.__write_obj.write(
             'mi<tg<empty-att_<rtf-definition'
             '<default-font>%s<code-page>%s'
@@ -131,7 +131,7 @@ class Preamble:
         self.__write_obj.write(line)
 
     def fix_preamble(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -140,7 +140,7 @@ class Preamble:
             Read one line in at a time. Determine what action to take based on
             the state. The state can either be default, the revision table, or
             the list table.
-        """
+        '''
         self.__initiate_values()
         with open_for_read(self.__file) as read_obj:
             with open_for_write(self.__write_to) as self.__write_obj:
@@ -153,6 +153,6 @@ class Preamble:
                     action(line)
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "preamble_div.data")
+            copy_obj.copy_file(self.__write_to, 'preamble_div.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/process_tokens.py b/src/calibre/ebooks/rtf2xml/process_tokens.py
index df0ab9aa04..2f526d2296 100644
--- a/src/calibre/ebooks/rtf2xml/process_tokens.py
+++ b/src/calibre/ebooks/rtf2xml/process_tokens.py
@@ -20,11 +20,11 @@ from . import open_for_read, open_for_write
 
 
 class ProcessTokens:
-    """
+    '''
     Process each token on a line and add information that will be useful for
     later processing. Information will be put on one line, delimited by "<"
     for main fields, and ">" for sub fields
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -46,7 +46,7 @@ class ProcessTokens:
         self.__bug_handler = bug_handler
 
     def compile_expressions(self):
-        self.__num_exp = re.compile(r"([a-zA-Z]+)(.*)")
+        self.__num_exp = re.compile(r'([a-zA-Z]+)(.*)')
         self.__utf_exp = re.compile(r'(&.*?;)')
 
     def initiate_token_dict(self):
@@ -155,7 +155,7 @@ class ProcessTokens:
         'levelindent'        :  ('ls', 'level-inde', self.default_func),
         'levelnfc'           :  ('ls', 'level-type', self.__list_type_func),
         'levelnfcn'          :  ('ls', 'level-type', self.__list_type_func),
-        'listid'             :  ('ls', 'lis-tbl-id',  self.default_func),
+        'listid'             :  ('ls', 'lis-tbl-id', self.default_func),
         'listoverride'       :  ('ls', 'lis-overid', self.default_func),
         # duplicate
         'pnlvl'              : ('ls', 'list-level', self.default_func),
@@ -371,7 +371,7 @@ class ProcessTokens:
             15:     'single byte character',
             16:     'Kanji numbering 3',
             17:     'Kanji numbering 4',
-            18:     'Circle numbering' ,
+            18:     'Circle numbering',
             19:     'double-byte Arabic numbering',
             2046:   'phonetic double-byte Katakana characters',
             2146:   'phonetic double-byte katakana characters',
@@ -466,7 +466,7 @@ class ProcessTokens:
             2060    :  'French Belgium',
             11276   :  'French Cameroon',
             3084    :  'French Canada',
-            12300   :  'French Cote d\'Ivoire',
+            12300   :  "French Cote d'Ivoire",
             5132    :  'French Luxembourg',
             13324   :  'French Mali',
             6156    :  'French Monaco',
@@ -585,36 +585,34 @@ class ProcessTokens:
             1024    :  'Unkown',
             255     :  'Unkown',
         }
-    """
         # unknown
         # These must get passed on because they occurred after \\*
-        'do'                :   ('un', 'unknown___', self.default_func),
-        'company'           :   ('un', 'company___', self.default_func),
-        'shpinst'           :   ('un', 'unknown___', self.default_func),
-        'panose'            :   ('un', 'unknown___', self.default_func),
-        'falt'              :   ('un', 'unknown___', self.default_func),
-        'listoverridetable' :   ('un', 'unknown___', self.default_func),
-        'category'          :   ('un', 'unknown___', self.default_func),
-        'template'          :   ('un', 'unknown___', self.default_func),
-        'ud'                :   ('un', 'unknown___', self.default_func),
-        'formfield'         :   ('un', 'unknown___', self.default_func),
-        'ts'                :   ('un', 'unknown___', self.default_func),
-        'rsidtbl'           :   ('un', 'unknown___', self.default_func),
-        'generator'         :   ('un', 'unknown___', self.default_func),
-        'ftnsep'            :   ('un', 'unknown___', self.default_func),
-        'aftnsep'           :   ('un', 'unknown___', self.default_func),
-        'aftnsepc'          :   ('un', 'unknown___', self.default_func),
-        'aftncn'            :   ('un', 'unknown___', self.default_func),
-        'objclass'          :   ('un', 'unknown___', self.default_func),
-        'objdata'           :   ('un', 'unknown___', self.default_func),
-        'picprop'           :   ('un', 'unknown___', self.default_func),
-        'blipuid'           :   ('un', 'unknown___', self.default_func),
-    """
+        # 'do'                :   ('un', 'unknown___', self.default_func),
+        # 'company'           :   ('un', 'company___', self.default_func),
+        # 'shpinst'           :   ('un', 'unknown___', self.default_func),
+        # 'panose'            :   ('un', 'unknown___', self.default_func),
+        # 'falt'              :   ('un', 'unknown___', self.default_func),
+        # 'listoverridetable' :   ('un', 'unknown___', self.default_func),
+        # 'category'          :   ('un', 'unknown___', self.default_func),
+        # 'template'          :   ('un', 'unknown___', self.default_func),
+        # 'ud'                :   ('un', 'unknown___', self.default_func),
+        # 'formfield'         :   ('un', 'unknown___', self.default_func),
+        # 'ts'                :   ('un', 'unknown___', self.default_func),
+        # 'rsidtbl'           :   ('un', 'unknown___', self.default_func),
+        # 'generator'         :   ('un', 'unknown___', self.default_func),
+        # 'ftnsep'            :   ('un', 'unknown___', self.default_func),
+        # 'aftnsep'           :   ('un', 'unknown___', self.default_func),
+        # 'aftnsepc'          :   ('un', 'unknown___', self.default_func),
+        # 'aftncn'            :   ('un', 'unknown___', self.default_func),
+        # 'objclass'          :   ('un', 'unknown___', self.default_func),
+        # 'objdata'           :   ('un', 'unknown___', self.default_func),
+        # 'picprop'           :   ('un', 'unknown___', self.default_func),
+        # 'blipuid'           :   ('un', 'unknown___', self.default_func),
 
     def __ms_hex_func(self, pre, token, num):
         num = num[1:]  # chop off leading 0, which I added
         num = num.upper()  # the mappings store hex in caps
-        return 'tx<hx<__________<\'%s\n' % num  # add an ' for the mappings
+        return "tx<hx<__________<'%s\n" % num  # add an ' for the mappings
 
     def ms_sub_func(self, pre, token, num):
         return 'tx<mc<__________<%s\n' % token
@@ -652,16 +650,16 @@ class ProcessTokens:
         return f'cw<{pre}<{token}<nu<{type}\n'
 
     def __language_func(self, pre, token, num):
-        lang_name = self.__language_dict.get(int(re.search('[0-9]+', num).group()))
+        lang_name = self.__language_dict.get(int(re.search(r'[0-9]+', num).group()))
         if not lang_name:
-            lang_name = "not defined"
+            lang_name = 'not defined'
             if self.__run_level > 3:
                 msg = 'No entry for number "%s"' % num
                 raise self.__bug_handler(msg)
         return f'cw<{pre}<{token}<nu<{lang_name}\n'
 
     def two_part_func(self, pre, token, num):
-        list = token.split("<")
+        list = token.split('<')
         token = list[0]
         num = list[1]
         return f'cw<{pre}<{token}<nu<{num}\n'
@@ -696,7 +694,7 @@ class ProcessTokens:
             third_field = 'en'
         num = '%X' % int(num)
         if len(num) != 2:
-            num = "0" + num
+            num = '0' + num
         return f'cw<{pre}<{token}<{third_field}<{num}\n'
         # return 'cw<cl<%s<nu<nu<%s>%s<%s\n' % (third_field, token, num, token)
 
@@ -719,12 +717,12 @@ class ProcessTokens:
     def divide_num(self, numerator, denominator):
         try:
             # calibre why ignore negative number? Wrong in case of \fi
-            numerator = float(re.search('[0-9.\\-]+', numerator).group())
+            numerator = float(re.search(r'[0-9.\-]+', numerator).group())
         except TypeError:
             if self.__run_level > 3:
-                msg = ('No number to process?\nthis indicates that the token \\(\\li\\) \
-                should have a number and does not\nnumerator is \
-                "%s"\ndenominator is "%s"\n') % (numerator, denominator)
+                msg = ('No number to process?\nthis indicates that the token \\(\\li\\)'
+                       'should have a number and does not\nnumerator is'
+                       '"%s"\ndenominator is "%s"\n') % (numerator, denominator)
                 raise self.__bug_handler(msg)
             if 5 > self.__return_code:
                 self.__return_code = 5
@@ -732,12 +730,12 @@ class ProcessTokens:
         num = '%0.2f' % round(numerator/denominator, 2)
         return num
         string_num = str(num)
-        if string_num[-2:] == ".0":
+        if string_num[-2:] == '.0':
             string_num = string_num[:-2]
         return string_num
 
     def split_let_num(self, token):
-        match_obj = re.search(self.__num_exp,token)
+        match_obj = re.search(self.__num_exp, token)
         if match_obj is not None:
             first = match_obj.group(1)
             second = match_obj.group(2)
@@ -753,22 +751,22 @@ class ProcessTokens:
             return token, 0
         return first, second
 
-    def convert_to_hex(self,number):
-        """Convert a string to uppercase hexadecimal"""
+    def convert_to_hex(self, number):
+        '''Convert a string to uppercase hexadecimal'''
         num = int(number)
         try:
-            hex_num = "%X" % num
+            hex_num = '%X' % num
             return hex_num
         except:
             raise self.__bug_handler
 
     def process_cw(self, token):
-        """Change the value of the control word by determining what dictionary
-        it belongs to"""
+        '''Change the value of the control word by determining what dictionary
+        it belongs to'''
         special = ['*', ':', '}', '{', '~', '_', '-', ';']
         # if token != "{" or token != "}":
         token = token[1:]  # strip off leading \
-        token = token.replace(" ", "")
+        token = token.replace(' ', '')
         # if not token: return
         only_alpha = token.isalpha()
         num = None
@@ -780,23 +778,23 @@ class ProcessTokens:
 
     def __check_brackets(self, in_file):
         self.__check_brack_obj = check_brackets.CheckBrackets(file=in_file)
-        good_br =  self.__check_brack_obj.check_brackets()[0]
+        good_br = self.__check_brack_obj.check_brackets()[0]
         if not good_br:
             return 1
 
     def process_tokens(self):
-        """Main method for handling other methods. """
+        '''Main method for handling other methods. '''
         line_count = 0
         with open_for_read(self.__file) as read_obj:
             with open_for_write(self.__write_to) as write_obj:
                 for line in read_obj:
-                    token = line.replace("\n", "")
+                    token = line.replace('\n', '')
                     line_count += 1
                     if line_count == 1 and token != '\\{':
-                        msg = '\nInvalid RTF: document doesn\'t start with {\n'
+                        msg = "\nInvalid RTF: document doesn't start with {\n"
                         raise self.__exception_handler(msg)
                     elif line_count == 2 and token[0:4] != '\\rtf':
-                        msg = '\nInvalid RTF: document doesn\'t start with \\rtf \n'
+                        msg = "\nInvalid RTF: document doesn't start with \\rtf \n"
                         raise self.__exception_handler(msg)
 
                     the_index = token.find('\\ ')
@@ -804,7 +802,7 @@ class ProcessTokens:
                         msg = '\nInvalid RTF: token "\\ " not valid.\nError at line %d'\
                             % line_count
                         raise self.__exception_handler(msg)
-                    elif token[:1] == "\\":
+                    elif token[:1] == '\\':
                         line = self.process_cw(token)
                         if line is not None:
                             write_obj.write(line)
@@ -824,7 +822,7 @@ class ProcessTokens:
 
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "processed_tokens.data")
+            copy_obj.copy_file(self.__write_to, 'processed_tokens.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
 
diff --git a/src/calibre/ebooks/rtf2xml/replace_illegals.py b/src/calibre/ebooks/rtf2xml/replace_illegals.py
index c2521922e6..c81af4bb4b 100644
--- a/src/calibre/ebooks/rtf2xml/replace_illegals.py
+++ b/src/calibre/ebooks/rtf2xml/replace_illegals.py
@@ -20,9 +20,9 @@ from . import open_for_read, open_for_write
 
 
 class ReplaceIllegals:
-    """
+    '''
     reaplace illegal lower ascii characters
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -35,14 +35,14 @@ class ReplaceIllegals:
         self.__write_to = better_mktemp()
 
     def replace_illegals(self):
-        """
-        """
+        '''
+        '''
         with open_for_read(self.__file) as read_obj:
             with open_for_write(self.__write_to) as write_obj:
                 for line in read_obj:
                     write_obj.write(clean_ascii_chars(line))
         copy_obj = copy.Copy()
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "replace_illegals.data")
+            copy_obj.copy_file(self.__write_to, 'replace_illegals.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/sections.py b/src/calibre/ebooks/rtf2xml/sections.py
index 16c000f3be..32056b6274 100644
--- a/src/calibre/ebooks/rtf2xml/sections.py
+++ b/src/calibre/ebooks/rtf2xml/sections.py
@@ -20,7 +20,7 @@ from . import open_for_read, open_for_write
 
 
 class Sections:
-    """
+    '''
     =================
     Purpose
     =================
@@ -53,14 +53,14 @@ class Sections:
     the list; use the second item in the description list.
     CHANGE (2004-04-26) No longer write sections that occur in field-blocks.
     Instead, ignore all section information in a field-block.
-    """
+    '''
 
     def __init__(self,
             in_file,
             bug_handler,
             copy=None,
             run_level=1):
-        """
+        '''
         Required:
             'file'--file to parse
         Optional:
@@ -69,7 +69,7 @@ class Sections:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -77,9 +77,9 @@ class Sections:
         self.__write_to = better_mktemp()
 
     def __initiate_values(self):
-        """
+        '''
         Initiate all values.
-        """
+        '''
         self.__mark_start = 'mi<mk<sect-start\n'
         self.__mark_end =   'mi<mk<sect-end__\n'
         self.__in_field = 0
@@ -101,33 +101,33 @@ class Sections:
         }
         # cw<sc<sect-defin<nu<true
         self.__body_dict = {
-        'cw<sc<section___'      : self.__found_section_func,
-        'mi<mk<sec-fd-beg'      : self.__found_sec_in_field_func,
-        'cw<sc<sect-defin'      : self.__found_section_def_bef_sec_func,
+        'cw<sc<section___'  : self.__found_section_func,
+        'mi<mk<sec-fd-beg'  : self.__found_sec_in_field_func,
+        'cw<sc<sect-defin'  : self.__found_section_def_bef_sec_func,
         }
         self.__section_def_dict = {
-        'cw<pf<par-def___'      : (self.__end_sec_def_func, None),
-        'mi<mk<body-open_'      : (self.__end_sec_def_func, None),
-        'cw<tb<columns___'      : (self.__attribute_func, 'columns'),
-        'cw<pa<margin-lef'      : (self.__attribute_func, 'margin-left'),
-        'cw<pa<margin-rig'      : (self.__attribute_func, 'margin-right'),
-        'mi<mk<header-ind'      : (self.__end_sec_def_func, None),
+        'cw<pf<par-def___'  : (self.__end_sec_def_func, None),
+        'mi<mk<body-open_'  : (self.__end_sec_def_func, None),
+        'cw<tb<columns___'  : (self.__attribute_func, 'columns'),
+        'cw<pa<margin-lef'  : (self.__attribute_func, 'margin-left'),
+        'cw<pa<margin-rig'  : (self.__attribute_func, 'margin-right'),
+        'mi<mk<header-ind'  : (self.__end_sec_def_func, None),
         # premature endings
         # __end_sec_premature_func
-        'tx<nu<__________'      : (self.__end_sec_premature_func, None),
-        'cw<ci<font-style'      : (self.__end_sec_premature_func, None),
-        'cw<ci<font-size_'      : (self.__end_sec_premature_func, None),
+        'tx<nu<__________'  : (self.__end_sec_premature_func, None),
+        'cw<ci<font-style'  : (self.__end_sec_premature_func, None),
+        'cw<ci<font-size_'  : (self.__end_sec_premature_func, None),
         }
         self.__sec_in_field_dict = {
-        'mi<mk<sec-fd-end'      : self.__end_sec_in_field_func,
+        'mi<mk<sec-fd-end'  : self.__end_sec_in_field_func,
         # changed this 2004-04-26
         # two lines
-        # 'cw<sc<section___'      : self.__found_section_in_field_func,
-        # 'cw<sc<sect-defin'      : self.__found_section_def_in_field_func,
+        # 'cw<sc<section___'  : self.__found_section_in_field_func,
+        # 'cw<sc<sect-defin'  : self.__found_section_def_in_field_func,
         }
 
     def __found_section_def_func(self, line):
-        """
+        '''
         Required:
             line -- the line to parse
         Returns:
@@ -136,12 +136,12 @@ class Sections:
             I have found a section definition. Change the state to
             setion_def (so subsequent lines will be processesed as part of
             the section definition), and clear the section_values dictionary.
-        """
+        '''
         self.__state = 'section_def'
         self.__section_values.clear()
 
     def __attribute_func(self, line, name):
-        """
+        '''
         Required:
             line -- the line to be parsed
             name -- the changed, readable name (as opposed to the
@@ -153,13 +153,13 @@ class Sections:
             can retrieve it later. The attribute (or key) is the name; the
             value is the last part of the text string.
             ex: cw<tb<columns___<nu<2
-        """
+        '''
         attribute = name
         value = line[20:-1]
         self.__section_values[attribute] = value
 
     def __found_section_func(self, line):
-        """
+        '''
         Requires:
             line -- the line to parse
         Returns:
@@ -167,13 +167,13 @@ class Sections:
         Logic:
             I have found the beginning of a section, so change the state
             accordingly. Also add one to the section counter.
-        """
+        '''
         self.__state = 'section'
         self.__write_obj.write(line)
         self.__section_num += 1
 
     def __found_section_def_bef_sec_func(self, line):
-        """
+        '''
         Requires:
             line -- the line to parse
         Returns:
@@ -181,25 +181,25 @@ class Sections:
         Logic:
             I have found the beginning of a section, so change the state
             accordingly. Also add one to the section counter.
-        """
+        '''
         self.__section_num += 1
         self.__found_section_def_func(line)
         self.__write_obj.write(line)
 
     def __section_func(self, line):
-        """
+        '''
         Requires:
             line --the line to parse
         Returns:
             nothing
         Logic:
-        """
+        '''
         if self.__token_info == 'cw<sc<sect-defin':
             self.__found_section_def_func(line)
         self.__write_obj.write(line)
 
     def __section_def_func(self, line):
-        """
+        '''
         Required:
             line --line to parse
         Returns:
@@ -209,7 +209,7 @@ class Sections:
             the defnition (a paragraph definition), or if it contains info that
             should be added to the values dictionary. If neither of these
             cases are true, output the line to a file.
-        """
+        '''
         action, name = self.__section_def_dict.get(self.__token_info, (None, None))
         if action:
             action(line, name)
@@ -221,7 +221,7 @@ class Sections:
             self.__write_obj.write(line)
 
     def __end_sec_def_func(self, line, name):
-        """
+        '''
         Requires:
             line --the line to parse
             name --changed, readable name
@@ -230,7 +230,7 @@ class Sections:
         Logic:
             The end of the section definition has been found. Reset the state.
             Call on the write_section method.
-        """
+        '''
         if not self.__in_field:
             self.__state = 'body'
         else:
@@ -238,7 +238,7 @@ class Sections:
         self.__write_section(line)
 
     def __end_sec_premature_func(self, line, name):
-        """
+        '''
         Requires:
             line --the line to parse
             name --changed, readable name
@@ -249,7 +249,7 @@ class Sections:
             before \\pard. This should indicate older RTF. Reset the state
             Write the section definition. Insert a paragraph definition.
             Insert {} to mark the end of a paragraph definition
-        """
+        '''
         if not self.__in_field:
             self.__state = 'body'
         else:
@@ -260,7 +260,7 @@ class Sections:
         self.__write_obj.write('cb<nu<clos-brack<0000\n')
 
     def __write_section(self, line):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -269,7 +269,7 @@ class Sections:
             Form a string of attributes and values. If you are not in a field
             block, write this string to the output file. Otherwise, call on
             the handle_sec_def method to handle this string.
-        """
+        '''
         my_string = self.__mark_start
         if self.__found_first_sec:
             my_string += 'mi<tg<close_____<section\n'
@@ -285,7 +285,7 @@ class Sections:
                 my_string += f'<{key}>{self.__section_values[key]}'
         my_string += '\n'
         my_string += self.__mark_end
-        # # my_string += line
+        # my_string += line
         if self.__state == 'body':
             self.__write_obj.write(my_string)
         elif self.__state == 'sec_in_field':
@@ -295,7 +295,7 @@ class Sections:
             raise self.__bug_handler(msg)
 
     def __handle_sec_def(self, my_string):
-        """
+        '''
         Requires:
             my_string -- the string of attributes and values. (Do I need this?)
         Returns:
@@ -303,12 +303,12 @@ class Sections:
         Logic:
             I need to append the dictionary of attributes and values to list
             so I can use it later when I reach the end of the field-block.
-        """
+        '''
         values_dict = self.__section_values
         self.__list_of_sec_values.append(values_dict)
 
     def __body_func(self, line):
-        """
+        '''
         Requires:
             line --the line to parse
         Returns:
@@ -316,7 +316,7 @@ class Sections:
         Logic:
             Look for the beginning of a section. Otherwise, print the line to
             the output file.
-        """
+        '''
         action = self.__body_dict.get(self.__token_info)
         if action:
             action(line)
@@ -324,20 +324,20 @@ class Sections:
             self.__write_obj.write(line)
 
     def __before_body_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
             nothing
         Logic:
             Look for the beginning of the body. Always print out the line.
-        """
+        '''
         if self.__token_info == 'mi<mk<body-open_':
             self.__state = 'before_first_sec'
         self.__write_obj.write(line)
 
     def __before_first_sec_func(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -345,7 +345,7 @@ class Sections:
         Logic:
             Look for the beginning of the first section. This can be \\sectd,
             but in older RTF it could mean the any paragraph or row definition
-        """
+        '''
         if self.__token_info == 'cw<sc<sect-defin':
             self.__state = 'section_def'
             self.__section_num += 1
@@ -378,7 +378,7 @@ class Sections:
         self.__write_obj.write(line)
 
     def __found_sec_in_field_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -387,13 +387,13 @@ class Sections:
             I have found the beginning of a field that has a section (or
             really, two) inside of it. Change the state, and start adding to
             one long string.
-        """
+        '''
         self.__state = 'sec_in_field'
         self.__sec_in_field_string = line
         self.__in_field = 1
 
     def __sec_in_field_func(self, line):
-        """
+        '''
         Requires:
             line --the line to parse
         Returns:
@@ -403,7 +403,7 @@ class Sections:
             definition.
             CHANGED! Just print out each line. Ignore any sections or
             section definition info.
-        """
+        '''
         action = self.__sec_in_field_dict.get(self.__token_info)
         if action:
             action(line)
@@ -413,7 +413,7 @@ class Sections:
             self.__write_obj.write(line)
 
     def __end_sec_in_field_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -424,22 +424,22 @@ class Sections:
             section tag. Print out the field string. Call on the same method
             to again write the close and beginning of a section tag.
             Change the state.
-        """
+        '''
         # change this 2004-04-26
         # Don't do anything
-        """
-        self.__sec_in_field_string += line
-        self.__print_field_sec_attributes()
-        self.__write_obj.write(self.__sec_in_field_string)
-        self.__print_field_sec_attributes()
-        """
+        #
+        # self.__sec_in_field_string += line
+        # self.__print_field_sec_attributes()
+        # self.__write_obj.write(self.__sec_in_field_string)
+        # self.__print_field_sec_attributes()
+
         self.__state = 'body'
         self.__in_field = 0
         # this is changed too
         self.__write_obj.write(line)
 
     def __print_field_sec_attributes(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -457,7 +457,7 @@ class Sections:
             my_string += '\n'
         else:
             my_string += 'mi<tg<open______<section-definition\n'
-        """
+        '''
         num = self.__field_num[0]
         self.__field_num = self.__field_num[1:]
         self.__write_obj.write(
@@ -465,7 +465,7 @@ class Sections:
         'mi<tg<open-att__<section<num>%s' % str(num)
         )
         if self.__list_of_sec_values:
-            keys =  self.__list_of_sec_values[0].keys()
+            keys = self.__list_of_sec_values[0].keys()
             for key in keys:
                 self.__write_obj.write(
                 f'<{key}>{self.__list_of_sec_values[0][key]}\n')
@@ -477,7 +477,7 @@ class Sections:
         # Look here
 
     def __found_section_in_field_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -485,13 +485,13 @@ class Sections:
         Logic:
             I have found a section in a field block. Add one to section
             counter, and append this number to a list.
-        """
+        '''
         self.__section_num += 1
         self.__field_num.append(self.__section_num)
         self.__sec_in_field_string += line
 
     def __found_section_def_in_field_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -499,12 +499,12 @@ class Sections:
         Logic:
             I have found a section definition in a filed block. Change the
             state and clear the values dictionary.
-        """
+        '''
         self.__state = 'section_def'
         self.__section_values.clear()
 
     def make_sections(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -514,7 +514,7 @@ class Sections:
             the state. If the state is before the body, look for the
             beginning of the body.
             If the state is body, send the line to the body method.
-        """
+        '''
         self.__initiate_values()
         read_obj = open_for_read(self.__file)
         self.__write_obj = open_for_write(self.__write_to)
@@ -532,6 +532,6 @@ class Sections:
         self.__write_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "sections.data")
+            copy_obj.copy_file(self.__write_to, 'sections.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/styles.py b/src/calibre/ebooks/rtf2xml/styles.py
index 78aeabe195..a067bb56ab 100644
--- a/src/calibre/ebooks/rtf2xml/styles.py
+++ b/src/calibre/ebooks/rtf2xml/styles.py
@@ -20,9 +20,9 @@ from . import open_for_read, open_for_write
 
 
 class Styles:
-    """
+    '''
     Change lines with style numbers to actual style names.
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -30,7 +30,7 @@ class Styles:
             copy=None,
             run_level=1,
             ):
-        """
+        '''
         Required:
             'file'--file to parse
         Optional:
@@ -39,7 +39,7 @@ class Styles:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -47,26 +47,26 @@ class Styles:
         self.__run_level = run_level
 
     def __initiate_values(self):
-        """
+        '''
         Initiate all values.
-        """
+        '''
         self.__border_obj = border_parse.BorderParse()
-        self.__styles_dict =  {'par':{}, 'char':{}}
+        self.__styles_dict = {'par':{}, 'char':{}}
         self.__styles_num = '0'
         self.__type_of_style = 'par'
         self.__text_string = ''
         self.__state = 'before_styles_table'
         self.__state_dict = {
-        'before_styles_table': self.__before_styles_func,
-        'in_styles_table'    : self.__in_styles_func,
-        'in_individual_style' : self.__in_individual_style_func,
-        'after_styles_table'  : self.__after_styles_func,
-        'mi<mk<styles-beg'  : self.__found_styles_table_func,
-        'mi<mk<styles-end'  : self.__found_end_styles_table_func,
-        'mi<mk<stylei-beg'  : self.__found_beg_ind_style_func,
-        'mi<mk<stylei-end'  : self.__found_end_ind_style_func,
-        'cw<ss<para-style'  : self.__para_style_func,
-        'cw<ss<char-style'  : self.__char_style_func,
+        'before_styles_table'   : self.__before_styles_func,
+        'in_styles_table'       : self.__in_styles_func,
+        'in_individual_style'   : self.__in_individual_style_func,
+        'after_styles_table'    : self.__after_styles_func,
+        'mi<mk<styles-beg'      : self.__found_styles_table_func,
+        'mi<mk<styles-end'      : self.__found_end_styles_table_func,
+        'mi<mk<stylei-beg'      : self.__found_beg_ind_style_func,
+        'mi<mk<stylei-end'      : self.__found_end_ind_style_func,
+        'cw<ss<para-style'      : self.__para_style_func,
+        'cw<ss<char-style'      : self.__char_style_func,
         }
         # A separate dictionary for parsing the body text
         self.__body_dict = {
@@ -76,170 +76,170 @@ class Styles:
         # Dictionary needed to convert shortened style names to readable names
         self.__token_dict={
         # paragraph formatting => pf
-        'par-end___'    : 'para',
-        'par-def___'    : 'paragraph-definition',
-        'keep-w-nex'    : 'keep-with-next',
-        'widow-cntl'    : 'widow-control',
-        'adjust-rgt'    : 'adjust-right',
-        'language__'    : 'language',
-        'right-inde'    : 'right-indent',
-        'fir-ln-ind'    : 'first-line-indent',
-        'left-inden'    : 'left-indent',
-        'space-befo'    : 'space-before',
-        'space-afte'    : 'space-after',
-        'line-space'    : 'line-spacing',
-        'default-ta'    : 'default-tab',
-        'align_____'    : 'align',
-        'widow-cntr'    : 'widow-control',
+        'par-end___': 'para',
+        'par-def___': 'paragraph-definition',
+        'keep-w-nex': 'keep-with-next',
+        'widow-cntl': 'widow-control',
+        'adjust-rgt': 'adjust-right',
+        'language__': 'language',
+        'right-inde': 'right-indent',
+        'fir-ln-ind': 'first-line-indent',
+        'left-inden': 'left-indent',
+        'space-befo': 'space-before',
+        'space-afte': 'space-after',
+        'line-space': 'line-spacing',
+        'default-ta': 'default-tab',
+        'align_____': 'align',
+        'widow-cntr': 'widow-control',
         # page formatting mixed in! (Just in older RTF?)
-        'margin-lef'    :       'left-indent',
-        'margin-rig'    :       'right-indent',
-        'margin-bot'    :       'space-after',
-        'margin-top'    :       'space-before',
+        'margin-lef':       'left-indent',
+        'margin-rig':       'right-indent',
+        'margin-bot':       'space-after',
+        'margin-top':       'space-before',
         # stylesheet = > ss
-        'style-shet'    : 'stylesheet',
-        'based-on__'    : 'based-on-style',
-        'next-style'    : 'next-style',
-        'char-style'    : 'character-style',
-        'para-style'    : 'paragraph-style',
+        'style-shet': 'stylesheet',
+        'based-on__': 'based-on-style',
+        'next-style': 'next-style',
+        'char-style': 'character-style',
+        'para-style': 'paragraph-style',
         # graphics => gr
-        'picture___'    : 'pict',
-        'obj-class_'    : 'obj_class',
-        'mac-pic___'    : 'mac-pict',
+        'picture___': 'pict',
+        'obj-class_': 'obj_class',
+        'mac-pic___': 'mac-pict',
         # section => sc
-        'section___'    : 'section-new',
-        'sect-defin'    : 'section-reset',
-        'sect-note_'    : 'endnotes-in-section',
+        'section___': 'section-new',
+        'sect-defin': 'section-reset',
+        'sect-note_': 'endnotes-in-section',
         # list=> ls
-        'list-text_'    : 'list-text',
-        'list______'    : 'list',
-        'list-lev-d'    : 'list-level-definition',
-        'list-cardi'    : 'list-cardinal-numbering',
-        'list-decim'    : 'list-decimal-numbering',
-        'list-up-al'    : 'list-uppercase-alphabetic-numbering',
-        'list-up-ro'    : 'list-uppercae-roman-numbering',
-        'list-ord__'    : 'list-ordinal-numbering',
-        'list-ordte'    : 'list-ordinal-text-numbering',
-        'list-bulli'    : 'list-bullet',
-        'list-simpi'    : 'list-simple',
-        'list-conti'    : 'list-continue',
-        'list-hang_'    : 'list-hang',
+        'list-text_': 'list-text',
+        'list______': 'list',
+        'list-lev-d': 'list-level-definition',
+        'list-cardi': 'list-cardinal-numbering',
+        'list-decim': 'list-decimal-numbering',
+        'list-up-al': 'list-uppercase-alphabetic-numbering',
+        'list-up-ro': 'list-uppercae-roman-numbering',
+        'list-ord__': 'list-ordinal-numbering',
+        'list-ordte': 'list-ordinal-text-numbering',
+        'list-bulli': 'list-bullet',
+        'list-simpi': 'list-simple',
+        'list-conti': 'list-continue',
+        'list-hang_': 'list-hang',
         # 'list-tebef'    : 'list-text-before',
         # 'list-level'    : 'level',
-        'list-id___'    : 'list-id',
-        'list-start'    : 'list-start',
-        'nest-level'    : 'nest-level',
+        'list-id___': 'list-id',
+        'list-start': 'list-start',
+        'nest-level': 'nest-level',
         # duplicate
-        'list-level'    : 'list-level',
+        'list-level': 'list-level',
         # notes => nt
-        'footnote__'    : 'footnote',
-        'type______'    : 'type',
+        'footnote__': 'footnote',
+        'type______': 'type',
         # anchor => an
-        'toc_______'    : 'anchor-toc',
-        'book-mk-st'    : 'bookmark-start',
-        'book-mk-en'    : 'bookmark-end',
-        'index-mark'    : 'anchor-index',
-        'place_____'    : 'place',
+        'toc_______': 'anchor-toc',
+        'book-mk-st': 'bookmark-start',
+        'book-mk-en': 'bookmark-end',
+        'index-mark': 'anchor-index',
+        'place_____': 'place',
         # field => fd
-        'field_____'    : 'field',
-        'field-inst'    : 'field-instruction',
-        'field-rslt'    : 'field-result',
-        'datafield_'    : 'data-field',
+        'field_____': 'field',
+        'field-inst': 'field-instruction',
+        'field-rslt': 'field-result',
+        'datafield_': 'data-field',
         # info-tables => it
-        'font-table'    : 'font-table',
-        'colr-table'    : 'color-table',
-        'lovr-table'    : 'list-override-table',
-        'listtable_'    : 'list-table',
-        'revi-table'    : 'revision-table',
+        'font-table': 'font-table',
+        'colr-table': 'color-table',
+        'lovr-table': 'list-override-table',
+        'listtable_': 'list-table',
+        'revi-table': 'revision-table',
         # character info => ci
-        'hidden____'    : 'hidden',
-        'italics___'    : 'italics',
-        'bold______'    : 'bold',
-        'strike-thr'   : 'strike-through',
-        'shadow____'   : 'shadow',
-        'outline___'   : 'outline',
-        'small-caps'   : 'small-caps',
-        'dbl-strike'   : 'double-strike-through',
-        'emboss____'    : 'emboss',
-        'engrave___'    : 'engrave',
-        'subscript_'    : 'subscript',
-        'superscrip'    : 'superscript',
-        'plain_____'    : 'plain',
-        'font-style'    : 'font-style',
-        'font-color'    : 'font-color',
-        'font-size_'    : 'font-size',
-        'font-up___'    : 'superscript',
-        'font-down_'    : 'subscript',
-        'red_______'    : 'red',
-        'blue______'    : 'blue',
-        'green_____'    : 'green',
-        'caps______'    :       'caps',
+        'hidden____': 'hidden',
+        'italics___': 'italics',
+        'bold______': 'bold',
+        'strike-thr': 'strike-through',
+        'shadow____': 'shadow',
+        'outline___': 'outline',
+        'small-caps': 'small-caps',
+        'dbl-strike': 'double-strike-through',
+        'emboss____': 'emboss',
+        'engrave___': 'engrave',
+        'subscript_': 'subscript',
+        'superscrip': 'superscript',
+        'plain_____': 'plain',
+        'font-style': 'font-style',
+        'font-color': 'font-color',
+        'font-size_': 'font-size',
+        'font-up___': 'superscript',
+        'font-down_': 'subscript',
+        'red_______': 'red',
+        'blue______': 'blue',
+        'green_____': 'green',
+        'caps______':       'caps',
         # table => tb
-        'row-def___'    : 'row-definition',
-        'cell______'    : 'cell',
-        'row_______'    : 'row',
-        'in-table__'    : 'in-table',
-        'columns___'    : 'columns',
-        'row-pos-le'    : 'row-position-left',
-        'cell-posit'    : 'cell-position',
+        'row-def___': 'row-definition',
+        'cell______': 'cell',
+        'row_______': 'row',
+        'in-table__': 'in-table',
+        'columns___': 'columns',
+        'row-pos-le': 'row-position-left',
+        'cell-posit': 'cell-position',
         # preamble => pr
         # underline
-        'underlined'    : 'underlined',
+        'underlined': 'underlined',
         # border => bd
-        'bor-t-r-hi'    : 'border-table-row-horizontal-inside',
-        'bor-t-r-vi'    : 'border-table-row-vertical-inside',
-        'bor-t-r-to'    : 'border-table-row-top',
-        'bor-t-r-le'    : 'border-table-row-left',
-        'bor-t-r-bo'    : 'border-table-row-bottom',
-        'bor-t-r-ri'    : 'border-table-row-right',
-        'bor-cel-bo'    : 'border-cell-bottom',
-        'bor-cel-to'    : 'border-cell-top',
-        'bor-cel-le'    : 'border-cell-left',
-        'bor-cel-ri'    : 'border-cell-right',
+        'bor-t-r-hi': 'border-table-row-horizontal-inside',
+        'bor-t-r-vi': 'border-table-row-vertical-inside',
+        'bor-t-r-to': 'border-table-row-top',
+        'bor-t-r-le': 'border-table-row-left',
+        'bor-t-r-bo': 'border-table-row-bottom',
+        'bor-t-r-ri': 'border-table-row-right',
+        'bor-cel-bo': 'border-cell-bottom',
+        'bor-cel-to': 'border-cell-top',
+        'bor-cel-le': 'border-cell-left',
+        'bor-cel-ri': 'border-cell-right',
         # 'bor-par-bo'    : 'border-paragraph-bottom',
-        'bor-par-to'    : 'border-paragraph-top',
-        'bor-par-le'    : 'border-paragraph-left',
-        'bor-par-ri'    : 'border-paragraph-right',
-        'bor-par-bo'    : 'border-paragraph-box',
-        'bor-for-ev'    : 'border-for-every-paragraph',
-        'bor-outsid'    : 'border-outisde',
-        'bor-none__'    : 'border',
+        'bor-par-to': 'border-paragraph-top',
+        'bor-par-le': 'border-paragraph-left',
+        'bor-par-ri': 'border-paragraph-right',
+        'bor-par-bo': 'border-paragraph-box',
+        'bor-for-ev': 'border-for-every-paragraph',
+        'bor-outsid': 'border-outisde',
+        'bor-none__': 'border',
         # border type => bt
-        'bdr-single'    : 'single',
-        'bdr-doubtb'    : 'double-thickness-border',
-        'bdr-shadow'    : 'shadowed-border',
-        'bdr-double'    : 'double-border',
-        'bdr-dotted'    : 'dotted-border',
-        'bdr-dashed'    : 'dashed',
-        'bdr-hair__'    : 'hairline',
-        'bdr-inset_'    : 'inset',
-        'bdr-das-sm'    : 'dash-small',
-        'bdr-dot-sm'    : 'dot-dash',
-        'bdr-dot-do'    : 'dot-dot-dash',
-        'bdr-outset'    : 'outset',
-        'bdr-trippl'    : 'tripple',
-        'bdr-thsm__'    : 'thick-thin-small',
-        'bdr-htsm__'    : 'thin-thick-small',
-        'bdr-hthsm_'    : 'thin-thick-thin-small',
-        'bdr-thm__'     : 'thick-thin-medium',
-        'bdr-htm__'     : 'thin-thick-medium',
-        'bdr-hthm_'     : 'thin-thick-thin-medium',
-        'bdr-thl__'     : 'thick-thin-large',
-        'bdr-hthl_'     : 'think-thick-think-large',
-        'bdr-wavy_'     : 'wavy',
-        'bdr-d-wav'     : 'double-wavy',
-        'bdr-strip'     : 'striped',
-        'bdr-embos'     : 'emboss',
-        'bdr-engra'     : 'engrave',
-        'bdr-frame'     : 'frame',
-        'bdr-li-wid'    : 'line-width',
+        'bdr-single': 'single',
+        'bdr-doubtb': 'double-thickness-border',
+        'bdr-shadow': 'shadowed-border',
+        'bdr-double': 'double-border',
+        'bdr-dotted': 'dotted-border',
+        'bdr-dashed': 'dashed',
+        'bdr-hair__': 'hairline',
+        'bdr-inset_': 'inset',
+        'bdr-das-sm': 'dash-small',
+        'bdr-dot-sm': 'dot-dash',
+        'bdr-dot-do': 'dot-dot-dash',
+        'bdr-outset': 'outset',
+        'bdr-trippl': 'tripple',
+        'bdr-thsm__': 'thick-thin-small',
+        'bdr-htsm__': 'thin-thick-small',
+        'bdr-hthsm_': 'thin-thick-thin-small',
+        'bdr-thm__': 'thick-thin-medium',
+        'bdr-htm__': 'thin-thick-medium',
+        'bdr-hthm_': 'thin-thick-thin-medium',
+        'bdr-thl__': 'thick-thin-large',
+        'bdr-hthl_': 'think-thick-think-large',
+        'bdr-wavy_': 'wavy',
+        'bdr-d-wav': 'double-wavy',
+        'bdr-strip': 'striped',
+        'bdr-embos': 'emboss',
+        'bdr-engra': 'engrave',
+        'bdr-frame': 'frame',
+        'bdr-li-wid': 'line-width',
         # tabs
-        'tab-center'  :   'center',
-        'tab-right_'  :   'right',
-        'tab-dec___'  :   'decimal',
-        'leader-dot'  :   'leader-dot',
-        'leader-hyp'  :   'leader-hyphen',
-        'leader-und'  :   'leader-underline',
+        'tab-center':   'center',
+        'tab-right_':   'right',
+        'tab-dec___':   'decimal',
+        'leader-dot':   'leader-dot',
+        'leader-hyp':   'leader-hyphen',
+        'leader-und':   'leader-underline',
         }
         self.__tabs_dict = {
         'cw<pf<tab-stop__'  :   self.__tab_stop_func,
@@ -267,7 +267,7 @@ class Styles:
         self.__leader_found = 0
 
     def __in_individual_style_func(self, line):
-        """
+        '''
         Required:
             line
         Returns:
@@ -283,7 +283,7 @@ class Styles:
             Write an error message if no key is found for the info.
             If the line is text, add the text to a text string. The text
             string will be the name of the style.
-            """
+        '''
         action = self.__state_dict.get(self.__token_info)
         if action:
             action(line)
@@ -301,7 +301,7 @@ class Styles:
             # cw<pf<widow-cntl<nu<true
             info = line[6:16]
             att = self.__token_dict.get(info)
-            if att is None :
+            if att is None:
                 if info not in self.__ignore_list:
                     if self.__run_level > 3:
                         msg = 'no value for key %s\n' % info
@@ -313,7 +313,7 @@ class Styles:
             self.__text_string += line[17:-1]
 
     def __tab_stop_func(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -321,7 +321,7 @@ class Styles:
         Logic:
             Try to add the number to dictionary entry tabs-left, or tabs-right, etc.
             If the dictionary entry doesn't exist, create one.
-        """
+        '''
         try:
             if self.__leader_found:
                 self.__styles_dict['par'][self.__styles_num]['tabs']\
@@ -342,8 +342,8 @@ class Styles:
         self.__leader_found = 0
 
     def __tab_type_func(self, line):
-        """
-        """
+        '''
+        '''
         type = self.__tab_type_dict.get(self.__token_info)
         if type is not None:
             self.__tab_type = type
@@ -353,7 +353,7 @@ class Styles:
                 raise self.__bug_handler(msg)
 
     def __tab_leader_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -362,7 +362,7 @@ class Styles:
             Try to add the string of the tab leader to dictionary entry
             tabs-left, or tabs-right, etc.  If the dictionary entry doesn't
             exist, create one.
-        """
+        '''
         self.__leader_found = 1
         leader = self.__tab_type_dict.get(self.__token_info)
         if leader is not None:
@@ -378,7 +378,7 @@ class Styles:
                 raise self.__bug_handler(msg)
 
     def __tab_bar_func(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -386,7 +386,7 @@ class Styles:
         Logic:
             Try to add the string of the tab bar to dictionary entry tabs-bar.
             If the dictionary entry doesn't exist, create one.
-        """
+        '''
         # self.__add_dict_entry('tabs-bar', line[20:-1])
         try:
             self.__styles_dict['par'][self.__styles_num]['tabs']\
@@ -402,7 +402,7 @@ class Styles:
         self.__tab_type = 'left'
 
     def __enter_dict_entry(self, att, value):
-        """
+        '''
         Required:
             att -- the attribute
             value -- the value
@@ -412,14 +412,14 @@ class Styles:
             Try to add the attribute value directly to the styles dictionary.
             If a keyerror is found, that means I have to build the "branches"
             of the dictionary before I can add the key value pair.
-        """
+        '''
         try:
             self.__styles_dict[self.__type_of_style][self.__styles_num][att] = value
         except KeyError:
             self.__add_dict_entry(att, value)
 
     def __add_dict_entry(self, att, value):
-        """
+        '''
         Required:
             att --the attribute
             value --the value
@@ -434,9 +434,9 @@ class Styles:
             Next, create a second, smaller dictionary with just the attribute and value.
             Add the small dictionary to the type dictionary.
             Add this type dictionary to the main styles dictionary.
-        """
+        '''
         if self.__type_of_style == 'par':
-            type_dict =self.__styles_dict['par']
+            type_dict = self.__styles_dict['par']
         elif self.__type_of_style == 'char':
             type_dict = self.__styles_dict['char']
         else:
@@ -449,7 +449,7 @@ class Styles:
         self.__styles_dict[self.__type_of_style] = type_dict
 
     def __para_style_func(self, line):
-        """
+        '''
         Required:
             line
         Returns:
@@ -457,19 +457,17 @@ class Styles:
         Logic:
             Set the type of style to paragraph.
             Extract the number for a line such as "cw<ss<para-style<nu<15".
-        """
+        '''
         self.__type_of_style = 'par'
         self.__styles_num = line[20:-1]
-        """
-        self.__enter_dict_entry('tabs-left', '')
-        self.__enter_dict_entry('tabs-right', '')
-        self.__enter_dict_entry('tabs-center', '')
-        self.__enter_dict_entry('tabs-decimal', '')
-        self.__enter_dict_entry('tabs-bar', '')
-        """
+        # self.__enter_dict_entry('tabs-left', '')
+        # self.__enter_dict_entry('tabs-right', '')
+        # self.__enter_dict_entry('tabs-center', '')
+        # self.__enter_dict_entry('tabs-decimal', '')
+        # self.__enter_dict_entry('tabs-bar', '')
 
     def __char_style_func(self, line):
-        """
+        '''
         Required:
             line
         Returns:
@@ -477,12 +475,12 @@ class Styles:
         Logic:
             Set the type of style to character.
             Extract the number for a line such as "cw<ss<char-style<nu<15".
-        """
+        '''
         self.__type_of_style = 'char'
         self.__styles_num = line[20:-1]
 
     def __found_beg_ind_style_func(self, line):
-        """
+        '''
         Required:
             line
         Returns:
@@ -491,7 +489,7 @@ class Styles:
             Get rid of the last semicolon in the text string. Add the text
             string as the value with 'name' as the key in the style
             dictionary.
-        """
+        '''
         self.__state = 'in_individual_style'
 
     def __found_end_ind_style_func(self, line):
@@ -503,7 +501,7 @@ class Styles:
         self.__text_string = ''
 
     def __found_end_styles_table_func(self, line):
-        """
+        '''
         Required:
             line
         Returns:
@@ -512,13 +510,13 @@ class Styles:
             Set the state to after the styles table.
             Fix the styles. (I explain this below.)
             Print out the style table.
-        """
+        '''
         self.__state = 'after_styles_table'
         self.__fix_based_on()
         self.__print_style_table()
 
     def __fix_based_on(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -532,7 +530,7 @@ class Styles:
             all the character styles.
             The inner loop: first check 'next-style', then check 'based-on-style'.
             Make sure values exist for the keys to avoid the nasty keyerror message.
-        """
+        '''
         types = ['par', 'char']
         for type in types:
             keys = self.__styles_dict[type].keys()
@@ -558,7 +556,7 @@ class Styles:
                             del self.__styles_dict[type][key][style]
 
     def __print_style_table(self):
-        """
+        '''
         Required:
             nothing
         Returns:
@@ -570,7 +568,7 @@ class Styles:
             The next loop iterates through the style numbers.
             The most inside loop iterates over the pairs of attributes and
             values, and prints them out.
-        """
+        '''
         types = ['par', 'char']
         for type in types:
             if type == 'par':
@@ -597,18 +595,18 @@ class Styles:
             )
 
     def __found_styles_table_func(self, line):
-        """
+        '''
         Required:
             line
         Returns:
             nothing
         Logic:
             Change the state to in the style table when the marker has been found.
-        """
+        '''
         self.__state = 'in_styles_table'
 
     def __before_styles_func(self, line):
-        """
+        '''
         Required:
             line
         Returns:
@@ -617,7 +615,7 @@ class Styles:
             Check the line info in the state dictionary. When the beginning of
             the styles table is found, change the state to in the styles
             table.
-        """
+        '''
         action = self.__state_dict.get(self.__token_info)
         if not action:
             self.__write_obj.write(line)
@@ -625,7 +623,7 @@ class Styles:
             action(line)
 
     def __in_styles_func(self, line):
-        """
+        '''
         Required:
             line
         Returns:
@@ -633,7 +631,7 @@ class Styles:
         Logic:
             Check the line for the beginning of an individual style. If it is
             not found, simply print out the line.
-        """
+        '''
         action = self.__state_dict.get(self.__token_info)
         if action is None:
             self.__write_obj.write(line)
@@ -641,7 +639,7 @@ class Styles:
             action(line)
 
     def __para_style_in_body_func(self, line, type):
-        """
+        '''
         Required:
             line-- the line
             type -- whether a character or paragraph
@@ -651,7 +649,7 @@ class Styles:
             Determine the prefix by whether the type is "par" or "char".
             Extract the number from a line such as "cw<ss<para-style<nu<15".
             Look up that number in the styles dictionary and put a name for a number
-        """
+        '''
         if type == 'par':
             prefix = 'para'
         else:
@@ -672,7 +670,7 @@ class Styles:
             )
 
     def __after_styles_func(self, line):
-        """
+        '''
         Required:
             line
         Returns:
@@ -681,7 +679,7 @@ class Styles:
             Determine if a line with either character of paragraph style info
             has been found. If so, then use the appropriate method to parse
             the line. Otherwise, write the line to a file.
-        """
+        '''
         action, type = self.__body_dict.get(self.__token_info, (None, None))
         if action:
             action(line, type)
@@ -689,7 +687,7 @@ class Styles:
             self.__write_obj.write(line)
 
     def convert_styles(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -702,7 +700,7 @@ class Styles:
             and print out the tags.
             If the state if after the style table, look for lines with style
             info, and substitute the number with the name of the style.
-        """
+        '''
         self.__initiate_values()
         read_obj = open_for_read(self.__file)
         self.__write_obj = open_for_write(self.__write_to)
@@ -720,6 +718,6 @@ class Styles:
         self.__write_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "styles.data")
+            copy_obj.copy_file(self.__write_to, 'styles.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/table.py b/src/calibre/ebooks/rtf2xml/table.py
index 774fcee278..5dbf666d01 100644
--- a/src/calibre/ebooks/rtf2xml/table.py
+++ b/src/calibre/ebooks/rtf2xml/table.py
@@ -18,7 +18,7 @@ from calibre.ptempfile import better_mktemp
 
 from . import open_for_read, open_for_write
 
-"""
+'''
 States.
 1. 'not_in_table'
     1. 'cw<tb<row-def___' start a row definition
@@ -43,23 +43,23 @@ States.
 5. 'in_cell'
     1. 'mi<mk<not-in-tbl', end table
     2. 'cw<tb<cell______', end cell
-"""
+'''
 
 
 class Table:
-    """
+    '''
     Make tables.
     Logic:
     Read one line at a time. The default state (self.__state) is
     'not_in_table'. Look for either a 'cw<tb<in-table__', or a row definition.
-    """
+    '''
 
     def __init__(self,
             in_file,
             bug_handler,
             copy=None,
             run_level=1,):
-        """
+        '''
         Required:
             'file'--file to parse
         Optional:
@@ -68,7 +68,7 @@ class Table:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -76,32 +76,32 @@ class Table:
         self.__write_to = better_mktemp()
 
     def __initiate_values(self):
-        """
+        '''
         Initiate all values.
-        """
+        '''
         self.__state_dict = {
-        'in_table':         self.__in_table_func,
-        'in_row_def':       self.__in_row_def_func,
-        'not_in_table':     self.__not_in_table_func,
-        'in_cell':          self.__in_cell_func,
-        'in_row':           self.__in_row_func,
+        'in_table'      : self.__in_table_func,
+        'in_row_def'    : self.__in_row_def_func,
+        'not_in_table'  : self.__not_in_table_func,
+        'in_cell'       : self.__in_cell_func,
+        'in_row'        : self.__in_row_func,
         }
         self.__not_in_table_dict = {
-        'cw<tb<row-def___':   self.__found_row_def_func,
-        'cw<tb<in-table__': self.__start_table_func,
+        'cw<tb<row-def___'  : self.__found_row_def_func,
+        'cw<tb<in-table__'  : self.__start_table_func,
         'mi<mk<in-table__'  : self.__start_table_func,
         }
         # can't use this dictionary. When in row_definition, many tokens
         # require multiple definitions
         self.__in_row_definition_dict = {
-        'mi<mk<not-in-tbl'  :   self.__end_row_table_func,
-        'mi<mk<pard-start'  :   self.__end_row_def_func,
+        'mi<mk<not-in-tbl'  : self.__end_row_table_func,
+        'mi<mk<pard-start'  : self.__end_row_def_func,
         }
         self.__in_row_dict = {
-        'mi<mk<not-in-tbl'  :   self.__close_table,
-        'mi<mk<pard-start'  :   self.__start_cell_func,
-        'cw<tb<row_______'  :   self.__end_row_func,
-        'cw<tb<cell______'  :   self.__empty_cell,
+        'mi<mk<not-in-tbl'  : self.__close_table,
+        'mi<mk<pard-start'  : self.__start_cell_func,
+        'cw<tb<row_______'  : self.__end_row_func,
+        'cw<tb<cell______'  : self.__empty_cell,
         }
         # set the default state
         self.__state = ['not_in_table']
@@ -113,14 +113,14 @@ class Table:
         self.__cell_widths = []
 
     def __in_table_func(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Logic:
             Look for the end of the table. If found, close out the table.
             Look for  'mi<mk<pard-start', which marks the beginning of a row. Start
             a row and start a cell.
-        """
+        '''
         # 'cell'               : ('tb', 'cell______', self.default_func),
         if self.__token_info == 'mi<mk<not-in-tbl' or\
             self.__token_info == 'mi<mk<sect-start' or\
@@ -138,7 +138,7 @@ class Table:
         self.__write_obj.write(line)
 
     def __not_in_table_func(self, line):
-        """
+        '''
         Requires:
             line -- the line of text read in from document
         Returns:
@@ -148,14 +148,14 @@ class Table:
             mark the start of a table: 'cw<tb<row-def', or 'cw<tb<in-table__'.
             If these tokens are found, use another method to start a table
             and change states. Otherwise, just output the line.
-        """
+        '''
         action = self.__not_in_table_dict.get(self.__token_info)
         if action:
             action(line)
         self.__write_obj.write(line)
 
     def __close_table(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -164,7 +164,7 @@ class Table:
             Write the end marker for the table.
             Write the end tag for the table.
             Set the state to ['not_in_table']
-        """
+        '''
         self.__write_obj.write('mi<mk<table-end_\n')
         self.__state = ['not_in_table']
         self.__table_data[-1]['number-of-columns'] = self.__max_number_cells_in_row
@@ -175,7 +175,7 @@ class Table:
         self.__table_data[-1]['average-cell-width'] = average_cell_width
 
     def __found_row_def_func(self, line):
-        """
+        '''
         Requires:
             line don't need this except for consistency with other methods.
         Returns:
@@ -183,7 +183,7 @@ class Table:
         Logic:
             A row definition has been found. Collect all the data from this
             to use later in writing attributes for the table.
-        """
+        '''
         self.__state.append('in_row_def')
         self.__last_cell_position = 0
         self.__row_dict = {}
@@ -192,7 +192,7 @@ class Table:
         self.__cell_widths = []
 
     def __start_table_func(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -201,7 +201,7 @@ class Table:
             Add the 'in_table' to the state list.
             Write out the table marker.
             Initialize table values (not sure about these yet)
-        """
+        '''
         self.__rows_in_table = 0
         self.__cells_in_table = 0
         self.__cells_in_row = 0
@@ -212,18 +212,18 @@ class Table:
         self.__state.append('in_table')
 
     def __end_row_table_func(self, line):
-        """
+        '''
         Requires:
             line --just for consistencey
         Returns:
             ?
         Logic:
             ?
-        """
+        '''
         self.__close_table(self, line)
 
     def __end_row_def_func(self, line):
-        """
+        '''
         Requires:
             line --just for consistency
         Returns:
@@ -233,7 +233,7 @@ class Table:
             get rid of the last {} in the cell list
             figure out the number of cells based on the self.__row_dict[widths]
             ('122, 122')
-        """
+        '''
         if len(self.__state) > 0:
             if self.__state[-1] == 'in_row_def':
                 self.__state.pop()
@@ -246,7 +246,7 @@ class Table:
             self.__row_dict['number-of-cells'] = num_cells
 
     def __in_row_def_func(self, line):
-        """
+        '''
         Requires:
             line --line to parse
         Returns:
@@ -258,7 +258,7 @@ class Table:
             While in the row definition, certain tokens can end a row or end a table.
             If a paragrah definition (pard-start) is found, and the you are already in
             a table, start of a row.
-        """
+        '''
         if self.__token_info == 'cw<tb<row_______':
             # write tags
             self.__end_row_func(line)
@@ -289,7 +289,7 @@ class Table:
             self.__write_obj.write(line)
 
     def __handle_row_token(self, line):
-        """
+        '''
         Requires:
             line -- line to parse
         Returns:
@@ -304,7 +304,7 @@ class Table:
             the last item in the cell list. ([{border:something, width:something},
                     {border:something, width:something}])
     cw<bd<bor-t-r-to<nu<bdr-hair__|bdr-li-wid:0.50
-        """
+        '''
         if line[3:5] == 'bd':
             border_obj = border_parse.BorderParse()
             the_dict = border_obj.parse_border(line)
@@ -330,7 +330,7 @@ class Table:
             self.__row_dict['header'] = 'true'
 
     def __start_cell_func(self, line):
-        """
+        '''
         Required:
             line -- the line of text
         Returns:
@@ -341,7 +341,7 @@ class Table:
             Write value => attributes for key=> value
             pop the self.__cell_list.
             Otherwise, print out a cell tag.
-        """
+        '''
         self.__state.append('in_cell')
         # self.__cell_list = []
         if len(self.__cell_list) > 0:
@@ -361,7 +361,7 @@ class Table:
         self.__cells_in_row += 1
 
     def __start_row_func(self, line):
-        """
+        '''
         Required:
             line -- the line of text
         Returns:
@@ -369,7 +369,7 @@ class Table:
         Logic:
             Append 'in_row' for states
             Write value => attributes for key=> value
-        """
+        '''
         self.__state.append('in_row')
         self.__write_obj.write('mi<tg<open-att__<row')
         keys = self.__row_dict.keys()
@@ -380,7 +380,7 @@ class Table:
         self.__rows_in_table += 1
 
     def __found_cell_position(self, line):
-        """
+        '''
         needs:
             line: current line
         returns:
@@ -390,7 +390,7 @@ class Table:
            If the cell is the first cell, you should add the left cell position to it.
            (This value is often negative.)
             Next, set the new last_cell_position to the current cell position.
-        """
+        '''
         # cw<tb<cell-posit<nu<216.00
         new_cell_position = round(float(line[20:-1]), 2)
         left_position = 0
@@ -411,7 +411,7 @@ class Table:
         self.__cell_widths.append(width)
 
     def __in_cell_func(self, line):
-        """
+        '''
         Required:
             line
         Returns:
@@ -423,7 +423,7 @@ class Table:
             Look for the close of the cell. If found, use the close cell function to close out
             the cell.
             Otherwise, print out the line.
-        """
+        '''
         # cw<tb<cell______<nu<true
         # mi<mk<sect-start
         if self.__token_info == 'mi<mk<not-in-tbl' or\
@@ -434,20 +434,20 @@ class Table:
             self.__end_row_func(line)
             self.__close_table(line)
             self.__write_obj.write(line)
-        elif self.__token_info ==  'cw<tb<cell______':
+        elif self.__token_info == 'cw<tb<cell______':
             self.__end_cell_func(line)
         else:
             self.__write_obj.write(line)
 
     def __end_cell_func(self, line):
-        """
+        '''
         Requires:
             line
         Returns:
             nothing
         Logic:
             End the cell. Print out the closing marks. Pop the self.__state.
-        """
+        '''
         if len(self.__state) > 1:
             if self.__state[-1] == 'in_cell':
                 self.__state.pop()
@@ -468,20 +468,18 @@ class Table:
             if action:
                 action(line)
             self.__write_obj.write(line)
-        """
-        elif self.__token_info == 'mi<mk<pard-start':
-            self.__start_cell_func(line)
-            self.__write_obj.write(line)
-        elif self.__token_info == 'cw<tb<row_______':
-            self.__end_row_func(line)
-            self.__write_obj.write(line)
-        else:
-            self.__write_obj.write(line)
-        """
+        # elif self.__token_info == 'mi<mk<pard-start':
+        #     self.__start_cell_func(line)
+        #     self.__write_obj.write(line)
+        # elif self.__token_info == 'cw<tb<row_______':
+        #     self.__end_row_func(line)
+        #     self.__write_obj.write(line)
+        # else:
+        #     self.__write_obj.write(line)
 
     def __end_row_func(self, line):
-        """
-        """
+        '''
+        '''
         if len(self.__state) > 1 and self.__state[-1] == 'in_row':
             self.__state.pop()
             self.__write_obj.write('mi<tg<close_____<row\n')
@@ -493,7 +491,7 @@ class Table:
         self.__list_of_cells_in_row.append(self.__cells_in_row)
 
     def __empty_cell(self, line):
-        """
+        '''
         Required:
             line -- line of text
         Returns:
@@ -501,7 +499,7 @@ class Table:
         Logic:
             Write an empty tag with attributes if there are attributes.
             Otherwise, written an empty tag with cell as element.
-        """
+        '''
         if len(self.__cell_list) > 0:
             self.__write_obj.write('mi<tg<empty-att_<cell')
             cell_dict = self.__cell_list[-1]
@@ -515,7 +513,7 @@ class Table:
         self.__cells_in_row += 1
 
     def __mode(self, the_list):
-        """
+        '''
         Required:
             the_list -- a list of something
         Returns:
@@ -523,7 +521,7 @@ class Table:
         Logic:
             get the count of each item in list. The count that is the greatest
             is the mode.
-        """
+        '''
         max = 0
         mode = 'not-defined'
         for item in the_list:
@@ -534,7 +532,7 @@ class Table:
         return mode
 
     def make_table(self):
-        """
+        '''
         Requires:
             nothing
         Returns:
@@ -542,7 +540,7 @@ class Table:
         Logic:
             Read one line in at a time. Determine what action to take based on
             the state.
-        """
+        '''
         self.__initiate_values()
         read_obj = open_for_read(self.__file)
         self.__write_obj = open_for_write(self.__write_to)
@@ -552,7 +550,7 @@ class Table:
             line = line_to_read
             self.__token_info = line[:16]
             action = self.__state_dict.get(self.__state[-1])
-            # print self.__state[-1]
+            # print(self.__state[-1])
             if action is None:
                 sys.stderr.write('No matching state in module table.py\n')
                 sys.stderr.write(self.__state[-1] + '\n')
@@ -561,7 +559,7 @@ class Table:
         self.__write_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "table.data")
+            copy_obj.copy_file(self.__write_to, 'table.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
         return self.__table_data
diff --git a/src/calibre/ebooks/rtf2xml/table_info.py b/src/calibre/ebooks/rtf2xml/table_info.py
index 56983c2280..37376bd43d 100644
--- a/src/calibre/ebooks/rtf2xml/table_info.py
+++ b/src/calibre/ebooks/rtf2xml/table_info.py
@@ -18,15 +18,15 @@ from calibre.ptempfile import better_mktemp
 from . import open_for_read, open_for_write
 
 # note to self. This is the first module in which I use tempfile. A good idea?
-"""
-"""
+'''
+'''
 
 
 class TableInfo:
-    """
+    '''
     Insert table data for tables.
     Logic:
-    """
+    '''
 
     def __init__(self,
             in_file,
@@ -34,7 +34,7 @@ class TableInfo:
             table_data,
             copy=None,
             run_level=1,):
-        """
+        '''
         Required:
             'file'--file to parse
             'table_data' -- a dictionary for each table.
@@ -44,7 +44,7 @@ class TableInfo:
             directory from which the script is run.)
         Returns:
             nothing
-            """
+        '''
         self.__file = in_file
         self.__bug_handler = bug_handler
         self.__copy = copy
@@ -54,8 +54,8 @@ class TableInfo:
         # self.__write_to = 'table_info.data'
 
     def insert_info(self):
-        """
-        """
+        '''
+        '''
         read_obj = open_for_read(self.__file)
         self.__write_obj = open_for_write(self.__write_to)
         line_to_read = 1
@@ -84,6 +84,6 @@ class TableInfo:
         self.__write_obj.close()
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "table_info.data")
+            copy_obj.copy_file(self.__write_to, 'table_info.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
diff --git a/src/calibre/ebooks/rtf2xml/tokenize.py b/src/calibre/ebooks/rtf2xml/tokenize.py
index 6a9bde8830..a3591f4f13 100644
--- a/src/calibre/ebooks/rtf2xml/tokenize.py
+++ b/src/calibre/ebooks/rtf2xml/tokenize.py
@@ -22,7 +22,7 @@ from . import open_for_read, open_for_write
 
 
 class Tokenize:
-    """Tokenize RTF into one line per field. Each line will contain information useful for the rest of the script"""
+    '''Tokenize RTF into one line per field. Each line will contain information useful for the rest of the script'''
 
     def __init__(self,
             in_file,
@@ -84,7 +84,7 @@ class Tokenize:
                 self.__uc_char -=1
                 self.__uc_bin = True
                 return ''
-            elif token[:1] == "\\" :
+            elif token[:1] == '\\':
                 self.__uc_char -=1
                 return ''
             else:
@@ -114,14 +114,14 @@ class Tokenize:
         # default
         return token
 
-    def __sub_reg_split(self,input_file):
+    def __sub_reg_split(self, input_file):
         input_file = self.__replace_spchar.mreplace(input_file)
         # this is for older RTF
         input_file = self.__par_exp.sub(r'\n\\par \n', input_file)
-        input_file = self.__cwdigit_exp.sub(r"\g<1>\n\g<2>", input_file)
-        input_file = self.__cs_ast.sub(r"\g<1>", input_file)
-        input_file = self.__ms_hex_exp.sub(r"\\mshex0\g<1> ", input_file)
-        input_file = self.__utf_ud.sub(r"\\{\\uc0 \g<1>\\}", input_file)
+        input_file = self.__cwdigit_exp.sub(r'\g<1>\n\g<2>', input_file)
+        input_file = self.__cs_ast.sub(r'\g<1>', input_file)
+        input_file = self.__ms_hex_exp.sub(r'\\mshex0\g<1> ', input_file)
+        input_file = self.__utf_ud.sub(r'\\{\\uc0 \g<1>\\}', input_file)
         # remove \n in bin data
         input_file = self.__bin_exp.sub(lambda x:
                                         x.group().replace('\n', '') + '\n', input_file)
@@ -132,51 +132,51 @@ class Tokenize:
 
     def __compile_expressions(self):
         SIMPLE_RPL = {
-            "\\\\": "\\backslash ",
-            "\\~": "\\~ ",
-            "\\;": "\\; ",
-            "&": "&amp;",
-            "<": "&lt;",
-            ">": "&gt;",
-            "\\_": "\\_ ",
-            "\\:": "\\: ",
-            "\\-": "\\- ",
+            '\\\\': '\\backslash ',
+            '\\~': '\\~ ',
+            '\\;': '\\; ',
+            '&': '&amp;',
+            '<': '&lt;',
+            '>': '&gt;',
+            '\\_': '\\_ ',
+            '\\:': '\\: ',
+            '\\-': '\\- ',
             # turn into a generic token to eliminate special
             # cases and make processing easier
-            "\\{": "\\ob ",
+            '\\{': '\\ob ',
             # turn into a generic token to eliminate special
             # cases and make processing easier
-            "\\}": "\\cb ",
+            '\\}': '\\cb ',
             # put a backslash in front of to eliminate special cases and
             # make processing easier
-            "{": "\\{",
+            '{': '\\{',
             # put a backslash in front of to eliminate special cases and
             # make processing easier
-            "}": "\\}",
+            '}': '\\}',
             }
         self.__replace_spchar = MReplace(SIMPLE_RPL)
         # add ;? in case of char following \u
         self.__ms_hex_exp = re.compile(r"\\\'([0-9a-fA-F]{2})")
-        self.__utf_exp = re.compile(r"\\u(-?\d{3,6}) ?")
-        self.__bin_exp = re.compile(r"(?:\\bin(-?\d{0,10})[\n ]+)[01\n]+")
+        self.__utf_exp = re.compile(r'\\u(-?\d{3,6}) ?')
+        self.__bin_exp = re.compile(r'(?:\\bin(-?\d{0,10})[\n ]+)[01\n]+')
         # manage upr/ud situations
-        self.__utf_ud = re.compile(r"\\{[\n ]?\\upr[\n ]?(?:\\{.*?\\})[\n ]?" +
-                       r"\\{[\n ]?\\*[\n ]?\\ud[\n ]?(\\{.*?\\})[\n ]?\\}[\n ]?\\}")
+        self.__utf_ud = re.compile(r'\\{[\n ]?\\upr[\n ]?(?:\\{.*?\\})[\n ]?' +
+                       r'\\{[\n ]?\\*[\n ]?\\ud[\n ]?(\\{.*?\\})[\n ]?\\}[\n ]?\\}')
         # add \n in split for whole file reading
         # why keep backslash whereas \is replaced before?
         # remove \n from endline char
-        self.__splitexp = re.compile(r"(\\[{}]|\n|\\[^\s\\{}&]+(?:[ \t\r\f\v])?)")
+        self.__splitexp = re.compile(r'(\\[{}]|\n|\\[^\s\\{}&]+(?:[ \t\r\f\v])?)')
         # this is for old RTF
         self.__par_exp = re.compile(r'(\\\n+|\\ )')
         # handle improper cs char-style with \* before without {
         self.__cs_ast = re.compile(r'\\\*([\n ]*\\cs\d+[\n \\]+)')
         # handle cw using a digit as argument and without space as delimiter
-        self.__cwdigit_exp = re.compile(r"(\\[a-zA-Z]+[\-0-9]+)([^0-9 \\]+)")
+        self.__cwdigit_exp = re.compile(r'(\\[a-zA-Z]+[\-0-9]+)([^0-9 \\]+)')
 
     def tokenize(self):
-        """Main class for handling other methods. Reads the file \
-        , uses method self.sub_reg to make basic substitutions,\
-        and process tokens by itself"""
+        '''Main class for handling other methods. Reads the file,
+        uses method self.sub_reg to make basic substitutions,
+        and process tokens by itself'''
         # read
         with open_for_read(self.__file) as read_obj:
             input_file = read_obj.read()
@@ -195,7 +195,7 @@ class Tokenize:
         # Move and copy
         copy_obj = copy.Copy(bug_handler=self.__bug_handler)
         if self.__copy:
-            copy_obj.copy_file(self.__write_to, "tokenize.data")
+            copy_obj.copy_file(self.__write_to, 'tokenize.data')
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
 
@@ -204,7 +204,7 @@ class Tokenize:
 # import sys
 # def main(args=sys.argv):
     # if len(args) < 2:
-        # print 'No file'
+        # print('No file')
         # return
     # file = 'data_tokens.txt'
     # if len(args) == 3:
diff --git a/src/calibre/ebooks/snb/snbfile.py b/src/calibre/ebooks/snb/snbfile.py
index 07536bf880..f5e8974d99 100644
--- a/src/calibre/ebooks/snb/snbfile.py
+++ b/src/calibre/ebooks/snb/snbfile.py
@@ -39,7 +39,7 @@ class SNBFile:
     def Open(self, inputFile):
         self.fileName = inputFile
 
-        with open(self.fileName, "rb") as f:
+        with open(self.fileName, 'rb') as f:
             f.seek(0)
             self.Parse(f)
 
@@ -74,7 +74,7 @@ class SNBFile:
             if f.attr & 0x41000000 == 0x41000000:
                 # Compressed Files
                 if uncompressedData is None:
-                    uncompressedData = b""
+                    uncompressedData = b''
                     for i in range(self.plainBlock):
                         bzdc = bz2.BZ2Decompressor()
                         if (i < self.plainBlock - 1):
@@ -101,7 +101,7 @@ class SNBFile:
                 f.fileBody = snbFile.read(f.fileSize)
                 binPos += f.fileSize
             else:
-                raise ValueError(f"Invalid file: {f.attr} {f.fileName}")
+                raise ValueError(f'Invalid file: {f.attr} {f.fileName}')
 
     def ParseFile(self, vfat, fileCount):
         fileNames = vfat[fileCount*12:].split(b'\0')
@@ -127,8 +127,8 @@ class SNBFile:
             return False
         if self.rev80 != SNBFile.REV80:
             return False
-#        if self.revA3 != SNBFile.REVA3:
-#            return False
+        # if self.revA3 != SNBFile.REVA3:
+        #     return False
         if self.revZ1 != SNBFile.REVZ1:
             return False
         if self.revZ2 != SNBFile.REVZ2:
@@ -148,7 +148,7 @@ class SNBFile:
         for root, dirs, files in os.walk(tdir):
             for name in files:
                 p, ext = os.path.splitext(name)
-                if ext in [".snbf", ".snbc"]:
+                if ext in ['.snbf', '.snbc']:
                     self.AppendPlain(os.path.relpath(os.path.join(root, name), tdir), tdir)
                 else:
                     self.AppendBinary(os.path.relpath(os.path.join(root, name), tdir), tdir)
@@ -156,23 +156,23 @@ class SNBFile:
     def AppendPlain(self, fileName, tdir):
         f = FileStream()
         f.attr = 0x41000000
-        f.fileSize = os.path.getsize(os.path.join(tdir,fileName))
-        with open(os.path.join(tdir,fileName), 'rb') as data:
+        f.fileSize = os.path.getsize(os.path.join(tdir, fileName))
+        with open(os.path.join(tdir, fileName), 'rb') as data:
             f.fileBody = data.read()
         f.fileName = fileName.replace(os.sep, '/')
         if isinstance(f.fileName, str):
-            f.fileName = f.fileName.encode("ascii", "ignore")
+            f.fileName = f.fileName.encode('ascii', 'ignore')
         self.files.append(f)
 
     def AppendBinary(self, fileName, tdir):
         f = FileStream()
         f.attr = 0x01000000
-        f.fileSize = os.path.getsize(os.path.join(tdir,fileName))
-        with open(os.path.join(tdir,fileName), 'rb') as data:
+        f.fileSize = os.path.getsize(os.path.join(tdir, fileName))
+        with open(os.path.join(tdir, fileName), 'rb') as data:
             f.fileBody = data.read()
         f.fileName = fileName.replace(os.sep, '/')
         if isinstance(f.fileName, str):
-            f.fileName = f.fileName.encode("ascii", "ignore")
+            f.fileName = f.fileName.encode('ascii', 'ignore')
         self.files.append(f)
 
     def GetFileStream(self, fileName):
@@ -220,7 +220,7 @@ class SNBFile:
                 f.contentOffset = len(binStream)
                 binStream += f.fileBody
             else:
-                raise Exception(f"Unknown file type: {f.attr} {f.fileName}")
+                raise Exception(f'Unknown file type: {f.attr} {f.fileName}')
         vfatCompressed = zlib.compress(vfat+fileNameTable)
 
         # File header part 2
@@ -278,35 +278,34 @@ class SNBFile:
 
         # Close
         outputFile.close()
-        return
 
     def Dump(self):
         if self.fileName:
-            print("File Name:\t", self.fileName)
-        print("File Count:\t", self.fileCount)
-        print("VFAT Size(Compressed):\t%d(%d)" % (self.vfatSize, self.vfatCompressed))
-        print("Binary Stream Size:\t", self.binStreamSize)
-        print("Plain Stream Uncompressed Size:\t", self.plainStreamSizeUncompressed)
-        print("Binary Block Count:\t", self.binBlock)
-        print("Plain Block Count:\t", self.plainBlock)
+            print('File Name:\t', self.fileName)
+        print('File Count:\t', self.fileCount)
+        print('VFAT Size(Compressed):\t%d(%d)' % (self.vfatSize, self.vfatCompressed))
+        print('Binary Stream Size:\t', self.binStreamSize)
+        print('Plain Stream Uncompressed Size:\t', self.plainStreamSizeUncompressed)
+        print('Binary Block Count:\t', self.binBlock)
+        print('Plain Block Count:\t', self.plainBlock)
         for i in range(self.fileCount):
-            print("File ", i)
+            print('File ', i)
             f = self.files[i]
-            print("File Name: ", f.fileName)
-            print("File Attr: ", f.attr)
-            print("File Size: ", f.fileSize)
-            print("Block Index: ", f.blockIndex)
-            print("Content Offset: ", f.contentOffset)
-            with open("/tmp/" + f.fileName, 'wb') as tempFile:
+            print('File Name: ', f.fileName)
+            print('File Attr: ', f.attr)
+            print('File Size: ', f.fileSize)
+            print('Block Index: ', f.blockIndex)
+            print('Content Offset: ', f.contentOffset)
+            with open('/tmp/' + f.fileName, 'wb') as tempFile:
                 tempFile.write(f.fileBody)
 
 
 def usage():
-    print("This unit test is for INTERNAL usage only!")
-    print("This unit test accept two parameters.")
-    print("python snbfile.py <INPUTFILE> <DESTFILE>")
-    print("The input file will be extracted and write to dest file. ")
-    print("Meta data of the file will be shown during this process.")
+    print('This unit test is for INTERNAL usage only!')
+    print('This unit test accept two parameters.')
+    print('python snbfile.py <INPUTFILE> <DESTFILE>')
+    print('The input file will be extracted and write to dest file. ')
+    print('Meta data of the file will be shown during this process.')
 
 
 def main():
@@ -316,19 +315,19 @@ def main():
     inputFile = sys.argv[1]
     outputFile = sys.argv[2]
 
-    print("Input file: ", inputFile)
-    print("Output file: ", outputFile)
+    print('Input file: ', inputFile)
+    print('Output file: ', outputFile)
 
     snbFile = SNBFile(inputFile)
     if snbFile.IsValid():
         snbFile.Dump()
         snbFile.Output(outputFile)
     else:
-        print("The input file is invalid.")
+        print('The input file is invalid.')
         return 1
     return 0
 
 
-if __name__ == "__main__":
-    """SNB file unit test"""
+if __name__ == '__main__':
+    '''SNB file unit test'''
     sys.exit(main())
diff --git a/src/calibre/ebooks/snb/snbml.py b/src/calibre/ebooks/snb/snbml.py
index 4d09d20cb6..758b110814 100644
--- a/src/calibre/ebooks/snb/snbml.py
+++ b/src/calibre/ebooks/snb/snbml.py
@@ -16,9 +16,9 @@ from polyglot.builtins import string_or_bytes
 
 def ProcessFileName(fileName):
     # Flat the path
-    fileName = fileName.replace("/", "_").replace(os.sep, "_")
+    fileName = fileName.replace('/', '_').replace(os.sep, '_')
     # Handle bookmark for HTML file
-    fileName = fileName.replace("#", "_")
+    fileName = fileName.replace('#', '_')
     # Make it lower case
     fileName = fileName.lower()
     # Change all images to jpg
@@ -49,15 +49,15 @@ SPACE_TAGS = [
     'td',
 ]
 
-CALIBRE_SNB_IMG_TAG = "<$$calibre_snb_temp_img$$>"
-CALIBRE_SNB_BM_TAG = "<$$calibre_snb_bm_tag$$>"
-CALIBRE_SNB_PRE_TAG = "<$$calibre_snb_pre_tag$$>"
+CALIBRE_SNB_IMG_TAG = '<$$calibre_snb_temp_img$$>'
+CALIBRE_SNB_BM_TAG = '<$$calibre_snb_bm_tag$$>'
+CALIBRE_SNB_PRE_TAG = '<$$calibre_snb_pre_tag$$>'
 
 
 class SNBMLizer:
 
-    curSubItem = ""
-#    curText = [ ]
+    curSubItem = ''
+    # curText = [ ]
 
     def __init__(self, log):
         self.log = log
@@ -72,10 +72,10 @@ class SNBMLizer:
 
     def merge_content(self, old_tree, oeb_book, item, subitems, opts):
         newTrees = self.extract_content(oeb_book, item, subitems, opts)
-        body = old_tree.find(".//body")
+        body = old_tree.find('.//body')
         if body is not None:
             for subName in newTrees:
-                newbody = newTrees[subName].find(".//body")
+                newbody = newTrees[subName].find('.//body')
                 for entity in newbody:
                     body.append(entity)
 
@@ -86,51 +86,51 @@ class SNBMLizer:
         output = ['']
         stylizer = Stylizer(self.item.data, self.item.href, self.oeb_book, self.opts, self.opts.output_profile)
         content = etree.tostring(self.item.data.find(XHTML('body')), encoding='unicode')
-#        content = self.remove_newlines(content)
+        # content = self.remove_newlines(content)
         trees = {}
         for subitem, subtitle in self.subitems:
-            snbcTree = etree.Element("snbc")
-            snbcHead = etree.SubElement(snbcTree, "head")
-            etree.SubElement(snbcHead, "title").text = subtitle
+            snbcTree = etree.Element('snbc')
+            snbcHead = etree.SubElement(snbcTree, 'head')
+            etree.SubElement(snbcHead, 'title').text = subtitle
             if self.opts and self.opts.snb_hide_chapter_name:
-                etree.SubElement(snbcHead, "hidetitle").text = "true"
-            etree.SubElement(snbcTree, "body")
+                etree.SubElement(snbcHead, 'hidetitle').text = 'true'
+            etree.SubElement(snbcTree, 'body')
             trees[subitem] = snbcTree
-        output.append('{}{}\n\n'.format(CALIBRE_SNB_BM_TAG, ""))
+        output.append('{}{}\n\n'.format(CALIBRE_SNB_BM_TAG, ''))
         output += self.dump_text(self.subitems, safe_xml_fromstring(content), stylizer)[0]
         output = self.cleanup_text(''.join(output))
 
         subitem = ''
-        bodyTree = trees[subitem].find(".//body")
+        bodyTree = trees[subitem].find('.//body')
         for line in output.splitlines():
             pos = line.find(CALIBRE_SNB_PRE_TAG)
             if pos == -1:
                 line = line.strip(' \t\n\r\u3000')
             else:
-                etree.SubElement(bodyTree, "text").text = \
+                etree.SubElement(bodyTree, 'text').text = \
                     etree.CDATA(line[pos+len(CALIBRE_SNB_PRE_TAG):])
                 continue
             if len(line) != 0:
                 if line.find(CALIBRE_SNB_IMG_TAG) == 0:
                     prefix = ProcessFileName(os.path.dirname(self.item.href))
                     if prefix != '':
-                        etree.SubElement(bodyTree, "img").text = \
+                        etree.SubElement(bodyTree, 'img').text = \
                             prefix + '_' + line[len(CALIBRE_SNB_IMG_TAG):]
                     else:
-                        etree.SubElement(bodyTree, "img").text = \
+                        etree.SubElement(bodyTree, 'img').text = \
                             line[len(CALIBRE_SNB_IMG_TAG):]
                 elif line.find(CALIBRE_SNB_BM_TAG) == 0:
                     subitem = line[len(CALIBRE_SNB_BM_TAG):]
-                    bodyTree = trees[subitem].find(".//body")
+                    bodyTree = trees[subitem].find('.//body')
                 else:
                     if self.opts and not self.opts.snb_dont_indent_first_line:
                         prefix = '\u3000\u3000'
                     else:
                         prefix = ''
-                    etree.SubElement(bodyTree, "text").text = \
+                    etree.SubElement(bodyTree, 'text').text = \
                         etree.CDATA(str(prefix + line))
                 if self.opts and self.opts.snb_insert_empty_line:
-                    etree.SubElement(bodyTree, "text").text = \
+                    etree.SubElement(bodyTree, 'text').text = \
                         etree.CDATA('')
 
         return trees
@@ -156,22 +156,22 @@ class SNBMLizer:
         text = text.replace('\f+', ' ')
 
         # Single line paragraph.
-        text = re.sub('(?<=.)%s(?=.)' % os.linesep, ' ', text)
+        text = re.sub(r'(?<=.)%s(?=.)' % os.linesep, ' ', text)
 
         # Remove multiple spaces.
-        # text = re.sub('[ ]{2,}', ' ', text)
+        # text = re.sub(r'[ ]{2,}', ' ', text)
 
         # Remove excessive newlines.
-        text = re.sub('\n[ ]+\n', '\n\n', text)
+        text = re.sub(r'\n[ ]+\n', '\n\n', text)
         if self.opts.remove_paragraph_spacing:
-            text = re.sub('\n{2,}', '\n', text)
-            text = re.sub('(?imu)^(?=.)', '\t', text)
+            text = re.sub(r'\n{2,}', '\n', text)
+            text = re.sub(r'(?imu)^(?=.)', '\t', text)
         else:
-            text = re.sub('\n{3,}', '\n\n', text)
+            text = re.sub(r'\n{3,}', '\n\n', text)
 
         # Replace spaces at the beginning and end of lines
-        text = re.sub('(?imu)^[ ]+', '', text)
-        text = re.sub('(?imu)[ ]+$', '', text)
+        text = re.sub(r'(?imu)^[ ]+', '', text)
+        text = re.sub(r'(?imu)[ ]+$', '', text)
 
         if self.opts.snb_max_line_length:
             max_length = self.opts.snb_max_line_length
diff --git a/src/calibre/ebooks/textile/functions.py b/src/calibre/ebooks/textile/functions.py
index 73389dd071..cb782e1410 100644
--- a/src/calibre/ebooks/textile/functions.py
+++ b/src/calibre/ebooks/textile/functions.py
@@ -1,17 +1,17 @@
 #!/usr/bin/env python
 
 
-"""
+'''
 PyTextile
 
 A Humane Web Text Generator
-"""
+'''
 
 # Last upstream version basis
 # __version__ = '2.1.4'
 # __date__ = '2009/12/04'
 
-__copyright__ = """
+__copyright__ = '''
 Copyright (c) 2011, Leigh Parry <leighparry@blueyonder.co.uk>
 Copyright (c) 2011, John Schember <john@nachtimwald.com>
 Copyright (c) 2009, Jason Samsa, http://jsamsa.com/
@@ -27,9 +27,9 @@ Textile's procedural code into a class framework
 
 Additions and fixes Copyright (c) 2006 Alex Shiels http://thresholdstate.com/
 
-"""
+'''
 
-__license__ = """
+__license__ = '''
 L I C E N S E
 =============
 Redistribution and use in source and binary forms, with or without
@@ -58,7 +58,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-"""
+'''
 
 import re
 import uuid
@@ -76,7 +76,7 @@ def _normalize_newlines(string):
 
 
 def getimagesize(url):
-    """
+    '''
     Attempts to determine an image's width and height, and returns a string
     suitable for use in an <img> tag, or None in case of failure.
     Requires that PIL is installed.
@@ -85,7 +85,7 @@ def getimagesize(url):
     ... #doctest: +ELLIPSIS, +SKIP
     'width="..." height="..."'
 
-    """
+    '''
 
     from PIL import ImageFile
 
@@ -262,7 +262,7 @@ class Textile:
     ]
 
     def __init__(self, restricted=False, lite=False, noimage=False):
-        """docstring for __init__"""
+        '''docstring for __init__'''
         self.restricted = restricted
         self.lite = lite
         self.noimage = noimage
@@ -274,14 +274,14 @@ class Textile:
         self.html_type = 'xhtml'
 
     def textile(self, text, rel=None, head_offset=0, html_type='xhtml'):
-        """
+        '''
         >>> import textile
         >>> textile.textile('some textile')
-        u'\\t<p>some textile</p>'
-        """
+        '\\t<p>some textile</p>'
+        '''
         self.html_type = html_type
 
-        # text = type(u'')(text)
+        # text = str(text)
         text = _normalize_newlines(text)
 
         if self.restricted:
@@ -298,7 +298,7 @@ class Textile:
         return text
 
     def pba(self, input, element=None):
-        """
+        '''
         Parse block attributes.
 
         >>> t = Textile()
@@ -338,7 +338,7 @@ class Textile:
         >>> t.pba('[fr]')
         ' lang="fr"'
 
-        """
+        '''
         style = []
         aclass = ''
         lang = ''
@@ -362,7 +362,7 @@ class Textile:
         if element == 'td' or element == 'tr':
             m = re.search(r'(%s)' % self.vlgn, matched)
             if m:
-                style.append("vertical-align:%s;" % self.vAlign(m.group(1)))
+                style.append('vertical-align:%s;' % self.vAlign(m.group(1)))
 
         m = re.search(r'\{([^}]*)\}', matched)
         if m:
@@ -381,17 +381,17 @@ class Textile:
 
         m = re.search(r'([(]+)', matched)
         if m:
-            style.append("padding-left:%sem;" % len(m.group(1)))
+            style.append('padding-left:%sem;' % len(m.group(1)))
             matched = matched.replace(m.group(0), '')
 
         m = re.search(r'([)]+)', matched)
         if m:
-            style.append("padding-right:%sem;" % len(m.group(1)))
+            style.append('padding-right:%sem;' % len(m.group(1)))
             matched = matched.replace(m.group(0), '')
 
         m = re.search(r'(%s)' % self.hlgn, matched)
         if m:
-            style.append("text-align:%s;" % self.hAlign(m.group(1)))
+            style.append('text-align:%s;' % self.hAlign(m.group(1)))
 
         m = re.search(r'^(.*)#(.*)$', aclass)
         if m:
@@ -406,7 +406,7 @@ class Textile:
 
         result = []
         if style:
-            result.append(' style="%s"' % "".join(style))
+            result.append(' style="%s"' % ''.join(style))
         if aclass:
             result.append(' class="%s"' % aclass)
         if lang:
@@ -420,7 +420,7 @@ class Textile:
         return ''.join(result)
 
     def hasRawText(self, text):
-        """
+        '''
         checks whether the text has text not already enclosed by a block tag
 
         >>> t = Textile()
@@ -430,18 +430,18 @@ class Textile:
         >>> t.hasRawText(' why yes, yes it does')
         True
 
-        """
+        '''
         r = re.compile(r'<(p|blockquote|div|form|table|ul|ol|pre|h\d)[^>]*?>.*</\1>', re.S).sub('', text.strip()).strip()
         r = re.compile(r'<(hr|br)[^>]*?/>').sub('', r)
         return '' != r
 
     def table(self, text):
-        r"""
+        r'''
         >>> t = Textile()
         >>> t.table('|one|two|three|\n|a|b|c|')
         '\t<table>\n\t\t<tr>\n\t\t\t<td>one</td>\n\t\t\t<td>two</td>\n\t\t\t<td>three</td>\n\t\t</tr>\n\t\t<tr>\n\t\t\t<td>a</td>\n\t\t\t<td>b</td>\n\t\t\t<td>c</td>\n\t\t</tr>\n\t</table>\n\n'
-        """
-        text = text + "\n\n"
+        '''
+        text = text + '\n\n'
         pattern = re.compile(r'^(?:table(_?%(s)s%(a)s%(c)s)\. ?\n)?^(%(a)s%(c)s\.? ?\|.*\|)\n\n' % {'s':self.s, 'a':self.a, 'c':self.c}, re.S|re.M|re.U)
         return pattern.sub(self.fTable, text)
 
@@ -460,7 +460,7 @@ class Textile:
             for cell in row.split('|')[1:-1]:
                 ctyp = 'd'
                 if re.search(r'^_', cell):
-                    ctyp = "h"
+                    ctyp = 'h'
                 cmtch = re.search(fr'^(_?{self.s}{self.a}{self.c}\. )(.*)', cell)
                 if cmtch:
                     catts = self.pba(cmtch.group(1), 'td')
@@ -470,22 +470,22 @@ class Textile:
 
                 cell = self.graf(self.span(cell))
                 cells.append(f'\t\t\t<t{ctyp}{catts}>{cell}</t{ctyp}>')
-            rows.append("\t\t<tr{}>\n{}\n\t\t</tr>".format(ratts, '\n'.join(cells)))
+            rows.append('\t\t<tr{}>\n{}\n\t\t</tr>'.format(ratts, '\n'.join(cells)))
             cells = []
             catts = None
-        return "\t<table{}>\n{}\n\t</table>\n\n".format(tatts, '\n'.join(rows))
+        return '\t<table{}>\n{}\n\t</table>\n\n'.format(tatts, '\n'.join(rows))
 
     def lists(self, text):
-        """
+        '''
         >>> t = Textile()
         >>> t.lists("* one\\n* two\\n* three")
         '\\t<ul>\\n\\t\\t<li>one</li>\\n\\t\\t<li>two</li>\\n\\t\\t<li>three</li>\\n\\t</ul>'
-        """
+        '''
         pattern = re.compile(r'^([#*]+%s .*)$(?![^#*])' % self.c, re.U|re.M|re.S)
         return pattern.sub(self.fList, text)
 
     def fList(self, match):
-        text = match.group(0).split("\n")
+        text = match.group(0).split('\n')
         result = []
         lists = []
         for i, line in enumerate(text):
@@ -494,7 +494,7 @@ class Textile:
             except IndexError:
                 nextline = ''
 
-            m = re.search(fr"^([#*]+)({self.a}{self.c}) (.*)$", line, re.S)
+            m = re.search(fr'^([#*]+)({self.a}{self.c}) (.*)$', line, re.S)
             if m:
                 tl, atts, content = m.groups()
                 nl = ''
@@ -504,21 +504,21 @@ class Textile:
                 if tl not in lists:
                     lists.append(tl)
                     atts = self.pba(atts)
-                    line = f"\t<{self.lT(tl)}l{atts}>\n\t\t<li>{self.graf(content)}"
+                    line = f'\t<{self.lT(tl)}l{atts}>\n\t\t<li>{self.graf(content)}'
                 else:
-                    line = "\t\t<li>" + self.graf(content)
+                    line = '\t\t<li>' + self.graf(content)
 
                 if len(nl) <= len(tl):
-                    line = line + "</li>"
+                    line = line + '</li>'
                 for k in reversed(lists):
                     if len(k) > len(nl):
-                        line = line + "\n\t</%sl>" % self.lT(k)
+                        line = line + '\n\t</%sl>' % self.lT(k)
                         if len(k) > 1:
-                            line = line + "</li>"
+                            line = line + '</li>'
                         lists.remove(k)
 
             result.append(line)
-        return "\n".join(result)
+        return '\n'.join(result)
 
     def lT(self, input):
         if re.search(r'^#+', input):
@@ -537,11 +537,11 @@ class Textile:
         return f'<{match.group(1)}{match.group(2)}>{content}{match.group(4)}'
 
     def block(self, text, head_offset=0):
-        """
+        '''
         >>> t = Textile()
         >>> t.block('h1. foobar baby')
         '\\t<h1>foobar baby</h1>'
-        """
+        '''
         if not self.lite:
             tre = '|'.join(self.btag)
         else:
@@ -574,9 +574,9 @@ class Textile:
                 # we'll close it at the start of the next block
 
                 if ext:
-                    line = f"{o1}{o2}{content}{c2}"
+                    line = f'{o1}{o2}{content}{c2}'
                 else:
-                    line = f"{o1}{o2}{content}{c2}{c1}"
+                    line = f'{o1}{o2}{content}{c2}{c1}'
 
             else:
                 anon = True
@@ -588,16 +588,16 @@ class Textile:
                     if tag == 'p' and not self.hasRawText(content):
                         line = content
                     else:
-                        line = f"{o2}{content}{c2}"
+                        line = f'{o2}{content}{c2}'
                 else:
                     line = self.graf(line)
 
             line = self.doPBr(line)
             if self.html_type == 'xhtml':
-                line = re.sub(r'<br>', '<br />', line)
+                line = line.replace('<br>', '<br />')
 
             if ext and anon:
-                out.append(out.pop() + "\n" + line)
+                out.append(out.pop() + '\n' + line)
             else:
                 out.append(line)
 
@@ -612,7 +612,7 @@ class Textile:
         return '\n\n'.join(out)
 
     def fBlock(self, tag, atts, ext, cite, content):
-        """
+        '''
         >>> t = Textile()
         >>> t.fBlock("bq", "", None, "", "Hello BlockQuote")
         ('\\t<blockquote>\\n', '\\t\\t<p>', 'Hello BlockQuote', '</p>', '\\n\\t</blockquote>')
@@ -625,7 +625,7 @@ class Textile:
 
         >>> t.fBlock("h1", "", None, "", "foobar")
         ('', '\\t<h1>', 'foobar', '</h1>', '')
-        """
+        '''
         atts = self.pba(atts)
         o1 = o2 = c2 = c1 = ''
 
@@ -647,17 +647,17 @@ class Textile:
                 cite = ' cite="%s"' % cite
             else:
                 cite = ''
-            o1 = f"\t<blockquote{cite}{atts}>\n"
-            o2 = "\t\t<p%s>" % atts
-            c2 = "</p>"
-            c1 = "\n\t</blockquote>"
+            o1 = f'\t<blockquote{cite}{atts}>\n'
+            o2 = '\t\t<p%s>' % atts
+            c2 = '</p>'
+            c1 = '\n\t</blockquote>'
 
         elif tag == 'bc':
-            o1 = "<pre%s>" % atts
-            o2 = "<code%s>" % atts
-            c2 = "</code>"
-            c1 = "</pre>"
-            content = self.shelve(self.encode_html(content.rstrip("\n") + "\n"))
+            o1 = '<pre%s>' % atts
+            o2 = '<code%s>' % atts
+            c2 = '</code>'
+            c1 = '</pre>'
+            content = self.shelve(self.encode_html(content.rstrip('\n') + '\n'))
 
         elif tag == 'notextile':
             content = self.shelve(content)
@@ -665,24 +665,24 @@ class Textile:
             c1 = c2 = ''
 
         elif tag == 'pre':
-            content = self.shelve(self.encode_html(content.rstrip("\n") + "\n"))
-            o1 = "<pre%s>" % atts
+            content = self.shelve(self.encode_html(content.rstrip('\n') + '\n'))
+            o1 = '<pre%s>' % atts
             o2 = c2 = ''
             c1 = '</pre>'
 
         else:
-            o2 = f"\t<{tag}{atts}>"
-            c2 = "</%s>" % tag
+            o2 = f'\t<{tag}{atts}>'
+            c2 = '</%s>' % tag
 
         content = self.graf(content)
         return o1, o2, content, c2, c1
 
     def footnoteRef(self, text):
-        """
+        '''
         >>> t = Textile()
         >>> t.footnoteRef('foo[1] ') # doctest: +ELLIPSIS
         'foo<sup class="footnote"><a href="#fn...">1</a></sup> '
-        """
+        '''
         return re.sub(r'\b\[([0-9]+)\](\s)?', self.footnoteID, text)
 
     def footnoteID(self, match):
@@ -695,7 +695,7 @@ class Textile:
         return f'<sup class="footnote"><a href="#fn{fnid}">{id}</a></sup>{t}'
 
     def glyphs(self, text):
-        """
+        '''
         >>> t = Textile()
 
         >>> t.glyphs("apostrophe's")
@@ -716,9 +716,9 @@ class Textile:
         >>> t.glyphs("<p><cite>Cat's Cradle</cite> by Vonnegut</p>")
         '<p><cite>Cat&#8217;s Cradle</cite> by Vonnegut</p>'
 
-        """
+        '''
         # fix: hackish
-        text = re.sub(r'"\Z', '\" ', text)
+        text = re.sub(r'"\Z', '" ', text)
 
         result = []
         for line in re.compile(r'(<.*?>)', re.U).split(text):
@@ -735,7 +735,7 @@ class Textile:
 
     def macros_only(self, text):
         # fix: hackish
-        text = re.sub(r'"\Z', '\" ', text)
+        text = re.sub(r'"\Z', '" ', text)
 
         result = []
         for line in re.compile(r'(<.*?>)', re.U).split(text):
@@ -757,10 +757,10 @@ class Textile:
         return d.get(input, '')
 
     def getRefs(self, text):
-        """
+        '''
         what is this for?
-        """
-        pattern = re.compile(r'(?:(?<=^)|(?<=\s))\[(.+)\]((?:http(?:s?):\/\/|\/)\S+)(?=\s|$)', re.U)
+        '''
+        pattern = re.compile(r'(?:(?<=^)|(?<=\s))\[(.+)\]((?:http(?:s?)://|/)\S+)(?=\s|$)', re.U)
         text = pattern.sub(self.refs, text)
         return text
 
@@ -773,7 +773,7 @@ class Textile:
         return self.urlrefs.get(url, url)
 
     def isRelURL(self, url):
-        """
+        '''
         Identify relative urls.
 
         >>> t = Textile()
@@ -782,8 +782,8 @@ class Textile:
         >>> t.isRelURL("/foo")
         True
 
-        """
-        (scheme, netloc) = urlparse(url)[0:2]
+        '''
+        scheme, netloc = urlparse(url)[0:2]
         return not scheme and not netloc
 
     def relURL(self, url):
@@ -798,12 +798,12 @@ class Textile:
         return id
 
     def retrieve(self, text):
-        """
+        '''
         >>> t = Textile()
         >>> id = t.shelve("foobar")
         >>> t.retrieve(id)
         'foobar'
-        """
+        '''
         while True:
             old = text
             for k, v in self.shelf.items():
@@ -850,11 +850,11 @@ class Textile:
         return text.rstrip('\n')
 
     def links(self, text):
-        """
+        '''
         >>> t = Textile()
         >>> t.links('fooobar "Google":http://google.com/foobar/ and hello world "flickr":http://flickr.com/photos/jsamsa/ ') # doctest: +ELLIPSIS
         'fooobar ... and hello world ...'
-        """
+        '''
 
         text = self.macros_only(text)
         punct = '!"#$%&\'*+,-./:;=?@\\^_`|~'
@@ -892,7 +892,7 @@ class Textile:
 
         atts = self.pba(atts)
         if title:
-            atts = atts +  ' title="%s"' % self.encode_html(title)
+            atts = atts + ' title="%s"' % self.encode_html(title)
 
         if not self.noimage:
             text = self.image(text)
@@ -906,16 +906,16 @@ class Textile:
         return ''.join([pre, out, post])
 
     def span(self, text):
-        """
+        '''
         >>> t = Textile()
         >>> t.span(r"hello %(bob)span *strong* and **bold**% goodbye")
         'hello <span class="bob">span <strong>strong</strong> and <b>bold</b></span> goodbye'
-        """
+        '''
         qtags = (r'\*\*', r'\*', r'\?\?', r'\-', r'__', r'_', r'%', r'\+', r'~', r'\^')
         pnct = ".,\"'?!;:"
 
         for qtag in qtags:
-            pattern = re.compile(r"""
+            pattern = re.compile(r'''
                 (?:^|(?<=[\s>%(pnct)s\(])|\[|([\]}]))
                 (%(qtag)s)(?!%(qtag)s)
                 (%(c)s)
@@ -924,7 +924,7 @@ class Textile:
                 ([%(pnct)s]*)
                 %(qtag)s
                 (?:$|([\]}])|(?=%(selfpnct)s{1,2}|\s))
-            """ % {'qtag':qtag, 'c':self.c, 'pnct':pnct,
+            ''' % {'qtag':qtag, 'c':self.c, 'pnct':pnct,
                    'selfpnct':self.pnct}, re.X)
             text = pattern.sub(self.fSpan, text)
         return text
@@ -951,16 +951,16 @@ class Textile:
 
         content = self.span(content)
 
-        out = f"<{tag}{atts}>{content}{end}</{tag}>"
+        out = f'<{tag}{atts}>{content}{end}</{tag}>'
         return out
 
     def image(self, text):
-        """
+        '''
         >>> t = Textile()
         >>> t.image('!/imgs/myphoto.jpg!:http://jsamsa.com')
         '<a href="http://jsamsa.com"><img src="/imgs/myphoto.jpg" alt="" /></a>'
-        """
-        pattern = re.compile(r"""
+        '''
+        pattern = re.compile(r'''
             (?:[\[{])?          # pre
             \!                 # opening !
             (%s)               # optional style,class atts
@@ -971,7 +971,7 @@ class Textile:
             \!                 # closing
             (?::(\S+))?        # optional href
             (?:[\]}]|(?=\s|$)) # lookahead: space or end of string
-        """ % self.c, re.U|re.X)
+        ''' % self.c, re.U|re.X)
         return pattern.sub(self.fImage, text)
 
     def fImage(self, match):
@@ -987,7 +987,7 @@ class Textile:
         if not self.isRelURL(url) and self.get_sizes:
             size = getimagesize(url)
             if (size):
-                atts += " %s" % size
+                atts += ' %s' % size
 
         if href:
             href = self.checkRefs(href)
@@ -1038,9 +1038,9 @@ class Textile:
         return pattern.sub(method, text)
 
     def fSpecial(self, match):
-        """
+        '''
         special blocks like notextile or code
-        """
+        '''
         before, text, after = match.groups()
         if after is None:
             after = ''
@@ -1058,17 +1058,17 @@ class Textile:
 
 
 def textile(text, head_offset=0, html_type='xhtml', encoding=None, output=None):
-    """
+    '''
     this function takes additional parameters:
     head_offset - offset to apply to heading levels (default: 0)
     html_type - 'xhtml' or 'html' style tags (default: 'xhtml')
-    """
+    '''
     return Textile().textile(text, head_offset=head_offset,
                              html_type=html_type)
 
 
 def textile_restricted(text, lite=True, noimage=True, html_type='xhtml'):
-    """
+    '''
     Restricted version of Textile designed for weblog comments and other
     untrusted input.
 
@@ -1083,7 +1083,7 @@ def textile_restricted(text, lite=True, noimage=True, html_type='xhtml'):
     When noimage=True is set (the default):
     Image tags are disabled.
 
-    """
+    '''
     return Textile(restricted=True, lite=lite,
                    noimage=noimage).textile(text, rel='nofollow',
                                             html_type=html_type)
diff --git a/src/calibre/ebooks/textile/unsmarten.py b/src/calibre/ebooks/textile/unsmarten.py
index 588854aeb7..1c94906b50 100644
--- a/src/calibre/ebooks/textile/unsmarten.py
+++ b/src/calibre/ebooks/textile/unsmarten.py
@@ -6,121 +6,121 @@ import re
 
 
 def unsmarten(txt):
-    txt = re.sub('&#162;|&cent;|¢',     r'{c\}',  txt)  # cent
-    txt = re.sub('&#163;|&pound;|£',    r'{L-}',  txt)  # pound
-    txt = re.sub('&#165;|&yen;|¥',      r'{Y=}',  txt)  # yen
-    txt = re.sub('&#169;|&copy;|©',     r'{(c)}', txt)  # copyright
-    txt = re.sub('&#174;|&reg;|®',      r'{(r)}', txt)  # registered
-    txt = re.sub('&#188;|&frac14;|¼',   r'{1/4}', txt)  # quarter
-    txt = re.sub('&#189;|&frac12;|½',   r'{1/2}', txt)  # half
-    txt = re.sub('&#190;|&frac34;|¾',   r'{3/4}', txt)  # three-quarter
-    txt = re.sub('&#192;|&Agrave;|À',   r'{A`)}', txt)  # A-grave
-    txt = re.sub('&#193;|&Aacute;|Á',   r"{A'}",  txt)  # A-acute
-    txt = re.sub('&#194;|&Acirc;|Â',    r'{A^}',  txt)  # A-circumflex
-    txt = re.sub('&#195;|&Atilde;|Ã',   r'{A~}',  txt)  # A-tilde
-    txt = re.sub('&#196;|&Auml;|Ä',     r'{A"}',  txt)  # A-umlaut
-    txt = re.sub('&#197;|&Aring;|Å',    r'{Ao}',  txt)  # A-ring
-    txt = re.sub('&#198;|&AElig;|Æ',    r'{AE}',  txt)  # AE
-    txt = re.sub('&#199;|&Ccedil;|Ç',   r'{C,}',  txt)  # C-cedilla
-    txt = re.sub('&#200;|&Egrave;|È',   r'{E`}',  txt)  # E-grave
-    txt = re.sub('&#201;|&Eacute;|É',   r"{E'}",  txt)  # E-acute
-    txt = re.sub('&#202;|&Ecirc;|Ê',    r'{E^}',  txt)  # E-circumflex
-    txt = re.sub('&#203;|&Euml;|Ë',     r'{E"}',  txt)  # E-umlaut
-    txt = re.sub('&#204;|&Igrave;|Ì',   r'{I`}',  txt)  # I-grave
-    txt = re.sub('&#205;|&Iacute;|Í',   r"{I'}",  txt)  # I-acute
-    txt = re.sub('&#206;|&Icirc;|Î',    r'{I^}',  txt)  # I-circumflex
-    txt = re.sub('&#207;|&Iuml;|Ï',     r'{I"}',  txt)  # I-umlaut
-    txt = re.sub('&#208;|&ETH;|Ð',      r'{D-}',  txt)  # ETH
-    txt = re.sub('&#209;|&Ntilde;|Ñ',   r'{N~}',  txt)  # N-tilde
-    txt = re.sub('&#210;|&Ograve;|Ò',   r'{O`}',  txt)  # O-grave
-    txt = re.sub('&#211;|&Oacute;|Ó',   r"{O'}",  txt)  # O-acute
-    txt = re.sub('&#212;|&Ocirc;|Ô',    r'{O^}',  txt)  # O-circumflex
-    txt = re.sub('&#213;|&Otilde;|Õ',   r'{O~}',  txt)  # O-tilde
-    txt = re.sub('&#214;|&Ouml;|Ö',     r'{O"}',  txt)  # O-umlaut
-    txt = re.sub('&#215;|&times;|×',    r'{x}',   txt)  # dimension
-    txt = re.sub('&#216;|&Oslash;|Ø',   r'{O/}',  txt)  # O-slash
-    txt = re.sub('&#217;|&Ugrave;|Ù',   r"{U`}",  txt)  # U-grave
-    txt = re.sub('&#218;|&Uacute;|Ú',   r"{U'}",  txt)  # U-acute
-    txt = re.sub('&#219;|&Ucirc;|Û',    r'{U^}',  txt)  # U-circumflex
-    txt = re.sub('&#220;|&Uuml;|Ü',     r'{U"}',  txt)  # U-umlaut
-    txt = re.sub('&#221;|&Yacute;|Ý',   r"{Y'}",  txt)  # Y-grave
-    txt = re.sub('&#223;|&szlig;|ß',    r'{sz}',  txt)  # sharp-s
-    txt = re.sub('&#224;|&agrave;|à',   r'{a`}',  txt)  # a-grave
-    txt = re.sub('&#225;|&aacute;|á',   r"{a'}",  txt)  # a-acute
-    txt = re.sub('&#226;|&acirc;|â',    r'{a^}',  txt)  # a-circumflex
-    txt = re.sub('&#227;|&atilde;|ã',   r'{a~}',  txt)  # a-tilde
-    txt = re.sub('&#228;|&auml;|ä',     r'{a"}',  txt)  # a-umlaut
-    txt = re.sub('&#229;|&aring;|å',    r'{ao}',  txt)  # a-ring
-    txt = re.sub('&#230;|&aelig;|æ',    r'{ae}',  txt)  # ae
-    txt = re.sub('&#231;|&ccedil;|ç',   r'{c,}',  txt)  # c-cedilla
-    txt = re.sub('&#232;|&egrave;|è',   r'{e`}',  txt)  # e-grave
-    txt = re.sub('&#233;|&eacute;|é',   r"{e'}",  txt)  # e-acute
-    txt = re.sub('&#234;|&ecirc;|ê',    r'{e^}',  txt)  # e-circumflex
-    txt = re.sub('&#235;|&euml;|ë',     r'{e"}',  txt)  # e-umlaut
-    txt = re.sub('&#236;|&igrave;|ì',   r'{i`}',  txt)  # i-grave
-    txt = re.sub('&#237;|&iacute;|í',   r"{i'}",  txt)  # i-acute
-    txt = re.sub('&#238;|&icirc;|î',    r'{i^}',  txt)  # i-circumflex
-    txt = re.sub('&#239;|&iuml;|ï',     r'{i"}',  txt)  # i-umlaut
-    txt = re.sub('&#240;|&eth;|ð',      r'{d-}',  txt)  # eth
-    txt = re.sub('&#241;|&ntilde;|ñ',   r'{n~}',  txt)  # n-tilde
-    txt = re.sub('&#242;|&ograve;|ò',   r'{o`}',  txt)  # o-grave
-    txt = re.sub('&#243;|&oacute;|ó',   r"{o'}",  txt)  # o-acute
-    txt = re.sub('&#244;|&ocirc;|ô',    r'{o^}',  txt)  # o-circumflex
-    txt = re.sub('&#245;|&otilde;|õ',   r'{o~}',  txt)  # o-tilde
-    txt = re.sub('&#246;|&ouml;|ö',     r'{o"}',  txt)  # o-umlaut
-    txt = re.sub('&#248;|&oslash;|ø',   r'{o/}',  txt)  # o-stroke
-    txt = re.sub('&#249;|&ugrave;|ù',   r'{u`}',  txt)  # u-grave
-    txt = re.sub('&#250;|&uacute;|ú',   r"{u'}",  txt)  # u-acute
-    txt = re.sub('&#251;|&ucirc;|û',    r'{u^}',  txt)  # u-circumflex
-    txt = re.sub('&#252;|&uuml;|ü',     r'{u"}',  txt)  # u-umlaut
-    txt = re.sub('&#253;|&yacute;|ý',   r"{y'}",  txt)  # y-acute
-    txt = re.sub('&#255;|&yuml;|ÿ',     r'{y"}',  txt)  # y-umlaut
+    txt = re.sub(r'&#162;|&cent;|¢',     r'{c\}',  txt)  # cent
+    txt = re.sub(r'&#163;|&pound;|£',    r'{L-}',  txt)  # pound
+    txt = re.sub(r'&#165;|&yen;|¥',      r'{Y=}',  txt)  # yen
+    txt = re.sub(r'&#169;|&copy;|©',     r'{(c)}', txt)  # copyright
+    txt = re.sub(r'&#174;|&reg;|®',      r'{(r)}', txt)  # registered
+    txt = re.sub(r'&#188;|&frac14;|¼',   r'{1/4}', txt)  # quarter
+    txt = re.sub(r'&#189;|&frac12;|½',   r'{1/2}', txt)  # half
+    txt = re.sub(r'&#190;|&frac34;|¾',   r'{3/4}', txt)  # three-quarter
+    txt = re.sub(r'&#192;|&Agrave;|À',   r'{A`)}', txt)  # A-grave
+    txt = re.sub(r'&#193;|&Aacute;|Á',   r"{A'}",  txt)  # A-acute
+    txt = re.sub(r'&#194;|&Acirc;|Â',    r'{A^}',  txt)  # A-circumflex
+    txt = re.sub(r'&#195;|&Atilde;|Ã',   r'{A~}',  txt)  # A-tilde
+    txt = re.sub(r'&#196;|&Auml;|Ä',     r'{A"}',  txt)  # A-umlaut
+    txt = re.sub(r'&#197;|&Aring;|Å',    r'{Ao}',  txt)  # A-ring
+    txt = re.sub(r'&#198;|&AElig;|Æ',    r'{AE}',  txt)  # AE
+    txt = re.sub(r'&#199;|&Ccedil;|Ç',   r'{C,}',  txt)  # C-cedilla
+    txt = re.sub(r'&#200;|&Egrave;|È',   r'{E`}',  txt)  # E-grave
+    txt = re.sub(r'&#201;|&Eacute;|É',   r"{E'}",  txt)  # E-acute
+    txt = re.sub(r'&#202;|&Ecirc;|Ê',    r'{E^}',  txt)  # E-circumflex
+    txt = re.sub(r'&#203;|&Euml;|Ë',     r'{E"}',  txt)  # E-umlaut
+    txt = re.sub(r'&#204;|&Igrave;|Ì',   r'{I`}',  txt)  # I-grave
+    txt = re.sub(r'&#205;|&Iacute;|Í',   r"{I'}",  txt)  # I-acute
+    txt = re.sub(r'&#206;|&Icirc;|Î',    r'{I^}',  txt)  # I-circumflex
+    txt = re.sub(r'&#207;|&Iuml;|Ï',     r'{I"}',  txt)  # I-umlaut
+    txt = re.sub(r'&#208;|&ETH;|Ð',      r'{D-}',  txt)  # ETH
+    txt = re.sub(r'&#209;|&Ntilde;|Ñ',   r'{N~}',  txt)  # N-tilde
+    txt = re.sub(r'&#210;|&Ograve;|Ò',   r'{O`}',  txt)  # O-grave
+    txt = re.sub(r'&#211;|&Oacute;|Ó',   r"{O'}",  txt)  # O-acute
+    txt = re.sub(r'&#212;|&Ocirc;|Ô',    r'{O^}',  txt)  # O-circumflex
+    txt = re.sub(r'&#213;|&Otilde;|Õ',   r'{O~}',  txt)  # O-tilde
+    txt = re.sub(r'&#214;|&Ouml;|Ö',     r'{O"}',  txt)  # O-umlaut
+    txt = re.sub(r'&#215;|&times;|×',    r'{x}',   txt)  # dimension
+    txt = re.sub(r'&#216;|&Oslash;|Ø',   r'{O/}',  txt)  # O-slash
+    txt = re.sub(r'&#217;|&Ugrave;|Ù',   r'{U`}',  txt)  # U-grave
+    txt = re.sub(r'&#218;|&Uacute;|Ú',   r"{U'}",  txt)  # U-acute
+    txt = re.sub(r'&#219;|&Ucirc;|Û',    r'{U^}',  txt)  # U-circumflex
+    txt = re.sub(r'&#220;|&Uuml;|Ü',     r'{U"}',  txt)  # U-umlaut
+    txt = re.sub(r'&#221;|&Yacute;|Ý',   r"{Y'}",  txt)  # Y-grave
+    txt = re.sub(r'&#223;|&szlig;|ß',    r'{sz}',  txt)  # sharp-s
+    txt = re.sub(r'&#224;|&agrave;|à',   r'{a`}',  txt)  # a-grave
+    txt = re.sub(r'&#225;|&aacute;|á',   r"{a'}",  txt)  # a-acute
+    txt = re.sub(r'&#226;|&acirc;|â',    r'{a^}',  txt)  # a-circumflex
+    txt = re.sub(r'&#227;|&atilde;|ã',   r'{a~}',  txt)  # a-tilde
+    txt = re.sub(r'&#228;|&auml;|ä',     r'{a"}',  txt)  # a-umlaut
+    txt = re.sub(r'&#229;|&aring;|å',    r'{ao}',  txt)  # a-ring
+    txt = re.sub(r'&#230;|&aelig;|æ',    r'{ae}',  txt)  # ae
+    txt = re.sub(r'&#231;|&ccedil;|ç',   r'{c,}',  txt)  # c-cedilla
+    txt = re.sub(r'&#232;|&egrave;|è',   r'{e`}',  txt)  # e-grave
+    txt = re.sub(r'&#233;|&eacute;|é',   r"{e'}",  txt)  # e-acute
+    txt = re.sub(r'&#234;|&ecirc;|ê',    r'{e^}',  txt)  # e-circumflex
+    txt = re.sub(r'&#235;|&euml;|ë',     r'{e"}',  txt)  # e-umlaut
+    txt = re.sub(r'&#236;|&igrave;|ì',   r'{i`}',  txt)  # i-grave
+    txt = re.sub(r'&#237;|&iacute;|í',   r"{i'}",  txt)  # i-acute
+    txt = re.sub(r'&#238;|&icirc;|î',    r'{i^}',  txt)  # i-circumflex
+    txt = re.sub(r'&#239;|&iuml;|ï',     r'{i"}',  txt)  # i-umlaut
+    txt = re.sub(r'&#240;|&eth;|ð',      r'{d-}',  txt)  # eth
+    txt = re.sub(r'&#241;|&ntilde;|ñ',   r'{n~}',  txt)  # n-tilde
+    txt = re.sub(r'&#242;|&ograve;|ò',   r'{o`}',  txt)  # o-grave
+    txt = re.sub(r'&#243;|&oacute;|ó',   r"{o'}",  txt)  # o-acute
+    txt = re.sub(r'&#244;|&ocirc;|ô',    r'{o^}',  txt)  # o-circumflex
+    txt = re.sub(r'&#245;|&otilde;|õ',   r'{o~}',  txt)  # o-tilde
+    txt = re.sub(r'&#246;|&ouml;|ö',     r'{o"}',  txt)  # o-umlaut
+    txt = re.sub(r'&#248;|&oslash;|ø',   r'{o/}',  txt)  # o-stroke
+    txt = re.sub(r'&#249;|&ugrave;|ù',   r'{u`}',  txt)  # u-grave
+    txt = re.sub(r'&#250;|&uacute;|ú',   r"{u'}",  txt)  # u-acute
+    txt = re.sub(r'&#251;|&ucirc;|û',    r'{u^}',  txt)  # u-circumflex
+    txt = re.sub(r'&#252;|&uuml;|ü',     r'{u"}',  txt)  # u-umlaut
+    txt = re.sub(r'&#253;|&yacute;|ý',   r"{y'}",  txt)  # y-acute
+    txt = re.sub(r'&#255;|&yuml;|ÿ',     r'{y"}',  txt)  # y-umlaut
 
-    txt = re.sub('&#268;|&Ccaron;|Č',   r'{Cˇ}',  txt)  # C-caron
-    txt = re.sub('&#269;|&ccaron;|č',   r'{cˇ}',  txt)  # c-caron
-    txt = re.sub('&#270;|&Dcaron;|Ď',   r'{Dˇ}',  txt)  # D-caron
-    txt = re.sub('&#271;|&dcaron;|ď',   r'{dˇ}',  txt)  # d-caron
-    txt = re.sub('&#282;|&Ecaron;|Ě',   r'{Eˇ}',  txt)  # E-caron
-    txt = re.sub('&#283;|&ecaron;|ě',   r'{eˇ}',  txt)  # e-caron
-    txt = re.sub('&#313;|&Lacute;|Ĺ',   r"{L'}",  txt)  # L-acute
-    txt = re.sub('&#314;|&lacute;|ĺ',   r"{l'}",  txt)  # l-acute
-    txt = re.sub('&#317;|&Lcaron;|Ľ',   r'{Lˇ}',  txt)  # L-caron
-    txt = re.sub('&#318;|&lcaron;|ľ',   r'{lˇ}',  txt)  # l-caron
-    txt = re.sub('&#327;|&Ncaron;|Ň',   r'{Nˇ}',  txt)  # N-caron
-    txt = re.sub('&#328;|&ncaron;|ň',   r'{nˇ}',  txt)  # n-caron
+    txt = re.sub(r'&#268;|&Ccaron;|Č',   r'{Cˇ}',  txt)  # C-caron
+    txt = re.sub(r'&#269;|&ccaron;|č',   r'{cˇ}',  txt)  # c-caron
+    txt = re.sub(r'&#270;|&Dcaron;|Ď',   r'{Dˇ}',  txt)  # D-caron
+    txt = re.sub(r'&#271;|&dcaron;|ď',   r'{dˇ}',  txt)  # d-caron
+    txt = re.sub(r'&#282;|&Ecaron;|Ě',   r'{Eˇ}',  txt)  # E-caron
+    txt = re.sub(r'&#283;|&ecaron;|ě',   r'{eˇ}',  txt)  # e-caron
+    txt = re.sub(r'&#313;|&Lacute;|Ĺ',   r"{L'}",  txt)  # L-acute
+    txt = re.sub(r'&#314;|&lacute;|ĺ',   r"{l'}",  txt)  # l-acute
+    txt = re.sub(r'&#317;|&Lcaron;|Ľ',   r'{Lˇ}',  txt)  # L-caron
+    txt = re.sub(r'&#318;|&lcaron;|ľ',   r'{lˇ}',  txt)  # l-caron
+    txt = re.sub(r'&#327;|&Ncaron;|Ň',   r'{Nˇ}',  txt)  # N-caron
+    txt = re.sub(r'&#328;|&ncaron;|ň',   r'{nˇ}',  txt)  # n-caron
 
-    txt = re.sub('&#338;|&OElig;|Œ',    r'{OE}',  txt)  # OE
-    txt = re.sub('&#339;|&oelig;|œ',    r'{oe}',  txt)  # oe
+    txt = re.sub(r'&#338;|&OElig;|Œ',    r'{OE}',  txt)  # OE
+    txt = re.sub(r'&#339;|&oelig;|œ',    r'{oe}',  txt)  # oe
 
-    txt = re.sub('&#340;|&Racute;|Ŕ',   r"{R'}",  txt)  # R-acute
-    txt = re.sub('&#341;|&racute;|ŕ',   r"{r'}",  txt)  # r-acute
-    txt = re.sub('&#344;|&Rcaron;|Ř',   r'{Rˇ}',  txt)  # R-caron
-    txt = re.sub('&#345;|&rcaron;|ř',   r'{rˇ}',  txt)  # r-caron
-    txt = re.sub('&#348;|Ŝ',            r'{S^}',  txt)  # S-circumflex
-    txt = re.sub('&#349;|ŝ',            r'{s^}',  txt)  # s-circumflex
-    txt = re.sub('&#352;|&Scaron;|Š',   r'{Sˇ}',  txt)  # S-caron
-    txt = re.sub('&#353;|&scaron;|š',   r'{sˇ}',  txt)  # s-caron
-    txt = re.sub('&#356;|&Tcaron;|Ť',   r'{Tˇ}',  txt)  # T-caron
-    txt = re.sub('&#357;|&tcaron;|ť',   r'{tˇ}',  txt)  # t-caron
-    txt = re.sub('&#366;|&Uring;|Ů',    r'{U°}',  txt)  # U-ring
-    txt = re.sub('&#367;|&uring;|ů',    r'{u°}',  txt)  # u-ring
-    txt = re.sub('&#381;|&Zcaron;|Ž',   r'{Zˇ}',  txt)  # Z-caron
-    txt = re.sub('&#382;|&zcaron;|ž',   r'{zˇ}',  txt)  # z-caron
+    txt = re.sub(r'&#340;|&Racute;|Ŕ',   r"{R'}",  txt)  # R-acute
+    txt = re.sub(r'&#341;|&racute;|ŕ',   r"{r'}",  txt)  # r-acute
+    txt = re.sub(r'&#344;|&Rcaron;|Ř',   r'{Rˇ}',  txt)  # R-caron
+    txt = re.sub(r'&#345;|&rcaron;|ř',   r'{rˇ}',  txt)  # r-caron
+    txt = re.sub(r'&#348;|Ŝ',            r'{S^}',  txt)  # S-circumflex
+    txt = re.sub(r'&#349;|ŝ',            r'{s^}',  txt)  # s-circumflex
+    txt = re.sub(r'&#352;|&Scaron;|Š',   r'{Sˇ}',  txt)  # S-caron
+    txt = re.sub(r'&#353;|&scaron;|š',   r'{sˇ}',  txt)  # s-caron
+    txt = re.sub(r'&#356;|&Tcaron;|Ť',   r'{Tˇ}',  txt)  # T-caron
+    txt = re.sub(r'&#357;|&tcaron;|ť',   r'{tˇ}',  txt)  # t-caron
+    txt = re.sub(r'&#366;|&Uring;|Ů',    r'{U°}',  txt)  # U-ring
+    txt = re.sub(r'&#367;|&uring;|ů',    r'{u°}',  txt)  # u-ring
+    txt = re.sub(r'&#381;|&Zcaron;|Ž',   r'{Zˇ}',  txt)  # Z-caron
+    txt = re.sub(r'&#382;|&zcaron;|ž',   r'{zˇ}',  txt)  # z-caron
 
-    txt = re.sub('&#8226;|&bull;|•',    r'{*}',   txt)  # bullet
-    txt = re.sub('&#8355;|₣',           r'{Fr}',  txt)  # Franc
-    txt = re.sub('&#8356;|₤',           r'{L=}',  txt)  # Lira
-    txt = re.sub('&#8360;|₨',           r'{Rs}',  txt)  # Rupee
-    txt = re.sub('&#8364;|&euro;|€',    r'{C=}',  txt)  # euro
-    txt = re.sub('&#8482;|&trade;|™',   r'{tm}',  txt)  # trademark
-    txt = re.sub('&#9824;|&spades;|♠',  r'{spade}',   txt)  # spade
-    txt = re.sub('&#9827;|&clubs;|♣',   r'{club}',    txt)  # club
-    txt = re.sub('&#9829;|&hearts;|♥',  r'{heart}',   txt)  # heart
-    txt = re.sub('&#9830;|&diams;|♦',   r'{diamond}', txt)  # diamond
+    txt = re.sub(r'&#8226;|&bull;|•',    r'{*}',   txt)  # bullet
+    txt = re.sub(r'&#8355;|₣',           r'{Fr}',  txt)  # Franc
+    txt = re.sub(r'&#8356;|₤',           r'{L=}',  txt)  # Lira
+    txt = re.sub(r'&#8360;|₨',           r'{Rs}',  txt)  # Rupee
+    txt = re.sub(r'&#8364;|&euro;|€',    r'{C=}',  txt)  # euro
+    txt = re.sub(r'&#8482;|&trade;|™',   r'{tm}',  txt)  # trademark
+    txt = re.sub(r'&#9824;|&spades;|♠',  r'{spade}',   txt)  # spade
+    txt = re.sub(r'&#9827;|&clubs;|♣',   r'{club}',    txt)  # club
+    txt = re.sub(r'&#9829;|&hearts;|♥',  r'{heart}',   txt)  # heart
+    txt = re.sub(r'&#9830;|&diams;|♦',   r'{diamond}', txt)  # diamond
 
     # Move into main code?
-    # txt = re.sub(u'\xa0',   r'p. ', txt)              # blank paragraph
-    # txt = re.sub(u'\n\n\n\n',   r'\n\np. \n\n', txt)  # blank paragraph
-    # txt = re.sub(u'\n  \n',   r'\n<br />\n', txt)     # blank paragraph - br tag
+    # txt = re.sub(r'\xa0',     r'p. ',         txt)  # blank paragraph
+    # txt = re.sub(r'\n\n\n\n', r'\n\np. \n\n', txt)  # blank paragraph
+    # txt = re.sub(r'\n  \n',   r'\n<br />\n',  txt)  # blank paragraph - br tag
 
     return txt
diff --git a/src/calibre/ebooks/txt/markdownml.py b/src/calibre/ebooks/txt/markdownml.py
index aa9d1f5291..65684a9e20 100644
--- a/src/calibre/ebooks/txt/markdownml.py
+++ b/src/calibre/ebooks/txt/markdownml.py
@@ -51,27 +51,27 @@ class MarkdownMLizer(OEB2HTML):
 
     def tidy_up(self, text):
         # Remove blank space form beginning of paragraph.
-        text = re.sub('(?msu)^[ ]{1,3}', '', text)
+        text = re.sub(r'(?msu)^[ ]{1,3}', '', text)
         # pre has 4 spaces. We trimmed 3 so anything with a space left is a pre.
-        text = re.sub('(?msu)^[ ]', '    ', text)
+        text = re.sub(r'(?msu)^[ ]', '    ', text)
 
         # Remove tabs that aren't at the beginning of a line
         new_text = []
         for l in text.splitlines():
-            start = re.match('\t+', l)
+            start = re.match(r'\t+', l)
             if start:
                 start = start.group()
             else:
                 start = ''
-            l = re.sub('\t', '', l)
+            l = l.replace('\t', '')
             new_text.append(start + l)
         text = '\n'.join(new_text)
 
         # Remove spaces from blank lines.
-        text = re.sub('(?msu)^[ ]+$', '', text)
+        text = re.sub(r'(?msu)^[ ]+$', '', text)
 
         # Reduce blank lines
-        text = re.sub('(?msu)\n{7,}', '\n' * 6, text)
+        text = re.sub(r'(?msu)\n{7,}', '\n' * 6, text)
 
         # Remove blank lines at beginning and end of document.
         text = re.sub(r'^\s*', '', text)
@@ -86,7 +86,7 @@ class MarkdownMLizer(OEB2HTML):
         # Condense redundant spaces created by replacing newlines with spaces.
         text = re.sub(r'[ ]{2,}', ' ', text)
         text = re.sub(r'\t+', '', text)
-        if self.remove_space_after_newline == True:  # noqa
+        if self.remove_space_after_newline == True:  # noqa: E712
             text = re.sub(r'^ +', '', text)
             self.remove_space_after_newline = False
         return text
@@ -148,13 +148,13 @@ class MarkdownMLizer(OEB2HTML):
 
         if style['font-style'] == 'italic' or tag in ('i', 'em'):
             if tag not in ('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'cite'):
-                if self.style_italic == False:  # noqa
+                if self.style_italic == False:  # noqa: E712
                     text.append('*')
                     tags.append('*')
                     self.style_italic = True
         if style['font-weight'] in ('bold', 'bolder') or tag in ('b', 'strong'):
             if tag not in ('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'th'):
-                if self.style_bold == False:  # noqa
+                if self.style_bold == False:  # noqa: E712
                     text.append('**')
                     tags.append('**')
                     self.style_bold = True
diff --git a/src/calibre/ebooks/txt/processor.py b/src/calibre/ebooks/txt/processor.py
index 45fc22eded..7012fa47c9 100644
--- a/src/calibre/ebooks/txt/processor.py
+++ b/src/calibre/ebooks/txt/processor.py
@@ -31,16 +31,16 @@ def clean_txt(txt):
     txt = '\n'.join([line.rstrip() for line in txt.splitlines()])
 
     # Replace whitespace at the beginning of the line with &nbsp;
-    txt = re.sub('(?m)(?<=^)([ ]{2,}|\t+)(?=.)', '&nbsp;' * 4, txt)
+    txt = re.sub(r'(?m)(?<=^)([ ]{2,}|\t+)(?=.)', '&nbsp;' * 4, txt)
 
     # Condense redundant spaces
-    txt = re.sub('[ ]{2,}', ' ', txt)
+    txt = re.sub(r'[ ]{2,}', ' ', txt)
 
     # Remove blank space from the beginning and end of the document.
     txt = re.sub(r'^\s+(?=.)', '', txt)
     txt = re.sub(r'(?<=.)\s+$', '', txt)
     # Remove excessive line breaks.
-    txt = re.sub('\n{5,}', '\n\n\n\n', txt)
+    txt = re.sub(r'\n{5,}', '\n\n\n\n', txt)
     # remove ASCII invalid chars : 0 to 8 and 11-14 to 24
     txt = clean_ascii_chars(txt)
 
@@ -190,7 +190,7 @@ def separate_paragraphs_single_line(txt):
 
 
 def separate_paragraphs_print_formatted(txt):
-    txt = re.sub('(?miu)^(?P<indent>\t+|[ ]{2,})(?=.)', lambda mo: '\n%s' % mo.group('indent'), txt)
+    txt = re.sub(r'(?miu)^(?P<indent>\t+|[ ]{2,})(?=.)', lambda mo: '\n%s' % mo.group('indent'), txt)
     return txt
 
 
@@ -213,7 +213,7 @@ def preserve_spaces(txt):
     '''
     Replaces spaces multiple spaces with &nbsp; entities.
     '''
-    txt = re.sub('(?P<space>[ ]{2,})', lambda mo: ' ' + ('&nbsp;' * (len(mo.group('space')) - 1)), txt)
+    txt = re.sub(r'(?P<space>[ ]{2,})', lambda mo: ' ' + ('&nbsp;' * (len(mo.group('space')) - 1)), txt)
     txt = txt.replace('\t', '&nbsp;&nbsp;&nbsp;&nbsp;')
     return txt
 
@@ -222,7 +222,7 @@ def remove_indents(txt):
     '''
     Remove whitespace at the beginning of each line.
     '''
-    return re.sub(r'^[\r\t\f\v ]+', r'', txt, flags=re.MULTILINE)
+    return re.sub(r'^[\r\t\f\v ]+', '', txt, flags=re.MULTILINE)
 
 
 def opf_writer(path, opf_name, manifest, spine, mi):
@@ -234,7 +234,7 @@ def opf_writer(path, opf_name, manifest, spine, mi):
 
 
 def split_utf8(s, n):
-    """Split UTF-8 s into chunks of maximum length n."""
+    '''Split UTF-8 s into chunks of maximum length n.'''
     if n < 3:
         raise ValueError(f'Cannot split into chunks of less than {n} < 4 bytes')
     s = memoryview(s)
@@ -325,9 +325,9 @@ def detect_formatting_type(txt):
 
     # Check for markdown
     # Headings
-    markdown_count += len(re.findall('(?mu)^#+', txt))
-    markdown_count += len(re.findall('(?mu)^=+$', txt))
-    markdown_count += len(re.findall('(?mu)^-+$', txt))
+    markdown_count += len(re.findall(r'(?mu)^#+', txt))
+    markdown_count += len(re.findall(r'(?mu)^=+$', txt))
+    markdown_count += len(re.findall(r'(?mu)^-+$', txt))
     # Images
     markdown_count += len(re.findall(r'(?u)!\[.*?\](\[|\()', txt))
     # Links
diff --git a/src/calibre/ebooks/txt/textileml.py b/src/calibre/ebooks/txt/textileml.py
index 6d75b3a62e..e317b37020 100644
--- a/src/calibre/ebooks/txt/textileml.py
+++ b/src/calibre/ebooks/txt/textileml.py
@@ -83,7 +83,7 @@ class TextileMLizer(OEB2HTML):
                         text = re.sub(r'"(.+)":'+i+r'(\s)', r'\1\2', text)
             for i in self.our_ids:
                 if i not in self.our_links:
-                    text = re.sub(r'%?\('+i+'\\)\xa0?%?', r'', text)
+                    text = re.sub(r'%?\('+i+'\\)\xa0?%?', '', text)
 
         # Remove obvious non-needed escaping, add sub/sup-script ones
         text = check_escaping(text, [r'\*', '_', r'\*'])
@@ -95,13 +95,13 @@ class TextileMLizer(OEB2HTML):
         # remove empty spans
         text = re.sub(r'%\xa0+', r'%', text)
         # remove empty spans - MAY MERGE SOME ?
-        text = re.sub(r'%%', r'', text)
+        text = text.replace('%%', '')
         # remove spans from tagged output
         text = re.sub(r'%([_+*-]+)%', r'\1', text)
         # remove spaces before a newline
         text = re.sub(r' +\n', r'\n', text)
         # remove newlines at top of file
-        text = re.sub(r'^\n+', r'', text)
+        text = re.sub(r'^\n+', '', text)
         # correct blockcode paras
         text = re.sub(r'\npre\.\n?\nbc\.', r'\nbc.', text)
         # correct blockquote paras
@@ -109,16 +109,16 @@ class TextileMLizer(OEB2HTML):
 
         # reduce blank lines
         text = re.sub(r'\n{3}', r'\n\np. \n\n', text)
-        text = re.sub('%\n(p[<>=]{1,2}\\.|p\\.)', r'%\n\n\1', text)
+        text = re.sub(r'%\n(p[<>=]{1,2}\.|p\.)', r'%\n\n\1', text)
         # Check span following blank para
         text = re.sub(r'\n+ +%', r' %', text)
-        text = re.sub('p[<>=]{1,2}\\.\n\n?', r'', text)
+        text = re.sub(r'p[<>=]{1,2}\.\n\n?', '', text)
         # blank paragraph
         text = re.sub(r'\n(p.*\.)\n', r'\n\1 \n\n', text)
         # blank paragraph
-        text = re.sub('\n\xa0', r'\np. ', text)
+        text = text.replace('\n\xa0', '\np. ')
         # blank paragraph
-        text = re.sub('\np[<>=]{1,2}?\\. \xa0', r'\np. ', text)
+        text = re.sub(r'\np[<>=]{1,2}?\\. \xa0', r'\np. ', text)
         text = re.sub(r'(^|\n)(p.*\. ?\n)(p.*\.)', r'\1\3', text)
         text = re.sub(r'\n(p\. \n)(p.*\.|h.*\.)', r'\n\2', text)
         # sort out spaces in tables
@@ -138,7 +138,7 @@ class TextileMLizer(OEB2HTML):
         # Condense redundant spaces created by replacing newlines with spaces.
         text = re.sub(r'[ ]{2,}', ' ', text)
         text = re.sub(r'\t+', '', text)
-        if self.remove_space_after_newline == True:  # noqa
+        if self.remove_space_after_newline == True:  # noqa: E712
             text = re.sub(r'^ +', '', text)
             self.remove_space_after_newline = False
         return text
@@ -268,7 +268,7 @@ class TextileMLizer(OEB2HTML):
 
         if style['font-style'] == 'italic' or tag in ('i', 'em'):
             if tag not in ('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'cite'):
-                if self.style_italic == False:  # noqa
+                if self.style_italic == False:  # noqa: E712
                     if self.in_a_link:
                         text.append('_')
                         tags.append('_')
@@ -279,7 +279,7 @@ class TextileMLizer(OEB2HTML):
                     self.style_italic = True
         if style['font-weight'] in ('bold', 'bolder') or tag in ('b', 'strong'):
             if tag not in ('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'th'):
-                if self.style_bold == False:  # noqa
+                if self.style_bold == False:  # noqa: E712
                     if self.in_a_link:
                         text.append('*')
                         tags.append('*')
@@ -290,13 +290,13 @@ class TextileMLizer(OEB2HTML):
                     self.style_bold = True
         if style['text-decoration'] == 'underline' or tag in ('u', 'ins'):
             if tag != 'a':
-                if self.style_under == False:  # noqa
+                if self.style_under == False:  # noqa: E712
                     text.append('[+')
                     tags.append('+]')
                     self.style_embed.append('+')
                     self.style_under = True
         if style['text-decoration'] == 'line-through' or tag in ('strike', 'del', 's'):
-            if self.style_strike == False:  # noqa
+            if self.style_strike == False:  # noqa: E712
                 text.append('[-')
                 tags.append('-]')
                 self.style_embed.append('-')
@@ -402,7 +402,7 @@ class TextileMLizer(OEB2HTML):
             txt = self.build_block('', style, attribs, stylizer)
             txt += '. '
             if txt != '\n. ':
-                txt = re.sub('\n', '', txt)
+                txt = txt.replace('\n', '')
                 text.append(txt)
             tags.append('|\n')
         elif tag == 'td':
@@ -423,12 +423,12 @@ class TextileMLizer(OEB2HTML):
             tags.append('')
         elif tag == 'span':
             if style['font-variant'] == 'small-caps':
-                if self.style_smallcap == False:  # noqa
+                if self.style_smallcap == False:  # noqa: E712
                     text.append('&')
                     tags.append('&')
                     self.style_smallcap = True
             else:
-                if self.in_a_link == False:  # noqa
+                if self.in_a_link == False:  # noqa: E712
                     txt = '%'
                     if self.opts.keep_links:
                         txt += self.check_id_tag(attribs)
diff --git a/src/calibre/ebooks/txt/txtml.py b/src/calibre/ebooks/txt/txtml.py
index 4c5a39c72e..2209ae495d 100644
--- a/src/calibre/ebooks/txt/txtml.py
+++ b/src/calibre/ebooks/txt/txtml.py
@@ -123,25 +123,25 @@ class TXTMLizer:
         text = text.replace('\f+', ' ')
 
         # Single line paragraph.
-        text = re.sub('(?<=.)\n(?=.)', ' ', text)
+        text = re.sub(r'(?<=.)\n(?=.)', ' ', text)
 
         # Remove multiple spaces.
-        text = re.sub('[ ]{2,}', ' ', text)
+        text = re.sub(r'[ ]{2,}', ' ', text)
 
         # Remove excessive newlines.
-        text = re.sub('\n[ ]+\n', '\n\n', text)
+        text = re.sub(r'\n[ ]+\n', '\n\n', text)
         if self.opts.remove_paragraph_spacing:
-            text = re.sub('\n{2,}', '\n', text)
+            text = re.sub(r'\n{2,}', '\n', text)
             text = re.sub(r'(?msu)^(?P<t>[^\t\n]+?)$', lambda mo: '%s\n\n' % mo.group('t'), text)
             text = re.sub(r'(?msu)(?P<b>[^\n])\n+(?P<t>[^\t\n]+?)(?=\n)', lambda mo: '{}\n\n\n\n\n\n{}'.format(mo.group('b'), mo.group('t')), text)
         else:
-            text = re.sub('\n{7,}', '\n\n\n\n\n\n', text)
+            text = re.sub(r'\n{7,}', '\n\n\n\n\n\n', text)
 
         # Replace spaces at the beginning and end of lines
         # We don't replace tabs because those are only added
         # when remove paragraph spacing is enabled.
-        text = re.sub('(?imu)^[ ]+', '', text)
-        text = re.sub('(?imu)[ ]+$', '', text)
+        text = re.sub(r'(?imu)^[ ]+', '', text)
+        text = re.sub(r'(?imu)[ ]+$', '', text)
 
         # Remove empty space and newlines at the beginning of the document.
         text = re.sub(r'(?u)^[ \n]+', '', text)
diff --git a/src/calibre/ebooks/unihandecode/__init__.py b/src/calibre/ebooks/unihandecode/__init__.py
index 5bb6156ac5..3abdb631db 100644
--- a/src/calibre/ebooks/unihandecode/__init__.py
+++ b/src/calibre/ebooks/unihandecode/__init__.py
@@ -1,7 +1,7 @@
 __license__ = 'GPL 3'
 __copyright__ = '2010, Hiroshi Miura <miurahr@linux.com>'
 __docformat__ = 'restructuredtext en'
-__all__ = ["Unihandecoder"]
+__all__ = ['Unihandecoder']
 
 '''
 Decode unicode text to an ASCII representation of the text.
@@ -22,7 +22,7 @@ class Unihandecoder:
     preferred_encoding = None
     decoder = None
 
-    def __init__(self, lang="zh", encoding='utf-8'):
+    def __init__(self, lang='zh', encoding='utf-8'):
         self.preferred_encoding = encoding
         lang = lang.lower()
         if lang[:2] == 'ja':
diff --git a/src/calibre/ebooks/unihandecode/jadecoder.py b/src/calibre/ebooks/unihandecode/jadecoder.py
index cd05c249d8..2bf5998c54 100644
--- a/src/calibre/ebooks/unihandecode/jadecoder.py
+++ b/src/calibre/ebooks/unihandecode/jadecoder.py
@@ -50,16 +50,19 @@ def itaiji_init(self):
             if self._itaijidict is None:
                 self._itaijidict = pickle.loads(dictdata(Configurations.jisyo_itaiji))
 
+
 def kanwa_init(self):
     if self._jisyo_table is None:
         with self._lock:
             if self._jisyo_table is None:
                 self._jisyo_table = pickle.loads(dictdata(Configurations.jisyo_kanwa))
 
+
 Jisyo.__init__ = jisyo_init
 Itaiji.__init__ = itaiji_init
 Kanwa.__init__ = kanwa_init
 
+
 class Jadecoder(Unidecoder):
 
     def __init__(self):
@@ -70,21 +73,21 @@ class Jadecoder(Unidecoder):
         # words. Sigh.
         # https://codeberg.org/miurahr/pykakasi/issues/172
         with warnings.catch_warnings():
-            warnings.simplefilter("ignore")
+            warnings.simplefilter('ignore')
             self.kakasi = kakasi()
-            self.kakasi.setMode("H","a") # Hiragana to ascii, default: no conversion
-            self.kakasi.setMode("K","a") # Katakana to ascii, default: no conversion
-            self.kakasi.setMode("J","a") # Japanese to ascii, default: no conversion
-            self.kakasi.setMode("r","Hepburn") # default: use Hepburn Roman table
-            self.kakasi.setMode("s", True) # add space, default: no separator
-            self.kakasi.setMode("C", True) # capitalize, default: no capitalize
+            self.kakasi.setMode('H','a')  # Hiragana to ascii, default: no conversion
+            self.kakasi.setMode('K','a')  # Katakana to ascii, default: no conversion
+            self.kakasi.setMode('J','a')  # Japanese to ascii, default: no conversion
+            self.kakasi.setMode('r','Hepburn')  # default: use Hepburn Roman table
+            self.kakasi.setMode('s', True)  # add space, default: no separator
+            self.kakasi.setMode('C', True)  # capitalize, default: no capitalize
             self.conv = self.kakasi.getConverter()
 
     def decode(self, text):
         try:
             with warnings.catch_warnings():
-                warnings.simplefilter("ignore")
+                warnings.simplefilter('ignore')
                 text = self.conv.do(text)
         except Exception:
             pass
-        return re.sub('[^\x00-\x7f]', lambda x: self.replace_point(x.group()), text)
+        return re.sub(r'[^\x00-\x7f]', lambda x: self.replace_point(x.group()), text)
diff --git a/src/calibre/ebooks/unihandecode/unicodepoints.py b/src/calibre/ebooks/unihandecode/unicodepoints.py
index 60d5724410..4b55ce58bf 100644
--- a/src/calibre/ebooks/unihandecode/unicodepoints.py
+++ b/src/calibre/ebooks/unihandecode/unicodepoints.py
@@ -11,1786 +11,1786 @@ a single dictionary.
 
 
 CODEPOINTS = {
-	'x20': [
-		' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '', '', '', '',
-		'-', '-', '-', '-', '--', '--', '||', '_', '\'', '\'', ',', '\'', '"', '"', ',,', '"',
-		'+', '++', '*', '*>', '.', '..', '...', '.', '\n', '\n\n', '', '', '', '', '', ' ',
-		'%0', '%00', '\'', '\'\'', '\'\'\'', '`', '``', '```', '^', '<', '>', '*', '!!', '!?', '-', '_',
-		'-', '^', '***', '--', '/', '-[', ']-', '[?]', '?!', '!?', '7', 'PP', '(]', '[)', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '', '', '', '', '', '',
-		'0', '', '', '', '4', '5', '6', '7', '8', '9', '+', '-', '=', '(', ')', 'n',
-		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '-', '=', '(', ')', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'ECU', 'CL', 'Cr', 'FF', 'L', 'mil', 'N', 'Pts', 'Rs', 'W', 'NS', 'D', 'EU', 'K', 'T', 'Dr',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'x25': [
-		'-', '-', '|', '|', '-', '-', '|', '|', '-', '-', '|', '|', '+', '+', '+', '+',
-		'+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+',
-		'+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+',
-		'+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+',
-		'+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '-', '-', '|', '|',
-		'-', '|', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+',
-		'+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+',
-		'+', '/', '\\', 'X', '-', '|', '-', '|', '-', '|', '-', '|', '-', '|', '-', '|',
-		'#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#',
-		'#', '#', '#', '#', '-', '|', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#',
-		'#', '#', '^', '^', '^', '^', '>', '>', '>', '>', '>', '>', 'V', 'V', 'V', 'V',
-		'<', '<', '<', '<', '<', '<', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*',
-		'*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*',
-		'*', '*', '*', '*', '*', '*', '*', '#', '#', '#', '#', '#', '^', '^', '^', 'O',
-		'#', '#', '#', '#', '#', '#', '#', '#', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'x1e': [
-		'A', 'a', 'B', 'b', 'B', 'b', 'B', 'b', 'C', 'c', 'D', 'd', 'D', 'd', 'D', 'd',
-		'D', 'd', 'D', 'd', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'F', 'f',
-		'G', 'g', 'H', 'h', 'H', 'h', 'H', 'h', 'H', 'h', 'H', 'h', 'I', 'i', 'I', 'i',
-		'K', 'k', 'K', 'k', 'K', 'k', 'L', 'l', 'L', 'l', 'L', 'l', 'L', 'l', 'M', 'm',
-		'M', 'm', 'M', 'm', 'N', 'n', 'N', 'n', 'N', 'n', 'N', 'n', 'O', 'o', 'O', 'o',
-		'O', 'o', 'O', 'o', 'P', 'p', 'P', 'p', 'R', 'r', 'R', 'r', 'R', 'r', 'R', 'r',
-		'S', 's', 'S', 's', 'S', 's', 'S', 's', 'S', 's', 'T', 't', 'T', 't', 'T', 't',
-		'T', 't', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'V', 'v', 'V', 'v',
-		'W', 'w', 'W', 'w', 'W', 'w', 'W', 'w', 'W', 'w', 'X', 'x', 'X', 'x', 'Y', 'y',
-		'Z', 'z', 'Z', 'z', 'Z', 'z', 'h', 't', 'w', 'y', 'a', 'S', '[?]', '[?]', '[?]', '[?]',
-		'A', 'a', 'A', 'a', 'A', 'a', 'A', 'a', 'A', 'a', 'A', 'a', 'A', 'a', 'A', 'a',
-		'A', 'a', 'A', 'a', 'A', 'a', 'A', 'a', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e',
-		'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'I', 'i', 'I', 'i', 'O', 'o', 'O', 'o',
-		'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o',
-		'O', 'o', 'O', 'o', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u',
-		'U', 'u', 'Y', 'y', 'Y', 'y', 'Y', 'y', 'Y', 'y', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xae': [
-		'geul', 'geulg', 'geulm', 'geulb', 'geuls', 'geult', 'geulp', 'geulh', 'geum', 'geub', 'geubs', 'geus', 'geuss', 'geung', 'geuj', 'geuc',
-		'geuk', 'geut', 'geup', 'geuh', 'gyi', 'gyig', 'gyigg', 'gyigs', 'gyin', 'gyinj', 'gyinh', 'gyid', 'gyil', 'gyilg', 'gyilm', 'gyilb',
-		'gyils', 'gyilt', 'gyilp', 'gyilh', 'gyim', 'gyib', 'gyibs', 'gyis', 'gyiss', 'gying', 'gyij', 'gyic', 'gyik', 'gyit', 'gyip', 'gyih',
-		'gi', 'gig', 'gigg', 'gigs', 'gin', 'ginj', 'ginh', 'gid', 'gil', 'gilg', 'gilm', 'gilb', 'gils', 'gilt', 'gilp', 'gilh',
-		'gim', 'gib', 'gibs', 'gis', 'giss', 'ging', 'gij', 'gic', 'gik', 'git', 'gip', 'gih', 'gga', 'ggag', 'ggagg', 'ggags',
-		'ggan', 'gganj', 'gganh', 'ggad', 'ggal', 'ggalg', 'ggalm', 'ggalb', 'ggals', 'ggalt', 'ggalp', 'ggalh', 'ggam', 'ggab', 'ggabs', 'ggas',
-		'ggass', 'ggang', 'ggaj', 'ggac', 'ggak', 'ggat', 'ggap', 'ggah', 'ggae', 'ggaeg', 'ggaegg', 'ggaegs', 'ggaen', 'ggaenj', 'ggaenh', 'ggaed',
-		'ggael', 'ggaelg', 'ggaelm', 'ggaelb', 'ggaels', 'ggaelt', 'ggaelp', 'ggaelh', 'ggaem', 'ggaeb', 'ggaebs', 'ggaes', 'ggaess', 'ggaeng', 'ggaej', 'ggaec',
-		'ggaek', 'ggaet', 'ggaep', 'ggaeh', 'ggya', 'ggyag', 'ggyagg', 'ggyags', 'ggyan', 'ggyanj', 'ggyanh', 'ggyad', 'ggyal', 'ggyalg', 'ggyalm', 'ggyalb',
-		'ggyals', 'ggyalt', 'ggyalp', 'ggyalh', 'ggyam', 'ggyab', 'ggyabs', 'ggyas', 'ggyass', 'ggyang', 'ggyaj', 'ggyac', 'ggyak', 'ggyat', 'ggyap', 'ggyah',
-		'ggyae', 'ggyaeg', 'ggyaegg', 'ggyaegs', 'ggyaen', 'ggyaenj', 'ggyaenh', 'ggyaed', 'ggyael', 'ggyaelg', 'ggyaelm', 'ggyaelb', 'ggyaels', 'ggyaelt', 'ggyaelp', 'ggyaelh',
-		'ggyaem', 'ggyaeb', 'ggyaebs', 'ggyaes', 'ggyaess', 'ggyaeng', 'ggyaej', 'ggyaec', 'ggyaek', 'ggyaet', 'ggyaep', 'ggyaeh', 'ggeo', 'ggeog', 'ggeogg', 'ggeogs',
-		'ggeon', 'ggeonj', 'ggeonh', 'ggeod', 'ggeol', 'ggeolg', 'ggeolm', 'ggeolb', 'ggeols', 'ggeolt', 'ggeolp', 'ggeolh', 'ggeom', 'ggeob', 'ggeobs', 'ggeos',
-		'ggeoss', 'ggeong', 'ggeoj', 'ggeoc', 'ggeok', 'ggeot', 'ggeop', 'ggeoh', 'gge', 'ggeg', 'ggegg', 'ggegs', 'ggen', 'ggenj', 'ggenh', 'gged',
-		'ggel', 'ggelg', 'ggelm', 'ggelb', 'ggels', 'ggelt', 'ggelp', 'ggelh', 'ggem', 'ggeb', 'ggebs', 'gges', 'ggess', 'ggeng', 'ggej', 'ggec',
-		'ggek', 'gget', 'ggep', 'ggeh', 'ggyeo', 'ggyeog', 'ggyeogg', 'ggyeogs', 'ggyeon', 'ggyeonj', 'ggyeonh', 'ggyeod', 'ggyeol', 'ggyeolg', 'ggyeolm', 'ggyeolb',
-	],
-	'xa2': [
-		'kax', 'ka', 'kap', 'kuox', 'kuo', 'kuop', 'kot', 'kox', 'ko', 'kop', 'ket', 'kex', 'ke', 'kep', 'kut', 'kux',
-		'ku', 'kup', 'kurx', 'kur', 'ggit', 'ggix', 'ggi', 'ggiex', 'ggie', 'ggiep', 'ggat', 'ggax', 'gga', 'ggap', 'gguot', 'gguox',
-		'gguo', 'gguop', 'ggot', 'ggox', 'ggo', 'ggop', 'gget', 'ggex', 'gge', 'ggep', 'ggut', 'ggux', 'ggu', 'ggup', 'ggurx', 'ggur',
-		'mgiex', 'mgie', 'mgat', 'mgax', 'mga', 'mgap', 'mguox', 'mguo', 'mguop', 'mgot', 'mgox', 'mgo', 'mgop', 'mgex', 'mge', 'mgep',
-		'mgut', 'mgux', 'mgu', 'mgup', 'mgurx', 'mgur', 'hxit', 'hxix', 'hxi', 'hxip', 'hxiet', 'hxiex', 'hxie', 'hxiep', 'hxat', 'hxax',
-		'hxa', 'hxap', 'hxuot', 'hxuox', 'hxuo', 'hxuop', 'hxot', 'hxox', 'hxo', 'hxop', 'hxex', 'hxe', 'hxep', 'ngiex', 'ngie', 'ngiep',
-		'ngat', 'ngax', 'nga', 'ngap', 'nguot', 'nguox', 'nguo', 'ngot', 'ngox', 'ngo', 'ngop', 'ngex', 'nge', 'ngep', 'hit', 'hiex',
-		'hie', 'hat', 'hax', 'ha', 'hap', 'huot', 'huox', 'huo', 'huop', 'hot', 'hox', 'ho', 'hop', 'hex', 'he', 'hep',
-		'wat', 'wax', 'wa', 'wap', 'wuox', 'wuo', 'wuop', 'wox', 'wo', 'wop', 'wex', 'we', 'wep', 'zit', 'zix', 'zi',
-		'zip', 'ziex', 'zie', 'ziep', 'zat', 'zax', 'za', 'zap', 'zuox', 'zuo', 'zuop', 'zot', 'zox', 'zo', 'zop', 'zex',
-		'ze', 'zep', 'zut', 'zux', 'zu', 'zup', 'zurx', 'zur', 'zyt', 'zyx', 'zy', 'zyp', 'zyrx', 'zyr', 'cit', 'cix',
-		'ci', 'cip', 'ciet', 'ciex', 'cie', 'ciep', 'cat', 'cax', 'ca', 'cap', 'cuox', 'cuo', 'cuop', 'cot', 'cox', 'co',
-		'cop', 'cex', 'ce', 'cep', 'cut', 'cux', 'cu', 'cup', 'curx', 'cur', 'cyt', 'cyx', 'cy', 'cyp', 'cyrx', 'cyr',
-		'zzit', 'zzix', 'zzi', 'zzip', 'zziet', 'zziex', 'zzie', 'zziep', 'zzat', 'zzax', 'zza', 'zzap', 'zzox', 'zzo', 'zzop', 'zzex',
-		'zze', 'zzep', 'zzux', 'zzu', 'zzup', 'zzurx', 'zzur', 'zzyt', 'zzyx', 'zzy', 'zzyp', 'zzyrx', 'zzyr', 'nzit', 'nzix', 'nzi',
-		'nzip', 'nziex', 'nzie', 'nziep', 'nzat', 'nzax', 'nza', 'nzap', 'nzuox', 'nzuo', 'nzox', 'nzop', 'nzex', 'nze', 'nzux', 'nzu',
-	],
-	'xc2': [
-		'syon', 'syonj', 'syonh', 'syod', 'syol', 'syolg', 'syolm', 'syolb', 'syols', 'syolt', 'syolp', 'syolh', 'syom', 'syob', 'syobs', 'syos',
-		'syoss', 'syong', 'syoj', 'syoc', 'syok', 'syot', 'syop', 'syoh', 'su', 'sug', 'sugg', 'sugs', 'sun', 'sunj', 'sunh', 'sud',
-		'sul', 'sulg', 'sulm', 'sulb', 'suls', 'sult', 'sulp', 'sulh', 'sum', 'sub', 'subs', 'sus', 'suss', 'sung', 'suj', 'suc',
-		'suk', 'sut', 'sup', 'suh', 'sweo', 'sweog', 'sweogg', 'sweogs', 'sweon', 'sweonj', 'sweonh', 'sweod', 'sweol', 'sweolg', 'sweolm', 'sweolb',
-		'sweols', 'sweolt', 'sweolp', 'sweolh', 'sweom', 'sweob', 'sweobs', 'sweos', 'sweoss', 'sweong', 'sweoj', 'sweoc', 'sweok', 'sweot', 'sweop', 'sweoh',
-		'swe', 'sweg', 'swegg', 'swegs', 'swen', 'swenj', 'swenh', 'swed', 'swel', 'swelg', 'swelm', 'swelb', 'swels', 'swelt', 'swelp', 'swelh',
-		'swem', 'sweb', 'swebs', 'swes', 'swess', 'sweng', 'swej', 'swec', 'swek', 'swet', 'swep', 'sweh', 'swi', 'swig', 'swigg', 'swigs',
-		'swin', 'swinj', 'swinh', 'swid', 'swil', 'swilg', 'swilm', 'swilb', 'swils', 'swilt', 'swilp', 'swilh', 'swim', 'swib', 'swibs', 'swis',
-		'swiss', 'swing', 'swij', 'swic', 'swik', 'swit', 'swip', 'swih', 'syu', 'syug', 'syugg', 'syugs', 'syun', 'syunj', 'syunh', 'syud',
-		'syul', 'syulg', 'syulm', 'syulb', 'syuls', 'syult', 'syulp', 'syulh', 'syum', 'syub', 'syubs', 'syus', 'syuss', 'syung', 'syuj', 'syuc',
-		'syuk', 'syut', 'syup', 'syuh', 'seu', 'seug', 'seugg', 'seugs', 'seun', 'seunj', 'seunh', 'seud', 'seul', 'seulg', 'seulm', 'seulb',
-		'seuls', 'seult', 'seulp', 'seulh', 'seum', 'seub', 'seubs', 'seus', 'seuss', 'seung', 'seuj', 'seuc', 'seuk', 'seut', 'seup', 'seuh',
-		'syi', 'syig', 'syigg', 'syigs', 'syin', 'syinj', 'syinh', 'syid', 'syil', 'syilg', 'syilm', 'syilb', 'syils', 'syilt', 'syilp', 'syilh',
-		'syim', 'syib', 'syibs', 'syis', 'syiss', 'sying', 'syij', 'syic', 'syik', 'syit', 'syip', 'syih', 'si', 'sig', 'sigg', 'sigs',
-		'sin', 'sinj', 'sinh', 'sid', 'sil', 'silg', 'silm', 'silb', 'sils', 'silt', 'silp', 'silh', 'sim', 'sib', 'sibs', 'sis',
-		'siss', 'sing', 'sij', 'sic', 'sik', 'sit', 'sip', 'sih', 'ssa', 'ssag', 'ssagg', 'ssags', 'ssan', 'ssanj', 'ssanh', 'ssad',
-	],
-	'x03': [
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'', '', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '\'', ',', '[?]', '[?]', '[?]', '[?]', '', '[?]', '[?]', '[?]', '?', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '', '', 'A', ';', 'E', 'E', 'I', '[?]', 'O', '[?]', 'U', 'O',
-		'I', 'A', 'B', 'G', 'D', 'E', 'Z', 'E', 'Th', 'I', 'K', 'L', 'M', 'N', 'Ks', 'O',
-		'P', 'R', '[?]', 'S', 'T', 'U', 'Ph', 'Kh', 'Ps', 'O', 'I', 'U', 'a', 'e', 'e', 'i',
-		'u', 'a', 'b', 'g', 'd', 'e', 'z', 'e', 'th', 'i', 'k', 'l', 'm', 'n', 'x', 'o',
-		'p', 'r', 's', 's', 't', 'u', 'ph', 'kh', 'ps', 'o', 'i', 'u', 'o', 'u', 'o', '[?]',
-		'b', 'th', 'U', 'U', 'U', 'ph', 'p', '&', '[?]', '[?]', 'St', 'st', 'W', 'w', 'Q', 'q',
-		'Sp', 'sp', 'Sh', 'sh', 'F', 'f', 'Kh', 'kh', 'H', 'h', 'G', 'g', 'CH', 'ch', 'Ti', 'ti',
-		'k', 'r', 'c', 'j', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xc5': [
-		'sseum', 'sseub', 'sseubs', 'sseus', 'sseuss', 'sseung', 'sseuj', 'sseuc', 'sseuk', 'sseut', 'sseup', 'sseuh', 'ssyi', 'ssyig', 'ssyigg', 'ssyigs',
-		'ssyin', 'ssyinj', 'ssyinh', 'ssyid', 'ssyil', 'ssyilg', 'ssyilm', 'ssyilb', 'ssyils', 'ssyilt', 'ssyilp', 'ssyilh', 'ssyim', 'ssyib', 'ssyibs', 'ssyis',
-		'ssyiss', 'ssying', 'ssyij', 'ssyic', 'ssyik', 'ssyit', 'ssyip', 'ssyih', 'ssi', 'ssig', 'ssigg', 'ssigs', 'ssin', 'ssinj', 'ssinh', 'ssid',
-		'ssil', 'ssilg', 'ssilm', 'ssilb', 'ssils', 'ssilt', 'ssilp', 'ssilh', 'ssim', 'ssib', 'ssibs', 'ssis', 'ssiss', 'ssing', 'ssij', 'ssic',
-		'ssik', 'ssit', 'ssip', 'ssih', 'a', 'ag', 'agg', 'ags', 'an', 'anj', 'anh', 'ad', 'al', 'alg', 'alm', 'alb',
-		'als', 'alt', 'alp', 'alh', 'am', 'ab', 'abs', 'as', 'ass', 'ang', 'aj', 'ac', 'ak', 'at', 'ap', 'ah',
-		'ae', 'aeg', 'aegg', 'aegs', 'aen', 'aenj', 'aenh', 'aed', 'ael', 'aelg', 'aelm', 'aelb', 'aels', 'aelt', 'aelp', 'aelh',
-		'aem', 'aeb', 'aebs', 'aes', 'aess', 'aeng', 'aej', 'aec', 'aek', 'aet', 'aep', 'aeh', 'ya', 'yag', 'yagg', 'yags',
-		'yan', 'yanj', 'yanh', 'yad', 'yal', 'yalg', 'yalm', 'yalb', 'yals', 'yalt', 'yalp', 'yalh', 'yam', 'yab', 'yabs', 'yas',
-		'yass', 'yang', 'yaj', 'yac', 'yak', 'yat', 'yap', 'yah', 'yae', 'yaeg', 'yaegg', 'yaegs', 'yaen', 'yaenj', 'yaenh', 'yaed',
-		'yael', 'yaelg', 'yaelm', 'yaelb', 'yaels', 'yaelt', 'yaelp', 'yaelh', 'yaem', 'yaeb', 'yaebs', 'yaes', 'yaess', 'yaeng', 'yaej', 'yaec',
-		'yaek', 'yaet', 'yaep', 'yaeh', 'eo', 'eog', 'eogg', 'eogs', 'eon', 'eonj', 'eonh', 'eod', 'eol', 'eolg', 'eolm', 'eolb',
-		'eols', 'eolt', 'eolp', 'eolh', 'eom', 'eob', 'eobs', 'eos', 'eoss', 'eong', 'eoj', 'eoc', 'eok', 'eot', 'eop', 'eoh',
-		'e', 'eg', 'egg', 'egs', 'en', 'enj', 'enh', 'ed', 'el', 'elg', 'elm', 'elb', 'els', 'elt', 'elp', 'elh',
-		'em', 'eb', 'ebs', 'es', 'ess', 'eng', 'ej', 'ec', 'ek', 'et', 'ep', 'eh', 'yeo', 'yeog', 'yeogg', 'yeogs',
-		'yeon', 'yeonj', 'yeonh', 'yeod', 'yeol', 'yeolg', 'yeolm', 'yeolb', 'yeols', 'yeolt', 'yeolp', 'yeolh', 'yeom', 'yeob', 'yeobs', 'yeos',
-	],
-	'xfb': [
-		'ff', 'fi', 'fl', 'ffi', 'ffl', 'st', 'st', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', 'mn', 'me', 'mi', 'vn', 'mkh', '[?]', '[?]', '[?]', '[?]', '[?]', 'yi', '', 'ay',
-		'`', '', 'd', 'h', 'k', 'l', 'm', 'm', 't', '+', 'sh', 's', 'sh', 's', 'a', 'a',
-		'', 'b', 'g', 'd', 'h', 'v', 'z', '[?]', 't', 'y', 'k', 'k', 'l', '[?]', 'l', '[?]',
-		'n', 'n', '[?]', 'p', 'p', '[?]', 'ts', 'ts', 'r', 'sh', 't', 'vo', 'b', 'k', 'p', 'l',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-	],
-	'x06': [
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', ',', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', ';', '[?]', '[?]', '[?]', '?',
-		'[?]', '', 'a', '\'', 'w\'', '', 'y\'', 'a', 'b', '@', 't', 'th', 'j', 'H', 'kh', 'd',
-		'dh', 'r', 'z', 's', 'sh', 'S', 'D', 'T', 'Z', '`', 'G', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'', 'f', 'q', 'k', 'l', 'm', 'n', 'h', 'w', '~', 'y', 'an', 'un', 'in', 'a', 'u',
-		'i', 'W', '', '', '\'', '\'', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '%', '.', ',', '*', '[?]', '[?]',
-		'', '\'', '\'', '\'', '', '\'', '\'w', '\'u', '\'y', 'tt', 'tth', 'b', 't', 'T', 'p', 'th',
-		'bh', '\'h', 'H', 'ny', 'dy', 'H', 'ch', 'cch', 'dd', 'D', 'D', 'Dt', 'dh', 'ddh', 'd', 'D',
-		'D', 'rr', 'R', 'R', 'R', 'R', 'R', 'R', 'j', 'R', 'S', 'S', 'S', 'S', 'S', 'T',
-		'GH', 'F', 'F', 'F', 'v', 'f', 'ph', 'Q', 'Q', 'kh', 'k', 'K', 'K', 'ng', 'K', 'g',
-		'G', 'N', 'G', 'G', 'G', 'L', 'L', 'L', 'L', 'N', 'N', 'N', 'N', 'N', 'h', 'Ch',
-		'hy', 'h', 'H', '@', 'W', 'oe', 'oe', 'u', 'yu', 'yu', 'W', 'v', 'y', 'Y', 'Y', 'W',
-		'', '', 'y', 'y\'', '.', 'ae', '', '', '', '', '', '', '', '@', '#', '',
-		'', '', '', '', '', '', '', '', '', '^', '', '', '', '', '[?]', '[?]',
-		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'Sh', 'D', 'Gh', '&', '+m',
-	],
-	'x07': [
-		'//', '/', ',', '!', '!', '-', ',', ',', ';', '?', '~', '\\{', '\\}', '*', '[?]', '',
-		'\'', '', 'b', 'g', 'g', 'd', 'd', 'h', 'w', 'z', 'H', 't', 't', 'y', 'yh', 'k',
-		'l', 'm', 'n', 's', 's', '`', 'p', 'p', 'S', 'q', 'r', 'sh', 't', '[?]', '[?]', '[?]',
-		'a', 'a', 'a', 'A', 'A', 'A', 'e', 'e', 'e', 'E', 'i', 'i', 'u', 'u', 'u', 'o',
-		'', '`', '\'', '', '', 'X', 'Q', '@', '@', '|', '+', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'h', 'sh', 'n', 'r', 'b', 'L', 'k', '\'', 'v', 'm', 'f', 'dh', 'th', 'l', 'g', 'ny',
-		's', 'd', 'z', 't', 'y', 'p', 'j', 'ch', 'tt', 'hh', 'kh', 'th', 'z', 'sh', 's', 'd',
-		't', 'z', '`', 'gh', 'q', 'w', 'a', 'aa', 'i', 'ee', 'u', 'oo', 'e', 'ey', 'o', 'oa',
-		'', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xcc': [
-		'jjyim', 'jjyib', 'jjyibs', 'jjyis', 'jjyiss', 'jjying', 'jjyij', 'jjyic', 'jjyik', 'jjyit', 'jjyip', 'jjyih', 'jji', 'jjig', 'jjigg', 'jjigs',
-		'jjin', 'jjinj', 'jjinh', 'jjid', 'jjil', 'jjilg', 'jjilm', 'jjilb', 'jjils', 'jjilt', 'jjilp', 'jjilh', 'jjim', 'jjib', 'jjibs', 'jjis',
-		'jjiss', 'jjing', 'jjij', 'jjic', 'jjik', 'jjit', 'jjip', 'jjih', 'ca', 'cag', 'cagg', 'cags', 'can', 'canj', 'canh', 'cad',
-		'cal', 'calg', 'calm', 'calb', 'cals', 'calt', 'calp', 'calh', 'cam', 'cab', 'cabs', 'cas', 'cass', 'cang', 'caj', 'cac',
-		'cak', 'cat', 'cap', 'cah', 'cae', 'caeg', 'caegg', 'caegs', 'caen', 'caenj', 'caenh', 'caed', 'cael', 'caelg', 'caelm', 'caelb',
-		'caels', 'caelt', 'caelp', 'caelh', 'caem', 'caeb', 'caebs', 'caes', 'caess', 'caeng', 'caej', 'caec', 'caek', 'caet', 'caep', 'caeh',
-		'cya', 'cyag', 'cyagg', 'cyags', 'cyan', 'cyanj', 'cyanh', 'cyad', 'cyal', 'cyalg', 'cyalm', 'cyalb', 'cyals', 'cyalt', 'cyalp', 'cyalh',
-		'cyam', 'cyab', 'cyabs', 'cyas', 'cyass', 'cyang', 'cyaj', 'cyac', 'cyak', 'cyat', 'cyap', 'cyah', 'cyae', 'cyaeg', 'cyaegg', 'cyaegs',
-		'cyaen', 'cyaenj', 'cyaenh', 'cyaed', 'cyael', 'cyaelg', 'cyaelm', 'cyaelb', 'cyaels', 'cyaelt', 'cyaelp', 'cyaelh', 'cyaem', 'cyaeb', 'cyaebs', 'cyaes',
-		'cyaess', 'cyaeng', 'cyaej', 'cyaec', 'cyaek', 'cyaet', 'cyaep', 'cyaeh', 'ceo', 'ceog', 'ceogg', 'ceogs', 'ceon', 'ceonj', 'ceonh', 'ceod',
-		'ceol', 'ceolg', 'ceolm', 'ceolb', 'ceols', 'ceolt', 'ceolp', 'ceolh', 'ceom', 'ceob', 'ceobs', 'ceos', 'ceoss', 'ceong', 'ceoj', 'ceoc',
-		'ceok', 'ceot', 'ceop', 'ceoh', 'ce', 'ceg', 'cegg', 'cegs', 'cen', 'cenj', 'cenh', 'ced', 'cel', 'celg', 'celm', 'celb',
-		'cels', 'celt', 'celp', 'celh', 'cem', 'ceb', 'cebs', 'ces', 'cess', 'ceng', 'cej', 'cec', 'cek', 'cet', 'cep', 'ceh',
-		'cyeo', 'cyeog', 'cyeogg', 'cyeogs', 'cyeon', 'cyeonj', 'cyeonh', 'cyeod', 'cyeol', 'cyeolg', 'cyeolm', 'cyeolb', 'cyeols', 'cyeolt', 'cyeolp', 'cyeolh',
-		'cyeom', 'cyeob', 'cyeobs', 'cyeos', 'cyeoss', 'cyeong', 'cyeoj', 'cyeoc', 'cyeok', 'cyeot', 'cyeop', 'cyeoh', 'cye', 'cyeg', 'cyegg', 'cyegs',
-		'cyen', 'cyenj', 'cyenh', 'cyed', 'cyel', 'cyelg', 'cyelm', 'cyelb', 'cyels', 'cyelt', 'cyelp', 'cyelh', 'cyem', 'cyeb', 'cyebs', 'cyes',
-	],
-	'xc6': [
-		'yeoss', 'yeong', 'yeoj', 'yeoc', 'yeok', 'yeot', 'yeop', 'yeoh', 'ye', 'yeg', 'yegg', 'yegs', 'yen', 'yenj', 'yenh', 'yed',
-		'yel', 'yelg', 'yelm', 'yelb', 'yels', 'yelt', 'yelp', 'yelh', 'yem', 'yeb', 'yebs', 'yes', 'yess', 'yeng', 'yej', 'yec',
-		'yek', 'yet', 'yep', 'yeh', 'o', 'og', 'ogg', 'ogs', 'on', 'onj', 'onh', 'od', 'ol', 'olg', 'olm', 'olb',
-		'ols', 'olt', 'olp', 'olh', 'om', 'ob', 'obs', 'os', 'oss', 'ong', 'oj', 'oc', 'ok', 'ot', 'op', 'oh',
-		'wa', 'wag', 'wagg', 'wags', 'wan', 'wanj', 'wanh', 'wad', 'wal', 'walg', 'walm', 'walb', 'wals', 'walt', 'walp', 'walh',
-		'wam', 'wab', 'wabs', 'was', 'wass', 'wang', 'waj', 'wac', 'wak', 'wat', 'wap', 'wah', 'wae', 'waeg', 'waegg', 'waegs',
-		'waen', 'waenj', 'waenh', 'waed', 'wael', 'waelg', 'waelm', 'waelb', 'waels', 'waelt', 'waelp', 'waelh', 'waem', 'waeb', 'waebs', 'waes',
-		'waess', 'waeng', 'waej', 'waec', 'waek', 'waet', 'waep', 'waeh', 'oe', 'oeg', 'oegg', 'oegs', 'oen', 'oenj', 'oenh', 'oed',
-		'oel', 'oelg', 'oelm', 'oelb', 'oels', 'oelt', 'oelp', 'oelh', 'oem', 'oeb', 'oebs', 'oes', 'oess', 'oeng', 'oej', 'oec',
-		'oek', 'oet', 'oep', 'oeh', 'yo', 'yog', 'yogg', 'yogs', 'yon', 'yonj', 'yonh', 'yod', 'yol', 'yolg', 'yolm', 'yolb',
-		'yols', 'yolt', 'yolp', 'yolh', 'yom', 'yob', 'yobs', 'yos', 'yoss', 'yong', 'yoj', 'yoc', 'yok', 'yot', 'yop', 'yoh',
-		'u', 'ug', 'ugg', 'ugs', 'un', 'unj', 'unh', 'ud', 'ul', 'ulg', 'ulm', 'ulb', 'uls', 'ult', 'ulp', 'ulh',
-		'um', 'ub', 'ubs', 'us', 'uss', 'ung', 'uj', 'uc', 'uk', 'ut', 'up', 'uh', 'weo', 'weog', 'weogg', 'weogs',
-		'weon', 'weonj', 'weonh', 'weod', 'weol', 'weolg', 'weolm', 'weolb', 'weols', 'weolt', 'weolp', 'weolh', 'weom', 'weob', 'weobs', 'weos',
-		'weoss', 'weong', 'weoj', 'weoc', 'weok', 'weot', 'weop', 'weoh', 'we', 'weg', 'wegg', 'wegs', 'wen', 'wenj', 'wenh', 'wed',
-		'wel', 'welg', 'welm', 'welb', 'wels', 'welt', 'welp', 'welh', 'wem', 'web', 'webs', 'wes', 'wess', 'weng', 'wej', 'wec',
-	],
-	'xb8': [
-		'reoss', 'reong', 'reoj', 'reoc', 'reok', 'reot', 'reop', 'reoh', 're', 'reg', 'regg', 'regs', 'ren', 'renj', 'renh', 'red',
-		'rel', 'relg', 'relm', 'relb', 'rels', 'relt', 'relp', 'relh', 'rem', 'reb', 'rebs', 'res', 'ress', 'reng', 'rej', 'rec',
-		'rek', 'ret', 'rep', 'reh', 'ryeo', 'ryeog', 'ryeogg', 'ryeogs', 'ryeon', 'ryeonj', 'ryeonh', 'ryeod', 'ryeol', 'ryeolg', 'ryeolm', 'ryeolb',
-		'ryeols', 'ryeolt', 'ryeolp', 'ryeolh', 'ryeom', 'ryeob', 'ryeobs', 'ryeos', 'ryeoss', 'ryeong', 'ryeoj', 'ryeoc', 'ryeok', 'ryeot', 'ryeop', 'ryeoh',
-		'rye', 'ryeg', 'ryegg', 'ryegs', 'ryen', 'ryenj', 'ryenh', 'ryed', 'ryel', 'ryelg', 'ryelm', 'ryelb', 'ryels', 'ryelt', 'ryelp', 'ryelh',
-		'ryem', 'ryeb', 'ryebs', 'ryes', 'ryess', 'ryeng', 'ryej', 'ryec', 'ryek', 'ryet', 'ryep', 'ryeh', 'ro', 'rog', 'rogg', 'rogs',
-		'ron', 'ronj', 'ronh', 'rod', 'rol', 'rolg', 'rolm', 'rolb', 'rols', 'rolt', 'rolp', 'rolh', 'rom', 'rob', 'robs', 'ros',
-		'ross', 'rong', 'roj', 'roc', 'rok', 'rot', 'rop', 'roh', 'rwa', 'rwag', 'rwagg', 'rwags', 'rwan', 'rwanj', 'rwanh', 'rwad',
-		'rwal', 'rwalg', 'rwalm', 'rwalb', 'rwals', 'rwalt', 'rwalp', 'rwalh', 'rwam', 'rwab', 'rwabs', 'rwas', 'rwass', 'rwang', 'rwaj', 'rwac',
-		'rwak', 'rwat', 'rwap', 'rwah', 'rwae', 'rwaeg', 'rwaegg', 'rwaegs', 'rwaen', 'rwaenj', 'rwaenh', 'rwaed', 'rwael', 'rwaelg', 'rwaelm', 'rwaelb',
-		'rwaels', 'rwaelt', 'rwaelp', 'rwaelh', 'rwaem', 'rwaeb', 'rwaebs', 'rwaes', 'rwaess', 'rwaeng', 'rwaej', 'rwaec', 'rwaek', 'rwaet', 'rwaep', 'rwaeh',
-		'roe', 'roeg', 'roegg', 'roegs', 'roen', 'roenj', 'roenh', 'roed', 'roel', 'roelg', 'roelm', 'roelb', 'roels', 'roelt', 'roelp', 'roelh',
-		'roem', 'roeb', 'roebs', 'roes', 'roess', 'roeng', 'roej', 'roec', 'roek', 'roet', 'roep', 'roeh', 'ryo', 'ryog', 'ryogg', 'ryogs',
-		'ryon', 'ryonj', 'ryonh', 'ryod', 'ryol', 'ryolg', 'ryolm', 'ryolb', 'ryols', 'ryolt', 'ryolp', 'ryolh', 'ryom', 'ryob', 'ryobs', 'ryos',
-		'ryoss', 'ryong', 'ryoj', 'ryoc', 'ryok', 'ryot', 'ryop', 'ryoh', 'ru', 'rug', 'rugg', 'rugs', 'run', 'runj', 'runh', 'rud',
-		'rul', 'rulg', 'rulm', 'rulb', 'ruls', 'rult', 'rulp', 'rulh', 'rum', 'rub', 'rubs', 'rus', 'russ', 'rung', 'ruj', 'ruc',
-	],
-	'x33': [
-		'apartment', 'alpha', 'ampere', 'are', 'inning', 'inch', 'won', 'escudo', 'acre', 'ounce', 'ohm', 'kai-ri', 'carat', 'calorie', 'gallon', 'gamma',
-		'giga', 'guinea', 'curie', 'guilder', 'kilo', 'kilogram', 'kilometer', 'kilowatt', 'gram', 'gram ton', 'cruzeiro', 'krone', 'case', 'koruna', 'co-op', 'cycle',
-		'centime', 'shilling', 'centi', 'cent', 'dozen', 'desi', 'dollar', 'ton', 'nano', 'knot', 'heights', 'percent', 'parts', 'barrel', 'piaster', 'picul',
-		'pico', 'building', 'farad', 'feet', 'bushel', 'franc', 'hectare', 'peso', 'pfennig', 'hertz', 'pence', 'page', 'beta', 'point', 'volt', 'hon',
-		'pound', 'hall', 'horn', 'micro', 'mile', 'mach', 'mark', 'mansion', 'micron', 'milli', 'millibar', 'mega', 'megaton', 'meter', 'yard', 'yard',
-		'yuan', 'liter', 'lira', 'rupee', 'ruble', 'rem', 'roentgen', 'watt', '0h', '1h', '2h', '3h', '4h', '5h', '6h', '7h',
-		'8h', '9h', '10h', '11h', '12h', '13h', '14h', '15h', '16h', '17h', '18h', '19h', '20h', '21h', '22h', '23h',
-		'24h', 'HPA', 'da', 'AU', 'bar', 'oV', 'pc', '[?]', '[?]', '[?]', '[?]', 'Heisei', 'Syouwa', 'Taisyou', 'Meiji', 'Inc.',
-		'pA', 'nA', 'microamp', 'mA', 'kA', 'kB', 'MB', 'GB', 'cal', 'kcal', 'pF', 'nF', 'microFarad', 'microgram', 'mg', 'kg',
-		'Hz', 'kHz', 'MHz', 'GHz', 'THz', 'microliter', 'ml', 'dl', 'kl', 'fm', 'nm', 'micrometer', 'mm', 'cm', 'km', 'mm^2',
-		'cm^2', 'm^2', 'km^2', 'mm^4', 'cm^3', 'm^3', 'km^3', 'm/s', 'm/s^2', 'Pa', 'kPa', 'MPa', 'GPa', 'rad', 'rad/s', 'rad/s^2',
-		'ps', 'ns', 'microsecond', 'ms', 'pV', 'nV', 'microvolt', 'mV', 'kV', 'MV', 'pW', 'nW', 'microwatt', 'mW', 'kW', 'MW',
-		'kOhm', 'MOhm', 'a.m.', 'Bq', 'cc', 'cd', 'C/kg', 'Co.', 'dB', 'Gy', 'ha', 'HP', 'in', 'K.K.', 'KM', 'kt',
-		'lm', 'ln', 'log', 'lx', 'mb', 'mil', 'mol', 'pH', 'p.m.', 'PPM', 'PR', 'sr', 'Sv', 'Wb', '[?]', '[?]',
-		'1d', '2d', '3d', '4d', '5d', '6d', '7d', '8d', '9d', '10d', '11d', '12d', '13d', '14d', '15d', '16d',
-		'17d', '18d', '19d', '20d', '21d', '22d', '23d', '24d', '25d', '26d', '27d', '28d', '29d', '30d', '31d',
-	],
-	'x32': [
-		'(g)', '(n)', '(d)', '(r)', '(m)', '(b)', '(s)', '()', '(j)', '(c)', '(k)', '(t)', '(p)', '(h)', '(ga)', '(na)',
-		'(da)', '(ra)', '(ma)', '(ba)', '(sa)', '(a)', '(ja)', '(ca)', '(ka)', '(ta)', '(pa)', '(ha)', '(ju)', '[?]', '[?]', '[?]',
-		'(1) ', '(2) ', '(3) ', '(4) ', '(5) ', '(6) ', '(7) ', '(8) ', '(9) ', '(10) ', '(Yue) ', '(Huo) ', '(Shui) ', '(Mu) ', '(Jin) ', '(Tu) ',
-		'(Ri) ', '(Zhu) ', '(You) ', '(She) ', '(Ming) ', '(Te) ', '(Cai) ', '(Zhu) ', '(Lao) ', '(Dai) ', '(Hu) ', '(Xue) ', '(Jian) ', '(Qi) ', '(Zi) ', '(Xie) ',
-		'(Ji) ', '(Xiu) ', '<<', '>>', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'(g)', '(n)', '(d)', '(r)', '(m)', '(b)', '(s)', '()', '(j)', '(c)', '(k)', '(t)', '(p)', '(h)', '(ga)', '(na)',
-		'(da)', '(ra)', '(ma)', '(ba)', '(sa)', '(a)', '(ja)', '(ca)', '(ka)', '(ta)', '(pa)', '(ha)', '[?]', '[?]', '[?]', 'KIS ',
-		'(1) ', '(2) ', '(3) ', '(4) ', '(5) ', '(6) ', '(7) ', '(8) ', '(9) ', '(10) ', '(Yue) ', '(Huo) ', '(Shui) ', '(Mu) ', '(Jin) ', '(Tu) ',
-		'(Ri) ', '(Zhu) ', '(You) ', '(She) ', '(Ming) ', '(Te) ', '(Cai) ', '(Zhu) ', '(Lao) ', '(Mi) ', '(Nan) ', '(Nu) ', '(Shi) ', '(You) ', '(Yin) ', '(Zhu) ',
-		'(Xiang) ', '(Xiu) ', '(Xie) ', '(Zheng) ', '(Shang) ', '(Zhong) ', '(Xia) ', '(Zuo) ', '(You) ', '(Yi) ', '(Zong) ', '(Xue) ', '(Jian) ', '(Qi) ', '(Zi) ', '(Xie) ',
-		'(Ye) ', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'1M', '2M', '3M', '4M', '5M', '6M', '7M', '8M', '9M', '10M', '11M', '12M', '[?]', '[?]', '[?]', '[?]',
-		'a', 'i', 'u', 'u', 'o', 'ka', 'ki', 'ku', 'ke', 'ko', 'sa', 'si', 'su', 'se', 'so', 'ta',
-		'ti', 'tu', 'te', 'to', 'na', 'ni', 'nu', 'ne', 'no', 'ha', 'hi', 'hu', 'he', 'ho', 'ma', 'mi',
-		'mu', 'me', 'mo', 'ya', 'yu', 'yo', 'ra', 'ri', 'ru', 're', 'ro', 'wa', 'wi', 'we', 'wo',
-	],
-	'x04': [
-		'Ie', 'Io', 'Dj', 'Gj', 'Ie', 'Dz', 'I', 'Yi', 'J', 'Lj', 'Nj', 'Tsh', 'Kj', 'I', 'U', 'Dzh',
-		'A', 'B', 'V', 'G', 'D', 'Ie', 'Zh', 'Z', 'I', 'I', 'K', 'L', 'M', 'N', 'O', 'P',
-		'R', 'S', 'T', 'U', 'F', 'Kh', 'Ts', 'Ch', 'Sh', 'Shch', '', 'Y', '\'', 'E', 'Iu', 'Ia',
-		'a', 'b', 'v', 'gh', 'd', 'ie', 'zh', 'z', 'i', 'i', 'k', 'l', 'm', 'n', 'o', 'p',
-		'r', 's', 't', 'u', 'f', 'kh', 'ts', 'ch', 'sh', 'shch', '', 'y', '\'', 'e', 'iu', 'ia',
-		'ie', 'io', 'dj', 'gj', 'ie', 'dz', 'i', 'yi', 'j', 'lj', 'nj', 'tsh', 'kj', 'i', 'u', 'dzh',
-		'O', 'o', 'E', 'e', 'Ie', 'ie', 'E', 'e', 'Ie', 'ie', 'O', 'o', 'Io', 'io', 'Ks', 'ks',
-		'Ps', 'ps', 'F', 'f', 'Y', 'y', 'Y', 'y', 'u', 'u', 'O', 'o', 'O', 'o', 'Ot', 'ot',
-		'Q', 'q', '*1000*', '', '', '', '', '[?]', '*100.000*', '*1.000.000*', '[?]', '[?]', '"', '"', 'R\'', 'r\'',
-		'G\'', 'g\'', 'G\'', 'g\'', 'G\'', 'g\'', 'Zh\'', 'zh\'', 'Z\'', 'z\'', 'K\'', 'k\'', 'K\'', 'k\'', 'K\'', 'k\'',
-		'K\'', 'k\'', 'N\'', 'n\'', 'Ng', 'ng', 'P\'', 'p\'', 'Kh', 'kh', 'S\'', 's\'', 'T\'', 't\'', 'U', 'u',
-		'U\'', 'u\'', 'Kh\'', 'kh\'', 'Tts', 'tts', 'Ch\'', 'ch\'', 'Ch\'', 'ch\'', 'H', 'h', 'Ch', 'ch', 'Ch\'', 'ch\'',
-		'`', 'Zh', 'zh', 'K\'', 'k\'', '[?]', '[?]', 'N\'', 'n\'', '[?]', '[?]', 'Ch', 'ch', '[?]', '[?]', '[?]',
-		'a', 'a', 'A', 'a', 'Ae', 'ae', 'Ie', 'ie', '@', '@', '@', '@', 'Zh', 'zh', 'Z', 'z',
-		'Dz', 'dz', 'I', 'i', 'I', 'i', 'O', 'o', 'O', 'o', 'O', 'o', 'E', 'e', 'U', 'u',
-		'U', 'u', 'U', 'u', 'Ch', 'ch', '[?]', '[?]', 'Y', 'y', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xb6': [
-		'ddyels', 'ddyelt', 'ddyelp', 'ddyelh', 'ddyem', 'ddyeb', 'ddyebs', 'ddyes', 'ddyess', 'ddyeng', 'ddyej', 'ddyec', 'ddyek', 'ddyet', 'ddyep', 'ddyeh',
-		'ddo', 'ddog', 'ddogg', 'ddogs', 'ddon', 'ddonj', 'ddonh', 'ddod', 'ddol', 'ddolg', 'ddolm', 'ddolb', 'ddols', 'ddolt', 'ddolp', 'ddolh',
-		'ddom', 'ddob', 'ddobs', 'ddos', 'ddoss', 'ddong', 'ddoj', 'ddoc', 'ddok', 'ddot', 'ddop', 'ddoh', 'ddwa', 'ddwag', 'ddwagg', 'ddwags',
-		'ddwan', 'ddwanj', 'ddwanh', 'ddwad', 'ddwal', 'ddwalg', 'ddwalm', 'ddwalb', 'ddwals', 'ddwalt', 'ddwalp', 'ddwalh', 'ddwam', 'ddwab', 'ddwabs', 'ddwas',
-		'ddwass', 'ddwang', 'ddwaj', 'ddwac', 'ddwak', 'ddwat', 'ddwap', 'ddwah', 'ddwae', 'ddwaeg', 'ddwaegg', 'ddwaegs', 'ddwaen', 'ddwaenj', 'ddwaenh', 'ddwaed',
-		'ddwael', 'ddwaelg', 'ddwaelm', 'ddwaelb', 'ddwaels', 'ddwaelt', 'ddwaelp', 'ddwaelh', 'ddwaem', 'ddwaeb', 'ddwaebs', 'ddwaes', 'ddwaess', 'ddwaeng', 'ddwaej', 'ddwaec',
-		'ddwaek', 'ddwaet', 'ddwaep', 'ddwaeh', 'ddoe', 'ddoeg', 'ddoegg', 'ddoegs', 'ddoen', 'ddoenj', 'ddoenh', 'ddoed', 'ddoel', 'ddoelg', 'ddoelm', 'ddoelb',
-		'ddoels', 'ddoelt', 'ddoelp', 'ddoelh', 'ddoem', 'ddoeb', 'ddoebs', 'ddoes', 'ddoess', 'ddoeng', 'ddoej', 'ddoec', 'ddoek', 'ddoet', 'ddoep', 'ddoeh',
-		'ddyo', 'ddyog', 'ddyogg', 'ddyogs', 'ddyon', 'ddyonj', 'ddyonh', 'ddyod', 'ddyol', 'ddyolg', 'ddyolm', 'ddyolb', 'ddyols', 'ddyolt', 'ddyolp', 'ddyolh',
-		'ddyom', 'ddyob', 'ddyobs', 'ddyos', 'ddyoss', 'ddyong', 'ddyoj', 'ddyoc', 'ddyok', 'ddyot', 'ddyop', 'ddyoh', 'ddu', 'ddug', 'ddugg', 'ddugs',
-		'ddun', 'ddunj', 'ddunh', 'ddud', 'ddul', 'ddulg', 'ddulm', 'ddulb', 'dduls', 'ddult', 'ddulp', 'ddulh', 'ddum', 'ddub', 'ddubs', 'ddus',
-		'dduss', 'ddung', 'dduj', 'dduc', 'dduk', 'ddut', 'ddup', 'dduh', 'ddweo', 'ddweog', 'ddweogg', 'ddweogs', 'ddweon', 'ddweonj', 'ddweonh', 'ddweod',
-		'ddweol', 'ddweolg', 'ddweolm', 'ddweolb', 'ddweols', 'ddweolt', 'ddweolp', 'ddweolh', 'ddweom', 'ddweob', 'ddweobs', 'ddweos', 'ddweoss', 'ddweong', 'ddweoj', 'ddweoc',
-		'ddweok', 'ddweot', 'ddweop', 'ddweoh', 'ddwe', 'ddweg', 'ddwegg', 'ddwegs', 'ddwen', 'ddwenj', 'ddwenh', 'ddwed', 'ddwel', 'ddwelg', 'ddwelm', 'ddwelb',
-		'ddwels', 'ddwelt', 'ddwelp', 'ddwelh', 'ddwem', 'ddweb', 'ddwebs', 'ddwes', 'ddwess', 'ddweng', 'ddwej', 'ddwec', 'ddwek', 'ddwet', 'ddwep', 'ddweh',
-		'ddwi', 'ddwig', 'ddwigg', 'ddwigs', 'ddwin', 'ddwinj', 'ddwinh', 'ddwid', 'ddwil', 'ddwilg', 'ddwilm', 'ddwilb', 'ddwils', 'ddwilt', 'ddwilp', 'ddwilh',
-	],
-	'x23': [
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xbc': [
-		'mil', 'milg', 'milm', 'milb', 'mils', 'milt', 'milp', 'milh', 'mim', 'mib', 'mibs', 'mis', 'miss', 'ming', 'mij', 'mic',
-		'mik', 'mit', 'mip', 'mih', 'ba', 'bag', 'bagg', 'bags', 'ban', 'banj', 'banh', 'bad', 'bal', 'balg', 'balm', 'balb',
-		'bals', 'balt', 'balp', 'balh', 'bam', 'bab', 'babs', 'bas', 'bass', 'bang', 'baj', 'bac', 'bak', 'bat', 'bap', 'bah',
-		'bae', 'baeg', 'baegg', 'baegs', 'baen', 'baenj', 'baenh', 'baed', 'bael', 'baelg', 'baelm', 'baelb', 'baels', 'baelt', 'baelp', 'baelh',
-		'baem', 'baeb', 'baebs', 'baes', 'baess', 'baeng', 'baej', 'baec', 'baek', 'baet', 'baep', 'baeh', 'bya', 'byag', 'byagg', 'byags',
-		'byan', 'byanj', 'byanh', 'byad', 'byal', 'byalg', 'byalm', 'byalb', 'byals', 'byalt', 'byalp', 'byalh', 'byam', 'byab', 'byabs', 'byas',
-		'byass', 'byang', 'byaj', 'byac', 'byak', 'byat', 'byap', 'byah', 'byae', 'byaeg', 'byaegg', 'byaegs', 'byaen', 'byaenj', 'byaenh', 'byaed',
-		'byael', 'byaelg', 'byaelm', 'byaelb', 'byaels', 'byaelt', 'byaelp', 'byaelh', 'byaem', 'byaeb', 'byaebs', 'byaes', 'byaess', 'byaeng', 'byaej', 'byaec',
-		'byaek', 'byaet', 'byaep', 'byaeh', 'beo', 'beog', 'beogg', 'beogs', 'beon', 'beonj', 'beonh', 'beod', 'beol', 'beolg', 'beolm', 'beolb',
-		'beols', 'beolt', 'beolp', 'beolh', 'beom', 'beob', 'beobs', 'beos', 'beoss', 'beong', 'beoj', 'beoc', 'beok', 'beot', 'beop', 'beoh',
-		'be', 'beg', 'begg', 'begs', 'ben', 'benj', 'benh', 'bed', 'bel', 'belg', 'belm', 'belb', 'bels', 'belt', 'belp', 'belh',
-		'bem', 'beb', 'bebs', 'bes', 'bess', 'beng', 'bej', 'bec', 'bek', 'bet', 'bep', 'beh', 'byeo', 'byeog', 'byeogg', 'byeogs',
-		'byeon', 'byeonj', 'byeonh', 'byeod', 'byeol', 'byeolg', 'byeolm', 'byeolb', 'byeols', 'byeolt', 'byeolp', 'byeolh', 'byeom', 'byeob', 'byeobs', 'byeos',
-		'byeoss', 'byeong', 'byeoj', 'byeoc', 'byeok', 'byeot', 'byeop', 'byeoh', 'bye', 'byeg', 'byegg', 'byegs', 'byen', 'byenj', 'byenh', 'byed',
-		'byel', 'byelg', 'byelm', 'byelb', 'byels', 'byelt', 'byelp', 'byelh', 'byem', 'byeb', 'byebs', 'byes', 'byess', 'byeng', 'byej', 'byec',
-		'byek', 'byet', 'byep', 'byeh', 'bo', 'bog', 'bogg', 'bogs', 'bon', 'bonj', 'bonh', 'bod', 'bol', 'bolg', 'bolm', 'bolb',
-	],
-	'x2f': [
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?]', '[?]', '[?]',
-	],
-	'xb4': [
-		'dwaen', 'dwaenj', 'dwaenh', 'dwaed', 'dwael', 'dwaelg', 'dwaelm', 'dwaelb', 'dwaels', 'dwaelt', 'dwaelp', 'dwaelh', 'dwaem', 'dwaeb', 'dwaebs', 'dwaes',
-		'dwaess', 'dwaeng', 'dwaej', 'dwaec', 'dwaek', 'dwaet', 'dwaep', 'dwaeh', 'doe', 'doeg', 'doegg', 'doegs', 'doen', 'doenj', 'doenh', 'doed',
-		'doel', 'doelg', 'doelm', 'doelb', 'doels', 'doelt', 'doelp', 'doelh', 'doem', 'doeb', 'doebs', 'does', 'doess', 'doeng', 'doej', 'doec',
-		'doek', 'doet', 'doep', 'doeh', 'dyo', 'dyog', 'dyogg', 'dyogs', 'dyon', 'dyonj', 'dyonh', 'dyod', 'dyol', 'dyolg', 'dyolm', 'dyolb',
-		'dyols', 'dyolt', 'dyolp', 'dyolh', 'dyom', 'dyob', 'dyobs', 'dyos', 'dyoss', 'dyong', 'dyoj', 'dyoc', 'dyok', 'dyot', 'dyop', 'dyoh',
-		'du', 'dug', 'dugg', 'dugs', 'dun', 'dunj', 'dunh', 'dud', 'dul', 'dulg', 'dulm', 'dulb', 'duls', 'dult', 'dulp', 'dulh',
-		'dum', 'dub', 'dubs', 'dus', 'duss', 'dung', 'duj', 'duc', 'duk', 'dut', 'dup', 'duh', 'dweo', 'dweog', 'dweogg', 'dweogs',
-		'dweon', 'dweonj', 'dweonh', 'dweod', 'dweol', 'dweolg', 'dweolm', 'dweolb', 'dweols', 'dweolt', 'dweolp', 'dweolh', 'dweom', 'dweob', 'dweobs', 'dweos',
-		'dweoss', 'dweong', 'dweoj', 'dweoc', 'dweok', 'dweot', 'dweop', 'dweoh', 'dwe', 'dweg', 'dwegg', 'dwegs', 'dwen', 'dwenj', 'dwenh', 'dwed',
-		'dwel', 'dwelg', 'dwelm', 'dwelb', 'dwels', 'dwelt', 'dwelp', 'dwelh', 'dwem', 'dweb', 'dwebs', 'dwes', 'dwess', 'dweng', 'dwej', 'dwec',
-		'dwek', 'dwet', 'dwep', 'dweh', 'dwi', 'dwig', 'dwigg', 'dwigs', 'dwin', 'dwinj', 'dwinh', 'dwid', 'dwil', 'dwilg', 'dwilm', 'dwilb',
-		'dwils', 'dwilt', 'dwilp', 'dwilh', 'dwim', 'dwib', 'dwibs', 'dwis', 'dwiss', 'dwing', 'dwij', 'dwic', 'dwik', 'dwit', 'dwip', 'dwih',
-		'dyu', 'dyug', 'dyugg', 'dyugs', 'dyun', 'dyunj', 'dyunh', 'dyud', 'dyul', 'dyulg', 'dyulm', 'dyulb', 'dyuls', 'dyult', 'dyulp', 'dyulh',
-		'dyum', 'dyub', 'dyubs', 'dyus', 'dyuss', 'dyung', 'dyuj', 'dyuc', 'dyuk', 'dyut', 'dyup', 'dyuh', 'deu', 'deug', 'deugg', 'deugs',
-		'deun', 'deunj', 'deunh', 'deud', 'deul', 'deulg', 'deulm', 'deulb', 'deuls', 'deult', 'deulp', 'deulh', 'deum', 'deub', 'deubs', 'deus',
-		'deuss', 'deung', 'deuj', 'deuc', 'deuk', 'deut', 'deup', 'deuh', 'dyi', 'dyig', 'dyigg', 'dyigs', 'dyin', 'dyinj', 'dyinh', 'dyid',
-	],
-	'xc9': [
-		'jun', 'junj', 'junh', 'jud', 'jul', 'julg', 'julm', 'julb', 'juls', 'jult', 'julp', 'julh', 'jum', 'jub', 'jubs', 'jus',
-		'juss', 'jung', 'juj', 'juc', 'juk', 'jut', 'jup', 'juh', 'jweo', 'jweog', 'jweogg', 'jweogs', 'jweon', 'jweonj', 'jweonh', 'jweod',
-		'jweol', 'jweolg', 'jweolm', 'jweolb', 'jweols', 'jweolt', 'jweolp', 'jweolh', 'jweom', 'jweob', 'jweobs', 'jweos', 'jweoss', 'jweong', 'jweoj', 'jweoc',
-		'jweok', 'jweot', 'jweop', 'jweoh', 'jwe', 'jweg', 'jwegg', 'jwegs', 'jwen', 'jwenj', 'jwenh', 'jwed', 'jwel', 'jwelg', 'jwelm', 'jwelb',
-		'jwels', 'jwelt', 'jwelp', 'jwelh', 'jwem', 'jweb', 'jwebs', 'jwes', 'jwess', 'jweng', 'jwej', 'jwec', 'jwek', 'jwet', 'jwep', 'jweh',
-		'jwi', 'jwig', 'jwigg', 'jwigs', 'jwin', 'jwinj', 'jwinh', 'jwid', 'jwil', 'jwilg', 'jwilm', 'jwilb', 'jwils', 'jwilt', 'jwilp', 'jwilh',
-		'jwim', 'jwib', 'jwibs', 'jwis', 'jwiss', 'jwing', 'jwij', 'jwic', 'jwik', 'jwit', 'jwip', 'jwih', 'jyu', 'jyug', 'jyugg', 'jyugs',
-		'jyun', 'jyunj', 'jyunh', 'jyud', 'jyul', 'jyulg', 'jyulm', 'jyulb', 'jyuls', 'jyult', 'jyulp', 'jyulh', 'jyum', 'jyub', 'jyubs', 'jyus',
-		'jyuss', 'jyung', 'jyuj', 'jyuc', 'jyuk', 'jyut', 'jyup', 'jyuh', 'jeu', 'jeug', 'jeugg', 'jeugs', 'jeun', 'jeunj', 'jeunh', 'jeud',
-		'jeul', 'jeulg', 'jeulm', 'jeulb', 'jeuls', 'jeult', 'jeulp', 'jeulh', 'jeum', 'jeub', 'jeubs', 'jeus', 'jeuss', 'jeung', 'jeuj', 'jeuc',
-		'jeuk', 'jeut', 'jeup', 'jeuh', 'jyi', 'jyig', 'jyigg', 'jyigs', 'jyin', 'jyinj', 'jyinh', 'jyid', 'jyil', 'jyilg', 'jyilm', 'jyilb',
-		'jyils', 'jyilt', 'jyilp', 'jyilh', 'jyim', 'jyib', 'jyibs', 'jyis', 'jyiss', 'jying', 'jyij', 'jyic', 'jyik', 'jyit', 'jyip', 'jyih',
-		'ji', 'jig', 'jigg', 'jigs', 'jin', 'jinj', 'jinh', 'jid', 'jil', 'jilg', 'jilm', 'jilb', 'jils', 'jilt', 'jilp', 'jilh',
-		'jim', 'jib', 'jibs', 'jis', 'jiss', 'jing', 'jij', 'jic', 'jik', 'jit', 'jip', 'jih', 'jja', 'jjag', 'jjagg', 'jjags',
-		'jjan', 'jjanj', 'jjanh', 'jjad', 'jjal', 'jjalg', 'jjalm', 'jjalb', 'jjals', 'jjalt', 'jjalp', 'jjalh', 'jjam', 'jjab', 'jjabs', 'jjas',
-		'jjass', 'jjang', 'jjaj', 'jjac', 'jjak', 'jjat', 'jjap', 'jjah', 'jjae', 'jjaeg', 'jjaegg', 'jjaegs', 'jjaen', 'jjaenj', 'jjaenh', 'jjaed',
-	],
-	'xb7': [
-		'ddwim', 'ddwib', 'ddwibs', 'ddwis', 'ddwiss', 'ddwing', 'ddwij', 'ddwic', 'ddwik', 'ddwit', 'ddwip', 'ddwih', 'ddyu', 'ddyug', 'ddyugg', 'ddyugs',
-		'ddyun', 'ddyunj', 'ddyunh', 'ddyud', 'ddyul', 'ddyulg', 'ddyulm', 'ddyulb', 'ddyuls', 'ddyult', 'ddyulp', 'ddyulh', 'ddyum', 'ddyub', 'ddyubs', 'ddyus',
-		'ddyuss', 'ddyung', 'ddyuj', 'ddyuc', 'ddyuk', 'ddyut', 'ddyup', 'ddyuh', 'ddeu', 'ddeug', 'ddeugg', 'ddeugs', 'ddeun', 'ddeunj', 'ddeunh', 'ddeud',
-		'ddeul', 'ddeulg', 'ddeulm', 'ddeulb', 'ddeuls', 'ddeult', 'ddeulp', 'ddeulh', 'ddeum', 'ddeub', 'ddeubs', 'ddeus', 'ddeuss', 'ddeung', 'ddeuj', 'ddeuc',
-		'ddeuk', 'ddeut', 'ddeup', 'ddeuh', 'ddyi', 'ddyig', 'ddyigg', 'ddyigs', 'ddyin', 'ddyinj', 'ddyinh', 'ddyid', 'ddyil', 'ddyilg', 'ddyilm', 'ddyilb',
-		'ddyils', 'ddyilt', 'ddyilp', 'ddyilh', 'ddyim', 'ddyib', 'ddyibs', 'ddyis', 'ddyiss', 'ddying', 'ddyij', 'ddyic', 'ddyik', 'ddyit', 'ddyip', 'ddyih',
-		'ddi', 'ddig', 'ddigg', 'ddigs', 'ddin', 'ddinj', 'ddinh', 'ddid', 'ddil', 'ddilg', 'ddilm', 'ddilb', 'ddils', 'ddilt', 'ddilp', 'ddilh',
-		'ddim', 'ddib', 'ddibs', 'ddis', 'ddiss', 'dding', 'ddij', 'ddic', 'ddik', 'ddit', 'ddip', 'ddih', 'ra', 'rag', 'ragg', 'rags',
-		'ran', 'ranj', 'ranh', 'rad', 'ral', 'ralg', 'ralm', 'ralb', 'rals', 'ralt', 'ralp', 'ralh', 'ram', 'rab', 'rabs', 'ras',
-		'rass', 'rang', 'raj', 'rac', 'rak', 'rat', 'rap', 'rah', 'rae', 'raeg', 'raegg', 'raegs', 'raen', 'raenj', 'raenh', 'raed',
-		'rael', 'raelg', 'raelm', 'raelb', 'raels', 'raelt', 'raelp', 'raelh', 'raem', 'raeb', 'raebs', 'raes', 'raess', 'raeng', 'raej', 'raec',
-		'raek', 'raet', 'raep', 'raeh', 'rya', 'ryag', 'ryagg', 'ryags', 'ryan', 'ryanj', 'ryanh', 'ryad', 'ryal', 'ryalg', 'ryalm', 'ryalb',
-		'ryals', 'ryalt', 'ryalp', 'ryalh', 'ryam', 'ryab', 'ryabs', 'ryas', 'ryass', 'ryang', 'ryaj', 'ryac', 'ryak', 'ryat', 'ryap', 'ryah',
-		'ryae', 'ryaeg', 'ryaegg', 'ryaegs', 'ryaen', 'ryaenj', 'ryaenh', 'ryaed', 'ryael', 'ryaelg', 'ryaelm', 'ryaelb', 'ryaels', 'ryaelt', 'ryaelp', 'ryaelh',
-		'ryaem', 'ryaeb', 'ryaebs', 'ryaes', 'ryaess', 'ryaeng', 'ryaej', 'ryaec', 'ryaek', 'ryaet', 'ryaep', 'ryaeh', 'reo', 'reog', 'reogg', 'reogs',
-		'reon', 'reonj', 'reonh', 'reod', 'reol', 'reolg', 'reolm', 'reolb', 'reols', 'reolt', 'reolp', 'reolh', 'reom', 'reob', 'reobs', 'reos',
-	],
-	'xbe': [
-		'byum', 'byub', 'byubs', 'byus', 'byuss', 'byung', 'byuj', 'byuc', 'byuk', 'byut', 'byup', 'byuh', 'beu', 'beug', 'beugg', 'beugs',
-		'beun', 'beunj', 'beunh', 'beud', 'beul', 'beulg', 'beulm', 'beulb', 'beuls', 'beult', 'beulp', 'beulh', 'beum', 'beub', 'beubs', 'beus',
-		'beuss', 'beung', 'beuj', 'beuc', 'beuk', 'beut', 'beup', 'beuh', 'byi', 'byig', 'byigg', 'byigs', 'byin', 'byinj', 'byinh', 'byid',
-		'byil', 'byilg', 'byilm', 'byilb', 'byils', 'byilt', 'byilp', 'byilh', 'byim', 'byib', 'byibs', 'byis', 'byiss', 'bying', 'byij', 'byic',
-		'byik', 'byit', 'byip', 'byih', 'bi', 'big', 'bigg', 'bigs', 'bin', 'binj', 'binh', 'bid', 'bil', 'bilg', 'bilm', 'bilb',
-		'bils', 'bilt', 'bilp', 'bilh', 'bim', 'bib', 'bibs', 'bis', 'biss', 'bing', 'bij', 'bic', 'bik', 'bit', 'bip', 'bih',
-		'bba', 'bbag', 'bbagg', 'bbags', 'bban', 'bbanj', 'bbanh', 'bbad', 'bbal', 'bbalg', 'bbalm', 'bbalb', 'bbals', 'bbalt', 'bbalp', 'bbalh',
-		'bbam', 'bbab', 'bbabs', 'bbas', 'bbass', 'bbang', 'bbaj', 'bbac', 'bbak', 'bbat', 'bbap', 'bbah', 'bbae', 'bbaeg', 'bbaegg', 'bbaegs',
-		'bbaen', 'bbaenj', 'bbaenh', 'bbaed', 'bbael', 'bbaelg', 'bbaelm', 'bbaelb', 'bbaels', 'bbaelt', 'bbaelp', 'bbaelh', 'bbaem', 'bbaeb', 'bbaebs', 'bbaes',
-		'bbaess', 'bbaeng', 'bbaej', 'bbaec', 'bbaek', 'bbaet', 'bbaep', 'bbaeh', 'bbya', 'bbyag', 'bbyagg', 'bbyags', 'bbyan', 'bbyanj', 'bbyanh', 'bbyad',
-		'bbyal', 'bbyalg', 'bbyalm', 'bbyalb', 'bbyals', 'bbyalt', 'bbyalp', 'bbyalh', 'bbyam', 'bbyab', 'bbyabs', 'bbyas', 'bbyass', 'bbyang', 'bbyaj', 'bbyac',
-		'bbyak', 'bbyat', 'bbyap', 'bbyah', 'bbyae', 'bbyaeg', 'bbyaegg', 'bbyaegs', 'bbyaen', 'bbyaenj', 'bbyaenh', 'bbyaed', 'bbyael', 'bbyaelg', 'bbyaelm', 'bbyaelb',
-		'bbyaels', 'bbyaelt', 'bbyaelp', 'bbyaelh', 'bbyaem', 'bbyaeb', 'bbyaebs', 'bbyaes', 'bbyaess', 'bbyaeng', 'bbyaej', 'bbyaec', 'bbyaek', 'bbyaet', 'bbyaep', 'bbyaeh',
-		'bbeo', 'bbeog', 'bbeogg', 'bbeogs', 'bbeon', 'bbeonj', 'bbeonh', 'bbeod', 'bbeol', 'bbeolg', 'bbeolm', 'bbeolb', 'bbeols', 'bbeolt', 'bbeolp', 'bbeolh',
-		'bbeom', 'bbeob', 'bbeobs', 'bbeos', 'bbeoss', 'bbeong', 'bbeoj', 'bbeoc', 'bbeok', 'bbeot', 'bbeop', 'bbeoh', 'bbe', 'bbeg', 'bbegg', 'bbegs',
-		'bben', 'bbenj', 'bbenh', 'bbed', 'bbel', 'bbelg', 'bbelm', 'bbelb', 'bbels', 'bbelt', 'bbelp', 'bbelh', 'bbem', 'bbeb', 'bbebs', 'bbes',
-	],
-	'x10': [
-		'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'nny', 'tt', 'tth', 'dd', 'ddh', 'nn',
-		'tt', 'th', 'd', 'dh', 'n', 'p', 'ph', 'b', 'bh', 'm', 'y', 'r', 'l', 'w', 's', 'h',
-		'll', 'a', '[?]', 'i', 'ii', 'u', 'uu', 'e', '[?]', 'o', 'au', '[?]', 'aa', 'i', 'ii', 'u',
-		'uu', 'e', 'ai', '[?]', '[?]', '[?]', 'N', '\'', ':', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ' / ', ' // ', 'n*', 'r*', 'l*', 'e*',
-		'sh', 'ss', 'R', 'RR', 'L', 'LL', 'R', 'RR', 'L', 'LL', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'A', 'B', 'G', 'D', 'E', 'V', 'Z', 'T`', 'I', 'K', 'L', 'M', 'N', 'O', 'P', 'Zh',
-		'R', 'S', 'T', 'U', 'P`', 'K`', 'G\'', 'Q', 'Sh', 'Ch`', 'C`', 'Z\'', 'C', 'Ch', 'X', 'J',
-		'H', 'E', 'Y', 'W', 'Xh', 'OE', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'a', 'b', 'g', 'd', 'e', 'v', 'z', 't`', 'i', 'k', 'l', 'm', 'n', 'o', 'p', 'zh',
-		'r', 's', 't', 'u', 'p`', 'k`', 'g\'', 'q', 'sh', 'ch`', 'c`', 'z\'', 'c', 'ch', 'x', 'j',
-		'h', 'e', 'y', 'w', 'xh', 'oe', 'f', '[?]', '[?]', '[?]', '[?]', ' // ', '[?]', '[?]', '[?]',
-	],
-	'x1f': [
-		'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A',
-		'e', 'e', 'e', 'e', 'e', 'e', '[?]', '[?]', 'E', 'E', 'E', 'E', 'E', 'E', '[?]', '[?]',
-		'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'E', 'E', 'E', 'E', 'E', 'E', 'E', 'E',
-		'i', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'I', 'I', 'I', 'I', 'I', 'I', 'I', 'I',
-		'o', 'o', 'o', 'o', 'o', 'o', '[?]', '[?]', 'O', 'O', 'O', 'O', 'O', 'O', '[?]', '[?]',
-		'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', '[?]', 'U', '[?]', 'U', '[?]', 'U', '[?]', 'U',
-		'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'O', 'O', 'O', 'O', 'O', 'O', 'O', 'O',
-		'a', 'a', 'e', 'e', 'e', 'e', 'i', 'i', 'o', 'o', 'u', 'u', 'o', 'o', '[?]', '[?]',
-		'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A',
-		'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'E', 'E', 'E', 'E', 'E', 'E', 'E', 'E',
-		'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'O', 'O', 'O', 'O', 'O', 'O', 'O', 'O',
-		'a', 'a', 'a', 'a', 'a', '[?]', 'a', 'a', 'A', 'A', 'A', 'A', 'A', '\'', 'i', '\'',
-		'~', '"~', 'e', 'e', 'e', '[?]', 'e', 'e', 'E', 'E', 'E', 'E', 'E', '\'`', '\'\'', '\'~',
-		'i', 'i', 'i', 'i', '[?]', '[?]', 'i', 'i', 'I', 'I', 'I', 'I', '[?]', '`\'', '`\'', '`~',
-		'u', 'u', 'u', 'u', 'R', 'R', 'u', 'u', 'U', 'U', 'U', 'U', 'R', '"`', '"\'', '`',
-		'[?]', '[?]', 'o', 'o', 'o', '[?]', 'o', 'o', 'O', 'O', 'O', 'O', 'O', '\'', '`',
-	],
-	'x31': [
-		'[?]', '[?]', '[?]', '[?]', '[?]', 'B', 'P', 'M', 'F', 'D', 'T', 'N', 'L', 'G', 'K', 'H',
-		'J', 'Q', 'X', 'ZH', 'CH', 'SH', 'R', 'Z', 'C', 'S', 'A', 'O', 'E', 'EH', 'AI', 'EI',
-		'AU', 'OU', 'AN', 'EN', 'ANG', 'ENG', 'ER', 'I', 'U', 'IU', 'V', 'NG', 'GN', '[?]', '[?]', '[?]',
-		'[?]', 'g', 'gg', 'gs', 'n', 'nj', 'nh', 'd', 'dd', 'r', 'lg', 'lm', 'lb', 'ls', 'lt', 'lp',
-		'rh', 'm', 'b', 'bb', 'bs', 's', 'ss', '', 'j', 'jj', 'c', 'k', 't', 'p', 'h', 'a',
-		'ae', 'ya', 'yae', 'eo', 'e', 'yeo', 'ye', 'o', 'wa', 'wae', 'oe', 'yo', 'u', 'weo', 'we', 'wi',
-		'yu', 'eu', 'yi', 'i', '', 'nn', 'nd', 'ns', 'nZ', 'lgs', 'ld', 'lbs', 'lZ', 'lQ', 'mb', 'ms',
-		'mZ', 'mN', 'bg', '', 'bsg', 'bst', 'bj', 'bt', 'bN', 'bbN', 'sg', 'sn', 'sd', 'sb', 'sj', 'Z',
-		'', 'N', 'Ns', 'NZ', 'pN', 'hh', 'Q', 'yo-ya', 'yo-yae', 'yo-i', 'yu-yeo', 'yu-ye', 'yu-i', 'U', 'U-i', '[?]',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'BU', 'ZI', 'JI', 'GU', 'EE', 'ENN', 'OO', 'ONN', 'IR', 'ANN', 'INN', 'UNN', 'IM', 'NGG', 'AINN', 'AUNN',
-		'AM', 'OM', 'ONG', 'INNN', 'P', 'T', 'K', 'H', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'x18': [
-		' @ ', ' ... ', ', ', '. ', ': ', ' // ', '', '-', ', ', '. ', '', '', '', '', '', '[?]',
-		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'a', 'e', 'i', 'o', 'u', 'O', 'U', 'ee', 'n', 'ng', 'b', 'p', 'q', 'g', 'm', 'l',
-		's', 'sh', 't', 'd', 'ch', 'j', 'y', 'r', 'w', 'f', 'k', 'kha', 'ts', 'z', 'h', 'zr',
-		'lh', 'zh', 'ch', '-', 'e', 'i', 'o', 'u', 'O', 'U', 'ng', 'b', 'p', 'q', 'g', 'm',
-		't', 'd', 'ch', 'j', 'ts', 'y', 'w', 'k', 'g', 'h', 'jy', 'ny', 'dz', 'e', 'i', 'iy',
-		'U', 'u', 'ng', 'k', 'g', 'h', 'p', 'sh', 't', 'd', 'j', 'f', 'g', 'h', 'ts', 'z',
-		'r', 'ch', 'zh', 'i', 'k', 'r', 'f', 'zh', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', 'H', 'X', 'W', 'M', ' 3 ', ' 333 ', 'a', 'i', 'k', 'ng', 'c', 'tt', 'tth', 'dd', 'nn',
-		't', 'd', 'p', 'ph', 'ss', 'zh', 'z', 'a', 't', 'zh', 'gh', 'ng', 'c', 'jh', 'tta', 'ddh',
-		't', 'dh', 'ss', 'cy', 'zh', 'z', 'u', 'y', 'bh', '\'', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'x11': [
-		'g', 'gg', 'n', 'd', 'dd', 'r', 'm', 'b', 'bb', 's', 'ss', '', 'j', 'jj', 'c', 'k',
-		't', 'p', 'h', 'ng', 'nn', 'nd', 'nb', 'dg', 'rn', 'rr', 'rh', 'rN', 'mb', 'mN', 'bg', 'bn',
-		'', 'bs', 'bsg', 'bst', 'bsb', 'bss', 'bsj', 'bj', 'bc', 'bt', 'bp', 'bN', 'bbN', 'sg', 'sn', 'sd',
-		'sr', 'sm', 'sb', 'sbg', 'sss', 's', 'sj', 'sc', 'sk', 'st', 'sp', 'sh', '', '', '', '',
-		'Z', 'g', 'd', 'm', 'b', 's', 'Z', '', 'j', 'c', 't', 'p', 'N', 'j', '', '',
-		'', '', 'ck', 'ch', '', '', 'pb', 'pN', 'hh', 'Q', '[?]', '[?]', '[?]', '[?]', '[?]', '',
-		'', 'a', 'ae', 'ya', 'yae', 'eo', 'e', 'yeo', 'ye', 'o', 'wa', 'wae', 'oe', 'yo', 'u', 'weo',
-		'we', 'wi', 'yu', 'eu', 'yi', 'i', 'a-o', 'a-u', 'ya-o', 'ya-yo', 'eo-o', 'eo-u', 'eo-eu', 'yeo-o', 'yeo-u', 'o-eo',
-		'o-e', 'o-ye', 'o-o', 'o-u', 'yo-ya', 'yo-yae', 'yo-yeo', 'yo-o', 'yo-i', 'u-a', 'u-ae', 'u-eo-eu', 'u-ye', 'u-u', 'yu-a', 'yu-eo',
-		'yu-e', 'yu-yeo', 'yu-ye', 'yu-u', 'yu-i', 'eu-u', 'eu-eu', 'yi-u', 'i-a', 'i-ya', 'i-o', 'i-u', 'i-eu', 'i-U', 'U', 'U-eo',
-		'U-u', 'U-i', 'UU', '[?]', '[?]', '[?]', '[?]', '[?]', 'g', 'gg', 'gs', 'n', 'nj', 'nh', 'd', 'l',
-		'lg', 'lm', 'lb', 'ls', 'lt', 'lp', 'lh', 'm', 'b', 'bs', 's', 'ss', 'ng', 'j', 'c', 'k',
-		't', 'p', 'h', 'gl', 'gsg', 'ng', 'nd', 'ns', 'nZ', 'nt', 'dg', 'tl', 'lgs', 'ln', 'ld', 'lth',
-		'll', 'lmg', 'lms', 'lbs', 'lbh', 'rNp', 'lss', 'lZ', 'lk', 'lQ', 'mg', 'ml', 'mb', 'ms', 'mss', 'mZ',
-		'mc', 'mh', 'mN', 'bl', 'bp', 'ph', 'pN', 'sg', 'sd', 'sl', 'sb', 'Z', 'g', 'ss', '', 'kh',
-		'N', 'Ns', 'NZ', 'pb', 'pN', 'hn', 'hl', 'hm', 'hb', 'Q', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xcf': [
-		'ke', 'keg', 'kegg', 'kegs', 'ken', 'kenj', 'kenh', 'ked', 'kel', 'kelg', 'kelm', 'kelb', 'kels', 'kelt', 'kelp', 'kelh',
-		'kem', 'keb', 'kebs', 'kes', 'kess', 'keng', 'kej', 'kec', 'kek', 'ket', 'kep', 'keh', 'kyeo', 'kyeog', 'kyeogg', 'kyeogs',
-		'kyeon', 'kyeonj', 'kyeonh', 'kyeod', 'kyeol', 'kyeolg', 'kyeolm', 'kyeolb', 'kyeols', 'kyeolt', 'kyeolp', 'kyeolh', 'kyeom', 'kyeob', 'kyeobs', 'kyeos',
-		'kyeoss', 'kyeong', 'kyeoj', 'kyeoc', 'kyeok', 'kyeot', 'kyeop', 'kyeoh', 'kye', 'kyeg', 'kyegg', 'kyegs', 'kyen', 'kyenj', 'kyenh', 'kyed',
-		'kyel', 'kyelg', 'kyelm', 'kyelb', 'kyels', 'kyelt', 'kyelp', 'kyelh', 'kyem', 'kyeb', 'kyebs', 'kyes', 'kyess', 'kyeng', 'kyej', 'kyec',
-		'kyek', 'kyet', 'kyep', 'kyeh', 'ko', 'kog', 'kogg', 'kogs', 'kon', 'konj', 'konh', 'kod', 'kol', 'kolg', 'kolm', 'kolb',
-		'kols', 'kolt', 'kolp', 'kolh', 'kom', 'kob', 'kobs', 'kos', 'koss', 'kong', 'koj', 'koc', 'kok', 'kot', 'kop', 'koh',
-		'kwa', 'kwag', 'kwagg', 'kwags', 'kwan', 'kwanj', 'kwanh', 'kwad', 'kwal', 'kwalg', 'kwalm', 'kwalb', 'kwals', 'kwalt', 'kwalp', 'kwalh',
-		'kwam', 'kwab', 'kwabs', 'kwas', 'kwass', 'kwang', 'kwaj', 'kwac', 'kwak', 'kwat', 'kwap', 'kwah', 'kwae', 'kwaeg', 'kwaegg', 'kwaegs',
-		'kwaen', 'kwaenj', 'kwaenh', 'kwaed', 'kwael', 'kwaelg', 'kwaelm', 'kwaelb', 'kwaels', 'kwaelt', 'kwaelp', 'kwaelh', 'kwaem', 'kwaeb', 'kwaebs', 'kwaes',
-		'kwaess', 'kwaeng', 'kwaej', 'kwaec', 'kwaek', 'kwaet', 'kwaep', 'kwaeh', 'koe', 'koeg', 'koegg', 'koegs', 'koen', 'koenj', 'koenh', 'koed',
-		'koel', 'koelg', 'koelm', 'koelb', 'koels', 'koelt', 'koelp', 'koelh', 'koem', 'koeb', 'koebs', 'koes', 'koess', 'koeng', 'koej', 'koec',
-		'koek', 'koet', 'koep', 'koeh', 'kyo', 'kyog', 'kyogg', 'kyogs', 'kyon', 'kyonj', 'kyonh', 'kyod', 'kyol', 'kyolg', 'kyolm', 'kyolb',
-		'kyols', 'kyolt', 'kyolp', 'kyolh', 'kyom', 'kyob', 'kyobs', 'kyos', 'kyoss', 'kyong', 'kyoj', 'kyoc', 'kyok', 'kyot', 'kyop', 'kyoh',
-		'ku', 'kug', 'kugg', 'kugs', 'kun', 'kunj', 'kunh', 'kud', 'kul', 'kulg', 'kulm', 'kulb', 'kuls', 'kult', 'kulp', 'kulh',
-		'kum', 'kub', 'kubs', 'kus', 'kuss', 'kung', 'kuj', 'kuc', 'kuk', 'kut', 'kup', 'kuh', 'kweo', 'kweog', 'kweogg', 'kweogs',
-	],
-	'x01': [
-		'A', 'a', 'A', 'a', 'A', 'a', 'C', 'c', 'C', 'c', 'C', 'c', 'C', 'c', 'D', 'd',
-		'D', 'd', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'G', 'g', 'G', 'g',
-		'G', 'g', 'G', 'g', 'H', 'h', 'H', 'h', 'I', 'i', 'I', 'i', 'I', 'i', 'I', 'i',
-		'I', 'i', 'IJ', '', 'J', 'j', 'K', 'k', 'k', 'L', 'l', 'L', 'l', 'L', 'l', 'L',
-		'l', 'L', 'l', 'N', 'n', 'N', 'n', 'N', 'n', '\'n', 'ng', 'NG', 'O', 'o', 'O', 'o',
-		'O', 'o', 'OE', 'oe', 'R', 'r', 'R', 'r', 'R', 'r', 'S', 's', 'S', 's', 'S', 's',
-		'S', 's', 'T', 't', 'T', 't', 'T', 't', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u',
-		'U', 'u', 'U', 'u', 'W', 'w', 'Y', 'y', 'Y', 'Z', 'z', 'Z', 'z', 'Z', 'z', 's',
-		'b', 'B', 'B', 'b', '6', '6', 'O', 'C', 'c', 'D', 'D', 'D', 'd', 'd', '3', '@',
-		'E', 'F', 'f', 'G', 'G', 'hv', 'I', 'I', 'K', 'k', 'l', 'l', 'W', 'N', 'n', 'O',
-		'O', 'o', 'OI', 'oi', 'P', 'p', 'YR', '2', '2', 'SH', 'sh', 't', 'T', 't', 'T', 'U',
-		'u', 'Y', 'V', 'Y', 'y', 'Z', 'z', 'ZH', 'ZH', 'zh', 'zh', '2', '5', '5', 'ts', 'w',
-		'|', '||', '|=', '!', 'DZ', 'Dz', 'dz', 'LJ', 'Lj', 'lj', 'NJ', 'Nj', 'nj', 'A', 'a', 'I',
-		'i', 'O', 'o', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', '@', 'A', 'a',
-		'A', 'a', 'AE', 'ae', 'G', 'g', 'G', 'g', 'K', 'k', 'O', 'o', 'O', 'o', 'ZH', 'zh',
-		'j', 'DZ', 'D', 'dz', 'G', 'g', 'HV', 'W', 'N', 'n', 'A', 'a', 'AE', 'ae', 'O', 'o',
-	],
-	'xc7': [
-		'wek', 'wet', 'wep', 'weh', 'wi', 'wig', 'wigg', 'wigs', 'win', 'winj', 'winh', 'wid', 'wil', 'wilg', 'wilm', 'wilb',
-		'wils', 'wilt', 'wilp', 'wilh', 'wim', 'wib', 'wibs', 'wis', 'wiss', 'wing', 'wij', 'wic', 'wik', 'wit', 'wip', 'wih',
-		'yu', 'yug', 'yugg', 'yugs', 'yun', 'yunj', 'yunh', 'yud', 'yul', 'yulg', 'yulm', 'yulb', 'yuls', 'yult', 'yulp', 'yulh',
-		'yum', 'yub', 'yubs', 'yus', 'yuss', 'yung', 'yuj', 'yuc', 'yuk', 'yut', 'yup', 'yuh', 'eu', 'eug', 'eugg', 'eugs',
-		'eun', 'eunj', 'eunh', 'eud', 'eul', 'eulg', 'eulm', 'eulb', 'euls', 'eult', 'eulp', 'eulh', 'eum', 'eub', 'eubs', 'eus',
-		'euss', 'eung', 'euj', 'euc', 'euk', 'eut', 'eup', 'euh', 'yi', 'yig', 'yigg', 'yigs', 'yin', 'yinj', 'yinh', 'yid',
-		'yil', 'yilg', 'yilm', 'yilb', 'yils', 'yilt', 'yilp', 'yilh', 'yim', 'yib', 'yibs', 'yis', 'yiss', 'ying', 'yij', 'yic',
-		'yik', 'yit', 'yip', 'yih', 'i', 'ig', 'igg', 'igs', 'in', 'inj', 'inh', 'id', 'il', 'ilg', 'ilm', 'ilb',
-		'ils', 'ilt', 'ilp', 'ilh', 'im', 'ib', 'ibs', 'is', 'iss', 'ing', 'ij', 'ic', 'ik', 'it', 'ip', 'ih',
-		'ja', 'jag', 'jagg', 'jags', 'jan', 'janj', 'janh', 'jad', 'jal', 'jalg', 'jalm', 'jalb', 'jals', 'jalt', 'jalp', 'jalh',
-		'jam', 'jab', 'jabs', 'jas', 'jass', 'jang', 'jaj', 'jac', 'jak', 'jat', 'jap', 'jah', 'jae', 'jaeg', 'jaegg', 'jaegs',
-		'jaen', 'jaenj', 'jaenh', 'jaed', 'jael', 'jaelg', 'jaelm', 'jaelb', 'jaels', 'jaelt', 'jaelp', 'jaelh', 'jaem', 'jaeb', 'jaebs', 'jaes',
-		'jaess', 'jaeng', 'jaej', 'jaec', 'jaek', 'jaet', 'jaep', 'jaeh', 'jya', 'jyag', 'jyagg', 'jyags', 'jyan', 'jyanj', 'jyanh', 'jyad',
-		'jyal', 'jyalg', 'jyalm', 'jyalb', 'jyals', 'jyalt', 'jyalp', 'jyalh', 'jyam', 'jyab', 'jyabs', 'jyas', 'jyass', 'jyang', 'jyaj', 'jyac',
-		'jyak', 'jyat', 'jyap', 'jyah', 'jyae', 'jyaeg', 'jyaegg', 'jyaegs', 'jyaen', 'jyaenj', 'jyaenh', 'jyaed', 'jyael', 'jyaelg', 'jyaelm', 'jyaelb',
-		'jyaels', 'jyaelt', 'jyaelp', 'jyaelh', 'jyaem', 'jyaeb', 'jyaebs', 'jyaes', 'jyaess', 'jyaeng', 'jyaej', 'jyaec', 'jyaek', 'jyaet', 'jyaep', 'jyaeh',
-	],
-	'x16': [
-		'kka', 'kk', 'nu', 'no', 'ne', 'nee', 'ni', 'na', 'mu', 'mo', 'me', 'mee', 'mi', 'ma', 'yu', 'yo',
-		'ye', 'yee', 'yi', 'ya', 'ju', 'ju', 'jo', 'je', 'jee', 'ji', 'ji', 'ja', 'jju', 'jjo', 'jje', 'jjee',
-		'jji', 'jja', 'lu', 'lo', 'le', 'lee', 'li', 'la', 'dlu', 'dlo', 'dle', 'dlee', 'dli', 'dla', 'lhu', 'lho',
-		'lhe', 'lhee', 'lhi', 'lha', 'tlhu', 'tlho', 'tlhe', 'tlhee', 'tlhi', 'tlha', 'tlu', 'tlo', 'tle', 'tlee', 'tli', 'tla',
-		'zu', 'zo', 'ze', 'zee', 'zi', 'za', 'z', 'z', 'dzu', 'dzo', 'dze', 'dzee', 'dzi', 'dza', 'su', 'so',
-		'se', 'see', 'si', 'sa', 'shu', 'sho', 'she', 'shee', 'shi', 'sha', 'sh', 'tsu', 'tso', 'tse', 'tsee', 'tsi',
-		'tsa', 'chu', 'cho', 'che', 'chee', 'chi', 'cha', 'ttsu', 'ttso', 'ttse', 'ttsee', 'ttsi', 'ttsa', 'X', '.', 'qai',
-		'ngai', 'nngi', 'nngii', 'nngo', 'nngoo', 'nnga', 'nngaa', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		' ', 'b', 'l', 'f', 's', 'n', 'h', 'd', 't', 'c', 'q', 'm', 'g', 'ng', 'z', 'r',
-		'a', 'o', 'u', 'e', 'i', 'ch', 'th', 'ph', 'p', 'x', 'p', '<', '>', '[?]', '[?]', '[?]',
-		'f', 'v', 'u', 'yr', 'y', 'w', 'th', 'th', 'a', 'o', 'ac', 'ae', 'o', 'o', 'o', 'oe',
-		'on', 'r', 'k', 'c', 'k', 'g', 'ng', 'g', 'g', 'w', 'h', 'h', 'h', 'h', 'n', 'n',
-		'n', 'i', 'e', 'j', 'g', 'ae', 'a', 'eo', 'p', 'z', 's', 's', 's', 'c', 'z', 't',
-		't', 'd', 'b', 'b', 'p', 'p', 'e', 'm', 'm', 'm', 'l', 'l', 'ng', 'ng', 'd', 'o',
-		'ear', 'ior', 'qu', 'qu', 'qu', 's', 'yr', 'yr', 'yr', 'q', 'x', '.', ':', '+', '17', '18',
-		'19', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xac': [
-		'ga', 'gag', 'gagg', 'gags', 'gan', 'ganj', 'ganh', 'gad', 'gal', 'galg', 'galm', 'galb', 'gals', 'galt', 'galp', 'galh',
-		'gam', 'gab', 'gabs', 'gas', 'gass', 'gang', 'gaj', 'gac', 'gak', 'gat', 'gap', 'gah', 'gae', 'gaeg', 'gaegg', 'gaegs',
-		'gaen', 'gaenj', 'gaenh', 'gaed', 'gael', 'gaelg', 'gaelm', 'gaelb', 'gaels', 'gaelt', 'gaelp', 'gaelh', 'gaem', 'gaeb', 'gaebs', 'gaes',
-		'gaess', 'gaeng', 'gaej', 'gaec', 'gaek', 'gaet', 'gaep', 'gaeh', 'gya', 'gyag', 'gyagg', 'gyags', 'gyan', 'gyanj', 'gyanh', 'gyad',
-		'gyal', 'gyalg', 'gyalm', 'gyalb', 'gyals', 'gyalt', 'gyalp', 'gyalh', 'gyam', 'gyab', 'gyabs', 'gyas', 'gyass', 'gyang', 'gyaj', 'gyac',
-		'gyak', 'gyat', 'gyap', 'gyah', 'gyae', 'gyaeg', 'gyaegg', 'gyaegs', 'gyaen', 'gyaenj', 'gyaenh', 'gyaed', 'gyael', 'gyaelg', 'gyaelm', 'gyaelb',
-		'gyaels', 'gyaelt', 'gyaelp', 'gyaelh', 'gyaem', 'gyaeb', 'gyaebs', 'gyaes', 'gyaess', 'gyaeng', 'gyaej', 'gyaec', 'gyaek', 'gyaet', 'gyaep', 'gyaeh',
-		'geo', 'geog', 'geogg', 'geogs', 'geon', 'geonj', 'geonh', 'geod', 'geol', 'geolg', 'geolm', 'geolb', 'geols', 'geolt', 'geolp', 'geolh',
-		'geom', 'geob', 'geobs', 'geos', 'geoss', 'geong', 'geoj', 'geoc', 'geok', 'geot', 'geop', 'geoh', 'ge', 'geg', 'gegg', 'gegs',
-		'gen', 'genj', 'genh', 'ged', 'gel', 'gelg', 'gelm', 'gelb', 'gels', 'gelt', 'gelp', 'gelh', 'gem', 'geb', 'gebs', 'ges',
-		'gess', 'geng', 'gej', 'gec', 'gek', 'get', 'gep', 'geh', 'gyeo', 'gyeog', 'gyeogg', 'gyeogs', 'gyeon', 'gyeonj', 'gyeonh', 'gyeod',
-		'gyeol', 'gyeolg', 'gyeolm', 'gyeolb', 'gyeols', 'gyeolt', 'gyeolp', 'gyeolh', 'gyeom', 'gyeob', 'gyeobs', 'gyeos', 'gyeoss', 'gyeong', 'gyeoj', 'gyeoc',
-		'gyeok', 'gyeot', 'gyeop', 'gyeoh', 'gye', 'gyeg', 'gyegg', 'gyegs', 'gyen', 'gyenj', 'gyenh', 'gyed', 'gyel', 'gyelg', 'gyelm', 'gyelb',
-		'gyels', 'gyelt', 'gyelp', 'gyelh', 'gyem', 'gyeb', 'gyebs', 'gyes', 'gyess', 'gyeng', 'gyej', 'gyec', 'gyek', 'gyet', 'gyep', 'gyeh',
-		'go', 'gog', 'gogg', 'gogs', 'gon', 'gonj', 'gonh', 'god', 'gol', 'golg', 'golm', 'golb', 'gols', 'golt', 'golp', 'golh',
-		'gom', 'gob', 'gobs', 'gos', 'goss', 'gong', 'goj', 'goc', 'gok', 'got', 'gop', 'goh', 'gwa', 'gwag', 'gwagg', 'gwags',
-	],
-	'xbf': [
-		'bbess', 'bbeng', 'bbej', 'bbec', 'bbek', 'bbet', 'bbep', 'bbeh', 'bbyeo', 'bbyeog', 'bbyeogg', 'bbyeogs', 'bbyeon', 'bbyeonj', 'bbyeonh', 'bbyeod',
-		'bbyeol', 'bbyeolg', 'bbyeolm', 'bbyeolb', 'bbyeols', 'bbyeolt', 'bbyeolp', 'bbyeolh', 'bbyeom', 'bbyeob', 'bbyeobs', 'bbyeos', 'bbyeoss', 'bbyeong', 'bbyeoj', 'bbyeoc',
-		'bbyeok', 'bbyeot', 'bbyeop', 'bbyeoh', 'bbye', 'bbyeg', 'bbyegg', 'bbyegs', 'bbyen', 'bbyenj', 'bbyenh', 'bbyed', 'bbyel', 'bbyelg', 'bbyelm', 'bbyelb',
-		'bbyels', 'bbyelt', 'bbyelp', 'bbyelh', 'bbyem', 'bbyeb', 'bbyebs', 'bbyes', 'bbyess', 'bbyeng', 'bbyej', 'bbyec', 'bbyek', 'bbyet', 'bbyep', 'bbyeh',
-		'bbo', 'bbog', 'bbogg', 'bbogs', 'bbon', 'bbonj', 'bbonh', 'bbod', 'bbol', 'bbolg', 'bbolm', 'bbolb', 'bbols', 'bbolt', 'bbolp', 'bbolh',
-		'bbom', 'bbob', 'bbobs', 'bbos', 'bboss', 'bbong', 'bboj', 'bboc', 'bbok', 'bbot', 'bbop', 'bboh', 'bbwa', 'bbwag', 'bbwagg', 'bbwags',
-		'bbwan', 'bbwanj', 'bbwanh', 'bbwad', 'bbwal', 'bbwalg', 'bbwalm', 'bbwalb', 'bbwals', 'bbwalt', 'bbwalp', 'bbwalh', 'bbwam', 'bbwab', 'bbwabs', 'bbwas',
-		'bbwass', 'bbwang', 'bbwaj', 'bbwac', 'bbwak', 'bbwat', 'bbwap', 'bbwah', 'bbwae', 'bbwaeg', 'bbwaegg', 'bbwaegs', 'bbwaen', 'bbwaenj', 'bbwaenh', 'bbwaed',
-		'bbwael', 'bbwaelg', 'bbwaelm', 'bbwaelb', 'bbwaels', 'bbwaelt', 'bbwaelp', 'bbwaelh', 'bbwaem', 'bbwaeb', 'bbwaebs', 'bbwaes', 'bbwaess', 'bbwaeng', 'bbwaej', 'bbwaec',
-		'bbwaek', 'bbwaet', 'bbwaep', 'bbwaeh', 'bboe', 'bboeg', 'bboegg', 'bboegs', 'bboen', 'bboenj', 'bboenh', 'bboed', 'bboel', 'bboelg', 'bboelm', 'bboelb',
-		'bboels', 'bboelt', 'bboelp', 'bboelh', 'bboem', 'bboeb', 'bboebs', 'bboes', 'bboess', 'bboeng', 'bboej', 'bboec', 'bboek', 'bboet', 'bboep', 'bboeh',
-		'bbyo', 'bbyog', 'bbyogg', 'bbyogs', 'bbyon', 'bbyonj', 'bbyonh', 'bbyod', 'bbyol', 'bbyolg', 'bbyolm', 'bbyolb', 'bbyols', 'bbyolt', 'bbyolp', 'bbyolh',
-		'bbyom', 'bbyob', 'bbyobs', 'bbyos', 'bbyoss', 'bbyong', 'bbyoj', 'bbyoc', 'bbyok', 'bbyot', 'bbyop', 'bbyoh', 'bbu', 'bbug', 'bbugg', 'bbugs',
-		'bbun', 'bbunj', 'bbunh', 'bbud', 'bbul', 'bbulg', 'bbulm', 'bbulb', 'bbuls', 'bbult', 'bbulp', 'bbulh', 'bbum', 'bbub', 'bbubs', 'bbus',
-		'bbuss', 'bbung', 'bbuj', 'bbuc', 'bbuk', 'bbut', 'bbup', 'bbuh', 'bbweo', 'bbweog', 'bbweogg', 'bbweogs', 'bbweon', 'bbweonj', 'bbweonh', 'bbweod',
-		'bbweol', 'bbweolg', 'bbweolm', 'bbweolb', 'bbweols', 'bbweolt', 'bbweolp', 'bbweolh', 'bbweom', 'bbweob', 'bbweobs', 'bbweos', 'bbweoss', 'bbweong', 'bbweoj', 'bbweoc',
-	],
-	'xd3': [
-		'tim', 'tib', 'tibs', 'tis', 'tiss', 'ting', 'tij', 'tic', 'tik', 'tit', 'tip', 'tih', 'pa', 'pag', 'pagg', 'pags',
-		'pan', 'panj', 'panh', 'pad', 'pal', 'palg', 'palm', 'palb', 'pals', 'palt', 'palp', 'palh', 'pam', 'pab', 'pabs', 'pas',
-		'pass', 'pang', 'paj', 'pac', 'pak', 'pat', 'pap', 'pah', 'pae', 'paeg', 'paegg', 'paegs', 'paen', 'paenj', 'paenh', 'paed',
-		'pael', 'paelg', 'paelm', 'paelb', 'paels', 'paelt', 'paelp', 'paelh', 'paem', 'paeb', 'paebs', 'paes', 'paess', 'paeng', 'paej', 'paec',
-		'paek', 'paet', 'paep', 'paeh', 'pya', 'pyag', 'pyagg', 'pyags', 'pyan', 'pyanj', 'pyanh', 'pyad', 'pyal', 'pyalg', 'pyalm', 'pyalb',
-		'pyals', 'pyalt', 'pyalp', 'pyalh', 'pyam', 'pyab', 'pyabs', 'pyas', 'pyass', 'pyang', 'pyaj', 'pyac', 'pyak', 'pyat', 'pyap', 'pyah',
-		'pyae', 'pyaeg', 'pyaegg', 'pyaegs', 'pyaen', 'pyaenj', 'pyaenh', 'pyaed', 'pyael', 'pyaelg', 'pyaelm', 'pyaelb', 'pyaels', 'pyaelt', 'pyaelp', 'pyaelh',
-		'pyaem', 'pyaeb', 'pyaebs', 'pyaes', 'pyaess', 'pyaeng', 'pyaej', 'pyaec', 'pyaek', 'pyaet', 'pyaep', 'pyaeh', 'peo', 'peog', 'peogg', 'peogs',
-		'peon', 'peonj', 'peonh', 'peod', 'peol', 'peolg', 'peolm', 'peolb', 'peols', 'peolt', 'peolp', 'peolh', 'peom', 'peob', 'peobs', 'peos',
-		'peoss', 'peong', 'peoj', 'peoc', 'peok', 'peot', 'peop', 'peoh', 'pe', 'peg', 'pegg', 'pegs', 'pen', 'penj', 'penh', 'ped',
-		'pel', 'pelg', 'pelm', 'pelb', 'pels', 'pelt', 'pelp', 'pelh', 'pem', 'peb', 'pebs', 'pes', 'pess', 'peng', 'pej', 'pec',
-		'pek', 'pet', 'pep', 'peh', 'pyeo', 'pyeog', 'pyeogg', 'pyeogs', 'pyeon', 'pyeonj', 'pyeonh', 'pyeod', 'pyeol', 'pyeolg', 'pyeolm', 'pyeolb',
-		'pyeols', 'pyeolt', 'pyeolp', 'pyeolh', 'pyeom', 'pyeob', 'pyeobs', 'pyeos', 'pyeoss', 'pyeong', 'pyeoj', 'pyeoc', 'pyeok', 'pyeot', 'pyeop', 'pyeoh',
-		'pye', 'pyeg', 'pyegg', 'pyegs', 'pyen', 'pyenj', 'pyenh', 'pyed', 'pyel', 'pyelg', 'pyelm', 'pyelb', 'pyels', 'pyelt', 'pyelp', 'pyelh',
-		'pyem', 'pyeb', 'pyebs', 'pyes', 'pyess', 'pyeng', 'pyej', 'pyec', 'pyek', 'pyet', 'pyep', 'pyeh', 'po', 'pog', 'pogg', 'pogs',
-		'pon', 'ponj', 'ponh', 'pod', 'pol', 'polg', 'polm', 'polb', 'pols', 'polt', 'polp', 'polh', 'pom', 'pob', 'pobs', 'pos',
-	],
-	'x0e': [
-		'[?]', 'k', 'kh', 'kh', 'kh', 'kh', 'kh', 'ng', 'cch', 'ch', 'ch', 'ch', 'ch', 'y', 'd', 't',
-		'th', 'th', 'th', 'n', 'd', 't', 'th', 'th', 'th', 'n', 'b', 'p', 'ph', 'f', 'ph', 'f',
-		'ph', 'm', 'y', 'r', 'R', 'l', 'L', 'w', 's', 's', 's', 'h', 'l', '`', 'h', '~',
-		'a', 'a', 'aa', 'am', 'i', 'ii', 'ue', 'uue', 'u', 'uu', '\'', '[?]', '[?]', '[?]', '[?]', 'Bh.',
-		'e', 'ae', 'o', 'ai', 'ai', 'ao', '+', '', '', '', '', '', '', 'M', '', ' * ',
-		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ' // ', ' /// ', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', 'k', 'kh', '[?]', 'kh', '[?]', '[?]', 'ng', 'ch', '[?]', 's', '[?]', '[?]', 'ny', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', 'd', 'h', 'th', 'th', '[?]', 'n', 'b', 'p', 'ph', 'f', 'ph', 'f',
-		'[?]', 'm', 'y', 'r', '[?]', 'l', '[?]', 'w', '[?]', '[?]', 's', 'h', '[?]', '`', '', '~',
-		'a', '', 'aa', 'am', 'i', 'ii', 'y', 'yy', 'u', 'uu', '[?]', 'o', 'l', 'ny', '[?]', '[?]',
-		'e', 'ei', 'o', 'ay', 'ai', '[?]', '+', '[?]', '', '', '', '', '', 'M', '[?]', '[?]',
-		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '[?]', '[?]', 'hn', 'hm', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xbd': [
-		'bols', 'bolt', 'bolp', 'bolh', 'bom', 'bob', 'bobs', 'bos', 'boss', 'bong', 'boj', 'boc', 'bok', 'bot', 'bop', 'boh',
-		'bwa', 'bwag', 'bwagg', 'bwags', 'bwan', 'bwanj', 'bwanh', 'bwad', 'bwal', 'bwalg', 'bwalm', 'bwalb', 'bwals', 'bwalt', 'bwalp', 'bwalh',
-		'bwam', 'bwab', 'bwabs', 'bwas', 'bwass', 'bwang', 'bwaj', 'bwac', 'bwak', 'bwat', 'bwap', 'bwah', 'bwae', 'bwaeg', 'bwaegg', 'bwaegs',
-		'bwaen', 'bwaenj', 'bwaenh', 'bwaed', 'bwael', 'bwaelg', 'bwaelm', 'bwaelb', 'bwaels', 'bwaelt', 'bwaelp', 'bwaelh', 'bwaem', 'bwaeb', 'bwaebs', 'bwaes',
-		'bwaess', 'bwaeng', 'bwaej', 'bwaec', 'bwaek', 'bwaet', 'bwaep', 'bwaeh', 'boe', 'boeg', 'boegg', 'boegs', 'boen', 'boenj', 'boenh', 'boed',
-		'boel', 'boelg', 'boelm', 'boelb', 'boels', 'boelt', 'boelp', 'boelh', 'boem', 'boeb', 'boebs', 'boes', 'boess', 'boeng', 'boej', 'boec',
-		'boek', 'boet', 'boep', 'boeh', 'byo', 'byog', 'byogg', 'byogs', 'byon', 'byonj', 'byonh', 'byod', 'byol', 'byolg', 'byolm', 'byolb',
-		'byols', 'byolt', 'byolp', 'byolh', 'byom', 'byob', 'byobs', 'byos', 'byoss', 'byong', 'byoj', 'byoc', 'byok', 'byot', 'byop', 'byoh',
-		'bu', 'bug', 'bugg', 'bugs', 'bun', 'bunj', 'bunh', 'bud', 'bul', 'bulg', 'bulm', 'bulb', 'buls', 'bult', 'bulp', 'bulh',
-		'bum', 'bub', 'bubs', 'bus', 'buss', 'bung', 'buj', 'buc', 'buk', 'but', 'bup', 'buh', 'bweo', 'bweog', 'bweogg', 'bweogs',
-		'bweon', 'bweonj', 'bweonh', 'bweod', 'bweol', 'bweolg', 'bweolm', 'bweolb', 'bweols', 'bweolt', 'bweolp', 'bweolh', 'bweom', 'bweob', 'bweobs', 'bweos',
-		'bweoss', 'bweong', 'bweoj', 'bweoc', 'bweok', 'bweot', 'bweop', 'bweoh', 'bwe', 'bweg', 'bwegg', 'bwegs', 'bwen', 'bwenj', 'bwenh', 'bwed',
-		'bwel', 'bwelg', 'bwelm', 'bwelb', 'bwels', 'bwelt', 'bwelp', 'bwelh', 'bwem', 'bweb', 'bwebs', 'bwes', 'bwess', 'bweng', 'bwej', 'bwec',
-		'bwek', 'bwet', 'bwep', 'bweh', 'bwi', 'bwig', 'bwigg', 'bwigs', 'bwin', 'bwinj', 'bwinh', 'bwid', 'bwil', 'bwilg', 'bwilm', 'bwilb',
-		'bwils', 'bwilt', 'bwilp', 'bwilh', 'bwim', 'bwib', 'bwibs', 'bwis', 'bwiss', 'bwing', 'bwij', 'bwic', 'bwik', 'bwit', 'bwip', 'bwih',
-		'byu', 'byug', 'byugg', 'byugs', 'byun', 'byunj', 'byunh', 'byud', 'byul', 'byulg', 'byulm', 'byulb', 'byuls', 'byult', 'byulp', 'byulh',
-	],
-	'x0c': [
-		'[?]', 'N', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', 'R', 'L', '[?]', 'e', 'ee',
-		'ai', '[?]', 'o', 'oo', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
-		'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', '[?]', 'p', 'ph', 'b', 'bh', 'm', 'y',
-		'r', 'rr', 'l', 'll', '[?]', 'v', 'sh', 'ss', 's', 'h', '[?]', '[?]', '[?]', '[?]', 'aa', 'i',
-		'ii', 'u', 'uu', 'R', 'RR', '[?]', 'e', 'ee', 'ai', '[?]', 'o', 'oo', 'au', '', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '+', '+', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'RR', 'LL', '[?]', '[?]', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', 'R', 'L', '[?]', 'e', 'ee',
-		'ai', '[?]', 'o', 'oo', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
-		'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', '[?]', 'p', 'ph', 'b', 'bh', 'm', 'y',
-		'r', 'rr', 'l', 'll', '[?]', 'v', 'sh', 'ss', 's', 'h', '[?]', '[?]', '[?]', '[?]', 'aa', 'i',
-		'ii', 'u', 'uu', 'R', 'RR', '[?]', 'e', 'ee', 'ai', '[?]', 'o', 'oo', 'au', '', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '+', '+', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', 'lll', '[?]',
-		'RR', 'LL', '[?]', '[?]', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xd1': [
-		'tyal', 'tyalg', 'tyalm', 'tyalb', 'tyals', 'tyalt', 'tyalp', 'tyalh', 'tyam', 'tyab', 'tyabs', 'tyas', 'tyass', 'tyang', 'tyaj', 'tyac',
-		'tyak', 'tyat', 'tyap', 'tyah', 'tyae', 'tyaeg', 'tyaegg', 'tyaegs', 'tyaen', 'tyaenj', 'tyaenh', 'tyaed', 'tyael', 'tyaelg', 'tyaelm', 'tyaelb',
-		'tyaels', 'tyaelt', 'tyaelp', 'tyaelh', 'tyaem', 'tyaeb', 'tyaebs', 'tyaes', 'tyaess', 'tyaeng', 'tyaej', 'tyaec', 'tyaek', 'tyaet', 'tyaep', 'tyaeh',
-		'teo', 'teog', 'teogg', 'teogs', 'teon', 'teonj', 'teonh', 'teod', 'teol', 'teolg', 'teolm', 'teolb', 'teols', 'teolt', 'teolp', 'teolh',
-		'teom', 'teob', 'teobs', 'teos', 'teoss', 'teong', 'teoj', 'teoc', 'teok', 'teot', 'teop', 'teoh', 'te', 'teg', 'tegg', 'tegs',
-		'ten', 'tenj', 'tenh', 'ted', 'tel', 'telg', 'telm', 'telb', 'tels', 'telt', 'telp', 'telh', 'tem', 'teb', 'tebs', 'tes',
-		'tess', 'teng', 'tej', 'tec', 'tek', 'tet', 'tep', 'teh', 'tyeo', 'tyeog', 'tyeogg', 'tyeogs', 'tyeon', 'tyeonj', 'tyeonh', 'tyeod',
-		'tyeol', 'tyeolg', 'tyeolm', 'tyeolb', 'tyeols', 'tyeolt', 'tyeolp', 'tyeolh', 'tyeom', 'tyeob', 'tyeobs', 'tyeos', 'tyeoss', 'tyeong', 'tyeoj', 'tyeoc',
-		'tyeok', 'tyeot', 'tyeop', 'tyeoh', 'tye', 'tyeg', 'tyegg', 'tyegs', 'tyen', 'tyenj', 'tyenh', 'tyed', 'tyel', 'tyelg', 'tyelm', 'tyelb',
-		'tyels', 'tyelt', 'tyelp', 'tyelh', 'tyem', 'tyeb', 'tyebs', 'tyes', 'tyess', 'tyeng', 'tyej', 'tyec', 'tyek', 'tyet', 'tyep', 'tyeh',
-		'to', 'tog', 'togg', 'togs', 'ton', 'tonj', 'tonh', 'tod', 'tol', 'tolg', 'tolm', 'tolb', 'tols', 'tolt', 'tolp', 'tolh',
-		'tom', 'tob', 'tobs', 'tos', 'toss', 'tong', 'toj', 'toc', 'tok', 'tot', 'top', 'toh', 'twa', 'twag', 'twagg', 'twags',
-		'twan', 'twanj', 'twanh', 'twad', 'twal', 'twalg', 'twalm', 'twalb', 'twals', 'twalt', 'twalp', 'twalh', 'twam', 'twab', 'twabs', 'twas',
-		'twass', 'twang', 'twaj', 'twac', 'twak', 'twat', 'twap', 'twah', 'twae', 'twaeg', 'twaegg', 'twaegs', 'twaen', 'twaenj', 'twaenh', 'twaed',
-		'twael', 'twaelg', 'twaelm', 'twaelb', 'twaels', 'twaelt', 'twaelp', 'twaelh', 'twaem', 'twaeb', 'twaebs', 'twaes', 'twaess', 'twaeng', 'twaej', 'twaec',
-		'twaek', 'twaet', 'twaep', 'twaeh', 'toe', 'toeg', 'toegg', 'toegs', 'toen', 'toenj', 'toenh', 'toed', 'toel', 'toelg', 'toelm', 'toelb',
-	],
-	'x26': [
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xd4': [
-		'poss', 'pong', 'poj', 'poc', 'pok', 'pot', 'pop', 'poh', 'pwa', 'pwag', 'pwagg', 'pwags', 'pwan', 'pwanj', 'pwanh', 'pwad',
-		'pwal', 'pwalg', 'pwalm', 'pwalb', 'pwals', 'pwalt', 'pwalp', 'pwalh', 'pwam', 'pwab', 'pwabs', 'pwas', 'pwass', 'pwang', 'pwaj', 'pwac',
-		'pwak', 'pwat', 'pwap', 'pwah', 'pwae', 'pwaeg', 'pwaegg', 'pwaegs', 'pwaen', 'pwaenj', 'pwaenh', 'pwaed', 'pwael', 'pwaelg', 'pwaelm', 'pwaelb',
-		'pwaels', 'pwaelt', 'pwaelp', 'pwaelh', 'pwaem', 'pwaeb', 'pwaebs', 'pwaes', 'pwaess', 'pwaeng', 'pwaej', 'pwaec', 'pwaek', 'pwaet', 'pwaep', 'pwaeh',
-		'poe', 'poeg', 'poegg', 'poegs', 'poen', 'poenj', 'poenh', 'poed', 'poel', 'poelg', 'poelm', 'poelb', 'poels', 'poelt', 'poelp', 'poelh',
-		'poem', 'poeb', 'poebs', 'poes', 'poess', 'poeng', 'poej', 'poec', 'poek', 'poet', 'poep', 'poeh', 'pyo', 'pyog', 'pyogg', 'pyogs',
-		'pyon', 'pyonj', 'pyonh', 'pyod', 'pyol', 'pyolg', 'pyolm', 'pyolb', 'pyols', 'pyolt', 'pyolp', 'pyolh', 'pyom', 'pyob', 'pyobs', 'pyos',
-		'pyoss', 'pyong', 'pyoj', 'pyoc', 'pyok', 'pyot', 'pyop', 'pyoh', 'pu', 'pug', 'pugg', 'pugs', 'pun', 'punj', 'punh', 'pud',
-		'pul', 'pulg', 'pulm', 'pulb', 'puls', 'pult', 'pulp', 'pulh', 'pum', 'pub', 'pubs', 'pus', 'puss', 'pung', 'puj', 'puc',
-		'puk', 'put', 'pup', 'puh', 'pweo', 'pweog', 'pweogg', 'pweogs', 'pweon', 'pweonj', 'pweonh', 'pweod', 'pweol', 'pweolg', 'pweolm', 'pweolb',
-		'pweols', 'pweolt', 'pweolp', 'pweolh', 'pweom', 'pweob', 'pweobs', 'pweos', 'pweoss', 'pweong', 'pweoj', 'pweoc', 'pweok', 'pweot', 'pweop', 'pweoh',
-		'pwe', 'pweg', 'pwegg', 'pwegs', 'pwen', 'pwenj', 'pwenh', 'pwed', 'pwel', 'pwelg', 'pwelm', 'pwelb', 'pwels', 'pwelt', 'pwelp', 'pwelh',
-		'pwem', 'pweb', 'pwebs', 'pwes', 'pwess', 'pweng', 'pwej', 'pwec', 'pwek', 'pwet', 'pwep', 'pweh', 'pwi', 'pwig', 'pwigg', 'pwigs',
-		'pwin', 'pwinj', 'pwinh', 'pwid', 'pwil', 'pwilg', 'pwilm', 'pwilb', 'pwils', 'pwilt', 'pwilp', 'pwilh', 'pwim', 'pwib', 'pwibs', 'pwis',
-		'pwiss', 'pwing', 'pwij', 'pwic', 'pwik', 'pwit', 'pwip', 'pwih', 'pyu', 'pyug', 'pyugg', 'pyugs', 'pyun', 'pyunj', 'pyunh', 'pyud',
-		'pyul', 'pyulg', 'pyulm', 'pyulb', 'pyuls', 'pyult', 'pyulp', 'pyulh', 'pyum', 'pyub', 'pyubs', 'pyus', 'pyuss', 'pyung', 'pyuj', 'pyuc',
-	],
-	'x12': [
-		'ha', 'hu', 'hi', 'haa', 'hee', 'he', 'ho', '[?]', 'la', 'lu', 'li', 'laa', 'lee', 'le', 'lo', 'lwa',
-		'hha', 'hhu', 'hhi', 'hhaa', 'hhee', 'hhe', 'hho', 'hhwa', 'ma', 'mu', 'mi', 'maa', 'mee', 'me', 'mo', 'mwa',
-		'sza', 'szu', 'szi', 'szaa', 'szee', 'sze', 'szo', 'szwa', 'ra', 'ru', 'ri', 'raa', 'ree', 're', 'ro', 'rwa',
-		'sa', 'su', 'si', 'saa', 'see', 'se', 'so', 'swa', 'sha', 'shu', 'shi', 'shaa', 'shee', 'she', 'sho', 'shwa',
-		'qa', 'qu', 'qi', 'qaa', 'qee', 'qe', 'qo', '[?]', 'qwa', '[?]', 'qwi', 'qwaa', 'qwee', 'qwe', '[?]', '[?]',
-		'qha', 'qhu', 'qhi', 'qhaa', 'qhee', 'qhe', 'qho', '[?]', 'qhwa', '[?]', 'qhwi', 'qhwaa', 'qhwee', 'qhwe', '[?]', '[?]',
-		'ba', 'bu', 'bi', 'baa', 'bee', 'be', 'bo', 'bwa', 'va', 'vu', 'vi', 'vaa', 'vee', 've', 'vo', 'vwa',
-		'ta', 'tu', 'ti', 'taa', 'tee', 'te', 'to', 'twa', 'ca', 'cu', 'ci', 'caa', 'cee', 'ce', 'co', 'cwa',
-		'xa', 'xu', 'xi', 'xaa', 'xee', 'xe', 'xo', '[?]', 'xwa', '[?]', 'xwi', 'xwaa', 'xwee', 'xwe', '[?]', '[?]',
-		'na', 'nu', 'ni', 'naa', 'nee', 'ne', 'no', 'nwa', 'nya', 'nyu', 'nyi', 'nyaa', 'nyee', 'nye', 'nyo', 'nywa',
-		'\'a', '\'u', '[?]', '\'aa', '\'ee', '\'e', '\'o', '\'wa', 'ka', 'ku', 'ki', 'kaa', 'kee', 'ke', 'ko', '[?]',
-		'kwa', '[?]', 'kwi', 'kwaa', 'kwee', 'kwe', '[?]', '[?]', 'kxa', 'kxu', 'kxi', 'kxaa', 'kxee', 'kxe', 'kxo', '[?]',
-		'kxwa', '[?]', 'kxwi', 'kxwaa', 'kxwee', 'kxwe', '[?]', '[?]', 'wa', 'wu', 'wi', 'waa', 'wee', 'we', 'wo', '[?]',
-		'`a', '`u', '`i', '`aa', '`ee', '`e', '`o', '[?]', 'za', 'zu', 'zi', 'zaa', 'zee', 'ze', 'zo', 'zwa',
-		'zha', 'zhu', 'zhi', 'zhaa', 'zhee', 'zhe', 'zho', 'zhwa', 'ya', 'yu', 'yi', 'yaa', 'yee', 'ye', 'yo', '[?]',
-		'da', 'du', 'di', 'daa', 'dee', 'de', 'do', 'dwa', 'dda', 'ddu', 'ddi', 'ddaa', 'ddee', 'dde', 'ddo', 'ddwa',
-	],
-	'xc8': [
-		'jeo', 'jeog', 'jeogg', 'jeogs', 'jeon', 'jeonj', 'jeonh', 'jeod', 'jeol', 'jeolg', 'jeolm', 'jeolb', 'jeols', 'jeolt', 'jeolp', 'jeolh',
-		'jeom', 'jeob', 'jeobs', 'jeos', 'jeoss', 'jeong', 'jeoj', 'jeoc', 'jeok', 'jeot', 'jeop', 'jeoh', 'je', 'jeg', 'jegg', 'jegs',
-		'jen', 'jenj', 'jenh', 'jed', 'jel', 'jelg', 'jelm', 'jelb', 'jels', 'jelt', 'jelp', 'jelh', 'jem', 'jeb', 'jebs', 'jes',
-		'jess', 'jeng', 'jej', 'jec', 'jek', 'jet', 'jep', 'jeh', 'jyeo', 'jyeog', 'jyeogg', 'jyeogs', 'jyeon', 'jyeonj', 'jyeonh', 'jyeod',
-		'jyeol', 'jyeolg', 'jyeolm', 'jyeolb', 'jyeols', 'jyeolt', 'jyeolp', 'jyeolh', 'jyeom', 'jyeob', 'jyeobs', 'jyeos', 'jyeoss', 'jyeong', 'jyeoj', 'jyeoc',
-		'jyeok', 'jyeot', 'jyeop', 'jyeoh', 'jye', 'jyeg', 'jyegg', 'jyegs', 'jyen', 'jyenj', 'jyenh', 'jyed', 'jyel', 'jyelg', 'jyelm', 'jyelb',
-		'jyels', 'jyelt', 'jyelp', 'jyelh', 'jyem', 'jyeb', 'jyebs', 'jyes', 'jyess', 'jyeng', 'jyej', 'jyec', 'jyek', 'jyet', 'jyep', 'jyeh',
-		'jo', 'jog', 'jogg', 'jogs', 'jon', 'jonj', 'jonh', 'jod', 'jol', 'jolg', 'jolm', 'jolb', 'jols', 'jolt', 'jolp', 'jolh',
-		'jom', 'job', 'jobs', 'jos', 'joss', 'jong', 'joj', 'joc', 'jok', 'jot', 'jop', 'joh', 'jwa', 'jwag', 'jwagg', 'jwags',
-		'jwan', 'jwanj', 'jwanh', 'jwad', 'jwal', 'jwalg', 'jwalm', 'jwalb', 'jwals', 'jwalt', 'jwalp', 'jwalh', 'jwam', 'jwab', 'jwabs', 'jwas',
-		'jwass', 'jwang', 'jwaj', 'jwac', 'jwak', 'jwat', 'jwap', 'jwah', 'jwae', 'jwaeg', 'jwaegg', 'jwaegs', 'jwaen', 'jwaenj', 'jwaenh', 'jwaed',
-		'jwael', 'jwaelg', 'jwaelm', 'jwaelb', 'jwaels', 'jwaelt', 'jwaelp', 'jwaelh', 'jwaem', 'jwaeb', 'jwaebs', 'jwaes', 'jwaess', 'jwaeng', 'jwaej', 'jwaec',
-		'jwaek', 'jwaet', 'jwaep', 'jwaeh', 'joe', 'joeg', 'joegg', 'joegs', 'joen', 'joenj', 'joenh', 'joed', 'joel', 'joelg', 'joelm', 'joelb',
-		'joels', 'joelt', 'joelp', 'joelh', 'joem', 'joeb', 'joebs', 'joes', 'joess', 'joeng', 'joej', 'joec', 'joek', 'joet', 'joep', 'joeh',
-		'jyo', 'jyog', 'jyogg', 'jyogs', 'jyon', 'jyonj', 'jyonh', 'jyod', 'jyol', 'jyolg', 'jyolm', 'jyolb', 'jyols', 'jyolt', 'jyolp', 'jyolh',
-		'jyom', 'jyob', 'jyobs', 'jyos', 'jyoss', 'jyong', 'jyoj', 'jyoc', 'jyok', 'jyot', 'jyop', 'jyoh', 'ju', 'jug', 'jugg', 'jugs',
-	],
-	'xaf': [
-		'ggyeols', 'ggyeolt', 'ggyeolp', 'ggyeolh', 'ggyeom', 'ggyeob', 'ggyeobs', 'ggyeos', 'ggyeoss', 'ggyeong', 'ggyeoj', 'ggyeoc', 'ggyeok', 'ggyeot', 'ggyeop', 'ggyeoh',
-		'ggye', 'ggyeg', 'ggyegg', 'ggyegs', 'ggyen', 'ggyenj', 'ggyenh', 'ggyed', 'ggyel', 'ggyelg', 'ggyelm', 'ggyelb', 'ggyels', 'ggyelt', 'ggyelp', 'ggyelh',
-		'ggyem', 'ggyeb', 'ggyebs', 'ggyes', 'ggyess', 'ggyeng', 'ggyej', 'ggyec', 'ggyek', 'ggyet', 'ggyep', 'ggyeh', 'ggo', 'ggog', 'ggogg', 'ggogs',
-		'ggon', 'ggonj', 'ggonh', 'ggod', 'ggol', 'ggolg', 'ggolm', 'ggolb', 'ggols', 'ggolt', 'ggolp', 'ggolh', 'ggom', 'ggob', 'ggobs', 'ggos',
-		'ggoss', 'ggong', 'ggoj', 'ggoc', 'ggok', 'ggot', 'ggop', 'ggoh', 'ggwa', 'ggwag', 'ggwagg', 'ggwags', 'ggwan', 'ggwanj', 'ggwanh', 'ggwad',
-		'ggwal', 'ggwalg', 'ggwalm', 'ggwalb', 'ggwals', 'ggwalt', 'ggwalp', 'ggwalh', 'ggwam', 'ggwab', 'ggwabs', 'ggwas', 'ggwass', 'ggwang', 'ggwaj', 'ggwac',
-		'ggwak', 'ggwat', 'ggwap', 'ggwah', 'ggwae', 'ggwaeg', 'ggwaegg', 'ggwaegs', 'ggwaen', 'ggwaenj', 'ggwaenh', 'ggwaed', 'ggwael', 'ggwaelg', 'ggwaelm', 'ggwaelb',
-		'ggwaels', 'ggwaelt', 'ggwaelp', 'ggwaelh', 'ggwaem', 'ggwaeb', 'ggwaebs', 'ggwaes', 'ggwaess', 'ggwaeng', 'ggwaej', 'ggwaec', 'ggwaek', 'ggwaet', 'ggwaep', 'ggwaeh',
-		'ggoe', 'ggoeg', 'ggoegg', 'ggoegs', 'ggoen', 'ggoenj', 'ggoenh', 'ggoed', 'ggoel', 'ggoelg', 'ggoelm', 'ggoelb', 'ggoels', 'ggoelt', 'ggoelp', 'ggoelh',
-		'ggoem', 'ggoeb', 'ggoebs', 'ggoes', 'ggoess', 'ggoeng', 'ggoej', 'ggoec', 'ggoek', 'ggoet', 'ggoep', 'ggoeh', 'ggyo', 'ggyog', 'ggyogg', 'ggyogs',
-		'ggyon', 'ggyonj', 'ggyonh', 'ggyod', 'ggyol', 'ggyolg', 'ggyolm', 'ggyolb', 'ggyols', 'ggyolt', 'ggyolp', 'ggyolh', 'ggyom', 'ggyob', 'ggyobs', 'ggyos',
-		'ggyoss', 'ggyong', 'ggyoj', 'ggyoc', 'ggyok', 'ggyot', 'ggyop', 'ggyoh', 'ggu', 'ggug', 'ggugg', 'ggugs', 'ggun', 'ggunj', 'ggunh', 'ggud',
-		'ggul', 'ggulg', 'ggulm', 'ggulb', 'gguls', 'ggult', 'ggulp', 'ggulh', 'ggum', 'ggub', 'ggubs', 'ggus', 'gguss', 'ggung', 'gguj', 'gguc',
-		'gguk', 'ggut', 'ggup', 'gguh', 'ggweo', 'ggweog', 'ggweogg', 'ggweogs', 'ggweon', 'ggweonj', 'ggweonh', 'ggweod', 'ggweol', 'ggweolg', 'ggweolm', 'ggweolb',
-		'ggweols', 'ggweolt', 'ggweolp', 'ggweolh', 'ggweom', 'ggweob', 'ggweobs', 'ggweos', 'ggweoss', 'ggweong', 'ggweoj', 'ggweoc', 'ggweok', 'ggweot', 'ggweop', 'ggweoh',
-		'ggwe', 'ggweg', 'ggwegg', 'ggwegs', 'ggwen', 'ggwenj', 'ggwenh', 'ggwed', 'ggwel', 'ggwelg', 'ggwelm', 'ggwelb', 'ggwels', 'ggwelt', 'ggwelp', 'ggwelh',
-	],
-	'x28': [
-		' ', 'a', '1', 'b', '\'', 'k', '2', 'l', '@', 'c', 'i', 'f', '/', 'm', 's', 'p',
-		'"', 'e', '3', 'h', '9', 'o', '6', 'r', '^', 'd', 'j', 'g', '>', 'n', 't', 'q',
-		',', '*', '5', '<', '-', 'u', '8', 'v', '.', '%', '[', '\\$', '+', 'x', '!', '&',
-		';', ':', '4', '\\', '0', 'z', '7', '(', '_', '?', 'w', ']', '#', 'y', ')', '=',
-		'[d7]', '[d17]', '[d27]', '[d127]', '[d37]', '[d137]', '[d237]', '[d1237]', '[d47]', '[d147]', '[d247]', '[d1247]', '[d347]', '[d1347]', '[d2347]', '[d12347]',
-		'[d57]', '[d157]', '[d257]', '[d1257]', '[d357]', '[d1357]', '[d2357]', '[d12357]', '[d457]', '[d1457]', '[d2457]', '[d12457]', '[d3457]', '[d13457]', '[d23457]', '[d123457]',
-		'[d67]', '[d167]', '[d267]', '[d1267]', '[d367]', '[d1367]', '[d2367]', '[d12367]', '[d467]', '[d1467]', '[d2467]', '[d12467]', '[d3467]', '[d13467]', '[d23467]', '[d123467]',
-		'[d567]', '[d1567]', '[d2567]', '[d12567]', '[d3567]', '[d13567]', '[d23567]', '[d123567]', '[d4567]', '[d14567]', '[d24567]', '[d124567]', '[d34567]', '[d134567]', '[d234567]', '[d1234567]',
-		'[d8]', '[d18]', '[d28]', '[d128]', '[d38]', '[d138]', '[d238]', '[d1238]', '[d48]', '[d148]', '[d248]', '[d1248]', '[d348]', '[d1348]', '[d2348]', '[d12348]',
-		'[d58]', '[d158]', '[d258]', '[d1258]', '[d358]', '[d1358]', '[d2358]', '[d12358]', '[d458]', '[d1458]', '[d2458]', '[d12458]', '[d3458]', '[d13458]', '[d23458]', '[d123458]',
-		'[d68]', '[d168]', '[d268]', '[d1268]', '[d368]', '[d1368]', '[d2368]', '[d12368]', '[d468]', '[d1468]', '[d2468]', '[d12468]', '[d3468]', '[d13468]', '[d23468]', '[d123468]',
-		'[d568]', '[d1568]', '[d2568]', '[d12568]', '[d3568]', '[d13568]', '[d23568]', '[d123568]', '[d4568]', '[d14568]', '[d24568]', '[d124568]', '[d34568]', '[d134568]', '[d234568]', '[d1234568]',
-		'[d78]', '[d178]', '[d278]', '[d1278]', '[d378]', '[d1378]', '[d2378]', '[d12378]', '[d478]', '[d1478]', '[d2478]', '[d12478]', '[d3478]', '[d13478]', '[d23478]', '[d123478]',
-		'[d578]', '[d1578]', '[d2578]', '[d12578]', '[d3578]', '[d13578]', '[d23578]', '[d123578]', '[d4578]', '[d14578]', '[d24578]', '[d124578]', '[d34578]', '[d134578]', '[d234578]', '[d1234578]',
-		'[d678]', '[d1678]', '[d2678]', '[d12678]', '[d3678]', '[d13678]', '[d23678]', '[d123678]', '[d4678]', '[d14678]', '[d24678]', '[d124678]', '[d34678]', '[d134678]', '[d234678]', '[d1234678]',
-		'[d5678]', '[d15678]', '[d25678]', '[d125678]', '[d35678]', '[d135678]', '[d235678]', '[d1235678]', '[d45678]', '[d145678]', '[d245678]', '[d1245678]', '[d345678]', '[d1345678]', '[d2345678]', '[d12345678]',
-	],
-	'xb1': [
-		'nyaess', 'nyaeng', 'nyaej', 'nyaec', 'nyaek', 'nyaet', 'nyaep', 'nyaeh', 'neo', 'neog', 'neogg', 'neogs', 'neon', 'neonj', 'neonh', 'neod',
-		'neol', 'neolg', 'neolm', 'neolb', 'neols', 'neolt', 'neolp', 'neolh', 'neom', 'neob', 'neobs', 'neos', 'neoss', 'neong', 'neoj', 'neoc',
-		'neok', 'neot', 'neop', 'neoh', 'ne', 'neg', 'negg', 'negs', 'nen', 'nenj', 'nenh', 'ned', 'nel', 'nelg', 'nelm', 'nelb',
-		'nels', 'nelt', 'nelp', 'nelh', 'nem', 'neb', 'nebs', 'nes', 'ness', 'neng', 'nej', 'nec', 'nek', 'net', 'nep', 'neh',
-		'nyeo', 'nyeog', 'nyeogg', 'nyeogs', 'nyeon', 'nyeonj', 'nyeonh', 'nyeod', 'nyeol', 'nyeolg', 'nyeolm', 'nyeolb', 'nyeols', 'nyeolt', 'nyeolp', 'nyeolh',
-		'nyeom', 'nyeob', 'nyeobs', 'nyeos', 'nyeoss', 'nyeong', 'nyeoj', 'nyeoc', 'nyeok', 'nyeot', 'nyeop', 'nyeoh', 'nye', 'nyeg', 'nyegg', 'nyegs',
-		'nyen', 'nyenj', 'nyenh', 'nyed', 'nyel', 'nyelg', 'nyelm', 'nyelb', 'nyels', 'nyelt', 'nyelp', 'nyelh', 'nyem', 'nyeb', 'nyebs', 'nyes',
-		'nyess', 'nyeng', 'nyej', 'nyec', 'nyek', 'nyet', 'nyep', 'nyeh', 'no', 'nog', 'nogg', 'nogs', 'non', 'nonj', 'nonh', 'nod',
-		'nol', 'nolg', 'nolm', 'nolb', 'nols', 'nolt', 'nolp', 'nolh', 'nom', 'nob', 'nobs', 'nos', 'noss', 'nong', 'noj', 'noc',
-		'nok', 'not', 'nop', 'noh', 'nwa', 'nwag', 'nwagg', 'nwags', 'nwan', 'nwanj', 'nwanh', 'nwad', 'nwal', 'nwalg', 'nwalm', 'nwalb',
-		'nwals', 'nwalt', 'nwalp', 'nwalh', 'nwam', 'nwab', 'nwabs', 'nwas', 'nwass', 'nwang', 'nwaj', 'nwac', 'nwak', 'nwat', 'nwap', 'nwah',
-		'nwae', 'nwaeg', 'nwaegg', 'nwaegs', 'nwaen', 'nwaenj', 'nwaenh', 'nwaed', 'nwael', 'nwaelg', 'nwaelm', 'nwaelb', 'nwaels', 'nwaelt', 'nwaelp', 'nwaelh',
-		'nwaem', 'nwaeb', 'nwaebs', 'nwaes', 'nwaess', 'nwaeng', 'nwaej', 'nwaec', 'nwaek', 'nwaet', 'nwaep', 'nwaeh', 'noe', 'noeg', 'noegg', 'noegs',
-		'noen', 'noenj', 'noenh', 'noed', 'noel', 'noelg', 'noelm', 'noelb', 'noels', 'noelt', 'noelp', 'noelh', 'noem', 'noeb', 'noebs', 'noes',
-		'noess', 'noeng', 'noej', 'noec', 'noek', 'noet', 'noep', 'noeh', 'nyo', 'nyog', 'nyogg', 'nyogs', 'nyon', 'nyonj', 'nyonh', 'nyod',
-		'nyol', 'nyolg', 'nyolm', 'nyolb', 'nyols', 'nyolt', 'nyolp', 'nyolh', 'nyom', 'nyob', 'nyobs', 'nyos', 'nyoss', 'nyong', 'nyoj', 'nyoc',
-	],
-	'xfd': [
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'[?]', '[?]', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'', '', '', '', '', '', '', '', '', '', '', '', '[?]', '[?]', '[?]',
-	],
-	'x14': [
-		'[?]', 'e', 'aai', 'i', 'ii', 'o', 'oo', 'oo', 'ee', 'i', 'a', 'aa', 'we', 'we', 'wi', 'wi',
-		'wii', 'wii', 'wo', 'wo', 'woo', 'woo', 'woo', 'wa', 'wa', 'waa', 'waa', 'waa', 'ai', 'w', '\'', 't',
-		'k', 'sh', 's', 'n', 'w', 'n', '[?]', 'w', 'c', '?', 'l', 'en', 'in', 'on', 'an', 'pe',
-		'paai', 'pi', 'pii', 'po', 'poo', 'poo', 'hee', 'hi', 'pa', 'paa', 'pwe', 'pwe', 'pwi', 'pwi', 'pwii', 'pwii',
-		'pwo', 'pwo', 'pwoo', 'pwoo', 'pwa', 'pwa', 'pwaa', 'pwaa', 'pwaa', 'p', 'p', 'h', 'te', 'taai', 'ti', 'tii',
-		'to', 'too', 'too', 'dee', 'di', 'ta', 'taa', 'twe', 'twe', 'twi', 'twi', 'twii', 'twii', 'two', 'two', 'twoo',
-		'twoo', 'twa', 'twa', 'twaa', 'twaa', 'twaa', 't', 'tte', 'tti', 'tto', 'tta', 'ke', 'kaai', 'ki', 'kii', 'ko',
-		'koo', 'koo', 'ka', 'kaa', 'kwe', 'kwe', 'kwi', 'kwi', 'kwii', 'kwii', 'kwo', 'kwo', 'kwoo', 'kwoo', 'kwa', 'kwa',
-		'kwaa', 'kwaa', 'kwaa', 'k', 'kw', 'keh', 'kih', 'koh', 'kah', 'ce', 'caai', 'ci', 'cii', 'co', 'coo', 'coo',
-		'ca', 'caa', 'cwe', 'cwe', 'cwi', 'cwi', 'cwii', 'cwii', 'cwo', 'cwo', 'cwoo', 'cwoo', 'cwa', 'cwa', 'cwaa', 'cwaa',
-		'cwaa', 'c', 'th', 'me', 'maai', 'mi', 'mii', 'mo', 'moo', 'moo', 'ma', 'maa', 'mwe', 'mwe', 'mwi', 'mwi',
-		'mwii', 'mwii', 'mwo', 'mwo', 'mwoo', 'mwoo', 'mwa', 'mwa', 'mwaa', 'mwaa', 'mwaa', 'm', 'm', 'mh', 'm', 'm',
-		'ne', 'naai', 'ni', 'nii', 'no', 'noo', 'noo', 'na', 'naa', 'nwe', 'nwe', 'nwa', 'nwa', 'nwaa', 'nwaa', 'nwaa',
-		'n', 'ng', 'nh', 'le', 'laai', 'li', 'lii', 'lo', 'loo', 'loo', 'la', 'laa', 'lwe', 'lwe', 'lwi', 'lwi',
-		'lwii', 'lwii', 'lwo', 'lwo', 'lwoo', 'lwoo', 'lwa', 'lwa', 'lwaa', 'lwaa', 'l', 'l', 'l', 'se', 'saai', 'si',
-		'sii', 'so', 'soo', 'soo', 'sa', 'saa', 'swe', 'swe', 'swi', 'swi', 'swii', 'swii', 'swo', 'swo', 'swoo', 'swoo',
-	],
-	'x00': [
-		'\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07', '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
-		'\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
-		' ', '!', '"', '#', '\\$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/',
-		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?',
-		'@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
-		'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', ']', '\\', ']', '^', '_',
-		'`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
-		'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '\\{', '|', '\\}', '~', '\x7f',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		' ', '!', 'C/', 'PS', '\\$?', 'Y=', '|', 'SS', '"', '(c)', 'a', '<<', '!', '', '(r)', '-',
-		'deg', '+-', '2', '3', '\'', 'u', 'P', '*', ',', '1', 'o', '>>', '1/4', '1/2', '3/4', '?',
-		'A', 'A', 'A', 'A', 'A', 'A', 'AE', 'C', 'E', 'E', 'E', 'E', 'I', 'I', 'I', 'I',
-		'D', 'N', 'O', 'O', 'O', 'O', 'O', 'x', 'O', 'U', 'U', 'U', 'U', 'U', 'Th', 'ss',
-		'a', 'a', 'a', 'a', 'a', 'a', 'ae', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i',
-		'd', 'n', 'o', 'o', 'o', 'o', 'o', '/', 'o', 'u', 'u', 'u', 'u', 'y', 'th', 'y',
-	],
-	'xfe': [
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'', '', '', '~', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'..', '--', '-', '_', '_', '(', ') ', '\\{', '\\} ', '[', '] ', '[(', ')] ', '<<', '>> ', '<',
-		'> ', '[', '] ', '\\{', '\\}', '[?]', '[?]', '[?]', '[?]', '', '', '', '', '', '', '',
-		',', ',', '.', '', ';', ':', '?', '!', '-', '(', ')', '\\{', '\\}', '\\{', '\\}', '#',
-		'&', '*', '+', '-', '<', '>', '=', '', '\\', '\\$', '%', '@', '[?]', '[?]', '[?]', '[?]',
-		'', '', '', '[?]', '', '[?]', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '[?]', '[?]', '',
-	],
-	'xad': [
-		'gwan', 'gwanj', 'gwanh', 'gwad', 'gwal', 'gwalg', 'gwalm', 'gwalb', 'gwals', 'gwalt', 'gwalp', 'gwalh', 'gwam', 'gwab', 'gwabs', 'gwas',
-		'gwass', 'gwang', 'gwaj', 'gwac', 'gwak', 'gwat', 'gwap', 'gwah', 'gwae', 'gwaeg', 'gwaegg', 'gwaegs', 'gwaen', 'gwaenj', 'gwaenh', 'gwaed',
-		'gwael', 'gwaelg', 'gwaelm', 'gwaelb', 'gwaels', 'gwaelt', 'gwaelp', 'gwaelh', 'gwaem', 'gwaeb', 'gwaebs', 'gwaes', 'gwaess', 'gwaeng', 'gwaej', 'gwaec',
-		'gwaek', 'gwaet', 'gwaep', 'gwaeh', 'goe', 'goeg', 'goegg', 'goegs', 'goen', 'goenj', 'goenh', 'goed', 'goel', 'goelg', 'goelm', 'goelb',
-		'goels', 'goelt', 'goelp', 'goelh', 'goem', 'goeb', 'goebs', 'goes', 'goess', 'goeng', 'goej', 'goec', 'goek', 'goet', 'goep', 'goeh',
-		'gyo', 'gyog', 'gyogg', 'gyogs', 'gyon', 'gyonj', 'gyonh', 'gyod', 'gyol', 'gyolg', 'gyolm', 'gyolb', 'gyols', 'gyolt', 'gyolp', 'gyolh',
-		'gyom', 'gyob', 'gyobs', 'gyos', 'gyoss', 'gyong', 'gyoj', 'gyoc', 'gyok', 'gyot', 'gyop', 'gyoh', 'gu', 'gug', 'gugg', 'gugs',
-		'gun', 'gunj', 'gunh', 'gud', 'gul', 'gulg', 'gulm', 'gulb', 'guls', 'gult', 'gulp', 'gulh', 'gum', 'gub', 'gubs', 'gus',
-		'guss', 'gung', 'guj', 'guc', 'guk', 'gut', 'gup', 'guh', 'gweo', 'gweog', 'gweogg', 'gweogs', 'gweon', 'gweonj', 'gweonh', 'gweod',
-		'gweol', 'gweolg', 'gweolm', 'gweolb', 'gweols', 'gweolt', 'gweolp', 'gweolh', 'gweom', 'gweob', 'gweobs', 'gweos', 'gweoss', 'gweong', 'gweoj', 'gweoc',
-		'gweok', 'gweot', 'gweop', 'gweoh', 'gwe', 'gweg', 'gwegg', 'gwegs', 'gwen', 'gwenj', 'gwenh', 'gwed', 'gwel', 'gwelg', 'gwelm', 'gwelb',
-		'gwels', 'gwelt', 'gwelp', 'gwelh', 'gwem', 'gweb', 'gwebs', 'gwes', 'gwess', 'gweng', 'gwej', 'gwec', 'gwek', 'gwet', 'gwep', 'gweh',
-		'gwi', 'gwig', 'gwigg', 'gwigs', 'gwin', 'gwinj', 'gwinh', 'gwid', 'gwil', 'gwilg', 'gwilm', 'gwilb', 'gwils', 'gwilt', 'gwilp', 'gwilh',
-		'gwim', 'gwib', 'gwibs', 'gwis', 'gwiss', 'gwing', 'gwij', 'gwic', 'gwik', 'gwit', 'gwip', 'gwih', 'gyu', 'gyug', 'gyugg', 'gyugs',
-		'gyun', 'gyunj', 'gyunh', 'gyud', 'gyul', 'gyulg', 'gyulm', 'gyulb', 'gyuls', 'gyult', 'gyulp', 'gyulh', 'gyum', 'gyub', 'gyubs', 'gyus',
-		'gyuss', 'gyung', 'gyuj', 'gyuc', 'gyuk', 'gyut', 'gyup', 'gyuh', 'geu', 'geug', 'geugg', 'geugs', 'geun', 'geunj', 'geunh', 'geud',
-	],
-	'x05': [
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', 'A', 'B', 'G', 'D', 'E', 'Z', 'E', 'E', 'T`', 'Zh', 'I', 'L', 'Kh', 'Ts', 'K',
-		'H', 'Dz', 'Gh', 'Ch', 'M', 'Y', 'N', 'Sh', 'O', 'Ch`', 'P', 'J', 'Rh', 'S', 'V', 'T',
-		'R', 'Ts`', 'W', 'P`', 'K`', 'O', 'F', '[?]', '[?]', '<', '\'', '/', '!', ',', '?', '.',
-		'[?]', 'a', 'b', 'g', 'd', 'e', 'z', 'e', 'e', 't`', 'zh', 'i', 'l', 'kh', 'ts', 'k',
-		'h', 'dz', 'gh', 'ch', 'm', 'y', 'n', 'sh', 'o', 'ch`', 'p', 'j', 'rh', 's', 'v', 't',
-		'r', 'ts`', 'w', 'p`', 'k`', 'o', 'f', 'ew', '[?]', '.', '-', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '[?]', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'@', 'e', 'a', 'o', 'i', 'e', 'e', 'a', 'a', 'o', '[?]', 'u', '\'', '', '', '',
-		'', '', '', ':', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'', 'b', 'g', 'd', 'h', 'v', 'z', 'kh', 't', 'y', 'k', 'k', 'l', 'm', 'm', 'n',
-		'n', 's', '`', 'p', 'p', 'ts', 'ts', 'q', 'r', 'sh', 't', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'V', 'oy', 'i', '\'', '"', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xce': [
-		'cwik', 'cwit', 'cwip', 'cwih', 'cyu', 'cyug', 'cyugg', 'cyugs', 'cyun', 'cyunj', 'cyunh', 'cyud', 'cyul', 'cyulg', 'cyulm', 'cyulb',
-		'cyuls', 'cyult', 'cyulp', 'cyulh', 'cyum', 'cyub', 'cyubs', 'cyus', 'cyuss', 'cyung', 'cyuj', 'cyuc', 'cyuk', 'cyut', 'cyup', 'cyuh',
-		'ceu', 'ceug', 'ceugg', 'ceugs', 'ceun', 'ceunj', 'ceunh', 'ceud', 'ceul', 'ceulg', 'ceulm', 'ceulb', 'ceuls', 'ceult', 'ceulp', 'ceulh',
-		'ceum', 'ceub', 'ceubs', 'ceus', 'ceuss', 'ceung', 'ceuj', 'ceuc', 'ceuk', 'ceut', 'ceup', 'ceuh', 'cyi', 'cyig', 'cyigg', 'cyigs',
-		'cyin', 'cyinj', 'cyinh', 'cyid', 'cyil', 'cyilg', 'cyilm', 'cyilb', 'cyils', 'cyilt', 'cyilp', 'cyilh', 'cyim', 'cyib', 'cyibs', 'cyis',
-		'cyiss', 'cying', 'cyij', 'cyic', 'cyik', 'cyit', 'cyip', 'cyih', 'ci', 'cig', 'cigg', 'cigs', 'cin', 'cinj', 'cinh', 'cid',
-		'cil', 'cilg', 'cilm', 'cilb', 'cils', 'cilt', 'cilp', 'cilh', 'cim', 'cib', 'cibs', 'cis', 'ciss', 'cing', 'cij', 'cic',
-		'cik', 'cit', 'cip', 'cih', 'ka', 'kag', 'kagg', 'kags', 'kan', 'kanj', 'kanh', 'kad', 'kal', 'kalg', 'kalm', 'kalb',
-		'kals', 'kalt', 'kalp', 'kalh', 'kam', 'kab', 'kabs', 'kas', 'kass', 'kang', 'kaj', 'kac', 'kak', 'kat', 'kap', 'kah',
-		'kae', 'kaeg', 'kaegg', 'kaegs', 'kaen', 'kaenj', 'kaenh', 'kaed', 'kael', 'kaelg', 'kaelm', 'kaelb', 'kaels', 'kaelt', 'kaelp', 'kaelh',
-		'kaem', 'kaeb', 'kaebs', 'kaes', 'kaess', 'kaeng', 'kaej', 'kaec', 'kaek', 'kaet', 'kaep', 'kaeh', 'kya', 'kyag', 'kyagg', 'kyags',
-		'kyan', 'kyanj', 'kyanh', 'kyad', 'kyal', 'kyalg', 'kyalm', 'kyalb', 'kyals', 'kyalt', 'kyalp', 'kyalh', 'kyam', 'kyab', 'kyabs', 'kyas',
-		'kyass', 'kyang', 'kyaj', 'kyac', 'kyak', 'kyat', 'kyap', 'kyah', 'kyae', 'kyaeg', 'kyaegg', 'kyaegs', 'kyaen', 'kyaenj', 'kyaenh', 'kyaed',
-		'kyael', 'kyaelg', 'kyaelm', 'kyaelb', 'kyaels', 'kyaelt', 'kyaelp', 'kyaelh', 'kyaem', 'kyaeb', 'kyaebs', 'kyaes', 'kyaess', 'kyaeng', 'kyaej', 'kyaec',
-		'kyaek', 'kyaet', 'kyaep', 'kyaeh', 'keo', 'keog', 'keogg', 'keogs', 'keon', 'keonj', 'keonh', 'keod', 'keol', 'keolg', 'keolm', 'keolb',
-		'keols', 'keolt', 'keolp', 'keolh', 'keom', 'keob', 'keobs', 'keos', 'keoss', 'keong', 'keoj', 'keoc', 'keok', 'keot', 'keop', 'keoh',
-	],
-	'x2e': [
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?]', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
-		'[?] ', '[?] ', '[?] ', '[?] ', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xd7': [
-		'hwen', 'hwenj', 'hwenh', 'hwed', 'hwel', 'hwelg', 'hwelm', 'hwelb', 'hwels', 'hwelt', 'hwelp', 'hwelh', 'hwem', 'hweb', 'hwebs', 'hwes',
-		'hwess', 'hweng', 'hwej', 'hwec', 'hwek', 'hwet', 'hwep', 'hweh', 'hwi', 'hwig', 'hwigg', 'hwigs', 'hwin', 'hwinj', 'hwinh', 'hwid',
-		'hwil', 'hwilg', 'hwilm', 'hwilb', 'hwils', 'hwilt', 'hwilp', 'hwilh', 'hwim', 'hwib', 'hwibs', 'hwis', 'hwiss', 'hwing', 'hwij', 'hwic',
-		'hwik', 'hwit', 'hwip', 'hwih', 'hyu', 'hyug', 'hyugg', 'hyugs', 'hyun', 'hyunj', 'hyunh', 'hyud', 'hyul', 'hyulg', 'hyulm', 'hyulb',
-		'hyuls', 'hyult', 'hyulp', 'hyulh', 'hyum', 'hyub', 'hyubs', 'hyus', 'hyuss', 'hyung', 'hyuj', 'hyuc', 'hyuk', 'hyut', 'hyup', 'hyuh',
-		'heu', 'heug', 'heugg', 'heugs', 'heun', 'heunj', 'heunh', 'heud', 'heul', 'heulg', 'heulm', 'heulb', 'heuls', 'heult', 'heulp', 'heulh',
-		'heum', 'heub', 'heubs', 'heus', 'heuss', 'heung', 'heuj', 'heuc', 'heuk', 'heut', 'heup', 'heuh', 'hyi', 'hyig', 'hyigg', 'hyigs',
-		'hyin', 'hyinj', 'hyinh', 'hyid', 'hyil', 'hyilg', 'hyilm', 'hyilb', 'hyils', 'hyilt', 'hyilp', 'hyilh', 'hyim', 'hyib', 'hyibs', 'hyis',
-		'hyiss', 'hying', 'hyij', 'hyic', 'hyik', 'hyit', 'hyip', 'hyih', 'hi', 'hig', 'higg', 'higs', 'hin', 'hinj', 'hinh', 'hid',
-		'hil', 'hilg', 'hilm', 'hilb', 'hils', 'hilt', 'hilp', 'hilh', 'him', 'hib', 'hibs', 'his', 'hiss', 'hing', 'hij', 'hic',
-		'hik', 'hit', 'hip', 'hih', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'x21': [
-		'', '', '', '', '', '', '', '', '', '', 'g', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', ' 1/3 ', ' 2/3 ', ' 1/5 ', ' 2/5 ', ' 3/5 ', ' 4/5 ', ' 1/6 ', ' 5/6 ', ' 1/8 ', ' 3/8 ', ' 5/8 ', ' 7/8 ', ' 1/',
-		'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X', 'XI', 'XII', 'L', 'C', 'D', 'M',
-		'i', 'ii', 'iii', 'iv', 'v', 'vi', 'vii', 'viii', 'ix', 'x', 'xi', 'xii', 'l', 'c', 'd', 'm',
-		'(D', 'D)', '((|))', ')', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'-', '|', '-', '|', '-', '|', '\\', '/', '\\', '/', '-', '-', '~', '~', '-', '|',
-		'-', '|', '-', '-', '-', '|', '-', '|', '|', '-', '-', '-', '-', '-', '-', '|',
-		'|', '|', '|', '|', '|', '|', '^', 'V', '\\', '=', 'V', '^', '-', '-', '|', '|',
-		'-', '-', '|', '|', '=', '|', '=', '=', '|', '=', '|', '=', '=', '=', '=', '=',
-		'=', '|', '=', '|', '=', '|', '\\', '/', '\\', '/', '=', '=', '~', '~', '|', '|',
-		'-', '|', '-', '|', '-', '-', '-', '|', '-', '|', '|', '|', '|', '|', '|', '|',
-		'-', '\\', '\\', '|', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xb0': [
-		'ggwem', 'ggweb', 'ggwebs', 'ggwes', 'ggwess', 'ggweng', 'ggwej', 'ggwec', 'ggwek', 'ggwet', 'ggwep', 'ggweh', 'ggwi', 'ggwig', 'ggwigg', 'ggwigs',
-		'ggwin', 'ggwinj', 'ggwinh', 'ggwid', 'ggwil', 'ggwilg', 'ggwilm', 'ggwilb', 'ggwils', 'ggwilt', 'ggwilp', 'ggwilh', 'ggwim', 'ggwib', 'ggwibs', 'ggwis',
-		'ggwiss', 'ggwing', 'ggwij', 'ggwic', 'ggwik', 'ggwit', 'ggwip', 'ggwih', 'ggyu', 'ggyug', 'ggyugg', 'ggyugs', 'ggyun', 'ggyunj', 'ggyunh', 'ggyud',
-		'ggyul', 'ggyulg', 'ggyulm', 'ggyulb', 'ggyuls', 'ggyult', 'ggyulp', 'ggyulh', 'ggyum', 'ggyub', 'ggyubs', 'ggyus', 'ggyuss', 'ggyung', 'ggyuj', 'ggyuc',
-		'ggyuk', 'ggyut', 'ggyup', 'ggyuh', 'ggeu', 'ggeug', 'ggeugg', 'ggeugs', 'ggeun', 'ggeunj', 'ggeunh', 'ggeud', 'ggeul', 'ggeulg', 'ggeulm', 'ggeulb',
-		'ggeuls', 'ggeult', 'ggeulp', 'ggeulh', 'ggeum', 'ggeub', 'ggeubs', 'ggeus', 'ggeuss', 'ggeung', 'ggeuj', 'ggeuc', 'ggeuk', 'ggeut', 'ggeup', 'ggeuh',
-		'ggyi', 'ggyig', 'ggyigg', 'ggyigs', 'ggyin', 'ggyinj', 'ggyinh', 'ggyid', 'ggyil', 'ggyilg', 'ggyilm', 'ggyilb', 'ggyils', 'ggyilt', 'ggyilp', 'ggyilh',
-		'ggyim', 'ggyib', 'ggyibs', 'ggyis', 'ggyiss', 'ggying', 'ggyij', 'ggyic', 'ggyik', 'ggyit', 'ggyip', 'ggyih', 'ggi', 'ggig', 'ggigg', 'ggigs',
-		'ggin', 'gginj', 'gginh', 'ggid', 'ggil', 'ggilg', 'ggilm', 'ggilb', 'ggils', 'ggilt', 'ggilp', 'ggilh', 'ggim', 'ggib', 'ggibs', 'ggis',
-		'ggiss', 'gging', 'ggij', 'ggic', 'ggik', 'ggit', 'ggip', 'ggih', 'na', 'nag', 'nagg', 'nags', 'nan', 'nanj', 'nanh', 'nad',
-		'nal', 'nalg', 'nalm', 'nalb', 'nals', 'nalt', 'nalp', 'nalh', 'nam', 'nab', 'nabs', 'nas', 'nass', 'nang', 'naj', 'nac',
-		'nak', 'nat', 'nap', 'nah', 'nae', 'naeg', 'naegg', 'naegs', 'naen', 'naenj', 'naenh', 'naed', 'nael', 'naelg', 'naelm', 'naelb',
-		'naels', 'naelt', 'naelp', 'naelh', 'naem', 'naeb', 'naebs', 'naes', 'naess', 'naeng', 'naej', 'naec', 'naek', 'naet', 'naep', 'naeh',
-		'nya', 'nyag', 'nyagg', 'nyags', 'nyan', 'nyanj', 'nyanh', 'nyad', 'nyal', 'nyalg', 'nyalm', 'nyalb', 'nyals', 'nyalt', 'nyalp', 'nyalh',
-		'nyam', 'nyab', 'nyabs', 'nyas', 'nyass', 'nyang', 'nyaj', 'nyac', 'nyak', 'nyat', 'nyap', 'nyah', 'nyae', 'nyaeg', 'nyaegg', 'nyaegs',
-		'nyaen', 'nyaenj', 'nyaenh', 'nyaed', 'nyael', 'nyaelg', 'nyaelm', 'nyaelb', 'nyaels', 'nyaelt', 'nyaelp', 'nyaelh', 'nyaem', 'nyaeb', 'nyaebs', 'nyaes',
-	],
-	'xa3': [
-		'nzup', 'nzurx', 'nzur', 'nzyt', 'nzyx', 'nzy', 'nzyp', 'nzyrx', 'nzyr', 'sit', 'six', 'si', 'sip', 'siex', 'sie', 'siep',
-		'sat', 'sax', 'sa', 'sap', 'suox', 'suo', 'suop', 'sot', 'sox', 'so', 'sop', 'sex', 'se', 'sep', 'sut', 'sux',
-		'su', 'sup', 'surx', 'sur', 'syt', 'syx', 'sy', 'syp', 'syrx', 'syr', 'ssit', 'ssix', 'ssi', 'ssip', 'ssiex', 'ssie',
-		'ssiep', 'ssat', 'ssax', 'ssa', 'ssap', 'ssot', 'ssox', 'sso', 'ssop', 'ssex', 'sse', 'ssep', 'ssut', 'ssux', 'ssu', 'ssup',
-		'ssyt', 'ssyx', 'ssy', 'ssyp', 'ssyrx', 'ssyr', 'zhat', 'zhax', 'zha', 'zhap', 'zhuox', 'zhuo', 'zhuop', 'zhot', 'zhox', 'zho',
-		'zhop', 'zhet', 'zhex', 'zhe', 'zhep', 'zhut', 'zhux', 'zhu', 'zhup', 'zhurx', 'zhur', 'zhyt', 'zhyx', 'zhy', 'zhyp', 'zhyrx',
-		'zhyr', 'chat', 'chax', 'cha', 'chap', 'chuot', 'chuox', 'chuo', 'chuop', 'chot', 'chox', 'cho', 'chop', 'chet', 'chex', 'che',
-		'chep', 'chux', 'chu', 'chup', 'churx', 'chur', 'chyt', 'chyx', 'chy', 'chyp', 'chyrx', 'chyr', 'rrax', 'rra', 'rruox', 'rruo',
-		'rrot', 'rrox', 'rro', 'rrop', 'rret', 'rrex', 'rre', 'rrep', 'rrut', 'rrux', 'rru', 'rrup', 'rrurx', 'rrur', 'rryt', 'rryx',
-		'rry', 'rryp', 'rryrx', 'rryr', 'nrat', 'nrax', 'nra', 'nrap', 'nrox', 'nro', 'nrop', 'nret', 'nrex', 'nre', 'nrep', 'nrut',
-		'nrux', 'nru', 'nrup', 'nrurx', 'nrur', 'nryt', 'nryx', 'nry', 'nryp', 'nryrx', 'nryr', 'shat', 'shax', 'sha', 'shap', 'shuox',
-		'shuo', 'shuop', 'shot', 'shox', 'sho', 'shop', 'shet', 'shex', 'she', 'shep', 'shut', 'shux', 'shu', 'shup', 'shurx', 'shur',
-		'shyt', 'shyx', 'shy', 'shyp', 'shyrx', 'shyr', 'rat', 'rax', 'ra', 'rap', 'ruox', 'ruo', 'ruop', 'rot', 'rox', 'ro',
-		'rop', 'rex', 're', 'rep', 'rut', 'rux', 'ru', 'rup', 'rurx', 'rur', 'ryt', 'ryx', 'ry', 'ryp', 'ryrx', 'ryr',
-		'jit', 'jix', 'ji', 'jip', 'jiet', 'jiex', 'jie', 'jiep', 'juot', 'juox', 'juo', 'juop', 'jot', 'jox', 'jo', 'jop',
-		'jut', 'jux', 'ju', 'jup', 'jurx', 'jur', 'jyt', 'jyx', 'jy', 'jyp', 'jyrx', 'jyr', 'qit', 'qix', 'qi', 'qip',
-	],
-	'xbb': [
-		'moen', 'moenj', 'moenh', 'moed', 'moel', 'moelg', 'moelm', 'moelb', 'moels', 'moelt', 'moelp', 'moelh', 'moem', 'moeb', 'moebs', 'moes',
-		'moess', 'moeng', 'moej', 'moec', 'moek', 'moet', 'moep', 'moeh', 'myo', 'myog', 'myogg', 'myogs', 'myon', 'myonj', 'myonh', 'myod',
-		'myol', 'myolg', 'myolm', 'myolb', 'myols', 'myolt', 'myolp', 'myolh', 'myom', 'myob', 'myobs', 'myos', 'myoss', 'myong', 'myoj', 'myoc',
-		'myok', 'myot', 'myop', 'myoh', 'mu', 'mug', 'mugg', 'mugs', 'mun', 'munj', 'munh', 'mud', 'mul', 'mulg', 'mulm', 'mulb',
-		'muls', 'mult', 'mulp', 'mulh', 'mum', 'mub', 'mubs', 'mus', 'muss', 'mung', 'muj', 'muc', 'muk', 'mut', 'mup', 'muh',
-		'mweo', 'mweog', 'mweogg', 'mweogs', 'mweon', 'mweonj', 'mweonh', 'mweod', 'mweol', 'mweolg', 'mweolm', 'mweolb', 'mweols', 'mweolt', 'mweolp', 'mweolh',
-		'mweom', 'mweob', 'mweobs', 'mweos', 'mweoss', 'mweong', 'mweoj', 'mweoc', 'mweok', 'mweot', 'mweop', 'mweoh', 'mwe', 'mweg', 'mwegg', 'mwegs',
-		'mwen', 'mwenj', 'mwenh', 'mwed', 'mwel', 'mwelg', 'mwelm', 'mwelb', 'mwels', 'mwelt', 'mwelp', 'mwelh', 'mwem', 'mweb', 'mwebs', 'mwes',
-		'mwess', 'mweng', 'mwej', 'mwec', 'mwek', 'mwet', 'mwep', 'mweh', 'mwi', 'mwig', 'mwigg', 'mwigs', 'mwin', 'mwinj', 'mwinh', 'mwid',
-		'mwil', 'mwilg', 'mwilm', 'mwilb', 'mwils', 'mwilt', 'mwilp', 'mwilh', 'mwim', 'mwib', 'mwibs', 'mwis', 'mwiss', 'mwing', 'mwij', 'mwic',
-		'mwik', 'mwit', 'mwip', 'mwih', 'myu', 'myug', 'myugg', 'myugs', 'myun', 'myunj', 'myunh', 'myud', 'myul', 'myulg', 'myulm', 'myulb',
-		'myuls', 'myult', 'myulp', 'myulh', 'myum', 'myub', 'myubs', 'myus', 'myuss', 'myung', 'myuj', 'myuc', 'myuk', 'myut', 'myup', 'myuh',
-		'meu', 'meug', 'meugg', 'meugs', 'meun', 'meunj', 'meunh', 'meud', 'meul', 'meulg', 'meulm', 'meulb', 'meuls', 'meult', 'meulp', 'meulh',
-		'meum', 'meub', 'meubs', 'meus', 'meuss', 'meung', 'meuj', 'meuc', 'meuk', 'meut', 'meup', 'meuh', 'myi', 'myig', 'myigg', 'myigs',
-		'myin', 'myinj', 'myinh', 'myid', 'myil', 'myilg', 'myilm', 'myilb', 'myils', 'myilt', 'myilp', 'myilh', 'myim', 'myib', 'myibs', 'myis',
-		'myiss', 'mying', 'myij', 'myic', 'myik', 'myit', 'myip', 'myih', 'mi', 'mig', 'migg', 'migs', 'min', 'minj', 'minh', 'mid',
-	],
-	'x02': [
-		'A', 'a', 'A', 'a', 'E', 'e', 'E', 'e', 'I', 'i', 'I', 'i', 'O', 'o', 'O', 'o',
-		'R', 'r', 'R', 'r', 'U', 'u', 'U', 'u', 'S', 's', 'T', 't', 'Y', 'y', 'H', 'h',
-		'[?]', '[?]', 'OU', 'ou', 'Z', 'z', 'A', 'a', 'E', 'e', 'O', 'o', 'O', 'o', 'O', 'o',
-		'O', 'o', 'Y', 'y', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'a', 'a', 'a', 'b', 'o', 'c', 'd', 'd', 'e', '@', '@', 'e', 'e', 'e', 'e', 'j',
-		'g', 'g', 'g', 'g', 'u', 'Y', 'h', 'h', 'i', 'i', 'I', 'l', 'l', 'l', 'lZ', 'W',
-		'W', 'm', 'n', 'n', 'n', 'o', 'OE', 'O', 'F', 'R', 'R', 'R', 'R', 'r', 'r', 'R',
-		'R', 'R', 's', 'S', 'j', 'S', 'S', 't', 't', 'U', 'U', 'v', '^', 'W', 'Y', 'Y',
-		'z', 'z', 'Z', 'Z', '?', '?', '?', 'C', '@', 'B', 'E', 'G', 'H', 'j', 'k', 'L',
-		'q', '?', '?', 'dz', 'dZ', 'dz', 'ts', 'tS', 'tC', 'fN', 'ls', 'lz', 'WW', ']]', '[?]', '[?]',
-		'k', 'h', 'j', 'r', 'r', 'r', 'r', 'w', 'y', '\'', '"', '`', '\'', '`', '`', '\'',
-		'?', '?', '<', '>', '^', 'V', '^', 'V', '\'', '-', '/', '\\', ',', '_', '\\', '/',
-		':', '.', '`', '\'', '^', 'V', '+', '-', 'V', '.', '@', ',', '~', '"', 'R', 'X',
-		'G', 'l', 's', 'x', '?', '', '', '', '', '', '', '', 'V', '=', '"', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xb5': [
-		'dyil', 'dyilg', 'dyilm', 'dyilb', 'dyils', 'dyilt', 'dyilp', 'dyilh', 'dyim', 'dyib', 'dyibs', 'dyis', 'dyiss', 'dying', 'dyij', 'dyic',
-		'dyik', 'dyit', 'dyip', 'dyih', 'di', 'dig', 'digg', 'digs', 'din', 'dinj', 'dinh', 'did', 'dil', 'dilg', 'dilm', 'dilb',
-		'dils', 'dilt', 'dilp', 'dilh', 'dim', 'dib', 'dibs', 'dis', 'diss', 'ding', 'dij', 'dic', 'dik', 'dit', 'dip', 'dih',
-		'dda', 'ddag', 'ddagg', 'ddags', 'ddan', 'ddanj', 'ddanh', 'ddad', 'ddal', 'ddalg', 'ddalm', 'ddalb', 'ddals', 'ddalt', 'ddalp', 'ddalh',
-		'ddam', 'ddab', 'ddabs', 'ddas', 'ddass', 'ddang', 'ddaj', 'ddac', 'ddak', 'ddat', 'ddap', 'ddah', 'ddae', 'ddaeg', 'ddaegg', 'ddaegs',
-		'ddaen', 'ddaenj', 'ddaenh', 'ddaed', 'ddael', 'ddaelg', 'ddaelm', 'ddaelb', 'ddaels', 'ddaelt', 'ddaelp', 'ddaelh', 'ddaem', 'ddaeb', 'ddaebs', 'ddaes',
-		'ddaess', 'ddaeng', 'ddaej', 'ddaec', 'ddaek', 'ddaet', 'ddaep', 'ddaeh', 'ddya', 'ddyag', 'ddyagg', 'ddyags', 'ddyan', 'ddyanj', 'ddyanh', 'ddyad',
-		'ddyal', 'ddyalg', 'ddyalm', 'ddyalb', 'ddyals', 'ddyalt', 'ddyalp', 'ddyalh', 'ddyam', 'ddyab', 'ddyabs', 'ddyas', 'ddyass', 'ddyang', 'ddyaj', 'ddyac',
-		'ddyak', 'ddyat', 'ddyap', 'ddyah', 'ddyae', 'ddyaeg', 'ddyaegg', 'ddyaegs', 'ddyaen', 'ddyaenj', 'ddyaenh', 'ddyaed', 'ddyael', 'ddyaelg', 'ddyaelm', 'ddyaelb',
-		'ddyaels', 'ddyaelt', 'ddyaelp', 'ddyaelh', 'ddyaem', 'ddyaeb', 'ddyaebs', 'ddyaes', 'ddyaess', 'ddyaeng', 'ddyaej', 'ddyaec', 'ddyaek', 'ddyaet', 'ddyaep', 'ddyaeh',
-		'ddeo', 'ddeog', 'ddeogg', 'ddeogs', 'ddeon', 'ddeonj', 'ddeonh', 'ddeod', 'ddeol', 'ddeolg', 'ddeolm', 'ddeolb', 'ddeols', 'ddeolt', 'ddeolp', 'ddeolh',
-		'ddeom', 'ddeob', 'ddeobs', 'ddeos', 'ddeoss', 'ddeong', 'ddeoj', 'ddeoc', 'ddeok', 'ddeot', 'ddeop', 'ddeoh', 'dde', 'ddeg', 'ddegg', 'ddegs',
-		'dden', 'ddenj', 'ddenh', 'dded', 'ddel', 'ddelg', 'ddelm', 'ddelb', 'ddels', 'ddelt', 'ddelp', 'ddelh', 'ddem', 'ddeb', 'ddebs', 'ddes',
-		'ddess', 'ddeng', 'ddej', 'ddec', 'ddek', 'ddet', 'ddep', 'ddeh', 'ddyeo', 'ddyeog', 'ddyeogg', 'ddyeogs', 'ddyeon', 'ddyeonj', 'ddyeonh', 'ddyeod',
-		'ddyeol', 'ddyeolg', 'ddyeolm', 'ddyeolb', 'ddyeols', 'ddyeolt', 'ddyeolp', 'ddyeolh', 'ddyeom', 'ddyeob', 'ddyeobs', 'ddyeos', 'ddyeoss', 'ddyeong', 'ddyeoj', 'ddyeoc',
-		'ddyeok', 'ddyeot', 'ddyeop', 'ddyeoh', 'ddye', 'ddyeg', 'ddyegg', 'ddyegs', 'ddyen', 'ddyenj', 'ddyenh', 'ddyed', 'ddyel', 'ddyelg', 'ddyelm', 'ddyelb',
-	],
-	'x17': [
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 't', 'tth', 'd', 'ddh', 'nn', 't',
-		'th', 'd', 'dh', 'n', 'p', 'ph', 'b', 'bh', 'm', 'y', 'r', 'l', 'v', 'sh', 'ss', 's',
-		'h', 'l', 'q', 'a', 'aa', 'i', 'ii', 'u', 'uk', 'uu', 'uuv', 'ry', 'ryy', 'ly', 'lyy', 'e',
-		'ai', 'oo', 'oo', 'au', 'a', 'aa', 'aa', 'i', 'ii', 'y', 'yy', 'u', 'uu', 'ua', 'oe', 'ya',
-		'ie', 'e', 'ae', 'ai', 'oo', 'au', 'M', 'H', 'a`', '', '', '', 'r', '', '!', '',
-		'', '', '', '', '.', ' // ', ':', '+', '++', ' * ', ' /// ', 'KR', '\'', '[?]', '[?]', '[?]',
-		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'x0b': [
-		'[?]', 'N', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', 'R', 'L', '[?]', '[?]', 'e',
-		'ai', '[?]', '[?]', 'o', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
-		'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', '[?]', 'p', 'ph', 'b', 'bh', 'm', 'y',
-		'r', '[?]', 'l', 'll', '[?]', '', 'sh', 'ss', 's', 'h', '[?]', '[?]', '\'', '\'', 'aa', 'i',
-		'ii', 'u', 'uu', 'R', '[?]', '[?]', '[?]', 'e', 'ai', '[?]', '[?]', 'o', 'au', '', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '+', '+', '[?]', '[?]', '[?]', '[?]', 'rr', 'rh', '[?]', 'yy',
-		'RR', 'LL', '[?]', '[?]', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-		'', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', '[?]', '[?]', '[?]', 'e', 'ee',
-		'ai', '[?]', 'o', 'oo', 'au', 'k', '[?]', '[?]', '[?]', 'ng', 'c', '[?]', 'j', '[?]', 'ny', 'tt',
-		'[?]', '[?]', '[?]', 'nn', 't', '[?]', '[?]', '[?]', 'n', 'nnn', 'p', '[?]', '[?]', '[?]', 'm', 'y',
-		'r', 'rr', 'l', 'll', 'lll', 'v', '[?]', 'ss', 's', 'h', '[?]', '[?]', '[?]', '[?]', 'aa', 'i',
-		'ii', 'u', 'uu', '[?]', '[?]', '[?]', 'e', 'ee', 'ai', '[?]', 'o', 'oo', 'au', '', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '+', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-		'+10+', '+100+', '+1000+', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'x0f': [
-		'AUM', '', '', '', '', '', '', '', ' // ', ' * ', '', '-', ' / ', ' / ', ' // ', ' -/ ',
-		' +/ ', ' X/ ', ' /XX/ ', ' /X/ ', ', ', '', '', '', '', '', '', '', '', '', '', '',
-		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.5', '1.5', '2.5', '3.5', '4.5', '5.5',
-		'6.5', '7.5', '8.5', '-.5', '+', '*', '^', '_', '', '~', '[?]', ']', '[[', ']]', '', '',
-		'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', '[?]', 'ny', 'tt', 'tth', 'dd', 'ddh', 'nn', 't',
-		'th', 'd', 'dh', 'n', 'p', 'ph', 'b', 'bh', 'm', 'ts', 'tsh', 'dz', 'dzh', 'w', 'zh', 'z',
-		'\'', 'y', 'r', 'l', 'sh', 'ssh', 's', 'h', 'a', 'kss', 'r', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', 'aa', 'i', 'ii', 'u', 'uu', 'R', 'RR', 'L', 'LL', 'e', 'ee', 'o', 'oo', 'M', 'H',
-		'i', 'ii', '', '', '', '', '', '', '', '', '', '', '[?]', '[?]', '[?]', '[?]',
-		'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', '[?]', 'ny', 'tt', 'tth', 'dd', 'ddh', 'nn', 't',
-		'th', 'd', 'dh', 'n', 'p', 'ph', 'b', 'bh', 'm', 'ts', 'tsh', 'dz', 'dzh', 'w', 'zh', 'z',
-		'\'', 'y', 'r', 'l', 'sh', 'ss', 's', 'h', 'a', 'kss', 'w', 'y', 'r', '[?]', 'X', ' :X: ',
-		' /O/ ', ' /o/ ', ' \\o\\ ', ' (O) ', '', '', '', '', '', '', '', '', '', '[?]', '[?]', '',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xc4': [
-		'sswals', 'sswalt', 'sswalp', 'sswalh', 'sswam', 'sswab', 'sswabs', 'sswas', 'sswass', 'sswang', 'sswaj', 'sswac', 'sswak', 'sswat', 'sswap', 'sswah',
-		'sswae', 'sswaeg', 'sswaegg', 'sswaegs', 'sswaen', 'sswaenj', 'sswaenh', 'sswaed', 'sswael', 'sswaelg', 'sswaelm', 'sswaelb', 'sswaels', 'sswaelt', 'sswaelp', 'sswaelh',
-		'sswaem', 'sswaeb', 'sswaebs', 'sswaes', 'sswaess', 'sswaeng', 'sswaej', 'sswaec', 'sswaek', 'sswaet', 'sswaep', 'sswaeh', 'ssoe', 'ssoeg', 'ssoegg', 'ssoegs',
-		'ssoen', 'ssoenj', 'ssoenh', 'ssoed', 'ssoel', 'ssoelg', 'ssoelm', 'ssoelb', 'ssoels', 'ssoelt', 'ssoelp', 'ssoelh', 'ssoem', 'ssoeb', 'ssoebs', 'ssoes',
-		'ssoess', 'ssoeng', 'ssoej', 'ssoec', 'ssoek', 'ssoet', 'ssoep', 'ssoeh', 'ssyo', 'ssyog', 'ssyogg', 'ssyogs', 'ssyon', 'ssyonj', 'ssyonh', 'ssyod',
-		'ssyol', 'ssyolg', 'ssyolm', 'ssyolb', 'ssyols', 'ssyolt', 'ssyolp', 'ssyolh', 'ssyom', 'ssyob', 'ssyobs', 'ssyos', 'ssyoss', 'ssyong', 'ssyoj', 'ssyoc',
-		'ssyok', 'ssyot', 'ssyop', 'ssyoh', 'ssu', 'ssug', 'ssugg', 'ssugs', 'ssun', 'ssunj', 'ssunh', 'ssud', 'ssul', 'ssulg', 'ssulm', 'ssulb',
-		'ssuls', 'ssult', 'ssulp', 'ssulh', 'ssum', 'ssub', 'ssubs', 'ssus', 'ssuss', 'ssung', 'ssuj', 'ssuc', 'ssuk', 'ssut', 'ssup', 'ssuh',
-		'ssweo', 'ssweog', 'ssweogg', 'ssweogs', 'ssweon', 'ssweonj', 'ssweonh', 'ssweod', 'ssweol', 'ssweolg', 'ssweolm', 'ssweolb', 'ssweols', 'ssweolt', 'ssweolp', 'ssweolh',
-		'ssweom', 'ssweob', 'ssweobs', 'ssweos', 'ssweoss', 'ssweong', 'ssweoj', 'ssweoc', 'ssweok', 'ssweot', 'ssweop', 'ssweoh', 'sswe', 'ssweg', 'sswegg', 'sswegs',
-		'sswen', 'sswenj', 'sswenh', 'sswed', 'sswel', 'sswelg', 'sswelm', 'sswelb', 'sswels', 'sswelt', 'sswelp', 'sswelh', 'sswem', 'ssweb', 'sswebs', 'sswes',
-		'sswess', 'ssweng', 'sswej', 'sswec', 'sswek', 'sswet', 'sswep', 'ssweh', 'sswi', 'sswig', 'sswigg', 'sswigs', 'sswin', 'sswinj', 'sswinh', 'sswid',
-		'sswil', 'sswilg', 'sswilm', 'sswilb', 'sswils', 'sswilt', 'sswilp', 'sswilh', 'sswim', 'sswib', 'sswibs', 'sswis', 'sswiss', 'sswing', 'sswij', 'sswic',
-		'sswik', 'sswit', 'sswip', 'sswih', 'ssyu', 'ssyug', 'ssyugg', 'ssyugs', 'ssyun', 'ssyunj', 'ssyunh', 'ssyud', 'ssyul', 'ssyulg', 'ssyulm', 'ssyulb',
-		'ssyuls', 'ssyult', 'ssyulp', 'ssyulh', 'ssyum', 'ssyub', 'ssyubs', 'ssyus', 'ssyuss', 'ssyung', 'ssyuj', 'ssyuc', 'ssyuk', 'ssyut', 'ssyup', 'ssyuh',
-		'sseu', 'sseug', 'sseugg', 'sseugs', 'sseun', 'sseunj', 'sseunh', 'sseud', 'sseul', 'sseulg', 'sseulm', 'sseulb', 'sseuls', 'sseult', 'sseulp', 'sseulh',
-	],
-	'xd0': [
-		'kweon', 'kweonj', 'kweonh', 'kweod', 'kweol', 'kweolg', 'kweolm', 'kweolb', 'kweols', 'kweolt', 'kweolp', 'kweolh', 'kweom', 'kweob', 'kweobs', 'kweos',
-		'kweoss', 'kweong', 'kweoj', 'kweoc', 'kweok', 'kweot', 'kweop', 'kweoh', 'kwe', 'kweg', 'kwegg', 'kwegs', 'kwen', 'kwenj', 'kwenh', 'kwed',
-		'kwel', 'kwelg', 'kwelm', 'kwelb', 'kwels', 'kwelt', 'kwelp', 'kwelh', 'kwem', 'kweb', 'kwebs', 'kwes', 'kwess', 'kweng', 'kwej', 'kwec',
-		'kwek', 'kwet', 'kwep', 'kweh', 'kwi', 'kwig', 'kwigg', 'kwigs', 'kwin', 'kwinj', 'kwinh', 'kwid', 'kwil', 'kwilg', 'kwilm', 'kwilb',
-		'kwils', 'kwilt', 'kwilp', 'kwilh', 'kwim', 'kwib', 'kwibs', 'kwis', 'kwiss', 'kwing', 'kwij', 'kwic', 'kwik', 'kwit', 'kwip', 'kwih',
-		'kyu', 'kyug', 'kyugg', 'kyugs', 'kyun', 'kyunj', 'kyunh', 'kyud', 'kyul', 'kyulg', 'kyulm', 'kyulb', 'kyuls', 'kyult', 'kyulp', 'kyulh',
-		'kyum', 'kyub', 'kyubs', 'kyus', 'kyuss', 'kyung', 'kyuj', 'kyuc', 'kyuk', 'kyut', 'kyup', 'kyuh', 'keu', 'keug', 'keugg', 'keugs',
-		'keun', 'keunj', 'keunh', 'keud', 'keul', 'keulg', 'keulm', 'keulb', 'keuls', 'keult', 'keulp', 'keulh', 'keum', 'keub', 'keubs', 'keus',
-		'keuss', 'keung', 'keuj', 'keuc', 'keuk', 'keut', 'keup', 'keuh', 'kyi', 'kyig', 'kyigg', 'kyigs', 'kyin', 'kyinj', 'kyinh', 'kyid',
-		'kyil', 'kyilg', 'kyilm', 'kyilb', 'kyils', 'kyilt', 'kyilp', 'kyilh', 'kyim', 'kyib', 'kyibs', 'kyis', 'kyiss', 'kying', 'kyij', 'kyic',
-		'kyik', 'kyit', 'kyip', 'kyih', 'ki', 'kig', 'kigg', 'kigs', 'kin', 'kinj', 'kinh', 'kid', 'kil', 'kilg', 'kilm', 'kilb',
-		'kils', 'kilt', 'kilp', 'kilh', 'kim', 'kib', 'kibs', 'kis', 'kiss', 'king', 'kij', 'kic', 'kik', 'kit', 'kip', 'kih',
-		'ta', 'tag', 'tagg', 'tags', 'tan', 'tanj', 'tanh', 'tad', 'tal', 'talg', 'talm', 'talb', 'tals', 'talt', 'talp', 'talh',
-		'tam', 'tab', 'tabs', 'tas', 'tass', 'tang', 'taj', 'tac', 'tak', 'tat', 'tap', 'tah', 'tae', 'taeg', 'taegg', 'taegs',
-		'taen', 'taenj', 'taenh', 'taed', 'tael', 'taelg', 'taelm', 'taelb', 'taels', 'taelt', 'taelp', 'taelh', 'taem', 'taeb', 'taebs', 'taes',
-		'taess', 'taeng', 'taej', 'taec', 'taek', 'taet', 'taep', 'taeh', 'tya', 'tyag', 'tyagg', 'tyags', 'tyan', 'tyanj', 'tyanh', 'tyad',
-	],
-	'xb9': [
-		'ruk', 'rut', 'rup', 'ruh', 'rweo', 'rweog', 'rweogg', 'rweogs', 'rweon', 'rweonj', 'rweonh', 'rweod', 'rweol', 'rweolg', 'rweolm', 'rweolb',
-		'rweols', 'rweolt', 'rweolp', 'rweolh', 'rweom', 'rweob', 'rweobs', 'rweos', 'rweoss', 'rweong', 'rweoj', 'rweoc', 'rweok', 'rweot', 'rweop', 'rweoh',
-		'rwe', 'rweg', 'rwegg', 'rwegs', 'rwen', 'rwenj', 'rwenh', 'rwed', 'rwel', 'rwelg', 'rwelm', 'rwelb', 'rwels', 'rwelt', 'rwelp', 'rwelh',
-		'rwem', 'rweb', 'rwebs', 'rwes', 'rwess', 'rweng', 'rwej', 'rwec', 'rwek', 'rwet', 'rwep', 'rweh', 'rwi', 'rwig', 'rwigg', 'rwigs',
-		'rwin', 'rwinj', 'rwinh', 'rwid', 'rwil', 'rwilg', 'rwilm', 'rwilb', 'rwils', 'rwilt', 'rwilp', 'rwilh', 'rwim', 'rwib', 'rwibs', 'rwis',
-		'rwiss', 'rwing', 'rwij', 'rwic', 'rwik', 'rwit', 'rwip', 'rwih', 'ryu', 'ryug', 'ryugg', 'ryugs', 'ryun', 'ryunj', 'ryunh', 'ryud',
-		'ryul', 'ryulg', 'ryulm', 'ryulb', 'ryuls', 'ryult', 'ryulp', 'ryulh', 'ryum', 'ryub', 'ryubs', 'ryus', 'ryuss', 'ryung', 'ryuj', 'ryuc',
-		'ryuk', 'ryut', 'ryup', 'ryuh', 'reu', 'reug', 'reugg', 'reugs', 'reun', 'reunj', 'reunh', 'reud', 'reul', 'reulg', 'reulm', 'reulb',
-		'reuls', 'reult', 'reulp', 'reulh', 'reum', 'reub', 'reubs', 'reus', 'reuss', 'reung', 'reuj', 'reuc', 'reuk', 'reut', 'reup', 'reuh',
-		'ryi', 'ryig', 'ryigg', 'ryigs', 'ryin', 'ryinj', 'ryinh', 'ryid', 'ryil', 'ryilg', 'ryilm', 'ryilb', 'ryils', 'ryilt', 'ryilp', 'ryilh',
-		'ryim', 'ryib', 'ryibs', 'ryis', 'ryiss', 'rying', 'ryij', 'ryic', 'ryik', 'ryit', 'ryip', 'ryih', 'ri', 'rig', 'rigg', 'rigs',
-		'rin', 'rinj', 'rinh', 'rid', 'ril', 'rilg', 'rilm', 'rilb', 'rils', 'rilt', 'rilp', 'rilh', 'rim', 'rib', 'ribs', 'ris',
-		'riss', 'ring', 'rij', 'ric', 'rik', 'rit', 'rip', 'rih', 'ma', 'mag', 'magg', 'mags', 'man', 'manj', 'manh', 'mad',
-		'mal', 'malg', 'malm', 'malb', 'mals', 'malt', 'malp', 'malh', 'mam', 'mab', 'mabs', 'mas', 'mass', 'mang', 'maj', 'mac',
-		'mak', 'mat', 'map', 'mah', 'mae', 'maeg', 'maegg', 'maegs', 'maen', 'maenj', 'maenh', 'maed', 'mael', 'maelg', 'maelm', 'maelb',
-		'maels', 'maelt', 'maelp', 'maelh', 'maem', 'maeb', 'maebs', 'maes', 'maess', 'maeng', 'maej', 'maec', 'maek', 'maet', 'maep', 'maeh',
-	],
-	'xff': [
-		'[?]', '!', '"', '#', '\\$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/',
-		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?',
-		'@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
-		'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[', '\\', ']', '^', '_',
-		'`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
-		'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '\\{', '|', '\\}', '~', '[?]',
-		'[?]', '.', '[', ']', ',', '*', 'wo', 'a', 'i', 'u', 'e', 'o', 'ya', 'yu', 'yo', 'tu',
-		'+', 'a', 'i', 'u', 'e', 'o', 'ka', 'ki', 'ku', 'ke', 'ko', 'sa', 'si', 'su', 'se', 'so',
-		'ta', 'ti', 'tu', 'te', 'to', 'na', 'ni', 'nu', 'ne', 'no', 'ha', 'hi', 'hu', 'he', 'ho', 'ma',
-		'mi', 'mu', 'me', 'mo', 'ya', 'yu', 'yo', 'ra', 'ri', 'ru', 're', 'ro', 'wa', 'n', ':', ';',
-		'', 'g', 'gg', 'gs', 'n', 'nj', 'nh', 'd', 'dd', 'r', 'lg', 'lm', 'lb', 'ls', 'lt', 'lp',
-		'rh', 'm', 'b', 'bb', 'bs', 's', 'ss', '', 'j', 'jj', 'c', 'k', 't', 'p', 'h', '[?]',
-		'[?]', '[?]', 'a', 'ae', 'ya', 'yae', 'eo', 'e', '[?]', '[?]', 'yeo', 'ye', 'o', 'wa', 'wae', 'oe',
-		'[?]', '[?]', 'yo', 'u', 'weo', 'we', 'wi', 'yu', '[?]', '[?]', 'eu', 'yi', 'i', '[?]', '[?]', '[?]',
-		'/C', 'PS', '!', '-', '|', 'Y=', 'W=', '[?]', '|', '-', '|', '-', '|', '#', 'O', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '\\{', '|', '\\}', '', '', '', '',
-	],
-	'xc3': [
-		'ssal', 'ssalg', 'ssalm', 'ssalb', 'ssals', 'ssalt', 'ssalp', 'ssalh', 'ssam', 'ssab', 'ssabs', 'ssas', 'ssass', 'ssang', 'ssaj', 'ssac',
-		'ssak', 'ssat', 'ssap', 'ssah', 'ssae', 'ssaeg', 'ssaegg', 'ssaegs', 'ssaen', 'ssaenj', 'ssaenh', 'ssaed', 'ssael', 'ssaelg', 'ssaelm', 'ssaelb',
-		'ssaels', 'ssaelt', 'ssaelp', 'ssaelh', 'ssaem', 'ssaeb', 'ssaebs', 'ssaes', 'ssaess', 'ssaeng', 'ssaej', 'ssaec', 'ssaek', 'ssaet', 'ssaep', 'ssaeh',
-		'ssya', 'ssyag', 'ssyagg', 'ssyags', 'ssyan', 'ssyanj', 'ssyanh', 'ssyad', 'ssyal', 'ssyalg', 'ssyalm', 'ssyalb', 'ssyals', 'ssyalt', 'ssyalp', 'ssyalh',
-		'ssyam', 'ssyab', 'ssyabs', 'ssyas', 'ssyass', 'ssyang', 'ssyaj', 'ssyac', 'ssyak', 'ssyat', 'ssyap', 'ssyah', 'ssyae', 'ssyaeg', 'ssyaegg', 'ssyaegs',
-		'ssyaen', 'ssyaenj', 'ssyaenh', 'ssyaed', 'ssyael', 'ssyaelg', 'ssyaelm', 'ssyaelb', 'ssyaels', 'ssyaelt', 'ssyaelp', 'ssyaelh', 'ssyaem', 'ssyaeb', 'ssyaebs', 'ssyaes',
-		'ssyaess', 'ssyaeng', 'ssyaej', 'ssyaec', 'ssyaek', 'ssyaet', 'ssyaep', 'ssyaeh', 'sseo', 'sseog', 'sseogg', 'sseogs', 'sseon', 'sseonj', 'sseonh', 'sseod',
-		'sseol', 'sseolg', 'sseolm', 'sseolb', 'sseols', 'sseolt', 'sseolp', 'sseolh', 'sseom', 'sseob', 'sseobs', 'sseos', 'sseoss', 'sseong', 'sseoj', 'sseoc',
-		'sseok', 'sseot', 'sseop', 'sseoh', 'sse', 'sseg', 'ssegg', 'ssegs', 'ssen', 'ssenj', 'ssenh', 'ssed', 'ssel', 'sselg', 'sselm', 'sselb',
-		'ssels', 'sselt', 'sselp', 'sselh', 'ssem', 'sseb', 'ssebs', 'sses', 'ssess', 'sseng', 'ssej', 'ssec', 'ssek', 'sset', 'ssep', 'sseh',
-		'ssyeo', 'ssyeog', 'ssyeogg', 'ssyeogs', 'ssyeon', 'ssyeonj', 'ssyeonh', 'ssyeod', 'ssyeol', 'ssyeolg', 'ssyeolm', 'ssyeolb', 'ssyeols', 'ssyeolt', 'ssyeolp', 'ssyeolh',
-		'ssyeom', 'ssyeob', 'ssyeobs', 'ssyeos', 'ssyeoss', 'ssyeong', 'ssyeoj', 'ssyeoc', 'ssyeok', 'ssyeot', 'ssyeop', 'ssyeoh', 'ssye', 'ssyeg', 'ssyegg', 'ssyegs',
-		'ssyen', 'ssyenj', 'ssyenh', 'ssyed', 'ssyel', 'ssyelg', 'ssyelm', 'ssyelb', 'ssyels', 'ssyelt', 'ssyelp', 'ssyelh', 'ssyem', 'ssyeb', 'ssyebs', 'ssyes',
-		'ssyess', 'ssyeng', 'ssyej', 'ssyec', 'ssyek', 'ssyet', 'ssyep', 'ssyeh', 'sso', 'ssog', 'ssogg', 'ssogs', 'sson', 'ssonj', 'ssonh', 'ssod',
-		'ssol', 'ssolg', 'ssolm', 'ssolb', 'ssols', 'ssolt', 'ssolp', 'ssolh', 'ssom', 'ssob', 'ssobs', 'ssos', 'ssoss', 'ssong', 'ssoj', 'ssoc',
-		'ssok', 'ssot', 'ssop', 'ssoh', 'sswa', 'sswag', 'sswagg', 'sswags', 'sswan', 'sswanj', 'sswanh', 'sswad', 'sswal', 'sswalg', 'sswalm', 'sswalb',
-	],
-	'x09': [
-		'[?]', 'N', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', 'R', 'L', 'eN', 'e', 'e',
-		'ai', 'oN', 'o', 'o', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
-		'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', 'nnn', 'p', 'ph', 'b', 'bh', 'm', 'y',
-		'r', 'rr', 'l', 'l', 'lll', 'v', 'sh', 'ss', 's', 'h', '[?]', '[?]', '\'', '\'', 'aa', 'i',
-		'ii', 'u', 'uu', 'R', 'RR', 'eN', 'e', 'e', 'ai', 'oN', 'o', 'o', 'au', '', '[?]', '[?]',
-		'AUM', '\'', '\'', '`', '\'', '[?]', '[?]', '[?]', 'q', 'khh', 'ghh', 'z', 'dddh', 'rh', 'f', 'yy',
-		'RR', 'LL', 'L', 'LL', ' / ', ' // ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-		'.', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', 'N', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', 'R', 'RR', '[?]', '[?]', 'e',
-		'ai', '[?]', '[?]', 'o', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
-		'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', '[?]', 'p', 'ph', 'b', 'bh', 'm', 'y',
-		'r', '[?]', 'l', '[?]', '[?]', '[?]', 'sh', 'ss', 's', 'h', '[?]', '[?]', '\'', '[?]', 'aa', 'i',
-		'ii', 'u', 'uu', 'R', 'RR', '[?]', '[?]', 'e', 'ai', '[?]', '[?]', 'o', 'au', '', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '+', '[?]', '[?]', '[?]', '[?]', 'rr', 'rh', '[?]', 'yy',
-		'RR', 'LL', 'L', 'LL', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-		'r\'', 'r`', 'Rs', 'Rs', '1/', '2/', '3/', '4/', ' 1 - 1/', '/16', '', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xb2': [
-		'nyok', 'nyot', 'nyop', 'nyoh', 'nu', 'nug', 'nugg', 'nugs', 'nun', 'nunj', 'nunh', 'nud', 'nul', 'nulg', 'nulm', 'nulb',
-		'nuls', 'nult', 'nulp', 'nulh', 'num', 'nub', 'nubs', 'nus', 'nuss', 'nung', 'nuj', 'nuc', 'nuk', 'nut', 'nup', 'nuh',
-		'nweo', 'nweog', 'nweogg', 'nweogs', 'nweon', 'nweonj', 'nweonh', 'nweod', 'nweol', 'nweolg', 'nweolm', 'nweolb', 'nweols', 'nweolt', 'nweolp', 'nweolh',
-		'nweom', 'nweob', 'nweobs', 'nweos', 'nweoss', 'nweong', 'nweoj', 'nweoc', 'nweok', 'nweot', 'nweop', 'nweoh', 'nwe', 'nweg', 'nwegg', 'nwegs',
-		'nwen', 'nwenj', 'nwenh', 'nwed', 'nwel', 'nwelg', 'nwelm', 'nwelb', 'nwels', 'nwelt', 'nwelp', 'nwelh', 'nwem', 'nweb', 'nwebs', 'nwes',
-		'nwess', 'nweng', 'nwej', 'nwec', 'nwek', 'nwet', 'nwep', 'nweh', 'nwi', 'nwig', 'nwigg', 'nwigs', 'nwin', 'nwinj', 'nwinh', 'nwid',
-		'nwil', 'nwilg', 'nwilm', 'nwilb', 'nwils', 'nwilt', 'nwilp', 'nwilh', 'nwim', 'nwib', 'nwibs', 'nwis', 'nwiss', 'nwing', 'nwij', 'nwic',
-		'nwik', 'nwit', 'nwip', 'nwih', 'nyu', 'nyug', 'nyugg', 'nyugs', 'nyun', 'nyunj', 'nyunh', 'nyud', 'nyul', 'nyulg', 'nyulm', 'nyulb',
-		'nyuls', 'nyult', 'nyulp', 'nyulh', 'nyum', 'nyub', 'nyubs', 'nyus', 'nyuss', 'nyung', 'nyuj', 'nyuc', 'nyuk', 'nyut', 'nyup', 'nyuh',
-		'neu', 'neug', 'neugg', 'neugs', 'neun', 'neunj', 'neunh', 'neud', 'neul', 'neulg', 'neulm', 'neulb', 'neuls', 'neult', 'neulp', 'neulh',
-		'neum', 'neub', 'neubs', 'neus', 'neuss', 'neung', 'neuj', 'neuc', 'neuk', 'neut', 'neup', 'neuh', 'nyi', 'nyig', 'nyigg', 'nyigs',
-		'nyin', 'nyinj', 'nyinh', 'nyid', 'nyil', 'nyilg', 'nyilm', 'nyilb', 'nyils', 'nyilt', 'nyilp', 'nyilh', 'nyim', 'nyib', 'nyibs', 'nyis',
-		'nyiss', 'nying', 'nyij', 'nyic', 'nyik', 'nyit', 'nyip', 'nyih', 'ni', 'nig', 'nigg', 'nigs', 'nin', 'ninj', 'ninh', 'nid',
-		'nil', 'nilg', 'nilm', 'nilb', 'nils', 'nilt', 'nilp', 'nilh', 'nim', 'nib', 'nibs', 'nis', 'niss', 'ning', 'nij', 'nic',
-		'nik', 'nit', 'nip', 'nih', 'da', 'dag', 'dagg', 'dags', 'dan', 'danj', 'danh', 'dad', 'dal', 'dalg', 'dalm', 'dalb',
-		'dals', 'dalt', 'dalp', 'dalh', 'dam', 'dab', 'dabs', 'das', 'dass', 'dang', 'daj', 'dac', 'dak', 'dat', 'dap', 'dah',
-	],
-	'x0a': [
-		'[?]', '[?]', 'N', '[?]', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', '[?]', '[?]', '[?]', '[?]', 'ee',
-		'ai', '[?]', '[?]', 'oo', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
-		'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', '[?]', 'p', 'ph', 'b', 'bb', 'm', 'y',
-		'r', '[?]', 'l', 'll', '[?]', 'v', 'sh', '[?]', 's', 'h', '[?]', '[?]', '\'', '[?]', 'aa', 'i',
-		'ii', 'u', 'uu', '[?]', '[?]', '[?]', '[?]', 'ee', 'ai', '[?]', '[?]', 'oo', 'au', '', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', 'khh', 'ghh', 'z', 'rr', '[?]', 'f', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-		'N', 'H', '', '', 'G.E.O.', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', 'N', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', 'R', '[?]', 'eN', '[?]', 'e',
-		'ai', 'oN', '[?]', 'o', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
-		'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', '[?]', 'p', 'ph', 'b', 'bh', 'm', 'ya',
-		'r', '[?]', 'l', 'll', '[?]', 'v', 'sh', 'ss', 's', 'h', '[?]', '[?]', '\'', '\'', 'aa', 'i',
-		'ii', 'u', 'uu', 'R', 'RR', 'eN', '[?]', 'e', 'ai', 'oN', '[?]', 'o', 'au', '', '[?]', '[?]',
-		'AUM', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'RR', '[?]', '[?]', '[?]', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'x0d': [
-		'[?]', '[?]', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', 'R', 'L', '[?]', 'e', 'ee',
-		'ai', '[?]', 'o', 'oo', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
-		'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', '[?]', 'p', 'ph', 'b', 'bh', 'm', 'y',
-		'r', 'rr', 'l', 'll', 'lll', 'v', 'sh', 'ss', 's', 'h', '[?]', '[?]', '[?]', '[?]', 'aa', 'i',
-		'ii', 'u', 'uu', 'R', '[?]', '[?]', 'e', 'ee', 'ai', '', 'o', 'oo', 'au', '', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '+', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'RR', 'LL', '[?]', '[?]', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', 'N', 'H', '[?]', 'a', 'aa', 'ae', 'aae', 'i', 'ii', 'u', 'uu', 'R', 'RR', 'L',
-		'LL', 'e', 'ee', 'ai', 'o', 'oo', 'au', '[?]', '[?]', '[?]', 'k', 'kh', 'g', 'gh', 'ng', 'nng',
-		'c', 'ch', 'j', 'jh', 'ny', 'jny', 'nyj', 'tt', 'tth', 'dd', 'ddh', 'nn', 'nndd', 't', 'th', 'd',
-		'dh', 'n', '[?]', 'nd', 'p', 'ph', 'b', 'bh', 'm', 'mb', 'y', 'r', '[?]', 'l', '[?]', '[?]',
-		'v', 'sh', 'ss', 's', 'h', 'll', 'f', '[?]', '[?]', '[?]', '', '[?]', '[?]', '[?]', '[?]', 'aa',
-		'ae', 'aae', 'i', 'ii', 'u', '[?]', 'uu', '[?]', 'R', 'e', 'ee', 'ai', 'o', 'oo', 'au', 'L',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', 'RR', 'LL', ' . ', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xc1': [
-		'syae', 'syaeg', 'syaegg', 'syaegs', 'syaen', 'syaenj', 'syaenh', 'syaed', 'syael', 'syaelg', 'syaelm', 'syaelb', 'syaels', 'syaelt', 'syaelp', 'syaelh',
-		'syaem', 'syaeb', 'syaebs', 'syaes', 'syaess', 'syaeng', 'syaej', 'syaec', 'syaek', 'syaet', 'syaep', 'syaeh', 'seo', 'seog', 'seogg', 'seogs',
-		'seon', 'seonj', 'seonh', 'seod', 'seol', 'seolg', 'seolm', 'seolb', 'seols', 'seolt', 'seolp', 'seolh', 'seom', 'seob', 'seobs', 'seos',
-		'seoss', 'seong', 'seoj', 'seoc', 'seok', 'seot', 'seop', 'seoh', 'se', 'seg', 'segg', 'segs', 'sen', 'senj', 'senh', 'sed',
-		'sel', 'selg', 'selm', 'selb', 'sels', 'selt', 'selp', 'selh', 'sem', 'seb', 'sebs', 'ses', 'sess', 'seng', 'sej', 'sec',
-		'sek', 'set', 'sep', 'seh', 'syeo', 'syeog', 'syeogg', 'syeogs', 'syeon', 'syeonj', 'syeonh', 'syeod', 'syeol', 'syeolg', 'syeolm', 'syeolb',
-		'syeols', 'syeolt', 'syeolp', 'syeolh', 'syeom', 'syeob', 'syeobs', 'syeos', 'syeoss', 'syeong', 'syeoj', 'syeoc', 'syeok', 'syeot', 'syeop', 'syeoh',
-		'sye', 'syeg', 'syegg', 'syegs', 'syen', 'syenj', 'syenh', 'syed', 'syel', 'syelg', 'syelm', 'syelb', 'syels', 'syelt', 'syelp', 'syelh',
-		'syem', 'syeb', 'syebs', 'syes', 'syess', 'syeng', 'syej', 'syec', 'syek', 'syet', 'syep', 'syeh', 'so', 'sog', 'sogg', 'sogs',
-		'son', 'sonj', 'sonh', 'sod', 'sol', 'solg', 'solm', 'solb', 'sols', 'solt', 'solp', 'solh', 'som', 'sob', 'sobs', 'sos',
-		'soss', 'song', 'soj', 'soc', 'sok', 'sot', 'sop', 'soh', 'swa', 'swag', 'swagg', 'swags', 'swan', 'swanj', 'swanh', 'swad',
-		'swal', 'swalg', 'swalm', 'swalb', 'swals', 'swalt', 'swalp', 'swalh', 'swam', 'swab', 'swabs', 'swas', 'swass', 'swang', 'swaj', 'swac',
-		'swak', 'swat', 'swap', 'swah', 'swae', 'swaeg', 'swaegg', 'swaegs', 'swaen', 'swaenj', 'swaenh', 'swaed', 'swael', 'swaelg', 'swaelm', 'swaelb',
-		'swaels', 'swaelt', 'swaelp', 'swaelh', 'swaem', 'swaeb', 'swaebs', 'swaes', 'swaess', 'swaeng', 'swaej', 'swaec', 'swaek', 'swaet', 'swaep', 'swaeh',
-		'soe', 'soeg', 'soegg', 'soegs', 'soen', 'soenj', 'soenh', 'soed', 'soel', 'soelg', 'soelm', 'soelb', 'soels', 'soelt', 'soelp', 'soelh',
-		'soem', 'soeb', 'soebs', 'soes', 'soess', 'soeng', 'soej', 'soec', 'soek', 'soet', 'soep', 'soeh', 'syo', 'syog', 'syogg', 'syogs',
-	],
-	'xba': [
-		'mya', 'myag', 'myagg', 'myags', 'myan', 'myanj', 'myanh', 'myad', 'myal', 'myalg', 'myalm', 'myalb', 'myals', 'myalt', 'myalp', 'myalh',
-		'myam', 'myab', 'myabs', 'myas', 'myass', 'myang', 'myaj', 'myac', 'myak', 'myat', 'myap', 'myah', 'myae', 'myaeg', 'myaegg', 'myaegs',
-		'myaen', 'myaenj', 'myaenh', 'myaed', 'myael', 'myaelg', 'myaelm', 'myaelb', 'myaels', 'myaelt', 'myaelp', 'myaelh', 'myaem', 'myaeb', 'myaebs', 'myaes',
-		'myaess', 'myaeng', 'myaej', 'myaec', 'myaek', 'myaet', 'myaep', 'myaeh', 'meo', 'meog', 'meogg', 'meogs', 'meon', 'meonj', 'meonh', 'meod',
-		'meol', 'meolg', 'meolm', 'meolb', 'meols', 'meolt', 'meolp', 'meolh', 'meom', 'meob', 'meobs', 'meos', 'meoss', 'meong', 'meoj', 'meoc',
-		'meok', 'meot', 'meop', 'meoh', 'me', 'meg', 'megg', 'megs', 'men', 'menj', 'menh', 'med', 'mel', 'melg', 'melm', 'melb',
-		'mels', 'melt', 'melp', 'melh', 'mem', 'meb', 'mebs', 'mes', 'mess', 'meng', 'mej', 'mec', 'mek', 'met', 'mep', 'meh',
-		'myeo', 'myeog', 'myeogg', 'myeogs', 'myeon', 'myeonj', 'myeonh', 'myeod', 'myeol', 'myeolg', 'myeolm', 'myeolb', 'myeols', 'myeolt', 'myeolp', 'myeolh',
-		'myeom', 'myeob', 'myeobs', 'myeos', 'myeoss', 'myeong', 'myeoj', 'myeoc', 'myeok', 'myeot', 'myeop', 'myeoh', 'mye', 'myeg', 'myegg', 'myegs',
-		'myen', 'myenj', 'myenh', 'myed', 'myel', 'myelg', 'myelm', 'myelb', 'myels', 'myelt', 'myelp', 'myelh', 'myem', 'myeb', 'myebs', 'myes',
-		'myess', 'myeng', 'myej', 'myec', 'myek', 'myet', 'myep', 'myeh', 'mo', 'mog', 'mogg', 'mogs', 'mon', 'monj', 'monh', 'mod',
-		'mol', 'molg', 'molm', 'molb', 'mols', 'molt', 'molp', 'molh', 'mom', 'mob', 'mobs', 'mos', 'moss', 'mong', 'moj', 'moc',
-		'mok', 'mot', 'mop', 'moh', 'mwa', 'mwag', 'mwagg', 'mwags', 'mwan', 'mwanj', 'mwanh', 'mwad', 'mwal', 'mwalg', 'mwalm', 'mwalb',
-		'mwals', 'mwalt', 'mwalp', 'mwalh', 'mwam', 'mwab', 'mwabs', 'mwas', 'mwass', 'mwang', 'mwaj', 'mwac', 'mwak', 'mwat', 'mwap', 'mwah',
-		'mwae', 'mwaeg', 'mwaegg', 'mwaegs', 'mwaen', 'mwaenj', 'mwaenh', 'mwaed', 'mwael', 'mwaelg', 'mwaelm', 'mwaelb', 'mwaels', 'mwaelt', 'mwaelp', 'mwaelh',
-		'mwaem', 'mwaeb', 'mwaebs', 'mwaes', 'mwaess', 'mwaeng', 'mwaej', 'mwaec', 'mwaek', 'mwaet', 'mwaep', 'mwaeh', 'moe', 'moeg', 'moegg', 'moegs',
-	],
-	'xb3': [
-		'dae', 'daeg', 'daegg', 'daegs', 'daen', 'daenj', 'daenh', 'daed', 'dael', 'daelg', 'daelm', 'daelb', 'daels', 'daelt', 'daelp', 'daelh',
-		'daem', 'daeb', 'daebs', 'daes', 'daess', 'daeng', 'daej', 'daec', 'daek', 'daet', 'daep', 'daeh', 'dya', 'dyag', 'dyagg', 'dyags',
-		'dyan', 'dyanj', 'dyanh', 'dyad', 'dyal', 'dyalg', 'dyalm', 'dyalb', 'dyals', 'dyalt', 'dyalp', 'dyalh', 'dyam', 'dyab', 'dyabs', 'dyas',
-		'dyass', 'dyang', 'dyaj', 'dyac', 'dyak', 'dyat', 'dyap', 'dyah', 'dyae', 'dyaeg', 'dyaegg', 'dyaegs', 'dyaen', 'dyaenj', 'dyaenh', 'dyaed',
-		'dyael', 'dyaelg', 'dyaelm', 'dyaelb', 'dyaels', 'dyaelt', 'dyaelp', 'dyaelh', 'dyaem', 'dyaeb', 'dyaebs', 'dyaes', 'dyaess', 'dyaeng', 'dyaej', 'dyaec',
-		'dyaek', 'dyaet', 'dyaep', 'dyaeh', 'deo', 'deog', 'deogg', 'deogs', 'deon', 'deonj', 'deonh', 'deod', 'deol', 'deolg', 'deolm', 'deolb',
-		'deols', 'deolt', 'deolp', 'deolh', 'deom', 'deob', 'deobs', 'deos', 'deoss', 'deong', 'deoj', 'deoc', 'deok', 'deot', 'deop', 'deoh',
-		'de', 'deg', 'degg', 'degs', 'den', 'denj', 'denh', 'ded', 'del', 'delg', 'delm', 'delb', 'dels', 'delt', 'delp', 'delh',
-		'dem', 'deb', 'debs', 'des', 'dess', 'deng', 'dej', 'dec', 'dek', 'det', 'dep', 'deh', 'dyeo', 'dyeog', 'dyeogg', 'dyeogs',
-		'dyeon', 'dyeonj', 'dyeonh', 'dyeod', 'dyeol', 'dyeolg', 'dyeolm', 'dyeolb', 'dyeols', 'dyeolt', 'dyeolp', 'dyeolh', 'dyeom', 'dyeob', 'dyeobs', 'dyeos',
-		'dyeoss', 'dyeong', 'dyeoj', 'dyeoc', 'dyeok', 'dyeot', 'dyeop', 'dyeoh', 'dye', 'dyeg', 'dyegg', 'dyegs', 'dyen', 'dyenj', 'dyenh', 'dyed',
-		'dyel', 'dyelg', 'dyelm', 'dyelb', 'dyels', 'dyelt', 'dyelp', 'dyelh', 'dyem', 'dyeb', 'dyebs', 'dyes', 'dyess', 'dyeng', 'dyej', 'dyec',
-		'dyek', 'dyet', 'dyep', 'dyeh', 'do', 'dog', 'dogg', 'dogs', 'don', 'donj', 'donh', 'dod', 'dol', 'dolg', 'dolm', 'dolb',
-		'dols', 'dolt', 'dolp', 'dolh', 'dom', 'dob', 'dobs', 'dos', 'doss', 'dong', 'doj', 'doc', 'dok', 'dot', 'dop', 'doh',
-		'dwa', 'dwag', 'dwagg', 'dwags', 'dwan', 'dwanj', 'dwanh', 'dwad', 'dwal', 'dwalg', 'dwalm', 'dwalb', 'dwals', 'dwalt', 'dwalp', 'dwalh',
-		'dwam', 'dwab', 'dwabs', 'dwas', 'dwass', 'dwang', 'dwaj', 'dwac', 'dwak', 'dwat', 'dwap', 'dwah', 'dwae', 'dwaeg', 'dwaegg', 'dwaegs',
-	],
-	'xa0': [
-		'it', 'ix', 'i', 'ip', 'iet', 'iex', 'ie', 'iep', 'at', 'ax', 'a', 'ap', 'uox', 'uo', 'uop', 'ot',
-		'ox', 'o', 'op', 'ex', 'e', 'wu', 'bit', 'bix', 'bi', 'bip', 'biet', 'biex', 'bie', 'biep', 'bat', 'bax',
-		'ba', 'bap', 'buox', 'buo', 'buop', 'bot', 'box', 'bo', 'bop', 'bex', 'be', 'bep', 'but', 'bux', 'bu', 'bup',
-		'burx', 'bur', 'byt', 'byx', 'by', 'byp', 'byrx', 'byr', 'pit', 'pix', 'pi', 'pip', 'piex', 'pie', 'piep', 'pat',
-		'pax', 'pa', 'pap', 'puox', 'puo', 'puop', 'pot', 'pox', 'po', 'pop', 'put', 'pux', 'pu', 'pup', 'purx', 'pur',
-		'pyt', 'pyx', 'py', 'pyp', 'pyrx', 'pyr', 'bbit', 'bbix', 'bbi', 'bbip', 'bbiet', 'bbiex', 'bbie', 'bbiep', 'bbat', 'bbax',
-		'bba', 'bbap', 'bbuox', 'bbuo', 'bbuop', 'bbot', 'bbox', 'bbo', 'bbop', 'bbex', 'bbe', 'bbep', 'bbut', 'bbux', 'bbu', 'bbup',
-		'bburx', 'bbur', 'bbyt', 'bbyx', 'bby', 'bbyp', 'nbit', 'nbix', 'nbi', 'nbip', 'nbiex', 'nbie', 'nbiep', 'nbat', 'nbax', 'nba',
-		'nbap', 'nbot', 'nbox', 'nbo', 'nbop', 'nbut', 'nbux', 'nbu', 'nbup', 'nburx', 'nbur', 'nbyt', 'nbyx', 'nby', 'nbyp', 'nbyrx',
-		'nbyr', 'hmit', 'hmix', 'hmi', 'hmip', 'hmiex', 'hmie', 'hmiep', 'hmat', 'hmax', 'hma', 'hmap', 'hmuox', 'hmuo', 'hmuop', 'hmot',
-		'hmox', 'hmo', 'hmop', 'hmut', 'hmux', 'hmu', 'hmup', 'hmurx', 'hmur', 'hmyx', 'hmy', 'hmyp', 'hmyrx', 'hmyr', 'mit', 'mix',
-		'mi', 'mip', 'miex', 'mie', 'miep', 'mat', 'max', 'ma', 'map', 'muot', 'muox', 'muo', 'muop', 'mot', 'mox', 'mo',
-		'mop', 'mex', 'me', 'mut', 'mux', 'mu', 'mup', 'murx', 'mur', 'myt', 'myx', 'my', 'myp', 'fit', 'fix', 'fi',
-		'fip', 'fat', 'fax', 'fa', 'fap', 'fox', 'fo', 'fop', 'fut', 'fux', 'fu', 'fup', 'furx', 'fur', 'fyt', 'fyx',
-		'fy', 'fyp', 'vit', 'vix', 'vi', 'vip', 'viet', 'viex', 'vie', 'viep', 'vat', 'vax', 'va', 'vap', 'vot', 'vox',
-		'vo', 'vop', 'vex', 'vep', 'vut', 'vux', 'vu', 'vup', 'vurx', 'vur', 'vyt', 'vyx', 'vy', 'vyp', 'vyrx', 'vyr',
-	],
-	'x15': [
-		'swa', 'swa', 'swaa', 'swaa', 'swaa', 's', 's', 'sw', 's', 'sk', 'skw', 'sW', 'spwa', 'stwa', 'skwa', 'scwa',
-		'she', 'shi', 'shii', 'sho', 'shoo', 'sha', 'shaa', 'shwe', 'shwe', 'shwi', 'shwi', 'shwii', 'shwii', 'shwo', 'shwo', 'shwoo',
-		'shwoo', 'shwa', 'shwa', 'shwaa', 'shwaa', 'sh', 'ye', 'yaai', 'yi', 'yii', 'yo', 'yoo', 'yoo', 'ya', 'yaa', 'ywe',
-		'ywe', 'ywi', 'ywi', 'ywii', 'ywii', 'ywo', 'ywo', 'ywoo', 'ywoo', 'ywa', 'ywa', 'ywaa', 'ywaa', 'ywaa', 'y', 'y',
-		'y', 'yi', 're', 're', 'le', 'raai', 'ri', 'rii', 'ro', 'roo', 'lo', 'ra', 'raa', 'la', 'rwaa', 'rwaa',
-		'r', 'r', 'r', 'fe', 'faai', 'fi', 'fii', 'fo', 'foo', 'fa', 'faa', 'fwaa', 'fwaa', 'f', 'the', 'the',
-		'thi', 'thi', 'thii', 'thii', 'tho', 'thoo', 'tha', 'thaa', 'thwaa', 'thwaa', 'th', 'tthe', 'tthi', 'ttho', 'ttha', 'tth',
-		'tye', 'tyi', 'tyo', 'tya', 'he', 'hi', 'hii', 'ho', 'hoo', 'ha', 'haa', 'h', 'h', 'hk', 'qaai', 'qi',
-		'qii', 'qo', 'qoo', 'qa', 'qaa', 'q', 'tlhe', 'tlhi', 'tlho', 'tlha', 're', 'ri', 'ro', 'ra', 'ngaai', 'ngi',
-		'ngii', 'ngo', 'ngoo', 'nga', 'ngaa', 'ng', 'nng', 'she', 'shi', 'sho', 'sha', 'the', 'thi', 'tho', 'tha', 'th',
-		'lhi', 'lhii', 'lho', 'lhoo', 'lha', 'lhaa', 'lh', 'the', 'thi', 'thii', 'tho', 'thoo', 'tha', 'thaa', 'th', 'b',
-		'e', 'i', 'o', 'a', 'we', 'wi', 'wo', 'wa', 'ne', 'ni', 'no', 'na', 'ke', 'ki', 'ko', 'ka',
-		'he', 'hi', 'ho', 'ha', 'ghu', 'gho', 'ghe', 'ghee', 'ghi', 'gha', 'ru', 'ro', 're', 'ree', 'ri', 'ra',
-		'wu', 'wo', 'we', 'wee', 'wi', 'wa', 'hwu', 'hwo', 'hwe', 'hwee', 'hwi', 'hwa', 'thu', 'tho', 'the', 'thee',
-		'thi', 'tha', 'ttu', 'tto', 'tte', 'ttee', 'tti', 'tta', 'pu', 'po', 'pe', 'pee', 'pi', 'pa', 'p', 'gu',
-		'go', 'ge', 'gee', 'gi', 'ga', 'khu', 'kho', 'khe', 'khee', 'khi', 'kha', 'kku', 'kko', 'kke', 'kkee', 'kki',
-	],
-	'x13': [
-		'ja', 'ju', 'ji', 'jaa', 'jee', 'je', 'jo', 'jwa', 'ga', 'gu', 'gi', 'gaa', 'gee', 'ge', 'go', '[?]',
-		'gwa', '[?]', 'gwi', 'gwaa', 'gwee', 'gwe', '[?]', '[?]', 'gga', 'ggu', 'ggi', 'ggaa', 'ggee', 'gge', 'ggo', '[?]',
-		'tha', 'thu', 'thi', 'thaa', 'thee', 'the', 'tho', 'thwa', 'cha', 'chu', 'chi', 'chaa', 'chee', 'che', 'cho', 'chwa',
-		'pha', 'phu', 'phi', 'phaa', 'phee', 'phe', 'pho', 'phwa', 'tsa', 'tsu', 'tsi', 'tsaa', 'tsee', 'tse', 'tso', 'tswa',
-		'tza', 'tzu', 'tzi', 'tzaa', 'tzee', 'tze', 'tzo', '[?]', 'fa', 'fu', 'fi', 'faa', 'fee', 'fe', 'fo', 'fwa',
-		'pa', 'pu', 'pi', 'paa', 'pee', 'pe', 'po', 'pwa', 'rya', 'mya', 'fya', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', ' ', '.', ',', ';', ':', ':: ', '?', '//', '1', '2', '3', '4', '5', '6', '7',
-		'8', '9', '10+', '20+', '30+', '40+', '50+', '60+', '70+', '80+', '90+', '100+', '10,000+', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'a', 'e', 'i', 'o', 'u', 'v', 'ga', 'ka', 'ge', 'gi', 'go', 'gu', 'gv', 'ha', 'he', 'hi',
-		'ho', 'hu', 'hv', 'la', 'le', 'li', 'lo', 'lu', 'lv', 'ma', 'me', 'mi', 'mo', 'mu', 'na', 'hna',
-		'nah', 'ne', 'ni', 'no', 'nu', 'nv', 'qua', 'que', 'qui', 'quo', 'quu', 'quv', 'sa', 's', 'se', 'si',
-		'so', 'su', 'sv', 'da', 'ta', 'de', 'te', 'di', 'ti', 'do', 'du', 'dv', 'dla', 'tla', 'tle', 'tli',
-		'tlo', 'tlu', 'tlv', 'tsa', 'tse', 'tsi', 'tso', 'tsu', 'tsv', 'wa', 'we', 'wi', 'wo', 'wu', 'wv', 'ya',
-		'ye', 'yi', 'yo', 'yu', 'yv', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'x27': [
-		'[?]', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '[?]',
-		'[?]', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'[?]', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'x24': [
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'', '', '', '', '', '', '', '', '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xcb': [
-		'jjwaels', 'jjwaelt', 'jjwaelp', 'jjwaelh', 'jjwaem', 'jjwaeb', 'jjwaebs', 'jjwaes', 'jjwaess', 'jjwaeng', 'jjwaej', 'jjwaec', 'jjwaek', 'jjwaet', 'jjwaep', 'jjwaeh',
-		'jjoe', 'jjoeg', 'jjoegg', 'jjoegs', 'jjoen', 'jjoenj', 'jjoenh', 'jjoed', 'jjoel', 'jjoelg', 'jjoelm', 'jjoelb', 'jjoels', 'jjoelt', 'jjoelp', 'jjoelh',
-		'jjoem', 'jjoeb', 'jjoebs', 'jjoes', 'jjoess', 'jjoeng', 'jjoej', 'jjoec', 'jjoek', 'jjoet', 'jjoep', 'jjoeh', 'jjyo', 'jjyog', 'jjyogg', 'jjyogs',
-		'jjyon', 'jjyonj', 'jjyonh', 'jjyod', 'jjyol', 'jjyolg', 'jjyolm', 'jjyolb', 'jjyols', 'jjyolt', 'jjyolp', 'jjyolh', 'jjyom', 'jjyob', 'jjyobs', 'jjyos',
-		'jjyoss', 'jjyong', 'jjyoj', 'jjyoc', 'jjyok', 'jjyot', 'jjyop', 'jjyoh', 'jju', 'jjug', 'jjugg', 'jjugs', 'jjun', 'jjunj', 'jjunh', 'jjud',
-		'jjul', 'jjulg', 'jjulm', 'jjulb', 'jjuls', 'jjult', 'jjulp', 'jjulh', 'jjum', 'jjub', 'jjubs', 'jjus', 'jjuss', 'jjung', 'jjuj', 'jjuc',
-		'jjuk', 'jjut', 'jjup', 'jjuh', 'jjweo', 'jjweog', 'jjweogg', 'jjweogs', 'jjweon', 'jjweonj', 'jjweonh', 'jjweod', 'jjweol', 'jjweolg', 'jjweolm', 'jjweolb',
-		'jjweols', 'jjweolt', 'jjweolp', 'jjweolh', 'jjweom', 'jjweob', 'jjweobs', 'jjweos', 'jjweoss', 'jjweong', 'jjweoj', 'jjweoc', 'jjweok', 'jjweot', 'jjweop', 'jjweoh',
-		'jjwe', 'jjweg', 'jjwegg', 'jjwegs', 'jjwen', 'jjwenj', 'jjwenh', 'jjwed', 'jjwel', 'jjwelg', 'jjwelm', 'jjwelb', 'jjwels', 'jjwelt', 'jjwelp', 'jjwelh',
-		'jjwem', 'jjweb', 'jjwebs', 'jjwes', 'jjwess', 'jjweng', 'jjwej', 'jjwec', 'jjwek', 'jjwet', 'jjwep', 'jjweh', 'jjwi', 'jjwig', 'jjwigg', 'jjwigs',
-		'jjwin', 'jjwinj', 'jjwinh', 'jjwid', 'jjwil', 'jjwilg', 'jjwilm', 'jjwilb', 'jjwils', 'jjwilt', 'jjwilp', 'jjwilh', 'jjwim', 'jjwib', 'jjwibs', 'jjwis',
-		'jjwiss', 'jjwing', 'jjwij', 'jjwic', 'jjwik', 'jjwit', 'jjwip', 'jjwih', 'jjyu', 'jjyug', 'jjyugg', 'jjyugs', 'jjyun', 'jjyunj', 'jjyunh', 'jjyud',
-		'jjyul', 'jjyulg', 'jjyulm', 'jjyulb', 'jjyuls', 'jjyult', 'jjyulp', 'jjyulh', 'jjyum', 'jjyub', 'jjyubs', 'jjyus', 'jjyuss', 'jjyung', 'jjyuj', 'jjyuc',
-		'jjyuk', 'jjyut', 'jjyup', 'jjyuh', 'jjeu', 'jjeug', 'jjeugg', 'jjeugs', 'jjeun', 'jjeunj', 'jjeunh', 'jjeud', 'jjeul', 'jjeulg', 'jjeulm', 'jjeulb',
-		'jjeuls', 'jjeult', 'jjeulp', 'jjeulh', 'jjeum', 'jjeub', 'jjeubs', 'jjeus', 'jjeuss', 'jjeung', 'jjeuj', 'jjeuc', 'jjeuk', 'jjeut', 'jjeup', 'jjeuh',
-		'jjyi', 'jjyig', 'jjyigg', 'jjyigs', 'jjyin', 'jjyinj', 'jjyinh', 'jjyid', 'jjyil', 'jjyilg', 'jjyilm', 'jjyilb', 'jjyils', 'jjyilt', 'jjyilp', 'jjyilh',
-	],
-	'xc0': [
-		'bbweok', 'bbweot', 'bbweop', 'bbweoh', 'bbwe', 'bbweg', 'bbwegg', 'bbwegs', 'bbwen', 'bbwenj', 'bbwenh', 'bbwed', 'bbwel', 'bbwelg', 'bbwelm', 'bbwelb',
-		'bbwels', 'bbwelt', 'bbwelp', 'bbwelh', 'bbwem', 'bbweb', 'bbwebs', 'bbwes', 'bbwess', 'bbweng', 'bbwej', 'bbwec', 'bbwek', 'bbwet', 'bbwep', 'bbweh',
-		'bbwi', 'bbwig', 'bbwigg', 'bbwigs', 'bbwin', 'bbwinj', 'bbwinh', 'bbwid', 'bbwil', 'bbwilg', 'bbwilm', 'bbwilb', 'bbwils', 'bbwilt', 'bbwilp', 'bbwilh',
-		'bbwim', 'bbwib', 'bbwibs', 'bbwis', 'bbwiss', 'bbwing', 'bbwij', 'bbwic', 'bbwik', 'bbwit', 'bbwip', 'bbwih', 'bbyu', 'bbyug', 'bbyugg', 'bbyugs',
-		'bbyun', 'bbyunj', 'bbyunh', 'bbyud', 'bbyul', 'bbyulg', 'bbyulm', 'bbyulb', 'bbyuls', 'bbyult', 'bbyulp', 'bbyulh', 'bbyum', 'bbyub', 'bbyubs', 'bbyus',
-		'bbyuss', 'bbyung', 'bbyuj', 'bbyuc', 'bbyuk', 'bbyut', 'bbyup', 'bbyuh', 'bbeu', 'bbeug', 'bbeugg', 'bbeugs', 'bbeun', 'bbeunj', 'bbeunh', 'bbeud',
-		'bbeul', 'bbeulg', 'bbeulm', 'bbeulb', 'bbeuls', 'bbeult', 'bbeulp', 'bbeulh', 'bbeum', 'bbeub', 'bbeubs', 'bbeus', 'bbeuss', 'bbeung', 'bbeuj', 'bbeuc',
-		'bbeuk', 'bbeut', 'bbeup', 'bbeuh', 'bbyi', 'bbyig', 'bbyigg', 'bbyigs', 'bbyin', 'bbyinj', 'bbyinh', 'bbyid', 'bbyil', 'bbyilg', 'bbyilm', 'bbyilb',
-		'bbyils', 'bbyilt', 'bbyilp', 'bbyilh', 'bbyim', 'bbyib', 'bbyibs', 'bbyis', 'bbyiss', 'bbying', 'bbyij', 'bbyic', 'bbyik', 'bbyit', 'bbyip', 'bbyih',
-		'bbi', 'bbig', 'bbigg', 'bbigs', 'bbin', 'bbinj', 'bbinh', 'bbid', 'bbil', 'bbilg', 'bbilm', 'bbilb', 'bbils', 'bbilt', 'bbilp', 'bbilh',
-		'bbim', 'bbib', 'bbibs', 'bbis', 'bbiss', 'bbing', 'bbij', 'bbic', 'bbik', 'bbit', 'bbip', 'bbih', 'sa', 'sag', 'sagg', 'sags',
-		'san', 'sanj', 'sanh', 'sad', 'sal', 'salg', 'salm', 'salb', 'sals', 'salt', 'salp', 'salh', 'sam', 'sab', 'sabs', 'sas',
-		'sass', 'sang', 'saj', 'sac', 'sak', 'sat', 'sap', 'sah', 'sae', 'saeg', 'saegg', 'saegs', 'saen', 'saenj', 'saenh', 'saed',
-		'sael', 'saelg', 'saelm', 'saelb', 'saels', 'saelt', 'saelp', 'saelh', 'saem', 'saeb', 'saebs', 'saes', 'saess', 'saeng', 'saej', 'saec',
-		'saek', 'saet', 'saep', 'saeh', 'sya', 'syag', 'syagg', 'syags', 'syan', 'syanj', 'syanh', 'syad', 'syal', 'syalg', 'syalm', 'syalb',
-		'syals', 'syalt', 'syalp', 'syalh', 'syam', 'syab', 'syabs', 'syas', 'syass', 'syang', 'syaj', 'syac', 'syak', 'syat', 'syap', 'syah',
-	],
-	'x22': [
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xa1': [
-		'dit', 'dix', 'di', 'dip', 'diex', 'die', 'diep', 'dat', 'dax', 'da', 'dap', 'duox', 'duo', 'dot', 'dox', 'do',
-		'dop', 'dex', 'de', 'dep', 'dut', 'dux', 'du', 'dup', 'durx', 'dur', 'tit', 'tix', 'ti', 'tip', 'tiex', 'tie',
-		'tiep', 'tat', 'tax', 'ta', 'tap', 'tuot', 'tuox', 'tuo', 'tuop', 'tot', 'tox', 'to', 'top', 'tex', 'te', 'tep',
-		'tut', 'tux', 'tu', 'tup', 'turx', 'tur', 'ddit', 'ddix', 'ddi', 'ddip', 'ddiex', 'ddie', 'ddiep', 'ddat', 'ddax', 'dda',
-		'ddap', 'dduox', 'dduo', 'dduop', 'ddot', 'ddox', 'ddo', 'ddop', 'ddex', 'dde', 'ddep', 'ddut', 'ddux', 'ddu', 'ddup', 'ddurx',
-		'ddur', 'ndit', 'ndix', 'ndi', 'ndip', 'ndiex', 'ndie', 'ndat', 'ndax', 'nda', 'ndap', 'ndot', 'ndox', 'ndo', 'ndop', 'ndex',
-		'nde', 'ndep', 'ndut', 'ndux', 'ndu', 'ndup', 'ndurx', 'ndur', 'hnit', 'hnix', 'hni', 'hnip', 'hniet', 'hniex', 'hnie', 'hniep',
-		'hnat', 'hnax', 'hna', 'hnap', 'hnuox', 'hnuo', 'hnot', 'hnox', 'hnop', 'hnex', 'hne', 'hnep', 'hnut', 'nit', 'nix', 'ni',
-		'nip', 'niex', 'nie', 'niep', 'nax', 'na', 'nap', 'nuox', 'nuo', 'nuop', 'not', 'nox', 'no', 'nop', 'nex', 'ne',
-		'nep', 'nut', 'nux', 'nu', 'nup', 'nurx', 'nur', 'hlit', 'hlix', 'hli', 'hlip', 'hliex', 'hlie', 'hliep', 'hlat', 'hlax',
-		'hla', 'hlap', 'hluox', 'hluo', 'hluop', 'hlox', 'hlo', 'hlop', 'hlex', 'hle', 'hlep', 'hlut', 'hlux', 'hlu', 'hlup', 'hlurx',
-		'hlur', 'hlyt', 'hlyx', 'hly', 'hlyp', 'hlyrx', 'hlyr', 'lit', 'lix', 'li', 'lip', 'liet', 'liex', 'lie', 'liep', 'lat',
-		'lax', 'la', 'lap', 'luot', 'luox', 'luo', 'luop', 'lot', 'lox', 'lo', 'lop', 'lex', 'le', 'lep', 'lut', 'lux',
-		'lu', 'lup', 'lurx', 'lur', 'lyt', 'lyx', 'ly', 'lyp', 'lyrx', 'lyr', 'git', 'gix', 'gi', 'gip', 'giet', 'giex',
-		'gie', 'giep', 'gat', 'gax', 'ga', 'gap', 'guot', 'guox', 'guo', 'guop', 'got', 'gox', 'go', 'gop', 'get', 'gex',
-		'ge', 'gep', 'gut', 'gux', 'gu', 'gup', 'gurx', 'gur', 'kit', 'kix', 'ki', 'kip', 'kiex', 'kie', 'kiep', 'kat',
-	],
-	'xd6': [
-		'hyeo', 'hyeog', 'hyeogg', 'hyeogs', 'hyeon', 'hyeonj', 'hyeonh', 'hyeod', 'hyeol', 'hyeolg', 'hyeolm', 'hyeolb', 'hyeols', 'hyeolt', 'hyeolp', 'hyeolh',
-		'hyeom', 'hyeob', 'hyeobs', 'hyeos', 'hyeoss', 'hyeong', 'hyeoj', 'hyeoc', 'hyeok', 'hyeot', 'hyeop', 'hyeoh', 'hye', 'hyeg', 'hyegg', 'hyegs',
-		'hyen', 'hyenj', 'hyenh', 'hyed', 'hyel', 'hyelg', 'hyelm', 'hyelb', 'hyels', 'hyelt', 'hyelp', 'hyelh', 'hyem', 'hyeb', 'hyebs', 'hyes',
-		'hyess', 'hyeng', 'hyej', 'hyec', 'hyek', 'hyet', 'hyep', 'hyeh', 'ho', 'hog', 'hogg', 'hogs', 'hon', 'honj', 'honh', 'hod',
-		'hol', 'holg', 'holm', 'holb', 'hols', 'holt', 'holp', 'holh', 'hom', 'hob', 'hobs', 'hos', 'hoss', 'hong', 'hoj', 'hoc',
-		'hok', 'hot', 'hop', 'hoh', 'hwa', 'hwag', 'hwagg', 'hwags', 'hwan', 'hwanj', 'hwanh', 'hwad', 'hwal', 'hwalg', 'hwalm', 'hwalb',
-		'hwals', 'hwalt', 'hwalp', 'hwalh', 'hwam', 'hwab', 'hwabs', 'hwas', 'hwass', 'hwang', 'hwaj', 'hwac', 'hwak', 'hwat', 'hwap', 'hwah',
-		'hwae', 'hwaeg', 'hwaegg', 'hwaegs', 'hwaen', 'hwaenj', 'hwaenh', 'hwaed', 'hwael', 'hwaelg', 'hwaelm', 'hwaelb', 'hwaels', 'hwaelt', 'hwaelp', 'hwaelh',
-		'hwaem', 'hwaeb', 'hwaebs', 'hwaes', 'hwaess', 'hwaeng', 'hwaej', 'hwaec', 'hwaek', 'hwaet', 'hwaep', 'hwaeh', 'hoe', 'hoeg', 'hoegg', 'hoegs',
-		'hoen', 'hoenj', 'hoenh', 'hoed', 'hoel', 'hoelg', 'hoelm', 'hoelb', 'hoels', 'hoelt', 'hoelp', 'hoelh', 'hoem', 'hoeb', 'hoebs', 'hoes',
-		'hoess', 'hoeng', 'hoej', 'hoec', 'hoek', 'hoet', 'hoep', 'hoeh', 'hyo', 'hyog', 'hyogg', 'hyogs', 'hyon', 'hyonj', 'hyonh', 'hyod',
-		'hyol', 'hyolg', 'hyolm', 'hyolb', 'hyols', 'hyolt', 'hyolp', 'hyolh', 'hyom', 'hyob', 'hyobs', 'hyos', 'hyoss', 'hyong', 'hyoj', 'hyoc',
-		'hyok', 'hyot', 'hyop', 'hyoh', 'hu', 'hug', 'hugg', 'hugs', 'hun', 'hunj', 'hunh', 'hud', 'hul', 'hulg', 'hulm', 'hulb',
-		'huls', 'hult', 'hulp', 'hulh', 'hum', 'hub', 'hubs', 'hus', 'huss', 'hung', 'huj', 'huc', 'huk', 'hut', 'hup', 'huh',
-		'hweo', 'hweog', 'hweogg', 'hweogs', 'hweon', 'hweonj', 'hweonh', 'hweod', 'hweol', 'hweolg', 'hweolm', 'hweolb', 'hweols', 'hweolt', 'hweolp', 'hweolh',
-		'hweom', 'hweob', 'hweobs', 'hweos', 'hweoss', 'hweong', 'hweoj', 'hweoc', 'hweok', 'hweot', 'hweop', 'hweoh', 'hwe', 'hweg', 'hwegg', 'hwegs',
-	],
-	'xd5': [
-		'pyuk', 'pyut', 'pyup', 'pyuh', 'peu', 'peug', 'peugg', 'peugs', 'peun', 'peunj', 'peunh', 'peud', 'peul', 'peulg', 'peulm', 'peulb',
-		'peuls', 'peult', 'peulp', 'peulh', 'peum', 'peub', 'peubs', 'peus', 'peuss', 'peung', 'peuj', 'peuc', 'peuk', 'peut', 'peup', 'peuh',
-		'pyi', 'pyig', 'pyigg', 'pyigs', 'pyin', 'pyinj', 'pyinh', 'pyid', 'pyil', 'pyilg', 'pyilm', 'pyilb', 'pyils', 'pyilt', 'pyilp', 'pyilh',
-		'pyim', 'pyib', 'pyibs', 'pyis', 'pyiss', 'pying', 'pyij', 'pyic', 'pyik', 'pyit', 'pyip', 'pyih', 'pi', 'pig', 'pigg', 'pigs',
-		'pin', 'pinj', 'pinh', 'pid', 'pil', 'pilg', 'pilm', 'pilb', 'pils', 'pilt', 'pilp', 'pilh', 'pim', 'pib', 'pibs', 'pis',
-		'piss', 'ping', 'pij', 'pic', 'pik', 'pit', 'pip', 'pih', 'ha', 'hag', 'hagg', 'hags', 'han', 'hanj', 'hanh', 'had',
-		'hal', 'halg', 'halm', 'halb', 'hals', 'halt', 'halp', 'halh', 'ham', 'hab', 'habs', 'has', 'hass', 'hang', 'haj', 'hac',
-		'hak', 'hat', 'hap', 'hah', 'hae', 'haeg', 'haegg', 'haegs', 'haen', 'haenj', 'haenh', 'haed', 'hael', 'haelg', 'haelm', 'haelb',
-		'haels', 'haelt', 'haelp', 'haelh', 'haem', 'haeb', 'haebs', 'haes', 'haess', 'haeng', 'haej', 'haec', 'haek', 'haet', 'haep', 'haeh',
-		'hya', 'hyag', 'hyagg', 'hyags', 'hyan', 'hyanj', 'hyanh', 'hyad', 'hyal', 'hyalg', 'hyalm', 'hyalb', 'hyals', 'hyalt', 'hyalp', 'hyalh',
-		'hyam', 'hyab', 'hyabs', 'hyas', 'hyass', 'hyang', 'hyaj', 'hyac', 'hyak', 'hyat', 'hyap', 'hyah', 'hyae', 'hyaeg', 'hyaegg', 'hyaegs',
-		'hyaen', 'hyaenj', 'hyaenh', 'hyaed', 'hyael', 'hyaelg', 'hyaelm', 'hyaelb', 'hyaels', 'hyaelt', 'hyaelp', 'hyaelh', 'hyaem', 'hyaeb', 'hyaebs', 'hyaes',
-		'hyaess', 'hyaeng', 'hyaej', 'hyaec', 'hyaek', 'hyaet', 'hyaep', 'hyaeh', 'heo', 'heog', 'heogg', 'heogs', 'heon', 'heonj', 'heonh', 'heod',
-		'heol', 'heolg', 'heolm', 'heolb', 'heols', 'heolt', 'heolp', 'heolh', 'heom', 'heob', 'heobs', 'heos', 'heoss', 'heong', 'heoj', 'heoc',
-		'heok', 'heot', 'heop', 'heoh', 'he', 'heg', 'hegg', 'hegs', 'hen', 'henj', 'henh', 'hed', 'hel', 'helg', 'helm', 'helb',
-		'hels', 'helt', 'help', 'helh', 'hem', 'heb', 'hebs', 'hes', 'hess', 'heng', 'hej', 'hec', 'hek', 'het', 'hep', 'heh',
-	],
-	'xd2': [
-		'toels', 'toelt', 'toelp', 'toelh', 'toem', 'toeb', 'toebs', 'toes', 'toess', 'toeng', 'toej', 'toec', 'toek', 'toet', 'toep', 'toeh',
-		'tyo', 'tyog', 'tyogg', 'tyogs', 'tyon', 'tyonj', 'tyonh', 'tyod', 'tyol', 'tyolg', 'tyolm', 'tyolb', 'tyols', 'tyolt', 'tyolp', 'tyolh',
-		'tyom', 'tyob', 'tyobs', 'tyos', 'tyoss', 'tyong', 'tyoj', 'tyoc', 'tyok', 'tyot', 'tyop', 'tyoh', 'tu', 'tug', 'tugg', 'tugs',
-		'tun', 'tunj', 'tunh', 'tud', 'tul', 'tulg', 'tulm', 'tulb', 'tuls', 'tult', 'tulp', 'tulh', 'tum', 'tub', 'tubs', 'tus',
-		'tuss', 'tung', 'tuj', 'tuc', 'tuk', 'tut', 'tup', 'tuh', 'tweo', 'tweog', 'tweogg', 'tweogs', 'tweon', 'tweonj', 'tweonh', 'tweod',
-		'tweol', 'tweolg', 'tweolm', 'tweolb', 'tweols', 'tweolt', 'tweolp', 'tweolh', 'tweom', 'tweob', 'tweobs', 'tweos', 'tweoss', 'tweong', 'tweoj', 'tweoc',
-		'tweok', 'tweot', 'tweop', 'tweoh', 'twe', 'tweg', 'twegg', 'twegs', 'twen', 'twenj', 'twenh', 'twed', 'twel', 'twelg', 'twelm', 'twelb',
-		'twels', 'twelt', 'twelp', 'twelh', 'twem', 'tweb', 'twebs', 'twes', 'twess', 'tweng', 'twej', 'twec', 'twek', 'twet', 'twep', 'tweh',
-		'twi', 'twig', 'twigg', 'twigs', 'twin', 'twinj', 'twinh', 'twid', 'twil', 'twilg', 'twilm', 'twilb', 'twils', 'twilt', 'twilp', 'twilh',
-		'twim', 'twib', 'twibs', 'twis', 'twiss', 'twing', 'twij', 'twic', 'twik', 'twit', 'twip', 'twih', 'tyu', 'tyug', 'tyugg', 'tyugs',
-		'tyun', 'tyunj', 'tyunh', 'tyud', 'tyul', 'tyulg', 'tyulm', 'tyulb', 'tyuls', 'tyult', 'tyulp', 'tyulh', 'tyum', 'tyub', 'tyubs', 'tyus',
-		'tyuss', 'tyung', 'tyuj', 'tyuc', 'tyuk', 'tyut', 'tyup', 'tyuh', 'teu', 'teug', 'teugg', 'teugs', 'teun', 'teunj', 'teunh', 'teud',
-		'teul', 'teulg', 'teulm', 'teulb', 'teuls', 'teult', 'teulp', 'teulh', 'teum', 'teub', 'teubs', 'teus', 'teuss', 'teung', 'teuj', 'teuc',
-		'teuk', 'teut', 'teup', 'teuh', 'tyi', 'tyig', 'tyigg', 'tyigs', 'tyin', 'tyinj', 'tyinh', 'tyid', 'tyil', 'tyilg', 'tyilm', 'tyilb',
-		'tyils', 'tyilt', 'tyilp', 'tyilh', 'tyim', 'tyib', 'tyibs', 'tyis', 'tyiss', 'tying', 'tyij', 'tyic', 'tyik', 'tyit', 'tyip', 'tyih',
-		'ti', 'tig', 'tigg', 'tigs', 'tin', 'tinj', 'tinh', 'tid', 'til', 'tilg', 'tilm', 'tilb', 'tils', 'tilt', 'tilp', 'tilh',
-	],
-	'xcd': [
-		'cyess', 'cyeng', 'cyej', 'cyec', 'cyek', 'cyet', 'cyep', 'cyeh', 'co', 'cog', 'cogg', 'cogs', 'con', 'conj', 'conh', 'cod',
-		'col', 'colg', 'colm', 'colb', 'cols', 'colt', 'colp', 'colh', 'com', 'cob', 'cobs', 'cos', 'coss', 'cong', 'coj', 'coc',
-		'cok', 'cot', 'cop', 'coh', 'cwa', 'cwag', 'cwagg', 'cwags', 'cwan', 'cwanj', 'cwanh', 'cwad', 'cwal', 'cwalg', 'cwalm', 'cwalb',
-		'cwals', 'cwalt', 'cwalp', 'cwalh', 'cwam', 'cwab', 'cwabs', 'cwas', 'cwass', 'cwang', 'cwaj', 'cwac', 'cwak', 'cwat', 'cwap', 'cwah',
-		'cwae', 'cwaeg', 'cwaegg', 'cwaegs', 'cwaen', 'cwaenj', 'cwaenh', 'cwaed', 'cwael', 'cwaelg', 'cwaelm', 'cwaelb', 'cwaels', 'cwaelt', 'cwaelp', 'cwaelh',
-		'cwaem', 'cwaeb', 'cwaebs', 'cwaes', 'cwaess', 'cwaeng', 'cwaej', 'cwaec', 'cwaek', 'cwaet', 'cwaep', 'cwaeh', 'coe', 'coeg', 'coegg', 'coegs',
-		'coen', 'coenj', 'coenh', 'coed', 'coel', 'coelg', 'coelm', 'coelb', 'coels', 'coelt', 'coelp', 'coelh', 'coem', 'coeb', 'coebs', 'coes',
-		'coess', 'coeng', 'coej', 'coec', 'coek', 'coet', 'coep', 'coeh', 'cyo', 'cyog', 'cyogg', 'cyogs', 'cyon', 'cyonj', 'cyonh', 'cyod',
-		'cyol', 'cyolg', 'cyolm', 'cyolb', 'cyols', 'cyolt', 'cyolp', 'cyolh', 'cyom', 'cyob', 'cyobs', 'cyos', 'cyoss', 'cyong', 'cyoj', 'cyoc',
-		'cyok', 'cyot', 'cyop', 'cyoh', 'cu', 'cug', 'cugg', 'cugs', 'cun', 'cunj', 'cunh', 'cud', 'cul', 'culg', 'culm', 'culb',
-		'culs', 'cult', 'culp', 'culh', 'cum', 'cub', 'cubs', 'cus', 'cuss', 'cung', 'cuj', 'cuc', 'cuk', 'cut', 'cup', 'cuh',
-		'cweo', 'cweog', 'cweogg', 'cweogs', 'cweon', 'cweonj', 'cweonh', 'cweod', 'cweol', 'cweolg', 'cweolm', 'cweolb', 'cweols', 'cweolt', 'cweolp', 'cweolh',
-		'cweom', 'cweob', 'cweobs', 'cweos', 'cweoss', 'cweong', 'cweoj', 'cweoc', 'cweok', 'cweot', 'cweop', 'cweoh', 'cwe', 'cweg', 'cwegg', 'cwegs',
-		'cwen', 'cwenj', 'cwenh', 'cwed', 'cwel', 'cwelg', 'cwelm', 'cwelb', 'cwels', 'cwelt', 'cwelp', 'cwelh', 'cwem', 'cweb', 'cwebs', 'cwes',
-		'cwess', 'cweng', 'cwej', 'cwec', 'cwek', 'cwet', 'cwep', 'cweh', 'cwi', 'cwig', 'cwigg', 'cwigs', 'cwin', 'cwinj', 'cwinh', 'cwid',
-		'cwil', 'cwilg', 'cwilm', 'cwilb', 'cwils', 'cwilt', 'cwilp', 'cwilh', 'cwim', 'cwib', 'cwibs', 'cwis', 'cwiss', 'cwing', 'cwij', 'cwic',
-	],
-	'x30': [
-		' ', ', ', '. ', '"', '[JIS]', '"', '/', '0', '<', '> ', '<<', '>> ', '[', '] ', '\\{', '\\} ',
-		'[(', ')] ', '@', 'X ', '[', '] ', '[[', ']] ', '((', ')) ', '[[', ']] ', '~ ', '``', '\'\'', ',,',
-		'@', '1', '2', '3', '4', '5', '6', '7', '8', '9', '', '', '', '', '', '',
-		'~', '+', '+', '+', '+', '', '@', ' // ', '+10+', '+20+', '+30+', '[?]', '[?]', '[?]', '', '',
-		'[?]', 'a', 'a', 'i', 'i', 'u', 'u', 'e', 'e', 'o', 'o', 'ka', 'ga', 'ki', 'gi', 'ku',
-		'gu', 'ke', 'ge', 'ko', 'go', 'sa', 'za', 'si', 'zi', 'su', 'zu', 'se', 'ze', 'so', 'zo', 'ta',
-		'da', 'ti', 'di', 'tu', 'tu', 'du', 'te', 'de', 'to', 'do', 'na', 'ni', 'nu', 'ne', 'no', 'ha',
-		'ba', 'pa', 'hi', 'bi', 'pi', 'hu', 'bu', 'pu', 'he', 'be', 'pe', 'ho', 'bo', 'po', 'ma', 'mi',
-		'mu', 'me', 'mo', 'ya', 'ya', 'yu', 'yu', 'yo', 'yo', 'ra', 'ri', 'ru', 're', 'ro', 'wa', 'wa',
-		'wi', 'we', 'wo', 'n', 'vu', '[?]', '[?]', '[?]', '[?]', '', '', '', '', '"', '"', '[?]',
-		'[?]', 'a', 'a', 'i', 'i', 'u', 'u', 'e', 'e', 'o', 'o', 'ka', 'ga', 'ki', 'gi', 'ku',
-		'gu', 'ke', 'ge', 'ko', 'go', 'sa', 'za', 'si', 'zi', 'su', 'zu', 'se', 'ze', 'so', 'zo', 'ta',
-		'da', 'ti', 'di', 'tu', 'tu', 'du', 'te', 'de', 'to', 'do', 'na', 'ni', 'nu', 'ne', 'no', 'ha',
-		'ba', 'pa', 'hi', 'bi', 'pi', 'hu', 'bu', 'pu', 'he', 'be', 'pe', 'ho', 'bo', 'po', 'ma', 'mi',
-		'mu', 'me', 'mo', 'ya', 'ya', 'yu', 'yu', 'yo', 'yo', 'ra', 'ri', 'ru', 're', 'ro', 'wa', 'wa',
-		'wi', 'we', 'wo', 'n', 'vu', 'ka', 'ke', 'va', 'vi', 've', 'vo', '', '', '"', '"',
-	],
-	'xca': [
-		'jjael', 'jjaelg', 'jjaelm', 'jjaelb', 'jjaels', 'jjaelt', 'jjaelp', 'jjaelh', 'jjaem', 'jjaeb', 'jjaebs', 'jjaes', 'jjaess', 'jjaeng', 'jjaej', 'jjaec',
-		'jjaek', 'jjaet', 'jjaep', 'jjaeh', 'jjya', 'jjyag', 'jjyagg', 'jjyags', 'jjyan', 'jjyanj', 'jjyanh', 'jjyad', 'jjyal', 'jjyalg', 'jjyalm', 'jjyalb',
-		'jjyals', 'jjyalt', 'jjyalp', 'jjyalh', 'jjyam', 'jjyab', 'jjyabs', 'jjyas', 'jjyass', 'jjyang', 'jjyaj', 'jjyac', 'jjyak', 'jjyat', 'jjyap', 'jjyah',
-		'jjyae', 'jjyaeg', 'jjyaegg', 'jjyaegs', 'jjyaen', 'jjyaenj', 'jjyaenh', 'jjyaed', 'jjyael', 'jjyaelg', 'jjyaelm', 'jjyaelb', 'jjyaels', 'jjyaelt', 'jjyaelp', 'jjyaelh',
-		'jjyaem', 'jjyaeb', 'jjyaebs', 'jjyaes', 'jjyaess', 'jjyaeng', 'jjyaej', 'jjyaec', 'jjyaek', 'jjyaet', 'jjyaep', 'jjyaeh', 'jjeo', 'jjeog', 'jjeogg', 'jjeogs',
-		'jjeon', 'jjeonj', 'jjeonh', 'jjeod', 'jjeol', 'jjeolg', 'jjeolm', 'jjeolb', 'jjeols', 'jjeolt', 'jjeolp', 'jjeolh', 'jjeom', 'jjeob', 'jjeobs', 'jjeos',
-		'jjeoss', 'jjeong', 'jjeoj', 'jjeoc', 'jjeok', 'jjeot', 'jjeop', 'jjeoh', 'jje', 'jjeg', 'jjegg', 'jjegs', 'jjen', 'jjenj', 'jjenh', 'jjed',
-		'jjel', 'jjelg', 'jjelm', 'jjelb', 'jjels', 'jjelt', 'jjelp', 'jjelh', 'jjem', 'jjeb', 'jjebs', 'jjes', 'jjess', 'jjeng', 'jjej', 'jjec',
-		'jjek', 'jjet', 'jjep', 'jjeh', 'jjyeo', 'jjyeog', 'jjyeogg', 'jjyeogs', 'jjyeon', 'jjyeonj', 'jjyeonh', 'jjyeod', 'jjyeol', 'jjyeolg', 'jjyeolm', 'jjyeolb',
-		'jjyeols', 'jjyeolt', 'jjyeolp', 'jjyeolh', 'jjyeom', 'jjyeob', 'jjyeobs', 'jjyeos', 'jjyeoss', 'jjyeong', 'jjyeoj', 'jjyeoc', 'jjyeok', 'jjyeot', 'jjyeop', 'jjyeoh',
-		'jjye', 'jjyeg', 'jjyegg', 'jjyegs', 'jjyen', 'jjyenj', 'jjyenh', 'jjyed', 'jjyel', 'jjyelg', 'jjyelm', 'jjyelb', 'jjyels', 'jjyelt', 'jjyelp', 'jjyelh',
-		'jjyem', 'jjyeb', 'jjyebs', 'jjyes', 'jjyess', 'jjyeng', 'jjyej', 'jjyec', 'jjyek', 'jjyet', 'jjyep', 'jjyeh', 'jjo', 'jjog', 'jjogg', 'jjogs',
-		'jjon', 'jjonj', 'jjonh', 'jjod', 'jjol', 'jjolg', 'jjolm', 'jjolb', 'jjols', 'jjolt', 'jjolp', 'jjolh', 'jjom', 'jjob', 'jjobs', 'jjos',
-		'jjoss', 'jjong', 'jjoj', 'jjoc', 'jjok', 'jjot', 'jjop', 'jjoh', 'jjwa', 'jjwag', 'jjwagg', 'jjwags', 'jjwan', 'jjwanj', 'jjwanh', 'jjwad',
-		'jjwal', 'jjwalg', 'jjwalm', 'jjwalb', 'jjwals', 'jjwalt', 'jjwalp', 'jjwalh', 'jjwam', 'jjwab', 'jjwabs', 'jjwas', 'jjwass', 'jjwang', 'jjwaj', 'jjwac',
-		'jjwak', 'jjwat', 'jjwap', 'jjwah', 'jjwae', 'jjwaeg', 'jjwaegg', 'jjwaegs', 'jjwaen', 'jjwaenj', 'jjwaenh', 'jjwaed', 'jjwael', 'jjwaelg', 'jjwaelm', 'jjwaelb',
-	],
-	'xa4': [
-		'qiet', 'qiex', 'qie', 'qiep', 'quot', 'quox', 'quo', 'quop', 'qot', 'qox', 'qo', 'qop', 'qut', 'qux', 'qu', 'qup',
-		'qurx', 'qur', 'qyt', 'qyx', 'qy', 'qyp', 'qyrx', 'qyr', 'jjit', 'jjix', 'jji', 'jjip', 'jjiet', 'jjiex', 'jjie', 'jjiep',
-		'jjuox', 'jjuo', 'jjuop', 'jjot', 'jjox', 'jjo', 'jjop', 'jjut', 'jjux', 'jju', 'jjup', 'jjurx', 'jjur', 'jjyt', 'jjyx', 'jjy',
-		'jjyp', 'njit', 'njix', 'nji', 'njip', 'njiet', 'njiex', 'njie', 'njiep', 'njuox', 'njuo', 'njot', 'njox', 'njo', 'njop', 'njux',
-		'nju', 'njup', 'njurx', 'njur', 'njyt', 'njyx', 'njy', 'njyp', 'njyrx', 'njyr', 'nyit', 'nyix', 'nyi', 'nyip', 'nyiet', 'nyiex',
-		'nyie', 'nyiep', 'nyuox', 'nyuo', 'nyuop', 'nyot', 'nyox', 'nyo', 'nyop', 'nyut', 'nyux', 'nyu', 'nyup', 'xit', 'xix', 'xi',
-		'xip', 'xiet', 'xiex', 'xie', 'xiep', 'xuox', 'xuo', 'xot', 'xox', 'xo', 'xop', 'xyt', 'xyx', 'xy', 'xyp', 'xyrx',
-		'xyr', 'yit', 'yix', 'yi', 'yip', 'yiet', 'yiex', 'yie', 'yiep', 'yuot', 'yuox', 'yuo', 'yuop', 'yot', 'yox', 'yo',
-		'yop', 'yut', 'yux', 'yu', 'yup', 'yurx', 'yur', 'yyt', 'yyx', 'yy', 'yyp', 'yyrx', 'yyr', '[?]', '[?]', '[?]',
-		'Qot', 'Li', 'Kit', 'Nyip', 'Cyp', 'Ssi', 'Ggop', 'Gep', 'Mi', 'Hxit', 'Lyr', 'Bbut', 'Mop', 'Yo', 'Put', 'Hxuo',
-		'Tat', 'Ga', '[?]', '[?]', 'Ddur', 'Bur', 'Gguo', 'Nyop', 'Tu', 'Op', 'Jjut', 'Zot', 'Pyt', 'Hmo', 'Yit', 'Vur',
-		'Shy', 'Vep', 'Za', 'Jo', '[?]', 'Jjy', 'Got', 'Jjie', 'Wo', 'Du', 'Shur', 'Lie', 'Cy', 'Cuop', 'Cip', 'Hxop',
-		'Shat', '[?]', 'Shop', 'Che', 'Zziet', '[?]', 'Ke', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-		'[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
-	],
-	'xfc': [
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-		'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-	],
-        'x1d4':[
-                'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O',
-                'P','Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e',
-                'f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u',
-                'v','w','x','y','z','A','B','C','D','E','F','G','H','I','J','K',
-                'L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','a',
-                'b','c','d','e','f','g','','i','j','k','l','m','n','o','p','q',
-                'r','s','t','u','v','w','x','y','z','A','B','C','D','E','F','G',
-                'H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W',
-                'X','Y','Z','a','b','c','d','e','f','g','h','i','j','k','l','m',
-                'n','o','p','q','r','s','t','u','v','w','x','y','z','A','','C',
-                'D','','','G','','','J','K','','','N','O','P','Q','','S',
-                'T','U','V','W','X','Y','Z','a','b','c','d','','f','','h','i',
-                'j','k','l','m','n','','p','q','r','s','t','u','v','w','x','y',
-                'z','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O',
-                'P','Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e',
-                'f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v'
-        ],
-       'x1d5':[
-                'w','x','y','z','A','B','','D','E','F','G','','','J','K',
-                'L','M','N','O','P','Q','','S','T','U','V','W','X','Y','','a',
-                'b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q',
-                'r','s','t','u','v','w','x','y','z','A','B','','D','E','F','G',
-                '','I','J','K','L','M','','O','','','','S','T','U','V','W',
-                'X','Y','','a','b','c','d','e','f','g','h','i','j','k','l','m',
-                'n','o','p','q','r','s','t','u','v','w','x','y','z','A','B','C',
-                'D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S',
-                'T','U','V','W','X','Y','Z','a','b','c','d','e','f','g','h','i',
-                'j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y',
-                'z','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O',
-                'P','Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e',
-                'f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u',
-                'v','w','x','y','z','A','B','C','D','E','F','G','H','I','J','K',
-                'L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','a',
-                'b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r'
-       ],
-      'x1d6':[
-                's','t','u','v','w','x','y','z','A','B','C','D','E','F','G',
-                'H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W',
-                'X','Y','Z','a','b','c','d','e','f','g','h','i','j','k','l','m',
-                'n','o','p','q','r','s','t','u','v','w','x','y','z','A','B','C',
-                'D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S',
-                'T','U','V','W','X','Y','Z','a','b','c','d','e','f','g','h','i',
-                'j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y',
-                'z','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O',
-                'P','Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e',
-                'f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u',
-                'v','w','x','y','z','i','j','','','Alpha','Beta','Gamma','Delta','Epsilon','Zeta','Eta',
-                'Theta','Iota','Kappa','Lamda','Mu','Nu','Xi','Omicron','Pi','Rho','Theta','Sigma','Tau','Upsilon','Phi','Chi',
-                'Psi','Omega','nabla','alpha','beta','gamma','delta','epsilon','zeta','eta','theta','iota','kappa','lamda','mu','nu',
-                'xi','omicron','pi','rho','sigma','sigma','tai','upsilon','phi','chi','psi','omega','','','','',
-                   '','','','','','','','','','','','','','','','',
-                   '','','','','','','','','','','','','','','','',''
-        ],
-        'x1d7':[
-                '','','','','','','','','','','','','','','',
-                '','','','','','','','','','','','','','','','',
-                '','','','','','','','','','','','','','','','',
-                '','','','','','','','','','','','','','','','',
-                '','','','','','','','','','','','','','','','',
-                '','','','','','','','','','','','','','','','',
-                '','','','','','','','','','','','','','','','',
-                '','','','','','','','','','','','','','','','',
-                '','','','','','','','','','','','','','','','',
-                '','','','','','','','','','','','','','','','',
-                '','','','','','','','','','','','','','','','',
-                '','','','','','','','','','','','','','','','',
-                '','','','','','','','','','','','','','','','0',
-                '1','2','3','4','5','6','7','8','9','0','1','2','3','4','5','6',
-                '7','8','9','0','1','2','3','4','5','6','7','8','9','0','1','2',
-                '3','4','5','6','7','8','9','0','1','2','3','4','5','6','7','8','9'
-        ]
-    }
+    'x20': [
+        ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '', '', '', '',
+        '-', '-', '-', '-', '--', '--', '||', '_', "'", "'", ',', "'", '"', '"', ',,', '"',
+        '+', '++', '*', '*>', '.', '..', '...', '.', '\n', '\n\n', '', '', '', '', '', ' ',
+        '%0', '%00', "'", "''", "'''", '`', '``', '```', '^', '<', '>', '*', '!!', '!?', '-', '_',
+        '-', '^', '***', '--', '/', '-[', ']-', '[?]', '?!', '!?', '7', 'PP', '(]', '[)', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '', '', '', '', '', '',
+        '0', '', '', '', '4', '5', '6', '7', '8', '9', '+', '-', '=', '(', ')', 'n',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '-', '=', '(', ')', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        'ECU', 'CL', 'Cr', 'FF', 'L', 'mil', 'N', 'Pts', 'Rs', 'W', 'NS', 'D', 'EU', 'K', 'T', 'Dr',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'x25': [
+        '-', '-', '|', '|', '-', '-', '|', '|', '-', '-', '|', '|', '+', '+', '+', '+',
+        '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+',
+        '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+',
+        '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+',
+        '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '-', '-', '|', '|',
+        '-', '|', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+',
+        '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+',
+        '+', '/', '\\', 'X', '-', '|', '-', '|', '-', '|', '-', '|', '-', '|', '-', '|',
+        '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#',
+        '#', '#', '#', '#', '-', '|', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#', '#',
+        '#', '#', '^', '^', '^', '^', '>', '>', '>', '>', '>', '>', 'V', 'V', 'V', 'V',
+        '<', '<', '<', '<', '<', '<', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*',
+        '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*',
+        '*', '*', '*', '*', '*', '*', '*', '#', '#', '#', '#', '#', '^', '^', '^', 'O',
+        '#', '#', '#', '#', '#', '#', '#', '#', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'x1e': [
+        'A', 'a', 'B', 'b', 'B', 'b', 'B', 'b', 'C', 'c', 'D', 'd', 'D', 'd', 'D', 'd',
+        'D', 'd', 'D', 'd', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'F', 'f',
+        'G', 'g', 'H', 'h', 'H', 'h', 'H', 'h', 'H', 'h', 'H', 'h', 'I', 'i', 'I', 'i',
+        'K', 'k', 'K', 'k', 'K', 'k', 'L', 'l', 'L', 'l', 'L', 'l', 'L', 'l', 'M', 'm',
+        'M', 'm', 'M', 'm', 'N', 'n', 'N', 'n', 'N', 'n', 'N', 'n', 'O', 'o', 'O', 'o',
+        'O', 'o', 'O', 'o', 'P', 'p', 'P', 'p', 'R', 'r', 'R', 'r', 'R', 'r', 'R', 'r',
+        'S', 's', 'S', 's', 'S', 's', 'S', 's', 'S', 's', 'T', 't', 'T', 't', 'T', 't',
+        'T', 't', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'V', 'v', 'V', 'v',
+        'W', 'w', 'W', 'w', 'W', 'w', 'W', 'w', 'W', 'w', 'X', 'x', 'X', 'x', 'Y', 'y',
+        'Z', 'z', 'Z', 'z', 'Z', 'z', 'h', 't', 'w', 'y', 'a', 'S', '[?]', '[?]', '[?]', '[?]',
+        'A', 'a', 'A', 'a', 'A', 'a', 'A', 'a', 'A', 'a', 'A', 'a', 'A', 'a', 'A', 'a',
+        'A', 'a', 'A', 'a', 'A', 'a', 'A', 'a', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e',
+        'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'I', 'i', 'I', 'i', 'O', 'o', 'O', 'o',
+        'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o',
+        'O', 'o', 'O', 'o', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u',
+        'U', 'u', 'Y', 'y', 'Y', 'y', 'Y', 'y', 'Y', 'y', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xae': [
+        'geul', 'geulg', 'geulm', 'geulb', 'geuls', 'geult', 'geulp', 'geulh', 'geum', 'geub', 'geubs', 'geus', 'geuss', 'geung', 'geuj', 'geuc',
+        'geuk', 'geut', 'geup', 'geuh', 'gyi', 'gyig', 'gyigg', 'gyigs', 'gyin', 'gyinj', 'gyinh', 'gyid', 'gyil', 'gyilg', 'gyilm', 'gyilb',
+        'gyils', 'gyilt', 'gyilp', 'gyilh', 'gyim', 'gyib', 'gyibs', 'gyis', 'gyiss', 'gying', 'gyij', 'gyic', 'gyik', 'gyit', 'gyip', 'gyih',
+        'gi', 'gig', 'gigg', 'gigs', 'gin', 'ginj', 'ginh', 'gid', 'gil', 'gilg', 'gilm', 'gilb', 'gils', 'gilt', 'gilp', 'gilh',
+        'gim', 'gib', 'gibs', 'gis', 'giss', 'ging', 'gij', 'gic', 'gik', 'git', 'gip', 'gih', 'gga', 'ggag', 'ggagg', 'ggags',
+        'ggan', 'gganj', 'gganh', 'ggad', 'ggal', 'ggalg', 'ggalm', 'ggalb', 'ggals', 'ggalt', 'ggalp', 'ggalh', 'ggam', 'ggab', 'ggabs', 'ggas',
+        'ggass', 'ggang', 'ggaj', 'ggac', 'ggak', 'ggat', 'ggap', 'ggah', 'ggae', 'ggaeg', 'ggaegg', 'ggaegs', 'ggaen', 'ggaenj', 'ggaenh', 'ggaed',
+        'ggael', 'ggaelg', 'ggaelm', 'ggaelb', 'ggaels', 'ggaelt', 'ggaelp', 'ggaelh', 'ggaem', 'ggaeb', 'ggaebs', 'ggaes', 'ggaess', 'ggaeng', 'ggaej', 'ggaec',
+        'ggaek', 'ggaet', 'ggaep', 'ggaeh', 'ggya', 'ggyag', 'ggyagg', 'ggyags', 'ggyan', 'ggyanj', 'ggyanh', 'ggyad', 'ggyal', 'ggyalg', 'ggyalm', 'ggyalb',
+        'ggyals', 'ggyalt', 'ggyalp', 'ggyalh', 'ggyam', 'ggyab', 'ggyabs', 'ggyas', 'ggyass', 'ggyang', 'ggyaj', 'ggyac', 'ggyak', 'ggyat', 'ggyap', 'ggyah',
+        'ggyae', 'ggyaeg', 'ggyaegg', 'ggyaegs', 'ggyaen', 'ggyaenj', 'ggyaenh', 'ggyaed', 'ggyael', 'ggyaelg', 'ggyaelm', 'ggyaelb', 'ggyaels', 'ggyaelt', 'ggyaelp', 'ggyaelh',
+        'ggyaem', 'ggyaeb', 'ggyaebs', 'ggyaes', 'ggyaess', 'ggyaeng', 'ggyaej', 'ggyaec', 'ggyaek', 'ggyaet', 'ggyaep', 'ggyaeh', 'ggeo', 'ggeog', 'ggeogg', 'ggeogs',
+        'ggeon', 'ggeonj', 'ggeonh', 'ggeod', 'ggeol', 'ggeolg', 'ggeolm', 'ggeolb', 'ggeols', 'ggeolt', 'ggeolp', 'ggeolh', 'ggeom', 'ggeob', 'ggeobs', 'ggeos',
+        'ggeoss', 'ggeong', 'ggeoj', 'ggeoc', 'ggeok', 'ggeot', 'ggeop', 'ggeoh', 'gge', 'ggeg', 'ggegg', 'ggegs', 'ggen', 'ggenj', 'ggenh', 'gged',
+        'ggel', 'ggelg', 'ggelm', 'ggelb', 'ggels', 'ggelt', 'ggelp', 'ggelh', 'ggem', 'ggeb', 'ggebs', 'gges', 'ggess', 'ggeng', 'ggej', 'ggec',
+        'ggek', 'gget', 'ggep', 'ggeh', 'ggyeo', 'ggyeog', 'ggyeogg', 'ggyeogs', 'ggyeon', 'ggyeonj', 'ggyeonh', 'ggyeod', 'ggyeol', 'ggyeolg', 'ggyeolm', 'ggyeolb',
+    ],
+    'xa2': [
+        'kax', 'ka', 'kap', 'kuox', 'kuo', 'kuop', 'kot', 'kox', 'ko', 'kop', 'ket', 'kex', 'ke', 'kep', 'kut', 'kux',
+        'ku', 'kup', 'kurx', 'kur', 'ggit', 'ggix', 'ggi', 'ggiex', 'ggie', 'ggiep', 'ggat', 'ggax', 'gga', 'ggap', 'gguot', 'gguox',
+        'gguo', 'gguop', 'ggot', 'ggox', 'ggo', 'ggop', 'gget', 'ggex', 'gge', 'ggep', 'ggut', 'ggux', 'ggu', 'ggup', 'ggurx', 'ggur',
+        'mgiex', 'mgie', 'mgat', 'mgax', 'mga', 'mgap', 'mguox', 'mguo', 'mguop', 'mgot', 'mgox', 'mgo', 'mgop', 'mgex', 'mge', 'mgep',
+        'mgut', 'mgux', 'mgu', 'mgup', 'mgurx', 'mgur', 'hxit', 'hxix', 'hxi', 'hxip', 'hxiet', 'hxiex', 'hxie', 'hxiep', 'hxat', 'hxax',
+        'hxa', 'hxap', 'hxuot', 'hxuox', 'hxuo', 'hxuop', 'hxot', 'hxox', 'hxo', 'hxop', 'hxex', 'hxe', 'hxep', 'ngiex', 'ngie', 'ngiep',
+        'ngat', 'ngax', 'nga', 'ngap', 'nguot', 'nguox', 'nguo', 'ngot', 'ngox', 'ngo', 'ngop', 'ngex', 'nge', 'ngep', 'hit', 'hiex',
+        'hie', 'hat', 'hax', 'ha', 'hap', 'huot', 'huox', 'huo', 'huop', 'hot', 'hox', 'ho', 'hop', 'hex', 'he', 'hep',
+        'wat', 'wax', 'wa', 'wap', 'wuox', 'wuo', 'wuop', 'wox', 'wo', 'wop', 'wex', 'we', 'wep', 'zit', 'zix', 'zi',
+        'zip', 'ziex', 'zie', 'ziep', 'zat', 'zax', 'za', 'zap', 'zuox', 'zuo', 'zuop', 'zot', 'zox', 'zo', 'zop', 'zex',
+        'ze', 'zep', 'zut', 'zux', 'zu', 'zup', 'zurx', 'zur', 'zyt', 'zyx', 'zy', 'zyp', 'zyrx', 'zyr', 'cit', 'cix',
+        'ci', 'cip', 'ciet', 'ciex', 'cie', 'ciep', 'cat', 'cax', 'ca', 'cap', 'cuox', 'cuo', 'cuop', 'cot', 'cox', 'co',
+        'cop', 'cex', 'ce', 'cep', 'cut', 'cux', 'cu', 'cup', 'curx', 'cur', 'cyt', 'cyx', 'cy', 'cyp', 'cyrx', 'cyr',
+        'zzit', 'zzix', 'zzi', 'zzip', 'zziet', 'zziex', 'zzie', 'zziep', 'zzat', 'zzax', 'zza', 'zzap', 'zzox', 'zzo', 'zzop', 'zzex',
+        'zze', 'zzep', 'zzux', 'zzu', 'zzup', 'zzurx', 'zzur', 'zzyt', 'zzyx', 'zzy', 'zzyp', 'zzyrx', 'zzyr', 'nzit', 'nzix', 'nzi',
+        'nzip', 'nziex', 'nzie', 'nziep', 'nzat', 'nzax', 'nza', 'nzap', 'nzuox', 'nzuo', 'nzox', 'nzop', 'nzex', 'nze', 'nzux', 'nzu',
+    ],
+    'xc2': [
+        'syon', 'syonj', 'syonh', 'syod', 'syol', 'syolg', 'syolm', 'syolb', 'syols', 'syolt', 'syolp', 'syolh', 'syom', 'syob', 'syobs', 'syos',
+        'syoss', 'syong', 'syoj', 'syoc', 'syok', 'syot', 'syop', 'syoh', 'su', 'sug', 'sugg', 'sugs', 'sun', 'sunj', 'sunh', 'sud',
+        'sul', 'sulg', 'sulm', 'sulb', 'suls', 'sult', 'sulp', 'sulh', 'sum', 'sub', 'subs', 'sus', 'suss', 'sung', 'suj', 'suc',
+        'suk', 'sut', 'sup', 'suh', 'sweo', 'sweog', 'sweogg', 'sweogs', 'sweon', 'sweonj', 'sweonh', 'sweod', 'sweol', 'sweolg', 'sweolm', 'sweolb',
+        'sweols', 'sweolt', 'sweolp', 'sweolh', 'sweom', 'sweob', 'sweobs', 'sweos', 'sweoss', 'sweong', 'sweoj', 'sweoc', 'sweok', 'sweot', 'sweop', 'sweoh',
+        'swe', 'sweg', 'swegg', 'swegs', 'swen', 'swenj', 'swenh', 'swed', 'swel', 'swelg', 'swelm', 'swelb', 'swels', 'swelt', 'swelp', 'swelh',
+        'swem', 'sweb', 'swebs', 'swes', 'swess', 'sweng', 'swej', 'swec', 'swek', 'swet', 'swep', 'sweh', 'swi', 'swig', 'swigg', 'swigs',
+        'swin', 'swinj', 'swinh', 'swid', 'swil', 'swilg', 'swilm', 'swilb', 'swils', 'swilt', 'swilp', 'swilh', 'swim', 'swib', 'swibs', 'swis',
+        'swiss', 'swing', 'swij', 'swic', 'swik', 'swit', 'swip', 'swih', 'syu', 'syug', 'syugg', 'syugs', 'syun', 'syunj', 'syunh', 'syud',
+        'syul', 'syulg', 'syulm', 'syulb', 'syuls', 'syult', 'syulp', 'syulh', 'syum', 'syub', 'syubs', 'syus', 'syuss', 'syung', 'syuj', 'syuc',
+        'syuk', 'syut', 'syup', 'syuh', 'seu', 'seug', 'seugg', 'seugs', 'seun', 'seunj', 'seunh', 'seud', 'seul', 'seulg', 'seulm', 'seulb',
+        'seuls', 'seult', 'seulp', 'seulh', 'seum', 'seub', 'seubs', 'seus', 'seuss', 'seung', 'seuj', 'seuc', 'seuk', 'seut', 'seup', 'seuh',
+        'syi', 'syig', 'syigg', 'syigs', 'syin', 'syinj', 'syinh', 'syid', 'syil', 'syilg', 'syilm', 'syilb', 'syils', 'syilt', 'syilp', 'syilh',
+        'syim', 'syib', 'syibs', 'syis', 'syiss', 'sying', 'syij', 'syic', 'syik', 'syit', 'syip', 'syih', 'si', 'sig', 'sigg', 'sigs',
+        'sin', 'sinj', 'sinh', 'sid', 'sil', 'silg', 'silm', 'silb', 'sils', 'silt', 'silp', 'silh', 'sim', 'sib', 'sibs', 'sis',
+        'siss', 'sing', 'sij', 'sic', 'sik', 'sit', 'sip', 'sih', 'ssa', 'ssag', 'ssagg', 'ssags', 'ssan', 'ssanj', 'ssanh', 'ssad',
+    ],
+    'x03': [
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', "'", ',', '[?]', '[?]', '[?]', '[?]', '', '[?]', '[?]', '[?]', '?', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '', '', 'A', ';', 'E', 'E', 'I', '[?]', 'O', '[?]', 'U', 'O',
+        'I', 'A', 'B', 'G', 'D', 'E', 'Z', 'E', 'Th', 'I', 'K', 'L', 'M', 'N', 'Ks', 'O',
+        'P', 'R', '[?]', 'S', 'T', 'U', 'Ph', 'Kh', 'Ps', 'O', 'I', 'U', 'a', 'e', 'e', 'i',
+        'u', 'a', 'b', 'g', 'd', 'e', 'z', 'e', 'th', 'i', 'k', 'l', 'm', 'n', 'x', 'o',
+        'p', 'r', 's', 's', 't', 'u', 'ph', 'kh', 'ps', 'o', 'i', 'u', 'o', 'u', 'o', '[?]',
+        'b', 'th', 'U', 'U', 'U', 'ph', 'p', '&', '[?]', '[?]', 'St', 'st', 'W', 'w', 'Q', 'q',
+        'Sp', 'sp', 'Sh', 'sh', 'F', 'f', 'Kh', 'kh', 'H', 'h', 'G', 'g', 'CH', 'ch', 'Ti', 'ti',
+        'k', 'r', 'c', 'j', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xc5': [
+        'sseum', 'sseub', 'sseubs', 'sseus', 'sseuss', 'sseung', 'sseuj', 'sseuc', 'sseuk', 'sseut', 'sseup', 'sseuh', 'ssyi', 'ssyig', 'ssyigg', 'ssyigs',
+        'ssyin', 'ssyinj', 'ssyinh', 'ssyid', 'ssyil', 'ssyilg', 'ssyilm', 'ssyilb', 'ssyils', 'ssyilt', 'ssyilp', 'ssyilh', 'ssyim', 'ssyib', 'ssyibs', 'ssyis',
+        'ssyiss', 'ssying', 'ssyij', 'ssyic', 'ssyik', 'ssyit', 'ssyip', 'ssyih', 'ssi', 'ssig', 'ssigg', 'ssigs', 'ssin', 'ssinj', 'ssinh', 'ssid',
+        'ssil', 'ssilg', 'ssilm', 'ssilb', 'ssils', 'ssilt', 'ssilp', 'ssilh', 'ssim', 'ssib', 'ssibs', 'ssis', 'ssiss', 'ssing', 'ssij', 'ssic',
+        'ssik', 'ssit', 'ssip', 'ssih', 'a', 'ag', 'agg', 'ags', 'an', 'anj', 'anh', 'ad', 'al', 'alg', 'alm', 'alb',
+        'als', 'alt', 'alp', 'alh', 'am', 'ab', 'abs', 'as', 'ass', 'ang', 'aj', 'ac', 'ak', 'at', 'ap', 'ah',
+        'ae', 'aeg', 'aegg', 'aegs', 'aen', 'aenj', 'aenh', 'aed', 'ael', 'aelg', 'aelm', 'aelb', 'aels', 'aelt', 'aelp', 'aelh',
+        'aem', 'aeb', 'aebs', 'aes', 'aess', 'aeng', 'aej', 'aec', 'aek', 'aet', 'aep', 'aeh', 'ya', 'yag', 'yagg', 'yags',
+        'yan', 'yanj', 'yanh', 'yad', 'yal', 'yalg', 'yalm', 'yalb', 'yals', 'yalt', 'yalp', 'yalh', 'yam', 'yab', 'yabs', 'yas',
+        'yass', 'yang', 'yaj', 'yac', 'yak', 'yat', 'yap', 'yah', 'yae', 'yaeg', 'yaegg', 'yaegs', 'yaen', 'yaenj', 'yaenh', 'yaed',
+        'yael', 'yaelg', 'yaelm', 'yaelb', 'yaels', 'yaelt', 'yaelp', 'yaelh', 'yaem', 'yaeb', 'yaebs', 'yaes', 'yaess', 'yaeng', 'yaej', 'yaec',
+        'yaek', 'yaet', 'yaep', 'yaeh', 'eo', 'eog', 'eogg', 'eogs', 'eon', 'eonj', 'eonh', 'eod', 'eol', 'eolg', 'eolm', 'eolb',
+        'eols', 'eolt', 'eolp', 'eolh', 'eom', 'eob', 'eobs', 'eos', 'eoss', 'eong', 'eoj', 'eoc', 'eok', 'eot', 'eop', 'eoh',
+        'e', 'eg', 'egg', 'egs', 'en', 'enj', 'enh', 'ed', 'el', 'elg', 'elm', 'elb', 'els', 'elt', 'elp', 'elh',
+        'em', 'eb', 'ebs', 'es', 'ess', 'eng', 'ej', 'ec', 'ek', 'et', 'ep', 'eh', 'yeo', 'yeog', 'yeogg', 'yeogs',
+        'yeon', 'yeonj', 'yeonh', 'yeod', 'yeol', 'yeolg', 'yeolm', 'yeolb', 'yeols', 'yeolt', 'yeolp', 'yeolh', 'yeom', 'yeob', 'yeobs', 'yeos',
+    ],
+    'xfb': [
+        'ff', 'fi', 'fl', 'ffi', 'ffl', 'st', 'st', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', 'mn', 'me', 'mi', 'vn', 'mkh', '[?]', '[?]', '[?]', '[?]', '[?]', 'yi', '', 'ay',
+        '`', '', 'd', 'h', 'k', 'l', 'm', 'm', 't', '+', 'sh', 's', 'sh', 's', 'a', 'a',
+        '', 'b', 'g', 'd', 'h', 'v', 'z', '[?]', 't', 'y', 'k', 'k', 'l', '[?]', 'l', '[?]',
+        'n', 'n', '[?]', 'p', 'p', '[?]', 'ts', 'ts', 'r', 'sh', 't', 'vo', 'b', 'k', 'p', 'l',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+    ],
+    'x06': [
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', ',', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', ';', '[?]', '[?]', '[?]', '?',
+        '[?]', '', 'a', "'", "w'", '', "y'", 'a', 'b', '@', 't', 'th', 'j', 'H', 'kh', 'd',
+        'dh', 'r', 'z', 's', 'sh', 'S', 'D', 'T', 'Z', '`', 'G', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '', 'f', 'q', 'k', 'l', 'm', 'n', 'h', 'w', '~', 'y', 'an', 'un', 'in', 'a', 'u',
+        'i', 'W', '', '', "'", "'", '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '%', '.', ',', '*', '[?]', '[?]',
+        '', "'", "'", "'", '', "'", "'w", "'u", "'y", 'tt', 'tth', 'b', 't', 'T', 'p', 'th',
+        'bh', "'h", 'H', 'ny', 'dy', 'H', 'ch', 'cch', 'dd', 'D', 'D', 'Dt', 'dh', 'ddh', 'd', 'D',
+        'D', 'rr', 'R', 'R', 'R', 'R', 'R', 'R', 'j', 'R', 'S', 'S', 'S', 'S', 'S', 'T',
+        'GH', 'F', 'F', 'F', 'v', 'f', 'ph', 'Q', 'Q', 'kh', 'k', 'K', 'K', 'ng', 'K', 'g',
+        'G', 'N', 'G', 'G', 'G', 'L', 'L', 'L', 'L', 'N', 'N', 'N', 'N', 'N', 'h', 'Ch',
+        'hy', 'h', 'H', '@', 'W', 'oe', 'oe', 'u', 'yu', 'yu', 'W', 'v', 'y', 'Y', 'Y', 'W',
+        '', '', 'y', "y'", '.', 'ae', '', '', '', '', '', '', '', '@', '#', '',
+        '', '', '', '', '', '', '', '', '', '^', '', '', '', '', '[?]', '[?]',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'Sh', 'D', 'Gh', '&', '+m',
+    ],
+    'x07': [
+        '//', '/', ',', '!', '!', '-', ',', ',', ';', '?', '~', '\\{', '\\}', '*', '[?]', '',
+        "'", '', 'b', 'g', 'g', 'd', 'd', 'h', 'w', 'z', 'H', 't', 't', 'y', 'yh', 'k',
+        'l', 'm', 'n', 's', 's', '`', 'p', 'p', 'S', 'q', 'r', 'sh', 't', '[?]', '[?]', '[?]',
+        'a', 'a', 'a', 'A', 'A', 'A', 'e', 'e', 'e', 'E', 'i', 'i', 'u', 'u', 'u', 'o',
+        '', '`', "'", '', '', 'X', 'Q', '@', '@', '|', '+', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        'h', 'sh', 'n', 'r', 'b', 'L', 'k', "'", 'v', 'm', 'f', 'dh', 'th', 'l', 'g', 'ny',
+        's', 'd', 'z', 't', 'y', 'p', 'j', 'ch', 'tt', 'hh', 'kh', 'th', 'z', 'sh', 's', 'd',
+        't', 'z', '`', 'gh', 'q', 'w', 'a', 'aa', 'i', 'ee', 'u', 'oo', 'e', 'ey', 'o', 'oa',
+        '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xcc': [
+        'jjyim', 'jjyib', 'jjyibs', 'jjyis', 'jjyiss', 'jjying', 'jjyij', 'jjyic', 'jjyik', 'jjyit', 'jjyip', 'jjyih', 'jji', 'jjig', 'jjigg', 'jjigs',
+        'jjin', 'jjinj', 'jjinh', 'jjid', 'jjil', 'jjilg', 'jjilm', 'jjilb', 'jjils', 'jjilt', 'jjilp', 'jjilh', 'jjim', 'jjib', 'jjibs', 'jjis',
+        'jjiss', 'jjing', 'jjij', 'jjic', 'jjik', 'jjit', 'jjip', 'jjih', 'ca', 'cag', 'cagg', 'cags', 'can', 'canj', 'canh', 'cad',
+        'cal', 'calg', 'calm', 'calb', 'cals', 'calt', 'calp', 'calh', 'cam', 'cab', 'cabs', 'cas', 'cass', 'cang', 'caj', 'cac',
+        'cak', 'cat', 'cap', 'cah', 'cae', 'caeg', 'caegg', 'caegs', 'caen', 'caenj', 'caenh', 'caed', 'cael', 'caelg', 'caelm', 'caelb',
+        'caels', 'caelt', 'caelp', 'caelh', 'caem', 'caeb', 'caebs', 'caes', 'caess', 'caeng', 'caej', 'caec', 'caek', 'caet', 'caep', 'caeh',
+        'cya', 'cyag', 'cyagg', 'cyags', 'cyan', 'cyanj', 'cyanh', 'cyad', 'cyal', 'cyalg', 'cyalm', 'cyalb', 'cyals', 'cyalt', 'cyalp', 'cyalh',
+        'cyam', 'cyab', 'cyabs', 'cyas', 'cyass', 'cyang', 'cyaj', 'cyac', 'cyak', 'cyat', 'cyap', 'cyah', 'cyae', 'cyaeg', 'cyaegg', 'cyaegs',
+        'cyaen', 'cyaenj', 'cyaenh', 'cyaed', 'cyael', 'cyaelg', 'cyaelm', 'cyaelb', 'cyaels', 'cyaelt', 'cyaelp', 'cyaelh', 'cyaem', 'cyaeb', 'cyaebs', 'cyaes',
+        'cyaess', 'cyaeng', 'cyaej', 'cyaec', 'cyaek', 'cyaet', 'cyaep', 'cyaeh', 'ceo', 'ceog', 'ceogg', 'ceogs', 'ceon', 'ceonj', 'ceonh', 'ceod',
+        'ceol', 'ceolg', 'ceolm', 'ceolb', 'ceols', 'ceolt', 'ceolp', 'ceolh', 'ceom', 'ceob', 'ceobs', 'ceos', 'ceoss', 'ceong', 'ceoj', 'ceoc',
+        'ceok', 'ceot', 'ceop', 'ceoh', 'ce', 'ceg', 'cegg', 'cegs', 'cen', 'cenj', 'cenh', 'ced', 'cel', 'celg', 'celm', 'celb',
+        'cels', 'celt', 'celp', 'celh', 'cem', 'ceb', 'cebs', 'ces', 'cess', 'ceng', 'cej', 'cec', 'cek', 'cet', 'cep', 'ceh',
+        'cyeo', 'cyeog', 'cyeogg', 'cyeogs', 'cyeon', 'cyeonj', 'cyeonh', 'cyeod', 'cyeol', 'cyeolg', 'cyeolm', 'cyeolb', 'cyeols', 'cyeolt', 'cyeolp', 'cyeolh',
+        'cyeom', 'cyeob', 'cyeobs', 'cyeos', 'cyeoss', 'cyeong', 'cyeoj', 'cyeoc', 'cyeok', 'cyeot', 'cyeop', 'cyeoh', 'cye', 'cyeg', 'cyegg', 'cyegs',
+        'cyen', 'cyenj', 'cyenh', 'cyed', 'cyel', 'cyelg', 'cyelm', 'cyelb', 'cyels', 'cyelt', 'cyelp', 'cyelh', 'cyem', 'cyeb', 'cyebs', 'cyes',
+    ],
+    'xc6': [
+        'yeoss', 'yeong', 'yeoj', 'yeoc', 'yeok', 'yeot', 'yeop', 'yeoh', 'ye', 'yeg', 'yegg', 'yegs', 'yen', 'yenj', 'yenh', 'yed',
+        'yel', 'yelg', 'yelm', 'yelb', 'yels', 'yelt', 'yelp', 'yelh', 'yem', 'yeb', 'yebs', 'yes', 'yess', 'yeng', 'yej', 'yec',
+        'yek', 'yet', 'yep', 'yeh', 'o', 'og', 'ogg', 'ogs', 'on', 'onj', 'onh', 'od', 'ol', 'olg', 'olm', 'olb',
+        'ols', 'olt', 'olp', 'olh', 'om', 'ob', 'obs', 'os', 'oss', 'ong', 'oj', 'oc', 'ok', 'ot', 'op', 'oh',
+        'wa', 'wag', 'wagg', 'wags', 'wan', 'wanj', 'wanh', 'wad', 'wal', 'walg', 'walm', 'walb', 'wals', 'walt', 'walp', 'walh',
+        'wam', 'wab', 'wabs', 'was', 'wass', 'wang', 'waj', 'wac', 'wak', 'wat', 'wap', 'wah', 'wae', 'waeg', 'waegg', 'waegs',
+        'waen', 'waenj', 'waenh', 'waed', 'wael', 'waelg', 'waelm', 'waelb', 'waels', 'waelt', 'waelp', 'waelh', 'waem', 'waeb', 'waebs', 'waes',
+        'waess', 'waeng', 'waej', 'waec', 'waek', 'waet', 'waep', 'waeh', 'oe', 'oeg', 'oegg', 'oegs', 'oen', 'oenj', 'oenh', 'oed',
+        'oel', 'oelg', 'oelm', 'oelb', 'oels', 'oelt', 'oelp', 'oelh', 'oem', 'oeb', 'oebs', 'oes', 'oess', 'oeng', 'oej', 'oec',
+        'oek', 'oet', 'oep', 'oeh', 'yo', 'yog', 'yogg', 'yogs', 'yon', 'yonj', 'yonh', 'yod', 'yol', 'yolg', 'yolm', 'yolb',
+        'yols', 'yolt', 'yolp', 'yolh', 'yom', 'yob', 'yobs', 'yos', 'yoss', 'yong', 'yoj', 'yoc', 'yok', 'yot', 'yop', 'yoh',
+        'u', 'ug', 'ugg', 'ugs', 'un', 'unj', 'unh', 'ud', 'ul', 'ulg', 'ulm', 'ulb', 'uls', 'ult', 'ulp', 'ulh',
+        'um', 'ub', 'ubs', 'us', 'uss', 'ung', 'uj', 'uc', 'uk', 'ut', 'up', 'uh', 'weo', 'weog', 'weogg', 'weogs',
+        'weon', 'weonj', 'weonh', 'weod', 'weol', 'weolg', 'weolm', 'weolb', 'weols', 'weolt', 'weolp', 'weolh', 'weom', 'weob', 'weobs', 'weos',
+        'weoss', 'weong', 'weoj', 'weoc', 'weok', 'weot', 'weop', 'weoh', 'we', 'weg', 'wegg', 'wegs', 'wen', 'wenj', 'wenh', 'wed',
+        'wel', 'welg', 'welm', 'welb', 'wels', 'welt', 'welp', 'welh', 'wem', 'web', 'webs', 'wes', 'wess', 'weng', 'wej', 'wec',
+    ],
+    'xb8': [
+        'reoss', 'reong', 'reoj', 'reoc', 'reok', 'reot', 'reop', 'reoh', 're', 'reg', 'regg', 'regs', 'ren', 'renj', 'renh', 'red',
+        'rel', 'relg', 'relm', 'relb', 'rels', 'relt', 'relp', 'relh', 'rem', 'reb', 'rebs', 'res', 'ress', 'reng', 'rej', 'rec',
+        'rek', 'ret', 'rep', 'reh', 'ryeo', 'ryeog', 'ryeogg', 'ryeogs', 'ryeon', 'ryeonj', 'ryeonh', 'ryeod', 'ryeol', 'ryeolg', 'ryeolm', 'ryeolb',
+        'ryeols', 'ryeolt', 'ryeolp', 'ryeolh', 'ryeom', 'ryeob', 'ryeobs', 'ryeos', 'ryeoss', 'ryeong', 'ryeoj', 'ryeoc', 'ryeok', 'ryeot', 'ryeop', 'ryeoh',
+        'rye', 'ryeg', 'ryegg', 'ryegs', 'ryen', 'ryenj', 'ryenh', 'ryed', 'ryel', 'ryelg', 'ryelm', 'ryelb', 'ryels', 'ryelt', 'ryelp', 'ryelh',
+        'ryem', 'ryeb', 'ryebs', 'ryes', 'ryess', 'ryeng', 'ryej', 'ryec', 'ryek', 'ryet', 'ryep', 'ryeh', 'ro', 'rog', 'rogg', 'rogs',
+        'ron', 'ronj', 'ronh', 'rod', 'rol', 'rolg', 'rolm', 'rolb', 'rols', 'rolt', 'rolp', 'rolh', 'rom', 'rob', 'robs', 'ros',
+        'ross', 'rong', 'roj', 'roc', 'rok', 'rot', 'rop', 'roh', 'rwa', 'rwag', 'rwagg', 'rwags', 'rwan', 'rwanj', 'rwanh', 'rwad',
+        'rwal', 'rwalg', 'rwalm', 'rwalb', 'rwals', 'rwalt', 'rwalp', 'rwalh', 'rwam', 'rwab', 'rwabs', 'rwas', 'rwass', 'rwang', 'rwaj', 'rwac',
+        'rwak', 'rwat', 'rwap', 'rwah', 'rwae', 'rwaeg', 'rwaegg', 'rwaegs', 'rwaen', 'rwaenj', 'rwaenh', 'rwaed', 'rwael', 'rwaelg', 'rwaelm', 'rwaelb',
+        'rwaels', 'rwaelt', 'rwaelp', 'rwaelh', 'rwaem', 'rwaeb', 'rwaebs', 'rwaes', 'rwaess', 'rwaeng', 'rwaej', 'rwaec', 'rwaek', 'rwaet', 'rwaep', 'rwaeh',
+        'roe', 'roeg', 'roegg', 'roegs', 'roen', 'roenj', 'roenh', 'roed', 'roel', 'roelg', 'roelm', 'roelb', 'roels', 'roelt', 'roelp', 'roelh',
+        'roem', 'roeb', 'roebs', 'roes', 'roess', 'roeng', 'roej', 'roec', 'roek', 'roet', 'roep', 'roeh', 'ryo', 'ryog', 'ryogg', 'ryogs',
+        'ryon', 'ryonj', 'ryonh', 'ryod', 'ryol', 'ryolg', 'ryolm', 'ryolb', 'ryols', 'ryolt', 'ryolp', 'ryolh', 'ryom', 'ryob', 'ryobs', 'ryos',
+        'ryoss', 'ryong', 'ryoj', 'ryoc', 'ryok', 'ryot', 'ryop', 'ryoh', 'ru', 'rug', 'rugg', 'rugs', 'run', 'runj', 'runh', 'rud',
+        'rul', 'rulg', 'rulm', 'rulb', 'ruls', 'rult', 'rulp', 'rulh', 'rum', 'rub', 'rubs', 'rus', 'russ', 'rung', 'ruj', 'ruc',
+    ],
+    'x33': [
+        'apartment', 'alpha', 'ampere', 'are', 'inning', 'inch', 'won', 'escudo', 'acre', 'ounce', 'ohm', 'kai-ri', 'carat', 'calorie', 'gallon', 'gamma',
+        'giga', 'guinea', 'curie', 'guilder', 'kilo', 'kilogram', 'kilometer', 'kilowatt', 'gram', 'gram ton', 'cruzeiro', 'krone', 'case', 'koruna', 'co-op', 'cycle',
+        'centime', 'shilling', 'centi', 'cent', 'dozen', 'desi', 'dollar', 'ton', 'nano', 'knot', 'heights', 'percent', 'parts', 'barrel', 'piaster', 'picul',
+        'pico', 'building', 'farad', 'feet', 'bushel', 'franc', 'hectare', 'peso', 'pfennig', 'hertz', 'pence', 'page', 'beta', 'point', 'volt', 'hon',
+        'pound', 'hall', 'horn', 'micro', 'mile', 'mach', 'mark', 'mansion', 'micron', 'milli', 'millibar', 'mega', 'megaton', 'meter', 'yard', 'yard',
+        'yuan', 'liter', 'lira', 'rupee', 'ruble', 'rem', 'roentgen', 'watt', '0h', '1h', '2h', '3h', '4h', '5h', '6h', '7h',
+        '8h', '9h', '10h', '11h', '12h', '13h', '14h', '15h', '16h', '17h', '18h', '19h', '20h', '21h', '22h', '23h',
+        '24h', 'HPA', 'da', 'AU', 'bar', 'oV', 'pc', '[?]', '[?]', '[?]', '[?]', 'Heisei', 'Syouwa', 'Taisyou', 'Meiji', 'Inc.',
+        'pA', 'nA', 'microamp', 'mA', 'kA', 'kB', 'MB', 'GB', 'cal', 'kcal', 'pF', 'nF', 'microFarad', 'microgram', 'mg', 'kg',
+        'Hz', 'kHz', 'MHz', 'GHz', 'THz', 'microliter', 'ml', 'dl', 'kl', 'fm', 'nm', 'micrometer', 'mm', 'cm', 'km', 'mm^2',
+        'cm^2', 'm^2', 'km^2', 'mm^4', 'cm^3', 'm^3', 'km^3', 'm/s', 'm/s^2', 'Pa', 'kPa', 'MPa', 'GPa', 'rad', 'rad/s', 'rad/s^2',
+        'ps', 'ns', 'microsecond', 'ms', 'pV', 'nV', 'microvolt', 'mV', 'kV', 'MV', 'pW', 'nW', 'microwatt', 'mW', 'kW', 'MW',
+        'kOhm', 'MOhm', 'a.m.', 'Bq', 'cc', 'cd', 'C/kg', 'Co.', 'dB', 'Gy', 'ha', 'HP', 'in', 'K.K.', 'KM', 'kt',
+        'lm', 'ln', 'log', 'lx', 'mb', 'mil', 'mol', 'pH', 'p.m.', 'PPM', 'PR', 'sr', 'Sv', 'Wb', '[?]', '[?]',
+        '1d', '2d', '3d', '4d', '5d', '6d', '7d', '8d', '9d', '10d', '11d', '12d', '13d', '14d', '15d', '16d',
+        '17d', '18d', '19d', '20d', '21d', '22d', '23d', '24d', '25d', '26d', '27d', '28d', '29d', '30d', '31d',
+    ],
+    'x32': [
+        '(g)', '(n)', '(d)', '(r)', '(m)', '(b)', '(s)', '()', '(j)', '(c)', '(k)', '(t)', '(p)', '(h)', '(ga)', '(na)',
+        '(da)', '(ra)', '(ma)', '(ba)', '(sa)', '(a)', '(ja)', '(ca)', '(ka)', '(ta)', '(pa)', '(ha)', '(ju)', '[?]', '[?]', '[?]',
+        '(1) ', '(2) ', '(3) ', '(4) ', '(5) ', '(6) ', '(7) ', '(8) ', '(9) ', '(10) ', '(Yue) ', '(Huo) ', '(Shui) ', '(Mu) ', '(Jin) ', '(Tu) ',
+        '(Ri) ', '(Zhu) ', '(You) ', '(She) ', '(Ming) ', '(Te) ', '(Cai) ', '(Zhu) ', '(Lao) ', '(Dai) ', '(Hu) ', '(Xue) ', '(Jian) ', '(Qi) ', '(Zi) ', '(Xie) ',
+        '(Ji) ', '(Xiu) ', '<<', '>>', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '(g)', '(n)', '(d)', '(r)', '(m)', '(b)', '(s)', '()', '(j)', '(c)', '(k)', '(t)', '(p)', '(h)', '(ga)', '(na)',
+        '(da)', '(ra)', '(ma)', '(ba)', '(sa)', '(a)', '(ja)', '(ca)', '(ka)', '(ta)', '(pa)', '(ha)', '[?]', '[?]', '[?]', 'KIS ',
+        '(1) ', '(2) ', '(3) ', '(4) ', '(5) ', '(6) ', '(7) ', '(8) ', '(9) ', '(10) ', '(Yue) ', '(Huo) ', '(Shui) ', '(Mu) ', '(Jin) ', '(Tu) ',
+        '(Ri) ', '(Zhu) ', '(You) ', '(She) ', '(Ming) ', '(Te) ', '(Cai) ', '(Zhu) ', '(Lao) ', '(Mi) ', '(Nan) ', '(Nu) ', '(Shi) ', '(You) ', '(Yin) ', '(Zhu) ',
+        '(Xiang) ', '(Xiu) ', '(Xie) ', '(Zheng) ', '(Shang) ', '(Zhong) ', '(Xia) ', '(Zuo) ', '(You) ', '(Yi) ', '(Zong) ', '(Xue) ', '(Jian) ', '(Qi) ', '(Zi) ', '(Xie) ',
+        '(Ye) ', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '1M', '2M', '3M', '4M', '5M', '6M', '7M', '8M', '9M', '10M', '11M', '12M', '[?]', '[?]', '[?]', '[?]',
+        'a', 'i', 'u', 'u', 'o', 'ka', 'ki', 'ku', 'ke', 'ko', 'sa', 'si', 'su', 'se', 'so', 'ta',
+        'ti', 'tu', 'te', 'to', 'na', 'ni', 'nu', 'ne', 'no', 'ha', 'hi', 'hu', 'he', 'ho', 'ma', 'mi',
+        'mu', 'me', 'mo', 'ya', 'yu', 'yo', 'ra', 'ri', 'ru', 're', 'ro', 'wa', 'wi', 'we', 'wo',
+    ],
+    'x04': [
+        'Ie', 'Io', 'Dj', 'Gj', 'Ie', 'Dz', 'I', 'Yi', 'J', 'Lj', 'Nj', 'Tsh', 'Kj', 'I', 'U', 'Dzh',
+        'A', 'B', 'V', 'G', 'D', 'Ie', 'Zh', 'Z', 'I', 'I', 'K', 'L', 'M', 'N', 'O', 'P',
+        'R', 'S', 'T', 'U', 'F', 'Kh', 'Ts', 'Ch', 'Sh', 'Shch', '', 'Y', "'", 'E', 'Iu', 'Ia',
+        'a', 'b', 'v', 'gh', 'd', 'ie', 'zh', 'z', 'i', 'i', 'k', 'l', 'm', 'n', 'o', 'p',
+        'r', 's', 't', 'u', 'f', 'kh', 'ts', 'ch', 'sh', 'shch', '', 'y', "'", 'e', 'iu', 'ia',
+        'ie', 'io', 'dj', 'gj', 'ie', 'dz', 'i', 'yi', 'j', 'lj', 'nj', 'tsh', 'kj', 'i', 'u', 'dzh',
+        'O', 'o', 'E', 'e', 'Ie', 'ie', 'E', 'e', 'Ie', 'ie', 'O', 'o', 'Io', 'io', 'Ks', 'ks',
+        'Ps', 'ps', 'F', 'f', 'Y', 'y', 'Y', 'y', 'u', 'u', 'O', 'o', 'O', 'o', 'Ot', 'ot',
+        'Q', 'q', '*1000*', '', '', '', '', '[?]', '*100.000*', '*1.000.000*', '[?]', '[?]', '"', '"', "R'", "r'",
+        "G'", "g'", "G'", "g'", "G'", "g'", "Zh'", "zh'", "Z'", "z'", "K'", "k'", "K'", "k'", "K'", "k'",
+        "K'", "k'", "N'", "n'", 'Ng', 'ng', "P'", "p'", 'Kh', 'kh', "S'", "s'", "T'", "t'", 'U', 'u',
+        "U'", "u'", "Kh'", "kh'", 'Tts', 'tts', "Ch'", "ch'", "Ch'", "ch'", 'H', 'h', 'Ch', 'ch', "Ch'", "ch'",
+        '`', 'Zh', 'zh', "K'", "k'", '[?]', '[?]', "N'", "n'", '[?]', '[?]', 'Ch', 'ch', '[?]', '[?]', '[?]',
+        'a', 'a', 'A', 'a', 'Ae', 'ae', 'Ie', 'ie', '@', '@', '@', '@', 'Zh', 'zh', 'Z', 'z',
+        'Dz', 'dz', 'I', 'i', 'I', 'i', 'O', 'o', 'O', 'o', 'O', 'o', 'E', 'e', 'U', 'u',
+        'U', 'u', 'U', 'u', 'Ch', 'ch', '[?]', '[?]', 'Y', 'y', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xb6': [
+        'ddyels', 'ddyelt', 'ddyelp', 'ddyelh', 'ddyem', 'ddyeb', 'ddyebs', 'ddyes', 'ddyess', 'ddyeng', 'ddyej', 'ddyec', 'ddyek', 'ddyet', 'ddyep', 'ddyeh',
+        'ddo', 'ddog', 'ddogg', 'ddogs', 'ddon', 'ddonj', 'ddonh', 'ddod', 'ddol', 'ddolg', 'ddolm', 'ddolb', 'ddols', 'ddolt', 'ddolp', 'ddolh',
+        'ddom', 'ddob', 'ddobs', 'ddos', 'ddoss', 'ddong', 'ddoj', 'ddoc', 'ddok', 'ddot', 'ddop', 'ddoh', 'ddwa', 'ddwag', 'ddwagg', 'ddwags',
+        'ddwan', 'ddwanj', 'ddwanh', 'ddwad', 'ddwal', 'ddwalg', 'ddwalm', 'ddwalb', 'ddwals', 'ddwalt', 'ddwalp', 'ddwalh', 'ddwam', 'ddwab', 'ddwabs', 'ddwas',
+        'ddwass', 'ddwang', 'ddwaj', 'ddwac', 'ddwak', 'ddwat', 'ddwap', 'ddwah', 'ddwae', 'ddwaeg', 'ddwaegg', 'ddwaegs', 'ddwaen', 'ddwaenj', 'ddwaenh', 'ddwaed',
+        'ddwael', 'ddwaelg', 'ddwaelm', 'ddwaelb', 'ddwaels', 'ddwaelt', 'ddwaelp', 'ddwaelh', 'ddwaem', 'ddwaeb', 'ddwaebs', 'ddwaes', 'ddwaess', 'ddwaeng', 'ddwaej', 'ddwaec',
+        'ddwaek', 'ddwaet', 'ddwaep', 'ddwaeh', 'ddoe', 'ddoeg', 'ddoegg', 'ddoegs', 'ddoen', 'ddoenj', 'ddoenh', 'ddoed', 'ddoel', 'ddoelg', 'ddoelm', 'ddoelb',
+        'ddoels', 'ddoelt', 'ddoelp', 'ddoelh', 'ddoem', 'ddoeb', 'ddoebs', 'ddoes', 'ddoess', 'ddoeng', 'ddoej', 'ddoec', 'ddoek', 'ddoet', 'ddoep', 'ddoeh',
+        'ddyo', 'ddyog', 'ddyogg', 'ddyogs', 'ddyon', 'ddyonj', 'ddyonh', 'ddyod', 'ddyol', 'ddyolg', 'ddyolm', 'ddyolb', 'ddyols', 'ddyolt', 'ddyolp', 'ddyolh',
+        'ddyom', 'ddyob', 'ddyobs', 'ddyos', 'ddyoss', 'ddyong', 'ddyoj', 'ddyoc', 'ddyok', 'ddyot', 'ddyop', 'ddyoh', 'ddu', 'ddug', 'ddugg', 'ddugs',
+        'ddun', 'ddunj', 'ddunh', 'ddud', 'ddul', 'ddulg', 'ddulm', 'ddulb', 'dduls', 'ddult', 'ddulp', 'ddulh', 'ddum', 'ddub', 'ddubs', 'ddus',
+        'dduss', 'ddung', 'dduj', 'dduc', 'dduk', 'ddut', 'ddup', 'dduh', 'ddweo', 'ddweog', 'ddweogg', 'ddweogs', 'ddweon', 'ddweonj', 'ddweonh', 'ddweod',
+        'ddweol', 'ddweolg', 'ddweolm', 'ddweolb', 'ddweols', 'ddweolt', 'ddweolp', 'ddweolh', 'ddweom', 'ddweob', 'ddweobs', 'ddweos', 'ddweoss', 'ddweong', 'ddweoj', 'ddweoc',
+        'ddweok', 'ddweot', 'ddweop', 'ddweoh', 'ddwe', 'ddweg', 'ddwegg', 'ddwegs', 'ddwen', 'ddwenj', 'ddwenh', 'ddwed', 'ddwel', 'ddwelg', 'ddwelm', 'ddwelb',
+        'ddwels', 'ddwelt', 'ddwelp', 'ddwelh', 'ddwem', 'ddweb', 'ddwebs', 'ddwes', 'ddwess', 'ddweng', 'ddwej', 'ddwec', 'ddwek', 'ddwet', 'ddwep', 'ddweh',
+        'ddwi', 'ddwig', 'ddwigg', 'ddwigs', 'ddwin', 'ddwinj', 'ddwinh', 'ddwid', 'ddwil', 'ddwilg', 'ddwilm', 'ddwilb', 'ddwils', 'ddwilt', 'ddwilp', 'ddwilh',
+    ],
+    'x23': [
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xbc': [
+        'mil', 'milg', 'milm', 'milb', 'mils', 'milt', 'milp', 'milh', 'mim', 'mib', 'mibs', 'mis', 'miss', 'ming', 'mij', 'mic',
+        'mik', 'mit', 'mip', 'mih', 'ba', 'bag', 'bagg', 'bags', 'ban', 'banj', 'banh', 'bad', 'bal', 'balg', 'balm', 'balb',
+        'bals', 'balt', 'balp', 'balh', 'bam', 'bab', 'babs', 'bas', 'bass', 'bang', 'baj', 'bac', 'bak', 'bat', 'bap', 'bah',
+        'bae', 'baeg', 'baegg', 'baegs', 'baen', 'baenj', 'baenh', 'baed', 'bael', 'baelg', 'baelm', 'baelb', 'baels', 'baelt', 'baelp', 'baelh',
+        'baem', 'baeb', 'baebs', 'baes', 'baess', 'baeng', 'baej', 'baec', 'baek', 'baet', 'baep', 'baeh', 'bya', 'byag', 'byagg', 'byags',
+        'byan', 'byanj', 'byanh', 'byad', 'byal', 'byalg', 'byalm', 'byalb', 'byals', 'byalt', 'byalp', 'byalh', 'byam', 'byab', 'byabs', 'byas',
+        'byass', 'byang', 'byaj', 'byac', 'byak', 'byat', 'byap', 'byah', 'byae', 'byaeg', 'byaegg', 'byaegs', 'byaen', 'byaenj', 'byaenh', 'byaed',
+        'byael', 'byaelg', 'byaelm', 'byaelb', 'byaels', 'byaelt', 'byaelp', 'byaelh', 'byaem', 'byaeb', 'byaebs', 'byaes', 'byaess', 'byaeng', 'byaej', 'byaec',
+        'byaek', 'byaet', 'byaep', 'byaeh', 'beo', 'beog', 'beogg', 'beogs', 'beon', 'beonj', 'beonh', 'beod', 'beol', 'beolg', 'beolm', 'beolb',
+        'beols', 'beolt', 'beolp', 'beolh', 'beom', 'beob', 'beobs', 'beos', 'beoss', 'beong', 'beoj', 'beoc', 'beok', 'beot', 'beop', 'beoh',
+        'be', 'beg', 'begg', 'begs', 'ben', 'benj', 'benh', 'bed', 'bel', 'belg', 'belm', 'belb', 'bels', 'belt', 'belp', 'belh',
+        'bem', 'beb', 'bebs', 'bes', 'bess', 'beng', 'bej', 'bec', 'bek', 'bet', 'bep', 'beh', 'byeo', 'byeog', 'byeogg', 'byeogs',
+        'byeon', 'byeonj', 'byeonh', 'byeod', 'byeol', 'byeolg', 'byeolm', 'byeolb', 'byeols', 'byeolt', 'byeolp', 'byeolh', 'byeom', 'byeob', 'byeobs', 'byeos',
+        'byeoss', 'byeong', 'byeoj', 'byeoc', 'byeok', 'byeot', 'byeop', 'byeoh', 'bye', 'byeg', 'byegg', 'byegs', 'byen', 'byenj', 'byenh', 'byed',
+        'byel', 'byelg', 'byelm', 'byelb', 'byels', 'byelt', 'byelp', 'byelh', 'byem', 'byeb', 'byebs', 'byes', 'byess', 'byeng', 'byej', 'byec',
+        'byek', 'byet', 'byep', 'byeh', 'bo', 'bog', 'bogg', 'bogs', 'bon', 'bonj', 'bonh', 'bod', 'bol', 'bolg', 'bolm', 'bolb',
+    ],
+    'x2f': [
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?]', '[?]', '[?]',
+    ],
+    'xb4': [
+        'dwaen', 'dwaenj', 'dwaenh', 'dwaed', 'dwael', 'dwaelg', 'dwaelm', 'dwaelb', 'dwaels', 'dwaelt', 'dwaelp', 'dwaelh', 'dwaem', 'dwaeb', 'dwaebs', 'dwaes',
+        'dwaess', 'dwaeng', 'dwaej', 'dwaec', 'dwaek', 'dwaet', 'dwaep', 'dwaeh', 'doe', 'doeg', 'doegg', 'doegs', 'doen', 'doenj', 'doenh', 'doed',
+        'doel', 'doelg', 'doelm', 'doelb', 'doels', 'doelt', 'doelp', 'doelh', 'doem', 'doeb', 'doebs', 'does', 'doess', 'doeng', 'doej', 'doec',
+        'doek', 'doet', 'doep', 'doeh', 'dyo', 'dyog', 'dyogg', 'dyogs', 'dyon', 'dyonj', 'dyonh', 'dyod', 'dyol', 'dyolg', 'dyolm', 'dyolb',
+        'dyols', 'dyolt', 'dyolp', 'dyolh', 'dyom', 'dyob', 'dyobs', 'dyos', 'dyoss', 'dyong', 'dyoj', 'dyoc', 'dyok', 'dyot', 'dyop', 'dyoh',
+        'du', 'dug', 'dugg', 'dugs', 'dun', 'dunj', 'dunh', 'dud', 'dul', 'dulg', 'dulm', 'dulb', 'duls', 'dult', 'dulp', 'dulh',
+        'dum', 'dub', 'dubs', 'dus', 'duss', 'dung', 'duj', 'duc', 'duk', 'dut', 'dup', 'duh', 'dweo', 'dweog', 'dweogg', 'dweogs',
+        'dweon', 'dweonj', 'dweonh', 'dweod', 'dweol', 'dweolg', 'dweolm', 'dweolb', 'dweols', 'dweolt', 'dweolp', 'dweolh', 'dweom', 'dweob', 'dweobs', 'dweos',
+        'dweoss', 'dweong', 'dweoj', 'dweoc', 'dweok', 'dweot', 'dweop', 'dweoh', 'dwe', 'dweg', 'dwegg', 'dwegs', 'dwen', 'dwenj', 'dwenh', 'dwed',
+        'dwel', 'dwelg', 'dwelm', 'dwelb', 'dwels', 'dwelt', 'dwelp', 'dwelh', 'dwem', 'dweb', 'dwebs', 'dwes', 'dwess', 'dweng', 'dwej', 'dwec',
+        'dwek', 'dwet', 'dwep', 'dweh', 'dwi', 'dwig', 'dwigg', 'dwigs', 'dwin', 'dwinj', 'dwinh', 'dwid', 'dwil', 'dwilg', 'dwilm', 'dwilb',
+        'dwils', 'dwilt', 'dwilp', 'dwilh', 'dwim', 'dwib', 'dwibs', 'dwis', 'dwiss', 'dwing', 'dwij', 'dwic', 'dwik', 'dwit', 'dwip', 'dwih',
+        'dyu', 'dyug', 'dyugg', 'dyugs', 'dyun', 'dyunj', 'dyunh', 'dyud', 'dyul', 'dyulg', 'dyulm', 'dyulb', 'dyuls', 'dyult', 'dyulp', 'dyulh',
+        'dyum', 'dyub', 'dyubs', 'dyus', 'dyuss', 'dyung', 'dyuj', 'dyuc', 'dyuk', 'dyut', 'dyup', 'dyuh', 'deu', 'deug', 'deugg', 'deugs',
+        'deun', 'deunj', 'deunh', 'deud', 'deul', 'deulg', 'deulm', 'deulb', 'deuls', 'deult', 'deulp', 'deulh', 'deum', 'deub', 'deubs', 'deus',
+        'deuss', 'deung', 'deuj', 'deuc', 'deuk', 'deut', 'deup', 'deuh', 'dyi', 'dyig', 'dyigg', 'dyigs', 'dyin', 'dyinj', 'dyinh', 'dyid',
+    ],
+    'xc9': [
+        'jun', 'junj', 'junh', 'jud', 'jul', 'julg', 'julm', 'julb', 'juls', 'jult', 'julp', 'julh', 'jum', 'jub', 'jubs', 'jus',
+        'juss', 'jung', 'juj', 'juc', 'juk', 'jut', 'jup', 'juh', 'jweo', 'jweog', 'jweogg', 'jweogs', 'jweon', 'jweonj', 'jweonh', 'jweod',
+        'jweol', 'jweolg', 'jweolm', 'jweolb', 'jweols', 'jweolt', 'jweolp', 'jweolh', 'jweom', 'jweob', 'jweobs', 'jweos', 'jweoss', 'jweong', 'jweoj', 'jweoc',
+        'jweok', 'jweot', 'jweop', 'jweoh', 'jwe', 'jweg', 'jwegg', 'jwegs', 'jwen', 'jwenj', 'jwenh', 'jwed', 'jwel', 'jwelg', 'jwelm', 'jwelb',
+        'jwels', 'jwelt', 'jwelp', 'jwelh', 'jwem', 'jweb', 'jwebs', 'jwes', 'jwess', 'jweng', 'jwej', 'jwec', 'jwek', 'jwet', 'jwep', 'jweh',
+        'jwi', 'jwig', 'jwigg', 'jwigs', 'jwin', 'jwinj', 'jwinh', 'jwid', 'jwil', 'jwilg', 'jwilm', 'jwilb', 'jwils', 'jwilt', 'jwilp', 'jwilh',
+        'jwim', 'jwib', 'jwibs', 'jwis', 'jwiss', 'jwing', 'jwij', 'jwic', 'jwik', 'jwit', 'jwip', 'jwih', 'jyu', 'jyug', 'jyugg', 'jyugs',
+        'jyun', 'jyunj', 'jyunh', 'jyud', 'jyul', 'jyulg', 'jyulm', 'jyulb', 'jyuls', 'jyult', 'jyulp', 'jyulh', 'jyum', 'jyub', 'jyubs', 'jyus',
+        'jyuss', 'jyung', 'jyuj', 'jyuc', 'jyuk', 'jyut', 'jyup', 'jyuh', 'jeu', 'jeug', 'jeugg', 'jeugs', 'jeun', 'jeunj', 'jeunh', 'jeud',
+        'jeul', 'jeulg', 'jeulm', 'jeulb', 'jeuls', 'jeult', 'jeulp', 'jeulh', 'jeum', 'jeub', 'jeubs', 'jeus', 'jeuss', 'jeung', 'jeuj', 'jeuc',
+        'jeuk', 'jeut', 'jeup', 'jeuh', 'jyi', 'jyig', 'jyigg', 'jyigs', 'jyin', 'jyinj', 'jyinh', 'jyid', 'jyil', 'jyilg', 'jyilm', 'jyilb',
+        'jyils', 'jyilt', 'jyilp', 'jyilh', 'jyim', 'jyib', 'jyibs', 'jyis', 'jyiss', 'jying', 'jyij', 'jyic', 'jyik', 'jyit', 'jyip', 'jyih',
+        'ji', 'jig', 'jigg', 'jigs', 'jin', 'jinj', 'jinh', 'jid', 'jil', 'jilg', 'jilm', 'jilb', 'jils', 'jilt', 'jilp', 'jilh',
+        'jim', 'jib', 'jibs', 'jis', 'jiss', 'jing', 'jij', 'jic', 'jik', 'jit', 'jip', 'jih', 'jja', 'jjag', 'jjagg', 'jjags',
+        'jjan', 'jjanj', 'jjanh', 'jjad', 'jjal', 'jjalg', 'jjalm', 'jjalb', 'jjals', 'jjalt', 'jjalp', 'jjalh', 'jjam', 'jjab', 'jjabs', 'jjas',
+        'jjass', 'jjang', 'jjaj', 'jjac', 'jjak', 'jjat', 'jjap', 'jjah', 'jjae', 'jjaeg', 'jjaegg', 'jjaegs', 'jjaen', 'jjaenj', 'jjaenh', 'jjaed',
+    ],
+    'xb7': [
+        'ddwim', 'ddwib', 'ddwibs', 'ddwis', 'ddwiss', 'ddwing', 'ddwij', 'ddwic', 'ddwik', 'ddwit', 'ddwip', 'ddwih', 'ddyu', 'ddyug', 'ddyugg', 'ddyugs',
+        'ddyun', 'ddyunj', 'ddyunh', 'ddyud', 'ddyul', 'ddyulg', 'ddyulm', 'ddyulb', 'ddyuls', 'ddyult', 'ddyulp', 'ddyulh', 'ddyum', 'ddyub', 'ddyubs', 'ddyus',
+        'ddyuss', 'ddyung', 'ddyuj', 'ddyuc', 'ddyuk', 'ddyut', 'ddyup', 'ddyuh', 'ddeu', 'ddeug', 'ddeugg', 'ddeugs', 'ddeun', 'ddeunj', 'ddeunh', 'ddeud',
+        'ddeul', 'ddeulg', 'ddeulm', 'ddeulb', 'ddeuls', 'ddeult', 'ddeulp', 'ddeulh', 'ddeum', 'ddeub', 'ddeubs', 'ddeus', 'ddeuss', 'ddeung', 'ddeuj', 'ddeuc',
+        'ddeuk', 'ddeut', 'ddeup', 'ddeuh', 'ddyi', 'ddyig', 'ddyigg', 'ddyigs', 'ddyin', 'ddyinj', 'ddyinh', 'ddyid', 'ddyil', 'ddyilg', 'ddyilm', 'ddyilb',
+        'ddyils', 'ddyilt', 'ddyilp', 'ddyilh', 'ddyim', 'ddyib', 'ddyibs', 'ddyis', 'ddyiss', 'ddying', 'ddyij', 'ddyic', 'ddyik', 'ddyit', 'ddyip', 'ddyih',
+        'ddi', 'ddig', 'ddigg', 'ddigs', 'ddin', 'ddinj', 'ddinh', 'ddid', 'ddil', 'ddilg', 'ddilm', 'ddilb', 'ddils', 'ddilt', 'ddilp', 'ddilh',
+        'ddim', 'ddib', 'ddibs', 'ddis', 'ddiss', 'dding', 'ddij', 'ddic', 'ddik', 'ddit', 'ddip', 'ddih', 'ra', 'rag', 'ragg', 'rags',
+        'ran', 'ranj', 'ranh', 'rad', 'ral', 'ralg', 'ralm', 'ralb', 'rals', 'ralt', 'ralp', 'ralh', 'ram', 'rab', 'rabs', 'ras',
+        'rass', 'rang', 'raj', 'rac', 'rak', 'rat', 'rap', 'rah', 'rae', 'raeg', 'raegg', 'raegs', 'raen', 'raenj', 'raenh', 'raed',
+        'rael', 'raelg', 'raelm', 'raelb', 'raels', 'raelt', 'raelp', 'raelh', 'raem', 'raeb', 'raebs', 'raes', 'raess', 'raeng', 'raej', 'raec',
+        'raek', 'raet', 'raep', 'raeh', 'rya', 'ryag', 'ryagg', 'ryags', 'ryan', 'ryanj', 'ryanh', 'ryad', 'ryal', 'ryalg', 'ryalm', 'ryalb',
+        'ryals', 'ryalt', 'ryalp', 'ryalh', 'ryam', 'ryab', 'ryabs', 'ryas', 'ryass', 'ryang', 'ryaj', 'ryac', 'ryak', 'ryat', 'ryap', 'ryah',
+        'ryae', 'ryaeg', 'ryaegg', 'ryaegs', 'ryaen', 'ryaenj', 'ryaenh', 'ryaed', 'ryael', 'ryaelg', 'ryaelm', 'ryaelb', 'ryaels', 'ryaelt', 'ryaelp', 'ryaelh',
+        'ryaem', 'ryaeb', 'ryaebs', 'ryaes', 'ryaess', 'ryaeng', 'ryaej', 'ryaec', 'ryaek', 'ryaet', 'ryaep', 'ryaeh', 'reo', 'reog', 'reogg', 'reogs',
+        'reon', 'reonj', 'reonh', 'reod', 'reol', 'reolg', 'reolm', 'reolb', 'reols', 'reolt', 'reolp', 'reolh', 'reom', 'reob', 'reobs', 'reos',
+    ],
+    'xbe': [
+        'byum', 'byub', 'byubs', 'byus', 'byuss', 'byung', 'byuj', 'byuc', 'byuk', 'byut', 'byup', 'byuh', 'beu', 'beug', 'beugg', 'beugs',
+        'beun', 'beunj', 'beunh', 'beud', 'beul', 'beulg', 'beulm', 'beulb', 'beuls', 'beult', 'beulp', 'beulh', 'beum', 'beub', 'beubs', 'beus',
+        'beuss', 'beung', 'beuj', 'beuc', 'beuk', 'beut', 'beup', 'beuh', 'byi', 'byig', 'byigg', 'byigs', 'byin', 'byinj', 'byinh', 'byid',
+        'byil', 'byilg', 'byilm', 'byilb', 'byils', 'byilt', 'byilp', 'byilh', 'byim', 'byib', 'byibs', 'byis', 'byiss', 'bying', 'byij', 'byic',
+        'byik', 'byit', 'byip', 'byih', 'bi', 'big', 'bigg', 'bigs', 'bin', 'binj', 'binh', 'bid', 'bil', 'bilg', 'bilm', 'bilb',
+        'bils', 'bilt', 'bilp', 'bilh', 'bim', 'bib', 'bibs', 'bis', 'biss', 'bing', 'bij', 'bic', 'bik', 'bit', 'bip', 'bih',
+        'bba', 'bbag', 'bbagg', 'bbags', 'bban', 'bbanj', 'bbanh', 'bbad', 'bbal', 'bbalg', 'bbalm', 'bbalb', 'bbals', 'bbalt', 'bbalp', 'bbalh',
+        'bbam', 'bbab', 'bbabs', 'bbas', 'bbass', 'bbang', 'bbaj', 'bbac', 'bbak', 'bbat', 'bbap', 'bbah', 'bbae', 'bbaeg', 'bbaegg', 'bbaegs',
+        'bbaen', 'bbaenj', 'bbaenh', 'bbaed', 'bbael', 'bbaelg', 'bbaelm', 'bbaelb', 'bbaels', 'bbaelt', 'bbaelp', 'bbaelh', 'bbaem', 'bbaeb', 'bbaebs', 'bbaes',
+        'bbaess', 'bbaeng', 'bbaej', 'bbaec', 'bbaek', 'bbaet', 'bbaep', 'bbaeh', 'bbya', 'bbyag', 'bbyagg', 'bbyags', 'bbyan', 'bbyanj', 'bbyanh', 'bbyad',
+        'bbyal', 'bbyalg', 'bbyalm', 'bbyalb', 'bbyals', 'bbyalt', 'bbyalp', 'bbyalh', 'bbyam', 'bbyab', 'bbyabs', 'bbyas', 'bbyass', 'bbyang', 'bbyaj', 'bbyac',
+        'bbyak', 'bbyat', 'bbyap', 'bbyah', 'bbyae', 'bbyaeg', 'bbyaegg', 'bbyaegs', 'bbyaen', 'bbyaenj', 'bbyaenh', 'bbyaed', 'bbyael', 'bbyaelg', 'bbyaelm', 'bbyaelb',
+        'bbyaels', 'bbyaelt', 'bbyaelp', 'bbyaelh', 'bbyaem', 'bbyaeb', 'bbyaebs', 'bbyaes', 'bbyaess', 'bbyaeng', 'bbyaej', 'bbyaec', 'bbyaek', 'bbyaet', 'bbyaep', 'bbyaeh',
+        'bbeo', 'bbeog', 'bbeogg', 'bbeogs', 'bbeon', 'bbeonj', 'bbeonh', 'bbeod', 'bbeol', 'bbeolg', 'bbeolm', 'bbeolb', 'bbeols', 'bbeolt', 'bbeolp', 'bbeolh',
+        'bbeom', 'bbeob', 'bbeobs', 'bbeos', 'bbeoss', 'bbeong', 'bbeoj', 'bbeoc', 'bbeok', 'bbeot', 'bbeop', 'bbeoh', 'bbe', 'bbeg', 'bbegg', 'bbegs',
+        'bben', 'bbenj', 'bbenh', 'bbed', 'bbel', 'bbelg', 'bbelm', 'bbelb', 'bbels', 'bbelt', 'bbelp', 'bbelh', 'bbem', 'bbeb', 'bbebs', 'bbes',
+    ],
+    'x10': [
+        'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'nny', 'tt', 'tth', 'dd', 'ddh', 'nn',
+        'tt', 'th', 'd', 'dh', 'n', 'p', 'ph', 'b', 'bh', 'm', 'y', 'r', 'l', 'w', 's', 'h',
+        'll', 'a', '[?]', 'i', 'ii', 'u', 'uu', 'e', '[?]', 'o', 'au', '[?]', 'aa', 'i', 'ii', 'u',
+        'uu', 'e', 'ai', '[?]', '[?]', '[?]', 'N', "'", ':', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ' / ', ' // ', 'n*', 'r*', 'l*', 'e*',
+        'sh', 'ss', 'R', 'RR', 'L', 'LL', 'R', 'RR', 'L', 'LL', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        'A', 'B', 'G', 'D', 'E', 'V', 'Z', 'T`', 'I', 'K', 'L', 'M', 'N', 'O', 'P', 'Zh',
+        'R', 'S', 'T', 'U', 'P`', 'K`', "G'", 'Q', 'Sh', 'Ch`', 'C`', "Z'", 'C', 'Ch', 'X', 'J',
+        'H', 'E', 'Y', 'W', 'Xh', 'OE', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        'a', 'b', 'g', 'd', 'e', 'v', 'z', 't`', 'i', 'k', 'l', 'm', 'n', 'o', 'p', 'zh',
+        'r', 's', 't', 'u', 'p`', 'k`', "g'", 'q', 'sh', 'ch`', 'c`', "z'", 'c', 'ch', 'x', 'j',
+        'h', 'e', 'y', 'w', 'xh', 'oe', 'f', '[?]', '[?]', '[?]', '[?]', ' // ', '[?]', '[?]', '[?]',
+    ],
+    'x1f': [
+        'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A',
+        'e', 'e', 'e', 'e', 'e', 'e', '[?]', '[?]', 'E', 'E', 'E', 'E', 'E', 'E', '[?]', '[?]',
+        'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'E', 'E', 'E', 'E', 'E', 'E', 'E', 'E',
+        'i', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'I', 'I', 'I', 'I', 'I', 'I', 'I', 'I',
+        'o', 'o', 'o', 'o', 'o', 'o', '[?]', '[?]', 'O', 'O', 'O', 'O', 'O', 'O', '[?]', '[?]',
+        'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', '[?]', 'U', '[?]', 'U', '[?]', 'U', '[?]', 'U',
+        'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'O', 'O', 'O', 'O', 'O', 'O', 'O', 'O',
+        'a', 'a', 'e', 'e', 'e', 'e', 'i', 'i', 'o', 'o', 'u', 'u', 'o', 'o', '[?]', '[?]',
+        'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A',
+        'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'E', 'E', 'E', 'E', 'E', 'E', 'E', 'E',
+        'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'O', 'O', 'O', 'O', 'O', 'O', 'O', 'O',
+        'a', 'a', 'a', 'a', 'a', '[?]', 'a', 'a', 'A', 'A', 'A', 'A', 'A', "'", 'i', "'",
+        '~', '"~', 'e', 'e', 'e', '[?]', 'e', 'e', 'E', 'E', 'E', 'E', 'E', "'`", "''", "'~",
+        'i', 'i', 'i', 'i', '[?]', '[?]', 'i', 'i', 'I', 'I', 'I', 'I', '[?]', "`'", "`'", '`~',
+        'u', 'u', 'u', 'u', 'R', 'R', 'u', 'u', 'U', 'U', 'U', 'U', 'R', '"`', '"\'', '`',
+        '[?]', '[?]', 'o', 'o', 'o', '[?]', 'o', 'o', 'O', 'O', 'O', 'O', 'O', "'", '`',
+    ],
+    'x31': [
+        '[?]', '[?]', '[?]', '[?]', '[?]', 'B', 'P', 'M', 'F', 'D', 'T', 'N', 'L', 'G', 'K', 'H',
+        'J', 'Q', 'X', 'ZH', 'CH', 'SH', 'R', 'Z', 'C', 'S', 'A', 'O', 'E', 'EH', 'AI', 'EI',
+        'AU', 'OU', 'AN', 'EN', 'ANG', 'ENG', 'ER', 'I', 'U', 'IU', 'V', 'NG', 'GN', '[?]', '[?]', '[?]',
+        '[?]', 'g', 'gg', 'gs', 'n', 'nj', 'nh', 'd', 'dd', 'r', 'lg', 'lm', 'lb', 'ls', 'lt', 'lp',
+        'rh', 'm', 'b', 'bb', 'bs', 's', 'ss', '', 'j', 'jj', 'c', 'k', 't', 'p', 'h', 'a',
+        'ae', 'ya', 'yae', 'eo', 'e', 'yeo', 'ye', 'o', 'wa', 'wae', 'oe', 'yo', 'u', 'weo', 'we', 'wi',
+        'yu', 'eu', 'yi', 'i', '', 'nn', 'nd', 'ns', 'nZ', 'lgs', 'ld', 'lbs', 'lZ', 'lQ', 'mb', 'ms',
+        'mZ', 'mN', 'bg', '', 'bsg', 'bst', 'bj', 'bt', 'bN', 'bbN', 'sg', 'sn', 'sd', 'sb', 'sj', 'Z',
+        '', 'N', 'Ns', 'NZ', 'pN', 'hh', 'Q', 'yo-ya', 'yo-yae', 'yo-i', 'yu-yeo', 'yu-ye', 'yu-i', 'U', 'U-i', '[?]',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        'BU', 'ZI', 'JI', 'GU', 'EE', 'ENN', 'OO', 'ONN', 'IR', 'ANN', 'INN', 'UNN', 'IM', 'NGG', 'AINN', 'AUNN',
+        'AM', 'OM', 'ONG', 'INNN', 'P', 'T', 'K', 'H', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'x18': [
+        ' @ ', ' ... ', ', ', '. ', ': ', ' // ', '', '-', ', ', '. ', '', '', '', '', '', '[?]',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        'a', 'e', 'i', 'o', 'u', 'O', 'U', 'ee', 'n', 'ng', 'b', 'p', 'q', 'g', 'm', 'l',
+        's', 'sh', 't', 'd', 'ch', 'j', 'y', 'r', 'w', 'f', 'k', 'kha', 'ts', 'z', 'h', 'zr',
+        'lh', 'zh', 'ch', '-', 'e', 'i', 'o', 'u', 'O', 'U', 'ng', 'b', 'p', 'q', 'g', 'm',
+        't', 'd', 'ch', 'j', 'ts', 'y', 'w', 'k', 'g', 'h', 'jy', 'ny', 'dz', 'e', 'i', 'iy',
+        'U', 'u', 'ng', 'k', 'g', 'h', 'p', 'sh', 't', 'd', 'j', 'f', 'g', 'h', 'ts', 'z',
+        'r', 'ch', 'zh', 'i', 'k', 'r', 'f', 'zh', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', 'H', 'X', 'W', 'M', ' 3 ', ' 333 ', 'a', 'i', 'k', 'ng', 'c', 'tt', 'tth', 'dd', 'nn',
+        't', 'd', 'p', 'ph', 'ss', 'zh', 'z', 'a', 't', 'zh', 'gh', 'ng', 'c', 'jh', 'tta', 'ddh',
+        't', 'dh', 'ss', 'cy', 'zh', 'z', 'u', 'y', 'bh', "'", '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'x11': [
+        'g', 'gg', 'n', 'd', 'dd', 'r', 'm', 'b', 'bb', 's', 'ss', '', 'j', 'jj', 'c', 'k',
+        't', 'p', 'h', 'ng', 'nn', 'nd', 'nb', 'dg', 'rn', 'rr', 'rh', 'rN', 'mb', 'mN', 'bg', 'bn',
+        '', 'bs', 'bsg', 'bst', 'bsb', 'bss', 'bsj', 'bj', 'bc', 'bt', 'bp', 'bN', 'bbN', 'sg', 'sn', 'sd',
+        'sr', 'sm', 'sb', 'sbg', 'sss', 's', 'sj', 'sc', 'sk', 'st', 'sp', 'sh', '', '', '', '',
+        'Z', 'g', 'd', 'm', 'b', 's', 'Z', '', 'j', 'c', 't', 'p', 'N', 'j', '', '',
+        '', '', 'ck', 'ch', '', '', 'pb', 'pN', 'hh', 'Q', '[?]', '[?]', '[?]', '[?]', '[?]', '',
+        '', 'a', 'ae', 'ya', 'yae', 'eo', 'e', 'yeo', 'ye', 'o', 'wa', 'wae', 'oe', 'yo', 'u', 'weo',
+        'we', 'wi', 'yu', 'eu', 'yi', 'i', 'a-o', 'a-u', 'ya-o', 'ya-yo', 'eo-o', 'eo-u', 'eo-eu', 'yeo-o', 'yeo-u', 'o-eo',
+        'o-e', 'o-ye', 'o-o', 'o-u', 'yo-ya', 'yo-yae', 'yo-yeo', 'yo-o', 'yo-i', 'u-a', 'u-ae', 'u-eo-eu', 'u-ye', 'u-u', 'yu-a', 'yu-eo',
+        'yu-e', 'yu-yeo', 'yu-ye', 'yu-u', 'yu-i', 'eu-u', 'eu-eu', 'yi-u', 'i-a', 'i-ya', 'i-o', 'i-u', 'i-eu', 'i-U', 'U', 'U-eo',
+        'U-u', 'U-i', 'UU', '[?]', '[?]', '[?]', '[?]', '[?]', 'g', 'gg', 'gs', 'n', 'nj', 'nh', 'd', 'l',
+        'lg', 'lm', 'lb', 'ls', 'lt', 'lp', 'lh', 'm', 'b', 'bs', 's', 'ss', 'ng', 'j', 'c', 'k',
+        't', 'p', 'h', 'gl', 'gsg', 'ng', 'nd', 'ns', 'nZ', 'nt', 'dg', 'tl', 'lgs', 'ln', 'ld', 'lth',
+        'll', 'lmg', 'lms', 'lbs', 'lbh', 'rNp', 'lss', 'lZ', 'lk', 'lQ', 'mg', 'ml', 'mb', 'ms', 'mss', 'mZ',
+        'mc', 'mh', 'mN', 'bl', 'bp', 'ph', 'pN', 'sg', 'sd', 'sl', 'sb', 'Z', 'g', 'ss', '', 'kh',
+        'N', 'Ns', 'NZ', 'pb', 'pN', 'hn', 'hl', 'hm', 'hb', 'Q', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xcf': [
+        'ke', 'keg', 'kegg', 'kegs', 'ken', 'kenj', 'kenh', 'ked', 'kel', 'kelg', 'kelm', 'kelb', 'kels', 'kelt', 'kelp', 'kelh',
+        'kem', 'keb', 'kebs', 'kes', 'kess', 'keng', 'kej', 'kec', 'kek', 'ket', 'kep', 'keh', 'kyeo', 'kyeog', 'kyeogg', 'kyeogs',
+        'kyeon', 'kyeonj', 'kyeonh', 'kyeod', 'kyeol', 'kyeolg', 'kyeolm', 'kyeolb', 'kyeols', 'kyeolt', 'kyeolp', 'kyeolh', 'kyeom', 'kyeob', 'kyeobs', 'kyeos',
+        'kyeoss', 'kyeong', 'kyeoj', 'kyeoc', 'kyeok', 'kyeot', 'kyeop', 'kyeoh', 'kye', 'kyeg', 'kyegg', 'kyegs', 'kyen', 'kyenj', 'kyenh', 'kyed',
+        'kyel', 'kyelg', 'kyelm', 'kyelb', 'kyels', 'kyelt', 'kyelp', 'kyelh', 'kyem', 'kyeb', 'kyebs', 'kyes', 'kyess', 'kyeng', 'kyej', 'kyec',
+        'kyek', 'kyet', 'kyep', 'kyeh', 'ko', 'kog', 'kogg', 'kogs', 'kon', 'konj', 'konh', 'kod', 'kol', 'kolg', 'kolm', 'kolb',
+        'kols', 'kolt', 'kolp', 'kolh', 'kom', 'kob', 'kobs', 'kos', 'koss', 'kong', 'koj', 'koc', 'kok', 'kot', 'kop', 'koh',
+        'kwa', 'kwag', 'kwagg', 'kwags', 'kwan', 'kwanj', 'kwanh', 'kwad', 'kwal', 'kwalg', 'kwalm', 'kwalb', 'kwals', 'kwalt', 'kwalp', 'kwalh',
+        'kwam', 'kwab', 'kwabs', 'kwas', 'kwass', 'kwang', 'kwaj', 'kwac', 'kwak', 'kwat', 'kwap', 'kwah', 'kwae', 'kwaeg', 'kwaegg', 'kwaegs',
+        'kwaen', 'kwaenj', 'kwaenh', 'kwaed', 'kwael', 'kwaelg', 'kwaelm', 'kwaelb', 'kwaels', 'kwaelt', 'kwaelp', 'kwaelh', 'kwaem', 'kwaeb', 'kwaebs', 'kwaes',
+        'kwaess', 'kwaeng', 'kwaej', 'kwaec', 'kwaek', 'kwaet', 'kwaep', 'kwaeh', 'koe', 'koeg', 'koegg', 'koegs', 'koen', 'koenj', 'koenh', 'koed',
+        'koel', 'koelg', 'koelm', 'koelb', 'koels', 'koelt', 'koelp', 'koelh', 'koem', 'koeb', 'koebs', 'koes', 'koess', 'koeng', 'koej', 'koec',
+        'koek', 'koet', 'koep', 'koeh', 'kyo', 'kyog', 'kyogg', 'kyogs', 'kyon', 'kyonj', 'kyonh', 'kyod', 'kyol', 'kyolg', 'kyolm', 'kyolb',
+        'kyols', 'kyolt', 'kyolp', 'kyolh', 'kyom', 'kyob', 'kyobs', 'kyos', 'kyoss', 'kyong', 'kyoj', 'kyoc', 'kyok', 'kyot', 'kyop', 'kyoh',
+        'ku', 'kug', 'kugg', 'kugs', 'kun', 'kunj', 'kunh', 'kud', 'kul', 'kulg', 'kulm', 'kulb', 'kuls', 'kult', 'kulp', 'kulh',
+        'kum', 'kub', 'kubs', 'kus', 'kuss', 'kung', 'kuj', 'kuc', 'kuk', 'kut', 'kup', 'kuh', 'kweo', 'kweog', 'kweogg', 'kweogs',
+    ],
+    'x01': [
+        'A', 'a', 'A', 'a', 'A', 'a', 'C', 'c', 'C', 'c', 'C', 'c', 'C', 'c', 'D', 'd',
+        'D', 'd', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'G', 'g', 'G', 'g',
+        'G', 'g', 'G', 'g', 'H', 'h', 'H', 'h', 'I', 'i', 'I', 'i', 'I', 'i', 'I', 'i',
+        'I', 'i', 'IJ', '', 'J', 'j', 'K', 'k', 'k', 'L', 'l', 'L', 'l', 'L', 'l', 'L',
+        'l', 'L', 'l', 'N', 'n', 'N', 'n', 'N', 'n', "'n", 'ng', 'NG', 'O', 'o', 'O', 'o',
+        'O', 'o', 'OE', 'oe', 'R', 'r', 'R', 'r', 'R', 'r', 'S', 's', 'S', 's', 'S', 's',
+        'S', 's', 'T', 't', 'T', 't', 'T', 't', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u',
+        'U', 'u', 'U', 'u', 'W', 'w', 'Y', 'y', 'Y', 'Z', 'z', 'Z', 'z', 'Z', 'z', 's',
+        'b', 'B', 'B', 'b', '6', '6', 'O', 'C', 'c', 'D', 'D', 'D', 'd', 'd', '3', '@',
+        'E', 'F', 'f', 'G', 'G', 'hv', 'I', 'I', 'K', 'k', 'l', 'l', 'W', 'N', 'n', 'O',
+        'O', 'o', 'OI', 'oi', 'P', 'p', 'YR', '2', '2', 'SH', 'sh', 't', 'T', 't', 'T', 'U',
+        'u', 'Y', 'V', 'Y', 'y', 'Z', 'z', 'ZH', 'ZH', 'zh', 'zh', '2', '5', '5', 'ts', 'w',
+        '|', '||', '|=', '!', 'DZ', 'Dz', 'dz', 'LJ', 'Lj', 'lj', 'NJ', 'Nj', 'nj', 'A', 'a', 'I',
+        'i', 'O', 'o', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', '@', 'A', 'a',
+        'A', 'a', 'AE', 'ae', 'G', 'g', 'G', 'g', 'K', 'k', 'O', 'o', 'O', 'o', 'ZH', 'zh',
+        'j', 'DZ', 'D', 'dz', 'G', 'g', 'HV', 'W', 'N', 'n', 'A', 'a', 'AE', 'ae', 'O', 'o',
+    ],
+    'xc7': [
+        'wek', 'wet', 'wep', 'weh', 'wi', 'wig', 'wigg', 'wigs', 'win', 'winj', 'winh', 'wid', 'wil', 'wilg', 'wilm', 'wilb',
+        'wils', 'wilt', 'wilp', 'wilh', 'wim', 'wib', 'wibs', 'wis', 'wiss', 'wing', 'wij', 'wic', 'wik', 'wit', 'wip', 'wih',
+        'yu', 'yug', 'yugg', 'yugs', 'yun', 'yunj', 'yunh', 'yud', 'yul', 'yulg', 'yulm', 'yulb', 'yuls', 'yult', 'yulp', 'yulh',
+        'yum', 'yub', 'yubs', 'yus', 'yuss', 'yung', 'yuj', 'yuc', 'yuk', 'yut', 'yup', 'yuh', 'eu', 'eug', 'eugg', 'eugs',
+        'eun', 'eunj', 'eunh', 'eud', 'eul', 'eulg', 'eulm', 'eulb', 'euls', 'eult', 'eulp', 'eulh', 'eum', 'eub', 'eubs', 'eus',
+        'euss', 'eung', 'euj', 'euc', 'euk', 'eut', 'eup', 'euh', 'yi', 'yig', 'yigg', 'yigs', 'yin', 'yinj', 'yinh', 'yid',
+        'yil', 'yilg', 'yilm', 'yilb', 'yils', 'yilt', 'yilp', 'yilh', 'yim', 'yib', 'yibs', 'yis', 'yiss', 'ying', 'yij', 'yic',
+        'yik', 'yit', 'yip', 'yih', 'i', 'ig', 'igg', 'igs', 'in', 'inj', 'inh', 'id', 'il', 'ilg', 'ilm', 'ilb',
+        'ils', 'ilt', 'ilp', 'ilh', 'im', 'ib', 'ibs', 'is', 'iss', 'ing', 'ij', 'ic', 'ik', 'it', 'ip', 'ih',
+        'ja', 'jag', 'jagg', 'jags', 'jan', 'janj', 'janh', 'jad', 'jal', 'jalg', 'jalm', 'jalb', 'jals', 'jalt', 'jalp', 'jalh',
+        'jam', 'jab', 'jabs', 'jas', 'jass', 'jang', 'jaj', 'jac', 'jak', 'jat', 'jap', 'jah', 'jae', 'jaeg', 'jaegg', 'jaegs',
+        'jaen', 'jaenj', 'jaenh', 'jaed', 'jael', 'jaelg', 'jaelm', 'jaelb', 'jaels', 'jaelt', 'jaelp', 'jaelh', 'jaem', 'jaeb', 'jaebs', 'jaes',
+        'jaess', 'jaeng', 'jaej', 'jaec', 'jaek', 'jaet', 'jaep', 'jaeh', 'jya', 'jyag', 'jyagg', 'jyags', 'jyan', 'jyanj', 'jyanh', 'jyad',
+        'jyal', 'jyalg', 'jyalm', 'jyalb', 'jyals', 'jyalt', 'jyalp', 'jyalh', 'jyam', 'jyab', 'jyabs', 'jyas', 'jyass', 'jyang', 'jyaj', 'jyac',
+        'jyak', 'jyat', 'jyap', 'jyah', 'jyae', 'jyaeg', 'jyaegg', 'jyaegs', 'jyaen', 'jyaenj', 'jyaenh', 'jyaed', 'jyael', 'jyaelg', 'jyaelm', 'jyaelb',
+        'jyaels', 'jyaelt', 'jyaelp', 'jyaelh', 'jyaem', 'jyaeb', 'jyaebs', 'jyaes', 'jyaess', 'jyaeng', 'jyaej', 'jyaec', 'jyaek', 'jyaet', 'jyaep', 'jyaeh',
+    ],
+    'x16': [
+        'kka', 'kk', 'nu', 'no', 'ne', 'nee', 'ni', 'na', 'mu', 'mo', 'me', 'mee', 'mi', 'ma', 'yu', 'yo',
+        'ye', 'yee', 'yi', 'ya', 'ju', 'ju', 'jo', 'je', 'jee', 'ji', 'ji', 'ja', 'jju', 'jjo', 'jje', 'jjee',
+        'jji', 'jja', 'lu', 'lo', 'le', 'lee', 'li', 'la', 'dlu', 'dlo', 'dle', 'dlee', 'dli', 'dla', 'lhu', 'lho',
+        'lhe', 'lhee', 'lhi', 'lha', 'tlhu', 'tlho', 'tlhe', 'tlhee', 'tlhi', 'tlha', 'tlu', 'tlo', 'tle', 'tlee', 'tli', 'tla',
+        'zu', 'zo', 'ze', 'zee', 'zi', 'za', 'z', 'z', 'dzu', 'dzo', 'dze', 'dzee', 'dzi', 'dza', 'su', 'so',
+        'se', 'see', 'si', 'sa', 'shu', 'sho', 'she', 'shee', 'shi', 'sha', 'sh', 'tsu', 'tso', 'tse', 'tsee', 'tsi',
+        'tsa', 'chu', 'cho', 'che', 'chee', 'chi', 'cha', 'ttsu', 'ttso', 'ttse', 'ttsee', 'ttsi', 'ttsa', 'X', '.', 'qai',
+        'ngai', 'nngi', 'nngii', 'nngo', 'nngoo', 'nnga', 'nngaa', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        ' ', 'b', 'l', 'f', 's', 'n', 'h', 'd', 't', 'c', 'q', 'm', 'g', 'ng', 'z', 'r',
+        'a', 'o', 'u', 'e', 'i', 'ch', 'th', 'ph', 'p', 'x', 'p', '<', '>', '[?]', '[?]', '[?]',
+        'f', 'v', 'u', 'yr', 'y', 'w', 'th', 'th', 'a', 'o', 'ac', 'ae', 'o', 'o', 'o', 'oe',
+        'on', 'r', 'k', 'c', 'k', 'g', 'ng', 'g', 'g', 'w', 'h', 'h', 'h', 'h', 'n', 'n',
+        'n', 'i', 'e', 'j', 'g', 'ae', 'a', 'eo', 'p', 'z', 's', 's', 's', 'c', 'z', 't',
+        't', 'd', 'b', 'b', 'p', 'p', 'e', 'm', 'm', 'm', 'l', 'l', 'ng', 'ng', 'd', 'o',
+        'ear', 'ior', 'qu', 'qu', 'qu', 's', 'yr', 'yr', 'yr', 'q', 'x', '.', ':', '+', '17', '18',
+        '19', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xac': [
+        'ga', 'gag', 'gagg', 'gags', 'gan', 'ganj', 'ganh', 'gad', 'gal', 'galg', 'galm', 'galb', 'gals', 'galt', 'galp', 'galh',
+        'gam', 'gab', 'gabs', 'gas', 'gass', 'gang', 'gaj', 'gac', 'gak', 'gat', 'gap', 'gah', 'gae', 'gaeg', 'gaegg', 'gaegs',
+        'gaen', 'gaenj', 'gaenh', 'gaed', 'gael', 'gaelg', 'gaelm', 'gaelb', 'gaels', 'gaelt', 'gaelp', 'gaelh', 'gaem', 'gaeb', 'gaebs', 'gaes',
+        'gaess', 'gaeng', 'gaej', 'gaec', 'gaek', 'gaet', 'gaep', 'gaeh', 'gya', 'gyag', 'gyagg', 'gyags', 'gyan', 'gyanj', 'gyanh', 'gyad',
+        'gyal', 'gyalg', 'gyalm', 'gyalb', 'gyals', 'gyalt', 'gyalp', 'gyalh', 'gyam', 'gyab', 'gyabs', 'gyas', 'gyass', 'gyang', 'gyaj', 'gyac',
+        'gyak', 'gyat', 'gyap', 'gyah', 'gyae', 'gyaeg', 'gyaegg', 'gyaegs', 'gyaen', 'gyaenj', 'gyaenh', 'gyaed', 'gyael', 'gyaelg', 'gyaelm', 'gyaelb',
+        'gyaels', 'gyaelt', 'gyaelp', 'gyaelh', 'gyaem', 'gyaeb', 'gyaebs', 'gyaes', 'gyaess', 'gyaeng', 'gyaej', 'gyaec', 'gyaek', 'gyaet', 'gyaep', 'gyaeh',
+        'geo', 'geog', 'geogg', 'geogs', 'geon', 'geonj', 'geonh', 'geod', 'geol', 'geolg', 'geolm', 'geolb', 'geols', 'geolt', 'geolp', 'geolh',
+        'geom', 'geob', 'geobs', 'geos', 'geoss', 'geong', 'geoj', 'geoc', 'geok', 'geot', 'geop', 'geoh', 'ge', 'geg', 'gegg', 'gegs',
+        'gen', 'genj', 'genh', 'ged', 'gel', 'gelg', 'gelm', 'gelb', 'gels', 'gelt', 'gelp', 'gelh', 'gem', 'geb', 'gebs', 'ges',
+        'gess', 'geng', 'gej', 'gec', 'gek', 'get', 'gep', 'geh', 'gyeo', 'gyeog', 'gyeogg', 'gyeogs', 'gyeon', 'gyeonj', 'gyeonh', 'gyeod',
+        'gyeol', 'gyeolg', 'gyeolm', 'gyeolb', 'gyeols', 'gyeolt', 'gyeolp', 'gyeolh', 'gyeom', 'gyeob', 'gyeobs', 'gyeos', 'gyeoss', 'gyeong', 'gyeoj', 'gyeoc',
+        'gyeok', 'gyeot', 'gyeop', 'gyeoh', 'gye', 'gyeg', 'gyegg', 'gyegs', 'gyen', 'gyenj', 'gyenh', 'gyed', 'gyel', 'gyelg', 'gyelm', 'gyelb',
+        'gyels', 'gyelt', 'gyelp', 'gyelh', 'gyem', 'gyeb', 'gyebs', 'gyes', 'gyess', 'gyeng', 'gyej', 'gyec', 'gyek', 'gyet', 'gyep', 'gyeh',
+        'go', 'gog', 'gogg', 'gogs', 'gon', 'gonj', 'gonh', 'god', 'gol', 'golg', 'golm', 'golb', 'gols', 'golt', 'golp', 'golh',
+        'gom', 'gob', 'gobs', 'gos', 'goss', 'gong', 'goj', 'goc', 'gok', 'got', 'gop', 'goh', 'gwa', 'gwag', 'gwagg', 'gwags',
+    ],
+    'xbf': [
+        'bbess', 'bbeng', 'bbej', 'bbec', 'bbek', 'bbet', 'bbep', 'bbeh', 'bbyeo', 'bbyeog', 'bbyeogg', 'bbyeogs', 'bbyeon', 'bbyeonj', 'bbyeonh', 'bbyeod',
+        'bbyeol', 'bbyeolg', 'bbyeolm', 'bbyeolb', 'bbyeols', 'bbyeolt', 'bbyeolp', 'bbyeolh', 'bbyeom', 'bbyeob', 'bbyeobs', 'bbyeos', 'bbyeoss', 'bbyeong', 'bbyeoj', 'bbyeoc',
+        'bbyeok', 'bbyeot', 'bbyeop', 'bbyeoh', 'bbye', 'bbyeg', 'bbyegg', 'bbyegs', 'bbyen', 'bbyenj', 'bbyenh', 'bbyed', 'bbyel', 'bbyelg', 'bbyelm', 'bbyelb',
+        'bbyels', 'bbyelt', 'bbyelp', 'bbyelh', 'bbyem', 'bbyeb', 'bbyebs', 'bbyes', 'bbyess', 'bbyeng', 'bbyej', 'bbyec', 'bbyek', 'bbyet', 'bbyep', 'bbyeh',
+        'bbo', 'bbog', 'bbogg', 'bbogs', 'bbon', 'bbonj', 'bbonh', 'bbod', 'bbol', 'bbolg', 'bbolm', 'bbolb', 'bbols', 'bbolt', 'bbolp', 'bbolh',
+        'bbom', 'bbob', 'bbobs', 'bbos', 'bboss', 'bbong', 'bboj', 'bboc', 'bbok', 'bbot', 'bbop', 'bboh', 'bbwa', 'bbwag', 'bbwagg', 'bbwags',
+        'bbwan', 'bbwanj', 'bbwanh', 'bbwad', 'bbwal', 'bbwalg', 'bbwalm', 'bbwalb', 'bbwals', 'bbwalt', 'bbwalp', 'bbwalh', 'bbwam', 'bbwab', 'bbwabs', 'bbwas',
+        'bbwass', 'bbwang', 'bbwaj', 'bbwac', 'bbwak', 'bbwat', 'bbwap', 'bbwah', 'bbwae', 'bbwaeg', 'bbwaegg', 'bbwaegs', 'bbwaen', 'bbwaenj', 'bbwaenh', 'bbwaed',
+        'bbwael', 'bbwaelg', 'bbwaelm', 'bbwaelb', 'bbwaels', 'bbwaelt', 'bbwaelp', 'bbwaelh', 'bbwaem', 'bbwaeb', 'bbwaebs', 'bbwaes', 'bbwaess', 'bbwaeng', 'bbwaej', 'bbwaec',
+        'bbwaek', 'bbwaet', 'bbwaep', 'bbwaeh', 'bboe', 'bboeg', 'bboegg', 'bboegs', 'bboen', 'bboenj', 'bboenh', 'bboed', 'bboel', 'bboelg', 'bboelm', 'bboelb',
+        'bboels', 'bboelt', 'bboelp', 'bboelh', 'bboem', 'bboeb', 'bboebs', 'bboes', 'bboess', 'bboeng', 'bboej', 'bboec', 'bboek', 'bboet', 'bboep', 'bboeh',
+        'bbyo', 'bbyog', 'bbyogg', 'bbyogs', 'bbyon', 'bbyonj', 'bbyonh', 'bbyod', 'bbyol', 'bbyolg', 'bbyolm', 'bbyolb', 'bbyols', 'bbyolt', 'bbyolp', 'bbyolh',
+        'bbyom', 'bbyob', 'bbyobs', 'bbyos', 'bbyoss', 'bbyong', 'bbyoj', 'bbyoc', 'bbyok', 'bbyot', 'bbyop', 'bbyoh', 'bbu', 'bbug', 'bbugg', 'bbugs',
+        'bbun', 'bbunj', 'bbunh', 'bbud', 'bbul', 'bbulg', 'bbulm', 'bbulb', 'bbuls', 'bbult', 'bbulp', 'bbulh', 'bbum', 'bbub', 'bbubs', 'bbus',
+        'bbuss', 'bbung', 'bbuj', 'bbuc', 'bbuk', 'bbut', 'bbup', 'bbuh', 'bbweo', 'bbweog', 'bbweogg', 'bbweogs', 'bbweon', 'bbweonj', 'bbweonh', 'bbweod',
+        'bbweol', 'bbweolg', 'bbweolm', 'bbweolb', 'bbweols', 'bbweolt', 'bbweolp', 'bbweolh', 'bbweom', 'bbweob', 'bbweobs', 'bbweos', 'bbweoss', 'bbweong', 'bbweoj', 'bbweoc',
+    ],
+    'xd3': [
+        'tim', 'tib', 'tibs', 'tis', 'tiss', 'ting', 'tij', 'tic', 'tik', 'tit', 'tip', 'tih', 'pa', 'pag', 'pagg', 'pags',
+        'pan', 'panj', 'panh', 'pad', 'pal', 'palg', 'palm', 'palb', 'pals', 'palt', 'palp', 'palh', 'pam', 'pab', 'pabs', 'pas',
+        'pass', 'pang', 'paj', 'pac', 'pak', 'pat', 'pap', 'pah', 'pae', 'paeg', 'paegg', 'paegs', 'paen', 'paenj', 'paenh', 'paed',
+        'pael', 'paelg', 'paelm', 'paelb', 'paels', 'paelt', 'paelp', 'paelh', 'paem', 'paeb', 'paebs', 'paes', 'paess', 'paeng', 'paej', 'paec',
+        'paek', 'paet', 'paep', 'paeh', 'pya', 'pyag', 'pyagg', 'pyags', 'pyan', 'pyanj', 'pyanh', 'pyad', 'pyal', 'pyalg', 'pyalm', 'pyalb',
+        'pyals', 'pyalt', 'pyalp', 'pyalh', 'pyam', 'pyab', 'pyabs', 'pyas', 'pyass', 'pyang', 'pyaj', 'pyac', 'pyak', 'pyat', 'pyap', 'pyah',
+        'pyae', 'pyaeg', 'pyaegg', 'pyaegs', 'pyaen', 'pyaenj', 'pyaenh', 'pyaed', 'pyael', 'pyaelg', 'pyaelm', 'pyaelb', 'pyaels', 'pyaelt', 'pyaelp', 'pyaelh',
+        'pyaem', 'pyaeb', 'pyaebs', 'pyaes', 'pyaess', 'pyaeng', 'pyaej', 'pyaec', 'pyaek', 'pyaet', 'pyaep', 'pyaeh', 'peo', 'peog', 'peogg', 'peogs',
+        'peon', 'peonj', 'peonh', 'peod', 'peol', 'peolg', 'peolm', 'peolb', 'peols', 'peolt', 'peolp', 'peolh', 'peom', 'peob', 'peobs', 'peos',
+        'peoss', 'peong', 'peoj', 'peoc', 'peok', 'peot', 'peop', 'peoh', 'pe', 'peg', 'pegg', 'pegs', 'pen', 'penj', 'penh', 'ped',
+        'pel', 'pelg', 'pelm', 'pelb', 'pels', 'pelt', 'pelp', 'pelh', 'pem', 'peb', 'pebs', 'pes', 'pess', 'peng', 'pej', 'pec',
+        'pek', 'pet', 'pep', 'peh', 'pyeo', 'pyeog', 'pyeogg', 'pyeogs', 'pyeon', 'pyeonj', 'pyeonh', 'pyeod', 'pyeol', 'pyeolg', 'pyeolm', 'pyeolb',
+        'pyeols', 'pyeolt', 'pyeolp', 'pyeolh', 'pyeom', 'pyeob', 'pyeobs', 'pyeos', 'pyeoss', 'pyeong', 'pyeoj', 'pyeoc', 'pyeok', 'pyeot', 'pyeop', 'pyeoh',
+        'pye', 'pyeg', 'pyegg', 'pyegs', 'pyen', 'pyenj', 'pyenh', 'pyed', 'pyel', 'pyelg', 'pyelm', 'pyelb', 'pyels', 'pyelt', 'pyelp', 'pyelh',
+        'pyem', 'pyeb', 'pyebs', 'pyes', 'pyess', 'pyeng', 'pyej', 'pyec', 'pyek', 'pyet', 'pyep', 'pyeh', 'po', 'pog', 'pogg', 'pogs',
+        'pon', 'ponj', 'ponh', 'pod', 'pol', 'polg', 'polm', 'polb', 'pols', 'polt', 'polp', 'polh', 'pom', 'pob', 'pobs', 'pos',
+    ],
+    'x0e': [
+        '[?]', 'k', 'kh', 'kh', 'kh', 'kh', 'kh', 'ng', 'cch', 'ch', 'ch', 'ch', 'ch', 'y', 'd', 't',
+        'th', 'th', 'th', 'n', 'd', 't', 'th', 'th', 'th', 'n', 'b', 'p', 'ph', 'f', 'ph', 'f',
+        'ph', 'm', 'y', 'r', 'R', 'l', 'L', 'w', 's', 's', 's', 'h', 'l', '`', 'h', '~',
+        'a', 'a', 'aa', 'am', 'i', 'ii', 'ue', 'uue', 'u', 'uu', "'", '[?]', '[?]', '[?]', '[?]', 'Bh.',
+        'e', 'ae', 'o', 'ai', 'ai', 'ao', '+', '', '', '', '', '', '', 'M', '', ' * ',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ' // ', ' /// ', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', 'k', 'kh', '[?]', 'kh', '[?]', '[?]', 'ng', 'ch', '[?]', 's', '[?]', '[?]', 'ny', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', 'd', 'h', 'th', 'th', '[?]', 'n', 'b', 'p', 'ph', 'f', 'ph', 'f',
+        '[?]', 'm', 'y', 'r', '[?]', 'l', '[?]', 'w', '[?]', '[?]', 's', 'h', '[?]', '`', '', '~',
+        'a', '', 'aa', 'am', 'i', 'ii', 'y', 'yy', 'u', 'uu', '[?]', 'o', 'l', 'ny', '[?]', '[?]',
+        'e', 'ei', 'o', 'ay', 'ai', '[?]', '+', '[?]', '', '', '', '', '', 'M', '[?]', '[?]',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '[?]', '[?]', 'hn', 'hm', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xbd': [
+        'bols', 'bolt', 'bolp', 'bolh', 'bom', 'bob', 'bobs', 'bos', 'boss', 'bong', 'boj', 'boc', 'bok', 'bot', 'bop', 'boh',
+        'bwa', 'bwag', 'bwagg', 'bwags', 'bwan', 'bwanj', 'bwanh', 'bwad', 'bwal', 'bwalg', 'bwalm', 'bwalb', 'bwals', 'bwalt', 'bwalp', 'bwalh',
+        'bwam', 'bwab', 'bwabs', 'bwas', 'bwass', 'bwang', 'bwaj', 'bwac', 'bwak', 'bwat', 'bwap', 'bwah', 'bwae', 'bwaeg', 'bwaegg', 'bwaegs',
+        'bwaen', 'bwaenj', 'bwaenh', 'bwaed', 'bwael', 'bwaelg', 'bwaelm', 'bwaelb', 'bwaels', 'bwaelt', 'bwaelp', 'bwaelh', 'bwaem', 'bwaeb', 'bwaebs', 'bwaes',
+        'bwaess', 'bwaeng', 'bwaej', 'bwaec', 'bwaek', 'bwaet', 'bwaep', 'bwaeh', 'boe', 'boeg', 'boegg', 'boegs', 'boen', 'boenj', 'boenh', 'boed',
+        'boel', 'boelg', 'boelm', 'boelb', 'boels', 'boelt', 'boelp', 'boelh', 'boem', 'boeb', 'boebs', 'boes', 'boess', 'boeng', 'boej', 'boec',
+        'boek', 'boet', 'boep', 'boeh', 'byo', 'byog', 'byogg', 'byogs', 'byon', 'byonj', 'byonh', 'byod', 'byol', 'byolg', 'byolm', 'byolb',
+        'byols', 'byolt', 'byolp', 'byolh', 'byom', 'byob', 'byobs', 'byos', 'byoss', 'byong', 'byoj', 'byoc', 'byok', 'byot', 'byop', 'byoh',
+        'bu', 'bug', 'bugg', 'bugs', 'bun', 'bunj', 'bunh', 'bud', 'bul', 'bulg', 'bulm', 'bulb', 'buls', 'bult', 'bulp', 'bulh',
+        'bum', 'bub', 'bubs', 'bus', 'buss', 'bung', 'buj', 'buc', 'buk', 'but', 'bup', 'buh', 'bweo', 'bweog', 'bweogg', 'bweogs',
+        'bweon', 'bweonj', 'bweonh', 'bweod', 'bweol', 'bweolg', 'bweolm', 'bweolb', 'bweols', 'bweolt', 'bweolp', 'bweolh', 'bweom', 'bweob', 'bweobs', 'bweos',
+        'bweoss', 'bweong', 'bweoj', 'bweoc', 'bweok', 'bweot', 'bweop', 'bweoh', 'bwe', 'bweg', 'bwegg', 'bwegs', 'bwen', 'bwenj', 'bwenh', 'bwed',
+        'bwel', 'bwelg', 'bwelm', 'bwelb', 'bwels', 'bwelt', 'bwelp', 'bwelh', 'bwem', 'bweb', 'bwebs', 'bwes', 'bwess', 'bweng', 'bwej', 'bwec',
+        'bwek', 'bwet', 'bwep', 'bweh', 'bwi', 'bwig', 'bwigg', 'bwigs', 'bwin', 'bwinj', 'bwinh', 'bwid', 'bwil', 'bwilg', 'bwilm', 'bwilb',
+        'bwils', 'bwilt', 'bwilp', 'bwilh', 'bwim', 'bwib', 'bwibs', 'bwis', 'bwiss', 'bwing', 'bwij', 'bwic', 'bwik', 'bwit', 'bwip', 'bwih',
+        'byu', 'byug', 'byugg', 'byugs', 'byun', 'byunj', 'byunh', 'byud', 'byul', 'byulg', 'byulm', 'byulb', 'byuls', 'byult', 'byulp', 'byulh',
+    ],
+    'x0c': [
+        '[?]', 'N', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', 'R', 'L', '[?]', 'e', 'ee',
+        'ai', '[?]', 'o', 'oo', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
+        'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', '[?]', 'p', 'ph', 'b', 'bh', 'm', 'y',
+        'r', 'rr', 'l', 'll', '[?]', 'v', 'sh', 'ss', 's', 'h', '[?]', '[?]', '[?]', '[?]', 'aa', 'i',
+        'ii', 'u', 'uu', 'R', 'RR', '[?]', 'e', 'ee', 'ai', '[?]', 'o', 'oo', 'au', '', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '+', '+', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        'RR', 'LL', '[?]', '[?]', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', 'R', 'L', '[?]', 'e', 'ee',
+        'ai', '[?]', 'o', 'oo', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
+        'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', '[?]', 'p', 'ph', 'b', 'bh', 'm', 'y',
+        'r', 'rr', 'l', 'll', '[?]', 'v', 'sh', 'ss', 's', 'h', '[?]', '[?]', '[?]', '[?]', 'aa', 'i',
+        'ii', 'u', 'uu', 'R', 'RR', '[?]', 'e', 'ee', 'ai', '[?]', 'o', 'oo', 'au', '', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '+', '+', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', 'lll', '[?]',
+        'RR', 'LL', '[?]', '[?]', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xd1': [
+        'tyal', 'tyalg', 'tyalm', 'tyalb', 'tyals', 'tyalt', 'tyalp', 'tyalh', 'tyam', 'tyab', 'tyabs', 'tyas', 'tyass', 'tyang', 'tyaj', 'tyac',
+        'tyak', 'tyat', 'tyap', 'tyah', 'tyae', 'tyaeg', 'tyaegg', 'tyaegs', 'tyaen', 'tyaenj', 'tyaenh', 'tyaed', 'tyael', 'tyaelg', 'tyaelm', 'tyaelb',
+        'tyaels', 'tyaelt', 'tyaelp', 'tyaelh', 'tyaem', 'tyaeb', 'tyaebs', 'tyaes', 'tyaess', 'tyaeng', 'tyaej', 'tyaec', 'tyaek', 'tyaet', 'tyaep', 'tyaeh',
+        'teo', 'teog', 'teogg', 'teogs', 'teon', 'teonj', 'teonh', 'teod', 'teol', 'teolg', 'teolm', 'teolb', 'teols', 'teolt', 'teolp', 'teolh',
+        'teom', 'teob', 'teobs', 'teos', 'teoss', 'teong', 'teoj', 'teoc', 'teok', 'teot', 'teop', 'teoh', 'te', 'teg', 'tegg', 'tegs',
+        'ten', 'tenj', 'tenh', 'ted', 'tel', 'telg', 'telm', 'telb', 'tels', 'telt', 'telp', 'telh', 'tem', 'teb', 'tebs', 'tes',
+        'tess', 'teng', 'tej', 'tec', 'tek', 'tet', 'tep', 'teh', 'tyeo', 'tyeog', 'tyeogg', 'tyeogs', 'tyeon', 'tyeonj', 'tyeonh', 'tyeod',
+        'tyeol', 'tyeolg', 'tyeolm', 'tyeolb', 'tyeols', 'tyeolt', 'tyeolp', 'tyeolh', 'tyeom', 'tyeob', 'tyeobs', 'tyeos', 'tyeoss', 'tyeong', 'tyeoj', 'tyeoc',
+        'tyeok', 'tyeot', 'tyeop', 'tyeoh', 'tye', 'tyeg', 'tyegg', 'tyegs', 'tyen', 'tyenj', 'tyenh', 'tyed', 'tyel', 'tyelg', 'tyelm', 'tyelb',
+        'tyels', 'tyelt', 'tyelp', 'tyelh', 'tyem', 'tyeb', 'tyebs', 'tyes', 'tyess', 'tyeng', 'tyej', 'tyec', 'tyek', 'tyet', 'tyep', 'tyeh',
+        'to', 'tog', 'togg', 'togs', 'ton', 'tonj', 'tonh', 'tod', 'tol', 'tolg', 'tolm', 'tolb', 'tols', 'tolt', 'tolp', 'tolh',
+        'tom', 'tob', 'tobs', 'tos', 'toss', 'tong', 'toj', 'toc', 'tok', 'tot', 'top', 'toh', 'twa', 'twag', 'twagg', 'twags',
+        'twan', 'twanj', 'twanh', 'twad', 'twal', 'twalg', 'twalm', 'twalb', 'twals', 'twalt', 'twalp', 'twalh', 'twam', 'twab', 'twabs', 'twas',
+        'twass', 'twang', 'twaj', 'twac', 'twak', 'twat', 'twap', 'twah', 'twae', 'twaeg', 'twaegg', 'twaegs', 'twaen', 'twaenj', 'twaenh', 'twaed',
+        'twael', 'twaelg', 'twaelm', 'twaelb', 'twaels', 'twaelt', 'twaelp', 'twaelh', 'twaem', 'twaeb', 'twaebs', 'twaes', 'twaess', 'twaeng', 'twaej', 'twaec',
+        'twaek', 'twaet', 'twaep', 'twaeh', 'toe', 'toeg', 'toegg', 'toegs', 'toen', 'toenj', 'toenh', 'toed', 'toel', 'toelg', 'toelm', 'toelb',
+    ],
+    'x26': [
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xd4': [
+        'poss', 'pong', 'poj', 'poc', 'pok', 'pot', 'pop', 'poh', 'pwa', 'pwag', 'pwagg', 'pwags', 'pwan', 'pwanj', 'pwanh', 'pwad',
+        'pwal', 'pwalg', 'pwalm', 'pwalb', 'pwals', 'pwalt', 'pwalp', 'pwalh', 'pwam', 'pwab', 'pwabs', 'pwas', 'pwass', 'pwang', 'pwaj', 'pwac',
+        'pwak', 'pwat', 'pwap', 'pwah', 'pwae', 'pwaeg', 'pwaegg', 'pwaegs', 'pwaen', 'pwaenj', 'pwaenh', 'pwaed', 'pwael', 'pwaelg', 'pwaelm', 'pwaelb',
+        'pwaels', 'pwaelt', 'pwaelp', 'pwaelh', 'pwaem', 'pwaeb', 'pwaebs', 'pwaes', 'pwaess', 'pwaeng', 'pwaej', 'pwaec', 'pwaek', 'pwaet', 'pwaep', 'pwaeh',
+        'poe', 'poeg', 'poegg', 'poegs', 'poen', 'poenj', 'poenh', 'poed', 'poel', 'poelg', 'poelm', 'poelb', 'poels', 'poelt', 'poelp', 'poelh',
+        'poem', 'poeb', 'poebs', 'poes', 'poess', 'poeng', 'poej', 'poec', 'poek', 'poet', 'poep', 'poeh', 'pyo', 'pyog', 'pyogg', 'pyogs',
+        'pyon', 'pyonj', 'pyonh', 'pyod', 'pyol', 'pyolg', 'pyolm', 'pyolb', 'pyols', 'pyolt', 'pyolp', 'pyolh', 'pyom', 'pyob', 'pyobs', 'pyos',
+        'pyoss', 'pyong', 'pyoj', 'pyoc', 'pyok', 'pyot', 'pyop', 'pyoh', 'pu', 'pug', 'pugg', 'pugs', 'pun', 'punj', 'punh', 'pud',
+        'pul', 'pulg', 'pulm', 'pulb', 'puls', 'pult', 'pulp', 'pulh', 'pum', 'pub', 'pubs', 'pus', 'puss', 'pung', 'puj', 'puc',
+        'puk', 'put', 'pup', 'puh', 'pweo', 'pweog', 'pweogg', 'pweogs', 'pweon', 'pweonj', 'pweonh', 'pweod', 'pweol', 'pweolg', 'pweolm', 'pweolb',
+        'pweols', 'pweolt', 'pweolp', 'pweolh', 'pweom', 'pweob', 'pweobs', 'pweos', 'pweoss', 'pweong', 'pweoj', 'pweoc', 'pweok', 'pweot', 'pweop', 'pweoh',
+        'pwe', 'pweg', 'pwegg', 'pwegs', 'pwen', 'pwenj', 'pwenh', 'pwed', 'pwel', 'pwelg', 'pwelm', 'pwelb', 'pwels', 'pwelt', 'pwelp', 'pwelh',
+        'pwem', 'pweb', 'pwebs', 'pwes', 'pwess', 'pweng', 'pwej', 'pwec', 'pwek', 'pwet', 'pwep', 'pweh', 'pwi', 'pwig', 'pwigg', 'pwigs',
+        'pwin', 'pwinj', 'pwinh', 'pwid', 'pwil', 'pwilg', 'pwilm', 'pwilb', 'pwils', 'pwilt', 'pwilp', 'pwilh', 'pwim', 'pwib', 'pwibs', 'pwis',
+        'pwiss', 'pwing', 'pwij', 'pwic', 'pwik', 'pwit', 'pwip', 'pwih', 'pyu', 'pyug', 'pyugg', 'pyugs', 'pyun', 'pyunj', 'pyunh', 'pyud',
+        'pyul', 'pyulg', 'pyulm', 'pyulb', 'pyuls', 'pyult', 'pyulp', 'pyulh', 'pyum', 'pyub', 'pyubs', 'pyus', 'pyuss', 'pyung', 'pyuj', 'pyuc',
+    ],
+    'x12': [
+        'ha', 'hu', 'hi', 'haa', 'hee', 'he', 'ho', '[?]', 'la', 'lu', 'li', 'laa', 'lee', 'le', 'lo', 'lwa',
+        'hha', 'hhu', 'hhi', 'hhaa', 'hhee', 'hhe', 'hho', 'hhwa', 'ma', 'mu', 'mi', 'maa', 'mee', 'me', 'mo', 'mwa',
+        'sza', 'szu', 'szi', 'szaa', 'szee', 'sze', 'szo', 'szwa', 'ra', 'ru', 'ri', 'raa', 'ree', 're', 'ro', 'rwa',
+        'sa', 'su', 'si', 'saa', 'see', 'se', 'so', 'swa', 'sha', 'shu', 'shi', 'shaa', 'shee', 'she', 'sho', 'shwa',
+        'qa', 'qu', 'qi', 'qaa', 'qee', 'qe', 'qo', '[?]', 'qwa', '[?]', 'qwi', 'qwaa', 'qwee', 'qwe', '[?]', '[?]',
+        'qha', 'qhu', 'qhi', 'qhaa', 'qhee', 'qhe', 'qho', '[?]', 'qhwa', '[?]', 'qhwi', 'qhwaa', 'qhwee', 'qhwe', '[?]', '[?]',
+        'ba', 'bu', 'bi', 'baa', 'bee', 'be', 'bo', 'bwa', 'va', 'vu', 'vi', 'vaa', 'vee', 've', 'vo', 'vwa',
+        'ta', 'tu', 'ti', 'taa', 'tee', 'te', 'to', 'twa', 'ca', 'cu', 'ci', 'caa', 'cee', 'ce', 'co', 'cwa',
+        'xa', 'xu', 'xi', 'xaa', 'xee', 'xe', 'xo', '[?]', 'xwa', '[?]', 'xwi', 'xwaa', 'xwee', 'xwe', '[?]', '[?]',
+        'na', 'nu', 'ni', 'naa', 'nee', 'ne', 'no', 'nwa', 'nya', 'nyu', 'nyi', 'nyaa', 'nyee', 'nye', 'nyo', 'nywa',
+        "'a", "'u", '[?]', "'aa", "'ee", "'e", "'o", "'wa", 'ka', 'ku', 'ki', 'kaa', 'kee', 'ke', 'ko', '[?]',
+        'kwa', '[?]', 'kwi', 'kwaa', 'kwee', 'kwe', '[?]', '[?]', 'kxa', 'kxu', 'kxi', 'kxaa', 'kxee', 'kxe', 'kxo', '[?]',
+        'kxwa', '[?]', 'kxwi', 'kxwaa', 'kxwee', 'kxwe', '[?]', '[?]', 'wa', 'wu', 'wi', 'waa', 'wee', 'we', 'wo', '[?]',
+        '`a', '`u', '`i', '`aa', '`ee', '`e', '`o', '[?]', 'za', 'zu', 'zi', 'zaa', 'zee', 'ze', 'zo', 'zwa',
+        'zha', 'zhu', 'zhi', 'zhaa', 'zhee', 'zhe', 'zho', 'zhwa', 'ya', 'yu', 'yi', 'yaa', 'yee', 'ye', 'yo', '[?]',
+        'da', 'du', 'di', 'daa', 'dee', 'de', 'do', 'dwa', 'dda', 'ddu', 'ddi', 'ddaa', 'ddee', 'dde', 'ddo', 'ddwa',
+    ],
+    'xc8': [
+        'jeo', 'jeog', 'jeogg', 'jeogs', 'jeon', 'jeonj', 'jeonh', 'jeod', 'jeol', 'jeolg', 'jeolm', 'jeolb', 'jeols', 'jeolt', 'jeolp', 'jeolh',
+        'jeom', 'jeob', 'jeobs', 'jeos', 'jeoss', 'jeong', 'jeoj', 'jeoc', 'jeok', 'jeot', 'jeop', 'jeoh', 'je', 'jeg', 'jegg', 'jegs',
+        'jen', 'jenj', 'jenh', 'jed', 'jel', 'jelg', 'jelm', 'jelb', 'jels', 'jelt', 'jelp', 'jelh', 'jem', 'jeb', 'jebs', 'jes',
+        'jess', 'jeng', 'jej', 'jec', 'jek', 'jet', 'jep', 'jeh', 'jyeo', 'jyeog', 'jyeogg', 'jyeogs', 'jyeon', 'jyeonj', 'jyeonh', 'jyeod',
+        'jyeol', 'jyeolg', 'jyeolm', 'jyeolb', 'jyeols', 'jyeolt', 'jyeolp', 'jyeolh', 'jyeom', 'jyeob', 'jyeobs', 'jyeos', 'jyeoss', 'jyeong', 'jyeoj', 'jyeoc',
+        'jyeok', 'jyeot', 'jyeop', 'jyeoh', 'jye', 'jyeg', 'jyegg', 'jyegs', 'jyen', 'jyenj', 'jyenh', 'jyed', 'jyel', 'jyelg', 'jyelm', 'jyelb',
+        'jyels', 'jyelt', 'jyelp', 'jyelh', 'jyem', 'jyeb', 'jyebs', 'jyes', 'jyess', 'jyeng', 'jyej', 'jyec', 'jyek', 'jyet', 'jyep', 'jyeh',
+        'jo', 'jog', 'jogg', 'jogs', 'jon', 'jonj', 'jonh', 'jod', 'jol', 'jolg', 'jolm', 'jolb', 'jols', 'jolt', 'jolp', 'jolh',
+        'jom', 'job', 'jobs', 'jos', 'joss', 'jong', 'joj', 'joc', 'jok', 'jot', 'jop', 'joh', 'jwa', 'jwag', 'jwagg', 'jwags',
+        'jwan', 'jwanj', 'jwanh', 'jwad', 'jwal', 'jwalg', 'jwalm', 'jwalb', 'jwals', 'jwalt', 'jwalp', 'jwalh', 'jwam', 'jwab', 'jwabs', 'jwas',
+        'jwass', 'jwang', 'jwaj', 'jwac', 'jwak', 'jwat', 'jwap', 'jwah', 'jwae', 'jwaeg', 'jwaegg', 'jwaegs', 'jwaen', 'jwaenj', 'jwaenh', 'jwaed',
+        'jwael', 'jwaelg', 'jwaelm', 'jwaelb', 'jwaels', 'jwaelt', 'jwaelp', 'jwaelh', 'jwaem', 'jwaeb', 'jwaebs', 'jwaes', 'jwaess', 'jwaeng', 'jwaej', 'jwaec',
+        'jwaek', 'jwaet', 'jwaep', 'jwaeh', 'joe', 'joeg', 'joegg', 'joegs', 'joen', 'joenj', 'joenh', 'joed', 'joel', 'joelg', 'joelm', 'joelb',
+        'joels', 'joelt', 'joelp', 'joelh', 'joem', 'joeb', 'joebs', 'joes', 'joess', 'joeng', 'joej', 'joec', 'joek', 'joet', 'joep', 'joeh',
+        'jyo', 'jyog', 'jyogg', 'jyogs', 'jyon', 'jyonj', 'jyonh', 'jyod', 'jyol', 'jyolg', 'jyolm', 'jyolb', 'jyols', 'jyolt', 'jyolp', 'jyolh',
+        'jyom', 'jyob', 'jyobs', 'jyos', 'jyoss', 'jyong', 'jyoj', 'jyoc', 'jyok', 'jyot', 'jyop', 'jyoh', 'ju', 'jug', 'jugg', 'jugs',
+    ],
+    'xaf': [
+        'ggyeols', 'ggyeolt', 'ggyeolp', 'ggyeolh', 'ggyeom', 'ggyeob', 'ggyeobs', 'ggyeos', 'ggyeoss', 'ggyeong', 'ggyeoj', 'ggyeoc', 'ggyeok', 'ggyeot', 'ggyeop', 'ggyeoh',
+        'ggye', 'ggyeg', 'ggyegg', 'ggyegs', 'ggyen', 'ggyenj', 'ggyenh', 'ggyed', 'ggyel', 'ggyelg', 'ggyelm', 'ggyelb', 'ggyels', 'ggyelt', 'ggyelp', 'ggyelh',
+        'ggyem', 'ggyeb', 'ggyebs', 'ggyes', 'ggyess', 'ggyeng', 'ggyej', 'ggyec', 'ggyek', 'ggyet', 'ggyep', 'ggyeh', 'ggo', 'ggog', 'ggogg', 'ggogs',
+        'ggon', 'ggonj', 'ggonh', 'ggod', 'ggol', 'ggolg', 'ggolm', 'ggolb', 'ggols', 'ggolt', 'ggolp', 'ggolh', 'ggom', 'ggob', 'ggobs', 'ggos',
+        'ggoss', 'ggong', 'ggoj', 'ggoc', 'ggok', 'ggot', 'ggop', 'ggoh', 'ggwa', 'ggwag', 'ggwagg', 'ggwags', 'ggwan', 'ggwanj', 'ggwanh', 'ggwad',
+        'ggwal', 'ggwalg', 'ggwalm', 'ggwalb', 'ggwals', 'ggwalt', 'ggwalp', 'ggwalh', 'ggwam', 'ggwab', 'ggwabs', 'ggwas', 'ggwass', 'ggwang', 'ggwaj', 'ggwac',
+        'ggwak', 'ggwat', 'ggwap', 'ggwah', 'ggwae', 'ggwaeg', 'ggwaegg', 'ggwaegs', 'ggwaen', 'ggwaenj', 'ggwaenh', 'ggwaed', 'ggwael', 'ggwaelg', 'ggwaelm', 'ggwaelb',
+        'ggwaels', 'ggwaelt', 'ggwaelp', 'ggwaelh', 'ggwaem', 'ggwaeb', 'ggwaebs', 'ggwaes', 'ggwaess', 'ggwaeng', 'ggwaej', 'ggwaec', 'ggwaek', 'ggwaet', 'ggwaep', 'ggwaeh',
+        'ggoe', 'ggoeg', 'ggoegg', 'ggoegs', 'ggoen', 'ggoenj', 'ggoenh', 'ggoed', 'ggoel', 'ggoelg', 'ggoelm', 'ggoelb', 'ggoels', 'ggoelt', 'ggoelp', 'ggoelh',
+        'ggoem', 'ggoeb', 'ggoebs', 'ggoes', 'ggoess', 'ggoeng', 'ggoej', 'ggoec', 'ggoek', 'ggoet', 'ggoep', 'ggoeh', 'ggyo', 'ggyog', 'ggyogg', 'ggyogs',
+        'ggyon', 'ggyonj', 'ggyonh', 'ggyod', 'ggyol', 'ggyolg', 'ggyolm', 'ggyolb', 'ggyols', 'ggyolt', 'ggyolp', 'ggyolh', 'ggyom', 'ggyob', 'ggyobs', 'ggyos',
+        'ggyoss', 'ggyong', 'ggyoj', 'ggyoc', 'ggyok', 'ggyot', 'ggyop', 'ggyoh', 'ggu', 'ggug', 'ggugg', 'ggugs', 'ggun', 'ggunj', 'ggunh', 'ggud',
+        'ggul', 'ggulg', 'ggulm', 'ggulb', 'gguls', 'ggult', 'ggulp', 'ggulh', 'ggum', 'ggub', 'ggubs', 'ggus', 'gguss', 'ggung', 'gguj', 'gguc',
+        'gguk', 'ggut', 'ggup', 'gguh', 'ggweo', 'ggweog', 'ggweogg', 'ggweogs', 'ggweon', 'ggweonj', 'ggweonh', 'ggweod', 'ggweol', 'ggweolg', 'ggweolm', 'ggweolb',
+        'ggweols', 'ggweolt', 'ggweolp', 'ggweolh', 'ggweom', 'ggweob', 'ggweobs', 'ggweos', 'ggweoss', 'ggweong', 'ggweoj', 'ggweoc', 'ggweok', 'ggweot', 'ggweop', 'ggweoh',
+        'ggwe', 'ggweg', 'ggwegg', 'ggwegs', 'ggwen', 'ggwenj', 'ggwenh', 'ggwed', 'ggwel', 'ggwelg', 'ggwelm', 'ggwelb', 'ggwels', 'ggwelt', 'ggwelp', 'ggwelh',
+    ],
+    'x28': [
+        ' ', 'a', '1', 'b', "'", 'k', '2', 'l', '@', 'c', 'i', 'f', '/', 'm', 's', 'p',
+        '"', 'e', '3', 'h', '9', 'o', '6', 'r', '^', 'd', 'j', 'g', '>', 'n', 't', 'q',
+        ',', '*', '5', '<', '-', 'u', '8', 'v', '.', '%', '[', '\\$', '+', 'x', '!', '&',
+        ';', ':', '4', '\\', '0', 'z', '7', '(', '_', '?', 'w', ']', '#', 'y', ')', '=',
+        '[d7]', '[d17]', '[d27]', '[d127]', '[d37]', '[d137]', '[d237]', '[d1237]', '[d47]', '[d147]', '[d247]', '[d1247]', '[d347]', '[d1347]', '[d2347]', '[d12347]',
+        '[d57]', '[d157]', '[d257]', '[d1257]', '[d357]', '[d1357]', '[d2357]', '[d12357]', '[d457]', '[d1457]', '[d2457]', '[d12457]', '[d3457]', '[d13457]', '[d23457]', '[d123457]',
+        '[d67]', '[d167]', '[d267]', '[d1267]', '[d367]', '[d1367]', '[d2367]', '[d12367]', '[d467]', '[d1467]', '[d2467]', '[d12467]', '[d3467]', '[d13467]', '[d23467]', '[d123467]',
+        '[d567]', '[d1567]', '[d2567]', '[d12567]', '[d3567]', '[d13567]', '[d23567]', '[d123567]', '[d4567]', '[d14567]', '[d24567]', '[d124567]', '[d34567]', '[d134567]', '[d234567]', '[d1234567]',
+        '[d8]', '[d18]', '[d28]', '[d128]', '[d38]', '[d138]', '[d238]', '[d1238]', '[d48]', '[d148]', '[d248]', '[d1248]', '[d348]', '[d1348]', '[d2348]', '[d12348]',
+        '[d58]', '[d158]', '[d258]', '[d1258]', '[d358]', '[d1358]', '[d2358]', '[d12358]', '[d458]', '[d1458]', '[d2458]', '[d12458]', '[d3458]', '[d13458]', '[d23458]', '[d123458]',
+        '[d68]', '[d168]', '[d268]', '[d1268]', '[d368]', '[d1368]', '[d2368]', '[d12368]', '[d468]', '[d1468]', '[d2468]', '[d12468]', '[d3468]', '[d13468]', '[d23468]', '[d123468]',
+        '[d568]', '[d1568]', '[d2568]', '[d12568]', '[d3568]', '[d13568]', '[d23568]', '[d123568]', '[d4568]', '[d14568]', '[d24568]', '[d124568]', '[d34568]', '[d134568]', '[d234568]', '[d1234568]',
+        '[d78]', '[d178]', '[d278]', '[d1278]', '[d378]', '[d1378]', '[d2378]', '[d12378]', '[d478]', '[d1478]', '[d2478]', '[d12478]', '[d3478]', '[d13478]', '[d23478]', '[d123478]',
+        '[d578]', '[d1578]', '[d2578]', '[d12578]', '[d3578]', '[d13578]', '[d23578]', '[d123578]', '[d4578]', '[d14578]', '[d24578]', '[d124578]', '[d34578]', '[d134578]', '[d234578]', '[d1234578]',
+        '[d678]', '[d1678]', '[d2678]', '[d12678]', '[d3678]', '[d13678]', '[d23678]', '[d123678]', '[d4678]', '[d14678]', '[d24678]', '[d124678]', '[d34678]', '[d134678]', '[d234678]', '[d1234678]',
+        '[d5678]', '[d15678]', '[d25678]', '[d125678]', '[d35678]', '[d135678]', '[d235678]', '[d1235678]', '[d45678]', '[d145678]', '[d245678]', '[d1245678]', '[d345678]', '[d1345678]', '[d2345678]', '[d12345678]',
+    ],
+    'xb1': [
+        'nyaess', 'nyaeng', 'nyaej', 'nyaec', 'nyaek', 'nyaet', 'nyaep', 'nyaeh', 'neo', 'neog', 'neogg', 'neogs', 'neon', 'neonj', 'neonh', 'neod',
+        'neol', 'neolg', 'neolm', 'neolb', 'neols', 'neolt', 'neolp', 'neolh', 'neom', 'neob', 'neobs', 'neos', 'neoss', 'neong', 'neoj', 'neoc',
+        'neok', 'neot', 'neop', 'neoh', 'ne', 'neg', 'negg', 'negs', 'nen', 'nenj', 'nenh', 'ned', 'nel', 'nelg', 'nelm', 'nelb',
+        'nels', 'nelt', 'nelp', 'nelh', 'nem', 'neb', 'nebs', 'nes', 'ness', 'neng', 'nej', 'nec', 'nek', 'net', 'nep', 'neh',
+        'nyeo', 'nyeog', 'nyeogg', 'nyeogs', 'nyeon', 'nyeonj', 'nyeonh', 'nyeod', 'nyeol', 'nyeolg', 'nyeolm', 'nyeolb', 'nyeols', 'nyeolt', 'nyeolp', 'nyeolh',
+        'nyeom', 'nyeob', 'nyeobs', 'nyeos', 'nyeoss', 'nyeong', 'nyeoj', 'nyeoc', 'nyeok', 'nyeot', 'nyeop', 'nyeoh', 'nye', 'nyeg', 'nyegg', 'nyegs',
+        'nyen', 'nyenj', 'nyenh', 'nyed', 'nyel', 'nyelg', 'nyelm', 'nyelb', 'nyels', 'nyelt', 'nyelp', 'nyelh', 'nyem', 'nyeb', 'nyebs', 'nyes',
+        'nyess', 'nyeng', 'nyej', 'nyec', 'nyek', 'nyet', 'nyep', 'nyeh', 'no', 'nog', 'nogg', 'nogs', 'non', 'nonj', 'nonh', 'nod',
+        'nol', 'nolg', 'nolm', 'nolb', 'nols', 'nolt', 'nolp', 'nolh', 'nom', 'nob', 'nobs', 'nos', 'noss', 'nong', 'noj', 'noc',
+        'nok', 'not', 'nop', 'noh', 'nwa', 'nwag', 'nwagg', 'nwags', 'nwan', 'nwanj', 'nwanh', 'nwad', 'nwal', 'nwalg', 'nwalm', 'nwalb',
+        'nwals', 'nwalt', 'nwalp', 'nwalh', 'nwam', 'nwab', 'nwabs', 'nwas', 'nwass', 'nwang', 'nwaj', 'nwac', 'nwak', 'nwat', 'nwap', 'nwah',
+        'nwae', 'nwaeg', 'nwaegg', 'nwaegs', 'nwaen', 'nwaenj', 'nwaenh', 'nwaed', 'nwael', 'nwaelg', 'nwaelm', 'nwaelb', 'nwaels', 'nwaelt', 'nwaelp', 'nwaelh',
+        'nwaem', 'nwaeb', 'nwaebs', 'nwaes', 'nwaess', 'nwaeng', 'nwaej', 'nwaec', 'nwaek', 'nwaet', 'nwaep', 'nwaeh', 'noe', 'noeg', 'noegg', 'noegs',
+        'noen', 'noenj', 'noenh', 'noed', 'noel', 'noelg', 'noelm', 'noelb', 'noels', 'noelt', 'noelp', 'noelh', 'noem', 'noeb', 'noebs', 'noes',
+        'noess', 'noeng', 'noej', 'noec', 'noek', 'noet', 'noep', 'noeh', 'nyo', 'nyog', 'nyogg', 'nyogs', 'nyon', 'nyonj', 'nyonh', 'nyod',
+        'nyol', 'nyolg', 'nyolm', 'nyolb', 'nyols', 'nyolt', 'nyolp', 'nyolh', 'nyom', 'nyob', 'nyobs', 'nyos', 'nyoss', 'nyong', 'nyoj', 'nyoc',
+    ],
+    'xfd': [
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '[?]', '[?]', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '', '', '', '', '', '', '', '', '', '', '', '', '[?]', '[?]', '[?]',
+    ],
+    'x14': [
+        '[?]', 'e', 'aai', 'i', 'ii', 'o', 'oo', 'oo', 'ee', 'i', 'a', 'aa', 'we', 'we', 'wi', 'wi',
+        'wii', 'wii', 'wo', 'wo', 'woo', 'woo', 'woo', 'wa', 'wa', 'waa', 'waa', 'waa', 'ai', 'w', "'", 't',
+        'k', 'sh', 's', 'n', 'w', 'n', '[?]', 'w', 'c', '?', 'l', 'en', 'in', 'on', 'an', 'pe',
+        'paai', 'pi', 'pii', 'po', 'poo', 'poo', 'hee', 'hi', 'pa', 'paa', 'pwe', 'pwe', 'pwi', 'pwi', 'pwii', 'pwii',
+        'pwo', 'pwo', 'pwoo', 'pwoo', 'pwa', 'pwa', 'pwaa', 'pwaa', 'pwaa', 'p', 'p', 'h', 'te', 'taai', 'ti', 'tii',
+        'to', 'too', 'too', 'dee', 'di', 'ta', 'taa', 'twe', 'twe', 'twi', 'twi', 'twii', 'twii', 'two', 'two', 'twoo',
+        'twoo', 'twa', 'twa', 'twaa', 'twaa', 'twaa', 't', 'tte', 'tti', 'tto', 'tta', 'ke', 'kaai', 'ki', 'kii', 'ko',
+        'koo', 'koo', 'ka', 'kaa', 'kwe', 'kwe', 'kwi', 'kwi', 'kwii', 'kwii', 'kwo', 'kwo', 'kwoo', 'kwoo', 'kwa', 'kwa',
+        'kwaa', 'kwaa', 'kwaa', 'k', 'kw', 'keh', 'kih', 'koh', 'kah', 'ce', 'caai', 'ci', 'cii', 'co', 'coo', 'coo',
+        'ca', 'caa', 'cwe', 'cwe', 'cwi', 'cwi', 'cwii', 'cwii', 'cwo', 'cwo', 'cwoo', 'cwoo', 'cwa', 'cwa', 'cwaa', 'cwaa',
+        'cwaa', 'c', 'th', 'me', 'maai', 'mi', 'mii', 'mo', 'moo', 'moo', 'ma', 'maa', 'mwe', 'mwe', 'mwi', 'mwi',
+        'mwii', 'mwii', 'mwo', 'mwo', 'mwoo', 'mwoo', 'mwa', 'mwa', 'mwaa', 'mwaa', 'mwaa', 'm', 'm', 'mh', 'm', 'm',
+        'ne', 'naai', 'ni', 'nii', 'no', 'noo', 'noo', 'na', 'naa', 'nwe', 'nwe', 'nwa', 'nwa', 'nwaa', 'nwaa', 'nwaa',
+        'n', 'ng', 'nh', 'le', 'laai', 'li', 'lii', 'lo', 'loo', 'loo', 'la', 'laa', 'lwe', 'lwe', 'lwi', 'lwi',
+        'lwii', 'lwii', 'lwo', 'lwo', 'lwoo', 'lwoo', 'lwa', 'lwa', 'lwaa', 'lwaa', 'l', 'l', 'l', 'se', 'saai', 'si',
+        'sii', 'so', 'soo', 'soo', 'sa', 'saa', 'swe', 'swe', 'swi', 'swi', 'swii', 'swii', 'swo', 'swo', 'swoo', 'swoo',
+    ],
+    'x00': [
+        '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07', '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+        '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
+        ' ', '!', '"', '#', '\\$', '%', '&', "'", '(', ')', '*', '+', ',', '-', '.', '/',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?',
+        '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+        'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', ']', '\\', ']', '^', '_',
+        '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+        'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '\\{', '|', '\\}', '~', '\x7f',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        ' ', '!', 'C/', 'PS', '\\$?', 'Y=', '|', 'SS', '"', '(c)', 'a', '<<', '!', '', '(r)', '-',
+        'deg', '+-', '2', '3', "'", 'u', 'P', '*', ',', '1', 'o', '>>', '1/4', '1/2', '3/4', '?',
+        'A', 'A', 'A', 'A', 'A', 'A', 'AE', 'C', 'E', 'E', 'E', 'E', 'I', 'I', 'I', 'I',
+        'D', 'N', 'O', 'O', 'O', 'O', 'O', 'x', 'O', 'U', 'U', 'U', 'U', 'U', 'Th', 'ss',
+        'a', 'a', 'a', 'a', 'a', 'a', 'ae', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i',
+        'd', 'n', 'o', 'o', 'o', 'o', 'o', '/', 'o', 'u', 'u', 'u', 'u', 'y', 'th', 'y',
+    ],
+    'xfe': [
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '', '', '', '~', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '..', '--', '-', '_', '_', '(', ') ', '\\{', '\\} ', '[', '] ', '[(', ')] ', '<<', '>> ', '<',
+        '> ', '[', '] ', '\\{', '\\}', '[?]', '[?]', '[?]', '[?]', '', '', '', '', '', '', '',
+        ',', ',', '.', '', ';', ':', '?', '!', '-', '(', ')', '\\{', '\\}', '\\{', '\\}', '#',
+        '&', '*', '+', '-', '<', '>', '=', '', '\\', '\\$', '%', '@', '[?]', '[?]', '[?]', '[?]',
+        '', '', '', '[?]', '', '[?]', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '[?]', '[?]', '',
+    ],
+    'xad': [
+        'gwan', 'gwanj', 'gwanh', 'gwad', 'gwal', 'gwalg', 'gwalm', 'gwalb', 'gwals', 'gwalt', 'gwalp', 'gwalh', 'gwam', 'gwab', 'gwabs', 'gwas',
+        'gwass', 'gwang', 'gwaj', 'gwac', 'gwak', 'gwat', 'gwap', 'gwah', 'gwae', 'gwaeg', 'gwaegg', 'gwaegs', 'gwaen', 'gwaenj', 'gwaenh', 'gwaed',
+        'gwael', 'gwaelg', 'gwaelm', 'gwaelb', 'gwaels', 'gwaelt', 'gwaelp', 'gwaelh', 'gwaem', 'gwaeb', 'gwaebs', 'gwaes', 'gwaess', 'gwaeng', 'gwaej', 'gwaec',
+        'gwaek', 'gwaet', 'gwaep', 'gwaeh', 'goe', 'goeg', 'goegg', 'goegs', 'goen', 'goenj', 'goenh', 'goed', 'goel', 'goelg', 'goelm', 'goelb',
+        'goels', 'goelt', 'goelp', 'goelh', 'goem', 'goeb', 'goebs', 'goes', 'goess', 'goeng', 'goej', 'goec', 'goek', 'goet', 'goep', 'goeh',
+        'gyo', 'gyog', 'gyogg', 'gyogs', 'gyon', 'gyonj', 'gyonh', 'gyod', 'gyol', 'gyolg', 'gyolm', 'gyolb', 'gyols', 'gyolt', 'gyolp', 'gyolh',
+        'gyom', 'gyob', 'gyobs', 'gyos', 'gyoss', 'gyong', 'gyoj', 'gyoc', 'gyok', 'gyot', 'gyop', 'gyoh', 'gu', 'gug', 'gugg', 'gugs',
+        'gun', 'gunj', 'gunh', 'gud', 'gul', 'gulg', 'gulm', 'gulb', 'guls', 'gult', 'gulp', 'gulh', 'gum', 'gub', 'gubs', 'gus',
+        'guss', 'gung', 'guj', 'guc', 'guk', 'gut', 'gup', 'guh', 'gweo', 'gweog', 'gweogg', 'gweogs', 'gweon', 'gweonj', 'gweonh', 'gweod',
+        'gweol', 'gweolg', 'gweolm', 'gweolb', 'gweols', 'gweolt', 'gweolp', 'gweolh', 'gweom', 'gweob', 'gweobs', 'gweos', 'gweoss', 'gweong', 'gweoj', 'gweoc',
+        'gweok', 'gweot', 'gweop', 'gweoh', 'gwe', 'gweg', 'gwegg', 'gwegs', 'gwen', 'gwenj', 'gwenh', 'gwed', 'gwel', 'gwelg', 'gwelm', 'gwelb',
+        'gwels', 'gwelt', 'gwelp', 'gwelh', 'gwem', 'gweb', 'gwebs', 'gwes', 'gwess', 'gweng', 'gwej', 'gwec', 'gwek', 'gwet', 'gwep', 'gweh',
+        'gwi', 'gwig', 'gwigg', 'gwigs', 'gwin', 'gwinj', 'gwinh', 'gwid', 'gwil', 'gwilg', 'gwilm', 'gwilb', 'gwils', 'gwilt', 'gwilp', 'gwilh',
+        'gwim', 'gwib', 'gwibs', 'gwis', 'gwiss', 'gwing', 'gwij', 'gwic', 'gwik', 'gwit', 'gwip', 'gwih', 'gyu', 'gyug', 'gyugg', 'gyugs',
+        'gyun', 'gyunj', 'gyunh', 'gyud', 'gyul', 'gyulg', 'gyulm', 'gyulb', 'gyuls', 'gyult', 'gyulp', 'gyulh', 'gyum', 'gyub', 'gyubs', 'gyus',
+        'gyuss', 'gyung', 'gyuj', 'gyuc', 'gyuk', 'gyut', 'gyup', 'gyuh', 'geu', 'geug', 'geugg', 'geugs', 'geun', 'geunj', 'geunh', 'geud',
+    ],
+    'x05': [
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', 'A', 'B', 'G', 'D', 'E', 'Z', 'E', 'E', 'T`', 'Zh', 'I', 'L', 'Kh', 'Ts', 'K',
+        'H', 'Dz', 'Gh', 'Ch', 'M', 'Y', 'N', 'Sh', 'O', 'Ch`', 'P', 'J', 'Rh', 'S', 'V', 'T',
+        'R', 'Ts`', 'W', 'P`', 'K`', 'O', 'F', '[?]', '[?]', '<', "'", '/', '!', ',', '?', '.',
+        '[?]', 'a', 'b', 'g', 'd', 'e', 'z', 'e', 'e', 't`', 'zh', 'i', 'l', 'kh', 'ts', 'k',
+        'h', 'dz', 'gh', 'ch', 'm', 'y', 'n', 'sh', 'o', 'ch`', 'p', 'j', 'rh', 's', 'v', 't',
+        'r', 'ts`', 'w', 'p`', 'k`', 'o', 'f', 'ew', '[?]', '.', '-', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '[?]', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '@', 'e', 'a', 'o', 'i', 'e', 'e', 'a', 'a', 'o', '[?]', 'u', "'", '', '', '',
+        '', '', '', ':', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '', 'b', 'g', 'd', 'h', 'v', 'z', 'kh', 't', 'y', 'k', 'k', 'l', 'm', 'm', 'n',
+        'n', 's', '`', 'p', 'p', 'ts', 'ts', 'q', 'r', 'sh', 't', '[?]', '[?]', '[?]', '[?]', '[?]',
+        'V', 'oy', 'i', "'", '"', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xce': [
+        'cwik', 'cwit', 'cwip', 'cwih', 'cyu', 'cyug', 'cyugg', 'cyugs', 'cyun', 'cyunj', 'cyunh', 'cyud', 'cyul', 'cyulg', 'cyulm', 'cyulb',
+        'cyuls', 'cyult', 'cyulp', 'cyulh', 'cyum', 'cyub', 'cyubs', 'cyus', 'cyuss', 'cyung', 'cyuj', 'cyuc', 'cyuk', 'cyut', 'cyup', 'cyuh',
+        'ceu', 'ceug', 'ceugg', 'ceugs', 'ceun', 'ceunj', 'ceunh', 'ceud', 'ceul', 'ceulg', 'ceulm', 'ceulb', 'ceuls', 'ceult', 'ceulp', 'ceulh',
+        'ceum', 'ceub', 'ceubs', 'ceus', 'ceuss', 'ceung', 'ceuj', 'ceuc', 'ceuk', 'ceut', 'ceup', 'ceuh', 'cyi', 'cyig', 'cyigg', 'cyigs',
+        'cyin', 'cyinj', 'cyinh', 'cyid', 'cyil', 'cyilg', 'cyilm', 'cyilb', 'cyils', 'cyilt', 'cyilp', 'cyilh', 'cyim', 'cyib', 'cyibs', 'cyis',
+        'cyiss', 'cying', 'cyij', 'cyic', 'cyik', 'cyit', 'cyip', 'cyih', 'ci', 'cig', 'cigg', 'cigs', 'cin', 'cinj', 'cinh', 'cid',
+        'cil', 'cilg', 'cilm', 'cilb', 'cils', 'cilt', 'cilp', 'cilh', 'cim', 'cib', 'cibs', 'cis', 'ciss', 'cing', 'cij', 'cic',
+        'cik', 'cit', 'cip', 'cih', 'ka', 'kag', 'kagg', 'kags', 'kan', 'kanj', 'kanh', 'kad', 'kal', 'kalg', 'kalm', 'kalb',
+        'kals', 'kalt', 'kalp', 'kalh', 'kam', 'kab', 'kabs', 'kas', 'kass', 'kang', 'kaj', 'kac', 'kak', 'kat', 'kap', 'kah',
+        'kae', 'kaeg', 'kaegg', 'kaegs', 'kaen', 'kaenj', 'kaenh', 'kaed', 'kael', 'kaelg', 'kaelm', 'kaelb', 'kaels', 'kaelt', 'kaelp', 'kaelh',
+        'kaem', 'kaeb', 'kaebs', 'kaes', 'kaess', 'kaeng', 'kaej', 'kaec', 'kaek', 'kaet', 'kaep', 'kaeh', 'kya', 'kyag', 'kyagg', 'kyags',
+        'kyan', 'kyanj', 'kyanh', 'kyad', 'kyal', 'kyalg', 'kyalm', 'kyalb', 'kyals', 'kyalt', 'kyalp', 'kyalh', 'kyam', 'kyab', 'kyabs', 'kyas',
+        'kyass', 'kyang', 'kyaj', 'kyac', 'kyak', 'kyat', 'kyap', 'kyah', 'kyae', 'kyaeg', 'kyaegg', 'kyaegs', 'kyaen', 'kyaenj', 'kyaenh', 'kyaed',
+        'kyael', 'kyaelg', 'kyaelm', 'kyaelb', 'kyaels', 'kyaelt', 'kyaelp', 'kyaelh', 'kyaem', 'kyaeb', 'kyaebs', 'kyaes', 'kyaess', 'kyaeng', 'kyaej', 'kyaec',
+        'kyaek', 'kyaet', 'kyaep', 'kyaeh', 'keo', 'keog', 'keogg', 'keogs', 'keon', 'keonj', 'keonh', 'keod', 'keol', 'keolg', 'keolm', 'keolb',
+        'keols', 'keolt', 'keolp', 'keolh', 'keom', 'keob', 'keobs', 'keos', 'keoss', 'keong', 'keoj', 'keoc', 'keok', 'keot', 'keop', 'keoh',
+    ],
+    'x2e': [
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?]', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ', '[?] ',
+        '[?] ', '[?] ', '[?] ', '[?] ', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xd7': [
+        'hwen', 'hwenj', 'hwenh', 'hwed', 'hwel', 'hwelg', 'hwelm', 'hwelb', 'hwels', 'hwelt', 'hwelp', 'hwelh', 'hwem', 'hweb', 'hwebs', 'hwes',
+        'hwess', 'hweng', 'hwej', 'hwec', 'hwek', 'hwet', 'hwep', 'hweh', 'hwi', 'hwig', 'hwigg', 'hwigs', 'hwin', 'hwinj', 'hwinh', 'hwid',
+        'hwil', 'hwilg', 'hwilm', 'hwilb', 'hwils', 'hwilt', 'hwilp', 'hwilh', 'hwim', 'hwib', 'hwibs', 'hwis', 'hwiss', 'hwing', 'hwij', 'hwic',
+        'hwik', 'hwit', 'hwip', 'hwih', 'hyu', 'hyug', 'hyugg', 'hyugs', 'hyun', 'hyunj', 'hyunh', 'hyud', 'hyul', 'hyulg', 'hyulm', 'hyulb',
+        'hyuls', 'hyult', 'hyulp', 'hyulh', 'hyum', 'hyub', 'hyubs', 'hyus', 'hyuss', 'hyung', 'hyuj', 'hyuc', 'hyuk', 'hyut', 'hyup', 'hyuh',
+        'heu', 'heug', 'heugg', 'heugs', 'heun', 'heunj', 'heunh', 'heud', 'heul', 'heulg', 'heulm', 'heulb', 'heuls', 'heult', 'heulp', 'heulh',
+        'heum', 'heub', 'heubs', 'heus', 'heuss', 'heung', 'heuj', 'heuc', 'heuk', 'heut', 'heup', 'heuh', 'hyi', 'hyig', 'hyigg', 'hyigs',
+        'hyin', 'hyinj', 'hyinh', 'hyid', 'hyil', 'hyilg', 'hyilm', 'hyilb', 'hyils', 'hyilt', 'hyilp', 'hyilh', 'hyim', 'hyib', 'hyibs', 'hyis',
+        'hyiss', 'hying', 'hyij', 'hyic', 'hyik', 'hyit', 'hyip', 'hyih', 'hi', 'hig', 'higg', 'higs', 'hin', 'hinj', 'hinh', 'hid',
+        'hil', 'hilg', 'hilm', 'hilb', 'hils', 'hilt', 'hilp', 'hilh', 'him', 'hib', 'hibs', 'his', 'hiss', 'hing', 'hij', 'hic',
+        'hik', 'hit', 'hip', 'hih', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'x21': [
+        '', '', '', '', '', '', '', '', '', '', 'g', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', ' 1/3 ', ' 2/3 ', ' 1/5 ', ' 2/5 ', ' 3/5 ', ' 4/5 ', ' 1/6 ', ' 5/6 ', ' 1/8 ', ' 3/8 ', ' 5/8 ', ' 7/8 ', ' 1/',
+        'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X', 'XI', 'XII', 'L', 'C', 'D', 'M',
+        'i', 'ii', 'iii', 'iv', 'v', 'vi', 'vii', 'viii', 'ix', 'x', 'xi', 'xii', 'l', 'c', 'd', 'm',
+        '(D', 'D)', '((|))', ')', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '-', '|', '-', '|', '-', '|', '\\', '/', '\\', '/', '-', '-', '~', '~', '-', '|',
+        '-', '|', '-', '-', '-', '|', '-', '|', '|', '-', '-', '-', '-', '-', '-', '|',
+        '|', '|', '|', '|', '|', '|', '^', 'V', '\\', '=', 'V', '^', '-', '-', '|', '|',
+        '-', '-', '|', '|', '=', '|', '=', '=', '|', '=', '|', '=', '=', '=', '=', '=',
+        '=', '|', '=', '|', '=', '|', '\\', '/', '\\', '/', '=', '=', '~', '~', '|', '|',
+        '-', '|', '-', '|', '-', '-', '-', '|', '-', '|', '|', '|', '|', '|', '|', '|',
+        '-', '\\', '\\', '|', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xb0': [
+        'ggwem', 'ggweb', 'ggwebs', 'ggwes', 'ggwess', 'ggweng', 'ggwej', 'ggwec', 'ggwek', 'ggwet', 'ggwep', 'ggweh', 'ggwi', 'ggwig', 'ggwigg', 'ggwigs',
+        'ggwin', 'ggwinj', 'ggwinh', 'ggwid', 'ggwil', 'ggwilg', 'ggwilm', 'ggwilb', 'ggwils', 'ggwilt', 'ggwilp', 'ggwilh', 'ggwim', 'ggwib', 'ggwibs', 'ggwis',
+        'ggwiss', 'ggwing', 'ggwij', 'ggwic', 'ggwik', 'ggwit', 'ggwip', 'ggwih', 'ggyu', 'ggyug', 'ggyugg', 'ggyugs', 'ggyun', 'ggyunj', 'ggyunh', 'ggyud',
+        'ggyul', 'ggyulg', 'ggyulm', 'ggyulb', 'ggyuls', 'ggyult', 'ggyulp', 'ggyulh', 'ggyum', 'ggyub', 'ggyubs', 'ggyus', 'ggyuss', 'ggyung', 'ggyuj', 'ggyuc',
+        'ggyuk', 'ggyut', 'ggyup', 'ggyuh', 'ggeu', 'ggeug', 'ggeugg', 'ggeugs', 'ggeun', 'ggeunj', 'ggeunh', 'ggeud', 'ggeul', 'ggeulg', 'ggeulm', 'ggeulb',
+        'ggeuls', 'ggeult', 'ggeulp', 'ggeulh', 'ggeum', 'ggeub', 'ggeubs', 'ggeus', 'ggeuss', 'ggeung', 'ggeuj', 'ggeuc', 'ggeuk', 'ggeut', 'ggeup', 'ggeuh',
+        'ggyi', 'ggyig', 'ggyigg', 'ggyigs', 'ggyin', 'ggyinj', 'ggyinh', 'ggyid', 'ggyil', 'ggyilg', 'ggyilm', 'ggyilb', 'ggyils', 'ggyilt', 'ggyilp', 'ggyilh',
+        'ggyim', 'ggyib', 'ggyibs', 'ggyis', 'ggyiss', 'ggying', 'ggyij', 'ggyic', 'ggyik', 'ggyit', 'ggyip', 'ggyih', 'ggi', 'ggig', 'ggigg', 'ggigs',
+        'ggin', 'gginj', 'gginh', 'ggid', 'ggil', 'ggilg', 'ggilm', 'ggilb', 'ggils', 'ggilt', 'ggilp', 'ggilh', 'ggim', 'ggib', 'ggibs', 'ggis',
+        'ggiss', 'gging', 'ggij', 'ggic', 'ggik', 'ggit', 'ggip', 'ggih', 'na', 'nag', 'nagg', 'nags', 'nan', 'nanj', 'nanh', 'nad',
+        'nal', 'nalg', 'nalm', 'nalb', 'nals', 'nalt', 'nalp', 'nalh', 'nam', 'nab', 'nabs', 'nas', 'nass', 'nang', 'naj', 'nac',
+        'nak', 'nat', 'nap', 'nah', 'nae', 'naeg', 'naegg', 'naegs', 'naen', 'naenj', 'naenh', 'naed', 'nael', 'naelg', 'naelm', 'naelb',
+        'naels', 'naelt', 'naelp', 'naelh', 'naem', 'naeb', 'naebs', 'naes', 'naess', 'naeng', 'naej', 'naec', 'naek', 'naet', 'naep', 'naeh',
+        'nya', 'nyag', 'nyagg', 'nyags', 'nyan', 'nyanj', 'nyanh', 'nyad', 'nyal', 'nyalg', 'nyalm', 'nyalb', 'nyals', 'nyalt', 'nyalp', 'nyalh',
+        'nyam', 'nyab', 'nyabs', 'nyas', 'nyass', 'nyang', 'nyaj', 'nyac', 'nyak', 'nyat', 'nyap', 'nyah', 'nyae', 'nyaeg', 'nyaegg', 'nyaegs',
+        'nyaen', 'nyaenj', 'nyaenh', 'nyaed', 'nyael', 'nyaelg', 'nyaelm', 'nyaelb', 'nyaels', 'nyaelt', 'nyaelp', 'nyaelh', 'nyaem', 'nyaeb', 'nyaebs', 'nyaes',
+    ],
+    'xa3': [
+        'nzup', 'nzurx', 'nzur', 'nzyt', 'nzyx', 'nzy', 'nzyp', 'nzyrx', 'nzyr', 'sit', 'six', 'si', 'sip', 'siex', 'sie', 'siep',
+        'sat', 'sax', 'sa', 'sap', 'suox', 'suo', 'suop', 'sot', 'sox', 'so', 'sop', 'sex', 'se', 'sep', 'sut', 'sux',
+        'su', 'sup', 'surx', 'sur', 'syt', 'syx', 'sy', 'syp', 'syrx', 'syr', 'ssit', 'ssix', 'ssi', 'ssip', 'ssiex', 'ssie',
+        'ssiep', 'ssat', 'ssax', 'ssa', 'ssap', 'ssot', 'ssox', 'sso', 'ssop', 'ssex', 'sse', 'ssep', 'ssut', 'ssux', 'ssu', 'ssup',
+        'ssyt', 'ssyx', 'ssy', 'ssyp', 'ssyrx', 'ssyr', 'zhat', 'zhax', 'zha', 'zhap', 'zhuox', 'zhuo', 'zhuop', 'zhot', 'zhox', 'zho',
+        'zhop', 'zhet', 'zhex', 'zhe', 'zhep', 'zhut', 'zhux', 'zhu', 'zhup', 'zhurx', 'zhur', 'zhyt', 'zhyx', 'zhy', 'zhyp', 'zhyrx',
+        'zhyr', 'chat', 'chax', 'cha', 'chap', 'chuot', 'chuox', 'chuo', 'chuop', 'chot', 'chox', 'cho', 'chop', 'chet', 'chex', 'che',
+        'chep', 'chux', 'chu', 'chup', 'churx', 'chur', 'chyt', 'chyx', 'chy', 'chyp', 'chyrx', 'chyr', 'rrax', 'rra', 'rruox', 'rruo',
+        'rrot', 'rrox', 'rro', 'rrop', 'rret', 'rrex', 'rre', 'rrep', 'rrut', 'rrux', 'rru', 'rrup', 'rrurx', 'rrur', 'rryt', 'rryx',
+        'rry', 'rryp', 'rryrx', 'rryr', 'nrat', 'nrax', 'nra', 'nrap', 'nrox', 'nro', 'nrop', 'nret', 'nrex', 'nre', 'nrep', 'nrut',
+        'nrux', 'nru', 'nrup', 'nrurx', 'nrur', 'nryt', 'nryx', 'nry', 'nryp', 'nryrx', 'nryr', 'shat', 'shax', 'sha', 'shap', 'shuox',
+        'shuo', 'shuop', 'shot', 'shox', 'sho', 'shop', 'shet', 'shex', 'she', 'shep', 'shut', 'shux', 'shu', 'shup', 'shurx', 'shur',
+        'shyt', 'shyx', 'shy', 'shyp', 'shyrx', 'shyr', 'rat', 'rax', 'ra', 'rap', 'ruox', 'ruo', 'ruop', 'rot', 'rox', 'ro',
+        'rop', 'rex', 're', 'rep', 'rut', 'rux', 'ru', 'rup', 'rurx', 'rur', 'ryt', 'ryx', 'ry', 'ryp', 'ryrx', 'ryr',
+        'jit', 'jix', 'ji', 'jip', 'jiet', 'jiex', 'jie', 'jiep', 'juot', 'juox', 'juo', 'juop', 'jot', 'jox', 'jo', 'jop',
+        'jut', 'jux', 'ju', 'jup', 'jurx', 'jur', 'jyt', 'jyx', 'jy', 'jyp', 'jyrx', 'jyr', 'qit', 'qix', 'qi', 'qip',
+    ],
+    'xbb': [
+        'moen', 'moenj', 'moenh', 'moed', 'moel', 'moelg', 'moelm', 'moelb', 'moels', 'moelt', 'moelp', 'moelh', 'moem', 'moeb', 'moebs', 'moes',
+        'moess', 'moeng', 'moej', 'moec', 'moek', 'moet', 'moep', 'moeh', 'myo', 'myog', 'myogg', 'myogs', 'myon', 'myonj', 'myonh', 'myod',
+        'myol', 'myolg', 'myolm', 'myolb', 'myols', 'myolt', 'myolp', 'myolh', 'myom', 'myob', 'myobs', 'myos', 'myoss', 'myong', 'myoj', 'myoc',
+        'myok', 'myot', 'myop', 'myoh', 'mu', 'mug', 'mugg', 'mugs', 'mun', 'munj', 'munh', 'mud', 'mul', 'mulg', 'mulm', 'mulb',
+        'muls', 'mult', 'mulp', 'mulh', 'mum', 'mub', 'mubs', 'mus', 'muss', 'mung', 'muj', 'muc', 'muk', 'mut', 'mup', 'muh',
+        'mweo', 'mweog', 'mweogg', 'mweogs', 'mweon', 'mweonj', 'mweonh', 'mweod', 'mweol', 'mweolg', 'mweolm', 'mweolb', 'mweols', 'mweolt', 'mweolp', 'mweolh',
+        'mweom', 'mweob', 'mweobs', 'mweos', 'mweoss', 'mweong', 'mweoj', 'mweoc', 'mweok', 'mweot', 'mweop', 'mweoh', 'mwe', 'mweg', 'mwegg', 'mwegs',
+        'mwen', 'mwenj', 'mwenh', 'mwed', 'mwel', 'mwelg', 'mwelm', 'mwelb', 'mwels', 'mwelt', 'mwelp', 'mwelh', 'mwem', 'mweb', 'mwebs', 'mwes',
+        'mwess', 'mweng', 'mwej', 'mwec', 'mwek', 'mwet', 'mwep', 'mweh', 'mwi', 'mwig', 'mwigg', 'mwigs', 'mwin', 'mwinj', 'mwinh', 'mwid',
+        'mwil', 'mwilg', 'mwilm', 'mwilb', 'mwils', 'mwilt', 'mwilp', 'mwilh', 'mwim', 'mwib', 'mwibs', 'mwis', 'mwiss', 'mwing', 'mwij', 'mwic',
+        'mwik', 'mwit', 'mwip', 'mwih', 'myu', 'myug', 'myugg', 'myugs', 'myun', 'myunj', 'myunh', 'myud', 'myul', 'myulg', 'myulm', 'myulb',
+        'myuls', 'myult', 'myulp', 'myulh', 'myum', 'myub', 'myubs', 'myus', 'myuss', 'myung', 'myuj', 'myuc', 'myuk', 'myut', 'myup', 'myuh',
+        'meu', 'meug', 'meugg', 'meugs', 'meun', 'meunj', 'meunh', 'meud', 'meul', 'meulg', 'meulm', 'meulb', 'meuls', 'meult', 'meulp', 'meulh',
+        'meum', 'meub', 'meubs', 'meus', 'meuss', 'meung', 'meuj', 'meuc', 'meuk', 'meut', 'meup', 'meuh', 'myi', 'myig', 'myigg', 'myigs',
+        'myin', 'myinj', 'myinh', 'myid', 'myil', 'myilg', 'myilm', 'myilb', 'myils', 'myilt', 'myilp', 'myilh', 'myim', 'myib', 'myibs', 'myis',
+        'myiss', 'mying', 'myij', 'myic', 'myik', 'myit', 'myip', 'myih', 'mi', 'mig', 'migg', 'migs', 'min', 'minj', 'minh', 'mid',
+    ],
+    'x02': [
+        'A', 'a', 'A', 'a', 'E', 'e', 'E', 'e', 'I', 'i', 'I', 'i', 'O', 'o', 'O', 'o',
+        'R', 'r', 'R', 'r', 'U', 'u', 'U', 'u', 'S', 's', 'T', 't', 'Y', 'y', 'H', 'h',
+        '[?]', '[?]', 'OU', 'ou', 'Z', 'z', 'A', 'a', 'E', 'e', 'O', 'o', 'O', 'o', 'O', 'o',
+        'O', 'o', 'Y', 'y', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        'a', 'a', 'a', 'b', 'o', 'c', 'd', 'd', 'e', '@', '@', 'e', 'e', 'e', 'e', 'j',
+        'g', 'g', 'g', 'g', 'u', 'Y', 'h', 'h', 'i', 'i', 'I', 'l', 'l', 'l', 'lZ', 'W',
+        'W', 'm', 'n', 'n', 'n', 'o', 'OE', 'O', 'F', 'R', 'R', 'R', 'R', 'r', 'r', 'R',
+        'R', 'R', 's', 'S', 'j', 'S', 'S', 't', 't', 'U', 'U', 'v', '^', 'W', 'Y', 'Y',
+        'z', 'z', 'Z', 'Z', '?', '?', '?', 'C', '@', 'B', 'E', 'G', 'H', 'j', 'k', 'L',
+        'q', '?', '?', 'dz', 'dZ', 'dz', 'ts', 'tS', 'tC', 'fN', 'ls', 'lz', 'WW', ']]', '[?]', '[?]',
+        'k', 'h', 'j', 'r', 'r', 'r', 'r', 'w', 'y', "'", '"', '`', "'", '`', '`', "'",
+        '?', '?', '<', '>', '^', 'V', '^', 'V', "'", '-', '/', '\\', ',', '_', '\\', '/',
+        ':', '.', '`', "'", '^', 'V', '+', '-', 'V', '.', '@', ',', '~', '"', 'R', 'X',
+        'G', 'l', 's', 'x', '?', '', '', '', '', '', '', '', 'V', '=', '"', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xb5': [
+        'dyil', 'dyilg', 'dyilm', 'dyilb', 'dyils', 'dyilt', 'dyilp', 'dyilh', 'dyim', 'dyib', 'dyibs', 'dyis', 'dyiss', 'dying', 'dyij', 'dyic',
+        'dyik', 'dyit', 'dyip', 'dyih', 'di', 'dig', 'digg', 'digs', 'din', 'dinj', 'dinh', 'did', 'dil', 'dilg', 'dilm', 'dilb',
+        'dils', 'dilt', 'dilp', 'dilh', 'dim', 'dib', 'dibs', 'dis', 'diss', 'ding', 'dij', 'dic', 'dik', 'dit', 'dip', 'dih',
+        'dda', 'ddag', 'ddagg', 'ddags', 'ddan', 'ddanj', 'ddanh', 'ddad', 'ddal', 'ddalg', 'ddalm', 'ddalb', 'ddals', 'ddalt', 'ddalp', 'ddalh',
+        'ddam', 'ddab', 'ddabs', 'ddas', 'ddass', 'ddang', 'ddaj', 'ddac', 'ddak', 'ddat', 'ddap', 'ddah', 'ddae', 'ddaeg', 'ddaegg', 'ddaegs',
+        'ddaen', 'ddaenj', 'ddaenh', 'ddaed', 'ddael', 'ddaelg', 'ddaelm', 'ddaelb', 'ddaels', 'ddaelt', 'ddaelp', 'ddaelh', 'ddaem', 'ddaeb', 'ddaebs', 'ddaes',
+        'ddaess', 'ddaeng', 'ddaej', 'ddaec', 'ddaek', 'ddaet', 'ddaep', 'ddaeh', 'ddya', 'ddyag', 'ddyagg', 'ddyags', 'ddyan', 'ddyanj', 'ddyanh', 'ddyad',
+        'ddyal', 'ddyalg', 'ddyalm', 'ddyalb', 'ddyals', 'ddyalt', 'ddyalp', 'ddyalh', 'ddyam', 'ddyab', 'ddyabs', 'ddyas', 'ddyass', 'ddyang', 'ddyaj', 'ddyac',
+        'ddyak', 'ddyat', 'ddyap', 'ddyah', 'ddyae', 'ddyaeg', 'ddyaegg', 'ddyaegs', 'ddyaen', 'ddyaenj', 'ddyaenh', 'ddyaed', 'ddyael', 'ddyaelg', 'ddyaelm', 'ddyaelb',
+        'ddyaels', 'ddyaelt', 'ddyaelp', 'ddyaelh', 'ddyaem', 'ddyaeb', 'ddyaebs', 'ddyaes', 'ddyaess', 'ddyaeng', 'ddyaej', 'ddyaec', 'ddyaek', 'ddyaet', 'ddyaep', 'ddyaeh',
+        'ddeo', 'ddeog', 'ddeogg', 'ddeogs', 'ddeon', 'ddeonj', 'ddeonh', 'ddeod', 'ddeol', 'ddeolg', 'ddeolm', 'ddeolb', 'ddeols', 'ddeolt', 'ddeolp', 'ddeolh',
+        'ddeom', 'ddeob', 'ddeobs', 'ddeos', 'ddeoss', 'ddeong', 'ddeoj', 'ddeoc', 'ddeok', 'ddeot', 'ddeop', 'ddeoh', 'dde', 'ddeg', 'ddegg', 'ddegs',
+        'dden', 'ddenj', 'ddenh', 'dded', 'ddel', 'ddelg', 'ddelm', 'ddelb', 'ddels', 'ddelt', 'ddelp', 'ddelh', 'ddem', 'ddeb', 'ddebs', 'ddes',
+        'ddess', 'ddeng', 'ddej', 'ddec', 'ddek', 'ddet', 'ddep', 'ddeh', 'ddyeo', 'ddyeog', 'ddyeogg', 'ddyeogs', 'ddyeon', 'ddyeonj', 'ddyeonh', 'ddyeod',
+        'ddyeol', 'ddyeolg', 'ddyeolm', 'ddyeolb', 'ddyeols', 'ddyeolt', 'ddyeolp', 'ddyeolh', 'ddyeom', 'ddyeob', 'ddyeobs', 'ddyeos', 'ddyeoss', 'ddyeong', 'ddyeoj', 'ddyeoc',
+        'ddyeok', 'ddyeot', 'ddyeop', 'ddyeoh', 'ddye', 'ddyeg', 'ddyegg', 'ddyegs', 'ddyen', 'ddyenj', 'ddyenh', 'ddyed', 'ddyel', 'ddyelg', 'ddyelm', 'ddyelb',
+    ],
+    'x17': [
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 't', 'tth', 'd', 'ddh', 'nn', 't',
+        'th', 'd', 'dh', 'n', 'p', 'ph', 'b', 'bh', 'm', 'y', 'r', 'l', 'v', 'sh', 'ss', 's',
+        'h', 'l', 'q', 'a', 'aa', 'i', 'ii', 'u', 'uk', 'uu', 'uuv', 'ry', 'ryy', 'ly', 'lyy', 'e',
+        'ai', 'oo', 'oo', 'au', 'a', 'aa', 'aa', 'i', 'ii', 'y', 'yy', 'u', 'uu', 'ua', 'oe', 'ya',
+        'ie', 'e', 'ae', 'ai', 'oo', 'au', 'M', 'H', 'a`', '', '', '', 'r', '', '!', '',
+        '', '', '', '', '.', ' // ', ':', '+', '++', ' * ', ' /// ', 'KR', "'", '[?]', '[?]', '[?]',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'x0b': [
+        '[?]', 'N', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', 'R', 'L', '[?]', '[?]', 'e',
+        'ai', '[?]', '[?]', 'o', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
+        'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', '[?]', 'p', 'ph', 'b', 'bh', 'm', 'y',
+        'r', '[?]', 'l', 'll', '[?]', '', 'sh', 'ss', 's', 'h', '[?]', '[?]', "'", "'", 'aa', 'i',
+        'ii', 'u', 'uu', 'R', '[?]', '[?]', '[?]', 'e', 'ai', '[?]', '[?]', 'o', 'au', '', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '+', '+', '[?]', '[?]', '[?]', '[?]', 'rr', 'rh', '[?]', 'yy',
+        'RR', 'LL', '[?]', '[?]', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', '[?]', '[?]', '[?]', 'e', 'ee',
+        'ai', '[?]', 'o', 'oo', 'au', 'k', '[?]', '[?]', '[?]', 'ng', 'c', '[?]', 'j', '[?]', 'ny', 'tt',
+        '[?]', '[?]', '[?]', 'nn', 't', '[?]', '[?]', '[?]', 'n', 'nnn', 'p', '[?]', '[?]', '[?]', 'm', 'y',
+        'r', 'rr', 'l', 'll', 'lll', 'v', '[?]', 'ss', 's', 'h', '[?]', '[?]', '[?]', '[?]', 'aa', 'i',
+        'ii', 'u', 'uu', '[?]', '[?]', '[?]', 'e', 'ee', 'ai', '[?]', 'o', 'oo', 'au', '', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '+', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '+10+', '+100+', '+1000+', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'x0f': [
+        'AUM', '', '', '', '', '', '', '', ' // ', ' * ', '', '-', ' / ', ' / ', ' // ', ' -/ ',
+        ' +/ ', ' X/ ', ' /XX/ ', ' /X/ ', ', ', '', '', '', '', '', '', '', '', '', '', '',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.5', '1.5', '2.5', '3.5', '4.5', '5.5',
+        '6.5', '7.5', '8.5', '-.5', '+', '*', '^', '_', '', '~', '[?]', ']', '[[', ']]', '', '',
+        'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', '[?]', 'ny', 'tt', 'tth', 'dd', 'ddh', 'nn', 't',
+        'th', 'd', 'dh', 'n', 'p', 'ph', 'b', 'bh', 'm', 'ts', 'tsh', 'dz', 'dzh', 'w', 'zh', 'z',
+        "'", 'y', 'r', 'l', 'sh', 'ssh', 's', 'h', 'a', 'kss', 'r', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', 'aa', 'i', 'ii', 'u', 'uu', 'R', 'RR', 'L', 'LL', 'e', 'ee', 'o', 'oo', 'M', 'H',
+        'i', 'ii', '', '', '', '', '', '', '', '', '', '', '[?]', '[?]', '[?]', '[?]',
+        'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', '[?]', 'ny', 'tt', 'tth', 'dd', 'ddh', 'nn', 't',
+        'th', 'd', 'dh', 'n', 'p', 'ph', 'b', 'bh', 'm', 'ts', 'tsh', 'dz', 'dzh', 'w', 'zh', 'z',
+        "'", 'y', 'r', 'l', 'sh', 'ss', 's', 'h', 'a', 'kss', 'w', 'y', 'r', '[?]', 'X', ' :X: ',
+        ' /O/ ', ' /o/ ', ' \\o\\ ', ' (O) ', '', '', '', '', '', '', '', '', '', '[?]', '[?]', '',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xc4': [
+        'sswals', 'sswalt', 'sswalp', 'sswalh', 'sswam', 'sswab', 'sswabs', 'sswas', 'sswass', 'sswang', 'sswaj', 'sswac', 'sswak', 'sswat', 'sswap', 'sswah',
+        'sswae', 'sswaeg', 'sswaegg', 'sswaegs', 'sswaen', 'sswaenj', 'sswaenh', 'sswaed', 'sswael', 'sswaelg', 'sswaelm', 'sswaelb', 'sswaels', 'sswaelt', 'sswaelp', 'sswaelh',
+        'sswaem', 'sswaeb', 'sswaebs', 'sswaes', 'sswaess', 'sswaeng', 'sswaej', 'sswaec', 'sswaek', 'sswaet', 'sswaep', 'sswaeh', 'ssoe', 'ssoeg', 'ssoegg', 'ssoegs',
+        'ssoen', 'ssoenj', 'ssoenh', 'ssoed', 'ssoel', 'ssoelg', 'ssoelm', 'ssoelb', 'ssoels', 'ssoelt', 'ssoelp', 'ssoelh', 'ssoem', 'ssoeb', 'ssoebs', 'ssoes',
+        'ssoess', 'ssoeng', 'ssoej', 'ssoec', 'ssoek', 'ssoet', 'ssoep', 'ssoeh', 'ssyo', 'ssyog', 'ssyogg', 'ssyogs', 'ssyon', 'ssyonj', 'ssyonh', 'ssyod',
+        'ssyol', 'ssyolg', 'ssyolm', 'ssyolb', 'ssyols', 'ssyolt', 'ssyolp', 'ssyolh', 'ssyom', 'ssyob', 'ssyobs', 'ssyos', 'ssyoss', 'ssyong', 'ssyoj', 'ssyoc',
+        'ssyok', 'ssyot', 'ssyop', 'ssyoh', 'ssu', 'ssug', 'ssugg', 'ssugs', 'ssun', 'ssunj', 'ssunh', 'ssud', 'ssul', 'ssulg', 'ssulm', 'ssulb',
+        'ssuls', 'ssult', 'ssulp', 'ssulh', 'ssum', 'ssub', 'ssubs', 'ssus', 'ssuss', 'ssung', 'ssuj', 'ssuc', 'ssuk', 'ssut', 'ssup', 'ssuh',
+        'ssweo', 'ssweog', 'ssweogg', 'ssweogs', 'ssweon', 'ssweonj', 'ssweonh', 'ssweod', 'ssweol', 'ssweolg', 'ssweolm', 'ssweolb', 'ssweols', 'ssweolt', 'ssweolp', 'ssweolh',
+        'ssweom', 'ssweob', 'ssweobs', 'ssweos', 'ssweoss', 'ssweong', 'ssweoj', 'ssweoc', 'ssweok', 'ssweot', 'ssweop', 'ssweoh', 'sswe', 'ssweg', 'sswegg', 'sswegs',
+        'sswen', 'sswenj', 'sswenh', 'sswed', 'sswel', 'sswelg', 'sswelm', 'sswelb', 'sswels', 'sswelt', 'sswelp', 'sswelh', 'sswem', 'ssweb', 'sswebs', 'sswes',
+        'sswess', 'ssweng', 'sswej', 'sswec', 'sswek', 'sswet', 'sswep', 'ssweh', 'sswi', 'sswig', 'sswigg', 'sswigs', 'sswin', 'sswinj', 'sswinh', 'sswid',
+        'sswil', 'sswilg', 'sswilm', 'sswilb', 'sswils', 'sswilt', 'sswilp', 'sswilh', 'sswim', 'sswib', 'sswibs', 'sswis', 'sswiss', 'sswing', 'sswij', 'sswic',
+        'sswik', 'sswit', 'sswip', 'sswih', 'ssyu', 'ssyug', 'ssyugg', 'ssyugs', 'ssyun', 'ssyunj', 'ssyunh', 'ssyud', 'ssyul', 'ssyulg', 'ssyulm', 'ssyulb',
+        'ssyuls', 'ssyult', 'ssyulp', 'ssyulh', 'ssyum', 'ssyub', 'ssyubs', 'ssyus', 'ssyuss', 'ssyung', 'ssyuj', 'ssyuc', 'ssyuk', 'ssyut', 'ssyup', 'ssyuh',
+        'sseu', 'sseug', 'sseugg', 'sseugs', 'sseun', 'sseunj', 'sseunh', 'sseud', 'sseul', 'sseulg', 'sseulm', 'sseulb', 'sseuls', 'sseult', 'sseulp', 'sseulh',
+    ],
+    'xd0': [
+        'kweon', 'kweonj', 'kweonh', 'kweod', 'kweol', 'kweolg', 'kweolm', 'kweolb', 'kweols', 'kweolt', 'kweolp', 'kweolh', 'kweom', 'kweob', 'kweobs', 'kweos',
+        'kweoss', 'kweong', 'kweoj', 'kweoc', 'kweok', 'kweot', 'kweop', 'kweoh', 'kwe', 'kweg', 'kwegg', 'kwegs', 'kwen', 'kwenj', 'kwenh', 'kwed',
+        'kwel', 'kwelg', 'kwelm', 'kwelb', 'kwels', 'kwelt', 'kwelp', 'kwelh', 'kwem', 'kweb', 'kwebs', 'kwes', 'kwess', 'kweng', 'kwej', 'kwec',
+        'kwek', 'kwet', 'kwep', 'kweh', 'kwi', 'kwig', 'kwigg', 'kwigs', 'kwin', 'kwinj', 'kwinh', 'kwid', 'kwil', 'kwilg', 'kwilm', 'kwilb',
+        'kwils', 'kwilt', 'kwilp', 'kwilh', 'kwim', 'kwib', 'kwibs', 'kwis', 'kwiss', 'kwing', 'kwij', 'kwic', 'kwik', 'kwit', 'kwip', 'kwih',
+        'kyu', 'kyug', 'kyugg', 'kyugs', 'kyun', 'kyunj', 'kyunh', 'kyud', 'kyul', 'kyulg', 'kyulm', 'kyulb', 'kyuls', 'kyult', 'kyulp', 'kyulh',
+        'kyum', 'kyub', 'kyubs', 'kyus', 'kyuss', 'kyung', 'kyuj', 'kyuc', 'kyuk', 'kyut', 'kyup', 'kyuh', 'keu', 'keug', 'keugg', 'keugs',
+        'keun', 'keunj', 'keunh', 'keud', 'keul', 'keulg', 'keulm', 'keulb', 'keuls', 'keult', 'keulp', 'keulh', 'keum', 'keub', 'keubs', 'keus',
+        'keuss', 'keung', 'keuj', 'keuc', 'keuk', 'keut', 'keup', 'keuh', 'kyi', 'kyig', 'kyigg', 'kyigs', 'kyin', 'kyinj', 'kyinh', 'kyid',
+        'kyil', 'kyilg', 'kyilm', 'kyilb', 'kyils', 'kyilt', 'kyilp', 'kyilh', 'kyim', 'kyib', 'kyibs', 'kyis', 'kyiss', 'kying', 'kyij', 'kyic',
+        'kyik', 'kyit', 'kyip', 'kyih', 'ki', 'kig', 'kigg', 'kigs', 'kin', 'kinj', 'kinh', 'kid', 'kil', 'kilg', 'kilm', 'kilb',
+        'kils', 'kilt', 'kilp', 'kilh', 'kim', 'kib', 'kibs', 'kis', 'kiss', 'king', 'kij', 'kic', 'kik', 'kit', 'kip', 'kih',
+        'ta', 'tag', 'tagg', 'tags', 'tan', 'tanj', 'tanh', 'tad', 'tal', 'talg', 'talm', 'talb', 'tals', 'talt', 'talp', 'talh',
+        'tam', 'tab', 'tabs', 'tas', 'tass', 'tang', 'taj', 'tac', 'tak', 'tat', 'tap', 'tah', 'tae', 'taeg', 'taegg', 'taegs',
+        'taen', 'taenj', 'taenh', 'taed', 'tael', 'taelg', 'taelm', 'taelb', 'taels', 'taelt', 'taelp', 'taelh', 'taem', 'taeb', 'taebs', 'taes',
+        'taess', 'taeng', 'taej', 'taec', 'taek', 'taet', 'taep', 'taeh', 'tya', 'tyag', 'tyagg', 'tyags', 'tyan', 'tyanj', 'tyanh', 'tyad',
+    ],
+    'xb9': [
+        'ruk', 'rut', 'rup', 'ruh', 'rweo', 'rweog', 'rweogg', 'rweogs', 'rweon', 'rweonj', 'rweonh', 'rweod', 'rweol', 'rweolg', 'rweolm', 'rweolb',
+        'rweols', 'rweolt', 'rweolp', 'rweolh', 'rweom', 'rweob', 'rweobs', 'rweos', 'rweoss', 'rweong', 'rweoj', 'rweoc', 'rweok', 'rweot', 'rweop', 'rweoh',
+        'rwe', 'rweg', 'rwegg', 'rwegs', 'rwen', 'rwenj', 'rwenh', 'rwed', 'rwel', 'rwelg', 'rwelm', 'rwelb', 'rwels', 'rwelt', 'rwelp', 'rwelh',
+        'rwem', 'rweb', 'rwebs', 'rwes', 'rwess', 'rweng', 'rwej', 'rwec', 'rwek', 'rwet', 'rwep', 'rweh', 'rwi', 'rwig', 'rwigg', 'rwigs',
+        'rwin', 'rwinj', 'rwinh', 'rwid', 'rwil', 'rwilg', 'rwilm', 'rwilb', 'rwils', 'rwilt', 'rwilp', 'rwilh', 'rwim', 'rwib', 'rwibs', 'rwis',
+        'rwiss', 'rwing', 'rwij', 'rwic', 'rwik', 'rwit', 'rwip', 'rwih', 'ryu', 'ryug', 'ryugg', 'ryugs', 'ryun', 'ryunj', 'ryunh', 'ryud',
+        'ryul', 'ryulg', 'ryulm', 'ryulb', 'ryuls', 'ryult', 'ryulp', 'ryulh', 'ryum', 'ryub', 'ryubs', 'ryus', 'ryuss', 'ryung', 'ryuj', 'ryuc',
+        'ryuk', 'ryut', 'ryup', 'ryuh', 'reu', 'reug', 'reugg', 'reugs', 'reun', 'reunj', 'reunh', 'reud', 'reul', 'reulg', 'reulm', 'reulb',
+        'reuls', 'reult', 'reulp', 'reulh', 'reum', 'reub', 'reubs', 'reus', 'reuss', 'reung', 'reuj', 'reuc', 'reuk', 'reut', 'reup', 'reuh',
+        'ryi', 'ryig', 'ryigg', 'ryigs', 'ryin', 'ryinj', 'ryinh', 'ryid', 'ryil', 'ryilg', 'ryilm', 'ryilb', 'ryils', 'ryilt', 'ryilp', 'ryilh',
+        'ryim', 'ryib', 'ryibs', 'ryis', 'ryiss', 'rying', 'ryij', 'ryic', 'ryik', 'ryit', 'ryip', 'ryih', 'ri', 'rig', 'rigg', 'rigs',
+        'rin', 'rinj', 'rinh', 'rid', 'ril', 'rilg', 'rilm', 'rilb', 'rils', 'rilt', 'rilp', 'rilh', 'rim', 'rib', 'ribs', 'ris',
+        'riss', 'ring', 'rij', 'ric', 'rik', 'rit', 'rip', 'rih', 'ma', 'mag', 'magg', 'mags', 'man', 'manj', 'manh', 'mad',
+        'mal', 'malg', 'malm', 'malb', 'mals', 'malt', 'malp', 'malh', 'mam', 'mab', 'mabs', 'mas', 'mass', 'mang', 'maj', 'mac',
+        'mak', 'mat', 'map', 'mah', 'mae', 'maeg', 'maegg', 'maegs', 'maen', 'maenj', 'maenh', 'maed', 'mael', 'maelg', 'maelm', 'maelb',
+        'maels', 'maelt', 'maelp', 'maelh', 'maem', 'maeb', 'maebs', 'maes', 'maess', 'maeng', 'maej', 'maec', 'maek', 'maet', 'maep', 'maeh',
+    ],
+    'xff': [
+        '[?]', '!', '"', '#', '\\$', '%', '&', "'", '(', ')', '*', '+', ',', '-', '.', '/',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?',
+        '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+        'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[', '\\', ']', '^', '_',
+        '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+        'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '\\{', '|', '\\}', '~', '[?]',
+        '[?]', '.', '[', ']', ',', '*', 'wo', 'a', 'i', 'u', 'e', 'o', 'ya', 'yu', 'yo', 'tu',
+        '+', 'a', 'i', 'u', 'e', 'o', 'ka', 'ki', 'ku', 'ke', 'ko', 'sa', 'si', 'su', 'se', 'so',
+        'ta', 'ti', 'tu', 'te', 'to', 'na', 'ni', 'nu', 'ne', 'no', 'ha', 'hi', 'hu', 'he', 'ho', 'ma',
+        'mi', 'mu', 'me', 'mo', 'ya', 'yu', 'yo', 'ra', 'ri', 'ru', 're', 'ro', 'wa', 'n', ':', ';',
+        '', 'g', 'gg', 'gs', 'n', 'nj', 'nh', 'd', 'dd', 'r', 'lg', 'lm', 'lb', 'ls', 'lt', 'lp',
+        'rh', 'm', 'b', 'bb', 'bs', 's', 'ss', '', 'j', 'jj', 'c', 'k', 't', 'p', 'h', '[?]',
+        '[?]', '[?]', 'a', 'ae', 'ya', 'yae', 'eo', 'e', '[?]', '[?]', 'yeo', 'ye', 'o', 'wa', 'wae', 'oe',
+        '[?]', '[?]', 'yo', 'u', 'weo', 'we', 'wi', 'yu', '[?]', '[?]', 'eu', 'yi', 'i', '[?]', '[?]', '[?]',
+        '/C', 'PS', '!', '-', '|', 'Y=', 'W=', '[?]', '|', '-', '|', '-', '|', '#', 'O', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '\\{', '|', '\\}', '', '', '', '',
+    ],
+    'xc3': [
+        'ssal', 'ssalg', 'ssalm', 'ssalb', 'ssals', 'ssalt', 'ssalp', 'ssalh', 'ssam', 'ssab', 'ssabs', 'ssas', 'ssass', 'ssang', 'ssaj', 'ssac',
+        'ssak', 'ssat', 'ssap', 'ssah', 'ssae', 'ssaeg', 'ssaegg', 'ssaegs', 'ssaen', 'ssaenj', 'ssaenh', 'ssaed', 'ssael', 'ssaelg', 'ssaelm', 'ssaelb',
+        'ssaels', 'ssaelt', 'ssaelp', 'ssaelh', 'ssaem', 'ssaeb', 'ssaebs', 'ssaes', 'ssaess', 'ssaeng', 'ssaej', 'ssaec', 'ssaek', 'ssaet', 'ssaep', 'ssaeh',
+        'ssya', 'ssyag', 'ssyagg', 'ssyags', 'ssyan', 'ssyanj', 'ssyanh', 'ssyad', 'ssyal', 'ssyalg', 'ssyalm', 'ssyalb', 'ssyals', 'ssyalt', 'ssyalp', 'ssyalh',
+        'ssyam', 'ssyab', 'ssyabs', 'ssyas', 'ssyass', 'ssyang', 'ssyaj', 'ssyac', 'ssyak', 'ssyat', 'ssyap', 'ssyah', 'ssyae', 'ssyaeg', 'ssyaegg', 'ssyaegs',
+        'ssyaen', 'ssyaenj', 'ssyaenh', 'ssyaed', 'ssyael', 'ssyaelg', 'ssyaelm', 'ssyaelb', 'ssyaels', 'ssyaelt', 'ssyaelp', 'ssyaelh', 'ssyaem', 'ssyaeb', 'ssyaebs', 'ssyaes',
+        'ssyaess', 'ssyaeng', 'ssyaej', 'ssyaec', 'ssyaek', 'ssyaet', 'ssyaep', 'ssyaeh', 'sseo', 'sseog', 'sseogg', 'sseogs', 'sseon', 'sseonj', 'sseonh', 'sseod',
+        'sseol', 'sseolg', 'sseolm', 'sseolb', 'sseols', 'sseolt', 'sseolp', 'sseolh', 'sseom', 'sseob', 'sseobs', 'sseos', 'sseoss', 'sseong', 'sseoj', 'sseoc',
+        'sseok', 'sseot', 'sseop', 'sseoh', 'sse', 'sseg', 'ssegg', 'ssegs', 'ssen', 'ssenj', 'ssenh', 'ssed', 'ssel', 'sselg', 'sselm', 'sselb',
+        'ssels', 'sselt', 'sselp', 'sselh', 'ssem', 'sseb', 'ssebs', 'sses', 'ssess', 'sseng', 'ssej', 'ssec', 'ssek', 'sset', 'ssep', 'sseh',
+        'ssyeo', 'ssyeog', 'ssyeogg', 'ssyeogs', 'ssyeon', 'ssyeonj', 'ssyeonh', 'ssyeod', 'ssyeol', 'ssyeolg', 'ssyeolm', 'ssyeolb', 'ssyeols', 'ssyeolt', 'ssyeolp', 'ssyeolh',
+        'ssyeom', 'ssyeob', 'ssyeobs', 'ssyeos', 'ssyeoss', 'ssyeong', 'ssyeoj', 'ssyeoc', 'ssyeok', 'ssyeot', 'ssyeop', 'ssyeoh', 'ssye', 'ssyeg', 'ssyegg', 'ssyegs',
+        'ssyen', 'ssyenj', 'ssyenh', 'ssyed', 'ssyel', 'ssyelg', 'ssyelm', 'ssyelb', 'ssyels', 'ssyelt', 'ssyelp', 'ssyelh', 'ssyem', 'ssyeb', 'ssyebs', 'ssyes',
+        'ssyess', 'ssyeng', 'ssyej', 'ssyec', 'ssyek', 'ssyet', 'ssyep', 'ssyeh', 'sso', 'ssog', 'ssogg', 'ssogs', 'sson', 'ssonj', 'ssonh', 'ssod',
+        'ssol', 'ssolg', 'ssolm', 'ssolb', 'ssols', 'ssolt', 'ssolp', 'ssolh', 'ssom', 'ssob', 'ssobs', 'ssos', 'ssoss', 'ssong', 'ssoj', 'ssoc',
+        'ssok', 'ssot', 'ssop', 'ssoh', 'sswa', 'sswag', 'sswagg', 'sswags', 'sswan', 'sswanj', 'sswanh', 'sswad', 'sswal', 'sswalg', 'sswalm', 'sswalb',
+    ],
+    'x09': [
+        '[?]', 'N', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', 'R', 'L', 'eN', 'e', 'e',
+        'ai', 'oN', 'o', 'o', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
+        'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', 'nnn', 'p', 'ph', 'b', 'bh', 'm', 'y',
+        'r', 'rr', 'l', 'l', 'lll', 'v', 'sh', 'ss', 's', 'h', '[?]', '[?]', "'", "'", 'aa', 'i',
+        'ii', 'u', 'uu', 'R', 'RR', 'eN', 'e', 'e', 'ai', 'oN', 'o', 'o', 'au', '', '[?]', '[?]',
+        'AUM', "'", "'", '`', "'", '[?]', '[?]', '[?]', 'q', 'khh', 'ghh', 'z', 'dddh', 'rh', 'f', 'yy',
+        'RR', 'LL', 'L', 'LL', ' / ', ' // ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '.', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', 'N', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', 'R', 'RR', '[?]', '[?]', 'e',
+        'ai', '[?]', '[?]', 'o', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
+        'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', '[?]', 'p', 'ph', 'b', 'bh', 'm', 'y',
+        'r', '[?]', 'l', '[?]', '[?]', '[?]', 'sh', 'ss', 's', 'h', '[?]', '[?]', "'", '[?]', 'aa', 'i',
+        'ii', 'u', 'uu', 'R', 'RR', '[?]', '[?]', 'e', 'ai', '[?]', '[?]', 'o', 'au', '', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '+', '[?]', '[?]', '[?]', '[?]', 'rr', 'rh', '[?]', 'yy',
+        'RR', 'LL', 'L', 'LL', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        "r'", 'r`', 'Rs', 'Rs', '1/', '2/', '3/', '4/', ' 1 - 1/', '/16', '', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xb2': [
+        'nyok', 'nyot', 'nyop', 'nyoh', 'nu', 'nug', 'nugg', 'nugs', 'nun', 'nunj', 'nunh', 'nud', 'nul', 'nulg', 'nulm', 'nulb',
+        'nuls', 'nult', 'nulp', 'nulh', 'num', 'nub', 'nubs', 'nus', 'nuss', 'nung', 'nuj', 'nuc', 'nuk', 'nut', 'nup', 'nuh',
+        'nweo', 'nweog', 'nweogg', 'nweogs', 'nweon', 'nweonj', 'nweonh', 'nweod', 'nweol', 'nweolg', 'nweolm', 'nweolb', 'nweols', 'nweolt', 'nweolp', 'nweolh',
+        'nweom', 'nweob', 'nweobs', 'nweos', 'nweoss', 'nweong', 'nweoj', 'nweoc', 'nweok', 'nweot', 'nweop', 'nweoh', 'nwe', 'nweg', 'nwegg', 'nwegs',
+        'nwen', 'nwenj', 'nwenh', 'nwed', 'nwel', 'nwelg', 'nwelm', 'nwelb', 'nwels', 'nwelt', 'nwelp', 'nwelh', 'nwem', 'nweb', 'nwebs', 'nwes',
+        'nwess', 'nweng', 'nwej', 'nwec', 'nwek', 'nwet', 'nwep', 'nweh', 'nwi', 'nwig', 'nwigg', 'nwigs', 'nwin', 'nwinj', 'nwinh', 'nwid',
+        'nwil', 'nwilg', 'nwilm', 'nwilb', 'nwils', 'nwilt', 'nwilp', 'nwilh', 'nwim', 'nwib', 'nwibs', 'nwis', 'nwiss', 'nwing', 'nwij', 'nwic',
+        'nwik', 'nwit', 'nwip', 'nwih', 'nyu', 'nyug', 'nyugg', 'nyugs', 'nyun', 'nyunj', 'nyunh', 'nyud', 'nyul', 'nyulg', 'nyulm', 'nyulb',
+        'nyuls', 'nyult', 'nyulp', 'nyulh', 'nyum', 'nyub', 'nyubs', 'nyus', 'nyuss', 'nyung', 'nyuj', 'nyuc', 'nyuk', 'nyut', 'nyup', 'nyuh',
+        'neu', 'neug', 'neugg', 'neugs', 'neun', 'neunj', 'neunh', 'neud', 'neul', 'neulg', 'neulm', 'neulb', 'neuls', 'neult', 'neulp', 'neulh',
+        'neum', 'neub', 'neubs', 'neus', 'neuss', 'neung', 'neuj', 'neuc', 'neuk', 'neut', 'neup', 'neuh', 'nyi', 'nyig', 'nyigg', 'nyigs',
+        'nyin', 'nyinj', 'nyinh', 'nyid', 'nyil', 'nyilg', 'nyilm', 'nyilb', 'nyils', 'nyilt', 'nyilp', 'nyilh', 'nyim', 'nyib', 'nyibs', 'nyis',
+        'nyiss', 'nying', 'nyij', 'nyic', 'nyik', 'nyit', 'nyip', 'nyih', 'ni', 'nig', 'nigg', 'nigs', 'nin', 'ninj', 'ninh', 'nid',
+        'nil', 'nilg', 'nilm', 'nilb', 'nils', 'nilt', 'nilp', 'nilh', 'nim', 'nib', 'nibs', 'nis', 'niss', 'ning', 'nij', 'nic',
+        'nik', 'nit', 'nip', 'nih', 'da', 'dag', 'dagg', 'dags', 'dan', 'danj', 'danh', 'dad', 'dal', 'dalg', 'dalm', 'dalb',
+        'dals', 'dalt', 'dalp', 'dalh', 'dam', 'dab', 'dabs', 'das', 'dass', 'dang', 'daj', 'dac', 'dak', 'dat', 'dap', 'dah',
+    ],
+    'x0a': [
+        '[?]', '[?]', 'N', '[?]', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', '[?]', '[?]', '[?]', '[?]', 'ee',
+        'ai', '[?]', '[?]', 'oo', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
+        'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', '[?]', 'p', 'ph', 'b', 'bb', 'm', 'y',
+        'r', '[?]', 'l', 'll', '[?]', 'v', 'sh', '[?]', 's', 'h', '[?]', '[?]', "'", '[?]', 'aa', 'i',
+        'ii', 'u', 'uu', '[?]', '[?]', '[?]', '[?]', 'ee', 'ai', '[?]', '[?]', 'oo', 'au', '', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', 'khh', 'ghh', 'z', 'rr', '[?]', 'f', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        'N', 'H', '', '', 'G.E.O.', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', 'N', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', 'R', '[?]', 'eN', '[?]', 'e',
+        'ai', 'oN', '[?]', 'o', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
+        'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', '[?]', 'p', 'ph', 'b', 'bh', 'm', 'ya',
+        'r', '[?]', 'l', 'll', '[?]', 'v', 'sh', 'ss', 's', 'h', '[?]', '[?]', "'", "'", 'aa', 'i',
+        'ii', 'u', 'uu', 'R', 'RR', 'eN', '[?]', 'e', 'ai', 'oN', '[?]', 'o', 'au', '', '[?]', '[?]',
+        'AUM', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        'RR', '[?]', '[?]', '[?]', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'x0d': [
+        '[?]', '[?]', 'N', 'H', '[?]', 'a', 'aa', 'i', 'ii', 'u', 'uu', 'R', 'L', '[?]', 'e', 'ee',
+        'ai', '[?]', 'o', 'oo', 'au', 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'tt',
+        'tth', 'dd', 'ddh', 'nn', 't', 'th', 'd', 'dh', 'n', '[?]', 'p', 'ph', 'b', 'bh', 'm', 'y',
+        'r', 'rr', 'l', 'll', 'lll', 'v', 'sh', 'ss', 's', 'h', '[?]', '[?]', '[?]', '[?]', 'aa', 'i',
+        'ii', 'u', 'uu', 'R', '[?]', '[?]', 'e', 'ee', 'ai', '', 'o', 'oo', 'au', '', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '+', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        'RR', 'LL', '[?]', '[?]', '[?]', '[?]', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', 'N', 'H', '[?]', 'a', 'aa', 'ae', 'aae', 'i', 'ii', 'u', 'uu', 'R', 'RR', 'L',
+        'LL', 'e', 'ee', 'ai', 'o', 'oo', 'au', '[?]', '[?]', '[?]', 'k', 'kh', 'g', 'gh', 'ng', 'nng',
+        'c', 'ch', 'j', 'jh', 'ny', 'jny', 'nyj', 'tt', 'tth', 'dd', 'ddh', 'nn', 'nndd', 't', 'th', 'd',
+        'dh', 'n', '[?]', 'nd', 'p', 'ph', 'b', 'bh', 'm', 'mb', 'y', 'r', '[?]', 'l', '[?]', '[?]',
+        'v', 'sh', 'ss', 's', 'h', 'll', 'f', '[?]', '[?]', '[?]', '', '[?]', '[?]', '[?]', '[?]', 'aa',
+        'ae', 'aae', 'i', 'ii', 'u', '[?]', 'uu', '[?]', 'R', 'e', 'ee', 'ai', 'o', 'oo', 'au', 'L',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', 'RR', 'LL', ' . ', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xc1': [
+        'syae', 'syaeg', 'syaegg', 'syaegs', 'syaen', 'syaenj', 'syaenh', 'syaed', 'syael', 'syaelg', 'syaelm', 'syaelb', 'syaels', 'syaelt', 'syaelp', 'syaelh',
+        'syaem', 'syaeb', 'syaebs', 'syaes', 'syaess', 'syaeng', 'syaej', 'syaec', 'syaek', 'syaet', 'syaep', 'syaeh', 'seo', 'seog', 'seogg', 'seogs',
+        'seon', 'seonj', 'seonh', 'seod', 'seol', 'seolg', 'seolm', 'seolb', 'seols', 'seolt', 'seolp', 'seolh', 'seom', 'seob', 'seobs', 'seos',
+        'seoss', 'seong', 'seoj', 'seoc', 'seok', 'seot', 'seop', 'seoh', 'se', 'seg', 'segg', 'segs', 'sen', 'senj', 'senh', 'sed',
+        'sel', 'selg', 'selm', 'selb', 'sels', 'selt', 'selp', 'selh', 'sem', 'seb', 'sebs', 'ses', 'sess', 'seng', 'sej', 'sec',
+        'sek', 'set', 'sep', 'seh', 'syeo', 'syeog', 'syeogg', 'syeogs', 'syeon', 'syeonj', 'syeonh', 'syeod', 'syeol', 'syeolg', 'syeolm', 'syeolb',
+        'syeols', 'syeolt', 'syeolp', 'syeolh', 'syeom', 'syeob', 'syeobs', 'syeos', 'syeoss', 'syeong', 'syeoj', 'syeoc', 'syeok', 'syeot', 'syeop', 'syeoh',
+        'sye', 'syeg', 'syegg', 'syegs', 'syen', 'syenj', 'syenh', 'syed', 'syel', 'syelg', 'syelm', 'syelb', 'syels', 'syelt', 'syelp', 'syelh',
+        'syem', 'syeb', 'syebs', 'syes', 'syess', 'syeng', 'syej', 'syec', 'syek', 'syet', 'syep', 'syeh', 'so', 'sog', 'sogg', 'sogs',
+        'son', 'sonj', 'sonh', 'sod', 'sol', 'solg', 'solm', 'solb', 'sols', 'solt', 'solp', 'solh', 'som', 'sob', 'sobs', 'sos',
+        'soss', 'song', 'soj', 'soc', 'sok', 'sot', 'sop', 'soh', 'swa', 'swag', 'swagg', 'swags', 'swan', 'swanj', 'swanh', 'swad',
+        'swal', 'swalg', 'swalm', 'swalb', 'swals', 'swalt', 'swalp', 'swalh', 'swam', 'swab', 'swabs', 'swas', 'swass', 'swang', 'swaj', 'swac',
+        'swak', 'swat', 'swap', 'swah', 'swae', 'swaeg', 'swaegg', 'swaegs', 'swaen', 'swaenj', 'swaenh', 'swaed', 'swael', 'swaelg', 'swaelm', 'swaelb',
+        'swaels', 'swaelt', 'swaelp', 'swaelh', 'swaem', 'swaeb', 'swaebs', 'swaes', 'swaess', 'swaeng', 'swaej', 'swaec', 'swaek', 'swaet', 'swaep', 'swaeh',
+        'soe', 'soeg', 'soegg', 'soegs', 'soen', 'soenj', 'soenh', 'soed', 'soel', 'soelg', 'soelm', 'soelb', 'soels', 'soelt', 'soelp', 'soelh',
+        'soem', 'soeb', 'soebs', 'soes', 'soess', 'soeng', 'soej', 'soec', 'soek', 'soet', 'soep', 'soeh', 'syo', 'syog', 'syogg', 'syogs',
+    ],
+    'xba': [
+        'mya', 'myag', 'myagg', 'myags', 'myan', 'myanj', 'myanh', 'myad', 'myal', 'myalg', 'myalm', 'myalb', 'myals', 'myalt', 'myalp', 'myalh',
+        'myam', 'myab', 'myabs', 'myas', 'myass', 'myang', 'myaj', 'myac', 'myak', 'myat', 'myap', 'myah', 'myae', 'myaeg', 'myaegg', 'myaegs',
+        'myaen', 'myaenj', 'myaenh', 'myaed', 'myael', 'myaelg', 'myaelm', 'myaelb', 'myaels', 'myaelt', 'myaelp', 'myaelh', 'myaem', 'myaeb', 'myaebs', 'myaes',
+        'myaess', 'myaeng', 'myaej', 'myaec', 'myaek', 'myaet', 'myaep', 'myaeh', 'meo', 'meog', 'meogg', 'meogs', 'meon', 'meonj', 'meonh', 'meod',
+        'meol', 'meolg', 'meolm', 'meolb', 'meols', 'meolt', 'meolp', 'meolh', 'meom', 'meob', 'meobs', 'meos', 'meoss', 'meong', 'meoj', 'meoc',
+        'meok', 'meot', 'meop', 'meoh', 'me', 'meg', 'megg', 'megs', 'men', 'menj', 'menh', 'med', 'mel', 'melg', 'melm', 'melb',
+        'mels', 'melt', 'melp', 'melh', 'mem', 'meb', 'mebs', 'mes', 'mess', 'meng', 'mej', 'mec', 'mek', 'met', 'mep', 'meh',
+        'myeo', 'myeog', 'myeogg', 'myeogs', 'myeon', 'myeonj', 'myeonh', 'myeod', 'myeol', 'myeolg', 'myeolm', 'myeolb', 'myeols', 'myeolt', 'myeolp', 'myeolh',
+        'myeom', 'myeob', 'myeobs', 'myeos', 'myeoss', 'myeong', 'myeoj', 'myeoc', 'myeok', 'myeot', 'myeop', 'myeoh', 'mye', 'myeg', 'myegg', 'myegs',
+        'myen', 'myenj', 'myenh', 'myed', 'myel', 'myelg', 'myelm', 'myelb', 'myels', 'myelt', 'myelp', 'myelh', 'myem', 'myeb', 'myebs', 'myes',
+        'myess', 'myeng', 'myej', 'myec', 'myek', 'myet', 'myep', 'myeh', 'mo', 'mog', 'mogg', 'mogs', 'mon', 'monj', 'monh', 'mod',
+        'mol', 'molg', 'molm', 'molb', 'mols', 'molt', 'molp', 'molh', 'mom', 'mob', 'mobs', 'mos', 'moss', 'mong', 'moj', 'moc',
+        'mok', 'mot', 'mop', 'moh', 'mwa', 'mwag', 'mwagg', 'mwags', 'mwan', 'mwanj', 'mwanh', 'mwad', 'mwal', 'mwalg', 'mwalm', 'mwalb',
+        'mwals', 'mwalt', 'mwalp', 'mwalh', 'mwam', 'mwab', 'mwabs', 'mwas', 'mwass', 'mwang', 'mwaj', 'mwac', 'mwak', 'mwat', 'mwap', 'mwah',
+        'mwae', 'mwaeg', 'mwaegg', 'mwaegs', 'mwaen', 'mwaenj', 'mwaenh', 'mwaed', 'mwael', 'mwaelg', 'mwaelm', 'mwaelb', 'mwaels', 'mwaelt', 'mwaelp', 'mwaelh',
+        'mwaem', 'mwaeb', 'mwaebs', 'mwaes', 'mwaess', 'mwaeng', 'mwaej', 'mwaec', 'mwaek', 'mwaet', 'mwaep', 'mwaeh', 'moe', 'moeg', 'moegg', 'moegs',
+    ],
+    'xb3': [
+        'dae', 'daeg', 'daegg', 'daegs', 'daen', 'daenj', 'daenh', 'daed', 'dael', 'daelg', 'daelm', 'daelb', 'daels', 'daelt', 'daelp', 'daelh',
+        'daem', 'daeb', 'daebs', 'daes', 'daess', 'daeng', 'daej', 'daec', 'daek', 'daet', 'daep', 'daeh', 'dya', 'dyag', 'dyagg', 'dyags',
+        'dyan', 'dyanj', 'dyanh', 'dyad', 'dyal', 'dyalg', 'dyalm', 'dyalb', 'dyals', 'dyalt', 'dyalp', 'dyalh', 'dyam', 'dyab', 'dyabs', 'dyas',
+        'dyass', 'dyang', 'dyaj', 'dyac', 'dyak', 'dyat', 'dyap', 'dyah', 'dyae', 'dyaeg', 'dyaegg', 'dyaegs', 'dyaen', 'dyaenj', 'dyaenh', 'dyaed',
+        'dyael', 'dyaelg', 'dyaelm', 'dyaelb', 'dyaels', 'dyaelt', 'dyaelp', 'dyaelh', 'dyaem', 'dyaeb', 'dyaebs', 'dyaes', 'dyaess', 'dyaeng', 'dyaej', 'dyaec',
+        'dyaek', 'dyaet', 'dyaep', 'dyaeh', 'deo', 'deog', 'deogg', 'deogs', 'deon', 'deonj', 'deonh', 'deod', 'deol', 'deolg', 'deolm', 'deolb',
+        'deols', 'deolt', 'deolp', 'deolh', 'deom', 'deob', 'deobs', 'deos', 'deoss', 'deong', 'deoj', 'deoc', 'deok', 'deot', 'deop', 'deoh',
+        'de', 'deg', 'degg', 'degs', 'den', 'denj', 'denh', 'ded', 'del', 'delg', 'delm', 'delb', 'dels', 'delt', 'delp', 'delh',
+        'dem', 'deb', 'debs', 'des', 'dess', 'deng', 'dej', 'dec', 'dek', 'det', 'dep', 'deh', 'dyeo', 'dyeog', 'dyeogg', 'dyeogs',
+        'dyeon', 'dyeonj', 'dyeonh', 'dyeod', 'dyeol', 'dyeolg', 'dyeolm', 'dyeolb', 'dyeols', 'dyeolt', 'dyeolp', 'dyeolh', 'dyeom', 'dyeob', 'dyeobs', 'dyeos',
+        'dyeoss', 'dyeong', 'dyeoj', 'dyeoc', 'dyeok', 'dyeot', 'dyeop', 'dyeoh', 'dye', 'dyeg', 'dyegg', 'dyegs', 'dyen', 'dyenj', 'dyenh', 'dyed',
+        'dyel', 'dyelg', 'dyelm', 'dyelb', 'dyels', 'dyelt', 'dyelp', 'dyelh', 'dyem', 'dyeb', 'dyebs', 'dyes', 'dyess', 'dyeng', 'dyej', 'dyec',
+        'dyek', 'dyet', 'dyep', 'dyeh', 'do', 'dog', 'dogg', 'dogs', 'don', 'donj', 'donh', 'dod', 'dol', 'dolg', 'dolm', 'dolb',
+        'dols', 'dolt', 'dolp', 'dolh', 'dom', 'dob', 'dobs', 'dos', 'doss', 'dong', 'doj', 'doc', 'dok', 'dot', 'dop', 'doh',
+        'dwa', 'dwag', 'dwagg', 'dwags', 'dwan', 'dwanj', 'dwanh', 'dwad', 'dwal', 'dwalg', 'dwalm', 'dwalb', 'dwals', 'dwalt', 'dwalp', 'dwalh',
+        'dwam', 'dwab', 'dwabs', 'dwas', 'dwass', 'dwang', 'dwaj', 'dwac', 'dwak', 'dwat', 'dwap', 'dwah', 'dwae', 'dwaeg', 'dwaegg', 'dwaegs',
+    ],
+    'xa0': [
+        'it', 'ix', 'i', 'ip', 'iet', 'iex', 'ie', 'iep', 'at', 'ax', 'a', 'ap', 'uox', 'uo', 'uop', 'ot',
+        'ox', 'o', 'op', 'ex', 'e', 'wu', 'bit', 'bix', 'bi', 'bip', 'biet', 'biex', 'bie', 'biep', 'bat', 'bax',
+        'ba', 'bap', 'buox', 'buo', 'buop', 'bot', 'box', 'bo', 'bop', 'bex', 'be', 'bep', 'but', 'bux', 'bu', 'bup',
+        'burx', 'bur', 'byt', 'byx', 'by', 'byp', 'byrx', 'byr', 'pit', 'pix', 'pi', 'pip', 'piex', 'pie', 'piep', 'pat',
+        'pax', 'pa', 'pap', 'puox', 'puo', 'puop', 'pot', 'pox', 'po', 'pop', 'put', 'pux', 'pu', 'pup', 'purx', 'pur',
+        'pyt', 'pyx', 'py', 'pyp', 'pyrx', 'pyr', 'bbit', 'bbix', 'bbi', 'bbip', 'bbiet', 'bbiex', 'bbie', 'bbiep', 'bbat', 'bbax',
+        'bba', 'bbap', 'bbuox', 'bbuo', 'bbuop', 'bbot', 'bbox', 'bbo', 'bbop', 'bbex', 'bbe', 'bbep', 'bbut', 'bbux', 'bbu', 'bbup',
+        'bburx', 'bbur', 'bbyt', 'bbyx', 'bby', 'bbyp', 'nbit', 'nbix', 'nbi', 'nbip', 'nbiex', 'nbie', 'nbiep', 'nbat', 'nbax', 'nba',
+        'nbap', 'nbot', 'nbox', 'nbo', 'nbop', 'nbut', 'nbux', 'nbu', 'nbup', 'nburx', 'nbur', 'nbyt', 'nbyx', 'nby', 'nbyp', 'nbyrx',
+        'nbyr', 'hmit', 'hmix', 'hmi', 'hmip', 'hmiex', 'hmie', 'hmiep', 'hmat', 'hmax', 'hma', 'hmap', 'hmuox', 'hmuo', 'hmuop', 'hmot',
+        'hmox', 'hmo', 'hmop', 'hmut', 'hmux', 'hmu', 'hmup', 'hmurx', 'hmur', 'hmyx', 'hmy', 'hmyp', 'hmyrx', 'hmyr', 'mit', 'mix',
+        'mi', 'mip', 'miex', 'mie', 'miep', 'mat', 'max', 'ma', 'map', 'muot', 'muox', 'muo', 'muop', 'mot', 'mox', 'mo',
+        'mop', 'mex', 'me', 'mut', 'mux', 'mu', 'mup', 'murx', 'mur', 'myt', 'myx', 'my', 'myp', 'fit', 'fix', 'fi',
+        'fip', 'fat', 'fax', 'fa', 'fap', 'fox', 'fo', 'fop', 'fut', 'fux', 'fu', 'fup', 'furx', 'fur', 'fyt', 'fyx',
+        'fy', 'fyp', 'vit', 'vix', 'vi', 'vip', 'viet', 'viex', 'vie', 'viep', 'vat', 'vax', 'va', 'vap', 'vot', 'vox',
+        'vo', 'vop', 'vex', 'vep', 'vut', 'vux', 'vu', 'vup', 'vurx', 'vur', 'vyt', 'vyx', 'vy', 'vyp', 'vyrx', 'vyr',
+    ],
+    'x15': [
+        'swa', 'swa', 'swaa', 'swaa', 'swaa', 's', 's', 'sw', 's', 'sk', 'skw', 'sW', 'spwa', 'stwa', 'skwa', 'scwa',
+        'she', 'shi', 'shii', 'sho', 'shoo', 'sha', 'shaa', 'shwe', 'shwe', 'shwi', 'shwi', 'shwii', 'shwii', 'shwo', 'shwo', 'shwoo',
+        'shwoo', 'shwa', 'shwa', 'shwaa', 'shwaa', 'sh', 'ye', 'yaai', 'yi', 'yii', 'yo', 'yoo', 'yoo', 'ya', 'yaa', 'ywe',
+        'ywe', 'ywi', 'ywi', 'ywii', 'ywii', 'ywo', 'ywo', 'ywoo', 'ywoo', 'ywa', 'ywa', 'ywaa', 'ywaa', 'ywaa', 'y', 'y',
+        'y', 'yi', 're', 're', 'le', 'raai', 'ri', 'rii', 'ro', 'roo', 'lo', 'ra', 'raa', 'la', 'rwaa', 'rwaa',
+        'r', 'r', 'r', 'fe', 'faai', 'fi', 'fii', 'fo', 'foo', 'fa', 'faa', 'fwaa', 'fwaa', 'f', 'the', 'the',
+        'thi', 'thi', 'thii', 'thii', 'tho', 'thoo', 'tha', 'thaa', 'thwaa', 'thwaa', 'th', 'tthe', 'tthi', 'ttho', 'ttha', 'tth',
+        'tye', 'tyi', 'tyo', 'tya', 'he', 'hi', 'hii', 'ho', 'hoo', 'ha', 'haa', 'h', 'h', 'hk', 'qaai', 'qi',
+        'qii', 'qo', 'qoo', 'qa', 'qaa', 'q', 'tlhe', 'tlhi', 'tlho', 'tlha', 're', 'ri', 'ro', 'ra', 'ngaai', 'ngi',
+        'ngii', 'ngo', 'ngoo', 'nga', 'ngaa', 'ng', 'nng', 'she', 'shi', 'sho', 'sha', 'the', 'thi', 'tho', 'tha', 'th',
+        'lhi', 'lhii', 'lho', 'lhoo', 'lha', 'lhaa', 'lh', 'the', 'thi', 'thii', 'tho', 'thoo', 'tha', 'thaa', 'th', 'b',
+        'e', 'i', 'o', 'a', 'we', 'wi', 'wo', 'wa', 'ne', 'ni', 'no', 'na', 'ke', 'ki', 'ko', 'ka',
+        'he', 'hi', 'ho', 'ha', 'ghu', 'gho', 'ghe', 'ghee', 'ghi', 'gha', 'ru', 'ro', 're', 'ree', 'ri', 'ra',
+        'wu', 'wo', 'we', 'wee', 'wi', 'wa', 'hwu', 'hwo', 'hwe', 'hwee', 'hwi', 'hwa', 'thu', 'tho', 'the', 'thee',
+        'thi', 'tha', 'ttu', 'tto', 'tte', 'ttee', 'tti', 'tta', 'pu', 'po', 'pe', 'pee', 'pi', 'pa', 'p', 'gu',
+        'go', 'ge', 'gee', 'gi', 'ga', 'khu', 'kho', 'khe', 'khee', 'khi', 'kha', 'kku', 'kko', 'kke', 'kkee', 'kki',
+    ],
+    'x13': [
+        'ja', 'ju', 'ji', 'jaa', 'jee', 'je', 'jo', 'jwa', 'ga', 'gu', 'gi', 'gaa', 'gee', 'ge', 'go', '[?]',
+        'gwa', '[?]', 'gwi', 'gwaa', 'gwee', 'gwe', '[?]', '[?]', 'gga', 'ggu', 'ggi', 'ggaa', 'ggee', 'gge', 'ggo', '[?]',
+        'tha', 'thu', 'thi', 'thaa', 'thee', 'the', 'tho', 'thwa', 'cha', 'chu', 'chi', 'chaa', 'chee', 'che', 'cho', 'chwa',
+        'pha', 'phu', 'phi', 'phaa', 'phee', 'phe', 'pho', 'phwa', 'tsa', 'tsu', 'tsi', 'tsaa', 'tsee', 'tse', 'tso', 'tswa',
+        'tza', 'tzu', 'tzi', 'tzaa', 'tzee', 'tze', 'tzo', '[?]', 'fa', 'fu', 'fi', 'faa', 'fee', 'fe', 'fo', 'fwa',
+        'pa', 'pu', 'pi', 'paa', 'pee', 'pe', 'po', 'pwa', 'rya', 'mya', 'fya', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', ' ', '.', ',', ';', ':', ':: ', '?', '//', '1', '2', '3', '4', '5', '6', '7',
+        '8', '9', '10+', '20+', '30+', '40+', '50+', '60+', '70+', '80+', '90+', '100+', '10,000+', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        'a', 'e', 'i', 'o', 'u', 'v', 'ga', 'ka', 'ge', 'gi', 'go', 'gu', 'gv', 'ha', 'he', 'hi',
+        'ho', 'hu', 'hv', 'la', 'le', 'li', 'lo', 'lu', 'lv', 'ma', 'me', 'mi', 'mo', 'mu', 'na', 'hna',
+        'nah', 'ne', 'ni', 'no', 'nu', 'nv', 'qua', 'que', 'qui', 'quo', 'quu', 'quv', 'sa', 's', 'se', 'si',
+        'so', 'su', 'sv', 'da', 'ta', 'de', 'te', 'di', 'ti', 'do', 'du', 'dv', 'dla', 'tla', 'tle', 'tli',
+        'tlo', 'tlu', 'tlv', 'tsa', 'tse', 'tsi', 'tso', 'tsu', 'tsv', 'wa', 'we', 'wi', 'wo', 'wu', 'wv', 'ya',
+        'ye', 'yi', 'yo', 'yu', 'yv', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'x27': [
+        '[?]', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '[?]',
+        '[?]', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '[?]', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'x24': [
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '', '', '', '', '', '', '', '', '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xcb': [
+        'jjwaels', 'jjwaelt', 'jjwaelp', 'jjwaelh', 'jjwaem', 'jjwaeb', 'jjwaebs', 'jjwaes', 'jjwaess', 'jjwaeng', 'jjwaej', 'jjwaec', 'jjwaek', 'jjwaet', 'jjwaep', 'jjwaeh',
+        'jjoe', 'jjoeg', 'jjoegg', 'jjoegs', 'jjoen', 'jjoenj', 'jjoenh', 'jjoed', 'jjoel', 'jjoelg', 'jjoelm', 'jjoelb', 'jjoels', 'jjoelt', 'jjoelp', 'jjoelh',
+        'jjoem', 'jjoeb', 'jjoebs', 'jjoes', 'jjoess', 'jjoeng', 'jjoej', 'jjoec', 'jjoek', 'jjoet', 'jjoep', 'jjoeh', 'jjyo', 'jjyog', 'jjyogg', 'jjyogs',
+        'jjyon', 'jjyonj', 'jjyonh', 'jjyod', 'jjyol', 'jjyolg', 'jjyolm', 'jjyolb', 'jjyols', 'jjyolt', 'jjyolp', 'jjyolh', 'jjyom', 'jjyob', 'jjyobs', 'jjyos',
+        'jjyoss', 'jjyong', 'jjyoj', 'jjyoc', 'jjyok', 'jjyot', 'jjyop', 'jjyoh', 'jju', 'jjug', 'jjugg', 'jjugs', 'jjun', 'jjunj', 'jjunh', 'jjud',
+        'jjul', 'jjulg', 'jjulm', 'jjulb', 'jjuls', 'jjult', 'jjulp', 'jjulh', 'jjum', 'jjub', 'jjubs', 'jjus', 'jjuss', 'jjung', 'jjuj', 'jjuc',
+        'jjuk', 'jjut', 'jjup', 'jjuh', 'jjweo', 'jjweog', 'jjweogg', 'jjweogs', 'jjweon', 'jjweonj', 'jjweonh', 'jjweod', 'jjweol', 'jjweolg', 'jjweolm', 'jjweolb',
+        'jjweols', 'jjweolt', 'jjweolp', 'jjweolh', 'jjweom', 'jjweob', 'jjweobs', 'jjweos', 'jjweoss', 'jjweong', 'jjweoj', 'jjweoc', 'jjweok', 'jjweot', 'jjweop', 'jjweoh',
+        'jjwe', 'jjweg', 'jjwegg', 'jjwegs', 'jjwen', 'jjwenj', 'jjwenh', 'jjwed', 'jjwel', 'jjwelg', 'jjwelm', 'jjwelb', 'jjwels', 'jjwelt', 'jjwelp', 'jjwelh',
+        'jjwem', 'jjweb', 'jjwebs', 'jjwes', 'jjwess', 'jjweng', 'jjwej', 'jjwec', 'jjwek', 'jjwet', 'jjwep', 'jjweh', 'jjwi', 'jjwig', 'jjwigg', 'jjwigs',
+        'jjwin', 'jjwinj', 'jjwinh', 'jjwid', 'jjwil', 'jjwilg', 'jjwilm', 'jjwilb', 'jjwils', 'jjwilt', 'jjwilp', 'jjwilh', 'jjwim', 'jjwib', 'jjwibs', 'jjwis',
+        'jjwiss', 'jjwing', 'jjwij', 'jjwic', 'jjwik', 'jjwit', 'jjwip', 'jjwih', 'jjyu', 'jjyug', 'jjyugg', 'jjyugs', 'jjyun', 'jjyunj', 'jjyunh', 'jjyud',
+        'jjyul', 'jjyulg', 'jjyulm', 'jjyulb', 'jjyuls', 'jjyult', 'jjyulp', 'jjyulh', 'jjyum', 'jjyub', 'jjyubs', 'jjyus', 'jjyuss', 'jjyung', 'jjyuj', 'jjyuc',
+        'jjyuk', 'jjyut', 'jjyup', 'jjyuh', 'jjeu', 'jjeug', 'jjeugg', 'jjeugs', 'jjeun', 'jjeunj', 'jjeunh', 'jjeud', 'jjeul', 'jjeulg', 'jjeulm', 'jjeulb',
+        'jjeuls', 'jjeult', 'jjeulp', 'jjeulh', 'jjeum', 'jjeub', 'jjeubs', 'jjeus', 'jjeuss', 'jjeung', 'jjeuj', 'jjeuc', 'jjeuk', 'jjeut', 'jjeup', 'jjeuh',
+        'jjyi', 'jjyig', 'jjyigg', 'jjyigs', 'jjyin', 'jjyinj', 'jjyinh', 'jjyid', 'jjyil', 'jjyilg', 'jjyilm', 'jjyilb', 'jjyils', 'jjyilt', 'jjyilp', 'jjyilh',
+    ],
+    'xc0': [
+        'bbweok', 'bbweot', 'bbweop', 'bbweoh', 'bbwe', 'bbweg', 'bbwegg', 'bbwegs', 'bbwen', 'bbwenj', 'bbwenh', 'bbwed', 'bbwel', 'bbwelg', 'bbwelm', 'bbwelb',
+        'bbwels', 'bbwelt', 'bbwelp', 'bbwelh', 'bbwem', 'bbweb', 'bbwebs', 'bbwes', 'bbwess', 'bbweng', 'bbwej', 'bbwec', 'bbwek', 'bbwet', 'bbwep', 'bbweh',
+        'bbwi', 'bbwig', 'bbwigg', 'bbwigs', 'bbwin', 'bbwinj', 'bbwinh', 'bbwid', 'bbwil', 'bbwilg', 'bbwilm', 'bbwilb', 'bbwils', 'bbwilt', 'bbwilp', 'bbwilh',
+        'bbwim', 'bbwib', 'bbwibs', 'bbwis', 'bbwiss', 'bbwing', 'bbwij', 'bbwic', 'bbwik', 'bbwit', 'bbwip', 'bbwih', 'bbyu', 'bbyug', 'bbyugg', 'bbyugs',
+        'bbyun', 'bbyunj', 'bbyunh', 'bbyud', 'bbyul', 'bbyulg', 'bbyulm', 'bbyulb', 'bbyuls', 'bbyult', 'bbyulp', 'bbyulh', 'bbyum', 'bbyub', 'bbyubs', 'bbyus',
+        'bbyuss', 'bbyung', 'bbyuj', 'bbyuc', 'bbyuk', 'bbyut', 'bbyup', 'bbyuh', 'bbeu', 'bbeug', 'bbeugg', 'bbeugs', 'bbeun', 'bbeunj', 'bbeunh', 'bbeud',
+        'bbeul', 'bbeulg', 'bbeulm', 'bbeulb', 'bbeuls', 'bbeult', 'bbeulp', 'bbeulh', 'bbeum', 'bbeub', 'bbeubs', 'bbeus', 'bbeuss', 'bbeung', 'bbeuj', 'bbeuc',
+        'bbeuk', 'bbeut', 'bbeup', 'bbeuh', 'bbyi', 'bbyig', 'bbyigg', 'bbyigs', 'bbyin', 'bbyinj', 'bbyinh', 'bbyid', 'bbyil', 'bbyilg', 'bbyilm', 'bbyilb',
+        'bbyils', 'bbyilt', 'bbyilp', 'bbyilh', 'bbyim', 'bbyib', 'bbyibs', 'bbyis', 'bbyiss', 'bbying', 'bbyij', 'bbyic', 'bbyik', 'bbyit', 'bbyip', 'bbyih',
+        'bbi', 'bbig', 'bbigg', 'bbigs', 'bbin', 'bbinj', 'bbinh', 'bbid', 'bbil', 'bbilg', 'bbilm', 'bbilb', 'bbils', 'bbilt', 'bbilp', 'bbilh',
+        'bbim', 'bbib', 'bbibs', 'bbis', 'bbiss', 'bbing', 'bbij', 'bbic', 'bbik', 'bbit', 'bbip', 'bbih', 'sa', 'sag', 'sagg', 'sags',
+        'san', 'sanj', 'sanh', 'sad', 'sal', 'salg', 'salm', 'salb', 'sals', 'salt', 'salp', 'salh', 'sam', 'sab', 'sabs', 'sas',
+        'sass', 'sang', 'saj', 'sac', 'sak', 'sat', 'sap', 'sah', 'sae', 'saeg', 'saegg', 'saegs', 'saen', 'saenj', 'saenh', 'saed',
+        'sael', 'saelg', 'saelm', 'saelb', 'saels', 'saelt', 'saelp', 'saelh', 'saem', 'saeb', 'saebs', 'saes', 'saess', 'saeng', 'saej', 'saec',
+        'saek', 'saet', 'saep', 'saeh', 'sya', 'syag', 'syagg', 'syags', 'syan', 'syanj', 'syanh', 'syad', 'syal', 'syalg', 'syalm', 'syalb',
+        'syals', 'syalt', 'syalp', 'syalh', 'syam', 'syab', 'syabs', 'syas', 'syass', 'syang', 'syaj', 'syac', 'syak', 'syat', 'syap', 'syah',
+    ],
+    'x22': [
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xa1': [
+        'dit', 'dix', 'di', 'dip', 'diex', 'die', 'diep', 'dat', 'dax', 'da', 'dap', 'duox', 'duo', 'dot', 'dox', 'do',
+        'dop', 'dex', 'de', 'dep', 'dut', 'dux', 'du', 'dup', 'durx', 'dur', 'tit', 'tix', 'ti', 'tip', 'tiex', 'tie',
+        'tiep', 'tat', 'tax', 'ta', 'tap', 'tuot', 'tuox', 'tuo', 'tuop', 'tot', 'tox', 'to', 'top', 'tex', 'te', 'tep',
+        'tut', 'tux', 'tu', 'tup', 'turx', 'tur', 'ddit', 'ddix', 'ddi', 'ddip', 'ddiex', 'ddie', 'ddiep', 'ddat', 'ddax', 'dda',
+        'ddap', 'dduox', 'dduo', 'dduop', 'ddot', 'ddox', 'ddo', 'ddop', 'ddex', 'dde', 'ddep', 'ddut', 'ddux', 'ddu', 'ddup', 'ddurx',
+        'ddur', 'ndit', 'ndix', 'ndi', 'ndip', 'ndiex', 'ndie', 'ndat', 'ndax', 'nda', 'ndap', 'ndot', 'ndox', 'ndo', 'ndop', 'ndex',
+        'nde', 'ndep', 'ndut', 'ndux', 'ndu', 'ndup', 'ndurx', 'ndur', 'hnit', 'hnix', 'hni', 'hnip', 'hniet', 'hniex', 'hnie', 'hniep',
+        'hnat', 'hnax', 'hna', 'hnap', 'hnuox', 'hnuo', 'hnot', 'hnox', 'hnop', 'hnex', 'hne', 'hnep', 'hnut', 'nit', 'nix', 'ni',
+        'nip', 'niex', 'nie', 'niep', 'nax', 'na', 'nap', 'nuox', 'nuo', 'nuop', 'not', 'nox', 'no', 'nop', 'nex', 'ne',
+        'nep', 'nut', 'nux', 'nu', 'nup', 'nurx', 'nur', 'hlit', 'hlix', 'hli', 'hlip', 'hliex', 'hlie', 'hliep', 'hlat', 'hlax',
+        'hla', 'hlap', 'hluox', 'hluo', 'hluop', 'hlox', 'hlo', 'hlop', 'hlex', 'hle', 'hlep', 'hlut', 'hlux', 'hlu', 'hlup', 'hlurx',
+        'hlur', 'hlyt', 'hlyx', 'hly', 'hlyp', 'hlyrx', 'hlyr', 'lit', 'lix', 'li', 'lip', 'liet', 'liex', 'lie', 'liep', 'lat',
+        'lax', 'la', 'lap', 'luot', 'luox', 'luo', 'luop', 'lot', 'lox', 'lo', 'lop', 'lex', 'le', 'lep', 'lut', 'lux',
+        'lu', 'lup', 'lurx', 'lur', 'lyt', 'lyx', 'ly', 'lyp', 'lyrx', 'lyr', 'git', 'gix', 'gi', 'gip', 'giet', 'giex',
+        'gie', 'giep', 'gat', 'gax', 'ga', 'gap', 'guot', 'guox', 'guo', 'guop', 'got', 'gox', 'go', 'gop', 'get', 'gex',
+        'ge', 'gep', 'gut', 'gux', 'gu', 'gup', 'gurx', 'gur', 'kit', 'kix', 'ki', 'kip', 'kiex', 'kie', 'kiep', 'kat',
+    ],
+    'xd6': [
+        'hyeo', 'hyeog', 'hyeogg', 'hyeogs', 'hyeon', 'hyeonj', 'hyeonh', 'hyeod', 'hyeol', 'hyeolg', 'hyeolm', 'hyeolb', 'hyeols', 'hyeolt', 'hyeolp', 'hyeolh',
+        'hyeom', 'hyeob', 'hyeobs', 'hyeos', 'hyeoss', 'hyeong', 'hyeoj', 'hyeoc', 'hyeok', 'hyeot', 'hyeop', 'hyeoh', 'hye', 'hyeg', 'hyegg', 'hyegs',
+        'hyen', 'hyenj', 'hyenh', 'hyed', 'hyel', 'hyelg', 'hyelm', 'hyelb', 'hyels', 'hyelt', 'hyelp', 'hyelh', 'hyem', 'hyeb', 'hyebs', 'hyes',
+        'hyess', 'hyeng', 'hyej', 'hyec', 'hyek', 'hyet', 'hyep', 'hyeh', 'ho', 'hog', 'hogg', 'hogs', 'hon', 'honj', 'honh', 'hod',
+        'hol', 'holg', 'holm', 'holb', 'hols', 'holt', 'holp', 'holh', 'hom', 'hob', 'hobs', 'hos', 'hoss', 'hong', 'hoj', 'hoc',
+        'hok', 'hot', 'hop', 'hoh', 'hwa', 'hwag', 'hwagg', 'hwags', 'hwan', 'hwanj', 'hwanh', 'hwad', 'hwal', 'hwalg', 'hwalm', 'hwalb',
+        'hwals', 'hwalt', 'hwalp', 'hwalh', 'hwam', 'hwab', 'hwabs', 'hwas', 'hwass', 'hwang', 'hwaj', 'hwac', 'hwak', 'hwat', 'hwap', 'hwah',
+        'hwae', 'hwaeg', 'hwaegg', 'hwaegs', 'hwaen', 'hwaenj', 'hwaenh', 'hwaed', 'hwael', 'hwaelg', 'hwaelm', 'hwaelb', 'hwaels', 'hwaelt', 'hwaelp', 'hwaelh',
+        'hwaem', 'hwaeb', 'hwaebs', 'hwaes', 'hwaess', 'hwaeng', 'hwaej', 'hwaec', 'hwaek', 'hwaet', 'hwaep', 'hwaeh', 'hoe', 'hoeg', 'hoegg', 'hoegs',
+        'hoen', 'hoenj', 'hoenh', 'hoed', 'hoel', 'hoelg', 'hoelm', 'hoelb', 'hoels', 'hoelt', 'hoelp', 'hoelh', 'hoem', 'hoeb', 'hoebs', 'hoes',
+        'hoess', 'hoeng', 'hoej', 'hoec', 'hoek', 'hoet', 'hoep', 'hoeh', 'hyo', 'hyog', 'hyogg', 'hyogs', 'hyon', 'hyonj', 'hyonh', 'hyod',
+        'hyol', 'hyolg', 'hyolm', 'hyolb', 'hyols', 'hyolt', 'hyolp', 'hyolh', 'hyom', 'hyob', 'hyobs', 'hyos', 'hyoss', 'hyong', 'hyoj', 'hyoc',
+        'hyok', 'hyot', 'hyop', 'hyoh', 'hu', 'hug', 'hugg', 'hugs', 'hun', 'hunj', 'hunh', 'hud', 'hul', 'hulg', 'hulm', 'hulb',
+        'huls', 'hult', 'hulp', 'hulh', 'hum', 'hub', 'hubs', 'hus', 'huss', 'hung', 'huj', 'huc', 'huk', 'hut', 'hup', 'huh',
+        'hweo', 'hweog', 'hweogg', 'hweogs', 'hweon', 'hweonj', 'hweonh', 'hweod', 'hweol', 'hweolg', 'hweolm', 'hweolb', 'hweols', 'hweolt', 'hweolp', 'hweolh',
+        'hweom', 'hweob', 'hweobs', 'hweos', 'hweoss', 'hweong', 'hweoj', 'hweoc', 'hweok', 'hweot', 'hweop', 'hweoh', 'hwe', 'hweg', 'hwegg', 'hwegs',
+    ],
+    'xd5': [
+        'pyuk', 'pyut', 'pyup', 'pyuh', 'peu', 'peug', 'peugg', 'peugs', 'peun', 'peunj', 'peunh', 'peud', 'peul', 'peulg', 'peulm', 'peulb',
+        'peuls', 'peult', 'peulp', 'peulh', 'peum', 'peub', 'peubs', 'peus', 'peuss', 'peung', 'peuj', 'peuc', 'peuk', 'peut', 'peup', 'peuh',
+        'pyi', 'pyig', 'pyigg', 'pyigs', 'pyin', 'pyinj', 'pyinh', 'pyid', 'pyil', 'pyilg', 'pyilm', 'pyilb', 'pyils', 'pyilt', 'pyilp', 'pyilh',
+        'pyim', 'pyib', 'pyibs', 'pyis', 'pyiss', 'pying', 'pyij', 'pyic', 'pyik', 'pyit', 'pyip', 'pyih', 'pi', 'pig', 'pigg', 'pigs',
+        'pin', 'pinj', 'pinh', 'pid', 'pil', 'pilg', 'pilm', 'pilb', 'pils', 'pilt', 'pilp', 'pilh', 'pim', 'pib', 'pibs', 'pis',
+        'piss', 'ping', 'pij', 'pic', 'pik', 'pit', 'pip', 'pih', 'ha', 'hag', 'hagg', 'hags', 'han', 'hanj', 'hanh', 'had',
+        'hal', 'halg', 'halm', 'halb', 'hals', 'halt', 'halp', 'halh', 'ham', 'hab', 'habs', 'has', 'hass', 'hang', 'haj', 'hac',
+        'hak', 'hat', 'hap', 'hah', 'hae', 'haeg', 'haegg', 'haegs', 'haen', 'haenj', 'haenh', 'haed', 'hael', 'haelg', 'haelm', 'haelb',
+        'haels', 'haelt', 'haelp', 'haelh', 'haem', 'haeb', 'haebs', 'haes', 'haess', 'haeng', 'haej', 'haec', 'haek', 'haet', 'haep', 'haeh',
+        'hya', 'hyag', 'hyagg', 'hyags', 'hyan', 'hyanj', 'hyanh', 'hyad', 'hyal', 'hyalg', 'hyalm', 'hyalb', 'hyals', 'hyalt', 'hyalp', 'hyalh',
+        'hyam', 'hyab', 'hyabs', 'hyas', 'hyass', 'hyang', 'hyaj', 'hyac', 'hyak', 'hyat', 'hyap', 'hyah', 'hyae', 'hyaeg', 'hyaegg', 'hyaegs',
+        'hyaen', 'hyaenj', 'hyaenh', 'hyaed', 'hyael', 'hyaelg', 'hyaelm', 'hyaelb', 'hyaels', 'hyaelt', 'hyaelp', 'hyaelh', 'hyaem', 'hyaeb', 'hyaebs', 'hyaes',
+        'hyaess', 'hyaeng', 'hyaej', 'hyaec', 'hyaek', 'hyaet', 'hyaep', 'hyaeh', 'heo', 'heog', 'heogg', 'heogs', 'heon', 'heonj', 'heonh', 'heod',
+        'heol', 'heolg', 'heolm', 'heolb', 'heols', 'heolt', 'heolp', 'heolh', 'heom', 'heob', 'heobs', 'heos', 'heoss', 'heong', 'heoj', 'heoc',
+        'heok', 'heot', 'heop', 'heoh', 'he', 'heg', 'hegg', 'hegs', 'hen', 'henj', 'henh', 'hed', 'hel', 'helg', 'helm', 'helb',
+        'hels', 'helt', 'help', 'helh', 'hem', 'heb', 'hebs', 'hes', 'hess', 'heng', 'hej', 'hec', 'hek', 'het', 'hep', 'heh',
+    ],
+    'xd2': [
+        'toels', 'toelt', 'toelp', 'toelh', 'toem', 'toeb', 'toebs', 'toes', 'toess', 'toeng', 'toej', 'toec', 'toek', 'toet', 'toep', 'toeh',
+        'tyo', 'tyog', 'tyogg', 'tyogs', 'tyon', 'tyonj', 'tyonh', 'tyod', 'tyol', 'tyolg', 'tyolm', 'tyolb', 'tyols', 'tyolt', 'tyolp', 'tyolh',
+        'tyom', 'tyob', 'tyobs', 'tyos', 'tyoss', 'tyong', 'tyoj', 'tyoc', 'tyok', 'tyot', 'tyop', 'tyoh', 'tu', 'tug', 'tugg', 'tugs',
+        'tun', 'tunj', 'tunh', 'tud', 'tul', 'tulg', 'tulm', 'tulb', 'tuls', 'tult', 'tulp', 'tulh', 'tum', 'tub', 'tubs', 'tus',
+        'tuss', 'tung', 'tuj', 'tuc', 'tuk', 'tut', 'tup', 'tuh', 'tweo', 'tweog', 'tweogg', 'tweogs', 'tweon', 'tweonj', 'tweonh', 'tweod',
+        'tweol', 'tweolg', 'tweolm', 'tweolb', 'tweols', 'tweolt', 'tweolp', 'tweolh', 'tweom', 'tweob', 'tweobs', 'tweos', 'tweoss', 'tweong', 'tweoj', 'tweoc',
+        'tweok', 'tweot', 'tweop', 'tweoh', 'twe', 'tweg', 'twegg', 'twegs', 'twen', 'twenj', 'twenh', 'twed', 'twel', 'twelg', 'twelm', 'twelb',
+        'twels', 'twelt', 'twelp', 'twelh', 'twem', 'tweb', 'twebs', 'twes', 'twess', 'tweng', 'twej', 'twec', 'twek', 'twet', 'twep', 'tweh',
+        'twi', 'twig', 'twigg', 'twigs', 'twin', 'twinj', 'twinh', 'twid', 'twil', 'twilg', 'twilm', 'twilb', 'twils', 'twilt', 'twilp', 'twilh',
+        'twim', 'twib', 'twibs', 'twis', 'twiss', 'twing', 'twij', 'twic', 'twik', 'twit', 'twip', 'twih', 'tyu', 'tyug', 'tyugg', 'tyugs',
+        'tyun', 'tyunj', 'tyunh', 'tyud', 'tyul', 'tyulg', 'tyulm', 'tyulb', 'tyuls', 'tyult', 'tyulp', 'tyulh', 'tyum', 'tyub', 'tyubs', 'tyus',
+        'tyuss', 'tyung', 'tyuj', 'tyuc', 'tyuk', 'tyut', 'tyup', 'tyuh', 'teu', 'teug', 'teugg', 'teugs', 'teun', 'teunj', 'teunh', 'teud',
+        'teul', 'teulg', 'teulm', 'teulb', 'teuls', 'teult', 'teulp', 'teulh', 'teum', 'teub', 'teubs', 'teus', 'teuss', 'teung', 'teuj', 'teuc',
+        'teuk', 'teut', 'teup', 'teuh', 'tyi', 'tyig', 'tyigg', 'tyigs', 'tyin', 'tyinj', 'tyinh', 'tyid', 'tyil', 'tyilg', 'tyilm', 'tyilb',
+        'tyils', 'tyilt', 'tyilp', 'tyilh', 'tyim', 'tyib', 'tyibs', 'tyis', 'tyiss', 'tying', 'tyij', 'tyic', 'tyik', 'tyit', 'tyip', 'tyih',
+        'ti', 'tig', 'tigg', 'tigs', 'tin', 'tinj', 'tinh', 'tid', 'til', 'tilg', 'tilm', 'tilb', 'tils', 'tilt', 'tilp', 'tilh',
+    ],
+    'xcd': [
+        'cyess', 'cyeng', 'cyej', 'cyec', 'cyek', 'cyet', 'cyep', 'cyeh', 'co', 'cog', 'cogg', 'cogs', 'con', 'conj', 'conh', 'cod',
+        'col', 'colg', 'colm', 'colb', 'cols', 'colt', 'colp', 'colh', 'com', 'cob', 'cobs', 'cos', 'coss', 'cong', 'coj', 'coc',
+        'cok', 'cot', 'cop', 'coh', 'cwa', 'cwag', 'cwagg', 'cwags', 'cwan', 'cwanj', 'cwanh', 'cwad', 'cwal', 'cwalg', 'cwalm', 'cwalb',
+        'cwals', 'cwalt', 'cwalp', 'cwalh', 'cwam', 'cwab', 'cwabs', 'cwas', 'cwass', 'cwang', 'cwaj', 'cwac', 'cwak', 'cwat', 'cwap', 'cwah',
+        'cwae', 'cwaeg', 'cwaegg', 'cwaegs', 'cwaen', 'cwaenj', 'cwaenh', 'cwaed', 'cwael', 'cwaelg', 'cwaelm', 'cwaelb', 'cwaels', 'cwaelt', 'cwaelp', 'cwaelh',
+        'cwaem', 'cwaeb', 'cwaebs', 'cwaes', 'cwaess', 'cwaeng', 'cwaej', 'cwaec', 'cwaek', 'cwaet', 'cwaep', 'cwaeh', 'coe', 'coeg', 'coegg', 'coegs',
+        'coen', 'coenj', 'coenh', 'coed', 'coel', 'coelg', 'coelm', 'coelb', 'coels', 'coelt', 'coelp', 'coelh', 'coem', 'coeb', 'coebs', 'coes',
+        'coess', 'coeng', 'coej', 'coec', 'coek', 'coet', 'coep', 'coeh', 'cyo', 'cyog', 'cyogg', 'cyogs', 'cyon', 'cyonj', 'cyonh', 'cyod',
+        'cyol', 'cyolg', 'cyolm', 'cyolb', 'cyols', 'cyolt', 'cyolp', 'cyolh', 'cyom', 'cyob', 'cyobs', 'cyos', 'cyoss', 'cyong', 'cyoj', 'cyoc',
+        'cyok', 'cyot', 'cyop', 'cyoh', 'cu', 'cug', 'cugg', 'cugs', 'cun', 'cunj', 'cunh', 'cud', 'cul', 'culg', 'culm', 'culb',
+        'culs', 'cult', 'culp', 'culh', 'cum', 'cub', 'cubs', 'cus', 'cuss', 'cung', 'cuj', 'cuc', 'cuk', 'cut', 'cup', 'cuh',
+        'cweo', 'cweog', 'cweogg', 'cweogs', 'cweon', 'cweonj', 'cweonh', 'cweod', 'cweol', 'cweolg', 'cweolm', 'cweolb', 'cweols', 'cweolt', 'cweolp', 'cweolh',
+        'cweom', 'cweob', 'cweobs', 'cweos', 'cweoss', 'cweong', 'cweoj', 'cweoc', 'cweok', 'cweot', 'cweop', 'cweoh', 'cwe', 'cweg', 'cwegg', 'cwegs',
+        'cwen', 'cwenj', 'cwenh', 'cwed', 'cwel', 'cwelg', 'cwelm', 'cwelb', 'cwels', 'cwelt', 'cwelp', 'cwelh', 'cwem', 'cweb', 'cwebs', 'cwes',
+        'cwess', 'cweng', 'cwej', 'cwec', 'cwek', 'cwet', 'cwep', 'cweh', 'cwi', 'cwig', 'cwigg', 'cwigs', 'cwin', 'cwinj', 'cwinh', 'cwid',
+        'cwil', 'cwilg', 'cwilm', 'cwilb', 'cwils', 'cwilt', 'cwilp', 'cwilh', 'cwim', 'cwib', 'cwibs', 'cwis', 'cwiss', 'cwing', 'cwij', 'cwic',
+    ],
+    'x30': [
+        ' ', ', ', '. ', '"', '[JIS]', '"', '/', '0', '<', '> ', '<<', '>> ', '[', '] ', '\\{', '\\} ',
+        '[(', ')] ', '@', 'X ', '[', '] ', '[[', ']] ', '((', ')) ', '[[', ']] ', '~ ', '``', "''", ',,',
+        '@', '1', '2', '3', '4', '5', '6', '7', '8', '9', '', '', '', '', '', '',
+        '~', '+', '+', '+', '+', '', '@', ' // ', '+10+', '+20+', '+30+', '[?]', '[?]', '[?]', '', '',
+        '[?]', 'a', 'a', 'i', 'i', 'u', 'u', 'e', 'e', 'o', 'o', 'ka', 'ga', 'ki', 'gi', 'ku',
+        'gu', 'ke', 'ge', 'ko', 'go', 'sa', 'za', 'si', 'zi', 'su', 'zu', 'se', 'ze', 'so', 'zo', 'ta',
+        'da', 'ti', 'di', 'tu', 'tu', 'du', 'te', 'de', 'to', 'do', 'na', 'ni', 'nu', 'ne', 'no', 'ha',
+        'ba', 'pa', 'hi', 'bi', 'pi', 'hu', 'bu', 'pu', 'he', 'be', 'pe', 'ho', 'bo', 'po', 'ma', 'mi',
+        'mu', 'me', 'mo', 'ya', 'ya', 'yu', 'yu', 'yo', 'yo', 'ra', 'ri', 'ru', 're', 'ro', 'wa', 'wa',
+        'wi', 'we', 'wo', 'n', 'vu', '[?]', '[?]', '[?]', '[?]', '', '', '', '', '"', '"', '[?]',
+        '[?]', 'a', 'a', 'i', 'i', 'u', 'u', 'e', 'e', 'o', 'o', 'ka', 'ga', 'ki', 'gi', 'ku',
+        'gu', 'ke', 'ge', 'ko', 'go', 'sa', 'za', 'si', 'zi', 'su', 'zu', 'se', 'ze', 'so', 'zo', 'ta',
+        'da', 'ti', 'di', 'tu', 'tu', 'du', 'te', 'de', 'to', 'do', 'na', 'ni', 'nu', 'ne', 'no', 'ha',
+        'ba', 'pa', 'hi', 'bi', 'pi', 'hu', 'bu', 'pu', 'he', 'be', 'pe', 'ho', 'bo', 'po', 'ma', 'mi',
+        'mu', 'me', 'mo', 'ya', 'ya', 'yu', 'yu', 'yo', 'yo', 'ra', 'ri', 'ru', 're', 'ro', 'wa', 'wa',
+        'wi', 'we', 'wo', 'n', 'vu', 'ka', 'ke', 'va', 'vi', 've', 'vo', '', '', '"', '"',
+    ],
+    'xca': [
+        'jjael', 'jjaelg', 'jjaelm', 'jjaelb', 'jjaels', 'jjaelt', 'jjaelp', 'jjaelh', 'jjaem', 'jjaeb', 'jjaebs', 'jjaes', 'jjaess', 'jjaeng', 'jjaej', 'jjaec',
+        'jjaek', 'jjaet', 'jjaep', 'jjaeh', 'jjya', 'jjyag', 'jjyagg', 'jjyags', 'jjyan', 'jjyanj', 'jjyanh', 'jjyad', 'jjyal', 'jjyalg', 'jjyalm', 'jjyalb',
+        'jjyals', 'jjyalt', 'jjyalp', 'jjyalh', 'jjyam', 'jjyab', 'jjyabs', 'jjyas', 'jjyass', 'jjyang', 'jjyaj', 'jjyac', 'jjyak', 'jjyat', 'jjyap', 'jjyah',
+        'jjyae', 'jjyaeg', 'jjyaegg', 'jjyaegs', 'jjyaen', 'jjyaenj', 'jjyaenh', 'jjyaed', 'jjyael', 'jjyaelg', 'jjyaelm', 'jjyaelb', 'jjyaels', 'jjyaelt', 'jjyaelp', 'jjyaelh',
+        'jjyaem', 'jjyaeb', 'jjyaebs', 'jjyaes', 'jjyaess', 'jjyaeng', 'jjyaej', 'jjyaec', 'jjyaek', 'jjyaet', 'jjyaep', 'jjyaeh', 'jjeo', 'jjeog', 'jjeogg', 'jjeogs',
+        'jjeon', 'jjeonj', 'jjeonh', 'jjeod', 'jjeol', 'jjeolg', 'jjeolm', 'jjeolb', 'jjeols', 'jjeolt', 'jjeolp', 'jjeolh', 'jjeom', 'jjeob', 'jjeobs', 'jjeos',
+        'jjeoss', 'jjeong', 'jjeoj', 'jjeoc', 'jjeok', 'jjeot', 'jjeop', 'jjeoh', 'jje', 'jjeg', 'jjegg', 'jjegs', 'jjen', 'jjenj', 'jjenh', 'jjed',
+        'jjel', 'jjelg', 'jjelm', 'jjelb', 'jjels', 'jjelt', 'jjelp', 'jjelh', 'jjem', 'jjeb', 'jjebs', 'jjes', 'jjess', 'jjeng', 'jjej', 'jjec',
+        'jjek', 'jjet', 'jjep', 'jjeh', 'jjyeo', 'jjyeog', 'jjyeogg', 'jjyeogs', 'jjyeon', 'jjyeonj', 'jjyeonh', 'jjyeod', 'jjyeol', 'jjyeolg', 'jjyeolm', 'jjyeolb',
+        'jjyeols', 'jjyeolt', 'jjyeolp', 'jjyeolh', 'jjyeom', 'jjyeob', 'jjyeobs', 'jjyeos', 'jjyeoss', 'jjyeong', 'jjyeoj', 'jjyeoc', 'jjyeok', 'jjyeot', 'jjyeop', 'jjyeoh',
+        'jjye', 'jjyeg', 'jjyegg', 'jjyegs', 'jjyen', 'jjyenj', 'jjyenh', 'jjyed', 'jjyel', 'jjyelg', 'jjyelm', 'jjyelb', 'jjyels', 'jjyelt', 'jjyelp', 'jjyelh',
+        'jjyem', 'jjyeb', 'jjyebs', 'jjyes', 'jjyess', 'jjyeng', 'jjyej', 'jjyec', 'jjyek', 'jjyet', 'jjyep', 'jjyeh', 'jjo', 'jjog', 'jjogg', 'jjogs',
+        'jjon', 'jjonj', 'jjonh', 'jjod', 'jjol', 'jjolg', 'jjolm', 'jjolb', 'jjols', 'jjolt', 'jjolp', 'jjolh', 'jjom', 'jjob', 'jjobs', 'jjos',
+        'jjoss', 'jjong', 'jjoj', 'jjoc', 'jjok', 'jjot', 'jjop', 'jjoh', 'jjwa', 'jjwag', 'jjwagg', 'jjwags', 'jjwan', 'jjwanj', 'jjwanh', 'jjwad',
+        'jjwal', 'jjwalg', 'jjwalm', 'jjwalb', 'jjwals', 'jjwalt', 'jjwalp', 'jjwalh', 'jjwam', 'jjwab', 'jjwabs', 'jjwas', 'jjwass', 'jjwang', 'jjwaj', 'jjwac',
+        'jjwak', 'jjwat', 'jjwap', 'jjwah', 'jjwae', 'jjwaeg', 'jjwaegg', 'jjwaegs', 'jjwaen', 'jjwaenj', 'jjwaenh', 'jjwaed', 'jjwael', 'jjwaelg', 'jjwaelm', 'jjwaelb',
+    ],
+    'xa4': [
+        'qiet', 'qiex', 'qie', 'qiep', 'quot', 'quox', 'quo', 'quop', 'qot', 'qox', 'qo', 'qop', 'qut', 'qux', 'qu', 'qup',
+        'qurx', 'qur', 'qyt', 'qyx', 'qy', 'qyp', 'qyrx', 'qyr', 'jjit', 'jjix', 'jji', 'jjip', 'jjiet', 'jjiex', 'jjie', 'jjiep',
+        'jjuox', 'jjuo', 'jjuop', 'jjot', 'jjox', 'jjo', 'jjop', 'jjut', 'jjux', 'jju', 'jjup', 'jjurx', 'jjur', 'jjyt', 'jjyx', 'jjy',
+        'jjyp', 'njit', 'njix', 'nji', 'njip', 'njiet', 'njiex', 'njie', 'njiep', 'njuox', 'njuo', 'njot', 'njox', 'njo', 'njop', 'njux',
+        'nju', 'njup', 'njurx', 'njur', 'njyt', 'njyx', 'njy', 'njyp', 'njyrx', 'njyr', 'nyit', 'nyix', 'nyi', 'nyip', 'nyiet', 'nyiex',
+        'nyie', 'nyiep', 'nyuox', 'nyuo', 'nyuop', 'nyot', 'nyox', 'nyo', 'nyop', 'nyut', 'nyux', 'nyu', 'nyup', 'xit', 'xix', 'xi',
+        'xip', 'xiet', 'xiex', 'xie', 'xiep', 'xuox', 'xuo', 'xot', 'xox', 'xo', 'xop', 'xyt', 'xyx', 'xy', 'xyp', 'xyrx',
+        'xyr', 'yit', 'yix', 'yi', 'yip', 'yiet', 'yiex', 'yie', 'yiep', 'yuot', 'yuox', 'yuo', 'yuop', 'yot', 'yox', 'yo',
+        'yop', 'yut', 'yux', 'yu', 'yup', 'yurx', 'yur', 'yyt', 'yyx', 'yy', 'yyp', 'yyrx', 'yyr', '[?]', '[?]', '[?]',
+        'Qot', 'Li', 'Kit', 'Nyip', 'Cyp', 'Ssi', 'Ggop', 'Gep', 'Mi', 'Hxit', 'Lyr', 'Bbut', 'Mop', 'Yo', 'Put', 'Hxuo',
+        'Tat', 'Ga', '[?]', '[?]', 'Ddur', 'Bur', 'Gguo', 'Nyop', 'Tu', 'Op', 'Jjut', 'Zot', 'Pyt', 'Hmo', 'Yit', 'Vur',
+        'Shy', 'Vep', 'Za', 'Jo', '[?]', 'Jjy', 'Got', 'Jjie', 'Wo', 'Du', 'Shur', 'Lie', 'Cy', 'Cuop', 'Cip', 'Hxop',
+        'Shat', '[?]', 'Shop', 'Che', 'Zziet', '[?]', 'Ke', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+        '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]', '[?]',
+    ],
+    'xfc': [
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+    ],
+    'x1d4':[
+        'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O',
+        'P','Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e',
+        'f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u',
+        'v','w','x','y','z','A','B','C','D','E','F','G','H','I','J','K',
+        'L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','a',
+        'b','c','d','e','f','g','','i','j','k','l','m','n','o','p','q',
+        'r','s','t','u','v','w','x','y','z','A','B','C','D','E','F','G',
+        'H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W',
+        'X','Y','Z','a','b','c','d','e','f','g','h','i','j','k','l','m',
+        'n','o','p','q','r','s','t','u','v','w','x','y','z','A','','C',
+        'D','','','G','','','J','K','','','N','O','P','Q','','S',
+        'T','U','V','W','X','Y','Z','a','b','c','d','','f','','h','i',
+        'j','k','l','m','n','','p','q','r','s','t','u','v','w','x','y',
+        'z','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O',
+        'P','Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e',
+        'f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v'
+    ],
+    'x1d5':[
+        'w','x','y','z','A','B','','D','E','F','G','','','J','K',
+        'L','M','N','O','P','Q','','S','T','U','V','W','X','Y','','a',
+        'b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q',
+        'r','s','t','u','v','w','x','y','z','A','B','','D','E','F','G',
+        '','I','J','K','L','M','','O','','','','S','T','U','V','W',
+        'X','Y','','a','b','c','d','e','f','g','h','i','j','k','l','m',
+        'n','o','p','q','r','s','t','u','v','w','x','y','z','A','B','C',
+        'D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S',
+        'T','U','V','W','X','Y','Z','a','b','c','d','e','f','g','h','i',
+        'j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y',
+        'z','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O',
+        'P','Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e',
+        'f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u',
+        'v','w','x','y','z','A','B','C','D','E','F','G','H','I','J','K',
+        'L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','a',
+        'b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r'
+    ],
+    'x1d6':[
+        's','t','u','v','w','x','y','z','A','B','C','D','E','F','G',
+        'H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W',
+        'X','Y','Z','a','b','c','d','e','f','g','h','i','j','k','l','m',
+        'n','o','p','q','r','s','t','u','v','w','x','y','z','A','B','C',
+        'D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S',
+        'T','U','V','W','X','Y','Z','a','b','c','d','e','f','g','h','i',
+        'j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y',
+        'z','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O',
+        'P','Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e',
+        'f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u',
+        'v','w','x','y','z','i','j','','','Alpha','Beta','Gamma','Delta','Epsilon','Zeta','Eta',
+        'Theta','Iota','Kappa','Lamda','Mu','Nu','Xi','Omicron','Pi','Rho','Theta','Sigma','Tau','Upsilon','Phi','Chi',
+        'Psi','Omega','nabla','alpha','beta','gamma','delta','epsilon','zeta','eta','theta','iota','kappa','lamda','mu','nu',
+        'xi','omicron','pi','rho','sigma','sigma','tai','upsilon','phi','chi','psi','omega','','','','',
+        '','','','','','','','','','','','','','','','',
+        '','','','','','','','','','','','','','','','',''
+    ],
+    'x1d7':[
+        '','','','','','','','','','','','','','','',
+        '','','','','','','','','','','','','','','','',
+        '','','','','','','','','','','','','','','','',
+        '','','','','','','','','','','','','','','','',
+        '','','','','','','','','','','','','','','','',
+        '','','','','','','','','','','','','','','','',
+        '','','','','','','','','','','','','','','','',
+        '','','','','','','','','','','','','','','','',
+        '','','','','','','','','','','','','','','','',
+        '','','','','','','','','','','','','','','','',
+        '','','','','','','','','','','','','','','','',
+        '','','','','','','','','','','','','','','','',
+        '','','','','','','','','','','','','','','','0',
+        '1','2','3','4','5','6','7','8','9','0','1','2','3','4','5','6',
+        '7','8','9','0','1','2','3','4','5','6','7','8','9','0','1','2',
+        '3','4','5','6','7','8','9','0','1','2','3','4','5','6','7','8','9'
+    ]
+}
diff --git a/src/calibre/ebooks/unihandecode/unidecoder.py b/src/calibre/ebooks/unihandecode/unidecoder.py
index a4a3ba9a5a..aba5069030 100644
--- a/src/calibre/ebooks/unihandecode/unidecoder.py
+++ b/src/calibre/ebooks/unihandecode/unidecoder.py
@@ -73,7 +73,7 @@ class Unidecoder:
 
     def decode(self, text):
         # Replace characters larger than 127 with their ASCII equivalent.
-        return re.sub('[^\x00-\x7f]',lambda x: self.replace_point(x.group()), text)
+        return re.sub(r'[^\x00-\x7f]', lambda x: self.replace_point(x.group()), text)
 
     def replace_point(self, codepoint):
         '''
@@ -94,7 +94,7 @@ class Unidecoder:
         '''
         # Code groups within CODEPOINTS take the form 'xAB'
         if not isinstance(character, str):
-            character = str(character, "utf-8")
+            character = str(character, 'utf-8')
         return 'x%02x' % (ord(character) >> 8)
 
     def grouped_point(self, character):
@@ -103,5 +103,5 @@ class Unidecoder:
         the group character is a part of.
         '''
         if not isinstance(character, str):
-            character = str(character, "utf-8")
+            character = str(character, 'utf-8')
         return ord(character) & 255
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 9371ba8be4..8e199f4e34 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -1,7 +1,7 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 
-""" The GUI """
+''' The GUI '''
 
 import glob
 import os
@@ -302,7 +302,6 @@ QIcon.icon_as_png = icon_resource_manager.icon_as_png
 QIcon.is_ok = lambda self: not self.isNull() and len(self.availableSizes()) > 0
 QIcon.cached_icon = icon_resource_manager.cached_icon
 
-
 # Setup gprefs {{{
 gprefs = JSONConfig('gui')
 
@@ -469,7 +468,7 @@ def create_defs():
     defs['books_autoscroll_time'] = 2.0
     defs['edit_metadata_single_use_2_cols_for_custom_fields'] = True
     defs['edit_metadata_elide_labels'] = True
-    defs['edit_metadata_elision_point'] = "right"
+    defs['edit_metadata_elision_point'] = 'right'
     defs['edit_metadata_bulk_cc_label_length'] = 25
     defs['edit_metadata_single_cc_label_length'] = 12
     defs['edit_metadata_templates_only_F2_on_booklist'] = False
@@ -623,7 +622,6 @@ def _config():  # {{{
 
 
 config = _config()
-
 # }}}
 
 QSettings.setPath(QSettings.Format.IniFormat, QSettings.Scope.UserScope, config_dir)
@@ -1030,7 +1028,7 @@ def pixmap_to_data(pixmap, format='JPEG', quality=None):
     Return the QPixmap pixmap as a string saved in the specified format.
     '''
     if quality is None:
-        if format.upper() == "PNG":
+        if format.upper() == 'PNG':
             # For some reason on windows with Qt 5.6 using a quality of 90
             # generates invalid PNG data. Many other quality values work
             # but we use -1 for the default quality which is most likely to
@@ -1259,7 +1257,7 @@ class Application(QApplication):
             # Qt 5.10.1 on Linux resets the global font on first event loop tick.
             # So workaround it by setting the font once again in a timer.
             font_from_prefs = self.font()
-            QTimer.singleShot(0, lambda : QApplication.setFont(font_from_prefs))
+            QTimer.singleShot(0, lambda: QApplication.setFont(font_from_prefs))
         self.line_height = max(12, QFontMetrics(self.font()).lineSpacing())
 
         dl = QLocale(get_lang())
@@ -1551,7 +1549,7 @@ def open_url(qurl):
             # QDesktopServices::openUrl()
             ensure_app()
             cmd = ['xdg-open', qurl.toLocalFile() if qurl.isLocalFile() else qurl.toString(QUrl.ComponentFormattingOption.FullyEncoded)]
-            if isfrozen and QApplication.instance().platformName() == "wayland":
+            if isfrozen and QApplication.instance().platformName() == 'wayland':
                 # See https://bugreports.qt.io/browse/QTBUG-119438
                 run_cmd(cmd)
                 ok = True
@@ -1605,6 +1603,7 @@ def open_local_file(path):
 
 _ea_lock = Lock()
 
+
 def simple_excepthook(t, v, tb):
     return sys.__excepthook__(t, v, tb)
 
@@ -1693,7 +1692,7 @@ def elided_text(text, font=None, width=300, pos='middle'):
         font = QApplication.instance().font()
     fm = (font if isinstance(font, QFontMetrics) else QFontMetrics(font))
     delta = 4
-    ellipsis = '\u2026'
+    ellipsis = '…'
 
     def remove_middle(x):
         mid = len(x) // 2
diff --git a/src/calibre/gui2/actions/__init__.py b/src/calibre/gui2/actions/__init__.py
index 5282d6b911..8ff9f6fba1 100644
--- a/src/calibre/gui2/actions/__init__.py
+++ b/src/calibre/gui2/actions/__init__.py
@@ -31,7 +31,7 @@ def toolbar_widgets_for_action(gui, action):
             # The button might be hidden
             if not w.isVisible():
                 continue
-            yield(w)
+            yield w
         except Exception:
             continue
 
@@ -85,7 +85,6 @@ def menu_action_unique_name(plugin, unique_name):
 
 
 class InterfaceAction(QObject):
-
     '''
     A plugin representing an "action" that can be taken in the graphical user
     interface. All the items in the toolbar and context menus are implemented
@@ -445,6 +444,7 @@ class InterfaceAction(QObject):
         '''
         pass
 
+
 class InterfaceActionWithLibraryDrop(InterfaceAction):
     '''
     Subclass of InterfaceAction that implements methods to execute the default action
diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py
index 28a0c17047..202cef8b2f 100644
--- a/src/calibre/gui2/actions/add.py
+++ b/src/calibre/gui2/actions/add.py
@@ -48,8 +48,8 @@ class AddAction(InterfaceAction):
 
     name = 'Add Books'
     action_spec = (_('Add books'), 'add_book.png',
-            _('Add books to the calibre library/device from files on your computer')
-            , _('A'))
+            _('Add books to the calibre library/device from files on your computer'),
+            _('A'))
     action_type = 'current'
     action_add_menu = True
     action_menu_clone_qaction = _('Add books from a single folder')
@@ -318,7 +318,7 @@ class AddAction(InterfaceAction):
         self.add_recursive(False)
 
     def add_recursive_question(self):
-        single =  question_dialog(self.gui, _('Multi-file books?'), _(
+        single = question_dialog(self.gui, _('Multi-file books?'), _(
             'Assume all e-book files in a single folder are multiple formats of the same book?'))
         self.add_recursive(single)
 
@@ -670,7 +670,7 @@ class AddAction(InterfaceAction):
             vmsg = getattr(self.gui.device_manager.device, 'VIRTUAL_BOOK_EXTENSION_MESSAGE', None) or _(
                 'The following books are virtual and cannot be added'
                 ' to the calibre library:')
-            info_dialog(self.gui,  _('Not Implemented'), vmsg, '\n'.join(remove), show=True)
+            info_dialog(self.gui, _('Not Implemented'), vmsg, '\n'.join(remove), show=True)
             if not paths:
                 return
         if not paths or len(paths) == 0:
diff --git a/src/calibre/gui2/actions/all_actions.py b/src/calibre/gui2/actions/all_actions.py
index 4e2b6ae31c..aa2544d0a4 100644
--- a/src/calibre/gui2/actions/all_actions.py
+++ b/src/calibre/gui2/actions/all_actions.py
@@ -15,8 +15,8 @@ class AllGUIActions(InterfaceAction):
 
     name = 'All GUI actions'
     action_spec = (_('All actions'), 'wizard.png',
-                   _("Show a menu of all available actions, including from third party plugins.\nThis menu "
-                     "is not available when looking at books on a device"), None)
+                   _('Show a menu of all available actions, including from third party plugins.\nThis menu '
+                     'is not available when looking at books on a device'), None)
 
     action_type = 'current'
     popup_type = QToolButton.ToolButtonPopupMode.InstantPopup
@@ -34,7 +34,7 @@ class AllGUIActions(InterfaceAction):
                         menu=self.hidden_menu,
                         unique_name='Main window layout',
                         shortcut='Ctrl+F1',
-                        text=_("Show a menu of all available actions."),
+                        text=_('Show a menu of all available actions.'),
                         icon='wizard.png',
                         triggered=self.show_menu)
 
@@ -63,15 +63,15 @@ class AllGUIActions(InterfaceAction):
         m = self.qaction.menu()
         m.clear()
 
-        name_data = {} # A dict of display names to actions data
+        name_data = {}  # A dict of display names to actions data
 
         # Use model data from Preferences / Toolbars, with location 'toolbar' or
         # 'toolbar-device' depending on whether a device is connected.
         location = 'toolbar' + ('-device' if self.gui.location_manager.has_device else '')
         for model in (AllModel(location, self.gui), CurrentModel(location, self.gui)):
-            for i in range(0, model.rowCount(None)):
+            for i in range(model.rowCount(None)):
                 dex = model.index(i)
-                name = model.names((dex,))[0] # this is the action name
+                name = model.names((dex,))[0]  # this is the action name
                 if name is not None and not name.startswith('---'):
                     name_data[model.data(dex, Qt.ItemDataRole.DisplayRole)] = {
                                     'action': model.name_to_action(name, self.gui),
@@ -81,8 +81,8 @@ class AllGUIActions(InterfaceAction):
 
         # Get display names of builtin and user plugins. We tell the difference
         # using the class full module name. Plugins start with 'calibre_plugins'
-        builtin_actions = list()
-        user_plugins = list()
+        builtin_actions = []
+        user_plugins = []
         for display_name, act_data in name_data.items():
             act = model.name_to_action(act_data['action_name'], self.gui)
             if act is not None:
@@ -106,7 +106,7 @@ class AllGUIActions(InterfaceAction):
         for n,v in kbd.keys_map.items():
             act_name = kbd.shortcuts[n]['name'].lower()
             if act_name in lower_names:
-                shortcuts = list(sc.toString() for sc in v)
+                shortcuts = [sc.toString() for sc in v]
                 shortcut_map[act_name] = f'\t{", ".join(shortcuts)}'
 
         # This function constructs a menu action, dealing with the action being
@@ -116,7 +116,7 @@ class AllGUIActions(InterfaceAction):
         def add_action(menu, display_name):
             shortcuts = shortcut_map.get(display_name.lower(), '')
             act = name_data[display_name]['action']
-            if not hasattr(act, 'popup_type'): # FakeAction
+            if not hasattr(act, 'popup_type'):  # FakeAction
                 return
             menu_text = f'{display_name}{shortcuts}'
             icon = name_data[display_name]['icon']
@@ -137,7 +137,7 @@ class AllGUIActions(InterfaceAction):
         # Finally the real work, building the action menu. Partition long lists
         # of actions into mostly-equal-length sublists of some arbitrary length.
         def partition(names):
-            max_in_partition = 10 # arbitrary
+            max_in_partition = 10  # arbitrary
             if len(names) >= max_in_partition:
                 partition_count = ceil(len(names) / max_in_partition)
                 step = int(ceil(len(names) / partition_count))
diff --git a/src/calibre/gui2/actions/annotate.py b/src/calibre/gui2/actions/annotate.py
index 8f8fdb0dac..ffcd4c32e0 100644
--- a/src/calibre/gui2/actions/annotate.py
+++ b/src/calibre/gui2/actions/annotate.py
@@ -102,7 +102,7 @@ class FetchAnnotationsAction(InterfaceAction):
                 path = get_device_path_from_id(id)
                 mi = db.get_metadata(id, index_is_id=True)
                 a_path = device.create_annotations_path(mi, device_path=path)
-                path_map[id] = dict(path=a_path, fmts=get_formats(id))
+                path_map[id] = {'path': a_path, 'fmts': get_formats(id)}
             return path_map
 
         device = self.gui.device_manager.device
diff --git a/src/calibre/gui2/actions/catalog.py b/src/calibre/gui2/actions/catalog.py
index 536dc684d6..739823e49b 100644
--- a/src/calibre/gui2/actions/catalog.py
+++ b/src/calibre/gui2/actions/catalog.py
@@ -6,7 +6,6 @@ __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 import os
-import re
 import shutil
 
 from qt.core import QModelIndex
@@ -72,11 +71,11 @@ class GenerateCatalogAction(InterfaceAction):
             # jobs.results is a list - the first entry is the intended title for the dialog
             # Subsequent strings are error messages
             dialog_title = job.result.pop(0)
-            if re.search('warning', job.result[0].lower()):
-                msg = _("Catalog generation complete, with warnings.")
+            if 'warning' in job.result[0].lower():
+                msg = _('Catalog generation complete, with warnings.')
                 warning_dialog(self.gui, dialog_title, msg, det_msg='\n'.join(job.result), show=True)
             else:
-                job.result.append("Catalog generation terminated.")
+                job.result.append('Catalog generation terminated.')
                 error_dialog(self.gui, dialog_title,'\n'.join(job.result),show=True)
                 return
 
diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index ec9dd9db48..25129e81df 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -121,7 +121,7 @@ class LibraryUsageStats:  # {{{
         if lpath in locs:
             locs.remove(lpath)
         limit = tweaks['many_libraries'] if limit is None else limit
-        key = (lambda x:sort_key(os.path.basename(x))) if len(locs) > limit else self.stats.get
+        key = (lambda x: sort_key(os.path.basename(x))) if len(locs) > limit else self.stats.get
         locs.sort(key=key, reverse=len(locs)<=limit)
         for loc in locs:
             yield self.pretty(loc), loc
diff --git a/src/calibre/gui2/actions/convert.py b/src/calibre/gui2/actions/convert.py
index 8f5297c813..cfc623e94b 100644
--- a/src/calibre/gui2/actions/convert.py
+++ b/src/calibre/gui2/actions/convert.py
@@ -177,7 +177,7 @@ class ConvertAction(InterfaceActionWithLibraryDrop):
             converted_func, extra_job_args=[], rows_are_ids=False):
         for func, args, desc, fmt, id, temp_files in jobs:
             func, _, parts = func.partition(':')
-            parts = {x for x in parts.split(';')}
+            parts = set(parts.split(';'))
             input_file = args[0]
             input_fmt = os.path.splitext(input_file)[1]
             core_usage = 1
diff --git a/src/calibre/gui2/actions/copy_to_library.py b/src/calibre/gui2/actions/copy_to_library.py
index a17d5d1a19..e706c50ea4 100644
--- a/src/calibre/gui2/actions/copy_to_library.py
+++ b/src/calibre/gui2/actions/copy_to_library.py
@@ -334,7 +334,6 @@ class DuplicatesQuestion(QDialog):  # {{{
     @property
     def ids(self):
         return {int(i.data(Qt.ItemDataRole.UserRole)) for i in self.items if i.checkState() == Qt.CheckState.Checked}
-
 # }}}
 
 
diff --git a/src/calibre/gui2/actions/delete.py b/src/calibre/gui2/actions/delete.py
index 538af5a3aa..b933bd6607 100644
--- a/src/calibre/gui2/actions/delete.py
+++ b/src/calibre/gui2/actions/delete.py
@@ -438,7 +438,7 @@ class DeleteAction(InterfaceActionWithLibraryDrop):
             try:
                 view.model().delete_books_by_id(to_delete_ids)
             except OSError as err:
-                err.locking_violation_msg = _('Could not change on-disk location of this book\'s files.')
+                err.locking_violation_msg = _("Could not change on-disk location of this book's files.")
                 raise
             self.library_ids_deleted2(to_delete_ids, next_id=next_id, can_undo=True)
         else:
diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py
index 43d59a4a26..91493f5ff8 100644
--- a/src/calibre/gui2/actions/device.py
+++ b/src/calibre/gui2/actions/device.py
@@ -59,7 +59,7 @@ class ShareConnMenu(QMenu):  # {{{
             _('Start Content server'))
         connect_lambda(self.toggle_server_action.triggered, self, lambda self: self.toggle_server.emit())
         self.open_server_in_browser_action = self.addAction(
-            QIcon.ic('forward.png'), _("Visit Content server in browser"))
+            QIcon.ic('forward.png'), _('Visit Content server in browser'))
         connect_lambda(self.open_server_in_browser_action.triggered, self, lambda self: open_in_browser())
         self.open_server_in_browser_action.setVisible(False)
         self.control_smartdevice_action = \
@@ -175,9 +175,9 @@ class ShareConnMenu(QMenu):  # {{{
     def set_state(self, device_connected, device):
         self.connect_to_folder_action.setEnabled(not device_connected)
 
-
 # }}}
 
+
 class SendToDeviceAction(InterfaceAction):
 
     name = 'Send To Device'
diff --git a/src/calibre/gui2/actions/layout_actions.py b/src/calibre/gui2/actions/layout_actions.py
index a6316d7845..3ec18e573c 100644
--- a/src/calibre/gui2/actions/layout_actions.py
+++ b/src/calibre/gui2/actions/layout_actions.py
@@ -86,8 +86,8 @@ class LayoutActions(InterfaceAction):
                         menu=self.hidden_menu,
                         unique_name='Main window layout',
                         shortcut=None,
-                        text=_("Save and restore layout item sizes, and add/remove/toggle "
-                               "layout items such as the search bar, tag browser, etc. "),
+                        text=_('Save and restore layout item sizes, and add/remove/toggle '
+                               'layout items such as the search bar, tag browser, etc. '),
                         icon='layout.png',
                         triggered=self.show_menu)
 
diff --git a/src/calibre/gui2/actions/mark_books.py b/src/calibre/gui2/actions/mark_books.py
index e1f75061f6..acdb7cd800 100644
--- a/src/calibre/gui2/actions/mark_books.py
+++ b/src/calibre/gui2/actions/mark_books.py
@@ -37,7 +37,7 @@ class MarkWithTextDialog(QDialog):
 
         history = textbox.all_items
         button_rows = min(4, len(history)-1)
-        for i in range(0, button_rows):
+        for i in range(button_rows):
             if i == 0:
                 layout.addWidget(QLabel(_('Recently used values:')), 0, 0, 1, 2)
             button = QPushButton()
@@ -149,7 +149,7 @@ class MarkBooksAction(InterfaceActionWithLibraryDrop):
         num = len(frozenset(marked_ids).intersection(db.new_api.all_book_ids()))
         text = _('Show marked book') if num == 1 else (_('Show marked books') + (' (%d)' % num))
         self.show_marked_action.setText(text)
-        counts = dict()
+        counts = {}
         for v in marked_ids.values():
             counts[v] = counts.get(v, 0) + 1
         labels = sorted(counts.keys(), key=sort_key)
diff --git a/src/calibre/gui2/actions/open.py b/src/calibre/gui2/actions/open.py
index 8998e5f343..b5fbeb586b 100644
--- a/src/calibre/gui2/actions/open.py
+++ b/src/calibre/gui2/actions/open.py
@@ -14,7 +14,7 @@ class OpenFolderAction(InterfaceAction):
 
     name = 'Open Folder'
     action_spec = (_('Open book folder'), 'document_open.png',
-                   _('Open the folder containing the current book\'s files'), _('O'))
+                   _("Open the folder containing the current book's files"), _('O'))
     dont_add_to = frozenset(('context-menu-device',))
     action_type = 'current'
     action_add_menu = True
@@ -24,7 +24,7 @@ class OpenFolderAction(InterfaceAction):
         va = self.gui.iactions['View'].view_folder
         self.qaction.triggered.connect(va)
         a = self.create_menu_action(self.qaction.menu(), 'show-data-folder',
-                                _('Open book data folder'), icon='document_open.png', shortcut=tuple())
+                                _('Open book data folder'), icon='document_open.png', shortcut=())
         a.triggered.connect(partial(va, data_folder=True))
 
     def location_selected(self, loc):
diff --git a/src/calibre/gui2/actions/preferences.py b/src/calibre/gui2/actions/preferences.py
index d46311efca..8885780ccc 100644
--- a/src/calibre/gui2/actions/preferences.py
+++ b/src/calibre/gui2/actions/preferences.py
@@ -46,7 +46,7 @@ class PreferencesAction(InterfaceAction):
     def initialization_complete(self):
         # Add the individual preferences to the menu.
         # First, sort them into the same order as shown in the preferences dialog
-        plugins = sorted([p for p in preferences_plugins()],
+        plugins = sorted(preferences_plugins(),
                          key=lambda p: p.category_order * 100 + p.name_order)
 
         pm = self.preferences_menu
@@ -65,7 +65,6 @@ class PreferencesAction(InterfaceAction):
                                     triggered=partial(self.do_config, initial_plugin=(p.category, p.name),
                                                       close_after_initial=True))
 
-
     def get_plugins(self):
         from calibre.gui2.dialogs.plugin_updater import FILTER_NOT_INSTALLED, PluginUpdaterDialog
         d = PluginUpdaterDialog(self.gui,
diff --git a/src/calibre/gui2/actions/save_to_disk.py b/src/calibre/gui2/actions/save_to_disk.py
index 39bddad3e3..6c183941bf 100644
--- a/src/calibre/gui2/actions/save_to_disk.py
+++ b/src/calibre/gui2/actions/save_to_disk.py
@@ -17,7 +17,7 @@ from polyglot.builtins import itervalues
 
 class SaveToDiskAction(InterfaceAction):
 
-    name = "Save To Disk"
+    name = 'Save To Disk'
     action_spec = (_('Save to disk'), 'save.png',
                    _('Export e-book files from the calibre library'), _('S'))
     action_type = 'current'
diff --git a/src/calibre/gui2/actions/show_template_tester.py b/src/calibre/gui2/actions/show_template_tester.py
index dbd2c9da8e..f751ce98a9 100644
--- a/src/calibre/gui2/actions/show_template_tester.py
+++ b/src/calibre/gui2/actions/show_template_tester.py
@@ -31,7 +31,7 @@ class ShowTemplateTesterAction(InterfaceAction):
         #                 text=self.non_modal_window_title,
         #                 icon='debug.png',
         #                 triggered=partial(self.show_template_editor, modal=False))
-        self.non_modal_dialogs = list()
+        self.non_modal_dialogs = []
 
     def last_template_text(self):
         return self.previous_text
diff --git a/src/calibre/gui2/actions/tweak_epub.py b/src/calibre/gui2/actions/tweak_epub.py
index a6d15ebedc..2addfc4b5f 100644
--- a/src/calibre/gui2/actions/tweak_epub.py
+++ b/src/calibre/gui2/actions/tweak_epub.py
@@ -105,7 +105,7 @@ class TweakEpubAction(InterfaceActionWithLibraryDrop):
                 return error_dialog(self.gui, _('Cannot edit book'), _(
                     'The book "{0}" must be in the {1} formats to edit.'
                     '\n\nFirst convert the book to one of these formats.'
-                ).format(title,  _(' or ').join(SUPPORTED)), show=True)
+                ).format(title, _(' or ').join(SUPPORTED)), show=True)
         from calibre.gui2.tweak_book import tprefs
         tprefs.refresh()  # In case they were changed in a Tweak Book process
         if len(tweakable_fmts) > 1:
diff --git a/src/calibre/gui2/actions/view.py b/src/calibre/gui2/actions/view.py
index b4e7959916..3d6205a4b4 100644
--- a/src/calibre/gui2/actions/view.py
+++ b/src/calibre/gui2/actions/view.py
@@ -222,7 +222,7 @@ class ViewAction(InterfaceAction):
                 for f in x:
                     all_fmts.add(f)
         if not all_fmts:
-            error_dialog(self.gui,  _('Format unavailable'),
+            error_dialog(self.gui, _('Format unavailable'),
                     _('Selected books have no formats'), show=True)
             return
         d = ChooseFormatDialog(self.gui, _('Choose the format to view'),
diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py
index 04c7b0cb22..b17a71a493 100644
--- a/src/calibre/gui2/add.py
+++ b/src/calibre/gui2/add.py
@@ -142,7 +142,7 @@ class Adder(QObject):
         if not self.items:
             shutil.rmtree(self.tdir, ignore_errors=True)
         self.setParent(None)
-        self.find_identical_books_data = self.merged_books = self.added_duplicate_info = self.pool = self.items = self.duplicates = self.pd = self.db = self.dbref = self.tdir = self.file_groups = self.scan_thread = None  # noqa
+        self.find_identical_books_data = self.merged_books = self.added_duplicate_info = self.pool = self.items = self.duplicates = self.pd = self.db = self.dbref = self.tdir = self.file_groups = self.scan_thread = None  # noqa: E501
         self.deleteLater()
 
     def tick(self):
diff --git a/src/calibre/gui2/bars.py b/src/calibre/gui2/bars.py
index 44f063bc45..f75537e208 100644
--- a/src/calibre/gui2/bars.py
+++ b/src/calibre/gui2/bars.py
@@ -273,8 +273,8 @@ class ToolBar(QToolBar):  # {{{
 
     def dragEnterEvent(self, event):
         md = event.mimeData()
-        if md.hasFormat("application/calibre+from_library") or \
-           md.hasFormat("application/calibre+from_device"):
+        if md.hasFormat('application/calibre+from_library') or \
+           md.hasFormat('application/calibre+from_device'):
             event.setDropAction(Qt.DropAction.CopyAction)
             event.accept()
             return
@@ -292,8 +292,8 @@ class ToolBar(QToolBar):  # {{{
             w = self.widgetForAction(ac)
             if w is not None:
                 if (md.hasFormat(
-                    "application/calibre+from_library") or md.hasFormat(
-                    "application/calibre+from_device")) and \
+                    'application/calibre+from_library') or md.hasFormat(
+                    'application/calibre+from_device')) and \
                         w.geometry().contains(event.pos()) and \
                         isinstance(w, QToolButton) and not w.isChecked():
                     allowed = True
@@ -353,8 +353,8 @@ class MenuAction(QAction):  # {{{
         self.setText(self.clone.text())
 # }}}
 
-# MenuBar {{{
 
+# MenuBar {{{
 
 if ismacos:
     # On OS X we need special handling for the application global menu bar and
@@ -482,9 +482,9 @@ if ismacos:
                 self.edit_menu = QMenu()
                 self.edit_action = QAction(_('Edit'), self)
                 self.edit_action.setMenu(self.edit_menu)
-                ac(_('Copy'), QKeySequence.StandardKey.Copy),
-                ac(_('Paste'), QKeySequence.StandardKey.Paste),
-                ac(_('Select all'), QKeySequence.StandardKey.SelectAll),
+                ac(_('Copy'), QKeySequence.StandardKey.Copy)
+                ac(_('Paste'), QKeySequence.StandardKey.Paste)
+                ac(_('Select all'), QKeySequence.StandardKey.SelectAll)
                 mb.addAction(self.edit_action)
                 self.added_actions = [self.edit_action]
             else:
diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py
index b734967088..5123dc817f 100644
--- a/src/calibre/gui2/book_details.py
+++ b/src/calibre/gui2/book_details.py
@@ -408,8 +408,8 @@ def render_data(mi, use_roman_numbers=True, all_fields=False, pref_name='book_di
 
 # }}}
 
-# Context menu {{{
 
+# Context menu {{{
 
 def add_format_entries(menu, data, book_info, copy_menu, search_menu):
     from calibre.ebooks.oeb.polish.main import SUPPORTED
@@ -479,10 +479,10 @@ def add_format_entries(menu, data, book_info, copy_menu, search_menu):
 def add_link_submenu(menu: QMenu, link, book_info, field='', item_name=''):
     if field and item_name:
         m = menu.addMenu(QIcon.ic('external-link'), _('Associated link'))
-        m.addAction(QIcon.ic('reference'), _('Open: {}').format(link), lambda : book_info.link_clicked.emit(link))
-        m.addAction(QIcon.ic('minus'), _('Remove the link').format(link), lambda : book_info.link_removal_requested.emit(field, item_name))
+        m.addAction(QIcon.ic('reference'), _('Open: {}').format(link), lambda: book_info.link_clicked.emit(link))
+        m.addAction(QIcon.ic('minus'), _('Remove the link').format(link), lambda: book_info.link_removal_requested.emit(field, item_name))
     else:
-        menu.addAction(QIcon.ic('external-link'), _('Open associated link').format(link), lambda : book_info.link_clicked.emit(link))
+        menu.addAction(QIcon.ic('external-link'), _('Open associated link').format(link), lambda: book_info.link_clicked.emit(link))
 
 
 def add_item_specific_entries(menu, data, book_info, copy_menu, search_menu):
@@ -524,7 +524,7 @@ def add_item_specific_entries(menu, data, book_info, copy_menu, search_menu):
             menu.addAction(ac)
         # See if we need to add a click associated link menu line for the author
         link_map = get_gui().current_db.new_api.get_all_link_maps_for_book(data.get('book_id', -1))
-        link = link_map.get("authors", {}).get(author)
+        link = link_map.get('authors', {}).get(author)
         if link:
             add_link_submenu(menu, link, book_info, 'authors', author)
     elif dt in ('path', 'devpath'):
@@ -542,7 +542,7 @@ def add_item_specific_entries(menu, data, book_info, copy_menu, search_menu):
         if path:
             path = os.path.join(path, DATA_DIR_NAME)
             ac.current_url = path
-            ac.setText(_('The location of the book\'s data files'))
+            ac.setText(_("The location of the book's data files"))
             copy_menu.addAction(ac)
     else:
         field = data.get('field')
@@ -619,7 +619,7 @@ def create_copy_links(menu, data=None):
         all_links.append(url)
         copy_to_clipboard_action(text, url)
 
-    sep = menu.addSeparator() # Note: separators are really actions
+    sep = menu.addSeparator()  # Note: separators are really actions
 
     link_action(_('Link to show book in calibre'), f'calibre://show-book/{library_id}/{book_id}')
     link_action(_('Link to show book details in a popup window'),
@@ -643,13 +643,13 @@ def create_copy_links(menu, data=None):
                                          note_data['searchable_text'].partition('\n')[2], sep)
             if field.startswith('#'):
                 field = '_' + field[1:]
-            url = f"calibre://show-note/{library_id}/{field}/id_{item_id}"
+            url = f'calibre://show-note/{library_id}/{field}/id_{item_id}'
             link_action(_('Link to show note in calibre'), url)
         else:
             field = data.get('field')
             if data['type'] == 'author':
                 field = 'authors'
-            if field and field in ('tags', 'series', 'publisher', 'authors') or is_category(field):
+            if (field and field in ('tags', 'series', 'publisher', 'authors')) or is_category(field):
                 name = data['name' if data['type'] == 'author' else 'value']
                 eq = f'{field}:"={name}"'.encode().hex()
                 link_action(_('Link to show books matching {} in calibre').format(name),
@@ -780,7 +780,6 @@ class CoverView(QWidget):  # {{{
         self.animation.setStartValue(QSize(0, 0))
         self.animation.valueChanged.connect(self.value_changed)
 
-
         self.default_pixmap = QApplication.instance().cached_qpixmap('default_cover.png', device_pixel_ratio=self.devicePixelRatio())
         self.pixmap = self.default_pixmap
         self.pwidth = self.pheight = None
@@ -1036,8 +1035,8 @@ class CoverView(QWidget):  # {{{
 
     # }}}
 
-# Book Info {{{
 
+# Book Info {{{
 
 class BookInfo(HTMLDisplay):
 
@@ -1316,6 +1315,7 @@ class DetailsLayout(QSplitter):  # {{{
         cover.do_layout()
 # }}}
 
+
 # Drag 'n drop {{{
 
 class DropMixin:
diff --git a/src/calibre/gui2/catalog/catalog_bibtex.py b/src/calibre/gui2/catalog/catalog_bibtex.py
index af41c91835..1f246a86e7 100644
--- a/src/calibre/gui2/catalog/catalog_bibtex.py
+++ b/src/calibre/gui2/catalog/catalog_bibtex.py
@@ -62,7 +62,7 @@ class PluginWidget(QWidget, Ui_Form):
             opt_value = gprefs.get(self.name + '_' + opt[0], opt[1])
             if opt[0] in ['bibfile_enc', 'bibfile_enctag', 'bib_entry']:
                 getattr(self, opt[0]).setCurrentIndex(opt_value)
-            elif opt[0] in ['impcit', 'addfiles'] :
+            elif opt[0] in ['impcit', 'addfiles']:
                 getattr(self, opt[0]).setChecked(opt_value)
             else:
                 getattr(self, opt[0]).setText(opt_value)
@@ -88,10 +88,10 @@ class PluginWidget(QWidget, Ui_Form):
         # 'bibfile_enc','bibfile_enctag' stores as int (Indexes)
         for opt in self.OPTION_FIELDS:
             if opt[0] in ['bibfile_enc', 'bibfile_enctag', 'bib_entry']:
-                opt_value = getattr(self,opt[0]).currentIndex()
-            elif opt[0] in ['impcit', 'addfiles'] :
+                opt_value = getattr(self, opt[0]).currentIndex()
+            elif opt[0] in ['impcit', 'addfiles']:
                 opt_value = getattr(self, opt[0]).isChecked()
-            else :
+            else:
                 opt_value = str(getattr(self, opt[0]).text())
             gprefs.set(self.name + '_' + opt[0], opt_value)
 
diff --git a/src/calibre/gui2/catalog/catalog_csv_xml.py b/src/calibre/gui2/catalog/catalog_csv_xml.py
index efb94c6c0c..320eb006d5 100644
--- a/src/calibre/gui2/catalog/catalog_csv_xml.py
+++ b/src/calibre/gui2/catalog/catalog_csv_xml.py
@@ -68,7 +68,7 @@ class PluginWidget(QWidget):
         self.db_fields.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove)
         self.db_fields.setDefaultDropAction(Qt.DropAction.CopyAction if ismacos else Qt.DropAction.MoveAction)
         self.db_fields.setAlternatingRowColors(True)
-        self.db_fields.setObjectName("db_fields")
+        self.db_fields.setObjectName('db_fields')
         h = QHBoxLayout()
         l.addLayout(h)
         h.addWidget(la), h.addStretch(10)
diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.py b/src/calibre/gui2/catalog/catalog_epub_mobi.py
index 16172cbb97..9598c686d3 100644
--- a/src/calibre/gui2/catalog/catalog_epub_mobi.py
+++ b/src/calibre/gui2/catalog/catalog_epub_mobi.py
@@ -40,7 +40,7 @@ from calibre.utils.localization import localize_user_manual_link
 from .catalog_epub_mobi_ui import Ui_Form
 
 
-class PluginWidget(QWidget,Ui_Form):
+class PluginWidget(QWidget, Ui_Form):
 
     TITLE = _('E-book options')
     HELP  = _('Options specific to')+' AZW3/EPUB/MOBI '+_('output')
@@ -121,20 +121,20 @@ class PluginWidget(QWidget,Ui_Form):
                                'name':_('Read book'),
                                'field':_('Tags'),
                                'pattern':'+',
-                               'prefix':'\u2713'},
+                               'prefix':'✓'},
                               {'ordinal':1,
                                'enabled':True,
                                'name':_('Wishlist item'),
                                'field':_('Tags'),
                                'pattern':'Wishlist',
-                               'prefix':'\u00d7'},],
+                               'prefix':'×'},],
                              ['table_widget','table_widget']))
 
         self.OPTION_FIELDS = option_fields
 
     def block_all_signals(self, bool):
         if self.DEBUG:
-            print("block_all_signals: %s" % bool)
+            print('block_all_signals: %s' % bool)
         self.blocking_all_signals = bool
         for opt in self.OPTION_FIELDS:
             c_name, c_def, c_type = opt
@@ -176,7 +176,7 @@ class PluginWidget(QWidget,Ui_Form):
         opts_dict[c_name[:-3]] = opt_value
 
     def exclude_genre_changed(self):
-        """ Dynamically compute excluded genres.
+        ''' Dynamically compute excluded genres.
 
         Run exclude_genre regex against selected genre_source_field to show excluded tags.
 
@@ -186,7 +186,7 @@ class PluginWidget(QWidget,Ui_Form):
 
         Output:
          self.exclude_genre_results (QLabel): updated to show tags to be excluded as genres
-        """
+        '''
         def _truncated_results(excluded_tags, limit=180):
             '''
             Limit number of genres displayed to avoid dialog explosion
@@ -203,7 +203,7 @@ class PluginWidget(QWidget,Ui_Form):
                     start.append(excluded_tags[lower])
                     break
                 start.append(excluded_tags[lower])
-                end.insert(0,excluded_tags[upper])
+                end.insert(0, excluded_tags[upper])
                 if len(', '.join(start)) + len(', '.join(end)) > limit:
                     break
                 lower += 1
@@ -211,7 +211,7 @@ class PluginWidget(QWidget,Ui_Form):
             if excluded_tags == start + end:
                 return ', '.join(excluded_tags)
             else:
-                return "{}  ...  {}".format(', '.join(start), ', '.join(end))
+                return '{}  ...  {}'.format(', '.join(start), ', '.join(end))
 
         results = _('No genres will be excluded')
 
@@ -230,7 +230,7 @@ class PluginWidget(QWidget,Ui_Form):
         try:
             pattern = re.compile(regex)
         except:
-            results = _("regex error: %s") % sys.exc_info()[1]
+            results = _('regex error: %s') % sys.exc_info()[1]
         else:
             excluded_tags = []
             for tag in all_genre_tags:
@@ -239,12 +239,12 @@ class PluginWidget(QWidget,Ui_Form):
                     excluded_tags.append(hit.string)
             if excluded_tags:
                 if set(excluded_tags) == set(all_genre_tags):
-                    results = _("All genres will be excluded")
+                    results = _('All genres will be excluded')
                 else:
                     results = _truncated_results(excluded_tags)
         finally:
             if False and self.DEBUG:
-                print("exclude_genre_changed(): %s" % results)
+                print('exclude_genre_changed(): %s' % results)
             self.exclude_genre_results.clear()
             self.exclude_genre_results.setText(results)
 
@@ -282,7 +282,7 @@ class PluginWidget(QWidget,Ui_Form):
         '''
         self.genre_source_field.setEnabled(enabled)
 
-    def genre_source_field_changed(self,new_index):
+    def genre_source_field_changed(self, new_index):
         '''
         Process changes in the genre_source_field combo box
         Update Excluded genres preview
@@ -303,7 +303,7 @@ class PluginWidget(QWidget,Ui_Form):
             current_format = parent.format.currentText().strip()
         return current_format, current_title
 
-    def header_note_source_field_changed(self,new_index):
+    def header_note_source_field_changed(self, new_index):
         '''
         Process changes in the header_note_source_field combo box
         '''
@@ -359,13 +359,13 @@ class PluginWidget(QWidget,Ui_Form):
                     if c_name == 'genre_source_field':
                         index = self.genre_source_field.findText(_('Tags'))
                 else:
-                    index = getattr(self,c_name).findText(opt_value)
+                    index = getattr(self, c_name).findText(opt_value)
                     if index == -1:
                         if c_name == 'read_source_field':
                             index = self.read_source_field.findText(_('Tags'))
                         elif c_name == 'genre_source_field':
                             index = self.genre_source_field.findText(_('Tags'))
-                getattr(self,c_name).setCurrentIndex(index)
+                getattr(self, c_name).setCurrentIndex(index)
                 if c_name != 'preset_field':
                     getattr(self, c_name).currentIndexChanged.connect(partial(self.settings_changed, c_name))
             elif c_type in ['line_edit']:
@@ -423,11 +423,11 @@ class PluginWidget(QWidget,Ui_Form):
 
         # Initialize exclusion rules
         self.exclusion_rules_table = ExclusionRules(self, self.exclusion_rules_gb,
-            "exclusion_rules_tw", exclusion_rules)
+            'exclusion_rules_tw', exclusion_rules)
 
         # Initialize prefix rules
         self.prefix_rules_table = PrefixRules(self, self.prefix_rules_gb,
-            "prefix_rules_tw", prefix_rules)
+            'prefix_rules_tw', prefix_rules)
 
         # Initialize excluded genres preview
         self.exclude_genre_changed()
@@ -439,7 +439,7 @@ class PluginWidget(QWidget,Ui_Form):
 
         self.blocking_all_signals = False
 
-    def merge_source_field_changed(self,new_index):
+    def merge_source_field_changed(self, new_index):
         '''
         Process changes in the merge_source_field combo box
         '''
@@ -481,7 +481,7 @@ class PluginWidget(QWidget,Ui_Form):
             if c_type in ['check_box', 'radio_button']:
                 opt_value = getattr(self, c_name).isChecked()
             elif c_type in ['combo_box']:
-                opt_value = str(getattr(self,c_name).currentText()).strip()
+                opt_value = str(getattr(self, c_name).currentText()).strip()
             elif c_type in ['line_edit']:
                 opt_value = str(getattr(self, c_name).text()).strip()
             elif c_type in ['spin_box']:
@@ -532,7 +532,7 @@ class PluginWidget(QWidget,Ui_Form):
             genre_source_spec = self.genre_source_fields[cs]
             self.genre_source_field_name = genre_source_spec['field']
 
-        opts_dict['merge_comments_rule'] = "%s:%s:%s" % \
+        opts_dict['merge_comments_rule'] = '%s:%s:%s' % \
             (self.merge_source_field_name, checked, include_hr)
 
         opts_dict['header_note_source_field'] = self.header_note_source_field_name
@@ -550,9 +550,9 @@ class PluginWidget(QWidget,Ui_Form):
             opts_dict['output_profile'] = ['default']
 
         if False and self.DEBUG:
-            print("opts_dict")
+            print('opts_dict')
             for opt in sorted(opts_dict.keys(), key=sort_key):
-                print(f" {opt}: {repr(opts_dict[opt])}")
+                print(f' {opt}: {opts_dict[opt]!r}')
         return opts_dict
 
     def populate_combo_boxes(self):
@@ -625,8 +625,8 @@ class PluginWidget(QWidget,Ui_Form):
         self.genre_source_field.currentIndexChanged.connect(self.genre_source_field_changed)
 
         # Populate the Presets combo box
-        self.presets = JSONConfig("catalog_presets")
-        self.preset_field.addItem("")
+        self.presets = JSONConfig('catalog_presets')
+        self.preset_field.addItem('')
         self.preset_field_values = sorted(self.presets, key=sort_key)
         self.preset_field.addItems(self.preset_field_values)
 
@@ -663,13 +663,13 @@ class PluginWidget(QWidget,Ui_Form):
                     if c_name == 'genre_source_field':
                         index = self.genre_source_field.findText(_('Tags'))
                 else:
-                    index = getattr(self,c_name).findText(opt_value)
+                    index = getattr(self, c_name).findText(opt_value)
                     if index == -1:
                         if c_name == 'read_source_field':
                             index = self.read_source_field.findText(_('Tags'))
                         elif c_name == 'genre_source_field':
                             index = self.genre_source_field.findText(_('Tags'))
-                getattr(self,c_name).setCurrentIndex(index)
+                getattr(self, c_name).setCurrentIndex(index)
             elif c_type in ['line_edit']:
                 getattr(self, c_name).setText(opt_value if opt_value else '')
             elif c_type in ['radio_button'] and opt_value is not None:
@@ -687,12 +687,12 @@ class PluginWidget(QWidget,Ui_Form):
         # Reset exclusion rules
         self.exclusion_rules_table.clearLayout()
         self.exclusion_rules_table = ExclusionRules(self, self.exclusion_rules_gb,
-            "exclusion_rules_tw", exclusion_rules)
+            'exclusion_rules_tw', exclusion_rules)
 
         # Reset prefix rules
         self.prefix_rules_table.clearLayout()
         self.prefix_rules_table = PrefixRules(self, self.prefix_rules_gb,
-            "prefix_rules_tw", prefix_rules)
+            'prefix_rules_tw', prefix_rules)
 
         # Reset excluded genres preview
         self.exclude_genre_changed()
@@ -711,9 +711,9 @@ class PluginWidget(QWidget,Ui_Form):
         if self.preset_field.currentIndex() == 0:
             return
 
-        if not question_dialog(self, _("Delete saved catalog preset"),
-                _("The selected saved catalog preset will be deleted. "
-                    "Are you sure?")):
+        if not question_dialog(self, _('Delete saved catalog preset'),
+                _('The selected saved catalog preset will be deleted. '
+                    'Are you sure?')):
             return
 
         item_id = self.preset_field.currentIndex()
@@ -725,7 +725,7 @@ class PluginWidget(QWidget,Ui_Form):
         self.preset_field.setCurrentIndex(0)
 
         if item_name in self.presets.keys():
-            del(self.presets[item_name])
+            del self.presets[item_name]
             self.presets.commit()
 
     def preset_save(self):
@@ -737,19 +737,19 @@ class PluginWidget(QWidget,Ui_Form):
             dex = 0
         name = ''
         while not name:
-            name, ok =  QInputDialog.getItem(self, _('Save catalog preset'),
+            name, ok = QInputDialog.getItem(self, _('Save catalog preset'),
                     _('Preset name:'), names, dex, True)
             if not ok:
                 return
             if not name:
-                error_dialog(self, _("Save catalog preset"),
-                        _("You must provide a name."), show=True)
+                error_dialog(self, _('Save catalog preset'),
+                        _('You must provide a name.'), show=True)
         new = True
         name = str(name)
         if name in self.presets.keys():
-            if not question_dialog(self, _("Save catalog preset"),
-                    _("That saved preset already exists and will be overwritten. "
-                        "Are you sure?")):
+            if not question_dialog(self, _('Save catalog preset'),
+                    _('That saved preset already exists and will be overwritten. '
+                        'Are you sure?')):
                 return
             new = False
 
@@ -769,7 +769,7 @@ class PluginWidget(QWidget,Ui_Form):
             elif c_type in ['combo_box']:
                 if c_name == 'preset_field':
                     continue
-                opt_value = str(getattr(self,c_name).currentText()).strip()
+                opt_value = str(getattr(self, c_name).currentText()).strip()
             elif c_type in ['line_edit']:
                 opt_value = str(getattr(self, c_name).text()).strip()
             elif c_type in ['spin_box']:
@@ -799,7 +799,7 @@ class PluginWidget(QWidget,Ui_Form):
         elif self.merge_after.isChecked():
             checked = 'after'
         include_hr = self.include_hr.isChecked()
-        preset['merge_comments_rule'] = "%s:%s:%s" % \
+        preset['merge_comments_rule'] = '%s:%s:%s' % \
             (self.merge_source_field_name, checked, include_hr)
 
         preset['header_note_source_field'] = str(self.header_note_source_field.currentText())
@@ -839,7 +839,7 @@ class PluginWidget(QWidget,Ui_Form):
         When anything changes, clear Preset combobox
         '''
         if self.DEBUG:
-            print("settings_changed: %s" % source)
+            print('settings_changed: %s' % source)
         self.preset_field.setCurrentIndex(0)
 
     def show_help(self):
@@ -850,7 +850,6 @@ class PluginWidget(QWidget,Ui_Form):
 
 
 class CheckableTableWidgetItem(QTableWidgetItem):
-
     '''
     Borrowed from kiwidude
     '''
@@ -889,7 +888,7 @@ class NoWheelComboBox(QComboBox):
 class ComboBox(NoWheelComboBox):
     # Caller is responsible for providing the list in the preferred order
 
-    def __init__(self, parent, items, selected_text,insert_blank=True):
+    def __init__(self, parent, items, selected_text, insert_blank=True):
         NoWheelComboBox.__init__(self, parent)
         self.populate_combo(items, selected_text, insert_blank)
 
@@ -905,7 +904,6 @@ class ComboBox(NoWheelComboBox):
 
 
 class GenericRulesTable(QTableWidget):
-
     '''
     Generic methods for managing rows in a QTableWidget
     '''
@@ -947,28 +945,28 @@ class GenericRulesTable(QTableWidget):
         # Add the control set
         vbl = QVBoxLayout()
         self.move_rule_up_tb = QToolButton()
-        self.move_rule_up_tb.setObjectName("move_rule_up_tb")
+        self.move_rule_up_tb.setObjectName('move_rule_up_tb')
         self.move_rule_up_tb.setToolTip('Move rule up')
         self.move_rule_up_tb.setIcon(QIcon.ic('arrow-up.png'))
         self.move_rule_up_tb.clicked.connect(self.move_row_up)
         vbl.addWidget(self.move_rule_up_tb)
 
         self.add_rule_tb = QToolButton()
-        self.add_rule_tb.setObjectName("add_rule_tb")
+        self.add_rule_tb.setObjectName('add_rule_tb')
         self.add_rule_tb.setToolTip('Add a new rule')
         self.add_rule_tb.setIcon(QIcon.ic('plus.png'))
         self.add_rule_tb.clicked.connect(self.add_row)
         vbl.addWidget(self.add_rule_tb)
 
         self.delete_rule_tb = QToolButton()
-        self.delete_rule_tb.setObjectName("delete_rule_tb")
+        self.delete_rule_tb.setObjectName('delete_rule_tb')
         self.delete_rule_tb.setToolTip('Delete selected rule')
         self.delete_rule_tb.setIcon(QIcon.ic('list_remove.png'))
         self.delete_rule_tb.clicked.connect(self.delete_row)
         vbl.addWidget(self.delete_rule_tb)
 
         self.move_rule_down_tb = QToolButton()
-        self.move_rule_down_tb.setObjectName("move_rule_down_tb")
+        self.move_rule_down_tb.setObjectName('move_rule_down_tb')
         self.move_rule_down_tb.setToolTip('Move rule down')
         self.move_rule_down_tb.setIcon(QIcon.ic('arrow-down.png'))
         self.move_rule_down_tb.clicked.connect(self.move_row_down)
@@ -980,7 +978,7 @@ class GenericRulesTable(QTableWidget):
         self.setFocus()
         row = self.last_row_selected + 1
         if self.DEBUG:
-            print("%s:add_row(): at row: %d" % (self.objectName(), row))
+            print('%s:add_row(): at row: %d' % (self.objectName(), row))
         self.insertRow(row)
         self.populate_table_row(row, self.create_blank_row_data())
         self.select_and_scroll_to_row(row)
@@ -1004,7 +1002,7 @@ class GenericRulesTable(QTableWidget):
 
     def delete_row(self):
         if self.DEBUG:
-            print("%s:delete_row()" % self.objectName())
+            print('%s:delete_row()' % self.objectName())
 
         self.setFocus()
         rows = self.last_rows_selected
@@ -1014,7 +1012,7 @@ class GenericRulesTable(QTableWidget):
         first = rows[0].row() + 1
         last = rows[-1].row() + 1
 
-        first_rule_name = str(self.cellWidget(first-1,self.COLUMNS['NAME']['ordinal']).text()).strip()
+        first_rule_name = str(self.cellWidget(first-1, self.COLUMNS['NAME']['ordinal']).text()).strip()
         message = _("Are you sure you want to delete '%s'?") % (first_rule_name)
         if len(rows) > 1:
             message = _('Are you sure you want to delete rules #%(first)d-%(last)d?') % dict(first=first, last=last)
@@ -1031,22 +1029,22 @@ class GenericRulesTable(QTableWidget):
     def enabled_state_changed(self, row, col):
         if col in [self.COLUMNS['ENABLED']['ordinal']]:
             self.select_and_scroll_to_row(row)
-            self.settings_changed("enabled_state_changed")
+            self.settings_changed('enabled_state_changed')
             if self.DEBUG:
-                print("%s:enabled_state_changed(): row %d col %d" %
+                print('%s:enabled_state_changed(): row %d col %d' %
                       (self.objectName(), row, col))
 
-    def focusInEvent(self,e):
+    def focusInEvent(self, e):
         if self.DEBUG:
-            print("%s:focusInEvent()" % self.objectName())
+            print('%s:focusInEvent()' % self.objectName())
 
-    def focusOutEvent(self,e):
+    def focusOutEvent(self, e):
         # Override of QTableWidget method - clear selection when table loses focus
         self.last_row_selected = self.currentRow()
         self.last_rows_selected = self.selectionModel().selectedRows()
         self.clearSelection()
         if self.DEBUG:
-            print("%s:focusOutEvent(): self.last_row_selected: %d" % (self.objectName(),self.last_row_selected))
+            print('%s:focusOutEvent(): self.last_row_selected: %d' % (self.objectName(),self.last_row_selected))
 
     def move_row_down(self):
         self.setFocus()
@@ -1062,7 +1060,7 @@ class GenericRulesTable(QTableWidget):
             dest_row = selrow.row() + 1
             src_row = selrow.row()
             if self.DEBUG:
-                print("%s:move_row_down() %d -> %d" % (self.objectName(),src_row, dest_row))
+                print('%s:move_row_down() %d -> %d' % (self.objectName(),src_row, dest_row))
 
             # Save the contents of the destination row
             saved_data = self.convert_row_to_data(dest_row)
@@ -1092,7 +1090,7 @@ class GenericRulesTable(QTableWidget):
 
         for selrow in rows:
             if self.DEBUG:
-                print("%s:move_row_up() %d -> %d" % (self.objectName(),selrow.row(), selrow.row()-1))
+                print('%s:move_row_up() %d -> %d' % (self.objectName(),selrow.row(), selrow.row()-1))
 
             # Save the row above
             saved_data = self.convert_row_to_data(selrow.row() - 1)
@@ -1129,12 +1127,12 @@ class GenericRulesTable(QTableWidget):
 
     def rule_name_edited(self):
         if self.DEBUG:
-            print("%s:rule_name_edited()" % self.objectName())
+            print('%s:rule_name_edited()' % self.objectName())
 
         current_row = self.currentRow()
-        self.cellWidget(current_row,1).home(False)
+        self.cellWidget(current_row, 1).home(False)
         self.select_and_scroll_to_row(current_row)
-        self.settings_changed("rule_name_edited")
+        self.settings_changed('rule_name_edited')
 
     def select_and_scroll_to_row(self, row):
         self.setFocus()
@@ -1154,7 +1152,7 @@ class GenericRulesTable(QTableWidget):
                 break
 
         if self.DEBUG:
-            print("%s:_source_index_changed(): calling source_index_changed with row: %d " %
+            print('%s:_source_index_changed(): calling source_index_changed with row: %d ' %
                   (self.objectName(), row))
 
         self.source_index_changed(combo, row)
@@ -1184,18 +1182,18 @@ class GenericRulesTable(QTableWidget):
         values_combo.currentIndexChanged.connect(partial(self.values_index_changed, values_combo))
         self.setCellWidget(row, self.COLUMNS['PATTERN']['ordinal'], values_combo)
         self.select_and_scroll_to_row(row)
-        self.settings_changed("source_index_changed")
+        self.settings_changed('source_index_changed')
 
     def values_index_changed(self, combo):
         # After edit, select row
         for row in range(self.rowCount()):
             if self.cellWidget(row, self.COLUMNS['PATTERN']['ordinal']) is combo:
                 self.select_and_scroll_to_row(row)
-                self.settings_changed("values_index_changed")
+                self.settings_changed('values_index_changed')
                 break
 
         if self.DEBUG:
-            print("%s:values_index_changed(): row %d " %
+            print('%s:values_index_changed(): row %d ' %
                   (self.objectName(), row))
 
 
@@ -1208,7 +1206,7 @@ class ExclusionRules(GenericRulesTable):
 
     def __init__(self, parent, parent_gb_hl, object_name, rules):
         super().__init__(parent, parent_gb_hl, object_name, rules)
-        self.setObjectName("exclusion_rules_table")
+        self.setObjectName('exclusion_rules_table')
         self._init_table_widget()
         self._initialize()
 
@@ -1230,10 +1228,10 @@ class ExclusionRules(GenericRulesTable):
     def convert_row_to_data(self, row):
         data = self.create_blank_row_data()
         data['ordinal'] = row
-        data['enabled'] = self.item(row,self.COLUMNS['ENABLED']['ordinal']).checkState() == Qt.CheckState.Checked
-        data['name'] = str(self.cellWidget(row,self.COLUMNS['NAME']['ordinal']).text()).strip()
-        data['field'] = str(self.cellWidget(row,self.COLUMNS['FIELD']['ordinal']).currentText()).strip()
-        data['pattern'] = str(self.cellWidget(row,self.COLUMNS['PATTERN']['ordinal']).currentText()).strip()
+        data['enabled'] = self.item(row, self.COLUMNS['ENABLED']['ordinal']).checkState() == Qt.CheckState.Checked
+        data['name'] = str(self.cellWidget(row, self.COLUMNS['NAME']['ordinal']).text()).strip()
+        data['field'] = str(self.cellWidget(row, self.COLUMNS['FIELD']['ordinal']).currentText()).strip()
+        data['pattern'] = str(self.cellWidget(row, self.COLUMNS['PATTERN']['ordinal']).currentText()).strip()
         return data
 
     def create_blank_row_data(self):
@@ -1301,7 +1299,7 @@ class PrefixRules(GenericRulesTable):
 
     def __init__(self, parent, parent_gb_hl, object_name, rules):
         super().__init__(parent, parent_gb_hl, object_name, rules)
-        self.setObjectName("prefix_rules_table")
+        self.setObjectName('prefix_rules_table')
         self._init_table_widget()
         self._initialize()
 
@@ -1324,11 +1322,11 @@ class PrefixRules(GenericRulesTable):
     def convert_row_to_data(self, row):
         data = self.create_blank_row_data()
         data['ordinal'] = row
-        data['enabled'] = self.item(row,self.COLUMNS['ENABLED']['ordinal']).checkState() == Qt.CheckState.Checked
-        data['name'] = str(self.cellWidget(row,self.COLUMNS['NAME']['ordinal']).text()).strip()
-        data['prefix'] = str(self.cellWidget(row,self.COLUMNS['PREFIX']['ordinal']).currentText()).strip()
-        data['field'] = str(self.cellWidget(row,self.COLUMNS['FIELD']['ordinal']).currentText()).strip()
-        data['pattern'] = str(self.cellWidget(row,self.COLUMNS['PATTERN']['ordinal']).currentText()).strip()
+        data['enabled'] = self.item(row, self.COLUMNS['ENABLED']['ordinal']).checkState() == Qt.CheckState.Checked
+        data['name'] = str(self.cellWidget(row, self.COLUMNS['NAME']['ordinal']).text()).strip()
+        data['prefix'] = str(self.cellWidget(row, self.COLUMNS['PREFIX']['ordinal']).currentText()).strip()
+        data['field'] = str(self.cellWidget(row, self.COLUMNS['FIELD']['ordinal']).currentText()).strip()
+        data['pattern'] = str(self.cellWidget(row, self.COLUMNS['PATTERN']['ordinal']).currentText()).strip()
         return data
 
     def create_blank_row_data(self):
@@ -1344,59 +1342,59 @@ class PrefixRules(GenericRulesTable):
     def generate_prefix_list(self):
         def prefix_sorter(item):
             key = item
-            if item[0] == "_":
+            if item[0] == '_':
                 key = 'zzz' + item
             return key
 
         # Create a list of prefixes for user selection
         raw_prefix_list = [
             ('Ampersand', '&'),
-            ('Angle left double', '\u00ab'),
-            ('Angle left', '\u2039'),
-            ('Angle right double', '\u00bb'),
-            ('Angle right', '\u203a'),
-            ('Arrow carriage return', '\u21b5'),
-            ('Arrow double', '\u2194'),
-            ('Arrow down', '\u2193'),
-            ('Arrow left', '\u2190'),
-            ('Arrow right', '\u2192'),
-            ('Arrow up', '\u2191'),
+            ('Angle left double', '«'),
+            ('Angle left', '‹'),
+            ('Angle right double', '»'),
+            ('Angle right', '›'),
+            ('Arrow carriage return', '↵'),
+            ('Arrow double', '↔'),
+            ('Arrow down', '↓'),
+            ('Arrow left', '←'),
+            ('Arrow right', '→'),
+            ('Arrow up', '↑'),
             ('Asterisk', '*'),
             ('At sign', '@'),
-            ('Bullet smallest', '\u22c5'),
-            ('Bullet small', '\u00b7'),
-            ('Bullet', '\u2022'),
-            ('Cards clubs', '\u2663'),
-            ('Cards diamonds', '\u2666'),
-            ('Cards hearts', '\u2665'),
-            ('Cards spades', '\u2660'),
+            ('Bullet smallest', '⋅'),
+            ('Bullet small', '·'),
+            ('Bullet', '•'),
+            ('Cards clubs', '♣'),
+            ('Cards diamonds', '♦'),
+            ('Cards hearts', '♥'),
+            ('Cards spades', '♠'),
             ('Caret', '^'),
-            ('Checkmark', '\u2713'),
-            ('Copyright circle c', '\u00a9'),
-            ('Copyright circle r', '\u00ae'),
-            ('Copyright trademark', '\u2122'),
-            ('Currency cent', '\u00a2'),
+            ('Checkmark', '✓'),
+            ('Copyright circle c', '©'),
+            ('Copyright circle r', '®'),
+            ('Copyright trademark', '™'),
+            ('Currency cent', '¢'),
             ('Currency dollar', '$'),
-            ('Currency euro', '\u20ac'),
-            ('Currency pound', '\u00a3'),
-            ('Currency yen', '\u00a5'),
-            ('Dagger double', '\u2021'),
-            ('Dagger', '\u2020'),
-            ('Degree', '\u00b0'),
-            ('Dots3', '\u2234'),
+            ('Currency euro', '€'),
+            ('Currency pound', '£'),
+            ('Currency yen', '¥'),
+            ('Dagger double', '‡'),
+            ('Dagger', '†'),
+            ('Degree', '°'),
+            ('Dots3', '∴'),
             ('Hash', '#'),
-            ('Infinity', '\u221e'),
-            ('Lozenge', '\u25ca'),
-            ('Math divide', '\u00f7'),
-            ('Math empty', '\u2205'),
+            ('Infinity', '∞'),
+            ('Lozenge', '◊'),
+            ('Math divide', '÷'),
+            ('Math empty', '∅'),
             ('Math equals', '='),
-            ('Math minus', '\u2212'),
-            ('Math plus circled', '\u2295'),
-            ('Math times circled', '\u2297'),
-            ('Math times', '\u00d7'),
-            ('Paragraph', '\u00b6'),
+            ('Math minus', '−'),
+            ('Math plus circled', '⊕'),
+            ('Math times circled', '⊗'),
+            ('Math times', '×'),
+            ('Paragraph', '¶'),
             ('Percent', '%'),
-            ('Plus-or-minus', '\u00b1'),
+            ('Plus-or-minus', '±'),
             ('Plus', '+'),
             ('Punctuation colon', ':'),
             ('Punctuation colon-semi', ';'),
@@ -1405,10 +1403,10 @@ class PrefixRules(GenericRulesTable):
             ('Punctuation period', '.'),
             ('Punctuation slash back', '\\'),
             ('Punctuation slash forward', '/'),
-            ('Section', '\u00a7'),
+            ('Section', '§'),
             ('Tilde', '~'),
             ('Vertical bar', '|'),
-            ('Vertical bar broken', '\u00a6'),
+            ('Vertical bar broken', '¦'),
             ('_0', '0'),
             ('_1', '1'),
             ('_2', '2'),
diff --git a/src/calibre/gui2/central.py b/src/calibre/gui2/central.py
index 5bbe0132de..54817cb14a 100644
--- a/src/calibre/gui2/central.py
+++ b/src/calibre/gui2/central.py
@@ -670,7 +670,7 @@ class CentralContainer(QWidget):
             hs = h.state
             if hs is HandleState.both_visible or hs is HandleState.only_side_visible:
                 height = normal_handle_width
-            if hs is HandleState.only_main_visible and h is self.bottom_handle or (h is self.top_handle and self.separate_cover_browser):
+            if (hs is HandleState.only_main_visible and h is self.bottom_handle) or (h is self.top_handle and self.separate_cover_browser):
                 height = 0
             h.resize(int(central_width), int(height))
             available_height -= height
diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py
index bf8413951c..93262ffc8f 100644
--- a/src/calibre/gui2/comments_editor.py
+++ b/src/calibre/gui2/comments_editor.py
@@ -327,6 +327,7 @@ def fix_html(original_html, original_txt, remove_comments=True, callback=None):
             ans = '<p>%s</p>'%ans
     return xml_replace_entities(ans)
 
+
 class EditorWidget(QTextEdit, LineEditECM):  # {{{
 
     data_changed = pyqtSignal()
@@ -1199,7 +1200,6 @@ class EditorWidget(QTextEdit, LineEditECM):  # {{{
 
 # Highlighter {{{
 
-
 State_Text = -1
 State_DocType = 0
 State_Comment = 1
@@ -1219,16 +1219,16 @@ class Highlighter(QSyntaxHighlighter):
         self.colors = {}
         self.colors['doctype']        = QColor(192, 192, 192)
         self.colors['entity']         = QColor(128, 128, 128)
-        self.colors['comment']        = QColor(35, 110,  37)
+        self.colors['comment']        = QColor(35,  110,  37)
         if is_dark_theme():
             from calibre.gui2.palette import dark_link_color
             self.colors['tag']            = QColor(186,  78, 188)
-            self.colors['attrname']       = QColor(193,  119, 60)
+            self.colors['attrname']       = QColor(193, 119,  60)
             self.colors['attrval']        = dark_link_color
         else:
             self.colors['tag']            = QColor(136,  18, 128)
             self.colors['attrname']       = QColor(153,  69,   0)
-            self.colors['attrval']        = QColor(36,  36, 170)
+            self.colors['attrval']        = QColor(36,   36, 170)
 
     def highlightBlock(self, text):
         state = self.previousBlockState()
@@ -1241,7 +1241,7 @@ class Highlighter(QSyntaxHighlighter):
             if state == State_Comment:
                 start = pos
                 while pos < len_:
-                    if text[pos:pos+3] == "-->":
+                    if text[pos:pos+3] == '-->':
                         pos += 3
                         state = State_Text
                         break
@@ -1398,10 +1398,10 @@ class Highlighter(QSyntaxHighlighter):
                 while pos < len_:
                     ch = text[pos]
                     if ch == '<':
-                        if text[pos:pos+4] == "<!--":
+                        if text[pos:pos+4] == '<!--':
                             state = State_Comment
                         else:
-                            if text[pos:pos+9].upper() == "<!DOCTYPE":
+                            if text[pos:pos+9].upper() == '<!DOCTYPE':
                                 state = State_DocType
                             else:
                                 state = State_TagStart
@@ -1521,8 +1521,7 @@ class Editor(QWidget):  # {{{
         self.editor.html = v
 
     def change_tab(self, index):
-        # print 'reloading:', (index and self.wyswyg_dirty) or (not index and
-        #        self.source_dirty)
+        # print('reloading:', (index and self.wyswyg_dirty) or (not index and self.source_dirty))
         if index == 1:  # changing to code view
             if self.wyswyg_dirty:
                 self.code_edit.setPlainText(self.editor.html)
@@ -1598,4 +1597,4 @@ if __name__ == '__main__':
     i = 'file:///home/kovid/work/calibre/resources/images/'
     w.html = f'<p>Testing <img src="{i}/donate.png"> img and another <img src="{i}/lt.png">file</p>'
     app.exec()
-    # print w.html
+    # print(w.html)
diff --git a/src/calibre/gui2/convert/__init__.py b/src/calibre/gui2/convert/__init__.py
index 1194417ae2..9b5e2836f2 100644
--- a/src/calibre/gui2/convert/__init__.py
+++ b/src/calibre/gui2/convert/__init__.py
@@ -194,7 +194,7 @@ class Widget(QWidget):
         elif isinstance(g, RegexEdit):
             return g.regex if g.regex else None
         else:
-            raise Exception('Can\'t get value from %s'%type(g))
+            raise Exception("Can't get value from %s"%type(g))
 
     def gui_obj_changed(self, gui_obj, *args):
         self.changed_signal.emit()
@@ -223,7 +223,7 @@ class Widget(QWidget):
         elif isinstance(g, FontFamilyChooser):
             g.family_changed.connect(f)
         else:
-            raise Exception('Can\'t connect %s'%type(g))
+            raise Exception("Can't connect %s"%type(g))
 
     def connect_gui_obj_handler(self, gui_obj, slot):
         raise NotImplementedError()
@@ -264,7 +264,7 @@ class Widget(QWidget):
         elif isinstance(g, (XPathEdit, RegexEdit)):
             g.edit.setText(val if val else '')
         else:
-            raise Exception('Can\'t set value %s in %s'%(repr(val),
+            raise Exception("Can't set value %s in %s"%(repr(val),
                 str(g.objectName())))
         self.post_set_value(g, val)
 
diff --git a/src/calibre/gui2/convert/gui_conversion.py b/src/calibre/gui2/convert/gui_conversion.py
index 641af19e33..ee491dc461 100644
--- a/src/calibre/gui2/convert/gui_conversion.py
+++ b/src/calibre/gui2/convert/gui_conversion.py
@@ -53,7 +53,7 @@ def gui_catalog(fmt, title, dbspec, ids, out_file_name, sync, fmt_options, conne
     # Create a minimal OptionParser that we can append to
     parser = OptionParser()
     args = []
-    parser.add_option("--verbose", action="store_true", dest="verbose", default=True)
+    parser.add_option('--verbose', action='store_true', dest='verbose', default=True)
     opts, args = parser.parse_args()
 
     # Populate opts
@@ -68,9 +68,9 @@ def gui_catalog(fmt, title, dbspec, ids, out_file_name, sync, fmt_options, conne
     # Extract the option dictionary to comma-separated lists
     for option in fmt_options:
         if isinstance(fmt_options[option],list):
-            setattr(opts,option, ','.join(fmt_options[option]))
+            setattr(opts, option, ','.join(fmt_options[option]))
         else:
-            setattr(opts,option, fmt_options[option])
+            setattr(opts, option, fmt_options[option])
 
     # Fetch and run the plugin for fmt
     # Returns 0 if successful, 1 if no catalog built
diff --git a/src/calibre/gui2/convert/metadata.py b/src/calibre/gui2/convert/metadata.py
index a6f587f255..d015b32283 100644
--- a/src/calibre/gui2/convert/metadata.py
+++ b/src/calibre/gui2/convert/metadata.py
@@ -134,7 +134,7 @@ class MetadataWidget(Widget, Ui_Form):
 
     def initalize_authors(self):
         all_authors = self.db.all_authors()
-        all_authors.sort(key=lambda x : sort_key(x[1]))
+        all_authors.sort(key=lambda x: sort_key(x[1]))
         self.author.set_separator('&')
         self.author.set_space_before_sep(True)
         self.author.set_add_separator(tweaks['authors_completer_append_separator'])
@@ -200,11 +200,11 @@ class MetadataWidget(Widget, Ui_Form):
                 return
             cover = None
             try:
-                with open(_file, "rb") as f:
+                with open(_file, 'rb') as f:
                     cover = f.read()
             except OSError as e:
                 d = error_dialog(self.parent(), _('Error reading file'),
-                        _("<p>There was an error reading from file: <br /><b>") + _file + "</b></p><br />"+str(e))
+                        _('<p>There was an error reading from file: <br /><b>') + _file + '</b></p><br />'+str(e))
                 d.exec()
             if cover:
                 pix = QPixmap()
@@ -212,7 +212,7 @@ class MetadataWidget(Widget, Ui_Form):
                 pix.setDevicePixelRatio(getattr(self, 'devicePixelRatioF', self.devicePixelRatio)())
                 if pix.isNull():
                     d = error_dialog(self.parent(), _('Error reading file'),
-                                      _file + _(" is not a valid picture"))
+                                      _file + _(' is not a valid picture'))
                     d.exec()
                 else:
                     self.cover_path.setText(_file)
@@ -243,7 +243,7 @@ class MetadataWidget(Widget, Ui_Form):
             if self.cover_changed and self.cover_data is not None:
                 self.db.set_cover(self.book_id, self.cover_data)
         except OSError as err:
-            err.locking_violation_msg = _('Failed to change on disk location of this book\'s files.')
+            err.locking_violation_msg = _("Failed to change on disk location of this book's files.")
             raise
         publisher = self.publisher.text().strip()
         if publisher != db.field_for('publisher', self.book_id):
diff --git a/src/calibre/gui2/convert/search_and_replace.py b/src/calibre/gui2/convert/search_and_replace.py
index 1eabfc756b..df328723db 100644
--- a/src/calibre/gui2/convert/search_and_replace.py
+++ b/src/calibre/gui2/convert/search_and_replace.py
@@ -79,10 +79,10 @@ class SearchAndReplaceWidget(Widget, Ui_Form):
         self.search_replace.setRowCount(row + 1)
         newItem = self.search_replace.itemPrototype().clone()
         newItem.setText(search)
-        self.search_replace.setItem(row,0, newItem)
+        self.search_replace.setItem(row, 0, newItem)
         newItem = self.search_replace.itemPrototype().clone()
         newItem.setText(replace)
-        self.search_replace.setItem(row,1, newItem)
+        self.search_replace.setItem(row, 1, newItem)
         return row
 
     def sr_change_clicked(self):
@@ -139,7 +139,7 @@ class SearchAndReplaceWidget(Widget, Ui_Form):
 
     def cell_rearrange(self, i):
         row = self.search_replace.currentRow()
-        for col in range(0, self.search_replace.columnCount()):
+        for col in range(self.search_replace.columnCount()):
             item1 = self.search_replace.item(row, col)
             item2 = self.search_replace.item(row+i, col)
             value = item1.text()
@@ -147,7 +147,7 @@ class SearchAndReplaceWidget(Widget, Ui_Form):
             item2.setText(value)
         self.search_replace.setCurrentCell(row+i, 0)
 
-    def sr_currentCellChanged(self, row, column, previousRow, previousColumn) :
+    def sr_currentCellChanged(self, row, column, previousRow, previousColumn):
         if row >= 0:
             self.sr_change.setEnabled(True)
             self.sr_remove.setEnabled(True)
@@ -227,9 +227,9 @@ class SearchAndReplaceWidget(Widget, Ui_Form):
 
     def get_definitions(self):
         ans = []
-        for row in range(0, self.search_replace.rowCount()):
+        for row in range(self.search_replace.rowCount()):
             colItems = []
-            for col in range(0, self.search_replace.columnCount()):
+            for col in range(self.search_replace.columnCount()):
                 colItems.append(str(self.search_replace.item(row, col).text()))
             ans.append(colItems)
         return ans
@@ -254,7 +254,7 @@ class SearchAndReplaceWidget(Widget, Ui_Form):
             for col, cellValue in enumerate(colItems):
                 newItem = self.search_replace.itemPrototype().clone()
                 newItem.setText(cellValue)
-                self.search_replace.setItem(row,col, newItem)
+                self.search_replace.setItem(row, col, newItem)
         return True
 
     def apply_recommendations(self, recs):
diff --git a/src/calibre/gui2/convert/single.py b/src/calibre/gui2/convert/single.py
index 8587ba95bd..4947fea16f 100644
--- a/src/calibre/gui2/convert/single.py
+++ b/src/calibre/gui2/convert/single.py
@@ -114,33 +114,33 @@ class Config(QDialog):
         self.show_pane(cur)
 
     def setupUi(self):
-        self.setObjectName("Dialog")
+        self.setObjectName('Dialog')
         self.resize(1024, 700)
         self.setWindowIcon(QIcon.ic('convert.png'))
         self.gridLayout = QGridLayout(self)
-        self.gridLayout.setObjectName("gridLayout")
+        self.gridLayout.setObjectName('gridLayout')
         self.horizontalLayout = QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.horizontalLayout.setObjectName('horizontalLayout')
         self.input_label = QLabel(self)
-        self.input_label.setObjectName("input_label")
+        self.input_label.setObjectName('input_label')
         self.horizontalLayout.addWidget(self.input_label)
         self.input_formats = QComboBox(self)
         self.input_formats.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon)
         self.input_formats.setMinimumContentsLength(5)
-        self.input_formats.setObjectName("input_formats")
+        self.input_formats.setObjectName('input_formats')
         self.horizontalLayout.addWidget(self.input_formats)
         self.opt_individual_saved_settings = QCheckBox(self)
-        self.opt_individual_saved_settings.setObjectName("opt_individual_saved_settings")
+        self.opt_individual_saved_settings.setObjectName('opt_individual_saved_settings')
         self.horizontalLayout.addWidget(self.opt_individual_saved_settings)
         spacerItem = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         self.horizontalLayout.addItem(spacerItem)
         self.label_2 = QLabel(self)
-        self.label_2.setObjectName("label_2")
+        self.label_2.setObjectName('label_2')
         self.horizontalLayout.addWidget(self.label_2)
         self.output_formats = QComboBox(self)
         self.output_formats.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon)
         self.output_formats.setMinimumContentsLength(5)
-        self.output_formats.setObjectName("output_formats")
+        self.output_formats.setObjectName('output_formats')
         self.horizontalLayout.addWidget(self.output_formats)
         self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 2)
         self.groups = QListView(self)
@@ -152,7 +152,7 @@ class Config(QDialog):
         self.groups.setTabKeyNavigation(True)
         self.groups.setIconSize(QSize(48, 48))
         self.groups.setWordWrap(True)
-        self.groups.setObjectName("groups")
+        self.groups.setObjectName('groups')
         self.gridLayout.addWidget(self.groups, 1, 0, 3, 1)
         self.scrollArea = QScrollArea(self)
         sizePolicy = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
@@ -163,16 +163,16 @@ class Config(QDialog):
         self.scrollArea.setFrameShape(QFrame.Shape.NoFrame)
         self.scrollArea.setLineWidth(0)
         self.scrollArea.setWidgetResizable(True)
-        self.scrollArea.setObjectName("scrollArea")
+        self.scrollArea.setObjectName('scrollArea')
         self.page = QWidget()
-        self.page.setObjectName("page")
+        self.page.setObjectName('page')
         self.gridLayout.addWidget(self.scrollArea, 1, 1, 1, 1)
         self.buttonBox = QDialogButtonBox(self)
         self.buttonBox.setOrientation(Qt.Orientation.Horizontal)
         self.buttonBox.setStandardButtons(
             QDialogButtonBox.StandardButton.Cancel|QDialogButtonBox.StandardButton.Ok|
             QDialogButtonBox.StandardButton.RestoreDefaults)
-        self.buttonBox.setObjectName("buttonBox")
+        self.buttonBox.setObjectName('buttonBox')
         self.gridLayout.addWidget(self.buttonBox, 3, 1, 1, 1)
         self.help = QTextEdit(self)
         self.help.setReadOnly(True)
@@ -182,13 +182,13 @@ class Config(QDialog):
         sizePolicy.setHeightForWidth(self.help.sizePolicy().hasHeightForWidth())
         self.help.setSizePolicy(sizePolicy)
         self.help.setMaximumHeight(80)
-        self.help.setObjectName("help")
+        self.help.setObjectName('help')
         self.gridLayout.addWidget(self.help, 2, 1, 1, 1)
         self.input_label.setBuddy(self.input_formats)
         self.label_2.setBuddy(self.output_formats)
-        self.input_label.setText(_("&Input format:"))
-        self.opt_individual_saved_settings.setText(_("Use &saved conversion settings for individual books"))
-        self.label_2.setText(_("&Output format:"))
+        self.input_label.setText(_('&Input format:'))
+        self.opt_individual_saved_settings.setText(_('Use &saved conversion settings for individual books'))
+        self.label_2.setText(_('&Output format:'))
 
         self.buttonBox.accepted.connect(self.accept)
         self.buttonBox.rejected.connect(self.reject)
diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py
index b61e3c24ca..150e07c885 100644
--- a/src/calibre/gui2/custom_column_widgets.py
+++ b/src/calibre/gui2/custom_column_widgets.py
@@ -847,12 +847,12 @@ def comments_factory(db, key, parent):
 
 
 widgets = {
-        'bool' : Bool,
-        'rating' : Rating,
+        'bool': Bool,
+        'rating': Rating,
         'int': Int,
         'float': Float,
         'datetime': DateTime,
-        'text' : Text,
+        'text': Text,
         'comments': comments_factory,
         'series': Series,
         'enumeration': Enumeration
@@ -887,12 +887,12 @@ def get_field_list(db, use_defaults=False, pref_data_override=None):
         for k in fields:
             if k not in result:
                 result[k] = True
-        return [(k,v) for k,v in result.items()]
+        return list(result.items())
 
 
 def get_custom_columns_to_display_in_editor(db):
-    return list([k[0] for k in
-        get_field_list(db, use_defaults=db.prefs['edit_metadata_ignore_display_order']) if k[1]])
+    return [k[0] for k in
+        get_field_list(db, use_defaults=db.prefs['edit_metadata_ignore_display_order']) if k[1]]
 
 
 def populate_metadata_page(layout, db, book_id, bulk=False, two_column=False, parent=None):
@@ -1050,12 +1050,12 @@ class BulkBase(Base):
         if is_bool:
             self.set_no_button = QToolButton(parent)
             self.set_no_button.setIcon(QIcon.ic('list_remove.png'))
-            self.set_no_button.clicked.connect(lambda:self.main_widget.setCurrentIndex(1))
+            self.set_no_button.clicked.connect(lambda: self.main_widget.setCurrentIndex(1))
             self.set_no_button.setToolTip(_('Set {0} to No').format(self.col_metadata['name']))
             l.insertWidget(1, self.set_no_button)
             self.set_yes_button = QToolButton(parent)
             self.set_yes_button.setIcon(QIcon.ic('ok.png'))
-            self.set_yes_button.clicked.connect(lambda:self.main_widget.setCurrentIndex(0))
+            self.set_yes_button.clicked.connect(lambda: self.main_widget.setCurrentIndex(0))
             self.set_yes_button.setToolTip(_('Set {0} to Yes').format(self.col_metadata['name']))
             l.insertWidget(1, self.set_yes_button)
         if add_edit_tags_button[0]:
@@ -1327,12 +1327,12 @@ class BulkSeries(BulkBase):
         self.series_start_number = QDoubleSpinBox(parent)
         self.series_start_number.setMinimum(0.0)
         self.series_start_number.setMaximum(9999999.0)
-        self.series_start_number.setProperty("value", 1.0)
+        self.series_start_number.setProperty('value', 1.0)
         layout.addWidget(self.series_start_number)
         self.series_increment = QDoubleSpinBox(parent)
         self.series_increment.setMinimum(0.00)
         self.series_increment.setMaximum(99999.0)
-        self.series_increment.setProperty("value", 1.0)
+        self.series_increment.setProperty('value', 1.0)
         self.series_increment.setToolTip('<p>' + _(
             'The amount by which to increment the series number '
             'for successive books. Only applicable when using '
@@ -1547,7 +1547,7 @@ class BulkText(BulkBase):
             self.main_widget.setMinimumContentsLength(25)
         self.ignore_change_signals = False
         self.parent = parent
-        self.finish_ui_setup(parent, add_edit_tags_button=(is_tags,self.edit_add))
+        self.finish_ui_setup(parent, add_edit_tags_button=(is_tags, self.edit_add))
 
     def set_to_undefined(self):
         self.main_widget.clearEditText()
@@ -1629,12 +1629,12 @@ class BulkText(BulkBase):
 
 
 bulk_widgets = {
-        'bool' : BulkBool,
-        'rating' : BulkRating,
+        'bool': BulkBool,
+        'rating': BulkRating,
         'int': BulkInt,
         'float': BulkFloat,
         'datetime': BulkDateTime,
-        'text' : BulkText,
+        'text': BulkText,
         'series': BulkSeries,
         'enumeration': BulkEnumeration,
 }
diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index d8777e430a..ffbd616ee3 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -444,8 +444,7 @@ class DeviceManager(Thread):  # {{{
             kls = None
             while True:
                 try:
-                    (kls,device_kind, folder_path) = \
-                                self.mount_connection_requests.get_nowait()
+                    kls, device_kind, folder_path = self.mount_connection_requests.get_nowait()
                 except queue.Empty:
                     break
             if kls is not None:
@@ -566,7 +565,7 @@ class DeviceManager(Thread):  # {{{
         mainlist = self.device.books(oncard=None, end_session=False)
         cardalist = self.device.books(oncard='carda')
         cardblist = self.device.books(oncard='cardb')
-        return (mainlist, cardalist, cardblist)
+        return mainlist, cardalist, cardblist
 
     def books(self, done, add_as_step_to_job=None):
         '''Return callable that returns the list of books on device as two booklists'''
@@ -785,7 +784,7 @@ class DeviceMenu(QMenu):  # {{{
         self.set_default_menu.setIcon(QIcon.ic('config.png'))
 
         basic_actions = [
-                ('main:', False, False,  'reader.png',
+                ('main:', False, False, 'reader.png',
                     _('Send to main memory')),
                 ('carda:0', False, False, 'sd.png',
                     _('Send to storage card A')),
@@ -794,16 +793,16 @@ class DeviceMenu(QMenu):  # {{{
         ]
 
         delete_actions = [
-                ('main:', True, False,   'reader.png',
+                ('main:', True, False, 'reader.png',
                     _('Main memory')),
-                ('carda:0', True, False,  'sd.png',
+                ('carda:0', True, False, 'sd.png',
                     _('Storage card A')),
-                ('cardb:0', True, False,  'sd.png',
+                ('cardb:0', True, False, 'sd.png',
                     _('Storage card B')),
         ]
 
         specific_actions = [
-                ('main:', False, True,  'reader.png',
+                ('main:', False, True, 'reader.png',
                     _('Main memory')),
                 ('carda:0', False, True, 'sd.png',
                     _('Storage card A')),
@@ -1438,9 +1437,9 @@ class DeviceMixin:  # {{{
             dynamic.set('catalogs_to_be_synced', set())
             if files:
                 remove = []
-                space = {self.location_manager.free[0] : None,
-                    self.location_manager.free[1] : 'carda',
-                    self.location_manager.free[2] : 'cardb'}
+                space = {self.location_manager.free[0]: None,
+                    self.location_manager.free[1]: 'carda',
+                    self.location_manager.free[2]: 'cardb'}
                 on_card = space.get(sorted(space.keys(), reverse=True)[0], None)
                 self.upload_books(files, names, metadata,
                         on_card=on_card,
@@ -1516,9 +1515,9 @@ class DeviceMixin:  # {{{
             self.news_to_be_synced = set()
             if config['upload_news_to_device'] and files:
                 remove = ids if del_on_upload else []
-                space = {self.location_manager.free[0] : None,
-                    self.location_manager.free[1] : 'carda',
-                    self.location_manager.free[2] : 'cardb'}
+                space = {self.location_manager.free[0]: None,
+                    self.location_manager.free[1]: 'carda',
+                    self.location_manager.free[2]: 'cardb'}
                 on_card = space.get(sorted(space.keys(), reverse=True)[0], None)
                 try:
                     total_size = sum(os.stat(f).st_size for f in files)
@@ -1530,7 +1529,7 @@ class DeviceMixin:  # {{{
                         pass
                     total_size = self.location_manager.free[0]
                 loc = tweaks['send_news_to_device_location']
-                loc_index = {"carda": 1, "cardb": 2}.get(loc, 0)
+                loc_index = {'carda': 1, 'cardb': 2}.get(loc, 0)
                 if self.location_manager.free[loc_index] > total_size + (1024**2):
                     # Send news to main memory if enough space available
                     # as some devices like the Nook Color cannot handle
@@ -1900,7 +1899,7 @@ class DeviceMixin:  # {{{
         books_with_future_dates = []
         first_call_to_synchronize_with_db = [True]
 
-        def update_book(id_, book) :
+        def update_book(id_, book):
             if not update_metadata:
                 return
             mi = db.get_metadata(id_, index_is_id=True, get_cover=get_covers)
diff --git a/src/calibre/gui2/device_drivers/mtp_config.py b/src/calibre/gui2/device_drivers/mtp_config.py
index 4c45121e37..482e2023b7 100644
--- a/src/calibre/gui2/device_drivers/mtp_config.py
+++ b/src/calibre/gui2/device_drivers/mtp_config.py
@@ -219,8 +219,8 @@ class IgnoredDevices(QWidget):  # {{{
 
 # }}}
 
-# Rules {{{
 
+# Rules {{{
 
 class Rule(QWidget):
 
@@ -445,7 +445,7 @@ class MTPConfig(QTabWidget):
         bb.rejected.connect(d.reject)
         l.addWidget(bb)
         bb.addButton(_('Copy to clipboard'), QDialogButtonBox.ButtonRole.ActionRole)
-        bb.clicked.connect(lambda :
+        bb.clicked.connect(lambda:
                 QApplication.clipboard().setText(v.toPlainText()))
         d.exec()
 
diff --git a/src/calibre/gui2/device_drivers/mtp_folder_browser.py b/src/calibre/gui2/device_drivers/mtp_folder_browser.py
index d283587bf9..18054dfd04 100644
--- a/src/calibre/gui2/device_drivers/mtp_folder_browser.py
+++ b/src/calibre/gui2/device_drivers/mtp_folder_browser.py
@@ -243,4 +243,4 @@ def ignored_folders():
 
 if __name__ == '__main__':
     print(browse())
-    # print ('Ignored:', ignored_folders())
+    # print('Ignored:', ignored_folders())
diff --git a/src/calibre/gui2/device_drivers/tabbed_device_config.py b/src/calibre/gui2/device_drivers/tabbed_device_config.py
index 8df831ccb6..d8bae0d0ee 100644
--- a/src/calibre/gui2/device_drivers/tabbed_device_config.py
+++ b/src/calibre/gui2/device_drivers/tabbed_device_config.py
@@ -44,7 +44,7 @@ def create_checkbox(title, tt, state):
 
 
 class TabbedDeviceConfig(QTabWidget):
-    """
+    '''
     This is a generic Tabbed Device config widget. It designed for devices with more
     complex configuration. But, it is backwards compatible to the standard device
     configuration widget.
@@ -63,7 +63,7 @@ class TabbedDeviceConfig(QTabWidget):
     DeviceConfigTab, for each set of options. Within the tabs, group boxes, subclassed
     from DeviceOptionsGroupBox, are created to further group the options. The group
     boxes can be coded to support any control type and dependencies between them.
-    """
+    '''
 
     def __init__(self, device_settings, all_formats, supports_subdirs,
                     must_read_metadata, supports_use_author_sort,
@@ -89,8 +89,8 @@ class TabbedDeviceConfig(QTabWidget):
             self.all_formats = set(self.all_formats) | set(BOOK_EXTENSIONS)
 
         self.base = QWidget(self)
-#         self.insertTab(0, self.base, _('Configure %s') % self.device.current_friendly_name)
-        self.insertTab(0, self.base, _("File formats"))
+        # self.insertTab(0, self.base, _('Configure %s') % self.device.current_friendly_name)
+        self.insertTab(0, self.base, _('File formats'))
         l = self.base.l = QGridLayout(self.base)
         self.base.setLayout(l)
 
@@ -99,23 +99,23 @@ class TabbedDeviceConfig(QTabWidget):
             self.formats.hide()
 
         self.opt_use_subdirs = create_checkbox(
-                                           _("Use sub-folders"),
+                                           _('Use sub-folders'),
                                            _('Place files in sub-folders if the device supports them'),
                                            device_settings.use_subdirs
                                            )
         self.opt_read_metadata = create_checkbox(
-                                             _("Read metadata from files on device"),
+                                             _('Read metadata from files on device'),
                                              _('Read metadata from files on device'),
                                              device_settings.read_metadata
                                              )
 
         self.template = TemplateConfig(device_settings.save_template)
         self.opt_use_author_sort = create_checkbox(
-                                             _("Use author sort for author"),
-                                             _("Use author sort for author"),
+                                             _('Use author sort for author'),
+                                             _('Use author sort for author'),
                                              device_settings.read_metadata
                                              )
-        self.opt_use_author_sort.setObjectName("opt_use_author_sort")
+        self.opt_use_author_sort.setObjectName('opt_use_author_sort')
         self.base.la = la = QLabel(_(
             'Choose the formats to send to the %s')%self.device_name)
         la.setWordWrap(True)
@@ -166,7 +166,7 @@ class TabbedDeviceConfig(QTabWidget):
         try:
             return super().__getattr__(attr_name)
         except AttributeError as ae:
-            for i in range(0, self.count()):
+            for i in range(self.count()):
                 atab = self.widget(i)
                 try:
                     return getattr(atab, attr_name)
@@ -216,7 +216,7 @@ class TabbedDeviceConfig(QTabWidget):
         return True
 
     def commit(self):
-        debug_print("TabbedDeviceConfig::commit: start")
+        debug_print('TabbedDeviceConfig::commit: start')
         p = self.device._configProxy()
 
         p['format_map'] = self.formats.format_map
@@ -261,19 +261,19 @@ class ExtraCustomization(DeviceConfigTab):  # {{{
     def __init__(self, extra_customization_message, extra_customization_choices, device_settings):
         super().__init__()
 
-        debug_print("ExtraCustomization.__init__ - extra_customization_message=", extra_customization_message)
-        debug_print("ExtraCustomization.__init__ - extra_customization_choices=", extra_customization_choices)
-        debug_print("ExtraCustomization.__init__ - device_settings.extra_customization=", device_settings.extra_customization)
-        debug_print("ExtraCustomization.__init__ - device_settings=", device_settings)
+        debug_print('ExtraCustomization.__init__ - extra_customization_message=', extra_customization_message)
+        debug_print('ExtraCustomization.__init__ - extra_customization_choices=', extra_customization_choices)
+        debug_print('ExtraCustomization.__init__ - device_settings.extra_customization=', device_settings.extra_customization)
+        debug_print('ExtraCustomization.__init__ - device_settings=', device_settings)
         self.extra_customization_message = extra_customization_message
 
         self.l = QVBoxLayout(self)
         self.setLayout(self.l)
 
-        options_group = QGroupBox(_("Extra driver customization options"), self)
+        options_group = QGroupBox(_('Extra driver customization options'), self)
         self.l.addWidget(options_group)
         self.extra_layout = QGridLayout()
-        self.extra_layout.setObjectName("extra_layout")
+        self.extra_layout.setObjectName('extra_layout')
         options_group.setLayout(self.extra_layout)
 
         if extra_customization_message:
@@ -346,7 +346,7 @@ class ExtraCustomization(DeviceConfigTab):  # {{{
         ec = []
         if self.extra_customization_message:
             if isinstance(self.extra_customization_message, list):
-                for i in range(0, len(self.extra_customization_message)):
+                for i in range(len(self.extra_customization_message)):
                     if self.opt_extra_customization[i] is None:
                         ec.append(None)
                         continue
@@ -365,18 +365,18 @@ class ExtraCustomization(DeviceConfigTab):  # {{{
 
     @property
     def has_extra_customizations(self):
-        debug_print("ExtraCustomization::has_extra_customizations - self.extra_customization_message", self.extra_customization_message)
+        debug_print('ExtraCustomization::has_extra_customizations - self.extra_customization_message', self.extra_customization_message)
         return self.extra_customization_message and len(self.extra_customization_message) > 0
 
 # }}}
 
 
 class DeviceOptionsGroupBox(QGroupBox):
-    """
+    '''
     This is a container for the individual options for a device driver.
-    """
+    '''
 
-    def __init__(self, parent, device=None, title=_("Unknown")):
+    def __init__(self, parent, device=None, title=_('Unknown')):
         QGroupBox.__init__(self, parent)
 
         self.device = device
@@ -391,10 +391,10 @@ if __name__ == '__main__':
     s.scan()
     app = Application([])
     dev = KOBO(None)
-    debug_print("KOBO:", KOBO)
-#     dev.startup()
-#     cd = dev.detect_managed_devices(s.devices)
-#     dev.open(cd, 'test')
+    debug_print('KOBO:', KOBO)
+    # dev.startup()
+    # cd = dev.detect_managed_devices(s.devices)
+    # dev.open(cd, 'test')
     cw = dev.config_widget()
     d = QDialog()
     d.l = QVBoxLayout()
diff --git a/src/calibre/gui2/dialogs/add_from_isbn.py b/src/calibre/gui2/dialogs/add_from_isbn.py
index 7bc1b99921..17c48e53c4 100644
--- a/src/calibre/gui2/dialogs/add_from_isbn.py
+++ b/src/calibre/gui2/dialogs/add_from_isbn.py
@@ -30,7 +30,7 @@ class AddFromISBN(QDialog):
 
     def setup_ui(self):
         self.resize(678, 430)
-        self.setWindowTitle(_("Add books by ISBN"))
+        self.setWindowTitle(_('Add books by ISBN'))
         self.setWindowIcon(QIcon.ic('add_book.png'))
         self.l = l = QVBoxLayout(self)
         self.h = h = QHBoxLayout()
@@ -43,24 +43,24 @@ class AddFromISBN(QDialog):
         self.isbn_box = i = QPlainTextEdit(self)
         i.setFocus(Qt.FocusReason.OtherFocusReason)
         l.addWidget(i)
-        self.paste_button = b = QPushButton(_("&Paste from clipboard"), self)
+        self.paste_button = b = QPushButton(_('&Paste from clipboard'), self)
         l.addWidget(b), b.clicked.connect(self.paste)
         self.lll = l  = QVBoxLayout()
         h.addLayout(l)
         self.label = la = QLabel(_(
-            "<p>Enter a list of ISBNs in the box to the left, one per line. calibre will automatically"
-            " create entries for books based on the ISBN and download metadata and covers for them.</p>\n"
-            "<p>Any invalid ISBNs in the list will be ignored.</p>\n"
-            "<p>You can also specify a file that will be added with each ISBN. To do this enter the full"
-            " path to the file after a <code>&gt;&gt;</code>. For example:</p>\n"
-            "<p><code>9788842915232 &gt;&gt; %s</code></p>"
-            "<p>To use identifiers other than ISBN use key:value syntax, For example:</p>\n"
-            "<p><code>amazon:B001JK9C72</code></p>"
+            '<p>Enter a list of ISBNs in the box to the left, one per line. calibre will automatically'
+            ' create entries for books based on the ISBN and download metadata and covers for them.</p>\n'
+            '<p>Any invalid ISBNs in the list will be ignored.</p>\n'
+            '<p>You can also specify a file that will be added with each ISBN. To do this enter the full'
+            ' path to the file after a <code>&gt;&gt;</code>. For example:</p>\n'
+            '<p><code>9788842915232 &gt;&gt; %s</code></p>'
+            '<p>To use identifiers other than ISBN use key:value syntax, For example:</p>\n'
+            '<p><code>amazon:B001JK9C72</code></p>'
         ), self)
 
         l.addWidget(la), la.setWordWrap(True)
         l.addSpacing(20)
-        self.la2 = la = QLabel(_("&Tags to set on created book entries:"), self)
+        self.la2 = la = QLabel(_('&Tags to set on created book entries:'), self)
         l.addWidget(la)
         self.add_tags = le = QLineEdit(self)
         le.setText(', '.join(gprefs.get('add from ISBN tags', [])))
diff --git a/src/calibre/gui2/dialogs/book_info.py b/src/calibre/gui2/dialogs/book_info.py
index f2cee736b3..7a00837bd9 100644
--- a/src/calibre/gui2/dialogs/book_info.py
+++ b/src/calibre/gui2/dialogs/book_info.py
@@ -206,7 +206,7 @@ class BookInfo(QDialog, DropMixin):
 
         self.details = Details(parent.book_details.book_info, self,
                                allow_context_menu=library_path is None,
-                               is_locked = dialog_number == DialogNumbers.Locked)
+                               is_locked=dialog_number == DialogNumbers.Locked)
         self.details.anchor_clicked.connect(self.on_link_clicked)
         self.link_delegate = link_delegate
         self.details.setAttribute(Qt.WidgetAttribute.WA_OpaquePaintEvent, False)
@@ -260,8 +260,8 @@ class BookInfo(QDialog, DropMixin):
             mi = dbn.get_metadata(book_id, get_cover=False)
             mi.cover_data = [None, dbn.cover(book_id, as_image=True)]
             mi.path = None
-            mi.format_files = dict()
-            mi.formats = list()
+            mi.format_files = {}
+            mi.formats = []
             mi.marked = ''
             mi.field_metadata = db.field_metadata
             mi.external_library_path = library_path
@@ -357,7 +357,7 @@ class BookInfo(QDialog, DropMixin):
         ret = QDialog.done(self, r)
         if self.slave_connected:
             self.view.model().new_bookdisplay_data.disconnect(self.slave)
-        self.slave_debounce_timer.stop() # OK if it isn't running
+        self.slave_debounce_timer.stop()  # OK if it isn't running
         self.view = self.link_delegate = self.gui = None
         self.closed.emit(self)
         return ret
@@ -383,7 +383,7 @@ class BookInfo(QDialog, DropMixin):
 
     def slave(self, mi):
         self._mi_for_debounce = mi
-        self.slave_debounce_timer.start() # start() will automatically reset the timer if it was already running
+        self.slave_debounce_timer.start()  # start() will automatically reset the timer if it was already running
 
     def _debounce_refresh(self):
         mi, self._mi_for_debounce = self._mi_for_debounce, None
diff --git a/src/calibre/gui2/dialogs/catalog.py b/src/calibre/gui2/dialogs/catalog.py
index acc3b144ae..9de031582b 100644
--- a/src/calibre/gui2/dialogs/catalog.py
+++ b/src/calibre/gui2/dialogs/catalog.py
@@ -19,7 +19,6 @@ from calibre.gui2.dialogs.catalog_ui import Ui_Dialog
 
 
 class Catalog(QDialog, Ui_Dialog):
-
     ''' Catalog Dialog builder'''
 
     def __init__(self, parent, dbspec, ids, db):
@@ -55,9 +54,9 @@ class Catalog(QDialog, Ui_Dialog):
                     pw.initialize(name, db)
                     pw.ICON = 'forward.png'
                     self.widgets.append(pw)
-                    [self.fmts.append([file_type.upper(), pw.sync_enabled,pw]) for file_type in plugin.file_types]
+                    [self.fmts.append([file_type.upper(), pw.sync_enabled, pw]) for file_type in plugin.file_types]
                 except ImportError:
-                    info("ImportError initializing %s" % name)
+                    info('ImportError initializing %s' % name)
                     continue
             else:
                 # Load dynamic tab
@@ -88,15 +87,15 @@ class Catalog(QDialog, Ui_Dialog):
                         pw.initialize(name)
                         pw.ICON = 'forward.png'
                         self.widgets.append(pw)
-                        [self.fmts.append([file_type.upper(), pw.sync_enabled,pw]) for file_type in plugin.file_types]
+                        [self.fmts.append([file_type.upper(), pw.sync_enabled, pw]) for file_type in plugin.file_types]
                     except ImportError:
-                        info("ImportError with %s" % name)
+                        info('ImportError with %s' % name)
                         continue
                     finally:
                         sys.path.remove(plugin.resources_path)
 
                 else:
-                    info("No dynamic tab resources found for %s" % name)
+                    info('No dynamic tab resources found for %s' % name)
 
         self.widgets = sorted(self.widgets, key=lambda x: x.TITLE)
 
@@ -181,7 +180,7 @@ class Catalog(QDialog, Ui_Dialog):
         '''
         cf = str(self.format.currentText()).lower()
         if cf in ('azw3', 'epub', 'mobi') and hasattr(self.options_widget, 'settings_changed'):
-            self.options_widget.settings_changed("title/format")
+            self.options_widget.settings_changed('title/format')
 
     @property
     def fmt_options(self):
diff --git a/src/calibre/gui2/dialogs/check_library.py b/src/calibre/gui2/dialogs/check_library.py
index f36c37eed7..751e1214ad 100644
--- a/src/calibre/gui2/dialogs/check_library.py
+++ b/src/calibre/gui2/dialogs/check_library.py
@@ -421,22 +421,22 @@ class CheckLibraryDialog(QDialog):
             self.log.blockSignals(True)
             if col:
                 node.setCheckState(col, to_what)
-            for i in range(0, node.childCount()):
+            for i in range(node.childCount()):
                 node.child(i).setCheckState(2, to_what)
             self.log.blockSignals(False)
 
         def is_child_delete_checked(node):
             checked = False
             all_checked = True
-            for i in range(0, node.childCount()):
+            for i in range(node.childCount()):
                 c = node.child(i).checkState(2)
                 checked = checked or c == Qt.CheckState.Checked
                 all_checked = all_checked and c == Qt.CheckState.Checked
-            return (checked, all_checked)
+            return checked, all_checked
 
         def any_child_delete_checked():
             for parent in self.top_level_items.values():
-                (c, _) = is_child_delete_checked(parent)
+                c, _ = is_child_delete_checked(parent)
                 if c:
                     return True
             return False
@@ -464,7 +464,7 @@ class CheckLibraryDialog(QDialog):
         else:
             for parent in self.top_level_items.values():
                 if parent.data(2, Qt.ItemDataRole.UserRole) == self.is_deletable:
-                    (child_chkd, all_chkd) = is_child_delete_checked(parent)
+                    child_chkd, all_chkd = is_child_delete_checked(parent)
                     if all_chkd and child_chkd:
                         check_state = Qt.CheckState.Checked
                     elif child_chkd:
@@ -522,7 +522,7 @@ class CheckLibraryDialog(QDialog):
     def fix_missing_formats(self):
         tl = self.top_level_items['missing_formats']
         child_count = tl.childCount()
-        for i in range(0, child_count):
+        for i in range(child_count):
             item = tl.child(i)
             id = int(item.data(0, Qt.ItemDataRole.UserRole))
             all = self.db.formats(id, index_is_id=True, verify_formats=False)
@@ -535,7 +535,7 @@ class CheckLibraryDialog(QDialog):
     def fix_missing_covers(self):
         tl = self.top_level_items['missing_covers']
         child_count = tl.childCount()
-        for i in range(0, child_count):
+        for i in range(child_count):
             item = tl.child(i)
             id = int(item.data(0, Qt.ItemDataRole.UserRole))
             self.db.set_has_cover(id, False)
@@ -543,7 +543,7 @@ class CheckLibraryDialog(QDialog):
     def fix_extra_covers(self):
         tl = self.top_level_items['extra_covers']
         child_count = tl.childCount()
-        for i in range(0, child_count):
+        for i in range(child_count):
             item = tl.child(i)
             id = int(item.data(0, Qt.ItemDataRole.UserRole))
             self.db.set_has_cover(id, True)
diff --git a/src/calibre/gui2/dialogs/choose_format.py b/src/calibre/gui2/dialogs/choose_format.py
index fcf012141d..5b99105497 100644
--- a/src/calibre/gui2/dialogs/choose_format.py
+++ b/src/calibre/gui2/dialogs/choose_format.py
@@ -14,7 +14,7 @@ class ChooseFormatDialog(QDialog):
     def __init__(self, window, msg, formats, show_open_with=False):
         QDialog.__init__(self, window)
         self.resize(507, 377)
-        self.setWindowIcon(QIcon.ic("mimetypes/unknown.png"))
+        self.setWindowIcon(QIcon.ic('mimetypes/unknown.png'))
         self.setWindowTitle(_('Choose format'))
         self.l = l = QVBoxLayout(self)
         self.msg = QLabel(msg)
diff --git a/src/calibre/gui2/dialogs/comments_dialog.py b/src/calibre/gui2/dialogs/comments_dialog.py
index 4747a918b9..6aa23c6eb6 100644
--- a/src/calibre/gui2/dialogs/comments_dialog.py
+++ b/src/calibre/gui2/dialogs/comments_dialog.py
@@ -17,8 +17,8 @@ class CommentsDialog(QDialog):
 
     def __init__(self, parent, text, column_name=None):
         QDialog.__init__(self, parent)
-        self.setObjectName("CommentsDialog")
-        self.setWindowTitle(_("Edit comments"))
+        self.setObjectName('CommentsDialog')
+        self.setWindowTitle(_('Edit comments'))
         self.verticalLayout = l = QVBoxLayout(self)
         self.textbox = tb = Editor(self)
         self.buttonBox = bb = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel, self)
diff --git a/src/calibre/gui2/dialogs/confirm_delete.py b/src/calibre/gui2/dialogs/confirm_delete.py
index ff99773429..e62eec6d7f 100644
--- a/src/calibre/gui2/dialogs/confirm_delete.py
+++ b/src/calibre/gui2/dialogs/confirm_delete.py
@@ -20,7 +20,7 @@ class Dialog(QDialog):
         extra_button_choices=None
     ):
         QDialog.__init__(self, parent)
-        self.setWindowTitle(title or _("Are you sure?"))
+        self.setWindowTitle(title or _('Are you sure?'))
         self.setWindowIcon(QIcon.ic(icon))
         self.l = l = QVBoxLayout(self)
         self.h = h = QHBoxLayout()
@@ -31,14 +31,14 @@ class Dialog(QDialog):
 
         self.msg = m = QLabel(self)
         m.setOpenExternalLinks(True)
-        m.setMinimumWidth(350), m.setWordWrap(True), m.setObjectName("msg")
+        m.setMinimumWidth(350), m.setWordWrap(True), m.setObjectName('msg')
         m.setMaximumHeight(400)
         m.setText(msg)
 
         h.addWidget(self.icon_widget), h.addSpacing(10), h.addWidget(m)
 
-        self.again = a = QCheckBox((confirm_msg or _("&Show this warning again")), self)
-        a.setChecked(True), a.setObjectName("again")
+        self.again = a = QCheckBox((confirm_msg or _('&Show this warning again')), self)
+        a.setChecked(True), a.setObjectName('again')
         a.stateChanged.connect(self.toggle)
         l.addWidget(a)
 
@@ -49,7 +49,7 @@ class Dialog(QDialog):
             buttons = QDialogButtonBox.StandardButton.Ok
             standard_button = QDialogButtonBox.StandardButton.Ok
         self.buttonBox = bb = QDialogButtonBox(buttons, self)
-        bb.setObjectName("buttonBox")
+        bb.setObjectName('buttonBox')
         bb.setFocus(Qt.FocusReason.OtherFocusReason)
         bb.accepted.connect(self.accept), bb.rejected.connect(self.reject)
         self.extra_button_clicked = False
diff --git a/src/calibre/gui2/dialogs/confirm_delete_location.py b/src/calibre/gui2/dialogs/confirm_delete_location.py
index e7ba43446d..a15500be10 100644
--- a/src/calibre/gui2/dialogs/confirm_delete_location.py
+++ b/src/calibre/gui2/dialogs/confirm_delete_location.py
@@ -2,8 +2,8 @@
 
 
 __license__   = 'GPL v3'
-__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' \
-                '2010, John Schember <john@nachtimwald.com>'
+__copyright__ = ('2008, Kovid Goyal kovid@kovidgoyal.net'
+                 '2010, John Schember <john@nachtimwald.com>')
 __docformat__ = 'restructuredtext en'
 
 from qt.core import QDialog, QHBoxLayout, QIcon, QLabel, QPushButton, QSizePolicy, Qt, QVBoxLayout
diff --git a/src/calibre/gui2/dialogs/custom_recipes.py b/src/calibre/gui2/dialogs/custom_recipes.py
index 764760f781..c72d94f49c 100644
--- a/src/calibre/gui2/dialogs/custom_recipes.py
+++ b/src/calibre/gui2/dialogs/custom_recipes.py
@@ -342,17 +342,17 @@ class BasicRecipe(QWidget):  # {{{
 
         self.oldest_article = o = QSpinBox(self)
         o.setSuffix(' ' + _('day(s)'))
-        o.setToolTip(_("The oldest article to download"))
+        o.setToolTip(_('The oldest article to download'))
         o.setMinimum(1), o.setMaximum(36500)
         l.addRow(_('&Oldest article:'), o)
 
         self.max_articles = m = QSpinBox(self)
         m.setMinimum(5), m.setMaximum(100)
-        m.setToolTip(_("Maximum number of articles to download per feed."))
-        l.addRow(_("&Max. number of articles per feed:"), m)
+        m.setToolTip(_('Maximum number of articles to download per feed.'))
+        l.addRow(_('&Max. number of articles per feed:'), m)
 
         self.fg = fg = QGroupBox(self)
-        fg.setTitle(_("Feeds in recipe"))
+        fg.setTitle(_('Feeds in recipe'))
         self.feeds = f = QListWidget(self)
         fg.h = QHBoxLayout(fg)
         fg.h.addWidget(f)
@@ -488,7 +488,7 @@ class AdvancedRecipe(QWidget):  # {{{
             compile_recipe(src)
         except Exception as err:
             error_dialog(self, _('Invalid recipe'), _(
-                'Failed to compile the recipe, with syntax error: {}' ).format(err), show=True)
+                'Failed to compile the recipe, with syntax error: {}').format(err), show=True)
             return False
         return True
 
@@ -519,7 +519,7 @@ class ChooseBuiltinRecipe(Dialog):  # {{{
 
     def __init__(self, recipe_model, parent=None):
         self.recipe_model = recipe_model
-        Dialog.__init__(self, _("Choose builtin recipe"), 'choose-builtin-recipe', parent=parent)
+        Dialog.__init__(self, _('Choose builtin recipe'), 'choose-builtin-recipe', parent=parent)
 
     def setup_ui(self):
         self.l = l = QVBoxLayout(self)
@@ -537,7 +537,7 @@ class ChooseBuiltinRecipe(Dialog):  # {{{
         self.recipe_model.searched.connect(self.search.search_done, type=Qt.ConnectionType.QueuedConnection)
         self.recipe_model.searched.connect(self.search_done)
         self.go_button = b = QToolButton(self)
-        b.setText(_("Go"))
+        b.setText(_('Go'))
         b.clicked.connect(self.search.do_search)
         h = QHBoxLayout()
         h.addWidget(s), h.addWidget(b)
@@ -572,7 +572,7 @@ class CustomRecipes(Dialog):
 
     def __init__(self, recipe_model, parent=None):
         self.recipe_model = recipe_model
-        Dialog.__init__(self, _("Add custom news source"), 'add-custom-news-source', parent=parent)
+        Dialog.__init__(self, _('Add custom news source'), 'add-custom-news-source', parent=parent)
 
     def setup_ui(self):
         self.l = l = QVBoxLayout(self)
@@ -598,9 +598,9 @@ class CustomRecipes(Dialog):
         la('document_open.png', _('Load recipe from &file'), _('Load a recipe from a file'), self.load_recipe)
         la('mimetypes/dir.png', _('&Show recipe files'), _('Show the folder containing all recipe files'), self.show_recipe_files)
         la('mimetypes/opml.png', _('Import &OPML'), _(
-            "Import a collection of RSS feeds in OPML format\n"
-            "Many RSS readers can export their subscribed RSS feeds\n"
-            "in OPML format"), self.import_opml)
+            'Import a collection of RSS feeds in OPML format\n'
+            'Many RSS readers can export their subscribed RSS feeds\n'
+            'in OPML format'), self.import_opml)
 
         s.currentChanged.connect(self.update_button_box)
         self.update_button_box()
diff --git a/src/calibre/gui2/dialogs/data_files_manager.py b/src/calibre/gui2/dialogs/data_files_manager.py
index 716d36a727..532439b1ca 100644
--- a/src/calibre/gui2/dialogs/data_files_manager.py
+++ b/src/calibre/gui2/dialogs/data_files_manager.py
@@ -168,7 +168,7 @@ class Files(QAbstractListModel):
         if row >= len(self.files):
             return None
         if role == Qt.ItemDataRole.DisplayRole:
-            name =  self.file_display_name(row)
+            name = self.file_display_name(row)
             e = self.item_at(row)
             date = datetime.fromtimestamp(e.stat_result.st_mtime)
             l2 = human_readable(e.stat_result.st_size) + date.strftime(' [%Y/%m/%d]')
@@ -415,7 +415,7 @@ class DataFilesManager(Dialog):
         if q:
             return error_dialog(
                 self, _('Cannot add'), _(
-                    'Cannot add these data files to the book because they are already in the book\'s data files folder'
+                    "Cannot add these data files to the book because they are already in the book's data files folder"
                 ), show=True, det_msg='\n'.join(q))
 
         m = {f'{DATA_DIR_NAME}/{os.path.basename(x)}': x for x in files}
diff --git a/src/calibre/gui2/dialogs/delete_matching_from_device.py b/src/calibre/gui2/dialogs/delete_matching_from_device.py
index fdea0b7641..b0042fbe60 100644
--- a/src/calibre/gui2/dialogs/delete_matching_from_device.py
+++ b/src/calibre/gui2/dialogs/delete_matching_from_device.py
@@ -86,8 +86,8 @@ class DeleteMatchingFromDeviceDialog(QDialog, Ui_DeleteMatchingFromDeviceDialog)
         self.table.setRowCount(rows)
         row = 0
         for card in items:
-            (model,books) = items[card]
-            for (id,book) in books:
+            model, books = items[card]
+            for id,book in books:
                 item = QTableWidgetItem()
                 item.setFlags(Qt.ItemFlag.ItemIsUserCheckable|Qt.ItemFlag.ItemIsEnabled)
                 item.setCheckState(Qt.CheckState.Checked)
@@ -115,7 +115,7 @@ class DeleteMatchingFromDeviceDialog(QDialog, Ui_DeleteMatchingFromDeviceDialog)
         for row in range(self.table.rowCount()):
             if self.table.item(row, 0).checkState() == Qt.CheckState.Unchecked:
                 continue
-            (model, id, path) = self.table.item(row, 0).data(Qt.ItemDataRole.UserRole)
+            model, id, path = self.table.item(row, 0).data(Qt.ItemDataRole.UserRole)
             path = str(path)
             self.result.append((model, id, path))
         return
diff --git a/src/calibre/gui2/dialogs/duplicates.py b/src/calibre/gui2/dialogs/duplicates.py
index 8d47ffce9c..fe5f73ed98 100644
--- a/src/calibre/gui2/dialogs/duplicates.py
+++ b/src/calibre/gui2/dialogs/duplicates.py
@@ -100,7 +100,7 @@ class DuplicatesQuestion(QDialog):
             incoming_formats = ', '.join(os.path.splitext(path)[-1].replace('.', '').upper() for path in formats)
             item = QTreeWidgetItem([ta%dict(
                 title=mi.title, author=mi.format_field('authors')[1],
-                formats=incoming_formats)] , 0)
+                formats=incoming_formats)], 0)
             item.setCheckState(0, Qt.CheckState.Checked)
             item.setFlags(Qt.ItemFlag.ItemIsEnabled|Qt.ItemFlag.ItemIsUserCheckable)
             item.setData(0, Qt.ItemDataRole.FontRole, bf)
@@ -146,7 +146,7 @@ class DuplicatesQuestion(QDialog):
         for i in range(self.dup_list.topLevelItemCount()):
             x = self.dup_list.topLevelItem(i)
             check = '✓' if x.checkState(0) == Qt.CheckState.Checked else '✗'
-            title = f'{check} {str(x.text(0))}'
+            title = f'{check} {x.text(0)}'
             dups = []
             for child in (x.child(j) for j in range(x.childCount())):
                 dups.append('\t' + str(child.text(0)))
diff --git a/src/calibre/gui2/dialogs/edit_authors_dialog.py b/src/calibre/gui2/dialogs/edit_authors_dialog.py
index 7ae6a5a7d2..75a5062870 100644
--- a/src/calibre/gui2/dialogs/edit_authors_dialog.py
+++ b/src/calibre/gui2/dialogs/edit_authors_dialog.py
@@ -134,7 +134,7 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog):
         except Exception:
             pass
 
-        self.notes_utilities = NotesUtilities(self.table, "authors",
+        self.notes_utilities = NotesUtilities(self.table, 'authors',
                   lambda item: int(self.table.item(item.row(), AUTHOR_COLUMN).data(Qt.ItemDataRole.UserRole)))
 
         self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setText(_('&OK'))
@@ -317,7 +317,7 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog):
             self.notes_utilities.set_icon(note_item, id_, id_ in all_items_that_have_notes)
             row += 1
 
-        headers = { # this depends on the dict being ordered, which is true from python 3.7
+        headers = {  # this depends on the dict being ordered, which is true from python 3.7
             _('Author'): _('Name of the author'),
             _('Author sort'): _('Value used to sort this author'),
             _('Count'): _('Count of books with this author'),
@@ -346,7 +346,7 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog):
         select_item = None
         if id_to_select:
             use_as = tweaks['categories_use_field_for_author_name'] == 'author_sort'
-            for row in range(0, len(auts_to_show)):
+            for row in range(len(auts_to_show)):
                 if is_first_letter:
                     item_txt = str(self.table.item(row, AUTHOR_SORT_COLUMN).text() if use_as
                                                 else self.table.item(row, AUTHOR_COLUMN).text())
@@ -382,7 +382,7 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog):
 
     def save_state(self):
         self.table_column_widths = []
-        for c in range(0, self.table.columnCount()):
+        for c in range(self.table.columnCount()):
             self.table_column_widths.append(self.table.columnWidth(c))
         gprefs['general_category_editor_row_height'] = self.table.verticalHeader().sectionSize(0)
         gprefs['manage_authors_table_widths'] = self.table_column_widths
@@ -390,7 +390,7 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog):
 
     def table_column_resized(self, col, old, new):
         self.table_column_widths = []
-        for c in range(0, self.table.columnCount()):
+        for c in range(self.table.columnCount()):
             self.table_column_widths.append(self.table.columnWidth(c))
 
     def resizeEvent(self, *args):
@@ -404,7 +404,7 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog):
             # widths will be remembered
             w = self.table.width() - 25 - self.table.verticalHeader().width()
             w //= self.table.columnCount()
-            for c in range(0, self.table.columnCount()):
+            for c in range(self.table.columnCount()):
                 self.table.setColumnWidth(c, w)
         self.save_state()
 
@@ -462,7 +462,7 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog):
                     ca = m.addAction(_('Copy to author sort'))
                     ca.triggered.connect(self.copy_au_to_aus)
                     m.addSeparator()
-                    ca = m.addAction(QIcon.cached_icon('lt.png'), _("Show books by author in book list"))
+                    ca = m.addAction(QIcon.cached_icon('lt.png'), _('Show books by author in book list'))
                     ca.triggered.connect(self.search_in_book_list)
                 else:
                     ca = m.addAction(_('Copy to author'))
@@ -543,7 +543,7 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog):
         st = icu_lower(str(self.find_box.currentText()))
         if not st:
             return
-        for _ in range(0, self.table.rowCount()*2):
+        for _ in range(self.table.rowCount()*2):
             self.start_find_pos = (self.start_find_pos + 1) % (self.table.rowCount()*2)
             r = (self.start_find_pos//2) % self.table.rowCount()
             c = self.start_find_pos % 2
@@ -600,7 +600,7 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog):
 
     def do_recalc_author_sort(self):
         with self.no_cell_changed():
-            for row in range(0,self.table.rowCount()):
+            for row in range(self.table.rowCount()):
                 item_aut = self.table.item(row, AUTHOR_COLUMN)
                 id_ = int(item_aut.data(Qt.ItemDataRole.UserRole))
                 aut  = str(item_aut.text()).strip()
@@ -620,7 +620,7 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog):
 
     def do_auth_sort_to_author(self):
         with self.no_cell_changed():
-            for row in range(0,self.table.rowCount()):
+            for row in range(self.table.rowCount()):
                 aus  = str(self.table.item(row, AUTHOR_SORT_COLUMN).text()).strip()
                 item_aut = self.table.item(row, AUTHOR_COLUMN)
                 id_ = int(item_aut.data(Qt.ItemDataRole.UserRole))
diff --git a/src/calibre/gui2/dialogs/edit_category_notes.py b/src/calibre/gui2/dialogs/edit_category_notes.py
index 23260a14dc..697d2b62f1 100644
--- a/src/calibre/gui2/dialogs/edit_category_notes.py
+++ b/src/calibre/gui2/dialogs/edit_category_notes.py
@@ -76,6 +76,7 @@ class AskLink(Dialog):  # {{{
     @property
     def url(self):
         return self.url_edit.text().strip()
+
 # }}}
 
 
@@ -194,7 +195,7 @@ class AskImage(Dialog):
                 'No image is present in the system clipboard'), show=True)
 
     @property
-    def image_layout(self) -> 'QTextFrameFormat.Position':
+    def image_layout(self) -> QTextFrameFormat.Position:
         b = self.image_layout_group.checkedButton()
         if b is self.inline:
             return QTextFrameFormat.Position.InFlow
@@ -213,7 +214,6 @@ class AskImage(Dialog):
 # }}}
 
 
-
 class NoteEditorWidget(EditorWidget):
 
     insert_images_separately = True
diff --git a/src/calibre/gui2/dialogs/enum_values_edit.py b/src/calibre/gui2/dialogs/enum_values_edit.py
index 552b23cd95..3ccb496dbd 100644
--- a/src/calibre/gui2/dialogs/enum_values_edit.py
+++ b/src/calibre/gui2/dialogs/enum_values_edit.py
@@ -238,7 +238,7 @@ class EnumValuesEdit(QDialog):
         values = []
         colors = []
         id_map = {}
-        for i in range(0, self.table.rowCount()):
+        for i in range(self.table.rowCount()):
             it = self.table.item(i, self.VALUE_COLUMN)
             v = str(it.text())
             if not v:
diff --git a/src/calibre/gui2/dialogs/exim.py b/src/calibre/gui2/dialogs/exim.py
index dfceba8561..900bab8a70 100644
--- a/src/calibre/gui2/dialogs/exim.py
+++ b/src/calibre/gui2/dialogs/exim.py
@@ -220,7 +220,7 @@ class EximDialog(Dialog):
         ll.setStyleSheet('QListView::item { padding: 5px }')
         ll.setAlternatingRowColors(True)
         lpaths = all_known_libraries()
-        for lpath in sorted(lpaths, key=lambda x:numeric_sort_key(os.path.basename(x))):
+        for lpath in sorted(lpaths, key=lambda x: numeric_sort_key(os.path.basename(x))):
             i = QListWidgetItem(self.export_lib_text(lpath), ll)
             i.setData(Qt.ItemDataRole.UserRole, lpath)
             i.setData(Qt.ItemDataRole.UserRole+1, lpaths[lpath])
@@ -289,7 +289,7 @@ class EximDialog(Dialog):
         self.imported_lib_widgets = []
         self.frames = []
         l = self.slp.layout()
-        for lpath in sorted(self.importer.metadata['libraries'], key=lambda x:numeric_sort_key(os.path.basename(x))):
+        for lpath in sorted(self.importer.metadata['libraries'], key=lambda x: numeric_sort_key(os.path.basename(x))):
             f = QFrame(self)
             self.frames.append(f)
             l.addWidget(f)
@@ -341,7 +341,7 @@ class EximDialog(Dialog):
         return True
 
     def show_panel(self, which):
-        self.validate = self.run_action = lambda : True
+        self.validate = self.run_action = lambda: True
         if which is None:
             self.bb.setStandardButtons(QDialogButtonBox.StandardButton.Cancel)
         else:
diff --git a/src/calibre/gui2/dialogs/ff_doc_editor.py b/src/calibre/gui2/dialogs/ff_doc_editor.py
index 99da008172..b56877234d 100644
--- a/src/calibre/gui2/dialogs/ff_doc_editor.py
+++ b/src/calibre/gui2/dialogs/ff_doc_editor.py
@@ -43,7 +43,7 @@ class FFDocEditor(Dialog):
         QApplication.instance().clipboard().setText(self.document_text())
 
     def html_widget(self, layout, row, column):
-        e =  HTMLDisplay()
+        e = HTMLDisplay()
         e.setFrameStyle(QFrame.Shape.Box)
         if iswindows:
             e.setDefaultStyleSheet('pre { font-family: "Segoe UI Mono", "Consolas", monospace; }')
@@ -51,7 +51,7 @@ class FFDocEditor(Dialog):
         return e
 
     def text_widget(self, read_only, layout, row, column):
-        e =  QPlainTextEdit()
+        e = QPlainTextEdit()
         e.setReadOnly(read_only)
         e.setFrameStyle(QFrame.Shape.Box)
         layout.addWidget(e, row, column, 1, 1)
@@ -207,7 +207,7 @@ def main():
 
     with TemporaryDirectory() as tdir:
         app = Application([])
-        db = LibraryDatabase(tdir) # needed to load formatter_funcs
+        db = LibraryDatabase(tdir)  # needed to load formatter_funcs
         d = FFDocEditor(None)
         d.exec()
         del db
diff --git a/src/calibre/gui2/dialogs/match_books.py b/src/calibre/gui2/dialogs/match_books.py
index beea89a6b6..da5288101f 100644
--- a/src/calibre/gui2/dialogs/match_books.py
+++ b/src/calibre/gui2/dialogs/match_books.py
@@ -83,7 +83,7 @@ class MatchBooks(QDialog, Ui_MatchBooks):
         self.books_table.setHorizontalHeaderItem(0, t)
         t = QTableWidgetItem(_('Authors'))
         self.books_table.setHorizontalHeaderItem(1, t)
-        t = QTableWidgetItem(ngettext("Series", 'Series', 1))
+        t = QTableWidgetItem(ngettext('Series', 'Series', 1))
         self.books_table.setHorizontalHeaderItem(2, t)
         self.books_table_header_height = self.books_table.height()
         self.books_table.cellDoubleClicked.connect(self.book_doubleclicked)
@@ -169,7 +169,7 @@ class MatchBooks(QDialog, Ui_MatchBooks):
             # widths will be remembered
             w = self.books_table.width() - 25 - self.books_table.verticalHeader().width()
             w //= self.books_table.columnCount()
-            for c in range(0, self.books_table.columnCount()):
+            for c in range(self.books_table.columnCount()):
                 self.books_table.setColumnWidth(c, w)
         self.save_state()
 
@@ -184,7 +184,7 @@ class MatchBooks(QDialog, Ui_MatchBooks):
 
     def save_state(self):
         self.books_table_column_widths = []
-        for c in range(0, self.books_table.columnCount()):
+        for c in range(self.books_table.columnCount()):
             self.books_table_column_widths.append(self.books_table.columnWidth(c))
         gprefs['match_books_dialog_books_table_widths'] = self.books_table_column_widths
         self.save_geometry(gprefs, 'match_books_dialog_geometry')
diff --git a/src/calibre/gui2/dialogs/message_box.py b/src/calibre/gui2/dialogs/message_box.py
index 8ad3cfc02e..806d513a09 100644
--- a/src/calibre/gui2/dialogs/message_box.py
+++ b/src/calibre/gui2/dialogs/message_box.py
@@ -68,29 +68,29 @@ class MessageBox(QDialog):  # {{{
     resize_needed = pyqtSignal()
 
     def setup_ui(self):
-        self.setObjectName("Dialog")
+        self.setObjectName('Dialog')
         self.resize(497, 235)
         self.gridLayout = l = QGridLayout(self)
-        l.setObjectName("gridLayout")
+        l.setObjectName('gridLayout')
         self.icon_widget = Icon(self)
         l.addWidget(self.icon_widget)
         self.msg = la = QLabel(self)
         la.setWordWrap(True), la.setMinimumWidth(400)
         la.setOpenExternalLinks(True)
-        la.setObjectName("msg")
+        la.setObjectName('msg')
         l.addWidget(la, 0, 1, 1, 1)
         self.det_msg = dm = QTextBrowser(self)
         dm.setReadOnly(True)
-        dm.setObjectName("det_msg")
+        dm.setObjectName('det_msg')
         l.addWidget(dm, 1, 0, 1, 2)
         self.bb = bb = QDialogButtonBox(self)
         bb.setStandardButtons(QDialogButtonBox.StandardButton.Ok)
-        bb.setObjectName("bb")
+        bb.setObjectName('bb')
         bb.accepted.connect(self.accept)
         bb.rejected.connect(self.reject)
         l.addWidget(bb, 3, 0, 1, 2)
         self.toggle_checkbox = tc = QCheckBox(self)
-        tc.setObjectName("toggle_checkbox")
+        tc.setObjectName('toggle_checkbox')
         l.addWidget(tc, 2, 0, 1, 2)
 
     def __init__(
@@ -108,7 +108,7 @@ class MessageBox(QDialog):  # {{{
         self.aborted = False
         if q_icon is None:
             icon = {
-                    self.ERROR : 'error',
+                    self.ERROR: 'error',
                     self.WARNING: 'warning',
                     self.INFO:    'information',
                     self.QUESTION: 'question',
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 86acfda56e..7252ae8d0e 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -85,7 +85,7 @@ class MyBlockingBusy(QDialog):  # {{{
     def __init__(self, args, ids, db, refresh_books, cc_widgets, s_r_func, do_sr, sr_calls, parent=None, window_title=_('Working')):
         QDialog.__init__(self, parent)
 
-        self._layout =  l = QVBoxLayout()
+        self._layout = l = QVBoxLayout()
         self.setLayout(l)
         self.cover_sizes = {'old': 0, 'new': 0}
         # Every Path that will be taken in do_all
@@ -114,8 +114,8 @@ class MyBlockingBusy(QDialog):  # {{{
         if args.series_map_rules:
             self.selected_options += 1
         if DEBUG:
-            print("Number of steps for bulk metadata: %d" % self.selected_options)
-            print("Optionslist: ")
+            print('Number of steps for bulk metadata: %d' % self.selected_options)
+            print('Optionslist: ')
             print(options)
 
         self.msg = QLabel(_('Processing %d books, please wait...') % len(ids))
@@ -123,13 +123,13 @@ class MyBlockingBusy(QDialog):  # {{{
         self.font.setPointSize(self.font.pointSize() + 8)
         self.msg.setFont(self.font)
         self.current_step_pb = QProgressBar(self)
-        self.current_step_pb.setFormat(_("Current step progress: %p %"))
+        self.current_step_pb.setFormat(_('Current step progress: %p %'))
         if self.selected_options > 1:
             # More than one Option needs to be done! Add Overall ProgressBar
             self.overall_pb = QProgressBar(self)
             self.overall_pb.setRange(0, self.selected_options)
             self.overall_pb.setValue(0)
-            self.overall_pb.setFormat(_("Step %v/%m"))
+            self.overall_pb.setFormat(_('Step %v/%m'))
             self._layout.addWidget(self.overall_pb)
             self._layout.addSpacing(15)
         self.current_option = 0
@@ -159,9 +159,9 @@ class MyBlockingBusy(QDialog):  # {{{
         pass
 
     def on_progress_update(self, processed_steps):
-        """
+        '''
         This signal should be emitted if a step can be traced with numbers.
-        """
+        '''
         self.current_step_value += processed_steps
         self.current_step_pb.setValue(self.current_step_value)
 
@@ -171,10 +171,10 @@ class MyBlockingBusy(QDialog):  # {{{
             self.overall_pb.setValue(self.current_option)
 
     def on_progress_next_step_range(self, steps_of_progress):
-        """
+        '''
         If steps_of_progress equals 0 results this in a indetermined ProgressBar
         Otherwise the range is from 0..steps_of_progress
-        """
+        '''
         self.current_step_value = 0
         self.current_step_pb.setRange(0, steps_of_progress)
 
@@ -557,11 +557,11 @@ class MyBlockingBusy(QDialog):  # {{{
 
 class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
 
-    s_r_functions = {''              : lambda x: x,
-                            _('Lower Case') : lambda x: icu_lower(x),
-                            _('Upper Case') : lambda x: icu_upper(x),
-                            _('Title Case') : lambda x: titlecase(x),
-                            _('Capitalize') : lambda x: capitalize(x),
+    s_r_functions = {'': lambda x: x,
+        _('Lower Case'): lambda x: icu_lower(x),
+        _('Upper Case'): lambda x: icu_upper(x),
+        _('Title Case'): lambda x: titlecase(x),
+        _('Capitalize'): lambda x: capitalize(x),
                     }
 
     s_r_match_modes = [_('Character match'),
@@ -603,7 +603,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
         self.initialize_combos()
 
         self.series.currentIndexChanged.connect(self.series_changed)
-        connect_lambda(self.rating.currentIndexChanged, self, lambda self:self.apply_rating.setChecked(True))
+        connect_lambda(self.rating.currentIndexChanged, self, lambda self: self.apply_rating.setChecked(True))
         self.series.editTextChanged.connect(self.series_changed)
         self.tag_editor_button.clicked.connect(self.tag_editor)
         self.autonumber_series.stateChanged[int].connect(self.auto_number_changed)
@@ -660,10 +660,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
         self.button_transform_publishers.clicked.connect(self.transform_publishers)
         self.button_transform_series.clicked.connect(self.transform_series)
         self.tag_map_rules = self.author_map_rules = self.publisher_map_rules = self.series_map_rules = ()
-        tuple(map(lambda b: (b.clicked.connect(self.clear_transform_rules_for), b.setIcon(QIcon.ic('clear_left.png')), b.setToolTip(_(
-            'Clear the rules'))),
-            (self.button_clear_tags_rules, self.button_clear_authors_rules, self.button_clear_publishers_rules)
-        ))
+        tuple((b.clicked.connect(self.clear_transform_rules_for), b.setIcon(QIcon.ic('clear_left.png')), b.setToolTip(_('Clear the rules')))
+            for b in (self.button_clear_tags_rules, self.button_clear_authors_rules, self.button_clear_publishers_rules))
         self.update_transform_labels()
         if starting_tab < 0:
             starting_tab = gprefs.get('bulk_metadata_window_tab', 0)
@@ -801,7 +799,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
         self.testgrid.setColumnStretch(2, 1)
         offset = 10
         self.s_r_number_of_books = min(10, len(self.ids))
-        for i in range(1,self.s_r_number_of_books+1):
+        for i in range(1, self.s_r_number_of_books+1):
             w = QLabel(self.tabWidgetPage3)
             w.setText(_('Book %d:')%i)
             self.testgrid.addWidget(w, i+offset, 0, 1, 1)
@@ -857,8 +855,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
                  'matching and replacement is to be assigned. You can replace '
                  'the text in the field, or prepend or append the matched text. '
                  'See <a href="https://docs.python.org/library/re.html">'
-                 'this reference</a> for more information on Python\'s regular '
-                 'expressions, and in particular the \'sub\' function.'
+                 "this reference</a> for more information on Python's regular "
+                 "expressions, and in particular the 'sub' function."
                  )
 
         self.search_mode.addItems(self.s_r_match_modes)
@@ -900,9 +898,9 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
         self.save_button.clicked.connect(self.s_r_save_query)
         self.remove_button.clicked.connect(self.s_r_remove_query)
 
-        self.queries = JSONConfig("search_replace_queries")
+        self.queries = JSONConfig('search_replace_queries')
         self.saved_search_name = ''
-        self.query_field.addItem("")
+        self.query_field.addItem('')
         self.query_field_values = sorted(self.queries, key=sort_key)
         self.query_field.addItems(self.query_field_values)
         self.query_field.currentIndexChanged.connect(self.s_r_query_change)
@@ -967,7 +965,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
                     break
                 mi.append(self.db.new_api.get_proxy_metadata(_id))
         except Exception as e:
-            prints(f'TemplateLineEditor: exception fetching metadata: {str(e)}')
+            prints(f'TemplateLineEditor: exception fetching metadata: {e}')
             mi = None
         t = TemplateDialog(self, self.s_r_template.text(), mi=mi)
         t.setWindowTitle(_('Edit search/replace template'))
@@ -992,7 +990,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
             self.s_r_src_ident_label.setVisible(True)
             self.s_r_src_ident.setVisible(True)
 
-        for i in range(0, self.s_r_number_of_books):
+        for i in range(self.s_r_number_of_books):
             w = getattr(self, 'book_%d_text'%(i+1))
             mi = self.db.get_metadata(self.ids[i], index_is_id=True)
             src = self.s_r_sf_itemdata(idx)
@@ -1062,7 +1060,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
             tt = error_message(self.s_r_error)
             self.test_result.setText(tt)
         update_status_actions(self.test_result, self.s_r_error is None, tt)
-        for i in range(0,self.s_r_number_of_books):
+        for i in range(self.s_r_number_of_books):
             getattr(self, 'book_%d_result'%(i+1)).setText('')
 
     def s_r_func(self, match):
@@ -1186,7 +1184,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
             self.s_r_set_colors()
             return
 
-        for i in range(0,self.s_r_number_of_books):
+        for i in range(self.s_r_number_of_books):
             mi = self.db.get_metadata(self.ids[i], index_is_id=True)
             wr = getattr(self, 'book_%d_result'%(i+1))
             try:
@@ -1279,7 +1277,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
 
     def initalize_authors(self):
         all_authors = self.db.all_authors()
-        all_authors.sort(key=lambda x : sort_key(x[1]))
+        all_authors.sort(key=lambda x: sort_key(x[1]))
 
         self.authors.set_separator('&')
         self.authors.set_space_before_sep(True)
@@ -1450,9 +1448,9 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
         if self.query_field.currentIndex() == 0:
             return
 
-        if not question_dialog(self, _("Delete saved search/replace"),
-                _("The selected saved search/replace will be deleted. "
-                    "Are you sure?")):
+        if not question_dialog(self, _('Delete saved search/replace'),
+                _('The selected saved search/replace will be deleted. '
+                    'Are you sure?')):
             return
 
         item_id = self.query_field.currentIndex()
@@ -1476,19 +1474,19 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
             dex = 0
         name = ''
         while not name:
-            name, ok =  QInputDialog.getItem(self, _('Save search/replace'),
+            name, ok = QInputDialog.getItem(self, _('Save search/replace'),
                     _('Search/replace name:'), names, dex, True)
             if not ok:
                 return
             if not name:
-                error_dialog(self, _("Save search/replace"),
-                        _("You must provide a name."), show=True)
+                error_dialog(self, _('Save search/replace'),
+                        _('You must provide a name.'), show=True)
         new = True
         name = str(name)
         if name in list(self.queries.keys()):
-            if not question_dialog(self, _("Save search/replace"),
-                    _("That saved search/replace already exists and will be overwritten. "
-                        "Are you sure?")):
+            if not question_dialog(self, _('Save search/replace'),
+                    _('That saved search/replace already exists and will be overwritten. '
+                        'Are you sure?')):
                 return
             new = False
 
@@ -1580,10 +1578,10 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
         # as it was
         self.search_field.setCurrentIndex(0)
         self.s_r_src_ident.setCurrentIndex(0)
-        self.s_r_template.setText("")
-        self.search_for.setText("")
+        self.s_r_template.setText('')
+        self.search_for.setText('')
         self.case_sensitive.setChecked(False)
-        self.replace_with.setText("")
+        self.replace_with.setText('')
         self.replace_func.setCurrentIndex(0)
         self.destination_field.setCurrentIndex(0)
         self.s_r_dst_ident.setText('')
@@ -1591,4 +1589,4 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
         self.comma_separated.setChecked(True)
         self.results_count.setValue(999)
         self.starting_from.setValue(1)
-        self.multiple_separator.setText(" ::: ")
+        self.multiple_separator.setText(' ::: ')
diff --git a/src/calibre/gui2/dialogs/multisort.py b/src/calibre/gui2/dialogs/multisort.py
index 07cb1dbe7e..7ed4a24001 100644
--- a/src/calibre/gui2/dialogs/multisort.py
+++ b/src/calibre/gui2/dialogs/multisort.py
@@ -108,7 +108,7 @@ class ChooseMultiSort(Dialog):
             if i != 0:
                 t += ' :: '
             q = bytes.hex(k.encode('utf-8'))
-            dname = prepare_string_for_xml(name).replace(" ", "&nbsp;")
+            dname = prepare_string_for_xml(name).replace(' ', '&nbsp;')
             t += f' <a href="{q}" style="text-decoration: none">{dname}&nbsp;{symbol}</a>'
         if t:
             t = _('Effective sort') + ': ' + t
diff --git a/src/calibre/gui2/dialogs/plugin_updater.py b/src/calibre/gui2/dialogs/plugin_updater.py
index 51787ea17f..dab81a83dc 100644
--- a/src/calibre/gui2/dialogs/plugin_updater.py
+++ b/src/calibre/gui2/dialogs/plugin_updater.py
@@ -132,7 +132,6 @@ def get_installed_plugin_status(display_plugin):
 
 
 class ImageTitleLayout(QHBoxLayout):
-
     '''
     A reusable layout widget displaying an image followed by a title
     '''
@@ -158,7 +157,6 @@ class ImageTitleLayout(QHBoxLayout):
 
 
 class SizePersistedDialog(QDialog):
-
     '''
     This dialog is a base class for any dialogs that want their size/position
     restored when they are next opened.
@@ -248,7 +246,7 @@ class DisplayPluginSortFilterModel(QSortFilterProxyModel):
         self.setSortRole(Qt.ItemDataRole.UserRole)
         self.setSortCaseSensitivity(Qt.CaseSensitivity.CaseInsensitive)
         self.filter_criteria = FILTER_ALL
-        self.filter_text = ""
+        self.filter_text = ''
 
     def filterAcceptsRow(self, sourceRow, sourceParent):
         index = self.sourceModel().index(sourceRow, 0, sourceParent)
@@ -509,7 +507,7 @@ class PluginUpdaterDialog(SizePersistedDialog):
         header_layout.addWidget(la)
         self.filter_by_name_lineedit = QLineEdit(self)
         la.setBuddy(self.filter_by_name_lineedit)
-        self.filter_by_name_lineedit.setText("")
+        self.filter_by_name_lineedit.setText('')
         self.filter_by_name_lineedit.textChanged.connect(self._filter_name_lineedit_changed)
 
         header_layout.addWidget(self.filter_by_name_lineedit)
@@ -652,7 +650,7 @@ class PluginUpdaterDialog(SizePersistedDialog):
         self.plugin_view.setFocus()
 
     def _filter_combo_changed(self, idx):
-        self.filter_by_name_lineedit.setText("")  # clear the name filter text when a different group was selected
+        self.filter_by_name_lineedit.setText('')  # clear the name filter text when a different group was selected
         self.proxy_model.set_filter_criteria(idx)
         if idx == FILTER_NOT_INSTALLED:
             self.plugin_view.sortByColumn(5, Qt.SortOrder.DescendingOrder)
@@ -796,7 +794,7 @@ class PluginUpdaterDialog(SizePersistedDialog):
         display_plugin = self._selected_display_plugin()
         plugin = display_plugin.plugin
         if not plugin.can_be_disabled:
-            return error_dialog(self,_('Plugin cannot be disabled'),
+            return error_dialog(self, _('Plugin cannot be disabled'),
                          _('The plugin: %s cannot be disabled')%plugin.name, show=True)
         if is_disabled(plugin):
             enable_plugin(plugin)
diff --git a/src/calibre/gui2/dialogs/progress.py b/src/calibre/gui2/dialogs/progress.py
index dc662931ee..3c3fc43eef 100644
--- a/src/calibre/gui2/dialogs/progress.py
+++ b/src/calibre/gui2/dialogs/progress.py
@@ -176,5 +176,5 @@ if __name__ == '__main__':
     app = QApplication([])
     d = ProgressDialog('A title', 'A message', icon='lt.png')
     d.show(), d.canceled_signal.connect(app.quit)
-    QTimer.singleShot(1000, lambda : (setattr(d, 'value', 10), setattr(d, 'msg', ('A message ' * 100))))
+    QTimer.singleShot(1000, lambda: (setattr(d, 'value', 10), setattr(d, 'msg', ('A message ' * 100))))
     app.exec()
diff --git a/src/calibre/gui2/dialogs/quickview.py b/src/calibre/gui2/dialogs/quickview.py
index 249054d51a..547e04b80f 100644
--- a/src/calibre/gui2/dialogs/quickview.py
+++ b/src/calibre/gui2/dialogs/quickview.py
@@ -36,7 +36,6 @@ from calibre.utils.iso8601 import UNDEFINED_DATE
 
 
 class TableItem(QTableWidgetItem):
-
     '''
     A QTableWidgetItem that sorts on a separate string and uses ICU rules
     '''
@@ -680,40 +679,40 @@ class Quickview(QDialog, Ui_Quickview):
         mi = self.db.new_api.get_proxy_metadata(book_id)
         try:
             if col == 'title':
-                return (mi.title, mi.title_sort, 0)
+                return mi.title, mi.title_sort, 0
             elif col == 'authors':
-                return (' & '.join(mi.authors), mi.author_sort, 0)
+                return ' & '.join(mi.authors), mi.author_sort, 0
             elif col == 'series':
                 series = mi.format_field('series')[1]
                 if series is None:
-                    return ('', None, 0)
+                    return '', None, 0
                 else:
-                    return (series, mi.series, mi.series_index)
+                    return series, mi.series, mi.series_index
             elif col == 'size':
                 v = mi.get('book_size')
                 if v is not None:
-                    return (f'{v:n}', v, 0)
+                    return f'{v:n}', v, 0
                 else:
-                    return ('', None, 0)
+                    return '', None, 0
             elif self.fm[col]['datatype'] == 'series':
                 v = mi.format_field(col)[1]
-                return (v, mi.get(col), mi.get(col+'_index'))
+                return v, mi.get(col), mi.get(col+'_index')
             elif self.fm[col]['datatype'] == 'datetime':
                 v = mi.format_field(col)[1]
                 d = mi.get(col)
                 if d is None:
                     d = UNDEFINED_DATE
-                return (v, timestampfromdt(d), 0)
+                return v, timestampfromdt(d), 0
             elif self.fm[col]['datatype'] in ('float', 'int'):
                 v = mi.format_field(col)[1]
                 sort_val = mi.get(col)
-                return (v, sort_val, 0)
+                return v, sort_val, 0
             else:
                 v = mi.format_field(col)[1]
-                return (v, v, 0)
+                return v, v, 0
         except:
             traceback.print_exc()
-            return (_('Something went wrong while filling in the table'), '', 0)
+            return _('Something went wrong while filling in the table'), '', 0
 
     # Deal with sizing the table columns. Done here because the numbers are not
     # correct until the first paint.
@@ -729,7 +728,7 @@ class Quickview(QDialog, Ui_Quickview):
             # widths will be remembered
             w = self.books_table.width() - 25 - self.books_table.verticalHeader().width()
             w //= self.books_table.columnCount()
-            for c in range(0, self.books_table.columnCount()):
+            for c in range(self.books_table.columnCount()):
                 self.books_table.setColumnWidth(c, w)
         self.save_state()
 
@@ -817,7 +816,7 @@ class Quickview(QDialog, Ui_Quickview):
             self.edit_metadata(book_id)
         else:
             if key not in self.view.visible_columns:
-                error_dialog(self, _("Quickview: Column cannot be selected"),
+                error_dialog(self, _('Quickview: Column cannot be selected'),
                      _("The column you double-clicked, '{}', is not shown in the "
                        "library view. The book/column cannot be selected by Quickview.").format(key),
                      show=True,
@@ -853,7 +852,7 @@ class Quickview(QDialog, Ui_Quickview):
         if self.is_closed:
             return
         self.books_table_column_widths = []
-        for c in range(0, self.books_table.columnCount()):
+        for c in range(self.books_table.columnCount()):
             self.books_table_column_widths.append(self.books_table.columnWidth(c))
         gprefs['quickview_dialog_books_table_widths'] = self.books_table_column_widths
         if not self.is_pane:
diff --git a/src/calibre/gui2/dialogs/restore_library.py b/src/calibre/gui2/dialogs/restore_library.py
index 4997e9e1d8..99c1b6107a 100644
--- a/src/calibre/gui2/dialogs/restore_library.py
+++ b/src/calibre/gui2/dialogs/restore_library.py
@@ -97,7 +97,7 @@ def restore_database(db, parent=None):
             _('Your list of books, with all their metadata is '
                 'stored in a single file, called a database. '
                 'In addition, metadata for each individual '
-                'book is stored in that books\' folder, as '
+                "book is stored in that books' folder, as "
                 'a backup.'
                 '<p>This operation will rebuild '
                 'the database from the individual book '
diff --git a/src/calibre/gui2/dialogs/scheduler.py b/src/calibre/gui2/dialogs/scheduler.py
index 49eac21e21..faf2155586 100644
--- a/src/calibre/gui2/dialogs/scheduler.py
+++ b/src/calibre/gui2/dialogs/scheduler.py
@@ -86,8 +86,8 @@ class RecipesView(QTreeView):
         QTreeView.currentChanged(self, current, previous)
         self.parent().current_changed(current, previous)
 
-# Time/date widgets {{{
 
+# Time/date widgets {{{
 
 class Base(QWidget):
 
@@ -268,7 +268,7 @@ class SchedulerDialog(QDialog):
         self.search.initialize('scheduler_search_history')
         self.search.setMinimumContentsLength(15)
         self.go_button = b = QToolButton(self)
-        b.setText(_("Go"))
+        b.setText(_('Go'))
         b.clicked.connect(self.search.do_search)
         h.addWidget(s), h.addWidget(b)
         self.recipes = RecipesView(self)
@@ -278,7 +278,7 @@ class SchedulerDialog(QDialog):
         self.recipes.setModel(self.recipe_model)
         self.recipes.setFocus(Qt.FocusReason.OtherFocusReason)
         self.recipes.item_activated.connect(self.download_clicked)
-        self.setWindowTitle(_("Schedule news download [{} sources]").format(self.recipe_model.showing_count))
+        self.setWindowTitle(_('Schedule news download [{} sources]').format(self.recipe_model.showing_count))
         self.search.search.connect(self.recipe_model.search)
         self.recipe_model.searched.connect(self.search.search_done, type=Qt.ConnectionType.QueuedConnection)
         self.recipe_model.searched.connect(self.search_done)
@@ -296,7 +296,7 @@ class SchedulerDialog(QDialog):
 
         # First Tab (scheduling)
         self.tab = QWidget()
-        self.detail_box.addTab(self.tab, _("&Schedule"))
+        self.detail_box.addTab(self.tab, _('&Schedule'))
         self.tab.v = vt = QVBoxLayout(self.tab)
         self.blurb = la = QLabel('blurb')
         la.setWordWrap(True), la.setOpenExternalLinks(True)
@@ -306,14 +306,14 @@ class SchedulerDialog(QDialog):
         f.setFrameShape(QFrame.Shape.StyledPanel)
         f.setFrameShadow(QFrame.Shadow.Raised)
         f.v = vf = QVBoxLayout(f)
-        self.schedule = s = QCheckBox(_("&Schedule for download:"), f)
+        self.schedule = s = QCheckBox(_('&Schedule for download:'), f)
         self.schedule.stateChanged[int].connect(self.toggle_schedule_info)
         vf.addWidget(s)
         f.h = h = QHBoxLayout()
         vf.addLayout(h)
-        self.days_of_week = QRadioButton(_("&Days of  week"), f)
-        self.days_of_month = QRadioButton(_("Da&ys of month"), f)
-        self.every_x_days = QRadioButton(_("Every &x days"), f)
+        self.days_of_week = QRadioButton(_('&Days of  week'), f)
+        self.days_of_month = QRadioButton(_('Da&ys of month'), f)
+        self.every_x_days = QRadioButton(_('Every &x days'), f)
         self.days_of_week.setChecked(True)
         h.addWidget(self.days_of_week), h.addWidget(self.days_of_month), h.addWidget(self.every_x_days)
         self.schedule_stack = ss = QStackedWidget(f)
@@ -325,22 +325,22 @@ class SchedulerDialog(QDialog):
         self.last_downloaded = la = QLabel(f)
         la.setWordWrap(True)
         vf.addWidget(la)
-        self.rla = la = QLabel(_("For the scheduling to work, you must leave calibre running."))
+        self.rla = la = QLabel(_('For the scheduling to work, you must leave calibre running.'))
         la.setWordWrap(True)
         vf.addWidget(la)
         self.account = acc = QGroupBox(self.tab)
-        acc.setTitle(_("&Account"))
+        acc.setTitle(_('&Account'))
         vt.addWidget(acc)
         acc.g = g = QGridLayout(acc)
-        acc.unla = la = QLabel(_("&Username:"))
+        acc.unla = la = QLabel(_('&Username:'))
         self.username = un = QLineEdit(self)
         la.setBuddy(un)
         g.addWidget(la), g.addWidget(un, 0, 1)
-        acc.pwla = la = QLabel(_("&Password:"))
+        acc.pwla = la = QLabel(_('&Password:'))
         self.password = pw = QLineEdit(self)
         pw.setEchoMode(QLineEdit.EchoMode.Password), la.setBuddy(pw)
         g.addWidget(la), g.addWidget(pw, 1, 1)
-        self.show_password = spw = QCheckBox(_("&Show password"), self.account)
+        self.show_password = spw = QCheckBox(_('&Show password'), self.account)
         spw.stateChanged[int].connect(self.set_pw_echo_mode)
         g.addWidget(spw, 2, 0, 1, 2)
         for b, c in iteritems(self.SCHEDULE_TYPES):
@@ -350,41 +350,41 @@ class SchedulerDialog(QDialog):
 
         # Second tab (advanced settings)
         self.tab2 = t2 = QWidget()
-        self.detail_box.addTab(self.tab2, _("&Advanced"))
+        self.detail_box.addTab(self.tab2, _('&Advanced'))
         self.tab2.g = g = QFormLayout(t2)
         g.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
-        self.add_title_tag = tt = QCheckBox(_("Add &title as tag"), t2)
+        self.add_title_tag = tt = QCheckBox(_('Add &title as tag'), t2)
         g.addRow(tt)
         self.custom_tags = ct = QLineEdit(self)
-        g.addRow(_("&Extra tags:"), ct)
+        g.addRow(_('&Extra tags:'), ct)
         self.keep_issues = ki = QSpinBox(t2)
         tt.toggled['bool'].connect(self.keep_issues.setEnabled)
         ki.setMaximum(100000)
         ki.setToolTip(_(
-            "<p>When set, this option will cause calibre to keep, at most, the specified number of issues"
-            " of this periodical. Every time a new issue is downloaded, the oldest one is deleted, if the"
-            " total is larger than this number.\n<p>Note that this feature only works if you have the"
-            " option to add the title as tag checked, above.\n<p>Also, the setting for deleting periodicals"
-            " older than a number of days, below, takes priority over this setting."))
-        ki.setSpecialValueText(_("all issues")), ki.setSuffix(_(" issues"))
-        g.addRow(_("&Keep at most:"), ki)
+            '<p>When set, this option will cause calibre to keep, at most, the specified number of issues'
+            ' of this periodical. Every time a new issue is downloaded, the oldest one is deleted, if the'
+            ' total is larger than this number.\n<p>Note that this feature only works if you have the'
+            ' option to add the title as tag checked, above.\n<p>Also, the setting for deleting periodicals'
+            ' older than a number of days, below, takes priority over this setting.'))
+        ki.setSpecialValueText(_('all issues')), ki.setSuffix(_(' issues'))
+        g.addRow(_('&Keep at most:'), ki)
         self.recipe_specific_widgets = {}
 
         # Bottom area
         self.hb = h = QHBoxLayout()
         self.l.addLayout(h, 2, 1, 1, 1)
-        self.labt = la = QLabel(_("Delete downloaded &news older than:"))
+        self.labt = la = QLabel(_('Delete downloaded &news older than:'))
         self.old_news = on = QSpinBox(self)
         on.setToolTip(_(
-            "<p>Delete downloaded news older than the specified number of days. Set to zero to disable.\n"
-            "<p>You can also control the maximum number of issues of a specific periodical that are kept"
-            " by clicking the Advanced tab for that periodical above."))
-        on.setSpecialValueText(_("never delete")), on.setSuffix(_(" days"))
+            '<p>Delete downloaded news older than the specified number of days. Set to zero to disable.\n'
+            '<p>You can also control the maximum number of issues of a specific periodical that are kept'
+            ' by clicking the Advanced tab for that periodical above.'))
+        on.setSpecialValueText(_('never delete')), on.setSuffix(_(' days'))
         on.setMaximum(1000), la.setBuddy(on)
         on.setValue(gconf['oldest_news'])
         h.addWidget(la), h.addWidget(on)
-        self.download_all_button = b = QPushButton(QIcon.ic('news.png'), _("Download &all scheduled"), self)
-        b.setToolTip(_("Download all scheduled news sources at once"))
+        self.download_all_button = b = QPushButton(QIcon.ic('news.png'), _('Download &all scheduled'), self)
+        b.setToolTip(_('Download all scheduled news sources at once'))
         b.clicked.connect(self.download_all_clicked)
         self.l.addWidget(b, 3, 0, 1, 1)
         self.bb = bb = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel, self)
diff --git a/src/calibre/gui2/dialogs/search.py b/src/calibre/gui2/dialogs/search.py
index 106806538d..81f28e98ac 100644
--- a/src/calibre/gui2/dialogs/search.py
+++ b/src/calibre/gui2/dialogs/search.py
@@ -65,9 +65,9 @@ def create_msg_label(self):
     f.setFrameShadow(QFrame.Shadow.Raised)
     f.l = l = QVBoxLayout(f)
     f.um_label = la = QLabel(_(
-        "<p>You can also perform other kinds of advanced searches, for example checking"
+        '<p>You can also perform other kinds of advanced searches, for example checking'
         ' for books that have no covers, combining multiple search expression using Boolean'
-        ' operators and so on. See <a href=\"%s\">The search interface</a> for more information.'
+        ' operators and so on. See <a href="%s">The search interface</a> for more information.'
     ) % localize_user_manual_link('https://manual.calibre-ebook.com/gui.html#the-search-interface'))
     la.setMinimumSize(QSize(150, 0))
     la.setWordWrap(True)
@@ -77,13 +77,13 @@ def create_msg_label(self):
 
 
 def create_match_kind(self):
-    self.cmk_label = la = QLabel(_("What &kind of match to use:"))
+    self.cmk_label = la = QLabel(_('What &kind of match to use:'))
     self.matchkind = m = QComboBox(self)
     la.setBuddy(m)
     m.addItems([
-        _("Contains: the word or phrase matches anywhere in the metadata field"),
-        _("Equals: the word or phrase must match the entire metadata field"),
-        _("Regular expression: the expression must match anywhere in the metadata field"),
+        _('Contains: the word or phrase matches anywhere in the metadata field'),
+        _('Equals: the word or phrase must match the entire metadata field'),
+        _('Regular expression: the expression must match anywhere in the metadata field'),
         _("Character variant: 'contains' with accents ignored and punctuation significant")
     ])
     l = QHBoxLayout()
@@ -102,9 +102,9 @@ def create_button_box(self):
 
 def create_adv_tab(self):
     self.adv_tab = w = QWidget(self.tab_widget)
-    self.tab_widget.addTab(w, _("A&dvanced search"))
+    self.tab_widget.addTab(w, _('A&dvanced search'))
 
-    w.g1 = QGroupBox(_("Find entries that have..."), w)
+    w.g1 = QGroupBox(_('Find entries that have...'), w)
     w.g2 = QGroupBox(_("But don't show entries that have..."), w)
     w.l = l = QVBoxLayout(w)
     l.addWidget(w.g1), l.addWidget(w.g2), l.addStretch(10)
@@ -112,9 +112,9 @@ def create_adv_tab(self):
     w.g1.l = l = QFormLayout(w.g1)
     l.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
     for key, text in (
-            ('all', _("A&ll these words:")),
-            ('phrase', _("&This exact phrase:")),
-            ('any', _("O&ne or more of these words:")),
+            ('all', _('A&ll these words:')),
+            ('phrase', _('&This exact phrase:')),
+            ('any', _('O&ne or more of these words:')),
     ):
         le = QLineEdit(w)
         le.setClearButtonEnabled(True)
@@ -125,12 +125,12 @@ def create_adv_tab(self):
     l.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
     self.none = le = QLineEdit(w)
     le.setClearButtonEnabled(True)
-    l.addRow(_("Any of these &unwanted words:"), le)
+    l.addRow(_('Any of these &unwanted words:'), le)
 
 
 def create_simple_tab(self, db):
     self.simple_tab = w = QWidget(self.tab_widget)
-    self.tab_widget.addTab(w, _("Titl&e/author/series..."))
+    self.tab_widget.addTab(w, _('Titl&e/author/series...'))
 
     w.l = l = QFormLayout(w)
     l.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
@@ -198,7 +198,7 @@ def toggle_date_conditions_visibility(self):
 def create_date_tab(self, db):
     self.date_tab = w = QWidget(self.tab_widget)
     w.date_condition_layouts = dcl = []
-    self.tab_widget.addTab(w, _("&Date search"))
+    self.tab_widget.addTab(w, _('&Date search'))
     w.l = l = QVBoxLayout(w)
 
     def a(w):
@@ -213,7 +213,7 @@ def create_date_tab(self, db):
 
     w.h1 = h = QHBoxLayout()
     l.addLayout(h)
-    self.date_field = df = add(_("&Search the"), QComboBox(w))
+    self.date_field = df = add(_('&Search the'), QComboBox(w))
     vals = [((v['search_terms'] or [k])[0], v['name'] or k)
                 for k, v in db.field_metadata.iter_items()
                     if v.get('datatype', None) == 'datetime' or
@@ -222,7 +222,7 @@ def create_date_tab(self, db):
     for k, v in sorted(vals, key=lambda k_v: sort_key(k_v[1])):
         df.addItem(v, k)
     h.addWidget(df)
-    self.dateop_date = dd = add(_("date column for books whose &date is "), QComboBox(w))
+    self.dateop_date = dd = add(_('date column for books whose &date is '), QComboBox(w))
     init_dateop(dd)
     connect_lambda(dd.currentIndexChanged, self, toggle_date_conditions_visibility)
     w.la3 = la = QLabel('...')
@@ -276,7 +276,7 @@ def create_date_tab(self, db):
 
 def create_template_tab(self):
     self.simple_tab = w = QWidget(self.tab_widget)
-    self.tab_widget.addTab(w, _("&Template search"))
+    self.tab_widget.addTab(w, _('&Template search'))
 
     w.l = l = QFormLayout(w)
     l.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
@@ -323,7 +323,7 @@ def create_template_tab(self):
     lo = QHBoxLayout()
     lo.addWidget(le)
     self.edit_template_button = tb = QToolButton()
-    tb.setIcon(QIcon.ic("edit_input.png"))
+    tb.setIcon(QIcon.ic('edit_input.png'))
     tb.setToolTip(_('Open template editor'))
     lo.addWidget(tb)
     self.template_layout_label = tll = QLabel(_('&Template:'))
@@ -337,7 +337,7 @@ def create_template_tab(self):
 
 
 def setup_ui(self, db):
-    self.setWindowTitle(_("Advanced search"))
+    self.setWindowTitle(_('Advanced search'))
     self.setWindowIcon(QIcon.ic('search.png'))
     self.l = l = QVBoxLayout(self)
     self.h = h = QHBoxLayout()
@@ -402,14 +402,14 @@ class SearchDialog(QDialog):
         else:
             self.copy_current_template_search_button.setEnabled(False)
         self.copy_current_template_search_button.clicked.connect(self.retrieve_template_search)
-        self.edit_template_button.clicked.connect(lambda:self.template_program_box.open_editor())
+        self.edit_template_button.clicked.connect(lambda: self.template_program_box.open_editor())
         self.resize(self.sizeHint())
 
     def retrieve_template_search(self):
-        template, sep, query = re.split('#@#:([tdnb]):', self.current_search_text, flags=re.IGNORECASE)
+        template, sep, query = re.split(r'#@#:([tdnb]):', self.current_search_text, flags=re.IGNORECASE)
         self.template_value_box.setText(query)
         cb = self.template_test_type_box
-        for idx in range(0, cb.count()):
+        for idx in range(cb.count()):
             if sep == str(cb.itemData(idx)):
                 cb.setCurrentIndex(idx)
                 break
@@ -469,7 +469,7 @@ class SearchDialog(QDialog):
         template = str(self.template_program_box.text())
         value = str(self.template_value_box.text())
         cb = self.template_test_type_box
-        op =  str(cb.itemData(cb.currentIndex()))
+        op = str(cb.itemData(cb.currentIndex()))
         l = f'{template}#@#:{op}:{value}'
         # Use docstring quoting (super-quoting) to avoid problems with escaping
         return 'template:"""' + l + '"""'
@@ -505,8 +505,7 @@ class SearchDialog(QDialog):
             self.mc = '~'
         else:
             self.mc = '^'
-        all, any, phrase, none = map(lambda x: str(x.text()),
-                (self.all, self.any, self.phrase, self.none))
+        all, any, phrase, none = (str(x.text()) for x in (self.all, self.any, self.phrase, self.none))
         all, any, none = map(self.tokens, (all, any, none))
         phrase = phrase.strip()
         all = ' and '.join(all)
diff --git a/src/calibre/gui2/dialogs/smartdevice.py b/src/calibre/gui2/dialogs/smartdevice.py
index a47cd42745..b539473a5d 100644
--- a/src/calibre/gui2/dialogs/smartdevice.py
+++ b/src/calibre/gui2/dialogs/smartdevice.py
@@ -19,7 +19,7 @@ def ipaddr_sort_key(ipaddr):
 
 
 def get_all_ip_addresses():
-    ipaddrs = list()
+    ipaddrs = []
     for iface in itervalues(get_all_ips()):
         for addrs in iface:
             if 'broadcast' in addrs and addrs['addr'] != '127.0.0.1':
diff --git a/src/calibre/gui2/dialogs/tag_categories.py b/src/calibre/gui2/dialogs/tag_categories.py
index 2137332943..91647a3189 100644
--- a/src/calibre/gui2/dialogs/tag_categories.py
+++ b/src/calibre/gui2/dialogs/tag_categories.py
@@ -14,7 +14,6 @@ from calibre.utils.icu import primary_contains, primary_sort_key, strcmp
 
 
 class TagCategories(QDialog, Ui_TagCategories):
-
     '''
     The structure of user_categories stored in preferences is
       {cat_name: [ [name, category, v], [], [] ]}, cat_name: [ [name, cat, v] ...]}
@@ -230,7 +229,7 @@ class TagCategories(QDialog, Ui_TagCategories):
     def fill_applied_items(self):
         ccn = self.current_cat_name
         if ccn:
-            self.applied_items = [v for v in self.user_categories[ccn]]
+            self.applied_items = list(self.user_categories[ccn])
             self.applied_items.sort(key=self.item_sort_key)
         else:
             self.applied_items = []
diff --git a/src/calibre/gui2/dialogs/tag_editor.py b/src/calibre/gui2/dialogs/tag_editor.py
index fdf90af097..780cb66820 100644
--- a/src/calibre/gui2/dialogs/tag_editor.py
+++ b/src/calibre/gui2/dialogs/tag_editor.py
@@ -75,9 +75,9 @@ class TagEditor(QDialog, Ui_TagEditor):
             self.applied_tags.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection)
 
         if key:
-            all_tags = [tag for tag in self.db.all_custom(label=key)]
+            all_tags = list(self.db.all_custom(label=key))
         else:
-            all_tags = [tag for tag in self.db.all_tags()]
+            all_tags = list(self.db.all_tags())
         all_tags = sorted(set(all_tags) - set(tags), key=sort_key)
         self.all_tags_model = QStringListModel(all_tags)
         p = QSortFilterProxyModel()
diff --git a/src/calibre/gui2/dialogs/tag_list_editor.py b/src/calibre/gui2/dialogs/tag_list_editor.py
index de35381fda..ef3458de1f 100644
--- a/src/calibre/gui2/dialogs/tag_list_editor.py
+++ b/src/calibre/gui2/dialogs/tag_list_editor.py
@@ -151,7 +151,7 @@ class NotesTableWidgetItem(QTableWidgetItem):
         return self._sort_val < other._sort_val
 
 
-class NotesUtilities():
+class NotesUtilities:
 
     def __init__(self, table, category, item_id_getter):
         self.table = table
@@ -513,7 +513,7 @@ class TagListEditor(QDialog, Ui_TagListEditor):
         ca.setEnabled(not item.is_deleted)
 
         if self.category is not None:
-            ca = m.addAction(_("Search the library for {0}").format(item_name))
+            ca = m.addAction(_('Search the library for {0}').format(item_name))
             ca.setIcon(QIcon.cached_icon('lt.png'))
             ca.triggered.connect(partial(self.search_for_books, item))
             ca.setEnabled(not item.is_deleted)
@@ -605,7 +605,7 @@ class TagListEditor(QDialog, Ui_TagListEditor):
         find_text = str(self.search_box.currentText())
         if not find_text:
             return
-        for _ in range(0, self.table.rowCount()):
+        for _ in range(self.table.rowCount()):
             r = self.search_item_row = (self.search_item_row + 1) % self.table.rowCount()
             if self.string_contains(find_text, self.table.item(r, VALUE_COLUMN).text()):
                 self.table.setCurrentItem(self.table.item(r, VALUE_COLUMN))
@@ -731,7 +731,7 @@ class TagListEditor(QDialog, Ui_TagListEditor):
             tags = self.ordered_tags
 
         select_item = None
-        tooltips = ( # must be in the same order as the columns in the table
+        tooltips = (  # must be in the same order as the columns in the table
              _('Name of the item'),
              _('Count of books with this item'),
              _('Value of the item before it was edited'),
@@ -849,7 +849,7 @@ class TagListEditor(QDialog, Ui_TagListEditor):
 
     def table_column_resized(self, *args):
         self.table_column_widths = []
-        for c in range(0, self.table.columnCount()):
+        for c in range(self.table.columnCount()):
             self.table_column_widths.append(self.table.columnWidth(c))
 
     def resizeEvent(self, *args):
@@ -863,7 +863,7 @@ class TagListEditor(QDialog, Ui_TagListEditor):
             # widths will be remembered
             w = self.table.width() - 25 - self.table.verticalHeader().width()
             w //= self.table.columnCount()
-            for c in range(0, self.table.columnCount()):
+            for c in range(self.table.columnCount()):
                 self.table.setColumnWidth(c, w)
 
     def start_editing(self, on_row):
@@ -916,8 +916,8 @@ class TagListEditor(QDialog, Ui_TagListEditor):
         new_text = str(edited_item.text())
         if self.is_enumerated and new_text not in self.enum_permitted_values:
             error_dialog(self, _('Item is not a permitted value'), '<p>' + _(
-                "This column has a fixed set of permitted values. The entered "
-                "text must be one of ({0}).").format(', '.join(self.enum_permitted_values)) +
+                'This column has a fixed set of permitted values. The entered '
+                'text must be one of ({0}).').format(', '.join(self.enum_permitted_values)) +
                 '</p>', show=True)
             with block_signals(self.table):
                 edited_item.setText(self.text_before_editing)
diff --git a/src/calibre/gui2/dialogs/template_dialog.py b/src/calibre/gui2/dialogs/template_dialog.py
index f65b32283f..fe8e480e5d 100644
--- a/src/calibre/gui2/dialogs/template_dialog.py
+++ b/src/calibre/gui2/dialogs/template_dialog.py
@@ -215,24 +215,24 @@ class TemplateHighlighter(QSyntaxHighlighter):
                     'separator', 'break', 'continue', 'return', 'in', 'inlist',
                     'inlist_field', 'def', 'fed', 'limit']
 
-    KEYWORDS_PYTHON = ["and", "as", "assert", "break", "class", "continue", "def",
-                       "del", "elif", "else", "except", "exec", "finally", "for", "from",
-                       "global", "if", "import", "in", "is", "lambda", "not", "or",
-                       "pass", "print", "raise", "return", "try", "while", "with",
-                       "yield"]
+    KEYWORDS_PYTHON = ['and', 'as', 'assert', 'break', 'class', 'continue', 'def',
+                       'del', 'elif', 'else', 'except', 'exec', 'finally', 'for', 'from',
+                       'global', 'if', 'import', 'in', 'is', 'lambda', 'not', 'or',
+                       'pass', 'print', 'raise', 'return', 'try', 'while', 'with',
+                       'yield']
 
-    BUILTINS_PYTHON = ["abs", "all", "any", "basestring", "bool", "callable", "chr",
-                       "classmethod", "cmp", "compile", "complex", "delattr", "dict",
-                       "dir", "divmod", "enumerate", "eval", "execfile", "exit", "file",
-                       "filter", "float", "frozenset", "getattr", "globals", "hasattr",
-                       "hex", "id", "int", "isinstance", "issubclass", "iter", "len",
-                       "list", "locals", "long", "map", "max", "min", "object", "oct",
-                       "open", "ord", "pow", "property", "range", "reduce", "repr",
-                       "reversed", "round", "set", "setattr", "slice", "sorted",
-                       "staticmethod", "str", "sum", "super", "tuple", "type", "unichr",
-                       "unicode", "vars", "xrange", "zip"]
+    BUILTINS_PYTHON = ['abs', 'all', 'any', 'basestring', 'bool', 'callable', 'chr',
+                       'classmethod', 'cmp', 'compile', 'complex', 'delattr', 'dict',
+                       'dir', 'divmod', 'enumerate', 'eval', 'execfile', 'exit', 'file',
+                       'filter', 'float', 'frozenset', 'getattr', 'globals', 'hasattr',
+                       'hex', 'id', 'int', 'isinstance', 'issubclass', 'iter', 'len',
+                       'list', 'locals', 'long', 'map', 'max', 'min', 'object', 'oct',
+                       'open', 'ord', 'pow', 'property', 'range', 'reduce', 'repr',
+                       'reversed', 'round', 'set', 'setattr', 'slice', 'sorted',
+                       'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'unichr',
+                       'unicode', 'vars', 'xrange', 'zip']
 
-    CONSTANTS_PYTHON = ["False", "True", "None", "NotImplemented", "Ellipsis"]
+    CONSTANTS_PYTHON = ['False', 'True', 'None', 'NotImplemented', 'Ellipsis']
 
     def __init__(self, parent=None, builtin_functions=None):
         super().__init__(parent)
@@ -249,38 +249,38 @@ class TemplateHighlighter(QSyntaxHighlighter):
             r.append((re.compile(a), b))
 
         if not for_python:
-            a(r"\b[a-zA-Z]\w*\b(?!\(|\s+\()"
-              r"|\$+#?[a-zA-Z]\w*",
-              "identifier")
-            a(r"^program:", "keymode")
-            a("|".join([r"\b%s\b" % keyword for keyword in self.KEYWORDS_GPM]), "keyword")
-            a("|".join([r"\b%s\b" % builtin for builtin in
+            a(r'\b[a-zA-Z]\w*\b(?!\(|\s+\()'
+              r'|\$+#?[a-zA-Z]\w*',
+              'identifier')
+            a(r'^program:', 'keymode')
+            a('|'.join([r'\b%s\b' % keyword for keyword in self.KEYWORDS_GPM]), 'keyword')
+            a('|'.join([r'\b%s\b' % builtin for builtin in
                             (builtin_functions if builtin_functions else
                                                 formatter_functions().get_builtins())]),
-                "builtin")
-            a(r"""(?<!:)'[^']*'|"[^"]*\"""", "string")
+                'builtin')
+            a(r'''(?<!:)'[^']*'|"[^"]*\"''', 'string')
         else:
-            a(r"^python:", "keymode")
-            a("|".join([r"\b%s\b" % keyword for keyword in self.KEYWORDS_PYTHON]), "keyword")
-            a("|".join([r"\b%s\b" % builtin for builtin in self.BUILTINS_PYTHON]), "builtin")
-            a("|".join([r"\b%s\b" % constant for constant in self.CONSTANTS_PYTHON]), "constant")
-            a(r"\bPyQt6\b|\bqt.core\b|\bQt?[A-Z][a-z]\w+\b", "pyqt")
-            a(r"@\w+(\.\w+)?\b", "decorator")
+            a(r'^python:', 'keymode')
+            a('|'.join([r'\b%s\b' % keyword for keyword in self.KEYWORDS_PYTHON]), 'keyword')
+            a('|'.join([r'\b%s\b' % builtin for builtin in self.BUILTINS_PYTHON]), 'builtin')
+            a('|'.join([r'\b%s\b' % constant for constant in self.CONSTANTS_PYTHON]), 'constant')
+            a(r'\bPyQt6\b|\bqt.core\b|\bQt?[A-Z][a-z]\w+\b', 'pyqt')
+            a(r'@\w+(\.\w+)?\b', 'decorator')
 
             stringRe = r'''(["'])(?:(?!\1)[^\\]|\\.)*\1'''
-            a(stringRe, "string")
+            a(stringRe, 'string')
             self.stringRe = re.compile(stringRe)
-            self.checkTripleInStringRe = re.compile(r"""((?:"|'){3}).*?\1""")
+            self.checkTripleInStringRe = re.compile(r'''((?:"|'){3}).*?\1''')
             self.tripleSingleRe = re.compile(r"""'''(?!")""")
             self.tripleDoubleRe = re.compile(r'''"""(?!')''')
         a(
-            r"\b[+-]?[0-9]+[lL]?\b"
-            r"|\b[+-]?0[xX][0-9A-Fa-f]+[lL]?\b"
-            r"|\b[+-]?[0-9]+(?:\.[0-9]+)?(?:[eE][+-]?[0-9]+)?\b",
-            "number")
+            r'\b[+-]?[0-9]+[lL]?\b'
+            r'|\b[+-]?0[xX][0-9A-Fa-f]+[lL]?\b'
+            r'|\b[+-]?[0-9]+(?:\.[0-9]+)?(?:[eE][+-]?[0-9]+)?\b',
+            'number')
 
-        a(r'\(', "lparen")
-        a(r'\)', "rparen")
+        a(r'\(', 'lparen')
+        a(r'\)', 'rparen')
         self.Rules = tuple(r)
 
     def initialize_formats(self):
@@ -292,43 +292,43 @@ class TemplateHighlighter(QSyntaxHighlighter):
             font.setPointSize(size)
             font_name = font.family()
         config = self.Config = {}
-        config["fontfamily"] = font_name
+        config['fontfamily'] = font_name
         app_palette = QApplication.instance().palette()
         is_dark = QApplication.instance().is_dark_theme
 
         all_formats = (
             # name, color, bold, italic
-            ("normal", None, False, False),
-            ("keyword", app_palette.color(QPalette.ColorRole.Link).name(), True, False),
-            ("builtin", app_palette.color(QPalette.ColorRole.Link).name(), False, False),
-            ("constant", app_palette.color(QPalette.ColorRole.Link).name(), False, False),
-            ("identifier", None, False, True),
-            ("comment", '#00c700' if is_dark else "#007F00", False, True),
-            ("string", '#b6b600' if is_dark else "#808000", False, False),
-            ("number", '#d96d00' if is_dark else "#924900", False, False),
-            ("decorator", "#FF8000", False, True),
-            ("pyqt", None, False, False),
-            ("lparen", None, True, True),
-            ("rparen", None, True, True))
+            ('normal', None, False, False),
+            ('keyword', app_palette.color(QPalette.ColorRole.Link).name(), True, False),
+            ('builtin', app_palette.color(QPalette.ColorRole.Link).name(), False, False),
+            ('constant', app_palette.color(QPalette.ColorRole.Link).name(), False, False),
+            ('identifier', None, False, True),
+            ('comment', '#00c700' if is_dark else '#007F00', False, True),
+            ('string', '#b6b600' if is_dark else '#808000', False, False),
+            ('number', '#d96d00' if is_dark else '#924900', False, False),
+            ('decorator', '#FF8000', False, True),
+            ('pyqt', None, False, False),
+            ('lparen', None, True, True),
+            ('rparen', None, True, True))
 
         for name, color, bold, italic in all_formats:
-            config["%sfontcolor" % name] = color
-            config["%sfontbold" % name] = bold
-            config["%sfontitalic" % name] = italic
+            config['%sfontcolor' % name] = color
+            config['%sfontbold' % name] = bold
+            config['%sfontitalic' % name] = italic
         base_format = QTextCharFormat()
-        base_format.setFontFamilies([config["fontfamily"]])
-        config["fontsize"] = size
-        base_format.setFontPointSize(config["fontsize"])
+        base_format.setFontFamilies([config['fontfamily']])
+        config['fontsize'] = size
+        base_format.setFontPointSize(config['fontsize'])
 
         self.Formats = {}
         for name, color, bold, italic in all_formats:
             format_ = QTextCharFormat(base_format)
-            color = config["%sfontcolor" % name]
+            color = config['%sfontcolor' % name]
             if color:
                 format_.setForeground(QColor(color))
-            if config["%sfontbold" % name]:
+            if config['%sfontbold' % name]:
                 format_.setFontWeight(QFont.Weight.Bold)
-            format_.setFontItalic(config["%sfontitalic" % name])
+            format_.setFontItalic(config['%sfontitalic' % name])
             self.Formats[name] = format_
 
     def find_paren(self, bn, pos):
@@ -345,12 +345,12 @@ class TemplateHighlighter(QSyntaxHighlighter):
         bn = self.currentBlock().blockNumber()
         textLength = len(text)
 
-        self.setFormat(0, textLength, self.Formats["normal"])
+        self.setFormat(0, textLength, self.Formats['normal'])
 
         if not text:
             pass
-        elif text[0] == "#":
-            self.setFormat(0, textLength, self.Formats["comment"])
+        elif text[0] == '#':
+            self.setFormat(0, textLength, self.Formats['comment'])
             return
 
         for regex, format_ in self.Rules:
@@ -374,7 +374,7 @@ class TemplateHighlighter(QSyntaxHighlighter):
             t = re.sub(self.stringRe, self.replace_strings_with_dash, text)
             sharp_pos = t.find('#')
             if sharp_pos >= 0:  # Do we still have a #?
-                self.setFormat(sharp_pos, len(text), self.Formats["comment"])
+                self.setFormat(sharp_pos, len(text), self.Formats['comment'])
 
         self.setCurrentBlockState(NORMAL)
 
@@ -389,10 +389,10 @@ class TemplateHighlighter(QSyntaxHighlighter):
                     if i == -1:
                         i = len(text)
                         self.setCurrentBlockState(state)
-                    self.setFormat(0, i + 3, self.Formats["string"])
+                    self.setFormat(0, i + 3, self.Formats['string'])
                 elif i > -1:
                     self.setCurrentBlockState(state)
-                    self.setFormat(i, len(text), self.Formats["string"])
+                    self.setFormat(i, len(text), self.Formats['string'])
 
         if self.generate_paren_positions:
             t = str(text)
@@ -770,14 +770,14 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
         tv.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
         tv.setRowCount(len(mi))
         # Use our own widget to get rid of elision. setTextElideMode() doesn't work
-        for r in range(0, len(mi)):
+        for r in range(len(mi)):
             w = QLineEdit(tv)
             w.setReadOnly(True)
             w.setText(mi[r].get('title', _('No title provided')))
             tv.setCellWidget(r, 0, w)
             tb = QToolButton()
             tb.setContentsMargins(0, 0, 0, 0)
-            tb.setIcon(QIcon.ic("edit_input.png"))
+            tb.setIcon(QIcon.ic('edit_input.png'))
             tb.setToolTip(_('Open Edit metadata on this book'))
             tb.clicked.connect(partial(self.metadata_button_clicked, r))
             tb.setEnabled(mi[r].get('id', -1) >= 0)
@@ -958,7 +958,7 @@ def evaluate(book, context):
         self.textbox.set_clicked_line_numbers(set())
 
     def set_all_button_pressed(self):
-        self.textbox.set_clicked_line_numbers({i for i in range(1, self.textbox.blockCount()+1)})
+        self.textbox.set_clicked_line_numbers(set(range(1, self.textbox.blockCount()+1)))
 
     def toggle_button_pressed(self):
         ln = self.breakpoint_line_box.value()
@@ -1011,7 +1011,6 @@ def evaluate(book, context):
                 self.icon_files.adjustSize()
         except:
             traceback.print_exc()
-        return
 
     def update_filename_box(self):
         self.icon_files.clear()
@@ -1145,7 +1144,7 @@ def evaluate(book, context):
 
     def table_column_resized(self, col, old, new):
         self.table_column_widths = []
-        for c in range(0, self.template_value.columnCount()):
+        for c in range(self.template_value.columnCount()):
             self.table_column_widths.append(self.template_value.columnWidth(c))
 
     def save_geometry(self):
@@ -1289,7 +1288,7 @@ class BreakReporterBase(QDialog):
 
     def table_column_resized(self, col, old, new):
         self.table_column_widths = []
-        for c in range(0, self.table.columnCount()):
+        for c in range(self.table.columnCount()):
             self.table_column_widths.append(self.table.columnWidth(c))
 
     def get_field_keys(self):
diff --git a/src/calibre/gui2/dialogs/template_dialog_code_widget.py b/src/calibre/gui2/dialogs/template_dialog_code_widget.py
index 196eaab1ee..022e85ddb9 100644
--- a/src/calibre/gui2/dialogs/template_dialog_code_widget.py
+++ b/src/calibre/gui2/dialogs/template_dialog_code_widget.py
@@ -59,7 +59,7 @@ class CodeEditor(QPlainTextEdit):
     def line_number_area_width(self):
         # get largest width of digits
         fm = self.fontMetrics()
-        self.number_width = max(map(lambda x:fm.horizontalAdvance(str(x)), range(10)))
+        self.number_width = max(fm.horizontalAdvance(str(x)) for x in range(10))
         digits = 1
         limit = max(1, self.blockCount())
         while limit >= 10:
diff --git a/src/calibre/gui2/dialogs/template_general_info.py b/src/calibre/gui2/dialogs/template_general_info.py
index d767c0853b..dba23bd13c 100644
--- a/src/calibre/gui2/dialogs/template_general_info.py
+++ b/src/calibre/gui2/dialogs/template_general_info.py
@@ -33,11 +33,11 @@ class GeneralInformationDialog(Dialog):
         l.addWidget(self.bb)
         html = ''
         if self.include_general_doc:
-                html += '<h2>General Information</h2>'
-                html += FFMLProcessor().document_to_html(general_doc, 'Template General Information')
+            html += '<h2>General Information</h2>'
+            html += FFMLProcessor().document_to_html(general_doc, 'Template General Information')
         if self.include_ffml_doc:
-                html += '<h2>Format Function Markup Language Documentation</h2>'
-                html += FFMLProcessor().document_to_html(ffml_doc, 'FFML Documentation')
+            html += '<h2>Format Function Markup Language Documentation</h2>'
+            html += FFMLProcessor().document_to_html(ffml_doc, 'FFML Documentation')
         e.setHtml(html)
 
 
diff --git a/src/calibre/gui2/dialogs/template_line_editor.py b/src/calibre/gui2/dialogs/template_line_editor.py
index a8b22ebf45..e3882953d3 100644
--- a/src/calibre/gui2/dialogs/template_line_editor.py
+++ b/src/calibre/gui2/dialogs/template_line_editor.py
@@ -13,7 +13,6 @@ from calibre.gui2.dialogs.template_dialog import TemplateDialog
 
 
 class TemplateLineEditor(QLineEdit):
-
     '''
     Extend the context menu of a QLineEdit to include more actions.
     '''
@@ -30,7 +29,7 @@ class TemplateLineEditor(QLineEdit):
                 mi.append(db.new_api.get_metadata(_id))
             self.mi = mi
         except Exception as e:
-            prints(f'TemplateLineEditor: exception fetching metadata: {str(e)}')
+            prints(f'TemplateLineEditor: exception fetching metadata: {e}')
             self.mi = None
         self.setClearButtonEnabled(True)
 
diff --git a/src/calibre/gui2/dnd.py b/src/calibre/gui2/dnd.py
index 532321e0f1..3b09b494fc 100644
--- a/src/calibre/gui2/dnd.py
+++ b/src/calibre/gui2/dnd.py
@@ -133,7 +133,7 @@ class DownloadDialog(QDialog):  # {{{
 
 def dnd_has_image(md):
     # Chromium puts image data into application/octet-stream
-    return md.hasImage() or md.hasFormat('application/octet-stream') and what(None, bytes(md.data('application/octet-stream'))) in image_extensions()
+    return md.hasImage() or (md.hasFormat('application/octet-stream') and what(None, bytes(md.data('application/octet-stream'))) in image_extensions())
 
 
 def data_as_string(f, md):
diff --git a/src/calibre/gui2/email.py b/src/calibre/gui2/email.py
index 4d05f8c170..4d5c67f1a6 100644
--- a/src/calibre/gui2/email.py
+++ b/src/calibre/gui2/email.py
@@ -536,12 +536,12 @@ class EmailMixin:  # {{{
                 get_fmts, self.email_sent, self.job_manager)
         if sent_mails:
             self.status_bar.show_message(_('Sent news to')+' '+
-                    ', '.join(sent_mails),  3000)
+                    ', '.join(sent_mails), 3000)
 
 # }}}
 
 
 if __name__ == '__main__':
     from qt.core import QApplication
-    app = QApplication([])  # noqa
+    app = QApplication([])  # noqa: F841
     print(select_recipients())
diff --git a/src/calibre/gui2/extra_files_watcher.py b/src/calibre/gui2/extra_files_watcher.py
index 86d88de773..5d3a75dc63 100644
--- a/src/calibre/gui2/extra_files_watcher.py
+++ b/src/calibre/gui2/extra_files_watcher.py
@@ -25,7 +25,7 @@ class ExtraFilesWatcher(QObject):
 
     books_changed = pyqtSignal(object)
     WATCH_FOR = 300  # seconds
-    TICK_INTERVAL = 1 # seconds
+    TICK_INTERVAL = 1  # seconds
 
     def __init__(self, parent=None):
         super().__init__(parent)
diff --git a/src/calibre/gui2/font_family_chooser.py b/src/calibre/gui2/font_family_chooser.py
index 387785a6eb..2a824dd6a1 100644
--- a/src/calibre/gui2/font_family_chooser.py
+++ b/src/calibre/gui2/font_family_chooser.py
@@ -160,7 +160,7 @@ class FontFamilyDelegate(QStyledItemDelegate):
         painter.drawText(r, Qt.AlignmentFlag.AlignVCenter|Qt.AlignmentFlag.AlignLeading|Qt.TextFlag.TextSingleLine, text)
 
         if (system != QFontDatabase.WritingSystem.Any):
-            w = painter.fontMetrics().horizontalAdvance(text + "  ")
+            w = painter.fontMetrics().horizontalAdvance(text + '  ')
             painter.setFont(font2)
             sample = QFontDatabase.writingSystemSample(system)
             if (option.direction == Qt.LayoutDirection.RightToLeft):
diff --git a/src/calibre/gui2/fts/search.py b/src/calibre/gui2/fts/search.py
index 078d97f5aa..2756e642cd 100644
--- a/src/calibre/gui2/fts/search.py
+++ b/src/calibre/gui2/fts/search.py
@@ -733,7 +733,7 @@ class ResultDetails(QWidget):
     def render_results(self, results, individual_match=None):
         html = []
         space_pat = re.compile(r'\s+')
-        markup_pat = re.compile('\x1d')
+        markup_pat = re.compile(r'\x1d')
 
         def markup_text(text):
             count = 0
@@ -953,7 +953,7 @@ if __name__ == '__main__':
     from calibre.library import db
     app = Application([])
     d = QDialog()
-    d.sizeHint = lambda : QSize(1000, 680)
+    d.sizeHint = lambda: QSize(1000, 680)
     l = QVBoxLayout(d)
     bb = QDialogButtonBox(d)
     bb.accepted.connect(d.accept), bb.rejected.connect(d.reject)
diff --git a/src/calibre/gui2/geometry.py b/src/calibre/gui2/geometry.py
index f6d0fed162..56e5a1ccc4 100644
--- a/src/calibre/gui2/geometry.py
+++ b/src/calibre/gui2/geometry.py
@@ -169,7 +169,7 @@ def _restore_geometry(self: QWidget, prefs: dict, name: str, get_legacy_saved_ge
         return False
     if is_debugging():
         debug('Restoring geometry for:', name)
-        dx =  x.copy()
+        dx = x.copy()
         del dx['qt']
         debug(dx)
     s = find_matching_screen(x['screen'])
diff --git a/src/calibre/gui2/icon_theme.py b/src/calibre/gui2/icon_theme.py
index 9fbde53a9a..d051635ab7 100644
--- a/src/calibre/gui2/icon_theme.py
+++ b/src/calibre/gui2/icon_theme.py
@@ -101,7 +101,7 @@ def read_images_from_folder(path):
         name = os.path.relpath(filepath, path).replace(os.sep, '/')
         ext = name.rpartition('.')[-1]
         bname = os.path.basename(name)
-        if bname.startswith('.') or bname.startswith('_'):
+        if bname.startswith(('.', '_')):
             continue
         if ext == 'svg':
             render_svg(filepath)
@@ -340,7 +340,7 @@ class ThemeCreateDialog(Dialog):
         self.license.setText((theme.license or 'Unknown').strip())
         self.url.setText((theme.url or '').strip())
         if self.report.missing:
-            title =  _('%d icons missing in this theme') % len(self.report.missing)
+            title = _('%d icons missing in this theme') % len(self.report.missing)
         else:
             title = _('No missing icons')
         self.missing_icons_group.setTitle(title)
@@ -498,8 +498,8 @@ def create_theme(folder=None, parent=None):
         icon_resource_manager.set_theme()
 # }}}
 
-# Choose Theme  {{{
 
+# Choose Theme {{{
 
 def download_cover(cover_url, etag=None, cached=b''):
     url = BASE_URL + cover_url
@@ -751,12 +751,12 @@ class ChooseThemeWidget(QWidget):
 
     def re_sort(self):
         ct = self.current_theme
-        self.themes.sort(key=lambda x:sort_key(x.get('title', '')))
+        self.themes.sort(key=lambda x: sort_key(x.get('title', '')))
         field = self.sort_on
         if field == 'number':
-            self.themes.sort(key=lambda x:x.get('number', 0), reverse=True)
+            self.themes.sort(key=lambda x: x.get('number', 0), reverse=True)
         elif field == 'usage':
-            self.themes.sort(key=lambda x:x.get('usage', 0), reverse=True)
+            self.themes.sort(key=lambda x: x.get('usage', 0), reverse=True)
         self.theme_list.clear()
         for theme in self.themes:
             i = QListWidgetItem(theme.get('title', '') + ' {} {}'.format(theme.get('number'), theme.get('usage', 0)), self.theme_list)
@@ -774,7 +774,7 @@ class ChooseThemeWidget(QWidget):
         return default_theme()
 
     def set_current_theme(self, name):
-        if not hasattr(self, "themes"):
+        if not hasattr(self, 'themes'):
             return False
         for i, t in enumerate(self.themes):
             if t.get('name') == name:
@@ -944,7 +944,7 @@ class ChooseTheme(Dialog):
         if themes_to_download:
             size = sum(t['compressed-size'] for t in themes_to_download.values())
             d = DownloadProgress(self, size)
-            d.canceled_signal.connect(lambda : setattr(self, 'keep_downloading', False))
+            d.canceled_signal.connect(lambda: setattr(self, 'keep_downloading', False))
             t = Thread(name='DownloadIconTheme', target=download)
             t.daemon = True
             t.start()
diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index cb2d1eb233..9a44c2f7ff 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -122,8 +122,8 @@ class LibraryViewMixin:  # {{{
                     v.set_current_row(0)
                     if v is self.library_view and v.row_count() == 0:
                         self.book_details.reset_info()
+# }}}
 
-    # }}}
 
 class UpdateLabel(QLabel):  # {{{
 
@@ -135,13 +135,14 @@ class UpdateLabel(QLabel):  # {{{
         pass
 # }}}
 
+
 class VersionLabel(QLabel):  # {{{
 
     def __init__(self, parent):
         QLabel.__init__(self, parent)
         self.mouse_over = False
         self.setCursor(Qt.CursorShape.PointingHandCursor)
-        self.setToolTip(_('See what\'s new in this calibre release'))
+        self.setToolTip(_("See what's new in this calibre release"))
 
     def mouseReleaseEvent(self, ev):
         open_url(localize_website_link('https://calibre-ebook.com/whats-new'))
@@ -172,6 +173,7 @@ class VersionLabel(QLabel):  # {{{
         return QLabel.paintEvent(self, ev)
 # }}}
 
+
 class StatusBar(QStatusBar):  # {{{
 
     def __init__(self, parent=None):
@@ -237,9 +239,9 @@ class StatusBar(QStatusBar):  # {{{
 
     def clear_message(self):
         self.clearMessage()
-
 # }}}
 
+
 class GridViewButton(LayoutButton):  # {{{
 
     def __init__(self, gui):
@@ -270,10 +272,9 @@ class GridViewButton(LayoutButton):  # {{{
     def restore_state(self):
         if gprefs.get('grid view visible', False):
             self.toggle()
-
-
 # }}}
 
+
 class SearchBarButton(LayoutButton):  # {{{
 
     def __init__(self, gui):
@@ -304,10 +305,9 @@ class SearchBarButton(LayoutButton):  # {{{
 
     def restore_state(self):
         self.setChecked(bool(gprefs.get('search bar visible', True)))
-
-
 # }}}
 
+
 class VLTabs(QTabBar):  # {{{
 
     def __init__(self, parent):
@@ -487,6 +487,7 @@ class VLTabs(QTabBar):  # {{{
 
 # }}}
 
+
 class StatusBarButton(QToolButton):
 
     def __init__(self, parent, action_name, pref_name, on_click):
@@ -798,5 +799,4 @@ class LayoutMixin:  # {{{
         selected = len(v.selectionModel().selectedRows())
         library_total, total, current = v.model().counts()
         self.status_bar.update_state(library_total, total, current, selected)
-
 # }}}
diff --git a/src/calibre/gui2/job_indicator.py b/src/calibre/gui2/job_indicator.py
index 504867a409..173c9aac2c 100644
--- a/src/calibre/gui2/job_indicator.py
+++ b/src/calibre/gui2/job_indicator.py
@@ -17,7 +17,7 @@ class Pointer(QWidget):
         self.setObjectName('jobs_pointer')
         self.setVisible(False)
         self.resize(100, 80)
-        self.animation = QPropertyAnimation(self, b"geometry", self)
+        self.animation = QPropertyAnimation(self, b'geometry', self)
         self.animation.setDuration(750)
         self.animation.setLoopCount(2)
         self.animation.setEasingCurve(QEasingCurve.Type.Linear)
diff --git a/src/calibre/gui2/jobs.py b/src/calibre/gui2/jobs.py
index fa19779a48..f299c76328 100644
--- a/src/calibre/gui2/jobs.py
+++ b/src/calibre/gui2/jobs.py
@@ -74,7 +74,7 @@ class JobManager(QAbstractTableModel, AdaptSQP):  # {{{
     job_done  = pyqtSignal(int)
 
     def __init__(self):
-        self.header_titles = _('Job'), _('Status'), _('Progress'), _('Running time'), _('Start time'),
+        self.header_titles = _('Job'), _('Status'), _('Progress'), _('Running time'), _('Start time')
         QAbstractTableModel.__init__(self)
         SearchQueryParser.__init__(self, ['all'])
 
@@ -417,8 +417,8 @@ class FilterModel(QSortFilterProxyModel):  # {{{
 
 # }}}
 
-# Jobs UI {{{
 
+# Jobs UI {{{
 
 class ProgressBarDelegate(QAbstractItemDelegate):  # {{{
 
@@ -732,8 +732,7 @@ class JobsDialog(QDialog, Ui_JobsDialog):
         self.proxy_model.beginResetModel(), self.proxy_model.endResetModel()
 
     def hide_all(self, *args):
-        self.model.hide_jobs(list(range(0,
-            self.model.rowCount(QModelIndex()))))
+        self.model.hide_jobs(list(range(self.model.rowCount(QModelIndex()))))
         self.proxy_model.beginResetModel(), self.proxy_model.endResetModel()
 
     def show_hidden(self, *args):
diff --git a/src/calibre/gui2/keyboard.py b/src/calibre/gui2/keyboard.py
index 37f9b584dd..2ef1af27dc 100644
--- a/src/calibre/gui2/keyboard.py
+++ b/src/calibre/gui2/keyboard.py
@@ -115,7 +115,6 @@ def finalize(shortcuts, custom_keys_map={}):  # {{{
         ac.setShortcuts(list(keys))
 
     return keys_map
-
 # }}}
 
 
@@ -194,8 +193,8 @@ class Manager(QObject):  # {{{
 
 # }}}
 
-# Model {{{
 
+# Model {{{
 
 class Node:
 
@@ -318,10 +317,8 @@ class ConfigModel(SearchQueryParser, QAbstractItemModel):
             sc = node.data
             un = sc['unique_name']
             if sc['set_to_default']:
-                if un in kmap:
-                    del kmap[un]
-                if un in options_map:
-                    del options_map[un]
+                kmap.pop(un, None)
+                options_map.pop(un, None)
             else:
                 if sc['persist_shortcut']:
                     options_map[un] = options_map.get(un, {})
@@ -462,7 +459,7 @@ class Editor(QFrame):  # {{{
 
         self.done_button = doneb = QPushButton(_('Done'), self)
         l.addWidget(doneb, 0, 2, 1, 1)
-        doneb.clicked.connect(lambda : self.editing_done.emit(self))
+        doneb.clicked.connect(lambda: self.editing_done.emit(self))
         l.setColumnStretch(0, 100)
 
         self.custom_toggled(False)
@@ -569,9 +566,9 @@ class Editor(QFrame):  # {{{
                 ans.append(ks)
         return tuple(ans)
 
-
 # }}}
 
+
 class Delegate(QStyledItemDelegate):  # {{{
 
     changed_signal = pyqtSignal()
@@ -598,7 +595,7 @@ class Delegate(QStyledItemDelegate):  # {{{
         else:
             # Group
             html = data.data
-        doc =  QTextDocument()
+        doc = QTextDocument()
         doc.setHtml(html)
         return doc
 
diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index 33c93b5a2f..067bd843ed 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -77,7 +77,7 @@ class LocationManager(QObject):  # {{{
                 a.triggered.connect(self._configure_requested)
                 self._mem.append(a)
                 a = m.addAction(QIcon.ic('sync.png'), _('Update cached metadata on device'))
-                a.triggered.connect(lambda x : self.update_device_metadata.emit())
+                a.triggered.connect(lambda x: self.update_device_metadata.emit())
                 self._mem.append(a)
 
             else:
@@ -212,7 +212,7 @@ class SearchBar(QFrame):  # {{{
         x.setText(_('Virtual library'))
         x.setAutoRaise(True)
         x.setIcon(QIcon.ic('vl.png'))
-        x.setObjectName("virtual_library")
+        x.setObjectName('virtual_library')
         x.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
         l.addWidget(x)
 
@@ -241,9 +241,9 @@ class SearchBar(QFrame):  # {{{
 
         x = parent.search = SearchBox2(self, as_url=search_as_url)
         x.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
-        x.setObjectName("search")
-        x.setToolTip(_("<p>Search the list of books by title, author, publisher, "
-                       "tags, comments, etc.<br><br>Words separated by spaces are ANDed"))
+        x.setObjectName('search')
+        x.setToolTip(_('<p>Search the list of books by title, author, publisher, '
+                       'tags, comments, etc.<br><br>Words separated by spaces are ANDed'))
         x.setMinimumContentsLength(10)
         l.addWidget(x)
 
@@ -255,7 +255,7 @@ class SearchBar(QFrame):  # {{{
         parent.addAction(ac)
         ac.setToolTip(_('Advanced search'))
         parent.keyboard.register_shortcut('advanced search toggle',
-                _('Advanced search'), default_keys=("Shift+Ctrl+F",),
+                _('Advanced search'), default_keys=('Shift+Ctrl+F',),
                 action=ac)
 
         # This error icon will be placed after the clear button icon
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 29c2340edb..b1c9712c1d 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -133,8 +133,8 @@ def image_to_data(image):  # {{{
     return ret
 # }}}
 
-# Drag 'n Drop {{{
 
+# Drag 'n Drop {{{
 
 def qt_item_view_base_class(self):
     for q in (QTableView, QListView, QTreeView):
@@ -331,8 +331,8 @@ def setup_dnd_interface(cls_or_self):
         self.setDragDropMode(QAbstractItemView.DragDropMode.DragDrop)
 # }}}
 
-# Manage slave views {{{
 
+# Manage slave views {{{
 
 def sync(func):
     @wraps(func)
@@ -436,8 +436,8 @@ class AlternateViews:
             self.current_view.marked_changed(old_marked, current_marked)
 # }}}
 
-# Rendering of covers {{{
 
+# Rendering of covers {{{
 
 class CoverDelegate(QStyledItemDelegate):
 
@@ -1005,7 +1005,7 @@ class GridView(QListView):
         if db is None:
             return None
         tc = self.thumbnail_cache
-        cdata, timestamp = tc[book_id] # None, None if not cached.
+        cdata, timestamp = tc[book_id]  # None, None if not cached.
         if timestamp is None:
             # Cover not in cache. Try to read the cover from the library.
             has_cover, cdata, timestamp = db.new_api.cover_or_cache(book_id, 0, as_what='pil_image')
@@ -1180,7 +1180,7 @@ class GridView(QListView):
         # Create a range based selector for each set of contiguous rows
         # as supplying selectors for each individual row causes very poor
         # performance if a large number of rows has to be selected.
-        for k, g in itertools.groupby(enumerate(rows), lambda i_x:i_x[0]-i_x[1]):
+        for k, g in itertools.groupby(enumerate(rows), lambda i_x: i_x[0]-i_x[1]):
             group = list(map(operator.itemgetter(1), g))
             sel.merge(QItemSelection(m.index(min(group), 0), m.index(max(group), 0)), QItemSelectionModel.SelectionFlag.Select)
         sm.select(sel, QItemSelectionModel.SelectionFlag.ClearAndSelect)
diff --git a/src/calibre/gui2/library/annotations.py b/src/calibre/gui2/library/annotations.py
index 2ef18eb728..529b576241 100644
--- a/src/calibre/gui2/library/annotations.py
+++ b/src/calibre/gui2/library/annotations.py
@@ -170,7 +170,7 @@ def render_note_line(line):
         yield prepare_string_for_xml(line)
         return
     pos = 0
-    for (s, e) in urls:
+    for s,e in urls:
         if s > pos:
             yield prepare_string_for_xml(line[pos:s])
         yield '<a href="{0}">{0}</a>'.format(prepare_string_for_xml(line[s:e], True))
@@ -226,7 +226,6 @@ class AnnotsResultsDelegate(ResultsDelegate):
             text = parts[0]
         return False, before, text, after, bool(result.get('annotation', {}).get('notes'))
 
-
 # }}}
 
 
@@ -269,7 +268,7 @@ def css_for_highlight_style(style):
     elif 'background-color' in style:
         ans = 'background-color: ' + style['background-color']
         if 'color' in style:
-            ans += '; color: ' + style["color"]
+            ans += '; color: ' + style['color']
     elif kind == 'decoration':
         which = style.get('which')
         if which is not None:
diff --git a/src/calibre/gui2/library/caches.py b/src/calibre/gui2/library/caches.py
index 9d85bb3508..6007f04738 100644
--- a/src/calibre/gui2/library/caches.py
+++ b/src/calibre/gui2/library/caches.py
@@ -24,7 +24,6 @@ class ThumbnailCache(TC):
 
 
 class CoverCache(dict):
-
     '''
     This is a RAM cache to speed up rendering of covers by storing them as
     QPixmaps. It is possible that it is called from multiple threads, thus the
diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py
index eb2b4a4c70..e9c85db96f 100644
--- a/src/calibre/gui2/library/delegates.py
+++ b/src/calibre/gui2/library/delegates.py
@@ -134,12 +134,14 @@ class UpdateEditorGeometry:
         initial_geometry.adjust(delta_x, 0, delta_width, 0)
         editor.setGeometry(initial_geometry)
 
+
 class EditableTextDelegate:
 
     def set_editor_data(self, editor, index):
         n = editor.metaObject().userProperty().name()
         editor.setProperty(n, get_val_for_textlike_columns(index))
 
+
 class DateTimeEdit(DateTimeEditBase):  # {{{
 
     def __init__(self, parent, format_):
@@ -151,8 +153,8 @@ class DateTimeEdit(DateTimeEditBase):  # {{{
 
 # }}}
 
-# Number Editor  {{{
 
+# Number Editor {{{
 
 def make_clearing_spinbox(spinbox):
 
@@ -184,8 +186,8 @@ ClearingDoubleSpinBox = make_clearing_spinbox(QDoubleSpinBox)
 
 # }}}
 
-# setter for text-like delegates. Return '' if CTRL is pushed {{{
 
+# setter for text-like delegates. Return '' if CTRL is pushed {{{
 
 def check_key_modifier(which_modifier):
     v = QApplication.keyboardModifiers() & (Qt.KeyboardModifier.ControlModifier | Qt.KeyboardModifier.ShiftModifier)
@@ -203,7 +205,6 @@ def get_val_for_textlike_columns(index_):
 
 
 class StyledItemDelegate(QStyledItemDelegate):
-
     '''
     When closing an editor and opening another, Qt sometimes picks what appears
     to be a random line and column for the second editor. This function checks
@@ -560,7 +561,7 @@ class CcTextDelegate(StyledItemDelegate, UpdateEditorGeometry, EditableTextDeleg
                 editor = EditWithComplete(parent)
             editor.set_separator(None)
             editor.set_clear_button_enabled(False)
-            complete_items = sorted(list(m.db.all_custom(label=key)), key=sort_key)
+            complete_items = sorted(m.db.all_custom(label=key), key=sort_key)
             editor.update_items_cache(complete_items)
         else:
             editor = QLineEdit(parent)
@@ -609,7 +610,6 @@ class CcLongTextDelegate(StyledItemDelegate):  # {{{
         d = PlainTextDialog(parent, text, column_name=m.custom_columns[col]['name'])
         if d.exec() == QDialog.DialogCode.Accepted:
             m.setData(index, d.text, Qt.ItemDataRole.EditRole)
-        return None
 
     def setModelData(self, editor, model, index):
         model.setData(index, (editor.textbox.html), Qt.ItemDataRole.EditRole)
@@ -664,7 +664,6 @@ class CcMarkdownDelegate(StyledItemDelegate):  # {{{
                                base_url=base_url)
         if d.exec() == QDialog.DialogCode.Accepted:
             m.setData(index, (d.text), Qt.ItemDataRole.EditRole)
-        return None
 
     def setModelData(self, editor, model, index):
         model.setData(index, (editor.textbox.html), Qt.ItemDataRole.EditRole)
@@ -815,7 +814,6 @@ class CcCommentsDelegate(StyledItemDelegate):  # {{{
         d = editor.exec()
         if d:
             m.setData(index, (editor.textbox.html), Qt.ItemDataRole.EditRole)
-        return None
 
     def setModelData(self, editor, model, index):
         model.setData(index, (editor.textbox.html), Qt.ItemDataRole.EditRole)
@@ -923,7 +921,7 @@ class CcTemplateDelegate(StyledItemDelegate):  # {{{
         else:
             text = m.custom_columns[m.column_map[index.column()]]['display']['composite_template']
         editor = TemplateDialog(parent, text, mi)
-        editor.setWindowTitle(_("Edit template"))
+        editor.setWindowTitle(_('Edit template'))
         editor.textbox.setTabChangesFocus(False)
         editor.textbox.setTabStopDistance(20)
         d = editor.exec()
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 127c6d2a85..aaaa9fb67a 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -59,7 +59,7 @@ def render_pin(color=None, save_to=None):
 
 
 def group_numbers(numbers):
-    for k, g in groupby(enumerate(sorted(numbers)), lambda i_x:i_x[0] - i_x[1]):
+    for k, g in groupby(enumerate(sorted(numbers)), lambda i_x: i_x[0] - i_x[1]):
         first = None
         for last in g:
             if first is None:
@@ -97,7 +97,7 @@ class ColumnColor:  # {{{
 
 
 def themed_icon_name(icon_dir, icon_name):
-    root,ext = os.path.splitext(icon_name)
+    root, ext = os.path.splitext(icon_name)
     # Remove any theme from the icon name
     root = root.removesuffix('-for-dark-theme').removesuffix('-for-light-theme')
     # Check if the correct themed icon exists.
@@ -204,16 +204,16 @@ class BooksModel(QAbstractTableModel):  # {{{
         self.bi_font.setItalic(True)
         self.styled_columns = {}
         self.orig_headers = {
-                        'title'     : _("Title"),
-                        'ondevice'   : _("On Device"),
-                        'authors'   : _("Author(s)"),
-                        'size'      : _("Size (MB)"),
-                        'timestamp' : _("Date"),
+                        'title'     : _('Title'),
+                        'ondevice'  : _('On Device'),
+                        'authors'   : _('Author(s)'),
+                        'size'      : _('Size (MB)'),
+                        'timestamp' : _('Date'),
                         'pubdate'   : _('Published'),
                         'rating'    : _('Rating'),
-                        'publisher' : _("Publisher"),
-                        'tags'      : _("Tags"),
-                        'series'    : ngettext("Series", 'Series', 1),
+                        'publisher' : _('Publisher'),
+                        'tags'      : _('Tags'),
+                        'series'    : ngettext('Series', 'Series', 1),
                         'last_modified' : _('Modified'),
                         'languages' : _('Languages'),
                         'formats'   : _('Formats'),
@@ -1127,8 +1127,8 @@ class BooksModel(QAbstractTableModel):  # {{{
             cname = self.column_map[index.column()]
             return self.styled_columns.get(cname)
         # elif role == Qt.ItemDataRole.ToolTipRole and index.isValid():
-        #    if self.column_map[index.column()] in self.editable_cols:
-        #        return (_("Double click to <b>edit</b> me<br><br>"))
+        #     if self.column_map[index.column()] in self.editable_cols:
+        #         return (_("Double click to <b>edit</b> me<br><br>"))
         return None
 
     def headerData(self, section, orientation, role):
@@ -1366,7 +1366,7 @@ class OnDeviceSearch(SearchQueryParser):  # {{{
         self.model = model
 
     def universal_set(self):
-        return set(range(0, len(self.model.db)))
+        return set(range(len(self.model.db)))
 
     def get_matches(self, location, query):
         location = location.lower().strip()
@@ -1392,13 +1392,13 @@ class OnDeviceSearch(SearchQueryParser):  # {{{
         all_locs = set(self.USABLE_LOCATIONS) - {'all', 'tags', 'search'}
         locations = all_locs if location == 'all' else [location]
         q = {
-             'title' : lambda x : getattr(x, 'title').lower(),
-             'author': lambda x: ' & '.join(getattr(x, 'authors')).lower(),
-             'collections':lambda x: ','.join(getattr(x, 'device_collections')).lower(),
-             'format':lambda x: os.path.splitext(x.path)[1].lower(),
-             'inlibrary':lambda x : getattr(x, 'in_library'),
-             'tags':lambda x : getattr(x, 'tags', [])
-             }
+            'title': lambda x: getattr(x, 'title').lower(),
+            'author': lambda x: ' & '.join(getattr(x, 'authors')).lower(),
+            'collections':lambda x: ','.join(getattr(x, 'device_collections')).lower(),
+            'format':lambda x: os.path.splitext(x.path)[1].lower(),
+            'inlibrary':lambda x: getattr(x, 'in_library'),
+            'tags':lambda x: getattr(x, 'tags', [])
+        }
         for x in ('author', 'format'):
             q[x+'s'] = q[x]
         upf = prefs['use_primary_find_in_search']
@@ -1533,7 +1533,7 @@ class DeviceBooksModel(BooksModel):  # {{{
         self.count_changed()
 
     def paths_deleted(self, paths):
-        self.map = list(range(0, len(self.db)))
+        self.map = list(range(len(self.db)))
         self.resort(False)
         self.research(True)
         self.count_changed()
@@ -1627,8 +1627,8 @@ class DeviceBooksModel(BooksModel):  # {{{
 
         keygen = {
                 'title': ('title_sorter', lambda x: sort_key(x) if x else b''),
-                'authors' : author_key,
-                'size' : ('size', int),
+                'authors': author_key,
+                'size': ('size', int),
                 'timestamp': ('datetime', functools.partial(dt_factory, assume_utc=True)),
                 'collections': ('device_collections', lambda x:sorted(x,
                     key=sort_key)),
@@ -1669,7 +1669,7 @@ class DeviceBooksModel(BooksModel):  # {{{
     def set_database(self, db):
         self.custom_columns = {}
         self.db = db
-        self.map = list(range(0, len(db)))
+        self.map = list(range(len(db)))
         self.research(reset=False)
         self.resort()
         self.count_changed()
@@ -1840,7 +1840,7 @@ class DeviceBooksModel(BooksModel):  # {{{
                     cname == 'collections' and (
                         callable(getattr(self.db, 'supports_collections', None)) and self.db.supports_collections())
             ):
-                return (_("Double click to <b>edit</b> me<br><br>"))
+                return (_('Double click to <b>edit</b> me<br><br>'))
         elif role == Qt.ItemDataRole.DecorationRole and cname == 'inlibrary':
             if hasattr(self.db[self.map[row]], 'in_library_waiting'):
                 return (self.sync_icon)
@@ -1893,7 +1893,7 @@ class DeviceBooksModel(BooksModel):  # {{{
                 self.upload_collections.emit(self.db)
                 return True
 
-            if cname == 'title' :
+            if cname == 'title':
                 self.db[idx].title = val
             elif cname == 'authors':
                 self.db[idx].authors = string_to_authors(val)
diff --git a/src/calibre/gui2/library/notes.py b/src/calibre/gui2/library/notes.py
index 94a1217a84..448d0c909d 100644
--- a/src/calibre/gui2/library/notes.py
+++ b/src/calibre/gui2/library/notes.py
@@ -350,7 +350,6 @@ class SearchInput(QWidget):
         r.restriction_changed.connect(self.search_changed)
         l.addWidget(r)
 
-
     @property
     def current_query(self):
         return {
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index dac15f7768..f7d6262df7 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -454,7 +454,7 @@ class BooksView(QTableView):  # {{{
         self.preserve_state = partial(PreserveViewState, self)
         self.marked_changed_listener = FunctionDispatcher(self.marked_changed)
 
-        # {{{ Column Header setup
+        # Column Header setup {{{
         self.can_add_columns = True
         self.was_restored = False
         self.allow_save_state = True
@@ -751,7 +751,7 @@ class BooksView(QTableView):  # {{{
 
             ac = getattr(m, 'column_mouse_move_action', None)
             if ac is None:
-                ac = m.column_mouse_move_action = m.addAction(_("Allow moving columns with the mouse"),
+                ac = m.column_mouse_move_action = m.addAction(_('Allow moving columns with the mouse'),
                           partial(self.column_header_context_handler, action='lock', column=col, view=view))
                 ac.setCheckable(True)
             ac.setChecked(view.column_header.sectionsMovable())
@@ -1335,7 +1335,7 @@ class BooksView(QTableView):  # {{{
     def visible_columns(self):
         h = self.horizontalHeader()
         logical_indices = (x for x in range(h.count()) if not h.isSectionHidden(x))
-        rmap = {i:x for i, x in enumerate(self.column_map)}
+        rmap = dict(enumerate(self.column_map))
         return (rmap[h.visualIndex(x)] for x in logical_indices if h.visualIndex(x) > -1)
 
     def refresh_book_details(self, force=False):
diff --git a/src/calibre/gui2/lrf_renderer/document.py b/src/calibre/gui2/lrf_renderer/document.py
index bd65174ccc..2d34f4f90a 100644
--- a/src/calibre/gui2/lrf_renderer/document.py
+++ b/src/calibre/gui2/lrf_renderer/document.py
@@ -216,7 +216,7 @@ class Header(Canvas):
 
     def __init__(self, font_loader, header, page_style, logger, opts, ruby_tags, link_activated):
         Canvas.__init__(self, font_loader, header, logger, opts, ruby_tags, link_activated,
-                        page_style.textwidth,  page_style.headheight)
+                        page_style.textwidth, page_style.headheight)
         if opts.visual_debug:
             self.setPen(QPen(Qt.GlobalColor.blue, 1, Qt.PenStyle.DashLine))
 
diff --git a/src/calibre/gui2/lrf_renderer/main.py b/src/calibre/gui2/lrf_renderer/main.py
index 15af0abb16..5e69d505db 100644
--- a/src/calibre/gui2/lrf_renderer/main.py
+++ b/src/calibre/gui2/lrf_renderer/main.py
@@ -160,7 +160,7 @@ class Main(MainWindow, Ui_MainWindow):
 
     def parsed(self):
         if not self.renderer.aborted and self.renderer.lrf is not None:
-            width, height =  self.renderer.lrf.device_info.width, \
+            width, height = self.renderer.lrf.device_info.width, \
                                             self.renderer.lrf.device_info.height
             hdelta = self.tool_bar.height()+3
 
@@ -197,7 +197,7 @@ class Main(MainWindow, Ui_MainWindow):
             print('Error rendering document', file=sys.stderr)
             print(exception, file=sys.stderr)
             print(self.renderer.formatted_traceback, file=sys.stderr)
-            msg =  '<p><b>%s</b>: '%(exception.__class__.__name__,) + as_unicode(exception) + '</p>'
+            msg = '<p><b>%s</b>: '%(exception.__class__.__name__,) + as_unicode(exception) + '</p>'
             msg += '<p>Failed to render document</p>'
             msg += '<p>Detailed <b>traceback</b>:<pre>'
             msg += self.renderer.formatted_traceback + '</pre>'
diff --git a/src/calibre/gui2/lrf_renderer/text.py b/src/calibre/gui2/lrf_renderer/text.py
index 53ab890a58..75b9b3b6e6 100644
--- a/src/calibre/gui2/lrf_renderer/text.py
+++ b/src/calibre/gui2/lrf_renderer/text.py
@@ -17,10 +17,16 @@ from polyglot.builtins import string_or_bytes
 
 def WEIGHT_MAP(wt):
     return int(wt / 10 - 1)
+
+
 def NULL(a, b):
     return a
+
+
 def COLOR(a, b):
     return QColor(*a)
+
+
 def WEIGHT(a, b):
     return WEIGHT_MAP(a)
 
@@ -100,7 +106,7 @@ class FontLoader:
 
 
 class Style:
-    map = collections.defaultdict(lambda : NULL)
+    map = collections.defaultdict(lambda: NULL)
 
     def __init__(self, style, dpi):
         self.fdpi = dpi/720
@@ -118,7 +124,7 @@ class Style:
 
 class TextStyle(Style):
 
-    map = collections.defaultdict(lambda : NULL,
+    map = collections.defaultdict(lambda: NULL,
         fontsize=operator.mul,
         fontwidth=operator.mul,
         fontweight=WEIGHT,
@@ -150,7 +156,7 @@ class TextStyle(Style):
 
 
 class BlockStyle(Style):
-    map = collections.defaultdict(lambda : NULL,
+    map = collections.defaultdict(lambda: NULL,
         bgcolor=COLOR,
         framecolor=COLOR,
         )
@@ -172,11 +178,11 @@ class TextBlock:
 
     has_content = property(fget=lambda self: self.peek_index < len(self.lines)-1)
     XML_ENTITIES = {
-            "apos" : "'",
-            "quot" : '"',
-            "amp" : "&",
-            "lt" : "<",
-            "gt" : ">"
+            'apos': "'",
+            'quot': '"',
+            'amp' : '&',
+            'lt'  : '<',
+            'gt'  : '>'
     }
 
     def __init__(self, tb, font_loader, respect_max_y, text_width, logger,
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 7f99a9f0f8..707c31ec25 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -92,7 +92,7 @@ def find_portable_library():
 
     if len(lib) > 74:
         error_dialog(None, _('Path too long'),
-            _("Path to Calibre Portable (%s) "
+            _('Path to Calibre Portable (%s) '
                 'too long. It must be less than 59 characters.')%base, show=True)
         raise AbortInit()
 
@@ -433,7 +433,7 @@ def run_gui_(opts, args, app, gui_debug=None):
             winutil.prepare_for_restart()
             with open(debugfile, 'r+b') as f:
                 raw = f.read()
-                raw = re.sub(b'(?<!\r)\n', b'\r\n', raw)
+                raw = re.sub(br'(?<!\r)\n', br'\r\n', raw)
                 f.seek(0)
                 f.truncate()
                 f.write(raw)
diff --git a/src/calibre/gui2/main_window.py b/src/calibre/gui2/main_window.py
index aa8a50aed9..a4d6247788 100644
--- a/src/calibre/gui2/main_window.py
+++ b/src/calibre/gui2/main_window.py
@@ -26,7 +26,6 @@ Launch the Graphical User Interface
 
 
 class GarbageCollector(QObject):
-
     '''
     Disable automatic garbage collection and instead collect manually
     every INTERVAL milliseconds.
diff --git a/src/calibre/gui2/markdown_editor.py b/src/calibre/gui2/markdown_editor.py
index 52ff74fa28..ffa1085a50 100644
--- a/src/calibre/gui2/markdown_editor.py
+++ b/src/calibre/gui2/markdown_editor.py
@@ -45,8 +45,8 @@ class MarkdownEditDialog(QDialog):
 
     def __init__(self, parent, text, column_name=None, base_url=None):
         QDialog.__init__(self, parent)
-        self.setObjectName("MarkdownEditDialog")
-        self.setWindowTitle(_("Edit Markdown"))
+        self.setObjectName('MarkdownEditDialog')
+        self.setWindowTitle(_('Edit Markdown'))
         self.verticalLayout = l = QVBoxLayout(self)
         self.textbox = editor = Editor(self)
         editor.set_base_url(base_url)
@@ -60,7 +60,7 @@ class MarkdownEditDialog(QDialog):
         self.setWindowFlags(self.windowFlags()&(~Qt.WindowType.WindowContextHelpButtonHint))
         self.setWindowIcon(icon)
 
-        self.textbox.markdown =text
+        self.textbox.markdown = text
         # self.textbox.wyswyg_dirtied()
 
         if column_name:
diff --git a/src/calibre/gui2/markdown_syntax_highlighter.py b/src/calibre/gui2/markdown_syntax_highlighter.py
index 3a44db07b1..f26c0f23aa 100644
--- a/src/calibre/gui2/markdown_syntax_highlighter.py
+++ b/src/calibre/gui2/markdown_syntax_highlighter.py
@@ -35,60 +35,60 @@ class MarkdownHighlighter(QSyntaxHighlighter):
     }
 
     key_theme_maps = {
-        'Bold': "bold",
-        'Italic': "emphasis",
-        'BoldItalic': "boldemphasis",
-        'uBold': "bold",
-        'uItalic': "emphasis",
-        'uBoldItalic': "boldemphasis",
-        'Link': "link",
-        'Image': "image",
-        'LinkRef': "link",
-        'Header': "header",
-        'HeaderLine': "header",
-        'CodeBlock': "codeblock",
-        'UnorderedList': "unorderedlist",
-        'UnorderedListStar': "unorderedlist",
-        'OrderedList': "orderedlist",
-        'BlockQuote': "blockquote",
-        'CodeSpan': "codespan",
-        'HR': "line",
-        'Html': "html",
-        'Entity': "entity",
+        'Bold': 'bold',
+        'Italic': 'emphasis',
+        'BoldItalic': 'boldemphasis',
+        'uBold': 'bold',
+        'uItalic': 'emphasis',
+        'uBoldItalic': 'boldemphasis',
+        'Link': 'link',
+        'Image': 'image',
+        'LinkRef': 'link',
+        'Header': 'header',
+        'HeaderLine': 'header',
+        'CodeBlock': 'codeblock',
+        'UnorderedList': 'unorderedlist',
+        'UnorderedListStar': 'unorderedlist',
+        'OrderedList': 'orderedlist',
+        'BlockQuote': 'blockquote',
+        'CodeSpan': 'codespan',
+        'HR': 'line',
+        'Html': 'html',
+        'Entity': 'entity',
     }
 
-    light_theme =  {
-        "bold": {"font-weight":"bold"},
-        "emphasis": {"font-style":"italic"},
-        "boldemphasis": {"font-weight":"bold", "font-style":"italic"},
-        "link": {"color":light_link_color.name(), "font-weight":"normal", "font-style":"normal"},
-        "image": {"color":"#cb4b16", "font-weight":"normal", "font-style":"normal"},
-        "header": {"color":"#2aa198", "font-weight":"bold", "font-style":"normal"},
-        "unorderedlist": {"color":"red", "font-weight":"normal", "font-style":"normal"},
-        "orderedlist": {"color":"red", "font-weight":"normal", "font-style":"normal"},
-        "blockquote": {"color":"red", "font-weight":"bold", "font-style":"normal"},
-        "codespan": {"color":"#ff5800", "font-weight":"normal", "font-style":"normal"},
-        "codeblock": {"color":"#ff5800", "font-weight":"normal", "font-style":"normal"},
-        "line": {"color":"#2aa198", "font-weight":"normal", "font-style":"normal"},
-        "html": {"color":"#c000c0", "font-weight":"normal", "font-style":"normal"},
-        "entity": {"color":"#006496"},
+    light_theme = {
+        'bold': {'font-weight':'bold'},
+        'emphasis': {'font-style':'italic'},
+        'boldemphasis': {'font-weight':'bold', 'font-style':'italic'},
+        'link': {'color':light_link_color.name(), 'font-weight':'normal', 'font-style':'normal'},
+        'image': {'color':'#cb4b16', 'font-weight':'normal', 'font-style':'normal'},
+        'header': {'color':'#2aa198', 'font-weight':'bold', 'font-style':'normal'},
+        'unorderedlist': {'color':'red', 'font-weight':'normal', 'font-style':'normal'},
+        'orderedlist': {'color':'red', 'font-weight':'normal', 'font-style':'normal'},
+        'blockquote': {'color':'red', 'font-weight':'bold', 'font-style':'normal'},
+        'codespan': {'color':'#ff5800', 'font-weight':'normal', 'font-style':'normal'},
+        'codeblock': {'color':'#ff5800', 'font-weight':'normal', 'font-style':'normal'},
+        'line': {'color':'#2aa198', 'font-weight':'normal', 'font-style':'normal'},
+        'html': {'color':'#c000c0', 'font-weight':'normal', 'font-style':'normal'},
+        'entity': {'color':'#006496'},
     }
 
-    dark_theme =  {
-        "bold": {"font-weight":"bold"},
-        "emphasis": {"font-style":"italic"},
-        "boldemphasis": {"font-weight":"bold", "font-style":"italic"},
-        "link": {"color":dark_link_color.name(), "font-weight":"normal", "font-style":"normal"},
-        "image": {"color":"#cb4b16", "font-weight":"normal", "font-style":"normal"},
-        "header": {"color":"#2aa198", "font-weight":"bold", "font-style":"normal"},
-        "unorderedlist": {"color":"yellow", "font-weight":"normal", "font-style":"normal"},
-        "orderedlist": {"color":"yellow", "font-weight":"normal", "font-style":"normal"},
-        "blockquote": {"color":"yellow", "font-weight":"bold", "font-style":"normal"},
-        "codespan": {"color":"#90ee90", "font-weight":"normal", "font-style":"normal"},
-        "codeblock": {"color":"#ff9900", "font-weight":"normal", "font-style":"normal"},
-        "line": {"color":"#2aa198", "font-weight":"normal", "font-style":"normal"},
-        "html": {"color":"#f653a6", "font-weight":"normal", "font-style":"normal"},
-        "entity": {"color":"#ff82ac"},
+    dark_theme = {
+        'bold': {'font-weight':'bold'},
+        'emphasis': {'font-style':'italic'},
+        'boldemphasis': {'font-weight':'bold', 'font-style':'italic'},
+        'link': {'color':dark_link_color.name(), 'font-weight':'normal', 'font-style':'normal'},
+        'image': {'color':'#cb4b16', 'font-weight':'normal', 'font-style':'normal'},
+        'header': {'color':'#2aa198', 'font-weight':'bold', 'font-style':'normal'},
+        'unorderedlist': {'color':'yellow', 'font-weight':'normal', 'font-style':'normal'},
+        'orderedlist': {'color':'yellow', 'font-weight':'normal', 'font-style':'normal'},
+        'blockquote': {'color':'yellow', 'font-weight':'bold', 'font-style':'normal'},
+        'codespan': {'color':'#90ee90', 'font-weight':'normal', 'font-style':'normal'},
+        'codeblock': {'color':'#ff9900', 'font-weight':'normal', 'font-style':'normal'},
+        'line': {'color':'#2aa198', 'font-weight':'normal', 'font-style':'normal'},
+        'html': {'color':'#f653a6', 'font-weight':'normal', 'font-style':'normal'},
+        'entity': {'color':'#ff82ac'},
     }
 
     def __init__(self, parent):
@@ -130,15 +130,15 @@ class MarkdownHighlighter(QSyntaxHighlighter):
         cursor = QTextCursor(self.document())
         bf = cursor.blockFormat()
 
-        #Block quotes can contain all elements so process it first, internally process recursively and return
+        # Block quotes can contain all elements so process it first, internally process recursively and return
         if self.highlightBlockQuote(text, cursor, bf):
             return
 
-        #If empty line no need to check for below elements just return
+        # If empty line no need to check for below elements just return
         if self.highlightEmptyLine(text, cursor, bf):
             return
 
-        #If horizontal line, look at pevious line to see if its a header, process and return
+        # If horizontal line, look at pevious line to see if its a header, process and return
         if self.highlightHorizontalLine(text, cursor, bf):
             return
 
@@ -186,9 +186,9 @@ class MarkdownHighlighter(QSyntaxHighlighter):
             prev = prevBlock.text()
             prevAscii = str(prev.replace('\u2029','\n'))
             if self.offset == 0 and prevAscii.strip():
-                #print "Its a header"
+                # print('Its a header')
                 prevCursor.select(QTextCursor.SelectionType.LineUnderCursor)
-                #prevCursor.setCharFormat(self.MARKDOWN_KWS_FORMAT['Header'])
+                # prevCursor.setCharFormat(self.MARKDOWN_KWS_FORMAT['Header'])
                 formatRange = QTextLayout.FormatRange()
                 formatRange.format = self.MARKDOWN_KWS_FORMAT['Header']
                 formatRange.length = prevCursor.block().length()
@@ -205,9 +205,9 @@ class MarkdownHighlighter(QSyntaxHighlighter):
     def highlightHeader(self, text, cursor, bf):
         found = False
         for mo in re.finditer(self.MARKDOWN_KEYS_REGEX['Header'],text):
-            #bf.setBackground(QBrush(QColor(7,54,65)))
-            #cursor.movePosition(QTextCursor.End)
-            #cursor.mergeBlockFormat(bf)
+            # bf.setBackground(QBrush(QColor(7,54,65)))
+            # cursor.movePosition(QTextCursor.End)
+            # cursor.mergeBlockFormat(bf)
             self.setFormat(self.offset+ mo.start(), mo.end() - mo.start(), self.MARKDOWN_KWS_FORMAT['Header'])
             found = True
         return found
@@ -257,7 +257,7 @@ class MarkdownHighlighter(QSyntaxHighlighter):
         return self._highlightBoldEmphasis(text[offset:], cursor, bf, offset, False, False)
 
     def _highlightBoldEmphasis(self, text, cursor, bf, offset, bold, emphasis):
-        #detect and apply imbricated Bold/Emphasis
+        # detect and apply imbricated Bold/Emphasis
         found = False
 
         def apply(match, bold, emphasis):
diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py
index dd0ccacd88..0231432cf3 100644
--- a/src/calibre/gui2/metadata/basic_widgets.py
+++ b/src/calibre/gui2/metadata/basic_widgets.py
@@ -196,9 +196,9 @@ def make_undoable(spinbox):
             m = QMenu(self)
             if hasattr(self, 'setDateTime'):
                 m.addAction(_('Set date to undefined') + '\t' + QKeySequence(Qt.Key.Key_Minus).toString(QKeySequence.SequenceFormat.NativeText),
-                            lambda : self.setDateTime(self.minimumDateTime()))
+                            lambda: self.setDateTime(self.minimumDateTime()))
                 m.addAction(_('Set date to today') + '\t' + QKeySequence(Qt.Key.Key_Equal).toString(QKeySequence.SequenceFormat.NativeText),
-                            lambda : self.setDateTime(QDateTime.currentDateTime()))
+                            lambda: self.setDateTime(QDateTime.currentDateTime()))
             m.addAction(_('&Undo') + access_key(QKeySequence.StandardKey.Undo), self.undo).setEnabled(self.undo_stack.canUndo())
             m.addAction(_('&Redo') + access_key(QKeySequence.StandardKey.Redo), self.redo).setEnabled(self.undo_stack.canRedo())
             m.addSeparator()
@@ -222,8 +222,8 @@ def make_undoable(spinbox):
 
     return UndoableSpinbox
 
-# Title {{{
 
+# Title {{{
 
 class TitleEdit(EnLineEdit, ToMetadataMixin):
 
@@ -357,8 +357,8 @@ class TitleSortEdit(TitleEdit, ToMetadataMixin, LineEditIndicators):
 
 # }}}
 
-# Authors {{{
 
+# Authors {{{
 
 class AuthorsEdit(EditWithComplete, ToMetadataMixin):
 
@@ -407,7 +407,7 @@ class AuthorsEdit(EditWithComplete, ToMetadataMixin):
                 try:
                     self.commit(self.db, self.id_)
                 except OSError as e:
-                    e.locking_violation_msg = _('Could not change on-disk location of this book\'s files.')
+                    e.locking_violation_msg = _("Could not change on-disk location of this book's files.")
                     raise
                 self.db.commit()
                 self.original_val = self.current_val
@@ -479,7 +479,7 @@ class AuthorSortEdit(EnLineEdit, ToMetadataMixin, LineEditIndicators):
     TOOLTIP = _('Specify how the author(s) of this book should be sorted. '
             'For example Charles Dickens should be sorted as Dickens, '
             'Charles.\nIf the box is colored green, then text matches '
-            'the individual author\'s sort strings. If it is colored '
+            "the individual author's sort strings. If it is colored "
             'red, then the authors and this text do not match.')
     LABEL = _('Author s&ort:')
     FIELD_NAME = 'author_sort'
@@ -622,8 +622,8 @@ class AuthorSortEdit(EnLineEdit, ToMetadataMixin, LineEditIndicators):
 
 # }}}
 
-# Series {{{
 
+# Series {{{
 
 class SeriesEdit(EditWithComplete, ToMetadataMixin):
 
@@ -794,8 +794,8 @@ class BuddyLabel(QLabel):  # {{{
         self.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignVCenter)
 # }}}
 
-# Formats {{{
 
+# Formats {{{
 
 class Format(QListWidgetItem):
 
@@ -1022,19 +1022,17 @@ class FormatsManager(QWidget):
                 db.add_format(id_, ext, spool, notify=False,
                         index_is_id=True)
         dbfmts = db.formats(id_, index_is_id=True)
-        db_extensions = {fl.lower() for fl in (dbfmts.split(',') if dbfmts
-            else [])}
+        db_extensions = {fl.lower() for fl in (dbfmts.split(',') if dbfmts else [])}
         extensions = new_extensions.union(old_extensions)
         for ext in db_extensions:
             if ext not in extensions and ext in self.original_val:
                 db.remove_format(id_, ext, notify=False, index_is_id=True)
 
         self.changed = False
-        return
 
     def add_format(self, *args):
         files = choose_files_and_remember_all_files(
-                self, 'add formats dialog', _("Choose formats for ") + self.dialog.title.current_val,
+                self, 'add formats dialog', _('Choose formats for ') + self.dialog.title.current_val,
                 [(_('Books'), BOOK_EXTENSIONS)])
         self._add_formats(files)
 
@@ -1202,7 +1200,7 @@ class Cover(ImageView):  # {{{
         self.select_cover_button = CB(_('&Browse'), 'document_open.png', self.select_cover)
         self.trim_cover_button = b = CB(_('Trim bord&ers'), 'trim.png')
         b.setToolTip(_(
-            'Automatically detect and remove extra space at the cover\'s edges.\n'
+            "Automatically detect and remove extra space at the cover's edges.\n"
             'Pressing it repeatedly can sometimes remove stubborn borders.'))
         b.m = m = QMenu(b)
         b.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
@@ -1282,12 +1280,12 @@ class Cover(ImageView):  # {{{
                 return
             cover = None
             try:
-                with open(_file, "rb") as f:
+                with open(_file, 'rb') as f:
                     cover = f.read()
             except OSError as e:
                 d = error_dialog(
                         self, _('Error reading file'),
-                        _("<p>There was an error reading from file: <br /><b>") + _file + "</b></p><br />"+str(e))
+                        _('<p>There was an error reading from file: <br /><b>') + _file + '</b></p><br />'+str(e))
                 d.exec()
             if cover:
                 orig = self.current_val
@@ -1295,8 +1293,8 @@ class Cover(ImageView):  # {{{
                 if self.current_val is None:
                     self.current_val = orig
                     error_dialog(self,
-                        _("Not a valid picture"),
-                            _file + _(" is not a valid picture"), show=True)
+                        _('Not a valid picture'),
+                            _file + _(' is not a valid picture'), show=True)
 
     def remove_cover(self, *args):
         self.current_val = None
@@ -1603,8 +1601,8 @@ class LanguagesEdit(LE, ToMetadataMixin):  # {{{
         self.update_recently_used()
 # }}}
 
-# Identifiers {{{
 
+# Identifiers {{{
 
 class Identifiers(Dialog):
 
@@ -1616,7 +1614,7 @@ class Identifiers(Dialog):
         self.l = l = QVBoxLayout(self)
 
         self.la = la = QLabel(_(
-            'Edit the book\'s identifiers. Every identifier must be on a separate line, and have the form type:value'))
+            "Edit the book's identifiers. Every identifier must be on a separate line, and have the form type:value"))
         la.setWordWrap(True)
         self.text = t = QPlainTextEdit(self)
         l.addWidget(la), l.addWidget(t)
@@ -1750,7 +1748,7 @@ class IdentifiersEdit(QLineEdit, ToMetadataMixin, LineEditIndicators):
         if identifier_found:
             return
         text = str(QApplication.clipboard().text()).strip()
-        if text.startswith('http://') or text.startswith('https://'):
+        if text.startswith(('http://', 'https://')):
             return self.paste_prefix('url')
         try:
             prefix = gprefs['paste_isbn_prefixes'][0]
@@ -1796,14 +1794,14 @@ class IdentifiersEdit(QLineEdit, ToMetadataMixin, LineEditIndicators):
         rules = msprefs['id_link_rules']
         if rules:
             formatter = EvalFormatter()
-            vals = {'id' : '__ID_REGEX_PLACEHOLDER__'}
+            vals = {'id': '__ID_REGEX_PLACEHOLDER__'}
             for key in rules.keys():
                 rule = rules[key]
                 for name, template in rule:
                     try:
                         url_pattern = formatter.safe_format(template, vals, '', vals)
                         url_pattern = re.escape(url_pattern).replace('__ID_REGEX_PLACEHOLDER__', '(?P<new_id>.+)')
-                        if url_pattern.startswith('http:') or url_pattern.startswith('https:'):
+                        if url_pattern.startswith(('http:', 'https:')):
                             url_pattern = '(?:http|https):' + url_pattern.partition(':')[2]
                         new_id = re.compile(url_pattern)
                         new_id = new_id.search(text).group('new_id')
@@ -1829,7 +1827,7 @@ class IdentifiersEdit(QLineEdit, ToMetadataMixin, LineEditIndicators):
                     return True
             except Exception:
                 pass
-        for (key, prefix) in (
+        for key, prefix in (
             ('doi', 'https://dx.doi.org/'),
             ('doi', 'https://doi.org/'),
             ('arxiv', 'https://arxiv.org/abs/'),
@@ -1845,6 +1843,7 @@ class IdentifiersEdit(QLineEdit, ToMetadataMixin, LineEditIndicators):
         return False
 # }}}
 
+
 class IndicatorLineEdit(QLineEdit, LineEditIndicators):
     pass
 
@@ -1978,8 +1977,8 @@ class PublisherEdit(EditWithComplete, ToMetadataMixin):  # {{{
 
 # }}}
 
-# DateEdit {{{
 
+# DateEdit {{{
 
 class DateEdit(make_undoable(DateTimeEdit), ToMetadataMixin):
 
diff --git a/src/calibre/gui2/metadata/config.py b/src/calibre/gui2/metadata/config.py
index 039579f029..bf15d716ce 100644
--- a/src/calibre/gui2/metadata/config.py
+++ b/src/calibre/gui2/metadata/config.py
@@ -30,7 +30,7 @@ class FieldsModel(FM):  # {{{
         for x in fields:
             if not x.startswith('identifier:') and x not in self.exclude:
                 self.fields.append(x)
-        self.fields.sort(key=lambda x:self.descs.get(x, x))
+        self.fields.sort(key=lambda x: self.descs.get(x, x))
         self.endResetModel()
 
     def state(self, field, defaults=False):
diff --git a/src/calibre/gui2/metadata/diff.py b/src/calibre/gui2/metadata/diff.py
index 61be77adae..6a79820247 100644
--- a/src/calibre/gui2/metadata/diff.py
+++ b/src/calibre/gui2/metadata/diff.py
@@ -55,8 +55,8 @@ from polyglot.builtins import iteritems, itervalues
 
 Widgets = namedtuple('Widgets', 'new old label button')
 
-# Widgets {{{
 
+# Widgets {{{
 
 class LineEdit(EditWithComplete):
 
@@ -626,7 +626,6 @@ class CoverZoom(QWidget):
 
 class CompareMany(QDialog):
 
-
     def __init__(self, ids, get_metadata, field_metadata, parent=None,
                  window_title=None,
                  reject_button_tooltip=None,
@@ -747,27 +746,22 @@ class CompareMany(QDialog):
         b.setFocus(Qt.FocusReason.OtherFocusReason)
         self.next_called = False
 
-
     def show_zoomed_cover(self, pixmap):
         self.cover_zoom.set_pixmap(pixmap)
         self.stack.setCurrentIndex(1)
 
-
     @property
     def mark_rejected(self):
         return self.markq.isChecked()
 
-
     def action_button_clicked(self):
         self.action_button_action(self.ids[0])
 
-
     def accept(self):
         self.save_geometry(gprefs, 'diff_dialog_geom')
         self.compare_widget.save_comments_controls_state()
         super().accept()
 
-
     def reject(self):
         if self.stack.currentIndex() == 1:
             self.stack.setCurrentIndex(0)
@@ -780,12 +774,10 @@ class CompareMany(QDialog):
         self.compare_widget.save_comments_controls_state()
         super().reject()
 
-
     @property
     def current_mi(self):
         return self.compare_widget.current_mi
 
-
     def show_current_item(self):
         self.setWindowTitle(self.window_title + _(' [%(num)d of %(tot)d]') % dict(
             num=(self.total - len(self.ids) + 1), tot=self.total))
@@ -819,7 +811,6 @@ class CompareMany(QDialog):
             return self.accept()
         self.show_current_item()
 
-
     def previous_item(self):
         if self.previous_items:
             # get the last book id from the previous items list and remove it from the previous items list
@@ -838,7 +829,6 @@ class CompareMany(QDialog):
             self.ids.insert(0, last_previous_item)
             self.show_current_item()
 
-
     def accept_all_remaining(self):
         self.next_item(True)
         for id_ in self.ids:
@@ -847,7 +837,6 @@ class CompareMany(QDialog):
         self.ids = []
         self.accept()
 
-
     def reject_all_remaining(self):
         from calibre.gui2.dialogs.confirm_delete import confirm
         if not confirm(ngettext(
@@ -863,7 +852,6 @@ class CompareMany(QDialog):
         self.ids = []
         self.accept()
 
-
     def keyPressEvent(self, ev):
         if ev.key() in (Qt.Key.Key_Enter, Qt.Key.Key_Return):
             ev.accept()
diff --git a/src/calibre/gui2/metadata/single.py b/src/calibre/gui2/metadata/single.py
index 88f8ec10a3..35cb58fb15 100644
--- a/src/calibre/gui2/metadata/single.py
+++ b/src/calibre/gui2/metadata/single.py
@@ -240,7 +240,7 @@ class MetadataSingleDialogBase(QDialog):
         self.manage_authors_button.setIcon(QIcon.ic('user_profile.png'))
         self.manage_authors_button.setToolTip('<p>' + _(
             'Open the Manage Authors editor. Use to rename authors and correct '
-            'individual author\'s sort values') + '</p>')
+            "individual author's sort values") + '</p>')
         self.manage_authors_button.clicked.connect(self.authors.manage_authors)
 
         self.series_editor_button = QToolButton(self)
@@ -465,7 +465,7 @@ class MetadataSingleDialogBase(QDialog):
     def update_window_title(self, *args):
         title = self.title.current_val
         if len(title) > 50:
-            title = title[:50] + '\u2026'
+            title = title[:50] + '…'
         self.setWindowTitle(BASE_TITLE + ' - ' +
                 title + ' -' +
                 _(' [%(num)d of %(tot)d]')%dict(num=self.current_row+1,
@@ -674,7 +674,7 @@ class MetadataSingleDialogBase(QDialog):
                 widget.commit(self.db, self.book_id)
                 self.books_to_refresh |= getattr(widget, 'books_to_refresh', set())
             except OSError as e:
-                e.locking_violation_msg = _('Could not change on-disk location of this book\'s files.')
+                e.locking_violation_msg = _("Could not change on-disk location of this book's files.")
                 raise
         for widget in getattr(self, 'custom_metadata_widgets', []):
             self.books_to_refresh |= widget.commit(self.book_id)
@@ -841,7 +841,7 @@ class MetadataSingleDialog(MetadataSingleDialogBase):  # {{{
         self.tabs = []
         self.labels = []
         self.tabs.append(QWidget(self))
-        self.central_widget.addTab(ScrollArea(self.tabs[0], self), _("&Basic metadata"))
+        self.central_widget.addTab(ScrollArea(self.tabs[0], self), _('&Basic metadata'))
         self.tabs[0].l = l = QVBoxLayout()
         self.tabs[0].tl = tl = QGridLayout()
         self.tabs[0].setLayout(l)
@@ -1006,12 +1006,12 @@ class MetadataSingleDialogAlt1(MetadataSingleDialogBase):  # {{{
 
         self.on_drag_enter.connect(self.handle_drag_enter)
         self.tabs.append(DragTrackingWidget(self, self.on_drag_enter))
-        self.central_widget.addTab(ScrollArea(self.tabs[0], self), _("&Metadata"))
+        self.central_widget.addTab(ScrollArea(self.tabs[0], self), _('&Metadata'))
         self.tabs[0].l = QGridLayout()
         self.tabs[0].setLayout(self.tabs[0].l)
 
         self.tabs.append(QWidget(self))
-        self.central_widget.addTab(ScrollArea(self.tabs[1], self), _("&Cover and formats"))
+        self.central_widget.addTab(ScrollArea(self.tabs[1], self), _('&Cover and formats'))
         self.tabs[1].l = QGridLayout()
         self.tabs[1].setLayout(self.tabs[1].l)
 
@@ -1083,7 +1083,7 @@ class MetadataSingleDialogAlt1(MetadataSingleDialogBase):  # {{{
         sto(self.tags_editor_button, self.publisher_editor_button)
         sto(self.publisher_editor_button, self.paste_isbn_button)
         tl.addItem(QSpacerItem(1, 1, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Expanding),
-                   13, 1, 1 ,1)
+                   13, 1, 1, 1)
 
         w = getattr(self, 'custom_metadata_widgets_parent', None)
         if w is not None:
@@ -1166,7 +1166,7 @@ class MetadataSingleDialogAlt2(MetadataSingleDialogBase):  # {{{
 
         main_splitter = self.main_splitter = Splitter(Qt.Orientation.Horizontal, self)
         self.central_widget.tabBar().setVisible(False)
-        self.central_widget.addTab(ScrollArea(main_splitter, self), _("&Metadata"))
+        self.central_widget.addTab(ScrollArea(main_splitter, self), _('&Metadata'))
 
         # Left side (metadata & comments)
         # basic and custom split from comments
@@ -1242,7 +1242,7 @@ class MetadataSingleDialogAlt2(MetadataSingleDialogBase):  # {{{
         sto(self.tags_editor_button, self.publisher_editor_button)
         sto(self.publisher_editor_button, self.paste_isbn_button)
         tl.addItem(QSpacerItem(1, 1, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Expanding),
-                   13, 1, 1 ,1)
+                   13, 1, 1, 1)
 
         # Custom metadata in col 1
         w = getattr(self, 'custom_metadata_widgets_parent', None)
diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py
index 955125dfc2..e35399b5ea 100644
--- a/src/calibre/gui2/metadata/single_download.py
+++ b/src/calibre/gui2/metadata/single_download.py
@@ -558,7 +558,7 @@ class IdentifyWidget(QWidget):  # {{{
             error_dialog(self, _('No matches found'), '<p>' +
                     _('Failed to find any books that '
                         'match your search. Try making the search <b>less '
-                        'specific</b>. For example, use only the author\'s '
+                        "specific</b>. For example, use only the author's "
                         'last name and a single distinctive word from '
                         'the title.<p>To see the full log, click "Show details".'),
                     show=True, det_msg=log)
diff --git a/src/calibre/gui2/notify.py b/src/calibre/gui2/notify.py
index 763a371136..3cc81213ef 100644
--- a/src/calibre/gui2/notify.py
+++ b/src/calibre/gui2/notify.py
@@ -125,12 +125,12 @@ class DBUSNotifier(Notifier):
             self.address, 'AddNotification', 'sa{sv}', (
                 str(replaces_id or 0),
                 {
-                "title": ('s', summary),
-                "body": ('s', body),
-                "icon": (
+                'title': ('s', summary),
+                'body': ('s', body),
+                'icon': (
                     '(sv)',
                     (
-                        "bytes",
+                        'bytes',
                         ('ay', icon(data=True))
                     )
                 ),
@@ -275,7 +275,8 @@ def hello():
 def develop_win():
     from calibre_extensions.wintoast import initialize_toast, notify
     initialize_toast(__appname__, MAIN_APP_UID)
-    notify("calibre notification", "hello world", icon())
+    notify('calibre notification', 'hello world', icon())
+
 
 if __name__ == '__main__':
     hello()
diff --git a/src/calibre/gui2/open_with.py b/src/calibre/gui2/open_with.py
index 3d45ee233c..758125646f 100644
--- a/src/calibre/gui2/open_with.py
+++ b/src/calibre/gui2/open_with.py
@@ -161,7 +161,7 @@ if iswindows:
 
     del run_program
 
-    def run_program(entry, path, parent):  # noqa
+    def run_program(entry, path, parent):
         import re
         cmdline = entry_to_cmdline(entry, path)
         flags = subprocess.CREATE_DEFAULT_ERROR_MODE | subprocess.CREATE_NEW_PROCESS_GROUP
diff --git a/src/calibre/gui2/preferences/__init__.py b/src/calibre/gui2/preferences/__init__.py
index c56e2c0b21..92689d62f6 100644
--- a/src/calibre/gui2/preferences/__init__.py
+++ b/src/calibre/gui2/preferences/__init__.py
@@ -42,7 +42,6 @@ class AbortInitialize(Exception):
 
 
 class ConfigWidgetInterface:
-
     '''
     This class defines the interface that all widgets displayed in the
     Preferences dialog must implement. See :class:`ConfigWidgetBase` for
@@ -118,6 +117,7 @@ class ConfigWidgetInterface:
             r = r | bool(getattr(t, method)(*args))
         return r
 
+
 def set_help_tips(gui_obj, tt):
     if tt:
         if not str(gui_obj.whatsThis()):
@@ -265,7 +265,6 @@ class CommaSeparatedList(Setting):
 
 
 class ConfigWidgetBase(QWidget, ConfigWidgetInterface):
-
     '''
     Base class that contains code to easily add standard config widgets like
     checkboxes, combo boxes, text fields and so on. See the :meth:`register`
@@ -497,7 +496,6 @@ class TableWidgetWithMoveByKeyPress(QTableWidget):
 
 # Testing {{{
 
-
 def test_widget(category, name, gui=None):
     show_config_widget(category, name, gui=gui, show_restart_msg=True)
 
diff --git a/src/calibre/gui2/preferences/coloring.py b/src/calibre/gui2/preferences/coloring.py
index d8ad6f9ab1..fe85325ded 100644
--- a/src/calibre/gui2/preferences/coloring.py
+++ b/src/calibre/gui2/preferences/coloring.py
@@ -69,11 +69,11 @@ icon_rule_kinds = [(_('icon with text'), 'icon'),
 class ConditionEditor(QWidget):  # {{{
 
     ACTION_MAP = {
-            'bool2' : (
+            'bool2': (
                     (_('is true'), 'is true',),
                     (_('is false'), 'is not true'),
             ),
-            'bool' : (
+            'bool': (
                     (_('is true'), 'is true',),
                     (_('is not true'), 'is not true'),
                     (_('is false'), 'is false'),
@@ -81,22 +81,22 @@ class ConditionEditor(QWidget):  # {{{
                     (_('is undefined'), 'is undefined'),
                     (_('is defined'), 'is defined'),
             ),
-            'ondevice' : (
+            'ondevice': (
                     (_('is true'), 'is set',),
                     (_('is false'), 'is not set'),
             ),
-            'identifiers' : (
+            'identifiers': (
                 (_('has id'), 'has id'),
                 (_('does not have id'), 'does not have id'),
             ),
-            'int' : (
+            'int': (
                 (_('is equal to'), 'eq'),
                 (_('is less than'), 'lt'),
                 (_('is greater than'), 'gt'),
                 (_('is set'), 'is set'),
                 (_('is not set'), 'is not set')
             ),
-            'datetime' : (
+            'datetime': (
                 (_('is equal to'), 'eq'),
                 (_('is earlier than'), 'lt'),
                 (_('is later than'), 'gt'),
@@ -108,7 +108,7 @@ class ConditionEditor(QWidget):  # {{{
                 (_('is more days from now than'), 'newer future days'),
                 (_('is fewer days from now than'), 'older future days')
             ),
-            'multiple' : (
+            'multiple': (
                 (_('has'), 'has'),
                 (_('does not have'), 'does not have'),
                 (_('has pattern'), 'has pattern'),
@@ -116,13 +116,13 @@ class ConditionEditor(QWidget):  # {{{
                 (_('is set'), 'is set'),
                 (_('is not set'), 'is not set'),
             ),
-            'multiple_no_isset' : (
+            'multiple_no_isset': (
                 (_('has'), 'has'),
                 (_('does not have'), 'does not have'),
                 (_('has pattern'), 'has pattern'),
                 (_('does not have pattern'), 'does not have pattern'),
             ),
-            'single'   : (
+            'single': (
                 (_('is'), 'is'),
                 (_('is not'), 'is not'),
                 (_('contains'), 'contains'),
@@ -132,7 +132,7 @@ class ConditionEditor(QWidget):  # {{{
                 (_('is set'), 'is set'),
                 (_('is not set'), 'is not set'),
             ),
-            'single_no_isset'   : (
+            'single_no_isset': (
                 (_('is'), 'is'),
                 (_('is not'), 'is not'),
                 (_('contains'), 'contains'),
@@ -233,11 +233,10 @@ class ConditionEditor(QWidget):  # {{{
     @property
     def condition(self):
 
-        c, a, v = (self.current_col, self.current_action,
-                self.current_val)
+        c, a, v = (self.current_col, self.current_action, self.current_val)
         if not c or not a:
             return None
-        return (c, a, v)
+        return c, a, v
 
     @condition.setter
     def condition(self, condition):
@@ -444,8 +443,6 @@ class RuleEditor(QDialog):  # {{{
                 ' first rule to match will be used.')))
             self.l3 = l3 = QLabel(_('of the column:'))
             l.addWidget(l3, 2, 2)
-        else:
-            pass
 
         self.column_box = QComboBox(self)
         l.addWidget(self.column_box, 3, 0 if self.rule_kind == 'color' else 2)
@@ -680,7 +677,6 @@ class RuleEditor(QDialog):  # {{{
         except:
             import traceback
             traceback.print_exc()
-        return
 
     def get_filenames_from_box(self):
         if self.doing_multiple:
@@ -866,7 +862,7 @@ class RulesModel(QAbstractListModel):  # {{{
                 col = self.fm[col]['name']
             return self.rule_to_html(kind, col, rule)
         if role == Qt.ItemDataRole.UserRole:
-            return (kind, col, rule)
+            return kind, col, rule
 
     def add_rule(self, kind, col, rule, selected_row=None):
         self.beginResetModel()
@@ -1281,7 +1277,7 @@ class EditRules(QWidget):  # {{{
 
     def move_rows(self, moving_up=True):
         sm = self.rules_view.selectionModel()
-        rows = sorted(list(sm.selectedRows()), reverse=not moving_up)
+        rows = sorted(sm.selectedRows(), reverse=not moving_up)
         if rows:
             if rows[0].row() == (0 if moving_up else self.model.rowCount() - 1):
                 return
diff --git a/src/calibre/gui2/preferences/columns.py b/src/calibre/gui2/preferences/columns.py
index aa4f661eda..6889c15ed4 100644
--- a/src/calibre/gui2/preferences/columns.py
+++ b/src/calibre/gui2/preferences/columns.py
@@ -87,7 +87,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
         self.opt_columns.setColumnCount(6)
         # Set up the columns in logical index order
-        for p in range(0, len(self.column_headings)):
+        for p in range(len(self.column_headings)):
             self.opt_columns.setHorizontalHeaderItem(p, QTableWidgetItem(self.column_headings[p]))
 
         # Now reorder the columns into the desired visual order. Note: ignore
@@ -107,9 +107,10 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.opt_columns.verticalHeader().hide()
 
         self.opt_columns.setRowCount(len(colmap))
-        self.column_desc = dict(map(lambda x:(CreateCustomColumn.column_types[x]['datatype'],
-                                         CreateCustomColumn.column_types[x]['text']),
-                                  CreateCustomColumn.column_types))
+        self.column_desc = {
+            CreateCustomColumn.column_types[x]['datatype']: CreateCustomColumn.column_types[x]['text']
+                for x in CreateCustomColumn.column_types
+        }
 
         for row, key in enumerate(colmap):
             self.setup_row(row, key, row)
@@ -124,7 +125,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
     def header_moved(self, log_index, old_v_index, new_v_index):
         self.column_positions = []
-        for vi in range(0, self.opt_columns.columnCount()):
+        for vi in range(self.opt_columns.columnCount()):
             self.column_positions.append(self.opt_columns.horizontalHeader().logicalIndex(vi))
         self.save_geometry()
 
@@ -157,7 +158,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
     def save_geometry(self):
         # Save both the column widths and the column order
         widths = []
-        for i in range(0, self.opt_columns.columnCount()):
+        for i in range(self.opt_columns.columnCount()):
             widths.append(self.opt_columns.columnWidth(i))
         gprefs.set('custcol-prefs-table-geometry', widths)
         gprefs.set('custcol-prefs-column_order', self.column_positions)
@@ -167,7 +168,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         geom = gprefs.get('custcol-prefs-table-geometry', None)
         if geom is not None and len(geom) == self.opt_columns.columnCount():
             with suppress(Exception):
-                for i in range(0, self.opt_columns.columnCount()):
+                for i in range(self.opt_columns.columnCount()):
                     self.opt_columns.setColumnWidth(i, geom[i])
                 return
         self.opt_columns.resizeColumnsToContents()
@@ -248,7 +249,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         item.setFlags(flags)
         self.opt_columns.setItem(row, self.TYPE_COLUMN, item)
 
-        desc = cc['display'].get('description', "")
+        desc = cc['display'].get('description', '')
         item = QTableWidgetItem(desc)
         item.setToolTip(desc)
         item.setFlags(flags)
@@ -291,11 +292,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
     def up_column(self):
         count = self.get_move_count()
-        for _ in range(0, count):
+        for _ in range(count):
             row = self.opt_columns.currentRow()
             if row > 0:
                 self.opt_columns.setSortingEnabled(False)
-                for i in range(0, self.opt_columns.columnCount()):
+                for i in range(self.opt_columns.columnCount()):
                     lower = self.opt_columns.takeItem(row-1, i)
                     upper = self.opt_columns.takeItem(row, i)
                     self.opt_columns.setItem(row, i, lower)
@@ -308,11 +309,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
     def down_column(self):
         count = self.get_move_count()
-        for _ in range(0, count):
+        for _ in range(count):
             row = self.opt_columns.currentRow()
             if row < self.opt_columns.rowCount()-1:
                 self.opt_columns.setSortingEnabled(False)
-                for i in range(0, self.opt_columns.columnCount()):
+                for i in range(self.opt_columns.columnCount()):
                     lower = self.opt_columns.takeItem(row, i)
                     upper = self.opt_columns.takeItem(row+1, i)
                     self.opt_columns.setItem(row+1, i, lower)
@@ -364,7 +365,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         o.setRowCount(row + 1)
         self.setup_row(row, self.cc_column_key, row)
         # We need to find the new item after sorting
-        for i in range(0, o.rowCount()):
+        for i in range(o.rowCount()):
             if self.column_order_val(i) == row:
                 o.setCurrentCell(i, 1)
                 o.scrollTo(o.currentIndex())
diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py
index c04471609d..a7d7525599 100644
--- a/src/calibre/gui2/preferences/create_custom_column.py
+++ b/src/calibre/gui2/preferences/create_custom_column.py
@@ -157,8 +157,7 @@ class CreateCustomColumn(QDialog):
             ct = '*' + ct
         self.orig_column_number = c['colnum']
         self.orig_column_name = col
-        column_numbers = dict(map(lambda x:(self.column_types[x]['datatype'], x),
-                                  self.column_types))
+        column_numbers = {self.column_types[x]['datatype']: x for x in self.column_types}
         self.column_type_box.setCurrentIndex(column_numbers[ct])
         self.column_type_box.setEnabled(False)
 
@@ -242,7 +241,7 @@ class CreateCustomColumn(QDialog):
         which = str(url).split(':')[-1]
         self.column_type_box.setCurrentIndex({
             'yesno': self.column_types_map['bool'],
-            'tags' : self.column_types_map['*text'],
+            'tags': self.column_types_map['*text'],
             'series': self.column_types_map['series'],
             'rating': self.column_types_map['rating'],
             'people': self.column_types_map['*text'],
@@ -285,7 +284,7 @@ class CreateCustomColumn(QDialog):
         for col, name in [('isbn', _('ISBN')), ('formats', _('Formats')),
                 ('yesno', _('Yes/No')),
                 ('tags', _('Tags')), ('series', ngettext('Series', 'Series', 1)), ('rating',
-                    _('Rating')), ('people', _("Names")), ('text', _('Short text'))]:
+                    _('Rating')), ('people', _('Names')), ('text', _('Short text'))]:
             text += ' <a href="col:%s">%s</a>,'%(col, name)
         text = text[:-1]
         s.setText(text)
@@ -327,40 +326,40 @@ class CreateCustomColumn(QDialog):
 
         # Lookup name
         self.column_name_box = cnb = QLineEdit(self)
-        cnb.setToolTip(_("Used for searching the column. Must contain only digits and lower case letters."))
-        add_row(_("&Lookup name:"), cnb)
+        cnb.setToolTip(_('Used for searching the column. Must contain only digits and lower case letters.'))
+        add_row(_('&Lookup name:'), cnb)
 
         # Heading
         self.column_heading_box = chb = QLineEdit(self)
-        chb.setToolTip(_("Column heading in the library view and category name in the Tag browser"))
-        add_row(_("Column &heading:"), chb)
+        chb.setToolTip(_('Column heading in the library view and category name in the Tag browser'))
+        add_row(_('Column &heading:'), chb)
 
         # Column Type
         h = QHBoxLayout()
         self.column_type_box = ctb = QComboBox(self)
         ctb.setMinimumWidth(70)
-        ctb.setToolTip(_("What kind of information will be kept in the column."))
+        ctb.setToolTip(_('What kind of information will be kept in the column.'))
         h.addWidget(ctb)
-        self.use_decorations = ud = QCheckBox(_("Show &checkmarks"), self)
+        self.use_decorations = ud = QCheckBox(_('Show &checkmarks'), self)
         ud.setToolTip(_("Show check marks in the GUI. Values of 'yes', 'checked', and 'true'\n"
             "will show a green check. Values of 'no', 'unchecked', and 'false' will show a red X.\n"
             "Everything else will show nothing. Note that the values of 'true' and 'false' don't\n"
             "follow calibre's language settings and are always in English."))
         h.addWidget(ud)
-        self.is_names = ins = QCheckBox(_("Contains names"), self)
+        self.is_names = ins = QCheckBox(_('Contains names'), self)
         ins.setToolTip('<p>' + _('Check this box if this column contains names, '
-             'like the authors column. If checked, the item separator will be an ampersand '
-             '(&) instead of a comma (,), sorting will be done using a computed value '
-             'that respects the author sort tweaks (for example converting "Firstname '
-             'Lastname" into "Lastname, Firstname"), and item order will be '
-             'preserved.')+'</p>')
+            'like the authors column. If checked, the item separator will be an ampersand '
+            '(&) instead of a comma (,), sorting will be done using a computed value '
+            'that respects the author sort tweaks (for example converting "Firstname '
+            'Lastname" into "Lastname, Firstname"), and item order will be '
+            'preserved.')+'</p>')
         h.addWidget(ins)
-        add_row(_("&Column type:"), h)
+        add_row(_('&Column type:'), h)
 
         # Description
         self.description_box = d = QLineEdit(self)
-        d.setToolTip(_("Optional text describing what this column is for"))
-        add_row(_("D&escription:"), d)
+        d.setToolTip(_('Optional text describing what this column is for'))
+        add_row(_('D&escription:'), d)
 
         # bool formatting
         h1 = QHBoxLayout()
@@ -408,12 +407,12 @@ class CreateCustomColumn(QDialog):
 
         # Template
         self.composite_box = cb = TemplateLineEditor(self)
-        self.composite_default_label = cdl = QLabel(_("Default: (nothing)"))
-        cb.setToolTip(_("Field template. Uses the same syntax as save templates."))
-        cdl.setToolTip(_("Similar to save templates. For example, %s") % "{title} {isbn}")
+        self.composite_default_label = cdl = QLabel(_('Default: (nothing)'))
+        cb.setToolTip(_('Field template. Uses the same syntax as save templates.'))
+        cdl.setToolTip(_('Similar to save templates. For example, %s') % '{title} {isbn}')
         h = QHBoxLayout()
         h.addWidget(cb), h.addWidget(cdl)
-        self.composite_label = add_row(_("&Template:"), h)
+        self.composite_label = add_row(_('&Template:'), h)
 
         # Comments properties
         self.comments_heading_position = ct = QComboBox(self)
@@ -450,10 +449,10 @@ class CreateCustomColumn(QDialog):
             "A comma-separated list of permitted values. The empty value is always\n"
             "included, and is the default. For example, the list 'one,two,three' has\n"
             "four values, the first of them being the empty value."))
-        self.enum_default_label = add_row(_("&Values:"), eb)
+        self.enum_default_label = add_row(_('&Values:'), eb)
         self.enum_colors = ec = QLineEdit(self)
-        ec.setToolTip(_("A list of color names to use when displaying an item. The\n"
-            "list must be empty or contain a color for each value."))
+        ec.setToolTip(_('A list of color names to use when displaying an item. The\n'
+            'list must be empty or contain a color for each value.'))
         self.enum_colors_label = add_row(_('Colors:'), ec)
 
         # Rating allow half stars
@@ -463,14 +462,14 @@ class CreateCustomColumn(QDialog):
 
         # Composite display properties
         l = QHBoxLayout()
-        self.composite_sort_by_label = la = QLabel(_("&Sort/search column by"))
+        self.composite_sort_by_label = la = QLabel(_('&Sort/search column by'))
         self.composite_sort_by = csb = QComboBox(self)
-        la.setBuddy(csb), csb.setToolTip(_("How this column should handled in the GUI when sorting and searching"))
+        la.setBuddy(csb), csb.setToolTip(_('How this column should handled in the GUI when sorting and searching'))
         l.addWidget(la), l.addWidget(csb)
-        self.composite_make_category = cmc = QCheckBox(_("Show in Tag browser"))
-        cmc.setToolTip(_("If checked, this column will appear in the Tag browser as a category"))
+        self.composite_make_category = cmc = QCheckBox(_('Show in Tag browser'))
+        cmc.setToolTip(_('If checked, this column will appear in the Tag browser as a category'))
         l.addWidget(cmc)
-        self.composite_contains_html = cch = QCheckBox(_("Show as HTML in Book details"))
+        self.composite_contains_html = cch = QCheckBox(_('Show as HTML in Book details'))
         cch.setToolTip('<p>' + _(
             'If checked, this column will be displayed as HTML in '
             'Book details and the Content server. This can be used to '
@@ -488,7 +487,7 @@ class CreateCustomColumn(QDialog):
         l.addStretch()
         add_row(None, l)
         l = QHBoxLayout()
-        self.composite_in_comments_box = cmc = QCheckBox(_("Show with comments in Book details"))
+        self.composite_in_comments_box = cmc = QCheckBox(_('Show with comments in Book details'))
         cmc.setToolTip('<p>' + _('If you check this box then the column contents '
                                  'will show in the Comments section in the Book details. '
                                  'You can indicate whether not to have a header or '
@@ -514,13 +513,13 @@ class CreateCustomColumn(QDialog):
         l = QHBoxLayout()
         self.store_template_value_in_opf = cmc = QCheckBox(_("Store this column's value in an OPF"))
         cmc.setToolTip('<p>' + _('If you check this box then the result of '
-             "evaluating this column's template will be stored in the backup OPF "
-             'stored in the library. The same is true when sending to a device, '
-             'assuming the format has an OPF. One reason to uncheck this box is '
-             'that the column contains large images.') + '</p>' + '<p>' +
-             _('Note that some background functions require data for a column to '
-               'be in the OPF, for example book jackets. If you uncheck this box '
-               'and some function stops working then check the box.') + '</p>')
+                       "evaluating this column's template will be stored in the backup OPF "
+                       'stored in the library. The same is true when sending to a device, '
+                       'assuming the format has an OPF. One reason to uncheck this box is '
+                       'that the column contains large images.') + '</p>' + '<p>' +
+                     _('Note that some background functions require data for a column to '
+                       'be in the OPF, for example book jackets. If you uncheck this box '
+                       'and some function stops working then check the box.') + '</p>')
         l.addWidget(cmc)
         l.addStretch()
         add_row(None, l)
@@ -542,7 +541,7 @@ class CreateCustomColumn(QDialog):
             self.bool_button_group.setFocusProxy(button)
 
     def composite_show_in_comments_clicked(self, state):
-        if state == Qt.CheckState.Checked.value: # state is passed as an int
+        if state == Qt.CheckState.Checked.value:  # state is passed as an int
             self.composite_sort_by.setEnabled(False)
             self.composite_sort_by_label.setEnabled(False)
             self.composite_make_category.setEnabled(False)
@@ -595,11 +594,11 @@ class CreateCustomColumn(QDialog):
                     '<li>AP   : use a 12-hour clock instead of a 24-hour clock, with "AP" replaced by the localized string for AM or PM</li>'
                     '<li>iso  : the date with time and timezone. Must be the only format present</li>'
                     '</ul></p>'
-                    "<p>For example:\n"
-                    "<ul>\n"
-                    "<li>ddd, d MMM yyyy gives Mon, 5 Jan 2010</li>\n"
-                    "<li>dd MMMM yy gives 05 January 10</li>\n"
-                    "</ul> "))
+                    '<p>For example:\n'
+                    '<ul>\n'
+                    '<li>ddd, d MMM yyyy gives Mon, 5 Jan 2010</li>\n'
+                    '<li>dd MMMM yy gives 05 January 10</li>\n'
+                    '</ul> '))
             else:
                 l, dl = _('&Format for numbers:'), (
                     '<p>' + _('Default: Not formatted. For format language details see'
@@ -627,7 +626,7 @@ class CreateCustomColumn(QDialog):
         self.store_template_value_in_opf.setVisible(col_type == 'composite')
         self.store_template_value_in_opf.setChecked(True)
 
-        for x in ('box', 'default_label',  'colors', 'colors_label'):
+        for x in ('box', 'default_label', 'colors', 'colors_label'):
             getattr(self, 'enum_'+x).setVisible(col_type == 'enumeration')
         for x in ('value_label', 'value'):
             getattr(self, 'default_'+x).setVisible(col_type not in ['composite', '*composite'])
@@ -745,7 +744,7 @@ class CreateCustomColumn(QDialog):
                 return self.simple_error('', _('The colors box must be empty or '
                            'contain the same number of items as the value box'))
             for tc in c:
-                if tc not in QColor.colorNames() and not re.match("#(?:[0-9a-f]{3}){1,4}",tc,re.I):
+                if tc not in QColor.colorNames() and not re.match(r'#(?:[0-9a-f]{3}){1,4}',tc,re.I):
                     return self.simple_error('', _('The color {0} is unknown').format(tc))
             display_dict = {'enum_values': l, 'enum_colors': c}
             if default_val:
@@ -841,7 +840,7 @@ class CreateCustomColumn(QDialog):
 
 
 class CreateNewCustomColumn:
-    """
+    '''
     Provide an API to create new custom columns.
 
     Usage:
@@ -942,7 +941,7 @@ class CreateNewCustomColumn:
     The method returns Result.MUST_RESTART if further calibre configuration has
     been blocked. You can check for this situation in advance by calling
     must_restart().
-    """
+    '''
 
     class Result(Enum):
         COLUMN_ADDED = 0
@@ -969,15 +968,15 @@ class CreateNewCustomColumn:
 
     def create_column(self, lookup_name, column_heading, datatype, is_multiple,
                       display={}, generate_unused_lookup_name=False, freeze_lookup_name=True):
-        """ See the class documentation for more information."""
+        ''' See the class documentation for more information.'''
         if self.restart_required:
-            return (self.Result.MUST_RESTART, _("You must restart calibre before making any more changes"))
+            return (self.Result.MUST_RESTART, _('You must restart calibre before making any more changes'))
         if not lookup_name.startswith('#'):
             return (self.Result.INVALID_KEY, _("The lookup name must begin with a '#'"))
         suffix_number = 1
         if lookup_name in self.custcols:
             if not generate_unused_lookup_name:
-                return (self.Result.DUPLICATE_KEY, _("The custom column %s already exists") % lookup_name)
+                return (self.Result.DUPLICATE_KEY, _('The custom column %s already exists') % lookup_name)
             for suffix_number in range(suffix_number, 100000):
                 nk = '%s_%d'%(lookup_name, suffix_number)
                 if nk not in self.custcols:
@@ -988,7 +987,7 @@ class CreateNewCustomColumn:
             if column_heading in headings:
                 if not generate_unused_lookup_name:
                     return (self.Result.DUPLICATE_HEADING,
-                           _("The column heading %s already exists") % column_heading)
+                           _('The column heading %s already exists') % column_heading)
                 for i in range(suffix_number, 100000):
                     nh = '%s_%d'%(column_heading, i)
                     if nh not in headings:
@@ -1001,10 +1000,10 @@ class CreateNewCustomColumn:
                    _("The custom column type %s doesn't exist") % datatype)
         if is_multiple and '*' + datatype not in CreateCustomColumn.column_types_map:
             return (self.Result.INVALID_IS_MULTIPLE,
-                   _("You cannot specify is_multiple for the datatype %s") % datatype)
+                   _('You cannot specify is_multiple for the datatype %s') % datatype)
         if not isinstance(display, dict):
             return (self.Result.INVALID_DISPLAY,
-                   _("The display parameter must be a Python dictionary"))
+                   _('The display parameter must be a Python dictionary'))
         self.created_count += 1
         self.custcols[lookup_name] = {
                 'label': lookup_name,
@@ -1058,7 +1057,7 @@ class CreateNewCustomColumn:
         return (self.Result.CANCELED, _('Canceled'))
 
     def current_columns(self):
-        """
+        '''
         Return the currently defined custom columns
 
         Return the currently defined custom columns including the ones that haven't
@@ -1075,22 +1074,22 @@ class CreateNewCustomColumn:
         Columns that already exist will have additional attributes that this class
         doesn't use. See calibre.library.field_metadata.add_custom_field() for the
         complete list.
-        """
+        '''
         # deepcopy to prevent users from changing it. The new MappingProxyType
         # isn't enough because only the top-level dict is immutable, not the
         # items in the dict.
         return copy.deepcopy(self.custcols)
 
     def current_headings(self):
-        """
+        '''
         Return the currently defined column headings
 
         Return the column headings including the ones that haven't yet been
         created. It is a dict. The key is the heading, the value is the lookup
         name having that heading.
-        """
+        '''
         return {v['name']:('#' + v['label']) for v in self.custcols.values()}
 
     def must_restart(self):
-        """Return true if calibre must be restarted before new columns can be added."""
+        '''Return true if calibre must be restarted before new columns can be added.'''
         return self.restart_required
diff --git a/src/calibre/gui2/preferences/emailp.py b/src/calibre/gui2/preferences/emailp.py
index 2ae7ca1530..b2f8b0e019 100644
--- a/src/calibre/gui2/preferences/emailp.py
+++ b/src/calibre/gui2/preferences/emailp.py
@@ -106,7 +106,7 @@ class EmailAccounts(QAbstractTableModel):  # {{{
         if role in [Qt.ItemDataRole.DisplayRole, Qt.ItemDataRole.EditRole]:
             if col == 0:
                 return (account)
-            if col ==  1:
+            if col == 1:
                 return ', '.join(x.strip() for x in (self.accounts[account][0] or '').split(','))
             if col == 2:
                 return (self.subjects.get(account, ''))
@@ -146,7 +146,7 @@ class EmailAccounts(QAbstractTableModel):  # {{{
             if aval:
                 self.tags[account] = aval
         elif col == 1:
-            self.accounts[account][0] = re.sub(',+', ',', re.sub(r'\s+', ',', as_unicode(value or '').upper()))
+            self.accounts[account][0] = re.sub(r',+', ',', re.sub(r'\s+', ',', as_unicode(value or '').upper()))
         elif col == 0:
             na = as_unicode(value or '').strip()
             from email.utils import parseaddr
@@ -259,7 +259,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         to_set = bool(self._email_accounts.accounts)
         if not self.send_email_widget.set_email_settings(to_set):
             raise AbortCommit('abort')
-        self.proxy['accounts'] =  self._email_accounts.accounts
+        self.proxy['accounts'] = self._email_accounts.accounts
         self.proxy['subjects'] = self._email_accounts.subjects
         self.proxy['aliases'] = self._email_accounts.aliases
         self.proxy['tags'] = self._email_accounts.tags
diff --git a/src/calibre/gui2/preferences/ignored_devices.py b/src/calibre/gui2/preferences/ignored_devices.py
index 1cc65acbbe..bad9f8cf5d 100644
--- a/src/calibre/gui2/preferences/ignored_devices.py
+++ b/src/calibre/gui2/preferences/ignored_devices.py
@@ -90,7 +90,7 @@ class ConfigWidget(ConfigWidgetBase):
 
     def commit(self):
         devs = {}
-        for i in range(0, self.devices.count()):
+        for i in range(self.devices.count()):
             e = self.devices.item(i)
             dev, uid = e.data(Qt.ItemDataRole.UserRole)
             if dev not in devs:
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index b524f8fc16..496296127d 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -137,9 +137,8 @@ class DefaultAuthorLink(QWidget):  # {{{
         self.custom_url.setVisible(k == 'url')
 # }}}
 
+
 # IdLinksEditor {{{
-
-
 class IdLinksRuleEdit(Dialog):
 
     def __init__(self, key='', name='', template='', parent=None):
@@ -201,7 +200,7 @@ class IdLinksEditor(Dialog):
         for k, lx in iteritems(msprefs['id_link_rules']):
             for n, t in lx:
                 items.append((k, n, t))
-        items.sort(key=lambda x:sort_key(x[1]))
+        items.sort(key=lambda x: sort_key(x[1]))
         self.table = t = QTableWidget(len(items), 3, self)
         t.setHorizontalHeaderLabels([_('Key'), _('Name'), _('Template')])
         for r, (key, val, template) in enumerate(items):
@@ -236,7 +235,7 @@ class IdLinksEditor(Dialog):
     def edit_rule(self, r=-1):
         key = name = template = ''
         if r > -1:
-            key, name, template = map(lambda c: self.table.item(r, c).text(), range(3))
+            key, name, template = (self.table.item(r, c).text() for c in range(3))
         d = IdLinksRuleEdit(key, name, template, self)
         if d.exec() == QDialog.DialogCode.Accepted:
             if r < 0:
@@ -286,7 +285,6 @@ class QVDisplayedFields(DisplayedFields):  # {{{
     def commit(self):
         if self.changed:
             self.db.new_api.set_pref('qv_display_fields', self.fields)
-
 # }}}
 
 
@@ -353,7 +351,7 @@ class TBPartitionedFields(DisplayedFields):  # {{{
             ans = [[k, True] for k in cats.keys()]
             self.changed = True
         elif pref_data_override:
-            po = {k:v for k,v in pref_data_override}
+            po = dict(pref_data_override)
             ans = [[k, po.get(k, True)] for k in cats.keys()]
             self.changed = True
         else:
@@ -389,11 +387,11 @@ class BDVerticalCats(DisplayedFields):  # {{{
             ans = [[k, False] for k in cats]
             self.changed = True
         elif pref_data_override:
-            ph = {k:v for k,v in pref_data_override}
+            ph = dict(pref_data_override)
             ans = [[k, ph.get(k, False)] for k in cats]
             self.changed = True
         else:
-            vertical_cats =  self.db.prefs.get('book_details_vertical_categories') or ()
+            vertical_cats = self.db.prefs.get('book_details_vertical_categories') or ()
             for key in cats:
                 ans.append([key, key in vertical_cats])
         self.beginResetModel()
@@ -638,7 +636,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.tb_partition_import_layout_button.clicked.connect(partial(self.import_layout,
                                                                        model=self.tb_categories_to_part_model))
 
-
         self.bd_vertical_cats_model = BDVerticalCats(self.gui.current_db, self.tb_hierarchy_tab.tb_hierarchical_cats)
         self.bd_vertical_cats_model.dataChanged.connect(self.changed_signal)
         self.bd_vertical_cats.setModel(self.bd_vertical_cats_model)
diff --git a/src/calibre/gui2/preferences/look_feel_tabs/cover_view.py b/src/calibre/gui2/preferences/look_feel_tabs/cover_view.py
index bbe4d18a4b..16e35bd010 100644
--- a/src/calibre/gui2/preferences/look_feel_tabs/cover_view.py
+++ b/src/calibre/gui2/preferences/look_feel_tabs/cover_view.py
@@ -25,7 +25,7 @@ class CoverView(ConfigTabWidget, Ui_Form):
         r('cover_flow_queue_length', config, restart_required=True)
         r('cover_browser_reflections', gprefs)
         r('cover_browser_narrow_view_position', gprefs,
-                            choices=[(_('Automatic'), 'automatic'), # Automatic must be first
+                            choices=[(_('Automatic'), 'automatic'),  # Automatic must be first
                                      (_('On top'), 'on_top'),
                                      (_('On right'), 'on_right')])
         r('cover_browser_title_template', db.prefs)
diff --git a/src/calibre/gui2/preferences/look_feel_tabs/tb_hierarchy.py b/src/calibre/gui2/preferences/look_feel_tabs/tb_hierarchy.py
index eeb7c333c7..2f91c0aa47 100644
--- a/src/calibre/gui2/preferences/look_feel_tabs/tb_hierarchy.py
+++ b/src/calibre/gui2/preferences/look_feel_tabs/tb_hierarchy.py
@@ -37,11 +37,11 @@ class TBHierarchicalFields(DisplayedFields):  # {{{
             ans = [[k, False] for k in cats]
             self.changed = True
         elif pref_data_override:
-            ph = {k:v for k,v in pref_data_override}
+            ph = dict(pref_data_override)
             ans = [[k, ph.get(k, False)] for k in cats]
             self.changed = True
         else:
-            hier_cats =  self.db.prefs.get('categories_using_hierarchy') or ()
+            hier_cats = self.db.prefs.get('categories_using_hierarchy') or ()
             for key in cats:
                 ans.append([key, key in hier_cats])
         self.beginResetModel()
@@ -54,7 +54,6 @@ class TBHierarchicalFields(DisplayedFields):  # {{{
 # }}}
 
 
-
 class TbHierarchyTab(ConfigTabWidget, Ui_Form):
 
     def genesis(self, gui):
@@ -127,7 +126,7 @@ class TbHierarchyTab(ConfigTabWidget, Ui_Form):
         # Walk the items in the list box building the (node -> node) graph of
         # the option order
         node = 0
-        for i in range(0, 4):
+        for i in range(4):
             v = self.tb_search_order.item(i).data(Qt.ItemDataRole.UserRole)
             # JSON dumps converts integer keys to strings, so do it explicitly
             t[str(node)] = v
diff --git a/src/calibre/gui2/preferences/look_feel_tabs/tb_icon_rules.py b/src/calibre/gui2/preferences/look_feel_tabs/tb_icon_rules.py
index 0e35bfa260..5b9f7bed85 100644
--- a/src/calibre/gui2/preferences/look_feel_tabs/tb_icon_rules.py
+++ b/src/calibre/gui2/preferences/look_feel_tabs/tb_icon_rules.py
@@ -115,7 +115,7 @@ class TbIconRulesTab(ConfigTabWidget, Ui_Form):
         self.rules_table.customContextMenuRequested.connect(self.show_context_menu)
         self.rules_table.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
 
-        for i in range(0, HEADER_SECTION_COUNT):
+        for i in range(HEADER_SECTION_COUNT):
             item = self.rules_table.horizontalHeaderItem(i)
             if i == DELETED_COLUMN:
                 item.setIcon(QIcon.cached_icon('trash.png'))
@@ -221,7 +221,7 @@ class TbIconRulesTab(ConfigTabWidget, Ui_Form):
 
     def table_column_resized(self, col, old, new):
         self.table_column_widths = []
-        for c in range(0, self.rules_table.columnCount()):
+        for c in range(self.rules_table.columnCount()):
             self.table_column_widths.append(self.rules_table.columnWidth(c))
         gprefs['tag_browser_rules_dialog_table_widths'] = self.table_column_widths
 
@@ -236,7 +236,7 @@ class TbIconRulesTab(ConfigTabWidget, Ui_Form):
             # widths will be remembered.
             w = self.tb_icon_rules_groupbox.width() - 25 - self.rules_table.verticalHeader().width()
             w //= self.rules_table.columnCount()
-            for c in range(0, self.rules_table.columnCount()):
+            for c in range(self.rules_table.columnCount()):
                 self.rules_table.setColumnWidth(c, w)
                 self.table_column_widths.append(self.rules_table.columnWidth(c))
         gprefs['tag_browser_rules_dialog_table_widths'] = self.table_column_widths
@@ -258,7 +258,7 @@ class TbIconRulesTab(ConfigTabWidget, Ui_Form):
     def commit(self):
         rr = ConfigWidgetBase.commit(self)
         v = copy.deepcopy(gprefs['tags_browser_value_icons'])
-        for r in range(0, self.rules_table.rowCount()):
+        for r in range(self.rules_table.rowCount()):
             cat_item = self.rules_table.item(r, CATEGORY_COLUMN)
             if cat_item.is_deleted:
                 val = self.rules_table.item(r, VALUE_COLUMN).real_value
diff --git a/src/calibre/gui2/preferences/main.py b/src/calibre/gui2/preferences/main.py
index e75e48350a..caf6d121e7 100644
--- a/src/calibre/gui2/preferences/main.py
+++ b/src/calibre/gui2/preferences/main.py
@@ -44,8 +44,8 @@ from calibre.gui2.preferences import AbortCommit, AbortInitialize, get_plugin, i
 
 ICON_SIZE = 32
 
-# Title Bar {{{
 
+# Title Bar {{{
 
 class Message(QWidget):
 
@@ -215,7 +215,6 @@ class Browser(QScrollArea):  # {{{
             w.plugin_activated.connect(self.show_plugin.emit)
         self._layout.addStretch(1)
 
-
 # }}}
 
 
diff --git a/src/calibre/gui2/preferences/metadata_sources.py b/src/calibre/gui2/preferences/metadata_sources.py
index 56cf5df01f..02e35c2a18 100644
--- a/src/calibre/gui2/preferences/metadata_sources.py
+++ b/src/calibre/gui2/preferences/metadata_sources.py
@@ -172,8 +172,8 @@ class FieldsModel(QAbstractListModel):  # {{{
                 'comments': _('Comments'),
                 'pubdate': _('Published date'),
                 'publisher': _('Publisher'),
-                'rating' : _('Rating'),
-                'tags' : _('Tags'),
+                'rating': _('Rating'),
+                'tags': _('Tags'),
                 'title': _('Title'),
                 'series': ngettext('Series', 'Series', 1),
                 'languages': _('Languages'),
@@ -195,7 +195,7 @@ class FieldsModel(QAbstractListModel):  # {{{
         for x in fields:
             if not x.startswith('identifier:') and x not in self.exclude:
                 self.fields.append(x)
-        self.fields.sort(key=lambda x:self.descs.get(x, x))
+        self.fields.sort(key=lambda x: self.descs.get(x, x))
         self.endResetModel()
 
     def state(self, field, defaults=False):
diff --git a/src/calibre/gui2/preferences/plugboard.py b/src/calibre/gui2/preferences/plugboard.py
index dab3835321..7c7be43daa 100644
--- a/src/calibre/gui2/preferences/plugboard.py
+++ b/src/calibre/gui2/preferences/plugboard.py
@@ -87,7 +87,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
         self.source_widgets = []
         self.dest_widgets = []
-        for i in range(0, len(self.dest_fields)-1):
+        for i in range(len(self.dest_fields)-1):
             w = TemplateLineEditor(self)
             self.source_widgets.append(w)
             self.fields_layout.addWidget(w, 5+i, 0, 1, 1)
@@ -290,7 +290,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
     def ok_clicked(self):
         pb = []
         comments_in_dests = False
-        for i in range(0, len(self.source_widgets)):
+        for i in range(len(self.source_widgets)):
             s = str(self.source_widgets[i].text())
             if s:
                 d = self.dest_widgets[i].currentIndex()
diff --git a/src/calibre/gui2/preferences/plugins.py b/src/calibre/gui2/preferences/plugins.py
index 8719eefbc8..7da65c1b8a 100644
--- a/src/calibre/gui2/preferences/plugins.py
+++ b/src/calibre/gui2/preferences/plugins.py
@@ -218,9 +218,9 @@ class PluginModel(QAbstractItemModel, AdaptSQP):  # {{{
                 return plugin
         return None
 
-
 # }}}
 
+
 class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
     supports_restoring_to_defaults = False
@@ -230,7 +230,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self._plugin_model = PluginModel(self.user_installed_plugins.isChecked())
         self.plugin_view.setModel(self._plugin_model)
         self.plugin_view.setStyleSheet(
-                "QTreeView::item { padding-bottom: 10px;}")
+                'QTreeView::item { padding-bottom: 10px;}')
         self.plugin_view.doubleClicked.connect(self.double_clicked)
         self.toggle_plugin_button.clicked.connect(self.toggle_plugin)
         self.customize_plugin_button.clicked.connect(self.customize_plugin)
diff --git a/src/calibre/gui2/preferences/server.py b/src/calibre/gui2/preferences/server.py
index 2aeaeac5c5..668908d001 100644
--- a/src/calibre/gui2/preferences/server.py
+++ b/src/calibre/gui2/preferences/server.py
@@ -69,7 +69,7 @@ if iswindows and not isportable:
 
     def startup_shortcut_path():
         startup_path = winutil.special_folder_path(winutil.CSIDL_STARTUP)
-        return os.path.join(startup_path, "calibre.lnk")
+        return os.path.join(startup_path, 'calibre.lnk')
 
     def create_shortcut(shortcut_path, target, description, *args):
         quoted_args = None
@@ -109,7 +109,6 @@ else:
 
 # Advanced {{{
 
-
 def init_opt(widget, opt, layout):
     widget.name, widget.default_val = opt.name, opt.default
     if opt.longdoc:
@@ -210,7 +209,7 @@ class Path(QWidget):
         self.b = b = QToolButton(self)
         l.addWidget(b)
         b.setIcon(QIcon.ic('document_open.png'))
-        b.setToolTip(_("Browse for the file"))
+        b.setToolTip(_('Browse for the file'))
         b.clicked.connect(self.choose)
         init_opt(self, opt, layout)
 
@@ -446,11 +445,10 @@ class MainTab(QWidget):  # {{{
     def settings(self):
         return {'auth': self.opt_auth.isChecked(), 'port': self.opt_port.value()}
 
-
 # }}}
 
-# Users {{{
 
+# Users {{{
 
 class NewUser(QDialog):
 
@@ -789,7 +787,7 @@ class User(QWidget):
         else:
             m = _('{} is currently allowed access to all libraries')
             b = _('Restrict the &libraries {} can access').format(self.username)
-        self.restrict_button.setText(b),
+        self.restrict_button.setText(b)
         self.access_label.setText(m.format(username))
 
     def show_user(self, username=None, user_data=None):
@@ -900,7 +898,6 @@ class Users(QWidget):
     def display_user_data(self, username=None):
         self.user_display.show_user(username, self.user_data)
 
-
 # }}}
 
 
diff --git a/src/calibre/gui2/preferences/texture_chooser.py b/src/calibre/gui2/preferences/texture_chooser.py
index b3659c05ee..6d1cb25494 100644
--- a/src/calibre/gui2/preferences/texture_chooser.py
+++ b/src/calibre/gui2/preferences/texture_chooser.py
@@ -86,14 +86,14 @@ class TextureChooser(QDialog):
         images = [{
             'fname': ':'+os.path.basename(x),
             'path': x,
-            'name': ' '.join(map(lambda s: s.capitalize(), os.path.splitext(os.path.basename(x))[0].split('_')))
+            'name': ' '.join(s.capitalize() for s in os.path.splitext(os.path.basename(x))[0].split('_'))
         } for x in glob.glob(I('textures/*.png'))] + [{
             'fname': os.path.basename(x),
             'path': x,
             'name': os.path.splitext(os.path.basename(x))[0],
         } for x in glob.glob(os.path.join(self.tdir, '*')) if x.rpartition('.')[-1].lower() in {'jpeg', 'png', 'jpg'}]
 
-        images.sort(key=lambda x:sort_key(x['name']))
+        images.sort(key=lambda x: sort_key(x['name']))
 
         for i in images:
             self.create_item(i)
@@ -165,7 +165,7 @@ class TextureChooser(QDialog):
 
 
 if __name__ == '__main__':
-    app = QApplication([])  # noqa
+    app = QApplication([])  # noqa: F841
     d = TextureChooser()
     d.exec()
     print(d.texture)
diff --git a/src/calibre/gui2/preferences/toolbar.py b/src/calibre/gui2/preferences/toolbar.py
index 84a556a9a8..97ff2dee9f 100644
--- a/src/calibre/gui2/preferences/toolbar.py
+++ b/src/calibre/gui2/preferences/toolbar.py
@@ -240,7 +240,7 @@ class CurrentModel(BaseModel):
     def restore_defaults(self):
         current = gprefs.defaults[self.gprefs_name]
         self.beginResetModel()
-        self._data =  [self.name_to_action(x, self.gui) for x in current]
+        self._data = [self.name_to_action(x, self.gui) for x in current]
         self.endResetModel()
 
 
diff --git a/src/calibre/gui2/preferences/tweaks.py b/src/calibre/gui2/preferences/tweaks.py
index a0f1e17a70..04deb444af 100644
--- a/src/calibre/gui2/preferences/tweaks.py
+++ b/src/calibre/gui2/preferences/tweaks.py
@@ -85,7 +85,7 @@ class Tweak:  # {{{
         self.doc = ' ' + self.doc
         self.var_names = var_names
         if self.var_names:
-            self.doc = "%s: %s\n\n%s"%(_('ID'), self.var_names[0], format_doc(self.doc))
+            self.doc = '%s: %s\n\n%s'%(_('ID'), self.var_names[0], format_doc(self.doc))
         self.default_values = OrderedDict()
         for x in var_names:
             self.default_values[x] = defaults[x]
@@ -386,8 +386,8 @@ class ConfigWidget(ConfigWidgetBase):
     def setupUi(self, x):
         self.l = l = QVBoxLayout(self)
         self.la1 = la = QLabel(
-            _("Values for the tweaks are shown below. Edit them to change the behavior of calibre."
-              " Your changes will only take effect <b>after a restart</b> of calibre."))
+            _('Values for the tweaks are shown below. Edit them to change the behavior of calibre.'
+              ' Your changes will only take effect <b>after a restart</b> of calibre.'))
         l.addWidget(la), la.setWordWrap(True)
         self.splitter = s = QSplitter(self)
         s.setChildrenCollapsible(False)
@@ -399,8 +399,8 @@ class ConfigWidget(ConfigWidgetBase):
         self.tweaks_view = tv = TweaksView(self)
         l2.addWidget(tv)
         self.plugin_tweaks_button = b = QPushButton(self)
-        b.setToolTip(_("Edit tweaks for any custom plugins you have installed"))
-        b.setText(_("&Plugin tweaks"))
+        b.setToolTip(_('Edit tweaks for any custom plugins you have installed'))
+        b.setText(_('&Plugin tweaks'))
         l2.addWidget(b)
         s.addWidget(lv)
 
@@ -416,16 +416,16 @@ class ConfigWidget(ConfigWidgetBase):
         g.setColumnStretch(0, 100)
         g.addWidget(self.search, 0, 0, 1, 1)
         self.next_button = b = QPushButton(self)
-        b.setIcon(QIcon.ic("arrow-down.png"))
-        b.setText(_("&Next"))
+        b.setIcon(QIcon.ic('arrow-down.png'))
+        b.setText(_('&Next'))
         g.addWidget(self.next_button, 0, 1, 1, 1)
         self.previous_button = b = QPushButton(self)
-        b.setIcon(QIcon.ic("arrow-up.png"))
-        b.setText(_("&Previous"))
+        b.setIcon(QIcon.ic('arrow-up.png'))
+        b.setText(_('&Previous'))
         g.addWidget(self.previous_button, 0, 2, 1, 1)
 
         self.hb = hb = QGroupBox(self)
-        hb.setTitle(_("Help"))
+        hb.setTitle(_('Help'))
         hb.l = l2 = QVBoxLayout(hb)
         self.help = h = QPlainTextEdit(self)
         l2.addWidget(h)
@@ -434,19 +434,19 @@ class ConfigWidget(ConfigWidgetBase):
 
         self.eb = eb = QGroupBox(self)
         g.addWidget(eb, 2, 0, 1, 3)
-        eb.setTitle(_("Edit tweak"))
+        eb.setTitle(_('Edit tweak'))
         eb.g = ebg = QGridLayout(eb)
         self.edit_tweak = et = QPlainTextEdit(self)
         et.setMinimumWidth(400)
         et.setLineWrapMode(QPlainTextEdit.LineWrapMode.NoWrap)
         ebg.addWidget(et, 0, 0, 1, 2)
         self.restore_default_button = b = QPushButton(self)
-        b.setToolTip(_("Restore this tweak to its default value"))
-        b.setText(_("&Reset this tweak"))
+        b.setToolTip(_('Restore this tweak to its default value'))
+        b.setText(_('&Reset this tweak'))
         ebg.addWidget(b, 1, 0, 1, 1)
         self.apply_button = ab = QPushButton(self)
-        ab.setToolTip(_("Apply any changes you made to this tweak"))
-        ab.setText(_("&Apply changes to this tweak"))
+        ab.setToolTip(_('Apply any changes you made to this tweak'))
+        ab.setText(_('&Apply changes to this tweak'))
         ebg.addWidget(ab, 1, 1, 1, 1)
 
     def genesis(self, gui):
@@ -476,7 +476,7 @@ class ConfigWidget(ConfigWidgetBase):
         self.context_menu.addAction(self.copy_icon,
                             _('Copy to clipboard'),
                             partial(self.copy_item_to_clipboard,
-                                    val="%s (%s: %s)"%(tweak.name,
+                                    val='%s (%s: %s)'%(tweak.name,
                                                         _('ID'),
                                                         tweak.var_names[0])))
         self.context_menu.popup(self.mapToGlobal(point))
diff --git a/src/calibre/gui2/proceed.py b/src/calibre/gui2/proceed.py
index 532df23744..3c9f4e6a33 100644
--- a/src/calibre/gui2/proceed.py
+++ b/src/calibre/gui2/proceed.py
@@ -71,7 +71,7 @@ class Icon(QWidget):
         self.set_icon('dialog_question.png')
         self.default_icon = self.icon
         self._fraction = 0.0
-        self.animation = a = QPropertyAnimation(self, b"fraction", self)
+        self.animation = a = QPropertyAnimation(self, b'fraction', self)
         a.setDuration(2000), a.setEasingCurve(QEasingCurve.Type.Linear)
         a.setStartValue(0.0), a.setEndValue(2.0), a.setLoopCount(10)
 
@@ -123,7 +123,7 @@ class ProceedQuestion(QWidget):
         parent.installEventFilter(self)
 
         self._show_fraction = 0.0
-        self.show_animation = a = QPropertyAnimation(self, b"show_fraction", self)
+        self.show_animation = a = QPropertyAnimation(self, b'show_fraction', self)
         a.setDuration(1000), a.setEasingCurve(QEasingCurve.Type.OutQuad)
         a.setStartValue(0.0), a.setEndValue(1.0)
         a.finished.connect(self.stop_show_animation)
diff --git a/src/calibre/gui2/progress_indicator/__init__.py b/src/calibre/gui2/progress_indicator/__init__.py
index 9452a8e3c1..49646c2e4f 100644
--- a/src/calibre/gui2/progress_indicator/__init__.py
+++ b/src/calibre/gui2/progress_indicator/__init__.py
@@ -8,6 +8,7 @@ from calibre_extensions.progress_indicator import SpinAnimator, draw_snake_spinn
 
 draw_snake_spinner
 
+
 class WaitPanel(QWidget):
 
     def __init__(self, msg, parent=None, size=256, interval=10):
diff --git a/src/calibre/gui2/qt_file_dialogs.py b/src/calibre/gui2/qt_file_dialogs.py
index da27487567..997f7d5e59 100644
--- a/src/calibre/gui2/qt_file_dialogs.py
+++ b/src/calibre/gui2/qt_file_dialogs.py
@@ -129,21 +129,21 @@ class FileDialog(QObject):
                 opts |= QFileDialog.Option.HideNameFilterDetails
             if mode == QFileDialog.FileMode.AnyFile:
                 if use_native_dialog:
-                    f = QFileDialog.getSaveFileName(parent, title, initial_dir, ftext, "", opts)
+                    f = QFileDialog.getSaveFileName(parent, title, initial_dir, ftext, '', opts)
                 else:
                     f = create_dialog(title, ftext, for_saving=True)
                 if f and f[0]:
                     self.selected_files.append(f[0])
             elif mode == QFileDialog.FileMode.ExistingFile:
                 if use_native_dialog:
-                    f = QFileDialog.getOpenFileName(parent, title, initial_dir, ftext, "", opts)
+                    f = QFileDialog.getOpenFileName(parent, title, initial_dir, ftext, '', opts)
                 else:
                     f = create_dialog(title, ftext)
                 if f and f[0] and os.path.exists(f[0]):
                     self.selected_files.append(f[0])
             elif mode == QFileDialog.FileMode.ExistingFiles:
                 if use_native_dialog:
-                    fs = QFileDialog.getOpenFileNames(parent, title, initial_dir, ftext, "", opts)
+                    fs = QFileDialog.getOpenFileNames(parent, title, initial_dir, ftext, '', opts)
                 else:
                     fs = create_dialog(title, ftext), True
                 if fs and fs[0]:
diff --git a/src/calibre/gui2/save.py b/src/calibre/gui2/save.py
index 3649b1abb3..cb5457c326 100644
--- a/src/calibre/gui2/save.py
+++ b/src/calibre/gui2/save.py
@@ -65,7 +65,6 @@ class SpooledFile(SpooledTemporaryFile):  # {{{
         newfile.seek(orig.tell(), 0)
 
         self._rolled = True
-
 # }}}
 
 
@@ -116,7 +115,7 @@ class Saver(QObject):
             self.pool.shutdown()
         self.setParent(None)
         self.jobs = self.pool = self.plugboards = self.template_functions = self.library_id =\
-                self.collected_data = self.all_book_ids = self.pd = self.db = None  # noqa
+                self.collected_data = self.all_book_ids = self.pd = self.db = None
         self.deleteLater()
 
     def book_id_data(self, book_id):
diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index 7e03a0a88d..b4c5e9d1b9 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -66,7 +66,7 @@ class SearchLineEdit(QLineEdit):  # {{{
         if self.as_url is not None:
             url = self.as_url(self.text())
             if url:
-                menu.addAction(_('Copy search as URL'), lambda : QApplication.clipboard().setText(url))
+                menu.addAction(_('Copy search as URL'), lambda: QApplication.clipboard().setText(url))
         menu.addAction(_('&Clear search history')).triggered.connect(self.clear_history)
         menu.exec(ev.globalPos())
 
@@ -363,9 +363,7 @@ class SearchBoxMixin:  # {{{
         self.search.clear()
         self.search.setMaximumWidth(self.width()-150)
         self.action_focus_search = QAction(self)
-        shortcuts = list(
-                map(lambda x:str(x.toString(QKeySequence.SequenceFormat.PortableText)),
-                QKeySequence.keyBindings(QKeySequence.StandardKey.Find)))
+        shortcuts = [str(x.toString(QKeySequence.SequenceFormat.PortableText)) for x in QKeySequence.keyBindings(QKeySequence.StandardKey.Find)]
         shortcuts += ['/', 'Alt+S']
         self.keyboard.register_shortcut('start search', _('Start search'),
                 default_keys=shortcuts, action=self.action_focus_search)
diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index b91aed7e64..942a79a943 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -375,7 +375,7 @@ class SearchRestrictionMixin:
 
         self.search_restriction = ComboBoxWithHelp(self)
         self.search_restriction.setVisible(False)
-        self.clear_vl.setText(_("(all books)"))
+        self.clear_vl.setText(_('(all books)'))
         self.ar_menu = QMenu(_('Additional restriction'), self.virtual_library_menu)
         self.edit_menu = QMenu(_('Edit Virtual library'), self.virtual_library_menu)
         self.rm_menu = QMenu(_('Remove Virtual library'), self.virtual_library_menu)
diff --git a/src/calibre/gui2/splash_screen.py b/src/calibre/gui2/splash_screen.py
index b7600e32fa..5ee7306794 100644
--- a/src/calibre/gui2/splash_screen.py
+++ b/src/calibre/gui2/splash_screen.py
@@ -77,7 +77,7 @@ class SplashScreen(QSplashScreen):
         x = pw + 10
         width -= num_width + 5 + x
         painter.setFont(self.title_font)
-        painter.drawText(x, y, width, self.title_height, Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter | Qt.TextFlag.TextSingleLine, "CALIBRE")
+        painter.drawText(x, y, width, self.title_height, Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter | Qt.TextFlag.TextSingleLine, 'CALIBRE')
 
         # Draw starting up message
         y += self.title_height + 5
diff --git a/src/calibre/gui2/store/config/chooser/adv_search_builder.py b/src/calibre/gui2/store/config/chooser/adv_search_builder.py
index ca6129fddf..5a443320e6 100644
--- a/src/calibre/gui2/store/config/chooser/adv_search_builder.py
+++ b/src/calibre/gui2/store/config/chooser/adv_search_builder.py
@@ -73,8 +73,7 @@ class AdvSearchBuilderDialog(QDialog, Ui_Dialog):
             self.mc = '='
         else:
             self.mc = '~'
-        all, any, phrase, none = map(lambda x: str(x.text()),
-                (self.all, self.any, self.phrase, self.none))
+        all, any, phrase, none = (str(x.text()) for x in (self.all, self.any, self.phrase, self.none))
         all, any, none = map(self.tokens, (all, any, none))
         phrase = phrase.strip()
         all = ' and '.join(all)
diff --git a/src/calibre/gui2/store/config/chooser/models.py b/src/calibre/gui2/store/config/chooser/models.py
index cb2270109d..90a3060066 100644
--- a/src/calibre/gui2/store/config/chooser/models.py
+++ b/src/calibre/gui2/store/config/chooser/models.py
@@ -154,9 +154,9 @@ class Matches(QAbstractItemModel):
                 if result.drm_free_only:
                     return ('<p>' + _('This store only distributes e-books without DRM.') + '</p>')
                 else:
-                    return ('<p>' + _('This store distributes e-books with DRM. It may have some titles without DRM, but you will need to check on a per title basis.') + '</p>')  # noqa
+                    return ('<p>' + _('This store distributes e-books with DRM. It may have some titles without DRM, but you will need to check on a per title basis.') + '</p>')  # noqa: E501
             elif col == 3:
-                return ('<p>' + _('This store is headquartered in %s. This is a good indication of what market the store caters to. However, this does not necessarily mean that the store is limited to that market only.') % result.headquarters + '</p>')  # noqa
+                return ('<p>' + _('This store is headquartered in %s. This is a good indication of what market the store caters to. However, this does not necessarily mean that the store is limited to that market only.') % result.headquarters + '</p>')  # noqa: E501
             elif col == 4:
                 if result.affiliate:
                     return ('<p>' + _('Buying from this store supports the calibre developer: %s.') % result.author + '</p>')
@@ -251,13 +251,13 @@ class SearchFilter(SearchQueryParser):
         all_locs = set(self.USABLE_LOCATIONS) - {'all'}
         locations = all_locs if location == 'all' else [location]
         q = {
-             'affiliate': lambda x: x.affiliate,
-             'description': lambda x: x.description.lower(),
-             'drm': lambda x: not x.drm_free_only,
-             'enabled': lambda x: not is_disabled(x),
-             'format': lambda x: ','.join(x.formats).lower(),
-             'headquarters': lambda x: x.headquarters.lower(),
-             'name': lambda x : x.name.lower(),
+            'affiliate': lambda x: x.affiliate,
+            'description': lambda x: x.description.lower(),
+            'drm': lambda x: not x.drm_free_only,
+            'enabled': lambda x: not is_disabled(x),
+            'format': lambda x: ','.join(x.formats).lower(),
+            'headquarters': lambda x: x.headquarters.lower(),
+            'name': lambda x: x.name.lower(),
         }
         q['formats'] = q['format']
         upf = prefs['use_primary_find_in_search']
@@ -266,14 +266,14 @@ class SearchFilter(SearchQueryParser):
                 accessor = q[locvalue]
                 if query == 'true':
                     if locvalue in ('affiliate', 'drm', 'enabled'):
-                        if accessor(sr) == True:  # noqa
+                        if accessor(sr) == True:  # noqa: E712
                             matches.add(sr)
                     elif accessor(sr) is not None:
                         matches.add(sr)
                     continue
                 if query == 'false':
                     if locvalue in ('affiliate', 'drm', 'enabled'):
-                        if accessor(sr) == False:  # noqa
+                        if accessor(sr) == False:  # noqa: E712
                             matches.add(sr)
                     elif accessor(sr) is None:
                         matches.add(sr)
diff --git a/src/calibre/gui2/store/config/chooser/results_view.py b/src/calibre/gui2/store/config/chooser/results_view.py
index 50604f5c1f..dd5a358f56 100644
--- a/src/calibre/gui2/store/config/chooser/results_view.py
+++ b/src/calibre/gui2/store/config/chooser/results_view.py
@@ -14,9 +14,9 @@ from calibre.gui2.store.config.chooser.models import Delegate, Matches
 class ResultsView(QTreeView):
 
     def __init__(self, parent=None):
-        QTreeView.__init__(self,parent)
+        QTreeView.__init__(self, parent)
 
-        self._model = Matches([p for p in store_plugins()])
+        self._model = Matches(list(store_plugins()))
         self.setModel(self._model)
 
         self.setIconSize(QSize(24, 24))
diff --git a/src/calibre/gui2/store/search/adv_search_builder.py b/src/calibre/gui2/store/search/adv_search_builder.py
index c6442c89ec..91281a6512 100644
--- a/src/calibre/gui2/store/search/adv_search_builder.py
+++ b/src/calibre/gui2/store/search/adv_search_builder.py
@@ -80,8 +80,7 @@ class AdvSearchBuilderDialog(QDialog, Ui_Dialog):
             self.mc = '='
         else:
             self.mc = '~'
-        all, any, phrase, none = list(map(lambda x: str(x.text()),
-                (self.all, self.any, self.phrase, self.none)))
+        all, any, phrase, none = [str(x.text()) for x in (self.all, self.any, self.phrase, self.none)]
         all, any, none = list(map(self.tokens, (all, any, none)))
         phrase = phrase.strip()
         all = ' and '.join(all)
diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py
index 9cbdbf9e5d..1a742b0eee 100644
--- a/src/calibre/gui2/store/search/models.py
+++ b/src/calibre/gui2/store/search/models.py
@@ -31,7 +31,7 @@ def comparable_price(text):
         m = re.sub(r'[.,\' ]', '.', match.group())
         # remove all separators accept fraction,
         # leave only 2 digits in fraction
-        m = re.sub(r'\.(?!\d*$)', r'', m)
+        m = re.sub(r'\.(?!\d*$)', '', m)
         text = f'{float(m) * 100.:0>8.0f}'
     return text
 
@@ -242,11 +242,11 @@ class Matches(QAbstractItemModel):
                     'No price was found')
             elif col == 3:
                 if result.drm == SearchResult.DRM_LOCKED:
-                    return ('<p>' + _('This book as been detected as having DRM restrictions. This book may not work with your reader and you will have limitations placed upon you as to what you can do with this book. Check with the store before making any purchases to ensure you can actually read this book.') + '</p>')  # noqa
+                    return ('<p>' + _('This book as been detected as having DRM restrictions. This book may not work with your reader and you will have limitations placed upon you as to what you can do with this book. Check with the store before making any purchases to ensure you can actually read this book.') + '</p>')  # noqa: E501
                 elif result.drm == SearchResult.DRM_UNLOCKED:
-                    return ('<p>' + _('This book has been detected as being DRM Free. You should be able to use this book on any device provided it is in a format calibre supports for conversion. However, before making a purchase double check the DRM status with the store. The store may not be disclosing the use of DRM.') + '</p>')  # noqa
+                    return ('<p>' + _('This book has been detected as being DRM Free. You should be able to use this book on any device provided it is in a format calibre supports for conversion. However, before making a purchase double check the DRM status with the store. The store may not be disclosing the use of DRM.') + '</p>')  # noqa: E501
                 else:
-                    return ('<p>' + _('The DRM status of this book could not be determined. There is a very high likelihood that this book is actually DRM restricted.') + '</p>')  # noqa
+                    return ('<p>' + _('The DRM status of this book could not be determined. There is a very high likelihood that this book is actually DRM restricted.') + '</p>')  # noqa: E501
             elif col == 4:
                 return ('<p>%s</p>' % result.formats)
             elif col == 5:
@@ -397,15 +397,15 @@ class SearchFilter(SearchQueryParser):
         all_locs = set(self.USABLE_LOCATIONS) - {'all'}
         locations = all_locs if location == 'all' else [location]
         q = {
-             'affiliate': attrgetter('affiliate'),
-             'author': lambda x: x.author.lower(),
-             'cover': attrgetter('cover_url'),
-             'drm': attrgetter('drm'),
-             'download': attrgetter('downloads'),
-             'format': attrgetter('formats'),
-             'price': lambda x: comparable_price(x.price),
-             'store': lambda x: x.store_name.lower(),
-             'title': lambda x: x.title.lower(),
+            'affiliate': attrgetter('affiliate'),
+            'author': lambda x: x.author.lower(),
+            'cover': attrgetter('cover_url'),
+            'drm': attrgetter('drm'),
+            'download': attrgetter('downloads'),
+            'format': attrgetter('formats'),
+            'price': lambda x: comparable_price(x.price),
+            'store': lambda x: x.store_name.lower(),
+            'title': lambda x: x.title.lower(),
         }
         for x in ('author', 'download', 'format'):
             q[x+'s'] = q[x]
diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py
index dea3ad8a31..96c9a9fca6 100644
--- a/src/calibre/gui2/store/search/search.py
+++ b/src/calibre/gui2/store/search/search.py
@@ -155,9 +155,9 @@ class SearchDialog(QDialog, Ui_Dialog):
         self.results_view.setColumnWidth(0, 85)
         total = total - 85
         # Title / Author
-        self.results_view.setColumnWidth(1,int(total*.40))
+        self.results_view.setColumnWidth(1, int(total*.40))
         # Price
-        self.results_view.setColumnWidth(2,int(total*.12))
+        self.results_view.setColumnWidth(2, int(total*.12))
         # DRM
         self.results_view.setColumnWidth(3, int(total*.15))
         # Store / Formats
@@ -181,7 +181,7 @@ class SearchDialog(QDialog, Ui_Dialog):
         # Prevent hitting the enter key twice in quick succession causing
         # the search to start and stop
         self.search.setEnabled(False)
-        QTimer.singleShot(1000, lambda :self.search.setEnabled(True))
+        QTimer.singleShot(1000, lambda: self.search.setEnabled(True))
 
     def do_search(self):
         # Stop all running threads.
@@ -198,7 +198,7 @@ class SearchDialog(QDialog, Ui_Dialog):
             query.append('author2:"%s"' % str(self.search_author.text()).replace('"', ' '))
         if self.search_edit.text():
             query.append(str(self.search_edit.text()))
-        query = " ".join(query)
+        query = ' '.join(query)
         if not query.strip():
             error_dialog(self, _('No query'),
                         _('You must enter a title, author or keyword to'
@@ -248,7 +248,7 @@ class SearchDialog(QDialog, Ui_Dialog):
             query = re.sub(r'%s:"[^"]"' % loc, '', query)
             query = re.sub(r'%s:[^\s]*' % loc, '', query)
         # Remove logic.
-        query = re.sub(r'(^|\s|")(and|not|or|a|the|is|of)(\s|$|")', r' ', query)
+        query = re.sub(r'(^|\s|")(and|not|or|a|the|is|of)(\s|$|")', ' ', query)
         # Remove "
         query = query.replace('"', '')
         # Remove excess whitespace.
@@ -385,7 +385,7 @@ class SearchDialog(QDialog, Ui_Dialog):
                 self.results_view.model().add_result(res, store_plugin)
 
         if not self.search_pool.threads_running() and not self.results_view.model().has_results():
-            info_dialog(self, _('No matches'), _('Couldn\'t find any books matching your query.'), show=True, show_copy_button=False)
+            info_dialog(self, _('No matches'), _("Couldn't find any books matching your query."), show=True, show_copy_button=False)
 
     def update_book_total(self, total):
         self.total.setText('%s' % total)
diff --git a/src/calibre/gui2/store/stores/amazon_de_plugin.py b/src/calibre/gui2/store/stores/amazon_de_plugin.py
index 17c64fae3a..ec4b72b594 100644
--- a/src/calibre/gui2/store/stores/amazon_de_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_de_plugin.py
@@ -28,6 +28,5 @@ class AmazonKindleStore(Base, StorePlugin):
     pass
 
 
-
 if __name__ == '__main__':
     Base().develop_plugin()
diff --git a/src/calibre/gui2/store/stores/amazon_es_plugin.py b/src/calibre/gui2/store/stores/amazon_es_plugin.py
index 64a2620d07..607d5723d3 100644
--- a/src/calibre/gui2/store/stores/amazon_es_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_es_plugin.py
@@ -100,7 +100,7 @@ def search_amazon(query, max_results=10, timeout=60,
             title = ''.join(data.xpath(title_xpath))
             author = ''.join(data.xpath(author_xpath))
             try:
-                author = author.split('by ', 1)[1].split(" (")[0]
+                author = author.split('by ', 1)[1].split(' (')[0]
             except:
                 pass
 
diff --git a/src/calibre/gui2/store/stores/amazon_it_plugin.py b/src/calibre/gui2/store/stores/amazon_it_plugin.py
index c7c2617729..895c825d81 100644
--- a/src/calibre/gui2/store/stores/amazon_it_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_it_plugin.py
@@ -100,7 +100,7 @@ def search_amazon(query, max_results=10, timeout=60,
             title = ''.join(data.xpath(title_xpath))
             author = ''.join(data.xpath(author_xpath))
             try:
-                author = author.split('by ', 1)[1].split(" (")[0]
+                author = author.split('by ', 1)[1].split(' (')[0]
             except:
                 pass
 
diff --git a/src/calibre/gui2/store/stores/archive_org_plugin.py b/src/calibre/gui2/store/stores/archive_org_plugin.py
index 2afa38d11a..2b0e154230 100644
--- a/src/calibre/gui2/store/stores/archive_org_plugin.py
+++ b/src/calibre/gui2/store/stores/archive_org_plugin.py
@@ -11,7 +11,7 @@ from calibre.gui2.store.basic_config import BasicStoreConfig
 from calibre.gui2.store.opensearch_store import OpenSearchOPDSStore, open_search
 from calibre.gui2.store.search_result import SearchResult
 
-SEARCH_URL =  'http://bookserver.archive.org/catalog/opensearch.xml'
+SEARCH_URL = 'http://bookserver.archive.org/catalog/opensearch.xml'
 
 
 def search(query, max_results=10, timeout=60):
diff --git a/src/calibre/gui2/store/stores/beam_ebooks_de_plugin.py b/src/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
index a296fb361b..064340c7dc 100644
--- a/src/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
+++ b/src/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
@@ -71,5 +71,5 @@ class BeamEBooksDEStore(BasicStoreConfig, StorePlugin):
                 s.price = price
                 s.drm = SearchResult.DRM_UNLOCKED
                 s.detail_item = id_
-#                 s.formats = None
+                # s.formats = None
                 yield s
diff --git a/src/calibre/gui2/store/stores/bn_plugin.py b/src/calibre/gui2/store/stores/bn_plugin.py
index d4eacf5cbc..efc16d81c0 100644
--- a/src/calibre/gui2/store/stores/bn_plugin.py
+++ b/src/calibre/gui2/store/stores/bn_plugin.py
@@ -83,7 +83,7 @@ def search_bn(query, max_results=10, timeout=60, write_html_to=''):
 class BNStore(BasicStoreConfig, StorePlugin):
 
     def open(self, parent=None, detail_item=None, external=False):
-        url = "https://bn.com"
+        url = 'https://bn.com'
 
         if external or self.config.get('open_external', False):
             open_url(QUrl(url_slash_cleaner(detail_item if detail_item else url)))
diff --git a/src/calibre/gui2/store/stores/chitanka_plugin.py b/src/calibre/gui2/store/stores/chitanka_plugin.py
index 29fa910f3e..ce15e58417 100644
--- a/src/calibre/gui2/store/stores/chitanka_plugin.py
+++ b/src/calibre/gui2/store/stores/chitanka_plugin.py
@@ -45,7 +45,7 @@ def parse_book_page(doc, base_url, counter):
         s.title = ''.join(data.xpath('.//div[@class="media-body"]/a[@class="booklink"]/i/text()')).strip()
         alternative_headline = data.xpath('.//div[@class="media-body"]/div[@itemprop="alternativeHeadline"]/text()')
         if len(alternative_headline) > 0:
-            s.title = "{} ({})".format(s.title, ''.join(alternative_headline).strip())
+            s.title = '{} ({})'.format(s.title, ''.join(alternative_headline).strip())
 
         s.author = ', '.join(data.xpath('.//div[@class="media-body"]/div[@class="bookauthor"]/span/a/text()')).strip(', ')
         s.detail_item = id
@@ -91,7 +91,7 @@ class ChitankaStore(BasicStoreConfig, StorePlugin):
             return
 
         base_url = 'http://chitanka.info'
-        url = base_url + '/search?q=' +  quote(query)
+        url = base_url + '/search?q=' + quote(query)
         counter = max_results
 
         # search for book title
diff --git a/src/calibre/gui2/store/stores/ebooks_com_plugin.py b/src/calibre/gui2/store/stores/ebooks_com_plugin.py
index 06a3973e0e..19bfdccae8 100644
--- a/src/calibre/gui2/store/stores/ebooks_com_plugin.py
+++ b/src/calibre/gui2/store/stores/ebooks_com_plugin.py
@@ -58,7 +58,7 @@ def search_ec(query, max_results=10, timeout=60, write_html_to=''):
         s.author = ' & '.join(x['name'] for x in book['authors'])
         s.price = book['price']
         s.detail_item = absolutize(book['book_url'])
-        s.ebooks_com_api_url = 'https://www.ebooks.com/api/book/?bookId={}&countryCode={}'.format(book["id"], cc)
+        s.ebooks_com_api_url = 'https://www.ebooks.com/api/book/?bookId={}&countryCode={}'.format(book['id'], cc)
         s.drm = SearchResult.DRM_UNKNOWN
         yield s
 
diff --git a/src/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py b/src/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py
index d9259366da..ecca17c687 100644
--- a/src/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py
+++ b/src/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py
@@ -46,7 +46,7 @@ class EBookShoppeUKStore(BasicStoreConfig, StorePlugin):
     def search(self, query, max_results=10, timeout=60):
         url = 'http://www.ebookshoppe.com/search.php?search_query=' + quote(query)
         br = browser()
-        br.addheaders = [("Referer", "http://www.ebookshoppe.com/")]
+        br.addheaders = [('Referer', 'http://www.ebookshoppe.com/')]
 
         counter = max_results
         with closing(br.open(url, timeout=timeout)) as f:
diff --git a/src/calibre/gui2/store/stores/empik_plugin.py b/src/calibre/gui2/store/stores/empik_plugin.py
index a75c0c0e2e..a39a8447d9 100644
--- a/src/calibre/gui2/store/stores/empik_plugin.py
+++ b/src/calibre/gui2/store/stores/empik_plugin.py
@@ -78,9 +78,9 @@ class EmpikStore(BasicStoreConfig, StorePlugin):
                 price = ''.join(data.xpath('.//div[@class="price ta-price-tile "]/text()'))
 
                 # with closing(br.open('https://empik.com' + id.strip(), timeout=timeout/4)) as nf:
-                #    idata = html.fromstring(nf.read())
-                #    crawled = idata.xpath('.//a[(@class="chosen hrefstyle") or (@class="connectionsLink hrefstyle")]/text()')
-                #    formats = ','.join([re.sub('ebook, ','', x.strip()) for x in crawled if 'ebook' in x])
+                #     idata = html.fromstring(nf.read())
+                #     crawled = idata.xpath('.//a[(@class="chosen hrefstyle") or (@class="connectionsLink hrefstyle")]/text()')
+                #     formats = ','.join([re.sub(r'ebook, ','', x.strip()) for x in crawled if 'ebook' in x])
 
                 counter -= 1
 
diff --git a/src/calibre/gui2/store/stores/gutenberg_plugin.py b/src/calibre/gui2/store/stores/gutenberg_plugin.py
index f54748d22d..e8e9a04dd5 100644
--- a/src/calibre/gui2/store/stores/gutenberg_plugin.py
+++ b/src/calibre/gui2/store/stores/gutenberg_plugin.py
@@ -55,7 +55,7 @@ def search(query, max_results=10, timeout=60, write_raw_to=None):
         try:
             s.author = etree.tostring(next(CSSSelect('span.subtitle', li)), method='text', encoding='unicode').strip()
         except StopIteration:
-            s.author = ""
+            s.author = ''
         for img in CSSSelect('img.cover-thumb', li):
             s.cover_url = absurl(img.get('src'))
             break
diff --git a/src/calibre/gui2/store/stores/litres_plugin.py b/src/calibre/gui2/store/stores/litres_plugin.py
index 51a231692c..c98c11b108 100644
--- a/src/calibre/gui2/store/stores/litres_plugin.py
+++ b/src/calibre/gui2/store/stores/litres_plugin.py
@@ -53,8 +53,8 @@ class LitResStore(BasicStoreConfig, StorePlugin):
             d.exec()
 
     def search(self, query, max_results=10, timeout=60):
-        search_url = u'http://robot.litres.ru/pages/catalit_browser/?checkpoint=2000-01-02&'\
-        'search=%s&limit=0,%s'
+        search_url = (u'http://robot.litres.ru/pages/catalit_browser/?checkpoint=2000-01-02'
+                       '&search=%s&limit=0,%s')
         search_url = search_url % (quote(query), max_results)
 
         counter = max_results
@@ -62,7 +62,7 @@ class LitResStore(BasicStoreConfig, StorePlugin):
         br.addheaders.append(['Accept-Encoding','gzip'])
 
         with closing(br.open(search_url, timeout=timeout)) as r:
-            ungzipResponse(r,br)
+            ungzipResponse(r, br)
             raw= xml_to_unicode(r.read(), strip_encoding_pats=True, assume_utf8=True)[0]
 
             doc = etree.fromstring(raw, parser=etree.XMLParser(recover=True, no_network=True, resolve_entities=False))
@@ -111,16 +111,16 @@ def format_price_in_RUR(price):
     @return: formatted price if possible otherwise original value
     @rtype: unicode
     '''
-    if price and re.match(r"^\d*?\.\d*?$", price):
+    if price and re.match(r'^\d*?\.\d*?$', price):
         try:
-            price = u'{:,.2F} \u20BD'.format(float(price))  # \u20BD => руб.
+            price = u'{:,.2F} \u20bd'.format(float(price))  # \u20bd => руб.
             price = price.replace(',', ' ').replace('.', ',', 1)
         except:
             pass
     return price
 
 
-def ungzipResponse(r,b):
+def ungzipResponse(r, b):
     headers = r.info()
     if headers.get('Content-Encoding', '')=='gzip':
         import gzip
diff --git a/src/calibre/gui2/store/stores/mills_boon_uk_plugin.py b/src/calibre/gui2/store/stores/mills_boon_uk_plugin.py
index 19e9647980..73a90af405 100644
--- a/src/calibre/gui2/store/stores/mills_boon_uk_plugin.py
+++ b/src/calibre/gui2/store/stores/mills_boon_uk_plugin.py
@@ -60,7 +60,7 @@ class MillsBoonUKStore(BasicStoreConfig, StorePlugin):
                     continue
 
                 cover_url = ''.join(data.xpath('.//div[@class="img-wrapper"]/a/img/@src'))
-                title =  ''.join(data.xpath('.//div[@class="img-wrapper"]/a/img/@alt')).strip()
+                title = ''.join(data.xpath('.//div[@class="img-wrapper"]/a/img/@alt')).strip()
                 author = ''.join(data.xpath('.//a[@class="author"]/text()'))
                 price = ''.join(data.xpath('.//div[@class="type-wrapper"]/ul/li[child::span[text()="eBook"]]/a/text()'))
                 format_ = ''.join(data.xpath('.//p[@class="doc-meta-format"]/span[last()]/text()'))
diff --git a/src/calibre/gui2/store/stores/mobileread/adv_search_builder.py b/src/calibre/gui2/store/stores/mobileread/adv_search_builder.py
index 8ea8dbea80..2c9781e9ce 100644
--- a/src/calibre/gui2/store/stores/mobileread/adv_search_builder.py
+++ b/src/calibre/gui2/store/stores/mobileread/adv_search_builder.py
@@ -73,8 +73,7 @@ class AdvSearchBuilderDialog(QDialog, Ui_Dialog):
             self.mc = '='
         else:
             self.mc = '~'
-        all, any, phrase, none = list(map(lambda x: type(u'')(x.text()),
-                (self.all, self.any, self.phrase, self.none)))
+        all, any, phrase, none = [type(u'')(x.text()) for x in (self.all, self.any, self.phrase, self.none)]
         all, any, none = list(map(self.tokens, (all, any, none)))
         phrase = phrase.strip()
         all = ' and '.join(all)
diff --git a/src/calibre/gui2/store/stores/mobileread/models.py b/src/calibre/gui2/store/stores/mobileread/models.py
index bed3d263a0..94f1af96df 100644
--- a/src/calibre/gui2/store/stores/mobileread/models.py
+++ b/src/calibre/gui2/store/stores/mobileread/models.py
@@ -152,9 +152,9 @@ class SearchFilter(SearchQueryParser):
         all_locs = set(self.USABLE_LOCATIONS) - {'all'}
         locations = all_locs if location == 'all' else [location]
         q = {
-             'author': lambda x: x.author.lower(),
-             'format': attrgetter('formats'),
-             'title': lambda x: x.title.lower(),
+            'author': lambda x: x.author.lower(),
+            'format': attrgetter('formats'),
+            'title': lambda x: x.title.lower(),
         }
         for x in ('author', 'format'):
             q[x+'s'] = q[x]
diff --git a/src/calibre/gui2/store/stores/nexto_plugin.py b/src/calibre/gui2/store/stores/nexto_plugin.py
index 162c6f3f48..92feedaa73 100644
--- a/src/calibre/gui2/store/stores/nexto_plugin.py
+++ b/src/calibre/gui2/store/stores/nexto_plugin.py
@@ -82,10 +82,10 @@ class NextoStore(BasicStoreConfig, StorePlugin):
                     price = ''.join(data.xpath('.//strong[@class="nprice"]/text()'))
 
                     cover_url = ''.join(data.xpath('.//picture[@class="cover"]/img/@data-src'))
-                    cover_url = re.sub(r'%2F', '/', cover_url)
-                    cover_url = re.sub(r'widthMax=235&heightMax=335', 'widthMax=64&heightMax=64', cover_url)
+                    cover_url = cover_url.replace('%2F', '/')
+                    cover_url = cover_url.replace('widthMax=235&heightMax=335', 'widthMax=64&heightMax=64')
                     title = ''.join(data.xpath('.//a[@class="title"]/text()'))
-                    title = re.sub(r' – ebook', '', title)
+                    title = title.replace(' – ebook', '')
                     author = ', '.join(data.xpath('.//div[@class="col-7"]//h4//a/text()'))
                     formats = ', '.join(data.xpath('.//ul[@class="formats"]/li//b/text()'))
                     DrmFree = data.xpath('.//ul[@class="formats"]/li//b[contains(@title, "znak")]')
diff --git a/src/calibre/gui2/store/stores/publio_plugin.py b/src/calibre/gui2/store/stores/publio_plugin.py
index f273b159db..b0ddf19da3 100644
--- a/src/calibre/gui2/store/stores/publio_plugin.py
+++ b/src/calibre/gui2/store/stores/publio_plugin.py
@@ -61,7 +61,7 @@ class PublioStore(BasicStoreConfig, StorePlugin):
         counter = max_results
         page = 1
         while counter:
-            with closing(br.open('http://www.publio.pl/e-booki,strona{}.html?q={}'.format(page, quote(query)), timeout=timeout)) as f:  # noqa
+            with closing(br.open('http://www.publio.pl/e-booki,strona{}.html?q={}'.format(page, quote(query)), timeout=timeout)) as f:
                 doc = html.fromstring(f.read())
                 for data in doc.xpath('//div[@class="products-list"]//div[@class="product-tile"]'):
                     if counter <= 0:
diff --git a/src/calibre/gui2/store/stores/rw2010_plugin.py b/src/calibre/gui2/store/stores/rw2010_plugin.py
index 6a4317678c..4c08c5bf66 100644
--- a/src/calibre/gui2/store/stores/rw2010_plugin.py
+++ b/src/calibre/gui2/store/stores/rw2010_plugin.py
@@ -75,7 +75,7 @@ class RW2010Store(BasicStoreConfig, StorePlugin):
                 s.title = title.strip()
                 s.author = author.strip()
                 s.price = price
-                s.detail_item = re.sub(r'%3D', '=', id)
+                s.detail_item = id.replace('%3D', '=')
                 s.drm = SearchResult.DRM_UNLOCKED
                 s.formats = formats[0:-2].upper()
 
diff --git a/src/calibre/gui2/store/stores/swiatebookow_plugin.py b/src/calibre/gui2/store/stores/swiatebookow_plugin.py
index 64ebce1465..9a5c6c11ae 100644
--- a/src/calibre/gui2/store/stores/swiatebookow_plugin.py
+++ b/src/calibre/gui2/store/stores/swiatebookow_plugin.py
@@ -81,7 +81,7 @@ class SwiatEbookowStore(BasicStoreConfig, StorePlugin):
                     counter -= 1
 
                     s = SearchResult()
-                    s.cover_url =  'https://www.swiatebookow.pl' + cover_url
+                    s.cover_url = 'https://www.swiatebookow.pl' + cover_url
                     s.title = title.strip()
                     s.author = author.strip()
                     s.price = price
diff --git a/src/calibre/gui2/tag_browser/__init__.py b/src/calibre/gui2/tag_browser/__init__.py
index ad82601065..1f6b29ebfa 100644
--- a/src/calibre/gui2/tag_browser/__init__.py
+++ b/src/calibre/gui2/tag_browser/__init__.py
@@ -4,6 +4,3 @@
 __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
-
-
-
diff --git a/src/calibre/gui2/tag_browser/model.py b/src/calibre/gui2/tag_browser/model.py
index f4d6b1e352..7510b0a8a9 100644
--- a/src/calibre/gui2/tag_browser/model.py
+++ b/src/calibre/gui2/tag_browser/model.py
@@ -472,7 +472,7 @@ class TagsModel(QAbstractItemModel):  # {{{
     def remove_value_icon(self, key, value, file_name):
         self.value_icons = self.prefs['tags_browser_value_icons']
         self.value_icons.get(key, {}).pop(value, None)
-        self.prefs['tags_browser_value_icons'] =self.value_icons
+        self.prefs['tags_browser_value_icons'] = self.value_icons
         self._remove_icon_file(file_name)
 
     def remove_all_value_icons(self, key, keep_template=True):
@@ -581,7 +581,7 @@ class TagsModel(QAbstractItemModel):  # {{{
             traceback.print_stack()
             return
         # traceback.print_stack()
-        # print ()
+        # print()
         self._build_in_progress = True
         self.beginResetModel()
         self._run_rebuild(state_map=state_map)
@@ -636,7 +636,7 @@ class TagsModel(QAbstractItemModel):  # {{{
                         key, (category_icon_map['user:'] if key.startswith('@') else category_icon_map['custom:'])))
 
             if key.startswith('@'):
-                path_parts = [p for p in key.split('.')]
+                path_parts = key.split('.')
                 path = ''
                 last_category_node = self.root_item
                 tree_root = self.user_category_node_tree
@@ -797,7 +797,7 @@ class TagsModel(QAbstractItemModel):  # {{{
                         cur_idx = 0
                         for interval in intervals:
                             first_chr, last_chr, length = interval
-                            for i in range(0, length):
+                            for i in range(length):
                                 if first_chr == last_chr:
                                     cl_list[cur_idx] = first_chr
                                 else:
@@ -903,12 +903,12 @@ class TagsModel(QAbstractItemModel):  # {{{
                                          t for t in node_parent.children
                                             if t.type != TagTreeItem.CATEGORY}
                         if (comp,child_key) in child_map:
-                            node_parent = child_map[(comp,child_key)]
+                            node_parent = child_map[(comp, child_key)]
                             t = node_parent.tag
                             t.is_hierarchical = '5state' if tag.category != 'search' else '3state'
                             if tag.id_set is not None and t.id_set is not None:
                                 t.id_set = t.id_set | tag.id_set
-                            intermediate_nodes[t.original_name,child_key] = t
+                            intermediate_nodes[t.original_name, child_key] = t
                         else:
                             if i < len(components)-1:
                                 original_name = '.'.join(components[:i+1])
@@ -924,12 +924,12 @@ class TagsModel(QAbstractItemModel):  # {{{
                                     else:
                                         t.is_searchable = t.is_editable = False
                                         t.search_expression = None
-                                    intermediate_nodes[original_name,child_key] = t
+                                    intermediate_nodes[original_name, child_key] = t
                             else:
                                 t = tag
                                 if not in_uc:
                                     t.original_name = t.name
-                                intermediate_nodes[t.original_name,child_key] = t
+                                intermediate_nodes[t.original_name, child_key] = t
                             t.is_hierarchical = \
                                 '5state' if t.category != 'search' else '3state'
                             t.name = comp
@@ -1055,7 +1055,7 @@ class TagsModel(QAbstractItemModel):  # {{{
 
     # Drag'n Drop {{{
     def mimeTypes(self):
-        return ["application/calibre+from_library",
+        return ['application/calibre+from_library',
                 'application/calibre+from_tag_browser']
 
     def mimeData(self, indexes):
@@ -1086,7 +1086,7 @@ class TagsModel(QAbstractItemModel):  # {{{
         fmts = {str(x) for x in md.formats()}
         if not fmts.intersection(set(self.mimeTypes())):
             return False
-        if "application/calibre+from_library" in fmts:
+        if 'application/calibre+from_library' in fmts:
             if action != Qt.DropAction.CopyAction:
                 return False
             return self.do_drop_from_library(md, action, row, column, parent)
@@ -1233,12 +1233,13 @@ class TagsModel(QAbstractItemModel):  # {{{
                 fm_dest = self.db.metadata_for_field(node.category_key)
                 if fm_dest['kind'] == 'user':
                     fm_src = self.db.metadata_for_field(md.column_name)
-                    if md.column_name in ['authors', 'publisher', 'series'] or \
-                            (fm_src['is_custom'] and (
-                             fm_src['datatype'] in ['series', 'text', 'enumeration'] and
-                              not fm_src['is_multiple'])or
-                             (fm_src['datatype'] == 'composite' and
-                              fm_src['display'].get('make_category', False))):
+                    if md.column_name in ['authors', 'publisher', 'series'] or (
+                               (fm_src['is_custom'] and (
+                                fm_src['datatype'] in ['series', 'text', 'enumeration'] and
+                                not fm_src['is_multiple'])) or
+                               (fm_src['datatype'] == 'composite' and
+                                fm_src['display'].get('make_category', False))
+                            ):
                         mime = 'application/calibre+from_library'
                         ids = list(map(int, md.data(mime).data().split()))
                         self.handle_user_category_drop(node, ids, md.column_name)
@@ -1284,7 +1285,7 @@ class TagsModel(QAbstractItemModel):  # {{{
         self.convert_requested.emit(book_ids, fmt)
 
     def handle_drop(self, on_node, ids):
-        # print 'Dropped ids:', ids, on_node.tag
+        # print('Dropped ids:', ids, on_node.tag)
         key = on_node.tag.category
         if key == 'formats':
             self.handle_drop_on_format(on_node.tag.name, ids)
@@ -1442,7 +1443,7 @@ class TagsModel(QAbstractItemModel):  # {{{
                 def key_func(val):
                     if order == 'display_name':
                         return icu_lower(self.db.field_metadata[val]['name'])
-                    return icu_lower(val[1:] if val.startswith('#') or val.startswith('@') else val)
+                    return icu_lower(val[1:] if val.startswith(('#', '@')) else val)
                 direction = tweaks.get('tag_browser_category_default_sort_direction', 'ascending')
                 if direction not in ('ascending', 'descending'):
                     print('Tweak tag_browser_category_default_sort_direction is not valid. Ignored')
@@ -1547,7 +1548,7 @@ class TagsModel(QAbstractItemModel):  # {{{
                 self.use_position_based_index_on_next_recount = True
                 return True
 
-            for c in sorted(list(user_cats.keys()), key=sort_key):
+            for c in sorted(user_cats.keys(), key=sort_key):
                 if icu_lower(c).startswith(ckey_lower):
                     if len(c) == len(ckey):
                         if strcmp(ckey, nkey) != 0 and \
@@ -1612,7 +1613,7 @@ class TagsModel(QAbstractItemModel):  # {{{
             self.add_renamed_item_to_user_categories(lookup_key, original_name, new_name)
 
         children = item.all_children()
-        restrict_to_book_ids=self.get_book_ids_to_use() if item.use_vl else None
+        restrict_to_book_ids = self.get_book_ids_to_use() if item.use_vl else None
         if item.tag.is_editable and len(children) == 0:
             # Leaf node, just do it.
             do_one_item(key, item, item.tag.original_name, to_what, restrict_to_book_ids)
@@ -1652,13 +1653,13 @@ class TagsModel(QAbstractItemModel):  # {{{
             if ucat.get(new_name, None) == item_category:
                 if ucat.pop(item_name, None) is not None:
                     # Only update the user_cats when something changes
-                    user_cats[k] = list([(n, c, 0) for n, c in ucat.items()])
+                    user_cats[k] = [(n, c, 0) for n, c in ucat.items()]
             elif ucat.get(item_name, None) == item_category:
                 # If the old name/item_category exists, rename it to the new
                 # name using del/add
                 del ucat[item_name]
                 ucat[new_name] = item_category
-                user_cats[k] = list([(n, c, 0) for n, c in ucat.items()])
+                user_cats[k] = [(n, c, 0) for n, c in ucat.items()]
         self.db.new_api.set_pref('user_categories', user_cats)
 
     def delete_item_from_all_user_categories(self, item_name, item_category):
@@ -1906,14 +1907,14 @@ class TagsModel(QAbstractItemModel):  # {{{
         nodes_seen = set()
         stars = rating_to_stars(3, True)
 
-        node_searches = {TAG_SEARCH_STATES['mark_plus']       : 'true',
-                         TAG_SEARCH_STATES['mark_plusplus']   : '.true',
-                         TAG_SEARCH_STATES['mark_minus']      : 'false',
-                         TAG_SEARCH_STATES['mark_minusminus'] : '.false'}
+        node_searches = {TAG_SEARCH_STATES['mark_plus']      : 'true',
+                         TAG_SEARCH_STATES['mark_plusplus']  : '.true',
+                         TAG_SEARCH_STATES['mark_minus']     : 'false',
+                         TAG_SEARCH_STATES['mark_minusminus']: '.false'}
 
         for node in self.category_nodes:
             if node.tag.state:
-                if node.category_key == "news":
+                if node.category_key == 'news':
                     if node_searches[node.tag.state] == 'true':
                         ans.append('tags:"=' + _('News') + '"')
                     else:
diff --git a/src/calibre/gui2/tag_browser/ui.py b/src/calibre/gui2/tag_browser/ui.py
index 112305a8ef..92bb001ac4 100644
--- a/src/calibre/gui2/tag_browser/ui.py
+++ b/src/calibre/gui2/tag_browser/ui.py
@@ -97,7 +97,7 @@ class TagBrowserMixin:  # {{{
         if idx is not None and idx.isValid():
             col = idx.column()
             model = self.library_view.model()
-            if col in range(0, len(model.column_map)):
+            if col in range(len(model.column_map)):
                 current_cat = model.column_map[col]
                 if current_cat in ('authors', 'series', 'publisher', 'tags') or current_cat in cust_cats:
                     cdn = cat_display_name(current_cat) or current_cat
@@ -105,7 +105,7 @@ class TagBrowserMixin:  # {{{
                     proxy_md = db.new_api.get_proxy_metadata(db.id(idx.row()))
                     items = proxy_md.get(current_cat)
                     if isinstance(items, str):
-                        items = list((items,))
+                        items = [items]
                     if items:
                         items_title = _('{category} for current book').format(category=cdn)
                         if len(items) > 4:
@@ -170,7 +170,7 @@ class TagBrowserMixin:  # {{{
         current_row_id = self.library_view.current_id
         self.library_view.model().refresh(reset=True)
         self.library_view.model().research(reset=False)
-        self.library_view.current_id = current_row_id # the setter checks for None
+        self.library_view.current_id = current_row_id  # the setter checks for None
 
     def do_restriction_error(self, e):
         error_dialog(self.tags_view, _('Invalid search restriction'),
@@ -893,7 +893,7 @@ class TagBrowserWidget(QFrame):  # {{{
         ac = QAction(parent)
         parent.addAction(ac)
         parent.keyboard.register_shortcut('tag browser set focus',
-                _("Give the Tag browser keyboard focus"), default_keys=(),
+                _('Give the Tag browser keyboard focus'), default_keys=(),
                 action=ac, group=_('Tag browser'))
         ac.triggered.connect(self.give_tb_focus)
 
@@ -1099,5 +1099,4 @@ class TagBrowserWidget(QFrame):  # {{{
             return
         return QFrame.keyPressEvent(self, ev)
 
-
 # }}}
diff --git a/src/calibre/gui2/tag_browser/view.py b/src/calibre/gui2/tag_browser/view.py
index 1889261957..a588ec87a7 100644
--- a/src/calibre/gui2/tag_browser/view.py
+++ b/src/calibre/gui2/tag_browser/view.py
@@ -101,7 +101,7 @@ class TagDelegate(QStyledItemDelegate):  # {{{
 
     def text_color(self, hover, palette) -> QColor:
         if QApplication.instance().is_dark_theme and hover:
-                return QColor(Qt.GlobalColor.black)
+            return QColor(Qt.GlobalColor.black)
         return palette.color(QPalette.ColorRole.WindowText)
 
     def draw_text(self, style, painter, option, widget, index, item):
@@ -253,7 +253,7 @@ class TagDelegate(QStyledItemDelegate):  # {{{
             editor = EnLineEdit(parent)
         return editor
 
-    # }}}
+# }}}
 
 
 class TagsView(QTreeView):  # {{{
@@ -300,7 +300,7 @@ class TagsView(QTreeView):  # {{{
         self.pane_is_visible = False
         self.current_expansion = None
         self.search_icon = QIcon.ic('search.png')
-        self.search_copy_icon = QIcon.ic("search_copy_saved.png")
+        self.search_copy_icon = QIcon.ic('search_copy_saved.png')
         self.user_category_icon = QIcon.ic('tb_folder.png')
         self.edit_metadata_icon = QIcon.ic('edit_input.png')
         self.delete_icon = QIcon.ic('list_remove.png')
@@ -712,7 +712,7 @@ class TagsView(QTreeView):  # {{{
                         self._model.set_value_icon(key, TEMPLATE_ICON_INDICATOR, d.rule[2], False)
                         self.recount()
                     return
-                (icon_file_name, for_children) = extra if extra is not None else (None, None)
+                icon_file_name, for_children = extra if extra is not None else (None, None)
                 item_val, desired_file_name = make_icon_name(key, index)
                 if icon_file_name is None:
                     # User wants to specify a specific icon
@@ -735,9 +735,9 @@ class TagsView(QTreeView):  # {{{
                 else:
                     # Already have an icon. User wants to change whether it applies to children
                     icon_file_name = desired_file_name
-                if index is None: # category icon
+                if index is None:  # category icon
                     self._model.set_custom_category_icon(key, str(icon_file_name))
-                else: # value icon
+                else:  # value icon
                     self._model.set_value_icon(key, item_val, icon_file_name, bool(for_children))
                 self.recount()
                 return
@@ -817,7 +817,7 @@ class TagsView(QTreeView):  # {{{
             if action == 'search':
                 self._toggle(index, set_to=search_state)
                 return
-            if action == "raw_search":
+            if action == 'raw_search':
                 get_gui().get_saved_search_text(search_name='search:' + key)
                 return
             if action == 'add_to_category':
@@ -1283,7 +1283,7 @@ class TagsView(QTreeView):  # {{{
                 if key not in ('search', 'formats') and not key.startswith('@'):
                     def get_rule_data(tag, key):
                         if tag is None:
-                            return (None, None, None)
+                            return None, None, None
                         name = tag.original_name
                         cat_rules = self._model.value_icons.get(key, {})
                         icon_name, for_child = cat_rules.get(name, (None, None))
@@ -1404,7 +1404,7 @@ class TagsView(QTreeView):  # {{{
             for p in paths:
                 # Now add the menu items
                 m.addAction(self.minus_icon,
-                            _("Collapse {0}").format(p[0]), partial(self.collapse_node, p[1]))
+                            _('Collapse {0}').format(p[0]), partial(self.collapse_node, p[1]))
             m.addAction(self.minus_icon, _('Collapse all'), self.collapseAll)
 
         # Ask plugins if they have any actions to add to the context menu
@@ -1637,5 +1637,4 @@ class TagsView(QTreeView):  # {{{
                 if not expansion[0]:
                     self.collapse(idx)
 
-
-    # }}}
+# }}}
diff --git a/src/calibre/gui2/tag_mapper.py b/src/calibre/gui2/tag_mapper.py
index 759ecf234d..26f40cd79e 100644
--- a/src/calibre/gui2/tag_mapper.py
+++ b/src/calibre/gui2/tag_mapper.py
@@ -488,7 +488,7 @@ class SaveLoadMixin:
                 self.PREFS_OBJECT[text] = self.rules
                 self.loaded_ruleset = text
                 self.ruleset_changed.emit()
-            elif text in self.PREFS_OBJECT: # Don't think we can get here because 'if rules:' is always True
+            elif text in self.PREFS_OBJECT:  # Don't think we can get here because 'if rules:' is always True
                 del self.PREFS_OBJECT[text]
                 if self.loaded_ruleset == text:
                     self.loaded_ruleset = ''
diff --git a/src/calibre/gui2/toc/__init__.py b/src/calibre/gui2/toc/__init__.py
index d91f720858..9c3d29d79e 100644
--- a/src/calibre/gui2/toc/__init__.py
+++ b/src/calibre/gui2/toc/__init__.py
@@ -4,6 +4,3 @@
 __license__   = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
-
-
-
diff --git a/src/calibre/gui2/toc/location.py b/src/calibre/gui2/toc/location.py
index a9d3725da3..3dd94d51e3 100644
--- a/src/calibre/gui2/toc/location.py
+++ b/src/calibre/gui2/toc/location.py
@@ -149,7 +149,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler):
         if fail_code is None:
             fail_code = QWebEngineUrlRequestJob.Error.UrlNotFound
         rq.fail(fail_code)
-        print(f"Blocking FAKE_PROTOCOL request: {rq.requestUrl().toString()} with code: {fail_code}", file=sys.stderr)
+        print(f'Blocking FAKE_PROTOCOL request: {rq.requestUrl().toString()} with code: {fail_code}', file=sys.stderr)
 
 
 class Page(QWebEnginePage):  # {{{
@@ -309,7 +309,7 @@ class ItemEdit(QWidget):
         sp.addWidget(f)
 
         f.la = la = QLabel('<p>'+_(
-            'Here you can choose a destination for the Table of Contents\' entry'
+            "Here you can choose a destination for the Table of Contents' entry"
             ' to point to. First choose a file from the book in the left-most panel. The'
             ' file will open in the central panel.<p>'
 
@@ -445,7 +445,7 @@ class ItemEdit(QWidget):
         if frac == 0:
             loctext = _('Top of the file')
         else:
-            loctext =  _('Approximately %d%% from the top')%frac
+            loctext = _('Approximately %d%% from the top')%frac
         return loctext
 
     def elem_clicked(self, tag, frac, elem_id, loc, totals):
diff --git a/src/calibre/gui2/toc/main.py b/src/calibre/gui2/toc/main.py
index 015d2f4289..7f28d3b2f9 100644
--- a/src/calibre/gui2/toc/main.py
+++ b/src/calibre/gui2/toc/main.py
@@ -270,7 +270,7 @@ class ItemView(QStackedWidget):  # {{{
         l.addWidget(la, 1, 0, 1, 2)
 
         # Item status
-        ip.hl1 = hl =  QFrame()
+        ip.hl1 = hl = QFrame()
         hl.setFrameShape(QFrame.Shape.HLine)
         l.addWidget(hl, l.rowCount(), 0, 1, 2)
         self.icon_label = QLabel()
@@ -278,7 +278,7 @@ class ItemView(QStackedWidget):  # {{{
         self.status_label.setWordWrap(True)
         l.addWidget(self.icon_label, l.rowCount(), 0)
         l.addWidget(self.status_label, l.rowCount()-1, 1)
-        ip.hl2 = hl =  QFrame()
+        ip.hl2 = hl = QFrame()
         hl.setFrameShape(QFrame.Shape.HLine)
         l.addWidget(hl, l.rowCount(), 0, 1, 2)
 
@@ -292,7 +292,7 @@ class ItemView(QStackedWidget):  # {{{
             _('&Remove this entry'), self)
         l.addWidget(b, l.rowCount(), 0, 1, 2)
         b.clicked.connect(self.delete_item)
-        ip.hl3 = hl =  QFrame()
+        ip.hl3 = hl = QFrame()
         hl.setFrameShape(QFrame.Shape.HLine)
         l.addWidget(hl, l.rowCount(), 0, 1, 2)
         l.setRowMinimumHeight(rs, 20)
@@ -315,7 +315,7 @@ class ItemView(QStackedWidget):  # {{{
                        'level as this entry.'))
         l.addWidget(b, l.rowCount()+1, 0, 1, 2)
 
-        ip.hl4 = hl =  QFrame()
+        ip.hl4 = hl = QFrame()
         hl.setFrameShape(QFrame.Shape.HLine)
         l.addWidget(hl, l.rowCount(), 0, 1, 2)
         l.setRowMinimumHeight(rs, 20)
@@ -525,7 +525,7 @@ class TreeWidget(QTreeWidget):  # {{{
             # have to ensure that selectedIndexes returns an ordered list of
             # indexes.
             sort_map = {self.indexFromItem(item):i for i, item in enumerate(self.iter_items())}
-            ans = sorted(ans, key=lambda x:sort_map.get(x, -1))
+            ans = sorted(ans, key=lambda x: sort_map.get(x, -1))
         return ans
 
     def highlight_item(self, item):
@@ -671,7 +671,7 @@ class TreeWidget(QTreeWidget):  # {{{
     def bulk_rename(self):
         from calibre.gui2.tweak_book.file_list import get_bulk_rename_settings
         sort_map = {id(item):i for i, item in enumerate(self.iter_items())}
-        items = sorted(self.selectedItems(), key=lambda x:sort_map.get(id(x), -1))
+        items = sorted(self.selectedItems(), key=lambda x: sort_map.get(id(x), -1))
         settings = get_bulk_rename_settings(self, len(items), prefix=_('Chapter '), msg=_(
             'All selected items will be renamed to the form prefix-number'), sanitize=lambda x:x, leading_zeros=False)
         fmt, num = settings['prefix'], settings['start']
@@ -1012,7 +1012,6 @@ class TOCView(QWidget):  # {{{
     def undo(self):
         self.tocw.pop_history()
 
-
 # }}}
 
 
diff --git a/src/calibre/gui2/tools.py b/src/calibre/gui2/tools.py
index 2cdc626af1..9cb6730c2c 100644
--- a/src/calibre/gui2/tools.py
+++ b/src/calibre/gui2/tools.py
@@ -56,7 +56,7 @@ def convert_single_ebook(parent, db, book_ids, auto_conversion=False,  # {{{
 
             if result == QDialog.DialogCode.Accepted:
                 # if not convert_existing(parent, db, [book_id], d.output_format):
-                #    continue
+                #     continue
 
                 mi = db.get_metadata(book_id, True)
                 in_file = PersistentTemporaryFile('.'+d.input_format)
@@ -110,7 +110,7 @@ def convert_single_ebook(parent, db, book_ids, auto_conversion=False,  # {{{
             warning_dialog(parent, _('Could not convert'), '<p>'+ _(
                 'Could not convert <b>%s</b> as it has no e-book files. If you '
                 'think it should have files, but calibre is not finding '
-                'them, that is most likely because you moved the book\'s '
+                "them, that is most likely because you moved the book's "
                 'files around outside of calibre. You will need to find those files '
                 'and re-add them to calibre.')%title, show=True)
         else:
@@ -136,8 +136,8 @@ def convert_single_ebook(parent, db, book_ids, auto_conversion=False,  # {{{
     return jobs, changed, bad
 # }}}
 
-# Bulk convert {{{
 
+# Bulk convert {{{
 
 def convert_bulk_ebook(parent, queue, db, book_ids, out_format=None, args=[]):
     total = len(book_ids)
@@ -327,7 +327,6 @@ def fetch_scheduled_recipe(arg):  # {{{
         recs.append(('recipe_specific_option', serialized, OptionRecommendation.HIGH))
 
     return 'gui_convert_recipe', args, _('Fetch news from %s')%arg['title'], fmt.upper(), [pt]
-
 # }}}
 
 
diff --git a/src/calibre/gui2/trash.py b/src/calibre/gui2/trash.py
index ec3801935d..8ac8a74914 100644
--- a/src/calibre/gui2/trash.py
+++ b/src/calibre/gui2/trash.py
@@ -314,8 +314,6 @@ class TrashView(Dialog):
             det_msg='\n'.join(det_msg), show=True)
 
 
-
-
 if __name__ == '__main__':
     from calibre.gui2 import Application
     from calibre.library import db
diff --git a/src/calibre/gui2/tts/download.py b/src/calibre/gui2/tts/download.py
index 55ac5b5c41..565198a2b0 100644
--- a/src/calibre/gui2/tts/download.py
+++ b/src/calibre/gui2/tts/download.py
@@ -183,7 +183,7 @@ def download_resources(
 def develop():
     from calibre.gui2 import Application
     app = Application([])
-    urls =  {
+    urls = {
         'https://huggingface.co/rhasspy/piper-voices/resolve/v1.0.0/en/en_US/lessac/medium/en_US-lessac-medium.onnx': (
             '/tmp/model', 'Voice neural network'),
         'https://huggingface.co/rhasspy/piper-voices/resolve/v1.0.0/en/en_US/lessac/medium/en_US-lessac-medium.onnx.json': (
diff --git a/src/calibre/gui2/tts/manager.py b/src/calibre/gui2/tts/manager.py
index cb3c5a889d..78ce3f8c7a 100644
--- a/src/calibre/gui2/tts/manager.py
+++ b/src/calibre/gui2/tts/manager.py
@@ -40,7 +40,7 @@ class Tracker:
         self.last_pos = 0
         self.queue: deque[Utterance] = deque()
 
-    def parse_marked_text(self, marked_text, limit = MAX_UTTERANCE_LENGTH):
+    def parse_marked_text(self, marked_text, limit=MAX_UTTERANCE_LENGTH):
         self.clear()
         text = []
         text_len = chunk_len = index_in_positions = offset_in_text = 0
diff --git a/src/calibre/gui2/tts/piper.py b/src/calibre/gui2/tts/piper.py
index 67e0c7106c..fe38147d7e 100644
--- a/src/calibre/gui2/tts/piper.py
+++ b/src/calibre/gui2/tts/piper.py
@@ -757,7 +757,6 @@ class ThreadedPipeReader(PipeReader):
                 self.queue.put((data, is_stdout, None))
 
 
-
 def duration_of_raw_audio_data(data: bytes, sample_rate: int = HIGH_QUALITY_SAMPLE_RATE, bytes_per_sample: int = 2, num_channels: int = 1) -> float:
     total_num_of_samples = len(data) / bytes_per_sample
     num_of_samples_per_channel = total_num_of_samples / num_channels
diff --git a/src/calibre/gui2/tts/speechd.py b/src/calibre/gui2/tts/speechd.py
index 1710d7a022..f59596ccb8 100644
--- a/src/calibre/gui2/tts/speechd.py
+++ b/src/calibre/gui2/tts/speechd.py
@@ -66,12 +66,12 @@ class SpeechdTTSBackend(TTSBackend):
 
     @property
     def available_voices(self) -> dict[str, tuple[Voice, ...]]:
-       if self._voices is None:
+        if self._voices is None:
             try:
                 self._voices = self._get_all_voices_for_all_output_modules()
             except Exception as e:
                 self._set_error(str(e))
-       return self._voices or {}
+        return self._voices or {}
 
     def stop(self) -> None:
         self._last_mark = self._last_text = ''
diff --git a/src/calibre/gui2/tts/types.py b/src/calibre/gui2/tts/types.py
index 4f46e22fc4..fd1f8548b2 100644
--- a/src/calibre/gui2/tts/types.py
+++ b/src/calibre/gui2/tts/types.py
@@ -109,7 +109,6 @@ class Voice(NamedTuple):
         return (self.quality.value, self.basic_name.lower())
 
 
-
 def qvoice_to_voice(v: QVoice) -> QVoice:
     lang = canonicalize_lang(QLocale.languageToCode(v.language())) or 'und'
     country = QLocale.territoryToString(v.locale().territory())
@@ -247,7 +246,7 @@ def available_engines() -> dict[str, EngineMetadata]:
         except ImportError:
             pass
         else:
-            cmd = os.getenv("SPEECHD_CMD", SPD_SPAWN_CMD)
+            cmd = os.getenv('SPEECHD_CMD', SPD_SPAWN_CMD)
             if cmd and os.access(cmd, os.X_OK) and os.path.isfile(cmd):
                 ans['speechd'] = EngineMetadata('speechd', _('The Speech Dispatcher Engine'), _(
                     'The "speechd" engine can usually track the currently spoken word on screen, however, it depends on the'
diff --git a/src/calibre/gui2/tweak_book/__init__.py b/src/calibre/gui2/tweak_book/__init__.py
index 7bc8dcbdb0..1b83276745 100644
--- a/src/calibre/gui2/tweak_book/__init__.py
+++ b/src/calibre/gui2/tweak_book/__init__.py
@@ -43,7 +43,17 @@ d['preview_background'] = 'auto'
 d['preview_foreground'] = 'auto'
 d['preview_link_color'] = 'auto'
 d['remove_existing_links_when_linking_sheets'] = True
-d['charmap_favorites'] = list(map(ord, '\xa0\u2002\u2003\u2009\xad' '‘’“”‹›«»‚„' '—–§¶†‡©®™' '→⇒•·°±−×÷¼½½¾' '…µ¢£€¿¡¨´¸ˆ˜' 'ÀÁÂÃÄÅÆÇÈÉÊË' 'ÌÍÎÏÐÑÒÓÔÕÖØ' 'ŒŠÙÚÛÜÝŸÞßàá' 'âãäåæçèéêëìí' 'îïðñòóôõöøœš' 'ùúûüýÿþªºαΩ∞'))  # noqa
+d['charmap_favorites'] = list(map(ord, ('\xa0\u2002\u2003\u2009\xad'
+                                        '‘’“”‹›«»‚„'
+                                        '—–§¶†‡©®™'
+                                        '→⇒•·°±−×÷¼½½¾'
+                                        '…µ¢£€¿¡¨´¸ˆ˜'
+                                        'ÀÁÂÃÄÅÆÇÈÉÊË'
+                                        'ÌÍÎÏÐÑÒÓÔÕÖØ'
+                                        'ŒŠÙÚÛÜÝŸÞßàá'
+                                        'âãäåæçèéêëìí'
+                                        'îïðñòóôõöøœš'
+                                        'ùúûüýÿþªºαΩ∞')))
 d['folders_for_types'] = {'style':'styles', 'image':'images', 'font':'fonts', 'audio':'audio', 'video':'video'}
 d['pretty_print_on_open'] = False
 d['disable_completion_popup_for_search'] = False
@@ -58,7 +68,7 @@ d['merge_identical_selectors'] = False
 d['merge_rules_with_identical_properties'] = False
 d['remove_unreferenced_sheets'] = True
 d['global_book_toolbar'] = [
-'new-file', 'open-book',  'save-book', None, 'global-undo', 'global-redo', 'create-checkpoint', None, 'donate', 'user-manual']
+'new-file', 'open-book', 'save-book', None, 'global-undo', 'global-redo', 'create-checkpoint', None, 'donate', 'user-manual']
 d['global_tools_toolbar'] = [
     'check-book', 'spell-check-book', 'edit-toc', 'insert-character',
     'manage-fonts', 'smarten-punctuation', 'remove-unused-css', 'show-reports'
diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index fb644cdd0a..1b0038f328 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -1484,7 +1484,7 @@ class Boss(QObject):
         if not name:
             return
         editor = self.open_editor_for_name(name)
-        if anchor and hasattr(editor, 'go_to_anchor') :
+        if anchor and hasattr(editor, 'go_to_anchor'):
             if editor.go_to_anchor(anchor):
                 self.gui.preview.pending_go_to_anchor = anchor
             elif show_anchor_not_found:
diff --git a/src/calibre/gui2/tweak_book/char_select.py b/src/calibre/gui2/tweak_book/char_select.py
index 0cdfff965d..93cd726ce3 100644
--- a/src/calibre/gui2/tweak_book/char_select.py
+++ b/src/calibre/gui2/tweak_book/char_select.py
@@ -140,7 +140,7 @@ class CategoryModel(QAbstractItemModel):
     (_('Ethiopic extended A'), (0xAB00, 0xAB2F)),
     (_('Meroitic cursive'), (0x109A0, 0x109FF)),
     (_('Meroitic hieroglyphs'), (0x10980, 0x1099F)),
-    (_('N\'Ko'), (0x7C0, 0x7FF)),
+    (_("N'Ko"), (0x7C0, 0x7FF)),
     (_('Osmanya'), (0x10480, 0x104AF)),
     (_('Tifinagh'), (0x2D30, 0x2D7F)),
     (_('Vai'), (0xA500, 0xA63F)),
diff --git a/src/calibre/gui2/tweak_book/check.py b/src/calibre/gui2/tweak_book/check.py
index 6a228b89ef..8ee77ff392 100644
--- a/src/calibre/gui2/tweak_book/check.py
+++ b/src/calibre/gui2/tweak_book/check.py
@@ -53,6 +53,7 @@ def prefix_for_level(level):
         text += ': '
     return text
 
+
 def build_error_message(error, with_level=False, with_line_numbers=False):
     prefix = ''
     filename = error.name
@@ -62,6 +63,7 @@ def build_error_message(error, with_level=False, with_line_numbers=False):
         filename = f'{filename}:{error.line}'
     return f'{prefix}{error.msg}\xa0\xa0\xa0\xa0[{filename}]'
 
+
 class Delegate(QStyledItemDelegate):
 
     def initStyleOption(self, option, index):
@@ -271,7 +273,7 @@ class Check(QSplitter):
 def main():
     from calibre.gui2 import Application
     from calibre.gui2.tweak_book.boss import get_container
-    app = Application([])  # noqa
+    app = Application([])  # noqa: F841
     path = sys.argv[-1]
     container = get_container(path)
     d = Check()
diff --git a/src/calibre/gui2/tweak_book/diff/main.py b/src/calibre/gui2/tweak_book/diff/main.py
index bb6b48e54d..8e277e4ffb 100644
--- a/src/calibre/gui2/tweak_book/diff/main.py
+++ b/src/calibre/gui2/tweak_book/diff/main.py
@@ -133,7 +133,7 @@ def get_decoded_raw(name):
         if syntax in {'html', 'xml'}:
             raw = xml_to_unicode(raw, verbose=True)[0]
         else:
-            m = re.search(br"coding[:=]\s*([-\w.]+)", raw[:1024], flags=re.I)
+            m = re.search(br'coding[:=]\s*([-\w.]+)', raw[:1024], flags=re.I)
             if m is not None and m.group(1) != '8bit':
                 enc = m.group(1)
                 if enc == b'unicode':
@@ -452,7 +452,7 @@ class Diff(Dialog):
             return {'context': self.context, 'beautify': self.beautify, 'syntax': syntax_map.get(name, None)}
 
         if isinstance(changed_names, dict):
-            for name, other_name in sorted(iteritems(changed_names), key=lambda x:numeric_sort_key(x[0])):
+            for name, other_name in sorted(iteritems(changed_names), key=lambda x: numeric_sort_key(x[0])):
                 args = (name, other_name, cache.left(name), cache.right(other_name))
                 add(args, kwargs(name))
         else:
@@ -468,7 +468,7 @@ class Diff(Dialog):
             args = (name, _('[%s was removed]') % name, cache.left(name), None)
             add(args, kwargs(name))
 
-        for name, new_name in sorted(iteritems(renamed_names), key=lambda x:numeric_sort_key(x[0])):
+        for name, new_name in sorted(iteritems(renamed_names), key=lambda x: numeric_sort_key(x[0])):
             args = (name, new_name, None, None)
             add(args, kwargs(name))
 
@@ -519,10 +519,10 @@ def main(args=sys.argv):
         attr = 'ebook_diff'
     else:
         attr = 'file_diff'
-    app = Application([])  # noqa
+    app = Application([])  # noqa: F841
     d = Diff(show_as_window=True)
     func = getattr(d, attr)
-    QTimer.singleShot(0, lambda : func(left, right))
+    QTimer.singleShot(0, lambda: func(left, right))
     d.show()
     app.exec()
     return 0
diff --git a/src/calibre/gui2/tweak_book/diff/view.py b/src/calibre/gui2/tweak_book/diff/view.py
index 1c3b56fa6f..6e28d30859 100644
--- a/src/calibre/gui2/tweak_book/diff/view.py
+++ b/src/calibre/gui2/tweak_book/diff/view.py
@@ -181,7 +181,7 @@ class TextBrowser(PlainTextEdit):  # {{{
 
     def calculate_metrics(self):
         fm = self.fontMetrics()
-        self.number_width = max(map(lambda x:fm.horizontalAdvance(str(x)), range(10)))
+        self.number_width = max(fm.horizontalAdvance(str(x)) for x in range(10))
         self.space_width = fm.horizontalAdvance(' ')
 
     def show_context_menu(self, pos):
@@ -388,7 +388,7 @@ class TextBrowser(PlainTextEdit):  # {{{
             if min(y_top, y_bot) > floor:
                 break
             if y_top != y_bot:
-                painter.fillRect(0,  int(y_top), int(w), int(y_bot - y_top), self.diff_backgrounds[kind])
+                painter.fillRect(0, int(y_top), int(w), int(y_bot - y_top), self.diff_backgrounds[kind])
             lines.append((y_top, y_bot, kind))
             if top in self.images:
                 img, maxw = self.images[top][:2]
@@ -531,7 +531,7 @@ class DiffSplit(QSplitter):  # {{{
 
         self.left, self.right = TextBrowser(parent=self), TextBrowser(right=True, parent=self, show_open_in_editor=show_open_in_editor)
         self.addWidget(self.left), self.addWidget(self.right)
-        self.split_words = re.compile(r"\w+|\W", re.UNICODE)
+        self.split_words = re.compile(r'\w+|\W', re.UNICODE)
         self.clear()
 
     def createHandle(self):
diff --git a/src/calibre/gui2/tweak_book/editor/canvas.py b/src/calibre/gui2/tweak_book/editor/canvas.py
index 97165a7be4..4a60782c68 100644
--- a/src/calibre/gui2/tweak_book/editor/canvas.py
+++ b/src/calibre/gui2/tweak_book/editor/canvas.py
@@ -58,7 +58,7 @@ def painter(func):
 
 class SelectionState:
 
-    __slots__ = ('last_press_point', 'current_mode', 'rect', 'in_selection', 'drag_corner', 'dragging', 'last_drag_pos')
+    __slots__ = ('current_mode', 'drag_corner', 'dragging', 'in_selection', 'last_drag_pos', 'last_press_point', 'rect')
 
     def __init__(self):
         self.reset()
@@ -107,7 +107,6 @@ def get_selection_rect(img, sr, target):
 
 
 class Trim(Command):
-
     ''' Remove the areas of the image outside the current selection. '''
 
     TEXT = _('Trim image')
@@ -117,7 +116,6 @@ class Trim(Command):
 
 
 class AutoTrim(Trim):
-
     ''' Auto trim borders from the image '''
     TEXT = _('Auto-trim image')
 
@@ -200,7 +198,6 @@ class Normalize(Command):
 
 
 class Replace(Command):
-
     ''' Replace the current image with another image. If there is a selection,
     only the region of the selection is replaced. '''
 
diff --git a/src/calibre/gui2/tweak_book/editor/insert_resource.py b/src/calibre/gui2/tweak_book/editor/insert_resource.py
index 72503e614d..02a4fcc20c 100644
--- a/src/calibre/gui2/tweak_book/editor/insert_resource.py
+++ b/src/calibre/gui2/tweak_book/editor/insert_resource.py
@@ -95,8 +95,8 @@ class ChooseName(Dialog):  # {{{
         super().accept()
 # }}}
 
-# Images {{{
 
+# Images {{{
 
 class ImageDelegate(QStyledItemDelegate):
 
@@ -373,6 +373,7 @@ class InsertImage(Dialog):
     def filter_changed(self, *args):
         f = str(self.filter.text())
         self.fm.setFilterFixedString(f)
+
 # }}}
 
 
@@ -516,7 +517,7 @@ class NewBook(Dialog):  # {{{
 
 
 if __name__ == '__main__':
-    app = QApplication([])  # noqa
+    app = QApplication([])  # noqa: F841
     from calibre.gui2.tweak_book import set_current_container
     from calibre.gui2.tweak_book.boss import get_container
     set_current_container(get_container(sys.argv[-1]))
diff --git a/src/calibre/gui2/tweak_book/editor/smarts/html.py b/src/calibre/gui2/tweak_book/editor/smarts/html.py
index 139610fa15..aa2a1c4df7 100644
--- a/src/calibre/gui2/tweak_book/editor/smarts/html.py
+++ b/src/calibre/gui2/tweak_book/editor/smarts/html.py
@@ -920,6 +920,6 @@ if __name__ == '__main__':  # {{{
 
     def callback(ed):
         import regex
-        ed.find_text(regex.compile('A bold word'))
+        ed.find_text(regex.compile(r'A bold word'))
     launch_editor(raw, path_is_raw=True, syntax='html', callback=callback)
 # }}}
diff --git a/src/calibre/gui2/tweak_book/editor/smarts/python.py b/src/calibre/gui2/tweak_book/editor/smarts/python.py
index 4e8a0a090a..50814e9a39 100644
--- a/src/calibre/gui2/tweak_book/editor/smarts/python.py
+++ b/src/calibre/gui2/tweak_book/editor/smarts/python.py
@@ -16,6 +16,7 @@ from calibre.gui2.tweak_book.editor.smarts.utils import get_text_before_cursor,
 def get_leading_whitespace_on_block(editor, previous=False):
     return expand_tabs(lw(editor, previous=previous))
 
+
 tw = 4  # The tab width (hardcoded to the pep8 value)
 
 
diff --git a/src/calibre/gui2/tweak_book/editor/smarts/utils.py b/src/calibre/gui2/tweak_book/editor/smarts/utils.py
index 8ece27b29e..88fe80524d 100644
--- a/src/calibre/gui2/tweak_book/editor/smarts/utils.py
+++ b/src/calibre/gui2/tweak_book/editor/smarts/utils.py
@@ -16,6 +16,8 @@ def get_text_around_cursor(editor, before=True):
 
 
 get_text_before_cursor = get_text_around_cursor
+
+
 def get_text_after_cursor(editor):
     return get_text_around_cursor(editor, before=False)
 
diff --git a/src/calibre/gui2/tweak_book/editor/snippets.py b/src/calibre/gui2/tweak_book/editor/snippets.py
index c598e2829b..e85aca1643 100644
--- a/src/calibre/gui2/tweak_book/editor/snippets.py
+++ b/src/calibre/gui2/tweak_book/editor/snippets.py
@@ -47,6 +47,8 @@ from polyglot.builtins import codepoint_to_chr, iteritems, itervalues
 
 def string_length(x):
     return strlen(str(x))  # Needed on narrow python builds, as subclasses of unicode dont work
+
+
 KEY = Qt.Key.Key_J
 MODIFIER = Qt.KeyboardModifier.MetaModifier if ismacos else Qt.KeyboardModifier.ControlModifier
 
@@ -108,6 +110,7 @@ obtain some advantage from it? But.</p>
 
 }  # }}}
 
+
 # Parsing of snippets {{{
 escape = unescape = None
 
@@ -199,11 +202,11 @@ def snippets(refresh=False):
             if snip['trigger'] and isinstance(snip['trigger'], str):
                 key = snip_key(snip['trigger'], *snip['syntaxes'])
                 _snippets[key] = {'template':snip['template'], 'description':snip['description']}
-        _snippets = sorted(iteritems(_snippets), key=(lambda key_snip:string_length(key_snip[0].trigger)), reverse=True)
+        _snippets = sorted(iteritems(_snippets), key=(lambda key_snip: string_length(key_snip[0].trigger)), reverse=True)
     return _snippets
 
-# Editor integration {{{
 
+# Editor integration {{{
 
 class EditorTabStop:
 
@@ -457,8 +460,8 @@ class SnippetManager(QObject):
         return False
 # }}}
 
-# Config {{{
 
+# Config {{{
 
 class SnippetTextEdit(PlainTextEdit):
 
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/__init__.py b/src/calibre/gui2/tweak_book/editor/syntax/__init__.py
index 0cbf055ec8..fb2e4b74e1 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/__init__.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/__init__.py
@@ -3,6 +3,3 @@
 
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
-
-
-
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/base.py b/src/calibre/gui2/tweak_book/editor/syntax/base.py
index d47b7e39a1..e2fc58a9f2 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/base.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/base.py
@@ -7,12 +7,11 @@ from collections import defaultdict, deque
 
 from qt.core import QTextBlock, QTextBlockUserData, QTextCursor, QTextFormat, QTextLayout, QTimer
 
+from calibre.gui2.tweak_book.editor.themes import highlight_to_char_format
 from calibre.gui2.widgets import BusyCursor
 from calibre.utils.icu import utf16_length
 from polyglot.builtins import iteritems
 
-from ..themes import highlight_to_char_format
-
 
 def run_loop(user_data, state_map, formats, text):
     state = user_data.state
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/css.py b/src/calibre/gui2/tweak_book/editor/syntax/css.py
index 1efd037ac2..2ad3b65b43 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/css.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/css.py
@@ -144,7 +144,7 @@ IN_COMMENT_CONTENT = 5
 
 class CSSState:
 
-    __slots__ = ('parse', 'blocks')
+    __slots__ = ('blocks', 'parse')
 
     def __init__(self):
         self.parse  = NORMAL
@@ -163,7 +163,7 @@ class CSSState:
         return not self.__eq__(other)
 
     def __repr__(self):
-        return f"CSSState(parse={self.parse}, blocks={self.blocks})"
+        return f'CSSState(parse={self.parse}, blocks={self.blocks})'
     __str__ = __repr__
 
 
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/html.py b/src/calibre/gui2/tweak_book/editor/syntax/html.py
index 9ac523474c..ea88c3dfde 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/html.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/html.py
@@ -39,7 +39,7 @@ attribute_name_pat = re.compile(r'''[^%s"'/><=]+''' % space_chars)
 self_closing_pat = re.compile(r'/\s*>')
 unquoted_val_pat = re.compile(r'''[^%s'"=<>`]+''' % space_chars)
 cdata_close_pats = {x:re.compile(r'</%s' % x, flags=re.I) for x in cdata_tags}
-nbsp_pat = re.compile('[\xa0\u2000-\u200A\u202F\u205F\u3000\u2011-\u2015\uFE58\uFE63\uFF0D]+')  # special spaces and hyphens
+nbsp_pat = re.compile(r'[\xa0\u2000-\u200A\u202F\u205F\u3000\u2011-\u2015\uFE58\uFE63\uFF0D]+')  # special spaces and hyphens
 
 NORMAL = 0
 IN_OPENING_TAG = 1
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/javascript.py b/src/calibre/gui2/tweak_book/editor/syntax/javascript.py
index 3ed167f5fe..3cc1605e80 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/javascript.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/javascript.py
@@ -23,12 +23,11 @@ JS_IDENT = JS_IDENT_START + '(?:' + JS_IDENT_PART + ')*'
 
 
 class JavascriptLexer(RegexLexer):
-
-    """
+    '''
     For JavaScript source code. This is based on the pygments JS highlighter,
     bu that does not handle multi-line comments in streaming mode, so we had to
     modify it.
-    """
+    '''
 
     flags = re.UNICODE | re.MULTILINE
 
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/pygments_highlighter.py b/src/calibre/gui2/tweak_book/editor/syntax/pygments_highlighter.py
index 7297730750..b85908429f 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/pygments_highlighter.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/pygments_highlighter.py
@@ -52,7 +52,7 @@ def create_lexer(base_class):
                         elif new_state == '#push':
                             statestack.append(statestack[-1])
                         else:
-                            assert False, "wrong state def: %r" % new_state
+                            assert False, 'wrong state def: %r' % new_state
                         statetokens = tokendefs[statestack[-1]]
                     break
             else:
@@ -119,7 +119,7 @@ class State:
         return not self.__eq__(other)
 
     def __repr__(self):
-        return "PythonState(%r)" % self.pygments_stack
+        return 'PythonState(%r)' % self.pygments_stack
     __str__ = __repr__
 
 
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/utils.py b/src/calibre/gui2/tweak_book/editor/syntax/utils.py
index 3abe8dc480..6673f4b3a3 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/utils.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/utils.py
@@ -47,6 +47,3 @@ def format_for_pygments_token(theme, cache, token):
         return ans
     cache[token] = ans = NULL_FMT
     return ans
-
-
-
diff --git a/src/calibre/gui2/tweak_book/editor/syntax/xml.py b/src/calibre/gui2/tweak_book/editor/syntax/xml.py
index 63f9185341..dd5a6fa598 100644
--- a/src/calibre/gui2/tweak_book/editor/syntax/xml.py
+++ b/src/calibre/gui2/tweak_book/editor/syntax/xml.py
@@ -4,4 +4,4 @@
 __license__ = 'GPL v3'
 __copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
 
-from calibre.gui2.tweak_book.editor.syntax.html import XMLHighlighter as Highlighter  # noqa
+from calibre.gui2.tweak_book.editor.syntax.html import XMLHighlighter as Highlighter  # noqa: F401
diff --git a/src/calibre/gui2/tweak_book/editor/text.py b/src/calibre/gui2/tweak_book/editor/text.py
index cab778533d..00c3c295e5 100644
--- a/src/calibre/gui2/tweak_book/editor/text.py
+++ b/src/calibre/gui2/tweak_book/editor/text.py
@@ -282,7 +282,7 @@ class TextEdit(PlainTextEdit):
         self.setFont(font)
         self.highlighter.apply_theme(theme)
         fm = self.fontMetrics()
-        self.number_width = max(map(lambda x:fm.horizontalAdvance(str(x)), range(10)))
+        self.number_width = max(fm.horizontalAdvance(str(x)) for x in range(10))
         self.size_hint = QSize(self.expected_geometry[0] * fm.averageCharWidth(), self.expected_geometry[1] * fm.height())
         self.highlight_color = theme_color(theme, 'HighlightRegion', 'bg')
         self.highlight_cursor_line()
@@ -937,7 +937,7 @@ class TextEdit(PlainTextEdit):
             c.setPosition(right, QTextCursor.MoveMode.KeepAnchor)
             href = prepare_string_for_xml(href, True)
             if fullpage:
-                template =  '''\
+                template = '''\
 <div style="page-break-before:always; page-break-after:always; page-break-inside:avoid">\
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" \
 version="1.1" width="100%%" height="100%%" viewBox="0 0 {w} {h}" preserveAspectRatio="{a}">\
diff --git a/src/calibre/gui2/tweak_book/editor/themes.py b/src/calibre/gui2/tweak_book/editor/themes.py
index a1a3f0b35f..85251afd5c 100644
--- a/src/calibre/gui2/tweak_book/editor/themes.py
+++ b/src/calibre/gui2/tweak_book/editor/themes.py
@@ -55,12 +55,12 @@ def default_theme():
 
 
 # The solarized themes {{{
-SLDX = {'base03':'1c1c1c', 'base02':'262626', 'base01':'585858', 'base00':'626262', 'base0':'808080', 'base1':'8a8a8a', 'base2':'e4e4e4', 'base3':'ffffd7', 'yellow':'af8700', 'orange':'d75f00', 'red':'d70000', 'magenta':'af005f', 'violet':'5f5faf', 'blue':'0087ff', 'cyan':'00afaf', 'green':'5f8700'}  # noqa
-SLD  = {'base03':'002b36', 'base02':'073642', 'base01':'586e75', 'base00':'657b83', 'base0':'839496', 'base1':'93a1a1', 'base2':'eee8d5', 'base3':'fdf6e3', 'yellow':'b58900', 'orange':'cb4b16', 'red':'dc322f', 'magenta':'d33682', 'violet':'6c71c4', 'blue':'268bd2', 'cyan':'2aa198', 'green':'859900'}  # noqa
+SLDX = {'base03':'1c1c1c', 'base02':'262626', 'base01':'585858', 'base00':'626262', 'base0':'808080', 'base1':'8a8a8a', 'base2':'e4e4e4', 'base3':'ffffd7', 'yellow':'af8700', 'orange':'d75f00', 'red':'d70000', 'magenta':'af005f', 'violet':'5f5faf', 'blue':'0087ff', 'cyan':'00afaf', 'green':'5f8700'}  # noqa: E501
+SLD  = {'base03':'002b36', 'base02':'073642', 'base01':'586e75', 'base00':'657b83', 'base0':'839496', 'base1':'93a1a1', 'base2':'eee8d5', 'base3':'fdf6e3', 'yellow':'b58900', 'orange':'cb4b16', 'red':'dc322f', 'magenta':'d33682', 'violet':'6c71c4', 'blue':'268bd2', 'cyan':'2aa198', 'green':'859900'}  # noqa: E501
 m = {'base%d'%n:'base%02d'%n for n in range(1, 4)}
 m.update({'base%02d'%n:'base%d'%n for n in range(1, 4)})
-SLL = {m.get(k, k) : v for k, v in iteritems(SLD)}
-SLLX = {m.get(k, k) : v for k, v in iteritems(SLDX)}
+SLL =  {m.get(k, k): v for k, v in iteritems(SLD)}
+SLLX = {m.get(k, k): v for k, v in iteritems(SLDX)}
 SOLARIZED = \
     '''
     CursorLine   bg={base02}
@@ -341,8 +341,8 @@ def builtin_theme_names():
 def all_theme_names():
     return builtin_theme_names() + custom_theme_names()
 
-# Custom theme creation/editing {{{
 
+# Custom theme creation/editing {{{
 
 class CreateNewTheme(Dialog):
 
@@ -500,8 +500,8 @@ class Property(QWidget):
         self.data['underline'] = str(self.underline.currentText()) or None
         self.changed.emit()
 
-# Help text {{{
 
+# Help text {{{
 
 HELP_TEXT = _('''\
 <h2>Creating a custom theme</h2>
diff --git a/src/calibre/gui2/tweak_book/editor/widget.py b/src/calibre/gui2/tweak_book/editor/widget.py
index 759da1874d..d7b50e9a57 100644
--- a/src/calibre/gui2/tweak_book/editor/widget.py
+++ b/src/calibre/gui2/tweak_book/editor/widget.py
@@ -650,7 +650,7 @@ def launch_editor(path_to_edit, path_is_raw=False, syntax='html', callback=None)
     opts = option_parser().parse_args([])
     app = Application([])
     # Create the actions that are placed into the editors toolbars
-    main = Main(opts)  # noqa
+    main = Main(opts)  # noqa: F841
     if path_is_raw:
         raw = path_to_edit
     else:
diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
index 5fae580bc6..5d8b7c7a06 100644
--- a/src/calibre/gui2/tweak_book/file_list.py
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -297,7 +297,7 @@ class FileList(QTreeWidget, OpenWithHandler):
         self.rendered_emblem_cache = {}
         self.font_name_cache = {}
         self.top_level_pixmap_cache = {
-            name : QIcon.ic(icon).pixmap(TOP_ICON_SIZE, TOP_ICON_SIZE)
+            name: QIcon.ic(icon).pixmap(TOP_ICON_SIZE, TOP_ICON_SIZE)
             for name, icon in iteritems({
                 'text':'keyboard-prefs.png',
                 'styles':'lookfeel.png',
@@ -783,7 +783,7 @@ class FileList(QTreeWidget, OpenWithHandler):
             for i in range(parent.childCount()):
                 item = parent.child(i)
                 if str(item.data(0, NAME_ROLE) or '') == name:
-                    return (category, i)
+                    return category, i
         return (None, -1)
 
     def merge_files(self):
@@ -994,7 +994,7 @@ class FileList(QTreeWidget, OpenWithHandler):
         b = self.verticalScrollBar()
         if b.value() == b.maximum():
             b.setValue(b.minimum())
-            QTimer.singleShot(0, lambda : b.setValue(b.maximum()))
+            QTimer.singleShot(0, lambda: b.setValue(b.maximum()))
 
     def __enter__(self):
         self.ordered_selected_indexes = True
diff --git a/src/calibre/gui2/tweak_book/live_css.py b/src/calibre/gui2/tweak_book/live_css.py
index 9b102444ca..2fa3841666 100644
--- a/src/calibre/gui2/tweak_book/live_css.py
+++ b/src/calibre/gui2/tweak_book/live_css.py
@@ -109,7 +109,7 @@ class Heading(QWidget):  # {{{
 
 class Cell:  # {{{
 
-    __slots__ = ('rect', 'text', 'right_align', 'color_role', 'override_color', 'swatch', 'is_overriden')
+    __slots__ = ('color_role', 'is_overriden', 'override_color', 'rect', 'right_align', 'swatch', 'text')
 
     SIDE_MARGIN = 5
     FLAGS = Qt.AlignmentFlag.AlignVCenter | Qt.TextFlag.TextSingleLine | Qt.TextFlag.TextIncludeTrailingSpaces
@@ -375,18 +375,18 @@ class Box(QWidget):
         block = '\n'.join(lines).replace('\xa0', ' ')
         heading = lines[0]
         m = QMenu(self)
-        m.addAction(QIcon.ic('edit-copy.png'), _('Copy') + ' ' + heading.replace('\xa0', ' '), lambda : QApplication.instance().clipboard().setText(block))
+        m.addAction(QIcon.ic('edit-copy.png'), _('Copy') + ' ' + heading.replace('\xa0', ' '), lambda: QApplication.instance().clipboard().setText(block))
         all_lines = []
         for w in self.widgets:
             all_lines += w.lines_for_copy
         all_text = '\n'.join(all_lines).replace('\xa0', ' ')
-        m.addAction(QIcon.ic('edit-copy.png'), _('Copy everything'), lambda : QApplication.instance().clipboard().setText(all_text))
+        m.addAction(QIcon.ic('edit-copy.png'), _('Copy everything'), lambda: QApplication.instance().clipboard().setText(all_text))
         m.exec(ev.globalPos())
 
 
 class Property:
 
-    __slots__ = 'name', 'value', 'important', 'color', 'specificity', 'is_overriden'
+    __slots__ = ('color', 'important', 'is_overriden', 'name', 'specificity', 'value')
 
     def __init__(self, prop, specificity=()):
         self.name, self.value, self.important, self.color = prop
diff --git a/src/calibre/gui2/tweak_book/plugin.py b/src/calibre/gui2/tweak_book/plugin.py
index 4565d794ec..6be40c449f 100644
--- a/src/calibre/gui2/tweak_book/plugin.py
+++ b/src/calibre/gui2/tweak_book/plugin.py
@@ -18,7 +18,6 @@ from polyglot.builtins import itervalues
 
 
 class Tool:
-
     '''
     The base class for individual tools in an Edit Book plugin. Useful members include:
 
diff --git a/src/calibre/gui2/tweak_book/polish.py b/src/calibre/gui2/tweak_book/polish.py
index fae596202f..f57f4295e8 100644
--- a/src/calibre/gui2/tweak_book/polish.py
+++ b/src/calibre/gui2/tweak_book/polish.py
@@ -163,8 +163,8 @@ def show_report(changed, title, report, parent, show_current_diff):
     if d.show_changes:
         show_current_diff(allow_revert=True)
 
-# CompressImages {{{
 
+# CompressImages {{{
 
 class ImageItemDelegate(QStyledItemDelegate):
 
@@ -277,7 +277,6 @@ class CompressImages(Dialog):
         return self.webp.jq.value()
 
 
-
 class CompressImagesProgress(Dialog):
 
     gui_loop = pyqtSignal(object, object, object)
diff --git a/src/calibre/gui2/tweak_book/preferences.py b/src/calibre/gui2/tweak_book/preferences.py
index d0946fbff3..3e7ef512e8 100644
--- a/src/calibre/gui2/tweak_book/preferences.py
+++ b/src/calibre/gui2/tweak_book/preferences.py
@@ -87,7 +87,7 @@ class BasicSettings(QWidget):  # {{{
                 raise TypeError('Unknown setting type for setting: %s' % name)
         else:
             if getter is None or setter is None:
-                raise ValueError("getter or setter not provided for: %s" % name)
+                raise ValueError('getter or setter not provided for: %s' % name)
         self._prevent_changed = True
         setter(widget, inval)
         self._prevent_changed = False
@@ -136,7 +136,7 @@ class BasicSettings(QWidget):  # {{{
             order_map = {x:i for i, x in enumerate(val)}
             items = list(w.defaults)
             limit = len(items)
-            items.sort(key=lambda x:order_map.get(x, limit))
+            items.sort(key=lambda x: order_map.get(x, limit))
             w.clear()
             for x in items:
                 i = QListWidgetItem(w)
@@ -470,8 +470,7 @@ class PreviewSettings(BasicSettings):  # {{{
 # }}}
 
 
-# ToolbarSettings  {{{
-
+# ToolbarSettings {{{
 
 class ToolbarList(QListWidget):
 
diff --git a/src/calibre/gui2/tweak_book/preview.py b/src/calibre/gui2/tweak_book/preview.py
index 1254b88cd4..a0e4e4a2c7 100644
--- a/src/calibre/gui2/tweak_book/preview.py
+++ b/src/calibre/gui2/tweak_book/preview.py
@@ -65,8 +65,8 @@ def get_data(name):
         return editors[name].get_raw_data()
     return current_container().raw_data(name)
 
-# Parsing of html to add linenumbers {{{
 
+# Parsing of html to add linenumbers {{{
 
 def parse_html(raw):
     root = parse(raw, decoder=lambda x:x.decode('utf-8'), line_numbers=True, linenumber_attribute='data-lnum')
@@ -78,7 +78,7 @@ def parse_html(raw):
 
 class ParseItem:
 
-    __slots__ = ('name', 'length', 'fingerprint', 'parsing_done', 'parsed_data')
+    __slots__ = ('fingerprint', 'length', 'name', 'parsed_data', 'parsing_done')
 
     def __init__(self, name):
         self.name = name
@@ -139,7 +139,7 @@ class ParseWorker(Thread):
                 pi.parsing_done = True
                 parsed_data = res['result']
                 if res['tb']:
-                    prints("Parser error:")
+                    prints('Parser error:')
                     prints(res['tb'])
                 else:
                     pi.parsed_data = parsed_data
@@ -175,8 +175,8 @@ class ParseWorker(Thread):
 parse_worker = ParseWorker()
 # }}}
 
-# Override network access to load data "live" from the editors {{{
 
+# Override network access to load data "live" from the editors {{{
 
 class UrlSchemeHandler(QWebEngineUrlSchemeHandler):
 
@@ -238,7 +238,6 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler):
         if self.requests:
             return QTimer.singleShot(10, self.check_for_parse)
 
-
 # }}}
 
 
diff --git a/src/calibre/gui2/tweak_book/reports.py b/src/calibre/gui2/tweak_book/reports.py
index 652122caf6..adfc0de224 100644
--- a/src/calibre/gui2/tweak_book/reports.py
+++ b/src/calibre/gui2/tweak_book/reports.py
@@ -260,8 +260,8 @@ class FilesView(QTableView):
 
 # }}}
 
-# Files {{{
 
+# Files {{{
 
 class FilesModel(FileCollection):
 
@@ -363,8 +363,8 @@ class FilesWidget(QWidget):
 
 # }}}
 
-# Jump {{{
 
+# Jump {{{
 
 def jump_to_location(loc):
     from calibre.gui2.tweak_book.boss import get_boss
@@ -390,7 +390,7 @@ def jump_to_location(loc):
 class Jump:
 
     def __init__(self):
-        self.pos_map = defaultdict(lambda : -1)
+        self.pos_map = defaultdict(lambda: -1)
 
     def clear(self):
         self.pos_map.clear()
@@ -402,11 +402,12 @@ class Jump:
             jump_to_location(loc)
 
 
-jump = Jump()  # }}}
+jump = Jump()
+# }}}
+
 
 # Images {{{
 
-
 class ImagesDelegate(QStyledItemDelegate):
 
     MARGIN = 5
@@ -563,8 +564,8 @@ class ImagesWidget(QWidget):
         self.files.save_table('image-files-table')
 # }}}
 
-# Links {{{
 
+# Links {{{
 
 class LinksModel(FileCollection):
 
@@ -727,8 +728,8 @@ class LinksWidget(QWidget):
         save_state('links-view-splitter', bytearray(self.splitter.saveState()))
 # }}}
 
-# Words {{{
 
+# Words {{{
 
 class WordsModel(FileCollection):
 
@@ -827,8 +828,8 @@ class WordsWidget(QWidget):
         self.words.save_table('words-table')
 # }}}
 
-# Characters {{{
 
+# Characters {{{
 
 class CharsModel(FileCollection):
 
@@ -946,8 +947,8 @@ class CharsWidget(QWidget):
 
 # }}}
 
-# CSS {{{
 
+# CSS {{{
 
 class CSSRulesModel(QAbstractItemModel):
 
@@ -1195,8 +1196,8 @@ class CSSWidget(QWidget):
 
 # }}}
 
-# Classes {{{
 
+# Classes {{{
 
 class ClassesModel(CSSRulesModel):
 
@@ -1330,8 +1331,8 @@ class ClassesWidget(CSSWidget):
 
 # }}}
 
-# Wrapper UI {{{
 
+# Wrapper UI {{{
 
 class ReportsWidget(QWidget):
 
diff --git a/src/calibre/gui2/tweak_book/search.py b/src/calibre/gui2/tweak_book/search.py
index b2e90183fe..8799e62cc4 100644
--- a/src/calibre/gui2/tweak_book/search.py
+++ b/src/calibre/gui2/tweak_book/search.py
@@ -67,7 +67,6 @@ from polyglot.builtins import error_message, iteritems
 
 
 class AnimatablePushButton(QPushButton):
-
     'A push button that can be animated without actually emitting a clicked signal'
 
     def __init__(self, *args, **kwargs):
@@ -130,7 +129,7 @@ class HistoryBox(HistoryComboBox):
             if not self.ignore_snip_expansion:
                 self.ignore_snip_expansion = True
                 expand_template(self.lineEdit())
-                QTimer.singleShot(100, lambda : setattr(self, 'ignore_snip_expansion', False))
+                QTimer.singleShot(100, lambda: setattr(self, 'ignore_snip_expansion', False))
             ev.accept()
             return True
         return HistoryComboBox.event(self, ev)
@@ -1035,9 +1034,9 @@ class SavedSearches(QWidget):
         self.eb2 = b = pb(_('E&xport'), _('Export saved searches'))
         v.addWidget(b)
         self.em = m = QMenu(_('Export'))
-        m.addAction(_('Export all'), lambda : QTimer.singleShot(0, partial(self.export_searches, all=True)))
-        m.addAction(_('Export selected'), lambda : QTimer.singleShot(0, partial(self.export_searches, all=False)))
-        m.addAction(_('Copy to search panel'), lambda : QTimer.singleShot(0, self.copy_to_search_panel))
+        m.addAction(_('Export all'), lambda: QTimer.singleShot(0, partial(self.export_searches, all=True)))
+        m.addAction(_('Export selected'), lambda: QTimer.singleShot(0, partial(self.export_searches, all=False)))
+        m.addAction(_('Copy to search panel'), lambda: QTimer.singleShot(0, self.copy_to_search_panel))
         b.setMenu(m)
 
         self.searches.setFocus(Qt.FocusReason.OtherFocusReason)
diff --git a/src/calibre/gui2/tweak_book/spell.py b/src/calibre/gui2/tweak_book/spell.py
index d60a854402..5273ebc940 100644
--- a/src/calibre/gui2/tweak_book/spell.py
+++ b/src/calibre/gui2/tweak_book/spell.py
@@ -95,14 +95,16 @@ def country_map():
         _country_map = msgpack_loads(P('localization/iso3166.calibre_msgpack', data=True, allow_user_override=False))
     return _country_map
 
+
 def current_languages_dictionaries(reread=False):
     all_dictionaries = builtin_dictionaries() | custom_dictionaries(reread=reread)
-    languages = defaultdict(lambda : defaultdict(set))
+    languages = defaultdict(lambda: defaultdict(set))
     for d in all_dictionaries:
         for locale in d.locales | {d.primary_locale}:
             languages[locale.langcode][locale.countrycode].add(d)
     return languages
 
+
 class AddDictionary(QDialog):  # {{{
 
     def __init__(self, parent=None):
@@ -167,7 +169,7 @@ class AddDictionary(QDialog):  # {{{
             download more dictionaries from <a href="{1}">the LibreOffice extensions repository</a>.
             The dictionary will download as an .oxt file. Simply specify the path to the
             downloaded .oxt file here to add the dictionary to {0}.''').format(
-                __appname__, 'https://extensions.libreoffice.org/?Tags%5B%5D=50')+'<p>')  # noqa
+                __appname__, 'https://extensions.libreoffice.org/?Tags%5B%5D=50')+'<p>')
         la.setWordWrap(True)
         la.setOpenExternalLinks(True)
         la.setMinimumWidth(450)
@@ -241,11 +243,11 @@ class AddDictionary(QDialog):  # {{{
         except:
             import traceback
             return error_dialog(self, _('Failed to download dictionaries'), _(
-                'Failed to download dictionaries for "{:s}". Click "Show details" for more information').format(data['text']),
+                'Failed to download dictionaries for "{}". Click "Show details" for more information').format(data['text']),
                                 det_msg=traceback.format_exc(), show=True)
         if num == 0:
             return error_dialog(self, _('No dictionaries'), _(
-                'No dictionary was found for "{:s}"').format(data['text']), show=True)
+                'No dictionary was found for "{}"').format(data['text']), show=True)
 
     def accept(self):
         idx = self.tabs.currentIndex()
@@ -257,8 +259,8 @@ class AddDictionary(QDialog):  # {{{
         QDialog.accept(self)
 # }}}
 
-# User Dictionaries {{{
 
+# User Dictionaries {{{
 
 class UserWordList(QListWidget):
 
@@ -355,7 +357,7 @@ class ManageUserDictionaries(Dialog):
 
     def build_dictionaries(self, current=None):
         self.dictionaries.clear()
-        for dic in sorted(dictionaries.all_user_dictionaries, key=lambda d:sort_key(d.name)):
+        for dic in sorted(dictionaries.all_user_dictionaries, key=lambda d: sort_key(d.name)):
             i = QListWidgetItem(dic.name, self.dictionaries)
             i.setData(Qt.ItemDataRole.UserRole, dic)
             if dic.is_active:
@@ -430,7 +432,7 @@ class ManageUserDictionaries(Dialog):
         self.is_active.setChecked(d.is_active)
         self.is_active.blockSignals(False)
         self.words.clear()
-        for word, lang in sorted(d.words, key=lambda x:sort_key(x[0])):
+        for word, lang in sorted(d.words, key=lambda x: sort_key(x[0])):
             i = QListWidgetItem(f'{word} [{get_language(lang)}]', self.words)
             i.setData(Qt.ItemDataRole.UserRole, (word, lang))
 
@@ -521,9 +523,9 @@ class ManageUserDictionaries(Dialog):
         d = cls()
         d.exec()
 
-
 # }}}
 
+
 class ManageDictionaries(Dialog):  # {{{
 
     def __init__(self, parent=None):
@@ -602,7 +604,7 @@ class ManageDictionaries(Dialog):  # {{{
         itf.setItalic(True)
         self.dictionaries.clear()
 
-        for lc in sorted(languages, key=lambda x:sort_key(calibre_langcode_to_name(x))):
+        for lc in sorted(languages, key=lambda x: sort_key(calibre_langcode_to_name(x))):
             i = QTreeWidgetItem(self.dictionaries, LANG)
             i.setText(0, calibre_langcode_to_name(lc))
             i.setData(0, Qt.ItemDataRole.UserRole, lc)
@@ -682,7 +684,7 @@ class ManageDictionaries(Dialog):  # {{{
             x.setData(0, Qt.ItemDataRole.FontRole, bf if x is item else None)
         lc = str(item.parent().data(0, Qt.ItemDataRole.UserRole))
         pl = dprefs['preferred_locales']
-        pl[lc] = f'{lc}-{str(item.data(0, Qt.ItemDataRole.UserRole))}'
+        pl[lc] = f'{lc}-{item.data(0, Qt.ItemDataRole.UserRole)}'
         dprefs['preferred_locales'] = pl
 
     def init_dictionary(self, item):
@@ -715,8 +717,8 @@ class ManageDictionaries(Dialog):  # {{{
         d.exec()
 # }}}
 
-# Spell Check Dialog {{{
 
+# Spell Check Dialog {{{
 
 class WordsModel(QAbstractTableModel):
 
@@ -1043,7 +1045,7 @@ class WordsView(QTableView):
         a = m.addAction(_('Add/remove all selected words'))
         am = QMenu(self)
         a.setMenu(am)
-        for dic in sorted(dictionaries.active_user_dictionaries, key=lambda x:sort_key(x.name)):
+        for dic in sorted(dictionaries.active_user_dictionaries, key=lambda x: sort_key(x.name)):
             am.addAction(dic.name, partial(self.add_all.emit, dic.name))
         m.addSeparator()
         m.addAction(_('Copy selected words to clipboard'), self.copy_to_clipboard)
@@ -1639,8 +1641,8 @@ class SpellCheck(Dialog):
         d.exec()
 # }}}
 
-# Find next occurrence  {{{
 
+# Find next occurrence {{{
 
 def find_next(word, locations, current_editor, current_editor_name,
               gui_parent, show_editor, edit_file):
diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py
index 2c8bc5a208..240a579566 100644
--- a/src/calibre/gui2/tweak_book/ui.py
+++ b/src/calibre/gui2/tweak_book/ui.py
@@ -401,7 +401,7 @@ class Main(MainWindow):
         self.action_save.setEnabled(False)
         self.action_save_copy = treg('save.png', _('Save a &copy'), self.boss.save_copy, 'save-copy', 'Ctrl+Alt+S', _('Save a copy of the book'))
         self.action_save_copy_edit = treg('save.png', _('Save a &copy and edit in new window'), partial(self.boss._save_copy, 'edit'), 'save-copy-edit',
-                                          'Ctrl+Shift+S', _( 'Save a copy of the book and edit it in a new window'))
+                                          'Ctrl+Shift+S', _('Save a copy of the book and edit it in a new window'))
         self.action_save_copy_replace = treg('save.png', _('Save a &copy and edit here'), partial(self.boss._save_copy, 'replace'),
                                              'save-copy-replace', 'Ctrl+Alt+Shift+S', _('Save a copy of the book and edit it in this window'))
         self.action_quit = treg('window-close.png', _('&Quit'), self.boss.quit, 'quit', 'Ctrl+Q', _('Quit'))
@@ -561,7 +561,7 @@ class Main(MainWindow):
             'edit-clear.png', _('Close tabs to the &right'), self.central.close_to_right_of_current_editor, 'close-tabs-to-right-of', 'Ctrl+Shift+W', _(
                 'Close tabs to the right of the current tab'))
         self.action_help = treg(
-            'help.png', _('User &Manual'), lambda : open_url(QUrl(localize_user_manual_link(
+            'help.png', _('User &Manual'), lambda: open_url(QUrl(localize_user_manual_link(
                 'https://manual.calibre-ebook.com/edit.html'))), 'user-manual', 'F1', _(
                 'Show User Manual'))
         self.action_browse_images = treg(
@@ -658,7 +658,7 @@ class Main(MainWindow):
         e = b.addMenu(_('&View'))
         t = e.addMenu(_('Tool&bars'))
         e.addSeparator()
-        for name in sorted(actions, key=lambda x:sort_key(actions[x].text())):
+        for name in sorted(actions, key=lambda x: sort_key(actions[x].text())):
             ac = actions[name]
             if name.endswith('-dock'):
                 e.addAction(ac)
@@ -694,7 +694,7 @@ class Main(MainWindow):
 
         if self.plugin_menu_actions:
             e = b.addMenu(_('&Plugins'))
-            for ac in sorted(self.plugin_menu_actions, key=lambda x:sort_key(str(x.text()))):
+            for ac in sorted(self.plugin_menu_actions, key=lambda x: sort_key(str(x.text()))):
                 e.addAction(ac)
 
         e = b.addMenu(_('&Help'))
diff --git a/src/calibre/gui2/tweak_book/widgets.py b/src/calibre/gui2/tweak_book/widgets.py
index 0a1bba54ba..65c3102861 100644
--- a/src/calibre/gui2/tweak_book/widgets.py
+++ b/src/calibre/gui2/tweak_book/widgets.py
@@ -287,8 +287,8 @@ class ImportForeign(Dialog):  # {{{
         return src, dest
 # }}}
 
-# Quick Open {{{
 
+# Quick Open {{{
 
 def make_highlighted_text(emph, text, positions):
     positions = sorted(set(positions) - {-1})
@@ -509,15 +509,15 @@ class QuickOpen(Dialog):
     @classmethod
     def test(cls):
         from calibre.utils.matcher import get_items_from_dir
-        items = get_items_from_dir(os.getcwd(), lambda x:not x.endswith('.pyc'))
+        items = get_items_from_dir(os.getcwd(), lambda x: not x.endswith('.pyc'))
         d = cls(items)
         d.exec()
         print(d.selected_result)
 
 # }}}
 
-# Filterable names list {{{
 
+# Filterable names list {{{
 
 class NamesDelegate(QStyledItemDelegate):
 
@@ -619,8 +619,8 @@ def create_filterable_names_list(names, filter_text=None, parent=None, model=Nam
 
 # }}}
 
-# Insert Link {{{
 
+# Insert Link {{{
 
 class AnchorsModel(QAbstractListModel):
 
@@ -814,10 +814,8 @@ class InsertLink(Dialog):
 
 # }}}
 
-# Insert Semantics {{{
 
-
-class InsertSemantics(Dialog):
+class InsertSemantics(Dialog):  # {{{
 
     def __init__(self, container, parent=None):
         self.container = container
@@ -1112,8 +1110,8 @@ class FilterCSS(Dialog):  # {{{
 
 # }}}
 
-# Add Cover {{{
 
+# Add Cover {{{
 
 class CoverView(QWidget):
 
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 6d14ba58e2..3d8765a61b 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -112,7 +112,6 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
         SavedSearchBoxMixin, SearchRestrictionMixin, LayoutMixin, UpdateMixin,
         EbookDownloadMixin
         ):
-
     'The main GUI'
 
     proceed_requested = pyqtSignal(object, object)
@@ -765,7 +764,6 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
                 item_val = itemx[4:]
             else:
                 prints('Ignoring invalid item hexval', itemx, file=sys.stderr)
-                return
 
             def doit():
                 nonlocal item_id, item_val
@@ -1010,7 +1008,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
             if db.new_api.pref('virtual_lib_on_startup'):
                 self.apply_virtual_library(db.new_api.pref('virtual_lib_on_startup'))
             self.rebuild_vl_tabs()
-            self._restore_tb_expansion_state() # Do this before plugins library_changed()
+            self._restore_tb_expansion_state()  # Do this before plugins library_changed()
             for action in self.iactions.values():
                 try:
                     action.library_changed(db)
diff --git a/src/calibre/gui2/viewer/__init__.py b/src/calibre/gui2/viewer/__init__.py
index b321fb5539..87d2eef191 100644
--- a/src/calibre/gui2/viewer/__init__.py
+++ b/src/calibre/gui2/viewer/__init__.py
@@ -56,7 +56,6 @@ def url_for_book_in_library():
     return ans
 
 
-
 class PerformanceMonitor:
 
     def __init__(self):
diff --git a/src/calibre/gui2/viewer/bookmarks.py b/src/calibre/gui2/viewer/bookmarks.py
index eb3b9647ed..5d5a07823b 100644
--- a/src/calibre/gui2/viewer/bookmarks.py
+++ b/src/calibre/gui2/viewer/bookmarks.py
@@ -121,7 +121,7 @@ class BookmarkManager(QWidget):
         l.addWidget(bl, 0, 0, 1, -1)
         bl.itemClicked.connect(self.item_activated)
         bl.bookmark_activated.connect(self.item_activated)
-        bl.changed.connect(lambda : self.edited.emit(self.get_bookmarks()))
+        bl.changed.connect(lambda: self.edited.emit(self.get_bookmarks()))
         bl.ac_edit.triggered.connect(self.edit_bookmark)
         bl.ac_delete.triggered.connect(self.delete_bookmark)
 
diff --git a/src/calibre/gui2/viewer/highlights.py b/src/calibre/gui2/viewer/highlights.py
index b0d223549f..612ea7b8b2 100644
--- a/src/calibre/gui2/viewer/highlights.py
+++ b/src/calibre/gui2/viewer/highlights.py
@@ -441,7 +441,7 @@ class Highlights(QTreeWidget):
         else:
             if cr < 0:
                 cr = -1
-            indices = chain(range(cr + 1, count), range(0, cr + 1))
+            indices = chain(range(cr + 1, count), range(cr + 1))
         for i in indices:
             h = items[i].data(0, highlight_role)
             if pat.search(h['highlighted_text']) is not None or pat.search(h.get('notes') or '') is not None:
diff --git a/src/calibre/gui2/viewer/lookup.py b/src/calibre/gui2/viewer/lookup.py
index 0afc2d4fe6..d550ce83a4 100644
--- a/src/calibre/gui2/viewer/lookup.py
+++ b/src/calibre/gui2/viewer/lookup.py
@@ -316,7 +316,7 @@ def set_sync_override(allowed):
 
 
 def blank_html():
-    msg = _('Double click on a word in the book\'s text to look it up.')
+    msg = _("Double click on a word in the book's text to look it up.")
     html = '<p>' + msg
     app = QApplication.instance()
     if app.is_dark_theme:
diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py
index 022b5fb0b2..bf77934571 100644
--- a/src/calibre/gui2/viewer/main.py
+++ b/src/calibre/gui2/viewer/main.py
@@ -202,9 +202,7 @@ def main(args=sys.argv):
     parser = option_parser()
     opts, args = parser.parse_args(args)
     oat = opts.open_at
-    if oat and not (
-            oat.startswith('toc:') or oat.startswith('toc-href:') or oat.startswith('toc-href-contains:') or
-            oat.startswith('epubcfi(/') or is_float(oat) or oat.startswith('ref:') or oat.startswith('search:') or oat.startswith('regex:')):
+    if oat and not (oat.startswith(('toc:', 'toc-href:', 'toc-href-contains:', 'epubcfi(/', 'ref:', 'search:', 'regex:')) or is_float(oat)):
         raise SystemExit(f'Not a valid --open-at value: {opts.open_at}')
 
     if not opts.new_instance and get_session_pref('singleinstance', False):
diff --git a/src/calibre/gui2/viewer/search.py b/src/calibre/gui2/viewer/search.py
index 4963726096..355e240f04 100644
--- a/src/calibre/gui2/viewer/search.py
+++ b/src/calibre/gui2/viewer/search.py
@@ -183,9 +183,18 @@ class SearchFinished:
 class SearchResult:
 
     __slots__ = (
-        'search_query', 'before', 'text', 'after', 'q', 'spine_idx',
-        'index', 'file_name', 'is_hidden', 'offset', 'toc_nodes',
-        'result_num'
+        'after',
+        'before',
+        'file_name',
+        'index',
+        'is_hidden',
+        'offset',
+        'q',
+        'result_num',
+        'search_query',
+        'spine_idx',
+        'text',
+        'toc_nodes',
     )
 
     def __init__(self, search_query, before, text, after, q, name, spine_idx, index, offset, result_num):
@@ -275,7 +284,7 @@ def searchable_text_for_name(name):
         if children:
             for child in reversed(children):
                 a((child, ignore_text_in_node_and_children, in_ruby))
-    for (tail, body) in removed_tails:
+    for tail, body in removed_tails:
         if tail is not None:
             body['l'] = tail
     return ''.join(ans), anchor_offset_map
@@ -410,7 +419,7 @@ def search_in_name(name, search_query, ctx_size=75):
                 return spans.append((s, s + l))
             primary_collator_without_punctuation().find_all(search_query.text, raw, a, search_query.mode == 'word')
 
-    for (start, end) in miter():
+    for start, end in miter():
         before = raw[max(0, start-ctx_size):start]
         after = raw[end:end+ctx_size]
         yield before, raw[start:end], after, start
@@ -601,7 +610,6 @@ class Results(QTreeWidget):  # {{{
         self.context_menu.popup(self.mapToGlobal(point))
         return True
 
-
     def viewportEvent(self, ev):
         if hasattr(self, 'gesture_manager'):
             ret = self.gesture_manager.handle_event(ev)
diff --git a/src/calibre/gui2/viewer/toolbars.py b/src/calibre/gui2/viewer/toolbars.py
index e5309462f0..9455f1b49c 100644
--- a/src/calibre/gui2/viewer/toolbars.py
+++ b/src/calibre/gui2/viewer/toolbars.py
@@ -40,7 +40,7 @@ from calibre.utils.localization import _
 
 class Action:
 
-    __slots__ = ('icon', 'text', 'shortcut_action')
+    __slots__ = ('icon', 'shortcut_action', 'text')
 
     def __init__(self, icon=None, text=None, shortcut_action=None):
         self.icon, self.text, self.shortcut_action = QIcon.ic(icon), text, shortcut_action
@@ -558,7 +558,7 @@ class ConfigureToolBar(Dialog):
         self.available_actions.add_names(names)
 
     def remove_item(self, item):
-        names = self.current_actions.remove_item(item),
+        names = (self.current_actions.remove_item(item),)
         self.available_actions.add_names(names)
 
     def add_actions(self):
@@ -566,7 +566,7 @@ class ConfigureToolBar(Dialog):
         self.current_actions.add_names(names)
 
     def add_item(self, item):
-        names = self.available_actions.remove_item(item),
+        names = (self.available_actions.remove_item(item),)
         self.current_actions.add_names(names)
 
     def restore_defaults(self):
diff --git a/src/calibre/gui2/viewer/ui.py b/src/calibre/gui2/viewer/ui.py
index 6cd93c9eb6..0f011e59f9 100644
--- a/src/calibre/gui2/viewer/ui.py
+++ b/src/calibre/gui2/viewer/ui.py
@@ -75,8 +75,8 @@ def dock_defs():
     def d(title, name, area, allowed=Qt.DockWidgetArea.LeftDockWidgetArea | Qt.DockWidgetArea.RightDockWidgetArea):
         ans[name] = Dock(name + '-dock', title, area, allowed)
 
-    d(_('Table of Contents'), 'toc', Qt.DockWidgetArea.LeftDockWidgetArea),
-    d(_('Lookup'), 'lookup', Qt.DockWidgetArea.RightDockWidgetArea),
+    d(_('Table of Contents'), 'toc', Qt.DockWidgetArea.LeftDockWidgetArea)
+    d(_('Lookup'), 'lookup', Qt.DockWidgetArea.RightDockWidgetArea)
     d(_('Bookmarks'), 'bookmarks', Qt.DockWidgetArea.RightDockWidgetArea)
     d(_('Search'), 'search', Qt.DockWidgetArea.LeftDockWidgetArea)
     d(_('Inspector'), 'inspector', Qt.DockWidgetArea.RightDockWidgetArea, Qt.DockWidgetArea.AllDockWidgetAreas)
@@ -420,21 +420,21 @@ class EbookViewer(MainWindow):
                 self.image_popup()
             else:
                 error_dialog(self, _('Invalid image'), _(
-                    "Failed to load the image {}").format(name), show=True)
+                    'Failed to load the image {}').format(name), show=True)
         else:
             error_dialog(self, _('Image not found'), _(
-                    "Failed to find the image {}").format(name), show=True)
+                    'Failed to find the image {}').format(name), show=True)
 
     def copy_image(self, name):
         path = get_path_for_name(name)
         if not path:
             return error_dialog(self, _('Image not found'), _(
-                "Failed to find the image {}").format(name), show=True)
+                'Failed to find the image {}').format(name), show=True)
         try:
             img = image_from_path(path)
         except Exception:
             return error_dialog(self, _('Invalid image'), _(
-                "Failed to load the image {}").format(name), show=True)
+                'Failed to load the image {}').format(name), show=True)
         url = QUrl.fromLocalFile(path)
         md = QMimeData()
         md.setImageData(img)
@@ -839,7 +839,7 @@ class EbookViewer(MainWindow):
         return MainWindow.closeEvent(self, ev)
     # }}}
 
-    # Auto-hide mouse cursor  {{{
+    # Auto-hide mouse cursor {{{
     def setup_mouse_auto_hide(self):
         QApplication.instance().installEventFilter(self)
         self.cursor_hidden = False
diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py
index 4e64405f6b..8805235c4d 100644
--- a/src/calibre/gui2/viewer/web_view.py
+++ b/src/calibre/gui2/viewer/web_view.py
@@ -56,8 +56,8 @@ from polyglot.functools import lru_cache
 
 SANDBOX_HOST = FAKE_HOST.rpartition('.')[0] + '.sandbox'
 
-# Override network access to load data from the book {{{
 
+# Override network access to load data from the book {{{
 
 def set_book_path(path, pathtoebook):
     set_book_path.pathtoebook = pathtoebook
@@ -112,7 +112,7 @@ def background_image(encoded_fname=''):
         with open(make_long_path_useable(img_path), 'rb') as f:
             return mt, f.read()
     except FileNotFoundError:
-        if fname.startswith('https://') or fname.startswith('http://'):
+        if fname.startswith(('https://', 'http://')):
             from calibre import browser
             br = browser()
             try:
@@ -140,14 +140,14 @@ def handle_mathjax_request(rq, name):
             with open(path, 'rb') as f:
                 raw = f.read()
         except OSError as err:
-            prints(f"Failed to get mathjax file: {name} with error: {err}", file=sys.stderr)
+            prints(f'Failed to get mathjax file: {name} with error: {err}', file=sys.stderr)
             rq.fail(QWebEngineUrlRequestJob.Error.RequestFailed)
             return
         if name.endswith('/startup.js'):
             raw = P('pdf-mathjax-loader.js', data=True, allow_user_override=False) + raw
         send_reply(rq, mt, raw)
     else:
-        prints(f"Failed to get mathjax file: {name} outside mathjax directory", file=sys.stderr)
+        prints(f'Failed to get mathjax file: {name} outside mathjax directory', file=sys.stderr)
         rq.fail(QWebEngineUrlRequestJob.Error.RequestFailed)
 
 
@@ -212,7 +212,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler):
         if fail_code is None:
             fail_code = QWebEngineUrlRequestJob.Error.UrlNotFound
         rq.fail(fail_code)
-        prints(f"Blocking FAKE_PROTOCOL request: {rq.requestUrl().toString()} with code: {fail_code}")
+        prints(f'Blocking FAKE_PROTOCOL request: {rq.requestUrl().toString()} with code: {fail_code}')
 
 # }}}
 
@@ -263,7 +263,6 @@ class ViewerBridge(Bridge):
     search_result_not_found = from_js(object)
     search_result_discovered = from_js(object)
     find_next = from_js(object)
-    quit = from_js()
     update_current_toc_nodes = from_js(object)
     toggle_full_screen = from_js()
     report_cfi = from_js(object, object)
@@ -477,7 +476,6 @@ class WebView(RestartingWebEngineView):
     new_bookmark = pyqtSignal(object)
     toggle_inspector = pyqtSignal()
     toggle_lookup = pyqtSignal(object)
-    quit = pyqtSignal()
     update_current_toc_nodes = pyqtSignal(object)
     toggle_full_screen = pyqtSignal()
     ask_for_open = pyqtSignal(object)
@@ -634,7 +632,7 @@ class WebView(RestartingWebEngineView):
         self.dead_renderer_error_shown = True
         error_dialog(self, _('Render process crashed'), _(
             'The Qt WebEngine Render process has crashed.'
-            ' You should try restarting the viewer.') , show=True)
+            ' You should try restarting the viewer.'), show=True)
 
     def event(self, event):
         if event.type() == QEvent.Type.ChildPolished:
diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index 9524571cf3..d027b07bb8 100644
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@@ -426,6 +426,7 @@ class ImageView(QWidget, ImageDropMixin):
             draw_size(p, target, ow, oh)
 # }}}
 
+
 # CoverView {{{
 
 class RoundedPixmap(QGraphicsPixmapItem):
@@ -472,8 +473,8 @@ class CoverView(QGraphicsView, ImageDropMixin):
 
 # }}}
 
-# BasicList {{{
 
+# BasicList {{{
 
 class BasicListItem(QListWidgetItem):
 
@@ -918,24 +919,24 @@ class PythonHighlighter(QSyntaxHighlighter):  # {{{
     Rules = ()
     Formats = {}
 
-    KEYWORDS = ["and", "as", "assert", "break", "class", "continue", "def",
-        "del", "elif", "else", "except", "exec", "finally", "for", "from",
-        "global", "if", "import", "in", "is", "lambda", "not", "or",
-        "pass", "print", "raise", "return", "try", "while", "with",
-        "yield"]
+    KEYWORDS = ['and', 'as', 'assert', 'break', 'class', 'continue', 'def',
+        'del', 'elif', 'else', 'except', 'exec', 'finally', 'for', 'from',
+        'global', 'if', 'import', 'in', 'is', 'lambda', 'not', 'or',
+        'pass', 'print', 'raise', 'return', 'try', 'while', 'with',
+        'yield']
 
-    BUILTINS = ["abs", "all", "any", "basestring", "bool", "callable", "chr",
-        "classmethod", "cmp", "compile", "complex", "delattr", "dict",
-        "dir", "divmod", "enumerate", "eval", "execfile", "exit", "file",
-        "filter", "float", "frozenset", "getattr", "globals", "hasattr",
-        "hex", "id", "int", "isinstance", "issubclass", "iter", "len",
-        "list", "locals", "long", "map", "max", "min", "object", "oct",
-        "open", "ord", "pow", "property", "range", "reduce", "repr",
-        "reversed", "round", "set", "setattr", "slice", "sorted",
-        "staticmethod", "str", "sum", "super", "tuple", "type", "unichr",
-        "unicode", "vars", "xrange", "zip"]
+    BUILTINS = ['abs', 'all', 'any', 'basestring', 'bool', 'callable', 'chr',
+        'classmethod', 'cmp', 'compile', 'complex', 'delattr', 'dict',
+        'dir', 'divmod', 'enumerate', 'eval', 'execfile', 'exit', 'file',
+        'filter', 'float', 'frozenset', 'getattr', 'globals', 'hasattr',
+        'hex', 'id', 'int', 'isinstance', 'issubclass', 'iter', 'len',
+        'list', 'locals', 'long', 'map', 'max', 'min', 'object', 'oct',
+        'open', 'ord', 'pow', 'property', 'range', 'reduce', 'repr',
+        'reversed', 'round', 'set', 'setattr', 'slice', 'sorted',
+        'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'unichr',
+        'unicode', 'vars', 'xrange', 'zip']
 
-    CONSTANTS = ["False", "True", "None", "NotImplemented", "Ellipsis"]
+    CONSTANTS = ['False', 'True', 'None', 'NotImplemented', 'Ellipsis']
 
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -951,26 +952,26 @@ class PythonHighlighter(QSyntaxHighlighter):  # {{{
             r.append((a, b))
 
         a(re.compile(
-                "|".join([r"\b%s\b" % keyword for keyword in cls.KEYWORDS])),
-                "keyword")
+                '|'.join([r'\b%s\b' % keyword for keyword in cls.KEYWORDS])),
+                'keyword')
         a(re.compile(
-                "|".join([r"\b%s\b" % builtin for builtin in cls.BUILTINS])),
-                "builtin")
+                '|'.join([r'\b%s\b' % builtin for builtin in cls.BUILTINS])),
+                'builtin')
         a(re.compile(
-                "|".join([r"\b%s\b" % constant
-                for constant in cls.CONSTANTS])), "constant")
+                '|'.join([r'\b%s\b' % constant
+                for constant in cls.CONSTANTS])), 'constant')
         a(re.compile(
-                r"\b[+-]?[0-9]+[lL]?\b"
-                r"|\b[+-]?0[xX][0-9A-Fa-f]+[lL]?\b"
-                r"|\b[+-]?[0-9]+(?:\.[0-9]+)?(?:[eE][+-]?[0-9]+)?\b"),
-                "number")
+                r'\b[+-]?[0-9]+[lL]?\b'
+                r'|\b[+-]?0[xX][0-9A-Fa-f]+[lL]?\b'
+                r'|\b[+-]?[0-9]+(?:\.[0-9]+)?(?:[eE][+-]?[0-9]+)?\b'),
+                'number')
         a(re.compile(
-                r"\bPyQt6\b|\bQt?[A-Z][a-z]\w+\b"), "pyqt")
-        a(re.compile(r"\b@\w+\b"), "decorator")
-        stringRe = re.compile(r"""(?:'[^']*?'|"[^"]*?")""")
-        a(stringRe, "string")
+                r'\bPyQt6\b|\bQt?[A-Z][a-z]\w+\b'), 'pyqt')
+        a(re.compile(r'\b@\w+\b'), 'decorator')
+        stringRe = re.compile(r'''(?:'[^']*?'|"[^"]*?")''')
+        a(stringRe, 'string')
         cls.stringRe = re.compile(r"""(:?"["]".*?"["]"|'''.*?''')""")
-        a(cls.stringRe, "string")
+        a(cls.stringRe, 'string')
         cls.tripleSingleRe = re.compile(r"""'''(?!")""")
         cls.tripleDoubleRe = re.compile(r'''"""(?!')''')
         cls.Rules = tuple(r)
@@ -982,16 +983,16 @@ class PythonHighlighter(QSyntaxHighlighter):  # {{{
         p = QApplication.instance().palette()
         is_dark = QApplication.instance().is_dark_theme
         for name, color, bold, italic in (
-                ("normal", None, False, False),
-                ("keyword", p.color(QPalette.ColorRole.Link).name(), True, False),
-                ("builtin", p.color(QPalette.ColorRole.Link).name(), False, False),
-                ("constant", p.color(QPalette.ColorRole.Link).name(), False, False),
-                ("decorator", "#0000E0", False, False),
-                ("comment", '#00c700' if is_dark else "#007F00", False, True),
-                ("string", '#b6b600' if is_dark else "#808000", False, False),
-                ("number", '#d96d00' if is_dark else "#924900", False, False),
-                ("error", "#FF0000", False, False),
-                ("pyqt", "#50621A", False, False)):
+                ('normal', None, False, False),
+                ('keyword', p.color(QPalette.ColorRole.Link).name(), True, False),
+                ('builtin', p.color(QPalette.ColorRole.Link).name(), False, False),
+                ('constant', p.color(QPalette.ColorRole.Link).name(), False, False),
+                ('decorator', '#0000E0', False, False),
+                ('comment', '#00c700' if is_dark else '#007F00', False, True),
+                ('string', '#b6b600' if is_dark else '#808000', False, False),
+                ('number', '#d96d00' if is_dark else '#924900', False, False),
+                ('error', '#FF0000', False, False),
+                ('pyqt', '#50621A', False, False)):
 
             fmt = QTextCharFormat(baseFormat)
             if color is not None:
@@ -1009,18 +1010,17 @@ class PythonHighlighter(QSyntaxHighlighter):  # {{{
         prevState = self.previousBlockState()
 
         self.setFormat(0, textLength,
-                       self.Formats["normal"])
+                       self.Formats['normal'])
 
-        if text.startswith("Traceback") or text.startswith("Error: "):
+        if text.startswith(('Traceback', 'Error: ')):
             self.setCurrentBlockState(ERROR)
             self.setFormat(0, textLength,
-                           self.Formats["error"])
+                           self.Formats['error'])
             return
-        if prevState == ERROR and \
-           not (text.startswith('>>>') or text.startswith("#")):
+        if prevState == ERROR and not text.startswith(('>>>', '#')):
             self.setCurrentBlockState(ERROR)
             self.setFormat(0, textLength,
-                           self.Formats["error"])
+                           self.Formats['error'])
             return
 
         for regex, fmt in PythonHighlighter.Rules:
@@ -1032,8 +1032,8 @@ class PythonHighlighter(QSyntaxHighlighter):  # {{{
         # PythonHighlighter.Rules.append((re.compile(r"#.*"), "comment"))
         if not text:
             pass
-        elif text[0] == "#":
-            self.setFormat(0, len(text), self.Formats["comment"])
+        elif text[0] == '#':
+            self.setFormat(0, len(text), self.Formats['comment'])
         else:
             stack = []
             for i, c in enumerate(text):
@@ -1042,8 +1042,8 @@ class PythonHighlighter(QSyntaxHighlighter):  # {{{
                         stack.pop()
                     else:
                         stack.append(c)
-                elif c == "#" and len(stack) == 0:
-                    self.setFormat(i, len(text), self.Formats["comment"])
+                elif c == '#' and len(stack) == 0:
+                    self.setFormat(i, len(text), self.Formats['comment'])
                     break
 
         self.setCurrentBlockState(NORMAL)
@@ -1061,11 +1061,11 @@ class PythonHighlighter(QSyntaxHighlighter):  # {{{
                     i = len(text)
                     self.setCurrentBlockState(state)
                 self.setFormat(0, i + 3,
-                               self.Formats["string"])
+                               self.Formats['string'])
             elif i > -1:
                 self.setCurrentBlockState(state)
                 self.setFormat(i, len(text),
-                               self.Formats["string"])
+                               self.Formats['string'])
 
     def rehighlight(self):
         QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
@@ -1100,7 +1100,6 @@ class SplitterHandle(QSplitterHandle):
         self.double_clicked.emit(self)
 
 
-
 class PaperSizes(QComboBox):  # {{{
 
     system_default_paper_size = None
diff --git a/src/calibre/gui2/widgets2.py b/src/calibre/gui2/widgets2.py
index bc3ff90242..e3fa54c333 100644
--- a/src/calibre/gui2/widgets2.py
+++ b/src/calibre/gui2/widgets2.py
@@ -211,7 +211,7 @@ class CenteredToolButton(RightClickButton):
         self.setIcon(icon)
         self.setSizePolicy(QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed))
         self.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
-        self.text_flags =  Qt.TextFlag.TextSingleLine | Qt.AlignmentFlag.AlignCenter
+        self.text_flags = Qt.TextFlag.TextSingleLine | Qt.AlignmentFlag.AlignCenter
 
     def paintEvent(self, ev):
         painter = QStylePainter(self)
@@ -239,7 +239,6 @@ class CenteredToolButton(RightClickButton):
 
 
 class Dialog(QDialog):
-
     '''
     An improved version of Qt's QDialog class. This automatically remembers the
     last used size, automatically connects the signals for QDialogButtonBox,
@@ -876,7 +875,6 @@ class MessagePopup(QLabel):
         self.move((p.width() - self.width()) // 2, self.OFFSET_FROM_TOP)
 
 
-
 if __name__ == '__main__':
     from calibre.gui2 import Application
     app = Application([])
diff --git a/src/calibre/gui2/win_file_dialogs.py b/src/calibre/gui2/win_file_dialogs.py
index 0a7a54b493..35ad9e670d 100644
--- a/src/calibre/gui2/win_file_dialogs.py
+++ b/src/calibre/gui2/win_file_dialogs.py
@@ -66,7 +66,7 @@ def serialize_string(key, val):
 
 
 def serialize_file_types(file_types):
-    key = b"FILE_TYPES"
+    key = b'FILE_TYPES'
     buf = [struct.pack('=B%dsH' % len(key), len(key), key, len(file_types))]
 
     def add(x):
@@ -347,7 +347,7 @@ def test(helper=HELPER):
     pipename = '\\\\.\\pipe\\%s' % uuid4()
     echo = '\U0001f431 Hello world!'
     secret = os.urandom(32).replace(b'\0', b' ')
-    data = serialize_string('PIPENAME', pipename) +  serialize_string('ECHO', echo) + serialize_secret(secret)
+    data = serialize_string('PIPENAME', pipename) + serialize_string('ECHO', echo) + serialize_secret(secret)
     server = PipeServer(pipename)
     server.start()
     p = subprocess.Popen([helper], stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE)
diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index 07105dee15..960f2a048c 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -623,8 +623,8 @@ class DevicePage(QWizardPage, DeviceUI):
     def __init__(self):
         QWizardPage.__init__(self)
         self.setupUi(self)
-        self.registerField("manufacturer", self.manufacturer_view)
-        self.registerField("device", self.device_view)
+        self.registerField('manufacturer', self.manufacturer_view)
+        self.registerField('device', self.device_view)
 
     def initializePage(self):
         self.label.setText(_('Choose your e-book device. If your device is'
@@ -751,9 +751,9 @@ class LibraryPage(QWizardPage, LibraryUI):
         try:
             lang = prefs['language'].lower()[:2]
             metadata_plugins = {
-                    'zh' : ('Douban Books',),
-                    'fr' : ('Nicebooks',),
-                    'ru' : ('OZON.ru',),
+                    'zh': ('Douban Books',),
+                    'fr': ('Nicebooks',),
+                    'ru': ('OZON.ru',),
             }.get(lang, [])
             from calibre.customize.ui import enable_plugin
             for name in metadata_plugins:
@@ -950,7 +950,7 @@ class Wizard(QWizard):
         QWizard.accept(self)
 
     def set_finish_text(self, *args):
-        bt = str("<em>" + self.buttonText(QWizard.WizardButton.FinishButton) + "</em>").replace('&', '')
+        bt = str('<em>' + self.buttonText(QWizard.WizardButton.FinishButton) + '</em>').replace('&', '')
         t = str(self.finish_page.finish_text.text())
         if '%s' in t:
             self.finish_page.finish_text.setText(t%bt)
diff --git a/src/calibre/gui2/wizard/send_email.py b/src/calibre/gui2/wizard/send_email.py
index dfbf62e65a..81fa130e5a 100644
--- a/src/calibre/gui2/wizard/send_email.py
+++ b/src/calibre/gui2/wizard/send_email.py
@@ -42,11 +42,11 @@ class TestEmail(QDialog):
     def __init__(self, pa, parent):
         QDialog.__init__(self, parent)
         self.test_func = parent.test_email_settings
-        self.setWindowTitle(_("Test email settings"))
+        self.setWindowTitle(_('Test email settings'))
         self.setWindowIcon(QIcon.ic('config.ui'))
         l = QVBoxLayout(self)
         opts = smtp_prefs().parse()
-        self.from_ = la = QLabel(_("Send test mail from %s to:")%opts.from_)
+        self.from_ = la = QLabel(_('Send test mail from %s to:')%opts.from_)
         l.addWidget(la)
         self.to = le = QLineEdit(self)
         if pa:
@@ -111,7 +111,7 @@ class RelaySetup(QDialog):
         bb.rejected.connect(self.reject)
         self.tl = QLabel(('<p>'+_('Setup sending email using') +
                 ' <b>{name}</b><p>' +
-            _('If you don\'t have an account, you can sign up for a free {name} email '
+            _("If you don't have an account, you can sign up for a free {name} email "
             'account at <a href="https://{url}">{url}</a>. {extra}')).format(
                 **service))
         l.addWidget(self.tl, 0, 0, 3, 0)
@@ -204,7 +204,7 @@ class SendEmail(QWidget, Ui_Form):
             button = getattr(self, 'relay_use_'+x)
             button.clicked.connect(partial(self.create_service_relay, x))
         self.relay_show_password.stateChanged.connect(
-         lambda state : self.relay_password.setEchoMode(
+         lambda state: self.relay_password.setEchoMode(
              QLineEdit.EchoMode.Password if
              state == 0 else QLineEdit.EchoMode.Normal))
         self.test_email_button.clicked.connect(self.test_email)
diff --git a/src/calibre/library/add_to_library.py b/src/calibre/library/add_to_library.py
index 8a65a62809..24272337d9 100644
--- a/src/calibre/library/add_to_library.py
+++ b/src/calibre/library/add_to_library.py
@@ -12,7 +12,7 @@ from calibre.ebooks import BOOK_EXTENSIONS
 
 
 def find_folders_under(root, db, add_root=True,  # {{{
-        follow_links=False, cancel_callback=lambda : False):
+        follow_links=False, cancel_callback=lambda: False):
     '''
     Find all folders under the specified root path, ignoring any folders under
     the library path of db
@@ -45,7 +45,6 @@ def find_folders_under(root, db, add_root=True,  # {{{
         ans.remove(root)
 
     return ans
-
 # }}}
 
 
@@ -103,7 +102,7 @@ class FormatCollection:  # {{{
 
 
 def books_in_folder(folder, one_per_folder,  # {{{
-        cancel_callback=lambda : False):
+        cancel_callback=lambda: False):
     dirpath = os.path.abspath(folder)
     if one_per_folder:
         formats = set()
@@ -142,7 +141,6 @@ def books_in_folder(folder, one_per_folder,  # {{{
             books[key].add(path)
 
         return [FormatCollection(folder, x) for x in books.values() if x]
-
 # }}}
 
 
diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py
index eed672e9f6..3b9405bbc5 100644
--- a/src/calibre/library/caches.py
+++ b/src/calibre/library/caches.py
@@ -56,10 +56,10 @@ class MetadataBackup(Thread):  # {{{
         while self.keep_running:
             try:
                 time.sleep(2)  # Limit to one book per two seconds
-                (id_, sequence) = self.db.get_a_dirtied_book()
+                id_, sequence = self.db.get_a_dirtied_book()
                 if id_ is None:
                     continue
-                # print 'writer thread', id_, sequence
+                # print('writer thread', id_, sequence)
             except:
                 # Happens during interpreter shutdown
                 break
@@ -119,9 +119,9 @@ class MetadataBackup(Thread):  # {{{
         with open(path, 'wb') as f:
             f.write(raw)
 
-
 # }}}
 
+
 # Global utility function for get_match here and in gui2/library.py
 # This is a global for performance
 pref_use_primary_find_in_search = False
@@ -191,7 +191,7 @@ class CacheRow(list):  # {{{
                 mi = self.db.get_metadata(id_, index_is_id=True,
                                           get_user_categories=False)
                 for c in self._composites:
-                    self[c] =  mi.get(self._composites[c])
+                    self[c] = mi.get(self._composites[c])
         if col == self._series_sort_col and self._series_sort is None:
             if self[self._series_col]:
                 self._series_sort = title_sort(self[self._series_col])
@@ -206,7 +206,7 @@ class CacheRow(list):  # {{{
 
     def refresh_composites(self):
         for c in self._composites:
-            self[c] =  None
+            self[c] = None
         self._must_do = True
 
 # }}}
@@ -381,10 +381,10 @@ class ResultCache(SearchQueryParser):  # {{{
         relop = None
         for k in self.date_search_relops.keys():
             if query.startswith(k):
-                (p, relop) = self.date_search_relops[k]
+                p, relop = self.date_search_relops[k]
                 query = query[p:]
         if relop is None:
-            (p, relop) = self.date_search_relops['=']
+            p, relop = self.date_search_relops['=']
 
         if query in self.local_today:
             qd = now()
@@ -395,7 +395,7 @@ class ResultCache(SearchQueryParser):  # {{{
         elif query in self.local_thismonth:
             qd = now()
             field_count = 2
-        elif query.endswith(self.local_daysago) or query.endswith(self.untrans_daysago):
+        elif query.endswith((self.local_daysago, self.untrans_daysago)):
             num = query[0:-(self.untrans_daysago_len if query.endswith(self.untrans_daysago) else self.local_daysago_len)]
             try:
                 qd = now() - timedelta(int(num))
@@ -464,10 +464,10 @@ class ResultCache(SearchQueryParser):  # {{{
             relop = None
             for k in self.numeric_search_relops.keys():
                 if query.startswith(k):
-                    (p, relop) = self.numeric_search_relops[k]
+                    p, relop = self.numeric_search_relops[k]
                     query = query[p:]
             if relop is None:
-                (p, relop) = self.numeric_search_relops['=']
+                p, relop = self.numeric_search_relops['=']
 
             if dt == 'int':
                 def cast(x):
@@ -541,7 +541,7 @@ class ResultCache(SearchQueryParser):  # {{{
             if len(q) != 2:
                 raise ParseException(
                  _('Invalid query format for colon-separated search: {0}').format(query))
-            (keyq, valq) = q
+            keyq, valq = q
             keyq_mkind, keyq = self._matchkind(keyq)
             valq_mkind, valq = self._matchkind(valq)
         else:
diff --git a/src/calibre/library/catalogs/__init__.py b/src/calibre/library/catalogs/__init__.py
index c12037d7b7..f693d9a08e 100644
--- a/src/calibre/library/catalogs/__init__.py
+++ b/src/calibre/library/catalogs/__init__.py
@@ -26,4 +26,3 @@ class EmptyCatalogException(Exception):
 
 class InvalidGenresSourceFieldException(Exception):
     pass
-
diff --git a/src/calibre/library/catalogs/bibtex.py b/src/calibre/library/catalogs/bibtex.py
index ac2397c290..97428f5e0f 100644
--- a/src/calibre/library/catalogs/bibtex.py
+++ b/src/calibre/library/catalogs/bibtex.py
@@ -127,15 +127,15 @@ class BIBTEX(CatalogPlugin):
             # Define starting chain or if book valid strict and not book return a Fail string
 
             bibtex_entry = []
-            if mode != "misc" and check_entry_book_valid(entry) :
+            if mode != 'misc' and check_entry_book_valid(entry):
                 bibtex_entry.append('@book{')
-            elif mode != "book" :
+            elif mode != 'book':
                 bibtex_entry.append('@misc{')
-            else :
+            else:
                 # case strict book
                 return ''
 
-            if citation_bibtex :
+            if citation_bibtex:
                 # Citation tag
                 bibtex_entry.append(make_bibtex_citation(entry, template_citation,
                     bibtexdict))
@@ -143,7 +143,7 @@ class BIBTEX(CatalogPlugin):
 
             for field in fields:
                 if field.startswith('#'):
-                    item = db.get_field(entry['id'],field,index_is_id=True)
+                    item = db.get_field(entry['id'], field, index_is_id=True)
                     m = db.new_api.field_metadata[field]
                     if isinstance(item, (bool, numbers.Number)):
                         item = repr(item)
@@ -160,28 +160,28 @@ class BIBTEX(CatalogPlugin):
                 if item is None:
                     continue
                 try:
-                    if len(item) == 0 :
+                    if len(item) == 0:
                         continue
                 except TypeError:
                     pass
 
-                if field == 'authors' :
+                if field == 'authors':
                     bibtex_entry.append('author = "%s"' % bibtexdict.bibtex_author_format(item))
 
-                elif field == 'id' :
+                elif field == 'id':
                     bibtex_entry.append('calibreid = "%s"' % int(item))
 
-                elif field == 'rating' :
+                elif field == 'rating':
                     bibtex_entry.append('rating = "%s"' % int(item))
 
-                elif field == 'size' :
+                elif field == 'size':
                     bibtex_entry.append(f'{field} = "{int(item)} octets"')
 
-                elif field == 'tags' :
+                elif field == 'tags':
                     # A list to flatten
                     bibtex_entry.append('tags = "%s"' % bibtexdict.utf8ToBibtex(', '.join(item)))
 
-                elif field == 'comments' :
+                elif field == 'comments':
                     # \n removal
                     item = item.replace('\r\n', ' ')
                     item = item.replace('\n', ' ')
@@ -191,14 +191,14 @@ class BIBTEX(CatalogPlugin):
                     try:
                         item = html2text(item)
                     except:
-                        log.warn("Failed to convert comments to text")
+                        log.warn('Failed to convert comments to text')
                     bibtex_entry.append('note = "%s"' % bibtexdict.utf8ToBibtex(item))
 
-                elif field == 'isbn' :
+                elif field == 'isbn':
                     # Could be 9, 10 or 13 digits
                     bibtex_entry.append('isbn = "%s"' % format_isbn(item))
 
-                elif field == 'formats' :
+                elif field == 'formats':
                     # Add file path if format is selected
                     formats = [format.rpartition('.')[2].lower() for format in item]
                     bibtex_entry.append('formats = "%s"' % ', '.join(formats))
@@ -207,15 +207,15 @@ class BIBTEX(CatalogPlugin):
                             for format in item]
                         bibtex_entry.append('file = "%s"' % ', '.join(files))
 
-                elif field == 'series_index' :
+                elif field == 'series_index':
                     bibtex_entry.append('volume = "%s"' % int(item))
 
-                elif field == 'timestamp' :
+                elif field == 'timestamp':
                     bibtex_entry.append('timestamp = "%s"' % isoformat(item).partition('T')[0])
 
-                elif field == 'pubdate' :
+                elif field == 'pubdate':
                     bibtex_entry.append('year = "%s"' % item.year)
-                    bibtex_entry.append('month = "%s"' % bibtexdict.utf8ToBibtex(strftime("%b", item)))
+                    bibtex_entry.append('month = "%s"' % bibtexdict.utf8ToBibtex(strftime('%b', item)))
 
                 elif field.startswith('#') and isinstance(item, string_or_bytes):
                     bibtex_entry.append('custom_{} = "{}"'.format(field[1:],
@@ -233,47 +233,47 @@ class BIBTEX(CatalogPlugin):
 
         def check_entry_book_valid(entry):
             # Check that the required fields are ok for a book entry
-            for field in ['title', 'authors', 'publisher'] :
-                if entry[field] is None or len(entry[field]) == 0 :
+            for field in ['title', 'authors', 'publisher']:
+                if entry[field] is None or len(entry[field]) == 0:
                     return False
-            if entry['pubdate'] is None :
+            if entry['pubdate'] is None:
                 return False
-            else :
+            else:
                 return True
 
         def make_bibtex_citation(entry, template_citation, bibtexclass):
 
             # define a function to replace the template entry by its value
-            def tpl_replace(objtplname) :
+            def tpl_replace(objtplname):
 
                 tpl_field = re.sub(r'[\{\}]', '', objtplname.group())
 
-                if tpl_field in TEMPLATE_ALLOWED_FIELDS :
-                    if tpl_field in ['pubdate', 'timestamp'] :
+                if tpl_field in TEMPLATE_ALLOWED_FIELDS:
+                    if tpl_field in ['pubdate', 'timestamp']:
                         tpl_field = isoformat(entry[tpl_field]).partition('T')[0]
-                    elif tpl_field in ['tags', 'authors'] :
-                        tpl_field =entry[tpl_field][0]
-                    elif tpl_field in ['id', 'series_index'] :
+                    elif tpl_field in ['tags', 'authors']:
+                        tpl_field = entry[tpl_field][0]
+                    elif tpl_field in ['id', 'series_index']:
                         tpl_field = str(entry[tpl_field])
-                    else :
+                    else:
                         tpl_field = entry[tpl_field]
                     return ascii_text(tpl_field)
                 else:
                     return ''
 
-            if len(template_citation) >0 :
+            if len(template_citation) >0:
                 tpl_citation = bibtexclass.utf8ToBibtex(
                     bibtexclass.ValidateCitationKey(re.sub(r'\{[^{}]*\}',
                         tpl_replace, template_citation)))
 
-                if len(tpl_citation) >0 :
+                if len(tpl_citation) >0:
                     return tpl_citation
 
-            if len(entry["isbn"]) > 0 :
-                template_citation = '%s' % re.sub(r'[\D]','', entry["isbn"])
+            if len(entry['isbn']) > 0:
+                template_citation = '%s' % re.sub(r'[\D]','', entry['isbn'])
 
-            else :
-                template_citation = '%s' % str(entry["id"])
+            else:
+                template_citation = '%s' % str(entry['id'])
 
             return bibtexclass.ValidateCitationKey(template_citation)
 
@@ -291,42 +291,42 @@ class BIBTEX(CatalogPlugin):
             bibfile_enctag = bibfile_enctag[opts.bibfile_enctag]
             bib_entry = bib_entry[opts.bib_entry]
         except:
-            if opts.bibfile_enc in bibfile_enc :
+            if opts.bibfile_enc in bibfile_enc:
                 bibfile_enc = opts.bibfile_enc
-            else :
-                log.warn("Incorrect --choose-encoding flag, revert to default")
+            else:
+                log.warn('Incorrect --choose-encoding flag, revert to default')
                 bibfile_enc = bibfile_enc[0]
-            if opts.bibfile_enctag in bibfile_enctag :
+            if opts.bibfile_enctag in bibfile_enctag:
                 bibfile_enctag = opts.bibfile_enctag
-            else :
-                log.warn("Incorrect --choose-encoding-configuration flag, revert to default")
+            else:
+                log.warn('Incorrect --choose-encoding-configuration flag, revert to default')
                 bibfile_enctag = bibfile_enctag[0]
-            if opts.bib_entry in bib_entry :
+            if opts.bib_entry in bib_entry:
                 bib_entry = opts.bib_entry
-            else :
-                log.warn("Incorrect --entry-type flag, revert to default")
+            else:
+                log.warn('Incorrect --entry-type flag, revert to default')
                 bib_entry = bib_entry[0]
 
         if opts.verbose:
             opts_dict = vars(opts)
-            log(f"{self.name}(): Generating {self.fmt}")
+            log(f'{self.name}(): Generating {self.fmt}')
             if opts.connected_device['is_device_connected']:
-                log(" connected_device: %s" % opts.connected_device['name'])
+                log(' connected_device: %s' % opts.connected_device['name'])
             if opts_dict['search_text']:
                 log(" --search='%s'" % opts_dict['search_text'])
 
             if opts_dict['ids']:
-                log(" Book count: %d" % len(opts_dict['ids']))
+                log(' Book count: %d' % len(opts_dict['ids']))
                 if opts_dict['search_text']:
-                    log(" (--search ignored when a subset of the database is specified)")
+                    log(' (--search ignored when a subset of the database is specified)')
 
             if opts_dict['fields']:
                 if opts_dict['fields'] == 'all':
-                    log(" Fields: %s" % ', '.join(FIELDS[1:]))
+                    log(' Fields: %s' % ', '.join(FIELDS[1:]))
                 else:
-                    log(" Fields: %s" % opts_dict['fields'])
+                    log(' Fields: %s' % opts_dict['fields'])
 
-            log(f" Output file will be encoded in {bibfile_enc} with {bibfile_enctag} flag")
+            log(f' Output file will be encoded in {bibfile_enc} with {bibfile_enctag} flag')
 
             log(" BibTeX entry type is {} with a citation like '{}' flag".format(bib_entry, opts_dict['bib_cit']))
 
@@ -349,33 +349,33 @@ class BIBTEX(CatalogPlugin):
         bibtexc = BibTeX()
 
         # Entries writing after Bibtex formatting (or not)
-        if bibfile_enc != 'ascii' :
+        if bibfile_enc != 'ascii':
             bibtexc.ascii_bibtex = False
-        else :
+        else:
             bibtexc.ascii_bibtex = True
 
         # Check citation choice and go to default in case of bad CLI
-        if isinstance(opts.impcit, string_or_bytes) :
-            if opts.impcit == 'False' :
+        if isinstance(opts.impcit, string_or_bytes):
+            if opts.impcit == 'False':
                 citation_bibtex= False
-            elif opts.impcit == 'True' :
+            elif opts.impcit == 'True':
                 citation_bibtex= True
-            else :
-                log.warn("Incorrect --create-citation, revert to default")
+            else:
+                log.warn('Incorrect --create-citation, revert to default')
                 citation_bibtex= True
-        else :
+        else:
             citation_bibtex= opts.impcit
 
         # Check add file entry and go to default in case of bad CLI
-        if isinstance(opts.addfiles, string_or_bytes) :
-            if opts.addfiles == 'False' :
+        if isinstance(opts.addfiles, string_or_bytes):
+            if opts.addfiles == 'False':
                 addfiles_bibtex = False
-            elif opts.addfiles == 'True' :
+            elif opts.addfiles == 'True':
                 addfiles_bibtex = True
-            else :
-                log.warn("Incorrect --add-files-path, revert to default")
+            else:
+                log.warn('Incorrect --add-files-path, revert to default')
                 addfiles_bibtex= True
-        else :
+        else:
             addfiles_bibtex = opts.addfiles
 
         # Preprocess for error and light correction
@@ -388,10 +388,10 @@ class BIBTEX(CatalogPlugin):
             nb_entries = len(data)
 
             # check in book strict if all is ok else throw a warning into log
-            if bib_entry == 'book' :
+            if bib_entry == 'book':
                 nb_books = len(list(filter(check_entry_book_valid, data)))
-                if nb_books < nb_entries :
-                    log.warn("Only %d entries in %d are book compatible" % (nb_books, nb_entries))
+                if nb_books < nb_entries:
+                    log.warn('Only %d entries in %d are book compatible' % (nb_books, nb_entries))
                     nb_entries = nb_books
 
             # If connected device, add 'On Device' values to data
@@ -401,7 +401,7 @@ class BIBTEX(CatalogPlugin):
 
             # outfile.write('%%%Calibre catalog\n%%%{0} entries in catalog\n\n'.format(nb_entries))
             outfile.write('@preamble{"This catalog of %d entries was generated by calibre on %s"}\n\n'
-                % (nb_entries, strftime("%A, %d. %B %Y %H:%M")))
+                % (nb_entries, strftime('%A, %d. %B %Y %H:%M')))
 
             for entry in data:
                 outfile.write(create_bibtex_entry(entry, fields, bib_entry, template_citation,
diff --git a/src/calibre/library/catalogs/csv_xml.py b/src/calibre/library/catalogs/csv_xml.py
index dae26bf0cd..f123b20bbc 100644
--- a/src/calibre/library/catalogs/csv_xml.py
+++ b/src/calibre/library/catalogs/csv_xml.py
@@ -17,7 +17,6 @@ from calibre.utils.localization import _
 
 
 class CSV_XML(CatalogPlugin):
-
     'CSV/XML catalog generator'
 
     Option = namedtuple('Option', 'option, default, dest, action, help')
@@ -71,20 +70,20 @@ class CSV_XML(CatalogPlugin):
             opts_dict = vars(opts)
             log(f"{self.name}('{current_library}'): Generating {self.fmt.upper()}")
             if opts.connected_device['is_device_connected']:
-                log(" connected_device: %s" % opts.connected_device['name'])
+                log(' connected_device: %s' % opts.connected_device['name'])
             if opts_dict['search_text']:
                 log(" --search='%s'" % opts_dict['search_text'])
 
             if opts_dict['ids']:
-                log(" Book count: %d" % len(opts_dict['ids']))
+                log(' Book count: %d' % len(opts_dict['ids']))
                 if opts_dict['search_text']:
-                    log(" (--search ignored when a subset of the database is specified)")
+                    log(' (--search ignored when a subset of the database is specified)')
 
             if opts_dict['fields']:
                 if opts_dict['fields'] == 'all':
-                    log(" Fields: %s" % ', '.join(FIELDS[1:]))
+                    log(' Fields: %s' % ', '.join(FIELDS[1:]))
                 else:
-                    log(" Fields: %s" % opts_dict['fields'])
+                    log(' Fields: %s' % opts_dict['fields'])
 
         # If a list of ids are provided, don't use search_text
         if opts.ids:
@@ -160,7 +159,7 @@ class CSV_XML(CatalogPlugin):
                     if isinstance(item, str):
                         opening_tag = re.search(r'<(\w+)( |>)', item)
                         if opening_tag:
-                            closing_tag = re.search(r'<\/%s>$' % opening_tag.group(1), item)
+                            closing_tag = re.search(r'</%s>$' % opening_tag.group(1), item)
                             if closing_tag:
                                 item = html2text(item)
 
diff --git a/src/calibre/library/catalogs/epub_mobi.py b/src/calibre/library/catalogs/epub_mobi.py
index df9b6a7f09..f6e980877c 100644
--- a/src/calibre/library/catalogs/epub_mobi.py
+++ b/src/calibre/library/catalogs/epub_mobi.py
@@ -22,7 +22,6 @@ Option = namedtuple('Option', 'option, default, dest, action, help')
 
 
 class EPUB_MOBI(CatalogPlugin):
-
     'EPUB catalog generator'
 
     name = 'Catalog_EPUB_MOBI'
@@ -33,8 +32,8 @@ class EPUB_MOBI(CatalogPlugin):
     version = (1, 0, 0)
     file_types = {'azw3', 'epub', 'mobi'}
 
-    THUMB_SMALLEST = "1.0"
-    THUMB_LARGEST = "3.0"
+    THUMB_SMALLEST = '1.0'
+    THUMB_LARGEST = '3.0'
 
     cli_options = [Option('--catalog-title',  # {{{
                           default='My Books',
@@ -78,8 +77,8 @@ class EPUB_MOBI(CatalogPlugin):
                           "(('Archived books','#status','Archived'),)\n"
                           "will exclude a book with a value of 'Archived' in the custom column 'status'.\n"
                           "When multiple rules are defined, all rules will be applied.\n"
-                          "Default: \n" + '"' + '%default' + '"' + "\n"
-                          "Applies to: AZW3, EPUB, MOBI output formats")),
+                          "Default: \n" + '"' + '%default' + '"' + '\n'
+                          'Applies to: AZW3, EPUB, MOBI output formats')),
                    Option('--generate-authors',
                           default=False,
                           dest='generate_authors',
@@ -156,14 +155,14 @@ class EPUB_MOBI(CatalogPlugin):
                                  "Default: '%default'\n"
                                  "Applies to: AZW3, EPUB, MOBI output formats")),
                    Option('--prefix-rules',
-                          default="(('Read books','tags','+','\u2713'),('Wishlist item','tags','Wishlist','\u00d7'))",
+                          default="(('Read books','tags','+','✓'),('Wishlist item','tags','Wishlist','×'))",
                           dest='prefix_rules',
                           action=None,
                           help=_("Specifies the rules used to include prefixes indicating read books, wishlist items and other user-specified prefixes.\n"
                           "The model for a prefix rule is ('<rule name>','<source field>','<pattern>','<prefix>').\n"
                           "When multiple rules are defined, the first matching rule will be used.\n"
-                          "Default:\n" + '"' + '%default' + '"' + "\n"
-                          "Applies to: AZW3, EPUB, MOBI output formats")),
+                          "Default:\n" + '"' + '%default' + '"' + '\n'
+                          'Applies to: AZW3, EPUB, MOBI output formats')),
                    Option('--preset',
                           default=None,
                           dest='preset',
@@ -197,11 +196,11 @@ class EPUB_MOBI(CatalogPlugin):
 
         # If preset specified from the cli, insert stored options from JSON file
         if hasattr(opts, 'preset') and opts.preset:
-            available_presets = JSONConfig("catalog_presets")
+            available_presets = JSONConfig('catalog_presets')
             if opts.preset not in available_presets:
                 if available_presets:
                     print(_('Error: Preset "{}" not found.').format(opts.preset))
-                    print(_('Stored presets: {}').format(', '.join([p for p in sorted(available_presets.keys())])))
+                    print(_('Stored presets: {}').format(', '.join(sorted(available_presets.keys()))))
                 else:
                     print(_('Error: No stored presets.'))
                 return 1
@@ -249,15 +248,15 @@ class EPUB_MOBI(CatalogPlugin):
             opts.connected_kindle = True
             if opts.connected_device['serial'] and \
                opts.connected_device['serial'][:4] in ['B004', 'B005']:
-                op = "kindle_dx"
+                op = 'kindle_dx'
             else:
-                op = "kindle"
+                op = 'kindle'
 
         opts.description_clip = 380 if op.endswith('dx') or 'kindle' not in op else 100
         opts.author_clip = 100 if op.endswith('dx') or 'kindle' not in op else 60
         opts.output_profile = op
 
-        opts.basename = "Catalog"
+        opts.basename = 'Catalog'
         opts.cli_environment = not hasattr(opts, 'sync')
 
         # Hard-wired to always sort descriptions by author, with series after non-series
@@ -289,21 +288,21 @@ class EPUB_MOBI(CatalogPlugin):
                      'x' * (len(opts.connected_device['serial']) - 4)))
                 for storage in opts.connected_device['storage']:
                     if storage:
-                        build_log.append("  mount point: %s" % storage)
+                        build_log.append('  mount point: %s' % storage)
             else:
                 build_log.append(" connected_device: '%s'" % opts.connected_device['name'])
                 try:
                     for storage in opts.connected_device['storage']:
                         if storage:
-                            build_log.append("  mount point: %s" % storage)
+                            build_log.append('  mount point: %s' % storage)
                 except:
-                    build_log.append("  (no mount points)")
+                    build_log.append('  (no mount points)')
         else:
             build_log.append(" connected_device: '%s'" % opts.connected_device['name'])
 
         opts_dict = vars(opts)
         if opts_dict['ids']:
-            build_log.append(" book count: %d" % len(opts_dict['ids']))
+            build_log.append(' book count: %d' % len(opts_dict['ids']))
 
         sections_list = []
         if opts.generate_authors:
@@ -331,14 +330,14 @@ class EPUB_MOBI(CatalogPlugin):
                 sections_list = ['Authors', 'Titles', 'Series', 'Genres', 'Recently Added', 'Descriptions']
             else:
                 opts.log.warn('\n*** No enabled Sections, terminating catalog generation ***')
-                return ["No Included Sections", "No enabled Sections.\nCheck E-book options tab\n'Included sections'\n"]
+                return ['No Included Sections', "No enabled Sections.\nCheck E-book options tab\n'Included sections'\n"]
         if opts.fmt == 'mobi' and sections_list == ['Descriptions']:
             warning = _("\n*** Adding 'By authors' section required for MOBI output ***")
             opts.log.warn(warning)
             sections_list.insert(0, 'Authors')
             opts.generate_authors = True
 
-        opts.log(" Sections: %s" % ', '.join(sections_list))
+        opts.log(' Sections: %s' % ', '.join(sections_list))
         opts.section_list = sections_list
 
         # Limit thumb_width to 1.0" - 2.0"
@@ -349,36 +348,36 @@ class EPUB_MOBI(CatalogPlugin):
             if float(opts.thumb_width) > float(self.THUMB_LARGEST):
                 log.warning(f"coercing thumb_width from '{opts.thumb_width}' to '{self.THUMB_LARGEST}'")
                 opts.thumb_width = self.THUMB_LARGEST
-            opts.thumb_width = "%.2f" % float(opts.thumb_width)
+            opts.thumb_width = '%.2f' % float(opts.thumb_width)
         except Exception:
             log.error(f"coercing thumb_width from '{opts.thumb_width}' to '{self.THUMB_SMALLEST}'")
-            opts.thumb_width = "1.0"
+            opts.thumb_width = '1.0'
 
         # eval prefix_rules if passed from command line
         if type(opts.prefix_rules) is not tuple:
             try:
                 opts.prefix_rules = eval(opts.prefix_rules)
             except:
-                log.error("malformed --prefix-rules: %s" % opts.prefix_rules)
+                log.error('malformed --prefix-rules: %s' % opts.prefix_rules)
                 raise
             for rule in opts.prefix_rules:
                 if len(rule) != 4:
-                    log.error("incorrect number of args for --prefix-rules: %s" % repr(rule))
+                    log.error('incorrect number of args for --prefix-rules: %s' % repr(rule))
 
         # eval exclusion_rules if passed from command line
         if type(opts.exclusion_rules) is not tuple:
             try:
                 opts.exclusion_rules = eval(opts.exclusion_rules)
             except:
-                log.error("malformed --exclusion-rules: %s" % opts.exclusion_rules)
+                log.error('malformed --exclusion-rules: %s' % opts.exclusion_rules)
                 raise
             for rule in opts.exclusion_rules:
                 if len(rule) != 3:
-                    log.error("incorrect number of args for --exclusion-rules: %s" % repr(rule))
+                    log.error('incorrect number of args for --exclusion-rules: %s' % repr(rule))
 
         # Display opts
         keys = sorted(opts_dict.keys())
-        build_log.append(" opts:")
+        build_log.append(' opts:')
         for key in keys:
             if key in ['catalog_title', 'author_clip', 'connected_kindle', 'creator',
                        'cross_reference_authors', 'description_clip', 'exclude_book_marker',
@@ -387,7 +386,7 @@ class EPUB_MOBI(CatalogPlugin):
                        'output_profile', 'prefix_rules', 'preset', 'read_book_marker',
                        'search_text', 'sort_by', 'sort_descriptions_by_author', 'sync',
                        'thumb_width', 'use_existing_cover', 'wishlist_tag']:
-                build_log.append(f"  {key}: {repr(opts_dict[key])}")
+                build_log.append(f'  {key}: {opts_dict[key]!r}')
         if opts.verbose:
             log('\n'.join(line for line in build_log))
 
@@ -397,7 +396,7 @@ class EPUB_MOBI(CatalogPlugin):
         self.opts = opts
 
         if opts.verbose:
-            log.info(" Begin catalog source generation (%s)" %
+            log.info(' Begin catalog source generation (%s)' %
                      str(datetime.timedelta(seconds=int(time.time() - opts.start_time))))
 
         # Launch the Catalog builder
@@ -406,12 +405,12 @@ class EPUB_MOBI(CatalogPlugin):
         try:
             catalog.build_sources()
             if opts.verbose:
-                log.info(" Completed catalog source generation (%s)\n"  %
+                log.info(' Completed catalog source generation (%s)\n'  %
                          str(datetime.timedelta(seconds=int(time.time() - opts.start_time))))
         except (AuthorSortMismatchException, EmptyCatalogException) as e:
-            log.error(" *** Terminated catalog generation: %s ***" % e)
+            log.error(' *** Terminated catalog generation: %s ***' % e)
         except:
-            log.error(" unhandled exception in catalog generator")
+            log.error(' unhandled exception in catalog generator')
             raise
 
         else:
@@ -420,9 +419,7 @@ class EPUB_MOBI(CatalogPlugin):
                 OptionRecommendation.HIGH))
             recommendations.append(('comments', '', OptionRecommendation.HIGH))
 
-            """
-            >>> Use to debug generated catalog code before pipeline conversion <<<
-            """
+            # >>> Use to debug generated catalog code before pipeline conversion <<<
             GENERATE_DEBUG_EPUB = False
             if GENERATE_DEBUG_EPUB:
                 catalog_debug_path = os.path.join(os.path.expanduser('~'), 'Desktop', 'Catalog debug')
@@ -433,7 +430,7 @@ class EPUB_MOBI(CatalogPlugin):
                 recommendations.append(('debug_pipeline', dp,
                     OptionRecommendation.HIGH))
 
-            if opts.output_profile and opts.output_profile.startswith("kindle"):
+            if opts.output_profile and opts.output_profile.startswith('kindle'):
                 recommendations.append(('output_profile', opts.output_profile,
                     OptionRecommendation.HIGH))
                 recommendations.append(('book_producer', opts.output_profile,
@@ -459,14 +456,14 @@ class EPUB_MOBI(CatalogPlugin):
                 pass
 
             if self.opts.use_existing_cover and not existing_cover:
-                log.warning("no existing catalog cover found")
+                log.warning('no existing catalog cover found')
 
             if self.opts.use_existing_cover and existing_cover:
                 recommendations.append(('cover', cpath, OptionRecommendation.HIGH))
-                log.info("using existing catalog cover")
+                log.info('using existing catalog cover')
             else:
                 from calibre.ebooks.covers import calibre_cover2
-                log.info("replacing catalog cover")
+                log.info('replacing catalog cover')
                 new_cover_path = PersistentTemporaryFile(suffix='.jpg')
                 new_cover = calibre_cover2(opts.catalog_title, 'calibre')
                 new_cover_path.write(new_cover)
@@ -499,7 +496,7 @@ class EPUB_MOBI(CatalogPlugin):
                 zip_rebuilder(input_path, os.path.join(catalog_debug_path, 'input.epub'))
 
             if opts.verbose:
-                log.info(" Catalog creation complete (%s)\n" %
+                log.info(' Catalog creation complete (%s)\n' %
                      str(datetime.timedelta(seconds=int(time.time() - opts.start_time))))
 
         # returns to gui2.actions.catalog:catalog_generated()
diff --git a/src/calibre/library/catalogs/epub_mobi_builder.py b/src/calibre/library/catalogs/epub_mobi_builder.py
index d1ef6c5974..3d2675db1c 100644
--- a/src/calibre/library/catalogs/epub_mobi_builder.py
+++ b/src/calibre/library/catalogs/epub_mobi_builder.py
@@ -138,7 +138,7 @@ class CatalogBuilder:
 
     def __init__(self, db, _opts, plugin,
                     report_progress=DummyReporter(),
-                    stylesheet="content/stylesheet.css",
+                    stylesheet='content/stylesheet.css',
                     init_resources=True):
 
         self.formatter = Formatter()
@@ -148,15 +148,15 @@ class CatalogBuilder:
         self.reporter = report_progress
         self.stylesheet = stylesheet
         self.cache_dir = os.path.join(cache_dir(), 'catalog')
-        self.catalog_path = PersistentTemporaryDirectory("_epub_mobi_catalog", prefix='')
-        self.content_dir = os.path.join(self.catalog_path, "content")
+        self.catalog_path = PersistentTemporaryDirectory('_epub_mobi_catalog', prefix='')
+        self.content_dir = os.path.join(self.catalog_path, 'content')
         self.excluded_tags = self.get_excluded_tags()
         self.generate_for_kindle_azw3 = True if (_opts.fmt == 'azw3' and
                                               _opts.output_profile and
-                                              _opts.output_profile.startswith("kindle")) else False
+                                              _opts.output_profile.startswith('kindle')) else False
         self.generate_for_kindle_mobi = True if (_opts.fmt == 'mobi' and
                                               _opts.output_profile and
-                                              _opts.output_profile.startswith("kindle")) else False
+                                              _opts.output_profile.startswith('kindle')) else False
 
         self.all_series = set()
         self.authors = None
@@ -175,7 +175,7 @@ class CatalogBuilder:
         self.generate_recently_read = False
         self.genres = []
         self.genre_tags_dict = \
-            self.filter_genre_tags(max_len=245 - len("%s/Genre_.html" % self.content_dir)) \
+            self.filter_genre_tags(max_len=245 - len('%s/Genre_.html' % self.content_dir)) \
             if self.opts.generate_genres else None
         self.html_filelist_1 = []
         self.html_filelist_2 = []
@@ -191,7 +191,7 @@ class CatalogBuilder:
         self.thumb_height = 0
         self.thumb_width = 0
         self.thumbs = None
-        self.thumbs_path = os.path.join(self.cache_dir, "thumbs.zip")
+        self.thumbs_path = os.path.join(self.cache_dir, 'thumbs.zip')
         self.total_steps = 6.0
         self.use_series_prefix_in_titles_section = False
 
@@ -204,10 +204,10 @@ class CatalogBuilder:
         if init_resources:
             self.copy_catalog_resources()
 
-    """ key() functions """
+    ''' key() functions '''
 
     def _kf_author_to_author_sort(self, author):
-        """ Compute author_sort value from author
+        ''' Compute author_sort value from author
 
         Tokenize author string, return capitalized string with last token first
 
@@ -216,7 +216,7 @@ class CatalogBuilder:
 
         Return:
          (str): 'Smith, john'
-        """
+        '''
         tokens = author.split()
         tokens = tokens[-1:] + tokens[:-1]
         if len(tokens) > 1:
@@ -224,7 +224,7 @@ class CatalogBuilder:
         return ' '.join(tokens).capitalize()
 
     def _kf_books_by_author_sorter_author(self, book):
-        """ Generate book sort key with computed author_sort.
+        ''' Generate book sort key with computed author_sort.
 
         Generate a sort key of computed author_sort, title. Used to look for
         author_sort mismatches.
@@ -237,7 +237,7 @@ class CatalogBuilder:
 
         Return:
          (str): sort key
-        """
+        '''
         if not book['series']:
             key = '{} {}'.format(self._kf_author_to_author_sort(book['author']),
                                 capitalize(book['title_sort']))
@@ -252,7 +252,7 @@ class CatalogBuilder:
         return key
 
     def _kf_books_by_author_sorter_author_sort(self, book, longest_author_sort=60):
-        """ Generate book sort key with supplied author_sort.
+        ''' Generate book sort key with supplied author_sort.
 
         Generate a sort key of author_sort, title.
         Bang, tilde included to force series to sort after non-series books.
@@ -262,7 +262,7 @@ class CatalogBuilder:
 
         Return:
          (str): sort key
-        """
+        '''
         if not book['series']:
             fs = '{:<%d}!{!s}' % longest_author_sort
             key = fs.format(capitalize(book['author_sort']),
@@ -287,10 +287,10 @@ class CatalogBuilder:
                          series_index)
         return key
 
-    """ Methods """
+    ''' Methods '''
 
     def build_sources(self):
-        """ Generate catalog source files.
+        ''' Generate catalog source files.
 
         Assemble OPF, HTML and NCX files reflecting catalog options.
         Generated source is OEB compliant.
@@ -305,7 +305,7 @@ class CatalogBuilder:
         Results:
          error: problems reported during build
 
-        """
+        '''
 
         self.fetch_books_by_title()
         self.fetch_books_by_author()
@@ -323,13 +323,13 @@ class CatalogBuilder:
             self.generate_html_by_genres()
             # If this is the only Section, and there are no genres, bail
             if self.opts.section_list == ['Genres'] and not self.genres:
-                error_msg = _("No genres to catalog.\n")
+                error_msg = _('No genres to catalog.\n')
                 if not self.opts.cli_environment:
                     error_msg += _("Check 'Excluded genres' regex in the E-book options.\n")
                 self.opts.log.error(error_msg)
                 self.error.append(_('No books available to catalog'))
                 self.error.append(error_msg)
-                raise EmptyCatalogException("No genres to catalog")
+                raise EmptyCatalogException('No genres to catalog')
         if self.opts.generate_recently_added:
             self.generate_html_by_date_added()
             if self.generate_recently_read:
@@ -338,23 +338,23 @@ class CatalogBuilder:
         self.generate_opf()
         self.generate_ncx_header()
         if self.opts.generate_authors:
-            self.generate_ncx_by_author(_("Authors"))
+            self.generate_ncx_by_author(_('Authors'))
         if self.opts.generate_titles:
-            self.generate_ncx_by_title(_("Titles"))
+            self.generate_ncx_by_title(_('Titles'))
         if self.opts.generate_series:
             self.generate_ncx_by_series(ngettext('Series', 'Series', 2))
         if self.opts.generate_genres:
-            self.generate_ncx_by_genre(_("Genres"))
+            self.generate_ncx_by_genre(_('Genres'))
         if self.opts.generate_recently_added:
-            self.generate_ncx_by_date_added(_("Recently Added"))
+            self.generate_ncx_by_date_added(_('Recently Added'))
             if self.generate_recently_read:
-                self.generate_ncx_by_date_read(_("Recently Read"))
+                self.generate_ncx_by_date_read(_('Recently Read'))
         if self.opts.generate_descriptions:
-            self.generate_ncx_descriptions(_("Descriptions"))
+            self.generate_ncx_descriptions(_('Descriptions'))
         self.write_ncx()
 
     def calculate_thumbnail_dimensions(self):
-        """ Calculate thumb dimensions based on device DPI.
+        ''' Calculate thumb dimensions based on device DPI.
 
         Using the specified output profile, calculate thumb_width
         in pixels, then set height to width * 1.33. Special-case for
@@ -368,7 +368,7 @@ class CatalogBuilder:
         Outputs:
          thumb_width (float): calculated thumb_width
          thumb_height (float): calculated thumb_height
-        """
+        '''
 
         for x in output_profiles():
             if x.short_name == self.opts.output_profile:
@@ -381,12 +381,12 @@ class CatalogBuilder:
                     self.thumb_height = self.thumb_height // 2
                 break
         if self.opts.verbose:
-            self.opts.log(" Thumbnails:")
-            self.opts.log("  DPI = %d; thumbnail dimensions: %d x %d" %
+            self.opts.log(' Thumbnails:')
+            self.opts.log('  DPI = %d; thumbnail dimensions: %d x %d' %
                             (x.dpi, self.thumb_width, self.thumb_height))
 
     def compute_total_steps(self):
-        """ Calculate number of build steps to generate catalog.
+        ''' Calculate number of build steps to generate catalog.
 
         Calculate total number of build steps based on enabled sections.
 
@@ -395,7 +395,7 @@ class CatalogBuilder:
 
         Outputs:
          total_steps (int): updated
-        """
+        '''
         # Tweak build steps based on optional sections:  1 call for HTML, 1 for NCX
         incremental_jobs = 0
         if self.opts.generate_authors:
@@ -414,7 +414,7 @@ class CatalogBuilder:
         self.total_steps += incremental_jobs
 
     def confirm_thumbs_archive(self):
-        """ Validate thumbs archive.
+        ''' Validate thumbs archive.
 
         Confirm existence of thumbs archive, or create if absent.
         Confirm stored thumb_width matches current opts.thumb_width,
@@ -428,7 +428,7 @@ class CatalogBuilder:
         Outputs:
          thumbs_path (file): new (non_existent or invalidated), or
                                   validated existing thumbs archive
-        """
+        '''
         if self.opts.generate_descriptions:
             if not os.path.exists(self.cache_dir):
                 self.opts.log.info("  creating new thumb cache '%s'" % self.cache_dir)
@@ -437,14 +437,14 @@ class CatalogBuilder:
                 self.opts.log.info('  creating thumbnail archive, thumb_width: %1.2f"' %
                                         float(self.opts.thumb_width))
                 with ZipFile(self.thumbs_path, mode='w') as zfw:
-                    zfw.writestr("Catalog Thumbs Archive", '')
+                    zfw.writestr('Catalog Thumbs Archive', '')
             else:
                 try:
                     with ZipFile(self.thumbs_path, mode='r') as zfr:
                         try:
                             cached_thumb_width = zfr.read('thumb_width')
                         except:
-                            cached_thumb_width = "-1"
+                            cached_thumb_width = '-1'
                 except:
                     os.remove(self.thumbs_path)
                     cached_thumb_width = '-1'
@@ -454,13 +454,13 @@ class CatalogBuilder:
                     self.opts.log.warning('  thumb_width changed: %1.2f" => %1.2f"' %
                                         (float(cached_thumb_width), float(self.opts.thumb_width)))
                     with ZipFile(self.thumbs_path, mode='w') as zfw:
-                        zfw.writestr("Catalog Thumbs Archive", '')
+                        zfw.writestr('Catalog Thumbs Archive', '')
                 else:
                     self.opts.log.info('  existing thumb cache at %s, cached_thumb_width: %1.2f"' %
                                             (self.thumbs_path, float(cached_thumb_width)))
 
     def convert_html_entities(self, s):
-        """ Convert string containing HTML entities to its unicode equivalent.
+        ''' Convert string containing HTML entities to its unicode equivalent.
 
         Convert a string containing HTML entities of the form '&amp;' or '&97;'
         to a normalized unicode string. E.g., 'AT&amp;T' converted to 'AT&T'.
@@ -470,11 +470,11 @@ class CatalogBuilder:
 
         Return:
          s (str): converted string
-        """
+        '''
         return replace_entities(s)
 
     def copy_catalog_resources(self):
-        """ Copy resources from calibre source to self.catalog_path.
+        ''' Copy resources from calibre source to self.catalog_path.
 
         Copy basic resources - default cover, stylesheet, and masthead (Kindle only)
         from calibre resource directory to self.catalog_path, a temporary directory
@@ -485,9 +485,9 @@ class CatalogBuilder:
 
         Output:
          resource files copied to self.catalog_path/*
-        """
+        '''
         self.create_catalog_directory_structure()
-        catalog_resources = P("catalog")
+        catalog_resources = P('catalog')
 
         files_to_copy = [('', 'DefaultCover.jpg'),
                             ('content', 'stylesheet.css')]
@@ -510,7 +510,7 @@ class CatalogBuilder:
                 pass
 
     def create_catalog_directory_structure(self):
-        """ Create subdirs in catalog output dir.
+        ''' Create subdirs in catalog output dir.
 
         Create /content and /images in self.catalog_path
 
@@ -519,19 +519,19 @@ class CatalogBuilder:
 
         Output:
          /content, /images created
-        """
+        '''
         if not os.path.isdir(self.catalog_path):
             os.makedirs(self.catalog_path)
 
-        content_path = self.catalog_path + "/content"
+        content_path = self.catalog_path + '/content'
         if not os.path.isdir(content_path):
             os.makedirs(content_path)
-        images_path = self.catalog_path + "/images"
+        images_path = self.catalog_path + '/images'
         if not os.path.isdir(images_path):
             os.makedirs(images_path)
 
     def detect_author_sort_mismatches(self, books_to_test):
-        """ Detect author_sort mismatches.
+        ''' Detect author_sort mismatches.
 
         Sort by author, look for inconsistencies in author_sort among
         similarly-named authors. Fatal for MOBI generation, a mere
@@ -545,36 +545,36 @@ class CatalogBuilder:
 
         Exceptions:
          AuthorSortMismatchException: author_sort mismatch detected
-        """
+        '''
 
-        books_by_author = sorted(list(books_to_test), key=self._kf_books_by_author_sorter_author)
+        books_by_author = sorted(books_to_test, key=self._kf_books_by_author_sorter_author)
 
         authors = [(record['author'], record['author_sort']) for record in books_by_author]
         current_author = authors[0]
-        for (i, author) in enumerate(authors):
+        for i, author in enumerate(authors):
             if author != current_author and i:
                 if author[0] == current_author[0]:
                     if self.opts.fmt == 'mobi':
                         # Exit if building MOBI
-                        error_msg = _("<p>Inconsistent author sort values for author<br/>" +
-                                      f"'{author[0]!s}':</p>" +
-                                      f"<p><center><b>{author[1]!s}</b> != <b>{current_author[1]!s}</b></center></p>" +
-                                      "<p>Unable to build MOBI catalog.<br/>" +
-                                      f"Select all books by '{author[0]!s}', apply correct Author Sort value in Edit Metadata dialog, then rebuild the catalog.\n<p>")  # noqa
+                        error_msg = _("<p>Inconsistent author sort values for author<br/>'{0}':</p>"
+                                      '<p><center><b>{1}</b> != <b>{2}</b></center></p>'
+                                      '<p>Unable to build MOBI catalog.<br/>'
+                                      "Select all books by '{0}', apply correct Author Sort value in Edit Metadata dialog, then rebuild the catalog.<p>"
+                                      ).format(author[0], author[1], current_author[1])
 
                         self.opts.log.warn('\n*** Metadata error ***')
                         self.opts.log.warn(error_msg)
 
                         self.error.append('Author sort mismatch')
                         self.error.append(error_msg)
-                        raise AuthorSortMismatchException("author_sort mismatch while building MOBI")
+                        raise AuthorSortMismatchException('author_sort mismatch while building MOBI')
                     else:
                         # Warning if building non-MOBI
                         if not self.error:
                             self.error.append('Author sort mismatch')
 
-                        error_msg = _(f"Warning: Inconsistent author sort values for author '{author[0]!s}':\n" +
-                                      f" {author[1]!s} != {current_author[1]!s}\n")
+                        error_msg = _(f"Warning: Inconsistent author sort values for author '{author[0]}':\n" +
+                                      f' {author[1]} != {current_author[1]}\n')
                         self.opts.log.warn('\n*** Metadata warning ***')
                         self.opts.log.warn(error_msg)
                         self.error.append(error_msg)
@@ -583,7 +583,7 @@ class CatalogBuilder:
                 current_author = author
 
     def discover_prefix(self, record):
-        """ Return a prefix for record.
+        ''' Return a prefix for record.
 
         Evaluate record against self.prefix_rules. Return assigned prefix
         if matched.
@@ -594,7 +594,7 @@ class CatalogBuilder:
         Return:
          prefix (str): matched a prefix_rule
          None: no match
-        """
+        '''
         def _log_prefix_rule_match_info(rule, record, matched):
             self.opts.log.info("  %s '%s' by %s (%s: '%s' contains '%s')" %
                                (rule['prefix'], record['title'],
@@ -643,8 +643,7 @@ class CatalogBuilder:
                             return rule['prefix']
                     except:
                         if self.opts.verbose:
-                            self.opts.log.error("pattern failed to compile: %s" % rule['pattern'])
-                        pass
+                            self.opts.log.error('pattern failed to compile: %s' % rule['pattern'])
                 elif field_contents is None and rule['pattern'] == 'None':
                     if self.DEBUG:
                         _log_prefix_rule_match_info(rule, record, field_contents)
@@ -653,19 +652,19 @@ class CatalogBuilder:
         return None
 
     def dump_custom_fields(self):
-        """
+        '''
         Dump custom field mappings for debugging
-        """
+        '''
         if self.opts.verbose:
-            self.opts.log.info(" Custom fields:")
+            self.opts.log.info(' Custom fields:')
             all_custom_fields = self.db.custom_field_keys()
             for cf in all_custom_fields:
-                self.opts.log.info("  %-20s %-20s %s" %
+                self.opts.log.info('  %-20s %-20s %s' %
                     (cf, "'%s'" % self.db.metadata_for_field(cf)['name'],
                      self.db.metadata_for_field(cf)['datatype']))
 
     def establish_equivalencies(self, item_list, key=None):
-        """ Return icu equivalent sort letter.
+        ''' Return icu equivalent sort letter.
 
         Returns base sort letter for accented characters. Code provided by
         chaley, modified to force unaccented base letters for A, O & U when
@@ -676,7 +675,7 @@ class CatalogBuilder:
 
         Return:
          cl_list (list): list of equivalent leading chars, 1:1 correspondence to item_list
-        """
+        '''
 
         # Hack to force the cataloged leading letter to be
         # an unadorned character if the accented version sorts before the unaccented
@@ -732,17 +731,17 @@ class CatalogBuilder:
                 cl_list[idx] = last_c
 
         if self.DEBUG and self.opts.verbose:
-            print("     establish_equivalencies():")
+            print('     establish_equivalencies():')
             if key:
                 for idx, item in enumerate(item_list):
-                    print(f"      {cl_list[idx]} {item[sort_field]}")
+                    print(f'      {cl_list[idx]} {item[sort_field]}')
             else:
-                print(f"      {cl_list[idx]} {item}")
+                print(f'      {cl_list[idx]} {item}')
 
         return cl_list
 
     def fetch_books_by_author(self):
-        """ Generate a list of books sorted by author.
+        ''' Generate a list of books sorted by author.
 
         For books with multiple authors, relist book with additional authors.
         Sort the database by author. Report author_sort inconsistencies as warning when
@@ -761,9 +760,9 @@ class CatalogBuilder:
         Return:
          True: no errors
          False: author_sort mismatch detected while building MOBI
-        """
+        '''
 
-        self.update_progress_full_step(_("Sorting database"))
+        self.update_progress_full_step(_('Sorting database'))
 
         books_by_author = list(self.books_to_catalog)
         self.detect_author_sort_mismatches(books_by_author)
@@ -793,7 +792,7 @@ class CatalogBuilder:
         if self.DEBUG and self.opts.verbose:
             tl = [i['title'] for i in books_by_author]
             lt = max(tl, key=len)
-            fs = '{:<6}{:<%d} {:<%d} {!s}' % (len(lt), len(las))
+            fs = '{:<6}{:<%d} {:<%d} {}' % (len(lt), len(las))
             print(fs.format('', 'Title', 'Author', 'Series'))
             for i in books_by_author:
                 print(fs.format('', i['title'], i['author_sort'], i['series']))
@@ -809,7 +808,7 @@ class CatalogBuilder:
         multiple_authors = False
         unique_authors = []
         individual_authors = set()
-        for (i, author) in enumerate(authors):
+        for i, author in enumerate(authors):
             if author != current_author:
                 # Note that current_author and author are tuples: (friendly, sort)
                 multiple_authors = True
@@ -840,18 +839,18 @@ class CatalogBuilder:
         self.individual_authors = list(individual_authors)
 
         if self.DEBUG and self.opts.verbose:
-            self.opts.log.info("\nfetch_books_by_author(): %d unique authors" % len(unique_authors))
+            self.opts.log.info('\nfetch_books_by_author(): %d unique authors' % len(unique_authors))
             for author in unique_authors:
-                self.opts.log.info((" %-50s %-25s %2d" % (author[0][0:45], author[1][0:20],
+                self.opts.log.info((' %-50s %-25s %2d' % (author[0][0:45], author[1][0:20],
                     author[2])).encode('utf-8'))
-            self.opts.log.info("\nfetch_books_by_author(): %d individual authors" % len(individual_authors))
+            self.opts.log.info('\nfetch_books_by_author(): %d individual authors' % len(individual_authors))
             for author in sorted(individual_authors):
-                self.opts.log.info("%s" % author)
+                self.opts.log.info('%s' % author)
 
         return True
 
     def fetch_books_by_title(self):
-        """ Generate a list of books sorted by title.
+        ''' Generate a list of books sorted by title.
 
         Sort the database by title.
 
@@ -864,17 +863,17 @@ class CatalogBuilder:
         Return:
          True: no errors
          False: author_sort mismatch detected while building MOBI
-        """
-        self.update_progress_full_step(_("Sorting titles"))
+        '''
+        self.update_progress_full_step(_('Sorting titles'))
         # Re-sort based on title_sort
         if len(self.books_to_catalog):
             self.books_by_title = sorted(self.books_to_catalog, key=lambda x: sort_key(x['title_sort'].upper()))
 
             if self.DEBUG and self.opts.verbose:
-                self.opts.log.info("fetch_books_by_title(): %d books" % len(self.books_by_title))
-                self.opts.log.info(" %-40s %-40s" % ('title', 'title_sort'))
+                self.opts.log.info('fetch_books_by_title(): %d books' % len(self.books_by_title))
+                self.opts.log.info(' %-40s %-40s' % ('title', 'title_sort'))
                 for title in self.books_by_title:
-                    self.opts.log.info((" %-40s %-40s" % (title['title'][0:40],
+                    self.opts.log.info((' %-40s %-40s' % (title['title'][0:40],
                                                             title['title_sort'][0:40])).encode('utf-8'))
         else:
             error_msg = _("No books to catalog.\nCheck 'Excluded books' rules in the E-book options.\n")
@@ -884,7 +883,7 @@ class CatalogBuilder:
             raise EmptyCatalogException(error_msg)
 
     def fetch_books_to_catalog(self):
-        """ Populate self.books_to_catalog from database
+        ''' Populate self.books_to_catalog from database
 
         Create self.books_to_catalog from filtered database.
         Keys:
@@ -917,7 +916,7 @@ class CatalogBuilder:
         Returns:
          True: Successful
          False: Empty data, (check filter restrictions)
-        """
+        '''
 
         def _populate_title(record):
             ''' populate this_title with massaged metadata '''
@@ -941,7 +940,7 @@ class CatalogBuilder:
                 this_title['authors'] = record['authors']
                 # Synthesize author attribution from authors list
                 if record['authors']:
-                    this_title['author'] = " & ".join(record['authors'])
+                    this_title['author'] = ' & '.join(record['authors'])
                 else:
                     this_title['author'] = _('Unknown')
                     this_title['authors'] = [this_title['author']]
@@ -981,7 +980,7 @@ class CatalogBuilder:
                     for token in p.contents:
                         if token.string is not None:
                             tokens.append(token.string)
-                this_title['short_description'] = self.generate_short_description(' '.join(tokens), dest="description")
+                this_title['short_description'] = self.generate_short_description(' '.join(tokens), dest='description')
             else:
                 this_title['description'] = None
                 this_title['short_description'] = None
@@ -1046,14 +1045,14 @@ class CatalogBuilder:
             search_terms = []
             for tag in self.excluded_tags:
                 search_terms.append('tags:"=%s"' % tag)
-            search_phrase = "not (%s)" % " or ".join(search_terms)
+            search_phrase = 'not (%s)' % ' or '.join(search_terms)
 
         # If a list of ids are provided, don't use search_text
         if self.opts.ids:
             self.opts.search_text = search_phrase
         else:
             if self.opts.search_text:
-                self.opts.search_text += " " + search_phrase
+                self.opts.search_text += ' ' + search_phrase
             else:
                 self.opts.search_text = search_phrase
 
@@ -1063,9 +1062,9 @@ class CatalogBuilder:
 
         if self.DEBUG:
             if self.prefix_rules:
-                self.opts.log.info(" Added prefixes (bools_are_tristate: {}):".format(self.db.new_api.pref('bools_are_tristate')))
+                self.opts.log.info(' Added prefixes (bools_are_tristate: {}):'.format(self.db.new_api.pref('bools_are_tristate')))
             else:
-                self.opts.log.info(" No added prefixes")
+                self.opts.log.info(' No added prefixes')
 
         # Populate this_title{} from data[{},{}]
         titles = []
@@ -1075,7 +1074,7 @@ class CatalogBuilder:
         return titles
 
     def fetch_bookmarks(self):
-        """ Interrogate connected Kindle for bookmarks.
+        ''' Interrogate connected Kindle for bookmarks.
 
         Discover bookmarks associated with books on Kindle downloaded by calibre.
         Used in Descriptions to show reading progress, Last Read section showing date
@@ -1089,7 +1088,7 @@ class CatalogBuilder:
 
         Output:
          bookmarked_books (dict): dict of Bookmarks
-        """
+        '''
 
         from calibre.devices.kindle.bookmark import Bookmark
         from calibre.devices.usbms.device import Device
@@ -1152,7 +1151,7 @@ class CatalogBuilder:
 
         self.bookmarked_books = {}
         if self.generate_recently_read:
-            self.opts.log.info("     Collecting Kindle bookmarks matching catalog entries")
+            self.opts.log.info('     Collecting Kindle bookmarks matching catalog entries')
 
             d = BookmarkDevice(None)
             d.initialize(self.opts.connected_device['save_template'])
@@ -1168,7 +1167,7 @@ class CatalogBuilder:
                                                 authors=book['authors'])
                     myMeta.author_sort = book['author_sort']
                     a_path = d.create_upload_path('/<storage>', myMeta, 'x.bookmark', create_dirs=False)
-                    path_map[id] = dict(path=a_path, fmts=[x.rpartition('.')[2] for x in book['formats']])
+                    path_map[id] = {'path': a_path, 'fmts': [x.rpartition('.')[2] for x in book['formats']]}
 
                     path_map, book_ext = _resolve_bookmark_paths(self.opts.connected_device['storage'], path_map)
                     if path_map:
@@ -1187,7 +1186,7 @@ class CatalogBuilder:
             self.bookmarked_books = bookmarks
 
     def filter_genre_tags(self, max_len):
-        """ Remove excluded tags from data set, return normalized genre list.
+        ''' Remove excluded tags from data set, return normalized genre list.
 
         Filter all db tags, removing excluded tags supplied in opts.
         Test for multiple tags resolving to same normalized form. Normalized
@@ -1198,13 +1197,13 @@ class CatalogBuilder:
 
         Return:
          genre_tags_dict (dict): dict of filtered, normalized tags in data set
-        """
+        '''
 
         def _format_tag_list(tags, indent=1, line_break=70, header='Tag list'):
             def _next_tag(sorted_tags):
-                for (i, tag) in enumerate(sorted_tags):
+                for i, tag in enumerate(sorted_tags):
                     if i < len(tags) - 1:
-                        yield tag + ", "
+                        yield tag + ', '
                     else:
                         yield tag
 
@@ -1220,7 +1219,7 @@ class CatalogBuilder:
             return ans + out_str
 
         def _normalize_tag(tag, max_len):
-            """ Generate an XHTML-legal anchor string from tag.
+            ''' Generate an XHTML-legal anchor string from tag.
 
             Parse tag for non-ascii, convert to unicode name.
 
@@ -1231,7 +1230,7 @@ class CatalogBuilder:
             Return:
              normalized (str): unicode names substituted for non-ascii chars,
               clipped to max_len
-            """
+            '''
 
             normalized = massaged = re.sub(r'\s', '', ascii_text(tag).lower())
             if re.search(r'\W', normalized):
@@ -1266,8 +1265,8 @@ class CatalogBuilder:
                                     " 'Comma separated text, like tags, shown in the browser',\n"
                                     " 'Text, column shown in the tag browser', or\n"
                                     " 'Text, but with a fixed set of permitted values'.")
-                self.opts.log.error("Eligible custom fields: %s" % ', '.join(eligible_custom_fields))
-                raise InvalidGenresSourceFieldException("invalid custom field specified for genre_source_field")
+                self.opts.log.error('Eligible custom fields: %s' % ', '.join(eligible_custom_fields))
+                raise InvalidGenresSourceFieldException('invalid custom field specified for genre_source_field')
 
             all_genre_tags = list(self.db.all_custom(self.db.field_metadata.key_to_label(self.opts.genre_source_field)))
 
@@ -1282,7 +1281,7 @@ class CatalogBuilder:
                     excluded_tags.append(tag)
                     continue
             except:
-                self.opts.log.error("\tfilterDbTags(): malformed --exclude-genre regex pattern: %s" % self.opts.exclude_genre)
+                self.opts.log.error('\tfilterDbTags(): malformed --exclude-genre regex pattern: %s' % self.opts.exclude_genre)
 
             if tag == ' ':
                 continue
@@ -1299,15 +1298,15 @@ class CatalogBuilder:
                 self.opts.log.warn("      Warning: multiple tags resolving to genre '%s':" % normalized)
                 for key in genre_tags_dict:
                     if genre_tags_dict[key] == normalized:
-                        self.opts.log.warn("       %s" % key)
+                        self.opts.log.warn('       %s' % key)
         if self.opts.verbose:
-            self.opts.log.info('%s' % _format_tag_list(genre_tags_dict, header="enabled genres"))
-            self.opts.log.info('%s' % _format_tag_list(excluded_tags, header="excluded genres"))
+            self.opts.log.info('%s' % _format_tag_list(genre_tags_dict, header='enabled genres'))
+            self.opts.log.info('%s' % _format_tag_list(excluded_tags, header='excluded genres'))
 
         return genre_tags_dict
 
     def filter_excluded_genres(self, tags, regex):
-        """ Remove excluded tags from a tag list
+        ''' Remove excluded tags from a tag list
 
         Run regex against list of tags, remove matching tags. Return filtered list.
 
@@ -1316,7 +1315,7 @@ class CatalogBuilder:
 
         Return:
          tag_list(list): filtered list of tags
-        """
+        '''
 
         tag_list = []
 
@@ -1328,13 +1327,13 @@ class CatalogBuilder:
                 else:
                     tag_list.append(tag)
         except:
-            self.opts.log.error("\tfilter_excluded_genres(): malformed --exclude-genre regex pattern: %s" % regex)
+            self.opts.log.error('\tfilter_excluded_genres(): malformed --exclude-genre regex pattern: %s' % regex)
             return tags
 
         return tag_list
 
     def format_ncx_text(self, description, dest=None):
-        """ Massage NCX text for Kindle.
+        ''' Massage NCX text for Kindle.
 
         Convert HTML entities for proper display on Kindle, convert
         '&amp;' to '&#38;' (Kindle fails).
@@ -1345,7 +1344,7 @@ class CatalogBuilder:
 
         Return:
          (str): massaged, possibly truncated description
-        """
+        '''
         # Kindle TOC descriptions won't render certain characters
         # Fix up
         massaged = xml_replace_entities(str(description))
@@ -1354,17 +1353,17 @@ class CatalogBuilder:
         # massaged = re.sub("&", "&#38;", massaged)
 
         if massaged.strip() and dest:
-            # print traceback.print_stack(limit=3)
+            # print(traceback.print_stack(limit=3))
             return self.generate_short_description(massaged.strip(), dest=dest)
         else:
             return None
 
     def insert_prefix(self, soup, parent_tag, pos, prefix_char):
-        """ Generate HTML snippet with prefix character.
+        ''' Generate HTML snippet with prefix character.
 
         Insert a <code> snippet for Kindle, <span> snippet for EPUB.
         Optimized to preserve first-column alignment for MOBI, EPUB.
-        """
+        '''
         if self.opts.fmt == 'mobi':
             tag = soup.new_tag('code')
         else:
@@ -1374,7 +1373,7 @@ class CatalogBuilder:
         parent_tag.insert(pos, tag)
 
     def generate_author_anchor(self, author):
-        """ Generate legal XHTML anchor.
+        ''' Generate legal XHTML anchor.
 
         Convert author to legal XHTML (may contain unicode chars), stripping
         non-alphanumeric chars.
@@ -1384,11 +1383,11 @@ class CatalogBuilder:
 
         Return:
          (str): asciized version of author
-        """
-        return re.sub(r"\W", "", ascii_text(author))
+        '''
+        return re.sub(r'\W', '', ascii_text(author))
 
     def generate_format_args(self, book):
-        """ Generate the format args for template substitution.
+        ''' Generate the format args for template substitution.
 
         self.load_section_templates imports string formatting templates of the form
         'by_*_template.py' for use in the various sections. The templates are designed to use
@@ -1399,7 +1398,7 @@ class CatalogBuilder:
 
         Return:
          (dict): formatted args for templating
-        """
+        '''
         series_index = str(book['series_index'])
         if series_index.endswith('.0'):
             series_index = series_index[:-2]
@@ -1410,11 +1409,11 @@ class CatalogBuilder:
                 rating=self.generate_rating_string(book),
                 rating_parens='(%s)' % self.generate_rating_string(book) if 'rating' in book else '',
                 pubyear=book['date'].split()[1] if book['date'] else '',
-                pubyear_parens="(%s)" % book['date'].split()[1] if book['date'] else '')
+                pubyear_parens='(%s)' % book['date'].split()[1] if book['date'] else '')
         return args
 
     def generate_html_by_author(self):
-        """ Generate content/ByAlphaAuthor.html.
+        ''' Generate content/ByAlphaAuthor.html.
 
         Loop through self.books_by_author, generate HTML
         with anchors for author and index letters.
@@ -1424,17 +1423,17 @@ class CatalogBuilder:
 
         Output:
          content/ByAlphaAuthor.html (file)
-        """
+        '''
 
-        friendly_name = _("Authors")
-        self.update_progress_full_step("%s HTML" % friendly_name)
+        friendly_name = _('Authors')
+        self.update_progress_full_step('%s HTML' % friendly_name)
 
         soup = self.generate_html_empty_header(friendly_name)
         body = soup.find('body')
 
         btc = 0
 
-        divTag = soup.new_tag("div")
+        divTag = soup.new_tag('div')
         dtc = 0
         divOpeningTag = None
         dotc = 0
@@ -1468,11 +1467,11 @@ class CatalogBuilder:
                 author_count = 0
                 divOpeningTag = soup.new_tag('div')
                 if dtc > 0:
-                    divOpeningTag['class'] = "initial_letter"
+                    divOpeningTag['class'] = 'initial_letter'
                 dotc = 0
-                pIndexTag = soup.new_tag("p")
-                pIndexTag['class'] = "author_title_letter_index"
-                aTag = soup.new_tag("a")
+                pIndexTag = soup.new_tag('p')
+                pIndexTag['class'] = 'author_title_letter_index'
+                aTag = soup.new_tag('a')
                 # current_letter = self.letter_or_symbol(book['author_sort'][0].upper())
                 current_letter = self.letter_or_symbol(sort_equivalents[idx])
                 if current_letter == self.SYMBOLS:
@@ -1504,15 +1503,15 @@ class CatalogBuilder:
                         dtc += 1
 
                     divRunningTag = soup.new_tag('div')
-                    divRunningTag['class'] = "author_logical_group"
+                    divRunningTag['class'] = 'author_logical_group'
                     drtc = 0
 
                 non_series_books = 0
                 current_series = None
-                pAuthorTag = soup.new_tag("p")
-                pAuthorTag['class'] = "author_index"
-                aTag = soup.new_tag("a")
-                aTag['id'] = "%s" % self.generate_author_anchor(current_author)
+                pAuthorTag = soup.new_tag('p')
+                pAuthorTag['class'] = 'author_index'
+                aTag = soup.new_tag('a')
+                aTag['id'] = '%s' % self.generate_author_anchor(current_author)
                 aTag.insert(0, NavigableString(current_author))
                 pAuthorTag.insert(0, aTag)
                 if author_count == 1:
@@ -1527,12 +1526,12 @@ class CatalogBuilder:
                 # Start a new series
                 current_series = book['series']
                 pSeriesTag = soup.new_tag('p')
-                pSeriesTag['class'] = "series"
+                pSeriesTag['class'] = 'series'
                 if self.opts.fmt == 'mobi':
-                    pSeriesTag['class'] = "series_mobi"
+                    pSeriesTag['class'] = 'series_mobi'
                 if self.opts.generate_series:
                     aTag = soup.new_tag('a')
-                    aTag['href'] = "{}.html#{}".format('BySeries', self.generate_series_anchor(book['series']))
+                    aTag['href'] = '{}.html#{}'.format('BySeries', self.generate_series_anchor(book['series']))
                     aTag.insert(0, book['series'])
                     pSeriesTag.insert(0, aTag)
                 else:
@@ -1548,20 +1547,20 @@ class CatalogBuilder:
                 current_series = None
 
             # Add books
-            pBookTag = soup.new_tag("p")
-            pBookTag['class'] = "line_item"
+            pBookTag = soup.new_tag('p')
+            pBookTag['class'] = 'line_item'
             ptc = 0
 
             self.insert_prefix(soup, pBookTag, ptc, book['prefix'])
             ptc += 1
 
-            spanTag = soup.new_tag("span")
-            spanTag['class'] = "entry"
+            spanTag = soup.new_tag('span')
+            spanTag['class'] = 'entry'
             stc = 0
 
-            aTag = soup.new_tag("a")
+            aTag = soup.new_tag('a')
             if self.opts.generate_descriptions:
-                aTag['href'] = "book_%d.html" % (int(float(book['id'])))
+                aTag['href'] = 'book_%d.html' % (int(float(book['id'])))
 
             # Generate the title from the template
             args = self.generate_format_args(book)
@@ -1593,7 +1592,7 @@ class CatalogBuilder:
 
         # loop ends here
 
-        pTag = soup.new_tag("p")
+        pTag = soup.new_tag('p')
         pTag['class'] = 'title'
         ptc = 0
         aTag = soup.new_tag('a')
@@ -1603,9 +1602,9 @@ class CatalogBuilder:
 
         if not self.generate_for_kindle_mobi:
             # Kindle don't need this because it shows section titles in Periodical format
-            aTag = soup.new_tag("a")
+            aTag = soup.new_tag('a')
             anchor_name = friendly_name.lower()
-            aTag['id'] = anchor_name.replace(" ", "")
+            aTag['id'] = anchor_name.replace(' ', '')
             pTag.insert(ptc, aTag)
             ptc += 1
             pTag.insert(ptc, NavigableString('%s' % (friendly_name)))
@@ -1624,13 +1623,13 @@ class CatalogBuilder:
         body.insert(btc, divTag)
 
         # Write the generated file to content_dir
-        outfile_spec = "%s/ByAlphaAuthor.html" % (self.content_dir)
+        outfile_spec = '%s/ByAlphaAuthor.html' % (self.content_dir)
         with open(outfile_spec, 'wb') as outfile:
             outfile.write(prettify(soup).encode('utf-8'))
-        self.html_filelist_1.append("content/ByAlphaAuthor.html")
+        self.html_filelist_1.append('content/ByAlphaAuthor.html')
 
     def generate_html_by_date_added(self):
-        """ Generate content/ByDateAdded.html.
+        ''' Generate content/ByDateAdded.html.
 
         Loop through self.books_to_catalog sorted by reverse date, generate HTML.
 
@@ -1639,7 +1638,7 @@ class CatalogBuilder:
 
         Output:
          content/ByDateAdded.html (file)
-        """
+        '''
 
         def _add_books_to_html_by_month(this_months_list, dtc):
             if len(this_months_list):
@@ -1651,10 +1650,10 @@ class CatalogBuilder:
 
                 # Create a new month anchor
                 date_string = strftime('%B %Y', current_date.timetuple())
-                pIndexTag = soup.new_tag("p")
-                pIndexTag['class'] = "date_index"
-                aTag = soup.new_tag("a")
-                aTag['id'] = f"bda_{current_date.year}-{current_date.month}"
+                pIndexTag = soup.new_tag('p')
+                pIndexTag['class'] = 'date_index'
+                aTag = soup.new_tag('a')
+                aTag['id'] = f'bda_{current_date.year}-{current_date.month}'
                 pIndexTag.insert(0, aTag)
                 pIndexTag.insert(1, NavigableString(date_string))
                 divTag.insert(dtc, pIndexTag)
@@ -1668,11 +1667,11 @@ class CatalogBuilder:
                         current_author = new_entry['author']
                         non_series_books = 0
                         current_series = None
-                        pAuthorTag = soup.new_tag("p")
-                        pAuthorTag['class'] = "author_index"
-                        aTag = soup.new_tag("a")
+                        pAuthorTag = soup.new_tag('p')
+                        pAuthorTag['class'] = 'author_index'
+                        aTag = soup.new_tag('a')
                         if self.opts.generate_authors:
-                            aTag['href'] = "{}.html#{}".format("ByAlphaAuthor", self.generate_author_anchor(current_author))
+                            aTag['href'] = '{}.html#{}'.format('ByAlphaAuthor', self.generate_author_anchor(current_author))
                         aTag.insert(0, NavigableString(current_author))
                         pAuthorTag.insert(0, aTag)
                         divTag.insert(dtc, pAuthorTag)
@@ -1683,12 +1682,12 @@ class CatalogBuilder:
                         # Start a new series
                         current_series = new_entry['series']
                         pSeriesTag = soup.new_tag('p')
-                        pSeriesTag['class'] = "series"
+                        pSeriesTag['class'] = 'series'
                         if self.opts.fmt == 'mobi':
-                            pSeriesTag['class'] = "series_mobi"
+                            pSeriesTag['class'] = 'series_mobi'
                         if self.opts.generate_series:
                             aTag = soup.new_tag('a')
-                            aTag['href'] = "{}.html#{}".format('BySeries', self.generate_series_anchor(new_entry['series']))
+                            aTag['href'] = '{}.html#{}'.format('BySeries', self.generate_series_anchor(new_entry['series']))
                             aTag.insert(0, new_entry['series'])
                             pSeriesTag.insert(0, aTag)
                         else:
@@ -1699,20 +1698,20 @@ class CatalogBuilder:
                         current_series = None
 
                     # Add books
-                    pBookTag = soup.new_tag("p")
-                    pBookTag['class'] = "line_item"
+                    pBookTag = soup.new_tag('p')
+                    pBookTag['class'] = 'line_item'
                     ptc = 0
 
                     self.insert_prefix(soup, pBookTag, ptc, new_entry['prefix'])
                     ptc += 1
 
-                    spanTag = soup.new_tag("span")
-                    spanTag['class'] = "entry"
+                    spanTag = soup.new_tag('span')
+                    spanTag['class'] = 'entry'
                     stc = 0
 
-                    aTag = soup.new_tag("a")
+                    aTag = soup.new_tag('a')
                     if self.opts.generate_descriptions:
-                        aTag['href'] = "book_%d.html" % (int(float(new_entry['id'])))
+                        aTag['href'] = 'book_%d.html' % (int(float(new_entry['id'])))
 
                     # Generate the title from the template
                     args = self.generate_format_args(new_entry)
@@ -1740,10 +1739,10 @@ class CatalogBuilder:
 
         def _add_books_to_html_by_date_range(date_range_list, date_range, dtc):
             if len(date_range_list):
-                pIndexTag = soup.new_tag("p")
-                pIndexTag['class'] = "date_index"
-                aTag = soup.new_tag("a")
-                aTag['id'] = "bda_%s" % date_range.replace(' ', '')
+                pIndexTag = soup.new_tag('p')
+                pIndexTag['class'] = 'date_index'
+                aTag = soup.new_tag('a')
+                aTag['id'] = 'bda_%s' % date_range.replace(' ', '')
                 pIndexTag.insert(0, aTag)
                 pIndexTag.insert(1, NavigableString(date_range))
                 divTag.insert(dtc, pIndexTag)
@@ -1751,20 +1750,20 @@ class CatalogBuilder:
 
                 for new_entry in date_range_list:
                     # Add books
-                    pBookTag = soup.new_tag("p")
-                    pBookTag['class'] = "line_item"
+                    pBookTag = soup.new_tag('p')
+                    pBookTag['class'] = 'line_item'
                     ptc = 0
 
                     self.insert_prefix(soup, pBookTag, ptc, new_entry['prefix'])
                     ptc += 1
 
-                    spanTag = soup.new_tag("span")
-                    spanTag['class'] = "entry"
+                    spanTag = soup.new_tag('span')
+                    spanTag['class'] = 'entry'
                     stc = 0
 
-                    aTag = soup.new_tag("a")
+                    aTag = soup.new_tag('a')
                     if self.opts.generate_descriptions:
-                        aTag['href'] = "book_%d.html" % (int(float(new_entry['id'])))
+                        aTag['href'] = 'book_%d.html' % (int(float(new_entry['id'])))
 
                     # Generate the title from the template
                     args = self.generate_format_args(new_entry)
@@ -1783,14 +1782,14 @@ class CatalogBuilder:
                     stc += 1
 
                     # Dot
-                    spanTag.insert(stc, NavigableString(" · "))
+                    spanTag.insert(stc, NavigableString(' · '))
                     stc += 1
 
                     # Link to author
-                    emTag = soup.new_tag("em")
-                    aTag = soup.new_tag("a")
+                    emTag = soup.new_tag('em')
+                    aTag = soup.new_tag('a')
                     if self.opts.generate_authors:
-                        aTag['href'] = "{}.html#{}".format("ByAlphaAuthor", self.generate_author_anchor(new_entry['author']))
+                        aTag['href'] = '{}.html#{}'.format('ByAlphaAuthor', self.generate_author_anchor(new_entry['author']))
                     aTag.insert(0, NavigableString(new_entry['author']))
                     emTag.insert(0, aTag)
                     spanTag.insert(stc, emTag)
@@ -1803,15 +1802,15 @@ class CatalogBuilder:
                     dtc += 1
             return dtc
 
-        friendly_name = _("Recently Added")
-        self.update_progress_full_step("%s HTML" % friendly_name)
+        friendly_name = _('Recently Added')
+        self.update_progress_full_step('%s HTML' % friendly_name)
 
         soup = self.generate_html_empty_header(friendly_name)
         body = soup.find('body')
 
         btc = 0
 
-        pTag = soup.new_tag("p")
+        pTag = soup.new_tag('p')
         pTag['class'] = 'title'
         ptc = 0
 
@@ -1822,9 +1821,9 @@ class CatalogBuilder:
 
         if not self.generate_for_kindle_mobi:
             # Kindle don't need this because it shows section titles in Periodical format
-            aTag = soup.new_tag("a")
+            aTag = soup.new_tag('a')
             anchor_name = friendly_name.lower()
-            aTag['id'] = anchor_name.replace(" ", "")
+            aTag['id'] = anchor_name.replace(' ', '')
 
             pTag.insert(ptc, aTag)
             ptc += 1
@@ -1833,7 +1832,7 @@ class CatalogBuilder:
         body.insert(btc, pTag)
         btc += 1
 
-        divTag = soup.new_tag("div")
+        divTag = soup.new_tag('div')
         dtc = 0
 
         # >>> Books by date range <<<
@@ -1846,7 +1845,7 @@ class CatalogBuilder:
 
         date_range_list = []
         today_time = nowf().replace(hour=23, minute=59, second=59)
-        for (i, date) in enumerate(self.DATE_RANGE):
+        for i, date in enumerate(self.DATE_RANGE):
             date_range_limit = self.DATE_RANGE[i]
             if i:
                 date_range = '%d to %d days ago' % (self.DATE_RANGE[i - 1], self.DATE_RANGE[i])
@@ -1887,13 +1886,13 @@ class CatalogBuilder:
         body.insert(btc, divTag)
 
         # Write the generated file to content_dir
-        outfile_spec = "%s/ByDateAdded.html" % (self.content_dir)
+        outfile_spec = '%s/ByDateAdded.html' % (self.content_dir)
         with open(outfile_spec, 'wb') as outfile:
             outfile.write(prettify(soup).encode('utf-8'))
-        self.html_filelist_2.append("content/ByDateAdded.html")
+        self.html_filelist_2.append('content/ByDateAdded.html')
 
     def generate_html_by_date_read(self):
-        """ Generate content/ByDateRead.html.
+        ''' Generate content/ByDateRead.html.
 
         Create self.bookmarked_books_by_date_read from self.bookmarked_books.
         Loop through self.bookmarked_books_by_date_read, generate HTML.
@@ -1903,46 +1902,46 @@ class CatalogBuilder:
 
         Output:
          content/ByDateRead.html (file)
-        """
+        '''
 
         def _add_books_to_html_by_day(todays_list, dtc):
             if len(todays_list):
                 # Create a new day anchor
                 date_string = strftime('%A, %B %d', current_date.timetuple())
-                pIndexTag = soup.new_tag("p")
-                pIndexTag['class'] = "date_index"
-                aTag = soup.new_tag("a")
-                aTag['name'] = f"bdr_{current_date.year}-{current_date.month}-{current_date.day}"
+                pIndexTag = soup.new_tag('p')
+                pIndexTag['class'] = 'date_index'
+                aTag = soup.new_tag('a')
+                aTag['name'] = f'bdr_{current_date.year}-{current_date.month}-{current_date.day}'
                 pIndexTag.insert(0, aTag)
                 pIndexTag.insert(1, NavigableString(date_string))
                 divTag.insert(dtc, pIndexTag)
                 dtc += 1
 
                 for new_entry in todays_list:
-                    pBookTag = soup.new_tag("p")
-                    pBookTag['class'] = "date_read"
+                    pBookTag = soup.new_tag('p')
+                    pBookTag['class'] = 'date_read'
                     ptc = 0
 
                     # Percent read
                     pBookTag.insert(ptc, NavigableString(new_entry['reading_progress']))
                     ptc += 1
 
-                    aTag = soup.new_tag("a")
+                    aTag = soup.new_tag('a')
                     if self.opts.generate_descriptions:
-                        aTag['href'] = "book_%d.html" % (int(float(new_entry['id'])))
+                        aTag['href'] = 'book_%d.html' % (int(float(new_entry['id'])))
                     aTag.insert(0, NavigableString(new_entry['title']))
                     pBookTag.insert(ptc, aTag)
                     ptc += 1
 
                     # Dot
-                    pBookTag.insert(ptc, NavigableString(" · "))
+                    pBookTag.insert(ptc, NavigableString(' · '))
                     ptc += 1
 
                     # Link to author
-                    emTag = soup.new_tag("em")
-                    aTag = soup.new_tag("a")
+                    emTag = soup.new_tag('em')
+                    aTag = soup.new_tag('a')
                     if self.opts.generate_authors:
-                        aTag['href'] = "{}.html#{}".format("ByAlphaAuthor", self.generate_author_anchor(new_entry['author']))
+                        aTag['href'] = '{}.html#{}'.format('ByAlphaAuthor', self.generate_author_anchor(new_entry['author']))
                     aTag.insert(0, NavigableString(new_entry['author']))
                     emTag.insert(0, aTag)
                     pBookTag.insert(ptc, emTag)
@@ -1954,10 +1953,10 @@ class CatalogBuilder:
 
         def _add_books_to_html_by_date_range(date_range_list, date_range, dtc):
             if len(date_range_list):
-                pIndexTag = soup.new_tag("p")
-                pIndexTag['class'] = "date_index"
-                aTag = soup.new_tag("a")
-                aTag['name'] = "bdr_%s" % date_range.replace(' ', '')
+                pIndexTag = soup.new_tag('p')
+                pIndexTag['class'] = 'date_index'
+                aTag = soup.new_tag('a')
+                aTag['name'] = 'bdr_%s' % date_range.replace(' ', '')
                 pIndexTag.insert(0, aTag)
                 pIndexTag.insert(1, NavigableString(date_range))
                 divTag.insert(dtc, pIndexTag)
@@ -1965,8 +1964,8 @@ class CatalogBuilder:
 
                 for new_entry in date_range_list:
                     # Add books
-                    pBookTag = soup.new_tag("p")
-                    pBookTag['class'] = "date_read"
+                    pBookTag = soup.new_tag('p')
+                    pBookTag['class'] = 'date_read'
                     ptc = 0
 
                     # Percent read
@@ -1976,22 +1975,22 @@ class CatalogBuilder:
                     pBookTag.insert(ptc, NavigableString(f'{dot_string}{empty_dots}'))
                     ptc += 1
 
-                    aTag = soup.new_tag("a")
+                    aTag = soup.new_tag('a')
                     if self.opts.generate_descriptions:
-                        aTag['href'] = "book_%d.html" % (int(float(new_entry['id'])))
+                        aTag['href'] = 'book_%d.html' % (int(float(new_entry['id'])))
                     aTag.insert(0, NavigableString(new_entry['title']))
                     pBookTag.insert(ptc, aTag)
                     ptc += 1
 
                     # Dot
-                    pBookTag.insert(ptc, NavigableString(" · "))
+                    pBookTag.insert(ptc, NavigableString(' · '))
                     ptc += 1
 
                     # Link to author
-                    emTag = soup.new_tag("em")
-                    aTag = soup.new_tag("a")
+                    emTag = soup.new_tag('em')
+                    aTag = soup.new_tag('a')
                     if self.opts.generate_authors:
-                        aTag['href'] = "{}.html#{}".format("ByAlphaAuthor", self.generate_author_anchor(new_entry['author']))
+                        aTag['href'] = '{}.html#{}'.format('ByAlphaAuthor', self.generate_author_anchor(new_entry['author']))
                     aTag.insert(0, NavigableString(new_entry['author']))
                     emTag.insert(0, aTag)
                     pBookTag.insert(ptc, emTag)
@@ -2002,7 +2001,7 @@ class CatalogBuilder:
             return dtc
 
         friendly_name = _('Recently Read')
-        self.update_progress_full_step("%s HTML" % friendly_name)
+        self.update_progress_full_step('%s HTML' % friendly_name)
 
         if not self.bookmarked_books:
             return
@@ -2019,20 +2018,20 @@ class CatalogBuilder:
         btc += 1
 
         # Insert the anchor
-        aTag = soup.new_tag("a")
+        aTag = soup.new_tag('a')
         anchor_name = friendly_name.lower()
-        aTag['name'] = anchor_name.replace(" ", "")
+        aTag['name'] = anchor_name.replace(' ', '')
         body.insert(btc, aTag)
         btc += 1
 
-        divTag = soup.new_tag("div")
+        divTag = soup.new_tag('div')
         dtc = 0
 
         # self.bookmarked_books: (Bookmark, book)
         bookmarked_books = []
         for bm_book in self.bookmarked_books:
             book = self.bookmarked_books[bm_book]
-            # print "bm_book: %s" % bm_book
+            # print('bm_book: %s' % bm_book)
             book[1]['bookmark_timestamp'] = book[0].timestamp
             try:
                 book[1]['percent_read'] = min(float(100 * book[0].last_read / book[0].book_length), 100)
@@ -2063,13 +2062,13 @@ class CatalogBuilder:
         body.insert(btc, divTag)
 
         # Write the generated file to content_dir
-        outfile_spec = "%s/ByDateRead.html" % (self.content_dir)
+        outfile_spec = '%s/ByDateRead.html' % (self.content_dir)
         with open(outfile_spec, 'wb') as outfile:
             outfile.write(prettify(soup).encode('utf-8'))
-        self.html_filelist_2.append("content/ByDateRead.html")
+        self.html_filelist_2.append('content/ByDateRead.html')
 
     def generate_html_by_genres(self):
-        """ Generate individual HTML files per tag.
+        ''' Generate individual HTML files per tag.
 
         Filter out excluded tags. For each tag qualifying as a genre,
         create a separate HTML file. Normalize tags to flatten synonymous tags.
@@ -2079,9 +2078,9 @@ class CatalogBuilder:
 
         Output:
          (files): HTML file per genre
-        """
+        '''
 
-        self.update_progress_full_step(_("Genres HTML"))
+        self.update_progress_full_step(_('Genres HTML'))
 
         # Extract books matching filtered_tags
         genre_list = []
@@ -2125,12 +2124,12 @@ class CatalogBuilder:
 
         if self.opts.verbose:
             if len(genre_list):
-                self.opts.log.info("  Genre summary: %d active genre tags used in generating catalog with %d titles" %
+                self.opts.log.info('  Genre summary: %d active genre tags used in generating catalog with %d titles' %
                                 (len(genre_list), len(self.books_to_catalog)))
 
                 for genre in genre_list:
                     for key in genre:
-                        self.opts.log.info("   %s: %d %s" % (self.get_friendly_genre_tag(key),
+                        self.opts.log.info('   %s: %d %s' % (self.get_friendly_genre_tag(key),
                                             len(genre[key]),
                                             'titles' if len(genre[key]) > 1 else 'title'))
 
@@ -2138,8 +2137,8 @@ class CatalogBuilder:
         # genre_list = [ {friendly_tag:[{book},{book}]}, {friendly_tag:[{book},{book}]}, ...]
         master_genre_list = []
         for genre_tag_set in genre_list:
-            for (index, genre) in enumerate(genre_tag_set):
-                # print "genre: %s  \t  genre_tag_set[genre]: %s" % (genre, genre_tag_set[genre])
+            for index, genre in enumerate(genre_tag_set):
+                # print('genre: %s  \t  genre_tag_set[genre]: %s' % (genre, genre_tag_set[genre]))
 
                 # Create sorted_authors[0] = friendly, [1] = author_sort for NCX creation
                 authors = []
@@ -2151,7 +2150,7 @@ class CatalogBuilder:
                 books_by_current_author = 1
                 current_author = authors[0]
                 unique_authors = []
-                for (i, author) in enumerate(authors):
+                for i, author in enumerate(authors):
                     if author != current_author and i:
                         unique_authors.append((current_author[0], current_author[1], books_by_current_author))
                         current_author = author
@@ -2163,13 +2162,13 @@ class CatalogBuilder:
                         books_by_current_author += 1
 
                 # Write the genre book list as an article
-                outfile = f"{self.content_dir}/Genre_{genre}.html"
+                outfile = f'{self.content_dir}/Genre_{genre}.html'
                 titles_spanned = self.generate_html_by_genre(genre,
                                                              True if index == 0 else False,
                                                              genre_tag_set[genre],
                                                              outfile)
 
-                tag_file = "content/Genre_%s.html" % genre
+                tag_file = 'content/Genre_%s.html' % genre
                 master_genre_list.append({
                                             'tag': genre,
                                             'file': tag_file,
@@ -2180,7 +2179,7 @@ class CatalogBuilder:
         self.genres = master_genre_list
 
     def generate_html_by_genre(self, genre, section_head, books, outfile):
-        """ Generate individual genre HTML file.
+        ''' Generate individual genre HTML file.
 
         Generate an individual genre HTML file. Called from generate_html_by_genres()
 
@@ -2195,7 +2194,7 @@ class CatalogBuilder:
 
         Returns:
          titles_spanned (list): [(first_author, first_book), (last_author, last_book)]
-        """
+        '''
 
         soup = self.generate_html_genre_header(genre)
         body = soup.find('body')
@@ -2215,7 +2214,7 @@ class CatalogBuilder:
 
         # Create an anchor from the tag
         aTag = soup.new_tag('a')
-        aTag['id'] = "Genre_%s" % genre
+        aTag['id'] = 'Genre_%s' % genre
         divTag.insert(dtc, aTag)
         body.insert(btc, divTag)
         btc += 1
@@ -2235,11 +2234,11 @@ class CatalogBuilder:
                 current_author = book['author']
                 non_series_books = 0
                 current_series = None
-                pAuthorTag = soup.new_tag("p")
-                pAuthorTag['class'] = "author_index"
-                aTag = soup.new_tag("a")
+                pAuthorTag = soup.new_tag('p')
+                pAuthorTag['class'] = 'author_index'
+                aTag = soup.new_tag('a')
                 if self.opts.generate_authors:
-                    aTag['href'] = "{}.html#{}".format("ByAlphaAuthor", self.generate_author_anchor(book['author']))
+                    aTag['href'] = '{}.html#{}'.format('ByAlphaAuthor', self.generate_author_anchor(book['author']))
                 aTag.insert(0, book['author'])
                 pAuthorTag.insert(0, aTag)
                 divTag.insert(dtc, pAuthorTag)
@@ -2250,12 +2249,12 @@ class CatalogBuilder:
                 # Start a new series
                 current_series = book['series']
                 pSeriesTag = soup.new_tag('p')
-                pSeriesTag['class'] = "series"
+                pSeriesTag['class'] = 'series'
                 if self.opts.fmt == 'mobi':
-                    pSeriesTag['class'] = "series_mobi"
+                    pSeriesTag['class'] = 'series_mobi'
                 if self.opts.generate_series:
                     aTag = soup.new_tag('a')
-                    aTag['href'] = "{}.html#{}".format('BySeries', self.generate_series_anchor(book['series']))
+                    aTag['href'] = '{}.html#{}'.format('BySeries', self.generate_series_anchor(book['series']))
                     aTag.insert(0, book['series'])
                     pSeriesTag.insert(0, aTag)
                 else:
@@ -2267,32 +2266,32 @@ class CatalogBuilder:
                 current_series = None
 
             # Add books
-            pBookTag = soup.new_tag("p")
-            pBookTag['class'] = "line_item"
+            pBookTag = soup.new_tag('p')
+            pBookTag['class'] = 'line_item'
             ptc = 0
 
             self.insert_prefix(soup, pBookTag, ptc, book['prefix'])
             ptc += 1
 
-            spanTag = soup.new_tag("span")
-            spanTag['class'] = "entry"
+            spanTag = soup.new_tag('span')
+            spanTag['class'] = 'entry'
             stc = 0
 
             # Add the book title
-            aTag = soup.new_tag("a")
+            aTag = soup.new_tag('a')
             if self.opts.generate_descriptions:
-                aTag['href'] = "book_%d.html" % (int(float(book['id'])))
+                aTag['href'] = 'book_%d.html' % (int(float(book['id'])))
 
             # Generate the title from the template
             args = self.generate_format_args(book)
             if current_series:
-                # aTag.insert(0,escape(book['title'][len(book['series'])+1:]))
+                # aTag.insert(0, escape(book['title'][len(book['series'])+1:]))
                 formatted_title = self.formatter.safe_format(
                                  self.by_genres_series_title_template, args,
                                  _('error in') + ' by_genres_series_title_template:',
                                  self.db.new_api.get_proxy_metadata(book['id']))
             else:
-                # aTag.insert(0,escape(book['title']))
+                # aTag.insert(0, escape(book['title']))
                 formatted_title = self.formatter.safe_format(
                                  self.by_genres_normal_title_template, args,
                                  _('error in') + ' by_genres_normal_title_template:',
@@ -2321,7 +2320,7 @@ class CatalogBuilder:
         return titles_spanned
 
     def generate_html_by_series(self):
-        """ Generate content/BySeries.html.
+        ''' Generate content/BySeries.html.
 
         Search database for books in series.
 
@@ -2331,9 +2330,9 @@ class CatalogBuilder:
         Output:
          content/BySeries.html (file)
 
-        """
+        '''
         friendly_name = ngettext('Series', 'Series', 2)
-        self.update_progress_full_step("%s HTML" % friendly_name)
+        self.update_progress_full_step('%s HTML' % friendly_name)
 
         self.opts.sort_by = 'series'
 
@@ -2343,7 +2342,7 @@ class CatalogBuilder:
 
         if not self.books_by_series:
             self.opts.generate_series = False
-            self.opts.log("  no series found in selected books, skipping Series section")
+            self.opts.log('  no series found in selected books, skipping Series section')
             return
 
         # Generate series_sort
@@ -2357,9 +2356,9 @@ class CatalogBuilder:
         body = soup.find('body')
 
         btc = 0
-        divTag = soup.new_tag("div")
+        divTag = soup.new_tag('div')
         dtc = 0
-        current_letter = ""
+        current_letter = ''
         current_series = None
 
         # Loop through books_by_series
@@ -2369,15 +2368,15 @@ class CatalogBuilder:
             if self.letter_or_symbol(sort_equivalents[idx]) != current_letter:
                 # Start a new letter with Index letter
                 current_letter = self.letter_or_symbol(sort_equivalents[idx])
-                pIndexTag = soup.new_tag("p")
-                pIndexTag['class'] = "series_letter_index"
-                aTag = soup.new_tag("a")
+                pIndexTag = soup.new_tag('p')
+                pIndexTag['class'] = 'series_letter_index'
+                aTag = soup.new_tag('a')
                 if current_letter == self.SYMBOLS:
-                    aTag['id'] = self.SYMBOLS + "_series"
+                    aTag['id'] = self.SYMBOLS + '_series'
                     pIndexTag.insert(0, aTag)
                     pIndexTag.insert(1, NavigableString(self.SYMBOLS))
                 else:
-                    aTag['id'] = self.generate_unicode_name(current_letter) + "_series"
+                    aTag['id'] = self.generate_unicode_name(current_letter) + '_series'
                     pIndexTag.insert(0, aTag)
                     pIndexTag.insert(1, NavigableString(sort_equivalents[idx]))
                 divTag.insert(dtc, pIndexTag)
@@ -2388,9 +2387,9 @@ class CatalogBuilder:
                 series_count += 1
                 current_series = book['series']
                 pSeriesTag = soup.new_tag('p')
-                pSeriesTag['class'] = "series"
+                pSeriesTag['class'] = 'series'
                 if self.opts.fmt == 'mobi':
-                    pSeriesTag['class'] = "series_mobi"
+                    pSeriesTag['class'] = 'series_mobi'
                 aTag = soup.new_tag('a')
                 aTag['id'] = self.generate_series_anchor(book['series'])
                 pSeriesTag.insert(0, aTag)
@@ -2399,21 +2398,21 @@ class CatalogBuilder:
                 dtc += 1
 
             # Add books
-            pBookTag = soup.new_tag("p")
-            pBookTag['class'] = "line_item"
+            pBookTag = soup.new_tag('p')
+            pBookTag['class'] = 'line_item'
             ptc = 0
 
             book['prefix'] = self.discover_prefix(book)
             self.insert_prefix(soup, pBookTag, ptc, book['prefix'])
             ptc += 1
 
-            spanTag = soup.new_tag("span")
-            spanTag['class'] = "entry"
+            spanTag = soup.new_tag('span')
+            spanTag['class'] = 'entry'
             stc = 0
 
-            aTag = soup.new_tag("a")
+            aTag = soup.new_tag('a')
             if self.opts.generate_descriptions:
-                aTag['href'] = "book_%d.html" % (int(float(book['id'])))
+                aTag['href'] = 'book_%d.html' % (int(float(book['id'])))
             # Use series, series index if avail else just title
             # aTag.insert(0,'%d. %s · %s' % (book['series_index'],escape(book['title']), ' & '.join(book['authors'])))
 
@@ -2432,9 +2431,9 @@ class CatalogBuilder:
             stc += 1
 
             # Link to author
-            aTag = soup.new_tag("a")
+            aTag = soup.new_tag('a')
             if self.opts.generate_authors:
-                aTag['href'] = "{}.html#{}".format("ByAlphaAuthor",
+                aTag['href'] = '{}.html#{}'.format('ByAlphaAuthor',
                                             self.generate_author_anchor(' & '.join(book['authors'])))
             aTag.insert(0, NavigableString(' & '.join(book['authors'])))
             spanTag.insert(stc, aTag)
@@ -2446,7 +2445,7 @@ class CatalogBuilder:
             divTag.insert(dtc, pBookTag)
             dtc += 1
 
-        pTag = soup.new_tag("p")
+        pTag = soup.new_tag('p')
         pTag['class'] = 'title'
         ptc = 0
         aTag = soup.new_tag('a')
@@ -2456,9 +2455,9 @@ class CatalogBuilder:
 
         if not self.generate_for_kindle_mobi:
             # Insert the <h2> tag with book_count at the head
-            aTag = soup.new_tag("a")
+            aTag = soup.new_tag('a')
             anchor_name = friendly_name.lower()
-            aTag['id'] = anchor_name.replace(" ", "")
+            aTag['id'] = anchor_name.replace(' ', '')
             pTag.insert(0, aTag)
             pTag.insert(1, NavigableString('%s' % friendly_name))
         body.insert(btc, pTag)
@@ -2468,13 +2467,13 @@ class CatalogBuilder:
         body.insert(btc, divTag)
 
         # Write the generated file to content_dir
-        outfile_spec = "%s/BySeries.html" % (self.content_dir)
+        outfile_spec = '%s/BySeries.html' % (self.content_dir)
         with open(outfile_spec, 'wb') as outfile:
             outfile.write(prettify(soup).encode('utf-8'))
-        self.html_filelist_1.append("content/BySeries.html")
+        self.html_filelist_1.append('content/BySeries.html')
 
     def generate_html_by_title(self):
-        """ Generate content/ByAlphaTitle.html.
+        ''' Generate content/ByAlphaTitle.html.
 
         Generate HTML of books sorted by title.
 
@@ -2483,15 +2482,15 @@ class CatalogBuilder:
 
         Output:
          content/ByAlphaTitle.html (file)
-        """
+        '''
 
-        self.update_progress_full_step(_("Titles HTML"))
+        self.update_progress_full_step(_('Titles HTML'))
 
-        soup = self.generate_html_empty_header("Books By Alpha Title")
+        soup = self.generate_html_empty_header('Books By Alpha Title')
         body = soup.find('body')
         btc = 0
 
-        pTag = soup.new_tag("p")
+        pTag = soup.new_tag('p')
         pTag['class'] = 'title'
         ptc = 0
         aTag = soup.new_tag('a')
@@ -2501,8 +2500,8 @@ class CatalogBuilder:
 
         if not self.generate_for_kindle_mobi:
             # Kindle don't need this because it shows section titles in Periodical format
-            aTag = soup.new_tag("a")
-            aTag['id'] = "bytitle"
+            aTag = soup.new_tag('a')
+            aTag['id'] = 'bytitle'
             pTag.insert(ptc, aTag)
             ptc += 1
             pTag.insert(ptc, NavigableString(_('Titles')))
@@ -2510,9 +2509,9 @@ class CatalogBuilder:
         body.insert(btc, pTag)
         btc += 1
 
-        divTag = soup.new_tag("div")
+        divTag = soup.new_tag('div')
         dtc = 0
-        current_letter = ""
+        current_letter = ''
 
         # Re-sort title list without leading series/series_index
         # Incoming title <series> <series_index>: <title>
@@ -2541,39 +2540,39 @@ class CatalogBuilder:
                     dtc += 1
                 divRunningTag = soup.new_tag('div')
                 if dtc > 0:
-                    divRunningTag['class'] = "initial_letter"
+                    divRunningTag['class'] = 'initial_letter'
                 drtc = 0
-                pIndexTag = soup.new_tag("p")
-                pIndexTag['class'] = "author_title_letter_index"
-                aTag = soup.new_tag("a")
+                pIndexTag = soup.new_tag('p')
+                pIndexTag['class'] = 'author_title_letter_index'
+                aTag = soup.new_tag('a')
                 current_letter = self.letter_or_symbol(sort_equivalents[idx])
                 if current_letter == self.SYMBOLS:
-                    aTag['id'] = self.SYMBOLS + "_titles"
+                    aTag['id'] = self.SYMBOLS + '_titles'
                     pIndexTag.insert(0, aTag)
                     pIndexTag.insert(1, NavigableString(self.SYMBOLS))
                 else:
-                    aTag['id'] = self.generate_unicode_name(current_letter) + "_titles"
+                    aTag['id'] = self.generate_unicode_name(current_letter) + '_titles'
                     pIndexTag.insert(0, aTag)
                     pIndexTag.insert(1, NavigableString(sort_equivalents[idx]))
                 divRunningTag.insert(dtc, pIndexTag)
                 drtc += 1
 
             # Add books
-            pBookTag = soup.new_tag("p")
-            pBookTag['class'] = "line_item"
+            pBookTag = soup.new_tag('p')
+            pBookTag['class'] = 'line_item'
             ptc = 0
 
             self.insert_prefix(soup, pBookTag, ptc, book['prefix'])
             ptc += 1
 
-            spanTag = soup.new_tag("span")
-            spanTag['class'] = "entry"
+            spanTag = soup.new_tag('span')
+            spanTag['class'] = 'entry'
             stc = 0
 
             # Link to book
-            aTag = soup.new_tag("a")
+            aTag = soup.new_tag('a')
             if self.opts.generate_descriptions:
-                aTag['href'] = "book_%d.html" % (int(float(book['id'])))
+                aTag['href'] = 'book_%d.html' % (int(float(book['id'])))
 
             # Generate the title from the template
             args = self.generate_format_args(book)
@@ -2592,14 +2591,14 @@ class CatalogBuilder:
             stc += 1
 
             # Dot
-            spanTag.insert(stc, NavigableString(" · "))
+            spanTag.insert(stc, NavigableString(' · '))
             stc += 1
 
             # Link to author
-            emTag = soup.new_tag("em")
-            aTag = soup.new_tag("a")
+            emTag = soup.new_tag('em')
+            aTag = soup.new_tag('a')
             if self.opts.generate_authors:
-                aTag['href'] = "{}.html#{}".format("ByAlphaAuthor", self.generate_author_anchor(book['author']))
+                aTag['href'] = '{}.html#{}'.format('ByAlphaAuthor', self.generate_author_anchor(book['author']))
             aTag.insert(0, NavigableString(book['author']))
             emTag.insert(0, aTag)
             spanTag.insert(stc, emTag)
@@ -2622,13 +2621,13 @@ class CatalogBuilder:
         btc += 1
 
         # Write the volume to content_dir
-        outfile_spec = "%s/ByAlphaTitle.html" % (self.content_dir)
+        outfile_spec = '%s/ByAlphaTitle.html' % (self.content_dir)
         with open(outfile_spec, 'wb') as outfile:
             outfile.write(prettify(soup).encode('utf-8'))
-        self.html_filelist_1.append("content/ByAlphaTitle.html")
+        self.html_filelist_1.append('content/ByAlphaTitle.html')
 
     def generate_html_description_header(self, book):
-        """ Generate the HTML Description header from template.
+        ''' Generate the HTML Description header from template.
 
         Create HTML Description from book metadata and template.
         Called by generate_html_descriptions()
@@ -2638,7 +2637,7 @@ class CatalogBuilder:
 
         Return:
          soup (BeautifulSoup): HTML Description for book
-        """
+        '''
 
         from calibre.ebooks.oeb.base import XHTML_NS
 
@@ -2687,11 +2686,11 @@ class CatalogBuilder:
         author = book['author']
 
         if book['prefix']:
-            author_prefix = book['prefix'] + ' ' + _("by ")
+            author_prefix = book['prefix'] + ' ' + _('by ')
         elif self.opts.connected_kindle and book['id'] in self.bookmarked_books:
-            author_prefix = self.SYMBOL_READING + ' ' + _("by ")
+            author_prefix = self.SYMBOL_READING + ' ' + _('by ')
         else:
-            author_prefix = _("by ")
+            author_prefix = _('by ')
 
         # Genres
         genres = ''
@@ -2699,11 +2698,11 @@ class CatalogBuilder:
             _soup = BeautifulSoup('')
             genresTag = _soup.new_tag('p')
             gtc = 0
-            for (i, tag) in enumerate(sorted(book.get('genres', []))):
+            for i, tag in enumerate(sorted(book.get('genres', []))):
                 aTag = _soup.new_tag('a')
                 if self.opts.generate_genres:
                     try:
-                        aTag['href'] = "Genre_%s.html" % self.genre_tags_dict[tag]
+                        aTag['href'] = 'Genre_%s.html' % self.genre_tags_dict[tag]
                     except KeyError:
                         pass
                 aTag.insert(0, NavigableString(tag))
@@ -2733,12 +2732,12 @@ class CatalogBuilder:
 
         # Thumb
         _soup = BeautifulSoup('<html>', selfClosingTags=['img'])
-        thumb = _soup.new_tag("img")
-        if 'cover' in book and book['cover']:
-            thumb['src'] = "../images/thumbnail_%d.jpg" % int(book['id'])
+        thumb = _soup.new_tag('img')
+        if book.get('cover'):
+            thumb['src'] = '../images/thumbnail_%d.jpg' % int(book['id'])
         else:
-            thumb['src'] = "../images/thumbnail_default.jpg"
-        thumb['alt'] = "cover thumbnail"
+            thumb['src'] = '../images/thumbnail_default.jpg'
+        thumb['alt'] = 'cover thumbnail'
 
         # Publisher
         publisher = ' '
@@ -2772,8 +2771,8 @@ class CatalogBuilder:
         body = soup.find('body')
         btc = 0
         # Insert the title anchor for inbound links
-        aTag = soup.new_tag("a")
-        aTag['id'] = "book%d" % int(book['id'])
+        aTag = soup.new_tag('a')
+        aTag['id'] = 'book%d' % int(book['id'])
         divTag = soup.new_tag('div')
         divTag.insert(0, aTag)
         body.insert(btc, divTag)
@@ -2784,14 +2783,14 @@ class CatalogBuilder:
         if aTag:
             if book['series']:
                 if self.opts.generate_series:
-                    aTag['href'] = "{}.html#{}".format('BySeries', self.generate_series_anchor(book['series']))
+                    aTag['href'] = '{}.html#{}'.format('BySeries', self.generate_series_anchor(book['series']))
             else:
                 aTag.extract()
 
         # Insert the author link
         aTag = body.find('a', attrs={'class': 'author'})
         if self.opts.generate_authors and aTag:
-            aTag['href'] = "{}.html#{}".format("ByAlphaAuthor",
+            aTag['href'] = '{}.html#{}'.format('ByAlphaAuthor',
                                         self.generate_author_anchor(book['author']))
 
         if publisher == ' ':
@@ -2823,7 +2822,7 @@ class CatalogBuilder:
         return soup
 
     def generate_html_descriptions(self):
-        """ Generate Description HTML for each book.
+        ''' Generate Description HTML for each book.
 
         Loop though books, write Description HTML for each book.
 
@@ -2832,13 +2831,13 @@ class CatalogBuilder:
 
         Output:
          (files): Description HTML for each book
-        """
+        '''
 
-        self.update_progress_full_step(_("Descriptions HTML"))
+        self.update_progress_full_step(_('Descriptions HTML'))
 
-        for (title_num, title) in enumerate(self.books_by_title):
-            self.update_progress_micro_step("%s %d of %d" %
-                                            (_("Description HTML"),
+        for title_num, title in enumerate(self.books_by_title):
+            self.update_progress_micro_step('%s %d of %d' %
+                                            (_('Description HTML'),
                                             title_num, len(self.books_by_title)),
                                             float(title_num * 100 / len(self.books_by_title)) / 100)
 
@@ -2846,11 +2845,11 @@ class CatalogBuilder:
             soup = self.generate_html_description_header(title)
 
             # Write the book entry to content_dir
-            with open("%s/book_%d.html" % (self.content_dir, int(title['id'])), 'wb') as outfile:
+            with open('%s/book_%d.html' % (self.content_dir, int(title['id'])), 'wb') as outfile:
                 outfile.write(prettify(soup).encode('utf-8'))
 
     def generate_html_empty_header(self, title):
-        """ Return a boilerplate HTML header.
+        ''' Return a boilerplate HTML header.
 
         Generate an HTML header with document title.
 
@@ -2859,7 +2858,7 @@ class CatalogBuilder:
 
         Return:
          soup (BeautifulSoup): HTML header with document title inserted
-        """
+        '''
 
         header = '''
             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
@@ -2880,7 +2879,7 @@ class CatalogBuilder:
         return soup
 
     def generate_html_genre_header(self, title):
-        """ Generate HTML header with initial body content
+        ''' Generate HTML header with initial body content
 
         Start with a generic HTML header, add <p> and <div>
 
@@ -2889,7 +2888,7 @@ class CatalogBuilder:
 
         Return:
          soup (BeautifulSoup): HTML with initial <p> and <div> tags
-        """
+        '''
 
         soup = self.generate_html_empty_header(title)
         bodyTag = soup.find('body')
@@ -2902,7 +2901,7 @@ class CatalogBuilder:
         return soup
 
     def generate_masthead_image(self, out_path):
-        """ Generate a Kindle masthead image.
+        ''' Generate a Kindle masthead image.
 
         Generate a Kindle masthead image, used with Kindle periodical format.
 
@@ -2915,7 +2914,7 @@ class CatalogBuilder:
 
         Output:
          out_path (file): masthead image (GIF)
-        """
+        '''
 
         from calibre.ebooks.conversion.config import load_defaults
 
@@ -2953,7 +2952,7 @@ class CatalogBuilder:
             img.save(f, 'GIF')
 
     def generate_ncx_header(self):
-        """ Generate the basic NCX file.
+        ''' Generate the basic NCX file.
 
         Generate the initial NCX, which is added to depending on included Sections.
 
@@ -2965,9 +2964,9 @@ class CatalogBuilder:
 
         Outputs:
          ncx_root (file): NCX foundation
-        """
+        '''
 
-        self.update_progress_full_step(_("NCX header"))
+        self.update_progress_full_step(_('NCX header'))
 
         header = '''
             <ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" xmlns:calibre="http://calibre.kovidgoyal.net/2009/metadata" version="2005-1" xml:lang="en">
@@ -2981,23 +2980,23 @@ class CatalogBuilder:
             # Build a top-level navPoint for Kindle periodicals
             navPointTag = makeelement('navPoint', navMapTag, class_='periodical', id='title', playOrder=self.play_order)
             self.play_order += 1
-            makeelement('{http://calibre.kovidgoyal.net/2009/metadata}meta-img', navPointTag, id="mastheadImage", src="images/mastheadImage.gif")
+            makeelement('{http://calibre.kovidgoyal.net/2009/metadata}meta-img', navPointTag, id='mastheadImage', src='images/mastheadImage.gif')
             navLabelTag = makeelement('navLabel', navPointTag)
             makeelement('text', navLabelTag).text = self.opts.catalog_title
 
             if self.opts.generate_authors:
-                makeelement('content', navPointTag, src="content/ByAlphaAuthor.html")
+                makeelement('content', navPointTag, src='content/ByAlphaAuthor.html')
             elif self.opts.generate_titles:
-                makeelement('content', navPointTag, src="content/ByAlphaTitle.html")
+                makeelement('content', navPointTag, src='content/ByAlphaTitle.html')
             elif self.opts.generate_series:
-                makeelement('content', navPointTag, src="content/BySeries.html")
+                makeelement('content', navPointTag, src='content/BySeries.html')
             elif self.opts.generate_genres:
-                makeelement('content', navPointTag, src="%s" % self.genres[0]['file'])
+                makeelement('content', navPointTag, src='%s' % self.genres[0]['file'])
             elif self.opts.generate_recently_added:
-                makeelement('content', navPointTag, src="content/ByDateAdded.html")
+                makeelement('content', navPointTag, src='content/ByDateAdded.html')
             elif self.opts.generate_descriptions:
                 # Descriptions only
-                makeelement('content', navPointTag, src="content/book_%d.html" % int(self.books_by_description[0]['id']))
+                makeelement('content', navPointTag, src='content/book_%d.html' % int(self.books_by_description[0]['id']))
 
     def generate_ncx_section_header(self, section_id, section_header, content_src):
         root = self.ncx_root
@@ -3018,18 +3017,18 @@ class CatalogBuilder:
     def generate_ncx_subsection(self, navPointTag, section_id, section_text, content_src, cm_tags={}):
         navPointVolumeTag = makeelement('navPoint', navPointTag, id=section_id, playOrder=self.play_order)
         if self.generate_for_kindle_mobi:
-            navPointVolumeTag.set('class', "article")
+            navPointVolumeTag.set('class', 'article')
         self.play_order += 1
-        navLabelTag = makeelement("navLabel", navPointVolumeTag)
-        makeelement("text", navLabelTag).text = section_text
-        makeelement("content", navPointVolumeTag, src=content_src)
+        navLabelTag = makeelement('navLabel', navPointVolumeTag)
+        makeelement('text', navLabelTag).text = section_text
+        makeelement('content', navPointVolumeTag, src=content_src)
 
         if self.generate_for_kindle_mobi:
             for name, text in cm_tags.items():
                 makeelement('{http://calibre.kovidgoyal.net/2009/metadata}meta', navPointVolumeTag, name=name).text = text
 
     def generate_ncx_descriptions(self, tocTitle):
-        """ Add Descriptions to the basic NCX file.
+        ''' Add Descriptions to the basic NCX file.
 
         Generate the Descriptions NCX content, add to self.ncx_soup.
 
@@ -3041,20 +3040,20 @@ class CatalogBuilder:
 
         Outputs:
          ncx_soup (file): updated
-        """
+        '''
         section_header = '%s [%d]' % (tocTitle, len(self.books_by_description))
         if self.generate_for_kindle_mobi:
             section_header = tocTitle
-        navPointTag = self.generate_ncx_section_header('bydescription-ID', section_header, "content/book_%d.html" % int(self.books_by_description[0]['id']))
+        navPointTag = self.generate_ncx_section_header('bydescription-ID', section_header, 'content/book_%d.html' % int(self.books_by_description[0]['id']))
 
-        self.update_progress_full_step(_("NCX for descriptions"))
+        self.update_progress_full_step(_('NCX for descriptions'))
 
         # --- Construct the 'Descriptions' section ---
         # Add the section navPoint
         # Loop over the titles
 
         for book in self.books_by_description:
-            sec_id = "book%dID" % int(book['id'])
+            sec_id = 'book%dID' % int(book['id'])
             if book['series']:
                 series_index = str(book['series_index'])
                 if series_index.endswith('.0'):
@@ -3072,12 +3071,10 @@ class CatalogBuilder:
                     # Don't include Author for Kindle
                     title_str = self.format_ncx_text('%s' % (book['title']), dest='title')
                     if self.opts.connected_kindle and book['id'] in self.bookmarked_books:
-                        '''
-                        dots = int((book['percent_read'] + 5)/10)
-                        dot_string = '+' * dots
-                        empty_dots = '-' * (10 - dots)
-                        title_str += ' %s%s' % (dot_string,empty_dots)
-                        '''
+                        # dots = int((book['percent_read'] + 5)/10)
+                        # dot_string = '+' * dots
+                        # empty_dots = '-' * (10 - dots)
+                        # title_str += ' %s%s' % (dot_string,empty_dots)
                         title_str += '*'
                     sec_text = title_str
                 else:
@@ -3085,7 +3082,7 @@ class CatalogBuilder:
                     sec_text = self.format_ncx_text('%s · %s' %
                                                     (book['title'], book['author']), dest='title')
 
-            content_src="content/book_%d.html#book%d" % (int(book['id']), int(book['id']))
+            content_src='content/book_%d.html#book%d' % (int(book['id']), int(book['id']))
             cm_tags = {}
 
             if book['date']:
@@ -3104,7 +3101,7 @@ class CatalogBuilder:
             self.generate_ncx_subsection(navPointTag, sec_id, sec_text, content_src, cm_tags)
 
     def generate_ncx_by_series(self, tocTitle):
-        """ Add Series to the basic NCX file.
+        ''' Add Series to the basic NCX file.
 
         Generate the Series NCX content, add to self.ncx_soup.
 
@@ -3116,21 +3113,21 @@ class CatalogBuilder:
 
         Outputs:
          ncx_soup (file): updated
-        """
+        '''
 
-        self.update_progress_full_step(_("NCX for Series"))
+        self.update_progress_full_step(_('NCX for Series'))
 
         def _add_to_series_by_letter(current_series_list):
-            current_series_list = " • ".join(current_series_list)
-            current_series_list = self.format_ncx_text(current_series_list, dest="description")
+            current_series_list = ' • '.join(current_series_list)
+            current_series_list = self.format_ncx_text(current_series_list, dest='description')
             series_by_letter.append(current_series_list)
 
         # --- Construct the 'Books By Series' section ---
         section_header = '%s [%d]' % (tocTitle, len(self.all_series))
         if self.generate_for_kindle_mobi:
             section_header = tocTitle
-        output = "BySeries"
-        navPointTag = self.generate_ncx_section_header('byseries-ID', section_header, "content/%s.html#section_start" % (output))
+        output = 'BySeries'
+        navPointTag = self.generate_ncx_section_header('byseries-ID', section_header, 'content/%s.html#section_start' % (output))
 
         series_by_letter = []
         # Establish initial letter equivalencies
@@ -3146,7 +3143,7 @@ class CatalogBuilder:
 
         title_letters = [current_letter]
         current_series_list = []
-        current_series = ""
+        current_series = ''
         for idx, book in enumerate(title_list):
             sort_title = self.generate_sort_title(book['series'])
             self.establish_equivalencies([sort_title])[0]
@@ -3170,23 +3167,23 @@ class CatalogBuilder:
         _add_to_series_by_letter(current_series_list)
 
         # Add *article* entries for each populated series title letter
-        for (i, books) in enumerate(series_by_letter):
-            sec_id = "%sSeries-ID" % (title_letters[i].upper())
+        for i, books in enumerate(series_by_letter):
+            sec_id = '%sSeries-ID' % (title_letters[i].upper())
             if len(title_letters[i]) > 1:
-                fmt_string = _("Series beginning with %s")
+                fmt_string = _('Series beginning with %s')
             else:
                 fmt_string = _("Series beginning with '%s'")
-            sec_text = fmt_string % (title_letters[i] if len(title_letters[i]) > 1 else title_letters[i])
+            sec_text = fmt_string % title_letters[i]
             if title_letters[i] == self.SYMBOLS:
-                content_src = f"content/{output}.html#{self.SYMBOLS}_series"
+                content_src = f'content/{output}.html#{self.SYMBOLS}_series'
             else:
-                content_src = f"content/{output}.html#{self.generate_unicode_name(title_letters[i])}_series"
+                content_src = f'content/{output}.html#{self.generate_unicode_name(title_letters[i])}_series'
 
             cm_tags = {'description': self.format_ncx_text(books, dest='description')}
             self.generate_ncx_subsection(navPointTag, sec_id, sec_text, content_src, cm_tags)
 
     def generate_ncx_by_title(self, tocTitle):
-        """ Add Titles to the basic NCX file.
+        ''' Add Titles to the basic NCX file.
 
         Generate the Titles NCX content, add to self.ncx_soup.
 
@@ -3198,21 +3195,21 @@ class CatalogBuilder:
 
         Outputs:
          ncx_soup (file): updated
-        """
+        '''
 
-        self.update_progress_full_step(_("NCX for Titles"))
+        self.update_progress_full_step(_('NCX for Titles'))
 
         def _add_to_books_by_letter(current_book_list):
-            current_book_list = " • ".join(current_book_list)
-            current_book_list = self.format_ncx_text(current_book_list, dest="description")
+            current_book_list = ' • '.join(current_book_list)
+            current_book_list = self.format_ncx_text(current_book_list, dest='description')
             books_by_letter.append(current_book_list)
 
         # --- Construct the 'Books By Title' section ---
         section_header = '%s [%d]' % (tocTitle, len(self.books_by_title))
         if self.generate_for_kindle_mobi:
             section_header = tocTitle
-        output = "ByAlphaTitle"
-        navPointTag = self.generate_ncx_section_header("byalphatitle-ID", section_header, "content/%s.html#section_start" % (output))
+        output = 'ByAlphaTitle'
+        navPointTag = self.generate_ncx_section_header('byalphatitle-ID', section_header, 'content/%s.html#section_start' % (output))
 
         books_by_letter = []
 
@@ -3230,7 +3227,7 @@ class CatalogBuilder:
         current_letter = self.letter_or_symbol(sort_equivalents[0])
         title_letters = [current_letter]
         current_book_list = []
-        current_book = ""
+        current_book = ''
         for idx, book in enumerate(title_list):
             # if self.letter_or_symbol(book['title_sort'][0]) != current_letter:
             if self.letter_or_symbol(sort_equivalents[idx]) != current_letter:
@@ -3254,23 +3251,23 @@ class CatalogBuilder:
         _add_to_books_by_letter(current_book_list)
 
         # Add *article* entries for each populated title letter
-        for (i, books) in enumerate(books_by_letter):
-            sec_id = "%sTitles-ID" % (title_letters[i].upper())
+        for i, books in enumerate(books_by_letter):
+            sec_id = '%sTitles-ID' % (title_letters[i].upper())
             if len(title_letters[i]) > 1:
-                fmt_string = _("Titles beginning with %s")
+                fmt_string = _('Titles beginning with %s')
             else:
                 fmt_string = _("Titles beginning with '%s'")
-            sec_text = fmt_string % (title_letters[i] if len(title_letters[i]) > 1 else title_letters[i])
+            sec_text = fmt_string % title_letters[i]
             if title_letters[i] == self.SYMBOLS:
-                content_src = f"content/{output}.html#{self.SYMBOLS}_titles"
+                content_src = f'content/{output}.html#{self.SYMBOLS}_titles'
             else:
-                content_src = f"content/{output}.html#{self.generate_unicode_name(title_letters[i])}_titles"
+                content_src = f'content/{output}.html#{self.generate_unicode_name(title_letters[i])}_titles'
 
             cm_tags = {'description': self.format_ncx_text(books, dest='description')}
             self.generate_ncx_subsection(navPointTag, sec_id, sec_text, content_src, cm_tags)
 
     def generate_ncx_by_author(self, tocTitle):
-        """ Add Authors to the basic NCX file.
+        ''' Add Authors to the basic NCX file.
 
         Generate the Authors NCX content, add to self.ncx_soup.
 
@@ -3282,24 +3279,24 @@ class CatalogBuilder:
 
         Outputs:
          ncx_soup (file): updated
-        """
+        '''
 
-        self.update_progress_full_step(_("NCX for Authors"))
+        self.update_progress_full_step(_('NCX for Authors'))
 
         def _add_to_author_list(current_author_list, current_letter):
-            current_author_list = " • ".join(current_author_list)
-            current_author_list = self.format_ncx_text(current_author_list, dest="description")
+            current_author_list = ' • '.join(current_author_list)
+            current_author_list = self.format_ncx_text(current_author_list, dest='description')
             master_author_list.append((current_author_list, current_letter))
 
-        HTML_file = "content/ByAlphaAuthor.html"
+        HTML_file = 'content/ByAlphaAuthor.html'
 
         # --- Construct the 'Books By Author' *section* ---
-        file_ID = "%s" % tocTitle.lower()
-        file_ID = file_ID.replace(" ", "")
+        file_ID = '%s' % tocTitle.lower()
+        file_ID = file_ID.replace(' ', '')
         section_header = '%s [%d]' % (tocTitle, len(self.individual_authors))
         if self.generate_for_kindle_mobi:
             section_header = tocTitle
-        navPointTag = self.generate_ncx_section_header("%s-ID" % file_ID, section_header, "%s#section_start" % HTML_file)
+        navPointTag = self.generate_ncx_section_header('%s-ID' % file_ID, section_header, '%s#section_start' % HTML_file)
 
         # Create an NCX article entry for each populated author index letter
         # Loop over the sorted_authors list, find start of each letter,
@@ -3332,22 +3329,22 @@ class CatalogBuilder:
         # Add *article* entries for each populated author initial letter
         # master_author_list{}: [0]:author list [1]:Initial letter
         for authors_by_letter in master_author_list:
-            sec_id = "%sauthors-ID" % (authors_by_letter[1])
+            sec_id = '%sauthors-ID' % (authors_by_letter[1])
             if authors_by_letter[1] == self.SYMBOLS:
-                fmt_string = _("Authors beginning with %s")
+                fmt_string = _('Authors beginning with %s')
             else:
                 fmt_string = _("Authors beginning with '%s'")
             sec_text = fmt_string % authors_by_letter[1]
             if authors_by_letter[1] == self.SYMBOLS:
-                content_src = f"{HTML_file}#{authors_by_letter[1]}_authors"
+                content_src = f'{HTML_file}#{authors_by_letter[1]}_authors'
             else:
-                content_src = f"{HTML_file}#{self.generate_unicode_name(authors_by_letter[1])}_authors"
+                content_src = f'{HTML_file}#{self.generate_unicode_name(authors_by_letter[1])}_authors'
 
             cm_tags = {'description': authors_by_letter[0]}
             self.generate_ncx_subsection(navPointTag, sec_id, sec_text, content_src, cm_tags)
 
     def generate_ncx_by_date_added(self, tocTitle):
-        """ Add Recently Added to the basic NCX file.
+        ''' Add Recently Added to the basic NCX file.
 
         Generate the Recently Added NCX content, add to self.ncx_soup.
 
@@ -3359,35 +3356,35 @@ class CatalogBuilder:
 
         Outputs:
          ncx_soup (file): updated
-        """
+        '''
 
-        self.update_progress_full_step(_("NCX for Recently Added"))
+        self.update_progress_full_step(_('NCX for Recently Added'))
 
         def _add_to_master_month_list(current_titles_list):
             book_count = len(current_titles_list)
-            current_titles_list = " • ".join(current_titles_list)
+            current_titles_list = ' • '.join(current_titles_list)
             current_titles_list = self.format_ncx_text(current_titles_list, dest='description')
             master_month_list.append((current_titles_list, current_date, book_count))
 
         def _add_to_master_date_range_list(current_titles_list):
             book_count = len(current_titles_list)
-            current_titles_list = " • ".join(current_titles_list)
+            current_titles_list = ' • '.join(current_titles_list)
             current_titles_list = self.format_ncx_text(current_titles_list, dest='description')
             master_date_range_list.append((current_titles_list, date_range, book_count))
 
-        HTML_file = "content/ByDateAdded.html"
+        HTML_file = 'content/ByDateAdded.html'
 
         # --- Construct the 'Recently Added' *section* ---
-        file_ID = "%s" % tocTitle.lower()
-        file_ID = file_ID.replace(" ", "")
-        navPointTag = self.generate_ncx_section_header("%s-ID" % file_ID, tocTitle, "%s#section_start" % HTML_file)
+        file_ID = '%s' % tocTitle.lower()
+        file_ID = file_ID.replace(' ', '')
+        navPointTag = self.generate_ncx_section_header('%s-ID' % file_ID, tocTitle, '%s#section_start' % HTML_file)
 
         # Create an NCX article entry for each date range
         current_titles_list = []
         master_date_range_list = []
         today = datetime.datetime.now()
         today_time = datetime.datetime(today.year, today.month, today.day)
-        for (i, date) in enumerate(self.DATE_RANGE):
+        for i, date in enumerate(self.DATE_RANGE):
             if i:
                 date_range = '%d to %d days ago' % (self.DATE_RANGE[i - 1], self.DATE_RANGE[i])
             else:
@@ -3396,7 +3393,7 @@ class CatalogBuilder:
             for book in self.books_by_date_range:
                 book_time = datetime.datetime(book['timestamp'].year, book['timestamp'].month, book['timestamp'].day)
                 if (today_time - book_time).days <= date_range_limit:
-                    # print "generate_ncx_by_date_added: %s added %d days ago" % (book['title'], (today_time-book_time).days)
+                    # print('generate_ncx_by_date_added: %s added %d days ago' % (book['title'], (today_time-book_time).days))
                     current_titles_list.append(book['title'])
                 else:
                     break
@@ -3407,9 +3404,9 @@ class CatalogBuilder:
         # Add *article* entries for each populated date range
         # master_date_range_list{}: [0]:titles list [1]:datestr
         for books_by_date_range in master_date_range_list:
-            sec_id = "%s-ID" % books_by_date_range[1].replace(' ', '')
+            sec_id = '%s-ID' % books_by_date_range[1].replace(' ', '')
             sec_text = books_by_date_range[1]
-            content_src = "{}#bda_{}".format(HTML_file,
+            content_src = '{}#bda_{}'.format(HTML_file,
                 books_by_date_range[1].replace(' ', ''))
             navStr = '%d titles' % books_by_date_range[2] if books_by_date_range[2] > 1 else \
                         '%d title' % books_by_date_range[2]
@@ -3419,7 +3416,7 @@ class CatalogBuilder:
         # Create an NCX article entry for each populated month
         # Loop over the booksByDate list, find start of each month,
         # add description_preview_count titles
-        # master_month_list(list,date,count)
+        # master_month_list(list, date, count)
         current_titles_list = []
         master_month_list = []
         current_date = self.books_by_month[0]['timestamp']
@@ -3443,9 +3440,9 @@ class CatalogBuilder:
         # master_months_list{}: [0]:titles list [1]:date
         for books_by_month in master_month_list:
             datestr = strftime('%B %Y', books_by_month[1].timetuple())
-            sec_id = f"bda_{books_by_month[1].year}-{books_by_month[1].month}-ID"
+            sec_id = f'bda_{books_by_month[1].year}-{books_by_month[1].month}-ID'
             sec_text = datestr
-            content_src = "{}#bda_{}-{}".format(HTML_file,
+            content_src = '{}#bda_{}-{}'.format(HTML_file,
                 books_by_month[1].year, books_by_month[1].month)
             navStr = '%d titles' % books_by_month[2] if books_by_month[2] > 1 else \
                         '%d title' % books_by_month[2]
@@ -3453,7 +3450,7 @@ class CatalogBuilder:
             self.generate_ncx_subsection(navPointTag, sec_id, sec_text, content_src, cm_tags)
 
     def generate_ncx_by_date_read(self, tocTitle):
-        """ Add By Date Read to the basic NCX file.
+        ''' Add By Date Read to the basic NCX file.
 
         Generate the By Date Read NCX content (Kindle only), add to self.ncx_soup.
 
@@ -3465,38 +3462,38 @@ class CatalogBuilder:
 
         Outputs:
          ncx_soup (file): updated
-        """
+        '''
 
         def _add_to_master_day_list(current_titles_list):
             book_count = len(current_titles_list)
-            current_titles_list = " • ".join(current_titles_list)
+            current_titles_list = ' • '.join(current_titles_list)
             current_titles_list = self.format_ncx_text(current_titles_list, dest='description')
             master_day_list.append((current_titles_list, current_date, book_count))
 
         def _add_to_master_date_range_list(current_titles_list):
             book_count = len(current_titles_list)
-            current_titles_list = " • ".join(current_titles_list)
+            current_titles_list = ' • '.join(current_titles_list)
             current_titles_list = self.format_ncx_text(current_titles_list, dest='description')
             master_date_range_list.append((current_titles_list, date_range, book_count))
 
-        self.update_progress_full_step(_("NCX for Recently Read"))
+        self.update_progress_full_step(_('NCX for Recently Read'))
 
         if not self.bookmarked_books_by_date_read:
             return
 
-        HTML_file = "content/ByDateRead.html"
+        HTML_file = 'content/ByDateRead.html'
 
         # --- Construct the 'Recently Read' *section* ---
-        file_ID = "%s" % tocTitle.lower()
-        file_ID = file_ID.replace(" ", "")
-        navPointTag = self.generate_ncx_section_header("%s-ID" % file_ID, tocTitle, "%s#section_start" % HTML_file)
+        file_ID = '%s' % tocTitle.lower()
+        file_ID = file_ID.replace(' ', '')
+        navPointTag = self.generate_ncx_section_header('%s-ID' % file_ID, tocTitle, '%s#section_start' % HTML_file)
 
         # Create an NCX article entry for each date range
         current_titles_list = []
         master_date_range_list = []
         today = datetime.datetime.now()
         today_time = datetime.datetime(today.year, today.month, today.day)
-        for (i, date) in enumerate(self.DATE_RANGE):
+        for i, date in enumerate(self.DATE_RANGE):
             if i:
                 date_range = '%d to %d days ago' % (self.DATE_RANGE[i - 1], self.DATE_RANGE[i])
             else:
@@ -3505,7 +3502,7 @@ class CatalogBuilder:
             for book in self.bookmarked_books_by_date_read:
                 bookmark_time = utcfromtimestamp(book['bookmark_timestamp'])
                 if (today_time - bookmark_time).days <= date_range_limit:
-                    # print "generate_ncx_by_date_added: %s added %d days ago" % (book['title'], (today_time-book_time).days)
+                    # print('generate_ncx_by_date_added: %s added %d days ago' % (book['title'], (today_time-book_time).days))
                     current_titles_list.append(book['title'])
                 else:
                     break
@@ -3516,7 +3513,7 @@ class CatalogBuilder:
         # Create an NCX article entry for each populated day
         # Loop over the booksByDate list, find start of each month,
         # add description_preview_count titles
-        # master_month_list(list,date,count)
+        # master_month_list(list, date, count)
         current_titles_list = []
         master_day_list = []
         current_date = utcfromtimestamp(self.bookmarked_books_by_date_read[0]['bookmark_timestamp'])
@@ -3542,11 +3539,11 @@ class CatalogBuilder:
         # master_day_list{}: [0]:titles list [1]:date
         for books_by_day in master_day_list:
             datestr = strftime('%A, %B %d', books_by_day[1].timetuple())
-            sec_id = "bdr_{}-{}-{}ID".format(books_by_day[1].year,
+            sec_id = 'bdr_{}-{}-{}ID'.format(books_by_day[1].year,
                                                             books_by_day[1].month,
                                                             books_by_day[1].day)
             sec_text = datestr
-            content_src = "{}#bdr_{}-{}-{}".format(HTML_file,
+            content_src = '{}#bdr_{}-{}-{}'.format(HTML_file,
                                                         books_by_day[1].year,
                                                         books_by_day[1].month,
                                                         books_by_day[1].day)
@@ -3556,7 +3553,7 @@ class CatalogBuilder:
             self.generate_ncx_subsection(navPointTag, sec_id, sec_text, content_src, cm_tags)
 
     def generate_ncx_by_genre(self, tocTitle):
-        """ Add Genres to the basic NCX file.
+        ''' Add Genres to the basic NCX file.
 
         Generate the Genre NCX content, add to self.ncx_soup.
 
@@ -3568,26 +3565,26 @@ class CatalogBuilder:
 
         Outputs:
          ncx_soup (file): updated
-        """
+        '''
 
-        self.update_progress_full_step(_("NCX for genres"))
+        self.update_progress_full_step(_('NCX for genres'))
 
         if not len(self.genres):
-            self.opts.log.warn(" No genres found\n"
-                                " No Genre section added to Catalog")
+            self.opts.log.warn(' No genres found\n'
+                                ' No Genre section added to Catalog')
             return
 
         # --- Construct the 'Books By Genre' *section* ---
-        file_ID = "%s" % tocTitle.lower()
-        file_ID = file_ID.replace(" ", "")
+        file_ID = '%s' % tocTitle.lower()
+        file_ID = file_ID.replace(' ', '')
         section_header = '%s [%d]' % (tocTitle, len(self.genres))
         if self.generate_for_kindle_mobi:
             section_header = tocTitle
-        navPointTag = self.generate_ncx_section_header("%s-ID" % file_ID, section_header, "content/Genre_%s.html#section_start" % self.genres[0]['tag'])
+        navPointTag = self.generate_ncx_section_header('%s-ID' % file_ID, section_header, 'content/Genre_%s.html#section_start' % self.genres[0]['tag'])
 
         for genre in self.genres:
             # Add an article for each genre
-            sec_id = "genre-%s-ID" % genre['tag']
+            sec_id = 'genre-%s-ID' % genre['tag']
             # GwR *** Can this be optimized?
             normalized_tag = None
             for friendly_tag in self.genre_tags_dict:
@@ -3595,21 +3592,21 @@ class CatalogBuilder:
                     normalized_tag = self.genre_tags_dict[friendly_tag]
                     break
             sec_text = self.format_ncx_text(NavigableString(friendly_tag), dest='description')
-            content_src = f"content/Genre_{normalized_tag}.html#Genre_{normalized_tag}"
+            content_src = f'content/Genre_{normalized_tag}.html#Genre_{normalized_tag}'
             if len(genre['titles_spanned']) > 1:
-                author_range = "{} - {}".format(genre['titles_spanned'][0][0], genre['titles_spanned'][1][0])
+                author_range = '{} - {}'.format(genre['titles_spanned'][0][0], genre['titles_spanned'][1][0])
             else:
-                author_range = "%s" % (genre['titles_spanned'][0][0])
+                author_range = '%s' % (genre['titles_spanned'][0][0])
             titles = []
             for title in genre['books']:
                 titles.append(title['title'])
             titles = sorted(titles, key=lambda x: (self.generate_sort_title(x), self.generate_sort_title(x)))
-            titles_list = self.generate_short_description(" • ".join(titles), dest="description")
+            titles_list = self.generate_short_description(' • '.join(titles), dest='description')
             cm_tags = {'author': author_range, 'description': self.format_ncx_text(titles_list, dest='description')}
             self.generate_ncx_subsection(navPointTag, sec_id, sec_text, content_src, cm_tags)
 
     def generate_opf(self):
-        """ Generate the OPF file.
+        ''' Generate the OPF file.
 
         Start with header template, construct manifest, spine and guide.
 
@@ -3624,9 +3621,9 @@ class CatalogBuilder:
 
         Outputs:
          opts.basename + '.opf' (file): written
-        """
+        '''
 
-        self.update_progress_full_step(_("Generating OPF"))
+        self.update_progress_full_step(_('Generating OPF'))
         lang = get_lang() or 'en'
         if lang_as_iso639_1(lang):
             lang = lang_as_iso639_1(lang)
@@ -3648,7 +3645,7 @@ class CatalogBuilder:
                 title=prepare_string_for_xml(self.opts.catalog_title),
                 creator=prepare_string_for_xml(self.opts.creator),
                 lang=prepare_string_for_xml(lang),
-                pt="periodical:default" if self.generate_for_kindle_mobi else ""
+                pt='periodical:default' if self.generate_for_kindle_mobi else ''
         )
         root = safe_xml_fromstring(header)
         manifest = root.xpath('//*[local-name()="manifest"]')[0]
@@ -3662,40 +3659,40 @@ class CatalogBuilder:
                 makeelement('itemref', spine, idref=id)
             return ans
 
-        manifest_item(id='ncx', href='%s.ncx' % self.opts.basename, media_type="application/x-dtbncx+xml")
+        manifest_item(id='ncx', href='%s.ncx' % self.opts.basename, media_type='application/x-dtbncx+xml')
         manifest_item(id='stylesheet', href=self.stylesheet, media_type='text/css')
 
         if self.generate_for_kindle_mobi:
-            manifest_item('mastheadimage-image', "images/mastheadImage.gif", 'image/gif')
+            manifest_item('mastheadimage-image', 'images/mastheadImage.gif', 'image/gif')
 
         # Write the thumbnail images, descriptions to the manifest
         if self.opts.generate_descriptions:
             for thumb in self.thumbs:
                 end = thumb.find('.jpg')
-                manifest_item("%s-image" % thumb[:end], "images/%s" % (thumb), 'image/jpeg')
+                manifest_item('%s-image' % thumb[:end], 'images/%s' % (thumb), 'image/jpeg')
 
         # Add html_files to manifest and spine
         for file in self.html_filelist_1:
             # By Author, By Title, By Series,
             start = file.find('/') + 1
             end = file.find('.')
-            manifest_item(file[start:end].lower(), file, "application/xhtml+xml", add_to_spine=True)
+            manifest_item(file[start:end].lower(), file, 'application/xhtml+xml', add_to_spine=True)
 
         # Add genre files to manifest and spine
         for genre in self.genres:
             start = genre['file'].find('/') + 1
             end = genre['file'].find('.')
-            manifest_item(genre['file'][start:end].lower(), genre['file'], "application/xhtml+xml", add_to_spine=True)
+            manifest_item(genre['file'][start:end].lower(), genre['file'], 'application/xhtml+xml', add_to_spine=True)
 
         for file in self.html_filelist_2:
             # By Date Added, By Date Read
             start = file.find('/') + 1
             end = file.find('.')
-            manifest_item(file[start:end].lower(), file, "application/xhtml+xml", add_to_spine=True)
+            manifest_item(file[start:end].lower(), file, 'application/xhtml+xml', add_to_spine=True)
 
         for book in self.books_by_description:
             # manifest
-            manifest_item("book%d" % int(book['id']), "content/book_%d.html" % int(book['id']), "application/xhtml+xml", add_to_spine=True)
+            manifest_item('book%d' % int(book['id']), 'content/book_%d.html' % int(book['id']), 'application/xhtml+xml', add_to_spine=True)
 
         # Guide
         if self.generate_for_kindle_mobi:
@@ -3704,11 +3701,11 @@ class CatalogBuilder:
         # Write the OPF file
         pretty_opf(root), pretty_xml_tree(root)
         output = etree.tostring(root, encoding='utf-8')
-        with open(f"{self.catalog_path}/{self.opts.basename}.opf", 'wb') as outfile:
+        with open(f'{self.catalog_path}/{self.opts.basename}.opf', 'wb') as outfile:
             outfile.write(output.strip())
 
     def generate_rating_string(self, book):
-        """ Generate rating string for Descriptions.
+        ''' Generate rating string for Descriptions.
 
         Starting with database rating (0-10), return 5 stars, with 0-5 filled,
         balance empty.
@@ -3718,7 +3715,7 @@ class CatalogBuilder:
 
         Return:
          rating (str): 5 stars, 1-5 solid, balance empty. Empty str for no rating.
-        """
+        '''
 
         rating = ''
         try:
@@ -3734,7 +3731,7 @@ class CatalogBuilder:
         return rating
 
     def generate_series_anchor(self, series):
-        """ Generate legal XHTML anchor for series names.
+        ''' Generate legal XHTML anchor for series names.
 
         Flatten series name to ascii_legal text.
 
@@ -3743,16 +3740,16 @@ class CatalogBuilder:
 
         Return:
          (str): asciized version of series name
-        """
+        '''
 
         # Generate a legal XHTML id/href string
         if self.letter_or_symbol(series) == self.SYMBOLS:
-            return "symbol_%s_series" % re.sub(r'\W', '', series).lower()
+            return 'symbol_%s_series' % re.sub(r'\W', '', series).lower()
         else:
-            return "%s_series" % re.sub(r'\W', '', ascii_text(series)).lower()
+            return '%s_series' % re.sub(r'\W', '', ascii_text(series)).lower()
 
     def generate_short_description(self, description, dest=None):
-        """ Generate a truncated version of the supplied string.
+        ''' Generate a truncated version of the supplied string.
 
         Given a string and NCX destination, truncate string to length specified
         in self.opts.
@@ -3766,15 +3763,15 @@ class CatalogBuilder:
 
         Return:
          (str): truncated description
-        """
+        '''
 
         def _short_description(description, limit):
-            short_description = ""
+            short_description = ''
             words = description.split()
             for word in words:
-                short_description += word + " "
+                short_description += word + ' '
                 if len(short_description) > limit:
-                    short_description += "..."
+                    short_description += '...'
                     return short_description
 
         if not description:
@@ -3798,7 +3795,7 @@ class CatalogBuilder:
             raise RuntimeError
 
     def generate_sort_title(self, title):
-        """ Generates a sort string from title.
+        ''' Generates a sort string from title.
 
         Based on trunk title_sort algorithm, but also accommodates series
         numbers by padding with leading zeroes to force proper numeric
@@ -3810,7 +3807,7 @@ class CatalogBuilder:
 
         Return:
          (str): sort string
-        """
+        '''
 
         from calibre.ebooks.metadata import title_sort
         from calibre.library.catalogs.utils import NumberToText
@@ -3819,7 +3816,7 @@ class CatalogBuilder:
         title_words = title_sort(title).split()
         translated = []
 
-        for (i, word) in enumerate(title_words):
+        for i, word in enumerate(title_words):
             # Leading numbers optionally translated to text equivalent
             # Capitalize leading sort word
             if i == 0:
@@ -3828,7 +3825,7 @@ class CatalogBuilder:
                     # if self.opts.numbers_as_text and re.match('[0-9]+',word[0]):
                     translated.append(NumberToText(word).text.capitalize())
                 else:
-                    if re.match('[0-9]+', word[0]):
+                    if re.match(r'[0-9]+', word[0]):
                         word = word.replace(',', '')
                         suffix = re.search(r'[\D]', word)
                         if suffix:
@@ -3844,7 +3841,7 @@ class CatalogBuilder:
                     translated.append(capitalize(word))
 
             else:
-                if re.search('[0-9]+', word[0]):
+                if re.search(r'[0-9]+', word[0]):
                     word = word.replace(',', '')
                     suffix = re.search(r'[\D]', word)
                     if suffix:
@@ -3855,7 +3852,7 @@ class CatalogBuilder:
         return ' '.join(translated)
 
     def generate_thumbnail(self, title, image_dir, thumb_file):
-        """ Create thumbnail of cover or return previously cached thumb.
+        ''' Create thumbnail of cover or return previously cached thumb.
 
         Test thumb archive for currently cached cover. Return cached version, or create
         and cache new version.
@@ -3868,7 +3865,7 @@ class CatalogBuilder:
         Output:
          (file): thumb written to /images
          (archive): current thumb archived under cover crc
-        """
+        '''
         from calibre.utils.img import scale_image
 
         def _open_archive(mode='r'):
@@ -3918,7 +3915,7 @@ class CatalogBuilder:
                         zf.writestr(uuid + cover_crc, thumb_data)
 
     def generate_thumbnails(self):
-        """ Generate a thumbnail cover for each book.
+        ''' Generate a thumbnail cover for each book.
 
         Generate or retrieve a thumbnail for each cover. If nonexistent or faulty
         cover data, substitute default cover. Checks for updated default cover.
@@ -3929,15 +3926,15 @@ class CatalogBuilder:
 
         Output:
          thumbs (list): list of referenced thumbnails
-        """
+        '''
 
-        self.update_progress_full_step(_("Thumbnails"))
+        self.update_progress_full_step(_('Thumbnails'))
         thumbs = ['thumbnail_default.jpg']
-        image_dir = "%s/images" % self.catalog_path
-        for (i, title) in enumerate(self.books_by_title):
+        image_dir = '%s/images' % self.catalog_path
+        for i, title in enumerate(self.books_by_title):
             # Update status
-            self.update_progress_micro_step("%s %d of %d" %
-                (_("Thumbnail"), i, len(self.books_by_title)),
+            self.update_progress_micro_step('%s %d of %d' %
+                (_('Thumbnail'), i, len(self.books_by_title)),
                  i / float(len(self.books_by_title)))
 
             thumb_file = 'thumbnail_%d.jpg' % int(title['id'])
@@ -3945,7 +3942,7 @@ class CatalogBuilder:
             valid_cover = True
             try:
                 self.generate_thumbnail(title, image_dir, thumb_file)
-                thumbs.append("thumbnail_%d.jpg" % int(title['id']))
+                thumbs.append('thumbnail_%d.jpg' % int(title['id']))
             except:
                 if 'cover' in title and os.path.exists(title['cover']):
                     valid_cover = False
@@ -3960,8 +3957,8 @@ class CatalogBuilder:
             if not thumb_generated:
                 self.opts.log.warn("     using default cover for '%s' (%d)" % (title['title'], title['id']))
                 # Confirm thumb exists, default is current
-                default_thumb_fp = os.path.join(image_dir, "thumbnail_default.jpg")
-                cover = os.path.join(self.catalog_path, "DefaultCover.png")
+                default_thumb_fp = os.path.join(image_dir, 'thumbnail_default.jpg')
+                cover = os.path.join(self.catalog_path, 'DefaultCover.png')
                 title['cover'] = cover
 
                 if not os.path.exists(cover):
@@ -3975,14 +3972,14 @@ class CatalogBuilder:
                     thumb_timestamp = os.path.getmtime(default_thumb_fp)
                     if thumb_timestamp < cover_timestamp:
                         if self.DEBUG and self.opts.verbose:
-                            self.opts.log.warn("updating thumbnail_default for %s" % title['title'])
+                            self.opts.log.warn('updating thumbnail_default for %s' % title['title'])
                         self.generate_thumbnail(title, image_dir,
-                                            "thumbnail_default.jpg" if valid_cover else thumb_file)
+                                            'thumbnail_default.jpg' if valid_cover else thumb_file)
                 else:
                     if self.DEBUG and self.opts.verbose:
-                        self.opts.log.warn("     generating new thumbnail_default.jpg")
+                        self.opts.log.warn('     generating new thumbnail_default.jpg')
                     self.generate_thumbnail(title, image_dir,
-                                            "thumbnail_default.jpg" if valid_cover else thumb_file)
+                                            'thumbnail_default.jpg' if valid_cover else thumb_file)
                 # Clear the book's cover property
                 title['cover'] = None
 
@@ -3998,7 +3995,7 @@ class CatalogBuilder:
         self.thumbs = thumbs
 
     def generate_unicode_name(self, c):
-        """ Generate a legal XHTML anchor from unicode character.
+        ''' Generate a legal XHTML anchor from unicode character.
 
         Generate a legal XHTML anchor from unicode character.
 
@@ -4007,13 +4004,13 @@ class CatalogBuilder:
 
         Return:
          (str): legal XHTML anchor string of unicode character name
-        """
+        '''
         fullname = ''.join(unicodedata.name(str(cc)) for cc in c)
         terms = fullname.split()
-        return "_".join(terms)
+        return '_'.join(terms)
 
     def get_excluded_tags(self):
-        """ Get excluded_tags from opts.exclusion_rules.
+        ''' Get excluded_tags from opts.exclusion_rules.
 
         Parse opts.exclusion_rules for tags to be excluded, return list.
         Log books that will be excluded by excluded_tags.
@@ -4023,7 +4020,7 @@ class CatalogBuilder:
 
         Return:
          excluded_tags (list): excluded tags
-        """
+        '''
         excluded_tags = []
         for rule in self.opts.exclusion_rules:
             if rule[1] == _('Tags'):
@@ -4034,7 +4031,7 @@ class CatalogBuilder:
 
         # Report excluded books
         if excluded_tags:
-            self.opts.log.info(" Books excluded by tag:")
+            self.opts.log.info(' Books excluded by tag:')
             data = self.db.get_data_as_dict(ids=self.opts.ids)
             for record in data:
                 matched = list(set(record['tags']) & set(excluded_tags))
@@ -4047,7 +4044,7 @@ class CatalogBuilder:
         return excluded_tags
 
     def get_friendly_genre_tag(self, genre):
-        """ Return the first friendly_tag matching genre.
+        ''' Return the first friendly_tag matching genre.
 
         Scan self.genre_tags_dict[] for first friendly_tag matching genre.
         genre_tags_dict[] populated in filter_genre_tags().
@@ -4057,27 +4054,27 @@ class CatalogBuilder:
 
         Return:
          friendly_tag (str): friendly_tag matching genre
-        """
+        '''
         # Find the first instance of friendly_tag matching genre
         for friendly_tag in self.genre_tags_dict:
             if self.genre_tags_dict[friendly_tag] == genre:
                 return friendly_tag
 
     def get_output_profile(self, _opts):
-        """ Return profile matching opts.output_profile
+        ''' Return profile matching opts.output_profile
 
         Input:
          _opts (object): build options object
 
         Return:
          (profile): output profile matching name
-        """
+        '''
         for profile in output_profiles():
             if profile.short_name == _opts.output_profile:
                 return profile
 
     def get_prefix_rules(self):
-        """ Convert opts.prefix_rules to dict.
+        ''' Convert opts.prefix_rules to dict.
 
         Convert opts.prefix_rules to dict format. The model for a prefix rule is
         ('<rule name>','<#source_field_lookup>','<pattern>','<prefix>')
@@ -4087,7 +4084,7 @@ class CatalogBuilder:
 
         Return:
          (list): list of prefix_rules dicts
-        """
+        '''
         pr = []
         if self.opts.prefix_rules:
             try:
@@ -4099,12 +4096,12 @@ class CatalogBuilder:
                     prefix_rule['prefix'] = rule[3]
                     pr.append(prefix_rule)
             except:
-                self.opts.log.error("malformed prefix_rules: %s" % repr(self.opts.prefix_rules))
+                self.opts.log.error('malformed prefix_rules: %s' % repr(self.opts.prefix_rules))
                 raise
         return pr
 
     def letter_or_symbol(self, char):
-        """ Test asciized char for A-z.
+        ''' Test asciized char for A-z.
 
         Convert char to ascii, test for A-z.
 
@@ -4113,14 +4110,14 @@ class CatalogBuilder:
 
         Return:
          (str): char if A-z, else SYMBOLS
-        """
-        if not re.search('[a-zA-Z]', ascii_text(char)):
+        '''
+        if not re.search(r'[a-zA-Z]', ascii_text(char)):
             return self.SYMBOLS
         else:
             return char
 
     def load_section_templates(self):
-        """ Add section templates to local namespace.
+        ''' Add section templates to local namespace.
 
         Load section templates from resource directory. If user has made local copies,
         these will be used for individual section generation.
@@ -4133,7 +4130,7 @@ class CatalogBuilder:
 
         Results:
          (strs): section templates added to local namespace
-        """
+        '''
 
         for line in P('catalog/section_list_templates.conf', data=True).decode('utf-8').splitlines():
             line = line.lstrip()
@@ -4146,7 +4143,7 @@ class CatalogBuilder:
                     setattr(self, key, val)
 
     def merge_comments(self, record):
-        """ Merge comments with custom column content.
+        ''' Merge comments with custom column content.
 
         Merge comments from book metadata with user-specified custom column
          content, optionally before or after. Optionally insert <hr> between
@@ -4157,7 +4154,7 @@ class CatalogBuilder:
 
         Return:
          merged (str): comments merged with addendum
-        """
+        '''
 
         merged = ''
         if record['description']:
@@ -4194,7 +4191,7 @@ class CatalogBuilder:
         return merged
 
     def process_exclusions(self, data_set):
-        """ Filter data_set based on exclusion_rules.
+        ''' Filter data_set based on exclusion_rules.
 
         Compare each book in data_set to each exclusion_rule. Remove
          books matching exclusion criteria.
@@ -4204,7 +4201,7 @@ class CatalogBuilder:
 
         Return:
          (list): filtered data_set
-        """
+        '''
         filtered_data_set = []
         exclusion_pairs = []
         exclusion_set = []
@@ -4217,7 +4214,7 @@ class CatalogBuilder:
                 continue
         if exclusion_pairs:
             if self.opts.verbose:
-                self.opts.log.info(" Books excluded by custom field contents:")
+                self.opts.log.info(' Books excluded by custom field contents:')
 
             for record in data_set:
                 for exclusion_pair in exclusion_pairs:
@@ -4272,7 +4269,7 @@ class CatalogBuilder:
             return data_set
 
     def relist_multiple_authors(self, books_by_author):
-        """ Create multiple entries for books with multiple authors
+        ''' Create multiple entries for books with multiple authors
 
         Given a list of books by author, scan list for books with multiple
         authors. Add a cloned copy of the book per additional author.
@@ -4284,7 +4281,7 @@ class CatalogBuilder:
         Return:
          (list): books_by_author with additional cloned entries for books with
          multiple authors
-        """
+        '''
 
         multiple_author_books = []
 
@@ -4309,7 +4306,7 @@ class CatalogBuilder:
         return books_by_author
 
     def update_progress_full_step(self, description):
-        """ Update calibre's job status UI.
+        ''' Update calibre's job status UI.
 
         Call ProgessReporter() with updates.
 
@@ -4318,7 +4315,7 @@ class CatalogBuilder:
 
         Result:
          (UI): Jobs UI updated
-        """
+        '''
 
         self.current_step += 1
         self.progress_string = description
@@ -4327,16 +4324,16 @@ class CatalogBuilder:
             self.progress_int = 0.01
         self.reporter(self.progress_int, self.progress_string)
         if self.opts.cli_environment:
-            log_msg = f"{self.progress_int * 100:3.0f}% {self.progress_string}"
+            log_msg = f'{self.progress_int * 100:3.0f}% {self.progress_string}'
             if self.opts.verbose:
-                log_msg += " (%s)" % str(datetime.timedelta(seconds=int(time.time() - self.opts.start_time)))
+                log_msg += ' (%s)' % str(datetime.timedelta(seconds=int(time.time() - self.opts.start_time)))
         else:
-            log_msg = ("{} ({})".format(self.progress_string,
+            log_msg = ('{} ({})'.format(self.progress_string,
                 str(datetime.timedelta(seconds=int(time.time() - self.opts.start_time)))))
         self.opts.log(log_msg)
 
     def update_progress_micro_step(self, description, micro_step_pct):
-        """ Update calibre's job status UI.
+        ''' Update calibre's job status UI.
 
         Called from steps requiring more time:
          generate_html_descriptions()
@@ -4348,7 +4345,7 @@ class CatalogBuilder:
 
         Results:
          (UI): Jobs UI updated
-        """
+        '''
 
         step_range = 100 / self.total_steps
         self.progress_string = description
@@ -4358,7 +4355,7 @@ class CatalogBuilder:
         self.reporter(self.progress_int, self.progress_string)
 
     def write_ncx(self):
-        """ Write accumulated ncx_soup to file.
+        ''' Write accumulated ncx_soup to file.
 
         Expanded description
 
@@ -4368,10 +4365,10 @@ class CatalogBuilder:
 
         Output:
          (file): basename.NCX written
-        """
+        '''
 
-        self.update_progress_full_step(_("Saving NCX"))
+        self.update_progress_full_step(_('Saving NCX'))
         pretty_xml_tree(self.ncx_root)
         ncx = etree.tostring(self.ncx_root, encoding='utf-8')
-        with open(f"{self.catalog_path}/{self.opts.basename}.ncx", 'wb') as outfile:
+        with open(f'{self.catalog_path}/{self.opts.basename}.ncx', 'wb') as outfile:
             outfile.write(ncx)
diff --git a/src/calibre/library/catalogs/utils.py b/src/calibre/library/catalogs/utils.py
index b28ac28d02..32c6edff65 100644
--- a/src/calibre/library/catalogs/utils.py
+++ b/src/calibre/library/catalogs/utils.py
@@ -19,11 +19,11 @@ class NumberToText:  # {{{
     4:56    => four fifty-six
     '''
     ORDINALS = ['zeroth','first','second','third','fourth','fifth','sixth','seventh','eighth','ninth']
-    lessThanTwenty = ["<zero>","one","two","three","four","five","six","seven","eight","nine",
-                        "ten","eleven","twelve","thirteen","fourteen","fifteen","sixteen","seventeen",
-                        "eighteen","nineteen"]
-    tens = ["<zero>","<tens>","twenty","thirty","forty","fifty","sixty","seventy","eighty","ninety"]
-    hundreds = ["<zero>","one","two","three","four","five","six","seven","eight","nine"]
+    lessThanTwenty = ['<zero>','one','two','three','four','five','six','seven','eight','nine',
+                        'ten','eleven','twelve','thirteen','fourteen','fifteen','sixteen','seventeen',
+                        'eighteen','nineteen']
+    tens = ['<zero>','<tens>','twenty','thirty','forty','fifty','sixty','seventy','eighty','ninety']
+    hundreds = ['<zero>','one','two','three','four','five','six','seven','eight','nine']
 
     def __init__(self, number, verbose=False):
         self.number = number
@@ -37,31 +37,31 @@ class NumberToText:  # {{{
         # Convert intToTranslate to string
         # intToTranslate is a three-digit number
 
-        tensComponentString = ""
+        tensComponentString = ''
         hundredsComponent = intToTranslate - (intToTranslate % 100)
         tensComponent = intToTranslate % 100
 
         # Build the hundreds component
         if hundredsComponent:
-            hundredsComponentString = "%s hundred" % self.hundreds[hundredsComponent//100]
+            hundredsComponentString = '%s hundred' % self.hundreds[hundredsComponent//100]
         else:
-            hundredsComponentString = ""
+            hundredsComponentString = ''
 
         # Build the tens component
         if tensComponent < 20:
             tensComponentString = self.lessThanTwenty[tensComponent]
         else:
-            tensPart = ""
-            onesPart = ""
+            tensPart = ''
+            onesPart = ''
 
             # Get the tens part
             tensPart = self.tens[tensComponent // 10]
             onesPart = self.lessThanTwenty[tensComponent % 10]
 
             if intToTranslate % 10:
-                tensComponentString = f"{tensPart}-{onesPart}"
+                tensComponentString = f'{tensPart}-{onesPart}'
             else:
-                tensComponentString = "%s" % tensPart
+                tensComponentString = '%s' % tensPart
 
         # Concatenate the results
         result = ''
@@ -70,29 +70,29 @@ class NumberToText:  # {{{
         elif not hundredsComponent and tensComponent:
             result = tensComponentString
         elif hundredsComponent and tensComponent:
-            result = hundredsComponentString + " " + tensComponentString
+            result = hundredsComponentString + ' ' + tensComponentString
         else:
-            prints(" NumberToText.stringFromInt(): empty result translating %d" % intToTranslate)
+            prints(' NumberToText.stringFromInt(): empty result translating %d' % intToTranslate)
         return result
 
     def numberTranslate(self):
         hundredsNumber = 0
         thousandsNumber = 0
-        hundredsString = ""
-        thousandsString = ""
-        resultString = ""
+        hundredsString = ''
+        thousandsString = ''
+        resultString = ''
         self.suffix = ''
 
         if self.verbose:
-            self.log("numberTranslate(): %s" % self.number)
+            self.log('numberTranslate(): %s' % self.number)
 
         # Special case ordinals
-        if re.search('[st|nd|rd|th]',self.number):
-            self.number = re.sub(',','',self.number)
+        if re.search(r'[st|nd|rd|th]',self.number):
+            self.number = self.number.replace(',', '')
             ordinal_suffix = re.search(r'[\D]', self.number)
-            ordinal_number = re.sub(r'\D','',re.sub(',','',self.number))
+            ordinal_number = re.sub(r'\D','',self.number.replace(',', ''))
             if self.verbose:
-                self.log("Ordinal: %s" % ordinal_number)
+                self.log('Ordinal: %s' % ordinal_number)
             self.number_as_float = ordinal_number
             self.suffix = self.number[ordinal_suffix.start():]
             if int(ordinal_number) > 9:
@@ -102,39 +102,39 @@ class NumberToText:  # {{{
                 self.text = '%s' % (self.ORDINALS[int(ordinal_number)])
 
         # Test for time
-        elif re.search(':',self.number):
+        elif ':' in self.number:
             if self.verbose:
-                self.log("Time: %s" % self.number)
-            self.number_as_float = re.sub(':','.',self.number)
-            time_strings = self.number.split(":")
+                self.log('Time: %s' % self.number)
+            self.number_as_float = self.number.replace(':', '.')
+            time_strings = self.number.split(':')
             hours = NumberToText(time_strings[0]).text
             minutes = NumberToText(time_strings[1]).text
             self.text = f'{hours.capitalize()}-{minutes}'
 
         # Test for %
-        elif re.search('%', self.number):
+        elif '%' in self.number:
             if self.verbose:
-                self.log("Percent: %s" % self.number)
+                self.log('Percent: %s' % self.number)
             self.number_as_float = self.number.split('%')[0]
             self.text = NumberToText(self.number.replace('%',' percent')).text
 
         # Test for decimal
-        elif re.search('\\.',self.number):
+        elif '.' in self.number:
             if self.verbose:
-                self.log("Decimal: %s" % self.number)
+                self.log('Decimal: %s' % self.number)
             self.number_as_float = self.number
-            decimal_strings = self.number.split(".")
+            decimal_strings = self.number.split('.')
             left = NumberToText(decimal_strings[0]).text
             right = NumberToText(decimal_strings[1]).text
             self.text = f'{left.capitalize()} point {right}'
 
         # Test for hyphenated
-        elif re.search('-', self.number):
+        elif '-' in self.number:
             if self.verbose:
-                self.log("Hyphenated: %s" % self.number)
+                self.log('Hyphenated: %s' % self.number)
             self.number_as_float = self.number.split('-')[0]
             strings = self.number.split('-')
-            if re.search('[0-9]+', strings[0]):
+            if re.search(r'[0-9]+', strings[0]):
                 left = NumberToText(strings[0]).text
                 right = strings[1]
             else:
@@ -143,16 +143,16 @@ class NumberToText:  # {{{
             self.text = f'{left}-{right}'
 
         # Test for only commas and numbers
-        elif re.search(',', self.number) and not re.search('[^0-9,]',self.number):
+        elif ',' in self.number and not re.search(r'[^0-9,]',self.number):
             if self.verbose:
-                self.log("Comma(s): %s" % self.number)
-            self.number_as_float = re.sub(',','',self.number)
+                self.log('Comma(s): %s' % self.number)
+            self.number_as_float = self.number.replace(',', '')
             self.text = NumberToText(self.number_as_float).text
 
         # Test for hybrid e.g., 'K2, 2nd, 10@10'
-        elif re.search('[\\D]+', self.number):
+        elif re.search(r'[\D]+', self.number):
             if self.verbose:
-                self.log("Hybrid: %s" % self.number)
+                self.log('Hybrid: %s' % self.number)
             # Split the token into number/text
             number_position = re.search(r'\d',self.number).start()
             text_position = re.search(r'\D',self.number).start()
@@ -167,7 +167,7 @@ class NumberToText:  # {{{
 
         else:
             if self.verbose:
-                self.log("Clean: %s" % self.number)
+                self.log('Clean: %s' % self.number)
             try:
                 self.float_as_number = float(self.number)
                 number = int(self.number)
@@ -175,21 +175,21 @@ class NumberToText:  # {{{
                 return
 
             if number > 10**9:
-                self.text = "%d out of range" % number
+                self.text = '%d out of range' % number
                 return
 
             if number == 10**9:
-                self.text = "one billion"
-            else :
+                self.text = 'one billion'
+            else:
                 # Isolate the three-digit number groups
                 millionsNumber  = number//10**6
                 thousandsNumber = (number - (millionsNumber * 10**6))//10**3
                 hundredsNumber  = number - (millionsNumber * 10**6) - (thousandsNumber * 10**3)
                 if self.verbose:
-                    print(f"Converting {millionsNumber} {thousandsNumber} {hundredsNumber}")
+                    print(f'Converting {millionsNumber} {thousandsNumber} {hundredsNumber}')
 
                 # Convert hundredsNumber
-                if hundredsNumber :
+                if hundredsNumber:
                     hundredsString = self.stringFromInt(hundredsNumber)
 
                 # Convert thousandsNumber
@@ -209,16 +209,16 @@ class NumberToText:  # {{{
                 # Concatenate the strings
                 resultString = ''
                 if millionsNumber:
-                    resultString += "%s million " % millionsString
+                    resultString += '%s million ' % millionsString
 
                 if thousandsNumber:
-                    resultString += "%s thousand " % thousandsString
+                    resultString += '%s thousand ' % thousandsString
 
                 if hundredsNumber:
-                    resultString += "%s" % hundredsString
+                    resultString += '%s' % hundredsString
 
                 if not millionsNumber and not thousandsNumber and not hundredsNumber:
-                    resultString = "zero"
+                    resultString = 'zero'
 
                 if self.verbose:
                     self.log('resultString: %s' % resultString)
diff --git a/src/calibre/library/check_library.py b/src/calibre/library/check_library.py
index 90b80d3ac0..ef990d963d 100644
--- a/src/calibre/library/check_library.py
+++ b/src/calibre/library/check_library.py
@@ -185,7 +185,7 @@ class CheckLibrary:
         return False
 
     def process_book(self, lib, book_info):
-        (db_path, title_dir, book_id) = book_info
+        db_path, title_dir, book_id = book_info
         filenames = frozenset(f for f in os.listdir(os.path.join(lib, db_path))
                                if not self.ignore_name(f) and (
                                    os.path.splitext(f)[1] not in self.ignore_ext or
diff --git a/src/calibre/library/coloring.py b/src/calibre/library/coloring.py
index e6c491295f..255cd08730 100644
--- a/src/calibre/library/coloring.py
+++ b/src/calibre/library/coloring.py
@@ -114,9 +114,9 @@ class Rule:  # {{{
 
     def ondevice_condition(self, col, action, val):
         if action == 'is set':
-            return "ondevice()"
+            return 'ondevice()'
         if action == 'is not set':
-            return "!ondevice()"
+            return '!ondevice()'
 
     def bool_condition(self, col, action, val):
         test = {'is true':      '0, 0, 1',
@@ -129,9 +129,9 @@ class Rule:  # {{{
 
     def number_condition(self, col, action, val):
         if action == 'is set':
-            return f"${col}"
+            return f'${col}'
         if action == 'is not set':
-            return f"!${col}"
+            return f'!${col}'
         lt, eq, gt = {
                 'eq': ('', '1', ''),
                 'lt': ('1', '', ''),
@@ -144,9 +144,9 @@ class Rule:  # {{{
 
     def rating_condition(self, col, action, val):
         if action == 'is set':
-            return f"${col}"
+            return f'${col}'
         if action == 'is not set':
-            return f"!${col}"
+            return f'!${col}'
         lt, eq, gt = {
                 'eq': ('', '1', ''),
                 'lt': ('1', '', ''),
@@ -176,9 +176,9 @@ class Rule:  # {{{
                             "format_date(today(), 'yyyy-MM-dd')), '1', '', ''), '')")
                      %(col, val, col))
         if action == 'is set':
-            return (f"${col}")
+            return (f'${col}')
         if action == 'is not set':
-            return (f"!${col}")
+            return (f'!${col}')
         if action == 'is today':
             return f"substr(format_date(raw_field('{col}'), 'iso'), 0, 10) == substr(today(), 0, 10)"
         lt, eq, gt = {
@@ -192,9 +192,9 @@ class Rule:  # {{{
         if not sep or sep == '|':
             sep = ','
         if action == 'is set':
-            return f"${col}"
+            return f'${col}'
         if action == 'is not set':
-            return f"!${col}"
+            return f'!${col}'
         if action == 'has':
             return "str_in_list(field('%s'), '%s', \"%s\", '1', '')"%(col, sep, val)
         if action == 'does not have':
@@ -206,9 +206,9 @@ class Rule:  # {{{
 
     def text_condition(self, col, action, val):
         if action == 'is set':
-            return f"${col}"
+            return f'${col}'
         if action == 'is not set':
-            return f"!${col}"
+            return f'!${col}'
         if action == 'is':
             return "strcmp(field('%s'), \"%s\", '', '1', '')"%(col, val)
         if action == 'is not':
diff --git a/src/calibre/library/comments.py b/src/calibre/library/comments.py
index 661fe829de..0c30d8b319 100644
--- a/src/calibre/library/comments.py
+++ b/src/calibre/library/comments.py
@@ -11,7 +11,7 @@ from calibre.utils.html2text import html2text
 
 # Hackish - ignoring sentences ending or beginning in numbers to avoid
 # confusion with decimal points.
-lost_cr_pat = re.compile('([a-z])([\\.\\?!])([A-Z])')
+lost_cr_pat = re.compile(r'([a-z])([\.\?!])([A-Z])')
 lost_cr_exception_pat = re.compile(r'(Ph\.D)|(D\.Phil)|((Dr|Mr|Mrs|Ms)\.[A-Z])')
 sanitize_pat = re.compile(r'<script|<table|<tr|<td|<th|<style|<iframe',
         re.IGNORECASE)
@@ -91,7 +91,7 @@ def comments_to_html(comments):
     all_tokens = list(soup.contents)
     inline_tags = ('br', 'b', 'i', 'em', 'strong', 'span', 'font', 'a', 'hr')
     for token in all_tokens:
-        if isinstance(token,  (CData, Comment, Declaration, ProcessingInstruction)):
+        if isinstance(token, (CData, Comment, Declaration, ProcessingInstruction)):
             continue
         if isinstance(token, NavigableString):
             if not open_pTag:
diff --git a/src/calibre/library/custom_columns.py b/src/calibre/library/custom_columns.py
index 7d6fe96593..4a512cc4d2 100644
--- a/src/calibre/library/custom_columns.py
+++ b/src/calibre/library/custom_columns.py
@@ -184,10 +184,10 @@ class CustomColumns:
         self.custom_data_adapters = {
                 'float': adapt_number,
                 'int':   adapt_number,
-                'rating':lambda x,d : x if x is None else min(10., max(0., float(x))),
+                'rating':lambda x,d: x if x is None else min(10., max(0., float(x))),
                 'bool':  adapt_bool,
                 'comments': lambda x,d: adapt_text(x, {'is_multiple':False}),
-                'datetime' : adapt_datetime,
+                'datetime': adapt_datetime,
                 'text':adapt_text,
                 'series':adapt_text,
                 'enumeration': adapt_enum
@@ -257,11 +257,11 @@ class CustomColumns:
             if ans is UNDEFINED_DATE:
                 ans = None
         if data['datatype'] != 'series':
-            return (ans, None)
+            return ans, None
         ign,lt = self.custom_table_names(data['num'])
         extra = self.conn.get('''SELECT extra FROM %s
                                  WHERE book=?'''%lt, (idx,), all=False)
-        return (ans, extra)
+        return ans, extra
 
     # convenience methods for tag editing
     def get_custom_items_with_ids(self, label=None, num=None):
@@ -547,7 +547,7 @@ class CustomColumns:
         val = self.custom_data_adapters[data['datatype']](val, data)
 
         if data['datatype'] == 'series' and extra is None:
-            (val, extra) = self._get_series_values(val)
+            val, extra = self._get_series_values(val)
             if extra is None:
                 extra = 1.0
 
@@ -628,7 +628,7 @@ class CustomColumns:
 
     def clean_custom(self):
         st = ('DELETE FROM {table} WHERE (SELECT COUNT(id) FROM {lt} WHERE'
-           ' {lt}.value={table}.id) < 1;')
+            ' {lt}.value={table}.id) < 1;')
         statements = []
         for data in self.custom_column_num_map.values():
             if data['normalized']:
@@ -674,7 +674,7 @@ class CustomColumns:
             editable=True, display={}):
         if not label:
             raise ValueError(_('No label was provided'))
-        if re.match('^\\w*$', label) is None or not label[0].isalpha() or label.lower() != label:
+        if re.match(r'^\w*$', label) is None or not label[0].isalpha() or label.lower() != label:
             raise ValueError(_('The label must contain only lower case letters, digits and underscores, and start with a letter'))
         if datatype not in self.CUSTOM_DATA_TYPES:
             raise ValueError('%r is not a supported data type'%datatype)
diff --git a/src/calibre/library/database.py b/src/calibre/library/database.py
index 2058cc6c2a..9a606c504e 100644
--- a/src/calibre/library/database.py
+++ b/src/calibre/library/database.py
@@ -55,8 +55,8 @@ class Connection(sqlite.Connection):
 def _connect(path):
     if isinstance(path, str):
         path = path.encode('utf-8')
-    conn =  sqlite.connect(path, factory=Connection, detect_types=sqlite.PARSE_DECLTYPES|sqlite.PARSE_COLNAMES)
-    conn.row_factory = lambda cursor, row : list(row)
+    conn = sqlite.connect(path, factory=Connection, detect_types=sqlite.PARSE_DECLTYPES|sqlite.PARSE_COLNAMES)
+    conn.row_factory = lambda cursor, row: list(row)
     conn.create_aggregate('concat', 1, Concatenate)
     title_pat = re.compile(r'^(A|The|An)\s+', re.IGNORECASE)
 
@@ -822,10 +822,10 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
                 func(self.conn)
 
     def close(self):
-        #        global _lock_file
-        #        _lock_file.close()
-        #        os.unlink(_lock_file.name)
-        #        _lock_file = None
+        # global _lock_file
+        # _lock_file.close()
+        # os.unlink(_lock_file.name)
+        # _lock_file = None
         self.conn.close()
 
     @property
@@ -841,16 +841,16 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
         Rebuild self.data and self.cache. Filter results are lost.
         '''
         FIELDS = {
-                  'title'        : 'sort',
-                  'authors'      : 'author_sort',
-                  'publisher'    : 'publisher',
-                  'size'         : 'size',
-                  'date'         : 'timestamp',
-                  'timestamp'    : 'timestamp',
-                  'formats'      : 'formats',
-                  'rating'       : 'rating',
-                  'tags'         : 'tags',
-                  'series'       : 'series',
+                  'title'    : 'sort',
+                  'authors'  : 'author_sort',
+                  'publisher': 'publisher',
+                  'size'     : 'size',
+                  'date'     : 'timestamp',
+                  'timestamp': 'timestamp',
+                  'formats'  : 'formats',
+                  'rating'   : 'rating',
+                  'tags'     : 'tags',
+                  'series'   : 'series',
                  }
         field = FIELDS[sort_field]
         order = 'ASC'
@@ -1462,13 +1462,13 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
 
 class SearchToken:
 
-    FIELD_MAP = {'title'       : 1,
-                  'author'      : 2,
-                  'publisher'   : 3,
-                  'tag'         : 7,
-                  'comments'    : 8,
-                  'series'      : 9,
-                  'format'      : 13,
+    FIELD_MAP = {'title'     : 1,
+                  'author'   : 2,
+                  'publisher': 3,
+                  'tag'      : 7,
+                  'comments' : 8,
+                  'series'   : 9,
+                  'format'   : 13,
                  }
 
     def __init__(self, text_token):
@@ -1504,11 +1504,11 @@ def text_to_tokens(text):
         text = match.group(1)
         OR = True
     tokens = []
-    quot = re.search('"(.*?)"', text)
+    quot = re.search(r'"(.*?)"', text)
     while quot:
         tokens.append(quot.group(1))
         text = text.replace('"'+quot.group(1)+'"', '')
-        quot = re.search('"(.*?)"', text)
+        quot = re.search(r'"(.*?)"', text)
     tokens += text.split(' ')
     ans = []
     for i in tokens:
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index ef8d4d1c2a..ec633a2d44 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -440,10 +440,10 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         lines.extend([custom_map[x] for x in custom_cols])
 
         self.FIELD_MAP = {'id':0, 'title':1, 'authors':2, 'timestamp':3,
-             'size':4, 'rating':5, 'tags':6, 'comments':7, 'series':8,
-             'publisher':9, 'series_index':10, 'sort':11, 'author_sort':12,
-             'formats':13, 'path':14, 'pubdate':15, 'uuid':16, 'cover':17,
-             'au_map':18, 'last_modified':19, 'identifiers':20, 'languages':21}
+            'size':4, 'rating':5, 'tags':6, 'comments':7, 'series':8,
+            'publisher':9, 'series_index':10, 'sort':11, 'author_sort':12,
+            'formats':13, 'path':14, 'pubdate':15, 'uuid':16, 'cover':17,
+            'au_map':18, 'last_modified':19, 'identifiers':20, 'languages':21}
 
         for k,v in iteritems(self.FIELD_MAP):
             self.field_metadata.set_field_record_index(k, v, prefer_custom=False)
@@ -839,9 +839,9 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         '''
         with self.dirtied_lock:
             dc_sequence = self.dirtied_cache.get(book_id, None)
-            # print 'clear_dirty: check book', book_id, dc_sequence
+            # print('clear_dirty: check book', book_id, dc_sequence)
             if dc_sequence is None or sequence is None or dc_sequence == sequence:
-                # print 'needs to be cleaned'
+                # print('needs to be cleaned')
                 self.conn.execute('DELETE FROM metadata_dirtied WHERE book=?',
                         (book_id,))
                 self.conn.commit()
@@ -850,7 +850,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                 except:
                     pass
             elif dc_sequence is not None:
-                # print 'book needs to be done again'
+                # print('book needs to be done again')
                 pass
 
     def dump_metadata(self, book_ids=None, remove_from_dirtied=True,
@@ -908,12 +908,12 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         self.update_last_modified(book_ids)
         for book in book_ids:
             with self.dirtied_lock:
-                # print 'dirtied: check id', book
+                # print('dirtied: check id', book)
                 if book in self.dirtied_cache:
                     self.dirtied_cache[book] = self.dirtied_sequence
                     self.dirtied_sequence += 1
                     continue
-                # print 'book not already dirty'
+                # print('book not already dirty')
 
                 self.conn.execute(
                     'INSERT OR IGNORE INTO metadata_dirtied (book) VALUES (?)',
@@ -937,8 +937,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                 # reason.
                 id_ = list(self.dirtied_cache.keys())[random.randint(0, l-1)]
                 sequence = self.dirtied_cache[id_]
-                return (id_, sequence)
-            return (None, None)
+                return id_, sequence
+            return None, None
 
     def dirty_queue_length(self):
         return len(self.dirtied_cache)
@@ -964,7 +964,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         # thread has not done the work between the put and the get_metadata
         with self.dirtied_lock:
             sequence = self.dirtied_cache.get(idx, None)
-        # print 'get_md_for_dump', idx, sequence
+        # print('get_md_for_dump', idx, sequence)
         try:
             # While a book is being created, the path is empty. Don't bother to
             # try to write the opf, because it will go to the wrong folder.
@@ -979,7 +979,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
             # This almost certainly means that the book has been deleted while
             # the backup operation sat in the queue.
             pass
-        return (path, mi, sequence)
+        return path, mi, sequence
 
     def get_metadata(self, idx, index_is_id=False, get_cover=False,
                      get_user_categories=True, cover_as_data=False):
@@ -1402,8 +1402,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
             raise NoSuchFormat('Record %d has no %s file'%(id_, fmt))
         if windows_atomic_move is not None:
             if not isinstance(dest, string_or_bytes):
-                raise Exception("Error, you must pass the dest as a path when"
-                        " using windows_atomic_move")
+                raise Exception('Error, you must pass the dest as a path when'
+                        ' using windows_atomic_move')
             if dest:
                 if samefile(path, dest):
                     # Ensure that the file has the same case as dest
@@ -1458,8 +1458,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         path = os.path.join(self.library_path, self.path(id, index_is_id=True), 'cover.jpg')
         if windows_atomic_move is not None:
             if not isinstance(dest, string_or_bytes):
-                raise Exception("Error, you must pass the dest as a path when"
-                        " using windows_atomic_move")
+                raise Exception('Error, you must pass the dest as a path when'
+                        ' using windows_atomic_move')
             if os.access(path, os.R_OK) and dest and not samefile(dest, path):
                 windows_atomic_move.copy_path_to(path, dest)
                 return True
@@ -1864,7 +1864,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                 md.append((category, cat['rec_index'],
                            cat['is_multiple'].get('cache_to_list', None),
                            cat['datatype'] == 'composite'))
-        # print 'end phase "collection":', time.clock() - last, 'seconds'
+        # print('end phase "collection":', time.clock() - last, 'seconds')
         # last = time.clock()
 
         # Now scan every book looking for category items.
@@ -1896,7 +1896,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                             item.rc += 1
                         continue
                     try:
-                        (item_id, sort_val) = tid_cat[val]  # let exceptions fly
+                        item_id, sort_val = tid_cat[val]  # let exceptions fly
                         item = tcats_cat.get(val, None)
                         if not item:
                             item = tag_class(val, sort_val)
@@ -1918,7 +1918,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                                 tid_cat[val] = (val, val)
                     for val in vals:
                         try:
-                            (item_id, sort_val) = tid_cat[val]  # let exceptions fly
+                            item_id, sort_val = tid_cat[val]  # let exceptions fly
                             item = tcats_cat.get(val, None)
                             if not item:
                                 item = tag_class(val, sort_val)
@@ -1932,7 +1932,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                         except:
                             prints('get_categories: item', val, 'is not in', cat, 'list!')
 
-        # print 'end phase "books":', time.clock() - last, 'seconds'
+        # print('end phase "books":', time.clock() - last, 'seconds')
         # last = time.clock()
 
         # Now do news
@@ -1953,7 +1953,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
             item.set_all(c=r[2], rt=r[2]*r[3], rc=r[2], id=r[0])
             tcategories['news'][r[1]] = item
 
-        # print 'end phase "news":', time.clock() - last, 'seconds'
+        # print('end phase "news":', time.clock() - last, 'seconds')
         # last = time.clock()
 
         # Build the real category list by iterating over the temporary copy
@@ -1989,7 +1989,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
             if datatype == 'rating':
                 def formatter(x):
                     return ('★' * int(x // 2))
-                def avgr(x):  # noqa
+                def avgr(x):
                     return x.n
                 # eliminate the zero ratings line as well as count == 0
                 items = [v for v in tcategories[category].values() if v.c > 0 and v.n != 0]
@@ -2030,7 +2030,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
             else:
                 use_sort_as_name = False
             is_editable = (category not in ['news', 'rating', 'languages'] and
-                                datatype != "composite")
+                                datatype != 'composite')
             categories[category] = [tag_class(formatter(r.n), count=r.c, id=r.id,
                                         avg=avgr(r), sort=r.s,
                                         category=category,
@@ -2038,7 +2038,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                                         use_sort_as_name=use_sort_as_name)
                                     for r in items]
 
-        # print 'end phase "tags list":', time.clock() - last, 'seconds'
+        # print('end phase "tags list":', time.clock() - last, 'seconds')
         # last = time.clock()
 
         # Needed for legacy databases that have multiple ratings that
@@ -2119,7 +2119,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         # temporarily duplicating the categories lists.
         taglist = {}
         for c in categories.keys():
-            taglist[c] = dict(map(lambda t:(icu_lower(t.name), t), categories[c]))
+            taglist[c] = {icu_lower(t.name): t for t in categories[c]}
 
         muc = self.prefs.get('grouped_search_make_user_categories', [])
         gst = self.prefs.get('grouped_search_terms', {})
@@ -2165,7 +2165,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                     sorted(items, key=lambda x: sort_key(x.sort))
             else:
                 categories[cat_name] = \
-                    sorted(items, key=lambda x:x.avg_rating, reverse=True)
+                    sorted(items, key=lambda x: x.avg_rating, reverse=True)
 
         # ### Finally, the saved searches category ####
         items = []
@@ -2181,8 +2181,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                 icon_map['search'] = icon_map['search']
             categories['search'] = items
 
-        # print 'last phase ran in:', time.clock() - last, 'seconds'
-        # print 'get_categories ran in:', time.clock() - start, 'seconds'
+        # print('last phase ran in:', time.clock() - last, 'seconds')
+        # print('get_categories ran in:', time.clock() - start, 'seconds')
 
         return categories
 
@@ -2509,7 +2509,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                 for bk in books_to_refresh:
                     ss = self.author_sort_from_book(id, index_is_id=True)
                     aus = self.author_sort(bk, index_is_id=True)
-                    if strcmp(aus, ss) ==  0:
+                    if strcmp(aus, ss) == 0:
                         self._update_author_in_cache(bk, ss, final_authors)
         # This can repeat what was done above in rare cases. Let it.
         ss = self.author_sort_from_book(id, index_is_id=True)
@@ -3187,7 +3187,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
 
     def set_series(self, id, series, notify=True, commit=True, allow_case_change=True):
         self.conn.execute('DELETE FROM books_series_link WHERE book=?',(id,))
-        (series, idx) = self._get_series_values(series)
+        series, idx = self._get_series_values(series)
         books_to_refresh = {id}
         if series:
             case_change = False
@@ -3545,8 +3545,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
             paths    = [duplicate[0] for duplicate in duplicates]
             formats  = [duplicate[1] for duplicate in duplicates]
             metadata = [duplicate[2] for duplicate in duplicates]
-            return (paths, formats, metadata), (ids if return_ids else
-                    len(ids))
+            return (paths, formats, metadata), (ids if return_ids else len(ids))
         return None, (ids if return_ids else len(ids))
 
     def import_book(self, mi, formats, notify=True, import_hooks=True,
diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py
index c3c8a45ec8..2f00d88c3b 100644
--- a/src/calibre/library/field_metadata.py
+++ b/src/calibre/library/field_metadata.py
@@ -28,15 +28,15 @@ category_icon_map = {
                     'languages'  : 'languages.png',
             }
 
-# Builtin metadata {{{
 
+# Builtin metadata {{{
 
 def _builtin_field_metadata():
     # This is a function so that changing the UI language allows newly created
     # field metadata objects to have correctly translated labels for builtin
     # fields.
     return [
-            ('authors',   {'table':'authors',
+            ('authors', {'table':'authors',
                            'column':'name',
                            'link_column':'author',
                            'category_sort':'sort',
@@ -65,7 +65,7 @@ def _builtin_field_metadata():
                            'is_category':True,
                            'is_csp': False}),
 
-            ('series',    {'table':'series',
+            ('series', {'table':'series',
                            'column':'name',
                            'link_column':'series',
                            'category_sort':'(title_sort(name))',
@@ -77,7 +77,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':True,
                            'is_csp': False}),
-            ('formats',   {'table':None,
+            ('formats', {'table':None,
                            'column':None,
                            'datatype':'text',
                            'is_multiple':{'cache_to_list': ',',
@@ -101,7 +101,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':True,
                            'is_csp': False}),
-            ('rating',    {'table':'ratings',
+            ('rating', {'table':'ratings',
                            'column':'rating',
                            'link_column':'rating',
                            'category_sort':'rating',
@@ -113,7 +113,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':True,
                            'is_csp': False}),
-            ('news',      {'table':'news',
+            ('news', {'table':'news',
                            'column':'name',
                            'category_sort':'name',
                            'datatype':None,
@@ -124,7 +124,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':True,
                            'is_csp': False}),
-            ('tags',      {'table':'tags',
+            ('tags', {'table':'tags',
                            'column':'name',
                            'link_column': 'tag',
                            'category_sort':'name',
@@ -138,7 +138,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':True,
                            'is_csp': False}),
-            ('identifiers',   {'table':None,
+            ('identifiers', {'table':None,
                            'column':None,
                            'datatype':'text',
                            'is_multiple':{'cache_to_list': ',',
@@ -160,7 +160,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
-            ('au_map',    {'table':None,
+            ('au_map', {'table':None,
                            'column':None,
                            'datatype':'text',
                            'is_multiple':{'cache_to_list': ',',
@@ -172,7 +172,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
-            ('comments',  {'table':None,
+            ('comments', {'table':None,
                            'column':None,
                            'datatype':'text',
                            'is_multiple':{},
@@ -182,7 +182,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
-            ('cover',     {'table':None,
+            ('cover', {'table':None,
                            'column':None,
                            'datatype':'int',
                            'is_multiple':{},
@@ -192,7 +192,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
-            ('id',        {'table':None,
+            ('id', {'table':None,
                            'column':None,
                            'datatype':'int',
                            'is_multiple':{},
@@ -212,7 +212,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
-            ('ondevice',  {'table':None,
+            ('ondevice', {'table':None,
                            'column':None,
                            'datatype':'text',
                            'is_multiple':{},
@@ -222,7 +222,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
-            ('path',      {'table':None,
+            ('path', {'table':None,
                            'column':None,
                            'datatype':'text',
                            'is_multiple':{},
@@ -232,7 +232,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
-            ('pubdate',   {'table':None,
+            ('pubdate', {'table':None,
                            'column':None,
                            'datatype':'datetime',
                            'is_multiple':{},
@@ -242,7 +242,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
-            ('marked',    {'table':None,
+            ('marked', {'table':None,
                            'column':None,
                            'datatype':'text',
                            'is_multiple':{},
@@ -272,7 +272,7 @@ def _builtin_field_metadata():
                              'is_custom':False,
                              'is_category':False,
                            'is_csp': False}),
-            ('series_sort',  {'table':None,
+            ('series_sort', {'table':None,
                            'column':None,
                            'datatype':'text',
                            'is_multiple':{},
@@ -282,7 +282,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
-            ('sort',      {'table':None,
+            ('sort', {'table':None,
                            'column':None,
                            'datatype':'text',
                            'is_multiple':{},
@@ -292,7 +292,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
-            ('size',      {'table':None,
+            ('size', {'table':None,
                            'column':None,
                            'datatype':'float',
                            'is_multiple':{},
@@ -312,7 +312,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
-            ('title',     {'table':None,
+            ('title', {'table':None,
                            'column':None,
                            'datatype':'text',
                            'is_multiple':{},
@@ -322,7 +322,7 @@ def _builtin_field_metadata():
                            'is_custom':False,
                            'is_category':False,
                            'is_csp': False}),
-            ('uuid',      {'table':None,
+            ('uuid', {'table':None,
                            'column':None,
                            'datatype':'text',
                            'is_multiple':{},
@@ -575,7 +575,7 @@ class FieldMetadata:
                              'colnum':colnum,      'display':display,
                              'is_custom':True,     'is_category':is_category,
                              'link_column':'value','category_sort':'value',
-                             'is_csp' : is_csp,     'is_editable': is_editable,}
+                             'is_csp': is_csp,     'is_editable': is_editable,}
         self._tb_custom_fields[key] = self._tb_cats[key]
         self._add_search_terms_to_map(key, [key])
         self.custom_label_to_key_map[label] = key
diff --git a/src/calibre/library/prefs.py b/src/calibre/library/prefs.py
index 08f6b9daa8..fd7d3c19c1 100644
--- a/src/calibre/library/prefs.py
+++ b/src/calibre/library/prefs.py
@@ -85,7 +85,7 @@ class DBPrefs(dict):
             data = json.dumps(self, indent=2, default=to_json)
             if not isinstance(data, bytes):
                 data = data.encode('utf-8')
-            with open(to_filename, "wb") as f:
+            with open(to_filename, 'wb') as f:
                 f.write(data)
         except:
             import traceback
@@ -96,7 +96,7 @@ class DBPrefs(dict):
         try:
             from_filename = os.path.join(library_path,
                     'metadata_db_prefs_backup.json')
-            with open(from_filename, "rb") as f:
+            with open(from_filename, 'rb') as f:
                 d = json.load(f, object_hook=from_json)
                 if not recreate_prefs:
                     return d
diff --git a/src/calibre/library/restore.py b/src/calibre/library/restore.py
index f1e953721a..32331b9116 100644
--- a/src/calibre/library/restore.py
+++ b/src/calibre/library/restore.py
@@ -82,8 +82,8 @@ class Restore(Thread):
 
         if self.conflicting_custom_cols:
             ans += '\n\n'
-            ans += 'The following custom columns have conflicting definitions ' \
-                    'and were not fully restored:\n'
+            ans += ('The following custom columns have conflicting definitions '
+                    'and were not fully restored:\n')
             for x in self.conflicting_custom_cols:
                 ans += '\t#'+x+'\n'
                 ans += '\tused:\t%s, %s, %s, %s\n'%(self.custom_columns[x][1],
@@ -203,7 +203,7 @@ class Restore(Thread):
         alm = mi.get('author_link_map', {})
         for author, link in iteritems(alm):
             existing_link, timestamp = self.authors_links.get(author, (None, None))
-            if existing_link is None or existing_link != link and timestamp < mi.timestamp:
+            if existing_link is None or (existing_link != link and timestamp < mi.timestamp):
                 self.authors_links[author] = (link, mi.timestamp)
 
     def create_cc_metadata(self):
diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py
index 9485189666..d984c946a2 100644
--- a/src/calibre/library/save_to_disk.py
+++ b/src/calibre/library/save_to_disk.py
@@ -29,26 +29,26 @@ plugboard_save_to_disk_value = 'save_to_disk'
 DEFAULT_TEMPLATE = '{author_sort}/{title}/{title} - {authors}'
 DEFAULT_SEND_TEMPLATE = '{author_sort}/{title} - {authors}'
 
-FORMAT_ARG_DESCS = dict(
-        title=_('The title'),
-        authors=_('The authors'),
-        author_sort=_('The author sort string. To use only the first letter '
+FORMAT_ARG_DESCS = {
+        'title': _('The title'),
+        'authors': _('The authors'),
+        'author_sort': _('The author sort string. To use only the first letter '
             'of the name use {author_sort[0]}'),
-        tags=_('The tags'),
-        series=_('The series'),
-        series_index=_('The series number. '
+        'tags': _('The tags'),
+        'series': _('The series'),
+        'series_index': _('The series number. '
             'To get leading zeros use {series_index:0>3s} or '
             '{series_index:>3s} for leading spaces'),
-        rating=_('The rating'),
-        isbn=_('The ISBN'),
-        publisher=_('The publisher'),
-        timestamp=_('The date'),
-        pubdate=_('The published date'),
-        last_modified=_('The date when the metadata for this book record'
+        'rating': _('The rating'),
+        'isbn': _('The ISBN'),
+        'publisher': _('The publisher'),
+        'timestamp': _('The date'),
+        'pubdate': _('The published date'),
+        'last_modified': _('The date when the metadata for this book record'
             ' was last modified'),
-        languages=_('The language(s) of this book'),
-        id=_('The calibre internal id')
-        )
+        'languages': _('The language(s) of this book'),
+        'id': _('The calibre internal id')
+}
 
 FORMAT_ARGS = {}
 for x in FORMAT_ARG_DESCS:
diff --git a/src/calibre/library/sqlite.py b/src/calibre/library/sqlite.py
index 8b195860e8..9b56d3a27f 100644
--- a/src/calibre/library/sqlite.py
+++ b/src/calibre/library/sqlite.py
@@ -84,7 +84,7 @@ def convert_bool(val):
     return val != '0'
 
 
-sqlite.register_adapter(bool, lambda x : 1 if x else 0)
+sqlite.register_adapter(bool, lambda x: 1 if x else 0)
 sqlite.register_converter(native_string_type('bool'), convert_bool)
 sqlite.register_converter(native_string_type('BOOL'), convert_bool)
 
@@ -258,7 +258,7 @@ def do_connect(path, row_factory=None):
     conn.create_aggregate('sortconcat_amper', 2, SortedConcatenateAmper)
     conn.create_aggregate('identifiers_concat', 2, IdentifiersConcat)
     load_c_extensions(conn)
-    conn.row_factory = sqlite.Row if row_factory else (lambda cursor, row : list(row))
+    conn.row_factory = sqlite.Row if row_factory else (lambda cursor, row: list(row))
     conn.create_aggregate('concat', 1, Concatenate)
     conn.create_aggregate('aum_sortconcat', 4, AumSortedConcatenate)
     conn.create_collation(native_string_type('PYNOCASE'), partial(pynocase,
@@ -266,7 +266,7 @@ def do_connect(path, row_factory=None):
     conn.create_function('title_sort', 1, title_sort)
     conn.create_function('author_to_author_sort', 1,
             _author_to_author_sort)
-    conn.create_function('uuid4', 0, lambda : str(uuid.uuid4()))
+    conn.create_function('uuid4', 0, lambda: str(uuid.uuid4()))
     # Dummy functions for dynamically created filters
     conn.create_function('books_list_filter', 1, lambda x: 1)
     conn.create_collation(native_string_type('icucollate'), icu_collator)
diff --git a/src/calibre/libunzip.py b/src/calibre/libunzip.py
index 0138826a21..60015d0010 100644
--- a/src/calibre/libunzip.py
+++ b/src/calibre/libunzip.py
@@ -42,9 +42,9 @@ def update(pathtozip, patterns, filepaths, names, compression=zipfile.ZIP_DEFLAT
 
 
 def extract(filename, dir):
-    """
+    '''
     Extract archive C{filename} into directory C{dir}
-    """
+    '''
     zf = zipfile.ZipFile(filename)
     zf.extractall(dir)
 
diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index 5d5a6fdef5..0dd03a5417 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -22,24 +22,24 @@ from polyglot.builtins import iteritems
 
 entry_points = {
         'console_scripts': [
-             'ebook-device         = calibre.devices.cli:main',
-             'ebook-meta           = calibre.ebooks.metadata.cli:main',
-             'ebook-convert        = calibre.ebooks.conversion.cli:main',
-             'ebook-polish         = calibre.ebooks.oeb.polish.main:main',
-             'markdown-calibre     = markdown.__main__:run',
-             'web2disk             = calibre.web.fetch.simple:main',
-             'calibre-server       = calibre.srv.standalone:main',
-             'lrf2lrs              = calibre.ebooks.lrf.lrfparser:main',
-             'lrs2lrf              = calibre.ebooks.lrf.lrs.convert_from:main',
-             'calibre-debug        = calibre.debug:main',
-             'calibredb            = calibre.db.cli.main:main',
-             'calibre-parallel     = calibre.utils.ipc.worker:main',
-             'calibre-customize    = calibre.customize.ui:main',
-             'calibre-complete     = calibre.utils.complete:main',
-             'fetch-ebook-metadata = calibre.ebooks.metadata.sources.cli:main',
-             'calibre-smtp         = calibre.utils.smtp:main',
+            'ebook-device         = calibre.devices.cli:main',
+            'ebook-meta           = calibre.ebooks.metadata.cli:main',
+            'ebook-convert        = calibre.ebooks.conversion.cli:main',
+            'ebook-polish         = calibre.ebooks.oeb.polish.main:main',
+            'markdown-calibre     = markdown.__main__:run',
+            'web2disk             = calibre.web.fetch.simple:main',
+            'calibre-server       = calibre.srv.standalone:main',
+            'lrf2lrs              = calibre.ebooks.lrf.lrfparser:main',
+            'lrs2lrf              = calibre.ebooks.lrf.lrs.convert_from:main',
+            'calibre-debug        = calibre.debug:main',
+            'calibredb            = calibre.db.cli.main:main',
+            'calibre-parallel     = calibre.utils.ipc.worker:main',
+            'calibre-customize    = calibre.customize.ui:main',
+            'calibre-complete     = calibre.utils.complete:main',
+            'fetch-ebook-metadata = calibre.ebooks.metadata.sources.cli:main',
+            'calibre-smtp         = calibre.utils.smtp:main',
         ],
-        'gui_scripts' : [
+        'gui_scripts': [
             __appname__+' = calibre.gui_launch:calibre',
             'lrfviewer    = calibre.gui2.lrf_renderer.main:main',
             'ebook-viewer = calibre.gui_launch:ebook_viewer',
@@ -103,8 +103,8 @@ class PreserveMIMEDefaults:  # {{{
                         raise
 # }}}
 
-# Uninstall script {{{
 
+# Uninstall script {{{
 
 UNINSTALL = '''\
 #!/bin/sh
@@ -236,8 +236,8 @@ CALIBRE_LINUX_INSTALLER_HEREDOC
 
 # }}}
 
-# Completion {{{
 
+# Completion {{{
 
 class ZshCompleter:  # {{{
 
@@ -287,7 +287,7 @@ class ZshCompleter:  # {{{
                 if opt.dest in {'extract_to', 'debug_pipeline', 'to_dir', 'outbox', 'with_library', 'library_path'}:
                     arg += "'_path_files -/'"
                 elif opt.choices:
-                    arg += "(%s)"%'|'.join(opt.choices)
+                    arg += '(%s)'%'|'.join(opt.choices)
                 elif set(file_map).intersection(set(opt._long_opts)):
                     k = tuple(set(file_map).intersection(set(opt._long_opts)))
                     exts = file_map[k[0]]
@@ -295,9 +295,9 @@ class ZshCompleter:  # {{{
                         exts = ('*.%s'%x for x in sorted(exts + [x.upper() for x in exts]))
                         arg += "'_files -g \"%s\"'" % ' '.join(exts)
                     else:
-                        arg += "_files"
+                        arg += '_files'
                 elif (opt.dest in {'pidfile', 'attachment'}):
-                    arg += "_files"
+                    arg += '_files'
                 elif set(opf_opts).intersection(set(opt._long_opts)):
                     arg += "'_files -g \"*.opf\"'"
                 elif set(cover_opts).intersection(set(opt._long_opts)):
@@ -408,17 +408,17 @@ class ZshCompleter:  # {{{
         w('\n_ebook_convert() {')
         w('\n  local iarg oarg context state_descr state line\n  typeset -A opt_args\n  local ret=1')
         w("\n  _arguments '1: :_ebc_input_args' '*::ebook-convert output:->args' && ret=0")
-        w("\n  case $state in \n  (args)")
+        w('\n  case $state in \n  (args)')
         w('\n    iarg=${line[1]##*.}; ')
         w("\n    _arguments '1: :_ebc_output_args' '*::ebook-convert options:->args' && ret=0")
-        w("\n     case $state in \n    (args)")
+        w('\n     case $state in \n    (args)')
 
         w('\n      oarg=${line[1]##*.}')
         w('\n      iarg="_ebc_input_opts_${(L)iarg}"; oarg="_ebc_output_opts_${(L)oarg}"')
         w('\n      _call_function - $iarg; _call_function - $oarg; _ebc_common_opts; ret=0')
         w('\n    ;;\n    esac')
 
-        w("\n  ;;\n  esac\n  return ret")
+        w('\n  ;;\n  esac\n  return ret')
         w('\n}\n')
 
     def do_ebook_edit(self, f):
@@ -489,7 +489,7 @@ _ebook_edit() {{
         w('    "--version:Show version"\n')
         for command, desc in iteritems(descs):
             w('    "%s:%s"\n'%(
-                command, desc.replace(':', '\\:').replace('"', '\'')))
+                command, desc.replace(':', '\\:').replace('"', "'")))
         w('  )\n  _describe -t commands "calibredb command" commands \n}\n')
 
         subcommands = []
@@ -1031,7 +1031,7 @@ def opts_and_words(name, op, words, takes_files=False):
     esac
 
 }
-complete -F _'''%(opts, words) + fname + ' ' + name +"\n\n").encode('utf-8')
+complete -F _'''%(opts, words) + fname + ' ' + name +'\n\n').encode('utf-8')
 
 
 pics = ['bmp', 'gif', 'jpeg', 'jpg', 'png']  # keep sorted alphabetically
@@ -1052,7 +1052,7 @@ def opts_and_exts(name, op, exts, cover_opts=('--cover',), opf_opts=(),
          ;;
     '''
     extras = []
-    for eopts, eexts in ((cover_opts, "${pics}"), (opf_opts, "'@(opf)'")):
+    for eopts, eexts in ((cover_opts, '${pics}'), (opf_opts, "'@(opf)'")):
         for opt in eopts:
             extras.append(special_exts_template%(opt, eexts))
     extras = '\n'.join(extras)
@@ -1085,7 +1085,7 @@ def opts_and_exts(name, op, exts, cover_opts=('--cover',), opf_opts=(),
 
 }
 complete -o filenames -F _'''%dict(pics=spics,
-    opts=opts, extras=extras, exts=exts) + fname + ' ' + name +"\n\n").encode('utf-8')
+    opts=opts, extras=extras, exts=exts) + fname + ' ' + name +'\n\n').encode('utf-8')
 
 
 VIEWER = '''\
@@ -1156,7 +1156,7 @@ def get_appdata():
             'summary':_('The one stop solution to all your e-book needs'),
             'description':(
                 _('calibre is the one stop solution to all your e-book needs.'),
-                _('You can use calibre to catalog your books, fetch metadata for them automatically, convert them from and to all the various e-book formats, send them to your e-book reader devices, read the books on your computer, edit the books in a dedicated e-book editor and even make them available over the network with the built-in Content server. You can also download news and periodicals in e-book format from over a thousand different news and magazine websites.')  # noqa
+                _('You can use calibre to catalog your books, fetch metadata for them automatically, convert them from and to all the various e-book formats, send them to your e-book reader devices, read the books on your computer, edit the books in a dedicated e-book editor and even make them available over the network with the built-in Content server. You can also download news and periodicals in e-book format from over a thousand different news and magazine websites.')  # noqa: E501
             ),
             'screenshots':(
                 (1408, 792, 'https://lh4.googleusercontent.com/-bNE1hc_3pIc/UvHLwKPGBPI/AAAAAAAAASA/8oavs_c6xoU/w1408-h792-no/main-default.png',),
@@ -1172,7 +1172,7 @@ def get_appdata():
             'summary':_('Edit the text and styles inside e-books'),
             'description':(
                 _('The calibre E-book editor allows you to edit the text and styles inside the book with a live preview of your changes.'),
-                _('It can edit books in both the EPUB and AZW3 (Kindle) formats. It includes various useful tools for checking the book for errors, editing the Table of Contents, performing automated cleanups, etc.'),  # noqa
+                _('It can edit books in both the EPUB and AZW3 (Kindle) formats. It includes various useful tools for checking the book for errors, editing the Table of Contents, performing automated cleanups, etc.'),  # noqa: E501
             ),
             'screenshots':(
                 (1408, 792, 'https://lh5.googleusercontent.com/-M2MAVc3A8e4/UvHMWqGRa8I/AAAAAAAAATA/cecQeWUYBVs/w1408-h792-no/edit-default.png',),
diff --git a/src/calibre/prints.py b/src/calibre/prints.py
index 75f095b2ee..14120b0e3b 100644
--- a/src/calibre/prints.py
+++ b/src/calibre/prints.py
@@ -46,6 +46,7 @@ def prints(*a, **kw):
         except Exception:
             pass
 
+
 def debug_print(*args, **kw):
     '''
     Prints debug information to the console if debugging is enabled.
diff --git a/src/calibre/ptempfile.py b/src/calibre/ptempfile.py
index 3fb5f87783..29a90e97e2 100644
--- a/src/calibre/ptempfile.py
+++ b/src/calibre/ptempfile.py
@@ -1,9 +1,9 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-"""
+'''
 Provides platform independent temporary files that persist even after
 being closed.
-"""
+'''
 import atexit
 import os
 import tempfile
@@ -157,16 +157,15 @@ def _make_dir(suffix, prefix, base):
 
 
 class PersistentTemporaryFile:
-
-    """
+    '''
     A file-like object that is a temporary file that is available even after being closed on
     all platforms. It is automatically deleted on normal program termination.
-    """
+    '''
     _file = None
 
-    def __init__(self, suffix="", prefix="", dir=None, mode='w+b'):
+    def __init__(self, suffix='', prefix='', dir=None, mode='w+b'):
         if prefix is None:
-            prefix = ""
+            prefix = ''
         if dir is None:
             dir = base_dir()
         fd, name = _make_file(suffix, prefix, dir)
@@ -208,7 +207,6 @@ def PersistentTemporaryDirectory(suffix='', prefix='', dir=None):
 
 
 class TemporaryDirectory:
-
     '''
     A temporary directory to be used in a with statement.
     '''
@@ -233,7 +231,7 @@ class TemporaryDirectory:
 
 class TemporaryFile:
 
-    def __init__(self, suffix="", prefix="", dir=None, mode='w+b'):
+    def __init__(self, suffix='', prefix='', dir=None, mode='w+b'):
         if prefix is None:
             prefix = ''
         if suffix is None:
@@ -256,7 +254,7 @@ class TemporaryFile:
 
 class SpooledTemporaryFile(tempfile.SpooledTemporaryFile):
 
-    def __init__(self, max_size=0, suffix="", prefix="", dir=None, mode='w+b',
+    def __init__(self, max_size=0, suffix='', prefix='', dir=None, mode='w+b',
             bufsize=-1):
         if prefix is None:
             prefix = ''
diff --git a/src/calibre/rpdb.py b/src/calibre/rpdb.py
index f904c32e51..8fc42c1906 100644
--- a/src/calibre/rpdb.py
+++ b/src/calibre/rpdb.py
@@ -22,14 +22,14 @@ QUESTION = '\x00\x01\x02'
 
 class RemotePdb(pdb.Pdb):
 
-    def __init__(self, addr="127.0.0.1", port=4444, skip=None):
+    def __init__(self, addr='127.0.0.1', port=4444, skip=None):
         # Open a reusable socket to allow for reloads
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, True)
         self.sock.bind((addr, port))
         self.sock.listen(1)
         with suppress(OSError):
-            print("pdb is running on %s:%d" % (addr, port), file=sys.stderr)
+            print('pdb is running on %s:%d' % (addr, port), file=sys.stderr)
         clientsocket, address = self.sock.accept()
         clientsocket.setblocking(True)
         self.clientsocket = clientsocket
@@ -64,7 +64,7 @@ class RemotePdb(pdb.Pdb):
 
     def do_clear(self, arg):
         if not arg:
-            ans = self.ask_question("Clear all breaks? [y/n]: ")
+            ans = self.ask_question('Clear all breaks? [y/n]: ')
             if ans.strip().lower() in {'y', 'yes'}:
                 self.clear_all_breaks()
                 self.prints('All breaks cleared')
@@ -129,7 +129,7 @@ def cli(port=4444):
         atexit.register(readline.write_history_file, histfile)
         p = pdb.Pdb()
         readline.set_completer(p.complete)
-        readline.parse_and_bind("tab: complete")
+        readline.parse_and_bind('tab: complete')
 
     sock.setblocking(True)
     with suppress(KeyboardInterrupt):
diff --git a/src/calibre/scraper/qt.py b/src/calibre/scraper/qt.py
index 233fc3227c..661a41e22a 100644
--- a/src/calibre/scraper/qt.py
+++ b/src/calibre/scraper/qt.py
@@ -145,7 +145,7 @@ class Browser:
 
         def has_header(x: str) -> bool:
             x = x.lower()
-            for (h, v) in headers:
+            for h,v in headers:
                 if h.lower() == x:
                     return True
             return False
diff --git a/src/calibre/scraper/qt_backend.py b/src/calibre/scraper/qt_backend.py
index e48bacd157..e86feea1d3 100644
--- a/src/calibre/scraper/qt_backend.py
+++ b/src/calibre/scraper/qt_backend.py
@@ -41,6 +41,7 @@ def qurl_to_key(url: QUrl | str) -> str:
 
 Headers = list[tuple[str, str]]
 
+
 class Request(TypedDict):
     id: int
     url: str
@@ -122,7 +123,7 @@ class DownloadRequest(QObject):
             'final_url': qurl_to_string(self.reply.url()), 'headers': []
         }
         h = result['headers']
-        for (k, v) in self.reply.rawHeaderPairs():
+        for k,v in self.reply.rawHeaderPairs():
             h.append((bytes(k).decode('utf-8', 'replace'), bytes(v).decode('utf-8', 'replace')))
         if code := self.reply.attribute(QNetworkRequest.Attribute.HttpStatusCodeAttribute):
             result['http_code'] = code
@@ -205,7 +206,7 @@ class FetchBackend(QNetworkAccessManager):
         timeout = req['timeout']
         rq.setTransferTimeout(int(timeout * 1000))
         rq.setRawHeader(b'User-Agent', self.current_user_agent().encode())
-        for (name, val) in req['headers']:
+        for name, val in req['headers']:
             ex = rq.rawHeader(name)
             if len(ex):
                 val = bytes(ex).decode() + ', ' + val
@@ -334,7 +335,7 @@ def develop(url: str) -> None:
     from calibre.gui2 import must_use_qt, setup_unix_signals
     must_use_qt()
     app = QApplication.instance()
-    app.signal_received = lambda : app.exit(1)
+    app.signal_received = lambda: app.exit(1)
     setup_unix_signals(app)
     backend = FetchBackend()
     num_left = 0
diff --git a/src/calibre/scraper/simple.py b/src/calibre/scraper/simple.py
index 1b936a4a1c..c91e601613 100644
--- a/src/calibre/scraper/simple.py
+++ b/src/calibre/scraper/simple.py
@@ -8,6 +8,7 @@ from threading import Lock
 
 overseers = []
 
+
 def cleanup_overseers():
     browsers = tuple(filter(None, (x() for x in overseers)))
     del overseers[:]
diff --git a/src/calibre/scraper/test_fetch_backend.py b/src/calibre/scraper/test_fetch_backend.py
index 0bd209ea93..0bdd09d36a 100644
--- a/src/calibre/scraper/test_fetch_backend.py
+++ b/src/calibre/scraper/test_fetch_backend.py
@@ -182,7 +182,7 @@ class TestFetchBackend(unittest.TestCase):
             ans = Handler(self, *a)
             return ans
 
-        with ThreadingHTTPServer(("", 0), create_handler) as httpd:
+        with ThreadingHTTPServer(('', 0), create_handler) as httpd:
             self.server = httpd
             self.port = httpd.server_address[1]
             self.server_started.set()
diff --git a/src/calibre/scraper/webengine_backend.py b/src/calibre/scraper/webengine_backend.py
index 230ef644e4..27b342f0b0 100644
--- a/src/calibre/scraper/webengine_backend.py
+++ b/src/calibre/scraper/webengine_backend.py
@@ -43,7 +43,6 @@ def create_base_profile(cache_name='', allow_js=False):
     return ans
 
 
-
 class DownloadRequest(QObject):
 
     aborted_on_timeout: bool = False
@@ -119,13 +118,12 @@ class Worker(QWebEnginePage):
                     self.runjs('window.get_messages()', self.dispatch_messages)
             else:
                 print(f'{source_id}:{line_num}:{message}')
-            return
 
     def dispatch_messages(self, messages: list) -> None:
         if not sip.isdeleted(self):
             self.messages_dispatch.emit(messages)
 
-    def runjs(self, js: str, callback = None) -> None:
+    def runjs(self, js: str, callback=None) -> None:
         if callback is None:
             self.runJavaScript(js, QWebEngineScript.ScriptWorldId.ApplicationWorld)
         else:
diff --git a/src/calibre/spell/dictionary.py b/src/calibre/spell/dictionary.py
index 8d6f2a26df..c46f55d06c 100644
--- a/src/calibre/spell/dictionary.py
+++ b/src/calibre/spell/dictionary.py
@@ -32,16 +32,15 @@ not_present = object()
 
 class UserDictionary:
 
-    __slots__ = ('name', 'is_active', 'words')
+    __slots__ = ('is_active', 'name', 'words')
 
     def __init__(self, **kwargs):
         self.name = kwargs['name']
         self.is_active = kwargs['is_active']
-        self.words = {(w, langcode) for w, langcode in kwargs['words']}
+        self.words = set(kwargs['words'])
 
     def serialize(self):
-        return {'name':self.name, 'is_active': self.is_active, 'words':[
-            (w, l) for w, l in self.words]}
+        return {'name':self.name, 'is_active': self.is_active, 'words': list(self.words)}
 
 
 _builtins = _custom = None
@@ -91,7 +90,7 @@ def custom_dictionaries(reread=False):
             if ploc.countrycode is None:
                 continue
             dics.append(Dictionary(
-                ploc, frozenset(filter(lambda x:x.countrycode is not None, map(parse_lang_code, locales))), os.path.join(base, '%s.dic' % locale),
+                ploc, frozenset(filter(lambda x: x.countrycode is not None, map(parse_lang_code, locales))), os.path.join(base, '%s.dic' % locale),
                 os.path.join(base, '%s.aff' % locale), False, name, os.path.basename(base)))
         _custom = frozenset(dics)
     return _custom
@@ -194,7 +193,7 @@ def load_dictionary(dictionary):
 class Dictionaries:
 
     def __init__(self):
-        self.remove_hyphenation = re.compile('[\u2010-]+')
+        self.remove_hyphenation = re.compile(r'[\u2010-]+')
         self.negative_pat = re.compile(r'-[.\d+]')
         self.fix_punctuation_pat = re.compile(r'''[:.]''')
         self.dictionaries = {}
diff --git a/src/calibre/spell/import_from.py b/src/calibre/spell/import_from.py
index ef6fd54895..2e2e5ae9be 100644
--- a/src/calibre/spell/import_from.py
+++ b/src/calibre/spell/import_from.py
@@ -21,8 +21,8 @@ from calibre.utils.zipfile import ZipFile
 from polyglot.builtins import iteritems
 
 NS_MAP = {
-    'oor': "http://openoffice.org/2001/registry",
-    'xs': "http://www.w3.org/2001/XMLSchema",
+    'oor': 'http://openoffice.org/2001/registry',
+    'xs': 'http://www.w3.org/2001/XMLSchema',
     'manifest': 'http://openoffice.org/2001/manifest',
 }
 
diff --git a/src/calibre/srv/ajax.py b/src/calibre/srv/ajax.py
index 24c4049c27..40b3841b4f 100644
--- a/src/calibre/srv/ajax.py
+++ b/src/calibre/srv/ajax.py
@@ -34,11 +34,11 @@ def get_pagination(query, num=100, offset=0):
     try:
         num = int(query.get('num', num))
     except:
-        raise HTTPNotFound("Invalid num")
+        raise HTTPNotFound('Invalid num')
     try:
         offset = int(query.get('offset', offset))
     except:
-        raise HTTPNotFound("Invalid offset")
+        raise HTTPNotFound('Invalid offset')
     return num, offset
 
 
@@ -54,8 +54,8 @@ def category_icon(category, meta):  # {{{
     return icon
 # }}}
 
-# Book metadata {{{
 
+# Book metadata {{{
 
 def book_to_json(ctx, rd, db, book_id,
                  get_category_urls=True, device_compatible=False, device_for_template=None):
@@ -233,8 +233,8 @@ def books(ctx, rd, library_id):
 
 # }}}
 
-# Categories (Tag Browser)  {{{
 
+# Categories (Tag Browser) {{{
 
 @endpoint('/ajax/categories/{library_id=None}', postprocess=json)
 def categories(ctx, rd, library_id):
@@ -526,8 +526,8 @@ def books_in(ctx, rd, encoded_category, encoded_item, library_id):
         return result
 # }}}
 
-# Search {{{
 
+# Search {{{
 
 def search_result(ctx, rd, db, query, num, offset, sort, sort_order, vl=''):
     multisort = [(sanitize_sort_field_name(db.field_metadata, s), ensure_val(o, 'asc', 'desc') == 'asc')
diff --git a/src/calibre/srv/auth.py b/src/calibre/srv/auth.py
index 34b89b56d9..a22a60bd5e 100644
--- a/src/calibre/srv/auth.py
+++ b/src/calibre/srv/auth.py
@@ -159,7 +159,7 @@ class DigestAuth:  # {{{
         return md5_hex(val)
 
     def H_A2(self, data):
-        """Returns the H(A2) string. See :rfc:`2617` section 3.2.2.3."""
+        '''Returns the H(A2) string. See :rfc:`2617` section 3.2.2.3.'''
         # RFC 2617 3.2.2.3
         # If the "qop" directive's value is "auth" or is unspecified,
         # then A2 is:
@@ -167,8 +167,8 @@ class DigestAuth:  # {{{
         #
         # If the "qop" value is "auth-int", then A2 is:
         #    A2 = method ":" digest-uri-value ":" H(entity-body)
-        if self.qop == "auth-int":
-            a2 = f"{data.method}:{self.uri}:{self.H(data.peek())}"
+        if self.qop == 'auth-int':
+            a2 = f'{data.method}:{self.uri}:{self.H(data.peek())}'
         else:
             a2 = f'{data.method}:{self.uri}'
         return self.H(a2)
@@ -178,10 +178,10 @@ class DigestAuth:  # {{{
         ha2 = self.H_A2(data)
         # Request-Digest -- RFC 2617 3.2.2.1
         if self.qop:
-            req = "{}:{}:{}:{}:{}".format(
+            req = '{}:{}:{}:{}:{}'.format(
                 self.nonce, self.nonce_count, self.cnonce, self.qop, ha2)
         else:
-            req = f"{self.nonce}:{ha2}"
+            req = f'{self.nonce}:{ha2}'
 
         # RFC 2617 3.2.2.2
         #
@@ -215,7 +215,6 @@ class DigestAuth:  # {{{
 
 
 class AuthController:
-
     '''
     Implement Basic/Digest authentication for the Content server. Android browsers
     cannot handle HTTP AUTH when downloading files, as the download is handed
diff --git a/src/calibre/srv/auto_reload.py b/src/calibre/srv/auto_reload.py
index dc99a0877d..09f0526b42 100644
--- a/src/calibre/srv/auto_reload.py
+++ b/src/calibre/srv/auto_reload.py
@@ -31,8 +31,8 @@ MAX_RETRIES = 10
 class NoAutoReload(EnvironmentError):
     pass
 
-# Filesystem watcher {{{
 
+# Filesystem watcher {{{
 
 class WatcherBase:
 
@@ -157,7 +157,7 @@ elif iswindows:
         def loop(self):
             for w in self.watchers:
                 w.start()
-            with HandleInterrupt(lambda : self.modified_queue.put(None)):
+            with HandleInterrupt(lambda: self.modified_queue.put(None)):
                 while True:
                     path = self.modified_queue.get()
                     if path is None:
@@ -332,8 +332,8 @@ class Worker:
                 s.close()
         self.log.error('Restarted server did not start listening on:', self.port)
 
-# WebSocket reload notifier {{{
 
+# WebSocket reload notifier {{{
 
 class ReloadHandler(DummyHandler):
 
diff --git a/src/calibre/srv/books.py b/src/calibre/srv/books.py
index f8e939aa08..2b80370861 100644
--- a/src/calibre/srv/books.py
+++ b/src/calibre/srv/books.py
@@ -103,7 +103,7 @@ def clean_final(interval=24 * 60 * 60):
     fdir = os.path.join(books_cache_dir(), 'f')
     for x in os.listdir(fdir):
         try:
-            tm = os.path.getmtime(os.path.join(fdir, x,  'calibre-book-manifest.json'))
+            tm = os.path.getmtime(os.path.join(fdir, x, 'calibre-book-manifest.json'))
         except OSError:
             continue
         if now - tm >= interval:
diff --git a/src/calibre/srv/content.py b/src/calibre/srv/content.py
index 9d6c32ff40..34a88bef35 100644
--- a/src/calibre/srv/content.py
+++ b/src/calibre/srv/content.py
@@ -514,9 +514,9 @@ def set_note(ctx, rd, field, item_id, library_id):
         db_replacements[key] = f'{RESOURCE_URL_SCHEME}://{scheme}/{digest}'
     db_html = srv_html = html
     if db_replacements:
-        db_html = re.sub('|'.join(map(re.escape, db_replacements)), lambda m: db_replacements[m.group()], html)
+        db_html = re.sub(r'|'.join(map(re.escape, db_replacements)), lambda m: db_replacements[m.group()], html)
     if srv_replacements:
-        srv_html = re.sub('|'.join(map(re.escape, srv_replacements)), lambda m: srv_replacements[m.group()], html)
+        srv_html = re.sub(r'|'.join(map(re.escape, srv_replacements)), lambda m: srv_replacements[m.group()], html)
     db.set_notes_for(field, item_id, db_html, searchable_text, resources)
     rd.outheaders['Content-Type'] = 'text/html; charset=UTF-8'
     return srv_html
@@ -529,7 +529,6 @@ def data_file(rd, fname, path, stat_result):
     return rd.filesystem_file_with_custom_etag(share_open(path, 'rb'), stat_result.st_dev, stat_result.st_ino, stat_result.st_size, stat_result.st_mtime)
 
 
-
 @endpoint('/data-files/get/{book_id}/{relpath}/{library_id=None}', types={'book_id': int})
 def get_data_file(ctx, rd, book_id, relpath, library_id):
     db = get_db(ctx, rd, library_id)
diff --git a/src/calibre/srv/fts.py b/src/calibre/srv/fts.py
index cc4cae42fa..e467e4151f 100644
--- a/src/calibre/srv/fts.py
+++ b/src/calibre/srv/fts.py
@@ -25,7 +25,7 @@ def fts_search(ctx, rd):
     ans = {'metadata': metadata_cache, 'indexing_status': {'left': l, 'total': t}}
 
     use_stemming = rd.query.get('use_stemming', 'y') == 'y'
-    query = rd.query.get('query' '')
+    query = rd.query.get('query')
     if not query:
         raise HTTPBadRequest('No search query specified')
     qid = rd.query.get('query_id')
@@ -107,7 +107,7 @@ def fts_snippets(ctx, rd, book_ids):
         raise HTTPPreconditionRequired('Full text searching is not enabled on this library')
 
     use_stemming = rd.query.get('use_stemming', 'y') == 'y'
-    query = rd.query.get('query' '')
+    query = rd.query.get('query')
     if not query:
         raise HTTPBadRequest('No search query specified')
     try:
diff --git a/src/calibre/srv/http_request.py b/src/calibre/srv/http_request.py
index 29ef335f97..b83d6c1381 100644
--- a/src/calibre/srv/http_request.py
+++ b/src/calibre/srv/http_request.py
@@ -20,11 +20,11 @@ protocol_map = {(1, 0):HTTP1, (1, 1):HTTP11}
 quoted_slash = re.compile(br'%2[fF]')
 HTTP_METHODS = {'HEAD', 'GET', 'PUT', 'POST', 'TRACE', 'DELETE', 'OPTIONS'}
 
+
 # Parse URI {{{
 
-
 def parse_request_uri(uri):
-    """Parse a Request-URI into (scheme, authority, path).
+    '''Parse a Request-URI into (scheme, authority, path).
 
     Note that Request-URI's must be one of::
 
@@ -42,7 +42,7 @@ def parse_request_uri(uri):
         path_segments = segment *( "/" segment )
         segment       = *pchar *( ";" param )
         param         = *pchar
-    """
+    '''
     if uri == b'*':
         return None, None, uri
 
@@ -68,9 +68,9 @@ def parse_request_uri(uri):
 def parse_uri(uri, parse_query=True, unquote_func=unquote):
     scheme, authority, path = parse_request_uri(uri)
     if path is None:
-        raise HTTPSimpleResponse(http_client.BAD_REQUEST, "No path component")
+        raise HTTPSimpleResponse(http_client.BAD_REQUEST, 'No path component')
     if b'#' in path:
-        raise HTTPSimpleResponse(http_client.BAD_REQUEST, "Illegal #fragment in Request-URI.")
+        raise HTTPSimpleResponse(http_client.BAD_REQUEST, 'Illegal #fragment in Request-URI.')
 
     if scheme:
         try:
@@ -125,7 +125,6 @@ def normalize_header_name(name):
 
 
 class HTTPHeaderParser:
-
     '''
     Parse HTTP headers. Use this class by repeatedly calling the created object
     with a single line at a time and checking the finished attribute. Can raise ValueError
@@ -134,7 +133,7 @@ class HTTPHeaderParser:
     Headers which are repeated are folded together using a comma if their
     specification so dictates.
     '''
-    __slots__ = ('hdict', 'lines', 'finished')
+    __slots__ = ('finished', 'hdict', 'lines')
 
     def __init__(self):
         self.hdict = MultiDict()
@@ -269,10 +268,10 @@ class HTTPRequest(Connection):
             rp = int(req_protocol[5]), int(req_protocol[7])
             self.method = method.decode('ascii').upper()
         except Exception:
-            return self.simple_response(http_client.BAD_REQUEST, "Malformed Request-Line")
+            return self.simple_response(http_client.BAD_REQUEST, 'Malformed Request-Line')
 
         if self.method not in HTTP_METHODS:
-            return self.simple_response(http_client.BAD_REQUEST, "Unknown HTTP method")
+            return self.simple_response(http_client.BAD_REQUEST, 'Unknown HTTP method')
 
         try:
             self.request_protocol = protocol_map[rp]
@@ -311,36 +310,36 @@ class HTTPRequest(Connection):
         request_content_length = int(inheaders.get('Content-Length', 0))
         if request_content_length > self.max_request_body_size:
             return self.simple_response(http_client.REQUEST_ENTITY_TOO_LARGE,
-                "The entity sent with the request exceeds the maximum "
-                "allowed bytes (%d)." % self.max_request_body_size)
+                'The entity sent with the request exceeds the maximum '
+                'allowed bytes (%d).' % self.max_request_body_size)
         # Persistent connection support
         if self.response_protocol is HTTP11:
             # Both server and client are HTTP/1.1
-            if inheaders.get("Connection", "") == "close":
+            if inheaders.get('Connection', '') == 'close':
                 self.close_after_response = True
         else:
             # Either the server or client (or both) are HTTP/1.0
-            if inheaders.get("Connection", "") != "Keep-Alive":
+            if inheaders.get('Connection', '') != 'Keep-Alive':
                 self.close_after_response = True
 
         # Transfer-Encoding support
         te = ()
         if self.response_protocol is HTTP11:
-            rte = inheaders.get("Transfer-Encoding")
+            rte = inheaders.get('Transfer-Encoding')
             if rte:
-                te = [x.strip().lower() for x in rte.split(",") if x.strip()]
+                te = [x.strip().lower() for x in rte.split(',') if x.strip()]
         chunked_read = False
         if te:
             for enc in te:
-                if enc == "chunked":
+                if enc == 'chunked':
                     chunked_read = True
                 else:
                     # Note that, even if we see "chunked", we must reject
                     # if there is an extension we don't recognize.
-                    return self.simple_response(http_client.NOT_IMPLEMENTED, "Unknown transfer encoding: %r" % enc)
+                    return self.simple_response(http_client.NOT_IMPLEMENTED, 'Unknown transfer encoding: %r' % enc)
 
-        if inheaders.get("Expect", '').lower() == "100-continue":
-            buf = BytesIO((HTTP11 + " 100 Continue\r\n\r\n").encode('ascii'))
+        if inheaders.get('Expect', '').lower() == '100-continue':
+            buf = BytesIO((HTTP11 + ' 100 Continue\r\n\r\n').encode('ascii'))
             return self.set_state(WRITE, self.write_continue, buf, inheaders, request_content_length, chunked_read)
         self.forwarded_for = inheaders.get('X-Forwarded-For')
 
diff --git a/src/calibre/srv/http_response.py b/src/calibre/srv/http_response.py
index e151c82999..c31b4ef2d7 100644
--- a/src/calibre/srv/http_response.py
+++ b/src/calibre/srv/http_response.py
@@ -69,7 +69,7 @@ def parse_multipart_byterange(buf, content_type):  # {{{
         if not cr.startswith('bytes '):
             raise ValueError('Malformed Content-Range header in sub-part, no prefix')
         try:
-            start, stop = map(lambda x: int(x.strip()), cr.partition(' ')[-1].partition('/')[0].partition('-')[::2])
+            start, stop = (int(x.strip()) for x in cr.partition(' ')[-1].partition('/')[0].partition('-')[::2])
         except Exception:
             raise ValueError('Malformed Content-Range header in sub-part, failed to parse byte range')
         content_length = stop - start + 1
@@ -77,7 +77,7 @@ def parse_multipart_byterange(buf, content_type):  # {{{
         if len(ret) != content_length:
             raise ValueError('Malformed sub-part, length of body not equal to length specified in Content-Range')
         buf.readline()
-        return (start, ret)
+        return start, ret
     while True:
         data = parse_part()
         if data is None:
@@ -118,14 +118,14 @@ def get_ranges(headervalue, content_length):  # {{{
 
     result = []
     try:
-        bytesunit, byteranges = headervalue.split("=", 1)
+        bytesunit, byteranges = headervalue.split('=', 1)
     except Exception:
         return None
     if bytesunit.strip() != 'bytes':
         return None
 
-    for brange in byteranges.split(","):
-        start, stop = (x.strip() for x in brange.split("-", 1))
+    for brange in byteranges.split(','):
+        start, stop = (x.strip() for x in brange.split('-', 1))
         if start:
             if not stop:
                 stop = content_length - 1
@@ -153,8 +153,8 @@ def get_ranges(headervalue, content_length):  # {{{
     return result
 # }}}
 
-# gzip transfer encoding  {{{
 
+# gzip transfer encoding {{{
 
 def gzip_prefix():
     # See http://www.gzip.org/zlib/rfc-gzip.html
@@ -170,7 +170,7 @@ def gzip_prefix():
 
 
 def compress_readable_output(src_file, compress_level=6):
-    crc = zlib.crc32(b"")
+    crc = zlib.crc32(b'')
     size = 0
     zobj = zlib.compressobj(compress_level,
                             zlib.DEFLATED, -zlib.MAX_WBITS,
@@ -187,7 +187,7 @@ def compress_readable_output(src_file, compress_level=6):
             prefix_written = True
             data = gzip_prefix() + data
         yield data
-    yield zobj.flush() + struct.pack(b"<L", crc & 0xffffffff) + struct.pack(b"<L", size)
+    yield zobj.flush() + struct.pack(b'<L', crc & 0xffffffff) + struct.pack(b'<L', size)
 # }}}
 
 
@@ -419,12 +419,12 @@ class HTTPConnection(HTTPRequest):
         ct = 'http' if self.method == 'TRACE' else 'plain'
         buf = [
             '%s %d %s' % (self.response_protocol, status_code, http_client.responses[status_code]),
-            "Content-Length: %s" % len(msg),
-            "Content-Type: text/%s; charset=UTF-8" % ct,
-            "Date: " + http_date(),
+            'Content-Length: %s' % len(msg),
+            'Content-Type: text/%s; charset=UTF-8' % ct,
+            'Date: ' + http_date(),
         ]
         if self.close_after_response and self.response_protocol is HTTP11:
-            buf.append("Connection: close")
+            buf.append('Connection: close')
         if extra_headers is not None:
             for h, v in iteritems(extra_headers):
                 buf.append(f'{h}: {v}')
@@ -460,8 +460,8 @@ class HTTPConnection(HTTPRequest):
                 self.response_protocol,
                 http_client.REQUESTED_RANGE_NOT_SATISFIABLE,
                 http_client.responses[http_client.REQUESTED_RANGE_NOT_SATISFIABLE]),
-            "Date: " + http_date(),
-            "Content-Range: bytes */%d" % content_length,
+            'Date: ' + http_date(),
+            'Content-Range: bytes */%d' % content_length,
         ]
         response_data = header_list_to_file(buf)
         self.log_access(status_code=http_client.REQUESTED_RANGE_NOT_SATISFIABLE, response_size=response_data.sz)
@@ -470,8 +470,8 @@ class HTTPConnection(HTTPRequest):
     def send_not_modified(self, etag=None):
         buf = [
             '%s %d %s' % (self.response_protocol, http_client.NOT_MODIFIED, http_client.responses[http_client.NOT_MODIFIED]),
-            "Content-Length: 0",
-            "Date: " + http_date(),
+            'Content-Length: 0',
+            'Date: ' + http_date(),
         ]
         if etag is not None:
             buf.append('ETag: ' + etag)
@@ -677,8 +677,7 @@ class HTTPConnection(HTTPRequest):
         else:
             output = GeneratedOutput(output)
         ct = outheaders.get('Content-Type', '').partition(';')[0]
-        compressible = (not ct or ct.startswith('text/') or ct.startswith('image/svg') or
-                        ct.partition(';')[0] in COMPRESSIBLE_TYPES)
+        compressible = (not ct or ct.startswith(('text/', 'image/svg')) or ct.partition(';')[0] in COMPRESSIBLE_TYPES)
         compressible = (compressible and request.status_code == http_client.OK and
                         (opts.compress_min_size > -1 and output.content_length >= opts.compress_min_size) and
                         acceptable_encoding(request.inheaders.get('Accept-Encoding', '')) and not is_http1)
diff --git a/src/calibre/srv/legacy.py b/src/calibre/srv/legacy.py
index 986a25470c..63c0ed7563 100644
--- a/src/calibre/srv/legacy.py
+++ b/src/calibre/srv/legacy.py
@@ -107,7 +107,7 @@ def build_navigation(start, num, total, url_base):  # {{{
     right_buttons = E.td(class_='button', style='text-align:right')
 
     if start > 1:
-        for t,s in [('First', 1), ('Previous', max(start-num,1))]:
+        for t,s in [('First', 1), ('Previous', max(start-num, 1))]:
             left_buttons.append(E.a(t, href='%s&start=%d'%(url_base, s)))
 
     if total > start + num:
@@ -118,7 +118,6 @@ def build_navigation(start, num, total, url_base):  # {{{
             E.tr(left_buttons, right_buttons),
             class_='buttons')
     return E.div(tagline, buttons, class_='navigation')
-
 # }}}
 
 
@@ -201,18 +200,18 @@ def build_index(rd, books, num, search, sort, order, start, total, url_base, fie
     body.append(E.div(
         E.a(_('Switch to the full interface (non-mobile interface)'),
             href=ctx.url_for(None),
-            style="text-decoration: none; color: blue",
+            style='text-decoration: none; color: blue',
             title=_('The full interface gives you many more features, '
                     'but it may not work well on a small screen')),
-        style="text-align:center")
+        style='text-align:center')
     )
     return E.html(
         E.head(
             E.title(__appname__ + ' Library'),
             E.link(rel='icon', href=ctx.url_for('/favicon.png'), type='image/png'),
             E.link(rel='stylesheet', type='text/css', href=ctx.url_for('/static', what='mobile.css')),
-            E.link(rel='apple-touch-icon', href=ctx.url_for("/static", what='calibre.png')),
-            E.meta(name="robots", content="noindex")
+            E.link(rel='apple-touch-icon', href=ctx.url_for('/static', what='calibre.png')),
+            E.meta(name='robots', content='noindex')
         ),  # End head
         body
     )  # End html
diff --git a/src/calibre/srv/loop.py b/src/calibre/srv/loop.py
index 0563b27208..ac5597dfdc 100644
--- a/src/calibre/srv/loop.py
+++ b/src/calibre/srv/loop.py
@@ -42,14 +42,14 @@ from polyglot.queue import Empty, Full
 
 READ, WRITE, RDWR, WAIT = 'READ', 'WRITE', 'RDWR', 'WAIT'
 WAKEUP, JOB_DONE = b'\0', b'\x01'
-IPPROTO_IPV6 = getattr(socket, "IPPROTO_IPV6", 41)
+IPPROTO_IPV6 = getattr(socket, 'IPPROTO_IPV6', 41)
 
 
 class ReadBuffer:  # {{{
 
     ' A ring buffer used to speed up the readline() implementation by minimizing recv() calls '
 
-    __slots__ = ('ba', 'buf', 'read_pos', 'write_pos', 'full_state')
+    __slots__ = ('ba', 'buf', 'full_state', 'read_pos', 'write_pos')
 
     def __init__(self, size=4096):
         self.ba = bytearray(size)
@@ -465,7 +465,7 @@ class ServerLoop:
             self.control_out.close()
 
     def __str__(self):
-        return f"{self.__class__.__name__}({self.bind_address!r})"
+        return f'{self.__class__.__name__}({self.bind_address!r})'
     __repr__ = __str__
 
     @property
@@ -482,19 +482,19 @@ class ServerLoop:
         except socket.gaierror:
             if ':' in host:
                 info = [(socket.AF_INET6, socket.SOCK_STREAM,
-                        0, "", self.bind_address + (0, 0))]
+                        0, '', self.bind_address + (0, 0))]
             else:
                 info = [(socket.AF_INET, socket.SOCK_STREAM,
-                        0, "", self.bind_address)]
+                        0, '', self.bind_address)]
 
         self.socket = None
-        msg = "No socket could be created"
+        msg = 'No socket could be created'
         for res in info:
             af, socktype, proto, canonname, sa = res
             try:
                 self.bind(af, socktype, proto)
             except OSError as serr:
-                msg = f"{msg} -- ({sa}: {as_unicode(serr)})"
+                msg = f'{msg} -- ({sa}: {as_unicode(serr)})'
                 if self.socket:
                     self.socket.close()
                 self.socket = None
@@ -556,7 +556,7 @@ class ServerLoop:
             self.shutdown()
 
     def serve_forever(self):
-        """ Listen for incoming connections. """
+        ''' Listen for incoming connections. '''
         self.initialize_socket()
         self.serve()
 
diff --git a/src/calibre/srv/metadata.py b/src/calibre/srv/metadata.py
index bbc3260106..69ba7c972d 100644
--- a/src/calibre/srv/metadata.py
+++ b/src/calibre/srv/metadata.py
@@ -30,7 +30,7 @@ IGNORED_FIELDS = frozenset('cover ondevice path marked au_map'.split())
 
 def encode_datetime(dateval):
     if dateval is None:
-        return "None"
+        return 'None'
     if not isinstance(dateval, datetime):
         dateval = datetime.combine(dateval, time())
     if hasattr(dateval, 'tzinfo') and dateval.tzinfo is None:
@@ -157,8 +157,7 @@ def category_item_as_json(x, clear_rating=False):
     return ans
 
 
-
-def get_gpref(name: str, defval = None):
+def get_gpref(name: str, defval=None):
     gprefs = getattr(get_gpref, 'gprefs', None)
     if gprefs is None:
         from calibre.utils.config import JSONConfig
@@ -186,7 +185,7 @@ def get_icon_for_node(node, parent, node_to_tag_map, tag_map, eval_formatter, db
                 break
             pt = node_to_tag_map[pid]
             pd = tag_map[id(pt)][1]
-            val_icon,for_children = value_icons.get(pd['category'], {}).get(name_for_icon(pd), (None, False))
+            val_icon, for_children = value_icons.get(pd['category'], {}).get(name_for_icon(pd), (None, False))
             if val_icon is not None and for_children:
                 break
             par = pd
@@ -213,7 +212,7 @@ CategoriesSettings = namedtuple(
 
 class GroupedSearchTerms:
 
-    __slots__ = ('keys', 'vals', 'hash')
+    __slots__ = ('hash', 'keys', 'vals')
 
     def __init__(self, src):
         self.keys = frozenset(src)
@@ -283,7 +282,7 @@ def categories_settings(query, db, gst_container=GroupedSearchTerms):
 
 
 def create_toplevel_tree(category_data, items, field_metadata, opts, db):
-    # Create the basic tree, containing all top level categories , user
+    # Create the basic tree, containing all top level categories, user
     # categories and grouped search terms
     last_category_node, category_node_map, root = None, {}, {'id':None, 'children':[]}
     node_id_map = {}
@@ -610,17 +609,17 @@ def render_categories(opts, db, category_data):
     if opts.hidden_categories:
         # We have to remove hidden categories after all processing is done as
         # items from a hidden category could be in a user category
-        root['children'] = list(filter((lambda child:items[child['id']]['category'] not in opts.hidden_categories), root['children']))
+        root['children'] = list(filter((lambda child: items[child['id']]['category'] not in opts.hidden_categories), root['children']))
     if opts.hide_empty_categories:
-        root['children'] = list(filter((lambda child:items[child['id']]['count'] > 0), root['children']))
+        root['children'] = list(filter((lambda child: items[child['id']]['count'] > 0), root['children']))
     return {'root':root, 'item_map': items}
 
 
 def categories_as_json(ctx, rd, db, opts, vl):
     return ctx.get_tag_browser(rd, db, opts, partial(render_categories, opts), vl=vl)
 
-# Test tag browser {{{
 
+# Test tag browser {{{
 
 def dump_categories_tree(data):
     root, items = data['root'], data['item_map']
diff --git a/src/calibre/srv/opds.py b/src/calibre/srv/opds.py
index 93ec02c297..e0fa231cd7 100644
--- a/src/calibre/srv/opds.py
+++ b/src/calibre/srv/opds.py
@@ -59,9 +59,9 @@ def format_tag_string(tags, sep, joinval=', '):
 DC_NS = 'http://purl.org/dc/terms/'
 E = ElementMaker(namespace='http://www.w3.org/2005/Atom',
                  nsmap={
-                     None   : 'http://www.w3.org/2005/Atom',
-                     'dc'   : DC_NS,
-                     'opds' : 'http://opds-spec.org/2010/catalog',
+                     None  : 'http://www.w3.org/2005/Atom',
+                     'dc'  : DC_NS,
+                     'opds': 'http://opds-spec.org/2010/catalog',
                      })
 
 
@@ -121,7 +121,7 @@ def html_to_lxml(raw):
     raw = '<div>%s</div>'%raw
     root = parse(raw, keep_doctype=False, namespace_elements=False, maybe_xhtml=False, sanitize_names=True)
     root = next(root.iterdescendants('div'))
-    root.set('xmlns', "http://www.w3.org/1999/xhtml")
+    root.set('xmlns', 'http://www.w3.org/1999/xhtml')
     raw = etree.tostring(root, encoding='unicode')
     try:
         return safe_xml_fromstring(raw, recover=False)
@@ -227,22 +227,22 @@ def ACQUISITION_ENTRY(book_id, updated, request_context):
             fmt = fmt.lower()
             mt = guess_type('a.'+fmt)[0]
             if mt:
-                link = E.link(type=mt, href=get(what=fmt), rel="http://opds-spec.org/acquisition")
+                link = E.link(type=mt, href=get(what=fmt), rel='http://opds-spec.org/acquisition')
                 ffm = fm.get(fmt.upper())
                 if ffm:
                     link.set('length', str(ffm['size']))
                     link.set('mtime', ffm['mtime'].isoformat())
                 ans.append(link)
-    ans.append(E.link(type='image/jpeg', href=get(what='cover'), rel="http://opds-spec.org/cover"))
-    ans.append(E.link(type='image/jpeg', href=get(what='thumb'), rel="http://opds-spec.org/thumbnail"))
-    ans.append(E.link(type='image/jpeg', href=get(what='cover'), rel="http://opds-spec.org/image"))
-    ans.append(E.link(type='image/jpeg', href=get(what='thumb'), rel="http://opds-spec.org/image/thumbnail"))
+    ans.append(E.link(type='image/jpeg', href=get(what='cover'), rel='http://opds-spec.org/cover'))
+    ans.append(E.link(type='image/jpeg', href=get(what='thumb'), rel='http://opds-spec.org/thumbnail'))
+    ans.append(E.link(type='image/jpeg', href=get(what='cover'), rel='http://opds-spec.org/image'))
+    ans.append(E.link(type='image/jpeg', href=get(what='thumb'), rel='http://opds-spec.org/image/thumbnail'))
 
     return ans
 
-
 # }}}
 
+
 default_feed_title = __appname__ + ' ' + _('Library')
 
 
diff --git a/src/calibre/srv/opts.py b/src/calibre/srv/opts.py
index 6ccdbfa4eb..47acfb742d 100644
--- a/src/calibre/srv/opts.py
+++ b/src/calibre/srv/opts.py
@@ -43,7 +43,7 @@ raw_options = (
     None,
 
     _('Time (in seconds) to wait for a response from the server when making queries'),
-    'ajax_timeout',  60.0,
+    'ajax_timeout', 60.0,
     None,
 
     _('Total time in seconds to wait for clean shutdown'),
@@ -253,7 +253,7 @@ def boolean_option(add_option, opt):
 
 def opts_to_parser(usage):
     from calibre.utils.config import OptionParser
-    parser =  OptionParser(usage)
+    parser = OptionParser(usage)
     for opt in itervalues(options):
         add_option = partial(parser.add_option, dest=opt.name, help=opt_to_cli_help(opt), default=opt.default)
         if opt.default is True or opt.default is False:
diff --git a/src/calibre/srv/pre_activated.py b/src/calibre/srv/pre_activated.py
index a03e1da2ba..470da5904f 100644
--- a/src/calibre/srv/pre_activated.py
+++ b/src/calibre/srv/pre_activated.py
@@ -22,10 +22,10 @@ if islinux:
     import ctypes
 
     class SOCKADDR_NL(ctypes.Structure):
-        _fields_ = [("nl_family", ctypes.c_ushort),
-                    ("nl_pad",    ctypes.c_ushort),
-                    ("nl_pid",    ctypes.c_int),
-                    ("nl_groups", ctypes.c_int)]
+        _fields_ = [('nl_family', ctypes.c_ushort),
+                    ('nl_pad',    ctypes.c_ushort),
+                    ('nl_pid',    ctypes.c_int),
+                    ('nl_groups', ctypes.c_int)]
 
     def getsockfamily(fd):
         addr = SOCKADDR_NL(0, 0, 0, 0)
@@ -44,7 +44,7 @@ if islinux:
         del pre_activated_socket
         has_preactivated_support = True
 
-        def pre_activated_socket():  # noqa
+        def pre_activated_socket():
             num = systemd.sd_listen_fds(1)  # Remove systemd env vars so that child processes do not inherit them
             if num > 1:
                 raise OSError('Too many file descriptors received from systemd')
diff --git a/src/calibre/srv/render_book.py b/src/calibre/srv/render_book.py
index 48e8532b67..e3d10a6a85 100644
--- a/src/calibre/srv/render_book.py
+++ b/src/calibre/srv/render_book.py
@@ -41,7 +41,7 @@ except ImportError:  # running from source without updated binary
         return len(getattr(elem, 'text', '') or '') + len(getattr(elem, 'tail', '') or '')
 RENDER_VERSION = 1
 
-BLANK_JPEG = b'\xff\xd8\xff\xdb\x00C\x00\x03\x02\x02\x02\x02\x02\x03\x02\x02\x02\x03\x03\x03\x03\x04\x06\x04\x04\x04\x04\x04\x08\x06\x06\x05\x06\t\x08\n\n\t\x08\t\t\n\x0c\x0f\x0c\n\x0b\x0e\x0b\t\t\r\x11\r\x0e\x0f\x10\x10\x11\x10\n\x0c\x12\x13\x12\x10\x13\x0f\x10\x10\x10\xff\xc9\x00\x0b\x08\x00\x01\x00\x01\x01\x01\x11\x00\xff\xcc\x00\x06\x00\x10\x10\x05\xff\xda\x00\x08\x01\x01\x00\x00?\x00\xd2\xcf \xff\xd9'  # noqa
+BLANK_JPEG = b'\xff\xd8\xff\xdb\x00C\x00\x03\x02\x02\x02\x02\x02\x03\x02\x02\x02\x03\x03\x03\x03\x04\x06\x04\x04\x04\x04\x04\x08\x06\x06\x05\x06\t\x08\n\n\t\x08\t\t\n\x0c\x0f\x0c\n\x0b\x0e\x0b\t\t\r\x11\r\x0e\x0f\x10\x10\x11\x10\n\x0c\x12\x13\x12\x10\x13\x0f\x10\x10\x10\xff\xc9\x00\x0b\x08\x00\x01\x00\x01\x01\x01\x11\x00\xff\xcc\x00\x06\x00\x10\x10\x05\xff\xda\x00\x08\x01\x01\x00\x00?\x00\xd2\xcf \xff\xd9'  # noqa: E501
 
 
 class Spineless(ValueError):
@@ -327,7 +327,6 @@ def parse_smil_time(x):
     return seconds
 
 
-
 def transform_smil(container, name, link_uid, virtualize_resources, virtualized_names, smil_map):
     root = container.parsed(name)
     text_tag, audio_tag = SMIL('text'), SMIL('audio')
@@ -588,7 +587,6 @@ def process_exploded_book(
     def needs_work(mt):
         return mt in OEB_STYLES or mt in OEB_DOCS or mt in ('image/svg+xml', 'application/smil', 'application/smil+xml')
 
-
     bookmark_data = None
     if save_bookmark_data:
         bm_file = 'META-INF/calibre_bookmarks.txt'
diff --git a/src/calibre/srv/routes.py b/src/calibre/srv/routes.py
index c07d37b9bf..f2b64ea4e3 100644
--- a/src/calibre/srv/routes.py
+++ b/src/calibre/srv/routes.py
@@ -166,7 +166,7 @@ class Route:
         if len(self.names) + 2 != len(argspec.args) - len(argspec.defaults or ()):
             raise route_error('Function must take %d non-default arguments' % (len(self.names) + 2))
         if argspec.args[2:len(self.names)+2] != self.names:
-            raise route_error('Function\'s argument names do not match the variable names in the route')
+            raise route_error("Function's argument names do not match the variable names in the route")
         if not frozenset(self.type_checkers).issubset(frozenset(self.names)):
             raise route_error('There exist type checkers that do not correspond to route variables: %r' % (set(self.type_checkers) - set(self.names)))
         self.min_size = found_optional_part if found_optional_part is not False else len(matchers)
diff --git a/src/calibre/srv/standalone.py b/src/calibre/srv/standalone.py
index 45276a555d..255f5f10b3 100644
--- a/src/calibre/srv/standalone.py
+++ b/src/calibre/srv/standalone.py
@@ -36,7 +36,7 @@ def daemonize():  # {{{
         raise SystemExit('fork #1 failed: %s' % as_unicode(e))
 
     # decouple from parent environment
-    os.chdir("/")
+    os.chdir('/')
     os.setsid()
     os.umask(0)
 
@@ -51,8 +51,6 @@ def daemonize():  # {{{
 
     # Redirect standard file descriptors.
     speedup.detach(os.devnull)
-
-
 # }}}
 
 
diff --git a/src/calibre/srv/tests/ajax.py b/src/calibre/srv/tests/ajax.py
index 62f6969522..002c47180e 100644
--- a/src/calibre/srv/tests/ajax.py
+++ b/src/calibre/srv/tests/ajax.py
@@ -187,7 +187,7 @@ class ContentTest(LibraryBaseTest):
             s = BytesIO(content)
             s.name = filename
             mi = get_metadata(s, stream_type='txt')
-            ae(data,  {'title': mi.title, 'book_id': data['book_id'], 'authors': mi.authors, 'languages': mi.languages, 'id': '1', 'filename': filename})
+            ae(data, {'title': mi.title, 'book_id': data['book_id'], 'authors': mi.authors, 'languages': mi.languages, 'id': '1', 'filename': filename})
             r, q = make_request(conn, '/get/txt/{}'.format(data['book_id']), username='12', password='test', prefix='')
             ae(r.status, OK)
             ae(q, content)
diff --git a/src/calibre/srv/tests/auth.py b/src/calibre/srv/tests/auth.py
index 3580862472..6bfe128495 100644
--- a/src/calibre/srv/tests/auth.py
+++ b/src/calibre/srv/tests/auth.py
@@ -131,7 +131,7 @@ class TestAuth(BaseTest):
         opts = Options(userdb=':memory:')
         Data = namedtuple('Data', 'username')
         with TemporaryDirectory() as base:
-            l1, l2, l3 = map(lambda x: os.path.join(base, 'l' + x), '123')
+            l1, l2, l3 = (os.path.join(base, 'l' + x) for x in '123')
             for l in (l1, l2, l3):
                 create_backend(l).close()
             ctx = Handler((l1, l2, l3), opts).router.ctx
@@ -214,19 +214,19 @@ class TestAuth(BaseTest):
                 return test(conn, '/closed', headers={'Authorization':digest(**args)}, **kw)
 
             # Check modified nonce fails
-            fail_test(conn, lambda da:setattr(da, 'nonce', 'xyz'))
-            fail_test(conn, lambda da:setattr(da, 'nonce', 'x' + da.nonce))
+            fail_test(conn, lambda da: setattr(da, 'nonce', 'xyz'))
+            fail_test(conn, lambda da: setattr(da, 'nonce', 'x' + da.nonce))
 
             # Check mismatched uri fails
-            fail_test(conn, lambda da:setattr(da, 'uri', '/'))
-            fail_test(conn, lambda da:setattr(da, 'uri', '/closed2'))
-            fail_test(conn, lambda da:setattr(da, 'uri', '/closed/2'))
+            fail_test(conn, lambda da: setattr(da, 'uri', '/'))
+            fail_test(conn, lambda da: setattr(da, 'uri', '/closed2'))
+            fail_test(conn, lambda da: setattr(da, 'uri', '/closed/2'))
 
             # Check that incorrect user/password fails
-            fail_test(conn, lambda da:setattr(da, 'pw', '/'))
-            fail_test(conn, lambda da:setattr(da, 'username', '/'))
-            fail_test(conn, lambda da:setattr(da, 'username', ''))
-            fail_test(conn, lambda da:setattr(da, 'pw', ''))
+            fail_test(conn, lambda da: setattr(da, 'pw', '/'))
+            fail_test(conn, lambda da: setattr(da, 'username', '/'))
+            fail_test(conn, lambda da: setattr(da, 'username', ''))
+            fail_test(conn, lambda da: setattr(da, 'pw', ''))
             fail_test(conn, lambda da:(setattr(da, 'pw', ''), setattr(da, 'username', '')))
 
             # Check against python's stdlib
diff --git a/src/calibre/srv/tests/base.py b/src/calibre/srv/tests/base.py
index 0915533284..b57abd5951 100644
--- a/src/calibre/srv/tests/base.py
+++ b/src/calibre/srv/tests/base.py
@@ -96,7 +96,7 @@ class LibraryBaseTest(BaseTest):
         return dest
 
     def create_server(self, *args, **kwargs):
-        args = (self.library_path ,) + args
+        args = (self.library_path,) + args
         return LibraryServer(*args, **kwargs)
 
 
diff --git a/src/calibre/srv/tests/content.py b/src/calibre/srv/tests/content.py
index a045a34009..2431bb4c71 100644
--- a/src/calibre/srv/tests/content.py
+++ b/src/calibre/srv/tests/content.py
@@ -256,16 +256,16 @@ class ContentTest(LibraryBaseTest):
             bc = data['tree']['c'][1]['c']
             self.ae(bc, body_children)
 
-        t('<p>a<!--c-->t</p>l', [{"n":"p","x":"a","l":"l","c":[{"s":"c","x":"c","l":"t"}]}])
-        t('<p class="foo" id="bar">a', [{"n":"p","x":"a","a":[['class','foo'],['id','bar']]}])
+        t('<p>a<!--c-->t</p>l', [{'n':'p','x':'a','l':'l','c':[{'s':'c','x':'c','l':'t'}]}])
+        t('<p class="foo" id="bar">a', [{'n':'p','x':'a','a':[['class','foo'],['id','bar']]}])
         t(
             '<svg xlink:href="h"></svg>', [{'n': 'svg', 's': 1, 'a': [['href', 'h', 2]]}],
             ('http://www.w3.org/1999/xhtml', 'http://www.w3.org/2000/svg', 'http://www.w3.org/1999/xlink')
         )
         text = '🐈\n\t\\mūs"'
-        t(f"<p id='{text}'>Peña", [{"n":"p","x":"Peña","a":[['id',text]]}])
+        t(f"<p id='{text}'>Peña", [{'n':'p','x':'Peña','a':[['id',text]]}])
         text = 'a' * (127 * 1024)
-        t('<p>{0}<p>{0}'.format(text), [{"n":"p","x":text}, {'n':'p','x':text}])
+        t('<p>{0}<p>{0}'.format(text), [{'n':'p','x':text}, {'n':'p','x':text}])
     # }}}
 
     def test_last_read_cache(self):  # {{{
diff --git a/src/calibre/srv/tests/http.py b/src/calibre/srv/tests/http.py
index 5f217d5806..108e50eca9 100644
--- a/src/calibre/srv/tests/http.py
+++ b/src/calibre/srv/tests/http.py
@@ -217,7 +217,7 @@ class TestHTTP(BaseTest):
             self.ae(r.getheader('Location'), '/somewhere-else')
             self.ae(b'', r.read())
 
-            server.change_handler(lambda data:data.path[0] + data.read().decode('ascii'))
+            server.change_handler(lambda data: data.path[0] + data.read().decode('ascii'))
             conn = server.connect(timeout=base_timeout * 5)
 
             # Test simple GET
@@ -311,7 +311,7 @@ class TestHTTP(BaseTest):
         from calibre.srv.http_response import parse_multipart_byterange
 
         def handler(conn):
-            return conn.generate_static_output('test', lambda : ''.join(conn.path))
+            return conn.generate_static_output('test', lambda: ''.join(conn.path))
         with NamedTemporaryFile(suffix='test.epub') as f, open(P('localization/locales.zip'), 'rb') as lf, \
                 TestServer(handler, timeout=1, compress_min_size=0) as server:
             fdata = (string.ascii_letters * 100).encode('ascii')
@@ -344,7 +344,7 @@ class TestHTTP(BaseTest):
             def edfunc():
                 num_calls[0] += 1
                 return b'data'
-            server.change_handler(lambda conn:conn.etagged_dynamic_response("xxx", edfunc))
+            server.change_handler(lambda conn: conn.etagged_dynamic_response('xxx', edfunc))
             conn = server.connect()
             conn.request('GET', '/an_etagged_path')
             r = conn.getresponse()
@@ -412,7 +412,7 @@ class TestHTTP(BaseTest):
                 # Test sending of larger file
                 start_time = monotonic()
                 lf.seek(0)
-                data =  lf.read()
+                data = lf.read()
                 server.change_handler(lambda conn: lf)
                 conn = server.connect(timeout=1)
                 conn.request('GET', '/test')
diff --git a/src/calibre/srv/tests/loop.py b/src/calibre/srv/tests/loop.py
index 4a01d7f3b2..2a6ed1386c 100644
--- a/src/calibre/srv/tests/loop.py
+++ b/src/calibre/srv/tests/loop.py
@@ -84,7 +84,7 @@ class LoopTest(BaseTest):
         self.ae(0, sum(int(w.is_alive()) for w in server.loop.pool.workers))
         # Test shutdown with hung worker
         block = Event()
-        with TestServer(lambda data:block.wait(), worker_count=3, shutdown_timeout=0.1, timeout=0.1) as server:
+        with TestServer(lambda data: block.wait(), worker_count=3, shutdown_timeout=0.1, timeout=0.1) as server:
             pool = server.loop.pool
             self.ae(3, sum(int(w.is_alive()) for w in pool.workers))
             conn = server.connect()
@@ -198,7 +198,7 @@ class LoopTest(BaseTest):
         'Test serving over SSL'
         address = '127.0.0.1'
         with TemporaryDirectory('srv-test-ssl') as tdir:
-            cert_file, key_file, ca_file = map(lambda x:os.path.join(tdir, x), 'cka')
+            cert_file, key_file, ca_file = (os.path.join(tdir, x) for x in 'cka')
             create_server_cert(address, ca_file, cert_file, key_file, key_size=2048)
             ctx = ssl.create_default_context(cafile=ca_file)
             ctx.verify_flags |= ssl.VERIFY_X509_STRICT
diff --git a/src/calibre/srv/tests/main.py b/src/calibre/srv/tests/main.py
index 5024035614..e6f8ae5ec2 100644
--- a/src/calibre/srv/tests/main.py
+++ b/src/calibre/srv/tests/main.py
@@ -13,7 +13,7 @@ def find_tests():
 
 if __name__ == '__main__':
     try:
-        import init_calibre  # noqa
+        import init_calibre  # noqa: F401
     except ImportError:
         pass
     run_tests(find_tests)
diff --git a/src/calibre/srv/tests/web_sockets.py b/src/calibre/srv/tests/web_sockets.py
index b470c1e30f..0b5fcb998c 100644
--- a/src/calibre/srv/tests/web_sockets.py
+++ b/src/calibre/srv/tests/web_sockets.py
@@ -234,12 +234,12 @@ class WebSocketTest(BaseTest):
         with WSTestServer(EchoHandler) as server:
             simple_test = partial(self.simple_test, server)
 
-            for q in ('', '*' * 125, '*' * 126, '*' * 127, '*' * 128, '*' * 65535, '*' * 65536, "Hello-µ@ßöäüàá-UTF-8!!"):
+            for q in ('', '*' * 125, '*' * 126, '*' * 127, '*' * 128, '*' * 65535, '*' * 65536, 'Hello-µ@ßöäüàá-UTF-8!!'):
                 simple_test([q], [q])
             for q in (b'', b'\xfe' * 125, b'\xfe' * 126, b'\xfe' * 127, b'\xfe' * 128, b'\xfe' * 65535, b'\xfe' * 65536):
                 simple_test([q], [q])
 
-            for payload in [b'', b'ping', b'\x00\xff\xfe\xfd\xfc\xfb\x00\xff', b"\xfe" * 125]:
+            for payload in [b'', b'ping', b'\x00\xff\xfe\xfd\xfc\xfb\x00\xff', b'\xfe' * 125]:
                 simple_test([(PING, payload)], [(PONG, payload)])
 
             simple_test([(PING, 'a'*126)], close_code=PROTOCOL_ERROR, send_close=False)
@@ -312,7 +312,7 @@ class WebSocketTest(BaseTest):
             simple_test([
                 {'opcode':TEXT, 'fin':0}, {'opcode':CONTINUATION, 'fin':0, 'payload':'x'}, {'opcode':CONTINUATION},], ['x'])
 
-            for q in (b'\xc2\xb5', b'\xce\xba\xe1\xbd\xb9\xcf\x83\xce\xbc\xce\xb5', "Hello-µ@ßöäüàá-UTF-8!!".encode()):
+            for q in (b'\xc2\xb5', b'\xce\xba\xe1\xbd\xb9\xcf\x83\xce\xbc\xce\xb5', 'Hello-µ@ßöäüàá-UTF-8!!'.encode()):
                 frags = []
                 for i in range(len(q)):
                     b = q[i:i+1]
diff --git a/src/calibre/srv/users.py b/src/calibre/srv/users.py
index 3a5f00e1b1..d23cb68cff 100644
--- a/src/calibre/srv/users.py
+++ b/src/calibre/srv/users.py
@@ -36,8 +36,8 @@ def parse_restriction(raw):
     lr = r.get('library_restrictions', {})
     if not isinstance(lr, dict):
         lr = {}
-    r['allowed_library_names'] = frozenset(map(lambda x: x.lower(), r.get('allowed_library_names', ())))
-    r['blocked_library_names'] = frozenset(map(lambda x: x.lower(), r.get('blocked_library_names', ())))
+    r['allowed_library_names'] = frozenset(x.lower() for x in r.get('allowed_library_names', ()))
+    r['blocked_library_names'] = frozenset(x.lower() for x in r.get('blocked_library_names', ()))
     r['library_restrictions'] = {k.lower(): v or '' for k, v in iteritems(lr)}
     return r
 
diff --git a/src/calibre/srv/utils.py b/src/calibre/srv/utils.py
index 2925e7fa30..cdc8c291df 100644
--- a/src/calibre/srv/utils.py
+++ b/src/calibre/srv/utils.py
@@ -117,20 +117,20 @@ def error_codes(*errnames):
     return ans
 
 
-socket_errors_eintr = error_codes("EINTR", "WSAEINTR")
+socket_errors_eintr = error_codes('EINTR', 'WSAEINTR')
 
 socket_errors_socket_closed = error_codes(  # errors indicating a disconnected connection
-    "EPIPE",
-    "EBADF", "WSAEBADF",
-    "ENOTSOCK", "WSAENOTSOCK",
-    "ENOTCONN", "WSAENOTCONN",
-    "ESHUTDOWN", "WSAESHUTDOWN",
-    "ETIMEDOUT", "WSAETIMEDOUT",
-    "ECONNREFUSED", "WSAECONNREFUSED",
-    "ECONNRESET", "WSAECONNRESET",
-    "ECONNABORTED", "WSAECONNABORTED",
-    "ENETRESET", "WSAENETRESET",
-    "EHOSTDOWN", "EHOSTUNREACH",
+    'EPIPE',
+    'EBADF', 'WSAEBADF',
+    'ENOTSOCK', 'WSAENOTSOCK',
+    'ENOTCONN', 'WSAENOTCONN',
+    'ESHUTDOWN', 'WSAESHUTDOWN',
+    'ETIMEDOUT', 'WSAETIMEDOUT',
+    'ECONNREFUSED', 'WSAECONNREFUSED',
+    'ECONNRESET', 'WSAECONNRESET',
+    'ECONNABORTED', 'WSAECONNABORTED',
+    'ENETRESET', 'WSAENETRESET',
+    'EHOSTDOWN', 'EHOSTUNREACH',
 )
 socket_errors_nonblocking = error_codes(
     'EAGAIN', 'EWOULDBLOCK', 'WSAEWOULDBLOCK')
@@ -154,14 +154,14 @@ def create_sock_pair():
 
 
 def parse_http_list(header_val):
-    """Parse lists as described by RFC 2068 Section 2.
+    '''Parse lists as described by RFC 2068 Section 2.
 
     In particular, parse comma-separated lists where the elements of
     the list may include quoted-strings.  A quoted-string could
     contain a comma.  A non-quoted string could have quotes in the
     middle.  Neither commas nor quotes count if they are escaped.
     Only double-quotes count, not single-quotes.
-    """
+    '''
     if isinstance(header_val, bytes):
         slash, dquote, comma = b'\\",'
         empty = b''
@@ -265,8 +265,8 @@ class Cookie(SimpleCookie):
 def custom_fields_to_display(db):
     return frozenset(db.field_metadata.ignorable_field_keys())
 
-# Logging {{{
 
+# Logging {{{
 
 class ServerLog(ThreadSafeLog):
     exception_traceback_level = ThreadSafeLog.WARN
diff --git a/src/calibre/srv/web_socket.py b/src/calibre/srv/web_socket.py
index 4ba685b290..c136bea0a6 100644
--- a/src/calibre/srv/web_socket.py
+++ b/src/calibre/srv/web_socket.py
@@ -23,10 +23,10 @@ from polyglot.binary import as_base64_unicode
 from polyglot.queue import Empty, Queue
 
 HANDSHAKE_STR = (
-    "HTTP/1.1 101 Switching Protocols\r\n"
-    "Upgrade: WebSocket\r\n"
-    "Connection: Upgrade\r\n"
-    "Sec-WebSocket-Accept: %s\r\n\r\n"
+    'HTTP/1.1 101 Switching Protocols\r\n'
+    'Upgrade: WebSocket\r\n'
+    'Connection: Upgrade\r\n'
+    'Sec-WebSocket-Accept: %s\r\n\r\n'
 )
 GUID_STR = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11'
 
@@ -172,8 +172,8 @@ class ReadFrame:  # {{{
 
 # }}}
 
-# Sending frames {{{
 
+# Sending frames {{{
 
 def create_frame(fin, opcode, payload, mask=None, rsv=0):
     if isinstance(payload, str):
@@ -525,11 +525,10 @@ class DummyHandler:
     def handle_websocket_close(self, connection_id):
         pass
 
+
 # Testing {{{
 
-# Run this file with calibre-debug and use wstest to run the Autobahn test
-# suite
-
+# Run this file with calibre-debug and use wstest to run the Autobahn test suite
 
 class EchoHandler:
 
diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py
index 4dbf2ce545..494cbe9e7b 100644
--- a/src/calibre/test_build.py
+++ b/src/calibre/test_build.py
@@ -106,8 +106,8 @@ class BuildTest(unittest.TestCase):
         self.assertEqual(data, decompress(cdata))
 
     def test_html5lib(self):
-        import html5lib.html5parser  # noqa
-        from html5lib import parse  # noqa
+        import html5lib.html5parser  # noqa: F401
+        from html5lib import parse  # noqa: F401
 
     def test_html5_parser(self):
         from html5_parser import parse
@@ -161,7 +161,7 @@ class BuildTest(unittest.TestCase):
         root = etree.fromstring(raw, parser=etree.XMLParser(recover=True, no_network=True, resolve_entities=False))
         self.assertEqual(etree.tostring(root), raw)
         from lxml import html
-        html.fromstring("<p>\U0001f63a")
+        html.fromstring('<p>\U0001f63a')
 
     def test_certgen(self):
         from calibre.utils.certgen import create_key_pair
@@ -303,7 +303,7 @@ class BuildTest(unittest.TestCase):
         os.rmdir(dpath)
         del h
         shutil.rmtree(tdir)
-        m = winutil.create_mutex("test-mutex", False)
+        m = winutil.create_mutex('test-mutex', False)
         self.assertRaises(OSError, winutil.create_mutex, 'test-mutex', False)
         m.close()
         self.assertEqual(winutil.parse_cmdline('"c:\\test exe.exe" "some arg" 2'), ('c:\\test exe.exe', 'some arg', '2'))
@@ -344,7 +344,7 @@ class BuildTest(unittest.TestCase):
         # package. On non-frozen builds, it should just work because the
         # hard-coded paths of the Qt installation should work. If they do not,
         # then it is a distro problem.
-        fmts = set(map(lambda x: x.data().decode('utf-8'), QImageReader.supportedImageFormats()))  # no2to3
+        fmts = {x.data().decode('utf-8') for x in QImageReader.supportedImageFormats()}  # no2to3
         testf = {'jpg', 'png', 'svg', 'ico', 'gif', 'webp'}
         self.assertEqual(testf.intersection(fmts), testf, "Qt doesn't seem to be able to load some of its image plugins. Available plugins: %s" % fmts)
         data = P('images/blank.png', allow_user_override=False, data=True)
@@ -422,7 +422,7 @@ class BuildTest(unittest.TestCase):
 
     def test_pykakasi(self):
         from calibre.ebooks.unihandecode.jadecoder import Jadecoder
-        self.assertEqual(Jadecoder().decode("自転車生活の愉しみ"), 'Jitensha Seikatsu no Tanoshi mi')
+        self.assertEqual(Jadecoder().decode('自転車生活の愉しみ'), 'Jitensha Seikatsu no Tanoshi mi')
 
     def test_imaging(self):
         from PIL import Image
diff --git a/src/calibre/translations/msgfmt.py b/src/calibre/translations/msgfmt.py
index 225d47ef85..ab63ef5b84 100644
--- a/src/calibre/translations/msgfmt.py
+++ b/src/calibre/translations/msgfmt.py
@@ -2,7 +2,7 @@
 # Written by Martin v. Löwis <loewis@informatik.hu-berlin.de>
 
 
-"""Generate binary message catalog from textual translation description.
+'''Generate binary message catalog from textual translation description.
 
 This program converts a textual Uniforum-style message catalog (.po file) into
 a binary GNU catalog (.mo file).  This is essentially the same function as the
@@ -24,7 +24,7 @@ Options:
     -V
     --version
         Display version information and exit.
-"""
+'''
 
 import array
 import ast
@@ -34,7 +34,7 @@ import struct
 import sys
 from email.parser import HeaderParser
 
-__version__ = "1.2"
+__version__ = '1.2'
 
 MESSAGES = {}
 STATS = {'translated': 0, 'untranslated': 0, 'uniqified': 0}
@@ -50,7 +50,7 @@ def usage(code, msg=''):
 
 
 def add(ctxt, msgid, msgstr, fuzzy):
-    "Add a non-fuzzy translation to the dictionary."
+    'Add a non-fuzzy translation to the dictionary.'
     if (not fuzzy or not msgid) and msgstr:
         if msgid:
             STATS['translated'] += 1
@@ -63,14 +63,14 @@ def add(ctxt, msgid, msgstr, fuzzy):
                 NON_UNIQUE.add(msgstr)
             MESSAGES[msgid] = msgstr
         else:
-            MESSAGES[b"%b\x04%b" % (ctxt, msgid)] = msgstr
+            MESSAGES[b'%b\x04%b' % (ctxt, msgid)] = msgstr
     else:
         if msgid:
             STATS['untranslated'] += 1
 
 
 def generate():
-    "Return the generated output."
+    'Return the generated output.'
     # the keys are sorted in the .mo file
     keys = sorted(MESSAGES.keys())
     offsets = []
@@ -96,17 +96,17 @@ def generate():
         koffsets += [l1, o1+keystart]
         voffsets += [l2, o2+valuestart]
     offsets = koffsets + voffsets
-    output = struct.pack("Iiiiiii",
+    output = struct.pack('Iiiiiii',
                          0x950412de,       # Magic
                          0,                 # Version
-                         len(keys),         # # of entries
+                         len(keys),         # of entries
                          7*4,               # start of key index
                          7*4+len(keys)*8,   # start of value index
                          0, 0)              # size and offset of hash table
     try:
-        output += array.array("i", offsets).tobytes()
+        output += array.array('i', offsets).tobytes()
     except AttributeError:
-        output += array.array("i", offsets).tostring()
+        output += array.array('i', offsets).tostring()
     output += ids
     output += strs
     return output
@@ -235,7 +235,7 @@ def make(filename, outfile):
         if hasattr(outfile, 'write'):
             outfile.write(output)
         else:
-            with open(outfile, "wb") as f:
+            with open(outfile, 'wb') as f:
                 f.write(output)
     except OSError as msg:
         print(msg, file=sys.stderr)
@@ -250,7 +250,7 @@ def make_with_stats(filename, outfile):
 
 
 def run_batch(pairs):
-    for (filename, outfile) in pairs:
+    for filename, outfile in pairs:
         yield make_with_stats(filename, outfile)
 
 
@@ -277,7 +277,7 @@ def main():
         if opt in ('-h', '--help'):
             usage(0)
         elif opt in ('-V', '--version'):
-            print("msgfmt.py", __version__, file=sys.stderr)
+            print('msgfmt.py', __version__, file=sys.stderr)
             sys.exit(0)
         elif opt in ('-o', '--output-file'):
             outfile = arg
diff --git a/src/calibre/utils/bibtex.py b/src/calibre/utils/bibtex.py
index 77c8ea573b..acf704391f 100644
--- a/src/calibre/utils/bibtex.py
+++ b/src/calibre/utils/bibtex.py
@@ -1,4 +1,4 @@
-""" Collection of python utility-methodes commonly used by other
+''' Collection of python utility-methodes commonly used by other
     bibliograph packages.
     From http://pypi.python.org/pypi/bibliograph.core/
     from Tom Gross <itconsense@gmail.com>
@@ -58,7 +58,7 @@
       OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
       SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
       DAMAGE.
-    """
+'''
 
 __author__  = 'sengian <sengian1 at gmail.com>'
 __docformat__ = 'restructuredtext en'
@@ -2553,21 +2553,21 @@ class BibTeX:
         self.ascii_bibtex = True
         # This substitution is based on the description of cite key restrictions at
         # http://bibdesk.sourceforge.net/manual/BibDesk%20Help_2.html
-        self.invalid_cit = re.compile('[ "@\',\\#}{~%&$^]')
+        self.invalid_cit = re.compile(r'[ "@\',\#}{~%&$^]')
         self.upper = re.compile('[' +
             string.ascii_uppercase + ']')
-        self.escape = re.compile('[#&%_]')
+        self.escape = re.compile(r'[#&%_]')
 
     def ValidateCitationKey(self, text):
-        """
+        '''
         Removes characters not allowed in BibTeX keys
-        """
+        '''
         return self.invalid_cit.sub('', text)
 
     def braceUppercase(self, text):
-        """
+        '''
         Convert uppercase letters to bibtex encoded uppercase
-        """
+        '''
         return self.upper.sub(lambda m: '{%s}' % m.group(), text)
 
     def resolveEntities(self, text):
@@ -2579,36 +2579,36 @@ class BibTeX:
         return text.replace('$}{$', '')
 
     def escapeSpecialCharacters(self, text):
-        """
+        '''
         Latex escaping some (not all) special characters
-        """
+        '''
         text = text.replace('\\', '\\\\')
         text = text.replace('~', '{\\char`\\~}')  # TILDE
         return self.escape.sub(lambda m: '\\%s' % m.group(), text)
 
     # Calibre functions: Option to go to official ASCII Bibtex or unofficial UTF-8
     def utf8ToBibtex(self, text):
-        """
+        '''
         Go from an unicode entry to ASCII Bibtex format without encoding
-        """
+        '''
         if len(text) == 0:
             return ''
         text = self.resolveEntities(text)
         text = self.escapeSpecialCharacters(text)
-        if self.ascii_bibtex :
+        if self.ascii_bibtex:
             text = self.resolveUnicode(text)
         return text
 
     def bibtex_author_format(self, item):
-        """
+        '''
         Format authors for Bibtex compliance (get a list as input)
-        """
-        return self.utf8ToBibtex(' and '.join([author for author in item]))
+        '''
+        return self.utf8ToBibtex(' and '.join(item))
 
     def stripUnmatchedSyntax(self, text, open_character, close_character):
-        """
+        '''
         Strips unmatched BibTeX syntax
-        """
+        '''
         stack = []
         assert len(open_character) == 1 and len(close_character) == 1
         remove = []
diff --git a/src/calibre/utils/certgen.py b/src/calibre/utils/certgen.py
index e654b645d4..c2c82457f6 100644
--- a/src/calibre/utils/certgen.py
+++ b/src/calibre/utils/certgen.py
@@ -99,7 +99,7 @@ def create_server_cert(
 
 def develop():
     cacert, cakey, cert, pkey = create_server_cert('test.me', alt_names=['DNS:moose.cat', 'DNS:huge.bat'])
-    print("CA Certificate")
+    print('CA Certificate')
     print(cert_info(cacert))
     print(), print(), print()
     print('Server Certificate')
diff --git a/src/calibre/utils/cleantext.py b/src/calibre/utils/cleantext.py
index ccf4ffaac7..47b2f4d745 100644
--- a/src/calibre/utils/cleantext.py
+++ b/src/calibre/utils/cleantext.py
@@ -76,10 +76,10 @@ def test_clean_xml_chars():
 def unescape(text, rm=False, rchar=''):
     def fixup(m, rm=rm, rchar=rchar):
         text = m.group(0)
-        if text[:2] == "&#":
+        if text[:2] == '&#':
             # character reference
             try:
-                if text[:3] == "&#x":
+                if text[:3] == '&#x':
                     return codepoint_to_chr(int(text[3:-1], 16))
                 else:
                     return codepoint_to_chr(int(text[2:-1]))
@@ -94,4 +94,4 @@ def unescape(text, rm=False, rchar=''):
         if rm:
             return rchar  # replace by char
         return text  # leave as is
-    return re.sub("&#?\\w+;", fixup, text)
+    return re.sub(r'&#?\w+;', fixup, text)
diff --git a/src/calibre/utils/complete.py b/src/calibre/utils/complete.py
index 38387a7ade..74f4f722d5 100644
--- a/src/calibre/utils/complete.py
+++ b/src/calibre/utils/complete.py
@@ -59,9 +59,9 @@ def get_opts_from_parser(parser, prefix):
 
 
 def send(ans):
-    pat = re.compile('([^0-9a-zA-Z_./-])')
+    pat = re.compile(r'([^0-9a-zA-Z_./-])')
     for x in sorted(set(ans)):
-        x = pat.sub(lambda m : '\\'+m.group(1), x)
+        x = pat.sub(lambda m: '\\'+m.group(1), x)
         if x.endswith('\\ '):
             x = x[:-2]+' '
         prints(x)
diff --git a/src/calibre/utils/config.py b/src/calibre/utils/config.py
index b306b66513..0068066a06 100644
--- a/src/calibre/utils/config.py
+++ b/src/calibre/utils/config.py
@@ -39,7 +39,7 @@ optparse._ = _
 
 if False:
     # Make pyflakes happy
-    Config, ConfigProxy, Option, OptionValues, StringConfig, OptionSet,
+    Config, ConfigProxy, Option, OptionValues, StringConfig, OptionSet
     ConfigInterface, tweaks, plugin_dir, prefs, from_json, to_json, make_config_dir
 
 
@@ -59,7 +59,7 @@ class CustomHelpFormatter(optparse.IndentedHelpFormatter):
 
     def format_heading(self, heading):
         from calibre.utils.terminal import colored
-        return "%*s%s:\n" % (self.current_indent, '',
+        return '%*s%s:\n' % (self.current_indent, '',
                                  colored(heading, fg='blue', bold=True))
 
     def format_option(self, option):
@@ -71,11 +71,11 @@ class CustomHelpFormatter(optparse.IndentedHelpFormatter):
         opts = self.option_strings[option]
         opt_width = self.help_position - self.current_indent - 2
         if len(opts) > opt_width:
-            opts = "%*s%s\n" % (self.current_indent, "",
+            opts = '%*s%s\n' % (self.current_indent, '',
                                     colored(opts, fg='green'))
             indent_first = self.help_position
         else:                       # start help on same line as opts
-            opts = "%*s%-*s  " % (self.current_indent, "", opt_width +
+            opts = '%*s%-*s  ' % (self.current_indent, '', opt_width +
                     len(colored('', fg='green')), colored(opts, fg='green'))
             indent_first = 0
         result.append(opts)
@@ -85,12 +85,12 @@ class CustomHelpFormatter(optparse.IndentedHelpFormatter):
 
             for line in help_text:
                 help_lines.extend(textwrap.wrap(line, self.help_width))
-            result.append("%*s%s\n" % (indent_first, "", help_lines[0]))
-            result.extend(["%*s%s\n" % (self.help_position, "", line)
+            result.append('%*s%s\n' % (indent_first, '', help_lines[0]))
+            result.extend(['%*s%s\n' % (self.help_position, '', line)
                            for line in help_lines[1:]])
-        elif opts[-1] != "\n":
-            result.append("\n")
-        return "".join(result)+'\n'
+        elif opts[-1] != '\n':
+            result.append('\n')
+        return ''.join(result)+'\n'
 
 
 class OptionParser(optparse.OptionParser):
@@ -111,7 +111,7 @@ class OptionParser(optparse.OptionParser):
             epilog = _('Created by ')+colored(__author__, fg='cyan')
         usage += '\n\n'+_('''Whenever you pass arguments to %prog that have spaces in them, '''
                           '''enclose the arguments in quotation marks. For example: "{}"''').format(
-                               "C:\\some path with spaces" if iswindows else '/some path/with spaces') +'\n'
+                               'C:\\some path with spaces' if iswindows else '/some path/with spaces') +'\n'
         if version is None:
             version = '%%prog (%s %s)'%(__appname__, get_version())
         optparse.OptionParser.__init__(self, usage=usage, version=version, epilog=epilog,
@@ -120,8 +120,8 @@ class OptionParser(optparse.OptionParser):
         self.gui_mode = gui_mode
         if False:
             # Translatable string from optparse
-            _("Options")
-            _("show this help message and exit")
+            _('Options')
+            _('show this help message and exit')
             _("show program's version number and exit")
 
     def print_usage(self, file=None):
@@ -302,7 +302,6 @@ dynamic = DynamicConfig()
 
 
 class XMLConfig(dict):
-
     '''
     Similar to :class:`DynamicConfig`, except that it uses an XML storage
     backend instead of a pickle file.
diff --git a/src/calibre/utils/config_base.py b/src/calibre/utils/config_base.py
index bc06642655..021b8176c6 100644
--- a/src/calibre/utils/config_base.py
+++ b/src/calibre/utils/config_base.py
@@ -267,7 +267,7 @@ class OptionSet:
     def option_parser(self, user_defaults=None, usage='', gui_mode=False):
         from calibre.utils.config import OptionParser
         parser = OptionParser(usage, gui_mode=gui_mode)
-        groups = defaultdict(lambda : parser)
+        groups = defaultdict(lambda: parser)
         for group, desc in self.groups.items():
             groups[group] = parser.add_option_group(group.upper(), desc)
 
@@ -415,7 +415,7 @@ class Config(ConfigInterface):
             try:
                 src = src_bytes.decode('utf-8')
             except ValueError:
-                print("Failed to parse", path)
+                print('Failed to parse', path)
                 traceback.print_exc()
         if not src:
             path = path.rpartition('.')[0]
@@ -594,7 +594,7 @@ def create_global_prefs(conf_obj=None):
                    'can cause problems with text that starts with numbers and is '
                    'a little slower.'))
 
-    c.add_opt('migrated', default=False, help='For Internal use. Don\'t modify.')
+    c.add_opt('migrated', default=False, help="For Internal use. Don't modify.")
     return c
 
 
@@ -603,8 +603,8 @@ if prefs['installation_uuid'] is None:
     import uuid
     prefs['installation_uuid'] = str(uuid.uuid4())
 
-# Read tweaks
 
+# Read tweaks
 
 def tweaks_file():
     return os.path.join(config_dir, 'tweaks.json')
diff --git a/src/calibre/utils/copy_files.py b/src/calibre/utils/copy_files.py
index 346c1a8520..30fef28476 100644
--- a/src/calibre/utils/copy_files.py
+++ b/src/calibre/utils/copy_files.py
@@ -18,6 +18,7 @@ if iswindows:
 WINDOWS_SLEEP_FOR_RETRY_TIME = 2  # seconds
 WindowsFileId = tuple[int, int, int]
 
+
 class UnixFileCopier:
 
     def __init__(self, delete_all=False, allow_move=False):
@@ -73,7 +74,6 @@ def windows_lock_path_and_callback(path: str, f: Callable) -> None:
 
 
 class WindowsFileCopier:
-
     '''
     Locks all files before starting the copy, ensuring other processes cannot interfere
     '''
@@ -81,7 +81,7 @@ class WindowsFileCopier:
     def __init__(self, delete_all=False, allow_move=False):
         self.delete_all = delete_all
         self.allow_move = allow_move
-        self.path_to_fileid_map : dict[str, WindowsFileId] = {}
+        self.path_to_fileid_map: dict[str, WindowsFileId] = {}
         self.fileid_to_paths_map: dict[WindowsFileId, set[str]] = defaultdict(set)
         self.path_to_handle_map: dict[str, 'winutil.Handle'] = {}
         self.folder_to_handle_map: dict[str, 'winutil.Handle'] = {}
diff --git a/src/calibre/utils/copy_files_test.py b/src/calibre/utils/copy_files_test.py
index 6e26eb71cb..0100d2d8c1 100644
--- a/src/calibre/utils/copy_files_test.py
+++ b/src/calibre/utils/copy_files_test.py
@@ -119,5 +119,6 @@ class TestCopyFiles(unittest.TestCase):
                 self.assertFalse(tuple(walk(self.d())))
             self.ae(before, frozenset(walk(src)), 'Source files were deleted despite there being an error')
 
+
 def find_tests():
     return unittest.defaultTestLoader.loadTestsFromTestCase(TestCopyFiles)
diff --git a/src/calibre/utils/date.py b/src/calibre/utils/date.py
index 045350002b..043d9f744a 100644
--- a/src/calibre/utils/date.py
+++ b/src/calibre/utils/date.py
@@ -161,7 +161,7 @@ def qt_to_dt(qdate_or_qdatetime, as_utc=True):
     o = qdate_or_qdatetime
     if o is None or is_date_undefined(qdate_or_qdatetime):
         return UNDEFINED_DATE
-    if hasattr(o, 'toUTC'): # QDateTime
+    if hasattr(o, 'toUTC'):  # QDateTime
         def c(o: QDateTime, tz=utc_tz):
             d, t = o.date(), o.time()
             try:
@@ -285,8 +285,8 @@ def utcfromtimestamp(stamp):
 def timestampfromdt(dt, assume_utc=True):
     return (as_utc(dt, assume_utc=assume_utc) - EPOCH).total_seconds()
 
-# Format date functions {{{
 
+# Format date functions {{{
 
 def fd_format_hour(dt, ampm, hr):
     l = len(hr)
@@ -384,13 +384,13 @@ def format_date(dt, format, assume_utc=False, as_utc=False):
 
     repl_func = partial(fd_repl_func, dt, 'ap' in format.lower())
     return re.sub(
-        '(s{1,2})|(m{1,2})|(h{1,2})|(ap)|(AP)|(d{1,4}|M{1,4}|(?:yyyy|yy))',
+        r'(s{1,2})|(m{1,2})|(h{1,2})|(ap)|(AP)|(d{1,4}|M{1,4}|(?:yyyy|yy))',
         repl_func, format)
 
 # }}}
 
-# Clean date functions {{{
 
+# Clean date functions {{{
 
 def cd_has_hour(tt, dt):
     tt['hour'] = dt.hour
@@ -460,7 +460,7 @@ def clean_date_for_sort(dt, fmt=None):
           'min':UNDEFINED_DATE.minute, 'sec':UNDEFINED_DATE.second}
 
     repl_func = partial(cd_repl_func, tt, dt)
-    re.sub('(s{1,2})|(m{1,2})|(h{1,2})|(d{1,4}|M{1,4}|(?:yyyy|yy))', repl_func, fmt)
+    re.sub(r'(s{1,2})|(m{1,2})|(h{1,2})|(d{1,4}|M{1,4}|(?:yyyy|yy))', repl_func, fmt)
     return dt.replace(year=tt['year'], month=tt['mon'], day=tt['day'], hour=tt['hour'],
                       minute=tt['min'], second=tt['sec'], microsecond=0)
 # }}}
diff --git a/src/calibre/utils/exim.py b/src/calibre/utils/exim.py
index 4e12dde715..25a1ec73dc 100644
--- a/src/calibre/utils/exim.py
+++ b/src/calibre/utils/exim.py
@@ -27,6 +27,7 @@ from polyglot.builtins import error_message, iteritems
 
 # Export {{{
 
+
 class FileDest:
 
     def __init__(self, key, exporter, mtime=None):
@@ -223,6 +224,7 @@ def export(destdir, library_paths=None, dbmap=None, progress1=None, progress2=No
         progress1(_('Completed'), total, total)
 # }}}
 
+
 # Import {{{
 
 class Chunk(NamedTuple):
diff --git a/src/calibre/utils/ffml_processor.py b/src/calibre/utils/ffml_processor.py
index 4289b4fc18..cd2310ae04 100644
--- a/src/calibre/utils/ffml_processor.py
+++ b/src/calibre/utils/ffml_processor.py
@@ -12,6 +12,7 @@ from calibre import prepare_string_for_xml
 # This must be something that will never naturally occur in documentation
 MARKUP_ERROR = '*' + _('Template documentation markup error') + '*:'
 
+
 @unique
 class NodeKinds(IntEnum):
 
@@ -176,9 +177,8 @@ class UrlNode(Node):
         return prepare_string_for_xml(self._url)
 
 
-
 class FFMLProcessor:
-    r"""
+    r'''
     This class is parser for the Formatter Function Markup Language (FFML). It
     provides output methods for RST and HTML.
 
@@ -191,18 +191,18 @@ class FFMLProcessor:
     - pushing the "FFML documentation" button in the "Formatter function
       documentation editor". How to access the editor is described in "General
       information" dialog mentioned above.
-    """
+    '''
 
 # ====== API ======
 
     def print_node_tree(self, node, indent=0):
-        """
+        '''
         Pretty print a Formatter Function Markup Language (FFML) parse tree.
 
         :param node:   The root of the tree you want printed.
         :param indent: The indent level of the tree. The outermost root should
                        have an indent of zero.
-        """
+        '''
         if node.node_kind() in (NodeKinds.TEXT, NodeKinds.CODE_TEXT, NodeKinds.CHARACTER,
                                 NodeKinds.CODE_BLOCK, NodeKinds.ITALIC_TEXT,
                                 NodeKinds.GUI_LABEL, NodeKinds.BOLD_TEXT):
@@ -215,7 +215,7 @@ class FFMLProcessor:
             self.print_node_tree(n, indent+1)
 
     def parse_document(self, doc, name, safe=True):
-        """
+        '''
         Given a Formatter Function Markup Language (FFML) document, return
         a parse tree for that document.
 
@@ -226,7 +226,7 @@ class FFMLProcessor:
                       recover using the Engiish version as well as display an error.
 
         :return:       a parse tree for the document
-        """
+        '''
         def initialize(txt):
             self.input_line = 1
             self.input = txt
@@ -273,7 +273,7 @@ class FFMLProcessor:
             return add_exception_text(DocumentNode(), e, doc)
 
     def tree_to_html(self, tree, depth=0):
-        """
+        '''
         Given a Formatter Function Markup Language (FFML) parse tree, return
         a string containing the HTML for that tree.
 
@@ -281,7 +281,7 @@ class FFMLProcessor:
         :param depth:  the recursion level. This is used for debugging.
 
         :return:       a string containing the HTML text
-        """
+        '''
         result = ''
         if tree.node_kind() == NodeKinds.TEXT:
             result += tree.escaped_text()
@@ -320,7 +320,7 @@ class FFMLProcessor:
         return result
 
     def document_to_html(self, document, name, safe=True):
-        """
+        '''
         Given a document in the Formatter Function Markup Language (FFML), return
         that document in HTML format.
 
@@ -332,12 +332,12 @@ class FFMLProcessor:
 
         :return: a string containing the HTML
 
-        """
+        '''
         tree = self.parse_document(document, name, safe=safe)
         return self.tree_to_html(tree, 0)
 
     def document_to_summary_html(self, document, name, safe=True):
-        """
+        '''
         Given a document in the Formatter Function Markup Language (FFML), return
         that document's summary in HTML format.
 
@@ -349,7 +349,7 @@ class FFMLProcessor:
 
         :return: a string containing the HTML
 
-        """
+        '''
         document = document.strip()
         sum_tag = document.find('[/]')
         if sum_tag > 0:
@@ -362,7 +362,7 @@ class FFMLProcessor:
         return result
 
     def tree_to_rst(self, tree, indent, result=None):
-        """
+        '''
         Given a Formatter Function Markup Language (FFML) parse tree, return
         a string containing the RST (sphinx reStructuredText) for that tree.
 
@@ -372,7 +372,7 @@ class FFMLProcessor:
                        the RST output indented.
 
         :return:       a string containing the RST text
-        """
+        '''
 
         def indent_text(txt):
             nonlocal result
@@ -428,7 +428,7 @@ class FFMLProcessor:
         return result
 
     def document_to_rst(self, document, name, indent=0, prefix=None, safe=True):
-        """
+        '''
         Given a document in the Formatter Function Markup Language (FFML), return
         that document in RST (sphinx reStructuredText) format.
 
@@ -446,14 +446,14 @@ class FFMLProcessor:
 
         :return: a string containing the RST text
 
-        """
+        '''
         doc = self.tree_to_rst(self.parse_document(document, name, safe=safe), indent)
         if prefix is not None:
             doc = prefix + doc.lstrip('  ' * indent)
         return doc
 
     def document_to_summary_rst(self, document, name, indent=0, prefix=None, safe=True):
-        """
+        '''
         Given a document in the Formatter Function Markup Language (FFML), return
         that document's summary in RST (sphinx reStructuredText) format.
 
@@ -471,7 +471,7 @@ class FFMLProcessor:
 
         :return: a string containing the RST text
 
-        """
+        '''
         document = document.strip()
         sum_tag = document.find('[/]')
         if sum_tag > 0:
@@ -486,7 +486,7 @@ class FFMLProcessor:
 
 # ============== Internal methods =================
 
-    keywords = {'``':           NodeKinds.CODE_TEXT, # must be before '`'
+    keywords = {'``':           NodeKinds.CODE_TEXT,  # must be before '`'
                 '`':            NodeKinds.ITALIC_TEXT,
                 '[B]':          NodeKinds.BOLD_TEXT,
                 '[CODE]':       NodeKinds.CODE_BLOCK,
diff --git a/src/calibre/utils/file_type_icons.py b/src/calibre/utils/file_type_icons.py
index 0946ff9bf6..b4b52d811d 100644
--- a/src/calibre/utils/file_type_icons.py
+++ b/src/calibre/utils/file_type_icons.py
@@ -52,6 +52,3 @@ EXT_MAP = {
     'docx'    : 'docx',
     'opml'    : 'opml',
 }
-
-
-
diff --git a/src/calibre/utils/filenames.py b/src/calibre/utils/filenames.py
index 83e3b5d098..e44549990e 100644
--- a/src/calibre/utils/filenames.py
+++ b/src/calibre/utils/filenames.py
@@ -359,7 +359,6 @@ def windows_nlinks(path):
 
 
 class WindowsAtomicFolderMove:
-
     '''
     Move all the files inside a specified folder in an atomic fashion,
     preventing any other process from locking a file while the operation is
@@ -416,7 +415,7 @@ class WindowsAtomicFolderMove:
 
                 self.close_handles()
                 if e.winerror == winutil.ERROR_SHARING_VIOLATION:
-                    err = IOError(errno.EACCES,
+                    err = OSError(errno.EACCES,
                             _('File is open in another process'))
                     err.filename = f
                     raise err
@@ -681,7 +680,7 @@ if iswindows:
         except FileNotFoundError:
             return path
         except OSError as e:
-            if e.winerror == 123: # ERR_INVALID_NAME
+            if e.winerror == 123:  # ERR_INVALID_NAME
                 return path
             raise
 
diff --git a/src/calibre/utils/fonts/scanner.py b/src/calibre/utils/fonts/scanner.py
index bfdc27e40d..79330c71a0 100644
--- a/src/calibre/utils/fonts/scanner.py
+++ b/src/calibre/utils/fonts/scanner.py
@@ -21,8 +21,8 @@ from polyglot.builtins import itervalues
 class NoFonts(ValueError):
     pass
 
-# Font dirs {{{
 
+# Font dirs {{{
 
 def default_font_dirs():
     return [
@@ -123,8 +123,8 @@ def font_dirs():
     return fc_list()
 # }}}
 
-# Build font family maps {{{
 
+# Build font family maps {{{
 
 def font_priority(font):
     '''
@@ -288,7 +288,7 @@ class FontScanner(Thread):
                 continue
             generic_family = panose_to_css_generic_family(faces[0]['panose'])
             if generic_family in allowed_families or generic_family == preferred_families[0]:
-                return (family, faces)
+                return family, faces
             elif generic_family not in found:
                 found[generic_family] = (family, faces)
 
diff --git a/src/calibre/utils/fonts/sfnt/__init__.py b/src/calibre/utils/fonts/sfnt/__init__.py
index c416da49c2..2375c60053 100644
--- a/src/calibre/utils/fonts/sfnt/__init__.py
+++ b/src/calibre/utils/fonts/sfnt/__init__.py
@@ -59,10 +59,10 @@ class FixedProperty:
 
 
 def max_power_of_two(x):
-    """
+    '''
 Return the highest exponent of two, so that
     (2 ** exponent) <= x
-    """
+    '''
     exponent = 0
     while x:
         x = x >> 1
@@ -76,4 +76,3 @@ def load_font(stream_or_path):
         raw = raw.read()
     from calibre.utils.fonts.sfnt.container import Sfnt
     return Sfnt(raw)
-
diff --git a/src/calibre/utils/fonts/sfnt/cff/__init__.py b/src/calibre/utils/fonts/sfnt/cff/__init__.py
index fba7748a38..c555cf1377 100644
--- a/src/calibre/utils/fonts/sfnt/cff/__init__.py
+++ b/src/calibre/utils/fonts/sfnt/cff/__init__.py
@@ -4,6 +4,3 @@
 __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
-
-
-
diff --git a/src/calibre/utils/fonts/sfnt/cff/constants.py b/src/calibre/utils/fonts/sfnt/cff/constants.py
index 4500dfa744..5b80094a04 100644
--- a/src/calibre/utils/fonts/sfnt/cff/constants.py
+++ b/src/calibre/utils/fonts/sfnt/cff/constants.py
@@ -5,7 +5,6 @@ __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-
 # cff_standard_strings {{{
 # The 391 Standard Strings as used in the CFF format.
 # from Adobe Technical None #5176, version 1.0, 18 March 1998
@@ -77,105 +76,103 @@ cff_standard_strings = [
 ]
 # }}}
 
-
 STANDARD_CHARSETS = [  # {{{
 # ISOAdobe
-(".notdef", "space", "exclam", "quotedbl", "numbersign", "dollar",
-    "percent", "ampersand", "quoteright", "parenleft", "parenright",
-    "asterisk", "plus", "comma", "hyphen", "period", "slash", "zero",
-    "one", "two", "three", "four", "five", "six", "seven", "eight", "nine",
-    "colon", "semicolon", "less", "equal", "greater", "question", "at",
-    "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N",
-    "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
-    "bracketleft", "backslash", "bracketright", "asciicircum",
-    "underscore", "quoteleft", "a", "b", "c", "d", "e", "f", "g", "h", "i",
-    "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w",
-    "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde",
-    "exclamdown", "cent", "sterling", "fraction", "yen", "florin",
-    "section", "currency", "quotesingle", "quotedblleft", "guillemotleft",
-    "guilsinglleft", "guilsinglright", "fi", "fl", "endash", "dagger",
-    "daggerdbl", "periodcentered", "paragraph", "bullet", "quotesinglbase",
-    "quotedblbase", "quotedblright", "guillemotright", "ellipsis",
-    "perthousand", "questiondown", "grave", "acute", "circumflex", "tilde",
-    "macron", "breve", "dotaccent", "dieresis", "ring", "cedilla",
-    "hungarumlaut", "ogonek", "caron", "emdash", "AE", "ordfeminine",
-    "Lslash", "Oslash", "OE", "ordmasculine", "ae", "dotlessi", "lslash",
-    "oslash", "oe", "germandbls", "onesuperior", "logicalnot", "mu",
-    "trademark", "Eth", "onehalf", "plusminus", "Thorn", "onequarter",
-    "divide", "brokenbar", "degree", "thorn", "threequarters",
-    "twosuperior", "registered", "minus", "eth", "multiply",
-    "threesuperior", "copyright", "Aacute", "Acircumflex", "Adieresis",
-    "Agrave", "Aring", "Atilde", "Ccedilla", "Eacute", "Ecircumflex",
-    "Edieresis", "Egrave", "Iacute", "Icircumflex", "Idieresis", "Igrave",
-    "Ntilde", "Oacute", "Ocircumflex", "Odieresis", "Ograve", "Otilde",
-    "Scaron", "Uacute", "Ucircumflex", "Udieresis", "Ugrave", "Yacute",
-    "Ydieresis", "Zcaron", "aacute", "acircumflex", "adieresis", "agrave",
-    "aring", "atilde", "ccedilla", "eacute", "ecircumflex", "edieresis",
-    "egrave", "iacute", "icircumflex", "idieresis", "igrave", "ntilde",
-    "oacute", "ocircumflex", "odieresis", "ograve", "otilde", "scaron",
-    "uacute", "ucircumflex", "udieresis", "ugrave", "yacute", "ydieresis",
-    "zcaron"),
+('.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar',
+    'percent', 'ampersand', 'quoteright', 'parenleft', 'parenright',
+    'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero',
+    'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine',
+    'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'at',
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+    'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+    'bracketleft', 'backslash', 'bracketright', 'asciicircum',
+    'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+    'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
+    'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde',
+    'exclamdown', 'cent', 'sterling', 'fraction', 'yen', 'florin',
+    'section', 'currency', 'quotesingle', 'quotedblleft', 'guillemotleft',
+    'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'endash', 'dagger',
+    'daggerdbl', 'periodcentered', 'paragraph', 'bullet', 'quotesinglbase',
+    'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis',
+    'perthousand', 'questiondown', 'grave', 'acute', 'circumflex', 'tilde',
+    'macron', 'breve', 'dotaccent', 'dieresis', 'ring', 'cedilla',
+    'hungarumlaut', 'ogonek', 'caron', 'emdash', 'AE', 'ordfeminine',
+    'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae', 'dotlessi', 'lslash',
+    'oslash', 'oe', 'germandbls', 'onesuperior', 'logicalnot', 'mu',
+    'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn', 'onequarter',
+    'divide', 'brokenbar', 'degree', 'thorn', 'threequarters',
+    'twosuperior', 'registered', 'minus', 'eth', 'multiply',
+    'threesuperior', 'copyright', 'Aacute', 'Acircumflex', 'Adieresis',
+    'Agrave', 'Aring', 'Atilde', 'Ccedilla', 'Eacute', 'Ecircumflex',
+    'Edieresis', 'Egrave', 'Iacute', 'Icircumflex', 'Idieresis', 'Igrave',
+    'Ntilde', 'Oacute', 'Ocircumflex', 'Odieresis', 'Ograve', 'Otilde',
+    'Scaron', 'Uacute', 'Ucircumflex', 'Udieresis', 'Ugrave', 'Yacute',
+    'Ydieresis', 'Zcaron', 'aacute', 'acircumflex', 'adieresis', 'agrave',
+    'aring', 'atilde', 'ccedilla', 'eacute', 'ecircumflex', 'edieresis',
+    'egrave', 'iacute', 'icircumflex', 'idieresis', 'igrave', 'ntilde',
+    'oacute', 'ocircumflex', 'odieresis', 'ograve', 'otilde', 'scaron',
+    'uacute', 'ucircumflex', 'udieresis', 'ugrave', 'yacute', 'ydieresis',
+    'zcaron'),
 
 # Expert
-("notdef", "space", "exclamsmall", "Hungarumlautsmall", "dollaroldstyle",
-    "dollarsuperior", "ampersandsmall", "Acutesmall", "parenleftsuperior",
-    "parenrightsuperior", "twodotenleader", "onedotenleader", "comma",
-    "hyphen", "period", "fraction", "zerooldstyle", "oneoldstyle",
-    "twooldstyle", "threeoldstyle", "fouroldstyle", "fiveoldstyle",
-    "sixoldstyle", "sevenoldstyle", "eightoldstyle", "nineoldstyle",
-    "colon", "semicolon", "commasuperior", "threequartersemdash",
-    "periodsuperior", "questionsmall", "asuperior", "bsuperior",
-    "centsuperior", "dsuperior", "esuperior", "isuperior", "lsuperior",
-    "msuperior", "nsuperior", "osuperior", "rsuperior", "ssuperior",
-    "tsuperior", "ff", "fi", "fl", "ffi", "ffl", "parenleftinferior",
-    "parenrightinferior", "Circumflexsmall", "hyphensuperior",
-    "Gravesmall", "Asmall", "Bsmall", "Csmall", "Dsmall", "Esmall",
-    "Fsmall", "Gsmall", "Hsmall", "Ismall", "Jsmall", "Ksmall", "Lsmall",
-    "Msmall", "Nsmall", "Osmall", "Psmall", "Qsmall", "Rsmall", "Ssmall",
-    "Tsmall", "Usmall", "Vsmall", "Wsmall", "Xsmall", "Ysmall", "Zsmall",
-    "colonmonetary", "onefitted", "rupiah", "Tildesmall",
-    "exclamdownsmall", "centoldstyle", "Lslashsmall", "Scaronsmall",
-    "Zcaronsmall", "Dieresissmall", "Brevesmall", "Caronsmall",
-    "Dotaccentsmall", "Macronsmall", "figuredash", "hypheninferior",
-    "Ogoneksmall", "Ringsmall", "Cedillasmall", "onequarter", "onehalf",
-    "threequarters", "questiondownsmall", "oneeighth", "threeeighths",
-    "fiveeighths", "seveneighths", "onethird", "twothirds", "zerosuperior",
-    "onesuperior", "twosuperior", "threesuperior", "foursuperior",
-    "fivesuperior", "sixsuperior", "sevensuperior", "eightsuperior",
-    "ninesuperior", "zeroinferior", "oneinferior", "twoinferior",
-    "threeinferior", "fourinferior", "fiveinferior", "sixinferior",
-    "seveninferior", "eightinferior", "nineinferior", "centinferior",
-    "dollarinferior", "periodinferior", "commainferior", "Agravesmall",
-    "Aacutesmall", "Acircumflexsmall", "Atildesmall", "Adieresissmall",
-    "Aringsmall", "AEsmall", "Ccedillasmall", "Egravesmall", "Eacutesmall",
-    "Ecircumflexsmall", "Edieresissmall", "Igravesmall", "Iacutesmall",
-    "Icircumflexsmall", "Idieresissmall", "Ethsmall", "Ntildesmall",
-    "Ogravesmall", "Oacutesmall", "Ocircumflexsmall", "Otildesmall",
-    "Odieresissmall", "OEsmall", "Oslashsmall", "Ugravesmall",
-    "Uacutesmall", "Ucircumflexsmall", "Udieresissmall", "Yacutesmall",
-    "Thornsmall", "Ydieresissmall"),
+('notdef', 'space', 'exclamsmall', 'Hungarumlautsmall', 'dollaroldstyle',
+    'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior',
+    'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma',
+    'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle',
+    'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle',
+    'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle',
+    'colon', 'semicolon', 'commasuperior', 'threequartersemdash',
+    'periodsuperior', 'questionsmall', 'asuperior', 'bsuperior',
+    'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior',
+    'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
+    'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior',
+    'parenrightinferior', 'Circumflexsmall', 'hyphensuperior',
+    'Gravesmall', 'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall',
+    'Fsmall', 'Gsmall', 'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall',
+    'Msmall', 'Nsmall', 'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall',
+    'Tsmall', 'Usmall', 'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall',
+    'colonmonetary', 'onefitted', 'rupiah', 'Tildesmall',
+    'exclamdownsmall', 'centoldstyle', 'Lslashsmall', 'Scaronsmall',
+    'Zcaronsmall', 'Dieresissmall', 'Brevesmall', 'Caronsmall',
+    'Dotaccentsmall', 'Macronsmall', 'figuredash', 'hypheninferior',
+    'Ogoneksmall', 'Ringsmall', 'Cedillasmall', 'onequarter', 'onehalf',
+    'threequarters', 'questiondownsmall', 'oneeighth', 'threeeighths',
+    'fiveeighths', 'seveneighths', 'onethird', 'twothirds', 'zerosuperior',
+    'onesuperior', 'twosuperior', 'threesuperior', 'foursuperior',
+    'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior',
+    'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior',
+    'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior',
+    'seveninferior', 'eightinferior', 'nineinferior', 'centinferior',
+    'dollarinferior', 'periodinferior', 'commainferior', 'Agravesmall',
+    'Aacutesmall', 'Acircumflexsmall', 'Atildesmall', 'Adieresissmall',
+    'Aringsmall', 'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall',
+    'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall',
+    'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall',
+    'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall',
+    'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall',
+    'Uacutesmall', 'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall',
+    'Thornsmall', 'Ydieresissmall'),
 
 # Expert Subset
-(".notdef", "space", "dollaroldstyle", "dollarsuperior",
-        "parenleftsuperior", "parenrightsuperior", "twodotenleader",
-        "onedotenleader", "comma", "hyphen", "period", "fraction",
-        "zerooldstyle", "oneoldstyle", "twooldstyle", "threeoldstyle",
-        "fouroldstyle", "fiveoldstyle", "sixoldstyle", "sevenoldstyle",
-        "eightoldstyle", "nineoldstyle", "colon", "semicolon",
-        "commasuperior", "threequartersemdash", "periodsuperior",
-        "asuperior", "bsuperior", "centsuperior", "dsuperior", "esuperior",
-        "isuperior", "lsuperior", "msuperior", "nsuperior", "osuperior",
-        "rsuperior", "ssuperior", "tsuperior", "ff", "fi", "fl", "ffi",
-        "ffl", "parenleftinferior", "parenrightinferior", "hyphensuperior",
-        "colonmonetary", "onefitted", "rupiah", "centoldstyle",
-        "figuredash", "hypheninferior", "onequarter", "onehalf",
-        "threequarters", "oneeighth", "threeeighths", "fiveeighths",
-        "seveneighths", "onethird", "twothirds", "zerosuperior",
-        "onesuperior", "twosuperior", "threesuperior", "foursuperior",
-        "fivesuperior", "sixsuperior", "sevensuperior", "eightsuperior",
-        "ninesuperior", "zeroinferior", "oneinferior", "twoinferior",
-        "threeinferior", "fourinferior", "fiveinferior", "sixinferior",
-        "seveninferior", "eightinferior", "nineinferior", "centinferior",
-        "dollarinferior", "periodinferior", "commainferior"),
+('.notdef', 'space', 'dollaroldstyle', 'dollarsuperior',
+        'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
+        'onedotenleader', 'comma', 'hyphen', 'period', 'fraction',
+        'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle',
+        'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle',
+        'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon',
+        'commasuperior', 'threequartersemdash', 'periodsuperior',
+        'asuperior', 'bsuperior', 'centsuperior', 'dsuperior', 'esuperior',
+        'isuperior', 'lsuperior', 'msuperior', 'nsuperior', 'osuperior',
+        'rsuperior', 'ssuperior', 'tsuperior', 'ff', 'fi', 'fl', 'ffi',
+        'ffl', 'parenleftinferior', 'parenrightinferior', 'hyphensuperior',
+        'colonmonetary', 'onefitted', 'rupiah', 'centoldstyle',
+        'figuredash', 'hypheninferior', 'onequarter', 'onehalf',
+        'threequarters', 'oneeighth', 'threeeighths', 'fiveeighths',
+        'seveneighths', 'onethird', 'twothirds', 'zerosuperior',
+        'onesuperior', 'twosuperior', 'threesuperior', 'foursuperior',
+        'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior',
+        'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior',
+        'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior',
+        'seveninferior', 'eightinferior', 'nineinferior', 'centinferior',
+        'dollarinferior', 'periodinferior', 'commainferior'),
 ]  # }}}
-
diff --git a/src/calibre/utils/fonts/sfnt/cff/dict_data.py b/src/calibre/utils/fonts/sfnt/cff/dict_data.py
index 730f6dd50f..930a4929a4 100644
--- a/src/calibre/utils/fonts/sfnt/cff/dict_data.py
+++ b/src/calibre/utils/fonts/sfnt/cff/dict_data.py
@@ -8,20 +8,20 @@ __docformat__ = 'restructuredtext en'
 from struct import pack, unpack_from
 
 t1_operand_encoding = [None] * 256
-t1_operand_encoding[0:32] = (32) * ["do_operator"]
-t1_operand_encoding[32:247] = (247 - 32) * ["read_byte"]
-t1_operand_encoding[247:251] = (251 - 247) * ["read_small_int1"]
-t1_operand_encoding[251:255] = (255 - 251) * ["read_small_int2"]
-t1_operand_encoding[255] = "read_long_int"
+t1_operand_encoding[0:32] = (32) * ['do_operator']
+t1_operand_encoding[32:247] = (247 - 32) * ['read_byte']
+t1_operand_encoding[247:251] = (251 - 247) * ['read_small_int1']
+t1_operand_encoding[251:255] = (255 - 251) * ['read_small_int2']
+t1_operand_encoding[255] = 'read_long_int'
 
 t2_operand_encoding = t1_operand_encoding[:]
-t2_operand_encoding[28] = "read_short_int"
-t2_operand_encoding[255] = "read_fixed_1616"
+t2_operand_encoding[28] = 'read_short_int'
+t2_operand_encoding[255] = 'read_fixed_1616'
 
 cff_dict_operand_encoding = t2_operand_encoding[:]
-cff_dict_operand_encoding[29] = "read_long_int"
-cff_dict_operand_encoding[30] = "read_real_number"
-cff_dict_operand_encoding[255] = "reserved"
+cff_dict_operand_encoding[29] = 'read_long_int'
+cff_dict_operand_encoding[30] = 'read_real_number'
+cff_dict_operand_encoding[255] = 'reserved'
 
 real_nibbles = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
         '.', 'E', 'E-', None, '-']
@@ -42,15 +42,15 @@ class ByteCode(dict):
         return -(b0-251)*256 - b1 - 108, index+1
 
     def read_short_int(self, b0, data, index):
-        value, = unpack_from(b">h", data, index)
+        value, = unpack_from(b'>h', data, index)
         return value, index+2
 
     def read_long_int(self, b0, data, index):
-        value, = unpack_from(b">l", data, index)
+        value, = unpack_from(b'>l', data, index)
         return value, index+4
 
     def read_fixed_1616(self, b0, data, index):
-        value, = unpack_from(b">l", data, index)
+        value, = unpack_from(b'>l', data, index)
         return value / 65536.0, index+4
 
     def read_real_number(self, b0, data, index):
@@ -70,17 +70,17 @@ class ByteCode(dict):
 
     def write_float(self, f, encoding='ignored'):
         s = str(f).upper()
-        if s[:2] == "0.":
+        if s[:2] == '0.':
             s = s[1:]
-        elif s[:3] == "-0.":
-            s = "-" + s[2:]
+        elif s[:3] == '-0.':
+            s = '-' + s[2:]
         nibbles = []
         while s:
             c = s[0]
             s = s[1:]
-            if c == "E" and s[:1] == "-":
+            if c == 'E' and s[:1] == '-':
                 s = s[1:]
-                c = "E-"
+                c = 'E-'
             nibbles.append(real_nibbles_map[c])
         nibbles.append(0xf)
         if len(nibbles) % 2:
@@ -90,7 +90,7 @@ class ByteCode(dict):
             d.append(nibbles[i] << 4 | nibbles[i+1])
         return bytes(d)
 
-    def write_int(self, value, encoding="cff"):
+    def write_int(self, value, encoding='cff'):
         four_byte_op = {'cff':29, 't1':255}.get(encoding, None)
 
         if -107 <= value <= 107:
@@ -103,15 +103,15 @@ class ByteCode(dict):
             code = bytes(bytearray([(value >> 8) + 251, (value & 0xFF)]))
         elif four_byte_op is None:
             # T2 only supports 2 byte ints
-            code = bytes(bytearray([28])) + pack(b">h", value)
+            code = bytes(bytearray([28])) + pack(b'>h', value)
         else:
-            code = bytes(bytearray([four_byte_op])) + pack(b">l", value)
+            code = bytes(bytearray([four_byte_op])) + pack(b'>l', value)
         return code
 
     def write_offset(self, value):
-        return bytes(bytearray([29])) + pack(b">l", value)
+        return bytes(bytearray([29])) + pack(b'>l', value)
 
-    def write_number(self, value, encoding="cff"):
+    def write_number(self, value, encoding='cff'):
         f = self.write_float if isinstance(value, float) else self.write_int
         return f(value, encoding)
 
diff --git a/src/calibre/utils/fonts/sfnt/cff/table.py b/src/calibre/utils/fonts/sfnt/cff/table.py
index 7a63813e6e..dbe57f3a6a 100644
--- a/src/calibre/utils/fonts/sfnt/cff/table.py
+++ b/src/calibre/utils/fonts/sfnt/cff/table.py
@@ -133,7 +133,7 @@ class Charset(list):
         super().__init__()
         self.standard_charset = offset if offset in {0, 1, 2} else None
         if is_CID and self.standard_charset is not None:
-            raise ValueError("CID font must not use a standard charset")
+            raise ValueError('CID font must not use a standard charset')
         if self.standard_charset is None:
             self.append(b'.notdef')
             fmt = unpack_from(b'>B', raw, offset)[0]
diff --git a/src/calibre/utils/fonts/sfnt/cmap.py b/src/calibre/utils/fonts/sfnt/cmap.py
index 7e9f5bb6a1..8eb0f59a4e 100644
--- a/src/calibre/utils/fonts/sfnt/cmap.py
+++ b/src/calibre/utils/fonts/sfnt/cmap.py
@@ -106,7 +106,7 @@ def set_id_delta(index, start_code):  # {{{
     #    (short)finalGID = (gid +  id_delta) % 0x10000),
     # we can get from a startCode of 0 to a final GID of 64 -1K by subtracting 1, and casting the
     # negative number to an unsigned short.
-    # Similarly , we can get from a startCode of 64K-1 to a final GID of 1 by adding 2, because of
+    # Similarly, we can get from a startCode of 64K-1 to a final GID of 1 by adding 2, because of
     # the modulo arithmetic.
 
     id_delta = index - start_code
diff --git a/src/calibre/utils/fonts/sfnt/common.py b/src/calibre/utils/fonts/sfnt/common.py
index 8fd02a03a2..636f074005 100644
--- a/src/calibre/utils/fonts/sfnt/common.py
+++ b/src/calibre/utils/fonts/sfnt/common.py
@@ -28,7 +28,6 @@ class Unpackable:
 
 
 class SimpleListTable(list):
-
     'A table that contains a list of subtables'
 
     child_class = None
@@ -53,7 +52,6 @@ class SimpleListTable(list):
 
 
 class ListTable(OrderedDict):
-
     'A table that contains an ordered mapping of table tag to subtable'
 
     child_class = None
diff --git a/src/calibre/utils/fonts/sfnt/container.py b/src/calibre/utils/fonts/sfnt/container.py
index 6c29f3ba5f..c100090cd4 100644
--- a/src/calibre/utils/fonts/sfnt/container.py
+++ b/src/calibre/utils/fonts/sfnt/container.py
@@ -25,18 +25,18 @@ from calibre.utils.resources import get_path as P
 class Sfnt:
 
     TABLE_MAP = {
-        b'head' : HeadTable,
-        b'hhea' : HorizontalHeader,
-        b'vhea' : VerticalHeader,
-        b'maxp' : MaxpTable,
-        b'loca' : LocaTable,
-        b'glyf' : GlyfTable,
-        b'cmap' : CmapTable,
-        b'CFF ' : CFFTable,
-        b'kern' : KernTable,
-        b'GSUB' : GSUBTable,
-        b'OS/2' : OS2Table,
-        b'post' : PostTable,
+        b'head': HeadTable,
+        b'hhea': HorizontalHeader,
+        b'vhea': VerticalHeader,
+        b'maxp': MaxpTable,
+        b'loca': LocaTable,
+        b'glyf': GlyfTable,
+        b'cmap': CmapTable,
+        b'CFF ': CFFTable,
+        b'kern': KernTable,
+        b'GSUB': GSUBTable,
+        b'OS/2': OS2Table,
+        b'post': PostTable,
     }
 
     def __init__(self, raw_or_get_table):
@@ -87,7 +87,7 @@ class Sfnt:
         #     b'hmtx', b'LTSH', b'VDMX', b'hdmx', b'cmap', b'fpgm', b'prep',
         #     b'cvt ', b'loca', b'glyf', b'CFF ', b'kern', b'name', b'post',
         #     b'gasp', b'PCLT', b'DSIG'))}
-        # keys.sort(key=lambda x:order.get(x, 1000))
+        # keys.sort(key=lambda x: order.get(x, 1000))
         # for x in keys:
         #     yield x
 
diff --git a/src/calibre/utils/fonts/sfnt/errors.py b/src/calibre/utils/fonts/sfnt/errors.py
index b74af2351c..909637bfcd 100644
--- a/src/calibre/utils/fonts/sfnt/errors.py
+++ b/src/calibre/utils/fonts/sfnt/errors.py
@@ -12,4 +12,3 @@ class UnsupportedFont(ValueError):
 
 class NoGlyphs(ValueError):
     pass
-
diff --git a/src/calibre/utils/fonts/sfnt/gsub.py b/src/calibre/utils/fonts/sfnt/gsub.py
index e1ffc8d426..7723606ef8 100644
--- a/src/calibre/utils/fonts/sfnt/gsub.py
+++ b/src/calibre/utils/fonts/sfnt/gsub.py
@@ -62,7 +62,7 @@ class LigatureSubstitution(UnknownLookupSubTable):
     def read_ligature(self, data):
         lig_glyph, count = data.unpack('HH')
         components = data.unpack('%dH'%(count-1), single_special=False)
-        return (lig_glyph, components)
+        return lig_glyph, components
 
     def all_substitutions(self, glyph_ids):
         gid_index_map = self.coverage.coverage_indices(glyph_ids)
diff --git a/src/calibre/utils/fonts/sfnt/head.py b/src/calibre/utils/fonts/sfnt/head.py
index a97bf47371..b2cc2900a6 100644
--- a/src/calibre/utils/fonts/sfnt/head.py
+++ b/src/calibre/utils/fonts/sfnt/head.py
@@ -24,23 +24,23 @@ class HeadTable(UnknownTable):
         super().__init__(*args, **kwargs)
 
         field_types = (
-                '_version_number' , 'l',
-                '_font_revision'  , 'l',
-                'checksum_adjustment' , 'L',
-                'magic_number' , 'L',
-                'flags' , 'H',
-                'units_per_em' , 'H',
-                '_created' , 'q',
-                '_modified' , 'q',
-                'x_min' , 'h',
-                'y_min' , 'h',
-                'x_max' , 'h',
-                'y_max' , 'h',
-                'mac_style' , 'H',
-                'lowest_rec_ppem' , 'H',
-                'font_direction_hint' , 'h',
-                'index_to_loc_format' , 'h',
-                'glyph_data_format'   , 'h'
+                '_version_number', 'l',
+                '_font_revision', 'l',
+                'checksum_adjustment', 'L',
+                'magic_number', 'L',
+                'flags', 'H',
+                'units_per_em', 'H',
+                '_created', 'q',
+                '_modified', 'q',
+                'x_min', 'h',
+                'y_min', 'h',
+                'x_max', 'h',
+                'y_max', 'h',
+                'mac_style', 'H',
+                'lowest_rec_ppem', 'H',
+                'font_direction_hint', 'h',
+                'index_to_loc_format', 'h',
+                'glyph_data_format', 'h'
         )
 
         self._fmt = ('>%s'%(''.join(field_types[1::2]))).encode('ascii')
@@ -88,7 +88,7 @@ class HorizontalHeader(UnknownTable):
 
     version_number = FixedProperty('_version_number')
     field_types = (
-        '_version_number' , 'l',
+        '_version_number', 'l',
         'ascender', 'h',
         'descender', 'h',
         'line_gap', 'h',
@@ -137,7 +137,7 @@ class VerticalHeader(UnknownTable):
 
     version_number = FixedProperty('_version_number')
     field_types = (
-        '_version_number' , 'l',
+        '_version_number', 'l',
         'ascender', 'h',
         'descender', 'h',
         'line_gap', 'h',
@@ -189,7 +189,7 @@ class OS2Table(UnknownTable):
             return
         ver, = unpack_from(b'>H', self.raw)
         field_types = [
-            'version' , 'H',
+            'version', 'H',
             'average_char_width', 'h',
             'weight_class', 'H',
             'width_class', 'H',
diff --git a/src/calibre/utils/fonts/sfnt/loca.py b/src/calibre/utils/fonts/sfnt/loca.py
index 1f79d8b68a..a354fc3ae9 100644
--- a/src/calibre/utils/fonts/sfnt/loca.py
+++ b/src/calibre/utils/fonts/sfnt/loca.py
@@ -77,7 +77,7 @@ class LocaTable(UnknownTable):
             self.fmt = four_byte_type_code()
             vals = array.array(self.fmt, vals)
 
-        if sys.byteorder != "big":
+        if sys.byteorder != 'big':
             vals.byteswap()
         self.raw = vals.tobytes()
     subset = update
diff --git a/src/calibre/utils/fonts/sfnt/metrics.py b/src/calibre/utils/fonts/sfnt/metrics.py
index 5207c57480..0652313b8e 100644
--- a/src/calibre/utils/fonts/sfnt/metrics.py
+++ b/src/calibre/utils/fonts/sfnt/metrics.py
@@ -10,7 +10,6 @@ from calibre.utils.fonts.utils import get_all_font_names
 
 
 class FontMetrics:
-
     '''
     Get various metrics for the specified sfnt. All the metrics are returned in
     units of pixels. To calculate a metric you have to specify the font size
@@ -43,7 +42,7 @@ class FontMetrics:
         self._sig = hash(self.sfnt[b'name'].raw)
 
         # Metrics for embedding in PDF
-        pdf_scale = self.pdf_scale = lambda x:int(round(x*1000./self.units_per_em))
+        pdf_scale = self.pdf_scale = lambda x: int(round(x*1000./self.units_per_em))
         self.pdf_ascent, self.pdf_descent = map(pdf_scale,
                         (self.os2.typo_ascender, self.os2.typo_descender))
         self.pdf_bbox = tuple(map(pdf_scale, self.bbox))
diff --git a/src/calibre/utils/fonts/sfnt/subset.py b/src/calibre/utils/fonts/sfnt/subset.py
index 2377467ba5..53bf5639cb 100644
--- a/src/calibre/utils/fonts/sfnt/subset.py
+++ b/src/calibre/utils/fonts/sfnt/subset.py
@@ -193,8 +193,8 @@ def subset(raw, individual_chars, ranges=(), warnings=None):
     raw, new_sizes = sfnt()
     return raw, old_sizes, new_sizes
 
-# CLI {{{
 
+# CLI {{{
 
 def option_parser():
     import textwrap
@@ -225,7 +225,7 @@ def print_stats(old_stats, new_stats):
     prints('='*80)
     old_total = sum(itervalues(old_stats))
     new_total = sum(itervalues(new_stats))
-    tables = sorted(old_stats, key=lambda x:old_stats[x],
+    tables = sorted(old_stats, key=lambda x: old_stats[x],
             reverse=True)
     for table in tables:
         osz = old_stats[table]
@@ -254,7 +254,7 @@ def main(args):
     with open(iff, 'rb') as f:
         orig = f.read()
 
-    chars = [x for x in chars.split(',')]
+    chars = chars.split(',')
     individual, ranges = set(), set()
 
     def not_single(c):
@@ -300,16 +300,15 @@ def main(args):
 
 if __name__ == '__main__':
     try:
-        import init_calibre
-        init_calibre
+        import init_calibre  # noqa: F401
     except ImportError:
         pass
     import sys
     main(sys.argv)
 # }}}
 
-# Tests {{{
 
+# Tests {{{
 
 def test_mem():
     import gc
@@ -364,7 +363,7 @@ def all():
                 failed.append((font['full_name'], font['path'], str(e)))
             else:
                 averages.append(sum(itervalues(new_stats))/sum(itervalues(old_stats)) * 100)
-                print('Reduced to:', '%.1f'%averages[-1] , '%')
+                print('Reduced to:', '%.1f'%averages[-1], '%')
     if unsupported:
         print('\n\nUnsupported:')
         for name, path, err in unsupported:
@@ -386,5 +385,4 @@ def all():
     print('Total:', total, 'Unsupported:', len(unsupported), 'Failed:',
             len(failed), 'Warnings:', len(warnings))
 
-
 # }}}
diff --git a/src/calibre/utils/fonts/utils.py b/src/calibre/utils/fonts/utils.py
index b07a008627..0dacee15a6 100644
--- a/src/calibre/utils/fonts/utils.py
+++ b/src/calibre/utils/fonts/utils.py
@@ -99,7 +99,7 @@ def get_font_characteristics(raw, raw_is_table=False, return_all=False):
     offset = struct.calcsize(common_fields)
     panose = struct.unpack_from(b'>10B', os2_table, offset)
     offset += 10
-    (range1, range2, range3, range4) = struct.unpack_from(b'>4L', os2_table, offset)
+    range1, range2, range3, range4 = struct.unpack_from(b'>4L', os2_table, offset)
     offset += struct.calcsize(b'>4L')
     vendor_id = os2_table[offset:offset+4]
     vendor_id
diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py
index 4739012e5e..fc31f35fbe 100644
--- a/src/calibre/utils/formatter.py
+++ b/src/calibre/utils/formatter.py
@@ -576,8 +576,8 @@ class _Parser:
         while not self.token_op_is(')'):
             a = self.top_expr()
             if a.node_type not in (Node.NODE_ASSIGN, Node.NODE_RVALUE):
-                self.error(_("Parameters to a function must be "
-                             "variables or assignments"))
+                self.error(_('Parameters to a function must be '
+                             'variables or assignments'))
             if a.node_type == Node.NODE_RVALUE:
                 a = AssignNode(line_number, a.name, ConstantNode(self.line_number, ''))
             arguments.append(a)
@@ -686,8 +686,8 @@ class _Parser:
         return self.expr()
 
     keyword_nodes = {
-            'if':       (lambda self:None, if_expression),
-            'for':      (lambda self:None, for_expression),
+            'if':       (lambda self: None, if_expression),
+            'for':      (lambda self: None, for_expression),
             'break':    (lambda self: self.consume(), lambda self: BreakNode(self.line_number)),
             'continue': (lambda self: self.consume(), lambda self: ContinueNode(self.line_number)),
             'return':   (lambda self: self.consume(), lambda self: ReturnNode(self.line_number, self.top_expr())),
@@ -769,7 +769,7 @@ class _Parser:
 
             # Eat the opening paren, parse the argument list, then eat the closing paren
             self.consume()
-            arguments = list()
+            arguments = []
             while not self.token_op_is(')'):
                 # parse an argument expression (recursive call)
                 arguments.append(self.expression_list())
@@ -878,11 +878,11 @@ class PythonTemplateContext:
     @property
     def attributes(self):
         # return a list of attributes in the context object
-        return sorted(list(self.attrs_set))
+        return sorted(self.attrs_set)
 
     def __str__(self):
         # return a string of the attribute with values separated by newlines
-        attrs = sorted(list(self.attrs_set))
+        attrs = sorted(self.attrs_set)
         ans = OrderedDict()
         for k in attrs:
             ans[k] = getattr(self, k, None)
@@ -961,7 +961,7 @@ class FormatterFuncsCaller:
 
             return call
 
-        e = AttributeError(_("No function named {!r} exists").format(name))
+        e = AttributeError(_('No function named {!r} exists').format(name))
         e.is_internal = True
         raise e
 
@@ -983,7 +983,7 @@ class _Interpreter:
         self.parent_book = parent.book
         self.funcs = funcs
         self.locals = {'$':val}
-        self.local_functions = dict()
+        self.local_functions = {}
         self.override_line_number = None
         self.global_vars = global_vars if isinstance(global_vars, dict) else {}
         if break_reporter:
@@ -995,7 +995,7 @@ class _Interpreter:
         try:
             if is_call:
                 # prog is an instance of the function definition class
-                ret =  self.do_node_stored_template_call(StoredTemplateCallNode(1, prog.name, prog, None), args=args)
+                ret = self.do_node_stored_template_call(StoredTemplateCallNode(1, prog.name, prog, None), args=args)
             else:
                 ret = self.expression_list(prog)
         except ReturnExecuted as e:
@@ -1074,20 +1074,20 @@ class _Interpreter:
             try:
                 start_val = int(self.float_deal_with_none(self.expr(prog.start_expr)))
             except ValueError:
-                self.error(_("{0}: {1} must be an integer").format('for', 'start'), line_number)
+                self.error(_('{0}: {1} must be an integer').format('for', 'start'), line_number)
             try:
                 stop_val = int(self.float_deal_with_none(self.expr(prog.stop_expr)))
             except ValueError:
-                self.error(_("{0}: {1} must be an integer").format('for', 'stop'), line_number)
+                self.error(_('{0}: {1} must be an integer').format('for', 'stop'), line_number)
             try:
                 step_val = int(self.float_deal_with_none(self.expr(prog.step_expr)))
             except ValueError:
-                self.error(_("{0}: {1} must be an integer").format('for', 'step'), line_number)
+                self.error(_('{0}: {1} must be an integer').format('for', 'step'), line_number)
             try:
                 limit_val = (1000 if prog.limit_expr is None else
                          int(self.float_deal_with_none(self.expr(prog.limit_expr))))
             except ValueError:
-                self.error(_("{0}: {1} must be an integer").format('for', 'limit'), line_number)
+                self.error(_('{0}: {1} must be an integer').format('for', 'limit'), line_number)
             var = prog.variable
             if (self.break_reporter):
                 self.break_reporter("'for': start value", str(start_val), line_number)
@@ -1099,7 +1099,7 @@ class _Interpreter:
                 range_gen = range(start_val, stop_val, step_val)
                 if len(range_gen) > limit_val:
                     self.error(
-                        _("{0}: the range length ({1}) is larger than the limit ({2})").format(
+                        _('{0}: the range length ({1}) is larger than the limit ({2})').format(
                             'for', str(len(range_gen)), str(limit_val)), line_number)
                 for x in (str(x) for x in range_gen):
                     try:
@@ -1128,7 +1128,7 @@ class _Interpreter:
             self.error(_("Unknown identifier '{0}'").format(prog.name), prog.line_number)
 
     def do_node_func(self, prog):
-        args = list()
+        args = []
         for arg in prog.expression_list:
             # evaluate the expression (recursive call)
             args.append(self.expr(arg))
@@ -1187,12 +1187,12 @@ class _Interpreter:
             self.break_reporter(prog.node_name, _('before evaluating arguments'), prog.line_number)
         line_number, argument_list, block  = self.local_functions[prog.name].attributes_to_tuple()
         if len(prog.arguments) > len(argument_list):
-            self.error(_("Function {0}: argument count mismatch -- "
-                         "{1} given, at most {2} required").format(prog.name,
+            self.error(_('Function {0}: argument count mismatch -- '
+                         '{1} given, at most {2} required').format(prog.name,
                                                           len(prog.arguments),
                                                           len(argument_list)),
                        prog.line_number)
-        new_locals = dict()
+        new_locals = {}
         for i,arg in enumerate(argument_list):
             if len(prog.arguments) > i:
                 new_locals[arg.left] = self.expr(prog.arguments[i])
@@ -1330,15 +1330,15 @@ class _Interpreter:
         for i in range(0, len(prog.expression_list)-1, 2):
             tst = self.expr(prog.expression_list[i])
             if self.break_reporter:
-                self.break_reporter("switch_if(): test expr", tst, prog.line_number)
+                self.break_reporter('switch_if(): test expr', tst, prog.line_number)
             if tst:
                 res = self.expr(prog.expression_list[i+1])
                 if self.break_reporter:
-                    self.break_reporter("switch_if(): value expr", res, prog.line_number)
+                    self.break_reporter('switch_if(): value expr', res, prog.line_number)
                 return res
         res = self.expr(prog.expression_list[-1])
         if (self.break_reporter):
-            self.break_reporter("switch_if(): default expr", res, prog.line_number)
+            self.break_reporter('switch_if(): default expr', res, prog.line_number)
         return res
 
     def do_node_strcat(self, prog):
@@ -1387,14 +1387,14 @@ class _Interpreter:
         return res
 
     INFIX_STRING_COMPARE_OPS = {
-        "==": lambda x, y: strcmp(x, y) == 0,
-        "!=": lambda x, y: strcmp(x, y) != 0,
-        "<": lambda x, y: strcmp(x, y) < 0,
-        "<=": lambda x, y: strcmp(x, y) <= 0,
-        ">": lambda x, y: strcmp(x, y) > 0,
-        ">=": lambda x, y: strcmp(x, y) >= 0,
-        "in": lambda x, y: re.search(x, y, flags=re.I),
-        "inlist": lambda x, y: list(filter(partial(re.search, x, flags=re.I),
+        '==': lambda x, y: strcmp(x, y) == 0,
+        '!=': lambda x, y: strcmp(x, y) != 0,
+        '<': lambda x, y: strcmp(x, y) < 0,
+        '<=': lambda x, y: strcmp(x, y) <= 0,
+        '>': lambda x, y: strcmp(x, y) > 0,
+        '>=': lambda x, y: strcmp(x, y) >= 0,
+        'in': lambda x, y: re.search(x, y, flags=re.I),
+        'inlist': lambda x, y: list(filter(partial(re.search, x, flags=re.I),
                                            [v.strip() for v in y.split(',') if v.strip()]))
         }
 
@@ -1403,7 +1403,7 @@ class _Interpreter:
         if res is None or not isinstance(res, (list, tuple, set, dict)):
             self.error(_("Field '{0}' is either not a field or not a list").format(right), prog.line_number)
         pat = re.compile(left, flags=re.I)
-        if isinstance(res, dict): # identifiers
+        if isinstance(res, dict):  # identifiers
             for k,v in res.items():
                 if re.search(pat, f'{k}:{v}'):
                     return '1'
@@ -1434,12 +1434,12 @@ class _Interpreter:
                          "operator '{0}'").format(prog.operator), prog.line_number)
 
     INFIX_NUMERIC_COMPARE_OPS = {
-        "==#": lambda x, y: x == y,
-        "!=#": lambda x, y: x != y,
-        "<#": lambda x, y: x < y,
-        "<=#": lambda x, y: x <= y,
-        ">#": lambda x, y: x > y,
-        ">=#": lambda x, y: x >= y,
+        '==#': lambda x, y: x == y,
+        '!=#': lambda x, y: x != y,
+        '<#': lambda x, y: x < y,
+        '<=#': lambda x, y: x <= y,
+        '>#': lambda x, y: x > y,
+        '>=#': lambda x, y: x >= y,
         }
 
     def float_deal_with_none(self, v):
@@ -1699,24 +1699,24 @@ class TemplateFormatter(string.Formatter):
     # ################# Template language lexical analyzer ######################
 
     lex_scanner = re.Scanner([
-            (r'(==#|!=#|<=#|<#|>=#|>#)', lambda x,t: (_Parser.LEX_NUMERIC_INFIX, t)),  # noqa
-            (r'(==|!=|<=|<|>=|>)',       lambda x,t: (_Parser.LEX_STRING_INFIX, t)),  # noqa
-            (r'(if|then|else|elif|fi)\b',lambda x,t: (_Parser.LEX_KEYWORD, t)),  # noqa
-            (r'(for|in|rof|separator)\b',lambda x,t: (_Parser.LEX_KEYWORD, t)),  # noqa
-            (r'(separator|limit)\b',     lambda x,t: (_Parser.LEX_KEYWORD, t)),  # noqa
-            (r'(def|fed|continue)\b',    lambda x,t: (_Parser.LEX_KEYWORD, t)),  # noqa
-            (r'(return|inlist|break)\b', lambda x,t: (_Parser.LEX_KEYWORD, t)),  # noqa
-            (r'(inlist_field)\b',        lambda x,t: (_Parser.LEX_KEYWORD, t)),  # noqa
-            (r'(\|\||&&|!|{|})',         lambda x,t: (_Parser.LEX_OP, t)),  # noqa
-            (r'[(),=;:\+\-*/&]',         lambda x,t: (_Parser.LEX_OP, t)),  # noqa
-            (r'-?[\d\.]+',               lambda x,t: (_Parser.LEX_CONST, t)),  # noqa
-            (r'\$\$?#?\w+',              lambda x,t: (_Parser.LEX_ID, t)),  # noqa
-            (r'\$',                      lambda x,t: (_Parser.LEX_ID, t)),  # noqa
-            (r'\w+',                     lambda x,t: (_Parser.LEX_ID, t)),  # noqa
-            (r'".*?((?<!\\)")',          lambda x,t: (_Parser.LEX_CONST, t[1:-1])),  # noqa
-            (r'\'.*?((?<!\\)\')',        lambda x,t: (_Parser.LEX_CONST, t[1:-1])),  # noqa
-            (r'\n#.*?(?:(?=\n)|$)',      lambda x,t: _Parser.LEX_NEWLINE),  # noqa
-            (r'\s',                      lambda x,t: _Parser.LEX_NEWLINE if t == '\n' else None),  # noqa
+            (r'(==#|!=#|<=#|<#|>=#|>#)', lambda x,t: (_Parser.LEX_NUMERIC_INFIX, t)),
+            (r'(==|!=|<=|<|>=|>)',       lambda x,t: (_Parser.LEX_STRING_INFIX, t)),
+            (r'(if|then|else|elif|fi)\b',lambda x,t: (_Parser.LEX_KEYWORD, t)),
+            (r'(for|in|rof|separator)\b',lambda x,t: (_Parser.LEX_KEYWORD, t)),
+            (r'(separator|limit)\b',     lambda x,t: (_Parser.LEX_KEYWORD, t)),
+            (r'(def|fed|continue)\b',    lambda x,t: (_Parser.LEX_KEYWORD, t)),
+            (r'(return|inlist|break)\b', lambda x,t: (_Parser.LEX_KEYWORD, t)),
+            (r'(inlist_field)\b',        lambda x,t: (_Parser.LEX_KEYWORD, t)),
+            (r'(\|\||&&|!|{|})',         lambda x,t: (_Parser.LEX_OP, t)),
+            (r'[(),=;:\+\-*/&]',         lambda x,t: (_Parser.LEX_OP, t)),
+            (r'-?[\d\.]+',               lambda x,t: (_Parser.LEX_CONST, t)),
+            (r'\$\$?#?\w+',              lambda x,t: (_Parser.LEX_ID, t)),
+            (r'\$',                      lambda x,t: (_Parser.LEX_ID, t)),
+            (r'\w+',                     lambda x,t: (_Parser.LEX_ID, t)),
+            (r'".*?((?<!\\)")',          lambda x,t: (_Parser.LEX_CONST, t[1:-1])),
+            (r'\'.*?((?<!\\)\')',        lambda x,t: (_Parser.LEX_CONST, t[1:-1])),
+            (r'\n#.*?(?:(?=\n)|$)',      lambda x,t: _Parser.LEX_NEWLINE),
+            (r'\s',                      lambda x,t: _Parser.LEX_NEWLINE if t == '\n' else None),
         ], flags=re.DOTALL)
 
     def _eval_program(self, val, prog, column_name, global_vars, break_reporter):
@@ -1804,7 +1804,7 @@ class TemplateFormatter(string.Formatter):
             raise ValueError(
                 _('Syntax error on line {0} column {1}: text {2}').format(e.lineno, e.offset, e.text))
         except KeyError:
-            raise ValueError(_("The {0} function is not defined in the template").format('evaluate'))
+            raise ValueError(_('The {0} function is not defined in the template').format('evaluate'))
 
     # ################# Override parent classes methods #####################
 
@@ -1823,13 +1823,13 @@ class TemplateFormatter(string.Formatter):
 
         # Handle functions
         # First see if we have a functional-style expression
-        if fmt.startswith('\''):
+        if fmt.startswith("'"):
             p = 0
         else:
-            p = fmt.find(':\'')
+            p = fmt.find(":'")
             if p >= 0:
                 p += 1
-        if p >= 0 and fmt[-1] == '\'':
+        if p >= 0 and fmt[-1] == "'":
             val = self._eval_program(val, fmt[p+1:-1], None, self.global_vars, None)
             colon = fmt[0:p].find(':')
             if colon < 0:
diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py
index 87ec727116..702fbc3bc8 100644
--- a/src/calibre/utils/formatter_functions.py
+++ b/src/calibre/utils/formatter_functions.py
@@ -389,7 +389,7 @@ arguments.[/] Can take any number of arguments. In most cases you can use the
     def evaluate(self, formatter, kwargs, mi, locals, *args):
         i = 0
         res = ''
-        for i in range(0, len(args)):
+        for i in range(len(args)):
             res += args[i]
         return res
 
@@ -722,7 +722,7 @@ separated by ``separator``.
     def evaluate(self, formatter, kwargs, mi, locals, name, separator):
         res = getattr(mi, name, None)
         if not isinstance(res, list):
-            return "%s is not a list" % name
+            return '%s is not a list' % name
         return separator.join(res)
 
 
@@ -998,14 +998,14 @@ return ``found_val``, otherwise return ``not_found_val``. If ``found_val`` and
             fv = args[0]
             nfv = args[1]
         else:
-            raise ValueError(_("{} requires 2 or 4 arguments").format(self.name))
+            raise ValueError(_('{} requires 2 or 4 arguments').format(self.name))
 
         l = [v.strip() for v in val.split(',') if v.strip()]
-        (id_, __, regexp) = ident.partition(':')
+        id_, __, regexp = ident.partition(':')
         if not id_:
             return nfv
         for candidate in l:
-            i, __, v =  candidate.partition(':')
+            i, __, v = candidate.partition(':')
             if v and i == id_:
                 if not regexp or re.search(regexp, v, flags=re.I):
                     return candidate if fv_is_id else fv
@@ -1054,7 +1054,7 @@ program: re_group(field('series'), "(\S* )(.*)", "{$:uppercase()}", "{$}")'}
         def repl(mo):
             res = ''
             if mo and mo.lastindex:
-                for dex in range(0, mo.lastindex):
+                for dex in range(mo.lastindex):
                     gv = mo.group(dex+1)
                     if gv is None:
                         continue
@@ -1268,7 +1268,6 @@ the :ref:`select` function to get the modification time for a specific format. N
 that format names are always uppercase, as in EPUB.
 ''')
 
-
     def evaluate(self, formatter, kwargs, mi, locals, fmt):
         fmt_data = mi.get('format_metadata', {})
         try:
@@ -1387,7 +1386,7 @@ items from ``start_index`` to ``end_index``.[/] The first item is number zero. I
 an index is negative, then it counts from the end of the list. As a special
 case, an end_index of zero is assumed to be the length of the list.
 
-Examples assuming that the tags column (which is comma-separated) contains "A, B ,C":
+Examples assuming that the tags column (which is comma-separated) contains "A, B, C":
 [LIST]
 [*]``{tags:sublist(0,1,\,)}`` returns "A"
 [*]``{tags:sublist(-1,0,\,)}`` returns "C"
@@ -1864,7 +1863,7 @@ program:
     list_join('#@#', $authors, '&', list_re($#genre, ',', '^(.).*$', 'Genre: \\1'),  ',')
 [/CODE]
 ''')  # not translated as \1 gets mistranslated as a control char in transifex
-      # for some reason. And yes, the double backslash is required, for some reason.
+    # for some reason. And yes, the double backslash is required, for some reason.
 
     def evaluate(self, formatter, kwargs, mi, locals, with_separator, *args):
         if len(args) % 2 != 0:
@@ -1873,7 +1872,7 @@ program:
                   "associated separator"))
 
         # Starting in python 3.7 dicts preserve order so we don't need OrderedDict
-        result = dict()
+        result = {}
         i = 0
         while i < len(args):
             lst = [v.strip() for v in args[i].split(args[i+1]) if v.strip()]
@@ -1952,7 +1951,7 @@ range(1, 5, 2, 1) -> error(limit exceeded)
         r = range(start_val, stop_val, step_val)
         if len(r) > limit_val:
             raise ValueError(
-                _("{0}: length ({1}) longer than limit ({2})").format(
+                _('{0}: length ({1}) longer than limit ({2})').format(
                             'range', len(r), str(limit_val)))
         return ', '.join([str(v) for v in r])
 
@@ -2041,8 +2040,8 @@ by ``separator``, as are the items in the returned list.
     def evaluate(self, formatter, kwargs, mi, locals, value, direction, separator):
         res = [l.strip() for l in value.split(separator) if l.strip()]
         if separator == ',':
-            return ', '.join(sorted(res, key=sort_key, reverse=direction != "0"))
-        return separator.join(sorted(res, key=sort_key, reverse=direction != "0"))
+            return ', '.join(sorted(res, key=sort_key, reverse=direction != '0'))
+        return separator.join(sorted(res, key=sort_key, reverse=direction != '0'))
 
 
 class BuiltinListEquals(BuiltinFormatterFunction):
@@ -2115,7 +2114,7 @@ uses ``re_group(item, search_re, template ...)`` when doing the replacements.
             def repl(mo):
                 newval = ''
                 if mo and mo.lastindex:
-                    for dex in range(0, mo.lastindex):
+                    for dex in range(mo.lastindex):
                         gv = mo.group(dex+1)
                         if gv is None:
                             continue
@@ -2227,7 +2226,7 @@ Example: ``'1s3d-1m'`` will add 1 second, add 3 days, and subtract 1 minute from
             raise e
         except Exception as e:
             traceback.print_exc()
-            raise ValueError(_("{0}: error: {1}").format('date_arithmetic', str(e)))
+            raise ValueError(_('{0}: error: {1}').format('date_arithmetic', str(e)))
 
 
 class BuiltinLanguageStrings(BuiltinFormatterFunction):
@@ -2535,7 +2534,6 @@ on a device has its own device name. The ``storage_location_key`` names are
 ``'main'``, ``'carda'`` and ``'cardb'``. This function works only in the GUI.
 ''')
 
-
     def evaluate(self, formatter, kwargs, mi, locals, storage_location):
         # We can't use get_database() here because we need the device manager.
         # In other words, the function really does need the GUI
@@ -2626,14 +2624,14 @@ This function works only in the GUI and the content server.
         if res is None:
             if is_undefined == '1':
                 return 'Yes'
-            return ""
+            return ''
         if not isinstance(res, bool):
             raise ValueError(_('check_yes_no requires the field be a Yes/No custom column'))
         if is_false == '1' and not res:
             return 'Yes'
         if is_true == '1' and res:
             return 'Yes'
-        return ""
+        return ''
 
 
 class BuiltinRatingToStars(BuiltinFormatterFunction):
@@ -3169,7 +3167,7 @@ This function works only in the GUI and the content server.
             return '1' if note is not None else ''
         try:
             notes_for_book = db.items_with_notes_in_book(mi.id)
-            values = [v for v in notes_for_book.get(field_name, {}).values()]
+            values = list(notes_for_book.get(field_name, {}).values())
             return db.field_metadata[field_name]['is_multiple'].get('list_to_ui', ', ').join(values)
         except Exception as e:
             traceback.print_exc()
diff --git a/src/calibre/utils/icu.py b/src/calibre/utils/icu.py
index 510ae675ed..e545b967eb 100644
--- a/src/calibre/utils/icu.py
+++ b/src/calibre/utils/icu.py
@@ -277,7 +277,7 @@ def partition_by_first_letter(items, reverse=False, key=lambda x:x):
     # Build a list of 'equal' first letters by noticing changes
     # in ICU's 'ordinal' for the first letter.
     from collections import OrderedDict
-    items = sorted(items, key=lambda x:sort_key(key(x)), reverse=reverse)
+    items = sorted(items, key=lambda x: sort_key(key(x)), reverse=reverse)
     ans = OrderedDict()
     last_c, last_ordnum = ' ', 0
     for item in items:
diff --git a/src/calibre/utils/icu_test.py b/src/calibre/utils/icu_test.py
index e482dd4ee0..a48d627571 100644
--- a/src/calibre/utils/icu_test.py
+++ b/src/calibre/utils/icu_test.py
@@ -35,7 +35,7 @@ class TestICU(unittest.TestCase):
         german = '''Sonntag Montag Dienstag Januar Februar März Fuße Fluße Flusse flusse fluße flüße flüsse'''.split()
         german_good = '''Dienstag Februar flusse Flusse fluße Fluße flüsse flüße Fuße Januar März Montag Sonntag'''.split()
         french = '''dimanche lundi mardi janvier février mars déjà Meme deja même dejà bpef bœg Boef Mémé bœf boef bnef pêche pèché pêché pêche pêché'''.split()
-        french_good = '''bnef boef Boef bœf bœg bpef deja dejà déjà dimanche février janvier lundi mardi mars Meme Mémé même pèché pêche pêche pêché pêché'''.split()  # noqa
+        french_good = '''bnef boef Boef bœf bœg bpef deja dejà déjà dimanche février janvier lundi mardi mars Meme Mémé même pèché pêche pêche pêché pêché'''.split()  # noqa: E501
 
         # Test corner cases
         sort_key = icu.sort_key
@@ -85,7 +85,7 @@ class TestICU(unittest.TestCase):
         for x in ('', None, False, 1):
             self.ae(x, icu.capitalize(x))
 
-        for x in ('a', 'Alice\'s code', 'macdonald\'s machIne', '02 the wars'):
+        for x in ('a', "Alice's code", "macdonald's machIne", '02 the wars'):
             self.ae(icu.upper(x), x.upper())
             self.ae(icu.lower(x), x.lower())
             # ICU's title case algorithm is different from ours, when there are
@@ -114,9 +114,9 @@ class TestICU(unittest.TestCase):
         self.assertFalse(icu.contains('xxx', 'xx'))
         self.assertTrue(icu.primary_contains('pena', 'peña'))
         x = icu.primary_collator()
-        self.ae(x.get_attribute(icu._icu.UCOL_STRENGTH), icu._icu.UCOL_PRIMARY),
+        self.ae(x.get_attribute(icu._icu.UCOL_STRENGTH), icu._icu.UCOL_PRIMARY)
         self.ae((0, 4), icu.primary_no_punc_find('pena"', 'peña'))
-        self.ae((0, 13), icu.primary_no_punc_find("typographers", 'typographer’s'))
+        self.ae((0, 13), icu.primary_no_punc_find('typographers', 'typographer’s'))
         self.ae((0, 7), icu.primary_no_punc_find('abcd', 'a\u00adb\u200cc\u200dd'))
         self.ae((0, 5), icu.primary_no_punc_find('abcd', 'ab cd'))
         # test find all
@@ -206,7 +206,7 @@ class TestICU(unittest.TestCase):
         from calibre.spell.break_iterator import split_into_words as split
         for q in ('one two three', ' one two three', 'one\ntwo  three ', ):
             self.ae(split(str(q)), ['one', 'two', 'three'], 'Failed to split: %r' % q)
-        self.ae(split('I I\'m'), ['I', "I'm"])
+        self.ae(split("I I'm"), ['I', "I'm"])
         self.ae(split('out-of-the-box'), ['out-of-the-box'])
         self.ae(split('-one two-'), ['-one', 'two-'])
         self.ae(split('-one a-b-c-d e'), ['-one', 'a-b-c-d', 'e'])
diff --git a/src/calibre/utils/img.py b/src/calibre/utils/img.py
index f45c3ad5f3..1a9fbc6552 100644
--- a/src/calibre/utils/img.py
+++ b/src/calibre/utils/img.py
@@ -63,8 +63,8 @@ def load_jxr_data(data):
 
 # }}}
 
-# png <-> gif {{{
 
+# png <-> gif {{{
 
 def png_data_to_gif_data(data):
     from PIL import Image
@@ -103,8 +103,8 @@ def gif_data_to_png_data(data, discard_animation=False):
 
 # }}}
 
-# Loading images {{{
 
+# Loading images {{{
 
 def set_image_allocation_limit(size_in_mb=1024):
     with suppress(ImportError):  # for people running form source
@@ -162,8 +162,8 @@ def image_and_format_from_data(data):
     return r.read(), fmt
 # }}}
 
-# Saving images {{{
 
+# Saving images {{{
 
 def image_to_data(img, compression_quality=95, fmt='JPEG', png_compression_level=9, jpeg_optimized=True, jpeg_progressive=False):
     '''
@@ -302,8 +302,8 @@ def save_cover_data_to(
         f.write(image_to_data(img, compression_quality, fmt, compression_quality // 10) if changed else data)
 # }}}
 
-# Overlaying images {{{
 
+# Overlaying images {{{
 
 def blend_on_canvas(img, width, height, bgcolor='#ffffff'):
     ' Blend the `img` onto a canvas with the specified background color and size '
@@ -370,8 +370,8 @@ def blend_image(img, bgcolor='#ffffff'):
     return canvas
 # }}}
 
-# Image borders {{{
 
+# Image borders {{{
 
 def add_borders_to_image(img, left=0, top=0, right=0, bottom=0, border_color='#ffffff'):
     img = image_from_data(img)
@@ -394,8 +394,8 @@ def remove_borders_from_image(img, fuzz=None):
     return ans if ans.size() != img.size() else img
 # }}}
 
-# Cropping/scaling of images {{{
 
+# Cropping/scaling of images {{{
 
 def resize_image(img, width, height):
     return img.scaled(int(width), int(height), Qt.AspectRatioMode.IgnoreAspectRatio, Qt.TransformationMode.SmoothTransformation)
@@ -450,8 +450,8 @@ def crop_image(img, x, y, width, height):
 
 # }}}
 
-# Image transformations {{{
 
+# Image transformations {{{
 
 def grayscale_image(img):
     return imageops.grayscale(image_from_data(img))
@@ -536,8 +536,8 @@ def eink_dither_image(img):
 
 # }}}
 
-# Optimization of images {{{
 
+# Optimization of images {{{
 
 def run_optimizer(file_path, cmd, as_filter=False, input_data=None):
     file_path = os.path.abspath(file_path)
@@ -660,15 +660,17 @@ def encode_jpeg(file_path, quality=80):
 
 def encode_webp(file_path, quality=75, m=6, metadata='all'):
     return run_cwebp(file_path, False, quality, m, metadata)
+
 # }}}
 
+
 # PIL images {{{
 def align8to32(bytes, width, mode):
-    """
+    '''
     converts each scanline of data from 8 bit to 32 bit aligned
-    """
+    '''
 
-    bits_per_pixel = {"1": 1, "L": 8, "P": 8, "I;16": 16}[mode]
+    bits_per_pixel = {'1': 1, 'L': 8, 'P': 8, 'I;16': 16}[mode]
 
     # calculate bytes per line and the extra padding if needed
     bits_per_line = bits_per_pixel * width
@@ -682,34 +684,34 @@ def align8to32(bytes, width, mode):
         return bytes
 
     new_data = [
-        bytes[i * bytes_per_line : (i + 1) * bytes_per_line] + b"\x00" * extra_padding
+        bytes[i * bytes_per_line : (i + 1) * bytes_per_line] + b'\x00' * extra_padding
         for i in range(len(bytes) // bytes_per_line)
     ]
 
-    return b"".join(new_data)
+    return b''.join(new_data)
 
 
 def convert_PIL_image_to_pixmap(im, device_pixel_ratio=1.0):
     data = None
     colortable = None
-    if im.mode == "RGBA":
+    if im.mode == 'RGBA':
         fmt = QImage.Format.Format_RGBA8888
-        data = im.tobytes("raw", "RGBA")
-    elif im.mode == "1":
+        data = im.tobytes('raw', 'RGBA')
+    elif im.mode == '1':
         fmt = QImage.Format.Format_Mono
-    elif im.mode == "L":
+    elif im.mode == 'L':
         fmt = QImage.Format.Format_Indexed8
         colortable = [qRgba(i, i, i, 255) & 0xFFFFFFFF for i in range(256)]
-    elif im.mode == "P":
+    elif im.mode == 'P':
         fmt = QImage.Format.Format_Indexed8
         palette = im.getpalette()
         colortable = [qRgba(*palette[i : i + 3], 255) & 0xFFFFFFFF for i in range(0, len(palette), 3)]
-    elif im.mode == "I;16":
+    elif im.mode == 'I;16':
         im = im.point(lambda i: i * 256)
         fmt = QImage.Format.Format_Grayscale16
     else:
         fmt = QImage.Format.Format_RGBX8888
-        data = im.convert("RGBA").tobytes("raw", "RGBA")
+        data = im.convert('RGBA').tobytes('raw', 'RGBA')
 
     size = im.size
     data = data or align8to32(im.tobytes(), size[0], im.mode)
@@ -726,15 +728,15 @@ def read_xmp_from_pil_image(im) -> str:
     xml = ''
     if fmt == 'jpeg':
         for segment, content in im.applist:
-            if segment == "APP1":
-                marker, xmp_tags = content.split(b"\x00")[:2]
-                if marker == b"http://ns.adobe.com/xap/1.0/":
+            if segment == 'APP1':
+                marker, xmp_tags = content.split(b'\x00')[:2]
+                if marker == b'http://ns.adobe.com/xap/1.0/':
                     xml = xmp_tags
                     break
     elif fmt == 'png':
         xml = im.info.get('XML:com.adobe.xmp', '')
     elif fmt == 'webp':
-        xml = im.info.get("xmp", '')
+        xml = im.info.get('xmp', '')
     elif fmt == 'tiff':
         xml = im.tag_v2.get(700, '')
     return xml
@@ -794,6 +796,7 @@ def read_alt_text(pil_im_or_path, target_lang='') -> str:
 
 # }}}
 
+
 def test():  # {{{
     from glob import glob
 
@@ -814,7 +817,7 @@ def test():  # {{{
             raise SystemExit('optimize_png failed: %s' % ret)
         if glob('*.bak'):
             raise SystemExit('Spurious .bak files left behind')
-        save_image(img, 'test.webp',  compression_quality=100)
+        save_image(img, 'test.webp', compression_quality=100)
         ret = optimize_webp('test.webp')
         if ret is not None:
             raise SystemExit('optimize_webp failed: %s' % ret)
diff --git a/src/calibre/utils/imghdr.py b/src/calibre/utils/imghdr.py
index 186b71c081..129fa599ed 100644
--- a/src/calibre/utils/imghdr.py
+++ b/src/calibre/utils/imghdr.py
@@ -8,7 +8,7 @@ from struct import error, unpack
 from calibre.utils.speedups import ReadOnlyFileBuffer
 from polyglot.builtins import string_or_bytes
 
-""" Recognize image file formats and sizes based on their first few bytes."""
+''' Recognize image file formats and sizes based on their first few bytes.'''
 
 HSIZE = 120
 
@@ -70,7 +70,7 @@ def _identify(stream):
             # PNG
             s = head[16:24] if size >= 24 and head[12:16] == b'IHDR' else head[8:16]
             try:
-                width, height = unpack(b">LL", s)
+                width, height = unpack(b'>LL', s)
             except error:
                 return fmt, width, height
         elif fmt == 'jpeg':
@@ -85,7 +85,7 @@ def _identify(stream):
         elif fmt == 'gif':
             # GIF
             try:
-                width, height = unpack(b"<HH", head[6:10])
+                width, height = unpack(b'<HH', head[6:10])
             except error:
                 return fmt, width, height
         elif size >= 56 and fmt == 'jpeg2000':
@@ -111,9 +111,9 @@ def test(f):
 
 @test
 def jpeg(h):
-    """JPEG data in JFIF format (Changed by Kovid to mimic the file utility,
+    '''JPEG data in JFIF format (Changed by Kovid to mimic the file utility,
     the original code was failing with some jpegs that included ICC_PROFILE
-    data, for example: http://nationalpostnews.files.wordpress.com/2013/03/budget.jpeg?w=300&h=1571)"""
+    data, for example: http://nationalpostnews.files.wordpress.com/2013/03/budget.jpeg?w=300&h=1571)'''
     if h[6:10] in (b'JFIF', b'Exif'):
         return 'jpeg'
     if h[:2] == b'\xff\xd8':
@@ -169,20 +169,20 @@ def jpeg_dimensions(stream):
 
 @test
 def png(h):
-    if h[:8] == b"\211PNG\r\n\032\n":
+    if h[:8] == b'\211PNG\r\n\032\n':
         return 'png'
 
 
 @test
 def gif(h):
-    """GIF ('87 and '89 variants)"""
+    '''GIF ('87 and '89 variants)'''
     if h[:6] in (b'GIF87a', b'GIF89a'):
         return 'gif'
 
 
 @test
 def tiff(h):
-    """TIFF (can be in Motorola or Intel byte order)"""
+    '''TIFF (can be in Motorola or Intel byte order)'''
     if h[:2] in (b'MM', b'II'):
         if h[2:4] == b'\xbc\x01':
             return 'jxr'
@@ -197,14 +197,14 @@ def webp(h):
 
 @test
 def rgb(h):
-    """SGI image library"""
+    '''SGI image library'''
     if h[:2] == b'\001\332':
         return 'rgb'
 
 
 @test
 def pbm(h):
-    """PBM (portable bitmap)"""
+    '''PBM (portable bitmap)'''
     if len(h) >= 3 and \
         h[0] == b'P' and h[1] in b'14' and h[2] in b' \t\n\r':
         return 'pbm'
@@ -212,7 +212,7 @@ def pbm(h):
 
 @test
 def pgm(h):
-    """PGM (portable graymap)"""
+    '''PGM (portable graymap)'''
     if len(h) >= 3 and \
         h[0] == b'P' and h[1] in b'25' and h[2] in b' \t\n\r':
         return 'pgm'
@@ -220,7 +220,7 @@ def pgm(h):
 
 @test
 def ppm(h):
-    """PPM (portable pixmap)"""
+    '''PPM (portable pixmap)'''
     if len(h) >= 3 and \
         h[0] == b'P' and h[1] in b'36' and h[2] in b' \t\n\r':
         return 'ppm'
@@ -228,14 +228,14 @@ def ppm(h):
 
 @test
 def rast(h):
-    """Sun raster file"""
+    '''Sun raster file'''
     if h[:4] == b'\x59\xA6\x6A\x95':
         return 'rast'
 
 
 @test
 def xbm(h):
-    """X bitmap (X10 or X11)"""
+    '''X bitmap (X10 or X11)'''
     s = b'#define '
     if h[:len(s)] == s:
         return 'xbm'
diff --git a/src/calibre/utils/inotify.py b/src/calibre/utils/inotify.py
index 6941215999..fb2a8b701c 100644
--- a/src/calibre/utils/inotify.py
+++ b/src/calibre/utils/inotify.py
@@ -47,27 +47,27 @@ def load_inotify():  # {{{
         if not hasattr(ctypes, 'c_ssize_t'):
             raise INotifyError('You need python >= 2.7 to use inotify')
         libc = ctypes.CDLL(None, use_errno=True)
-        for function in ("inotify_add_watch", "inotify_init1", "inotify_rm_watch"):
+        for function in ('inotify_add_watch', 'inotify_init1', 'inotify_rm_watch'):
             if not hasattr(libc, function):
                 raise INotifyError('libc is too old')
         # inotify_init1()
         prototype = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_int, use_errno=True)
-        init1 = prototype(('inotify_init1', libc), ((1, "flags", 0),))
+        init1 = prototype(('inotify_init1', libc), ((1, 'flags', 0),))
 
         # inotify_add_watch()
         prototype = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_int, ctypes.c_char_p, ctypes.c_uint32, use_errno=True)
         add_watch = prototype(('inotify_add_watch', libc), (
-            (1, "fd"), (1, "pathname"), (1, "mask")), use_errno=True)
+            (1, 'fd'), (1, 'pathname'), (1, 'mask')), use_errno=True)
 
         # inotify_rm_watch()
         prototype = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_int, ctypes.c_int, use_errno=True)
         rm_watch = prototype(('inotify_rm_watch', libc), (
-            (1, "fd"), (1, "wd")), use_errno=True)
+            (1, 'fd'), (1, 'wd')), use_errno=True)
 
         # read()
         prototype = ctypes.CFUNCTYPE(ctypes.c_ssize_t, ctypes.c_int, ctypes.c_void_p, ctypes.c_size_t, use_errno=True)
         read = prototype(('read', libc), (
-            (1, "fd"), (1, "buf"), (1, "count")), use_errno=True)
+            (1, 'fd'), (1, 'buf'), (1, 'count')), use_errno=True)
         _inotify = (init1, add_watch, rm_watch, read)
     return _inotify
 # }}}
diff --git a/src/calibre/utils/ipc/launch.py b/src/calibre/utils/ipc/launch.py
index 12475b8c01..723c5a8468 100644
--- a/src/calibre/utils/ipc/launch.py
+++ b/src/calibre/utils/ipc/launch.py
@@ -174,20 +174,20 @@ class Worker:
             priority = prefs['worker_process_priority']
         cmd = [exe] if isinstance(exe, string_or_bytes) else exe
         args = {
-                'env' : env,
-                'cwd' : _cwd,
+                'env': env,
+                'cwd': _cwd,
                 }
         if iswindows:
             priority = {
-                    'high'   : subprocess.HIGH_PRIORITY_CLASS,
-                    'normal' : subprocess.NORMAL_PRIORITY_CLASS,
-                    'low'    : subprocess.IDLE_PRIORITY_CLASS}[priority]
+                    'high'  : subprocess.HIGH_PRIORITY_CLASS,
+                    'normal': subprocess.NORMAL_PRIORITY_CLASS,
+                    'low'   : subprocess.IDLE_PRIORITY_CLASS}[priority]
             args['creationflags'] = subprocess.CREATE_NO_WINDOW|priority
         else:
             niceness = {
-                    'normal' : 0,
-                    'low'    : 10,
-                    'high'   : 20,
+                    'normal': 0,
+                    'low'   : 10,
+                    'high'  : 20,
             }[priority]
             args['env']['CALIBRE_WORKER_NICENESS'] = str(niceness)
         ret = None
diff --git a/src/calibre/utils/ipc/pool.py b/src/calibre/utils/ipc/pool.py
index 4bc15d1668..ba62e8adc6 100644
--- a/src/calibre/utils/ipc/pool.py
+++ b/src/calibre/utils/ipc/pool.py
@@ -40,7 +40,7 @@ if iswindows:
     # Note that when running via the "Restart in debug mode" action, stdout is
     # not a console (its already redirected to a log file), so no redirection
     # is required.
-    if getattr(sys, 'gui_app', False) or getattr(sys.stdout, 'isatty', lambda : False)():
+    if getattr(sys, 'gui_app', False) or getattr(sys.stdout, 'isatty', lambda: False)():
         if DEBUG:
             # We are running in a windows console with calibre-debug -g
             import subprocess
diff --git a/src/calibre/utils/ipc/server.py b/src/calibre/utils/ipc/server.py
index 4f66b73f71..ca098195ac 100644
--- a/src/calibre/utils/ipc/server.py
+++ b/src/calibre/utils/ipc/server.py
@@ -136,7 +136,7 @@ class Server(Thread):
         with a:
             env = {
                 'CALIBRE_WORKER_FD': str(a.fileno()),
-                'CALIBRE_WORKER_RESULT' : environ_item(as_hex_unicode(rfile))
+                'CALIBRE_WORKER_RESULT': environ_item(as_hex_unicode(rfile))
             }
             w = Worker(env, gui=gui, job_name=job_name)
 
diff --git a/src/calibre/utils/ipc/simple_worker.py b/src/calibre/utils/ipc/simple_worker.py
index 918f88886a..7b155c3c55 100644
--- a/src/calibre/utils/ipc/simple_worker.py
+++ b/src/calibre/utils/ipc/simple_worker.py
@@ -143,9 +143,9 @@ def start_pipe_worker(command, env=None, priority='normal', **process_args):
     try:
         if iswindows:
             priority = {
-                    'high'   : subprocess.HIGH_PRIORITY_CLASS,
-                    'normal' : subprocess.NORMAL_PRIORITY_CLASS,
-                    'low'    : subprocess.IDLE_PRIORITY_CLASS}[priority]
+                    'high'  : subprocess.HIGH_PRIORITY_CLASS,
+                    'normal': subprocess.NORMAL_PRIORITY_CLASS,
+                    'low'   : subprocess.IDLE_PRIORITY_CLASS}[priority]
             args['creationflags'] = subprocess.CREATE_NO_WINDOW|priority
             pass_fds = args.pop('pass_fds', None)
             if pass_fds:
@@ -153,7 +153,7 @@ def start_pipe_worker(command, env=None, priority='normal', **process_args):
                     os.set_handle_inheritable(fd, True)
                 args['startupinfo'] = subprocess.STARTUPINFO(lpAttributeList={'handle_list':pass_fds})
         else:
-            niceness = {'normal' : 0, 'low'    : 10, 'high'   : 20}[priority]
+            niceness = {'normal': 0, 'low': 10, 'high': 20}[priority]
             args['env']['CALIBRE_WORKER_NICENESS'] = str(niceness)
 
         exe = w.executable
diff --git a/src/calibre/utils/ipc/worker.py b/src/calibre/utils/ipc/worker.py
index 4afa8b652d..4aa9190c3a 100644
--- a/src/calibre/utils/ipc/worker.py
+++ b/src/calibre/utils/ipc/worker.py
@@ -24,46 +24,46 @@ else:
     from multiprocessing.connection import Connection
 
 PARALLEL_FUNCS = {
-    'lrfviewer'    :
+    'lrfviewer':
     ('calibre.gui2.lrf_renderer.main', 'main', None),
 
-    'ebook-viewer'    :
+    'ebook-viewer':
     ('calibre.gui_launch', 'ebook_viewer', None),
 
-    'ebook-edit' :
+    'ebook-edit':
     ('calibre.gui_launch', 'gui_ebook_edit', None),
 
-    'store-dialog' :
+    'store-dialog':
     ('calibre.gui_launch', 'store_dialog', None),
 
-    'toc-dialog' :
+    'toc-dialog':
     ('calibre.gui_launch', 'toc_dialog', None),
 
-    'webengine-dialog' :
+    'webengine-dialog':
     ('calibre.gui_launch', 'webengine_dialog', None),
 
-    'render_pages' :
+    'render_pages':
     ('calibre.ebooks.comic.input', 'render_pages', 'notification'),
 
-    'gui_convert'     :
+    'gui_convert':
     ('calibre.gui2.convert.gui_conversion', 'gui_convert', 'notification'),
 
-    'gui_convert_recipe'     :
+    'gui_convert_recipe':
     ('calibre.gui2.convert.gui_conversion', 'gui_convert_recipe', 'notification'),
 
-    'gui_polish'     :
+    'gui_polish':
     ('calibre.ebooks.oeb.polish.main', 'gui_polish', None),
 
-    'gui_convert_override'     :
+    'gui_convert_override':
     ('calibre.gui2.convert.gui_conversion', 'gui_convert_override', 'notification'),
 
-    'gui_catalog'     :
+    'gui_catalog':
     ('calibre.gui2.convert.gui_conversion', 'gui_catalog', 'notification'),
 
-    'arbitrary' :
+    'arbitrary':
     ('calibre.utils.ipc.worker', 'arbitrary', None),
 
-    'arbitrary_n' :
+    'arbitrary_n':
     ('calibre.utils.ipc.worker', 'arbitrary_n', 'notification'),
 }
 
diff --git a/src/calibre/utils/iphlpapi.py b/src/calibre/utils/iphlpapi.py
index 7295aca1aa..06d68259b9 100644
--- a/src/calibre/utils/iphlpapi.py
+++ b/src/calibre/utils/iphlpapi.py
@@ -13,10 +13,10 @@ from ctypes import windll, wintypes
 
 class GUID(ctypes.Structure):
     _fields_ = [
-        ("data1", wintypes.DWORD),
-        ("data2", wintypes.WORD),
-        ("data3", wintypes.WORD),
-        ("data4", wintypes.BYTE * 8)]
+        ('data1', wintypes.DWORD),
+        ('data2', wintypes.WORD),
+        ('data3', wintypes.WORD),
+        ('data4', wintypes.BYTE * 8)]
 
     def __init__(self, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8):
         self.data1 = l
diff --git a/src/calibre/utils/ipython.py b/src/calibre/utils/ipython.py
index 27056a183f..16f5396f32 100644
--- a/src/calibre/utils/ipython.py
+++ b/src/calibre/utils/ipython.py
@@ -121,12 +121,12 @@ history_length(2000) #value of -1 means no limit
         import atexit
         import readline
 
-        import pyreadline.unicode_helper  # noqa
+        import pyreadline.unicode_helper  # noqa: F401
         # Normally the codepage for pyreadline is set to be sys.stdout.encoding
         # if you need to change this uncomment the following line
         # pyreadline.unicode_helper.pyreadline_codepage="utf8"
     except ImportError:
-        print("Module readline not available.")
+        print('Module readline not available.')
     else:
         # import tab completion functionality
         import rlcompleter
@@ -140,7 +140,7 @@ history_length(2000) #value of -1 means no limit
         readline.set_completer(completer_obj.complete)
 
         # activate tab completion
-        readline.parse_and_bind("tab: complete")
+        readline.parse_and_bind('tab: complete')
         readline.read_history_file()
         atexit.register(readline.write_history_file)
         del readline, rlcompleter, atexit
@@ -159,8 +159,8 @@ class Exit:
 class Helper:
 
     def __repr__(self):
-        return "Type help() for interactive help, " \
-               "or help(object) for help about object."
+        return ('Type help() for interactive help, '
+                'or help(object) for help about object.')
 
     def __call__(self, *args, **kwds):
         import pydoc
@@ -172,14 +172,13 @@ def simple_repl(user_ns={}):
         setup_pyreadline()
     else:
         try:
-            import rlcompleter  # noqa
-            import readline  # noqa
-            readline.parse_and_bind("tab: complete")
+            import readline, rlcompleter  # noqa: I001, E401, F401
+            readline.parse_and_bind('tab: complete')
         except ImportError:
             pass
 
     user_ns = user_ns or {}
-    import sys, re  # noqa
+    import sys, re  # noqa: I001, E401, F401
     for x in ('os', 'sys', 're'):
         user_ns[x] = user_ns.get(x, globals().get(x, locals().get(x)))
     user_ns['exit'] = Exit()
diff --git a/src/calibre/utils/iso8601.py b/src/calibre/utils/iso8601.py
index f4733d80e5..6e40b3a579 100644
--- a/src/calibre/utils/iso8601.py
+++ b/src/calibre/utils/iso8601.py
@@ -21,7 +21,7 @@ def parse_iso8601(date_string, assume_utc=False, as_utc=True, require_aware=Fals
             tz = utc_tz
         else:
             sign = '-' if tzseconds < 0 else '+'
-            description = "%s%02d:%02d" % (sign, abs(tzseconds) // 3600, (abs(tzseconds) % 3600) // 60)
+            description = '%s%02d:%02d' % (sign, abs(tzseconds) // 3600, (abs(tzseconds) % 3600) // 60)
             tz = timezone(timedelta(seconds=tzseconds), description)
     elif require_aware:
         raise ValueError(f'{date_string} does not specify a time zone')
diff --git a/src/calibre/utils/linux_trash.py b/src/calibre/utils/linux_trash.py
index ebc4eea4bd..7d7e9b8a42 100644
--- a/src/calibre/utils/linux_trash.py
+++ b/src/calibre/utils/linux_trash.py
@@ -51,7 +51,7 @@ def is_parent(parent, path):
 
 
 def format_date(date):
-    return date.strftime("%Y-%m-%dT%H:%M:%S")
+    return date.strftime('%Y-%m-%dT%H:%M:%S')
 
 
 def info_for(src, topdir):
@@ -62,9 +62,9 @@ def info_for(src, topdir):
     else:
         src = op.relpath(src, topdir)
 
-    info  = "[Trash Info]\n"
-    info += "Path=" + uniquote(src) + "\n"
-    info += "DeletionDate=" + format_date(datetime.now()) + "\n"
+    info  = '[Trash Info]\n'
+    info += 'Path=' + uniquote(src) + '\n'
+    info += 'DeletionDate=' + format_date(datetime.now()) + '\n'
     return info
 
 
@@ -151,11 +151,11 @@ def get_dev(path):
 
 def send2trash(path):
     if not op.exists(path):
-        raise OSError("File not found: %s" % path)
+        raise OSError('File not found: %s' % path)
     # ...should check whether the user has the necessary permissions to delete
     # it, before starting the trashing operation itself. [2]
     if not os.access(path, os.W_OK):
-        raise OSError("Permission denied: %s" % path)
+        raise OSError('Permission denied: %s' % path)
     # if the file to be trashed is on the same device as HOMETRASH we
     # want to move it there.
     path_dev = get_dev(path)
diff --git a/src/calibre/utils/localization.py b/src/calibre/utils/localization.py
index 863c101ec7..a4a0c95381 100644
--- a/src/calibre/utils/localization.py
+++ b/src/calibre/utils/localization.py
@@ -90,7 +90,7 @@ def get_system_locale():
 
 def sanitize_lang(lang):
     if lang:
-        match = re.match('[a-z]{2,3}(_[A-Z]{2}){0,1}', lang)
+        match = re.match(r'[a-z]{2,3}(_[A-Z]{2}){0,1}', lang)
         if match:
             lang = match.group()
     if lang == 'zh':
@@ -340,13 +340,13 @@ set_translators.lang = None
 
 _iso639 = None
 _extra_lang_codes = {
-        'pt_BR' : _('Brazilian Portuguese'),
-        'zh_CN' : _('Simplified Chinese'),
-        'zh_TW' : _('Traditional Chinese'),
-        'bn_IN' : _('Indian Bengali'),
-        'bn_BD' : _('Bangladeshi Bengali'),
-        'en'    : _('English'),
-        'und'   : _('Unknown')
+        'pt_BR': _('Brazilian Portuguese'),
+        'zh_CN': _('Simplified Chinese'),
+        'zh_TW': _('Traditional Chinese'),
+        'bn_IN': _('Indian Bengali'),
+        'bn_BD': _('Bangladeshi Bengali'),
+        'en'   : _('English'),
+        'und'  : _('Unknown')
         }
 
 if False:
diff --git a/src/calibre/utils/localunzip.py b/src/calibre/utils/localunzip.py
index 31923806c8..95021fec53 100644
--- a/src/calibre/utils/localunzip.py
+++ b/src/calibre/utils/localunzip.py
@@ -37,8 +37,8 @@ LocalHeader = namedtuple('LocalHeader',
 
 if hasattr(sys, 'getwindowsversion'):
     windows_reserved_filenames = (
-        'CON', 'PRN', 'AUX', 'CLOCK$', 'NUL' 'COM0', 'COM1', 'COM2', 'COM3',
-        'COM4', 'COM5', 'COM6', 'COM7', 'COM8', 'COM9' 'LPT0', 'LPT1', 'LPT2',
+        'CON', 'PRN', 'AUX', 'CLOCK$', 'NUL', 'COM0', 'COM1', 'COM2', 'COM3',
+        'COM4', 'COM5', 'COM6', 'COM7', 'COM8', 'COM9', 'LPT0', 'LPT1', 'LPT2',
         'LPT3', 'LPT4', 'LPT5', 'LPT6', 'LPT7', 'LPT8', 'LPT9')
 
     def is_reserved_filename(x):
diff --git a/src/calibre/utils/logging.py b/src/calibre/utils/logging.py
index 059b1e2fdb..e008e30fc0 100644
--- a/src/calibre/utils/logging.py
+++ b/src/calibre/utils/logging.py
@@ -245,7 +245,6 @@ class ThreadSafeWrapper(Log):
 
 
 class GUILog(ThreadSafeLog):
-
     '''
     Logs in HTML and plain text as unicode. Ideal for display in a GUI context.
     '''
diff --git a/src/calibre/utils/magick/legacy.py b/src/calibre/utils/magick/legacy.py
index fc3c66c96b..132cd99d87 100644
--- a/src/calibre/utils/magick/legacy.py
+++ b/src/calibre/utils/magick/legacy.py
@@ -135,7 +135,7 @@ class Image:
         return width, height, fmt
 
     def remove_border(self, fuzz=None):
-        if fuzz is not None and fuzz < 0 or fuzz > 255:
+        if (fuzz is not None and fuzz < 0) or fuzz > 255:
             fuzz = None
         self.img = remove_borders_from_image(self.img, fuzz)
     trim = remove_border
diff --git a/src/calibre/utils/matcher.py b/src/calibre/utils/matcher.py
index c08fee8e58..9a76773c94 100644
--- a/src/calibre/utils/matcher.py
+++ b/src/calibre/utils/matcher.py
@@ -99,7 +99,7 @@ class Matcher:
                 w = [Worker(requests, results) for i in range(max(1, cpu_count()))]
                 [x.start() for x in w]
                 workers.extend(w)
-        items = map(lambda x: normalize('NFC', str(x)), filter(None, items))
+        items = (normalize('NFC', str(x)) for x in filter(None, items))
         self.items = items = tuple(items)
         tasks = split(items, len(workers))
         self.task_maps = [{j: i for j, (i, _) in enumerate(task)} for task in tasks]
@@ -167,7 +167,6 @@ class FilesystemMatcher(Matcher):
 
 # Python implementation of the scoring algorithm {{{
 
-
 def calc_score_for_char(ctx, prev, current, distance):
     factor = 1.0
     ans = ctx.max_score_per_char
@@ -226,7 +225,12 @@ def process_item(ctx, haystack, needle):
 
 class PyScorer:
     __slots__ = (
-        'level1', 'level2', 'level3', 'max_score_per_char', 'items', 'memory'
+        'items',
+        'level1',
+        'level2',
+        'level3',
+        'max_score_per_char',
+        'memory',
     )
 
     def __init__(
@@ -246,7 +250,6 @@ class PyScorer:
             self.memory = {}
             yield process_item(self, item, needle)
 
-
 # }}}
 
 
@@ -277,7 +280,7 @@ def test(return_tests=False):
 
     class Test(unittest.TestCase):
 
-        @unittest.skipIf(is_sanitized, 'Sanitizer enabled can\'t check for leaks')
+        @unittest.skipIf(is_sanitized, "Sanitizer enabled can't check for leaks")
         def test_mem_leaks(self):
             import gc
 
diff --git a/src/calibre/utils/mdns.py b/src/calibre/utils/mdns.py
index db84d4cc64..ebf8f1cb9c 100644
--- a/src/calibre/utils/mdns.py
+++ b/src/calibre/utils/mdns.py
@@ -38,9 +38,9 @@ class AllIpAddressesGetter(Thread):
 
     def run(self):
         global _all_ip_addresses
-#        print 'sleeping'
-#        time.sleep(15)
-#        print 'slept'
+        # print('sleeping')
+        # time.sleep(15)
+        # print('slept')
         _all_ip_addresses = self.get_all_ips()
 
 
@@ -74,7 +74,7 @@ def _get_external_ip():
                     break
             except:
                 time.sleep(0.3)
-    # print 'ipaddr: %s' % ipaddr
+    # print('ipaddr: %s' % ipaddr)
     return ipaddr
 
 
diff --git a/src/calibre/utils/mem.py b/src/calibre/utils/mem.py
index ce286b04ca..f04e0859a2 100644
--- a/src/calibre/utils/mem.py
+++ b/src/calibre/utils/mem.py
@@ -32,7 +32,7 @@ def memory(since=0.0):
 
 
 def gc_histogram():
-    """Returns per-class counts of existing objects."""
+    '''Returns per-class counts of existing objects.'''
     result = {}
     for o in gc.get_objects():
         t = type(o)
@@ -42,10 +42,10 @@ def gc_histogram():
 
 
 def diff_hists(h1, h2):
-    """Prints differences between two results of gc_histogram()."""
+    '''Prints differences between two results of gc_histogram().'''
     for k in h1:
         if k not in h2:
             h2[k] = 0
         if h1[k] != h2[k]:
-            print("%s: %d -> %d (%s%d)" % (
-                k, h1[k], h2[k], h2[k] > h1[k] and "+" or "", h2[k] - h1[k]))
+            print('%s: %d -> %d (%s%d)' % (
+                k, h1[k], h2[k], (h2[k] > h1[k] and '+') or '', h2[k] - h1[k]))
diff --git a/src/calibre/utils/mreplace.py b/src/calibre/utils/mreplace.py
index 65b9cdcd65..2c9bbb63b6 100644
--- a/src/calibre/utils/mreplace.py
+++ b/src/calibre/utils/mreplace.py
@@ -25,9 +25,9 @@ class MReplace(UserDict):
         if len(self.data) > 0:
             keys = sorted(self.data, key=len, reverse=True)
             if isinstance(keys[0], bytes):
-                tmp = b"(%s)" % b"|".join(map(re.escape, keys))
+                tmp = b'(%s)' % b'|'.join(map(re.escape, keys))
             else:
-                tmp = "(%s)" % "|".join(map(re.escape, keys))
+                tmp = '(%s)' % '|'.join(map(re.escape, keys))
             if self.re != tmp:
                 self.re = tmp
                 if self.case_sensitive:
diff --git a/src/calibre/utils/network.py b/src/calibre/utils/network.py
index 213625c950..79c32fd329 100644
--- a/src/calibre/utils/network.py
+++ b/src/calibre/utils/network.py
@@ -27,20 +27,20 @@ class LinuxNetworkStatus:
         #
         # There is no difference in terms of “features” provided between
         # the two APIs from our point of view.
-        self.xdp_call = lambda : new_method_call(DBusAddress(
+        self.xdp_call = lambda: new_method_call(DBusAddress(
             '/org/freedesktop/portal/desktop',
             bus_name='org.freedesktop.portal.Desktop',
-            interface="org.freedesktop.portal.NetworkMonitor"), 'GetConnectivity')
-        self.nm_call = lambda : Properties(DBusAddress('/org/freedesktop/NetworkManager',
+            interface='org.freedesktop.portal.NetworkMonitor'), 'GetConnectivity')
+        self.nm_call = lambda: Properties(DBusAddress('/org/freedesktop/NetworkManager',
                 bus_name='org.freedesktop.NetworkManager',
-                interface="org.freedesktop.NetworkManager")).get('Connectivity')
+                interface='org.freedesktop.NetworkManager')).get('Connectivity')
 
         if self.xdp() is not None:
             self.get_connectivity = self.xdp
         elif self.nm() is not None:
             self.get_connectivity = self.nm
         else:
-            self.get_connectivity = lambda : 4
+            self.get_connectivity = lambda: 4
 
     def connect(self, which='SESSION'):
         from jeepney.io.blocking import open_dbus_connection
@@ -109,6 +109,7 @@ def internet_connected():
 
     return internet_connected.checker()
 
+
 def is_ipv6_addr(addr):
     import socket
     try:
diff --git a/src/calibre/utils/open_with/linux.py b/src/calibre/utils/open_with/linux.py
index 3edb4fbc64..19abfabf0a 100644
--- a/src/calibre/utils/open_with/linux.py
+++ b/src/calibre/utils/open_with/linux.py
@@ -228,7 +228,7 @@ def find_programs(extensions):
             continue
         if data is not None and mime_types.intersection(data['MimeType']):
             ans.append(process_desktop_file(data))
-    ans.sort(key=lambda d:sort_key(d.get('Name')))
+    ans.sort(key=lambda d: sort_key(d.get('Name')))
     return ans
 
 
diff --git a/src/calibre/utils/open_with/osx.py b/src/calibre/utils/open_with/osx.py
index 5adae681d8..1e56705a70 100644
--- a/src/calibre/utils/open_with/osx.py
+++ b/src/calibre/utils/open_with/osx.py
@@ -17,8 +17,8 @@ from polyglot.builtins import iteritems, string_or_bytes
 
 application_locations = ('/Applications', '~/Applications', '~/Desktop')
 
-# Public UTI MAP {{{
 
+# Public UTI MAP {{{
 
 def generate_public_uti_map():
     from html5_parser import parse
diff --git a/src/calibre/utils/opensearch/description.py b/src/calibre/utils/opensearch/description.py
index f1bada0926..fa2b1ebd53 100644
--- a/src/calibre/utils/opensearch/description.py
+++ b/src/calibre/utils/opensearch/description.py
@@ -17,7 +17,7 @@ class Description:
     A class for representing OpenSearch Description files.
     '''
 
-    def __init__(self, url=""):
+    def __init__(self, url=''):
         '''
         The constructor which may pass an optional url to load from.
 
diff --git a/src/calibre/utils/opensearch/query.py b/src/calibre/utils/opensearch/query.py
index 94d5cb77bf..0622f2b8fe 100644
--- a/src/calibre/utils/opensearch/query.py
+++ b/src/calibre/utils/opensearch/query.py
@@ -56,7 +56,7 @@ class Query:
                 query_string[name] = [getattr(self, macro)]
             else:
                 # remove the name/value pair
-                del(query_string[name])
+                del query_string[name]
 
         # copy the url parts and substitute in our new query string
         url_parts = list(self.url_parts)
diff --git a/src/calibre/utils/ordered_dict.py b/src/calibre/utils/ordered_dict.py
index d11fc6cda0..00bf5e2d9d 100644
--- a/src/calibre/utils/ordered_dict.py
+++ b/src/calibre/utils/ordered_dict.py
@@ -9,4 +9,3 @@ __docformat__ = 'restructuredtext en'
 from collections import OrderedDict
 
 OrderedDict
-
diff --git a/src/calibre/utils/podofo/__init__.py b/src/calibre/utils/podofo/__init__.py
index 68c84180fa..33de681772 100644
--- a/src/calibre/utils/podofo/__init__.py
+++ b/src/calibre/utils/podofo/__init__.py
@@ -217,7 +217,7 @@ def test_podofo():
     from calibre.ebooks.metadata.book.base import Metadata
     from calibre.ebooks.metadata.xmp import metadata_to_xmp_packet
     # {{{
-    raw = b"%PDF-1.1\n%\xe2\xe3\xcf\xd3\n1 0 obj<</Type/Catalog/Metadata 6 0 R/Pages 2 0 R>>\nendobj\n2 0 obj<</Type/Pages/Count 1/Kids[ 3 0 R]/MediaBox[ 0 0 300 144]>>\nendobj\n3 0 obj<</Type/Page/Contents 4 0 R/Parent 2 0 R/Resources<</Font<</F1<</Type/Font/BaseFont/Times-Roman/Subtype/Type1>>>>>>>>\nendobj\n4 0 obj<</Length 55>>\nstream\n  BT\n    /F1 18 Tf\n    0 0 Td\n    (Hello World) Tj\n  ET\nendstream\nendobj\n5 0 obj<</Author(\xfe\xff\x00U\x00n\x00k\x00n\x00o\x00w\x00n)/CreationDate(D:20140919134038+05'00')/Producer(PoDoFo - http://podofo.sf.net)/Title(\xfe\xff\x00n\x00e\x00w\x00t)>>\nendobj\n6 0 obj<</Type/Metadata/Filter/FlateDecode/Length 584/Subtype/XML>>\nstream\nx\x9c\xed\x98\xcd\xb2\x930\x14\xc7\xf7}\n&.\x1d\x1ahoGa\x80\x8e\xb6\xe3x\x17ua\xaf\xe3\xd2\t\xc9i\x1b\x0b\x81&a\xc0\xfbj.|$_\xc1\xd0r\xe9\xb7V\x9d\xbb\x83\x15\x9c\x9c\xff\xff\x97\x8fs\xb2 \x18W9\xa1k\xd0V\x0cK.B\xf4\xf3\xfb\x0fdq\x16\xa2\xcf\xa3\x993\xcb'\xb0\xe2\xef\x1f%\xcc\x1f?<\xd0\xc75\xf5\x18\x1aG\xbd\xa0\xf2\xab4OA\x13\xabJ\x13\xa1\xfc*D\x84e1\xf8\xe6\xbd\x0ec\x14\xf5,+\x90l\xe1\x7f\x9c\xbek\x92\xccW\x88VZ\xe7>\xc6eY\xf6\xcba?\x93K\xecz\x9e\x87\x9d\x01\x1e\x0cl\x93a\xaboB\x93\xca\x16\xea\xc5\xd6\xa3q\x99\x82\xa2\x92\xe7\x9ag\xa2qc\xb45\xcb\x0b\x99l\xad\x18\xc5\x90@\nB+\xec\xf6]\x8c\xacZK\xe2\xac\xd0!j\xec\x8c!\xa3>\xdb\xfb=\x85\x1b\xd2\x9bD\xef#M,\xe15\xd4O\x88X\x86\xa8\xb2\x19,H\x91h\x14\x05x7z`\x81O<\x02|\x99VOBs\x9d\xc0\x7f\xe0\x05\x94\xfa\xd6)\x1c\xb1jx^\xc4\tW+\x90'\x13xK\x96\xf8Hy\x96X\xabU\x11\x7f\x05\xaa\xff\xa4=I\xab\x95T\x02\xd1\xd9)u\x0e\x9b\x0b\xcb\x8e>\x89\xb5\xc8Jqm\x91\x07\xaa-\xee\xc8{\x972=\xdd\xfa+\xe5d\xea\xb9\xad'\xa1\xfa\xdbj\xee\xd3,\xc5\x15\xc9M-9\xa6\x96\xdaD\xce6Wr\xd3\x1c\xdf3S~|\xc1A\xe2MA\x92F{\xb1\x0eM\xba?3\xdd\xc2\x88&S\xa2!\x1a8\xee\x9d\xedx\xb6\xeb=\xb8C\xff\xce\xf1\x87\xaf\xfb\xde\xe0\xd5\xc8\xf3^:#\x7f\xe8\x04\xf8L\xf2\x0fK\xcd%W\xe9\xbey\xea/\xa5\x89`D\xb2m\x17\t\x92\x822\xb7\x02(\x1c\x13\xc5)\x1e\x9c-\x01\xff\x1e\xc0\x16\xd5\xe5\r\xaaG\xcc\x8e\x0c\xff\xca\x8e\x92\x84\xc7\x12&\x93\xd6\xb3\x89\xd8\x10g\xd9\xfai\xe7\xedv\xde6-\x94\xceR\x9bfI\x91\n\x85\x8e}nu9\x91\xcd\xefo\xc6+\x90\x1c\x94\xcd\x05\x83\xea\xca\xd17\x16\xbb\xb6\xfc\xa22\xa9\x9bn\xbe0p\xfd\x88wAs\xc3\x9a+\x19\xb7w\xf2a#=\xdf\xd3A:H\x07\xe9 \x1d\xa4\x83t\x90\x0e\xd2A:H\x07yNH/h\x7f\xd6\x80`!*\xd18\xfa\x05\x94\x80P\xb0\nendstream\nendobj\nxref\n0 7\n0000000000 65535 f \n0000000015 00000 n \n0000000074 00000 n \n0000000148 00000 n \n0000000280 00000 n \n0000000382 00000 n \n0000000522 00000 n \ntrailer\n<</ID[<4D028D512DEBEFD964756764AD8FF726><4D028D512DEBEFD964756764AD8FF726>]/Info 5 0 R/Root 1 0 R/Size 7>>\nstartxref\n1199\n%%EOF\n"  # noqa
+    raw = b"%PDF-1.1\n%\xe2\xe3\xcf\xd3\n1 0 obj<</Type/Catalog/Metadata 6 0 R/Pages 2 0 R>>\nendobj\n2 0 obj<</Type/Pages/Count 1/Kids[ 3 0 R]/MediaBox[ 0 0 300 144]>>\nendobj\n3 0 obj<</Type/Page/Contents 4 0 R/Parent 2 0 R/Resources<</Font<</F1<</Type/Font/BaseFont/Times-Roman/Subtype/Type1>>>>>>>>\nendobj\n4 0 obj<</Length 55>>\nstream\n  BT\n    /F1 18 Tf\n    0 0 Td\n    (Hello World) Tj\n  ET\nendstream\nendobj\n5 0 obj<</Author(\xfe\xff\x00U\x00n\x00k\x00n\x00o\x00w\x00n)/CreationDate(D:20140919134038+05'00')/Producer(PoDoFo - http://podofo.sf.net)/Title(\xfe\xff\x00n\x00e\x00w\x00t)>>\nendobj\n6 0 obj<</Type/Metadata/Filter/FlateDecode/Length 584/Subtype/XML>>\nstream\nx\x9c\xed\x98\xcd\xb2\x930\x14\xc7\xf7}\n&.\x1d\x1ahoGa\x80\x8e\xb6\xe3x\x17ua\xaf\xe3\xd2\t\xc9i\x1b\x0b\x81&a\xc0\xfbj.|$_\xc1\xd0r\xe9\xb7V\x9d\xbb\x83\x15\x9c\x9c\xff\xff\x97\x8fs\xb2 \x18W9\xa1k\xd0V\x0cK.B\xf4\xf3\xfb\x0fdq\x16\xa2\xcf\xa3\x993\xcb'\xb0\xe2\xef\x1f%\xcc\x1f?<\xd0\xc75\xf5\x18\x1aG\xbd\xa0\xf2\xab4OA\x13\xabJ\x13\xa1\xfc*D\x84e1\xf8\xe6\xbd\x0ec\x14\xf5,+\x90l\xe1\x7f\x9c\xbek\x92\xccW\x88VZ\xe7>\xc6eY\xf6\xcba?\x93K\xecz\x9e\x87\x9d\x01\x1e\x0cl\x93a\xaboB\x93\xca\x16\xea\xc5\xd6\xa3q\x99\x82\xa2\x92\xe7\x9ag\xa2qc\xb45\xcb\x0b\x99l\xad\x18\xc5\x90@\nB+\xec\xf6]\x8c\xacZK\xe2\xac\xd0!j\xec\x8c!\xa3>\xdb\xfb=\x85\x1b\xd2\x9bD\xef#M,\xe15\xd4O\x88X\x86\xa8\xb2\x19,H\x91h\x14\x05x7z`\x81O<\x02|\x99VOBs\x9d\xc0\x7f\xe0\x05\x94\xfa\xd6)\x1c\xb1jx^\xc4\tW+\x90'\x13xK\x96\xf8Hy\x96X\xabU\x11\x7f\x05\xaa\xff\xa4=I\xab\x95T\x02\xd1\xd9)u\x0e\x9b\x0b\xcb\x8e>\x89\xb5\xc8Jqm\x91\x07\xaa-\xee\xc8{\x972=\xdd\xfa+\xe5d\xea\xb9\xad'\xa1\xfa\xdbj\xee\xd3,\xc5\x15\xc9M-9\xa6\x96\xdaD\xce6Wr\xd3\x1c\xdf3S~|\xc1A\xe2MA\x92F{\xb1\x0eM\xba?3\xdd\xc2\x88&S\xa2!\x1a8\xee\x9d\xedx\xb6\xeb=\xb8C\xff\xce\xf1\x87\xaf\xfb\xde\xe0\xd5\xc8\xf3^:#\x7f\xe8\x04\xf8L\xf2\x0fK\xcd%W\xe9\xbey\xea/\xa5\x89`D\xb2m\x17\t\x92\x822\xb7\x02(\x1c\x13\xc5)\x1e\x9c-\x01\xff\x1e\xc0\x16\xd5\xe5\r\xaaG\xcc\x8e\x0c\xff\xca\x8e\x92\x84\xc7\x12&\x93\xd6\xb3\x89\xd8\x10g\xd9\xfai\xe7\xedv\xde6-\x94\xceR\x9bfI\x91\n\x85\x8e}nu9\x91\xcd\xefo\xc6+\x90\x1c\x94\xcd\x05\x83\xea\xca\xd17\x16\xbb\xb6\xfc\xa22\xa9\x9bn\xbe0p\xfd\x88wAs\xc3\x9a+\x19\xb7w\xf2a#=\xdf\xd3A:H\x07\xe9 \x1d\xa4\x83t\x90\x0e\xd2A:H\x07yNH/h\x7f\xd6\x80`!*\xd18\xfa\x05\x94\x80P\xb0\nendstream\nendobj\nxref\n0 7\n0000000000 65535 f \n0000000015 00000 n \n0000000074 00000 n \n0000000148 00000 n \n0000000280 00000 n \n0000000382 00000 n \n0000000522 00000 n \ntrailer\n<</ID[<4D028D512DEBEFD964756764AD8FF726><4D028D512DEBEFD964756764AD8FF726>]/Info 5 0 R/Root 1 0 R/Size 7>>\nstartxref\n1199\n%%EOF\n"  # noqa: E501
     # }}}
     mi = Metadata('title1', ['xmp_author'])
     podofo = get_podofo()
@@ -238,7 +238,7 @@ def test_podofo():
         fraw = f.read()
         wraw = p.write()
         if fraw != wraw:
-            raise ValueError("write() and save_to_fileobj() resulted in different output")
+            raise ValueError('write() and save_to_fileobj() resulted in different output')
     try:
         p = podofo.PDFDoc()
         p.open(f.name)
@@ -267,6 +267,5 @@ def develop(path=sys.argv[-1]):
     p.title = 'test'
 
 
-
 if __name__ == '__main__':
     develop()
diff --git a/src/calibre/utils/rapydscript.py b/src/calibre/utils/rapydscript.py
index c46f582410..223423eee2 100644
--- a/src/calibre/utils/rapydscript.py
+++ b/src/calibre/utils/rapydscript.py
@@ -32,8 +32,8 @@ COMPILER_PATH = 'rapydscript/compiler.js.xz'
 def abspath(x):
     return os.path.realpath(os.path.abspath(x))
 
-# Update RapydScript {{{
 
+# Update RapydScript {{{
 
 def update_rapydscript():
     import lzma
@@ -49,8 +49,8 @@ def update_rapydscript():
         f.write(raw)
 # }}}
 
-# Compiler {{{
 
+# Compiler {{{
 
 def to_dict(obj):
     return dict(zip(list(obj.keys()), list(obj.values())))
@@ -394,7 +394,7 @@ def run_rapydscript_tests():
             if fail_code is None:
                 fail_code = QWebEngineUrlRequestJob.Error.UrlNotFound
             rq.fail(fail_code)
-            print(f"Blocking FAKE_PROTOCOL request: {rq.requestUrl().toString()}", file=sys.stderr)
+            print(f'Blocking FAKE_PROTOCOL request: {rq.requestUrl().toString()}', file=sys.stderr)
 
     class Tester(QWebEnginePage):
 
@@ -508,8 +508,8 @@ def compile_srv():
 
 # }}}
 
-# Translations {{{
 
+# Translations {{{
 
 def create_pot(source_files):
     c = compiler()
diff --git a/src/calibre/utils/run_tests.py b/src/calibre/utils/run_tests.py
index 4fdde74e0c..e9de38617e 100644
--- a/src/calibre/utils/run_tests.py
+++ b/src/calibre/utils/run_tests.py
@@ -65,7 +65,7 @@ def find_tests_in_package(package, excludes=('main.py',)):
     excludes = set(excludes) | {x + 'c' for x in excludes}
     seen = set()
     for x in items:
-        if (x.endswith('.py') or x.endswith('.pyc')) and x not in excludes:
+        if (x.endswith(('.py', '.pyc'))) and x not in excludes:
             q = x.rpartition('.')[0]
             if q in seen:
                 continue
@@ -324,7 +324,7 @@ def run_test(test_name, verbosity=4, buffer=False):
     # calibre-debug -t test_name
     which_tests = None
     if test_name.startswith('@'):
-        which_tests = test_name[1:],
+        which_tests = test_name[1:], None
     tests = find_tests(which_tests)
     if test_name != 'all':
         if test_name.startswith('.'):
diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py
index e7b47940aa..22d013a750 100644
--- a/src/calibre/utils/search_query_parser.py
+++ b/src/calibre/utils/search_query_parser.py
@@ -47,7 +47,7 @@ class SavedSearchQueries:
             self.queries = db.pref(self.opt_name, {})
         else:
             self.queries = {}
-            self._db = lambda : None
+            self._db = lambda: None
 
     @property
     def db(self):
@@ -158,11 +158,11 @@ class Parser:
 
     # Had to translate named constants to numeric values
     lex_scanner = re.Scanner([
-            (r'[()]', lambda x,t: (Parser.OPCODE, t)),
-            (r'@.+?:[^")\s]+', lambda x,t: (Parser.WORD, str(t))),
-            (r'[^"()\s]+', lambda x,t: (Parser.WORD, str(t))),
+            (r'[()]',           lambda x,t: (Parser.OPCODE, t)),
+            (r'@.+?:[^")\s]+',  lambda x,t: (Parser.WORD, str(t))),
+            (r'[^"()\s]+',      lambda x,t: (Parser.WORD, str(t))),
             (r'".*?((?<!\\)")', lambda x,t: (Parser.QUOTED_WORD, t[1:-1])),
-            (r'\s+',              None)
+            (r'\s+',            None)
     ], flags=re.DOTALL)
 
     def token(self, advance=False):
@@ -195,7 +195,7 @@ class Parser:
     def tokenize(self, expr):
         # convert docstrings to base64 to avoid all processing. Change the docstring
         # indicator to something unique with no characters special to the parser.
-        expr = re.sub('(""")(..*?)(""")',
+        expr = re.sub(r'(""")(..*?)(""")',
                   lambda mo: self.docstring_sep + as_hex_unicode(mo.group(2)) + self.docstring_sep,
                   expr, flags=re.DOTALL)
 
@@ -294,7 +294,7 @@ class ParseException(Exception):
     def msg(self):
         if len(self.args) > 0:
             return self.args[0]
-        return ""
+        return ''
 
 
 class SearchQueryParser:
@@ -424,8 +424,8 @@ class SearchQueryParser:
         #  return self.universal_set().difference(self.evaluate(argument[0]))
         return candidates.difference(self.evaluate(argument[0], candidates))
 
-#     def evaluate_parenthesis(self, argument, candidates):
-#         return self.evaluate(argument[0], candidates)
+    # def evaluate_parenthesis(self, argument, candidates):
+    #     return self.evaluate(argument[0], candidates)
 
     def _check_saved_search_recursion(self, query):
         if query.startswith('='):
@@ -435,7 +435,7 @@ class SearchQueryParser:
             raise ParseException(_('Recursive saved search: {0}').format(query))
         self.searches_seen.add(search_name_lower)
         query = self._get_saved_search_text(query)
-        return (query, search_name_lower)
+        return query, search_name_lower
 
     def _get_saved_search_text(self, query):
         try:
diff --git a/src/calibre/utils/search_query_parser_test.py b/src/calibre/utils/search_query_parser_test.py
index 91e515416b..b1b396545a 100644
--- a/src/calibre/utils/search_query_parser_test.py
+++ b/src/calibre/utils/search_query_parser_test.py
@@ -227,7 +227,7 @@ class Tester(SearchQueryParser):
        'London : Jonathan Cape, 2005.',
        'lrf,txt'],
  259: ['My name is Red',
-       'Orhan Pamuk; translated from the Turkish by Erda\u011f G\xf6knar',
+       'Orhan Pamuk; translated from the Turkish by Erdağ G\xf6knar',
        'New York : Alfred A. Knopf, 2001.',
        'lit,lrf'],
  265: ['Harbinger', 'David Mack', 'Star Trek', 'lit,lrf'],
@@ -300,28 +300,28 @@ class Tester(SearchQueryParser):
  }
 
     tests = {
-             'Dysfunction' : {348},
-             'title:Dysfunction' : {348},
-             'Title:Dysfunction' : {348},
-             'title:Dysfunction OR author:Laurie': {348, 444},
-             '(tag:txt or tag:pdf)': {33, 258, 354, 305, 242, 51, 55, 56, 154},
-             '(tag:txt OR tag:pdf) and author:Tolstoy': {55, 56},
-             'Tolstoy txt': {55, 56},
-             'Hamilton Amsterdam' : set(),
-             'Beär' : {91},
-             'dysfunc or tolstoy': {348, 55, 56},
-             'tag:txt AND NOT tolstoy': {33, 258, 354, 305, 242, 154},
-             'not tag:lrf' : {305},
-             'london:thames': {13},
-             'publisher:london:thames': {13},
-             '"(1977)"': {13},
-             'jack weatherford orc': {30},
-             'S\\"calzi': {343},
-             'author:S\\"calzi': {343},
-             '"S\\"calzi"': {343},
-             'M\\\\cMurtry': {427},
-             'author:Tolstoy (tag:txt OR tag:pdf)': {55, 56},
-             }
+            'Dysfunction': {348},
+            'title:Dysfunction': {348},
+            'Title:Dysfunction': {348},
+            'title:Dysfunction OR author:Laurie': {348, 444},
+            '(tag:txt or tag:pdf)': {33, 258, 354, 305, 242, 51, 55, 56, 154},
+            '(tag:txt OR tag:pdf) and author:Tolstoy': {55, 56},
+            'Tolstoy txt': {55, 56},
+            'Hamilton Amsterdam': set(),
+            'Beär': {91},
+            'dysfunc or tolstoy': {348, 55, 56},
+            'tag:txt AND NOT tolstoy': {33, 258, 354, 305, 242, 154},
+            'not tag:lrf': {305},
+            'london:thames': {13},
+            'publisher:london:thames': {13},
+            '"(1977)"': {13},
+            'jack weatherford orc': {30},
+            'S\\"calzi': {343},
+            'author:S\\"calzi': {343},
+            '"S\\"calzi"': {343},
+            'M\\\\cMurtry': {427},
+            'author:Tolstoy (tag:txt OR tag:pdf)': {55, 56},
+    }
     fields = {'title':0, 'author':1, 'publisher':2, 'tag':3}
 
     _universal_set = set(texts.keys())
@@ -346,10 +346,10 @@ class Tester(SearchQueryParser):
         if candidates:
             return {key for key, val in self.texts.items()
                 if key in candidates and query and query
-                        in getattr(getter(val), 'lower', lambda : '')()}
+                        in getattr(getter(val), 'lower', lambda: '')()}
         else:
             return {key for key, val in self.texts.items()
-                if query and query in getattr(getter(val), 'lower', lambda : '')()}
+                if query and query in getattr(getter(val), 'lower', lambda: '')()}
 
     def run_tests(self, ae):
         for query in self.tests.keys():
@@ -391,7 +391,7 @@ class TestSQP(unittest.TestCase):
         # docstring tests
         t(r'"""a\1b"""', 'W', r'a\1b')
         t(r'("""a\1b""" AND """c""" OR d)',
-          'O', '(', 'W', r'a\1b', 'W', 'AND', 'W', 'c',  'W', 'OR', 'W', 'd', 'O', ')')
+          'O', '(', 'W', r'a\1b', 'W', 'AND', 'W', 'c', 'W', 'OR', 'W', 'd', 'O', ')')
         t(r'template:="""a\1b"""', 'W', r'template:=a\1b')
         t('template:="""a\nb"""', 'W', 'template:=a\nb')
         t(r'template:"""=a\1b"""', 'W', r'template:=a\1b')
diff --git a/src/calibre/utils/seven_zip.py b/src/calibre/utils/seven_zip.py
index 29263daf3f..4fe0d0b747 100644
--- a/src/calibre/utils/seven_zip.py
+++ b/src/calibre/utils/seven_zip.py
@@ -32,7 +32,7 @@ def extract_member(path_or_stream, match=None, name=None):
     with open_archive(path_or_stream) as ar:
         all_names = list(filter(is_match, ar.getnames()))
         if all_names:
-            return all_names[0] , ar.read(all_names[:1])[all_names[0]].read()
+            return all_names[0], ar.read(all_names[:1])[all_names[0]].read()
 
 
 def extract_cover_image(stream):
@@ -52,7 +52,6 @@ def extract(path_or_stream, location):
 
 # Test {{{
 
-
 def test_basic():
     from tempfile import TemporaryDirectory
 
diff --git a/src/calibre/utils/shared_file.py b/src/calibre/utils/shared_file.py
index ea60f3c073..b3a2e0b015 100644
--- a/src/calibre/utils/shared_file.py
+++ b/src/calibre/utils/shared_file.py
@@ -35,9 +35,9 @@ if iswindows:
 
     _ACCESS_MASK = os.O_RDONLY | os.O_WRONLY | os.O_RDWR
     _ACCESS_MAP  = {
-        os.O_RDONLY : winutil.GENERIC_READ,
-        os.O_WRONLY : winutil.GENERIC_WRITE,
-        os.O_RDWR   : winutil.GENERIC_READ | winutil.GENERIC_WRITE
+        os.O_RDONLY: winutil.GENERIC_READ,
+        os.O_WRONLY: winutil.GENERIC_WRITE,
+        os.O_RDWR  : winutil.GENERIC_READ | winutil.GENERIC_WRITE
     }
 
     _CREATE_MASK = os.O_CREAT | os.O_EXCL | os.O_TRUNC
diff --git a/src/calibre/utils/shm.py b/src/calibre/utils/shm.py
index c7a64adb42..c2fafa44dc 100644
--- a/src/calibre/utils/shm.py
+++ b/src/calibre/utils/shm.py
@@ -19,7 +19,7 @@ else:
 
 
 def make_filename(prefix: str) -> str:
-    "Create a random filename for the shared memory object."
+    'Create a random filename for the shared memory object.'
     # number of random bytes to use for name. Use a largeish value
     # to make double unlink safe.
     if not iswindows and not prefix.startswith('/'):
@@ -202,8 +202,8 @@ class SharedMemory:
         return f'{self.__class__.__name__}({self.name!r}, size={self.size})'
 
     def close(self) -> None:
-        """Closes access to the shared memory from this instance but does
-        not destroy the shared memory block."""
+        '''Closes access to the shared memory from this instance but does
+        not destroy the shared memory block.'''
         if self._mmap is not None:
             self._mmap.close()
             self._mmap = None
@@ -213,11 +213,11 @@ class SharedMemory:
         self.unlink()
 
     def unlink(self) -> None:
-        """Requests that the underlying shared memory block be destroyed.
+        '''Requests that the underlying shared memory block be destroyed.
 
         In order to ensure proper cleanup of resources, unlink should be
         called once (and only once) across all processes which have access
-        to the shared memory block."""
+        to the shared memory block.'''
         if self._name:
             if not iswindows:
                 try:
diff --git a/src/calibre/utils/smartypants.py b/src/calibre/utils/smartypants.py
index a00a615122..cf943d2cf9 100644
--- a/src/calibre/utils/smartypants.py
+++ b/src/calibre/utils/smartypants.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
 
-__author__ = "Chad Miller <smartypantspy@chad.org>, Kovid Goyal <kovid at kovidgoyal.net>"
-__description__ = "Smart-quotes, smart-ellipses, and smart-dashes for weblog entries in pyblosxom"
+__author__ = 'Chad Miller <smartypantspy@chad.org>, Kovid Goyal <kovid at kovidgoyal.net>'
+__description__ = 'Smart-quotes, smart-ellipses, and smart-dashes for weblog entries in pyblosxom'
 
-r"""
+r'''
 ==============
 smartypants.py
 ==============
@@ -374,12 +374,12 @@ smartypants.py license::
 .. _SmartyPants: https://daringfireball.net/projects/smartypants/
 .. _Movable Type: http://www.movabletype.org/
 
-"""
+'''
 
 import re
 
 # style added by Kovid
-tags_to_skip_regex = re.compile(r"<(/)?(style|pre|code|kbd|script|math)[^>]*>", re.I)
+tags_to_skip_regex = re.compile(r'<(/)?(style|pre|code|kbd|script|math)[^>]*>', re.I)
 self_closing_regex = re.compile(r'/\s*>$')
 
 
@@ -388,41 +388,41 @@ self_closing_regex = re.compile(r'/\s*>$')
 def parse_attr(attr):
     do_dashes = do_backticks = do_quotes = do_ellipses = do_stupefy = 0
 
-    if attr == "1":
+    if attr == '1':
         do_quotes    = 1
         do_backticks = 1
         do_dashes    = 1
         do_ellipses  = 1
-    elif attr == "2":
+    elif attr == '2':
         # Do everything, turn all options on, use old school dash shorthand.
         do_quotes    = 1
         do_backticks = 1
         do_dashes    = 2
         do_ellipses  = 1
-    elif attr == "3":
+    elif attr == '3':
         # Do everything, turn all options on, use inverted old school dash shorthand.
         do_quotes    = 1
         do_backticks = 1
         do_dashes    = 3
         do_ellipses  = 1
-    elif attr == "-1":
+    elif attr == '-1':
         # Special "stupefy" mode.
         do_stupefy   = 1
     else:
         for c in attr:
-            if c == "q":
+            if c == 'q':
                 do_quotes = 1
-            elif c == "b":
+            elif c == 'b':
                 do_backticks = 1
-            elif c == "B":
+            elif c == 'B':
                 do_backticks = 2
-            elif c == "d":
+            elif c == 'd':
                 do_dashes = 1
-            elif c == "D":
+            elif c == 'D':
                 do_dashes = 2
-            elif c == "i":
+            elif c == 'i':
                 do_dashes = 3
-            elif c == "e":
+            elif c == 'e':
                 do_ellipses = 1
             else:
                 pass
@@ -445,7 +445,7 @@ def smartyPants(text, attr='1'):
     # i : inverted old school dashes
     # e : ellipses
 
-    if attr == "0":
+    if attr == '0':
         # Do nothing.
         return text
 
@@ -459,7 +459,7 @@ def smartyPants(text, attr='1'):
     result = []
     in_pre = False
 
-    prev_token_last_char = ""
+    prev_token_last_char = ''
     # This is a cheat, used to get some context
     # for one-character tokens that consist of
     # just a quote char. What we do is remember
@@ -468,7 +468,7 @@ def smartyPants(text, attr='1'):
     # character quote tokens correctly.
 
     for cur_token in tokens:
-        if cur_token[0] == "tag":
+        if cur_token[0] == 'tag':
             # Don't mess with quotes inside some tags.  This does not handle self <closing/> tags!
             result.append(cur_token[1])
             skip_match = tags_to_skip_regex.match(cur_token[1])
@@ -502,16 +502,16 @@ def smartyPants(text, attr='1'):
                 if do_quotes != 0:
                     if t == "'":
                         # Special case: single-character ' token
-                        if re.match(r"\S", prev_token_last_char):
-                            t = "&#8217;"
+                        if re.match(r'\S', prev_token_last_char):
+                            t = '&#8217;'
                         else:
-                            t = "&#8216;"
+                            t = '&#8216;'
                     elif t == '"':
                         # Special case: single-character " token
-                        if re.match(r"\S", prev_token_last_char):
-                            t = "&#8221;"
+                        if re.match(r'\S', prev_token_last_char):
+                            t = '&#8221;'
                         else:
-                            t = "&#8220;"
+                            t = '&#8220;'
 
                     else:
                         # Normal case:
@@ -522,49 +522,49 @@ def smartyPants(text, attr='1'):
             prev_token_last_char = last_char
             result.append(t)
 
-    return "".join(result)
+    return ''.join(result)
 
 
 def educateQuotes(text):
-    """
+    '''
     Parameter:  String.
 
     Returns:    The string, with "educated" curly quote HTML entities.
 
     Example input:  "Isn't this fun?"
     Example output: &#8220;Isn&#8217;t this fun?&#8221;
-    """
+    '''
 
-    punct_class = r"""[!"#\$\%'()*+,-.\/:;<=>?\@\[\\\]\^_`{|}~]"""
+    punct_class = r'''[!"#\$\%'()*+,-.\/:;<=>?\@\[\\\]\^_`{|}~]'''
 
     # Special case if the very first character is a quote
     # followed by punctuation at a non-word-break. Close the quotes by brute force:
-    text = re.sub(fr"""^'(?={punct_class}\\B)""", r"""&#8217;""", text)
-    text = re.sub(fr"""^"(?={punct_class}\\B)""", r"""&#8221;""", text)
+    text = re.sub(fr'''^'(?={punct_class}\\B)''', r'''&#8217;''', text)
+    text = re.sub(fr'''^"(?={punct_class}\\B)''', r'''&#8221;''', text)
 
     # Special case for double sets of quotes, e.g.:
     #   <p>He said, "'Quoted' words in a larger quote."</p>
-    text = re.sub(r""""'(?=\w)""", """&#8220;&#8216;""", text)
-    text = re.sub(r"""'"(?=\w)""", """&#8216;&#8220;""", text)
-    text = re.sub(r'''""(?=\w)''', """&#8220;&#8220;""", text)
-    text = re.sub(r"""''(?=\w)""", """&#8216;&#8216;""", text)
-    text = re.sub(r'''\"\'''',     """&#8221;&#8217;""", text)
-    text = re.sub(r'''\'\"''',     """&#8217;&#8221;""", text)
-    text = re.sub(r'''""''',       """&#8221;&#8221;""", text)
-    text = re.sub(r"""''""",       """&#8217;&#8217;""", text)
+    text = re.sub(r'''"'(?=\w)''', '''&#8220;&#8216;''', text)
+    text = re.sub(r''''"(?=\w)''', '''&#8216;&#8220;''', text)
+    text = re.sub(r'''""(?=\w)''', '''&#8220;&#8220;''', text)
+    text = re.sub(r'''''(?=\w)''', '''&#8216;&#8216;''', text)
+    text = re.sub(r'''\"\'''',     '''&#8221;&#8217;''', text)
+    text = re.sub(r'''\'\"''',     '''&#8217;&#8221;''', text)
+    text = re.sub(r'''""''',       '''&#8221;&#8221;''', text)
+    text = re.sub(r"""''""",       '''&#8217;&#8217;''', text)
 
     # Special case for decade abbreviations (the '80s --> ’80s):
     # See http://practicaltypography.com/apostrophes.html
-    text = re.sub(r"""(\W|^)'(?=\d{2}s)""", r"""\1&#8217;""", text)
+    text = re.sub(r'''(\W|^)'(?=\d{2}s)''', r'''\1&#8217;''', text)
     # Measurements in feet and inches or longitude/latitude: 19' 43.5" --> 19′ 43.5″
     text = re.sub(r'''(\W|^)([-0-9.]+\s*)'(\s*[-0-9.]+)"''', r'\1\2&#8242;\3&#8243;', text)
 
     # Special case for Quotes at inside of other entities, e.g.:
     #   <p>A double quote--"within dashes"--would be nice.</p>
-    text = re.sub(r"""(?<=\W)"(?=\w)""", r"""&#8220;""", text)
-    text = re.sub(r"""(?<=\W)'(?=\w)""", r"""&#8216;""", text)
-    text = re.sub(r"""(?<=\w)"(?=\W)""", r"""&#8221;""", text)
-    text = re.sub(r"""(?<=\w)'(?=\W)""", r"""&#8217;""", text)
+    text = re.sub(r'''(?<=\W)"(?=\w)''', r'''&#8220;''', text)
+    text = re.sub(r'''(?<=\W)'(?=\w)''', r'''&#8216;''', text)
+    text = re.sub(r'''(?<=\w)"(?=\W)''', r'''&#8221;''', text)
+    text = re.sub(r'''(?<=\w)'(?=\W)''', r'''&#8217;''', text)
 
     # The following are commented out as smartypants tokenizes text by
     # stripping out html tags. Therefore, there is no guarantee that the
@@ -572,18 +572,18 @@ def educateQuotes(text):
     # meaningful
 
     # Special case for Quotes at end of line with a preceding space (may change just to end of line)
-    # text = re.sub(r"""(?<=\s)"$""", r"""&#8221;""", text)
-    # text = re.sub(r"""(?<=\s)'$""", r"""&#8217;""", text)
+    # text = re.sub(r'''(?<=\s)"$''', r'''&#8221;''', text)
+    # text = re.sub(r'''(?<=\s)'$''', r'''&#8217;''', text)
 
     # Special case for Quotes at beginning of line with a space - multiparagraph quoted text:
-    # text = re.sub(r"""^"(?=\s)""", r"""&#8220;""", text)
-    # text = re.sub(r"""^'(?=\s)""", r"""&#8216;""", text)
+    # text = re.sub(r'''^"(?=\s)''', r'''&#8220;''', text)
+    # text = re.sub(r'''^'(?=\s)''', r'''&#8216;''', text)
 
-    close_class = r"""[^\ \t\r\n\[\{\(\-]"""
-    dec_dashes = r"""&#8211;|&#8212;"""
+    close_class = r'''[^\ \t\r\n\[\{\(\-]'''
+    dec_dashes = r'''&#8211;|&#8212;'''
 
     # Get most opening single quotes:
-    opening_single_quotes_regex = re.compile(r"""
+    opening_single_quotes_regex = re.compile(r'''
             (
                 \s          |   # a whitespace char, or
                 &nbsp;      |   # a non-breaking space entity, or
@@ -594,28 +594,28 @@ def educateQuotes(text):
             )
             '                 # the quote
             (?=\w)            # followed by a word character
-            """.format(dec_dashes), re.VERBOSE)
-    text = opening_single_quotes_regex.sub(r"""\1&#8216;""", text)
+            '''.format(dec_dashes), re.VERBOSE)
+    text = opening_single_quotes_regex.sub(r'''\1&#8216;''', text)
 
-    closing_single_quotes_regex = re.compile(r"""
+    closing_single_quotes_regex = re.compile(r'''
             ({})
             '
             (?!\s | s\b | \d)
-            """.format(close_class), re.VERBOSE)
-    text = closing_single_quotes_regex.sub(r"""\1&#8217;""", text)
+            '''.format(close_class), re.VERBOSE)
+    text = closing_single_quotes_regex.sub(r'''\1&#8217;''', text)
 
-    closing_single_quotes_regex = re.compile(r"""
+    closing_single_quotes_regex = re.compile(r'''
             ({})
             '
             (\s | s\b)
-            """.format(close_class), re.VERBOSE)
-    text = closing_single_quotes_regex.sub(r"""\1&#8217;\2""", text)
+            '''.format(close_class), re.VERBOSE)
+    text = closing_single_quotes_regex.sub(r'''\1&#8217;\2''', text)
 
     # Any remaining single quotes should be opening ones:
-    text = re.sub(r"""'""", r"""&#8216;""", text)
+    text = re.sub(r"""'""", r'''&#8216;''', text)
 
     # Get most opening double quotes:
-    opening_double_quotes_regex = re.compile(r"""
+    opening_double_quotes_regex = re.compile(r'''
             (
                 \s          |   # a whitespace char, or
                 &nbsp;      |   # a non-breaking space entity, or
@@ -626,91 +626,91 @@ def educateQuotes(text):
             )
             "                 # the quote
             (?=\w)            # followed by a word character
-            """.format(dec_dashes), re.VERBOSE)
-    text = opening_double_quotes_regex.sub(r"""\1&#8220;""", text)
+            '''.format(dec_dashes), re.VERBOSE)
+    text = opening_double_quotes_regex.sub(r'''\1&#8220;''', text)
 
     # Double closing quotes:
-    closing_double_quotes_regex = re.compile(r"""
+    closing_double_quotes_regex = re.compile(r'''
             #({})?   # character that indicates the quote should be closing
             "
             (?=\s)
-            """.format(close_class), re.VERBOSE)
-    text = closing_double_quotes_regex.sub(r"""&#8221;""", text)
+            '''.format(close_class), re.VERBOSE)
+    text = closing_double_quotes_regex.sub(r'''&#8221;''', text)
 
-    closing_double_quotes_regex = re.compile(r"""
+    closing_double_quotes_regex = re.compile(r'''
             ({})   # character that indicates the quote should be closing
             "
-            """.format(close_class), re.VERBOSE)
-    text = closing_double_quotes_regex.sub(r"""\1&#8221;""", text)
+            '''.format(close_class), re.VERBOSE)
+    text = closing_double_quotes_regex.sub(r'''\1&#8221;''', text)
 
     if text.endswith('-"'):
         # A string that endswith -" is sometimes used for dialogue
         text = text[:-1] + '&#8221;'
 
     # Any remaining quotes should be opening ones.
-    text = re.sub(r'"', r"""&#8220;""", text)
+    text = re.sub(r'"', r'''&#8220;''', text)
 
     return text
 
 
 def educateBackticks(text):
-    """
+    '''
     Parameter:  String.
     Returns:    The string, with ``backticks'' -style double quotes
                 translated into HTML curly quote entities.
     Example input:  ``Isn't this fun?''
     Example output: &#8220;Isn't this fun?&#8221;
-    """
+    '''
 
-    text = re.sub(r"""``""", r"""&#8220;""", text)
-    text = re.sub(r"""''""", r"""&#8221;""", text)
+    text = re.sub(r'''``''', r'''&#8220;''', text)
+    text = re.sub(r"""''""", r'''&#8221;''', text)
     return text
 
 
 def educateSingleBackticks(text):
-    """
+    '''
     Parameter:  String.
     Returns:    The string, with `backticks' -style single quotes
                 translated into HTML curly quote entities.
 
     Example input:  `Isn't this fun?'
     Example output: &#8216;Isn&#8217;t this fun?&#8217;
-    """
+    '''
 
-    text = re.sub(r"""`""", r"""&#8216;""", text)
-    text = re.sub(r"""'""", r"""&#8217;""", text)
+    text = re.sub(r'''`''', r'''&#8216;''', text)
+    text = re.sub(r"""'""", r'''&#8217;''', text)
     return text
 
 
 def educateDashes(text):
-    """
+    '''
     Parameter:  String.
 
     Returns:    The string, with each instance of "--" translated to
                 an em-dash HTML entity.
-    """
+    '''
 
-    text = re.sub(r"""---""", r"""&#8211;""", text)  # en  (yes, backwards)
-    text = re.sub(r"""--""", r"""&#8212;""", text)  # em (yes, backwards)
+    text = re.sub(r'''---''', r'''&#8211;''', text)  # en  (yes, backwards)
+    text = re.sub(r'''--''', r'''&#8212;''', text)  # em (yes, backwards)
     return text
 
 
 def educateDashesOldSchool(text):
-    """
+    '''
     Parameter:  String.
 
     Returns:    The string, with each instance of "--" translated to
                 an en-dash HTML entity, and each "---" translated to
                 an em-dash HTML entity.
-    """
+    '''
 
-    text = re.sub(r"""---""", r"""&#8212;""", text)    # em (yes, backwards)
-    text = re.sub(r"""--""", r"""&#8211;""", text)    # en (yes, backwards)
+    text = re.sub(r'''---''', r'''&#8212;''', text)    # em (yes, backwards)
+    text = re.sub(r'''--''', r'''&#8211;''', text)    # en (yes, backwards)
     return text
 
 
 def educateDashesOldSchoolInverted(text):
-    """
+    '''
     Parameter:  String.
 
     Returns:    The string, with each instance of "--" translated to
@@ -723,53 +723,53 @@ def educateDashesOldSchoolInverted(text):
                 common than en-dashes, and so it sort of makes sense that
                 the shortcut should be shorter to type. (Thanks to Aaron
                 Swartz for the idea.)
-    """
-    text = re.sub(r"""---""", r"""&#8211;""", text)    # em
-    text = re.sub(r"""--""", r"""&#8212;""", text)    # en
+    '''
+    text = re.sub(r'''---''', r'''&#8211;''', text)    # em
+    text = re.sub(r'''--''', r'''&#8212;''', text)    # en
     return text
 
 
 def educateEllipses(text):
-    """
+    '''
     Parameter:  String.
     Returns:    The string, with each instance of "..." translated to
                 an ellipsis HTML entity.
 
     Example input:  Huh...?
     Example output: Huh&#8230;?
-    """
+    '''
 
-    text = re.sub(r"""\.\.\.""", r"""&#8230;""", text)
-    text = re.sub(r"""\. \. \.""", r"""&#8230;""", text)
+    text = re.sub(r'''\.\.\.''', r'''&#8230;''', text)
+    text = re.sub(r'''\. \. \.''', r'''&#8230;''', text)
     return text
 
 
 def stupefyEntities(text):
-    """
+    '''
     Parameter:  String.
     Returns:    The string, with each SmartyPants HTML entity translated to
                 its ASCII counterpart.
 
     Example input:  &#8220;Hello &#8212; world.&#8221;
     Example output: "Hello -- world."
-    """
+    '''
 
-    text = re.sub(r"""&#8211;""", r"""-""", text)  # en-dash
-    text = re.sub(r"""&#8212;""", r"""--""", text)  # em-dash
+    text = re.sub(r'''&#8211;''', r'''-''', text)  # en-dash
+    text = re.sub(r'''&#8212;''', r'''--''', text)  # em-dash
 
-    text = re.sub(r"""&#8216;""", r"""'""", text)  # open single quote
-    text = re.sub(r"""&#8217;""", r"""'""", text)  # close single quote
+    text = re.sub(r'''&#8216;''', r"""'""", text)  # open single quote
+    text = re.sub(r'''&#8217;''', r"""'""", text)  # close single quote
 
-    text = re.sub(r"""&#8220;""", r'''"''', text)  # open double quote
-    text = re.sub(r"""&#8221;""", r'''"''', text)  # close double quote
+    text = re.sub(r'''&#8220;''', r'''"''', text)  # open double quote
+    text = re.sub(r'''&#8221;''', r'''"''', text)  # close double quote
 
-    text = re.sub(r"""&#8230;""", r"""...""", text)  # ellipsis
+    text = re.sub(r'''&#8230;''', r'''...''', text)  # ellipsis
 
     return text
 
 
 def processEscapes(text):
-    r"""
+    r'''
     Parameter:  String.
     Returns:    The string, with after processing the following backslash
                 escape sequences. This is useful if you want to force a "dumb"
@@ -783,19 +783,19 @@ def processEscapes(text):
                 \.      &#46;
                 \-      &#45;
                 \`      &#96;
-    """
-    text = re.sub(r"""\\\\""", r"""&#92;""", text)
-    text = re.sub(r'''\\"''', r"""&#34;""", text)
-    text = re.sub(r"""\\'""", r"""&#39;""", text)
-    text = re.sub(r"""\\\.""", r"""&#46;""", text)
-    text = re.sub(r"""\\-""", r"""&#45;""", text)
-    text = re.sub(r"""\\`""", r"""&#96;""", text)
+    '''
+    text = re.sub(r'''\\\\''', r'''&#92;''', text)
+    text = re.sub(r'''\\"''', r'''&#34;''', text)
+    text = re.sub(r"""\\'""", r'''&#39;''', text)
+    text = re.sub(r'''\\\.''', r'''&#46;''', text)
+    text = re.sub(r'''\\-''', r'''&#45;''', text)
+    text = re.sub(r'''\\`''', r'''&#96;''', text)
 
     return text
 
 
 def _tokenize(html):
-    """
+    '''
     Parameter:  String containing HTML markup.
     Returns:    Reference to an array of the tokens comprising the input
                 string. Each token is either a tag (possibly with nested,
@@ -806,16 +806,16 @@ def _tokenize(html):
 
     Based on the _tokenize() subroutine from Brad Choate's MTRegex plugin.
         <http://www.bradchoate.com/past/mtregex.php>
-    """
+    '''
 
     tokens = []
 
     # depth = 6
     # nested_tags = "|".join(['(?:<(?:[^<>]',] * depth) + (')*>)' * depth)
-    # match = r"""(?: <! ( -- .*? -- \s* )+ > ) |  # comments
+    # match = r'''(?: <! ( -- .*? -- \s* )+ > ) |  # comments
     # (?: <\? .*? \?> ) |  # directives
-    # %s  # nested tags       """ % (nested_tags,)
-    tag_soup = re.compile(r"""([^<]*)(<[^>]*>)""")
+    # %s  # nested tags       ''' % (nested_tags,)
+    tag_soup = re.compile(r'''([^<]*)(<[^>]*>)''')
 
     token_match = tag_soup.search(html)
 
@@ -843,46 +843,45 @@ def run_tests(return_tests=False):
         # the default attribute is "1", which means "all".
 
         def test_dates(self):
-            self.assertEqual(sp("one two '60s"), "one two &#8217;60s")
-            self.assertEqual(sp("1440-80's"), "1440-80&#8217;s")
-            self.assertEqual(sp("1440-'80s"), "1440-&#8217;80s")
-            self.assertEqual(sp("1440---'80s"), "1440&#8211;&#8217;80s")
-            self.assertEqual(sp("1960s"), "1960s")  # no effect.
-            self.assertEqual(sp("1960's"), "1960&#8217;s")
-            self.assertEqual(sp("one two '60s"), "one two &#8217;60s")
-            self.assertEqual(sp("'60s"), "&#8217;60s")
+            self.assertEqual(sp("one two '60s"), 'one two &#8217;60s')
+            self.assertEqual(sp("1440-80's"), '1440-80&#8217;s')
+            self.assertEqual(sp("1440-'80s"), '1440-&#8217;80s')
+            self.assertEqual(sp("1440---'80s"), '1440&#8211;&#8217;80s')
+            self.assertEqual(sp('1960s'), '1960s')  # no effect.
+            self.assertEqual(sp("1960's"), '1960&#8217;s')
+            self.assertEqual(sp("one two '60s"), 'one two &#8217;60s')
+            self.assertEqual(sp("'60s"), '&#8217;60s')
 
         def test_measurements(self):
             ae = self.assertEqual
-            ae(sp("one two 1.1'2.2\""), "one two 1.1&#8242;2.2&#8243;")
-            ae(sp("1' 2\""), "1&#8242; 2&#8243;")
+            ae(sp("one two 1.1'2.2\""), 'one two 1.1&#8242;2.2&#8243;')
+            ae(sp("1' 2\""), '1&#8242; 2&#8243;')
 
         def test_skip_tags(self):
             self.assertEqual(
-                sp("""<script type="text/javascript">\n<!--\nvar href = "http://www.google.com";\nvar linktext = "google";\ndocument.write('<a href="' + href + '">' + linktext + "</a>");\n//-->\n</script>"""),  # noqa
-                   """<script type="text/javascript">\n<!--\nvar href = "http://www.google.com";\nvar linktext = "google";\ndocument.write('<a href="' + href + '">' + linktext + "</a>");\n//-->\n</script>""")  # noqa
+                sp('''<script type="text/javascript">\n<!--\nvar href = "http://www.google.com";\nvar linktext = "google";\ndocument.write('<a href="' + href + '">' + linktext + "</a>");\n//-->\n</script>'''),  # noqa: E501
+                   '''<script type="text/javascript">\n<!--\nvar href = "http://www.google.com";\nvar linktext = "google";\ndocument.write('<a href="' + href + '">' + linktext + "</a>");\n//-->\n</script>''')  # noqa: E501
             self.assertEqual(
-                sp("""<p>He said &quot;Let's write some code.&quot; This code here <code>if True:\n\tprint &quot;Okay&quot;</code> is python code.</p>"""),
-                   """<p>He said &#8220;Let&#8217;s write some code.&#8221; This code here <code>if True:\n\tprint &quot;Okay&quot;</code> is python code.</p>""")  # noqa
+                sp('''<p>He said &quot;Let's write some code.&quot; This code here <code>if True:\n\tprint &quot;Okay&quot;</code> is python code.</p>'''),
+                   '''<p>He said &#8220;Let&#8217;s write some code.&#8221; This code here <code>if True:\n\tprint &quot;Okay&quot;</code> is python code.</p>''')  # noqa: E501
 
             self.assertEqual(
                 sp('''<script/><p>It's ok</p>'''),
                 '''<script/><p>It&#8217;s ok</p>''')
 
         def test_ordinal_numbers(self):
-            self.assertEqual(sp("21st century"), "21st century")  # no effect.
-            self.assertEqual(sp("3rd"), "3rd")  # no effect.
+            self.assertEqual(sp('21st century'), '21st century')  # no effect.
+            self.assertEqual(sp('3rd'), '3rd')  # no effect.
 
         def test_educated_quotes(self):
             self.assertEqual(sp('''"Isn't this fun?"'''), '''&#8220;Isn&#8217;t this fun?&#8221;''')
             self.assertEqual(sp("'abc'"), '&#8216;abc&#8217;')
 
-
     tests = unittest.defaultTestLoader.loadTestsFromTestCase(TestSmartypantsAllAttributes)
     if return_tests:
         return tests
     unittest.TextTestRunner(verbosity=4).run(tests)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     run_tests()
diff --git a/src/calibre/utils/smtp.py b/src/calibre/utils/smtp.py
index 01b697dbb1..078ffa929a 100644
--- a/src/calibre/utils/smtp.py
+++ b/src/calibre/utils/smtp.py
@@ -89,7 +89,7 @@ def create_mail(from_, to, subject, text=None, attachment_data=None,
     outer['To'] = to
     outer['Subject'] = subject
     outer['Date'] = formatdate(localtime=True)
-    outer['Message-Id'] = f"<{uuid.uuid4()}@{get_msgid_domain(from_)}>"
+    outer['Message-Id'] = f'<{uuid.uuid4()}@{get_msgid_domain(from_)}>'
     outer.preamble = 'You will not see this in a MIME-aware mail reader.\n'
 
     if text is not None:
@@ -341,7 +341,7 @@ def main(args=sys.argv):
 def config(defaults=None):
     from calibre.utils.config import Config, StringConfig
     desc = _('Control email delivery')
-    c = Config('smtp',desc) if defaults is None else StringConfig(defaults,desc)
+    c = Config('smtp', desc) if defaults is None else StringConfig(defaults, desc)
     c.add_opt('from_')
     c.add_opt('accounts', default={})
     c.add_opt('subjects', default={})
diff --git a/src/calibre/utils/smtplib.py b/src/calibre/utils/smtplib.py
index d1742b55ee..654d81dcf8 100644
--- a/src/calibre/utils/smtplib.py
+++ b/src/calibre/utils/smtplib.py
@@ -54,41 +54,51 @@ from sys import stderr
 
 from polyglot.builtins import string_or_bytes
 
-__all__ = ["SMTPException", "SMTPServerDisconnected", "SMTPResponseException",
-           "SMTPSenderRefused", "SMTPRecipientsRefused", "SMTPDataError",
-           "SMTPConnectError", "SMTPHeloError", "SMTPAuthenticationError",
-           "quoteaddr", "quotedata", "SMTP"]
+__all__ = [
+    'SMTP',
+    'SMTPAuthenticationError',
+    'SMTPConnectError',
+    'SMTPDataError',
+    'SMTPException',
+    'SMTPHeloError',
+    'SMTPRecipientsRefused',
+    'SMTPResponseException',
+    'SMTPSenderRefused',
+    'SMTPServerDisconnected',
+    'quoteaddr',
+    'quotedata',
+]
 
 SMTP_PORT = 25
 SMTP_SSL_PORT = 465
-CRLF = "\r\n"
+CRLF = '\r\n'
 _MAXLINE = 8192  # more than 8 times larger than RFC 821, 4.5.3
 
-OLDSTYLE_AUTH = re.compile(r"auth=(.*)", re.I)
+OLDSTYLE_AUTH = re.compile(r'auth=(.*)', re.I)
 
 
 # Exception classes used by this module.
 class SMTPException(Exception):
-    """Base class for all exceptions raised by this module."""
+    '''Base class for all exceptions raised by this module.'''
 
 
 class SMTPServerDisconnected(SMTPException):
-    """Not connected to any SMTP server.
+    '''Not connected to any SMTP server.
 
     This exception is raised when the server unexpectedly disconnects,
     or when an attempt is made to use the SMTP instance before
     connecting it to a server.
-    """
+    '''
 
 
 class SMTPResponseException(SMTPException):
-    """Base class for all exceptions that include an SMTP error code.
+    '''Base class for all exceptions that include an SMTP error code.
 
     These exceptions are generated in some instances when the SMTP
     server returns an error code.  The error code is stored in the
     `smtp_code' attribute of the error, and the `smtp_error' attribute
     is set to the error message.
-    """
+    '''
 
     def __init__(self, code, msg):
         self.smtp_code = code
@@ -97,11 +107,11 @@ class SMTPResponseException(SMTPException):
 
 
 class SMTPSenderRefused(SMTPResponseException):
-    """Sender address refused.
+    '''Sender address refused.
 
     In addition to the attributes set by on all SMTPResponseException
     exceptions, this sets `sender' to the string that the SMTP refused.
-    """
+    '''
 
     def __init__(self, code, msg, sender):
         self.smtp_code = code
@@ -111,12 +121,12 @@ class SMTPSenderRefused(SMTPResponseException):
 
 
 class SMTPRecipientsRefused(SMTPException):
-    """All recipient addresses refused.
+    '''All recipient addresses refused.
 
     The errors for each recipient are accessible through the attribute
     'recipients', which is a dictionary of exactly the same sort as
     SMTP.sendmail() returns.
-    """
+    '''
 
     def __init__(self, recipients):
         self.recipients = recipients
@@ -124,30 +134,30 @@ class SMTPRecipientsRefused(SMTPException):
 
 
 class SMTPDataError(SMTPResponseException):
-    """The SMTP server didn't accept the data."""
+    '''The SMTP server didn't accept the data.'''
 
 
 class SMTPConnectError(SMTPResponseException):
-    """Error during connection establishment."""
+    '''Error during connection establishment.'''
 
 
 class SMTPHeloError(SMTPResponseException):
-    """The server refused our HELO reply."""
+    '''The server refused our HELO reply.'''
 
 
 class SMTPAuthenticationError(SMTPResponseException):
-    """Authentication error.
+    '''Authentication error.
 
     Most probably the server didn't accept the username/password
     combination provided.
-    """
+    '''
 
 
 def quoteaddr(addr):
-    """Quote a subset of the email addresses defined by RFC 821.
+    '''Quote a subset of the email addresses defined by RFC 821.
 
     Should be able to handle anything rfc822.parseaddr can handle.
-    """
+    '''
     m = (None, None)
     try:
         m = email.utils.parseaddr(addr)[1]
@@ -155,12 +165,12 @@ def quoteaddr(addr):
         pass
     if m == (None, None):  # Indicates parse failure or AttributeError
         # something weird here.. punt -ddm
-        return "<%s>" % addr
+        return '<%s>' % addr
     elif m is None:
         # the sender wants an empty return address
-        return "<>"
+        return '<>'
     else:
-        return "<%s>" % m
+        return '<%s>' % m
 
 
 def _addr_only(addrstring):
@@ -172,11 +182,11 @@ def _addr_only(addrstring):
 
 
 def quotedata(data):
-    """Quote data for email.
+    '''Quote data for email.
 
     Double leading '.', and change Unix newline '\\n', or Mac '\\r' into
     Internet CRLF end-of-line.
-    """
+    '''
     return re.sub(r'(?m)^\.', '..',
         re.sub(r'(?:\r\n|\n|\r(?!\n))', CRLF, data))
 
@@ -187,10 +197,10 @@ except ImportError:
     _have_ssl = False
 else:
     class SSLFakeFile:
-        """A fake file like object that really wraps a SSLObject.
+        '''A fake file like object that really wraps a SSLObject.
 
         It only supports what is needed in smtplib.
-        """
+        '''
 
         def __init__(self, sslobj):
             self.sslobj = sslobj
@@ -198,9 +208,9 @@ else:
         def readline(self, size=-1):
             if size < 0:
                 size = None
-            str = ""
+            str = ''
             chr = None
-            while chr != "\n":
+            while chr != '\n':
                 if size is not None and len(str) >= size:
                     break
                 chr = self.sslobj.read(1)
@@ -216,7 +226,7 @@ else:
 
 
 class SMTP:
-    """This class manages a connection to an SMTP or ESMTP server.
+    '''This class manages a connection to an SMTP or ESMTP server.
     SMTP Objects:
         SMTP objects have the following attributes:
             helo_resp
@@ -243,11 +253,11 @@ class SMTP:
         See each method's docstrings for details.  In general, there is a
         method of the same name to perform each SMTP command.  There is also a
         method called 'sendmail' that will do an entire mail transaction.
-        """
+        '''
     debuglevel = 0
     file = None
     helo_resp = None
-    ehlo_msg = "ehlo"
+    ehlo_msg = 'ehlo'
     ehlo_resp = None
     does_esmtp = 0
     default_port = SMTP_PORT
@@ -255,7 +265,7 @@ class SMTP:
     def __init__(self, host='', port=0, local_hostname=None,
                  timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
                  debug_to=partial(print, file=stderr)):
-        """Initialize a new instance.
+        '''Initialize a new instance.
 
         If specified, `host' is the name of the remote host to which to
         connect.  If specified, `port' specifies the port to which to connect.
@@ -266,13 +276,13 @@ class SMTP:
         specifies where debug output is written to. By default it is written to
         sys.stderr. You should pass in a print function of your own to control
         where debug output is written.
-        """
+        '''
         self._host = host
         self.timeout = timeout
         self.debug = debug_to
         self.esmtp_features = {}
         if host:
-            (code, msg) = self.connect(host, port)
+            code, msg = self.connect(host, port)
             if code != 220:
                 raise SMTPConnectError(code, msg)
         if local_hostname is not None:
@@ -294,14 +304,14 @@ class SMTP:
                 self.local_hostname = '[%s]' % addr
 
     def set_debuglevel(self, debuglevel):
-        """Set the debug output level.
+        '''Set the debug output level.
 
         A value of 0 means no debug logging. A value of 1 means all interaction
         with the server is logged except that long lines are truncated to 100
         characters and AUTH messages are censored. A value of 2 or higher means
         the complete session is logged.
 
-        """
+        '''
         self.debuglevel = debuglevel
 
     def _get_socket(self, host, port, timeout):
@@ -312,7 +322,7 @@ class SMTP:
         return socket.create_connection((host, port), timeout)
 
     def connect(self, host='localhost', port=0):
-        """Connect to a host on a given port.
+        '''Connect to a host on a given port.
 
         If the hostname ends with a colon (`:') followed by a number, and
         there is no port specified, that suffix will be stripped off and the
@@ -321,7 +331,7 @@ class SMTP:
         Note: This method is automatically invoked by __init__, if a host is
         specified during instantiation.
 
-        """
+        '''
         if not port and (host.find(':') == host.rfind(':')):
             i = host.rfind(':')
             if i >= 0:
@@ -329,20 +339,20 @@ class SMTP:
                 try:
                     port = int(port)
                 except ValueError:
-                    raise OSError("nonnumeric port")
+                    raise OSError('nonnumeric port')
         if not port:
             port = self.default_port
         if self.debuglevel > 0:
             self.debug('connect:', (host, port))
         self._host = host
         self.sock = self._get_socket(host, port, self.timeout)
-        (code, msg) = self.getreply()
+        code, msg = self.getreply()
         if self.debuglevel > 0:
-            self.debug("connect:", msg)
-        return (code, msg)
+            self.debug('connect:', msg)
+        return code, msg
 
     def send(self, str):
-        """Send `str' to the server."""
+        '''Send `str' to the server.'''
         if self.debuglevel > 0:
             raw = repr(str)
             self.debug('send:', raw)
@@ -355,16 +365,16 @@ class SMTP:
         else:
             raise SMTPServerDisconnected('please run connect() first')
 
-    def putcmd(self, cmd, args=""):
-        """Send a command to the server."""
-        if args == "":
+    def putcmd(self, cmd, args=''):
+        '''Send a command to the server.'''
+        if args == '':
             str = f'{cmd}{CRLF}'
         else:
             str = f'{cmd} {args}{CRLF}'
         self.send(str)
 
     def getreply(self):
-        """Get a reply from the server.
+        '''Get a reply from the server.
 
         Returns a tuple consisting of:
 
@@ -375,7 +385,7 @@ class SMTP:
             responses are converted to a single, multiline string).
 
         Raises SMTPServerDisconnected if end-of-file is reached.
-        """
+        '''
         resp = []
         if self.file is None:
             self.file = self.sock.makefile('rb')
@@ -384,14 +394,14 @@ class SMTP:
                 line = self.file.readline(_MAXLINE + 1)
             except OSError as e:
                 self.close()
-                raise SMTPServerDisconnected("Connection unexpectedly closed: " + str(e))
+                raise SMTPServerDisconnected('Connection unexpectedly closed: ' + str(e))
             if line == '':
                 self.close()
-                raise SMTPServerDisconnected("Connection unexpectedly closed")
+                raise SMTPServerDisconnected('Connection unexpectedly closed')
             if self.debuglevel > 0:
                 self.debug('reply:', repr(line))
             if len(line) > _MAXLINE:
-                raise SMTPResponseException(500, "Line too long.")
+                raise SMTPResponseException(500, 'Line too long.')
             resp.append(line[4:].strip())
             code = line[:3]
             # Check that the error code is syntactically correct.
@@ -402,47 +412,47 @@ class SMTP:
                 errcode = -1
                 break
             # Check if multiline response.
-            if line[3:4] != "-":
+            if line[3:4] != '-':
                 break
 
-        errmsg = "\n".join(resp)
+        errmsg = '\n'.join(resp)
         if self.debuglevel > 0:
             self.debug(f'reply: retcode ({errcode}); Msg: {errmsg}')
         return errcode, errmsg
 
-    def docmd(self, cmd, args=""):
-        """Send a command, and return its response code."""
+    def docmd(self, cmd, args=''):
+        '''Send a command, and return its response code.'''
         self.putcmd(cmd, args)
         return self.getreply()
 
     # std smtp commands
     def helo(self, name=''):
-        """SMTP 'helo' command.
+        '''SMTP 'helo' command.
         Hostname to send for this command defaults to the FQDN of the local
         host.
-        """
-        self.putcmd("helo", name or self.local_hostname)
-        (code, msg) = self.getreply()
+        '''
+        self.putcmd('helo', name or self.local_hostname)
+        code, msg = self.getreply()
         self.helo_resp = msg
-        return (code, msg)
+        return code, msg
 
     def ehlo(self, name=''):
-        """ SMTP 'ehlo' command.
+        ''' SMTP 'ehlo' command.
         Hostname to send for this command defaults to the FQDN of the local
         host.
-        """
+        '''
         self.esmtp_features = {}
         self.putcmd(self.ehlo_msg, name or self.local_hostname)
-        (code, msg) = self.getreply()
+        code, msg = self.getreply()
         # According to RFC1869 some (badly written)
         # MTA's will disconnect on an ehlo. Toss an exception if
         # that happens -ddm
         if code == -1 and len(msg) == 0:
             self.close()
-            raise SMTPServerDisconnected("Server not connected")
+            raise SMTPServerDisconnected('Server not connected')
         self.ehlo_resp = msg
         if code != 250:
-            return (code, msg)
+            return code, msg
         self.does_esmtp = 1
         # parse the ehlo response -ddm
         resp = self.ehlo_resp.split('\n')
@@ -457,8 +467,8 @@ class SMTP:
             auth_match = OLDSTYLE_AUTH.match(each)
             if auth_match:
                 # This doesn't remove duplicates, but that's no problem
-                self.esmtp_features["auth"] = self.esmtp_features.get("auth", "") \
-                        + " " + auth_match.groups(0)[0]
+                self.esmtp_features['auth'] = self.esmtp_features.get('auth', '') \
+                        + ' ' + auth_match.groups(0)[0]
                 continue
 
             # RFC 1869 requires a space between ehlo keyword and parameters.
@@ -467,90 +477,90 @@ class SMTP:
             # that the space isn't present if there are no parameters.
             m = re.match(r'(?P<feature>[A-Za-z0-9][A-Za-z0-9\-]*) ?', each)
             if m:
-                feature = m.group("feature").lower()
-                params = m.string[m.end("feature"):].strip()
-                if feature == "auth":
-                    self.esmtp_features[feature] = self.esmtp_features.get(feature, "") \
-                            + " " + params
+                feature = m.group('feature').lower()
+                params = m.string[m.end('feature'):].strip()
+                if feature == 'auth':
+                    self.esmtp_features[feature] = self.esmtp_features.get(feature, '') \
+                            + ' ' + params
                 else:
                     self.esmtp_features[feature] = params
-        return (code, msg)
+        return code, msg
 
     def has_extn(self, opt):
-        """Does the server support a given SMTP service extension?"""
+        '''Does the server support a given SMTP service extension?'''
         return opt.lower() in self.esmtp_features
 
     def help(self, args=''):
-        """SMTP 'help' command.
-        Returns help text from server."""
-        self.putcmd("help", args)
+        '''SMTP 'help' command.
+        Returns help text from server.'''
+        self.putcmd('help', args)
         return self.getreply()[1]
 
     def rset(self):
-        """SMTP 'rset' command -- resets session."""
-        return self.docmd("rset")
+        '''SMTP 'rset' command -- resets session.'''
+        return self.docmd('rset')
 
     def noop(self):
-        """SMTP 'noop' command -- doesn't do anything :>"""
-        return self.docmd("noop")
+        '''SMTP 'noop' command -- doesn't do anything :>'''
+        return self.docmd('noop')
 
     def mail(self, sender, options=[]):
-        """SMTP 'mail' command -- begins mail xfer session."""
+        '''SMTP 'mail' command -- begins mail xfer session.'''
         optionlist = ''
         if options and self.does_esmtp:
             optionlist = ' ' + ' '.join(options)
-        self.putcmd("mail", f"FROM:{quoteaddr(sender)}{optionlist}")
+        self.putcmd('mail', f'FROM:{quoteaddr(sender)}{optionlist}')
         return self.getreply()
 
     def rcpt(self, recip, options=[]):
-        """SMTP 'rcpt' command -- indicates 1 recipient for this mail."""
+        '''SMTP 'rcpt' command -- indicates 1 recipient for this mail.'''
         optionlist = ''
         if options and self.does_esmtp:
             optionlist = ' ' + ' '.join(options)
-        self.putcmd("rcpt", f"TO:{quoteaddr(recip)}{optionlist}")
+        self.putcmd('rcpt', f'TO:{quoteaddr(recip)}{optionlist}')
         return self.getreply()
 
     def data(self, msg):
-        """SMTP 'DATA' command -- sends message data to server.
+        '''SMTP 'DATA' command -- sends message data to server.
 
         Automatically quotes lines beginning with a period per rfc821.
         Raises SMTPDataError if there is an unexpected reply to the
         DATA command; the return value from this method is the final
         response code received when the all data is sent.
-        """
-        self.putcmd("data")
-        (code, repl) = self.getreply()
+        '''
+        self.putcmd('data')
+        code, repl = self.getreply()
         if self.debuglevel > 0:
-            self.debug("data:", (code, repl))
+            self.debug('data:', (code, repl))
         if code != 354:
             raise SMTPDataError(code, repl)
         else:
             q = quotedata(msg)
             if q[-2:] != CRLF:
                 q = q + CRLF
-            q = q + "." + CRLF
+            q = q + '.' + CRLF
             self.send(q)
-            (code, msg) = self.getreply()
-            if self.debuglevel > 0 :
-                self.debug("data:", (code, msg))
-            return (code, msg)
+            code, msg = self.getreply()
+            if self.debuglevel > 0:
+                self.debug('data:', (code, msg))
+            return code, msg
 
     def verify(self, address):
-        """SMTP 'verify' command -- checks for address validity."""
-        self.putcmd("vrfy", _addr_only(address))
+        '''SMTP 'verify' command -- checks for address validity.'''
+        self.putcmd('vrfy', _addr_only(address))
         return self.getreply()
     # a.k.a.
     vrfy = verify
 
     def expn(self, address):
-        """SMTP 'expn' command -- expands a mailing list."""
-        self.putcmd("expn", _addr_only(address))
+        '''SMTP 'expn' command -- expands a mailing list.'''
+        self.putcmd('expn', _addr_only(address))
         return self.getreply()
 
     # some useful methods
 
     def ehlo_or_helo_if_needed(self):
-        """Call self.ehlo() and/or self.helo() if needed.
+        '''Call self.ehlo() and/or self.helo() if needed.
 
         If there has been no previous EHLO or HELO command this session, this
         method tries ESMTP EHLO first.
@@ -559,15 +569,15 @@ class SMTP:
 
          SMTPHeloError            The server didn't reply properly to
                                   the helo greeting.
-        """
+        '''
         if self.helo_resp is None and self.ehlo_resp is None:
             if not (200 <= self.ehlo()[0] <= 299):
-                (code, resp) = self.helo()
+                code, resp = self.helo()
                 if not (200 <= code <= 299):
                     raise SMTPHeloError(code, resp)
 
     def login(self, user, password):
-        """Log in on an SMTP server that requires authentication.
+        '''Log in on an SMTP server that requires authentication.
 
         The arguments are:
             - user:     The user name to authenticate with.
@@ -586,29 +596,29 @@ class SMTP:
                                   password combination.
          SMTPException            No suitable authentication method was
                                   found.
-        """
+        '''
 
         def encode_cram_md5(challenge, user, password):
             challenge = base64.decodestring(challenge)
             if isinstance(password, str):  # Added by Kovid, see http://bugs.python.org/issue5285
                 password = password.encode('utf-8')
-            response = user + " " + hmac.HMAC(password, challenge).hexdigest()
-            return encode_base64(response, eol="")
+            response = user + ' ' + hmac.HMAC(password, challenge).hexdigest()
+            return encode_base64(response, eol='')
 
         def encode_plain(user, password):
-            return encode_base64(f"\0{user}\0{password}", eol="")
+            return encode_base64(f'\0{user}\0{password}', eol='')
 
-        AUTH_PLAIN = "PLAIN"
-        AUTH_CRAM_MD5 = "CRAM-MD5"
-        AUTH_LOGIN = "LOGIN"
+        AUTH_PLAIN = 'PLAIN'
+        AUTH_CRAM_MD5 = 'CRAM-MD5'
+        AUTH_LOGIN = 'LOGIN'
 
         self.ehlo_or_helo_if_needed()
 
-        if not self.has_extn("auth"):
-            raise SMTPException("SMTP AUTH extension not supported by server.")
+        if not self.has_extn('auth'):
+            raise SMTPException('SMTP AUTH extension not supported by server.')
 
         # Authentication methods the server supports:
-        authlist = self.esmtp_features["auth"].split()
+        authlist = self.esmtp_features['auth'].split()
 
         # List of authentication methods we support: from preferred to
         # less preferred methods. Except for the purpose of testing the weaker
@@ -623,30 +633,30 @@ class SMTP:
                 break
 
         if authmethod == AUTH_CRAM_MD5:
-            (code, resp) = self.docmd("AUTH", AUTH_CRAM_MD5)
+            code, resp = self.docmd('AUTH', AUTH_CRAM_MD5)
             if code == 503:
                 # 503 == 'Error: already authenticated'
-                return (code, resp)
-            (code, resp) = self.docmd(encode_cram_md5(resp, user, password))
+                return code, resp
+            code, resp = self.docmd(encode_cram_md5(resp, user, password))
         elif authmethod == AUTH_PLAIN:
-            (code, resp) = self.docmd("AUTH",
-                AUTH_PLAIN + " " + encode_plain(user, password))
+            code, resp = self.docmd('AUTH',
+                AUTH_PLAIN + ' ' + encode_plain(user, password))
         elif authmethod == AUTH_LOGIN:
-            (code, resp) = self.docmd("AUTH",
-                "{} {}".format(AUTH_LOGIN, encode_base64(user, eol="")))
+            code, resp = self.docmd('AUTH',
+                '{} {}'.format(AUTH_LOGIN, encode_base64(user, eol='')))
             if code != 334:
                 raise SMTPAuthenticationError(code, resp)
-            (code, resp) = self.docmd(encode_base64(password, eol=""))
+            code, resp = self.docmd(encode_base64(password, eol=''))
         elif authmethod is None:
-            raise SMTPException("No suitable authentication method found.")
+            raise SMTPException('No suitable authentication method found.')
         if code not in (235, 503):
             # 235 == 'Authentication successful'
             # 503 == 'Error: already authenticated'
             raise SMTPAuthenticationError(code, resp)
-        return (code, resp)
+        return code, resp
 
     def starttls(self, context=None):
-        """Puts the connection to the SMTP server into TLS mode.
+        '''Puts the connection to the SMTP server into TLS mode.
 
         If there has been no previous EHLO or HELO command this session, this
         method tries ESMTP EHLO first.
@@ -661,14 +671,14 @@ class SMTP:
 
          SMTPHeloError            The server didn't reply properly to
                                   the helo greeting.
-        """
+        '''
         self.ehlo_or_helo_if_needed()
-        if not self.has_extn("starttls"):
-            raise SMTPException("STARTTLS extension not supported by server.")
-        (resp, reply) = self.docmd("STARTTLS")
+        if not self.has_extn('starttls'):
+            raise SMTPException('STARTTLS extension not supported by server.')
+        resp, reply = self.docmd('STARTTLS')
         if resp == 220:
             if not _have_ssl:
-                raise RuntimeError("No SSL support included in this Python")
+                raise RuntimeError('No SSL support included in this Python')
             if context is None:
                 self.sock = ssl.wrap_socket(self.sock)
             else:
@@ -687,7 +697,7 @@ class SMTP:
             # 501 Syntax error (no parameters allowed)
             # 454 TLS not available due to temporary reason
             raise SMTPResponseException(resp, reply)
-        return (resp, reply)
+        return resp, reply
 
     def sendmail(self, from_addr, to_addrs, msg, mail_options=[],
                  rcpt_options=[]):
@@ -737,26 +747,26 @@ class SMTP:
          ...
          ... This is a test '''
          >>> s.sendmail("me@my.org",tolist,msg)
-         { "three@three.org" : ( 550 ,"User unknown" ) }
+         { "three@three.org" : (550, "User unknown") }
          >>> s.quit()
 
         In the above example, the message was accepted for delivery to three
         of the four addresses, and one was rejected, with the error code
         550.  If all addresses are accepted, then the method will return an
         empty dictionary.
-
         """
+
         self.ehlo_or_helo_if_needed()
         esmtp_opts = []
         if self.does_esmtp:
             # Hmmm? what's this? -ddm
             # self.esmtp_features['7bit']=""
             if self.has_extn('size'):
-                esmtp_opts.append("size=%d" % len(msg))
+                esmtp_opts.append('size=%d' % len(msg))
             for option in mail_options:
                 esmtp_opts.append(option)
 
-        (code, resp) = self.mail(from_addr, esmtp_opts)
+        code, resp = self.mail(from_addr, esmtp_opts)
         if code != 250:
             self.rset()
             raise SMTPSenderRefused(code, resp, from_addr)
@@ -764,14 +774,14 @@ class SMTP:
         if isinstance(to_addrs, string_or_bytes):
             to_addrs = [to_addrs]
         for each in to_addrs:
-            (code, resp) = self.rcpt(each, rcpt_options)
+            code, resp = self.rcpt(each, rcpt_options)
             if (code != 250) and (code != 251):
-                senderrs[each] = (code,resp)
+                senderrs[each] = (code, resp)
         if len(senderrs) == len(to_addrs):
             # the server refused all our recipients
             self.rset()
             raise SMTPRecipientsRefused(senderrs)
-        (code, resp) = self.data(msg)
+        code, resp = self.data(msg)
         if code != 250:
             self.rset()
             raise SMTPDataError(code, resp)
@@ -779,7 +789,7 @@ class SMTP:
         return senderrs
 
     def close(self):
-        """Close the connection to the SMTP server."""
+        '''Close the connection to the SMTP server.'''
         try:
             file = self.file
             self.file = None
@@ -792,8 +802,8 @@ class SMTP:
                 sock.close()
 
     def quit(self):
-        """Terminate the SMTP session."""
-        res = self.docmd("quit")
+        '''Terminate the SMTP session.'''
+        res = self.docmd('quit')
         # A new EHLO is required after reconnecting with connect()
         self.ehlo_resp = self.helo_resp = None
         self.esmtp_features = {}
@@ -805,13 +815,13 @@ class SMTP:
 if _have_ssl:
 
     class SMTP_SSL(SMTP):
-        """ This is a subclass derived from SMTP that connects over an SSL encrypted
+        ''' This is a subclass derived from SMTP that connects over an SSL encrypted
         socket (to use this class you need a socket module that was compiled with SSL
         support). If host is not specified, '' (the local host) is used. If port is
         omitted, the standard SMTP-over-SSL port (465) is used. keyfile and certfile
         are also optional - they can contain a PEM formatted private key and
         certificate chain file for the SSL connection.
-        """
+        '''
 
         default_port = SMTP_SSL_PORT
 
@@ -832,7 +842,7 @@ if _have_ssl:
             self.file = SSLFakeFile(new_socket)
             return new_socket
 
-    __all__.append("SMTP_SSL")
+    __all__.append('SMTP_SSL')
 
 #
 # LMTP extension
@@ -841,7 +851,7 @@ LMTP_PORT = 2003
 
 
 class LMTP(SMTP):
-    """LMTP - Local Mail Transfer Protocol
+    '''LMTP - Local Mail Transfer Protocol
 
     The LMTP protocol, which is very similar to ESMTP, is heavily based
     on the standard SMTP client. It's common to use Unix sockets for LMTP,
@@ -851,16 +861,16 @@ class LMTP(SMTP):
 
     Authentication is supported, using the regular SMTP mechanism. When
     using a Unix socket, LMTP generally don't support or require any
-    authentication, but your mileage might vary."""
+    authentication, but your mileage might vary.'''
 
-    ehlo_msg = "lhlo"
+    ehlo_msg = 'lhlo'
 
     def __init__(self, host='', port=LMTP_PORT, local_hostname=None):
-        """Initialize a new instance."""
+        '''Initialize a new instance.'''
         SMTP.__init__(self, host, port, local_hostname)
 
     def connect(self, host='localhost', port=0):
-        """Connect to the LMTP daemon, on either a Unix or a TCP socket."""
+        '''Connect to the LMTP daemon, on either a Unix or a TCP socket.'''
         if host[0] != '/':
             return SMTP.connect(self, host, port)
 
@@ -875,10 +885,10 @@ class LMTP(SMTP):
                 self.sock.close()
             self.sock = None
             raise
-        (code, msg) = self.getreply()
+        code, msg = self.getreply()
         if self.debuglevel > 0:
-            self.debug("connect:", msg)
-        return (code, msg)
+            self.debug('connect:', msg)
+        return code, msg
 
 
 # Test the sendmail method, which tests most of the others.
@@ -887,19 +897,19 @@ if __name__ == '__main__':
     import sys
 
     def prompt(prompt):
-        sys.stdout.write(prompt + ": ")
+        sys.stdout.write(prompt + ': ')
         return sys.stdin.readline().strip()
 
-    fromaddr = prompt("From")
-    toaddrs = prompt("To").split(',')
-    print("Enter message, end with ^D:")
+    fromaddr = prompt('From')
+    toaddrs = prompt('To').split(',')
+    print('Enter message, end with ^D:')
     msg = ''
     while 1:
         line = sys.stdin.readline()
         if not line:
             break
         msg = msg + line
-    print("Message length is %d" % len(msg))
+    print('Message length is %d' % len(msg))
 
     server = SMTP('localhost')
     server.set_debuglevel(1)
diff --git a/src/calibre/utils/speedups.py b/src/calibre/utils/speedups.py
index ae6672ea76..f998b2305a 100644
--- a/src/calibre/utils/speedups.py
+++ b/src/calibre/utils/speedups.py
@@ -6,7 +6,6 @@ import os
 
 
 class ReadOnlyFileBuffer:
-
     ''' A zero copy implementation of a file like object. Uses memoryviews for efficiency. '''
 
     def __init__(self, raw: bytes, name: str = ''):
@@ -196,7 +195,7 @@ def svg_path_to_painter_path(d):
                 raise ValueError('Extra parameters after close path command')
             elif last_cmd in (
                 lineto_abs, lineto_rel, hline_abs, hline_rel, vline_abs,
-                vline_rel, curveto_abs, curveto_rel,smoothcurveto_abs,
+                vline_rel, curveto_abs, curveto_rel, smoothcurveto_abs,
                 smoothcurveto_rel, quadcurveto_abs, quadcurveto_rel,
                 smoothquadcurveto_abs, smoothquadcurveto_rel
             ):
diff --git a/src/calibre/utils/spell/__init__.py b/src/calibre/utils/spell/__init__.py
index 0cbf055ec8..fb2e4b74e1 100644
--- a/src/calibre/utils/spell/__init__.py
+++ b/src/calibre/utils/spell/__init__.py
@@ -3,6 +3,3 @@
 
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
-
-
-
diff --git a/src/calibre/utils/terminal.py b/src/calibre/utils/terminal.py
index 6aee59ef56..1743f26e58 100644
--- a/src/calibre/utils/terminal.py
+++ b/src/calibre/utils/terminal.py
@@ -108,7 +108,7 @@ class Detect:
     def __init__(self, stream):
         self.stream = stream or sys.stdout
         self.is_binary = is_binary(self.stream)
-        self.isatty = getattr(self.stream, 'isatty', lambda : False)()
+        self.isatty = getattr(self.stream, 'isatty', lambda: False)()
         force_ansi = 'CALIBRE_FORCE_ANSI' in os.environ
         if not self.isatty and force_ansi:
             self.isatty = True
@@ -196,32 +196,29 @@ def windows_terminfo():
     from ctypes.wintypes import SHORT, WORD
 
     class COORD(Structure):
-
-        """struct in wincon.h"""
+        '''struct in wincon.h'''
         _fields_ = [
             ('X', SHORT),
             ('Y', SHORT),
         ]
 
     class SMALL_RECT(Structure):
-
-        """struct in wincon.h."""
+        '''struct in wincon.h.'''
         _fields_ = [
-            ("Left", SHORT),
-            ("Top", SHORT),
-            ("Right", SHORT),
-            ("Bottom", SHORT),
+            ('Left', SHORT),
+            ('Top', SHORT),
+            ('Right', SHORT),
+            ('Bottom', SHORT),
         ]
 
     class CONSOLE_SCREEN_BUFFER_INFO(Structure):
-
-        """struct in wincon.h."""
+        '''struct in wincon.h.'''
         _fields_ = [
-            ("dwSize", COORD),
-            ("dwCursorPosition", COORD),
-            ("wAttributes", WORD),
-            ("srWindow", SMALL_RECT),
-            ("dwMaximumWindowSize", COORD),
+            ('dwSize', COORD),
+            ('dwCursorPosition', COORD),
+            ('wAttributes', WORD),
+            ('srWindow', SMALL_RECT),
+            ('dwMaximumWindowSize', COORD),
         ]
     csbi = CONSOLE_SCREEN_BUFFER_INFO()
     import msvcrt
@@ -286,7 +283,7 @@ def test():
     text = [colored(t, fg=t)+'. '+colored(t, fg=t, bold=True)+'.' for t in
             ('red', 'yellow', 'green', 'white', 'cyan', 'magenta', 'blue',)]
     s.write('\n'.join(text))
-    u = '\u041c\u0438\u0445\u0430\u0438\u043b fällen'
+    u = 'Михаил fällen'
     print()
     s.write(u)
     print()
diff --git a/src/calibre/utils/text2int.py b/src/calibre/utils/text2int.py
index ff7722a1f1..bc25abd737 100644
--- a/src/calibre/utils/text2int.py
+++ b/src/calibre/utils/text2int.py
@@ -1,15 +1,15 @@
 #!/usr/bin/env python
 
 
-__author__ = "stackoverflow community"
+__author__ = 'stackoverflow community'
 __docformat__ = 'restructuredtext en'
-"""
+'''
 Takes english numeric words and converts them to integers.
 Returns False if the word isn't a number.
 
 implementation courtesy of the stackoverflow community:
 http://stackoverflow.com/questions/493174/is-there-a-way-to-convert-number-words-to-integers-python
-"""
+'''
 
 import re
 
@@ -19,19 +19,19 @@ numwords = {}
 def text2int(textnum):
     if not numwords:
 
-        units = ["zero", "one", "two", "three", "four", "five", "six",
-                "seven", "eight", "nine", "ten", "eleven", "twelve",
-                "thirteen", "fourteen", "fifteen", "sixteen", "seventeen",
-                "eighteen", "nineteen"]
+        units = ['zero', 'one', 'two', 'three', 'four', 'five', 'six',
+                'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve',
+                'thirteen', 'fourteen', 'fifteen', 'sixteen', 'seventeen',
+                'eighteen', 'nineteen']
 
-        tens = ["", "", "twenty", "thirty", "forty", "fifty", "sixty",
-                "seventy", "eighty", "ninety"]
+        tens = ['', '', 'twenty', 'thirty', 'forty', 'fifty', 'sixty',
+                'seventy', 'eighty', 'ninety']
 
-        scales = ["hundred", "thousand", "million", "billion", "trillion",
+        scales = ['hundred', 'thousand', 'million', 'billion', 'trillion',
                 'quadrillion', 'quintillion', 'sexillion', 'septillion',
                 'octillion', 'nonillion', 'decillion']
 
-        numwords["and"] = (1, 0)
+        numwords['and'] = (1, 0)
         for idx, word in enumerate(units):
             numwords[word] = (1, idx)
         for idx, word in enumerate(tens):
@@ -43,14 +43,14 @@ def text2int(textnum):
             'eighth':8, 'ninth':9, 'twelfth':12}
     ordinal_endings = [('ieth', 'y'), ('th', '')]
     current = result = 0
-    tokens = re.split(r"[\s-]+", textnum)
+    tokens = re.split(r'[\s-]+', textnum)
     for word in tokens:
         if word in ordinal_words:
             scale, increment = (1, ordinal_words[word])
         else:
             for ending, replacement in ordinal_endings:
                 if word.endswith(ending):
-                    word = f"{word[:-len(ending)]}{replacement}"
+                    word = f'{word[:-len(ending)]}{replacement}'
 
             if word not in numwords:
                 # raise Exception("Illegal word: " + word)
diff --git a/src/calibre/utils/threadpool.py b/src/calibre/utils/threadpool.py
index 1bc1db5044..85a89ce1cb 100644
--- a/src/calibre/utils/threadpool.py
+++ b/src/calibre/utils/threadpool.py
@@ -1,4 +1,4 @@
-"""Easy to use object-oriented thread pool framework.
+'''Easy to use object-oriented thread pool framework.
 
 A thread pool is an object that maintains a pool of worker threads to perform
 time consuming operations in parallel. It assigns jobs to the threads
@@ -28,21 +28,21 @@ Basic usage:
 See the end of the module code for a brief, annotated usage example.
 
 Website : http://chrisarndt.de/en/software/python/threadpool/
-"""
+'''
 
 __all__ = [
-  'makeRequests',
-  'NoResultsPending',
-  'NoWorkersAvailable',
-  'ThreadPool',
-  'WorkRequest',
-  'WorkerThread'
+    'NoResultsPending',
+    'NoWorkersAvailable',
+    'ThreadPool',
+    'WorkRequest',
+    'WorkerThread',
+    'makeRequests',
 ]
 
-__author__ = "Christopher Arndt"
-__version__ = "1.2.3"
-__revision__ = "$Revision: 1.5 $"
-__date__ = "$Date: 2006/06/23 12:32:25 $"
+__author__ = 'Christopher Arndt'
+__version__ = '1.2.3'
+__revision__ = '$Revision: 1.5 $'
+__date__ = '$Date: 2006/06/23 12:32:25 $'
 __license__ = 'Python license'
 
 # standard library modules
@@ -54,30 +54,30 @@ from polyglot import queue
 
 
 class NoResultsPending(Exception):
-    """All work requests have been processed."""
+    '''All work requests have been processed.'''
     pass
 
 
 class NoWorkersAvailable(Exception):
-    """No worker threads available to process remaining requests."""
+    '''No worker threads available to process remaining requests.'''
     pass
 
+
 # classes
 
-
 class WorkerThread(threading.Thread):
-    """Background thread connected to the requests/results queues.
+    '''Background thread connected to the requests/results queues.
 
     A worker thread sits in the background and picks up work requests from
     one queue and puts the results in another until it is dismissed.
-    """
+    '''
 
     def __init__(self, requestsQueue, resultsQueue, **kwds):
-        """Set up thread in daemonic mode and start it immediately.
+        '''Set up thread in daemonic mode and start it immediately.
 
         requestsQueue and resultQueue are instances of queue.Queue passed
         by the ThreadPool class when it creates a new worker thread.
-        """
+        '''
         kwds['daemon'] = True
         threading.Thread.__init__(self, **kwds)
         self.workRequestQueue = requestsQueue
@@ -86,7 +86,7 @@ class WorkerThread(threading.Thread):
         self.start()
 
     def run(self):
-        """Repeatedly process the job queue until told to exit."""
+        '''Repeatedly process the job queue until told to exit.'''
 
         while not self._dismissed.isSet():
             # thread blocks here, if queue empty
@@ -105,23 +105,23 @@ class WorkerThread(threading.Thread):
                 self.resultQueue.put((request, traceback.format_exc()))
 
     def dismiss(self):
-        """Sets a flag to tell the thread to exit when done with current job.
-        """
+        '''Sets a flag to tell the thread to exit when done with current job.
+        '''
 
         self._dismissed.set()
 
 
 class WorkRequest:
-    """A request to execute a callable for putting in the request queue later.
+    '''A request to execute a callable for putting in the request queue later.
 
     See the module function makeRequests() for the common case
     where you want to build several WorkRequests for the same callable
     but with different arguments for each call.
-    """
+    '''
 
     def __init__(self, callable, args=None, kwds=None, requestID=None,
       callback=None, exc_callback=None):
-        """Create a work request for a callable and attach callbacks.
+        '''Create a work request for a callable and attach callbacks.
 
         A work request consists of the callable to be executed by a
         worker thread, a list of positional arguments, a dictionary
@@ -140,7 +140,7 @@ class WorkRequest:
         requestID, if given, must be hashable since it is used by the
         ThreadPool object to store the results of that work request in a
         dictionary. It defaults to the return value of id(self).
-        """
+        '''
 
         if requestID is None:
             self.requestID = id(self)
@@ -148,7 +148,7 @@ class WorkRequest:
             try:
                 hash(requestID)
             except TypeError:
-                raise TypeError("requestID must be hashable.")
+                raise TypeError('requestID must be hashable.')
             self.requestID = requestID
         self.exception = False
         self.callback = callback
@@ -159,19 +159,19 @@ class WorkRequest:
 
 
 class ThreadPool:
-    """A thread pool, distributing work requests and collecting results.
+    '''A thread pool, distributing work requests and collecting results.
 
     See the module doctring for more information.
-    """
+    '''
 
     def __init__(self, num_workers, q_size=0):
-        """Set up the thread pool and start num_workers worker threads.
+        '''Set up the thread pool and start num_workers worker threads.
 
         num_workers is the number of worker threads to start initially.
         If q_size > 0 the size of the work request queue is limited and
         the thread pool blocks when the queue is full and it tries to put
         more work requests in it (see putRequest method).
-        """
+        '''
 
         self.requestsQueue = queue.Queue(q_size)
         self.resultsQueue = queue.Queue()
@@ -180,29 +180,29 @@ class ThreadPool:
         self.createWorkers(num_workers)
 
     def createWorkers(self, num_workers):
-        """Add num_workers worker threads to the pool."""
+        '''Add num_workers worker threads to the pool.'''
 
         for i in range(num_workers):
             self.workers.append(WorkerThread(self.requestsQueue,
               self.resultsQueue))
 
     def dismissWorkers(self, num_workers):
-        """Tell num_workers worker threads to quit after their current task.
-        """
+        '''Tell num_workers worker threads to quit after their current task.
+        '''
 
         for i in range(min(num_workers, len(self.workers))):
             worker = self.workers.pop()
             worker.dismiss()
 
     def putRequest(self, request, block=True, timeout=0):
-        """Put work request into work queue and save its id for later."""
+        '''Put work request into work queue and save its id for later.'''
 
         assert isinstance(request, WorkRequest)
         self.requestsQueue.put(request, block, timeout)
         self.workRequests[request.requestID] = request
 
     def poll(self, block=False):
-        """Process any new results in the queue."""
+        '''Process any new results in the queue.'''
 
         while True:
             # still results pending?
@@ -226,7 +226,7 @@ class ThreadPool:
                 break
 
     def wait(self, sleep=0):
-        """Wait for results, blocking until all have arrived."""
+        '''Wait for results, blocking until all have arrived.'''
 
         while 1:
             try:
@@ -235,11 +235,11 @@ class ThreadPool:
             except NoResultsPending:
                 break
 
+
 # helper functions
 
-
 def makeRequests(callable, args_list, callback=None, exc_callback=None):
-    """Create several work requests for same callable with different arguments.
+    '''Create several work requests for same callable with different arguments.
 
     Convenience function for creating several work requests for the same
     callable where each invocation of the callable receives different values
@@ -251,7 +251,7 @@ def makeRequests(callable, args_list, callback=None, exc_callback=None):
     non-tuple argument.
 
     See docstring for WorkRequest for info on callback and exc_callback.
-    """
+    '''
 
     requests = []
     for item in args_list:
@@ -267,11 +267,11 @@ def makeRequests(callable, args_list, callback=None, exc_callback=None):
             )
     return requests
 
+
 ################
 # USAGE EXAMPLE
 ################
 
-
 if __name__ == '__main__':
     import random
     import time
@@ -282,16 +282,16 @@ if __name__ == '__main__':
         result = round(random.random() * data, 5)
         # just to show off, we throw an exception once in a while
         if result > 3:
-            raise RuntimeError("Something extraordinary happened!")
+            raise RuntimeError('Something extraordinary happened!')
         return result
 
     # this will be called each time a result is available
     def print_result(request, result):
-        print(f"**Result: {result} from request #{request.requestID}")
+        print(f'**Result: {result} from request #{request.requestID}')
 
     # this will be called when an exception occurs within a thread
     def handle_exception(request, exc_info):
-        print("Exception occurred in request #%s: %s" %
+        print('Exception occurred in request #%s: %s' %
           (request.requestID, exc_info[1]))
 
     # assemble the arguments for each job to a list...
@@ -311,7 +311,7 @@ if __name__ == '__main__':
     # then we put the work requests in the queue...
     for req in requests:
         main.putRequest(req)
-        print("Work request #%s added." % req.requestID)
+        print('Work request #%s added.' % req.requestID)
     # or shorter:
     # [main.putRequest(req) for req in requests]
 
@@ -325,15 +325,15 @@ if __name__ == '__main__':
     while 1:
         try:
             main.poll()
-            print("Main thread working...")
+            print('Main thread working...')
             time.sleep(0.5)
             if i == 10:
-                print("Adding 3 more worker threads...")
+                print('Adding 3 more worker threads...')
                 main.createWorkers(3)
             i += 1
         except KeyboardInterrupt:
-            print("Interrupted!")
+            print('Interrupted!')
             break
         except NoResultsPending:
-            print("All results collected.")
+            print('All results collected.')
             break
diff --git a/src/calibre/utils/titlecase.py b/src/calibre/utils/titlecase.py
index 6002fd12f5..a134736bca 100644
--- a/src/calibre/utils/titlecase.py
+++ b/src/calibre/utils/titlecase.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 
 
-"""
+'''
 Original Perl version by: John Gruber https://daringfireball.net/ 10 May 2008
 Python version by Stuart Colville http://muffinresearch.co.uk
 Modifications to make it work with non-ascii chars by Kovid Goyal
 License: http://www.opensource.org/licenses/mit-license.php
-"""
+'''
 
 import re
 
@@ -18,18 +18,18 @@ __all__ = ['titlecase']
 __version__ = '0.5'
 
 SMALL = 'a|an|and|as|at|but|by|en|for|if|in|of|on|or|the|to|v\\.?|via|vs\\.?'
-PUNCT = r"""!"#$%&'‘’()*+,\-‒–—―./:;?@[\\\]_`{|}~"""
+PUNCT = r'''!"#$%&'‘’()*+,\-‒–—―./:;?@[\\\]_`{|}~'''
 
 SMALL_WORDS = re.compile(r'^(%s)$' % SMALL, re.I)
 INLINE_PERIOD = re.compile(r'[a-z][.][a-z]', re.I)
 UC_ELSEWHERE = re.compile(r'[%s]*?[a-zA-Z]+[A-Z]+?' % PUNCT)
-CAPFIRST = re.compile(str(r"^[%s]*?(\w)" % PUNCT), flags=re.UNICODE)
+CAPFIRST = re.compile(str(r'^[%s]*?(\w)' % PUNCT), flags=re.UNICODE)
 SMALL_FIRST = re.compile(fr'^([{PUNCT}]*)({SMALL})\b', re.I|re.U)
 SMALL_LAST = re.compile(fr'\b({SMALL})[{PUNCT}]?$', re.I|re.U)
 SMALL_AFTER_NUM = re.compile(r'(\d+\s+)(a|an|the)\b', re.I|re.U)
 SUBPHRASE = re.compile(r'([:.;?!][ ])(%s)' % SMALL)
 APOS_SECOND = re.compile(r"^[dol]{1}['‘]{1}[a-z]+$", re.I)
-UC_INITIALS = re.compile(r"^(?:[A-Z]{1}\.{1}|[A-Z]{1}\.{1}[A-Z]{1})+$")
+UC_INITIALS = re.compile(r'^(?:[A-Z]{1}\.{1}|[A-Z]{1}\.{1}[A-Z]{1})+$')
 
 _lang = None
 
@@ -43,7 +43,7 @@ def lang():
 
 
 def titlecase(text):
-    """
+    '''
     Titlecases input text
 
     This filter changes all words to Title Caps, and attempts to be clever
@@ -52,7 +52,7 @@ def titlecase(text):
     The list of "SMALL words" which are not capped comes from
     the New York Times Manual of Style, plus 'vs' and 'v'.
 
-    """
+    '''
 
     all_caps = icu_upper(text) == text
 
@@ -86,9 +86,9 @@ def titlecase(text):
         hyphenated = []
         for item in word.split('-'):
             hyphenated.append(CAPFIRST.sub(lambda m: icu_upper(m.group(0)), item))
-        line.append("-".join(hyphenated))
+        line.append('-'.join(hyphenated))
 
-    result = "".join(line)
+    result = ''.join(line)
 
     result = SMALL_FIRST.sub(lambda m: '{}{}'.format(
         m.group(1),
diff --git a/src/calibre/utils/unicode_names.py b/src/calibre/utils/unicode_names.py
index fdba032305..82421e182a 100644
--- a/src/calibre/utils/unicode_names.py
+++ b/src/calibre/utils/unicode_names.py
@@ -30,7 +30,7 @@ def html_entities():
 
 
 def points_for_word(w):
-    """Returns the set of all codepoints that contain ``word`` in their names"""
+    '''Returns the set of all codepoints that contain ``word`` in their names'''
     w = w.lower()
     ans = points_for_word.cache.get(w)
     if ans is None:
@@ -40,4 +40,4 @@ def points_for_word(w):
     return ans
 
 
-points_for_word.cache = {}  # noqa
+points_for_word.cache = {}
diff --git a/src/calibre/utils/unrar.py b/src/calibre/utils/unrar.py
index ff8100f6d8..b68533a202 100644
--- a/src/calibre/utils/unrar.py
+++ b/src/calibre/utils/unrar.py
@@ -120,11 +120,9 @@ def extract_cover_image(stream):
 
 # Test normal RAR file {{{
 
-
 def test_basic():
 
-    stream = BytesIO(  # {{{
-        b"Rar!\x1a\x07\x00\xcf\x90s\x00\x00\r\x00\x00\x00\x00\x00\x00\x00\x14\xe7z\x00\x80#\x00\x17\x00\x00\x00\r\x00\x00\x00\x03\xc2\xb3\x96o\x00\x00\x00\x00\x1d3\x03\x00\x00\x00\x00\x00CMT\x0c\x00\x8b\xec\x8e\xef\x14\xf6\xe6h\x04\x17\xff\xcd\x0f\xffk9b\x11]^\x80\xd3dt \x90+\x00\x14\x00\x00\x00\x08\x00\x00\x00\x03\xf1\x84\x93\\\xb9]yA\x1d3\t\x00\xa4\x81\x00\x001\\sub-one\x00\xc0\x0c\x00\x8f\xec\x89\xfe.JM\x86\x82\x0c_\xfd\xfd\xd7\x11\x1a\xef@\x9eHt \x80'\x00\x0e\x00\x00\x00\x04\x00\x00\x00\x03\x9f\xa8\x17\xf8\xaf]yA\x1d3\x07\x00\xa4\x81\x00\x00one.txt\x00\x08\xbf\x08\xae\xf3\xca\x87\xfeo\xfe\xd2n\x80-Ht \x82:\x00\x18\x00\x00\x00\x10\x00\x00\x00\x03\xa86\x81\xdf\xf9fyA\x1d3\x1a\x00\xa4\x81\x00\x00\xe8\xaf\xb6\xe6\xaf\x94\xe5\xb1\x81.txt\x00\x8bh\xf6\xd4kA\\.\x00txt\x0c\x00\x8b\xec\x8e\xef\x14\xf6\xe2l\x91\x189\xff\xdf\xfe\xc2\xd3:g\x9a\x19F=cYt \x928\x00\x11\x00\x00\x00\x08\x00\x00\x00\x03\x7f\xd6\xb6\x7f\xeafyA\x1d3\x16\x00\xa4\x81\x00\x00F\xc3\xbc\xc3\x9fe.txt\x00\x01\x00F\xfc\xdfe\x00.txt\x00\xc0<D\xfe\xc8\xef\xbc\xd1\x04I?\xfd\xff\xdbF)]\xe8\xb9\xe1t \x90/\x00\x13\x00\x00\x00\x08\x00\x00\x00\x03\x1a$\x932\xc2]yA\x1d3\r\x00\xa4\x81\x00\x002\\sub-two.txt\x00\xc0\x10\x00S\xec\xcb\x7f\x8b\xa5(\x0b\x01\xcb\xef\xdf\xf6t\x89\x97z\x0eft \x90)\x00\r\x00\x00\x00\r\x00\x00\x00\x03c\x89K\xd3\xc8fyA\x140\x07\x00\xff\xa1\x00\x00symlink\x00\xc02/sub-two.txt\xeb\x86t\xe0\x90#\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\xb9]yA\x140\x01\x00\xedA\x00\x001\x00\xc0\xe0Dt\xe0\x90#\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\xc2]yA\x140\x01\x00\xedA\x00\x002\x00\xc0u\xa1t \x80,\x00\r\x00\x00\x00\r\x00\x00\x00\x03T\xea\x04\xca\xe6\x84yA\x140\x0c\x00\xa4\x81\x00\x00uncompresseduncompressed\n\xda\x10t \x900\x00\x0e\x00\x00\x00\x04\x00\x00\x00\x035K.\xa6\x18\x85yA\x1d5\x0e\x00\xa4\x81\x00\x00max-compressed\x00\xc0\x00\x08\xbf\x08\xae\xf2\xcc\x01s\xf8\xff\xec\x96\xe8\xc4={\x00@\x07\x00")  # noqa }}}
+    stream = BytesIO(b"Rar!\x1a\x07\x00\xcf\x90s\x00\x00\r\x00\x00\x00\x00\x00\x00\x00\x14\xe7z\x00\x80#\x00\x17\x00\x00\x00\r\x00\x00\x00\x03\xc2\xb3\x96o\x00\x00\x00\x00\x1d3\x03\x00\x00\x00\x00\x00CMT\x0c\x00\x8b\xec\x8e\xef\x14\xf6\xe6h\x04\x17\xff\xcd\x0f\xffk9b\x11]^\x80\xd3dt \x90+\x00\x14\x00\x00\x00\x08\x00\x00\x00\x03\xf1\x84\x93\\\xb9]yA\x1d3\t\x00\xa4\x81\x00\x001\\sub-one\x00\xc0\x0c\x00\x8f\xec\x89\xfe.JM\x86\x82\x0c_\xfd\xfd\xd7\x11\x1a\xef@\x9eHt \x80'\x00\x0e\x00\x00\x00\x04\x00\x00\x00\x03\x9f\xa8\x17\xf8\xaf]yA\x1d3\x07\x00\xa4\x81\x00\x00one.txt\x00\x08\xbf\x08\xae\xf3\xca\x87\xfeo\xfe\xd2n\x80-Ht \x82:\x00\x18\x00\x00\x00\x10\x00\x00\x00\x03\xa86\x81\xdf\xf9fyA\x1d3\x1a\x00\xa4\x81\x00\x00\xe8\xaf\xb6\xe6\xaf\x94\xe5\xb1\x81.txt\x00\x8bh\xf6\xd4kA\\.\x00txt\x0c\x00\x8b\xec\x8e\xef\x14\xf6\xe2l\x91\x189\xff\xdf\xfe\xc2\xd3:g\x9a\x19F=cYt \x928\x00\x11\x00\x00\x00\x08\x00\x00\x00\x03\x7f\xd6\xb6\x7f\xeafyA\x1d3\x16\x00\xa4\x81\x00\x00F\xc3\xbc\xc3\x9fe.txt\x00\x01\x00F\xfc\xdfe\x00.txt\x00\xc0<D\xfe\xc8\xef\xbc\xd1\x04I?\xfd\xff\xdbF)]\xe8\xb9\xe1t \x90/\x00\x13\x00\x00\x00\x08\x00\x00\x00\x03\x1a$\x932\xc2]yA\x1d3\r\x00\xa4\x81\x00\x002\\sub-two.txt\x00\xc0\x10\x00S\xec\xcb\x7f\x8b\xa5(\x0b\x01\xcb\xef\xdf\xf6t\x89\x97z\x0eft \x90)\x00\r\x00\x00\x00\r\x00\x00\x00\x03c\x89K\xd3\xc8fyA\x140\x07\x00\xff\xa1\x00\x00symlink\x00\xc02/sub-two.txt\xeb\x86t\xe0\x90#\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\xb9]yA\x140\x01\x00\xedA\x00\x001\x00\xc0\xe0Dt\xe0\x90#\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\xc2]yA\x140\x01\x00\xedA\x00\x002\x00\xc0u\xa1t \x80,\x00\r\x00\x00\x00\r\x00\x00\x00\x03T\xea\x04\xca\xe6\x84yA\x140\x0c\x00\xa4\x81\x00\x00uncompresseduncompressed\n\xda\x10t \x900\x00\x0e\x00\x00\x00\x04\x00\x00\x00\x035K.\xa6\x18\x85yA\x1d5\x0e\x00\xa4\x81\x00\x00max-compressed\x00\xc0\x00\x08\xbf\x08\xae\xf2\xcc\x01s\xf8\xff\xec\x96\xe8\xc4={\x00@\x07\x00")  # noqa: E501
 
     tdata = {
         '1': b'',
diff --git a/src/calibre/utils/winreg/dde.py b/src/calibre/utils/winreg/dde.py
index 38c9fff5a9..3c9f0a5bde 100644
--- a/src/calibre/utils/winreg/dde.py
+++ b/src/calibre/utils/winreg/dde.py
@@ -25,19 +25,19 @@ DML_ERRORS = {
 
     'DATAACKTIMEOUT': (0x4002, 'A request for a synchronous data transaction has timed out.'),
 
-    'DLL_NOT_INITIALIZED': (0x4003, 'A DDEML function was called without first calling the DdeInitialize function, or an invalid instance identifier was passed to a DDEML function.'),  # noqa
+    'DLL_NOT_INITIALIZED': (0x4003, 'A DDEML function was called without first calling the DdeInitialize function, or an invalid instance identifier was passed to a DDEML function.'),  # noqa: E501
 
-    'DLL_USAGE': (0x4004, 'An application initialized as APPCLASS_MONITOR has attempted to perform a DDE transaction, or an application initialized as APPCMD_CLIENTONLY has attempted to perform server transactions.'),  # noqa
+    'DLL_USAGE': (0x4004, 'An application initialized as APPCLASS_MONITOR has attempted to perform a DDE transaction, or an application initialized as APPCMD_CLIENTONLY has attempted to perform server transactions.'),  # noqa: E501
 
     'EXECACKTIMEOUT': (0x4005, 'A request for a synchronous execute transaction has timed out.'),
 
-    'INVALIDPARAMETER': (0x4006, 'An invalid transaction identifier was passed to a DDEML function. Once the application has returned from an XTYP_XACT_COMPLETE callback, the transaction identifier for that callback function is no longer valid.  A parameter failed to be validated by the DDEML. Some of the possible causes follow: The application used a data handle initialized with a different item name handle than was required by the transaction.  The application used a data handle that was initialized with a different clipboard data format than was required by the transaction.  The application used a client-side conversation handle with a server-side function or vice versa.  The application used a freed data handle or string handle.  More than one instance of the application used the same object.'),  # noqa
+    'INVALIDPARAMETER': (0x4006, 'An invalid transaction identifier was passed to a DDEML function. Once the application has returned from an XTYP_XACT_COMPLETE callback, the transaction identifier for that callback function is no longer valid.  A parameter failed to be validated by the DDEML. Some of the possible causes follow: The application used a data handle initialized with a different item name handle than was required by the transaction.  The application used a data handle that was initialized with a different clipboard data format than was required by the transaction.  The application used a client-side conversation handle with a server-side function or vice versa.  The application used a freed data handle or string handle.  More than one instance of the application used the same object.'),  # noqa: E501
 
-    'LOW_MEMORY': (0x4007, 'A DDEML application has created a prolonged race condition (in which the server application outruns the client), causing large amounts of memory to be consumed.'),  # noqa
+    'LOW_MEMORY': (0x4007, 'A DDEML application has created a prolonged race condition (in which the server application outruns the client), causing large amounts of memory to be consumed.'),  # noqa: E501
 
     'MEMORY_ERROR': (0x4008, 'A memory allocation has failed.'),
 
-    'NO_CONV_ESTABLISHED': (0x400a, 'A client\'s attempt to establish a conversation has failed.'),
+    'NO_CONV_ESTABLISHED': (0x400a, "A client's attempt to establish a conversation has failed."),
 
     'NOTPROCESSED': (0x4009, 'A transaction has failed.'),
 
@@ -45,17 +45,17 @@ DML_ERRORS = {
 
     'POSTMSG_FAILED': (0x400c, 'An internal call to the PostMessage function has failed.'),
 
-    'REENTRANCY': (0x400d, 'An application instance with a synchronous transaction already in progress attempted to initiate another synchronous transaction, or the DdeEnableCallback function was called from within a DDEML callback function.'),  # noqa
+    'REENTRANCY': (0x400d, 'An application instance with a synchronous transaction already in progress attempted to initiate another synchronous transaction, or the DdeEnableCallback function was called from within a DDEML callback function.'),  # noqa: E501
 
-    'SERVER_DIED': (0x400e, 'A server-side transaction was attempted on a conversation terminated by the client, or the server terminated before completing a transaction.'),  # noqa
+    'SERVER_DIED': (0x400e, 'A server-side transaction was attempted on a conversation terminated by the client, or the server terminated before completing a transaction.'),  # noqa: E501
 
     'SYS_ERROR': (0x400f, 'An internal error has occurred in the DDEML.'),
 
     'UNADVACKTIMEOUT': (0x4010, 'A request to end an advise transaction has timed out.'),
 
-    'UNFOUND_QUEUE_ID': (0x4011, 'An invalid transaction identifier was passed to a DDEML function. Once the application has returned from an XTYP_XACT_COMPLETE callback, the transaction identifier for that callback function is no longer valid.'),  # noqa
+    'UNFOUND_QUEUE_ID': (0x4011, 'An invalid transaction identifier was passed to a DDEML function. Once the application has returned from an XTYP_XACT_COMPLETE callback, the transaction identifier for that callback function is no longer valid.'),  # noqa: E501
 }
-DML_ERROR_TEXT = {code:text for (code, text) in itervalues(DML_ERRORS)}
+DML_ERROR_TEXT = dict(itervalues(DML_ERRORS))
 
 user32 = windll.user32
 
diff --git a/src/calibre/utils/winreg/lib.py b/src/calibre/utils/winreg/lib.py
index c0cc018d29..bcb0c0144e 100644
--- a/src/calibre/utils/winreg/lib.py
+++ b/src/calibre/utils/winreg/lib.py
@@ -17,7 +17,6 @@ try:
 except ImportError:
     import _winreg as winreg
 
-
 # Binding to C library {{{
 advapi32 = ctypes.windll.advapi32
 HKEY = types.HKEY
@@ -43,7 +42,7 @@ RRF_ZEROONFAILURE = 0x20000000
 
 
 class FILETIME(ctypes.Structure):
-    _fields_ = [("dwLowDateTime", DWORD), ("dwHighDateTime", DWORD)]
+    _fields_ = [('dwLowDateTime', DWORD), ('dwHighDateTime', DWORD)]
 
 
 def default_errcheck(result, func, args):
diff --git a/src/calibre/utils/wmf/__init__.py b/src/calibre/utils/wmf/__init__.py
index 7a912414cd..4e85b1cb73 100644
--- a/src/calibre/utils/wmf/__init__.py
+++ b/src/calibre/utils/wmf/__init__.py
@@ -17,7 +17,6 @@ class NoRaster(Exception):
 
 
 class DIBHeader:
-
     '''
     See http://en.wikipedia.org/wiki/BMP_file_format
     '''
diff --git a/src/calibre/utils/wmf/emf.py b/src/calibre/utils/wmf/emf.py
index 7c5a7c9a05..c136e039df 100644
--- a/src/calibre/utils/wmf/emf.py
+++ b/src/calibre/utils/wmf/emf.py
@@ -14,16 +14,16 @@ from polyglot.builtins import iteritems
 # Record types {{{
 # See: http://msdn.microsoft.com/en-us/library/cc231166.aspx
 RECORD_TYPES = {
-    'EMR_BITBLT' : 0x4C,
-    'EMR_STRETCHBLT' : 0x4D,
-    'EMR_MASKBLT' : 0x4E,
-    'EMR_PLGBLT' : 0x4F,
-    'EMR_SETDIBITSTODEVICE' : 0x50,
-    'EMR_STRETCHDIBITS' : 0x51,
-    'EMR_ALPHABLEND' : 0x72,
-    'EMR_TRANSPARENTBLT' : 0x74,
-    'EOF' : 0xe,
-    'HEADER' : 0x1,
+    'EMR_BITBLT': 0x4C,
+    'EMR_STRETCHBLT': 0x4D,
+    'EMR_MASKBLT': 0x4E,
+    'EMR_PLGBLT': 0x4F,
+    'EMR_SETDIBITSTODEVICE': 0x50,
+    'EMR_STRETCHDIBITS': 0x51,
+    'EMR_ALPHABLEND': 0x72,
+    'EMR_TRANSPARENTBLT': 0x74,
+    'EOF': 0xe,
+    'HEADER': 0x1,
 }
 RECORD_RMAP = {v:k for k, v in iteritems(RECORD_TYPES)}
 
diff --git a/src/calibre/utils/wmf/parse.py b/src/calibre/utils/wmf/parse.py
index 522ef4ad15..7d23c26fd6 100644
--- a/src/calibre/utils/wmf/parse.py
+++ b/src/calibre/utils/wmf/parse.py
@@ -12,7 +12,6 @@ from calibre.utils.wmf import create_bmp_from_dib, to_png
 
 
 class WMFHeader:
-
     '''
     For header documentation, see
     http://www.skynet.ie/~caolan/publink/libwmf/libwmf/doc/ora-wmf.html
diff --git a/src/calibre/utils/wordcount.py b/src/calibre/utils/wordcount.py
index 61b7440208..7b6b2daa31 100644
--- a/src/calibre/utils/wordcount.py
+++ b/src/calibre/utils/wordcount.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 
-"""
+'''
 Get word, character, and Asian character counts
 
 1. Get a word count as a dictionary:
@@ -22,15 +22,15 @@ properties counted:
 Sourced from:
 http://ginstrom.com/scribbles/2008/05/17/counting-words-etc-in-an-html-file-with-python/
 http://ginstrom.com/scribbles/2007/10/06/counting-words-characters-and-asian-characters-with-python/
-"""
+'''
 __version__ = 0.1
-__author__ = "Ryan Ginstrom"
+__author__ = 'Ryan Ginstrom'
 
 IDEOGRAPHIC_SPACE = 0x3000
 
 
 def is_asian(char):
-    """Is the character Asian?"""
+    '''Is the character Asian?'''
 
     # 0x3000 is ideographic space (i.e. double-byte space)
     # Anything over is an Asian character
@@ -38,18 +38,18 @@ def is_asian(char):
 
 
 def filter_jchars(c):
-    """Filters Asian characters to spaces"""
+    '''Filters Asian characters to spaces'''
     if is_asian(c):
         return ' '
     return c
 
 
 def nonj_len(word):
-    """Returns number of non-Asian words in {word}
+    '''Returns number of non-Asian words in {word}
     - 日本語AアジアンB -> 2
     - hello -> 1
     @param word: A word, possibly containing Asian characters
-    """
+    '''
     # Here are the steps:
     # 本spam日eggs
     # -> [' ', 's', 'p', 'a', 'm', ' ', 'e', 'g', 'g', 's']
@@ -61,26 +61,26 @@ def nonj_len(word):
 
 
 def get_wordcount(text):
-    """Get the word/character count for text
+    '''Get the word/character count for text
 
     @param text: The text of the segment
-    """
+    '''
 
     characters = len(text)
     chars_no_spaces = sum(not x.isspace() for x in text)
-    asian_chars =  sum(is_asian(x) for x in text)
+    asian_chars = sum(is_asian(x) for x in text)
     non_asian_words = nonj_len(text)
     words = non_asian_words + asian_chars
 
-    return dict(characters=characters,
-                chars_no_spaces=chars_no_spaces,
-                asian_chars=asian_chars,
-                non_asian_words=non_asian_words,
-                words=words)
+    return {'characters': characters,
+            'chars_no_spaces': chars_no_spaces,
+            'asian_chars': asian_chars,
+            'non_asian_words': non_asian_words,
+            'words': words}
 
 
 def dict2obj(dictionary):
-    """Transform a dictionary into an object"""
+    '''Transform a dictionary into an object'''
     class Obj:
 
         def __init__(self, dictionary):
@@ -89,5 +89,5 @@ def dict2obj(dictionary):
 
 
 def get_wordcount_obj(text):
-    """Get the wordcount as an object rather than a dictionary"""
+    '''Get the wordcount as an object rather than a dictionary'''
     return dict2obj(get_wordcount(text))
diff --git a/src/calibre/utils/zipfile.py b/src/calibre/utils/zipfile.py
index 03c57bc7c6..377d2d1805 100644
--- a/src/calibre/utils/zipfile.py
+++ b/src/calibre/utils/zipfile.py
@@ -1,7 +1,7 @@
-"""
+'''
 Read and write ZIP files. Modified by Kovid Goyal to support replacing files in
 a zip archive, detecting filename encoding, updating zip files, etc.
-"""
+'''
 import binascii
 import io
 import os
@@ -26,8 +26,17 @@ except ImportError:
     zlib = None
     crc32 = binascii.crc32
 
-__all__ = ["BadZipfile", "error", "ZIP_STORED", "ZIP_DEFLATED", "is_zipfile",
-           "ZipInfo", "ZipFile", "PyZipFile", "LargeZipFile"]
+__all__ = [
+    'ZIP_DEFLATED',
+    'ZIP_STORED',
+    'BadZipfile',
+    'LargeZipFile',
+    'PyZipFile',
+    'ZipFile',
+    'ZipInfo',
+    'error',
+    'is_zipfile',
+]
 
 
 def decode_zip_internal_file_name(fname, flags):
@@ -40,11 +49,10 @@ class BadZipfile(Exception):
 
 
 class LargeZipFile(Exception):
-
-    """
+    '''
     Raised when writing a zipfile, the zipfile requires ZIP64 extensions
     and those extensions are disabled.
-    """
+    '''
 
 
 error = BadZipfile      # The exception raised by this module
@@ -67,8 +75,8 @@ ZIP_DEFLATED = 8
 
 # The "end of central directory" structure, magic number, size, and indices
 # (section V.I in the format document)
-structEndArchive = "<4s4H2LH"
-stringEndArchive = b"PK\005\006"
+structEndArchive = '<4s4H2LH'
+stringEndArchive = b'PK\005\006'
 sizeEndCentDir = struct.calcsize(structEndArchive)
 
 _ECD_SIGNATURE = 0
@@ -86,8 +94,8 @@ _ECD_LOCATION = 9
 
 # The "central directory" structure, magic number, size, and indices
 # of entries in the structure (section V.F in the format document)
-structCentralDir = "<4s4B4HL2L5H2L"
-stringCentralDir = b"PK\001\002"
+structCentralDir = '<4s4B4HL2L5H2L'
+stringCentralDir = b'PK\001\002'
 sizeCentralDir = struct.calcsize(structCentralDir)
 
 # indexes of entries in the central directory structure
@@ -113,8 +121,8 @@ _CD_LOCAL_HEADER_OFFSET = 18
 
 # The "local file header" structure, magic number, size, and indices
 # (section V.A in the format document)
-structFileHeader = "<4s2B4HL2L2H"
-stringFileHeader = b"PK\003\004"
+structFileHeader = '<4s2B4HL2L2H'
+stringFileHeader = b'PK\003\004'
 sizeFileHeader = struct.calcsize(structFileHeader)
 
 _FH_SIGNATURE = 0
@@ -131,14 +139,14 @@ _FH_FILENAME_LENGTH = 10
 _FH_EXTRA_FIELD_LENGTH = 11
 
 # The "Zip64 end of central directory locator" structure, magic number, and size
-structEndArchive64Locator = "<4sLQL"
-stringEndArchive64Locator = b"PK\x06\x07"
+structEndArchive64Locator = '<4sLQL'
+stringEndArchive64Locator = b'PK\x06\x07'
 sizeEndCentDir64Locator = struct.calcsize(structEndArchive64Locator)
 
 # The "Zip64 end of central directory" record, magic number, size, and indices
 # (section V.G in the format document)
-structEndArchive64 = "<4sQ2H2L4Q"
-stringEndArchive64 = b"PK\x06\x06"
+structEndArchive64 = '<4sQ2H2L4Q'
+stringEndArchive64 = b'PK\x06\x06'
 sizeEndCentDir64 = struct.calcsize(structEndArchive64)
 
 _CD64_SIGNATURE = 0
@@ -166,9 +174,8 @@ def decode_arcname(name):
                 name = name.decode('utf-8', 'replace')
     return name
 
-# Added by Kovid to reset timestamp to default if it overflows the DOS
-# limits
 
+# Added by Kovid to reset timestamp to default if it overflows the DOS limits
 
 def fixtimevar(val):
     if val < 0 or val > 0xffff:
@@ -186,16 +193,16 @@ def _check_zipfile(fp):
 
 
 def is_zipfile(filename):
-    """Quickly see if a file is a ZIP file by checking the magic number.
+    '''Quickly see if a file is a ZIP file by checking the magic number.
 
     The filename argument may be a file or file-like object too.
-    """
+    '''
     result = False
     try:
-        if hasattr(filename, "read"):
+        if hasattr(filename, 'read'):
             result = _check_zipfile(filename)
         else:
-            with open(filename, "rb") as fp:
+            with open(filename, 'rb') as fp:
                 result = _check_zipfile(fp)
     except OSError:
         pass
@@ -203,9 +210,9 @@ def is_zipfile(filename):
 
 
 def _EndRecData64(fpin, offset, endrec):
-    """
+    '''
     Read the ZIP64 end-of-archive records and use that to update endrec
-    """
+    '''
     try:
         fpin.seek(offset - sizeEndCentDir64Locator, 2)
     except OSError:
@@ -219,7 +226,7 @@ def _EndRecData64(fpin, offset, endrec):
         return endrec
 
     if diskno != 0 or disks != 1:
-        raise BadZipfile("zipfiles that span multiple disks are not supported")
+        raise BadZipfile('zipfiles that span multiple disks are not supported')
 
     # Assume no 'zip64 extensible data'
     fpin.seek(offset - sizeEndCentDir64Locator - sizeEndCentDir64, 2)
@@ -242,10 +249,10 @@ def _EndRecData64(fpin, offset, endrec):
 
 
 def _EndRecData(fpin):
-    """Return data from the "End of Central Directory" record, or None.
+    '''Return data from the "End of Central Directory" record, or None.
 
     The data is a list of the nine items in the ZIP "End of central dir"
-    record followed by a tenth item, the file seek offset of this record."""
+    record followed by a tenth item, the file seek offset of this record.'''
 
     # Determine file size
     fpin.seek(0, 2)
@@ -259,13 +266,13 @@ def _EndRecData(fpin):
     except OSError:
         return None
     data = fpin.read()
-    if data[0:4] == stringEndArchive and data[-2:] == b"\000\000":
+    if data[0:4] == stringEndArchive and data[-2:] == b'\000\000':
         # the signature is correct and there's no comment, unpack structure
         endrec = struct.unpack(structEndArchive, data)
         endrec=list(endrec)
 
         # Append a blank comment and record start offset
-        endrec.append(b"")
+        endrec.append(b'')
         endrec.append(filesize - sizeEndCentDir)
 
         # Try to read the "Zip64 end of central directory" structure
@@ -300,34 +307,33 @@ def _EndRecData(fpin):
     return
 
 
-class ZipInfo :
-
-    """Class with attributes describing each file in the ZIP archive."""
+class ZipInfo:
+    '''Class with attributes describing each file in the ZIP archive.'''
 
     __slots__ = (
-            'orig_filename',
-            'filename',
-            'date_time',
-            'compress_type',
-            'comment',
-            'extra',
-            'create_system',
-            'create_version',
-            'extract_version',
-            'reserved',
-            'flag_bits',
-            'volume',
-            'internal_attr',
-            'external_attr',
-            'header_offset',
-            'CRC',
-            'compress_size',
-            'file_size',
-            '_raw_time',
-            'file_offset',
-        )
+        'CRC',
+        '_raw_time',
+        'comment',
+        'compress_size',
+        'compress_type',
+        'create_system',
+        'create_version',
+        'date_time',
+        'external_attr',
+        'extra',
+        'extract_version',
+        'file_offset',
+        'file_size',
+        'filename',
+        'flag_bits',
+        'header_offset',
+        'internal_attr',
+        'orig_filename',
+        'reserved',
+        'volume',
+    )
 
-    def __init__(self, filename="NoName", date_time=(1980,1,1,0,0,0)):
+    def __init__(self, filename='NoName', date_time=(1980,1,1,0,0,0)):
         self.orig_filename = filename   # Original file name in archive
 
         # Terminate the file name at the first null byte.  Null bytes in file
@@ -349,8 +355,8 @@ class ZipInfo :
         self.date_time = date_time      # year, month, day, hour, min, sec
         # Standard values:
         self.compress_type = ZIP_STORED  # Type of compression for the file
-        self.comment = b""               # Comment for each file
-        self.extra = b""                 # ZIP extra data
+        self.comment = b''               # Comment for each file
+        self.extra = b''                 # ZIP extra data
         if sys.platform == 'win32':
             self.create_system = 0          # System which created ZIP archive
         else:
@@ -371,7 +377,7 @@ class ZipInfo :
         # file_size             Size of the uncompressed file
 
     def FileHeader(self):
-        """Return the per-file header as a string."""
+        '''Return the per-file header as a string.'''
         dt = self.date_time
         dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2]
         dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2)
@@ -427,7 +433,7 @@ class ZipInfo :
                 elif ln == 0:
                     counts = ()
                 else:
-                    raise RuntimeError("Corrupt extra field %s"%(ln,))
+                    raise RuntimeError('Corrupt extra field %s'%(ln,))
 
                 idx = 0
 
@@ -448,8 +454,7 @@ class ZipInfo :
 
 
 class _ZipDecrypter:
-
-    """Class to handle decryption of files stored within a ZIP archive.
+    '''Class to handle decryption of files stored within a ZIP archive.
 
     ZIP supports a password-based form of encryption. Even though known
     plaintext attacks have been found against it, it is still useful
@@ -459,15 +464,15 @@ class _ZipDecrypter:
         zd = _ZipDecrypter(mypwd)
         plain_char = zd(cypher_char)
         plain_text = map(zd, cypher_text)
-    """
+    '''
 
     def _GenerateCRCTable():
-        """Generate a CRC-32 table.
+        '''Generate a CRC-32 table.
 
         ZIP encryption uses the CRC32 one-byte primitive for scrambling some
         internal keys. We noticed that a direct implementation is faster than
         relying on binascii.crc32().
-        """
+        '''
         poly = 0xedb88320
         table = [0] * 256
         for i in range(256):
@@ -482,7 +487,7 @@ class _ZipDecrypter:
     crctable = _GenerateCRCTable()
 
     def _crc32(self, ch, crc):
-        """Compute the CRC32 primitive on one byte."""
+        '''Compute the CRC32 primitive on one byte.'''
         return ((crc >> 8) & 0xffffff) ^ self.crctable[(crc ^ ch) & 0xff]
 
     def __init__(self, pwd):
@@ -499,7 +504,7 @@ class _ZipDecrypter:
         self.key2 = self._crc32(((self.key1 >> 24) & 255), self.key2)
 
     def __call__(self, c):
-        """Decrypt a single byte."""
+        '''Decrypt a single byte.'''
         k = self.key2 | 2
         c = c ^ (((k * (k^1)) >> 8) & 255)
         self._UpdateKeys(c)
@@ -507,10 +512,9 @@ class _ZipDecrypter:
 
 
 class ZipExtFile(io.BufferedIOBase):
-
-    """File-like object for reading an archive member.
+    '''File-like object for reading an archive member.
        Is returned by ZipFile.open().
-    """
+    '''
 
     # Max size supported by decompressor.
     MAX_N = 1 << 31 - 1
@@ -555,10 +559,10 @@ class ZipExtFile(io.BufferedIOBase):
             self._expected_crc = None
 
     def readline(self, limit=-1):
-        """Read and return a line from the stream.
+        '''Read and return a line from the stream.
 
         If limit is specified, at most limit bytes will be read.
-        """
+        '''
 
         if not self._universal and limit < 0:
             # Shortcut common case - newline found in buffer.
@@ -605,7 +609,7 @@ class ZipExtFile(io.BufferedIOBase):
         return line
 
     def peek(self, n=1):
-        """Returns buffered bytes without advancing the position."""
+        '''Returns buffered bytes without advancing the position.'''
         if n > len(self._readbuffer) - self._offset:
             chunk = self.read(n)
             self._offset -= len(chunk)
@@ -617,9 +621,9 @@ class ZipExtFile(io.BufferedIOBase):
         return True
 
     def read(self, n=-1):
-        """Read and return up to n bytes.
+        '''Read and return up to n bytes.
         If the argument is omitted, None, or negative, data is read and returned until EOF is reached..
-        """
+        '''
         buf = b''
         if n is None:
             n = -1
@@ -642,10 +646,10 @@ class ZipExtFile(io.BufferedIOBase):
         self._running_crc = crc32(newdata, self._running_crc) & 0xffffffff
         # Check the CRC if we're at the end of the file
         if eof and self._running_crc != self._expected_crc:
-            raise BadZipfile("Bad CRC-32 for file %r" % self.name)
+            raise BadZipfile('Bad CRC-32 for file %r' % self.name)
 
     def read1(self, n):
-        """Read up to n bytes with at most one read() system call."""
+        '''Read up to n bytes with at most one read() system call.'''
 
         # Simplify algorithm (branching) by transforming negative n to large n.
         if n < 0 or n is None:
@@ -711,8 +715,7 @@ class ZipExtFile(io.BufferedIOBase):
 
 
 class ZipFile:
-
-    """ Class with methods to open, read, write, close, list and update zip files.
+    ''' Class with methods to open, read, write, close, list and update zip files.
 
     z = ZipFile(file, mode="r", compression=ZIP_STORED, allowZip64=False)
 
@@ -724,13 +727,13 @@ class ZipFile:
                 needed, otherwise it will raise an exception when this would
                 be necessary.
 
-    """
+    '''
 
     fp = None                   # Set here since __del__ checks it
 
-    def __init__(self, file, mode="r", compression=ZIP_DEFLATED, allowZip64=True):
-        """Open the ZIP file with mode read "r", write "w" or append "a"."""
-        if mode not in ("r", "w", "a"):
+    def __init__(self, file, mode='r', compression=ZIP_DEFLATED, allowZip64=True):
+        '''Open the ZIP file with mode read "r", write "w" or append "a".'''
+        if mode not in ('r', 'w', 'a'):
             raise RuntimeError('ZipFile() requires mode "r", "w", or "a" not %s'%mode)
 
         if compression == ZIP_STORED:
@@ -738,9 +741,9 @@ class ZipFile:
         elif compression == ZIP_DEFLATED:
             if not zlib:
                 raise RuntimeError(
-                      "Compression requires the (missing) zlib module")
+                      'Compression requires the (missing) zlib module')
         else:
-            raise RuntimeError("The compression method %s is not supported" % compression)
+            raise RuntimeError('The compression method %s is not supported' % compression)
 
         self._allowZip64 = allowZip64
         self._didModify = False
@@ -756,7 +759,7 @@ class ZipFile:
         if isinstance(file, string_or_bytes):
             self._filePassed = 0
             self.filename = file
-            modeDict = {'r' : 'rb', 'w': 'wb', 'a' : 'r+b'}
+            modeDict = {'r': 'rb', 'w': 'wb', 'a': 'r+b'}
             try:
                 self.fp = open(file, modeDict[mode])
             except OSError:
@@ -803,8 +806,8 @@ class ZipFile:
         self.close()
 
     def _GetContents(self):
-        """Read the directory, making sure we close the file if the format
-        is bad."""
+        '''Read the directory, making sure we close the file if the format
+        is bad.'''
         try:
             self._RealGetContents()
         except BadZipfile:
@@ -814,14 +817,14 @@ class ZipFile:
             raise
 
     def _RealGetContents(self):
-        """Read in the table of contents for the ZIP file."""
+        '''Read in the table of contents for the ZIP file.'''
         fp = self.fp
         try:
             endrec = _EndRecData(fp)
         except OSError:
-            raise BadZipfile("File is not a zip file")
+            raise BadZipfile('File is not a zip file')
         if not endrec:
-            raise BadZipfile("File is not a zip file")
+            raise BadZipfile('File is not a zip file')
         if self.debug > 1:
             print(endrec)
         size_cd = endrec[_ECD_SIZE]             # bytes in central directory
@@ -836,7 +839,7 @@ class ZipFile:
 
         if self.debug > 2:
             inferred = concat + offset_cd
-            print("given, inferred, offset", offset_cd, inferred, concat)
+            print('given, inferred, offset', offset_cd, inferred, concat)
         # self.start_dir:  Position of start of central directory
         self.start_dir = offset_cd + concat
         fp.seek(self.start_dir, 0)
@@ -846,7 +849,7 @@ class ZipFile:
         while total < size_cd:
             centdir = fp.read(sizeCentralDir)
             if centdir[0:4] != stringCentralDir:
-                raise BadZipfile("Bad magic number for central directory")
+                raise BadZipfile('Bad magic number for central directory')
             centdir = struct.unpack(structCentralDir, centdir)
             if self.debug > 2:
                 print(centdir)
@@ -878,14 +881,14 @@ class ZipFile:
                      centdir[_CD_COMMENT_LENGTH])
 
             if self.debug > 2:
-                print("total", total)
+                print('total', total)
 
     def _calculate_file_offsets(self):
         for zip_info in self.filelist:
             self.fp.seek(zip_info.header_offset, 0)
             fheader = self.fp.read(30)
             if fheader[0:4] != stringFileHeader:
-                raise BadZipfile("Bad magic number for file header")
+                raise BadZipfile('Bad magic number for file header')
             fheader = struct.unpack(structFileHeader, fheader)
             # file_offset is computed here, since the extra field for
             # the central directory and for the local file header
@@ -904,8 +907,8 @@ class ZipFile:
             zip_info.file_offset = file_offset
 
     def replace(self, filename, arcname=None, compress_type=None):
-        """Delete arcname, and put the bytes from filename into the
-        archive under the name arcname."""
+        '''Delete arcname, and put the bytes from filename into the
+        archive under the name arcname.'''
         deleteName = arcname
         if deleteName is None:
             deleteName = filename
@@ -913,18 +916,18 @@ class ZipFile:
         self.write(filename, arcname, compress_type)
 
     def replacestr(self, zinfo, byts):
-        """Delete zinfo.filename, and write a new file into the archive. The
-        contents is the string 'bytes'."""
+        '''Delete zinfo.filename, and write a new file into the archive. The
+        contents is the string 'bytes'.'''
         self.delete(zinfo.filename)
         self.writestr(zinfo, byts)
 
     def delete(self, name):
-        """Delete the file from the archive. If it appears multiple
-        times only the first instance will be deleted."""
-        for i in range(0, len(self.filelist)):
+        '''Delete the file from the archive. If it appears multiple
+        times only the first instance will be deleted.'''
+        for i in range(len(self.filelist)):
             if self.filelist[i].filename == name:
                 if self.debug:
-                    print("Removing", name)
+                    print('Removing', name)
                 deleted_offset = self.filelist[i].header_offset
                 deleted_size   = (self.filelist[i].file_offset - self.filelist[i].header_offset) + self.filelist[i].compress_size
                 zinfo_size = struct.calcsize(structCentralDir) + len(self.filelist[i].filename) + len(self.filelist[i].extra)
@@ -953,42 +956,42 @@ class ZipFile:
                 self._didModify = True
                 return
         if self.debug:
-            print(name, "not in archive")
+            print(name, 'not in archive')
 
     def namelist(self):
-        """Return a list of file names in the archive."""
+        '''Return a list of file names in the archive.'''
         l = []
         for data in self.filelist:
             l.append(data.filename)
         return l
 
     def infolist(self):
-        """Return a list of class ZipInfo instances for files in the
-        archive."""
+        '''Return a list of class ZipInfo instances for files in the
+        archive.'''
         return self.filelist
 
     def printdir(self):
-        """Print a table of contents for the zip file."""
-        print("%-46s %19s %12s" % ("File Name", "Modified    ", "Size"))
+        '''Print a table of contents for the zip file.'''
+        print('%-46s %19s %12s' % ('File Name', 'Modified    ', 'Size'))
         for zinfo in self.filelist:
-            date = "%d-%02d-%02d %02d:%02d:%02d" % zinfo.date_time[:6]
-            print("%-46s %s %12d" % (zinfo.filename, date, zinfo.file_size))
+            date = '%d-%02d-%02d %02d:%02d:%02d' % zinfo.date_time[:6]
+            print('%-46s %s %12d' % (zinfo.filename, date, zinfo.file_size))
 
     def testzip(self):
-        """Read all the files and check the CRC."""
+        '''Read all the files and check the CRC.'''
         chunk_size = 2 ** 20
         for zinfo in self.filelist:
             try:
                 # Read by chunks, to avoid an OverflowError or a
                 # MemoryError with very large embedded files.
-                f = self.open(zinfo.filename, "r")
+                f = self.open(zinfo.filename, 'r')
                 while f.read(chunk_size):     # Check CRC-32
                     pass
             except BadZipfile:
                 return zinfo.filename
 
     def getinfo(self, name):
-        """Return the instance of ZipInfo given 'name'."""
+        '''Return the instance of ZipInfo given 'name'.'''
         info = self.NameToInfo.get(name)
         if info is None:
             raise KeyError(
@@ -997,25 +1000,25 @@ class ZipFile:
         return info
 
     def setpassword(self, pwd):
-        """Set default password for encrypted files."""
+        '''Set default password for encrypted files.'''
         self.pwd = pwd
 
     def read(self, name, pwd=None):
-        """Return file bytes (as a string) for name."""
-        return self.open(name, "r", pwd).read()
+        '''Return file bytes (as a string) for name.'''
+        return self.open(name, 'r', pwd).read()
 
-    def read_raw(self, name, mode="r", pwd=None):
-        """Return the raw bytes in the zipfile corresponding to name."""
+    def read_raw(self, name, mode='r', pwd=None):
+        '''Return the raw bytes in the zipfile corresponding to name.'''
         zef = self.open(name, mode=mode, pwd=pwd)
         return zef.read_raw()
 
-    def open(self, name, mode="r", pwd=None):
-        """Return file-like object for 'name'."""
-        if mode not in ("r", "U", "rU"):
+    def open(self, name, mode='r', pwd=None):
+        '''Return file-like object for 'name'.'''
+        if mode not in ('r', 'U', 'rU'):
             raise RuntimeError('open() requires mode "r", "U", or "rU"')
         if not self.fp:
             raise RuntimeError(
-                  "Attempt to read ZIP archive that was already closed")
+                  'Attempt to read ZIP archive that was already closed')
 
         # Only open a new file for instances where we were not
         # given a file object in the constructor
@@ -1037,7 +1040,7 @@ class ZipFile:
         # Skip the file header:
         fheader = zef_file.read(sizeFileHeader)
         if fheader[0:4] != stringFileHeader:
-            raise BadZipfile("Bad magic number for file header")
+            raise BadZipfile('Bad magic number for file header')
 
         fheader = struct.unpack(structFileHeader, fheader)
         fname = zef_file.read(fheader[_FH_FILENAME_LENGTH])
@@ -1049,9 +1052,9 @@ class ZipFile:
             print(('WARNING: Header (%r) and directory (%r) filenames do not'
                     ' match inside ZipFile')%(fname, zinfo.orig_filename))
             print('Using directory filename %r'%zinfo.orig_filename)
-            # raise BadZipfile, \
+            # raise BadZipfile(
             #          'File name in directory "%r" and header "%r" differ.' % (
-            #              zinfo.orig_filename, fname)
+            #              zinfo.orig_filename, fname))
 
         # check for encrypted flag & handle password
         is_encrypted = zinfo.flag_bits & 0x1
@@ -1060,15 +1063,15 @@ class ZipFile:
             if not pwd:
                 pwd = self.pwd
             if not pwd:
-                raise RuntimeError(("File %s is encrypted, "
-                      "password required for extraction") % name)
+                raise RuntimeError(('File %s is encrypted, '
+                      'password required for extraction') % name)
 
             zd = _ZipDecrypter(pwd)
             # The first 12 bytes in the cypher stream is an encryption header
-            #  used to strengthen the algorithm. The first 11 bytes are
-            #  completely random, while the 12th contains the MSB of the CRC,
-            #  or the MSB of the file time depending on the header type
-            #  and is used to check the correctness of the password.
+            # used to strengthen the algorithm. The first 11 bytes are
+            # completely random, while the 12th contains the MSB of the CRC,
+            # or the MSB of the file time depending on the header type
+            # and is used to check the correctness of the password.
             byts = zef_file.read(12)
             h = list(map(zd, bytearray(byts[0:12])))
             if zinfo.flag_bits & 0x8:
@@ -1078,16 +1081,16 @@ class ZipFile:
                 # compare against the CRC otherwise
                 check_byte = (zinfo.CRC >> 24) & 0xff
             if h[11] != check_byte:
-                raise RuntimeError("Bad password for file", name)
+                raise RuntimeError('Bad password for file', name)
 
         return ZipExtFile(zef_file, mode, zinfo, zd)
 
     def extract(self, member, path=None, pwd=None):
-        """Extract a member from the archive to the current working directory,
+        '''Extract a member from the archive to the current working directory,
            using its full name. Its file information is extracted as accurately
            as possible. `member' may be a filename or a ZipInfo object. You can
            specify a different directory using `path'.
-        """
+        '''
         if not isinstance(member, ZipInfo):
             member = self.getinfo(member)
 
@@ -1097,11 +1100,11 @@ class ZipFile:
         return self._extract_member(member, path, pwd)
 
     def extractall(self, path=None, members=None, pwd=None):
-        """Extract all members from the archive to the current working
+        '''Extract all members from the archive to the current working
            directory. `path' specifies a different directory to extract to.
            `members' is optional and must be a subset of the list returned
            by namelist().
-        """
+        '''
         if members is None:
             members = self.namelist()
 
@@ -1113,9 +1116,9 @@ class ZipFile:
             self.extract(zipinfo, path, pwd)
 
     def _extract_member(self, member, targetpath, pwd):
-        """Extract the ZipInfo object 'member' to a physical
+        '''Extract the ZipInfo object 'member' to a physical
            file on the path targetpath.
-        """
+        '''
         # build the destination pathname, replacing
         # forward slashes to platform specific separators.
         # Strip trailing path separator, unless it represents the root.
@@ -1184,34 +1187,34 @@ class ZipFile:
         return targetpath
 
     def _writecheck(self, zinfo):
-        """Check for errors before writing a file to the archive."""
+        '''Check for errors before writing a file to the archive.'''
         if zinfo.filename in self.NameToInfo:
             if self.debug:      # Warning for duplicate names
-                print("Duplicate name:", zinfo.filename)
-        if self.mode not in ("w", "a"):
+                print('Duplicate name:', zinfo.filename)
+        if self.mode not in ('w', 'a'):
             raise RuntimeError('write() requires mode "w" or "a"')
         if not self.fp:
             raise RuntimeError(
-                  "Attempt to write ZIP archive that was already closed")
+                  'Attempt to write ZIP archive that was already closed')
         if zinfo.compress_type == ZIP_DEFLATED and not zlib:
             raise RuntimeError(
-                  "Compression requires the (missing) zlib module")
+                  'Compression requires the (missing) zlib module')
         if zinfo.compress_type not in (ZIP_STORED, ZIP_DEFLATED):
             raise RuntimeError(
-                  "The compression method %s is not supported" % zinfo.compress_type)
+                  'The compression method %s is not supported' % zinfo.compress_type)
         if zinfo.file_size > ZIP64_LIMIT:
             if not self._allowZip64:
-                raise LargeZipFile("Filesize would require ZIP64 extensions")
+                raise LargeZipFile('Filesize would require ZIP64 extensions')
         if zinfo.header_offset > ZIP64_LIMIT:
             if not self._allowZip64:
-                raise LargeZipFile("Zipfile size would require ZIP64 extensions")
+                raise LargeZipFile('Zipfile size would require ZIP64 extensions')
 
     def write(self, filename, arcname=None, compress_type=None):
-        """Put the bytes from filename into the archive under the name
-        arcname."""
+        '''Put the bytes from filename into the archive under the name
+        arcname.'''
         if not self.fp:
             raise RuntimeError(
-                  "Attempt to write to ZIP archive that was already closed")
+                  'Attempt to write to ZIP archive that was already closed')
 
         st = os.stat(filename)
         isdir = stat.S_ISDIR(st.st_mode)
@@ -1252,7 +1255,7 @@ class ZipFile:
             self.fp.write(zinfo.FileHeader())
             return
 
-        with open(filename, "rb") as fp:
+        with open(filename, 'rb') as fp:
             # Must overwrite CRC and sizes with correct data later
             zinfo.CRC = CRC = 0
             zinfo.compress_size = compress_size = 0
@@ -1285,7 +1288,7 @@ class ZipFile:
         # Seek backwards and write CRC and file sizes
         position = self.fp.tell()       # Preserve current position in file
         self.fp.seek(zinfo.header_offset + 14, 0)
-        self.fp.write(struct.pack("<LLL", zinfo.CRC, zinfo.compress_size,
+        self.fp.write(struct.pack('<LLL', zinfo.CRC, zinfo.compress_size,
               zinfo.file_size))
         self.fp.seek(position, 0)
         self.filelist.append(zinfo)
@@ -1293,9 +1296,9 @@ class ZipFile:
 
     def writestr(self, zinfo_or_arcname, byts, permissions=0o600,
             compression=ZIP_DEFLATED, raw_bytes=False):
-        """Write a file into the archive.  The contents is the string
+        '''Write a file into the archive.  The contents is the string
         'byts'.  'zinfo_or_arcname' is either a ZipInfo instance or
-        the name of the file in the archive."""
+        the name of the file in the archive.'''
         assert not raw_bytes or (raw_bytes and
                 isinstance(zinfo_or_arcname, ZipInfo))
         if not isinstance(byts, bytes):
@@ -1312,7 +1315,7 @@ class ZipFile:
 
         if not self.fp:
             raise RuntimeError(
-                  "Attempt to write to ZIP archive that was already closed")
+                  'Attempt to write to ZIP archive that was already closed')
 
         if not raw_bytes:
             zinfo.file_size = len(byts)            # Uncompressed size
@@ -1334,7 +1337,7 @@ class ZipFile:
         self.fp.flush()
         if zinfo.flag_bits & 0x08:
             # Write CRC and file sizes after the file data
-            self.fp.write(struct.pack("<LLL", zinfo.CRC, zinfo.compress_size,
+            self.fp.write(struct.pack('<LLL', zinfo.CRC, zinfo.compress_size,
                   zinfo.file_size))
         self.filelist.append(zinfo)
         self.NameToInfo[zinfo.filename] = zinfo
@@ -1357,16 +1360,16 @@ class ZipFile:
                 self.write(f, arcname)
 
     def __del__(self):
-        """Call the "close()" method in case the user forgot."""
+        '''Call the "close()" method in case the user forgot.'''
         self.close()
 
     def close(self):
-        """Close the file, and for mode "w" and "a" write the ending
-        records."""
+        '''Close the file, and for mode "w" and "a" write the ending
+        records.'''
         if self.fp is None:
             return
 
-        if self.mode in ("w", "a") and self._didModify:  # write ending records
+        if self.mode in ('w', 'a') and self._didModify:  # write ending records
             count = 0
             pos1 = self.fp.tell()
             for zinfo in self.filelist:         # write central directory
@@ -1525,11 +1528,10 @@ def safe_replace(zipstream, name, datastream, extra_replacements={},
 
 
 class PyZipFile(ZipFile):
+    '''Class to create ZIP archives with Python library files and packages.'''
 
-    """Class to create ZIP archives with Python library files and packages."""
-
-    def writepy(self, pathname, basename=""):
-        """Add all files from "pathname" to the ZIP archive.
+    def writepy(self, pathname, basename=''):
+        '''Add all files from "pathname" to the ZIP archive.
 
         If pathname is a package directory, search the directory and
         all package subdirectories recursively for all *.py and enter
@@ -1539,70 +1541,70 @@ class PyZipFile(ZipFile):
         archive.  Added modules are always module.pyo or module.pyc.
         This method will compile the module.py into module.pyc if
         necessary.
-        """
+        '''
         dir, name = os.path.split(pathname)
         if os.path.isdir(pathname):
-            initname = os.path.join(pathname, "__init__.py")
+            initname = os.path.join(pathname, '__init__.py')
             if os.path.isfile(initname):
                 # This is a package directory, add it
                 if basename:
-                    basename = f"{basename}/{name}"
+                    basename = f'{basename}/{name}'
                 else:
                     basename = name
                 if self.debug:
-                    print("Adding package in", pathname, "as", basename)
+                    print('Adding package in', pathname, 'as', basename)
                 fname, arcname = self._get_codename(initname[0:-3], basename)
                 if self.debug:
-                    print("Adding", arcname)
+                    print('Adding', arcname)
                 self.write(fname, arcname)
                 dirlist = os.listdir(pathname)
-                dirlist.remove("__init__.py")
+                dirlist.remove('__init__.py')
                 # Add all *.py files and package subdirectories
                 for filename in dirlist:
                     path = os.path.join(pathname, filename)
                     ext = os.path.splitext(filename)[-1]
                     if os.path.isdir(path):
-                        if os.path.isfile(os.path.join(path, "__init__.py")):
+                        if os.path.isfile(os.path.join(path, '__init__.py')):
                             # This is a package directory, add it
                             self.writepy(path, basename)  # Recursive call
-                    elif ext == ".py":
+                    elif ext == '.py':
                         fname, arcname = self._get_codename(path[0:-3],
                                          basename)
                         if self.debug:
-                            print("Adding", arcname)
+                            print('Adding', arcname)
                         self.write(fname, arcname)
             else:
                 # This is NOT a package directory, add its files at top level
                 if self.debug:
-                    print("Adding files from directory", pathname)
+                    print('Adding files from directory', pathname)
                 for filename in os.listdir(pathname):
                     path = os.path.join(pathname, filename)
                     ext = os.path.splitext(filename)[-1]
-                    if ext == ".py":
+                    if ext == '.py':
                         fname, arcname = self._get_codename(path[0:-3],
                                          basename)
                         if self.debug:
-                            print("Adding", arcname)
+                            print('Adding', arcname)
                         self.write(fname, arcname)
         else:
-            if pathname[-3:] != ".py":
+            if pathname[-3:] != '.py':
                 raise RuntimeError(
                       'Files added with writepy() must end with ".py"')
             fname, arcname = self._get_codename(pathname[0:-3], basename)
             if self.debug:
-                print("Adding file", arcname)
+                print('Adding file', arcname)
             self.write(fname, arcname)
 
     def _get_codename(self, pathname, basename):
-        """Return (filename, archivename) for the path.
+        '''Return (filename, archivename) for the path.
 
         Given a module name path, return the correct file path and
         archive name, compiling if necessary.  For example, given
         /python/lib/string, return (/python/lib/string.pyc, string).
-        """
-        file_py  = pathname + ".py"
-        file_pyc = pathname + ".pyc"
-        file_pyo = pathname + ".pyo"
+        '''
+        file_py  = pathname + '.py'
+        file_pyc = pathname + '.pyc'
+        file_pyo = pathname + '.pyo'
         if os.path.isfile(file_pyo) and \
                             os.stat(file_pyo).st_mtime >= os.stat(file_py).st_mtime:
             fname = file_pyo    # Use .pyo file
@@ -1610,7 +1612,7 @@ class PyZipFile(ZipFile):
              os.stat(file_pyc).st_mtime < os.stat(file_py).st_mtime:
             import py_compile
             if self.debug:
-                print("Compiling", file_py)
+                print('Compiling', file_py)
             try:
                 py_compile.compile(file_py, file_pyc, None, True)
             except py_compile.PyCompileError as err:
@@ -1620,8 +1622,8 @@ class PyZipFile(ZipFile):
             fname = file_pyc
         archivename = os.path.split(fname)[1]
         if basename:
-            archivename = f"{basename}/{archivename}"
-        return (fname, archivename)
+            archivename = f'{basename}/{archivename}'
+        return fname, archivename
 
 
 def extractall(source, dest):
@@ -1631,13 +1633,13 @@ def extractall(source, dest):
 
 def main(args=None):
     import textwrap
-    USAGE=textwrap.dedent("""\
+    USAGE=textwrap.dedent('''\
         Usage:
             zipfile.py -l zipfile.zip        # Show listing of a zipfile
             zipfile.py -t zipfile.zip        # Test if a zipfile is valid
             zipfile.py -e zipfile.zip target # Extract zipfile into target dir
             zipfile.py -c zipfile.zip src ... # Create zipfile from sources
-        """)
+        ''')
     if args is None:
         args = sys.argv[1:]
 
@@ -1660,8 +1662,8 @@ def main(args=None):
         zf = ZipFile(args[1], 'r')
         badfile = zf.testzip()
         if badfile:
-            print(f"The following enclosed file is corrupted: {badfile!r}")
-        print("Done testing")
+            print(f'The following enclosed file is corrupted: {badfile!r}')
+        print('Done testing')
 
     elif args[0] == '-e':
         if len(args) != 3:
@@ -1704,5 +1706,5 @@ def main(args=None):
         zf.close()
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     main()
diff --git a/src/calibre/web/__init__.py b/src/calibre/web/__init__.py
index 50c0b76adf..03905d2ffd 100644
--- a/src/calibre/web/__init__.py
+++ b/src/calibre/web/__init__.py
@@ -19,12 +19,12 @@ def get_download_filename_from_response(response):
             if 'filename' in p:
                 if '*=' in disposition:
                     parts = disposition.split('*=')[-1]
-                    filename = parts.split('\'')[-1]
+                    filename = parts.split("'")[-1]
                 else:
                     filename = disposition.split('=')[-1]
-                if filename[0] in ('\'', '"'):
+                if filename[0] in ("'", '"'):
                     filename = filename[1:]
-                if filename[-1] in ('\'', '"'):
+                if filename[-1] in ("'", '"'):
                     filename = filename[:-1]
                 filename = unquote(filename)
                 break
diff --git a/src/calibre/web/feeds/__init__.py b/src/calibre/web/feeds/__init__.py
index 5d2cad1846..e660670e84 100644
--- a/src/calibre/web/feeds/__init__.py
+++ b/src/calibre/web/feeds/__init__.py
@@ -65,7 +65,7 @@ class Article:
     def formatted_date(self):
 
         if self._formatted_date is None:
-            self._formatted_date = strftime(" [%a, %d %b %H:%M]",
+            self._formatted_date = strftime(' [%a, %d %b %H:%M]',
                     t=self.localtime.timetuple())
         return self._formatted_date
 
@@ -104,7 +104,7 @@ Has content : %s
 
     def is_same_as(self, other_article):
         # if self.title != getattr(other_article, 'title', False):
-        #    return False
+        #     return False
         if self.url:
             return self.url == getattr(other_article, 'url', False)
         return self.content == getattr(other_article, 'content', False)
@@ -326,7 +326,7 @@ class FeedCollection(list):
         for j, f in enumerate(self):
             for i, a in enumerate(f):
                 if a is article:
-                    return (j, i)
+                    return j, i
 
     def restore_duplicates(self):
         temp = []
diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py
index 6a732745ac..5964d0eeae 100644
--- a/src/calibre/web/feeds/news.py
+++ b/src/calibre/web/feeds/news.py
@@ -3,7 +3,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 '''
 Defines various abstract base classes that can be subclassed to create powerful news fetching recipes.
 '''
-__docformat__ = "restructuredtext en"
+__docformat__ = 'restructuredtext en'
 
 
 import io
@@ -38,8 +38,7 @@ from polyglot.builtins import string_or_bytes
 
 def classes(classes):
     q = frozenset(classes.split(' '))
-    return dict(attrs={
-        'class': lambda x: x and frozenset(x.split()).intersection(q)})
+    return dict(attrs={'class': lambda x: x and frozenset(x.split()).intersection(q)})
 
 
 def prefixed_classes(classes):
@@ -624,7 +623,7 @@ class BasicNewsRecipe(Recipe):
         for key in article.keys():
             if key.endswith('_origlink'):
                 url = article[key]
-                if url and (url.startswith('http://') or url.startswith('https://')):
+                if url and (url.startswith(('http://', 'https://'))):
                     return url
         ans = article.get('link', None)
         if not ans and getattr(article, 'links', None):
@@ -1109,7 +1108,6 @@ class BasicNewsRecipe(Recipe):
                 article = self.feed_objects[f].articles[a]
             except:
                 self.log.exception('Failed to get article object for postprocessing')
-                pass
             else:
                 self.populate_article_metadata(article, ans, first_fetch)
         return ans
@@ -1159,7 +1157,7 @@ class BasicNewsRecipe(Recipe):
         templ = templ(lang=self.lang_for_html)
         css = self.template_css + '\n\n' +(self.get_extra_css() or '')
         timefmt = self.timefmt
-        return templ.generate(self.title, "mastheadImage.jpg", timefmt, feeds,
+        return templ.generate(self.title, 'mastheadImage.jpg', timefmt, feeds,
                               extra_css=css).render(doctype='xhtml')
 
     @classmethod
@@ -1183,7 +1181,7 @@ class BasicNewsRecipe(Recipe):
             from calibre.utils.cleantext import clean_xml_chars
 
             # Truncating the string could cause a dangling UTF-16 half-surrogate, which will cause lxml to barf, clean it
-            ans = clean_xml_chars(ans) + '\u2026'
+            ans = clean_xml_chars(ans) + '…'
         return ans
 
     def feed2index(self, f, feeds):
@@ -1389,7 +1387,7 @@ class BasicNewsRecipe(Recipe):
                 break
 
         for f, feed in enumerate(feeds):
-            html = self.feed2index(f,feeds)
+            html = self.feed2index(f, feeds)
             feed_dir = os.path.join(self.output_dir, 'feed_%d'%f)
             with open(os.path.join(feed_dir, 'index.html'), 'wb') as fi:
                 fi.write(html)
@@ -1478,7 +1476,7 @@ class BasicNewsRecipe(Recipe):
         try:
             self._download_masthead(url)
         except:
-            self.log.exception("Failed to download supplied masthead_url")
+            self.log.exception('Failed to download supplied masthead_url')
 
     def resolve_masthead(self):
         self.masthead_path = None
@@ -1493,7 +1491,7 @@ class BasicNewsRecipe(Recipe):
             # Failure sets self.masthead_path to None
             self.download_masthead(murl)
         if self.masthead_path is None:
-            self.log.info("Synthesizing mastheadImage")
+            self.log.info('Synthesizing mastheadImage')
             self.masthead_path = os.path.join(self.output_dir, 'mastheadImage.jpg')
             try:
                 self.default_masthead_image(self.masthead_path)
@@ -1597,7 +1595,7 @@ class BasicNewsRecipe(Recipe):
         if cpath is None:
             pf = open(os.path.join(dir, 'cover.jpg'), 'wb')
             if self.default_cover(pf):
-                cpath =  pf.name
+                cpath = pf.name
         if cpath is not None and os.access(cpath, os.R_OK):
             opf.cover = cpath
             manifest.append(cpath)
@@ -1731,7 +1729,7 @@ class BasicNewsRecipe(Recipe):
 
     def error_in_article_download(self, request, traceback):
         self.jobs_done += 1
-        if traceback and re.search('^AbortArticle:', traceback, flags=re.M) is not None:
+        if traceback and re.search(r'^AbortArticle:', traceback, flags=re.M) is not None:
             self.log.warn('Aborted download of article:', request.article.title,
                           'from', request.article.url)
             self.report_progress(float(self.jobs_done)/len(self.jobs),
@@ -1862,7 +1860,7 @@ class BasicNewsRecipe(Recipe):
             item.extract()
             divtag = soup.new_tag('div')
             brtag  = soup.new_tag('br')
-            oldParent.insert(myIndex,divtag)
+            oldParent.insert(myIndex, divtag)
             divtag.append(item)
             divtag.append(brtag)
         return soup
diff --git a/src/calibre/web/feeds/recipes/collection.py b/src/calibre/web/feeds/recipes/collection.py
index c854376bae..5adb7ac00f 100644
--- a/src/calibre/web/feeds/recipes/collection.py
+++ b/src/calibre/web/feeds/recipes/collection.py
@@ -58,7 +58,6 @@ def normalize_language(x: str) -> str:
 def serialize_recipe(urn, recipe_class):
     from xml.sax.saxutils import quoteattr
 
-
     def attr(n, d, normalize=lambda x: x):
         ans = getattr(recipe_class, n, d)
         if isinstance(ans, bytes):
@@ -76,15 +75,15 @@ def serialize_recipe(urn, recipe_class):
     if rso:
         options = f' options={quoteattr(json.dumps(rso))}'
     return ('  <recipe id={id} title={title} author={author} language={language}'
-            ' needs_subscription={needs_subscription} description={description}{options}/>').format(**{
-        'id'                 : quoteattr(str(urn)),
-        'title'              : attr('title', _('Unknown')),
-        'author'             : attr('__author__', default_author),
-        'language'           : attr('language', 'und', normalize_language),
-        'needs_subscription' : quoteattr(ns),
-        'description'        : attr('description', ''),
-        'options'            : options,
-        })
+            ' needs_subscription={needs_subscription} description={description}{options}/>').format(
+                id=quoteattr(str(urn)),
+                title=attr('title', _('Unknown')),
+                author=attr('__author__', default_author),
+                language=attr('language', 'und', normalize_language),
+                needs_subscription=quoteattr(ns),
+                description=attr('description', ''),
+                options=options,
+            )
 
 
 def serialize_collection(mapping_of_recipe_classes):
@@ -352,7 +351,7 @@ class SchedulerConfig:
             if last_downloaded is None:
                 last_downloaded = EPOCH
             sr = E.scheduled_recipe({
-                'id' : recipe.get('id'),
+                'id': recipe.get('id'),
                 'title': recipe.get('title'),
                 'last_downloaded':isoformat(last_downloaded),
                 }, self.serialize_schedule(schedule_type, schedule))
@@ -366,10 +365,10 @@ class SchedulerConfig:
                 if x.get('id') == urn:
                     self.root.remove(x)
             cs = E.recipe_customization({
-                'keep_issues' : str(val.keep_issues),
-                'id' : urn,
-                'add_title_tag' : 'yes' if val.add_title_tag else 'no',
-                'custom_tags' : ','.join(val.custom_tags),
+                'keep_issues': str(val.keep_issues),
+                'id': urn,
+                'add_title_tag': 'yes' if val.add_title_tag else 'no',
+                'custom_tags': ','.join(val.custom_tags),
                 'recipe_specific_options': json.dumps(val.recipe_specific_options or {}),
                 })
             self.root.append(cs)
diff --git a/src/calibre/web/feeds/recipes/model.py b/src/calibre/web/feeds/recipes/model.py
index 316f5bb29b..d2ff3a3cb7 100644
--- a/src/calibre/web/feeds/recipes/model.py
+++ b/src/calibre/web/feeds/recipes/model.py
@@ -211,7 +211,7 @@ class RecipeModel(QAbstractItemModel, AdaptSQP):
         script_ids = []
         for urn, title_script in iteritems(script_urn_map):
             id_ = int(urn[len('custom:'):])
-            (title, script) = title_script
+            title, script = title_script
             script_ids.append((id_, title, script))
 
         update_custom_recipes(script_ids)
diff --git a/src/calibre/web/feeds/templates.py b/src/calibre/web/feeds/templates.py
index 524ae9222b..761ce50b1d 100644
--- a/src/calibre/web/feeds/templates.py
+++ b/src/calibre/web/feeds/templates.py
@@ -23,8 +23,8 @@ def attrs(*args, **kw):
         kw['class'] = ' '.join(args)
     return kw
 
-# Regular templates
 
+# Regular templates
 
 class Template:
 
@@ -106,7 +106,7 @@ class IndexTemplate(Template):
                     href='feed_%d/index.html'%i)), id='feed_%d'%i)
                 ul.append(li)
         div = DIV(
-                PT(IMG(src=masthead,alt="masthead"),style='text-align:center'),
+                PT(IMG(src=masthead, alt='masthead'), style='text-align:center'),
                 PT(date, style='text-align:right'),
                 ul,
                 attrs(rescale=100))
@@ -132,7 +132,7 @@ class FeedTemplate(Template):
             link = A(_('Next section'), href='../feed_%d/index.html'%(f+1))
             link.tail = ' | '
             navbar.append(link)
-        link = A(_('Main menu'), href="../index.html")
+        link = A(_('Main menu'), href='../index.html')
         link.tail = ' | '
         navbar.append(link)
         if f > 0:
@@ -249,11 +249,11 @@ class TouchscreenIndexTemplate(Template):
     def _generate(self, title, masthead, datefmt, feeds, extra_css=None, style=None):
         self.IS_HTML = False
         date = '{}, {} {}, {}'.format(strftime('%A'), strftime('%B'), strftime('%d').lstrip('0'), strftime('%Y'))
-        masthead_p = etree.Element("p")
-        masthead_p.set("style","text-align:center")
-        masthead_img = etree.Element("img")
-        masthead_img.set("src",masthead)
-        masthead_img.set("alt","masthead")
+        masthead_p = etree.Element('p')
+        masthead_p.set('style','text-align:center')
+        masthead_img = etree.Element('img')
+        masthead_img.set('src',masthead)
+        masthead_img.set('alt','masthead')
         masthead_p.append(masthead_img)
 
         head = HEAD(TITLE(title))
@@ -262,12 +262,12 @@ class TouchscreenIndexTemplate(Template):
         if extra_css:
             head.append(STYLE(extra_css, type='text/css'))
 
-        toc = TABLE(attrs('toc'),width="100%",border="0",cellpadding="3px")
+        toc = TABLE(attrs('toc'),width='100%',border='0',cellpadding='3px')
         for i, feed in enumerate(feeds):
             if len(feed):
                 tr = TR()
                 tr.append(TD(attrs(rescale=120), A(feed.title, href='feed_%d/index.html'%i)))
-                tr.append(TD('%s' % len(feed.articles), style="text-align:right"))
+                tr.append(TD('%s' % len(feed.articles), style='text-align:right'))
                 toc.append(tr)
         div = DIV(
                 masthead_p,
@@ -284,7 +284,7 @@ class TouchscreenFeedTemplate(Template):
     def _generate(self, f, feeds, cutoff, extra_css=None, style=None):
         from calibre.utils.cleantext import clean_xml_chars
 
-        def trim_title(title,clip=18):
+        def trim_title(title, clip=18):
             if len(title)>clip:
                 tokens = title.split(' ')
                 new_title_tokens = []
@@ -317,7 +317,7 @@ class TouchscreenFeedTemplate(Template):
         navbar_tr.append(TD(attrs('feed_prev'),link))
 
         # Up to Sections
-        link = A(_('Sections'), href="../index.html")
+        link = A(_('Sections'), href='../index.html')
         navbar_tr.append(TD(attrs('feed_up'),link))
 
         # Next Section
@@ -330,7 +330,7 @@ class TouchscreenFeedTemplate(Template):
         navbar_t.append(navbar_tr)
         top_navbar = navbar_t
         bottom_navbar = copy.copy(navbar_t)
-        # print "\n%s\n" % etree.tostring(navbar_t, pretty_print=True)
+        # print('\n%s\n' % etree.tostring(navbar_t, pretty_print=True))
 
         # Build the page
         head = HEAD(TITLE(feed.title))
@@ -423,6 +423,6 @@ class TouchscreenNavBarTemplate(Template):
         navbar_tr.append(TD(attrs('article_next'),link))
         navbar_t.append(navbar_tr)
         navbar.append(navbar_t)
-        # print "\n%s\n" % etree.tostring(navbar, pretty_print=True)
+        # print('\n%s\n' % etree.tostring(navbar, pretty_print=True))
 
         self.root = HTML(head, BODY(navbar))
diff --git a/src/calibre/web/fetch/simple.py b/src/calibre/web/fetch/simple.py
index 82e9da36fa..f740dbfe95 100644
--- a/src/calibre/web/fetch/simple.py
+++ b/src/calibre/web/fetch/simple.py
@@ -43,7 +43,6 @@ class FetchError(Exception):
 
 
 class closing:
-
     'Context to automatically close something at the end of a block.'
 
     def __init__(self, thing):
@@ -124,7 +123,7 @@ def default_is_link_wanted(url, tag):
 
 class RecursiveFetcher:
     LINK_FILTER = tuple(re.compile(i, re.IGNORECASE) for i in
-                ('.exe\\s*$', '.mp3\\s*$', '.ogg\\s*$', '^\\s*mailto:', '^\\s*$'))
+                (r'.exe\s*$', r'.mp3\s*$', r'.ogg\s*$', r'^\s*mailto:', r'^\s*$'))
     # ADBLOCK_FILTER = tuple(re.compile(i, re.IGNORECASE) for it in
     #                       (
     #
@@ -545,7 +544,7 @@ class RecursiveFetcher:
                     dsrc = self.fetch_url(iurl)
                     newbaseurl = dsrc.newurl
                     if len(dsrc) == 0 or \
-                       len(re.compile(b'<!--.*?-->', re.DOTALL).sub(b'', dsrc).strip()) == 0:
+                       len(re.compile(br'<!--.*?-->', re.DOTALL).sub(b'', dsrc).strip()) == 0:
                         raise ValueError('No content at URL %r'%iurl)
                     if callable(self.encoding):
                         dsrc = self.encoding(dsrc)
diff --git a/src/calibre/web/site_parsers/natgeo.py b/src/calibre/web/site_parsers/natgeo.py
index 88a2dcb3f5..b767f721ae 100644
--- a/src/calibre/web/site_parsers/natgeo.py
+++ b/src/calibre/web/site_parsers/natgeo.py
@@ -105,6 +105,7 @@ def parse_body(x):
             if isinstance(y, dict):
                 yield from parse_body(y)
 
+
 def parse_bdy(item):
     c = item['cntnt']
     if item.get('type') == 'inline':
@@ -130,6 +131,7 @@ def parse_bdy(item):
             yield '<{tag}>{markup}</{tag}>'.format(
                 tag=item['type'], markup=c['mrkup'])
 
+
 def parse_article(edg):
     sc = edg['schma']
     yield '<div class="sub">' + escape(edg['sctn']) + '</div>'
diff --git a/src/calibre/web/site_parsers/nytimes.py b/src/calibre/web/site_parsers/nytimes.py
index 172088210d..704fb71ef6 100644
--- a/src/calibre/web/site_parsers/nytimes.py
+++ b/src/calibre/web/site_parsers/nytimes.py
@@ -270,8 +270,8 @@ def extract_html(soup, url):
     if '/interactive/' in url:
         return (
             '<html><body><p><em>'
-            + 'This is an interactive article, which is supposed to be read in a browser.'
-            + '</p></em></body></html>'
+            'This is an interactive article, which is supposed to be read in a browser.'
+            '</p></em></body></html>'
         )
     script = soup.findAll('script', text=lambda x: x and 'window.__preloadedData' in x)[0]
     script = str(script)
diff --git a/src/odf/attrconverters.py b/src/odf/attrconverters.py
index 1687bff05f..8351863a50 100644
--- a/src/odf/attrconverters.py
+++ b/src/odf/attrconverters.py
@@ -44,13 +44,13 @@ from .namespaces import (
     XLINKNS,
 )
 
-pattern_color =  re.compile(r'#[0-9a-fA-F]{6}')
+pattern_color = re.compile(r'#[0-9a-fA-F]{6}')
 pattern_vector3D = re.compile(r'\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)){2}[ ]*\)')
 
 
 def make_NCName(arg):
     for c in (':',' '):
-        arg = arg.replace(c,"_%x_" % ord(c))
+        arg = arg.replace(c, f'_{ord(c):x}_')
     return arg
 
 
@@ -59,48 +59,48 @@ def cnv_anyURI(attribute, arg, element):
 
 
 def cnv_boolean(attribute, arg, element):
-    if arg.lower() in ("false","no"):
-        return "false"
+    if arg.lower() in ('false','no'):
+        return 'false'
     if arg:
-        return "true"
-    return "false"
+        return 'true'
+    return 'false'
+
 
 # Potentially accept color values
 
-
 def cnv_color(attribute, arg, element):
-    """ A RGB color in conformance with §5.9.11 of [XSL], that is a RGB color in notation “#rrggbb”, where
+    ''' A RGB color in conformance with §5.9.11 of [XSL], that is a RGB color in notation “#rrggbb”, where
         rr, gg and bb are 8-bit hexadecimal digits.
-    """
+    '''
     return unicode_type(arg)
 
 
 def cnv_configtype(attribute, arg, element):
-    if unicode_type(arg) not in ("boolean", "short", "int", "long",
-    "double", "string", "datetime", "base64Binary"):
-        raise ValueError("'%s' not allowed" % unicode_type(arg))
+    if unicode_type(arg) not in ('boolean', 'short', 'int', 'long',
+    'double', 'string', 'datetime', 'base64Binary'):
+        raise ValueError(f"'{unicode_type(arg)}' not allowed")
     return unicode_type(arg)
 
 
 def cnv_data_source_has_labels(attribute, arg, element):
-    if unicode_type(arg) not in ("none","row","column","both"):
-        raise ValueError("'%s' not allowed" % unicode_type(arg))
+    if unicode_type(arg) not in ('none','row','column','both'):
+        raise ValueError(f"'{unicode_type(arg)}' not allowed")
     return unicode_type(arg)
 
+
 # Understand different date formats
 
-
 def cnv_date(attribute, arg, element):
-    """ A dateOrDateTime value is either an [xmlschema-2] date value or an [xmlschema-2] dateTime
+    ''' A dateOrDateTime value is either an [xmlschema-2] date value or an [xmlschema-2] dateTime
         value.
-    """
+    '''
     return unicode_type(arg)
 
 
 def cnv_dateTime(attribute, arg, element):
-    """ A dateOrDateTime value is either an [xmlschema-2] date value or an [xmlschema-2] dateTime
+    ''' A dateOrDateTime value is either an [xmlschema-2] date value or an [xmlschema-2] dateTime
         value.
-    """
+    '''
     return unicode_type(arg)
 
 
@@ -113,10 +113,10 @@ def cnv_duration(attribute, arg, element):
 
 
 def cnv_family(attribute, arg, element):
-    """ A style family """
-    if unicode_type(arg) not in ("text", "paragraph", "section", "ruby", "table", "table-column", "table-row", "table-cell",
-      "graphic", "presentation", "drawing-page", "chart"):
-        raise ValueError("'%s' not allowed" % unicode_type(arg))
+    ''' A style family '''
+    if unicode_type(arg) not in ('text', 'paragraph', 'section', 'ruby', 'table', 'table-column', 'table-row', 'table-cell',
+      'graphic', 'presentation', 'drawing-page', 'chart'):
+        raise ValueError(f"'{unicode_type(arg)}' not allowed")
     return unicode_type(arg)
 
 
@@ -126,17 +126,17 @@ def __save_prefix(attribute, arg, element):
         return str(arg)
     namespace = element.get_knownns(prefix)
     if namespace is None:
-        # raise ValueError, "'%s' is an unknown prefix" % unicode_type(prefix)
+        # raise ValueError(f"'{unicode_type(prefix)}' is an unknown prefix")
         return str(arg)
     return str(arg)
 
 
 def cnv_formula(attribute, arg, element):
-    """ A string containing a formula. Formulas do not have a predefined syntax, but the string should
+    ''' A string containing a formula. Formulas do not have a predefined syntax, but the string should
         begin with a namespace prefix, followed by a “:” (COLON, U+003A) separator, followed by the text
         of the formula. The namespace bound to the prefix determines the syntax and semantics of the
         formula.
-    """
+    '''
     return __save_prefix(attribute, arg, element)
 
 
@@ -153,8 +153,8 @@ def cnv_integer(attribute, arg, element):
 
 
 def cnv_legend_position(attribute, arg, element):
-    if unicode_type(arg) not in ("start", "end", "top", "bottom", "top-start", "bottom-start", "top-end", "bottom-end"):
-        raise ValueError("'%s' not allowed" % unicode_type(arg))
+    if unicode_type(arg) not in ('start', 'end', 'top', 'bottom', 'top-start', 'bottom-start', 'top-end', 'bottom-end'):
+        raise ValueError(f"'{unicode_type(arg)}' not allowed")
     return unicode_type(arg)
 
 
@@ -162,12 +162,12 @@ pattern_length = re.compile(r'-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)
 
 
 def cnv_length(attribute, arg, element):
-    """ A (positive or negative) physical length, consisting of magnitude and unit, in conformance with the
+    ''' A (positive or negative) physical length, consisting of magnitude and unit, in conformance with the
         Units of Measure defined in §5.9.13 of [XSL].
-    """
+    '''
     global pattern_length
     if not pattern_length.match(arg):
-        raise ValueError("'%s' is not a valid length" % arg)
+        raise ValueError(f"'{arg}' is not a valid length")
     return arg
 
 
@@ -182,19 +182,19 @@ def cnv_lengthorpercent(attribute, arg, element):
     except:
         failed = True
     if failed:
-        raise ValueError("'%s' is not a valid length or percent" % arg)
+        raise ValueError(f"'{arg}' is not a valid length or percent")
     return arg
 
 
 def cnv_metavaluetype(attribute, arg, element):
-    if unicode_type(arg) not in ("float", "date", "time", "boolean", "string"):
-        raise ValueError("'%s' not allowed" % unicode_type(arg))
+    if unicode_type(arg) not in ('float', 'date', 'time', 'boolean', 'string'):
+        raise ValueError(f"'{unicode_type(arg)}' not allowed")
     return unicode_type(arg)
 
 
 def cnv_major_minor(attribute, arg, element):
     if arg not in ('major','minor'):
-        raise ValueError("'%s' is not either 'minor' or 'major'" % arg)
+        raise ValueError(f"'{arg}' is not either 'minor' or 'major'")
 
 
 pattern_namespacedToken = re.compile(r'[0-9a-zA-Z_]+:[0-9a-zA-Z._\-]+')
@@ -204,14 +204,14 @@ def cnv_namespacedToken(attribute, arg, element):
     global pattern_namespacedToken
 
     if not pattern_namespacedToken.match(arg):
-        raise ValueError("'%s' is not a valid namespaced token" % arg)
+        raise ValueError(f"'{arg}' is not a valid namespaced token")
     return __save_prefix(attribute, arg, element)
 
 
 def cnv_NCName(attribute, arg, element):
-    """ NCName is defined in http://www.w3.org/TR/REC-xml-names/#NT-NCName
+    ''' NCName is defined in http://www.w3.org/TR/REC-xml-names/#NT-NCName
         Essentially an XML name minus ':'
-    """
+    '''
     if isinstance(arg, string_or_bytes):
         return make_NCName(arg)
     else:
@@ -241,8 +241,8 @@ def cnv_DrawNameRef(attribute, arg, element):
     except:
         return arg
 
-# Must accept list of Style objects
 
+# Must accept list of Style objects
 
 def cnv_NCNames(attribute, arg, element):
     return ' '.join(arg)
@@ -258,7 +258,7 @@ pattern_percent = re.compile(r'-?([0-9]+(\.[0-9]*)?|\.[0-9]+)%')
 def cnv_percent(attribute, arg, element):
     global pattern_percent
     if not pattern_percent.match(arg):
-        raise ValueError("'%s' is not a valid length" % arg)
+        raise ValueError(f"'{arg}' is not a valid length")
     return arg
 
 
@@ -271,13 +271,13 @@ def cnv_points(attribute, arg, element):
     global pattern_points
     if isinstance(arg, string_or_bytes):
         if not pattern_points.match(arg):
-            raise ValueError("x,y are separated by a comma and the points are separated by white spaces")
+            raise ValueError('x,y are separated by a comma and the points are separated by white spaces')
         return arg
     else:
         try:
-            strarg = ' '.join(["%d,%d" % p for p in arg])
+            strarg = ' '.join(['{},{}'.format(*p) for p in arg])
         except:
-            raise ValueError("Points must be string or [(0,0),(1,1)] - not %s" % arg)
+            raise ValueError(f'Points must be string or [(0,0),(1,1)] - not {arg}')
         return strarg
 
 
@@ -290,12 +290,12 @@ def cnv_string(attribute, arg, element):
 
 
 def cnv_textnoteclass(attribute, arg, element):
-    if unicode_type(arg) not in ("footnote", "endnote"):
-        raise ValueError("'%s' not allowed" % unicode_type(arg))
+    if unicode_type(arg) not in ('footnote', 'endnote'):
+        raise ValueError(f"'{unicode_type(arg)}' not allowed")
     return unicode_type(arg)
 
-# Understand different time formats
 
+# Understand different time formats
 
 def cnv_time(attribute, arg, element):
     return unicode_type(arg)
@@ -311,13 +311,13 @@ pattern_viewbox = re.compile(r'-?[0-9]+([ ]+-?[0-9]+){3}$')
 def cnv_viewbox(attribute, arg, element):
     global pattern_viewbox
     if not pattern_viewbox.match(arg):
-        raise ValueError("viewBox must be four integers separated by whitespaces")
+        raise ValueError('viewBox must be four integers separated by whitespaces')
     return arg
 
 
 def cnv_xlinkshow(attribute, arg, element):
-    if unicode_type(arg) not in ("new", "replace", "embed"):
-        raise ValueError("'%s' not allowed" % unicode_type(arg))
+    if unicode_type(arg) not in ('new', 'replace', 'embed'):
+        raise ValueError(f"'{unicode_type(arg)}' not allowed")
     return unicode_type(arg)
 
 
@@ -333,7 +333,7 @@ attrconverters = {
         ((ANIMNS,'name'), None): cnv_string,
         ((ANIMNS,'sub-item'), None): cnv_string,
         ((ANIMNS,'value'), None): cnv_string,
-        # ((DBNS,u'type'), None): cnv_namespacedToken,
+        # ((DBNS,'type'), None): cnv_namespacedToken,
         ((CHARTNS,'attached-axis'), None): cnv_string,
         ((CHARTNS,'class'), (CHARTNS,'grid')): cnv_major_minor,
         ((CHARTNS,'class'), None): cnv_namespacedToken,
@@ -555,8 +555,8 @@ attrconverters = {
         ((DRAWNS,'handle-range-y-maximum'), None): cnv_string,
         ((DRAWNS,'handle-range-y-minimum'), None): cnv_string,
         ((DRAWNS,'handle-switched'), None): cnv_boolean,
-        # ((DRAWNS,u'id'), None): cnv_ID,
-        # ((DRAWNS,u'id'), None): cnv_nonNegativeInteger,   # ?? line 6581 in RNG
+        # ((DRAWNS,'id'), None): cnv_ID,
+        # ((DRAWNS,'id'), None): cnv_nonNegativeInteger,   # ?? line 6581 in RNG
         ((DRAWNS,'id'), None): cnv_string,
         ((DRAWNS,'image-opacity'), None): cnv_string,
         ((DRAWNS,'kind'), None): cnv_string,
@@ -579,7 +579,7 @@ attrconverters = {
         ((DRAWNS,'mirror-vertical'), None): cnv_boolean,
         ((DRAWNS,'modifiers'), None): cnv_string,
         ((DRAWNS,'name'), None): cnv_NCName,
-        # ((DRAWNS,u'name'), None): cnv_string,
+        # ((DRAWNS,'name'), None): cnv_string,
         ((DRAWNS,'nav-order'), None): cnv_IDREF,
         ((DRAWNS,'nohref'), None): cnv_string,
         ((DRAWNS,'notify-on-update-of-ranges'), None): cnv_string,
@@ -716,10 +716,10 @@ attrconverters = {
         ((FORMNS,'convert-empty-to-null'), None): cnv_boolean,
         ((FORMNS,'current-selected'), None): cnv_boolean,
         ((FORMNS,'current-state'), None): cnv_string,
-        # ((FORMNS,u'current-value'), None): cnv_date,
-        # ((FORMNS,u'current-value'), None): cnv_double,
+        # ((FORMNS,'current-value'), None): cnv_date,
+        # ((FORMNS,'current-value'), None): cnv_double,
         ((FORMNS,'current-value'), None): cnv_string,
-        # ((FORMNS,u'current-value'), None): cnv_time,
+        # ((FORMNS,'current-value'), None): cnv_time,
         ((FORMNS,'data-field'), None): cnv_string,
         ((FORMNS,'datasource'), None): cnv_string,
         ((FORMNS,'default-button'), None): cnv_boolean,
@@ -744,15 +744,15 @@ attrconverters = {
         ((FORMNS,'list-source-type'), None): cnv_string,
         ((FORMNS,'master-fields'), None): cnv_string,
         ((FORMNS,'max-length'), None): cnv_nonNegativeInteger,
-        # ((FORMNS,u'max-value'), None): cnv_date,
-        # ((FORMNS,u'max-value'), None): cnv_double,
+        # ((FORMNS,'max-value'), None): cnv_date,
+        # ((FORMNS,'max-value'), None): cnv_double,
         ((FORMNS,'max-value'), None): cnv_string,
-        # ((FORMNS,u'max-value'), None): cnv_time,
+        # ((FORMNS,'max-value'), None): cnv_time,
         ((FORMNS,'method'), None): cnv_string,
-        # ((FORMNS,u'min-value'), None): cnv_date,
-        # ((FORMNS,u'min-value'), None): cnv_double,
+        # ((FORMNS,'min-value'), None): cnv_date,
+        # ((FORMNS,'min-value'), None): cnv_double,
         ((FORMNS,'min-value'), None): cnv_string,
-        # ((FORMNS,u'min-value'), None): cnv_time,
+        # ((FORMNS,'min-value'), None): cnv_time,
         ((FORMNS,'multi-line'), None): cnv_boolean,
         ((FORMNS,'multiple'), None): cnv_boolean,
         ((FORMNS,'name'), None): cnv_string,
@@ -774,10 +774,10 @@ attrconverters = {
         ((FORMNS,'title'), None): cnv_string,
         ((FORMNS,'toggle'), None): cnv_boolean,
         ((FORMNS,'validation'), None): cnv_boolean,
-        # ((FORMNS,u'value'), None): cnv_date,
-        # ((FORMNS,u'value'), None): cnv_double,
+        # ((FORMNS,'value'), None): cnv_date,
+        # ((FORMNS,'value'), None): cnv_double,
         ((FORMNS,'value'), None): cnv_string,
-        # ((FORMNS,u'value'), None): cnv_time,
+        # ((FORMNS,'value'), None): cnv_time,
         ((FORMNS,'visual-effect'), None): cnv_string,
         ((FORMNS,'xforms-list-source'), None): cnv_string,
         ((FORMNS,'xforms-submission'), None): cnv_string,
@@ -1205,7 +1205,7 @@ attrconverters = {
         ((TABLENS,'border-color'), None): cnv_string,
         ((TABLENS,'border-model'), None): cnv_string,
         ((TABLENS,'buttons'), None): cnv_string,
-        # ((TABLENS,u'case-sensitive'), None): cnv_boolean,
+        # ((TABLENS,'case-sensitive'), None): cnv_boolean,
         ((TABLENS,'case-sensitive'), None): cnv_string,
         ((TABLENS,'cell-address'), None): cnv_string,
         ((TABLENS,'cell-range-address'), None): cnv_string,
@@ -1252,7 +1252,7 @@ attrconverters = {
         ((TABLENS,'execute'), None): cnv_boolean,
         ((TABLENS,'expression'), None): cnv_formula,
         ((TABLENS,'field-name'), None): cnv_string,
-        # ((TABLENS,u'field-number'), None): cnv_nonNegativeInteger,
+        # ((TABLENS,'field-number'), None): cnv_nonNegativeInteger,
         ((TABLENS,'field-number'), None): cnv_string,
         ((TABLENS,'filter-name'), None): cnv_string,
         ((TABLENS,'filter-options'), None): cnv_string,
@@ -1311,7 +1311,7 @@ attrconverters = {
         ((TABLENS,'protection-key'), None): cnv_string,
         ((TABLENS,'query-name'), None): cnv_string,
         ((TABLENS,'range-usable-as'), None): cnv_string,
-        # ((TABLENS,u'refresh-delay'), None): cnv_boolean,
+        # ((TABLENS,'refresh-delay'), None): cnv_boolean,
         ((TABLENS,'refresh-delay'), None): cnv_duration,
         ((TABLENS,'rejecting-change-id'), None): cnv_string,
         ((TABLENS,'row'), None): cnv_integer,
@@ -1319,7 +1319,7 @@ attrconverters = {
         ((TABLENS,'search-criteria-must-apply-to-whole-cell'), None): cnv_boolean,
         ((TABLENS,'selected-page'), None): cnv_string,
         ((TABLENS,'show-details'), None): cnv_boolean,
-        # ((TABLENS,u'show-empty'), None): cnv_boolean,
+        # ((TABLENS,'show-empty'), None): cnv_boolean,
         ((TABLENS,'show-empty'), None): cnv_string,
         ((TABLENS,'show-filter-button'), None): cnv_boolean,
         ((TABLENS,'sort-mode'), None): cnv_string,
@@ -1402,7 +1402,7 @@ attrconverters = {
         ((TEXTNS,'database-name'), None): cnv_string,
         ((TEXTNS,'date-adjust'), None): cnv_duration,
         ((TEXTNS,'date-value'), None): cnv_date,
-        # ((TEXTNS,u'date-value'), None): cnv_dateTime,
+        # ((TEXTNS,'date-value'), None): cnv_dateTime,
         ((TEXTNS,'default-style-name'), None): cnv_StyleNameRef,
         ((TEXTNS,'description'), None): cnv_string,
         ((TEXTNS,'display'), None): cnv_string,
@@ -1421,7 +1421,7 @@ attrconverters = {
         ((TEXTNS,'global'), None): cnv_boolean,
         ((TEXTNS,'howpublished'), None): cnv_string,
         ((TEXTNS,'id'), None): cnv_ID,
-        # ((TEXTNS,u'id'), None): cnv_string,
+        # ((TEXTNS,'id'), None): cnv_string,
         ((TEXTNS,'identifier'), None): cnv_string,
         ((TEXTNS,'ignore-case'), None): cnv_boolean,
         ((TEXTNS,'increment'), None): cnv_nonNegativeInteger,
@@ -1486,7 +1486,7 @@ attrconverters = {
         ((TEXTNS,'sort-by-position'), None): cnv_boolean,
         ((TEXTNS,'space-before'), None): cnv_string,
         ((TEXTNS,'start-numbering-at'), None): cnv_string,
-        # ((TEXTNS,u'start-value'), None): cnv_nonNegativeInteger,
+        # ((TEXTNS,'start-value'), None): cnv_nonNegativeInteger,
         ((TEXTNS,'start-value'), None): cnv_positiveInteger,
         ((TEXTNS,'string-value'), None): cnv_string,
         ((TEXTNS,'string-value-if-false'), None): cnv_string,
@@ -1498,7 +1498,7 @@ attrconverters = {
         ((TEXTNS,'table-name'), None): cnv_string,
         ((TEXTNS,'table-type'), None): cnv_string,
         ((TEXTNS,'time-adjust'), None): cnv_duration,
-        # ((TEXTNS,u'time-value'), None): cnv_dateTime,
+        # ((TEXTNS,'time-value'), None): cnv_dateTime,
         ((TEXTNS,'time-value'), None): cnv_time,
         ((TEXTNS,'title'), None): cnv_string,
         ((TEXTNS,'track-changes'), None): cnv_boolean,
@@ -1533,9 +1533,9 @@ attrconverters = {
 
 class AttrConverters:
     def convert(self, attribute, value, element):
-        """ Based on the element, figures out how to check/convert the attribute value
+        ''' Based on the element, figures out how to check/convert the attribute value
             All values are converted to string
-        """
+        '''
         conversion = attrconverters.get((attribute, element.qname), None)
         if conversion is not None:
             return conversion(attribute, value, element)
diff --git a/src/odf/dc.py b/src/odf/dc.py
index 55fdc5f9ac..261b531c7f 100644
--- a/src/odf/dc.py
+++ b/src/odf/dc.py
@@ -52,28 +52,28 @@ def Title(**args):
 # these elements
 
 # def Contributor(**args):
-#    return Element(qname = (DCNS,'contributor'), **args)
+#     return Element(qname = (DCNS,'contributor'), **args)
 
 # def Coverage(**args):
-#    return Element(qname = (DCNS,'coverage'), **args)
+#     return Element(qname = (DCNS,'coverage'), **args)
 
 # def Format(**args):
-#    return Element(qname = (DCNS,'format'), **args)
+#     return Element(qname = (DCNS,'format'), **args)
 
 # def Identifier(**args):
-#    return Element(qname = (DCNS,'identifier'), **args)
+#     return Element(qname = (DCNS,'identifier'), **args)
 
 # def Publisher(**args):
-#    return Element(qname = (DCNS,'publisher'), **args)
+#     return Element(qname = (DCNS,'publisher'), **args)
 
 # def Relation(**args):
-#    return Element(qname = (DCNS,'relation'), **args)
+#     return Element(qname = (DCNS,'relation'), **args)
 
 # def Rights(**args):
-#    return Element(qname = (DCNS,'rights'), **args)
+#     return Element(qname = (DCNS,'rights'), **args)
 
 # def Source(**args):
-#    return Element(qname = (DCNS,'source'), **args)
+#     return Element(qname = (DCNS,'source'), **args)
 
 # def Type(**args):
-#    return Element(qname = (DCNS,'type'), **args)
+#     return Element(qname = (DCNS,'type'), **args)
diff --git a/src/odf/easyliststyle.py b/src/odf/easyliststyle.py
index 11a2b8de05..9b23d1cf17 100644
--- a/src/odf/easyliststyle.py
+++ b/src/odf/easyliststyle.py
@@ -26,7 +26,7 @@ from polyglot.builtins import unicode_type
 from .style import ListLevelProperties
 from .text import ListLevelStyleBullet, ListLevelStyleNumber, ListStyle
 
-"""
+'''
 Create a <text:list-style> element from a string or array.
 
 List styles require a lot of code to create one level at a time.
@@ -38,7 +38,7 @@ Each item in the string (or array) represents a list level
  * <p>If an item contains <code>1</code>, <code>I</code>,
  * <code>i</code>, <code>A</code>, or <code>a</code>, then it is presumed
  * to be a numbering style; otherwise it is a bulleted style.</p>
-"""
+'''
 
 _MAX_LIST_LEVEL = 10
 SHOW_ALL_LEVELS = True
@@ -51,16 +51,16 @@ def styleFromString(name, specifiers, delim, spacing, showAllLevels):
 
 
 def styleFromList(styleName, specArray, spacing, showAllLevels):
-    bullet = ""
-    numPrefix = ""
-    numSuffix = ""
+    bullet = ''
+    numPrefix = ''
+    numSuffix = ''
     cssLengthNum = 0
-    cssLengthUnits = ""
+    cssLengthUnits = ''
     numbered = False
     displayLevels = 0
     listStyle = ListStyle(name=styleName)
-    numFormatPattern = re.compile("([1IiAa])")
-    cssLengthPattern = re.compile("([^a-z]+)\\s*([a-z]+)?")
+    numFormatPattern = re.compile(r'([1IiAa])')
+    cssLengthPattern = re.compile(r'([^a-z]+)\s*([a-z]+)?')
     m = cssLengthPattern.search(spacing)
     if (m is not None):
         cssLengthNum = float(m.group(1))
@@ -73,7 +73,7 @@ def styleFromList(styleName, specArray, spacing, showAllLevels):
         if (m is not None):
             numPrefix = specification[0:m.start(1)]
             numSuffix = specification[m.end(1):]
-            bullet = ""
+            bullet = ''
             numbered = True
             if (showAllLevels):
                 displayLevels = i + 1
@@ -81,8 +81,8 @@ def styleFromList(styleName, specArray, spacing, showAllLevels):
                 displayLevels = 1
         else:    # it's a bullet style
             bullet = specification
-            numPrefix = ""
-            numSuffix = ""
+            numPrefix = ''
+            numSuffix = ''
             displayLevels = 1
             numbered = False
         if (numbered):
diff --git a/src/odf/element.py b/src/odf/element.py
index 99b77e83a7..b206aa3a42 100644
--- a/src/odf/element.py
+++ b/src/odf/element.py
@@ -37,22 +37,22 @@ from .namespaces import nsdict
 
 
 def _escape(data, entities={}):
-    """ Escape &, <, and > in a string of data.
+    ''' Escape &, <, and > in a string of data.
 
         You can escape other strings of data by passing a dictionary as
         the optional entities parameter.  The keys and values must all be
         strings; each key will be replaced with its corresponding value.
-    """
-    data = data.replace("&", "&amp;")
-    data = data.replace("<", "&lt;")
-    data = data.replace(">", "&gt;")
+    '''
+    data = data.replace('&', '&amp;')
+    data = data.replace('<', '&lt;')
+    data = data.replace('>', '&gt;')
     for chars, entity in entities.items():
         data = data.replace(chars, entity)
     return data
 
 
 def _quoteattr(data, entities={}):
-    """ Escape and quote an attribute value.
+    ''' Escape and quote an attribute value.
 
         Escape &, <, and > in a string of data, then quote it for use as
         an attribute value.  The \" character will be escaped as well, if
@@ -61,22 +61,22 @@ def _quoteattr(data, entities={}):
         You can escape other strings of data by passing a dictionary as
         the optional entities parameter.  The keys and values must all be
         strings; each key will be replaced with its corresponding value.
-    """
+    '''
     entities['\n']='&#10;'
     entities['\r']='&#12;'
     data = _escape(data, entities)
     if '"' in data:
         if "'" in data:
-            data = '"%s"' % data.replace('"', "&quot;")
+            data = '"{}"'.format(data.replace('"', '&quot;'))
         else:
-            data = "'%s'" % data
+            data = f"'{data}'"
     else:
-        data = '"%s"' % data
+        data = f'"{data}"'
     return data
 
 
 def _nssplit(qualifiedName):
-    """ Split a qualified name into namespace part and local part.  """
+    ''' Split a qualified name into namespace part and local part.  '''
     fields = qualifiedName.split(':', 1)
     if len(fields) == 2:
         return fields
@@ -85,29 +85,29 @@ def _nssplit(qualifiedName):
 
 
 def _nsassign(namespace):
-    return nsdict.setdefault(namespace,"ns" + unicode_type(len(nsdict)))
+    return nsdict.setdefault(namespace,'ns' + unicode_type(len(nsdict)))
+
 
 # Exceptions
 
-
 class IllegalChild(Exception):
-    """ Complains if you add an element to a parent where it is not allowed """
+    ''' Complains if you add an element to a parent where it is not allowed '''
 
 
 class IllegalText(Exception):
-    """ Complains if you add text or cdata to an element where it is not allowed """
+    ''' Complains if you add text or cdata to an element where it is not allowed '''
 
 
 class Node(xml.dom.Node):
-    """ super class for more specific nodes """
+    ''' super class for more specific nodes '''
     parentNode = None
     nextSibling = None
     previousSibling = None
 
     def hasChildNodes(self):
-        """ Tells whether this element has any children; text nodes,
+        ''' Tells whether this element has any children; text nodes,
             subelements, whatever.
-        """
+        '''
         if self.childNodes:
             return True
         else:
@@ -125,11 +125,11 @@ class Node(xml.dom.Node):
             return self.childNodes[-1]
 
     def insertBefore(self, newChild, refChild):
-        """ Inserts the node newChild before the existing child node refChild.
+        ''' Inserts the node newChild before the existing child node refChild.
             If refChild is null, insert newChild at the end of the list of children.
-        """
+        '''
         if newChild.nodeType not in self._child_node_types:
-            raise IllegalChild(f"{newChild.tagName} cannot be child of {self.tagName}")
+            raise IllegalChild(f'{newChild.tagName} cannot be child of {self.tagName}')
         if newChild.parentNode is not None:
             newChild.parentNode.removeChild(newChild)
         if refChild is None:
@@ -152,16 +152,16 @@ class Node(xml.dom.Node):
         return newChild
 
     def appendChild(self, newChild):
-        """ Adds the node newChild to the end of the list of children of this node.
+        ''' Adds the node newChild to the end of the list of children of this node.
             If the newChild is already in the tree, it is first removed.
-        """
+        '''
         if newChild.nodeType == self.DOCUMENT_FRAGMENT_NODE:
             for c in tuple(newChild.childNodes):
                 self.appendChild(c)
             # The DOM does not clearly specify what to return in this case
             return newChild
         if newChild.nodeType not in self._child_node_types:
-            raise IllegalChild(f"<{newChild.tagName}> is not allowed in {self.tagName}")
+            raise IllegalChild(f'<{newChild.tagName}> is not allowed in {self.tagName}')
         if newChild.parentNode is not None:
             newChild.parentNode.removeChild(newChild)
         _append_child(self, newChild)
@@ -169,8 +169,8 @@ class Node(xml.dom.Node):
         return newChild
 
     def removeChild(self, oldChild):
-        """ Removes the child node indicated by oldChild from the list of children, and returns it.
-        """
+        ''' Removes the child node indicated by oldChild from the list of children, and returns it.
+        '''
         # FIXME: update ownerDocument.element_dict or find other solution
         try:
             self.childNodes.remove(oldChild)
@@ -194,8 +194,8 @@ class Node(xml.dom.Node):
     __str__ = __unicode__
 
 
-defproperty(Node, "firstChild", doc="First child node, or None.")
-defproperty(Node, "lastChild",  doc="Last child node, or None.")
+defproperty(Node, 'firstChild', doc='First child node, or None.')
+defproperty(Node, 'lastChild',  doc='Last child node, or None.')
 
 
 def _append_child(self, node):
@@ -203,16 +203,16 @@ def _append_child(self, node):
     childNodes = self.childNodes
     if childNodes:
         last = childNodes[-1]
-        node.__dict__["previousSibling"] = last
-        last.__dict__["nextSibling"] = node
+        node.__dict__['previousSibling'] = last
+        last.__dict__['nextSibling'] = node
     childNodes.append(node)
-    node.__dict__["parentNode"] = self
+    node.__dict__['parentNode'] = self
 
 
 class Childless:
-    """ Mixin that makes childless-ness easy to implement and avoids
+    ''' Mixin that makes childless-ness easy to implement and avoids
         the complexity of the Node methods that deal with children.
-    """
+    '''
 
     attributes = None
     childNodes = EmptyNodeList()
@@ -226,32 +226,32 @@ class Childless:
         return None
 
     def appendChild(self, node):
-        """ Raises an error """
+        ''' Raises an error '''
         raise xml.dom.HierarchyRequestErr(
-            self.tagName + " nodes cannot have children")
+            self.tagName + ' nodes cannot have children')
 
     def hasChildNodes(self):
         return False
 
     def insertBefore(self, newChild, refChild):
-        """ Raises an error """
+        ''' Raises an error '''
         raise xml.dom.HierarchyRequestErr(
-            self.tagName + " nodes do not have children")
+            self.tagName + ' nodes do not have children')
 
     def removeChild(self, oldChild):
-        """ Raises an error """
+        ''' Raises an error '''
         raise xml.dom.NotFoundErr(
-            self.tagName + " nodes do not have children")
+            self.tagName + ' nodes do not have children')
 
     def replaceChild(self, newChild, oldChild):
-        """ Raises an error """
+        ''' Raises an error '''
         raise xml.dom.HierarchyRequestErr(
-            self.tagName + " nodes do not have children")
+            self.tagName + ' nodes do not have children')
 
 
 class Text(Childless, Node):
     nodeType = Node.TEXT_NODE
-    tagName = "Text"
+    tagName = 'Text'
 
     def __init__(self, data):
         self.data = data
@@ -260,8 +260,8 @@ class Text(Childless, Node):
         return self.data
     __unicode__ = __str__
 
-    def toXml(self,level,f):
-        """ Write XML in UTF-8 """
+    def toXml(self, level, f):
+        ''' Write XML in UTF-8 '''
         if self.data:
             f.write(_escape(str(self.data).encode('utf-8')))
 
@@ -269,22 +269,22 @@ class Text(Childless, Node):
 class CDATASection(Text, Childless):
     nodeType = Node.CDATA_SECTION_NODE
 
-    def toXml(self,level,f):
-        """ Generate XML output of the node. If the text contains "]]>", then
+    def toXml(self, level, f):
+        ''' Generate XML output of the node. If the text contains "]]>", then
             escape it by going out of CDATA mode (]]>), then write the string
             and then go into CDATA mode again. (<![CDATA[)
-        """
+        '''
         if self.data:
-            f.write('<![CDATA[%s]]>' % self.data.replace(']]>',']]>]]><![CDATA['))
+            f.write('<![CDATA[{}]]>'.format(self.data.replace(']]>',']]>]]><![CDATA[')))
 
 
 class Element(Node):
-    """ Creates a arbitrary element and is intended to be subclassed not used on its own.
+    ''' Creates a arbitrary element and is intended to be subclassed not used on its own.
         This element is the base of every element it defines a class which resembles
         a xml-element. The main advantage of this kind of implementation is that you don't
         have to create a toXML method for every different object. Every element
         consists of an attribute, optional subelements, optional text and optional cdata.
-    """
+    '''
 
     nodeType = Node.ELEMENT_NODE
     namespaces = {}  # Due to shallow copy this is a static variable
@@ -299,12 +299,12 @@ class Element(Node):
     def __init__(self, attributes=None, text=None, cdata=None, qname=None, qattributes=None, check_grammar=True, **args):
         if qname is not None:
             self.qname = qname
-        assert(hasattr(self, 'qname'))
+        assert hasattr(self, 'qname')
         self.ownerDocument = None
         self.childNodes=[]
         self.allowed_children = grammar.allowed_children.get(self.qname)
         prefix = self.get_nsprefix(self.qname[0])
-        self.tagName = prefix + ":" + self.qname[1]
+        self.tagName = prefix + ':' + self.qname[1]
         if text is not None:
             self.addText(text)
         if cdata is not None:
@@ -334,12 +334,12 @@ class Element(Node):
         if required:
             for r in required:
                 if self.getAttrNS(r[0],r[1]) is None:
-                    raise AttributeError("Required attribute missing: {} in <{}>".format(r[1].lower().replace('-',''), self.tagName))
+                    raise AttributeError('Required attribute missing: {} in <{}>'.format(r[1].lower().replace('-',''), self.tagName))
 
     def get_knownns(self, prefix):
-        """ Odfpy maintains a list of known namespaces. In some cases a prefix is used, and
+        ''' Odfpy maintains a list of known namespaces. In some cases a prefix is used, and
             we need to know which namespace it resolves to.
-        """
+        '''
         global nsdict
         for ns,p in nsdict.items():
             if p == prefix:
@@ -347,11 +347,11 @@ class Element(Node):
         return None
 
     def get_nsprefix(self, namespace):
-        """ Odfpy maintains a list of known namespaces. In some cases we have a namespace URL,
+        ''' Odfpy maintains a list of known namespaces. In some cases we have a namespace URL,
             and needs to look up or assign the prefix for it.
-        """
+        '''
         if namespace is None:
-            namespace = ""
+            namespace = ''
         prefix = _nsassign(namespace)
         if namespace not in self.namespaces:
             self.namespaces[namespace] = prefix
@@ -366,84 +366,84 @@ class Element(Node):
             self._setOwnerDoc(child)
 
     def addElement(self, element, check_grammar=True):
-        """ adds an element to an Element
+        ''' adds an element to an Element
 
             Element.addElement(Element)
-        """
+        '''
         if check_grammar and self.allowed_children is not None:
             if element.qname not in self.allowed_children:
-                raise IllegalChild(f"<{element.tagName}> is not allowed in <{self.tagName}>")
+                raise IllegalChild(f'<{element.tagName}> is not allowed in <{self.tagName}>')
         self.appendChild(element)
         self._setOwnerDoc(element)
         if self.ownerDocument:
             self.ownerDocument.rebuild_caches(element)
 
     def addText(self, text, check_grammar=True):
-        """ Adds text to an element
+        ''' Adds text to an element
             Setting check_grammar=False turns off grammar checking
-        """
+        '''
         if check_grammar and self.qname not in grammar.allows_text:
-            raise IllegalText("The <%s> element does not allow text" % self.tagName)
+            raise IllegalText(f'The <{self.tagName}> element does not allow text')
         else:
             if text != '':
                 self.appendChild(Text(text))
 
     def addCDATA(self, cdata, check_grammar=True):
-        """ Adds CDATA to an element
+        ''' Adds CDATA to an element
             Setting check_grammar=False turns off grammar checking
-        """
+        '''
         if check_grammar and self.qname not in grammar.allows_text:
-            raise IllegalText("The <%s> element does not allow text" % self.tagName)
+            raise IllegalText(f'The <{self.tagName}> element does not allow text')
         else:
             self.appendChild(CDATASection(cdata))
 
     def removeAttribute(self, attr, check_grammar=True):
-        """ Removes an attribute by name. """
+        ''' Removes an attribute by name. '''
         allowed_attrs = self.allowed_attributes()
         if allowed_attrs is None:
             if isinstance(attr, tuple):
                 prefix, localname = attr
                 self.removeAttrNS(prefix, localname)
             else:
-                raise AttributeError("Unable to add simple attribute - use (namespace, localpart)")
+                raise AttributeError('Unable to add simple attribute - use (namespace, localpart)')
         else:
             # Construct a list of allowed arguments
             allowed_args = [a[1].lower().replace('-','') for a in allowed_attrs]
             if check_grammar and attr not in allowed_args:
-                raise AttributeError(f"Attribute {attr} is not allowed in <{self.tagName}>")
+                raise AttributeError(f'Attribute {attr} is not allowed in <{self.tagName}>')
             i = allowed_args.index(attr)
             self.removeAttrNS(allowed_attrs[i][0], allowed_attrs[i][1])
 
     def setAttribute(self, attr, value, check_grammar=True):
-        """ Add an attribute to the element
+        ''' Add an attribute to the element
             This is sort of a convenience method. All attributes in ODF have
             namespaces. The library knows what attributes are legal and then allows
             the user to provide the attribute as a keyword argument and the
             library will add the correct namespace.
             Must overwrite, If attribute already exists.
-        """
+        '''
         allowed_attrs = self.allowed_attributes()
         if allowed_attrs is None:
             if isinstance(attr, tuple):
                 prefix, localname = attr
                 self.setAttrNS(prefix, localname, value)
             else:
-                raise AttributeError("Unable to add simple attribute - use (namespace, localpart)")
+                raise AttributeError('Unable to add simple attribute - use (namespace, localpart)')
         else:
             # Construct a list of allowed arguments
             allowed_args = [a[1].lower().replace('-','') for a in allowed_attrs]
             if check_grammar and attr not in allowed_args:
-                raise AttributeError(f"Attribute {attr} is not allowed in <{self.tagName}>")
+                raise AttributeError(f'Attribute {attr} is not allowed in <{self.tagName}>')
             i = allowed_args.index(attr)
             self.setAttrNS(allowed_attrs[i][0], allowed_attrs[i][1], value)
 
     def setAttrNS(self, namespace, localpart, value):
-        """ Add an attribute to the element
+        ''' Add an attribute to the element
             In case you need to add an attribute the library doesn't know about
             then you must provide the full qualified name
             It will not check that the attribute is legal according to the schema.
             Must overwrite, If attribute already exists.
-        """
+        '''
         c = AttrConverters()
         self.attributes[(namespace, localpart)] = c.convert((namespace, localpart), value, self)
 
@@ -454,15 +454,15 @@ class Element(Node):
         del self.attributes[(namespace, localpart)]
 
     def getAttribute(self, attr):
-        """ Get an attribute value. The method knows which namespace the attribute is in
-        """
+        ''' Get an attribute value. The method knows which namespace the attribute is in
+        '''
         allowed_attrs = self.allowed_attributes()
         if allowed_attrs is None:
             if isinstance(attr, tuple):
                 prefix, localname = attr
                 return self.getAttrNS(prefix, localname)
             else:
-                raise AttributeError("Unable to get simple attribute - use (namespace, localpart)")
+                raise AttributeError('Unable to get simple attribute - use (namespace, localpart)')
         else:
             # Construct a list of allowed arguments
             allowed_args = [a[1].lower().replace('-','') for a in allowed_attrs]
@@ -483,7 +483,7 @@ class Element(Node):
         f.write('</'+self.tagName+'>')
 
     def toXml(self, level, f):
-        """ Generate XML stream out of the tree structure """
+        ''' Generate XML stream out of the tree structure '''
         f.write('<'+self.tagName)
         if level == 0:
             for namespace, prefix in self.namespaces.items():
@@ -494,7 +494,7 @@ class Element(Node):
         if self.childNodes:
             f.write('>')
             for element in self.childNodes:
-                element.toXml(level+1,f)
+                element.toXml(level+1, f)
             f.write('</'+self.tagName+'>')
         else:
             f.write('/>')
@@ -508,11 +508,11 @@ class Element(Node):
         return accumulator
 
     def getElementsByType(self, element):
-        """ Gets elements based on the type, which is function from text.py, draw.py etc. """
+        ''' Gets elements based on the type, which is function from text.py, draw.py etc. '''
         obj = element(check_grammar=False)
         return self._getElementsByObj(obj,[])
 
     def isInstanceOf(self, element):
-        """ This is a check to see if the object is an instance of a type """
+        ''' This is a check to see if the object is an instance of a type '''
         obj = element(check_grammar=False)
         return self.qname == obj.qname
diff --git a/src/odf/elementtypes.py b/src/odf/elementtypes.py
index 5eaee93cb1..4cd028f753 100644
--- a/src/odf/elementtypes.py
+++ b/src/odf/elementtypes.py
@@ -337,5 +337,5 @@ empty_elements = (
     (TEXTNS,'user-index-mark'),
     (TEXTNS,'user-index-mark-end'),
     (TEXTNS,'user-index-mark-start'),
-    (TEXTNS,'variable-decl')
+    (TEXTNS,'variable-decl'),
 )
diff --git a/src/odf/grammar.py b/src/odf/grammar.py
index 44584a5f76..cf374c52ae 100644
--- a/src/odf/grammar.py
+++ b/src/odf/grammar.py
@@ -18,10 +18,10 @@
 #
 
 
-__doc__=""" In principle the OpenDocument schema converted to python structures.
+__doc__=''' In principle the OpenDocument schema converted to python structures.
 Currently it contains the legal child elements of a given element.
 To be used for validation check in the API
-"""
+'''
 
 from .namespaces import (
     ANIMNS,
@@ -74,57 +74,57 @@ from .namespaces import (
 #
 
 allowed_children = {
-        (DCNS,'creator') : (
+        (DCNS,'creator'): (
         ),
-        (DCNS,'date') : (
+        (DCNS,'date'): (
         ),
-        (DCNS,'description') : (
+        (DCNS,'description'): (
         ),
-        (DCNS,'language') : (
+        (DCNS,'language'): (
         ),
-        (DCNS,'subject') : (
+        (DCNS,'subject'): (
         ),
-        (DCNS,'title') : (
+        (DCNS,'title'): (
         ),
-# Completes Dublin Core start
-        # (DCNS,'contributor') : (
+    # Completes Dublin Core start
+        # (DCNS,'contributor'): (
         # ),
-        # (DCNS,'coverage') : (
+        # (DCNS,'coverage'): (
         # ),
-        # (DCNS,'format') : (
+        # (DCNS,'format'): (
         # ),
-        # (DCNS,'identifier') : (
+        # (DCNS,'identifier'): (
         # ),
-        # (DCNS,'publisher') : (
+        # (DCNS,'publisher'): (
         # ),
-        # (DCNS,'relation') : (
+        # (DCNS,'relation'): (
         # ),
-        # (DCNS,'rights') : (
+        # (DCNS,'rights'): (
         # ),
-        # (DCNS,'source') : (
+        # (DCNS,'source'): (
         # ),
-        # (DCNS,'type') : (
+        # (DCNS,'type'): (
         # ),
-# Completes Dublin Core end
-        (MATHNS,'math') : None,
+    # Completes Dublin Core end
+        (MATHNS,'math'): None,
 
-        (XFORMSNS,'model') : None,
+        (XFORMSNS,'model'): None,
 
-        (ANIMNS,'animate') : (
+        (ANIMNS,'animate'): (
         ),
-        (ANIMNS,'animateColor') : (
+        (ANIMNS,'animateColor'): (
         ),
-        (ANIMNS,'animateMotion') : (
+        (ANIMNS,'animateMotion'): (
         ),
-        (ANIMNS,'animateTransform') : (
+        (ANIMNS,'animateTransform'): (
         ),
-        (ANIMNS,'audio') : (
+        (ANIMNS,'audio'): (
         ),
-        (ANIMNS,'command') : (
+        (ANIMNS,'command'): (
                 (ANIMNS,'param'),
         ),
-# allowed_children
-        (ANIMNS,'iterate') : (
+    # allowed_children
+        (ANIMNS,'iterate'): (
                 (ANIMNS,'animate'),
                 (ANIMNS,'animateColor'),
                 (ANIMNS,'animateMotion'),
@@ -137,7 +137,7 @@ allowed_children = {
                 (ANIMNS,'set'),
                 (ANIMNS,'transitionFilter'),
         ),
-        (ANIMNS,'par') : (
+        (ANIMNS,'par'): (
                 (ANIMNS,'animate'),
                 (ANIMNS,'animateColor'),
                 (ANIMNS,'animateMotion'),
@@ -150,10 +150,10 @@ allowed_children = {
                 (ANIMNS,'set'),
                 (ANIMNS,'transitionFilter'),
         ),
-# allowed_children
-        (ANIMNS,'param') : (
+    # allowed_children
+        (ANIMNS,'param'): (
         ),
-        (ANIMNS,'seq') : (
+        (ANIMNS,'seq'): (
                 (ANIMNS,'animate'),
                 (ANIMNS,'animateColor'),
                 (ANIMNS,'animateMotion'),
@@ -166,19 +166,19 @@ allowed_children = {
                 (ANIMNS,'set'),
                 (ANIMNS,'transitionFilter'),
         ),
-        (ANIMNS,'set') : (
+        (ANIMNS,'set'): (
         ),
-        (ANIMNS,'transitionFilter') : (
+        (ANIMNS,'transitionFilter'): (
         ),
-        (CHARTNS,'axis') : (
+        (CHARTNS,'axis'): (
                 (CHARTNS,'categories'),
                 (CHARTNS,'grid'),
                 (CHARTNS,'title'),
         ),
-# allowed_children
-        (CHARTNS,'categories') : (
+    # allowed_children
+        (CHARTNS,'categories'): (
         ),
-        (CHARTNS,'chart') : (
+        (CHARTNS,'chart'): (
                 (CHARTNS,'footer'),
                 (CHARTNS,'legend'),
                 (CHARTNS,'plot-area'),
@@ -186,25 +186,25 @@ allowed_children = {
                 (CHARTNS,'title'),
                 (TABLENS,'table'),
         ),
-        (CHARTNS,'data-point') : (
+        (CHARTNS,'data-point'): (
         ),
-        (CHARTNS,'domain') : (
+        (CHARTNS,'domain'): (
         ),
-        (CHARTNS,'error-indicator') : (
+        (CHARTNS,'error-indicator'): (
         ),
-        (CHARTNS,'floor') : (
+        (CHARTNS,'floor'): (
         ),
-        (CHARTNS,'footer') : (
+        (CHARTNS,'footer'): (
                 (TEXTNS,'p'),
         ),
-        (CHARTNS,'grid') : (
+        (CHARTNS,'grid'): (
         ),
-        (CHARTNS,'legend') : (
+        (CHARTNS,'legend'): (
         ),
-# allowed_children
-        (CHARTNS,'mean-value') : (
+    # allowed_children
+        (CHARTNS,'mean-value'): (
         ),
-        (CHARTNS,'plot-area') : (
+        (CHARTNS,'plot-area'): (
                 (CHARTNS,'axis'),
                 (CHARTNS,'floor'),
                 (CHARTNS,'series'),
@@ -214,88 +214,88 @@ allowed_children = {
                 (CHARTNS,'wall'),
                 (DR3DNS,'light'),
         ),
-        (CHARTNS,'regression-curve') : (
+        (CHARTNS,'regression-curve'): (
         ),
-        (CHARTNS,'series') : (
+        (CHARTNS,'series'): (
                 (CHARTNS,'data-point'),
                 (CHARTNS,'domain'),
                 (CHARTNS,'error-indicator'),
                 (CHARTNS,'mean-value'),
                 (CHARTNS,'regression-curve'),
         ),
-        (CHARTNS,'stock-gain-marker') : (
+        (CHARTNS,'stock-gain-marker'): (
         ),
-        (CHARTNS,'stock-loss-marker') : (
+        (CHARTNS,'stock-loss-marker'): (
         ),
-# allowed_children
-        (CHARTNS,'stock-range-line') : (
+    # allowed_children
+        (CHARTNS,'stock-range-line'): (
         ),
-        (CHARTNS,'subtitle') : (
+        (CHARTNS,'subtitle'): (
                 (TEXTNS,'p'),
         ),
-        (CHARTNS,'symbol-image') : (
+        (CHARTNS,'symbol-image'): (
         ),
-        (CHARTNS,'title') : (
+        (CHARTNS,'title'): (
                 (TEXTNS,'p'),
         ),
-        (CHARTNS,'wall') : (
+        (CHARTNS,'wall'): (
         ),
-        (CONFIGNS,'config-item') : (
+        (CONFIGNS,'config-item'): (
         ),
-        (CONFIGNS,'config-item-map-entry') : (
+        (CONFIGNS,'config-item-map-entry'): (
                 (CONFIGNS,'config-item'),
                 (CONFIGNS,'config-item-map-indexed'),
                 (CONFIGNS,'config-item-map-named'),
                 (CONFIGNS,'config-item-set'),
         ),
-        (CONFIGNS,'config-item-map-indexed') : (
+        (CONFIGNS,'config-item-map-indexed'): (
                 (CONFIGNS,'config-item-map-entry'),
         ),
-        (CONFIGNS,'config-item-map-named') : (
+        (CONFIGNS,'config-item-map-named'): (
                 (CONFIGNS,'config-item-map-entry'),
         ),
-# allowed_children
-        (CONFIGNS,'config-item-set') : (
+    # allowed_children
+        (CONFIGNS,'config-item-set'): (
                 (CONFIGNS,'config-item'),
                 (CONFIGNS,'config-item-map-indexed'),
                 (CONFIGNS,'config-item-map-named'),
                 (CONFIGNS,'config-item-set'),
         ),
-        (MANIFESTNS,'algorithm') : (
+        (MANIFESTNS,'algorithm'): (
         ),
-        (MANIFESTNS,'encryption-data') : (
+        (MANIFESTNS,'encryption-data'): (
                 (MANIFESTNS,'algorithm'),
                 (MANIFESTNS,'key-derivation'),
         ),
-        (MANIFESTNS,'file-entry') : (
+        (MANIFESTNS,'file-entry'): (
                 (MANIFESTNS,'encryption-data'),
         ),
-        (MANIFESTNS,'key-derivation') : (
+        (MANIFESTNS,'key-derivation'): (
         ),
-        (MANIFESTNS,'manifest') : (
+        (MANIFESTNS,'manifest'): (
                 (MANIFESTNS,'file-entry'),
         ),
-        (NUMBERNS,'am-pm') : (
+        (NUMBERNS,'am-pm'): (
         ),
-        (NUMBERNS,'boolean') : (
+        (NUMBERNS,'boolean'): (
         ),
-# allowed_children
-        (NUMBERNS,'boolean-style') : (
+    # allowed_children
+        (NUMBERNS,'boolean-style'): (
                 (NUMBERNS,'boolean'),
                 (NUMBERNS,'text'),
                 (STYLENS,'map'),
                 (STYLENS,'text-properties'),
         ),
-        (NUMBERNS,'currency-style') : (
+        (NUMBERNS,'currency-style'): (
                 (NUMBERNS,'currency-symbol'),
                 (NUMBERNS,'number'),
                 (NUMBERNS,'text'),
                 (STYLENS,'map'),
                 (STYLENS,'text-properties'),
         ),
-        (NUMBERNS,'currency-symbol') : (
+        (NUMBERNS,'currency-symbol'): (
         ),
-        (NUMBERNS,'date-style') : (
+        (NUMBERNS,'date-style'): (
                 (NUMBERNS,'am-pm'),
                 (NUMBERNS,'day'),
                 (NUMBERNS,'day-of-week'),
@@ -311,27 +311,27 @@ allowed_children = {
                 (STYLENS,'map'),
                 (STYLENS,'text-properties'),
         ),
-# allowed_children
-        (NUMBERNS,'day') : (
+    # allowed_children
+        (NUMBERNS,'day'): (
         ),
-        (NUMBERNS,'day-of-week') : (
+        (NUMBERNS,'day-of-week'): (
         ),
-        (NUMBERNS,'embedded-text') : (
+        (NUMBERNS,'embedded-text'): (
         ),
-        (NUMBERNS,'era') : (
+        (NUMBERNS,'era'): (
         ),
-        (NUMBERNS,'fraction') : (
+        (NUMBERNS,'fraction'): (
         ),
-        (NUMBERNS,'hours') : (
+        (NUMBERNS,'hours'): (
         ),
-        (NUMBERNS,'minutes') : (
+        (NUMBERNS,'minutes'): (
         ),
-        (NUMBERNS,'month') : (
+        (NUMBERNS,'month'): (
         ),
-        (NUMBERNS,'number') : (
+        (NUMBERNS,'number'): (
                 (NUMBERNS,'embedded-text'),
         ),
-        (NUMBERNS,'number-style') : (
+        (NUMBERNS,'number-style'): (
                 (NUMBERNS,'fraction'),
                 (NUMBERNS,'number'),
                 (NUMBERNS,'scientific-number'),
@@ -339,31 +339,31 @@ allowed_children = {
                 (STYLENS,'map'),
                 (STYLENS,'text-properties'),
         ),
-# allowed_children
-        (NUMBERNS,'percentage-style') : (
+    # allowed_children
+        (NUMBERNS,'percentage-style'): (
                 (NUMBERNS,'number'),
                 (NUMBERNS,'text'),
                 (STYLENS,'map'),
                 (STYLENS,'text-properties'),
         ),
-        (NUMBERNS,'quarter') : (
+        (NUMBERNS,'quarter'): (
         ),
-        (NUMBERNS,'scientific-number') : (
+        (NUMBERNS,'scientific-number'): (
         ),
-        (NUMBERNS,'seconds') : (
+        (NUMBERNS,'seconds'): (
         ),
-        (NUMBERNS,'text') : (
+        (NUMBERNS,'text'): (
         ),
-        (NUMBERNS,'text-content') : (
+        (NUMBERNS,'text-content'): (
         ),
-        (NUMBERNS,'text-style') : (
+        (NUMBERNS,'text-style'): (
                 (NUMBERNS,'text'),
                 (NUMBERNS,'text-content'),
                 (STYLENS,'map'),
                 (STYLENS,'text-properties'),
         ),
-# allowed_children
-        (NUMBERNS,'time-style') : (
+    # allowed_children
+        (NUMBERNS,'time-style'): (
                 (NUMBERNS,'am-pm'),
                 (NUMBERNS,'hours'),
                 (NUMBERNS,'minutes'),
@@ -372,20 +372,20 @@ allowed_children = {
                 (STYLENS,'map'),
                 (STYLENS,'text-properties'),
         ),
-# allowed_children
-        (NUMBERNS,'week-of-year') : (
+    # allowed_children
+        (NUMBERNS,'week-of-year'): (
         ),
-        (NUMBERNS,'year') : (
+        (NUMBERNS,'year'): (
         ),
-        (DR3DNS,'cube') : (
+        (DR3DNS,'cube'): (
         ),
-        (DR3DNS,'extrude') : (
+        (DR3DNS,'extrude'): (
         ),
-        (DR3DNS,'light') : (
+        (DR3DNS,'light'): (
         ),
-        (DR3DNS,'rotate') : (
+        (DR3DNS,'rotate'): (
         ),
-        (DR3DNS,'scene') : (
+        (DR3DNS,'scene'): (
                 (DR3DNS,'cube'),
                 (DR3DNS,'extrude'),
                 (DR3DNS,'light'),
@@ -395,31 +395,31 @@ allowed_children = {
                 (SVGNS,'title'),
                 (SVGNS,'desc'),
         ),
-        (DR3DNS,'sphere') : (
+        (DR3DNS,'sphere'): (
         ),
-        (DRAWNS,'a') : (
+        (DRAWNS,'a'): (
                 (DRAWNS,'frame'),
         ),
-# allowed_children
-        (DRAWNS,'applet') : (
+    # allowed_children
+        (DRAWNS,'applet'): (
                 (DRAWNS,'param'),
         ),
-        (DRAWNS,'area-circle') : (
+        (DRAWNS,'area-circle'): (
                 (OFFICENS,'event-listeners'),
                 (SVGNS,'desc'),
                 (SVGNS,'title'),
         ),
-        (DRAWNS,'area-polygon') : (
+        (DRAWNS,'area-polygon'): (
                 (OFFICENS,'event-listeners'),
                 (SVGNS,'desc'),
                 (SVGNS,'title'),
         ),
-        (DRAWNS,'area-rectangle') : (
+        (DRAWNS,'area-rectangle'): (
                 (OFFICENS,'event-listeners'),
                 (SVGNS,'desc'),
                 (SVGNS,'title'),
         ),
-        (DRAWNS,'caption') : (
+        (DRAWNS,'caption'): (
                 (DRAWNS,'glue-point'),
                 (OFFICENS,'event-listeners'),
                 (SVGNS,'desc'),
@@ -427,7 +427,7 @@ allowed_children = {
                 (TEXTNS,'list'),
                 (TEXTNS,'p'),
         ),
-        (DRAWNS,'circle') : (
+        (DRAWNS,'circle'): (
                 (DRAWNS,'glue-point'),
                 (OFFICENS,'event-listeners'),
                 (SVGNS,'desc'),
@@ -435,8 +435,8 @@ allowed_children = {
                 (TEXTNS,'list'),
                 (TEXTNS,'p'),
         ),
-# allowed_children
-        (DRAWNS,'connector') : (
+    # allowed_children
+        (DRAWNS,'connector'): (
                 (DRAWNS,'glue-point'),
                 (OFFICENS,'event-listeners'),
                 (SVGNS,'desc'),
@@ -444,16 +444,16 @@ allowed_children = {
                 (TEXTNS,'list'),
                 (TEXTNS,'p'),
         ),
-        (DRAWNS,'contour-path') : (
+        (DRAWNS,'contour-path'): (
         ),
-        (DRAWNS,'contour-polygon') : (
+        (DRAWNS,'contour-polygon'): (
         ),
-        (DRAWNS,'control') : (
+        (DRAWNS,'control'): (
                 (DRAWNS,'glue-point'),
                 (SVGNS,'desc'),
                 (SVGNS,'title'),
         ),
-        (DRAWNS,'custom-shape') : (
+        (DRAWNS,'custom-shape'): (
                 (DRAWNS,'enhanced-geometry'),
                 (DRAWNS,'glue-point'),
                 (OFFICENS,'event-listeners'),
@@ -462,8 +462,8 @@ allowed_children = {
                 (TEXTNS,'list'),
                 (TEXTNS,'p'),
         ),
-# allowed_children
-        (DRAWNS,'ellipse') : (
+    # allowed_children
+        (DRAWNS,'ellipse'): (
                 (DRAWNS,'glue-point'),
                 (OFFICENS,'event-listeners'),
                 (SVGNS,'desc'),
@@ -471,18 +471,18 @@ allowed_children = {
                 (TEXTNS,'list'),
                 (TEXTNS,'p'),
         ),
-        (DRAWNS,'enhanced-geometry') : (
+        (DRAWNS,'enhanced-geometry'): (
                 (DRAWNS,'equation'),
                 (DRAWNS,'handle'),
         ),
-        (DRAWNS,'equation') : (
+        (DRAWNS,'equation'): (
         ),
-# allowed_children
-        (DRAWNS,'fill-image') : (
+    # allowed_children
+        (DRAWNS,'fill-image'): (
         ),
-        (DRAWNS,'floating-frame') : (
+        (DRAWNS,'floating-frame'): (
         ),
-        (DRAWNS,'frame') : (
+        (DRAWNS,'frame'): (
                 (DRAWNS,'applet'),
                 (DRAWNS,'contour-path'),
                 (DRAWNS,'contour-polygon'),
@@ -498,8 +498,8 @@ allowed_children = {
                 (SVGNS,'desc'),
                 (SVGNS,'title'),
         ),
-# allowed_children
-        (DRAWNS,'g') : (
+    # allowed_children
+        (DRAWNS,'g'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'caption'),
                 (DRAWNS,'circle'),
@@ -522,33 +522,33 @@ allowed_children = {
                 (SVGNS,'title'),
                 (OFFICENS,'event-listeners'),
         ),
-        (DRAWNS,'glue-point') : (
+        (DRAWNS,'glue-point'): (
         ),
-        (DRAWNS,'gradient') : (
+        (DRAWNS,'gradient'): (
         ),
-        (DRAWNS,'handle') : (
+        (DRAWNS,'handle'): (
         ),
-        (DRAWNS,'hatch') : (
+        (DRAWNS,'hatch'): (
         ),
-# allowed_children
-        (DRAWNS,'image') : (
+    # allowed_children
+        (DRAWNS,'image'): (
                 (OFFICENS,'binary-data'),
                 (TEXTNS,'list'),
                 (TEXTNS,'p'),
         ),
-        (DRAWNS,'image-map') : (
+        (DRAWNS,'image-map'): (
                 (DRAWNS,'area-circle'),
                 (DRAWNS,'area-polygon'),
                 (DRAWNS,'area-rectangle'),
         ),
-        (DRAWNS,'layer') : (
+        (DRAWNS,'layer'): (
                 (SVGNS,'desc'),
                 (SVGNS,'title'),
         ),
-        (DRAWNS,'layer-set') : (
+        (DRAWNS,'layer-set'): (
                 (DRAWNS,'layer'),
         ),
-        (DRAWNS,'line') : (
+        (DRAWNS,'line'): (
                 (DRAWNS,'glue-point'),
                 (OFFICENS,'event-listeners'),
                 (SVGNS,'desc'),
@@ -556,9 +556,9 @@ allowed_children = {
                 (TEXTNS,'list'),
                 (TEXTNS,'p'),
         ),
-        (DRAWNS,'marker') : (
+        (DRAWNS,'marker'): (
         ),
-        (DRAWNS,'measure') : (
+        (DRAWNS,'measure'): (
                 (DRAWNS,'glue-point'),
                 (OFFICENS,'event-listeners'),
                 (TEXTNS,'list'),
@@ -566,17 +566,17 @@ allowed_children = {
                 (SVGNS,'title'),
                 (SVGNS,'desc'),
         ),
-        (DRAWNS,'object') : (
+        (DRAWNS,'object'): (
                 (MATHNS,'math'),
                 (OFFICENS,'document'),
         ),
-# allowed_children
-        (DRAWNS,'object-ole') : (
+    # allowed_children
+        (DRAWNS,'object-ole'): (
                 (OFFICENS,'binary-data'),
         ),
-        (DRAWNS,'opacity') : (
+        (DRAWNS,'opacity'): (
         ),
-        (DRAWNS,'page') : (
+        (DRAWNS,'page'): (
                 (ANIMNS,'animate'),
                 (ANIMNS,'animateColor'),
                 (ANIMNS,'animateMotion'),
@@ -609,14 +609,14 @@ allowed_children = {
                 (PRESENTATIONNS,'animations'),
                 (PRESENTATIONNS,'notes'),
         ),
-# allowed_children
-        (DRAWNS,'page-thumbnail') : (
+    # allowed_children
+        (DRAWNS,'page-thumbnail'): (
                 (SVGNS,'desc'),
                 (SVGNS,'title'),
         ),
-        (DRAWNS,'param') : (
+        (DRAWNS,'param'): (
         ),
-        (DRAWNS,'path') : (
+        (DRAWNS,'path'): (
                 (DRAWNS,'glue-point'),
                 (OFFICENS,'event-listeners'),
                 (SVGNS,'desc'),
@@ -624,10 +624,10 @@ allowed_children = {
                 (TEXTNS,'list'),
                 (TEXTNS,'p'),
         ),
-        (DRAWNS,'plugin') : (
+        (DRAWNS,'plugin'): (
                 (DRAWNS,'param'),
         ),
-        (DRAWNS,'polygon') : (
+        (DRAWNS,'polygon'): (
                 (DRAWNS,'glue-point'),
                 (OFFICENS,'event-listeners'),
                 (SVGNS,'title'),
@@ -635,7 +635,7 @@ allowed_children = {
                 (TEXTNS,'list'),
                 (TEXTNS,'p'),
         ),
-        (DRAWNS,'polyline') : (
+        (DRAWNS,'polyline'): (
                 (DRAWNS,'glue-point'),
                 (OFFICENS,'event-listeners'),
                 (SVGNS,'desc'),
@@ -643,8 +643,8 @@ allowed_children = {
                 (TEXTNS,'list'),
                 (TEXTNS,'p'),
         ),
-# allowed_children
-        (DRAWNS,'rect') : (
+    # allowed_children
+        (DRAWNS,'rect'): (
                 (DRAWNS,'glue-point'),
                 (OFFICENS,'event-listeners'),
                 (SVGNS,'desc'),
@@ -652,7 +652,7 @@ allowed_children = {
                 (TEXTNS,'list'),
                 (TEXTNS,'p'),
         ),
-        (DRAWNS,'regular-polygon') : (
+        (DRAWNS,'regular-polygon'): (
                 (DRAWNS,'glue-point'),
                 (OFFICENS,'event-listeners'),
                 (SVGNS,'desc'),
@@ -660,9 +660,9 @@ allowed_children = {
                 (TEXTNS,'list'),
                 (TEXTNS,'p'),
         ),
-        (DRAWNS,'stroke-dash') : (
+        (DRAWNS,'stroke-dash'): (
         ),
-        (DRAWNS,'text-box') : (
+        (DRAWNS,'text-box'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'a'),
                 (DRAWNS,'caption'),
@@ -699,16 +699,16 @@ allowed_children = {
                 (TEXTNS,'table-of-content'),
                 (TEXTNS,'user-index'),
         ),
-# allowed_children
-        (FORMNS,'button') : (
+    # allowed_children
+        (FORMNS,'button'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'checkbox') : (
+        (FORMNS,'checkbox'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'column') : (
+        (FORMNS,'column'): (
                 (FORMNS,'checkbox'),
                 (FORMNS,'combobox'),
                 (FORMNS,'date'),
@@ -718,27 +718,27 @@ allowed_children = {
                 (FORMNS,'text'),
                 (FORMNS,'textarea'),
         ),
-        (FORMNS,'combobox') : (
+        (FORMNS,'combobox'): (
                 (FORMNS,'item'),
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'connection-resource') : (
+        (FORMNS,'connection-resource'): (
         ),
-        (FORMNS,'date') : (
+        (FORMNS,'date'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'file') : (
+        (FORMNS,'file'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'fixed-text') : (
+        (FORMNS,'fixed-text'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-# allowed_children
-        (FORMNS,'form') : (
+    # allowed_children
+        (FORMNS,'form'): (
                 (FORMNS,'button'),
                 (FORMNS,'checkbox'),
                 (FORMNS,'combobox'),
@@ -765,39 +765,39 @@ allowed_children = {
                 (FORMNS,'value-range'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'formatted-text') : (
+        (FORMNS,'formatted-text'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'frame') : (
+        (FORMNS,'frame'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'generic-control') : (
+        (FORMNS,'generic-control'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'grid') : (
+        (FORMNS,'grid'): (
                 (FORMNS,'column'),
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'hidden') : (
+        (FORMNS,'hidden'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'image') : (
+        (FORMNS,'image'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-# allowed_children
-        (FORMNS,'image-frame') : (
+    # allowed_children
+        (FORMNS,'image-frame'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'item') : (
+        (FORMNS,'item'): (
         ),
-        (FORMNS,'list-property') : (
+        (FORMNS,'list-property'): (
                 (FORMNS,'list-value'),
                 (FORMNS,'list-value'),
                 (FORMNS,'list-value'),
@@ -806,87 +806,87 @@ allowed_children = {
                 (FORMNS,'list-value'),
                 (FORMNS,'list-value'),
         ),
-        (FORMNS,'list-value') : (
+        (FORMNS,'list-value'): (
         ),
-        (FORMNS,'listbox') : (
+        (FORMNS,'listbox'): (
                 (FORMNS,'option'),
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'number') : (
+        (FORMNS,'number'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'option') : (
+        (FORMNS,'option'): (
         ),
-        (FORMNS,'password') : (
+        (FORMNS,'password'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'properties') : (
+        (FORMNS,'properties'): (
                 (FORMNS,'list-property'),
                 (FORMNS,'property'),
         ),
-        (FORMNS,'property') : (
+        (FORMNS,'property'): (
         ),
-        (FORMNS,'radio') : (
+        (FORMNS,'radio'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'text') : (
+        (FORMNS,'text'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'textarea') : (
+        (FORMNS,'textarea'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
                 (TEXTNS,'p'),
         ),
-        (FORMNS,'time') : (
+        (FORMNS,'time'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (FORMNS,'value-range') : (
+        (FORMNS,'value-range'): (
                 (FORMNS,'properties'),
                 (OFFICENS,'event-listeners'),
         ),
-        (METANS,'auto-reload') : (
+        (METANS,'auto-reload'): (
         ),
-        (METANS,'creation-date') : (
+        (METANS,'creation-date'): (
         ),
-        (METANS,'date-string') : (
+        (METANS,'date-string'): (
         ),
-        (METANS,'document-statistic') : (
+        (METANS,'document-statistic'): (
         ),
-        (METANS,'editing-cycles') : (
+        (METANS,'editing-cycles'): (
         ),
-        (METANS,'editing-duration') : (
+        (METANS,'editing-duration'): (
         ),
-        (METANS,'generator') : (
+        (METANS,'generator'): (
         ),
-        (METANS,'hyperlink-behaviour') : (
+        (METANS,'hyperlink-behaviour'): (
         ),
-        (METANS,'initial-creator') : (
+        (METANS,'initial-creator'): (
         ),
-        (METANS,'keyword') : (
+        (METANS,'keyword'): (
         ),
-        (METANS,'print-date') : (
+        (METANS,'print-date'): (
         ),
-        (METANS,'printed-by') : (
+        (METANS,'printed-by'): (
         ),
-        (METANS,'template') : (
+        (METANS,'template'): (
         ),
-        (METANS,'user-defined') : (
+        (METANS,'user-defined'): (
         ),
-# allowed_children
-        (OFFICENS,'annotation') : (
+    # allowed_children
+        (OFFICENS,'annotation'): (
                 (DCNS,'creator'),
                 (DCNS,'date'),
                 (METANS,'date-string'),
                 (TEXTNS,'list'),
                 (TEXTNS,'p'),
         ),
-        (OFFICENS,'automatic-styles') : (
+        (OFFICENS,'automatic-styles'): (
                 (NUMBERNS,'boolean-style'),
                 (NUMBERNS,'currency-style'),
                 (NUMBERNS,'date-style'),
@@ -898,9 +898,9 @@ allowed_children = {
                 (STYLENS,'style'),
                 (TEXTNS,'list-style'),
         ),
-        (OFFICENS,'binary-data') : (
+        (OFFICENS,'binary-data'): (
         ),
-        (OFFICENS,'body') : (
+        (OFFICENS,'body'): (
                 (OFFICENS,'chart'),
                 (OFFICENS,'drawing'),
                 (OFFICENS,'image'),
@@ -908,12 +908,12 @@ allowed_children = {
                 (OFFICENS,'spreadsheet'),
                 (OFFICENS,'text'),
         ),
-        (OFFICENS,'change-info') : (
+        (OFFICENS,'change-info'): (
                 (DCNS,'creator'),
                 (DCNS,'date'),
                 (TEXTNS,'p'),
         ),
-        (OFFICENS,'chart') : (
+        (OFFICENS,'chart'): (
                 (CHARTNS,'chart'),
                 (TABLENS,'calculation-settings'),
                 (TABLENS,'consolidation'),
@@ -929,9 +929,9 @@ allowed_children = {
                 (TEXTNS,'user-field-decls'),
                 (TEXTNS,'variable-decls'),
         ),
-        (OFFICENS,'dde-source') : (
+        (OFFICENS,'dde-source'): (
         ),
-        (OFFICENS,'document') : (
+        (OFFICENS,'document'): (
                 (OFFICENS,'automatic-styles'),
                 (OFFICENS,'body'),
                 (OFFICENS,'font-face-decls'),
@@ -941,25 +941,25 @@ allowed_children = {
                 (OFFICENS,'settings'),
                 (OFFICENS,'styles'),
         ),
-        (OFFICENS,'document-content') : (
+        (OFFICENS,'document-content'): (
                 (OFFICENS,'automatic-styles'),
                 (OFFICENS,'body'),
                 (OFFICENS,'font-face-decls'),
                 (OFFICENS,'scripts'),
         ),
-        (OFFICENS,'document-meta') : (
+        (OFFICENS,'document-meta'): (
                 (OFFICENS,'meta'),
         ),
-        (OFFICENS,'document-settings') : (
+        (OFFICENS,'document-settings'): (
                 (OFFICENS,'settings'),
         ),
-        (OFFICENS,'document-styles') : (
+        (OFFICENS,'document-styles'): (
                 (OFFICENS,'automatic-styles'),
                 (OFFICENS,'font-face-decls'),
                 (OFFICENS,'master-styles'),
                 (OFFICENS,'styles'),
         ),
-        (OFFICENS,'drawing') : (
+        (OFFICENS,'drawing'): (
                 (DRAWNS,'page'),
                 (TABLENS,'calculation-settings'),
                 (TABLENS,'consolidation'),
@@ -975,45 +975,45 @@ allowed_children = {
                 (TEXTNS,'user-field-decls'),
                 (TEXTNS,'variable-decls'),
         ),
-        (OFFICENS,'event-listeners') : (
+        (OFFICENS,'event-listeners'): (
                 (PRESENTATIONNS,'event-listener'),
                 (SCRIPTNS,'event-listener'),
         ),
-        (OFFICENS,'font-face-decls') : (
+        (OFFICENS,'font-face-decls'): (
                 (STYLENS,'font-face'),
         ),
-# allowed_children
-        (OFFICENS,'forms') : (
+    # allowed_children
+        (OFFICENS,'forms'): (
                 (XFORMSNS,'model'),
                 (FORMNS,'form'),
         ),
-        (OFFICENS,'image') : (
+        (OFFICENS,'image'): (
                 (DRAWNS,'frame'),
         ),
-        (OFFICENS,'master-styles') : (
+        (OFFICENS,'master-styles'): (
                 (DRAWNS,'layer-set'),
                 (STYLENS,'handout-master'),
                 (STYLENS,'master-page'),
                 (TABLENS,'table-template'),
         ),
-        (OFFICENS,'meta') : (
+        (OFFICENS,'meta'): (
                 (DCNS,'creator'),
                 (DCNS,'date'),
                 (DCNS,'description'),
                 (DCNS,'language'),
                 (DCNS,'subject'),
                 (DCNS,'title'),
-# Completes Dublin Core start
-#               (DCNS,'contributor'),
-#               (DCNS,'coverage'),
-#               (DCNS,'format'),
-#               (DCNS,'identifier'),
-#               (DCNS,'publisher'),
-#               (DCNS,'relation'),
-#               (DCNS,'rights'),
-#               (DCNS,'source'),
-#               (DCNS,'type'),
-# Completes Dublin Core end
+        # Completes Dublin Core start
+                # (DCNS,'contributor'),
+                # (DCNS,'coverage'),
+                # (DCNS,'format'),
+                # (DCNS,'identifier'),
+                # (DCNS,'publisher'),
+                # (DCNS,'relation'),
+                # (DCNS,'rights'),
+                # (DCNS,'source'),
+                # (DCNS,'type'),
+        # Completes Dublin Core end
                 (METANS,'auto-reload'),
                 (METANS,'creation-date'),
                 (METANS,'document-statistic'),
@@ -1028,7 +1028,7 @@ allowed_children = {
                 (METANS,'template'),
                 (METANS,'user-defined'),
         ),
-        (OFFICENS,'presentation') : (
+        (OFFICENS,'presentation'): (
                 (DRAWNS,'page'),
                 (PRESENTATIONNS,'date-time-decl'),
                 (PRESENTATIONNS,'footer-decl'),
@@ -1048,17 +1048,17 @@ allowed_children = {
                 (TEXTNS,'user-field-decls'),
                 (TEXTNS,'variable-decls'),
         ),
-# allowed_children
-        (OFFICENS,'script') : None,
+    # allowed_children
+        (OFFICENS,'script'): None,
 
-        (OFFICENS,'scripts') : (
+        (OFFICENS,'scripts'): (
                 (OFFICENS,'event-listeners'),
                 (OFFICENS,'script'),
         ),
-        (OFFICENS,'settings') : (
+        (OFFICENS,'settings'): (
                 (CONFIGNS,'config-item-set'),
         ),
-        (OFFICENS,'spreadsheet') : (
+        (OFFICENS,'spreadsheet'): (
                 (TABLENS,'calculation-settings'),
                 (TABLENS,'consolidation'),
                 (TABLENS,'content-validations'),
@@ -1075,7 +1075,7 @@ allowed_children = {
                 (TEXTNS,'user-field-decls'),
                 (TEXTNS,'variable-decls'),
         ),
-        (OFFICENS,'styles') : (
+        (OFFICENS,'styles'): (
                 (NUMBERNS,'boolean-style'),
                 (NUMBERNS,'currency-style'),
                 (NUMBERNS,'date-style'),
@@ -1100,7 +1100,7 @@ allowed_children = {
                 (TEXTNS,'notes-configuration'),
                 (TEXTNS,'outline-style'),
         ),
-        (OFFICENS,'text') : (
+        (OFFICENS,'text'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'a'),
                 (DRAWNS,'caption'),
@@ -1153,7 +1153,7 @@ allowed_children = {
                 (TEXTNS,'user-index'),
                 (TEXTNS,'variable-decls'),
         ),
-        (PRESENTATIONNS,'animation-group') : (
+        (PRESENTATIONNS,'animation-group'): (
                 (PRESENTATIONNS,'dim'),
                 (PRESENTATIONNS,'hide-shape'),
                 (PRESENTATIONNS,'hide-text'),
@@ -1161,7 +1161,7 @@ allowed_children = {
                 (PRESENTATIONNS,'show-shape'),
                 (PRESENTATIONNS,'show-text'),
         ),
-        (PRESENTATIONNS,'animations') : (
+        (PRESENTATIONNS,'animations'): (
                 (PRESENTATIONNS,'animation-group'),
                 (PRESENTATIONNS,'dim'),
                 (PRESENTATIONNS,'hide-shape'),
@@ -1170,32 +1170,32 @@ allowed_children = {
                 (PRESENTATIONNS,'show-shape'),
                 (PRESENTATIONNS,'show-text'),
         ),
-        (PRESENTATIONNS,'date-time') : (
+        (PRESENTATIONNS,'date-time'): (
         ),
-        (PRESENTATIONNS,'date-time-decl') : (
+        (PRESENTATIONNS,'date-time-decl'): (
         ),
-        (PRESENTATIONNS,'dim') : (
+        (PRESENTATIONNS,'dim'): (
                 (PRESENTATIONNS,'sound'),
         ),
-        (PRESENTATIONNS,'event-listener') : (
+        (PRESENTATIONNS,'event-listener'): (
                 (PRESENTATIONNS,'sound'),
         ),
-        (PRESENTATIONNS,'footer') : (
+        (PRESENTATIONNS,'footer'): (
         ),
-        (PRESENTATIONNS,'footer-decl') : (
+        (PRESENTATIONNS,'footer-decl'): (
         ),
-        (PRESENTATIONNS,'header') : (
+        (PRESENTATIONNS,'header'): (
         ),
-        (PRESENTATIONNS,'header-decl') : (
+        (PRESENTATIONNS,'header-decl'): (
         ),
-        (PRESENTATIONNS,'hide-shape') : (
+        (PRESENTATIONNS,'hide-shape'): (
                 (PRESENTATIONNS,'sound'),
         ),
-        (PRESENTATIONNS,'hide-text') : (
+        (PRESENTATIONNS,'hide-text'): (
                 (PRESENTATIONNS,'sound'),
         ),
-# allowed_children
-        (PRESENTATIONNS,'notes') : (
+    # allowed_children
+        (PRESENTATIONNS,'notes'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'caption'),
                 (DRAWNS,'circle'),
@@ -1215,40 +1215,40 @@ allowed_children = {
                 (DRAWNS,'regular-polygon'),
                 (OFFICENS,'forms'),
         ),
-        (PRESENTATIONNS,'placeholder') : (
+        (PRESENTATIONNS,'placeholder'): (
         ),
-        (PRESENTATIONNS,'play') : (
+        (PRESENTATIONNS,'play'): (
         ),
-        (PRESENTATIONNS,'settings') : (
+        (PRESENTATIONNS,'settings'): (
                 (PRESENTATIONNS,'show'),
         ),
-        (PRESENTATIONNS,'show') : (
+        (PRESENTATIONNS,'show'): (
         ),
-        (PRESENTATIONNS,'show-shape') : (
+        (PRESENTATIONNS,'show-shape'): (
                 (PRESENTATIONNS,'sound'),
         ),
-        (PRESENTATIONNS,'show-text') : (
+        (PRESENTATIONNS,'show-text'): (
                 (PRESENTATIONNS,'sound'),
         ),
-        (PRESENTATIONNS,'sound') : (
+        (PRESENTATIONNS,'sound'): (
         ),
-        (SCRIPTNS,'event-listener') : (
+        (SCRIPTNS,'event-listener'): (
         ),
-        (STYLENS,'background-image') : (
+        (STYLENS,'background-image'): (
                 (OFFICENS,'binary-data'),
         ),
-        (STYLENS,'chart-properties') : (
+        (STYLENS,'chart-properties'): (
                 (CHARTNS,'symbol-image'),
         ),
-        (STYLENS,'column') : (
+        (STYLENS,'column'): (
         ),
-        (STYLENS,'column-sep') : (
+        (STYLENS,'column-sep'): (
         ),
-        (STYLENS,'columns') : (
+        (STYLENS,'columns'): (
                 (STYLENS,'column'),
                 (STYLENS,'column-sep'),
         ),
-        (STYLENS,'default-style') : (
+        (STYLENS,'default-style'): (
                 (STYLENS,'chart-properties'),
                 (STYLENS,'drawing-page-properties'),
                 (STYLENS,'graphic-properties'),
@@ -1261,16 +1261,16 @@ allowed_children = {
                 (STYLENS,'table-row-properties'),
                 (STYLENS,'text-properties'),
         ),
-        (STYLENS,'drawing-page-properties') : (
+        (STYLENS,'drawing-page-properties'): (
                 (PRESENTATIONNS,'sound'),
         ),
-        (STYLENS,'drop-cap') : (
+        (STYLENS,'drop-cap'): (
         ),
-        (STYLENS,'font-face') : (
+        (STYLENS,'font-face'): (
                 (SVGNS,'definition-src'),
                 (SVGNS,'font-face-src'),
         ),
-        (STYLENS,'footer') : (
+        (STYLENS,'footer'): (
                 (STYLENS,'region-center'),
                 (STYLENS,'region-left'),
                 (STYLENS,'region-right'),
@@ -1297,8 +1297,8 @@ allowed_children = {
                 (TEXTNS,'user-index'),
                 (TEXTNS,'variable-decls'),
         ),
-# allowed_children
-        (STYLENS,'footer-left') : (
+    # allowed_children
+        (STYLENS,'footer-left'): (
                 (STYLENS,'region-center'),
                 (STYLENS,'region-left'),
                 (STYLENS,'region-right'),
@@ -1325,18 +1325,18 @@ allowed_children = {
                 (TEXTNS,'user-index'),
                 (TEXTNS,'variable-decls'),
         ),
-        (STYLENS,'footer-style') : (
+        (STYLENS,'footer-style'): (
                 (STYLENS,'header-footer-properties'),
         ),
-        (STYLENS,'footnote-sep') : (
+        (STYLENS,'footnote-sep'): (
         ),
-        (STYLENS,'graphic-properties') : (
+        (STYLENS,'graphic-properties'): (
                 (STYLENS,'background-image'),
                 (STYLENS,'columns'),
                 (TEXTNS,'list-style'),
         ),
-# allowed_children
-        (STYLENS,'handout-master') : (
+    # allowed_children
+        (STYLENS,'handout-master'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'caption'),
                 (DRAWNS,'circle'),
@@ -1355,7 +1355,7 @@ allowed_children = {
                 (DRAWNS,'rect'),
                 (DRAWNS,'regular-polygon'),
         ),
-        (STYLENS,'header') : (
+        (STYLENS,'header'): (
                 (STYLENS,'region-center'),
                 (STYLENS,'region-left'),
                 (STYLENS,'region-right'),
@@ -1382,11 +1382,11 @@ allowed_children = {
                 (TEXTNS,'user-index'),
                 (TEXTNS,'variable-decls'),
         ),
-# allowed_children
-        (STYLENS,'header-footer-properties') : (
+    # allowed_children
+        (STYLENS,'header-footer-properties'): (
                 (STYLENS,'background-image'),
         ),
-        (STYLENS,'header-left') : (
+        (STYLENS,'header-left'): (
                 (STYLENS,'region-center'),
                 (STYLENS,'region-left'),
                 (STYLENS,'region-right'),
@@ -1413,14 +1413,14 @@ allowed_children = {
                 (TEXTNS,'user-index'),
                 (TEXTNS,'variable-decls'),
         ),
-        (STYLENS,'header-style') : (
+        (STYLENS,'header-style'): (
                 (STYLENS,'header-footer-properties'),
         ),
-        (STYLENS,'list-level-properties') : (
+        (STYLENS,'list-level-properties'): (
         ),
-        (STYLENS,'map') : (
+        (STYLENS,'map'): (
         ),
-        (STYLENS,'master-page') : (
+        (STYLENS,'master-page'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'caption'),
                 (DRAWNS,'circle'),
@@ -1446,42 +1446,42 @@ allowed_children = {
                 (STYLENS,'header-left'),
                 (STYLENS,'style'),
         ),
-        (STYLENS,'page-layout') : (
+        (STYLENS,'page-layout'): (
                 (STYLENS,'footer-style'),
                 (STYLENS,'header-style'),
                 (STYLENS,'page-layout-properties'),
         ),
-        (STYLENS,'page-layout-properties') : (
+        (STYLENS,'page-layout-properties'): (
                 (STYLENS,'background-image'),
                 (STYLENS,'columns'),
                 (STYLENS,'footnote-sep'),
         ),
-# allowed_children
-        (STYLENS,'paragraph-properties') : (
+    # allowed_children
+        (STYLENS,'paragraph-properties'): (
                 (STYLENS,'background-image'),
                 (STYLENS,'drop-cap'),
                 (STYLENS,'tab-stops'),
         ),
-        (STYLENS,'presentation-page-layout') : (
+        (STYLENS,'presentation-page-layout'): (
                 (PRESENTATIONNS,'placeholder'),
         ),
-        (STYLENS,'region-center') : (
+        (STYLENS,'region-center'): (
                 (TEXTNS,'p'),
         ),
-        (STYLENS,'region-left') : (
+        (STYLENS,'region-left'): (
                 (TEXTNS,'p'),
         ),
-        (STYLENS,'region-right') : (
+        (STYLENS,'region-right'): (
                 (TEXTNS,'p'),
         ),
-        (STYLENS,'ruby-properties') : (
+        (STYLENS,'ruby-properties'): (
         ),
-        (STYLENS,'section-properties') : (
+        (STYLENS,'section-properties'): (
                 (STYLENS,'background-image'),
                 (STYLENS,'columns'),
                 (TEXTNS,'notes-configuration'),
         ),
-        (STYLENS,'style') : (
+        (STYLENS,'style'): (
                 (STYLENS,'chart-properties'),
                 (STYLENS,'drawing-page-properties'),
                 (STYLENS,'graphic-properties'),
@@ -1495,90 +1495,90 @@ allowed_children = {
                 (STYLENS,'table-row-properties'),
                 (STYLENS,'text-properties'),
         ),
-        (STYLENS,'tab-stop') : (
+        (STYLENS,'tab-stop'): (
         ),
-        (STYLENS,'tab-stops') : (
+        (STYLENS,'tab-stops'): (
                 (STYLENS,'tab-stop'),
         ),
-# allowed_children
-        (STYLENS,'table-cell-properties') : (
+    # allowed_children
+        (STYLENS,'table-cell-properties'): (
                 (STYLENS,'background-image'),
         ),
-        (STYLENS,'table-column-properties') : (
+        (STYLENS,'table-column-properties'): (
         ),
-        (STYLENS,'table-properties') : (
+        (STYLENS,'table-properties'): (
                 (STYLENS,'background-image'),
         ),
-        (STYLENS,'table-row-properties') : (
+        (STYLENS,'table-row-properties'): (
                 (STYLENS,'background-image'),
         ),
-        (STYLENS,'text-properties') : (
+        (STYLENS,'text-properties'): (
         ),
-        (SVGNS,'definition-src') : (
+        (SVGNS,'definition-src'): (
         ),
-        (SVGNS,'desc') : (
+        (SVGNS,'desc'): (
         ),
-        (SVGNS,'font-face-format') : (
+        (SVGNS,'font-face-format'): (
         ),
-        (SVGNS,'font-face-name') : (
+        (SVGNS,'font-face-name'): (
         ),
-        (SVGNS,'font-face-src') : (
+        (SVGNS,'font-face-src'): (
                 (SVGNS,'font-face-name'),
                 (SVGNS,'font-face-uri'),
         ),
-        (SVGNS,'font-face-uri') : (
+        (SVGNS,'font-face-uri'): (
                 (SVGNS,'font-face-format'),
         ),
-        (SVGNS,'linearGradient') : (
+        (SVGNS,'linearGradient'): (
                 (SVGNS,'stop'),
         ),
-        (SVGNS,'radialGradient') : (
+        (SVGNS,'radialGradient'): (
                 (SVGNS,'stop'),
         ),
-        (SVGNS,'stop') : (
+        (SVGNS,'stop'): (
         ),
-        (SVGNS,'title') : (
+        (SVGNS,'title'): (
         ),
-        (TABLENS,'body') : (
+        (TABLENS,'body'): (
         ),
-        (TABLENS,'calculation-settings') : (
+        (TABLENS,'calculation-settings'): (
                 (TABLENS,'iteration'),
                 (TABLENS,'null-date'),
         ),
-# allowed_children
-        (TABLENS,'cell-address') : (
+    # allowed_children
+        (TABLENS,'cell-address'): (
         ),
-        (TABLENS,'cell-content-change') : (
+        (TABLENS,'cell-content-change'): (
                 (OFFICENS,'change-info'),
                 (TABLENS,'cell-address'),
                 (TABLENS,'deletions'),
                 (TABLENS,'dependencies'),
                 (TABLENS,'previous'),
         ),
-        (TABLENS,'cell-content-deletion') : (
+        (TABLENS,'cell-content-deletion'): (
                 (TABLENS,'cell-address'),
                 (TABLENS,'change-track-table-cell'),
         ),
-        (TABLENS,'cell-range-source') : (
+        (TABLENS,'cell-range-source'): (
         ),
-        (TABLENS,'change-deletion') : (
+        (TABLENS,'change-deletion'): (
         ),
-        (TABLENS,'change-track-table-cell') : (
+        (TABLENS,'change-track-table-cell'): (
                 (TEXTNS,'p'),
         ),
-        (TABLENS,'consolidation') : (
+        (TABLENS,'consolidation'): (
         ),
-        (TABLENS,'content-validation') : (
+        (TABLENS,'content-validation'): (
                 (OFFICENS,'event-listeners'),
                 (TABLENS,'error-macro'),
                 (TABLENS,'error-message'),
                 (TABLENS,'help-message'),
         ),
-# allowed_children
-        (TABLENS,'content-validations') : (
+    # allowed_children
+        (TABLENS,'content-validations'): (
                 (TABLENS,'content-validation'),
         ),
-        (TABLENS,'covered-table-cell') : (
+        (TABLENS,'covered-table-cell'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'a'),
                 (DRAWNS,'caption'),
@@ -1618,51 +1618,51 @@ allowed_children = {
                 (TEXTNS,'table-of-content'),
                 (TEXTNS,'user-index'),
         ),
-# allowed_children
-        (TABLENS,'cut-offs') : (
+    # allowed_children
+        (TABLENS,'cut-offs'): (
                 (TABLENS,'insertion-cut-off'),
                 (TABLENS,'movement-cut-off'),
         ),
-        (TABLENS,'data-pilot-display-info') : (
+        (TABLENS,'data-pilot-display-info'): (
         ),
-        (TABLENS,'data-pilot-field') : (
+        (TABLENS,'data-pilot-field'): (
                 (TABLENS,'data-pilot-field-reference'),
                 (TABLENS,'data-pilot-groups'),
                 (TABLENS,'data-pilot-level'),
         ),
-        (TABLENS,'data-pilot-field-reference') : (
+        (TABLENS,'data-pilot-field-reference'): (
         ),
-        (TABLENS,'data-pilot-group') : (
+        (TABLENS,'data-pilot-group'): (
                 (TABLENS,'data-pilot-group-member'),
         ),
-        (TABLENS,'data-pilot-group-member') : (
+        (TABLENS,'data-pilot-group-member'): (
         ),
-        (TABLENS,'data-pilot-groups') : (
+        (TABLENS,'data-pilot-groups'): (
                 (TABLENS,'data-pilot-group'),
         ),
-        (TABLENS,'data-pilot-layout-info') : (
+        (TABLENS,'data-pilot-layout-info'): (
         ),
-        (TABLENS,'data-pilot-level') : (
+        (TABLENS,'data-pilot-level'): (
                 (TABLENS,'data-pilot-display-info'),
                 (TABLENS,'data-pilot-layout-info'),
                 (TABLENS,'data-pilot-members'),
                 (TABLENS,'data-pilot-sort-info'),
                 (TABLENS,'data-pilot-subtotals'),
         ),
-        (TABLENS,'data-pilot-member') : (
+        (TABLENS,'data-pilot-member'): (
         ),
-        (TABLENS,'data-pilot-members') : (
+        (TABLENS,'data-pilot-members'): (
                 (TABLENS,'data-pilot-member'),
         ),
-        (TABLENS,'data-pilot-sort-info') : (
+        (TABLENS,'data-pilot-sort-info'): (
         ),
-        (TABLENS,'data-pilot-subtotal') : (
+        (TABLENS,'data-pilot-subtotal'): (
         ),
-        (TABLENS,'data-pilot-subtotals') : (
+        (TABLENS,'data-pilot-subtotals'): (
                 (TABLENS,'data-pilot-subtotal'),
         ),
-# allowed_children
-        (TABLENS,'data-pilot-table') : (
+    # allowed_children
+        (TABLENS,'data-pilot-table'): (
                 (TABLENS,'data-pilot-field'),
                 (TABLENS,'database-source-query'),
                 (TABLENS,'database-source-sql'),
@@ -1670,10 +1670,10 @@ allowed_children = {
                 (TABLENS,'source-cell-range'),
                 (TABLENS,'source-service'),
         ),
-        (TABLENS,'data-pilot-tables') : (
+        (TABLENS,'data-pilot-tables'): (
                 (TABLENS,'data-pilot-table'),
         ),
-        (TABLENS,'database-range') : (
+        (TABLENS,'database-range'): (
                 (TABLENS,'database-source-query'),
                 (TABLENS,'database-source-sql'),
                 (TABLENS,'database-source-table'),
@@ -1681,127 +1681,127 @@ allowed_children = {
                 (TABLENS,'sort'),
                 (TABLENS,'subtotal-rules'),
         ),
-        (TABLENS,'database-ranges') : (
+        (TABLENS,'database-ranges'): (
                 (TABLENS,'database-range'),
         ),
-        (TABLENS,'database-source-query') : (
+        (TABLENS,'database-source-query'): (
         ),
-        (TABLENS,'database-source-sql') : (
+        (TABLENS,'database-source-sql'): (
         ),
-        (TABLENS,'database-source-table') : (
+        (TABLENS,'database-source-table'): (
         ),
-# allowed_children
-        (TABLENS,'dde-link') : (
+    # allowed_children
+        (TABLENS,'dde-link'): (
                 (OFFICENS,'dde-source'),
                 (TABLENS,'table'),
         ),
-        (TABLENS,'dde-links') : (
+        (TABLENS,'dde-links'): (
                 (TABLENS,'dde-link'),
         ),
-        (TABLENS,'deletion') : (
+        (TABLENS,'deletion'): (
                 (OFFICENS,'change-info'),
                 (TABLENS,'cut-offs'),
                 (TABLENS,'deletions'),
                 (TABLENS,'dependencies'),
         ),
-        (TABLENS,'deletions') : (
+        (TABLENS,'deletions'): (
                 (TABLENS,'cell-content-deletion'),
                 (TABLENS,'change-deletion'),
         ),
-        (TABLENS,'dependencies') : (
+        (TABLENS,'dependencies'): (
                 (TABLENS,'dependency'),
         ),
-        (TABLENS,'dependency') : (
+        (TABLENS,'dependency'): (
         ),
-        (TABLENS,'detective') : (
+        (TABLENS,'detective'): (
                 (TABLENS,'highlighted-range'),
                 (TABLENS,'operation'),
         ),
-# allowed_children
-        (TABLENS,'error-macro') : (
+    # allowed_children
+        (TABLENS,'error-macro'): (
         ),
-        (TABLENS,'error-message') : (
+        (TABLENS,'error-message'): (
                 (TEXTNS,'p'),
         ),
-        (TABLENS,'even-columns') : (
+        (TABLENS,'even-columns'): (
         ),
-        (TABLENS,'even-rows') : (
+        (TABLENS,'even-rows'): (
         ),
-        (TABLENS,'filter') : (
+        (TABLENS,'filter'): (
                 (TABLENS,'filter-and'),
                 (TABLENS,'filter-condition'),
                 (TABLENS,'filter-or'),
         ),
-        (TABLENS,'filter-and') : (
+        (TABLENS,'filter-and'): (
                 (TABLENS,'filter-condition'),
                 (TABLENS,'filter-or'),
         ),
-        (TABLENS,'filter-condition') : (
+        (TABLENS,'filter-condition'): (
         ),
-        (TABLENS,'filter-or') : (
+        (TABLENS,'filter-or'): (
                 (TABLENS,'filter-and'),
                 (TABLENS,'filter-condition'),
         ),
-# allowed_children
-        (TABLENS,'first-column') : (
+    # allowed_children
+        (TABLENS,'first-column'): (
         ),
-        (TABLENS,'first-row') : (
+        (TABLENS,'first-row'): (
         ),
-        (TABLENS,'help-message') : (
+        (TABLENS,'help-message'): (
                 (TEXTNS,'p'),
         ),
-        (TABLENS,'highlighted-range') : (
+        (TABLENS,'highlighted-range'): (
         ),
-        (TABLENS,'insertion') : (
+        (TABLENS,'insertion'): (
                 (OFFICENS,'change-info'),
                 (TABLENS,'deletions'),
                 (TABLENS,'dependencies'),
         ),
-        (TABLENS,'insertion-cut-off') : (
+        (TABLENS,'insertion-cut-off'): (
         ),
-        (TABLENS,'iteration') : (
+        (TABLENS,'iteration'): (
         ),
-        (TABLENS,'label-range') : (
+        (TABLENS,'label-range'): (
         ),
-        (TABLENS,'label-ranges') : (
+        (TABLENS,'label-ranges'): (
                 (TABLENS,'label-range'),
         ),
-        (TABLENS,'last-column') : (
+        (TABLENS,'last-column'): (
         ),
-        (TABLENS,'last-row') : (
+        (TABLENS,'last-row'): (
         ),
-        (TABLENS,'movement') : (
+        (TABLENS,'movement'): (
                 (OFFICENS,'change-info'),
                 (TABLENS,'deletions'),
                 (TABLENS,'dependencies'),
                 (TABLENS,'source-range-address'),
                 (TABLENS,'target-range-address'),
         ),
-        (TABLENS,'movement-cut-off') : (
+        (TABLENS,'movement-cut-off'): (
         ),
-        (TABLENS,'named-expression') : (
+        (TABLENS,'named-expression'): (
         ),
-        (TABLENS,'named-expressions') : (
+        (TABLENS,'named-expressions'): (
                 (TABLENS,'named-expression'),
                 (TABLENS,'named-range'),
         ),
-# allowed_children
-        (TABLENS,'named-range') : (
+    # allowed_children
+        (TABLENS,'named-range'): (
         ),
-        (TABLENS,'null-date') : (
+        (TABLENS,'null-date'): (
         ),
-        (TABLENS,'odd-columns') : (
+        (TABLENS,'odd-columns'): (
         ),
-        (TABLENS,'odd-rows') : (
+        (TABLENS,'odd-rows'): (
         ),
-        (TABLENS,'operation') : (
+        (TABLENS,'operation'): (
         ),
-        (TABLENS,'previous') : (
+        (TABLENS,'previous'): (
                 (TABLENS,'change-track-table-cell'),
         ),
-        (TABLENS,'scenario') : (
+        (TABLENS,'scenario'): (
         ),
-        (TABLENS,'shapes') : (
+        (TABLENS,'shapes'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'caption'),
                 (DRAWNS,'circle'),
@@ -1820,32 +1820,32 @@ allowed_children = {
                 (DRAWNS,'rect'),
                 (DRAWNS,'regular-polygon'),
         ),
-# allowed_children
-        (TABLENS,'sort') : (
+    # allowed_children
+        (TABLENS,'sort'): (
                 (TABLENS,'sort-by'),
         ),
-        (TABLENS,'sort-by') : (
+        (TABLENS,'sort-by'): (
         ),
-        (TABLENS,'sort-groups') : (
+        (TABLENS,'sort-groups'): (
         ),
-        (TABLENS,'source-cell-range') : (
+        (TABLENS,'source-cell-range'): (
                 (TABLENS,'filter'),
         ),
-        (TABLENS,'source-range-address') : (
+        (TABLENS,'source-range-address'): (
         ),
-        (TABLENS,'source-service') : (
+        (TABLENS,'source-service'): (
         ),
-        (TABLENS,'subtotal-field') : (
+        (TABLENS,'subtotal-field'): (
         ),
-        (TABLENS,'subtotal-rule') : (
+        (TABLENS,'subtotal-rule'): (
                 (TABLENS,'subtotal-field'),
         ),
-        (TABLENS,'subtotal-rules') : (
+        (TABLENS,'subtotal-rules'): (
                 (TABLENS,'sort-groups'),
                 (TABLENS,'subtotal-rule'),
         ),
-# allowed_children
-        (TABLENS,'table') : (
+    # allowed_children
+        (TABLENS,'table'): (
                 (OFFICENS,'dde-source'),
                 (OFFICENS,'forms'),
                 (TEXTNS,'soft-page-break'),
@@ -1861,7 +1861,7 @@ allowed_children = {
                 (TABLENS,'table-rows'),
                 (TABLENS,'table-source'),
         ),
-        (TABLENS,'table-cell') : (
+        (TABLENS,'table-cell'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'a'),
                 (DRAWNS,'caption'),
@@ -1901,44 +1901,44 @@ allowed_children = {
                 (TEXTNS,'table-of-content'),
                 (TEXTNS,'user-index'),
         ),
-# allowed_children
-        (TABLENS,'table-column') : (
+    # allowed_children
+        (TABLENS,'table-column'): (
         ),
-        (TABLENS,'table-column-group') : (
+        (TABLENS,'table-column-group'): (
                 (TABLENS,'table-column'),
                 (TABLENS,'table-column-group'),
                 (TABLENS,'table-columns'),
                 (TABLENS,'table-header-columns'),
         ),
-        (TABLENS,'table-columns') : (
+        (TABLENS,'table-columns'): (
                 (TABLENS,'table-column'),
         ),
-        (TABLENS,'table-header-columns') : (
+        (TABLENS,'table-header-columns'): (
                 (TABLENS,'table-column'),
         ),
-        (TABLENS,'table-header-rows') : (
+        (TABLENS,'table-header-rows'): (
                 (TABLENS,'table-row'),
                 (TEXTNS,'soft-page-break'),
         ),
-        (TABLENS,'table-row') : (
+        (TABLENS,'table-row'): (
                 (TABLENS,'covered-table-cell'),
                 (TABLENS,'table-cell'),
         ),
-        (TABLENS,'table-row-group') : (
+        (TABLENS,'table-row-group'): (
                 (TABLENS,'table-header-rows'),
                 (TABLENS,'table-row'),
                 (TABLENS,'table-row-group'),
                 (TABLENS,'table-rows'),
                 (TEXTNS,'soft-page-break'),
         ),
-        (TABLENS,'table-rows') : (
+        (TABLENS,'table-rows'): (
                 (TABLENS,'table-row'),
                 (TEXTNS,'soft-page-break'),
         ),
-# allowed_children
-        (TABLENS,'table-source') : (
+    # allowed_children
+        (TABLENS,'table-source'): (
         ),
-        (TABLENS,'table-template') : (
+        (TABLENS,'table-template'): (
                 (TABLENS,'body'),
                 (TABLENS,'even-columns'),
                 (TABLENS,'even-rows'),
@@ -1949,16 +1949,16 @@ allowed_children = {
                 (TABLENS,'odd-columns'),
                 (TABLENS,'odd-rows'),
         ),
-        (TABLENS,'target-range-address') : (
+        (TABLENS,'target-range-address'): (
         ),
-        (TABLENS,'tracked-changes') : (
+        (TABLENS,'tracked-changes'): (
                 (TABLENS,'cell-content-change'),
                 (TABLENS,'deletion'),
                 (TABLENS,'insertion'),
                 (TABLENS,'movement'),
         ),
-# allowed_children
-        (TEXTNS,'a') : (
+    # allowed_children
+        (TEXTNS,'a'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'a'),
                 (DRAWNS,'caption'),
@@ -2086,110 +2086,110 @@ allowed_children = {
                 (TEXTNS,'variable-input'),
                 (TEXTNS,'variable-set'),
         ),
-# allowed_children
-        (TEXTNS,'alphabetical-index') : (
+    # allowed_children
+        (TEXTNS,'alphabetical-index'): (
                 (TEXTNS,'alphabetical-index-source'),
                 (TEXTNS,'index-body'),
         ),
-        (TEXTNS,'alphabetical-index-auto-mark-file') : (
+        (TEXTNS,'alphabetical-index-auto-mark-file'): (
         ),
-        (TEXTNS,'alphabetical-index-entry-template') : (
+        (TEXTNS,'alphabetical-index-entry-template'): (
                 (TEXTNS,'index-entry-chapter'),
                 (TEXTNS,'index-entry-page-number'),
                 (TEXTNS,'index-entry-span'),
                 (TEXTNS,'index-entry-tab-stop'),
                 (TEXTNS,'index-entry-text'),
         ),
-        (TEXTNS,'alphabetical-index-mark') : (
+        (TEXTNS,'alphabetical-index-mark'): (
         ),
-        (TEXTNS,'alphabetical-index-mark-end') : (
+        (TEXTNS,'alphabetical-index-mark-end'): (
         ),
-        (TEXTNS,'alphabetical-index-mark-start') : (
+        (TEXTNS,'alphabetical-index-mark-start'): (
         ),
-        (TEXTNS,'alphabetical-index-source') : (
+        (TEXTNS,'alphabetical-index-source'): (
                 (TEXTNS,'alphabetical-index-entry-template'),
                 (TEXTNS,'index-title-template'),
         ),
-        (TEXTNS,'author-initials') : (
+        (TEXTNS,'author-initials'): (
         ),
-        (TEXTNS,'author-name') : (
+        (TEXTNS,'author-name'): (
         ),
-        (TEXTNS,'bibliography') : (
+        (TEXTNS,'bibliography'): (
                 (TEXTNS,'bibliography-source'),
                 (TEXTNS,'index-body'),
         ),
-        (TEXTNS,'bibliography-configuration') : (
+        (TEXTNS,'bibliography-configuration'): (
                 (TEXTNS,'sort-key'),
         ),
-        (TEXTNS,'bibliography-entry-template') : (
+        (TEXTNS,'bibliography-entry-template'): (
                 (TEXTNS,'index-entry-bibliography'),
                 (TEXTNS,'index-entry-span'),
                 (TEXTNS,'index-entry-tab-stop'),
         ),
-# allowed_children
-        (TEXTNS,'bibliography-mark') : (
+    # allowed_children
+        (TEXTNS,'bibliography-mark'): (
         ),
-        (TEXTNS,'bibliography-source') : (
+        (TEXTNS,'bibliography-source'): (
                 (TEXTNS,'bibliography-entry-template'),
                 (TEXTNS,'index-title-template'),
         ),
-        (TEXTNS,'bookmark') : (
+        (TEXTNS,'bookmark'): (
         ),
-        (TEXTNS,'bookmark-end') : (
+        (TEXTNS,'bookmark-end'): (
         ),
-        (TEXTNS,'bookmark-ref') : (
+        (TEXTNS,'bookmark-ref'): (
         ),
-        (TEXTNS,'bookmark-start') : (
+        (TEXTNS,'bookmark-start'): (
         ),
-        (TEXTNS,'change') : (
+        (TEXTNS,'change'): (
         ),
-        (TEXTNS,'change-end') : (
+        (TEXTNS,'change-end'): (
         ),
-        (TEXTNS,'change-start') : (
+        (TEXTNS,'change-start'): (
         ),
-        (TEXTNS,'changed-region') : (
+        (TEXTNS,'changed-region'): (
                 (TEXTNS,'deletion'),
                 (TEXTNS,'format-change'),
                 (TEXTNS,'insertion'),
         ),
-        (TEXTNS,'chapter') : (
+        (TEXTNS,'chapter'): (
         ),
-        (TEXTNS,'character-count') : (
+        (TEXTNS,'character-count'): (
         ),
-        (TEXTNS,'conditional-text') : (
+        (TEXTNS,'conditional-text'): (
         ),
-        (TEXTNS,'creation-date') : (
+        (TEXTNS,'creation-date'): (
         ),
-        (TEXTNS,'creation-time') : (
+        (TEXTNS,'creation-time'): (
         ),
-        (TEXTNS,'creator') : (
+        (TEXTNS,'creator'): (
         ),
-        (TEXTNS,'database-display') : (
+        (TEXTNS,'database-display'): (
                 (FORMNS,'connection-resource'),
         ),
-        (TEXTNS,'database-name') : (
+        (TEXTNS,'database-name'): (
                 (FORMNS,'connection-resource'),
         ),
-        (TEXTNS,'database-next') : (
+        (TEXTNS,'database-next'): (
                 (FORMNS,'connection-resource'),
         ),
-        (TEXTNS,'database-row-number') : (
+        (TEXTNS,'database-row-number'): (
                 (FORMNS,'connection-resource'),
         ),
-        (TEXTNS,'database-row-select') : (
+        (TEXTNS,'database-row-select'): (
                 (FORMNS,'connection-resource'),
         ),
-        (TEXTNS,'date') : (
+        (TEXTNS,'date'): (
         ),
-        (TEXTNS,'dde-connection') : (
+        (TEXTNS,'dde-connection'): (
         ),
-        (TEXTNS,'dde-connection-decl') : (
+        (TEXTNS,'dde-connection-decl'): (
         ),
-        (TEXTNS,'dde-connection-decls') : (
+        (TEXTNS,'dde-connection-decls'): (
                 (TEXTNS,'dde-connection-decl'),
         ),
-# allowed_children
-        (TEXTNS,'deletion') : (
+    # allowed_children
+        (TEXTNS,'deletion'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'a'),
                 (DRAWNS,'caption'),
@@ -2227,24 +2227,24 @@ allowed_children = {
                 (TEXTNS,'table-of-content'),
                 (TEXTNS,'user-index'),
         ),
-        (TEXTNS,'description') : (
+        (TEXTNS,'description'): (
         ),
-        (TEXTNS,'editing-cycles') : (
+        (TEXTNS,'editing-cycles'): (
         ),
-        (TEXTNS,'editing-duration') : (
+        (TEXTNS,'editing-duration'): (
         ),
-        (TEXTNS,'execute-macro') : (
+        (TEXTNS,'execute-macro'): (
                 (OFFICENS,'event-listeners'),
         ),
-        (TEXTNS,'expression') : (
+        (TEXTNS,'expression'): (
         ),
-        (TEXTNS,'file-name') : (
+        (TEXTNS,'file-name'): (
         ),
-        (TEXTNS,'format-change') : (
+        (TEXTNS,'format-change'): (
                 (OFFICENS,'change-info'),
         ),
-# allowed_children
-        (TEXTNS,'h') : (
+    # allowed_children
+        (TEXTNS,'h'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'a'),
                 (DRAWNS,'caption'),
@@ -2372,29 +2372,29 @@ allowed_children = {
                 (TEXTNS,'variable-input'),
                 (TEXTNS,'variable-set'),
         ),
-# allowed_children
-        (TEXTNS,'hidden-paragraph') : (
+    # allowed_children
+        (TEXTNS,'hidden-paragraph'): (
         ),
-        (TEXTNS,'hidden-text') : (
+        (TEXTNS,'hidden-text'): (
         ),
-        (TEXTNS,'illustration-index') : (
+        (TEXTNS,'illustration-index'): (
                 (TEXTNS,'illustration-index-source'),
                 (TEXTNS,'index-body'),
         ),
-        (TEXTNS,'illustration-index-entry-template') : (
+        (TEXTNS,'illustration-index-entry-template'): (
                 (TEXTNS,'index-entry-page-number'),
                 (TEXTNS,'index-entry-span'),
                 (TEXTNS,'index-entry-tab-stop'),
                 (TEXTNS,'index-entry-text'),
         ),
-        (TEXTNS,'illustration-index-source') : (
+        (TEXTNS,'illustration-index-source'): (
                 (TEXTNS,'illustration-index-entry-template'),
                 (TEXTNS,'index-title-template'),
         ),
-        (TEXTNS,'image-count') : (
+        (TEXTNS,'image-count'): (
         ),
-# allowed_children
-        (TEXTNS,'index-body') : (
+    # allowed_children
+        (TEXTNS,'index-body'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'a'),
                 (DRAWNS,'caption'),
@@ -2432,29 +2432,29 @@ allowed_children = {
                 (TEXTNS,'table-of-content'),
                 (TEXTNS,'user-index'),
         ),
-        (TEXTNS,'index-entry-bibliography') : (
+        (TEXTNS,'index-entry-bibliography'): (
         ),
-        (TEXTNS,'index-entry-chapter') : (
+        (TEXTNS,'index-entry-chapter'): (
         ),
-        (TEXTNS,'index-entry-link-end') : (
+        (TEXTNS,'index-entry-link-end'): (
         ),
-        (TEXTNS,'index-entry-link-start') : (
+        (TEXTNS,'index-entry-link-start'): (
         ),
-        (TEXTNS,'index-entry-page-number') : (
+        (TEXTNS,'index-entry-page-number'): (
         ),
-        (TEXTNS,'index-entry-span') : (
+        (TEXTNS,'index-entry-span'): (
         ),
-        (TEXTNS,'index-entry-tab-stop') : (
+        (TEXTNS,'index-entry-tab-stop'): (
         ),
-        (TEXTNS,'index-entry-text') : (
+        (TEXTNS,'index-entry-text'): (
         ),
-        (TEXTNS,'index-source-style') : (
+        (TEXTNS,'index-source-style'): (
         ),
-        (TEXTNS,'index-source-styles') : (
+        (TEXTNS,'index-source-styles'): (
                 (TEXTNS,'index-source-style'),
         ),
-# allowed_children
-        (TEXTNS,'index-title') : (
+    # allowed_children
+        (TEXTNS,'index-title'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'a'),
                 (DRAWNS,'caption'),
@@ -2492,69 +2492,69 @@ allowed_children = {
                 (TEXTNS,'table-of-content'),
                 (TEXTNS,'user-index'),
         ),
-        (TEXTNS,'index-title-template') : (
+        (TEXTNS,'index-title-template'): (
         ),
-        (TEXTNS,'initial-creator') : (
+        (TEXTNS,'initial-creator'): (
         ),
-        (TEXTNS,'insertion') : (
+        (TEXTNS,'insertion'): (
                 (OFFICENS,'change-info'),
         ),
-        (TEXTNS,'keywords') : (
+        (TEXTNS,'keywords'): (
         ),
-        (TEXTNS,'line-break') : (
+        (TEXTNS,'line-break'): (
         ),
-        (TEXTNS,'linenumbering-configuration') : (
+        (TEXTNS,'linenumbering-configuration'): (
                 (TEXTNS,'linenumbering-separator'),
         ),
-        (TEXTNS,'linenumbering-separator') : (
+        (TEXTNS,'linenumbering-separator'): (
         ),
-        (TEXTNS,'list') : (
+        (TEXTNS,'list'): (
                 (TEXTNS,'list-header'),
                 (TEXTNS,'list-item'),
         ),
-        (TEXTNS,'list-header') : (
+        (TEXTNS,'list-header'): (
                 (TEXTNS,'h'),
                 (TEXTNS,'list'),
                 (TEXTNS,'number'),
                 (TEXTNS,'p'),
                 (TEXTNS,'soft-page-break'),
         ),
-        (TEXTNS,'list-item') : (
+        (TEXTNS,'list-item'): (
                 (TEXTNS,'h'),
                 (TEXTNS,'list'),
                 (TEXTNS,'number'),
                 (TEXTNS,'p'),
                 (TEXTNS,'soft-page-break'),
         ),
-        (TEXTNS,'list-level-style-bullet') : (
+        (TEXTNS,'list-level-style-bullet'): (
                 (STYLENS,'list-level-properties'),
                 (STYLENS,'text-properties'),
         ),
-        (TEXTNS,'list-level-style-image') : (
+        (TEXTNS,'list-level-style-image'): (
                 (OFFICENS,'binary-data'),
                 (STYLENS,'list-level-properties'),
         ),
-        (TEXTNS,'list-level-style-number') : (
+        (TEXTNS,'list-level-style-number'): (
                 (STYLENS,'list-level-properties'),
                 (STYLENS,'text-properties'),
         ),
-        (TEXTNS,'list-style') : (
+        (TEXTNS,'list-style'): (
                 (TEXTNS,'list-level-style-bullet'),
                 (TEXTNS,'list-level-style-image'),
                 (TEXTNS,'list-level-style-number'),
         ),
-        (TEXTNS,'measure') : (
+        (TEXTNS,'measure'): (
         ),
-        (TEXTNS,'modification-date') : (
+        (TEXTNS,'modification-date'): (
         ),
-        (TEXTNS,'modification-time') : (
+        (TEXTNS,'modification-time'): (
         ),
-        (TEXTNS,'note') : (
+        (TEXTNS,'note'): (
                 (TEXTNS,'note-body'),
                 (TEXTNS,'note-citation'),
         ),
-# allowed_children
-        (TEXTNS,'note-body') : (
+    # allowed_children
+        (TEXTNS,'note-body'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'a'),
                 (DRAWNS,'caption'),
@@ -2591,50 +2591,50 @@ allowed_children = {
                 (TEXTNS,'table-of-content'),
                 (TEXTNS,'user-index'),
         ),
-        (TEXTNS,'note-citation') : (
+        (TEXTNS,'note-citation'): (
         ),
-        (TEXTNS,'note-continuation-notice-backward') : (
+        (TEXTNS,'note-continuation-notice-backward'): (
         ),
-        (TEXTNS,'note-continuation-notice-forward') : (
+        (TEXTNS,'note-continuation-notice-forward'): (
         ),
-        (TEXTNS,'note-ref') : (
+        (TEXTNS,'note-ref'): (
         ),
-        (TEXTNS,'notes-configuration') : (
+        (TEXTNS,'notes-configuration'): (
                 (TEXTNS,'note-continuation-notice-backward'),
                 (TEXTNS,'note-continuation-notice-forward'),
         ),
-        (TEXTNS,'number') : (
+        (TEXTNS,'number'): (
         ),
-        (TEXTNS,'numbered-paragraph') : (
+        (TEXTNS,'numbered-paragraph'): (
                 (TEXTNS,'h'),
                 (TEXTNS,'number'),
                 (TEXTNS,'p'),
         ),
-        (TEXTNS,'object-count') : (
+        (TEXTNS,'object-count'): (
         ),
-        (TEXTNS,'object-index') : (
+        (TEXTNS,'object-index'): (
                 (TEXTNS,'index-body'),
                 (TEXTNS,'object-index-source'),
         ),
-        (TEXTNS,'object-index-entry-template') : (
+        (TEXTNS,'object-index-entry-template'): (
                 (TEXTNS,'index-entry-page-number'),
                 (TEXTNS,'index-entry-span'),
                 (TEXTNS,'index-entry-tab-stop'),
                 (TEXTNS,'index-entry-text'),
         ),
-        (TEXTNS,'object-index-source') : (
+        (TEXTNS,'object-index-source'): (
                 (TEXTNS,'index-title-template'),
                 (TEXTNS,'object-index-entry-template'),
         ),
-        (TEXTNS,'outline-level-style') : (
+        (TEXTNS,'outline-level-style'): (
                 (STYLENS,'list-level-properties'),
                 (STYLENS,'text-properties'),
         ),
-        (TEXTNS,'outline-style') : (
+        (TEXTNS,'outline-style'): (
                 (TEXTNS,'outline-level-style'),
         ),
-# allowed_children
-        (TEXTNS,'p') : (
+    # allowed_children
+        (TEXTNS,'p'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'a'),
                 (DRAWNS,'caption'),
@@ -2761,45 +2761,45 @@ allowed_children = {
                 (TEXTNS,'variable-set'),
                 (TEXTNS,'word-count'),
         ),
-        (TEXTNS,'page') : (
+        (TEXTNS,'page'): (
         ),
-        (TEXTNS,'page-count') : (
+        (TEXTNS,'page-count'): (
         ),
-        (TEXTNS,'page-continuation') : (
+        (TEXTNS,'page-continuation'): (
         ),
-        (TEXTNS,'page-number') : (
+        (TEXTNS,'page-number'): (
         ),
-        (TEXTNS,'page-sequence') : (
+        (TEXTNS,'page-sequence'): (
                 (TEXTNS,'page'),
         ),
-        (TEXTNS,'page-variable-get') : (
+        (TEXTNS,'page-variable-get'): (
         ),
-        (TEXTNS,'page-variable-set') : (
+        (TEXTNS,'page-variable-set'): (
         ),
-        (TEXTNS,'paragraph-count') : (
+        (TEXTNS,'paragraph-count'): (
         ),
-        (TEXTNS,'placeholder') : (
+        (TEXTNS,'placeholder'): (
         ),
-        (TEXTNS,'print-date') : (
+        (TEXTNS,'print-date'): (
         ),
-        (TEXTNS,'print-time') : (
+        (TEXTNS,'print-time'): (
         ),
-        (TEXTNS,'printed-by') : (
+        (TEXTNS,'printed-by'): (
         ),
-        (TEXTNS,'reference-mark') : (
+        (TEXTNS,'reference-mark'): (
         ),
-        (TEXTNS,'reference-mark-end') : (
+        (TEXTNS,'reference-mark-end'): (
         ),
-# allowed_children
-        (TEXTNS,'reference-mark-start') : (
+    # allowed_children
+        (TEXTNS,'reference-mark-start'): (
         ),
-        (TEXTNS,'reference-ref') : (
+        (TEXTNS,'reference-ref'): (
         ),
-        (TEXTNS,'ruby') : (
+        (TEXTNS,'ruby'): (
                 (TEXTNS,'ruby-base'),
                 (TEXTNS,'ruby-text'),
         ),
-        (TEXTNS,'ruby-base') : (
+        (TEXTNS,'ruby-base'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'a'),
                 (DRAWNS,'caption'),
@@ -2926,14 +2926,14 @@ allowed_children = {
                 (TEXTNS,'variable-input'),
                 (TEXTNS,'variable-set'),
         ),
-# allowed_children
-        (TEXTNS,'ruby-text') : (
+    # allowed_children
+        (TEXTNS,'ruby-text'): (
         ),
-        (TEXTNS,'s') : (
+        (TEXTNS,'s'): (
         ),
-        (TEXTNS,'script') : (
+        (TEXTNS,'script'): (
         ),
-        (TEXTNS,'section') : (
+        (TEXTNS,'section'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'a'),
                 (DRAWNS,'caption'),
@@ -2972,56 +2972,56 @@ allowed_children = {
                 (TEXTNS,'table-of-content'),
                 (TEXTNS,'user-index'),
         ),
-        (TEXTNS,'section-source') : (
+        (TEXTNS,'section-source'): (
         ),
-        (TEXTNS,'sender-city') : (
+        (TEXTNS,'sender-city'): (
         ),
-        (TEXTNS,'sender-company') : (
+        (TEXTNS,'sender-company'): (
         ),
-        (TEXTNS,'sender-country') : (
+        (TEXTNS,'sender-country'): (
         ),
-# allowed_children
-        (TEXTNS,'sender-email') : (
+    # allowed_children
+        (TEXTNS,'sender-email'): (
         ),
-        (TEXTNS,'sender-fax') : (
+        (TEXTNS,'sender-fax'): (
         ),
-        (TEXTNS,'sender-firstname') : (
+        (TEXTNS,'sender-firstname'): (
         ),
-        (TEXTNS,'sender-initials') : (
+        (TEXTNS,'sender-initials'): (
         ),
-        (TEXTNS,'sender-lastname') : (
+        (TEXTNS,'sender-lastname'): (
         ),
-        (TEXTNS,'sender-phone-private') : (
+        (TEXTNS,'sender-phone-private'): (
         ),
-        (TEXTNS,'sender-phone-work') : (
+        (TEXTNS,'sender-phone-work'): (
         ),
-        (TEXTNS,'sender-position') : (
+        (TEXTNS,'sender-position'): (
         ),
-        (TEXTNS,'sender-postal-code') : (
+        (TEXTNS,'sender-postal-code'): (
         ),
-        (TEXTNS,'sender-state-or-province') : (
+        (TEXTNS,'sender-state-or-province'): (
         ),
-        (TEXTNS,'sender-street') : (
+        (TEXTNS,'sender-street'): (
         ),
-        (TEXTNS,'sender-title') : (
+        (TEXTNS,'sender-title'): (
         ),
-        (TEXTNS,'sequence') : (
+        (TEXTNS,'sequence'): (
         ),
-        (TEXTNS,'sequence-decl') : (
+        (TEXTNS,'sequence-decl'): (
         ),
-        (TEXTNS,'sequence-decls') : (
+        (TEXTNS,'sequence-decls'): (
                 (TEXTNS,'sequence-decl'),
         ),
-        (TEXTNS,'sequence-ref') : (
+        (TEXTNS,'sequence-ref'): (
         ),
-        (TEXTNS,'sheet-name') : (
+        (TEXTNS,'sheet-name'): (
         ),
-        (TEXTNS,'soft-page-break') : (
+        (TEXTNS,'soft-page-break'): (
         ),
-        (TEXTNS,'sort-key') : (
+        (TEXTNS,'sort-key'): (
         ),
-# allowed_children
-        (TEXTNS,'span') : (
+    # allowed_children
+        (TEXTNS,'span'): (
                 (DR3DNS,'scene'),
                 (DRAWNS,'a'),
                 (DRAWNS,'caption'),
@@ -3148,34 +3148,34 @@ allowed_children = {
                 (TEXTNS,'variable-input'),
                 (TEXTNS,'variable-set'),
         ),
-# allowed_children
-        (TEXTNS,'subject') : (
+    # allowed_children
+        (TEXTNS,'subject'): (
         ),
-        (TEXTNS,'tab') : (
+        (TEXTNS,'tab'): (
         ),
-        (TEXTNS,'table-count') : (
+        (TEXTNS,'table-count'): (
         ),
-        (TEXTNS,'table-formula') : (
+        (TEXTNS,'table-formula'): (
         ),
-        (TEXTNS,'table-index') : (
+        (TEXTNS,'table-index'): (
                 (TEXTNS,'index-body'),
                 (TEXTNS,'table-index-source'),
         ),
-        (TEXTNS,'table-index-entry-template') : (
+        (TEXTNS,'table-index-entry-template'): (
                 (TEXTNS,'index-entry-page-number'),
                 (TEXTNS,'index-entry-span'),
                 (TEXTNS,'index-entry-tab-stop'),
                 (TEXTNS,'index-entry-text'),
         ),
-        (TEXTNS,'table-index-source') : (
+        (TEXTNS,'table-index-source'): (
                 (TEXTNS,'index-title-template'),
                 (TEXTNS,'table-index-entry-template'),
         ),
-        (TEXTNS,'table-of-content') : (
+        (TEXTNS,'table-of-content'): (
                 (TEXTNS,'index-body'),
                 (TEXTNS,'table-of-content-source'),
         ),
-        (TEXTNS,'table-of-content-entry-template') : (
+        (TEXTNS,'table-of-content-entry-template'): (
                 (TEXTNS,'index-entry-chapter'),
                 (TEXTNS,'index-entry-link-end'),
                 (TEXTNS,'index-entry-link-start'),
@@ -3184,76 +3184,77 @@ allowed_children = {
                 (TEXTNS,'index-entry-tab-stop'),
                 (TEXTNS,'index-entry-text'),
         ),
-        (TEXTNS,'table-of-content-source') : (
+        (TEXTNS,'table-of-content-source'): (
                 (TEXTNS,'index-source-styles'),
                 (TEXTNS,'index-title-template'),
                 (TEXTNS,'table-of-content-entry-template'),
         ),
-        (TEXTNS,'template-name') : (
+        (TEXTNS,'template-name'): (
         ),
-        (TEXTNS,'text-input') : (
+        (TEXTNS,'text-input'): (
         ),
-        (TEXTNS,'time') : (
+        (TEXTNS,'time'): (
         ),
-        (TEXTNS,'title') : (
+        (TEXTNS,'title'): (
         ),
-        (TEXTNS,'toc-mark') : (
+        (TEXTNS,'toc-mark'): (
         ),
-        (TEXTNS,'toc-mark-end') : (
+        (TEXTNS,'toc-mark-end'): (
         ),
-        (TEXTNS,'toc-mark-start') : (
+        (TEXTNS,'toc-mark-start'): (
         ),
-# allowed_children
-        (TEXTNS,'tracked-changes') : (
+    # allowed_children
+        (TEXTNS,'tracked-changes'): (
                 (TEXTNS,'changed-region'),
         ),
-        (TEXTNS,'user-defined') : (
+        (TEXTNS,'user-defined'): (
         ),
-        (TEXTNS,'user-field-decl') : (
+        (TEXTNS,'user-field-decl'): (
         ),
-        (TEXTNS,'user-field-decls') : (
+        (TEXTNS,'user-field-decls'): (
                 (TEXTNS,'user-field-decl'),
         ),
-        (TEXTNS,'user-field-get') : (
+        (TEXTNS,'user-field-get'): (
         ),
-        (TEXTNS,'user-field-input') : (
+        (TEXTNS,'user-field-input'): (
         ),
-        (TEXTNS,'user-index') : (
+        (TEXTNS,'user-index'): (
                 (TEXTNS,'index-body'),
                 (TEXTNS,'user-index-source'),
         ),
-        (TEXTNS,'user-index-entry-template') : (
+        (TEXTNS,'user-index-entry-template'): (
                 (TEXTNS,'index-entry-chapter'),
                 (TEXTNS,'index-entry-page-number'),
                 (TEXTNS,'index-entry-span'),
                 (TEXTNS,'index-entry-tab-stop'),
                 (TEXTNS,'index-entry-text'),
         ),
-# allowed_children
-        (TEXTNS,'user-index-mark') : (
+    # allowed_children
+        (TEXTNS,'user-index-mark'): (
         ),
-        (TEXTNS,'user-index-mark-end') : (
+        (TEXTNS,'user-index-mark-end'): (
         ),
-        (TEXTNS,'user-index-mark-start') : (
+        (TEXTNS,'user-index-mark-start'): (
         ),
-        (TEXTNS,'user-index-source') : (
+        (TEXTNS,'user-index-source'): (
                 (TEXTNS,'index-source-styles'),
                 (TEXTNS,'index-title-template'),
                 (TEXTNS,'user-index-entry-template'),
         ),
-        (TEXTNS,'variable-decl') : (
+        (TEXTNS,'variable-decl'): (
         ),
-        (TEXTNS,'variable-decls') : (
+        (TEXTNS,'variable-decls'): (
                 (TEXTNS,'variable-decl'),
         ),
-        (TEXTNS,'variable-get') : (
+        (TEXTNS,'variable-get'): (
         ),
-        (TEXTNS,'variable-input') : (
+        (TEXTNS,'variable-input'): (
         ),
-        (TEXTNS,'variable-set') : (
+        (TEXTNS,'variable-set'): (
         ),
-        (TEXTNS,'word-count') : (
+        (TEXTNS,'word-count'): (
         ),
+    # allowed_children
 }
 
 #
@@ -3267,17 +3268,17 @@ allows_text = (
         (DCNS,'language'),
         (DCNS,'subject'),
         (DCNS,'title'),
-# Completes Dublin Core start
-#       (DCNS,'contributor'),
-#       (DCNS,'coverage'),
-#       (DCNS,'format'),
-#       (DCNS,'identifier'),
-#       (DCNS,'publisher'),
-#       (DCNS,'relation'),
-#       (DCNS,'rights'),
-#       (DCNS,'source'),
-#       (DCNS,'type'),
-# Completes Dublin Core end
+    # Completes Dublin Core start
+        # (DCNS,'contributor'),
+        # (DCNS,'coverage'),
+        # (DCNS,'format'),
+        # (DCNS,'identifier'),
+        # (DCNS,'publisher'),
+        # (DCNS,'relation'),
+        # (DCNS,'rights'),
+        # (DCNS,'source'),
+        # (DCNS,'type'),
+    # Completes Dublin Core end
         (FORMNS,'item'),
         (FORMNS,'option'),
         (MATHNS,'math'),
@@ -3285,7 +3286,7 @@ allows_text = (
         (METANS,'date-string'),
         (METANS,'editing-cycles'),
         (METANS,'editing-duration'),
-# allows_text
+    # allows_text
         (METANS,'generator'),
         (METANS,'initial-creator'),
         (METANS,'keyword'),
@@ -3328,7 +3329,7 @@ allows_text = (
         (TEXTNS,'hidden-paragraph'),
         (TEXTNS,'hidden-text'),
         (TEXTNS,'image-count'),
-# allowed_children
+    # allows_text
         (TEXTNS,'index-entry-span'),
         (TEXTNS,'index-title-template'),
         (TEXTNS,'initial-creator'),
@@ -3376,7 +3377,7 @@ allows_text = (
         (TEXTNS,'sequence'),
         (TEXTNS,'sequence-ref'),
         (TEXTNS,'sheet-name'),
-# allowed_children
+    # allows_text
         (TEXTNS,'span'),
         (TEXTNS,'subject'),
         (TEXTNS,'table-count'),
@@ -3392,6 +3393,7 @@ allows_text = (
         (TEXTNS,'variable-input'),
         (TEXTNS,'variable-set'),
         (TEXTNS,'word-count'),
+    # allows_text
 )
 
 # Only the elements with at least one required attribute is listed
@@ -3420,7 +3422,7 @@ required_attributes = {
         (ANIMNS,'set'): (
                 (SMILNS,'attributeName'),
         ),
-# required_attributes
+    # required_attributes
         (ANIMNS,'transitionFilter'): (
                 (SMILNS,'type'),
         ),
@@ -3446,7 +3448,7 @@ required_attributes = {
         (CONFIGNS,'config-item-set'): (
                 (CONFIGNS,'name'),
         ),
-# required_attributes
+    # required_attributes
         (NUMBERNS,'boolean-style'): (
                 (STYLENS,'name'),
         ),
@@ -3482,7 +3484,7 @@ required_attributes = {
                 (SVGNS,'viewBox'),
                 (SVGNS,'d'),
         ),
-# required_attributes
+    # required_attributes
         (DRAWNS,'a'): (
                 (XLINKNS,'href'),
         ),
@@ -3531,7 +3533,7 @@ required_attributes = {
                 (DRAWNS,'id'),
                 (DRAWNS,'escape-direction'),
         ),
-# required_attributes
+    # required_attributes
         (DRAWNS,'gradient'): (
                 (DRAWNS,'style'),
         ),
@@ -3579,7 +3581,7 @@ required_attributes = {
                 (DRAWNS,'points'),
                 (SVGNS,'viewBox'),
         ),
-# required_attributes
+    # required_attributes
         (DRAWNS,'polyline'): (
                 (DRAWNS,'points'),
                 (SVGNS,'viewBox'),
@@ -3626,7 +3628,7 @@ required_attributes = {
         (FORMNS,'hidden'): (
                 (FORMNS,'id'),
         ),
-# required_attributes
+    # required_attributes
         (FORMNS,'image'): (
                 (FORMNS,'id'),
         ),
@@ -3666,24 +3668,24 @@ required_attributes = {
         (FORMNS,'value-range'): (
                 (FORMNS,'id'),
         ),
-        (MANIFESTNS,'algorithm') : (
+        (MANIFESTNS,'algorithm'): (
                 (MANIFESTNS,'algorithm-name'),
                 (MANIFESTNS,'initialisation-vector'),
         ),
-        (MANIFESTNS,'encryption-data') : (
+        (MANIFESTNS,'encryption-data'): (
                 (MANIFESTNS,'checksum-type'),
                 (MANIFESTNS,'checksum'),
         ),
-        (MANIFESTNS,'file-entry') : (
+        (MANIFESTNS,'file-entry'): (
                 (MANIFESTNS,'full-path'),
                 (MANIFESTNS,'media-type'),
         ),
-        (MANIFESTNS,'key-derivation') : (
+        (MANIFESTNS,'key-derivation'): (
                 (MANIFESTNS,'key-derivation-name'),
                 (MANIFESTNS,'salt'),
                 (MANIFESTNS,'iteration-count'),
         ),
-# required_attributes
+    # required_attributes
         (METANS,'template'): (
                 (XLINKNS,'href'),
         ),
@@ -3709,7 +3711,7 @@ required_attributes = {
                 (DRAWNS,'color'),
                 (DRAWNS,'shape-id'),
         ),
-# required_attributes
+    # required_attributes
         (PRESENTATIONNS,'event-listener'): (
                 (PRESENTATIONNS,'action'),
                 (SCRIPTNS,'event-name'),
@@ -3756,7 +3758,7 @@ required_attributes = {
         (STYLENS,'column'): (
                 (STYLENS,'rel-width'),
         ),
-# required_attributes
+    # required_attributes
         (STYLENS,'column-sep'): (
                 (STYLENS,'width'),
         ),
@@ -3804,7 +3806,7 @@ required_attributes = {
         (SVGNS,'stop'): (
                 (SVGNS,'offset'),
         ),
-# required_attributes
+    # required_attributes
         (TABLENS,'body'): (
                 (TEXTNS,'style-name'),
         ),
@@ -3836,7 +3838,7 @@ required_attributes = {
                 (TABLENS,'enabled'),
                 (TABLENS,'display-member-mode'),
         ),
-# required_attributes
+    # required_attributes
         (TABLENS,'data-pilot-field'): (
                 (TABLENS,'source-field-name'),
         ),
@@ -3875,7 +3877,7 @@ required_attributes = {
         (TABLENS,'database-range'): (
                 (TABLENS,'target-range-address'),
         ),
-# required_attributes
+    # required_attributes
         (TABLENS,'database-source-query'): (
                 (TABLENS,'query-name'),
                 (TABLENS,'database-name'),
@@ -3922,7 +3924,7 @@ required_attributes = {
                 (TABLENS,'position'),
                 (TABLENS,'id'),
         ),
-# required_attributes
+    # required_attributes
         (TABLENS,'label-range'): (
                 (TABLENS,'label-cell-range-address'),
                 (TABLENS,'data-cell-range-address'),
@@ -3955,7 +3957,7 @@ required_attributes = {
                 (TABLENS,'index'),
                 (TABLENS,'name'),
         ),
-# required_attributes
+    # required_attributes
         (TABLENS,'scenario'): (
                 (TABLENS,'is-active'),
                 (TABLENS,'scenario-ranges'),
@@ -3991,7 +3993,7 @@ required_attributes = {
         (TEXTNS,'a'): (
                 (XLINKNS,'href'),
         ),
-# required_attributes
+    # required_attributes
         (TEXTNS,'alphabetical-index'): (
                 (TEXTNS,'name'),
         ),
@@ -4024,7 +4026,7 @@ required_attributes = {
         (TEXTNS,'bookmark'): (
                 (TEXTNS,'name'),
         ),
-# required_attributes
+    # required_attributes
         (TEXTNS,'bookmark-end'): (
                 (TEXTNS,'name'),
         ),
@@ -4071,7 +4073,7 @@ required_attributes = {
         (TEXTNS,'dde-connection'): (
                 (TEXTNS,'connection-name'),
         ),
-# required_attributes
+    # required_attributes
         (TEXTNS,'dde-connection-decl'): (
                 (OFFICENS,'dde-topic'),
                 (OFFICENS,'dde-application'),
@@ -4119,7 +4121,7 @@ required_attributes = {
         (TEXTNS,'list-style'): (
                 (STYLENS,'name'),
         ),
-# required_attributes
+    # required_attributes
         (TEXTNS,'measure'): (
                 (TEXTNS,'kind'),
         ),
@@ -4169,7 +4171,7 @@ required_attributes = {
                 (TEXTNS,'display-outline-level'),
                 (TEXTNS,'name'),
         ),
-# required_attributes
+    # required_attributes
         (TEXTNS,'sort-key'): (
                 (TEXTNS,'key'),
         ),
@@ -4214,7 +4216,7 @@ required_attributes = {
                 (TEXTNS,'style-name'),
                 (TEXTNS,'outline-level'),
         ),
-# required_attributes
+    # required_attributes
         (TEXTNS,'user-index-mark'): (
                 (TEXTNS,'index-name'),
                 (TEXTNS,'string-value'),
@@ -4243,6 +4245,7 @@ required_attributes = {
         (TEXTNS,'variable-set'): (
                 (TEXTNS,'name'),
         ),
+    # required_attributes
 }
 
 # Empty list means the element has no allowed attributes
@@ -4261,29 +4264,29 @@ allowed_attributes = {
         ),
         (DCNS,'title'):(
         ),
-# Completes Dublin Core start
-#       (DCNS,'contributor') : (
-#       ),
-#       (DCNS,'coverage') : (
-#       ),
-#       (DCNS,'format') : (
-#       ),
-#       (DCNS,'identifier') : (
-#       ),
-#       (DCNS,'publisher') : (
-#       ),
-#       (DCNS,'relation') : (
-#       ),
-#       (DCNS,'rights') : (
-#       ),
-#       (DCNS,'source') : (
-#       ),
-#       (DCNS,'type') : (
-#       ),
-# Completes Dublin Core end
+    # Completes Dublin Core start
+        # (DCNS,'contributor'): (
+        # ),
+        # (DCNS,'coverage'): (
+        # ),
+        # (DCNS,'format'): (
+        # ),
+        # (DCNS,'identifier'): (
+        # ),
+        # (DCNS,'publisher'): (
+        # ),
+        # (DCNS,'relation'): (
+        # ),
+        # (DCNS,'rights'): (
+        # ),
+        # (DCNS,'source'): (
+        # ),
+        # (DCNS,'type'): (
+        # ),
+    # Completes Dublin Core end
         (MATHNS,'math'): None,
         (XFORMSNS,'model'): None,
-# allowed_attributes
+    # allowed_attributes
         (ANIMNS,'animate'):(
                 (ANIMNS,'formula'),
                 (ANIMNS,'sub-item'),
@@ -4311,7 +4314,7 @@ allowed_attributes = {
                 (SMILNS,'to'),
                 (SMILNS,'values'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (ANIMNS,'animateColor'):(
                 (ANIMNS,'color-interpolation'),
                 (ANIMNS,'color-interpolation-direction'),
@@ -4341,7 +4344,7 @@ allowed_attributes = {
                 (SMILNS,'to'),
                 (SMILNS,'values'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (ANIMNS,'animateMotion'):(
                 (ANIMNS,'formula'),
                 (ANIMNS,'sub-item'),
@@ -4371,7 +4374,7 @@ allowed_attributes = {
                 (SVGNS,'origin'),
                 (SVGNS,'path'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (ANIMNS,'animateTransform'):(
                 (ANIMNS,'formula'),
                 (ANIMNS,'sub-item'),
@@ -4397,7 +4400,7 @@ allowed_attributes = {
                 (SMILNS,'values'),
                 (SVGNS,'type'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (ANIMNS,'audio'):(
                 (ANIMNS,'audio-level'),
                 (ANIMNS,'id'),
@@ -4428,7 +4431,7 @@ allowed_attributes = {
                 (ANIMNS,'id'),
                 (PRESENTATIONNS,'master-element'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (ANIMNS,'iterate'):(
                 (ANIMNS,'id'),
                 (ANIMNS,'iterate-interval'),
@@ -4477,7 +4480,7 @@ allowed_attributes = {
                 (SMILNS,'restart'),
                 (PRESENTATIONNS,'master-element'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (ANIMNS,'param'):(
                 (ANIMNS,'name'),
                 (ANIMNS,'value'),
@@ -4525,7 +4528,7 @@ allowed_attributes = {
                 (SMILNS,'to'),
 
         ),
-# allowed_attributes
+    # allowed_attributes
         (ANIMNS,'transitionFilter'):(
                 (ANIMNS,'formula'),
                 (ANIMNS,'sub-item'),
@@ -4556,7 +4559,7 @@ allowed_attributes = {
                 (SMILNS,'values'),
 
         ),
-# allowed_attributes
+    # allowed_attributes
         (CHARTNS,'axis'):(
                 (CHARTNS,'style-name'),
                 (CHARTNS,'dimension'),
@@ -4587,7 +4590,7 @@ allowed_attributes = {
                 (SVGNS,'width'),
                 (CHARTNS,'style-name'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (CHARTNS,'footer'):(
                 (SVGNS,'y'),
                 (SVGNS,'x'),
@@ -4643,7 +4646,7 @@ allowed_attributes = {
         (CHARTNS,'stock-gain-marker'):(
                 (CHARTNS,'style-name'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (CHARTNS,'stock-loss-marker'):(
                 (CHARTNS,'style-name'),
         ),
@@ -4685,7 +4688,7 @@ allowed_attributes = {
         (CONFIGNS,'config-item-set'):(
                 (CONFIGNS,'name'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (NUMBERNS,'am-pm'):(
         ),
         (NUMBERNS,'boolean'):(
@@ -4719,7 +4722,7 @@ allowed_attributes = {
                 (NUMBERNS,'country'),
                 (NUMBERNS,'language'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (NUMBERNS,'date-style'):(
                 (NUMBERNS,'transliteration-language'),
                 (STYLENS,'name'),
@@ -4759,7 +4762,7 @@ allowed_attributes = {
         (NUMBERNS,'hours'):(
                 (NUMBERNS,'style'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (NUMBERNS,'minutes'):(
                 (NUMBERNS,'style'),
         ),
@@ -4788,7 +4791,7 @@ allowed_attributes = {
                 (STYLENS,'volatile'),
                 (NUMBERNS,'transliteration-country'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (NUMBERNS,'percentage-style'):(
                 (NUMBERNS,'transliteration-language'),
                 (STYLENS,'name'),
@@ -4894,7 +4897,7 @@ allowed_attributes = {
                 (PRESENTATIONNS,'class-names'),
                 (DRAWNS,'id'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (DR3DNS,'scene'):(
                 (DR3DNS,'ambient-color'),
                 (DR3DNS,'distance'),
@@ -5142,7 +5145,7 @@ allowed_attributes = {
                 (DRAWNS,'id'),
                 (TEXTNS,'anchor-type'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (DRAWNS,'ellipse'):(
                 (DRAWNS,'layer'),
                 (DRAWNS,'start-angle'),
@@ -5173,7 +5176,7 @@ allowed_attributes = {
                 (SVGNS,'x'),
                 (DRAWNS,'text-style-name'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (DRAWNS,'enhanced-geometry'):(
                 (DRAWNS,'extrusion-rotation-center'),
                 (DRAWNS,'extrusion-shininess'),
@@ -5219,7 +5222,7 @@ allowed_attributes = {
                 (DRAWNS,'glue-point-type'),
                 (DRAWNS,'text-path'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (DRAWNS,'equation'):(
                 (DRAWNS,'formula'),
                 (DRAWNS,'name'),
@@ -5270,7 +5273,7 @@ allowed_attributes = {
                 (TEXTNS,'anchor-page-number'),
                 (TEXTNS,'anchor-type'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (DRAWNS,'g'):(
                 (DRAWNS,'id'),
                 (DRAWNS,'caption-id'),
@@ -5343,7 +5346,7 @@ allowed_attributes = {
                 (DRAWNS,'name'),
                 (DRAWNS,'display'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (DRAWNS,'layer-set'):(
         ),
         (DRAWNS,'line'):(
@@ -5375,7 +5378,7 @@ allowed_attributes = {
                 (DRAWNS,'name'),
                 (SVGNS,'viewBox'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (DRAWNS,'measure'):(
                 (TABLENS,'end-cell-address'),
                 (DRAWNS,'layer'),
@@ -5465,7 +5468,7 @@ allowed_attributes = {
                 (DRAWNS,'name'),
                 (DRAWNS,'value'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (DRAWNS,'path'):(
                 (TABLENS,'table-background'),
                 (DRAWNS,'layer'),
@@ -5523,7 +5526,7 @@ allowed_attributes = {
                 (SVGNS,'viewBox'),
                 (TEXTNS,'anchor-type'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (DRAWNS,'polyline'):(
                 (TABLENS,'table-background'),
                 (DRAWNS,'layer'),
@@ -5573,7 +5576,7 @@ allowed_attributes = {
                 (TEXTNS,'anchor-page-number'),
                 (TEXTNS,'anchor-type'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (DRAWNS,'regular-polygon'):(
                 (TABLENS,'table-background'),
                 (DRAWNS,'layer'),
@@ -5619,7 +5622,7 @@ allowed_attributes = {
                 (FONS,'max-width'),
                 (TEXTNS,'id'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (FORMNS,'button'):(
                 (FORMNS,'tab-stop'),
                 (FORMNS,'focus-on-click'),
@@ -5691,7 +5694,7 @@ allowed_attributes = {
                 (FORMNS,'current-value'),
                 (FORMNS,'size'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (FORMNS,'connection-resource'):(
                 (XLINKNS,'href'),
         ),
@@ -5741,7 +5744,7 @@ allowed_attributes = {
                 (FORMNS,'printable'),
                 (FORMNS,'id'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (FORMNS,'form'):(
                 (XLINKNS,'actuate'),
                 (XLINKNS,'href'),
@@ -5798,7 +5801,7 @@ allowed_attributes = {
                 (FORMNS,'printable'),
                 (FORMNS,'id'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (FORMNS,'generic-control'):(
                 (FORMNS,'control-implementation'),
                 (XFORMSNS,'bind'),
@@ -5861,7 +5864,7 @@ allowed_attributes = {
         (FORMNS,'list-value'):(
                 (OFFICENS,'string-value'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (FORMNS,'listbox'):(
                 (FORMNS,'tab-stop'),
                 (FORMNS,'bound-column'),
@@ -6023,27 +6026,27 @@ allowed_attributes = {
                 (FORMNS,'id'),
                 (FORMNS,'step-size'),
         ),
-        (MANIFESTNS,'algorithm') : (
+        (MANIFESTNS,'algorithm'): (
                 (MANIFESTNS,'algorithm-name'),
                 (MANIFESTNS,'initialisation-vector'),
         ),
-        (MANIFESTNS,'encryption-data') : (
+        (MANIFESTNS,'encryption-data'): (
                 (MANIFESTNS,'checksum-type'),
                 (MANIFESTNS,'checksum'),
         ),
-        (MANIFESTNS,'file-entry') : (
+        (MANIFESTNS,'file-entry'): (
                 (MANIFESTNS,'full-path'),
                 (MANIFESTNS,'media-type'),
                 (MANIFESTNS,'size'),
         ),
-        (MANIFESTNS,'key-derivation') : (
+        (MANIFESTNS,'key-derivation'): (
                 (MANIFESTNS,'key-derivation-name'),
                 (MANIFESTNS,'salt'),
                 (MANIFESTNS,'iteration-count'),
         ),
         (MANIFESTNS,'manifest'):(
         ),
-# allowed_attributes
+    # allowed_attributes
         (METANS,'auto-reload'):(
                 (METANS,'delay'),
                 (XLINKNS,'actuate'),
@@ -6078,7 +6081,7 @@ allowed_attributes = {
         ),
         (METANS,'generator'):(
         ),
-# allowed_attributes
+    # allowed_attributes
         (METANS,'hyperlink-behaviour'):(
                 (OFFICENS,'target-frame-name'),
                 (XLINKNS,'show'),
@@ -6174,7 +6177,7 @@ allowed_attributes = {
         ),
         (OFFICENS,'image'):(
         ),
-# allowed_attributes
+    # allowed_attributes
         (OFFICENS,'master-styles'):(
         ),
         (OFFICENS,'meta'):(
@@ -6245,7 +6248,7 @@ allowed_attributes = {
                 (PRESENTATIONNS,'speed'),
                 (DRAWNS,'shape-id'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (PRESENTATIONNS,'hide-text'):(
                 (PRESENTATIONNS,'direction'),
                 (PRESENTATIONNS,'effect'),
@@ -6273,7 +6276,7 @@ allowed_attributes = {
                 (PRESENTATIONNS,'speed'),
                 (DRAWNS,'shape-id'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (PRESENTATIONNS,'settings'):(
                 (PRESENTATIONNS,'animations'),
                 (PRESENTATIONNS,'endless'),
@@ -6319,7 +6322,7 @@ allowed_attributes = {
                 (PRESENTATIONNS,'play-full'),
                 (XLINKNS,'show'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (SCRIPTNS,'event-listener'):(
                 (SCRIPTNS,'language'),
                 (SCRIPTNS,'macro-name'),
@@ -6412,7 +6415,7 @@ allowed_attributes = {
         (STYLENS,'default-style'):(
                 (STYLENS,'family'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (STYLENS,'drawing-page-properties'): (
                 (DRAWNS,'fill'),
                 (DRAWNS,'fill-color'),
@@ -6455,7 +6458,7 @@ allowed_attributes = {
                 (STYLENS,'style-name'),
                 (STYLENS,'lines'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (STYLENS,'font-face'):(
                 (STYLENS,'font-adornments'),
                 (STYLENS,'font-charset'),
@@ -6513,7 +6516,7 @@ allowed_attributes = {
                 (STYLENS,'line-style'),
                 (STYLENS,'adjustment'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (STYLENS,'graphic-properties'): (
                 (DR3DNS,'ambient-color'),
                 (DR3DNS,'back-scale'),
@@ -6568,7 +6571,7 @@ allowed_attributes = {
                 (DRAWNS,'fill-image-ref-point-x'),
                 (DRAWNS,'fill-image-ref-point-y'),
                 (DRAWNS,'fill-image-width'),
-# allowed_attributes
+    # allowed_attributes
                 (DRAWNS,'fit-to-contour'),
                 (DRAWNS,'fit-to-size'),
                 (DRAWNS,'frame-display-border'),
@@ -6621,7 +6624,7 @@ allowed_attributes = {
                 (DRAWNS,'visible-area-top'),
                 (DRAWNS,'visible-area-width'),
                 (DRAWNS,'wrap-influence-on-position'),
-# allowed_attributes
+    # allowed_attributes
                 (FONS,'background-color'),
                 (FONS,'border'),
                 (FONS,'border-bottom'),
@@ -6696,7 +6699,7 @@ allowed_attributes = {
                 (PRESENTATIONNS,'use-header-name'),
                 (PRESENTATIONNS,'use-date-time-name'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (STYLENS,'header'):(
                 (STYLENS,'display'),
         ),
@@ -6732,7 +6735,7 @@ allowed_attributes = {
         ),
         (STYLENS,'header-style'):(
         ),
-# allowed_attributes
+    # allowed_attributes
         (STYLENS,'list-level-properties'): (
                 (FONS,'height'),
                 (FONS,'text-align'),
@@ -6761,7 +6764,7 @@ allowed_attributes = {
                 (STYLENS,'name'),
                 (STYLENS,'page-usage'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (STYLENS,'page-layout-properties'): (
                 (FONS,'background-color'),
                 (FONS,'border'),
@@ -6811,7 +6814,7 @@ allowed_attributes = {
                 (STYLENS,'table-centering'),
                 (STYLENS,'writing-mode'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (STYLENS,'paragraph-properties'): (
                 (FONS,'background-color'),
                 (FONS,'border'),
@@ -6870,7 +6873,7 @@ allowed_attributes = {
                 (STYLENS,'display-name'),
                 (STYLENS,'name'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (STYLENS,'region-center'):(
         ),
         (STYLENS,'region-left'):(
@@ -6902,7 +6905,7 @@ allowed_attributes = {
                 (STYLENS,'display-name'),
                 (STYLENS,'parent-style-name'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (STYLENS,'tab-stop'):(
                 (STYLENS,'leader-text-style'),
                 (STYLENS,'leader-width'),
@@ -6951,7 +6954,7 @@ allowed_attributes = {
                 (STYLENS,'text-align-source'),
                 (STYLENS,'vertical-align'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (STYLENS,'table-column-properties'): (
                 (FONS,'break-after'),
                 (FONS,'break-before'),
@@ -6988,7 +6991,7 @@ allowed_attributes = {
                 (STYLENS,'row-height'),
                 (STYLENS,'use-optimal-row-height'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (STYLENS,'text-properties'): (
                 (FONS,'background-color'),
                 (FONS,'color'),
@@ -7074,7 +7077,7 @@ allowed_attributes = {
         (SVGNS,'font-face-format'):(
                 (SVGNS,'string'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (SVGNS,'font-face-name'):(
                 (SVGNS,'name'),
         ),
@@ -7115,7 +7118,7 @@ allowed_attributes = {
         ),
         (SVGNS,'title'):(
         ),
-# allowed_attributes
+    # allowed_attributes
         (TABLENS,'body'):(
                 (TEXTNS,'paragraph-style-name'),
                 (TEXTNS,'style-name'),
@@ -7185,7 +7188,7 @@ allowed_attributes = {
         ),
         (TABLENS,'content-validations'):(
         ),
-# allowed_attributes
+    # allowed_attributes
         (TABLENS,'covered-table-cell'):(
                 (TABLENS,'protect'),
                 (OFFICENS,'string-value'),
@@ -7222,7 +7225,7 @@ allowed_attributes = {
                 (TABLENS,'member-type'),
                 (TABLENS,'type'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TABLENS,'data-pilot-group'):(
                 (TABLENS,'name'),
         ),
@@ -7245,7 +7248,7 @@ allowed_attributes = {
         (TABLENS,'data-pilot-level'):(
                 (TABLENS,'show-empty'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TABLENS,'data-pilot-member'):(
                 (TABLENS,'show-details'),
                 (TABLENS,'name'),
@@ -7274,7 +7277,7 @@ allowed_attributes = {
                 (TABLENS,'show-filter-button'),
                 (TABLENS,'grand-total'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TABLENS,'data-pilot-tables'):(
         ),
         (TABLENS,'database-range'):(
@@ -7295,7 +7298,7 @@ allowed_attributes = {
                 (TABLENS,'query-name'),
                 (TABLENS,'database-name'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TABLENS,'database-source-sql'):(
                 (TABLENS,'parse-sql-statement'),
                 (TABLENS,'database-name'),
@@ -7318,7 +7321,7 @@ allowed_attributes = {
                 (TABLENS,'type'),
                 (TABLENS,'id'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TABLENS,'deletions'):(
         ),
         (TABLENS,'dependencies'):(
@@ -7344,7 +7347,7 @@ allowed_attributes = {
                 (TEXTNS,'paragraph-style-name'),
                 (TEXTNS,'style-name'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TABLENS,'filter'):(
                 (TABLENS,'target-range-address'),
                 (TABLENS,'display-duplicates'),
@@ -7370,7 +7373,7 @@ allowed_attributes = {
                 (TEXTNS,'paragraph-style-name'),
                 (TEXTNS,'style-name'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TABLENS,'help-message'):(
                 (TABLENS,'display'),
                 (TABLENS,'title'),
@@ -7399,7 +7402,7 @@ allowed_attributes = {
                 (TABLENS,'maximum-difference'),
                 (TABLENS,'steps'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TABLENS,'label-range'):(
                 (TABLENS,'label-cell-range-address'),
                 (TABLENS,'data-cell-range-address'),
@@ -7501,7 +7504,7 @@ allowed_attributes = {
                 (TABLENS,'end-table'),
                 (TABLENS,'start-column'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TABLENS,'source-service'):(
                 (TABLENS,'user-name'),
                 (TABLENS,'source-name'),
@@ -7548,7 +7551,7 @@ allowed_attributes = {
                 (TABLENS,'formula'),
                 (OFFICENS,'time-value'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TABLENS,'table-column'):(
                 (TABLENS,'style-name'),
                 (TABLENS,'default-cell-style-name'),
@@ -7606,7 +7609,7 @@ allowed_attributes = {
         (TABLENS,'tracked-changes'):(
                 (TABLENS,'track-changes'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'a'):(
                 (TEXTNS,'visited-style-name'),
                 (OFFICENS,'name'),
@@ -7641,7 +7644,7 @@ allowed_attributes = {
                 (TEXTNS,'key2-phonetic'),
                 (TEXTNS,'string-value-phonetic'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'alphabetical-index-mark-end'):(
                 (TEXTNS,'id'),
         ),
@@ -7670,7 +7673,7 @@ allowed_attributes = {
                 (TEXTNS,'main-entry-style-name'),
                 (TEXTNS,'use-keys-as-entries'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'author-initials'):(
                 (TEXTNS,'fixed'),
         ),
@@ -7696,7 +7699,7 @@ allowed_attributes = {
                 (TEXTNS,'style-name'),
                 (TEXTNS,'bibliography-type'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'bibliography-mark'):(
                 (TEXTNS,'address'),
                 (TEXTNS,'annote'),
@@ -7746,7 +7749,7 @@ allowed_attributes = {
         (TEXTNS,'bookmark-start'):(
                 (TEXTNS,'name'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'change'):(
                 (TEXTNS,'change-id'),
         ),
@@ -7815,7 +7818,7 @@ allowed_attributes = {
                 (TEXTNS,'database-name'),
                 (TEXTNS,'condition'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'date'):(
                 (TEXTNS,'date-value'),
                 (TEXTNS,'fixed'),
@@ -7866,7 +7869,7 @@ allowed_attributes = {
                 (TEXTNS,'fixed'),
                 (TEXTNS,'display'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'format-change'):(
         ),
         (TEXTNS,'h'):(
@@ -7914,7 +7917,7 @@ allowed_attributes = {
                 (TEXTNS,'style-name'),
                 (TEXTNS,'display'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'index-entry-link-end'):(
                 (TEXTNS,'style-name'),
         ),
@@ -7956,7 +7959,7 @@ allowed_attributes = {
         ),
         (TEXTNS,'insertion'):(
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'keywords'):(
                 (TEXTNS,'fixed'),
         ),
@@ -8011,7 +8014,7 @@ allowed_attributes = {
                 (STYLENS,'num-letter-sync'),
                 (TEXTNS,'start-value'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'list-style'):(
                 (TEXTNS,'consecutive-numbering'),
                 (STYLENS,'display-name'),
@@ -8080,7 +8083,7 @@ allowed_attributes = {
                 (TEXTNS,'name'),
                 (TEXTNS,'protection-key'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'object-index-entry-template'):(
                 (TEXTNS,'style-name'),
         ),
@@ -8201,7 +8204,7 @@ allowed_attributes = {
         (TEXTNS,'sender-country'):(
                 (TEXTNS,'fixed'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'sender-email'):(
                 (TEXTNS,'fixed'),
         ),
@@ -8264,7 +8267,7 @@ allowed_attributes = {
                 (TEXTNS,'sort-ascending'),
                 (TEXTNS,'key'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'span'):(
                 (TEXTNS,'style-name'),
                 (TEXTNS,'class-names'),
@@ -8296,7 +8299,7 @@ allowed_attributes = {
                 (TEXTNS,'caption-sequence-format'),
                 (TEXTNS,'relative-tab-stop-position'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'table-of-content'):(
                 (TEXTNS,'protected'),
                 (TEXTNS,'style-name'),
@@ -8372,7 +8375,7 @@ allowed_attributes = {
                 (TEXTNS,'name'),
                 (TEXTNS,'display'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'user-field-input'):(
                 (STYLENS,'data-style-name'),
                 (TEXTNS,'name'),
@@ -8402,7 +8405,7 @@ allowed_attributes = {
                 (TEXTNS,'id'),
                 (TEXTNS,'outline-level'),
         ),
-# allowed_attributes
+    # allowed_attributes
         (TEXTNS,'user-index-source'):(
                 (TEXTNS,'copy-outline-levels'),
                 (TEXTNS,'index-name'),
@@ -8445,5 +8448,5 @@ allowed_attributes = {
                 (TEXTNS,'formula'),
                 (OFFICENS,'time-value'),
         ),
-# allowed_attributes
+    # allowed_attributes
 }
diff --git a/src/odf/load.py b/src/odf/load.py
index 42b3e1793a..f476e45c52 100644
--- a/src/odf/load.py
+++ b/src/odf/load.py
@@ -35,7 +35,7 @@ from .namespaces import OFFICENS
 
 
 class LoadParser(handler.ContentHandler):
-    """ Extract headings from content.xml of an ODT file """
+    ''' Extract headings from content.xml of an ODT file '''
     triggers = (
        (OFFICENS, 'automatic-styles'), (OFFICENS, 'body'),
        (OFFICENS, 'font-face-decls'), (OFFICENS, 'master-styles'),
@@ -56,7 +56,7 @@ class LoadParser(handler.ContentHandler):
     def startElementNS(self, tag, qname, attrs):
         if tag in self.triggers:
             self.parse = True
-        if self.doc._parsing != "styles.xml" and tag == (OFFICENS, 'font-face-decls'):
+        if self.doc._parsing != 'styles.xml' and tag == (OFFICENS, 'font-face-decls'):
             self.parse = False
         if self.parse is False:
             return
@@ -69,13 +69,13 @@ class LoadParser(handler.ContentHandler):
             self.data = []
         # Create the element
         attrdict = {}
-        for (att,value) in attrs.items():
+        for att,value in attrs.items():
             attrdict[att] = value
         try:
             e = Element(qname=tag, qattributes=attrdict, check_grammar=False)
             self.curr = e
         except AttributeError as v:
-            print("Error: %s" % v)
+            print(f'Error: {v}')
 
         if tag == (OFFICENS, 'automatic-styles'):
             e = self.doc.automaticstyles
@@ -91,7 +91,7 @@ class LoadParser(handler.ContentHandler):
             e = self.doc.settings
         elif tag == (OFFICENS,'styles'):
             e = self.doc.styles
-        elif self.doc._parsing == "styles.xml" and tag == (OFFICENS, 'font-face-decls'):
+        elif self.doc._parsing == 'styles.xml' and tag == (OFFICENS, 'font-face-decls'):
             e = self.doc.fontfacedecls
         elif hasattr(self,'parent'):
             self.parent.addElement(e, check_grammar=False)
diff --git a/src/odf/namespaces.py b/src/odf/namespaces.py
index 1c78099b36..93da190dc8 100644
--- a/src/odf/namespaces.py
+++ b/src/odf/namespaces.py
@@ -17,91 +17,91 @@
 # Contributor(s):
 #
 
-TOOLSVERSION = "ODFPY/0.9.4dev"
+TOOLSVERSION = 'ODFPY/0.9.4dev'
 
-ANIMNS         = "urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
-CHARTNS        = "urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-CHARTOOONS     = "http://openoffice.org/2010/chart"
-CONFIGNS       = "urn:oasis:names:tc:opendocument:xmlns:config:1.0"
-CSS3TNS        = "http://www.w3.org/TR/css3-text/"
-# DBNS         = u"http://openoffice.org/2004/database"
-DBNS           = "urn:oasis:names:tc:opendocument:xmlns:database:1.0"
-DCNS           = "http://purl.org/dc/elements/1.1/"
-DOMNS          = "http://www.w3.org/2001/xml-events"
-DR3DNS         = "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-DRAWNS         = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-FIELDNS        = "urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
-FONS           = "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
-FORMNS         = "urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-FORMXNS        = "urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
-GRDDLNS        = "http://www.w3.org/2003/g/data-view#"
-KOFFICENS      = "http://www.koffice.org/2005/"
-MANIFESTNS     = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
-MATHNS         = "http://www.w3.org/1998/Math/MathML"
-METANS         = "urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-NUMBERNS       = "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-OFFICENS       = "urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-OFNS           = "urn:oasis:names:tc:opendocument:xmlns:of:1.2"
-OOOCNS         = "http://openoffice.org/2004/calc"
-OOONS          = "http://openoffice.org/2004/office"
-OOOWNS         = "http://openoffice.org/2004/writer"
-PRESENTATIONNS = "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-RDFANS         = "http://docs.oasis-open.org/opendocument/meta/rdfa#"
-RPTNS          = "http://openoffice.org/2005/report"
-SCRIPTNS       = "urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-SMILNS         = "urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
-STYLENS        = "urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-SVGNS          = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-TABLENS        = "urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-TABLEOOONS     = "http://openoffice.org/2009/table"
-TEXTNS         = "urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-XFORMSNS       = "http://www.w3.org/2002/xforms"
-XHTMLNS        = "http://www.w3.org/1999/xhtml"
-XLINKNS        = "http://www.w3.org/1999/xlink"
-XMLNS          = "http://www.w3.org/XML/1998/namespace"
-XSDNS          = "http://www.w3.org/2001/XMLSchema"
-XSINS          = "http://www.w3.org/2001/XMLSchema-instance"
+ANIMNS         = 'urn:oasis:names:tc:opendocument:xmlns:animation:1.0'
+CHARTNS        = 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0'
+CHARTOOONS     = 'http://openoffice.org/2010/chart'
+CONFIGNS       = 'urn:oasis:names:tc:opendocument:xmlns:config:1.0'
+CSS3TNS        = 'http://www.w3.org/TR/css3-text/'
+# DBNS         = 'http://openoffice.org/2004/database'
+DBNS           = 'urn:oasis:names:tc:opendocument:xmlns:database:1.0'
+DCNS           = 'http://purl.org/dc/elements/1.1/'
+DOMNS          = 'http://www.w3.org/2001/xml-events'
+DR3DNS         = 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0'
+DRAWNS         = 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0'
+FIELDNS        = 'urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0'
+FONS           = 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0'
+FORMNS         = 'urn:oasis:names:tc:opendocument:xmlns:form:1.0'
+FORMXNS        = 'urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0'
+GRDDLNS        = 'http://www.w3.org/2003/g/data-view#'
+KOFFICENS      = 'http://www.koffice.org/2005/'
+MANIFESTNS     = 'urn:oasis:names:tc:opendocument:xmlns:manifest:1.0'
+MATHNS         = 'http://www.w3.org/1998/Math/MathML'
+METANS         = 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0'
+NUMBERNS       = 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0'
+OFFICENS       = 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'
+OFNS           = 'urn:oasis:names:tc:opendocument:xmlns:of:1.2'
+OOOCNS         = 'http://openoffice.org/2004/calc'
+OOONS          = 'http://openoffice.org/2004/office'
+OOOWNS         = 'http://openoffice.org/2004/writer'
+PRESENTATIONNS = 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0'
+RDFANS         = 'http://docs.oasis-open.org/opendocument/meta/rdfa#'
+RPTNS          = 'http://openoffice.org/2005/report'
+SCRIPTNS       = 'urn:oasis:names:tc:opendocument:xmlns:script:1.0'
+SMILNS         = 'urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0'
+STYLENS        = 'urn:oasis:names:tc:opendocument:xmlns:style:1.0'
+SVGNS          = 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0'
+TABLENS        = 'urn:oasis:names:tc:opendocument:xmlns:table:1.0'
+TABLEOOONS     = 'http://openoffice.org/2009/table'
+TEXTNS         = 'urn:oasis:names:tc:opendocument:xmlns:text:1.0'
+XFORMSNS       = 'http://www.w3.org/2002/xforms'
+XHTMLNS        = 'http://www.w3.org/1999/xhtml'
+XLINKNS        = 'http://www.w3.org/1999/xlink'
+XMLNS          = 'http://www.w3.org/XML/1998/namespace'
+XSDNS          = 'http://www.w3.org/2001/XMLSchema'
+XSINS          = 'http://www.w3.org/2001/XMLSchema-instance'
 
 nsdict = {
-   ANIMNS: 'anim',
-   CHARTNS: 'chart',
-   CHARTOOONS: 'chartooo',
-   CONFIGNS: 'config',
-   CSS3TNS: 'css3t',
-   DBNS: 'db',
-   DCNS: 'dc',
-   DOMNS: 'dom',
-   DR3DNS: 'dr3d',
-   DRAWNS: 'draw',
-   FIELDNS: 'field',
-   FONS: 'fo',
-   FORMNS: 'form',
-   FORMXNS: 'formx',
-   GRDDLNS: 'grddl',
-   KOFFICENS: 'koffice',
-   MANIFESTNS: 'manifest',
-   MATHNS: 'math',
-   METANS: 'meta',
-   NUMBERNS: 'number',
-   OFFICENS: 'office',
-   OFNS: 'of',
-   OOONS: 'ooo',
-   OOOWNS: 'ooow',
-   OOOCNS: 'oooc',
-   PRESENTATIONNS: 'presentation',
-   RDFANS: 'rdfa',
-   RPTNS:  'rpt',
-   SCRIPTNS: 'script',
-   SMILNS: 'smil',
-   STYLENS: 'style',
-   SVGNS: 'svg',
-   TABLENS: 'table',
-   TABLEOOONS: 'tableooo',
-   TEXTNS: 'text',
-   XFORMSNS: 'xforms',
-   XLINKNS: 'xlink',
-   XHTMLNS: 'xhtml',
-   XMLNS: 'xml',
-   XSDNS: 'xsd',
-   XSINS: 'xsi',
+    ANIMNS: 'anim',
+    CHARTNS: 'chart',
+    CHARTOOONS: 'chartooo',
+    CONFIGNS: 'config',
+    CSS3TNS: 'css3t',
+    DBNS: 'db',
+    DCNS: 'dc',
+    DOMNS: 'dom',
+    DR3DNS: 'dr3d',
+    DRAWNS: 'draw',
+    FIELDNS: 'field',
+    FONS: 'fo',
+    FORMNS: 'form',
+    FORMXNS: 'formx',
+    GRDDLNS: 'grddl',
+    KOFFICENS: 'koffice',
+    MANIFESTNS: 'manifest',
+    MATHNS: 'math',
+    METANS: 'meta',
+    NUMBERNS: 'number',
+    OFFICENS: 'office',
+    OFNS: 'of',
+    OOONS: 'ooo',
+    OOOWNS: 'ooow',
+    OOOCNS: 'oooc',
+    PRESENTATIONNS: 'presentation',
+    RDFANS: 'rdfa',
+    RPTNS:  'rpt',
+    SCRIPTNS: 'script',
+    SMILNS: 'smil',
+    STYLENS: 'style',
+    SVGNS: 'svg',
+    TABLENS: 'table',
+    TABLEOOONS: 'tableooo',
+    TEXTNS: 'text',
+    XFORMSNS: 'xforms',
+    XLINKNS: 'xlink',
+    XHTMLNS: 'xhtml',
+    XMLNS: 'xml',
+    XSDNS: 'xsd',
+    XSINS: 'xsi',
 }
diff --git a/src/odf/odf2moinmoin.py b/src/odf/odf2moinmoin.py
index 83ce1e71a0..f58e524309 100644
--- a/src/odf/odf2moinmoin.py
+++ b/src/odf/odf2moinmoin.py
@@ -36,13 +36,13 @@ IGNORED_TAGS = [
     'office:annotation',
     'presentation:notes',
     'svg:desc',
-] + [nsdict[item[0]]+":"+item[1] for item in empty_elements]
+] + [nsdict[item[0]]+':'+item[1] for item in empty_elements]
 
-INLINE_TAGS = [nsdict[item[0]]+":"+item[1] for item in inline_elements]
+INLINE_TAGS = [nsdict[item[0]]+':'+item[1] for item in inline_elements]
 
 
 class TextProps:
-    """ Holds properties for a text style. """
+    ''' Holds properties for a text style. '''
 
     def __init__(self):
 
@@ -55,26 +55,26 @@ class TextProps:
         self.subscript = False
 
     def setItalic(self, value):
-        if value == "italic":
+        if value == 'italic':
             self.italic = True
-        elif value == "normal":
+        elif value == 'normal':
             self.italic = False
 
     def setBold(self, value):
-        if value == "bold":
+        if value == 'bold':
             self.bold = True
-        elif value == "normal":
+        elif value == 'normal':
             self.bold = False
 
     def setFixed(self, value):
         self.fixed = value
 
     def setUnderlined(self, value):
-        if value and value != "none":
+        if value and value != 'none':
             self.underlined = True
 
     def setStrikethrough(self, value):
-        if value and value != "none":
+        if value and value != 'none':
             self.strikethrough = True
 
     def setPosition(self, value):
@@ -83,10 +83,10 @@ class TextProps:
         posisize = value.split(' ')
         textpos = posisize[0]
         if textpos.find('%') == -1:
-            if textpos == "sub":
+            if textpos == 'sub':
                 self.superscript = False
                 self.subscript = True
-            elif textpos == "super":
+            elif textpos == 'super':
                 self.superscript = True
                 self.subscript = False
         else:
@@ -100,14 +100,14 @@ class TextProps:
 
     def __unicode__(self):
 
-        return "[italic={}, bold=i{}, fixed={}]".format(unicode_type(self.italic),
+        return '[italic={}, bold=i{}, fixed={}]'.format(unicode_type(self.italic),
                                           unicode_type(self.bold),
                                           unicode_type(self.fixed))
     __str__ = __unicode__
 
 
 class ParagraphProps:
-    """ Holds properties of a paragraph style. """
+    ''' Holds properties of a paragraph style. '''
 
     def __init__(self):
 
@@ -131,14 +131,14 @@ class ParagraphProps:
 
     def __unicode__(self):
 
-        return "[bq=%s, h=%d, code=%s]" % (unicode_type(self.blockquote),
+        return '[bq={}, h={}, code={}]'.format(unicode_type(self.blockquote),
                                            self.headingLevel,
                                            unicode_type(self.code))
     __str__ = __unicode__
 
 
 class ListProperties:
-    """ Holds properties for a list style. """
+    ''' Holds properties for a list style. '''
 
     def __init__(self):
         self.ordered = False
@@ -152,8 +152,8 @@ class ODF2MoinMoin:
     def __init__(self, filepath):
         self.footnotes = []
         self.footnoteCounter = 0
-        self.textStyles = {"Standard": TextProps()}
-        self.paragraphStyles = {"Standard": ParagraphProps()}
+        self.textStyles = {'Standard': TextProps()}
+        self.paragraphStyles = {'Standard': ParagraphProps()}
         self.listStyles = {}
         self.fixedFonts = []
         self.hasTitle = 0
@@ -161,12 +161,12 @@ class ODF2MoinMoin:
 
         # Tags
         self.elements = {
-         'draw:page': self.textToString,
-         'draw:frame': self.textToString,
-         'draw:image': self.draw_image,
-         'draw:text-box': self.textToString,
-         'text:a': self.text_a,
-         'text:note': self.text_note,
+            'draw:page': self.textToString,
+            'draw:frame': self.textToString,
+            'draw:image': self.draw_image,
+            'draw:text-box': self.textToString,
+            'text:a': self.text_a,
+            'text:note': self.text_note,
         }
         for tag in IGNORED_TAGS:
             self.elements[tag] = self.do_nothing
@@ -180,43 +180,43 @@ class ODF2MoinMoin:
         self.load(filepath)
 
     def processFontDeclarations(self, fontDecl):
-        """ Extracts necessary font information from a font-declaration
+        ''' Extracts necessary font information from a font-declaration
             element.
-            """
-        for fontFace in fontDecl.getElementsByTagName("style:font-face"):
-            if fontFace.getAttribute("style:font-pitch") == "fixed":
-                self.fixedFonts.append(fontFace.getAttribute("style:name"))
+        '''
+        for fontFace in fontDecl.getElementsByTagName('style:font-face'):
+            if fontFace.getAttribute('style:font-pitch') == 'fixed':
+                self.fixedFonts.append(fontFace.getAttribute('style:name'))
 
     def extractTextProperties(self, style, parent=None):
-        """ Extracts text properties from a style element. """
+        ''' Extracts text properties from a style element. '''
 
         textProps = TextProps()
 
-        textPropEl = style.getElementsByTagName("style:text-properties")
+        textPropEl = style.getElementsByTagName('style:text-properties')
         if not textPropEl:
             return textProps
 
         textPropEl = textPropEl[0]
 
-        textProps.setItalic(textPropEl.getAttribute("fo:font-style"))
-        textProps.setBold(textPropEl.getAttribute("fo:font-weight"))
-        textProps.setUnderlined(textPropEl.getAttribute("style:text-underline-style"))
-        textProps.setStrikethrough(textPropEl.getAttribute("style:text-line-through-style"))
-        textProps.setPosition(textPropEl.getAttribute("style:text-position"))
+        textProps.setItalic(textPropEl.getAttribute('fo:font-style'))
+        textProps.setBold(textPropEl.getAttribute('fo:font-weight'))
+        textProps.setUnderlined(textPropEl.getAttribute('style:text-underline-style'))
+        textProps.setStrikethrough(textPropEl.getAttribute('style:text-line-through-style'))
+        textProps.setPosition(textPropEl.getAttribute('style:text-position'))
 
-        if textPropEl.getAttribute("style:font-name") in self.fixedFonts:
+        if textPropEl.getAttribute('style:font-name') in self.fixedFonts:
             textProps.setFixed(True)
 
         return textProps
 
     def extractParagraphProperties(self, style, parent=None):
-        """ Extracts paragraph properties from a style element. """
+        ''' Extracts paragraph properties from a style element. '''
 
         paraProps = ParagraphProps()
 
-        name = style.getAttribute("style:name")
+        name = style.getAttribute('style:name')
 
-        if name.startswith("Heading_20_"):
+        if name.startswith('Heading_20_'):
             level = name[11:]
             try:
                 level = int(level)
@@ -224,13 +224,13 @@ class ODF2MoinMoin:
             except:
                 level = 0
 
-        if name == "Title":
+        if name == 'Title':
             paraProps.setTitle(True)
 
-        paraPropEl = style.getElementsByTagName("style:paragraph-properties")
+        paraPropEl = style.getElementsByTagName('style:paragraph-properties')
         if paraPropEl:
             paraPropEl = paraPropEl[0]
-            leftMargin = paraPropEl.getAttribute("fo:margin-left")
+            leftMargin = paraPropEl.getAttribute('fo:margin-left')
             if leftMargin:
                 try:
                     leftMargin = float(leftMargin[:-2])
@@ -246,23 +246,23 @@ class ODF2MoinMoin:
         return paraProps
 
     def processStyles(self, styleElements):
-        """ Runs through "style" elements extracting necessary information.
-        """
+        ''' Runs through "style" elements extracting necessary information.
+        '''
 
         for style in styleElements:
 
-            name = style.getAttribute("style:name")
+            name = style.getAttribute('style:name')
 
-            if name == "Standard":
+            if name == 'Standard':
                 continue
 
-            family = style.getAttribute("style:family")
-            parent = style.getAttribute("style:parent-style-name")
+            family = style.getAttribute('style:family')
+            parent = style.getAttribute('style:parent-style-name')
 
-            if family == "text":
+            if family == 'text':
                 self.textStyles[name] = self.extractTextProperties(style, parent)
 
-            elif family == "paragraph":
+            elif family == 'paragraph':
                 self.paragraphStyles[name] = \
                                  self.extractParagraphProperties(style, parent)
                 self.textStyles[name] = self.extractTextProperties(style, parent)
@@ -270,49 +270,49 @@ class ODF2MoinMoin:
     def processListStyles(self, listStyleElements):
 
         for style in listStyleElements:
-            name = style.getAttribute("style:name")
+            name = style.getAttribute('style:name')
 
             prop = ListProperties()
             if style.hasChildNodes():
                 subitems = [el for el in style.childNodes
-                     if el.nodeType == xml.dom.Node.ELEMENT_NODE and el.tagName == "text:list-level-style-number"]
+                     if el.nodeType == xml.dom.Node.ELEMENT_NODE and el.tagName == 'text:list-level-style-number']
                 if len(subitems) > 0:
                     prop.setOrdered(True)
 
             self.listStyles[name] = prop
 
     def load(self, filepath):
-        """ Loads an ODT file. """
+        ''' Loads an ODT file. '''
 
         zip = zipfile.ZipFile(filepath)
 
-        styles_doc = xml.dom.minidom.parseString(zip.read("styles.xml"))
-        fontfacedecls = styles_doc.getElementsByTagName("office:font-face-decls")
+        styles_doc = xml.dom.minidom.parseString(zip.read('styles.xml'))
+        fontfacedecls = styles_doc.getElementsByTagName('office:font-face-decls')
         if fontfacedecls:
             self.processFontDeclarations(fontfacedecls[0])
-        self.processStyles(styles_doc.getElementsByTagName("style:style"))
-        self.processListStyles(styles_doc.getElementsByTagName("text:list-style"))
+        self.processStyles(styles_doc.getElementsByTagName('style:style'))
+        self.processListStyles(styles_doc.getElementsByTagName('text:list-style'))
 
-        self.content = xml.dom.minidom.parseString(zip.read("content.xml"))
-        fontfacedecls = self.content.getElementsByTagName("office:font-face-decls")
+        self.content = xml.dom.minidom.parseString(zip.read('content.xml'))
+        fontfacedecls = self.content.getElementsByTagName('office:font-face-decls')
         if fontfacedecls:
             self.processFontDeclarations(fontfacedecls[0])
 
-        self.processStyles(self.content.getElementsByTagName("style:style"))
-        self.processListStyles(self.content.getElementsByTagName("text:list-style"))
+        self.processStyles(self.content.getElementsByTagName('style:style'))
+        self.processListStyles(self.content.getElementsByTagName('text:list-style'))
 
     def compressCodeBlocks(self, text):
-        """ Removes extra blank lines from code blocks. """
+        ''' Removes extra blank lines from code blocks. '''
 
         return text
-        lines = text.split("\n")
+        lines = text.split('\n')
         buffer = []
         numLines = len(lines)
         for i in range(numLines):
 
             if (lines[i].strip() or i == numLines-1 or i == 0 or
-                not (lines[i-1].startswith("    ") and lines[i+1].startswith("    "))):
-                buffer.append("\n" + lines[i])
+                not (lines[i-1].startswith('    ') and lines[i+1].startswith('    '))):
+                buffer.append('\n' + lines[i])
 
         return ''.join(buffer)
 
@@ -321,44 +321,44 @@ class ODF2MoinMoin:
         return ''
 
     def draw_image(self, node):
-        """
-        """
+        '''
+        '''
 
-        link = node.getAttribute("xlink:href")
+        link = node.getAttribute('xlink:href')
         if link and link[:2] == './':  # Indicates a sub-object, which isn't supported
-            return "%s\n" % link
+            return f'{link}\n'
         if link and link[:9] == 'Pictures/':
             link = link[9:]
-        return "[[Image(%s)]]\n" % link
+        return f'[[Image({link})]]\n'
 
     def text_a(self, node):
         text = self.textToString(node)
-        link = node.getAttribute("xlink:href")
+        link = node.getAttribute('xlink:href')
         if link.strip() == text.strip():
-            return "[%s] " % link.strip()
+            return f'[{link.strip()}] '
         else:
-            return f"[{link.strip()} {text.strip()}] "
+            return f'[{link.strip()} {text.strip()}] '
 
     def text_line_break(self, node):
-        return "[[BR]]"
+        return '[[BR]]'
 
     def text_note(self, node):
-        cite = (node.getElementsByTagName("text:note-citation")[0]
+        cite = (node.getElementsByTagName('text:note-citation')[0]
                     .childNodes[0].nodeValue)
-        body = (node.getElementsByTagName("text:note-body")[0]
+        body = (node.getElementsByTagName('text:note-body')[0]
                     .childNodes[0])
         self.footnotes.append((cite, self.textToString(body)))
-        return "^%s^" % cite
+        return f'^{cite}^'
 
     def text_s(self, node):
         try:
-            num = int(node.getAttribute("text:c"))
-            return " "*num
+            num = int(node.getAttribute('text:c'))
+            return ' '*num
         except:
-            return " "
+            return ' '
 
     def text_tab(self, node):
-        return "    "
+        return '    '
 
     def inline_markup(self, node):
         text = self.textToString(node)
@@ -366,11 +366,11 @@ class ODF2MoinMoin:
         if not text.strip():
             return ''  # don't apply styles to white space
 
-        styleName = node.getAttribute("text:style-name")
+        styleName = node.getAttribute('text:style-name')
         style = self.textStyles.get(styleName, TextProps())
 
         if style.fixed:
-            return "`" + text + "`"
+            return '`' + text + '`'
 
         mark = []
         if style:
@@ -379,16 +379,16 @@ class ODF2MoinMoin:
             if style.bold:
                 mark.append("'''")
             if style.underlined:
-                mark.append("__")
+                mark.append('__')
             if style.strikethrough:
-                mark.append("~~")
+                mark.append('~~')
             if style.superscript:
-                mark.append("^")
+                mark.append('^')
             if style.subscript:
-                mark.append(",,")
+                mark.append(',,')
         revmark = mark[:]
         revmark.reverse()
-        return "{}{}{}".format(''.join(mark), text, ''.join(revmark))
+        return '{}{}{}'.format(''.join(mark), text, ''.join(revmark))
 
 # -----------------------------------
     def listToString(self, listElement, indent=0):
@@ -396,71 +396,71 @@ class ODF2MoinMoin:
         self.lastsegment = listElement.tagName
         buffer = []
 
-        styleName = listElement.getAttribute("text:style-name")
+        styleName = listElement.getAttribute('text:style-name')
         props = self.listStyles.get(styleName, ListProperties())
 
         i = 0
         for item in listElement.childNodes:
-            buffer.append(" "*indent)
+            buffer.append(' '*indent)
             i += 1
             if props.ordered:
                 number = unicode_type(i)
-                number = " " + number + ". "
-                buffer.append(" 1. ")
+                number = ' ' + number + '. '
+                buffer.append(' 1. ')
             else:
-                buffer.append(" * ")
+                buffer.append(' * ')
             subitems = [el for el in item.childNodes
-                          if el.tagName in ["text:p", "text:h", "text:list"]]
+                          if el.tagName in ['text:p', 'text:h', 'text:list']]
             for subitem in subitems:
-                if subitem.tagName == "text:list":
-                    buffer.append("\n")
+                if subitem.tagName == 'text:list':
+                    buffer.append('\n')
                     buffer.append(self.listToString(subitem, indent+3))
                 else:
                     buffer.append(self.paragraphToString(subitem, indent+3))
                 self.lastsegment = subitem.tagName
             self.lastsegment = item.tagName
-            buffer.append("\n")
+            buffer.append('\n')
 
         return ''.join(buffer)
 
     def tableToString(self, tableElement):
-        """ MoinMoin uses || to delimit table cells
-        """
+        ''' MoinMoin uses || to delimit table cells
+        '''
 
         self.lastsegment = tableElement.tagName
         buffer = []
 
         for item in tableElement.childNodes:
             self.lastsegment = item.tagName
-            if item.tagName == "table:table-header-rows":
+            if item.tagName == 'table:table-header-rows':
                 buffer.append(self.tableToString(item))
-            if item.tagName == "table:table-row":
-                buffer.append("\n||")
+            if item.tagName == 'table:table-row':
+                buffer.append('\n||')
                 for cell in item.childNodes:
                     buffer.append(self.inline_markup(cell))
-                    buffer.append("||")
+                    buffer.append('||')
                     self.lastsegment = cell.tagName
         return ''.join(buffer)
 
     def toString(self):
-        """ Converts the document to a string.
+        ''' Converts the document to a string.
             FIXME: Result from second call differs from first call
-        """
-        body = self.content.getElementsByTagName("office:body")[0]
+        '''
+        body = self.content.getElementsByTagName('office:body')[0]
         text = body.childNodes[0]
 
         buffer = []
 
         paragraphs = [el for el in text.childNodes
-                      if el.tagName in ["draw:page", "text:p", "text:h","text:section",
-                                        "text:list", "table:table"]]
+                      if el.tagName in ['draw:page', 'text:p', 'text:h','text:section',
+                                        'text:list', 'table:table']]
 
         for paragraph in paragraphs:
-            if paragraph.tagName == "text:list":
+            if paragraph.tagName == 'text:list':
                 text = self.listToString(paragraph)
-            elif paragraph.tagName == "text:section":
+            elif paragraph.tagName == 'text:section':
                 text = self.textToString(paragraph)
-            elif paragraph.tagName == "table:table":
+            elif paragraph.tagName == 'table:table':
                 text = self.tableToString(paragraph)
             else:
                 text = self.paragraphToString(paragraph)
@@ -469,11 +469,11 @@ class ODF2MoinMoin:
 
         if self.footnotes:
 
-            buffer.append("----")
+            buffer.append('----')
             for cite, body in self.footnotes:
-                buffer.append(f"{cite}: {body}")
+                buffer.append(f'{cite}: {body}')
 
-        buffer.append("")
+        buffer.append('')
         return self.compressCodeBlocks('\n'.join(buffer))
 
     def textToString(self, element):
@@ -488,21 +488,21 @@ class ODF2MoinMoin:
             elif node.nodeType == xml.dom.Node.ELEMENT_NODE:
                 tag = node.tagName
 
-                if tag in ("draw:text-box", "draw:frame"):
+                if tag in ('draw:text-box', 'draw:frame'):
                     buffer.append(self.textToString(node))
 
-                elif tag in ("text:p", "text:h"):
+                elif tag in ('text:p', 'text:h'):
                     text = self.paragraphToString(node)
                     if text:
                         buffer.append(text)
-                elif tag == "text:list":
+                elif tag == 'text:list':
                     buffer.append(self.listToString(node))
                 else:
                     method = self.elements.get(tag)
                     if method:
                         buffer.append(method(node))
                     else:
-                        buffer.append(" {" + tag + "} ")
+                        buffer.append(' {' + tag + '} ')
 
         return ''.join(buffer)
 
@@ -510,23 +510,23 @@ class ODF2MoinMoin:
 
         dummyParaProps = ParagraphProps()
 
-        style_name = paragraph.getAttribute("text:style-name")
+        style_name = paragraph.getAttribute('text:style-name')
         paraProps = self.paragraphStyles.get(style_name, dummyParaProps)
         text = self.inline_markup(paragraph)
 
         if paraProps and not paraProps.code:
             text = text.strip()
 
-        if paragraph.tagName == "text:p" and self.lastsegment == "text:p":
-            text = "\n" + text
+        if paragraph.tagName == 'text:p' and self.lastsegment == 'text:p':
+            text = '\n' + text
 
         self.lastsegment = paragraph.tagName
 
         if paraProps.title:
             self.hasTitle = 1
-            return "= " + text + " =\n"
+            return '= ' + text + ' =\n'
 
-        outlinelevel = paragraph.getAttribute("text:outline-level")
+        outlinelevel = paragraph.getAttribute('text:outline-level')
         if outlinelevel:
 
             level = int(outlinelevel)
@@ -534,10 +534,10 @@ class ODF2MoinMoin:
                 level += 1
 
             if level >= 1:
-                return "=" * level + " " + text + " " + "=" * level + "\n"
+                return '=' * level + ' ' + text + ' ' + '=' * level + '\n'
 
         elif paraProps.code:
-            return "{{{\n" + text + "\n}}}\n"
+            return '{{{\n' + text + '\n}}}\n'
 
         if paraProps.indented:
             return self.wrapParagraph(text, indent=indent, blockquote=True)
@@ -552,19 +552,19 @@ class ODF2MoinMoin:
         LIMIT = 50
 
         if blockquote:
-            buffer.append("  ")
+            buffer.append('  ')
 
         return ''.join(buffer) + text
         # Unused from here
         for token in text.split():
 
             if counter > LIMIT - indent:
-                buffer.append("\n" + " "*indent)
+                buffer.append('\n' + ' '*indent)
                 if blockquote:
-                    buffer.append("  ")
+                    buffer.append('  ')
                 counter = 0
 
-            buffer.append(token + " ")
+            buffer.append(token + ' ')
             counter += len(token)
 
         return ''.join(buffer)
diff --git a/src/odf/odf2xhtml.py b/src/odf/odf2xhtml.py
index d889e02f88..5eae4e5878 100644
--- a/src/odf/odf2xhtml.py
+++ b/src/odf/odf2xhtml.py
@@ -77,11 +77,10 @@ if False:  # Added by Kovid
 
 
 class StyleToCSS:
-
-    """ The purpose of the StyleToCSS class is to contain the rules to convert
+    ''' The purpose of the StyleToCSS class is to contain the rules to convert
         ODF styles to CSS2. Since it needs the generic fonts, it would probably
         make sense to also contain the Styles in a dict as well..
-    """
+    '''
 
     def __init__(self):
         # Font declarations
@@ -92,79 +91,79 @@ class StyleToCSS:
 
         self.ruleconversions = {
             (DRAWNS,'fill-image-name'): self.c_drawfillimage,
-            (FONS,"background-color"): self.c_fo,
-            (FONS,"border"): self.c_fo,
-            (FONS,"border-bottom"): self.c_fo,
-            (FONS,"border-left"): self.c_fo,
-            (FONS,"border-right"): self.c_fo,
-            (FONS,"border-top"): self.c_fo,
-            (FONS,"break-after"): self.c_break,  # Added by Kovid
-            (FONS,"break-before"): self.c_break,  # Added by Kovid
-            (FONS,"color"): self.c_fo,
-            (FONS,"font-family"): self.c_fo,
-            (FONS,"font-size"): self.c_fo,
-            (FONS,"font-style"): self.c_fo,
-            (FONS,"font-variant"): self.c_fo,
-            (FONS,"font-weight"): self.c_fo,
-            (FONS,"line-height"): self.c_fo,
-            (FONS,"margin"): self.c_fo,
-            (FONS,"margin-bottom"): self.c_fo,
-            (FONS,"margin-left"): self.c_fo,
-            (FONS,"margin-right"): self.c_fo,
-            (FONS,"margin-top"): self.c_fo,
-            (FONS,"min-height"): self.c_fo,
-            (FONS,"padding"): self.c_fo,
-            (FONS,"padding-bottom"): self.c_fo,
-            (FONS,"padding-left"): self.c_fo,
-            (FONS,"padding-right"): self.c_fo,
-            (FONS,"padding-top"): self.c_fo,
-            (FONS,"page-width"): self.c_page_width,
-            (FONS,"page-height"): self.c_page_height,
-            (FONS,"text-align"): self.c_text_align,
-            (FONS,"text-indent") :self.c_fo,
-            (TABLENS,'border-model') :self.c_border_model,
-            (STYLENS,'column-width') : self.c_width,
-            (STYLENS,"font-name"): self.c_fn,
+            (FONS,'background-color'): self.c_fo,
+            (FONS,'border'): self.c_fo,
+            (FONS,'border-bottom'): self.c_fo,
+            (FONS,'border-left'): self.c_fo,
+            (FONS,'border-right'): self.c_fo,
+            (FONS,'border-top'): self.c_fo,
+            (FONS,'break-after'): self.c_break,  # Added by Kovid
+            (FONS,'break-before'): self.c_break,  # Added by Kovid
+            (FONS,'color'): self.c_fo,
+            (FONS,'font-family'): self.c_fo,
+            (FONS,'font-size'): self.c_fo,
+            (FONS,'font-style'): self.c_fo,
+            (FONS,'font-variant'): self.c_fo,
+            (FONS,'font-weight'): self.c_fo,
+            (FONS,'line-height'): self.c_fo,
+            (FONS,'margin'): self.c_fo,
+            (FONS,'margin-bottom'): self.c_fo,
+            (FONS,'margin-left'): self.c_fo,
+            (FONS,'margin-right'): self.c_fo,
+            (FONS,'margin-top'): self.c_fo,
+            (FONS,'min-height'): self.c_fo,
+            (FONS,'padding'): self.c_fo,
+            (FONS,'padding-bottom'): self.c_fo,
+            (FONS,'padding-left'): self.c_fo,
+            (FONS,'padding-right'): self.c_fo,
+            (FONS,'padding-top'): self.c_fo,
+            (FONS,'page-width'): self.c_page_width,
+            (FONS,'page-height'): self.c_page_height,
+            (FONS,'text-align'): self.c_text_align,
+            (FONS,'text-indent'):self.c_fo,
+            (TABLENS,'border-model'):self.c_border_model,
+            (STYLENS,'column-width'): self.c_width,
+            (STYLENS,'font-name'): self.c_fn,
             (STYLENS,'horizontal-pos'): self.c_hp,
             (STYLENS,'text-position'): self.c_text_position,
             (STYLENS,'text-line-through-style'): self.c_text_line_through_style,
             (STYLENS,'text-underline-style'): self.c_text_underline_style,
-            (STYLENS,'width') : self.c_width,
+            (STYLENS,'width'): self.c_width,
             # FIXME Should do style:vertical-pos here
         }
 
     def save_font(self, name, family, generic):
-        """ It is possible that the HTML browser doesn't know how to
+        ''' It is possible that the HTML browser doesn't know how to
             show a particular font. Fortunately ODF provides generic fallbacks.
             Unfortunately they are not the same as CSS2.
             CSS2: serif, sans-serif, cursive, fantasy, monospace
             ODF: roman, swiss, modern, decorative, script, system
             This method put the font and fallback into a dictionary
-        """
-        htmlgeneric = "sans-serif"
-        if generic == "roman":
-            htmlgeneric = "serif"
-        elif generic == "swiss":
-            htmlgeneric = "sans-serif"
-        elif generic == "modern":
-            htmlgeneric = "monospace"
-        elif generic == "decorative":
-            htmlgeneric = "sans-serif"
-        elif generic == "script":
-            htmlgeneric = "monospace"
-        elif generic == "system":
-            htmlgeneric = "serif"
+        '''
+        htmlgeneric = 'sans-serif'
+        if generic == 'roman':
+            htmlgeneric = 'serif'
+        elif generic == 'swiss':
+            htmlgeneric = 'sans-serif'
+        elif generic == 'modern':
+            htmlgeneric = 'monospace'
+        elif generic == 'decorative':
+            htmlgeneric = 'sans-serif'
+        elif generic == 'script':
+            htmlgeneric = 'monospace'
+        elif generic == 'system':
+            htmlgeneric = 'serif'
         self.fontdict[name] = (family, htmlgeneric)
 
     def c_drawfillimage(self, ruleset, sdict, rule, val):
-        """ Fill a figure with an image. Since CSS doesn't let you resize images
+        ''' Fill a figure with an image. Since CSS doesn't let you resize images
             this should really be implemented as an absolutely position <img>
             with a width and a height
-        """
-        sdict['background-image'] = "url('%s')" % self.fillimages[val]
+        '''
+        sdict['background-image'] = "url('{}')".format(self.fillimages[val])
 
     def c_fo(self, ruleset, sdict, rule, val):
-        """ XSL formatting attributes """
+        ''' XSL formatting attributes '''
         selector = rule[1]
         sdict[selector] = val
 
@@ -176,37 +175,37 @@ class StyleToCSS:
         sdict[property] = values.get(val, 'auto')
 
     def c_border_model(self, ruleset, sdict, rule, val):
-        """ Convert to CSS2 border model """
+        ''' Convert to CSS2 border model '''
         if val == 'collapsing':
             sdict['border-collapse'] ='collapse'
         else:
             sdict['border-collapse'] ='separate'
 
     def c_width(self, ruleset, sdict, rule, val):
-        """ Set width of box """
+        ''' Set width of box '''
         sdict['width'] = val
 
     def c_text_align(self, ruleset, sdict, rule, align):
-        """ Text align """
-        if align == "start":
-            align = "left"
-        if align == "end":
-            align = "right"
+        ''' Text align '''
+        if align == 'start':
+            align = 'left'
+        if align == 'end':
+            align = 'right'
         sdict['text-align'] = align
 
     def c_fn(self, ruleset, sdict, rule, fontstyle):
-        """ Generate the CSS font family
+        ''' Generate the CSS font family
             A generic font can be found in two ways. In a <style:font-face>
             element or as a font-family-generic attribute in text-properties.
-        """
+        '''
         generic = ruleset.get((STYLENS,'font-family-generic'))
         if generic is not None:
             self.save_font(fontstyle, fontstyle, generic)
         family, htmlgeneric = self.fontdict.get(fontstyle, (fontstyle, 'serif'))
-        sdict['font-family'] = '%s, %s'  % (family, htmlgeneric)
+        sdict['font-family'] = f'{family}, {htmlgeneric}'
 
     def c_text_position(self, ruleset, sdict, rule, tp):
-        """ Text position. This is used e.g. to make superscript and subscript
+        ''' Text position. This is used e.g. to make superscript and subscript
             This attribute can have one or two values.
 
             The first value must be present and specifies the vertical
@@ -223,15 +222,15 @@ class StyleToCSS:
             used. Although this value may change the font height that
             is displayed, it never changes the current font height that
             is used for additional calculations.
-        """
+        '''
         textpos = tp.split(' ')
-        if len(textpos) == 2 and textpos[0] != "0%":
+        if len(textpos) == 2 and textpos[0] != '0%':
             # Bug in OpenOffice. If vertical-align is 0% - ignore the text size.
             sdict['font-size'] = textpos[1]
-        if textpos[0] == "super":
-            sdict['vertical-align'] = "33%"
-        elif textpos[0] == "sub":
-            sdict['vertical-align'] = "-33%"
+        if textpos[0] == 'super':
+            sdict['vertical-align'] = '33%'
+        elif textpos[0] == 'sub':
+            sdict['vertical-align'] = '-33%'
         else:
             sdict['vertical-align'] = textpos[0]
 
@@ -241,70 +240,70 @@ class StyleToCSS:
         # collect the information.
         wrap = ruleset.get((STYLENS,'wrap'),'parallel')
         # Can have: from-left, left, center, right, from-inside, inside, outside
-        if hpos == "center":
-            sdict['margin-left'] = "auto"
-            sdict['margin-right'] = "auto"
+        if hpos == 'center':
+            sdict['margin-left'] = 'auto'
+            sdict['margin-right'] = 'auto'
         # else:
         #     # force it to be *something* then delete it
         #     sdict['margin-left'] = sdict['margin-right'] = ''
         #     del sdict['margin-left'], sdict['margin-right']
 
-        if hpos in ("right","outside"):
-            if wrap in ("left", "parallel","dynamic"):
-                sdict['float'] = "right"
-            elif wrap == "run-through":
-                sdict['position'] = "absolute"  # Simulate run-through
-                sdict['top'] = "0"
-                sdict['right'] = "0"
+        if hpos in ('right','outside'):
+            if wrap in ('left', 'parallel','dynamic'):
+                sdict['float'] = 'right'
+            elif wrap == 'run-through':
+                sdict['position'] = 'absolute'  # Simulate run-through
+                sdict['top'] = '0'
+                sdict['right'] = '0'
             else:  # No wrapping
-                sdict['margin-left'] = "auto"
-                sdict['margin-right'] = "0px"
-        elif hpos in ("left", "inside"):
-            if wrap in ("right", "parallel","dynamic"):
-                sdict['float'] = "left"
-            elif wrap == "run-through":
-                sdict['position'] = "absolute"  # Simulate run-through
-                sdict['top'] = "0"
-                sdict['left'] = "0"
+                sdict['margin-left'] = 'auto'
+                sdict['margin-right'] = '0px'
+        elif hpos in ('left', 'inside'):
+            if wrap in ('right', 'parallel','dynamic'):
+                sdict['float'] = 'left'
+            elif wrap == 'run-through':
+                sdict['position'] = 'absolute'  # Simulate run-through
+                sdict['top'] = '0'
+                sdict['left'] = '0'
             else:  # No wrapping
-                sdict['margin-left'] = "0px"
-                sdict['margin-right'] = "auto"
-        elif hpos in ("from-left", "from-inside"):
-            if wrap in ("right", "parallel"):
-                sdict['float'] = "left"
+                sdict['margin-left'] = '0px'
+                sdict['margin-right'] = 'auto'
+        elif hpos in ('from-left', 'from-inside'):
+            if wrap in ('right', 'parallel'):
+                sdict['float'] = 'left'
             else:
-                sdict['position'] = "relative"  # No wrapping
+                sdict['position'] = 'relative'  # No wrapping
                 if (SVGNS,'x') in ruleset:
                     sdict['left'] = ruleset[(SVGNS,'x')]
 
     def c_page_width(self, ruleset, sdict, rule, val):
-        """ Set width of box
+        ''' Set width of box
             HTML doesn't really have a page-width. It is always 100% of the browser width
-        """
+        '''
         sdict['width'] = val
 
     def c_text_underline_style(self, ruleset, sdict, rule, val):
-        """ Set underline decoration
+        ''' Set underline decoration
             HTML doesn't really have a page-width. It is always 100% of the browser width
-        """
-        if val and val != "none":
-            sdict['text-decoration'] = "underline"
+        '''
+        if val and val != 'none':
+            sdict['text-decoration'] = 'underline'
 
     def c_text_line_through_style(self, ruleset, sdict, rule, val):
-        """ Set underline decoration
+        ''' Set underline decoration
             HTML doesn't really have a page-width. It is always 100% of the browser width
-        """
-        if val and val != "none":
-            sdict['text-decoration'] = "line-through"
+        '''
+        if val and val != 'none':
+            sdict['text-decoration'] = 'line-through'
 
     def c_page_height(self, ruleset, sdict, rule, val):
-        """ Set height of box """
+        ''' Set height of box '''
         sdict['height'] = val
 
     def convert_styles(self, ruleset):
-        """ Rule is a tuple of (namespace, name). If the namespace is '' then
+        ''' Rule is a tuple of (namespace, name). If the namespace is '' then
             it is already CSS2
-        """
+        '''
         sdict = {}
         for rule,val in ruleset.items():
             if rule[0] == '':
@@ -333,7 +332,7 @@ class TagStack:
         return item[1]
 
     def rfindattr(self, attr):
-        """ Find a tag with the given attribute """
+        ''' Find a tag with the given attribute '''
         for tag, attrs in self.stack:
             if attr in attrs:
                 return attrs[attr]
@@ -348,26 +347,26 @@ class TagStack:
 
 
 special_styles = {
-   'S-Emphasis':'em',
-   'S-Citation':'cite',
-   'S-Strong_20_Emphasis':'strong',
-   'S-Variable':'var',
-   'S-Definition':'dfn',
-   'S-Teletype':'tt',
-   'P-Heading_20_1':'h1',
-   'P-Heading_20_2':'h2',
-   'P-Heading_20_3':'h3',
-   'P-Heading_20_4':'h4',
-   'P-Heading_20_5':'h5',
-   'P-Heading_20_6':'h6',
-#  'P-Caption':'caption',
-   'P-Addressee':'address',
-#  'P-List_20_Heading':'dt',
-#  'P-List_20_Contents':'dd',
-   'P-Preformatted_20_Text':'pre',
-#  'P-Table_20_Heading':'th',
-#  'P-Table_20_Contents':'td',
-#  'P-Text_20_body':'p'
+    'S-Emphasis':'em',
+    'S-Citation':'cite',
+    'S-Strong_20_Emphasis':'strong',
+    'S-Variable':'var',
+    'S-Definition':'dfn',
+    'S-Teletype':'tt',
+    'P-Heading_20_1':'h1',
+    'P-Heading_20_2':'h2',
+    'P-Heading_20_3':'h3',
+    'P-Heading_20_4':'h4',
+    'P-Heading_20_5':'h5',
+    'P-Heading_20_6':'h6',
+    # 'P-Caption':'caption',
+    'P-Addressee':'address',
+    # 'P-List_20_Heading':'dt',
+    # 'P-List_20_Contents':'dd',
+    'P-Preformatted_20_Text':'pre',
+    # 'P-Table_20_Heading':'th',
+    # 'P-Table_20_Contents':'td',
+    # 'P-Text_20_body':'p'
 }
 
 # -----------------------------------------------------------------------------
@@ -378,14 +377,13 @@ special_styles = {
 
 
 class ODF2XHTML(handler.ContentHandler):
-
-    """ The ODF2XHTML parses an ODF file and produces XHTML"""
+    ''' The ODF2XHTML parses an ODF file and produces XHTML'''
 
     def __init__(self, generate_css=True, embedable=False):
         # Tags
         self.generate_css = generate_css
         self.frame_stack = []
-        self.list_number_map = defaultdict(lambda : 1)
+        self.list_number_map = defaultdict(lambda: 1)
         self.list_id_map = {}
         self.list_class_stack = []
         self.elements = {
@@ -398,7 +396,7 @@ class ODF2XHTML(handler.ContentHandler):
         (DRAWNS, 'frame'): (self.s_draw_frame, self.e_draw_frame),
         (DRAWNS, 'image'): (self.s_draw_image, None),
         (DRAWNS, 'fill-image'): (self.s_draw_fill_image, None),
-        (DRAWNS, "layer-set"):(self.s_ignorexml, None),
+        (DRAWNS, 'layer-set'):(self.s_ignorexml, None),
         (DRAWNS, 'object'): (self.s_draw_object, None),
         (DRAWNS, 'object-ole'): (self.s_draw_object_ole, None),
         (DRAWNS, 'page'): (self.s_draw_page, self.e_draw_page),
@@ -407,47 +405,47 @@ class ODF2XHTML(handler.ContentHandler):
         (METANS, 'generator'):(self.s_processcont, self.e_dc_metatag),
         (METANS, 'initial-creator'): (self.s_processcont, self.e_dc_metatag),
         (METANS, 'keyword'): (self.s_processcont, self.e_dc_metatag),
-        (NUMBERNS, "boolean-style"):(self.s_ignorexml, None),
-        (NUMBERNS, "currency-style"):(self.s_ignorexml, None),
-        (NUMBERNS, "date-style"):(self.s_ignorexml, None),
-        (NUMBERNS, "number-style"):(self.s_ignorexml, None),
-        (NUMBERNS, "text-style"):(self.s_ignorexml, None),
-        (OFFICENS, "annotation"):(self.s_ignorexml, None),
-        (OFFICENS, "automatic-styles"):(self.s_office_automatic_styles, None),
-        (OFFICENS, "document"):(self.s_office_document_content, self.e_office_document_content),
-        (OFFICENS, "document-content"):(self.s_office_document_content, self.e_office_document_content),
-        (OFFICENS, "forms"):(self.s_ignorexml, None),
-        (OFFICENS, "master-styles"):(self.s_office_master_styles, None),
-        (OFFICENS, "meta"):(self.s_ignorecont, None),
-        (OFFICENS, "presentation"):(self.s_office_presentation, self.e_office_presentation),
-        (OFFICENS, "spreadsheet"):(self.s_office_spreadsheet, self.e_office_spreadsheet),
-        (OFFICENS, "styles"):(self.s_office_styles, None),
-        (OFFICENS, "text"):(self.s_office_text, self.e_office_text),
-        (OFFICENS, "scripts"):(self.s_ignorexml, None),
-        (OFFICENS, "settings"):(self.s_ignorexml, None),
-        (PRESENTATIONNS, "notes"):(self.s_ignorexml, None),
-#       (STYLENS, "default-page-layout"):(self.s_style_default_page_layout, self.e_style_page_layout),
-        (STYLENS, "default-page-layout"):(self.s_ignorexml, None),
-        (STYLENS, "default-style"):(self.s_style_default_style, self.e_style_default_style),
-        (STYLENS, "drawing-page-properties"):(self.s_style_handle_properties, None),
-        (STYLENS, "font-face"):(self.s_style_font_face, None),
-#       (STYLENS, "footer"):(self.s_style_footer, self.e_style_footer),
-#       (STYLENS, "footer-style"):(self.s_style_footer_style, None),
-        (STYLENS, "graphic-properties"):(self.s_style_handle_properties, None),
-        (STYLENS, "handout-master"):(self.s_ignorexml, None),
-#       (STYLENS, "header"):(self.s_style_header, self.e_style_header),
-#       (STYLENS, "header-footer-properties"):(self.s_style_handle_properties, None),
-#       (STYLENS, "header-style"):(self.s_style_header_style, None),
-        (STYLENS, "master-page"):(self.s_style_master_page, None),
-        (STYLENS, "page-layout-properties"):(self.s_style_handle_properties, None),
-        (STYLENS, "page-layout"):(self.s_style_page_layout, self.e_style_page_layout),
-#       (STYLENS, "page-layout"):(self.s_ignorexml, None),
-        (STYLENS, "paragraph-properties"):(self.s_style_handle_properties, None),
-        (STYLENS, "style"):(self.s_style_style, self.e_style_style),
-        (STYLENS, "table-cell-properties"):(self.s_style_handle_properties, None),
-        (STYLENS, "table-column-properties"):(self.s_style_handle_properties, None),
-        (STYLENS, "table-properties"):(self.s_style_handle_properties, None),
-        (STYLENS, "text-properties"):(self.s_style_handle_properties, None),
+        (NUMBERNS, 'boolean-style'):(self.s_ignorexml, None),
+        (NUMBERNS, 'currency-style'):(self.s_ignorexml, None),
+        (NUMBERNS, 'date-style'):(self.s_ignorexml, None),
+        (NUMBERNS, 'number-style'):(self.s_ignorexml, None),
+        (NUMBERNS, 'text-style'):(self.s_ignorexml, None),
+        (OFFICENS, 'annotation'):(self.s_ignorexml, None),
+        (OFFICENS, 'automatic-styles'):(self.s_office_automatic_styles, None),
+        (OFFICENS, 'document'):(self.s_office_document_content, self.e_office_document_content),
+        (OFFICENS, 'document-content'):(self.s_office_document_content, self.e_office_document_content),
+        (OFFICENS, 'forms'):(self.s_ignorexml, None),
+        (OFFICENS, 'master-styles'):(self.s_office_master_styles, None),
+        (OFFICENS, 'meta'):(self.s_ignorecont, None),
+        (OFFICENS, 'presentation'):(self.s_office_presentation, self.e_office_presentation),
+        (OFFICENS, 'spreadsheet'):(self.s_office_spreadsheet, self.e_office_spreadsheet),
+        (OFFICENS, 'styles'):(self.s_office_styles, None),
+        (OFFICENS, 'text'):(self.s_office_text, self.e_office_text),
+        (OFFICENS, 'scripts'):(self.s_ignorexml, None),
+        (OFFICENS, 'settings'):(self.s_ignorexml, None),
+        (PRESENTATIONNS, 'notes'):(self.s_ignorexml, None),
+        # (STYLENS, "default-page-layout"):(self.s_style_default_page_layout, self.e_style_page_layout),
+        (STYLENS, 'default-page-layout'):(self.s_ignorexml, None),
+        (STYLENS, 'default-style'):(self.s_style_default_style, self.e_style_default_style),
+        (STYLENS, 'drawing-page-properties'):(self.s_style_handle_properties, None),
+        (STYLENS, 'font-face'):(self.s_style_font_face, None),
+        # (STYLENS, "footer"):(self.s_style_footer, self.e_style_footer),
+        # (STYLENS, "footer-style"):(self.s_style_footer_style, None),
+        (STYLENS, 'graphic-properties'):(self.s_style_handle_properties, None),
+        (STYLENS, 'handout-master'):(self.s_ignorexml, None),
+        # (STYLENS, "header"):(self.s_style_header, self.e_style_header),
+        # (STYLENS, "header-footer-properties"):(self.s_style_handle_properties, None),
+        # (STYLENS, "header-style"):(self.s_style_header_style, None),
+        (STYLENS, 'master-page'):(self.s_style_master_page, None),
+        (STYLENS, 'page-layout-properties'):(self.s_style_handle_properties, None),
+        (STYLENS, 'page-layout'):(self.s_style_page_layout, self.e_style_page_layout),
+        # (STYLENS, "page-layout"):(self.s_ignorexml, None),
+        (STYLENS, 'paragraph-properties'):(self.s_style_handle_properties, None),
+        (STYLENS, 'style'):(self.s_style_style, self.e_style_style),
+        (STYLENS, 'table-cell-properties'):(self.s_style_handle_properties, None),
+        (STYLENS, 'table-column-properties'):(self.s_style_handle_properties, None),
+        (STYLENS, 'table-properties'):(self.s_style_handle_properties, None),
+        (STYLENS, 'text-properties'):(self.s_style_handle_properties, None),
         (SVGNS, 'desc'): (self.s_ignorexml, None),
         (TABLENS, 'covered-table-cell'): (self.s_ignorexml, None),
         (TABLENS, 'table-cell'): (self.s_table_table_cell, self.e_table_table_cell),
@@ -455,9 +453,9 @@ class ODF2XHTML(handler.ContentHandler):
         (TABLENS, 'table-row'): (self.s_table_table_row, self.e_table_table_row),
         (TABLENS, 'table'): (self.s_table_table, self.e_table_table),
         (TEXTNS, 'a'): (self.s_text_a, self.e_text_a),
-        (TEXTNS, "alphabetical-index-source"):(self.s_text_x_source, self.e_text_x_source),
-        (TEXTNS, "bibliography-configuration"):(self.s_ignorexml, None),
-        (TEXTNS, "bibliography-source"):(self.s_text_x_source, self.e_text_x_source),
+        (TEXTNS, 'alphabetical-index-source'):(self.s_text_x_source, self.e_text_x_source),
+        (TEXTNS, 'bibliography-configuration'):(self.s_ignorexml, None),
+        (TEXTNS, 'bibliography-source'):(self.s_text_x_source, self.e_text_x_source),
         (TEXTNS, 'bookmark'): (self.s_text_bookmark, None),
         (TEXTNS, 'bookmark-start'): (self.s_text_bookmark, None),
         (TEXTNS, 'reference-mark-start'): (self.s_text_bookmark, None),  # Added by Kovid
@@ -465,52 +463,52 @@ class ODF2XHTML(handler.ContentHandler):
         (TEXTNS, 'reference-ref'): (self.s_text_bookmark_ref, self.e_text_a),  # Added by Kovid
         (TEXTNS, 'bookmark-ref-start'): (self.s_text_bookmark_ref, None),
         (TEXTNS, 'h'): (self.s_text_h, self.e_text_h),
-        (TEXTNS, "illustration-index-source"):(self.s_text_x_source, self.e_text_x_source),
+        (TEXTNS, 'illustration-index-source'):(self.s_text_x_source, self.e_text_x_source),
         (TEXTNS, 'line-break'):(self.s_text_line_break, None),
-        (TEXTNS, "linenumbering-configuration"):(self.s_ignorexml, None),
-        (TEXTNS, "list"):(self.s_text_list, self.e_text_list),
-        (TEXTNS, "list-item"):(self.s_text_list_item, self.e_text_list_item),
-        (TEXTNS, "list-level-style-bullet"):(self.s_text_list_level_style_bullet, self.e_text_list_level_style_bullet),
-        (TEXTNS, "list-level-style-number"):(self.s_text_list_level_style_number, self.e_text_list_level_style_number),
-        (TEXTNS, "list-style"):(None, None),
-        (TEXTNS, "note"):(self.s_text_note, None),
-        (TEXTNS, "note-body"):(self.s_text_note_body, self.e_text_note_body),
-        (TEXTNS, "note-citation"):(None, self.e_text_note_citation),
-        (TEXTNS, "notes-configuration"):(self.s_ignorexml, None),
-        (TEXTNS, "object-index-source"):(self.s_text_x_source, self.e_text_x_source),
+        (TEXTNS, 'linenumbering-configuration'):(self.s_ignorexml, None),
+        (TEXTNS, 'list'):(self.s_text_list, self.e_text_list),
+        (TEXTNS, 'list-item'):(self.s_text_list_item, self.e_text_list_item),
+        (TEXTNS, 'list-level-style-bullet'):(self.s_text_list_level_style_bullet, self.e_text_list_level_style_bullet),
+        (TEXTNS, 'list-level-style-number'):(self.s_text_list_level_style_number, self.e_text_list_level_style_number),
+        (TEXTNS, 'list-style'):(None, None),
+        (TEXTNS, 'note'):(self.s_text_note, None),
+        (TEXTNS, 'note-body'):(self.s_text_note_body, self.e_text_note_body),
+        (TEXTNS, 'note-citation'):(None, self.e_text_note_citation),
+        (TEXTNS, 'notes-configuration'):(self.s_ignorexml, None),
+        (TEXTNS, 'object-index-source'):(self.s_text_x_source, self.e_text_x_source),
         (TEXTNS, 'p'): (self.s_text_p, self.e_text_p),
         (TEXTNS, 's'): (self.s_text_s, None),
         (TEXTNS, 'span'): (self.s_text_span, self.e_text_span),
         (TEXTNS, 'tab'): (self.s_text_tab, None),
-        (TEXTNS, "table-index-source"):(self.s_text_x_source, self.e_text_x_source),
-        (TEXTNS, "table-of-content-source"):(self.s_text_x_source, self.e_text_x_source),
-        (TEXTNS, "user-index-source"):(self.s_text_x_source, self.e_text_x_source),
+        (TEXTNS, 'table-index-source'):(self.s_text_x_source, self.e_text_x_source),
+        (TEXTNS, 'table-of-content-source'):(self.s_text_x_source, self.e_text_x_source),
+        (TEXTNS, 'user-index-source'):(self.s_text_x_source, self.e_text_x_source),
         }
         if embedable:
             self.make_embedable()
         self._resetobject()
 
     def set_plain(self):
-        """ Tell the parser to not generate CSS """
+        ''' Tell the parser to not generate CSS '''
         self.generate_css = False
 
     def set_embedable(self):
-        """ Tells the converter to only output the parts inside the <body>"""
-        self.elements[(OFFICENS, "text")] = (None,None)
-        self.elements[(OFFICENS, "spreadsheet")] = (None,None)
-        self.elements[(OFFICENS, "presentation")] = (None,None)
-        self.elements[(OFFICENS, "document-content")] = (None,None)
+        ''' Tells the converter to only output the parts inside the <body>'''
+        self.elements[(OFFICENS, 'text')] = (None,None)
+        self.elements[(OFFICENS, 'spreadsheet')] = (None,None)
+        self.elements[(OFFICENS, 'presentation')] = (None,None)
+        self.elements[(OFFICENS, 'document-content')] = (None,None)
 
     def add_style_file(self, stylefilename, media=None):
-        """ Add a link to an external style file.
+        ''' Add a link to an external style file.
             Also turns of the embedding of styles in the HTML
-        """
+        '''
         self.use_internal_css = False
         self.stylefilename = stylefilename
         if media:
             self.metatags.append(f'<link rel="stylesheet" type="text/css" href="{stylefilename}" media="{media}"/>\n')
         else:
-            self.metatags.append('<link rel="stylesheet" type="text/css" href="%s"/>\n' % (stylefilename))
+            self.metatags.append(f'<link rel="stylesheet" type="text/css" href="{stylefilename}"/>\n')
 
     def _resetfootnotes(self):
         # Footnotes and endnotes
@@ -558,30 +556,30 @@ class ODF2XHTML(handler.ContentHandler):
             self.writeout(escape(d))
 
     def opentag(self, tag, attrs={}, block=False):
-        """ Create an open HTML tag """
+        ''' Create an open HTML tag '''
         self.htmlstack.append((tag,attrs,block))
         a = []
         for key,val in attrs.items():
             a.append(f'''{key}={quoteattr(val)}''')
         if len(a) == 0:
-            self.writeout("<%s>" % tag)
+            self.writeout(f'<{tag}>')
         else:
-            self.writeout("<{} {}>".format(tag, " ".join(a)))
+            self.writeout('<{} {}>'.format(tag, ' '.join(a)))
         if block:
-            self.writeout("\n")
+            self.writeout('\n')
 
     def closetag(self, tag, block=True):
-        """ Close an open HTML tag """
+        ''' Close an open HTML tag '''
         self.htmlstack.pop()
-        self.writeout("</%s>" % tag)
+        self.writeout(f'</{tag}>')
         if block:
-            self.writeout("\n")
+            self.writeout('\n')
 
     def emptytag(self, tag, attrs={}):
         a = []
         for key,val in attrs.items():
             a.append(f'''{key}={quoteattr(val)}''')
-        self.writeout("<{} {}/>\n".format(tag, " ".join(a)))
+        self.writeout('<{} {}/>\n'.format(tag, ' '.join(a)))
 
 # --------------------------------------------------
 # Interface to parser
@@ -597,7 +595,7 @@ class ODF2XHTML(handler.ContentHandler):
             if method:
                 self.handle_starttag(tag, method, attrs)
             else:
-                self.unknown_starttag(tag,attrs)
+                self.unknown_starttag(tag, attrs)
         self.tagstack.push(tag, attrs)
 
     def endElementNS(self, tag, qname):
@@ -612,7 +610,7 @@ class ODF2XHTML(handler.ContentHandler):
 
 # --------------------------------------------------
     def handle_starttag(self, tag, method, attrs):
-        method(tag,attrs)
+        method(tag, attrs)
 
     def handle_endtag(self, tag, attrs, method):
         method(tag, attrs)
@@ -624,30 +622,30 @@ class ODF2XHTML(handler.ContentHandler):
         pass
 
     def s_ignorexml(self, tag, attrs):
-        """ Ignore this xml element and all children of it
+        ''' Ignore this xml element and all children of it
             It will automatically stop ignoring
-        """
+        '''
         self.processelem = False
 
     def s_ignorecont(self, tag, attrs):
-        """ Stop processing the text nodes """
+        ''' Stop processing the text nodes '''
         self.processcont = False
 
     def s_processcont(self, tag, attrs):
-        """ Start processing the text nodes """
+        ''' Start processing the text nodes '''
         self.processcont = True
 
     def classname(self, attrs):
-        """ Generate a class name from a style name """
+        ''' Generate a class name from a style name '''
         c = attrs.get((TEXTNS,'style-name'),'')
-        c = c.replace(".","_")
+        c = c.replace('.','_')
         return c
 
     def get_anchor(self, name):
-        """ Create a unique anchor id for a href name """
+        ''' Create a unique anchor id for a href name '''
         if name not in self.anchors:
             # Changed by Kovid
-            self.anchors[name] = "anchor%d" % (len(self.anchors) + 1)
+            self.anchors[name] = 'anchor{}'.format(len(self.anchors) + 1)
         return self.anchors.get(name)
 
     def purgedata(self):
@@ -659,174 +657,174 @@ class ODF2XHTML(handler.ContentHandler):
 #
 # -----------------------------------------------------------------------------
     def e_dc_title(self, tag, attrs):
-        """ Get the title from the meta data and create a HTML <title>
-        """
+        ''' Get the title from the meta data and create a HTML <title>
+        '''
         self.title = ''.join(self.data)
-        # self.metatags.append('<title>%s</title>\n' % escape(self.title))
+        # self.metatags.append('<title>{}</title>\n'.format(escape(self.title)))
         self.data = []
 
     def e_dc_metatag(self, tag, attrs):
-        """ Any other meta data is added as a <meta> element
-        """
+        ''' Any other meta data is added as a <meta> element
+        '''
         self.metatags.append('<meta name="{}" content={}/>\n'.format(tag[1], quoteattr(''.join(self.data))))
         self.data = []
 
     def e_dc_contentlanguage(self, tag, attrs):
-        """ Set the content language. Identifies the targeted audience
-        """
+        ''' Set the content language. Identifies the targeted audience
+        '''
         self.language = ''.join(self.data)
-        self.metatags.append('<meta http-equiv="content-language" content="%s"/>\n' % escape(self.language))
+        self.metatags.append(f'<meta http-equiv="content-language" content="{escape(self.language)}"/>\n')
         self.data = []
 
     def e_dc_creator(self, tag, attrs):
-        """ Set the content creator. Identifies the targeted audience
-        """
+        ''' Set the content creator. Identifies the targeted audience
+        '''
         self.creator = ''.join(self.data)
-        self.metatags.append('<meta http-equiv="creator" content="%s"/>\n' % escape(self.creator))
+        self.metatags.append(f'<meta http-equiv="creator" content="{escape(self.creator)}"/>\n')
         self.data = []
 
     def s_custom_shape(self, tag, attrs):
-        """ A <draw:custom-shape> is made into a <div> in HTML which is then styled
-        """
+        ''' A <draw:custom-shape> is made into a <div> in HTML which is then styled
+        '''
         anchor_type = attrs.get((TEXTNS,'anchor-type'),'notfound')
         htmltag = 'div'
-        name = "G-" + attrs.get((DRAWNS,'style-name'), "")
+        name = 'G-' + attrs.get((DRAWNS,'style-name'), '')
         if name == 'G-':
-            name = "PR-" + attrs.get((PRESENTATIONNS,'style-name'), "")
-        name = name.replace(".","_")
-        if anchor_type == "paragraph":
+            name = 'PR-' + attrs.get((PRESENTATIONNS,'style-name'), '')
+        name = name.replace('.','_')
+        if anchor_type == 'paragraph':
             style = 'position:absolute;'
         elif anchor_type == 'char':
-            style = "position:absolute;"
+            style = 'position:absolute;'
         elif anchor_type == 'as-char':
             htmltag = 'div'
             style = ''
         else:
-            style = "position: absolute;"
-        if (SVGNS,"width") in attrs:
-            style = style + "width:" + attrs[(SVGNS,"width")] + ";"
-        if (SVGNS,"height") in attrs:
-            style = style + "height:" +  attrs[(SVGNS,"height")] + ";"
-        if (SVGNS,"x") in attrs:
-            style = style + "left:" +  attrs[(SVGNS,"x")] + ";"
-        if (SVGNS,"y") in attrs:
-            style = style + "top:" +  attrs[(SVGNS,"y")] + ";"
+            style = 'position: absolute;'
+        if (SVGNS,'width') in attrs:
+            style = style + 'width:' + attrs[(SVGNS,'width')] + ';'
+        if (SVGNS,'height') in attrs:
+            style = style + 'height:' + attrs[(SVGNS,'height')] + ';'
+        if (SVGNS,'x') in attrs:
+            style = style + 'left:' + attrs[(SVGNS,'x')] + ';'
+        if (SVGNS,'y') in attrs:
+            style = style + 'top:' + attrs[(SVGNS,'y')] + ';'
         if self.generate_css:
             self.opentag(htmltag, {'class': name, 'style': style})
         else:
             self.opentag(htmltag)
 
     def e_custom_shape(self, tag, attrs):
-        """ End the <draw:frame>
-        """
+        ''' End the <draw:frame>
+        '''
         self.closetag('div')
 
     def s_draw_frame(self, tag, attrs):
-        """ A <draw:frame> is made into a <div> in HTML which is then styled
-        """
+        ''' A <draw:frame> is made into a <div> in HTML which is then styled
+        '''
         self.frame_stack.append([])
         anchor_type = attrs.get((TEXTNS,'anchor-type'),'notfound')
         htmltag = 'div'
-        name = "G-" + attrs.get((DRAWNS,'style-name'), "")
+        name = 'G-' + attrs.get((DRAWNS,'style-name'), '')
         if name == 'G-':
-            name = "PR-" + attrs.get((PRESENTATIONNS,'style-name'), "")
-        name = name.replace(".","_")
-        if anchor_type == "paragraph":
+            name = 'PR-' + attrs.get((PRESENTATIONNS,'style-name'), '')
+        name = name.replace('.','_')
+        if anchor_type == 'paragraph':
             style = 'position:relative;'
         elif anchor_type == 'char':
-            style = "position:relative;"
+            style = 'position:relative;'
         elif anchor_type == 'as-char':
             htmltag = 'div'
             style = ''
         else:
-            style = "position:absolute;"
-        if (SVGNS,"width") in attrs:
-            style = style + "width:" + attrs[(SVGNS,"width")] + ";"
-        if (SVGNS,"height") in attrs:
-            style = style + "height:" +  attrs[(SVGNS,"height")] + ";"
-        if (SVGNS,"x") in attrs:
-            style = style + "left:" +  attrs[(SVGNS,"x")] + ";"
-        if (SVGNS,"y") in attrs:
-            style = style + "top:" +  attrs[(SVGNS,"y")] + ";"
+            style = 'position:absolute;'
+        if (SVGNS,'width') in attrs:
+            style = style + 'width:' + attrs[(SVGNS,'width')] + ';'
+        if (SVGNS,'height') in attrs:
+            style = style + 'height:' + attrs[(SVGNS,'height')] + ';'
+        if (SVGNS,'x') in attrs:
+            style = style + 'left:' + attrs[(SVGNS,'x')] + ';'
+        if (SVGNS,'y') in attrs:
+            style = style + 'top:' + attrs[(SVGNS,'y')] + ';'
         if self.generate_css:
             self.opentag(htmltag, {'class': name, 'style': style})
         else:
             self.opentag(htmltag)
 
     def e_draw_frame(self, tag, attrs):
-        """ End the <draw:frame>
-        """
+        ''' End the <draw:frame>
+        '''
         self.closetag('div')
         self.frame_stack.pop()
 
     def s_draw_fill_image(self, tag, attrs):
-        name = attrs.get((DRAWNS,'name'), "NoName")
-        imghref = attrs[(XLINKNS,"href")]
+        name = attrs.get((DRAWNS,'name'), 'NoName')
+        imghref = attrs[(XLINKNS,'href')]
         imghref = self.rewritelink(imghref)
         self.cs.fillimages[name] = imghref
 
     def rewritelink(self, imghref):
-        """ Intended to be overloaded if you don't store your pictures
+        ''' Intended to be overloaded if you don't store your pictures
             in a Pictures subfolder
-        """
+        '''
         return imghref
 
     def s_draw_image(self, tag, attrs):
-        """ A <draw:image> becomes an <img/> element
-        """
+        ''' A <draw:image> becomes an <img/> element
+        '''
         if self.frame_stack:
             if self.frame_stack[-1]:
                 return
             self.frame_stack[-1].append('img')
         parent = self.tagstack.stackparent()
         anchor_type = parent.get((TEXTNS,'anchor-type'))
-        imghref = attrs[(XLINKNS,"href")]
+        imghref = attrs[(XLINKNS,'href')]
         imghref = self.rewritelink(imghref)
-        htmlattrs = {'alt':"", 'src':imghref}
+        htmlattrs = {'alt':'', 'src':imghref}
         if self.generate_css:
-            if anchor_type != "char":
-                htmlattrs['style'] = "display: block;"
+            if anchor_type != 'char':
+                htmlattrs['style'] = 'display: block;'
         self.emptytag('img', htmlattrs)
 
     def s_draw_object(self, tag, attrs):
-        """ A <draw:object> is embedded object in the document (e.g. spreadsheet in presentation).
-        """
+        ''' A <draw:object> is embedded object in the document (e.g. spreadsheet in presentation).
+        '''
         return  # Added by Kovid
-        objhref = attrs[(XLINKNS,"href")]
+        objhref = attrs[(XLINKNS,'href')]
         # Remove leading "./": from "./Object 1" to "Object 1"
-#       objhref = objhref [2:]
+        # objhref = objhref [2:]
 
         # Not using os.path.join since it fails to find the file on Windows.
-#       objcontentpath = '/'.join([objhref, 'content.xml'])
+        # objcontentpath = '/'.join([objhref, 'content.xml'])
 
         for c in self.document.childnodes:
             if c.folder == objhref:
                 self._walknode(c.topnode)
 
     def s_draw_object_ole(self, tag, attrs):
-        """ A <draw:object-ole> is embedded OLE object in the document (e.g. MS Graph).
-        """
+        ''' A <draw:object-ole> is embedded OLE object in the document (e.g. MS Graph).
+        '''
         try:
-            class_id = attrs[(DRAWNS,"class-id")]
+            class_id = attrs[(DRAWNS,'class-id')]
         except KeyError:  # Added by Kovid to ignore <draw> without the right
             return       # attributes
-        if class_id and class_id.lower() == "00020803-0000-0000-c000-000000000046":  # Microsoft Graph 97 Chart
+        if class_id and class_id.lower() == '00020803-0000-0000-c000-000000000046':  # Microsoft Graph 97 Chart
             tagattrs = {'name':'object_ole_graph', 'class':'ole-graph'}
             self.opentag('a', tagattrs)
             self.closetag('a', tagattrs)
 
     def s_draw_page(self, tag, attrs):
-        """ A <draw:page> is a slide in a presentation. We use a <fieldset> element in HTML.
+        ''' A <draw:page> is a slide in a presentation. We use a <fieldset> element in HTML.
             Therefore if you convert a ODP file, you get a series of <fieldset>s.
             Override this for your own purpose.
-        """
-        name = attrs.get((DRAWNS,'name'), "NoName")
-        stylename = attrs.get((DRAWNS,'style-name'), "")
-        stylename = stylename.replace(".","_")
-        masterpage = attrs.get((DRAWNS,'master-page-name'),"")
-        masterpage = masterpage.replace(".","_")
+        '''
+        name = attrs.get((DRAWNS,'name'), 'NoName')
+        stylename = attrs.get((DRAWNS,'style-name'), '')
+        stylename = stylename.replace('.','_')
+        masterpage = attrs.get((DRAWNS,'master-page-name'),'')
+        masterpage = masterpage.replace('.','_')
         if self.generate_css:
-            self.opentag('fieldset', {'class':f"DP-{stylename} MP-{masterpage}"})
+            self.opentag('fieldset', {'class':f'DP-{stylename} MP-{masterpage}'})
         else:
             self.opentag('fieldset')
         self.opentag('legend')
@@ -838,20 +836,20 @@ class ODF2XHTML(handler.ContentHandler):
 
     def s_draw_textbox(self, tag, attrs):
         style = ''
-        if (FONS,"min-height") in attrs:
-            style = style + "min-height:" +  attrs[(FONS,"min-height")] + ";"
+        if (FONS,'min-height') in attrs:
+            style = style + 'min-height:' + attrs[(FONS,'min-height')] + ';'
         self.opentag('div')
-#       self.opentag('div', {'style': style})
+        # self.opentag('div', {'style': style})
 
     def e_draw_textbox(self, tag, attrs):
-        """ End the <draw:text-box>
-        """
+        ''' End the <draw:text-box>
+        '''
         self.closetag('div')
 
     def html_body(self, tag, attrs):
         self.writedata()
         if self.generate_css and self.use_internal_css:
-            self.opentag('style', {'type':"text/css"}, True)
+            self.opentag('style', {'type':'text/css'}, True)
             self.writeout('/*<![CDATA[*/\n')
             self.generate_stylesheet()
             self.writeout('/*]]>*/\n')
@@ -864,7 +862,7 @@ class ODF2XHTML(handler.ContentHandler):
     # Specifying an explicit bg color prevents ebook readers
     # from successfully inverting colors
     # Added styling for endnotes
-    default_styles = """
+    default_styles = '''
 img { width: 100%; height: 100%; }
 * { padding: 0; margin: 0; }
 body { margin: 0 1em; }
@@ -875,7 +873,7 @@ dl.notes dt { font-size: large }
 dl.notes dt a { text-decoration: none }
 dl.notes dd { page-break-after: always }
 dl.notes dd:last-of-type { page-break-after: avoid }
-"""
+'''
 
     def generate_stylesheet(self):
         for name in self.stylestack:
@@ -923,10 +921,10 @@ dl.notes dd:last-of-type { page-break-after: avoid }
                     yield k, v
 
         for css2, names in css_styles.items():
-            self.writeout("%s {\n" % ', '.join(names))
+            self.writeout('{} {{\n'.format(', '.join(names)))
             for style, val in filter_margins(css2):
-                self.writeout(f"\t{style}: {val};\n")
-            self.writeout("}\n")
+                self.writeout(f'\t{style}: {val};\n')
+            self.writeout('}\n')
 
     def generate_footnotes(self):
         if self.currentnote == 0:
@@ -937,16 +935,16 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         self.writeout(_('Notes'))
         self.closetag('h1')
         self.opentag('dl', {'class':'notes'})
-        for key in range(1,self.currentnote+1):
+        for key in range(1, self.currentnote+1):
             note = self.notedict[key]
-#       for key,note in self.notedict.items():
-            self.opentag('dt', {'id':"footnote-%d" % key})
-#           self.opentag('sup')
-#           self.writeout(escape(note['citation']))
-#           self.closetag('sup', False)
+        # for key,note in self.notedict.items():
+            self.opentag('dt', {'id':f'footnote-{key}'})
+            # self.opentag('sup')
+            # self.writeout(escape(note['citation']))
+            # self.closetag('sup', False)
             self.writeout('[')
-            self.opentag('a', {'href': "#citation-%d" % key})
-            self.writeout("←%d" % key)
+            self.opentag('a', {'href': f'#citation-{key}'})
+            self.writeout(f'←{key}')
             self.closetag('a')
             self.writeout(']\xa0')
             self.closetag('dt')
@@ -957,35 +955,35 @@ dl.notes dd:last-of-type { page-break-after: avoid }
 
     def s_office_automatic_styles(self, tag, attrs):
         if self.xmlfile == 'styles.xml':
-            self.autoprefix = "A"
+            self.autoprefix = 'A'
         else:
-            self.autoprefix = ""
+            self.autoprefix = ''
 
     def s_office_document_content(self, tag, attrs):
-        """ First tag in the content.xml file"""
+        ''' First tag in the content.xml file'''
         self.writeout('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" ')
         self.writeout('"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\n')
-        self.opentag('html', {'xmlns':"http://www.w3.org/1999/xhtml"}, True)
+        self.opentag('html', {'xmlns':'http://www.w3.org/1999/xhtml'}, True)
         self.opentag('head', block=True)
-        self.emptytag('meta', {'http-equiv':"Content-Type", 'content':"text/html;charset=UTF-8"})
+        self.emptytag('meta', {'http-equiv':'Content-Type', 'content':'text/html;charset=UTF-8'})
         for metaline in self.metatags:
             self.writeout(metaline)
-        self.writeout('<title>%s</title>\n' % escape(self.title))
+        self.writeout(f'<title>{escape(self.title)}</title>\n')
 
     def e_office_document_content(self, tag, attrs):
-        """ Last tag """
+        ''' Last tag '''
         self.closetag('html')
 
     def s_office_master_styles(self, tag, attrs):
-        """ """
+        ''' '''
 
     def s_office_presentation(self, tag, attrs):
-        """ For some odd reason, OpenOffice Impress doesn't define a default-style
+        ''' For some odd reason, OpenOffice Impress doesn't define a default-style
             for the 'paragraph'. We therefore force a standard when we see
             it is a presentation
-        """
-        self.styledict['p'] = {(FONS,'font-size'): "24pt"}
-        self.styledict['presentation'] = {(FONS,'font-size'): "24pt"}
+        '''
+        self.styledict['p'] = {(FONS,'font-size'): '24pt'}
+        self.styledict['presentation'] = {(FONS,'font-size'): '24pt'}
         self.html_body(tag, attrs)
 
     def e_office_presentation(self, tag, attrs):
@@ -1000,10 +998,10 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         self.closetag('body')
 
     def s_office_styles(self, tag, attrs):
-        self.autoprefix = ""
+        self.autoprefix = ''
 
     def s_office_text(self, tag, attrs):
-        """ OpenDocument text """
+        ''' OpenDocument text '''
         self.styledict['frame'] = {(STYLENS,'wrap'): 'parallel'}
         self.html_body(tag, attrs)
 
@@ -1012,9 +1010,9 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         self.closetag('body')
 
     def s_style_handle_properties(self, tag, attrs):
-        """ Copy all attributes to a struct.
+        ''' Copy all attributes to a struct.
             We will later convert them to CSS2
-        """
+        '''
         if self.currentstyle is None:  # Added by Kovid
             return
 
@@ -1027,31 +1025,31 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         'table-row':'tr','graphic':'graphic'}
 
     def s_style_default_style(self, tag, attrs):
-        """ A default style is like a style on an HTML tag
-        """
+        ''' A default style is like a style on an HTML tag
+        '''
         family = attrs[(STYLENS,'family')]
         htmlfamily = self.familymap.get(family,'unknown')
         self.currentstyle = htmlfamily
-#       self.stylestack.append(self.currentstyle)
+        # self.stylestack.append(self.currentstyle)
         self.styledict[self.currentstyle] = {}
 
     def e_style_default_style(self, tag, attrs):
         self.currentstyle = None
 
     def s_style_font_face(self, tag, attrs):
-        """ It is possible that the HTML browser doesn't know how to
+        ''' It is possible that the HTML browser doesn't know how to
             show a particular font. Luckily ODF provides generic fallbacks
             Unfortunately they are not the same as CSS2.
             CSS2: serif, sans-serif, cursive, fantasy, monospace
             ODF: roman, swiss, modern, decorative, script, system
-        """
-        name = attrs[(STYLENS,"name")]
-        family = attrs[(SVGNS,"font-family")]
-        generic = attrs.get((STYLENS,'font-family-generic'),"")
+        '''
+        name = attrs[(STYLENS,'name')]
+        family = attrs[(SVGNS,'font-family')]
+        generic = attrs.get((STYLENS,'font-family-generic'),'')
         self.cs.save_font(name, family, generic)
 
     def s_style_footer(self, tag, attrs):
-        self.opentag('div', {'id':"footer"})
+        self.opentag('div', {'id':'footer'})
         self.purgedata()
 
     def e_style_footer(self, tag, attrs):
@@ -1060,12 +1058,12 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         self.purgedata()
 
     def s_style_footer_style(self, tag, attrs):
-        self.currentstyle = "@print #footer"
+        self.currentstyle = '@print #footer'
         self.stylestack.append(self.currentstyle)
         self.styledict[self.currentstyle] = {}
 
     def s_style_header(self, tag, attrs):
-        self.opentag('div', {'id':"header"})
+        self.opentag('div', {'id':'header'})
         self.purgedata()
 
     def e_style_header(self, tag, attrs):
@@ -1074,46 +1072,46 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         self.purgedata()
 
     def s_style_header_style(self, tag, attrs):
-        self.currentstyle = "@print #header"
+        self.currentstyle = '@print #header'
         self.stylestack.append(self.currentstyle)
         self.styledict[self.currentstyle] = {}
 
     def s_style_default_page_layout(self, tag, attrs):
-        """ Collect the formatting for the default page layout style.
-        """
-        self.currentstyle = "@page"
+        ''' Collect the formatting for the default page layout style.
+        '''
+        self.currentstyle = '@page'
         self.stylestack.append(self.currentstyle)
         self.styledict[self.currentstyle] = {}
 
     def s_style_page_layout(self, tag, attrs):
-        """ Collect the formatting for the page layout style.
+        ''' Collect the formatting for the page layout style.
             This won't work in CSS 2.1, as page identifiers are not allowed.
             It is legal in CSS3, but the rest of the application doesn't specify when to use what page layout
-        """
+        '''
         name = attrs[(STYLENS,'name')]
-        name = name.replace(".","_")
-        self.currentstyle = ".PL-" + name
+        name = name.replace('.','_')
+        self.currentstyle = '.PL-' + name
         self.stylestack.append(self.currentstyle)
         self.styledict[self.currentstyle] = {}
 
     def e_style_page_layout(self, tag, attrs):
-        """ End this style
-        """
+        ''' End this style
+        '''
         self.currentstyle = None
 
     def s_style_master_page(self, tag, attrs):
-        """ Collect the formatting for the page layout style.
-        """
+        ''' Collect the formatting for the page layout style.
+        '''
         name = attrs[(STYLENS,'name')]
-        name = name.replace(".","_")
+        name = name.replace('.','_')
 
-        self.currentstyle = ".MP-" + name
+        self.currentstyle = '.MP-' + name
         self.stylestack.append(self.currentstyle)
         self.styledict[self.currentstyle] = {('','position'):'relative'}
         # Then load the pagelayout style if we find it
         pagelayout = attrs.get((STYLENS,'page-layout-name'), None)
         if pagelayout:
-            pagelayout = ".PL-" + pagelayout
+            pagelayout = '.PL-' + pagelayout
             if pagelayout in self.styledict:
                 styles = self.styledict[pagelayout]
                 for style, val in styles.items():
@@ -1125,24 +1123,24 @@ dl.notes dd:last-of-type { page-break-after: avoid }
     # Short prefixes for class selectors
     _familyshort = {'drawing-page':'DP', 'paragraph':'P', 'presentation':'PR',
         'text':'S', 'section':'D',
-         'table':'T', 'table-cell':'TD', 'table-column':'TC',
-         'table-row':'TR', 'graphic':'G'}
+        'table':'T', 'table-cell':'TD', 'table-column':'TC',
+        'table-row':'TR', 'graphic':'G'}
 
     def s_style_style(self, tag, attrs):
-        """ Collect the formatting for the style.
+        ''' Collect the formatting for the style.
             Styles have scope. The same name can be used for both paragraph and
             character styles Since CSS has no scope we use a prefix. (Not elegant)
             In ODF a style can have a parent, these parents can be chained.
             We may not have encountered the parent yet, but if we have, we resolve it.
-        """
+        '''
         name = attrs[(STYLENS,'name')]
-        name = name.replace(".","_")
+        name = name.replace('.','_')
         family = attrs[(STYLENS,'family')]
         htmlfamily = self.familymap.get(family,'unknown')
         sfamily = self._familyshort.get(family,'X')
-        name = f"{self.autoprefix}{sfamily}-{name}"
+        name = f'{self.autoprefix}{sfamily}-{name}'
         parent = attrs.get((STYLENS,'parent-style-name'))
-        self.currentstyle = special_styles.get(name,"."+name)
+        self.currentstyle = special_styles.get(name,'.'+name)
         self.stylestack.append(self.currentstyle)
         if self.currentstyle not in self.styledict:
             self.styledict[self.currentstyle] = {}
@@ -1151,9 +1149,9 @@ dl.notes dd:last-of-type { page-break-after: avoid }
 
         # Then load the parent style if we find it
         if parent:
-            parent = parent.replace(".", "_")
-            parent = f"{sfamily}-{parent}"
-            parent = special_styles.get(parent, "."+parent)
+            parent = parent.replace('.', '_')
+            parent = f'{sfamily}-{parent}'
+            parent = special_styles.get(parent, '.'+parent)
             if parent in self.styledict:
                 styles = self.styledict[parent]
                 for style, val in styles.items():
@@ -1162,30 +1160,30 @@ dl.notes dd:last-of-type { page-break-after: avoid }
                 self.styledict[self.currentstyle]['__parent-style-name'] = parent
 
     def e_style_style(self, tag, attrs):
-        """ End this style
-        """
+        ''' End this style
+        '''
         self.currentstyle = None
 
     def s_table_table(self, tag, attrs):
-        """ Start a table
-        """
+        ''' Start a table
+        '''
         c = attrs.get((TABLENS,'style-name'), None)
         if c and self.generate_css:
-            c = c.replace(".","_")
-            self.opentag('table',{'class': "T-%s" % c})
+            c = c.replace('.','_')
+            self.opentag('table',{'class': f'T-{c}'})
         else:
             self.opentag('table')
         self.purgedata()
 
     def e_table_table(self, tag, attrs):
-        """ End a table
-        """
+        ''' End a table
+        '''
         self.writedata()
         self.closetag('table')
         self.purgedata()
 
     def s_table_table_cell(self, tag, attrs):
-        """ Start a table cell """
+        ''' Start a table cell '''
         # FIXME: number-columns-repeated § 8.1.3
         # repeated = int(attrs.get( (TABLENS,'number-columns-repeated'), 1))
         htmlattrs = {}
@@ -1198,60 +1196,60 @@ dl.notes dd:last-of-type { page-break-after: avoid }
 
         c = attrs.get((TABLENS,'style-name'))
         if c:
-            htmlattrs['class'] = 'TD-%s' % c.replace(".","_")
+            htmlattrs['class'] = 'TD-{}'.format(c.replace('.','_'))
         self.opentag('td', htmlattrs)
         self.purgedata()
 
     def e_table_table_cell(self, tag, attrs):
-        """ End a table cell """
+        ''' End a table cell '''
         self.writedata()
         self.closetag('td')
         self.purgedata()
 
     def s_table_table_column(self, tag, attrs):
-        """ Start a table column """
+        ''' Start a table column '''
         c = attrs.get((TABLENS,'style-name'), None)
         repeated = int(attrs.get((TABLENS,'number-columns-repeated'), 1))
         htmlattrs = {}
         if c:
-            htmlattrs['class'] = "TC-%s" % c.replace(".","_")
+            htmlattrs['class'] = 'TC-{}'.format(c.replace('.','_'))
         for x in range(repeated):
             self.emptytag('col', htmlattrs)
         self.purgedata()
 
     def s_table_table_row(self, tag, attrs):
-        """ Start a table row """
+        ''' Start a table row '''
         # FIXME: table:number-rows-repeated
         c = attrs.get((TABLENS,'style-name'), None)
         htmlattrs = {}
         if c:
-            htmlattrs['class'] = "TR-%s" % c.replace(".","_")
+            htmlattrs['class'] = 'TR-{}'.format(c.replace('.','_'))
         self.opentag('tr', htmlattrs)
         self.purgedata()
 
     def e_table_table_row(self, tag, attrs):
-        """ End a table row """
+        ''' End a table row '''
         self.writedata()
         self.closetag('tr')
         self.purgedata()
 
     def s_text_a(self, tag, attrs):
-        """ Anchors start """
+        ''' Anchors start '''
         self.writedata()
-        href = attrs[(XLINKNS,"href")].split("|")[0]
-        if href[:1] == "#":  # Changed by Kovid
-            href = "#" + self.get_anchor(href[1:])
+        href = attrs[(XLINKNS,'href')].split('|')[0]
+        if href[:1] == '#':  # Changed by Kovid
+            href = '#' + self.get_anchor(href[1:])
         self.opentag('a', {'href':href})
         self.purgedata()
 
     def e_text_a(self, tag, attrs):
-        """ End an anchor or bookmark reference """
+        ''' End an anchor or bookmark reference '''
         self.writedata()
         self.closetag('a', False)
         self.purgedata()
 
     def s_text_bookmark(self, tag, attrs):
-        """ Bookmark definition """
+        ''' Bookmark definition '''
         name = attrs[(TEXTNS,'name')]
         html_id = self.get_anchor(name)
         self.writedata()
@@ -1260,15 +1258,15 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         self.purgedata()
 
     def s_text_bookmark_ref(self, tag, attrs):
-        """ Bookmark reference """
+        ''' Bookmark reference '''
         name = attrs[(TEXTNS,'ref-name')]
-        html_id = "#" + self.get_anchor(name)
+        html_id = '#' + self.get_anchor(name)
         self.writedata()
         self.opentag('a', {'href':html_id})
         self.purgedata()
 
     def s_text_h(self, tag, attrs):
-        """ Headings start """
+        ''' Headings start '''
         level = int(attrs[(TEXTNS,'outline-level')])
         if level > 6:
             level = 6  # Heading levels go only to 6 in XHTML
@@ -1276,20 +1274,20 @@ dl.notes dd:last-of-type { page-break-after: avoid }
             level = 1
         self.headinglevels[level] = self.headinglevels[level] + 1
         name = self.classname(attrs)
-        for x in range(level + 1,10):
+        for x in range(level + 1, 10):
             self.headinglevels[x] = 0
-        special = special_styles.get("P-"+name)
+        special = special_styles.get('P-'+name)
         if special or not self.generate_css:
-            self.opentag('h%s' % level)
+            self.opentag(f'h{level}')
         else:
-            self.opentag('h%s' % level, {'class':"P-%s" % name})
+            self.opentag(f'h{level}', {'class':f'P-{name}'})
         self.purgedata()
 
     def e_text_h(self, tag, attrs):
-        """ Headings end
+        ''' Headings end
             Side-effect: If there is no title in the metadata, then it is taken
             from the first heading of any level.
-        """
+        '''
         self.writedata()
         level = int(attrs[(TEXTNS,'outline-level')])
         if level > 6:
@@ -1297,45 +1295,45 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         if level < 1:
             level = 1
         lev = self.headinglevels[1:level+1]
-        outline = '.'.join(map(str,lev))
+        outline = '.'.join(map(str, lev))
         heading = ''.join(self.data)
         if self.title == '':
             self.title = heading
         # Changed by Kovid
         tail = ''.join(self.data)
-        anchor = self.get_anchor(f"{outline}.{tail}")
+        anchor = self.get_anchor(f'{outline}.{tail}')
         anchor2 = self.get_anchor(tail)  # Added by kovid to fix #7506
         self.opentag('a', {'id': anchor})
         self.closetag('a', False)
         self.opentag('a', {'id': anchor2})
         self.closetag('a', False)
-        self.closetag('h%s' % level)
+        self.closetag(f'h{level}')
         self.purgedata()
 
     def s_text_line_break(self, tag, attrs):
-        """ Force a line break (<br/>) """
+        ''' Force a line break (<br/>) '''
         self.writedata()
         self.emptytag('br')
         self.purgedata()
 
     def s_text_list(self, tag, attrs):
-        """ Start a list (<ul> or <ol>)
+        ''' Start a list (<ul> or <ol>)
             To know which level we're at, we have to count the number
             of <text:list> elements on the tagstack.
-        """
+        '''
         name = attrs.get((TEXTNS,'style-name'))
         continue_numbering = attrs.get((TEXTNS, 'continue-numbering')) == 'true'
         continue_list = attrs.get((TEXTNS, 'continue-list'))
         list_id = attrs.get(('http://www.w3.org/XML/1998/namespace', 'id'))
         level = self.tagstack.count_tags(tag) + 1
         if name:
-            name = name.replace(".","_")
+            name = name.replace('.','_')
         else:
             # FIXME: If a list is contained in a table cell or text box,
             # the list level must return to 1, even though the table or
             # textbox itself may be nested within another list.
             name = self.tagstack.rfindattr((TEXTNS,'style-name'))
-        list_class = "%s_%d" % (name, level)
+        list_class = f'{name}_{level}'
         tag_name = self.listtypes.get(list_class,'ul')
         number_class = tag_name + list_class
         if list_id:
@@ -1355,29 +1353,29 @@ dl.notes dd:last-of-type { page-break-after: avoid }
             attrs = {'start': unicode_type(self.list_number_map[number_class])}
         if self.generate_css:
             attrs['class'] = list_class
-        self.opentag('%s' % tag_name, attrs)
+        self.opentag(str(tag_name), attrs)
         self.purgedata()
 
     def e_text_list(self, tag, attrs):
-        """ End a list """
+        ''' End a list '''
         self.writedata()
         if self.list_class_stack:
             self.list_class_stack.pop()
         name = attrs.get((TEXTNS,'style-name'))
         level = self.tagstack.count_tags(tag) + 1
         if name:
-            name = name.replace(".","_")
+            name = name.replace('.','_')
         else:
             # FIXME: If a list is contained in a table cell or text box,
             # the list level must return to 1, even though the table or
             # textbox itself may be nested within another list.
             name = self.tagstack.rfindattr((TEXTNS,'style-name'))
-        list_class = "%s_%d" % (name, level)
+        list_class = f'{name}_{level}'
         self.closetag(self.listtypes.get(list_class,'ul'))
         self.purgedata()
 
     def s_text_list_item(self, tag, attrs):
-        """ Start list item """
+        ''' Start list item '''
         number_class = self.list_class_stack[-1] if self.list_class_stack else None
         if number_class:
             self.list_number_map[number_class] += 1
@@ -1385,27 +1383,27 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         self.purgedata()
 
     def e_text_list_item(self, tag, attrs):
-        """ End list item """
+        ''' End list item '''
         self.writedata()
         self.closetag('li')
         self.purgedata()
 
     def s_text_list_level_style_bullet(self, tag, attrs):
-        """ CSS doesn't have the ability to set the glyph
+        ''' CSS doesn't have the ability to set the glyph
             to a particular character, so we just go through
             the available glyphs
-        """
+        '''
         name = self.tagstack.rfindattr((STYLENS,'name'))
         level = attrs[(TEXTNS,'level')]
         self.prevstyle = self.currentstyle
-        list_class = f"{name}_{level}"
+        list_class = f'{name}_{level}'
         self.listtypes[list_class] = 'ul'
-        self.currentstyle = ".{}_{}".format(name.replace(".","_"), level)
+        self.currentstyle = '.{}_{}'.format(name.replace('.','_'), level)
         self.stylestack.append(self.currentstyle)
         self.styledict[self.currentstyle] = {}
 
         level = int(level)
-        listtype = ("square", "disc", "circle")[level % 3]
+        listtype = ('square', 'disc', 'circle')[level % 3]
         self.styledict[self.currentstyle][('','list-style-type')] = listtype
 
     def e_text_list_level_style_bullet(self, tag, attrs):
@@ -1415,28 +1413,28 @@ dl.notes dd:last-of-type { page-break-after: avoid }
     def s_text_list_level_style_number(self, tag, attrs):
         name = self.tagstack.stackparent()[(STYLENS,'name')]
         level = attrs[(TEXTNS,'level')]
-        num_format = attrs.get((STYLENS,'num-format'),"1")
+        num_format = attrs.get((STYLENS,'num-format'),'1')
         start_value = attrs.get((TEXTNS, 'start-value'), '1')
-        list_class = f"{name}_{level}"
+        list_class = f'{name}_{level}'
         self.prevstyle = self.currentstyle
-        self.currentstyle = ".{}_{}".format(name.replace(".","_"), level)
+        self.currentstyle = '.{}_{}'.format(name.replace('.','_'), level)
         if start_value != '1':
             self.list_starts[self.currentstyle] = start_value
         self.listtypes[list_class] = 'ol'
         self.stylestack.append(self.currentstyle)
         self.styledict[self.currentstyle] = {}
-        if num_format == "1":
-            listtype = "decimal"
-        elif num_format == "I":
-            listtype = "upper-roman"
-        elif num_format == "i":
-            listtype = "lower-roman"
-        elif num_format == "A":
-            listtype = "upper-alpha"
-        elif num_format == "a":
-            listtype = "lower-alpha"
+        if num_format == '1':
+            listtype = 'decimal'
+        elif num_format == 'I':
+            listtype = 'upper-roman'
+        elif num_format == 'i':
+            listtype = 'lower-roman'
+        elif num_format == 'A':
+            listtype = 'upper-alpha'
+        elif num_format == 'a':
+            listtype = 'lower-alpha'
         else:
-            listtype = "decimal"
+            listtype = 'decimal'
         self.styledict[self.currentstyle][('','list-style-type')] = listtype
 
     def e_text_list_level_style_number(self, tag, attrs):
@@ -1453,7 +1451,7 @@ dl.notes dd:last-of-type { page-break-after: avoid }
     def e_text_note(self, tag, attrs):
         pass
 
-    def collectnote(self,s):
+    def collectnote(self, s):
         if s != '':
             self.notebody.append(s)
 
@@ -1473,11 +1471,11 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         self.notedict[self.currentnote]['citation'] = mark
         self.opentag('sup')
         self.opentag('a', {
-            'href': "#footnote-%s" % self.currentnote,
+            'href': f'#footnote-{self.currentnote}',
             'class': 'citation',
-            'id':'citation-%s' % self.currentnote
+            'id':f'citation-{self.currentnote}',
         })
-#        self.writeout( escape(mark) )
+        # self.writeout( escape(mark) )
         # Since HTML only knows about endnotes, there is too much risk that the
         # marker is reused in the source. Therefore we force numeric markers
         self.writeout(str(self.currentnote))
@@ -1485,29 +1483,29 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         self.closetag('sup')
 
     def s_text_p(self, tag, attrs):
-        """ Paragraph
-        """
+        ''' Paragraph
+        '''
         htmlattrs = {}
-        specialtag = "p"
+        specialtag = 'p'
         c = attrs.get((TEXTNS,'style-name'), None)
         if c:
-            c = c.replace(".","_")
-            specialtag = special_styles.get("P-"+c)
+            c = c.replace('.','_')
+            specialtag = special_styles.get('P-'+c)
             if specialtag is None:
                 specialtag = 'p'
                 if self.generate_css:
-                    htmlattrs['class'] = "P-%s" % c
+                    htmlattrs['class'] = f'P-{c}'
         self.opentag(specialtag, htmlattrs)
         self.purgedata()
 
     def e_text_p(self, tag, attrs):
-        """ End Paragraph
-        """
-        specialtag = "p"
+        ''' End Paragraph
+        '''
+        specialtag = 'p'
         c = attrs.get((TEXTNS,'style-name'), None)
         if c:
-            c = c.replace(".","_")
-            specialtag = special_styles.get("P-"+c)
+            c = c.replace('.','_')
+            specialtag = special_styles.get('P-'+c)
             if specialtag is None:
                 specialtag = 'p'
         self.writedata()
@@ -1522,9 +1520,9 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         # element instead of being part of the text flow.
         # We don't use an entity for the nbsp as the contents of self.data will
         # be escaped on writeout.
-        """ Generate a number of spaces. We use the non breaking space for
+        ''' Generate a number of spaces. We use the non breaking space for
         the text:s ODF element.
-        """
+        '''
         try:
             c = int(attrs.get((TEXTNS, 'c'), 1))
         except:
@@ -1533,9 +1531,9 @@ dl.notes dd:last-of-type { page-break-after: avoid }
             self.data.append('\u00a0'*c)
 
     def s_text_span(self, tag, attrs):
-        """ The <text:span> element matches the <span> element in HTML. It is
+        ''' The <text:span> element matches the <span> element in HTML. It is
             typically used to properties of the text.
-        """
+        '''
         self.writedata()
         c = attrs.get((TEXTNS,'style-name'), None)
         htmlattrs = {}
@@ -1543,26 +1541,26 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         # Apparently LibreOffice does this.
         special = 'span'
         if c:
-            c = c.replace(".","_")
-            special = special_styles.get("S-"+c)
+            c = c.replace('.','_')
+            special = special_styles.get('S-'+c)
             if special is None:
                 special = 'span'
                 if self.generate_css:
-                    htmlattrs['class'] = "S-%s" % c
+                    htmlattrs['class'] = f'S-{c}'
 
         self.opentag(special, htmlattrs)
         self.purgedata()
 
     def e_text_span(self, tag, attrs):
-        """ End the <text:span> """
+        ''' End the <text:span> '''
         self.writedata()
         c = attrs.get((TEXTNS,'style-name'), None)
         # Changed by Kovid to handle inline special styles defined on <text:span> tags.
         # Apparently LibreOffice does this.
         special = 'span'
         if c:
-            c = c.replace(".","_")
-            special = special_styles.get("S-"+c)
+            c = c.replace('.','_')
+            special = special_styles.get('S-'+c)
             if special is None:
                 special = 'span'
 
@@ -1570,22 +1568,22 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         self.purgedata()
 
     def s_text_tab(self, tag, attrs):
-        """ Move to the next tabstop. We ignore this in HTML
-        """
+        ''' Move to the next tabstop. We ignore this in HTML
+        '''
         self.writedata()
         self.writeout(' ')
         self.purgedata()
 
     def s_text_x_source(self, tag, attrs):
-        """ Various indexes and tables of contents. We ignore those.
-        """
+        ''' Various indexes and tables of contents. We ignore those.
+        '''
         self.writedata()
         self.purgedata()
         self.s_ignorexml(tag, attrs)
 
     def e_text_x_source(self, tag, attrs):
-        """ Various indexes and tables of contents. We ignore those.
-        """
+        ''' Various indexes and tables of contents. We ignore those.
+        '''
         self.writedata()
         self.purgedata()
 
@@ -1596,9 +1594,9 @@ dl.notes dd:last-of-type { page-break-after: avoid }
     # -----------------------------------------------------------------------------
 
     def load(self, odffile):
-        """ Loads a document into the parser and parses it.
+        ''' Loads a document into the parser and parses it.
             The argument can either be a filename or a document in memory.
-        """
+        '''
         self.lines = []
         self._wfunc = self._wlines
         if isinstance(odffile, (bytes, str)) or hasattr(odffile, 'read'):  # Added by Kovid
@@ -1617,18 +1615,18 @@ dl.notes dd:last-of-type { page-break-after: avoid }
             self.characters(str(node))
 
     def odf2xhtml(self, odffile):
-        """ Load a file and return the XHTML
-        """
+        ''' Load a file and return the XHTML
+        '''
         self.load(odffile)
         return self.xhtml()
 
-    def _wlines(self,s):
+    def _wlines(self, s):
         if s:
             self.lines.append(s)
 
     def xhtml(self):
-        """ Returns the xhtml
-        """
+        ''' Returns the xhtml
+        '''
         return ''.join(self.lines)
 
     def _writecss(self, s):
@@ -1639,7 +1637,7 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         pass
 
     def css(self):
-        """ Returns the CSS content """
+        ''' Returns the CSS content '''
         self._csslines = []
         self._wfunc = self._writecss
         self.generate_stylesheet()
@@ -1649,24 +1647,23 @@ dl.notes dd:last-of-type { page-break-after: avoid }
         return res
 
     def save(self, outputfile, addsuffix=False):
-        """ Save the HTML under the filename.
+        ''' Save the HTML under the filename.
             If the filename is '-' then save to stdout
             We have the last style filename in self.stylefilename
-        """
+        '''
         if outputfile == '-':
             import sys  # Added by Kovid
             outputfp = sys.stdout
         else:
             if addsuffix:
-                outputfile = outputfile + ".html"
-            outputfp = open(outputfile, "wb")
+                outputfile = outputfile + '.html'
+            outputfp = open(outputfile, 'wb')
         outputfp.write(self.xhtml().encode('us-ascii','xmlcharrefreplace'))
         outputfp.close()
 
 
 class ODF2XHTMLembedded(ODF2XHTML):
-
-    """ The ODF2XHTML parses an ODF file and produces XHTML"""
+    ''' The ODF2XHTML parses an ODF file and produces XHTML'''
 
     def __init__(self, lines, generate_css=True, embedable=False):
         self._resetobject()
@@ -1675,61 +1672,61 @@ class ODF2XHTMLembedded(ODF2XHTML):
         # Tags
         self.generate_css = generate_css
         self.elements = {
-#        (DCNS, 'title'): (self.s_processcont, self.e_dc_title),
-#        (DCNS, 'language'): (self.s_processcont, self.e_dc_contentlanguage),
-#        (DCNS, 'creator'): (self.s_processcont, self.e_dc_metatag),
-#        (DCNS, 'description'): (self.s_processcont, self.e_dc_metatag),
-#        (DCNS, 'date'): (self.s_processcont, self.e_dc_metatag),
+        # (DCNS, 'title'): (self.s_processcont, self.e_dc_title),
+        # (DCNS, 'language'): (self.s_processcont, self.e_dc_contentlanguage),
+        # (DCNS, 'creator'): (self.s_processcont, self.e_dc_metatag),
+        # (DCNS, 'description'): (self.s_processcont, self.e_dc_metatag),
+        # (DCNS, 'date'): (self.s_processcont, self.e_dc_metatag),
         (DRAWNS, 'frame'): (self.s_draw_frame, self.e_draw_frame),
         (DRAWNS, 'image'): (self.s_draw_image, None),
         (DRAWNS, 'fill-image'): (self.s_draw_fill_image, None),
-        (DRAWNS, "layer-set"):(self.s_ignorexml, None),
+        (DRAWNS, 'layer-set'):(self.s_ignorexml, None),
         (DRAWNS, 'page'): (self.s_draw_page, self.e_draw_page),
         (DRAWNS, 'object'): (self.s_draw_object, None),
         (DRAWNS, 'object-ole'): (self.s_draw_object_ole, None),
         (DRAWNS, 'text-box'): (self.s_draw_textbox, self.e_draw_textbox),
-#        (METANS, 'creation-date'):(self.s_processcont, self.e_dc_metatag),
-#        (METANS, 'generator'):(self.s_processcont, self.e_dc_metatag),
-#        (METANS, 'initial-creator'): (self.s_processcont, self.e_dc_metatag),
-#        (METANS, 'keyword'): (self.s_processcont, self.e_dc_metatag),
-        (NUMBERNS, "boolean-style"):(self.s_ignorexml, None),
-        (NUMBERNS, "currency-style"):(self.s_ignorexml, None),
-        (NUMBERNS, "date-style"):(self.s_ignorexml, None),
-        (NUMBERNS, "number-style"):(self.s_ignorexml, None),
-        (NUMBERNS, "text-style"):(self.s_ignorexml, None),
-#        (OFFICENS, "automatic-styles"):(self.s_office_automatic_styles, None),
-#        (OFFICENS, "document-content"):(self.s_office_document_content, self.e_office_document_content),
-        (OFFICENS, "forms"):(self.s_ignorexml, None),
-#        (OFFICENS, "master-styles"):(self.s_office_master_styles, None),
-        (OFFICENS, "meta"):(self.s_ignorecont, None),
-#        (OFFICENS, "presentation"):(self.s_office_presentation, self.e_office_presentation),
-#        (OFFICENS, "spreadsheet"):(self.s_office_spreadsheet, self.e_office_spreadsheet),
-#        (OFFICENS, "styles"):(self.s_office_styles, None),
-#        (OFFICENS, "text"):(self.s_office_text, self.e_office_text),
-        (OFFICENS, "scripts"):(self.s_ignorexml, None),
-        (PRESENTATIONNS, "notes"):(self.s_ignorexml, None),
-# (STYLENS, "default-page-layout"):(self.s_style_default_page_layout, self.e_style_page_layout),
-#        (STYLENS, "default-page-layout"):(self.s_ignorexml, None),
-#        (STYLENS, "default-style"):(self.s_style_default_style, self.e_style_default_style),
-#        (STYLENS, "drawing-page-properties"):(self.s_style_handle_properties, None),
-#        (STYLENS, "font-face"):(self.s_style_font_face, None),
-# (STYLENS, "footer"):(self.s_style_footer, self.e_style_footer),
-# (STYLENS, "footer-style"):(self.s_style_footer_style, None),
-#        (STYLENS, "graphic-properties"):(self.s_style_handle_properties, None),
-#        (STYLENS, "handout-master"):(self.s_ignorexml, None),
-# (STYLENS, "header"):(self.s_style_header, self.e_style_header),
-# (STYLENS, "header-footer-properties"):(self.s_style_handle_properties, None),
-# (STYLENS, "header-style"):(self.s_style_header_style, None),
-#        (STYLENS, "master-page"):(self.s_style_master_page, None),
-#        (STYLENS, "page-layout-properties"):(self.s_style_handle_properties, None),
-# (STYLENS, "page-layout"):(self.s_style_page_layout, self.e_style_page_layout),
-#        (STYLENS, "page-layout"):(self.s_ignorexml, None),
-#        (STYLENS, "paragraph-properties"):(self.s_style_handle_properties, None),
-#        (STYLENS, "style"):(self.s_style_style, self.e_style_style),
-#        (STYLENS, "table-cell-properties"):(self.s_style_handle_properties, None),
-#        (STYLENS, "table-column-properties"):(self.s_style_handle_properties, None),
-#        (STYLENS, "table-properties"):(self.s_style_handle_properties, None),
-#        (STYLENS, "text-properties"):(self.s_style_handle_properties, None),
+        # (METANS, 'creation-date'):(self.s_processcont, self.e_dc_metatag),
+        # (METANS, 'generator'):(self.s_processcont, self.e_dc_metatag),
+        # (METANS, 'initial-creator'): (self.s_processcont, self.e_dc_metatag),
+        # (METANS, 'keyword'): (self.s_processcont, self.e_dc_metatag),
+        (NUMBERNS, 'boolean-style'):(self.s_ignorexml, None),
+        (NUMBERNS, 'currency-style'):(self.s_ignorexml, None),
+        (NUMBERNS, 'date-style'):(self.s_ignorexml, None),
+        (NUMBERNS, 'number-style'):(self.s_ignorexml, None),
+        (NUMBERNS, 'text-style'):(self.s_ignorexml, None),
+        # (OFFICENS, "automatic-styles"):(self.s_office_automatic_styles, None),
+        # (OFFICENS, "document-content"):(self.s_office_document_content, self.e_office_document_content),
+        (OFFICENS, 'forms'):(self.s_ignorexml, None),
+        # (OFFICENS, "master-styles"):(self.s_office_master_styles, None),
+        (OFFICENS, 'meta'):(self.s_ignorecont, None),
+        # (OFFICENS, "presentation"):(self.s_office_presentation, self.e_office_presentation),
+        # (OFFICENS, "spreadsheet"):(self.s_office_spreadsheet, self.e_office_spreadsheet),
+        # (OFFICENS, "styles"):(self.s_office_styles, None),
+        # (OFFICENS, "text"):(self.s_office_text, self.e_office_text),
+        (OFFICENS, 'scripts'):(self.s_ignorexml, None),
+        (PRESENTATIONNS, 'notes'):(self.s_ignorexml, None),
+        # (STYLENS, "default-page-layout"):(self.s_style_default_page_layout, self.e_style_page_layout),
+        # (STYLENS, "default-page-layout"):(self.s_ignorexml, None),
+        # (STYLENS, "default-style"):(self.s_style_default_style, self.e_style_default_style),
+        # (STYLENS, "drawing-page-properties"):(self.s_style_handle_properties, None),
+        # (STYLENS, "font-face"):(self.s_style_font_face, None),
+        # (STYLENS, "footer"):(self.s_style_footer, self.e_style_footer),
+        # (STYLENS, "footer-style"):(self.s_style_footer_style, None),
+        # (STYLENS, "graphic-properties"):(self.s_style_handle_properties, None),
+        # (STYLENS, "handout-master"):(self.s_ignorexml, None),
+        # (STYLENS, "header"):(self.s_style_header, self.e_style_header),
+        # (STYLENS, "header-footer-properties"):(self.s_style_handle_properties, None),
+        # (STYLENS, "header-style"):(self.s_style_header_style, None),
+        # (STYLENS, "master-page"):(self.s_style_master_page, None),
+        # (STYLENS, "page-layout-properties"):(self.s_style_handle_properties, None),
+        # (STYLENS, "page-layout"):(self.s_style_page_layout, self.e_style_page_layout),
+        # (STYLENS, "page-layout"):(self.s_ignorexml, None),
+        # (STYLENS, "paragraph-properties"):(self.s_style_handle_properties, None),
+        # (STYLENS, "style"):(self.s_style_style, self.e_style_style),
+        # (STYLENS, "table-cell-properties"):(self.s_style_handle_properties, None),
+        # (STYLENS, "table-column-properties"):(self.s_style_handle_properties, None),
+        # (STYLENS, "table-properties"):(self.s_style_handle_properties, None),
+        # (STYLENS, "text-properties"):(self.s_style_handle_properties, None),
         (SVGNS, 'desc'): (self.s_ignorexml, None),
         (TABLENS, 'covered-table-cell'): (self.s_ignorexml, None),
         (TABLENS, 'table-cell'): (self.s_table_table_cell, self.e_table_table_cell),
@@ -1737,29 +1734,29 @@ class ODF2XHTMLembedded(ODF2XHTML):
         (TABLENS, 'table-row'): (self.s_table_table_row, self.e_table_table_row),
         (TABLENS, 'table'): (self.s_table_table, self.e_table_table),
         (TEXTNS, 'a'): (self.s_text_a, self.e_text_a),
-        (TEXTNS, "alphabetical-index-source"):(self.s_text_x_source, self.e_text_x_source),
-        (TEXTNS, "bibliography-configuration"):(self.s_ignorexml, None),
-        (TEXTNS, "bibliography-source"):(self.s_text_x_source, self.e_text_x_source),
+        (TEXTNS, 'alphabetical-index-source'):(self.s_text_x_source, self.e_text_x_source),
+        (TEXTNS, 'bibliography-configuration'):(self.s_ignorexml, None),
+        (TEXTNS, 'bibliography-source'):(self.s_text_x_source, self.e_text_x_source),
         (TEXTNS, 'h'): (self.s_text_h, self.e_text_h),
-        (TEXTNS, "illustration-index-source"):(self.s_text_x_source, self.e_text_x_source),
+        (TEXTNS, 'illustration-index-source'):(self.s_text_x_source, self.e_text_x_source),
         (TEXTNS, 'line-break'):(self.s_text_line_break, None),
-        (TEXTNS, "linenumbering-configuration"):(self.s_ignorexml, None),
-        (TEXTNS, "list"):(self.s_text_list, self.e_text_list),
-        (TEXTNS, "list-item"):(self.s_text_list_item, self.e_text_list_item),
-        (TEXTNS, "list-level-style-bullet"):(self.s_text_list_level_style_bullet, self.e_text_list_level_style_bullet),
-        (TEXTNS, "list-level-style-number"):(self.s_text_list_level_style_number, self.e_text_list_level_style_number),
-        (TEXTNS, "list-style"):(None, None),
-        (TEXTNS, "note"):(self.s_text_note, None),
-        (TEXTNS, "note-body"):(self.s_text_note_body, self.e_text_note_body),
-        (TEXTNS, "note-citation"):(None, self.e_text_note_citation),
-        (TEXTNS, "notes-configuration"):(self.s_ignorexml, None),
-        (TEXTNS, "object-index-source"):(self.s_text_x_source, self.e_text_x_source),
+        (TEXTNS, 'linenumbering-configuration'):(self.s_ignorexml, None),
+        (TEXTNS, 'list'):(self.s_text_list, self.e_text_list),
+        (TEXTNS, 'list-item'):(self.s_text_list_item, self.e_text_list_item),
+        (TEXTNS, 'list-level-style-bullet'):(self.s_text_list_level_style_bullet, self.e_text_list_level_style_bullet),
+        (TEXTNS, 'list-level-style-number'):(self.s_text_list_level_style_number, self.e_text_list_level_style_number),
+        (TEXTNS, 'list-style'):(None, None),
+        (TEXTNS, 'note'):(self.s_text_note, None),
+        (TEXTNS, 'note-body'):(self.s_text_note_body, self.e_text_note_body),
+        (TEXTNS, 'note-citation'):(None, self.e_text_note_citation),
+        (TEXTNS, 'notes-configuration'):(self.s_ignorexml, None),
+        (TEXTNS, 'object-index-source'):(self.s_text_x_source, self.e_text_x_source),
         (TEXTNS, 'p'): (self.s_text_p, self.e_text_p),
         (TEXTNS, 's'): (self.s_text_s, None),
         (TEXTNS, 'span'): (self.s_text_span, self.e_text_span),
         (TEXTNS, 'tab'): (self.s_text_tab, None),
-        (TEXTNS, "table-index-source"):(self.s_text_x_source, self.e_text_x_source),
-        (TEXTNS, "table-of-content-source"):(self.s_text_x_source, self.e_text_x_source),
-        (TEXTNS, "user-index-source"):(self.s_text_x_source, self.e_text_x_source),
-        (TEXTNS, "page-number"):(None, None),
+        (TEXTNS, 'table-index-source'):(self.s_text_x_source, self.e_text_x_source),
+        (TEXTNS, 'table-of-content-source'):(self.s_text_x_source, self.e_text_x_source),
+        (TEXTNS, 'user-index-source'):(self.s_text_x_source, self.e_text_x_source),
+        (TEXTNS, 'page-number'):(None, None),
         }
diff --git a/src/odf/odfmanifest.py b/src/odf/odfmanifest.py
index 14986e5c67..210cc34d04 100644
--- a/src/odf/odfmanifest.py
+++ b/src/odf/odfmanifest.py
@@ -25,7 +25,7 @@ import zipfile
 from xml.sax import handler, make_parser
 from xml.sax.xmlreader import InputSource
 
-MANIFESTNS="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
+MANIFESTNS='urn:oasis:names:tc:opendocument:xmlns:manifest:1.0'
 
 # -----------------------------------------------------------------------------
 #
@@ -35,8 +35,8 @@ MANIFESTNS="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
 
 
 class ODFManifestHandler(handler.ContentHandler):
-    """ The ODFManifestHandler parses a manifest file and produces a list of
-        content """
+    ''' The ODFManifestHandler parses a manifest file and produces a list of
+        content '''
 
     def __init__(self):
         self.manifest = {}
@@ -48,7 +48,7 @@ class ODFManifestHandler(handler.ContentHandler):
         }
 
     def handle_starttag(self, tag, method, attrs):
-        method(tag,attrs)
+        method(tag, attrs)
 
     def handle_endtag(self, tag, method):
         method(tag)
@@ -58,7 +58,7 @@ class ODFManifestHandler(handler.ContentHandler):
         if method:
             self.handle_starttag(tag, method, attrs)
         else:
-            self.unknown_starttag(tag,attrs)
+            self.unknown_starttag(tag, attrs)
 
     def endElementNS(self, tag, qname):
         method = self.elements.get(tag, (None, None))[1]
@@ -77,7 +77,7 @@ class ODFManifestHandler(handler.ContentHandler):
         pass
 
     def s_file_entry(self, tag, attrs):
-        m = attrs.get((MANIFESTNS, 'media-type'),"application/octet-stream")
+        m = attrs.get((MANIFESTNS, 'media-type'),'application/octet-stream')
         p = attrs.get((MANIFESTNS, 'full-path'))
         self.manifest[p] = {'media-type':m, 'full-path':p}
 
@@ -110,8 +110,8 @@ def odfmanifest(odtfile):
     return manifestlist(manifest)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     import sys
     result = odfmanifest(sys.argv[1])
     for file in result.values():
-        print("%-40s %-40s" % (file['media-type'], file['full-path']))
+        print('{:<40} {:<40}'.format(file['media-type'], file['full-path']))
diff --git a/src/odf/office.py b/src/odf/office.py
index 41a9330404..1705bb3106 100644
--- a/src/odf/office.py
+++ b/src/odf/office.py
@@ -53,23 +53,23 @@ def DdeSource(**args):
     return Element(qname=(OFFICENS,'dde-source'), **args)
 
 
-def Document(version="1.1", **args):
+def Document(version='1.1', **args):
     return Element(qname=(OFFICENS,'document'), version=version, **args)
 
 
-def DocumentContent(version="1.1", **args):
+def DocumentContent(version='1.1', **args):
     return Element(qname=(OFFICENS, 'document-content'), version=version, **args)
 
 
-def DocumentMeta(version="1.1", **args):
+def DocumentMeta(version='1.1', **args):
     return Element(qname=(OFFICENS, 'document-meta'), version=version, **args)
 
 
-def DocumentSettings(version="1.1", **args):
+def DocumentSettings(version='1.1', **args):
     return Element(qname=(OFFICENS, 'document-settings'), version=version, **args)
 
 
-def DocumentStyles(version="1.1", **args):
+def DocumentStyles(version='1.1', **args):
     return Element(qname=(OFFICENS, 'document-styles'), version=version, **args)
 
 
diff --git a/src/odf/opendocument.py b/src/odf/opendocument.py
index 3bf3a4f25c..5bb7a7432b 100644
--- a/src/odf/opendocument.py
+++ b/src/odf/opendocument.py
@@ -18,7 +18,7 @@
 #
 
 
-__doc__="""Use OpenDocument to generate your documents."""
+__doc__='''Use OpenDocument to generate your documents.'''
 
 import mimetypes
 import sys
@@ -65,29 +65,29 @@ UNIXPERMS = 0o100644 << 16  # -rw-r--r--
 IS_FILENAME = 0
 IS_IMAGE = 1
 # We need at least Python 2.2
-assert sys.version_info[0]>=2 and sys.version_info[1] >= 2
+assert sys.version_info >= (2, 2)
 
 # sys.setrecursionlimit(100)
 # The recursion limit is set conservative so mistakes like
 # s=content() s.addElement(s) won't eat up too much processor time.
 
 odmimetypes = {
- 'application/vnd.oasis.opendocument.text':                  '.odt',
- 'application/vnd.oasis.opendocument.text-template':         '.ott',
- 'application/vnd.oasis.opendocument.graphics':              '.odg',
- 'application/vnd.oasis.opendocument.graphics-template':     '.otg',
- 'application/vnd.oasis.opendocument.presentation':          '.odp',
- 'application/vnd.oasis.opendocument.presentation-template': '.otp',
- 'application/vnd.oasis.opendocument.spreadsheet':           '.ods',
- 'application/vnd.oasis.opendocument.spreadsheet-template':  '.ots',
- 'application/vnd.oasis.opendocument.chart':                 '.odc',
- 'application/vnd.oasis.opendocument.chart-template':        '.otc',
- 'application/vnd.oasis.opendocument.image':                 '.odi',
- 'application/vnd.oasis.opendocument.image-template':        '.oti',
- 'application/vnd.oasis.opendocument.formula':               '.odf',
- 'application/vnd.oasis.opendocument.formula-template':      '.otf',
- 'application/vnd.oasis.opendocument.text-master':           '.odm',
- 'application/vnd.oasis.opendocument.text-web':              '.oth',
+    'application/vnd.oasis.opendocument.text':                  '.odt',
+    'application/vnd.oasis.opendocument.text-template':         '.ott',
+    'application/vnd.oasis.opendocument.graphics':              '.odg',
+    'application/vnd.oasis.opendocument.graphics-template':     '.otg',
+    'application/vnd.oasis.opendocument.presentation':          '.odp',
+    'application/vnd.oasis.opendocument.presentation-template': '.otp',
+    'application/vnd.oasis.opendocument.spreadsheet':           '.ods',
+    'application/vnd.oasis.opendocument.spreadsheet-template':  '.ots',
+    'application/vnd.oasis.opendocument.chart':                 '.odc',
+    'application/vnd.oasis.opendocument.chart-template':        '.otc',
+    'application/vnd.oasis.opendocument.image':                 '.odi',
+    'application/vnd.oasis.opendocument.image-template':        '.oti',
+    'application/vnd.oasis.opendocument.formula':               '.odf',
+    'application/vnd.oasis.opendocument.formula-template':      '.otf',
+    'application/vnd.oasis.opendocument.text-master':           '.odm',
+    'application/vnd.oasis.opendocument.text-web':              '.oth',
 }
 
 
@@ -99,19 +99,19 @@ class OpaqueObject:
 
 
 class OpenDocument:
-    """ A class to hold the content of an OpenDocument document
+    ''' A class to hold the content of an OpenDocument document
         Use the xml method to write the XML
         source to the screen or to a file
         d = OpenDocument(mimetype)
         fd.write(d.xml())
-    """
+    '''
     thumbnail = None
 
     def __init__(self, mimetype, add_generator=True):
         self.mimetype = mimetype
         self.childobjects = []
         self._extra = []
-        self.folder = ""  # Always empty for toplevel documents
+        self.folder = ''  # Always empty for toplevel documents
         self.topnode = Document(mimetype=self.mimetype)
         self.topnode.ownerDocument = self
 
@@ -151,8 +151,8 @@ class OpenDocument:
         self._styles_ooo_fix = {}
 
     def build_caches(self, element):
-        """ Called from element.py
-        """
+        ''' Called from element.py
+        '''
         if element.qname not in self.element_dict:
             self.element_dict[element.qname] = []
         self.element_dict[element.qname].append(element)
@@ -191,9 +191,9 @@ class OpenDocument:
             f.close()
 
     def xml(self):
-        """ Generates the full document as an XML file
+        ''' Generates the full document as an XML file
             Always written as a bytestream in UTF-8 encoding
-        """
+        '''
         self.__replaceGenerator()
         xml=PolyglotBytesIO()
         xml.write(_XMLPROLOGUE)
@@ -201,9 +201,9 @@ class OpenDocument:
         return xml.getvalue()
 
     def contentxml(self):
-        """ Generates the content.xml file
+        ''' Generates the content.xml file
             Always written as a bytestream in UTF-8 encoding
-        """
+        '''
         xml=PolyglotBytesIO()
         xml.write(_XMLPROLOGUE)
         x = DocumentContent()
@@ -226,38 +226,38 @@ class OpenDocument:
         return xml.getvalue()
 
     def __manifestxml(self):
-        """ Generates the manifest.xml file
+        ''' Generates the manifest.xml file
             The self.manifest isn't available unless the document is being saved
-        """
+        '''
         xml=PolyglotBytesIO()
         xml.write(_XMLPROLOGUE)
-        self.manifest.toXml(0,xml)
+        self.manifest.toXml(0, xml)
         return xml.getvalue()
 
     def metaxml(self):
-        """ Generates the meta.xml file """
+        ''' Generates the meta.xml file '''
         self.__replaceGenerator()
         x = DocumentMeta()
         x.addElement(self.meta)
         xml=PolyglotStringIO()
         xml.write(_XMLPROLOGUE)
-        x.toXml(0,xml)
+        x.toXml(0, xml)
         return xml.getvalue()
 
     def settingsxml(self):
-        """ Generates the settings.xml file """
+        ''' Generates the settings.xml file '''
         x = DocumentSettings()
         x.addElement(self.settings)
         xml=PolyglotStringIO()
         xml.write(_XMLPROLOGUE)
-        x.toXml(0,xml)
+        x.toXml(0, xml)
         return xml.getvalue()
 
     def _parseoneelement(self, top, stylenamelist):
-        """ Finds references to style objects in master-styles
+        ''' Finds references to style objects in master-styles
             and add the style name to the style list if not already there.
             Recursive
-        """
+        '''
         for e in top.childNodes:
             if e.nodeType == element.Node.ELEMENT_NODE:
                 for styleref in (
@@ -280,10 +280,10 @@ class OpenDocument:
         return stylenamelist
 
     def _used_auto_styles(self, segments):
-        """ Loop through the masterstyles elements, and find the automatic
+        ''' Loop through the masterstyles elements, and find the automatic
             styles that are used. These will be added to the automatic-styles
             element in styles.xml
-        """
+        '''
         stylenamelist = []
         for top in segments:
             stylenamelist = self._parseoneelement(top, stylenamelist)
@@ -294,7 +294,7 @@ class OpenDocument:
         return stylelist
 
     def stylesxml(self):
-        """ Generates the styles.xml file """
+        ''' Generates the styles.xml file '''
         xml=PolyglotStringIO()
         xml.write(_XMLPROLOGUE)
         x = DocumentStyles()
@@ -313,11 +313,11 @@ class OpenDocument:
         return xml.getvalue()
 
     def addPicture(self, filename, mediatype=None, content=None):
-        """ Add a picture
+        ''' Add a picture
             It uses the same convention as OOo, in that it saves the picture in
             the zipfile in the subdirectory 'Pictures'
             If passed a file ptr, mediatype must be set
-        """
+        '''
         if content is None:
             if mediatype is None:
                 mediatype, encoding = mimetypes.guess_type(filename)
@@ -329,7 +329,7 @@ class OpenDocument:
                     ext=''
             else:
                 ext = mimetypes.guess_extension(mediatype)
-            manifestfn = f"Pictures/{(time.time()*10000000000):0.0f}{ext}"
+            manifestfn = f'Pictures/{(time.time()*10000000000):0.0f}{ext}'
             self.Pictures[manifestfn] = (IS_FILENAME, filename, mediatype)
         else:
             manifestfn = filename
@@ -337,12 +337,12 @@ class OpenDocument:
         return manifestfn
 
     def addPictureFromFile(self, filename, mediatype=None):
-        """ Add a picture
+        ''' Add a picture
             It uses the same convention as OOo, in that it saves the picture in
             the zipfile in the subdirectory 'Pictures'.
             If mediatype is not given, it will be guessed from the filename
             extension.
-        """
+        '''
         if mediatype is None:
             mediatype, encoding = mimetypes.guess_type(filename)
         if mediatype is None:
@@ -353,26 +353,26 @@ class OpenDocument:
                 ext=''
         else:
             ext = mimetypes.guess_extension(mediatype)
-        manifestfn = f"Pictures/{(time.time()*10000000000):0.0f}{ext}"
+        manifestfn = f'Pictures/{(time.time()*10000000000):0.0f}{ext}'
         self.Pictures[manifestfn] = (IS_FILENAME, filename, mediatype)
         return manifestfn
 
     def addPictureFromString(self, content, mediatype):
-        """ Add a picture
+        ''' Add a picture
             It uses the same convention as OOo, in that it saves the picture in
             the zipfile in the subdirectory 'Pictures'. The content variable
             is a string that contains the binary image data. The mediatype
             indicates the image format.
-        """
+        '''
         ext = mimetypes.guess_extension(mediatype)
-        manifestfn = f"Pictures/{(time.time()*10000000000):0.0f}{ext}"
+        manifestfn = f'Pictures/{(time.time()*10000000000):0.0f}{ext}'
         self.Pictures[manifestfn] = (IS_IMAGE, content, mediatype)
         return manifestfn
 
     def addThumbnail(self, filecontent=None):
-        """ Add a fixed thumbnail
+        ''' Add a fixed thumbnail
             The thumbnail in the library is big, so this is pretty useless.
-        """
+        '''
         if filecontent is None:
             import thumbnail
             self.thumbnail = thumbnail.thumbnail()
@@ -380,20 +380,20 @@ class OpenDocument:
             self.thumbnail = filecontent
 
     def addObject(self, document, objectname=None):
-        """ Adds an object (subdocument). The object must be an OpenDocument class
+        ''' Adds an object (subdocument). The object must be an OpenDocument class
             The return value will be the folder in the zipfile the object is stored in
-        """
+        '''
         self.childobjects.append(document)
         if objectname is None:
-            document.folder = "%s/Object %d" % (self.folder, len(self.childobjects))
+            document.folder = f'{self.folder}/Object {len(self.childobjects)}'
         else:
             document.folder = objectname
-        return ".%s" % document.folder
+        return f'.{document.folder}'
 
     def _savePictures(self, object, folder):
         for arcname, picturerec in object.Pictures.items():
             what_it_is, fileobj, mediatype = picturerec
-            self.manifest.addElement(manifest.FileEntry(fullpath=f"{folder}{arcname}", mediatype=mediatype))
+            self.manifest.addElement(manifest.FileEntry(fullpath=f'{folder}{arcname}', mediatype=mediatype))
             if what_it_is == IS_FILENAME:
                 self._z.write(fileobj, arcname, zipfile.ZIP_STORED)
             else:
@@ -402,47 +402,47 @@ class OpenDocument:
                 zi.external_attr = UNIXPERMS
                 self._z.writestr(zi, fileobj)
         # According to section 17.7.3 in ODF 1.1, the pictures folder should not have a manifest entry
-#       if hasPictures:
-#           self.manifest.addElement(manifest.FileEntry(fullpath="%sPictures/" % folder, mediatype=""))
+        # if hasPictures:
+        #     self.manifest.addElement(manifest.FileEntry(fullpath=f"{folder}Pictures/", mediatype=""))
         # Look in subobjects
         subobjectnum = 1
         for subobject in object.childobjects:
-            self._savePictures(subobject,'%sObject %d/' % (folder, subobjectnum))
+            self._savePictures(subobject, f'{folder}Object {subobjectnum}/')
             subobjectnum += 1
 
     def __replaceGenerator(self):
-        """ Section 3.1.1: The application MUST NOT export the original identifier
+        ''' Section 3.1.1: The application MUST NOT export the original identifier
             belonging to the application that created the document.
-        """
+        '''
         for m in self.meta.childNodes[:]:
             if m.qname == (METANS, 'generator'):
                 self.meta.removeChild(m)
         self.meta.addElement(meta.Generator(text=TOOLSVERSION))
 
     def save(self, outputfile, addsuffix=False):
-        """ Save the document under the filename.
+        ''' Save the document under the filename.
             If the filename is '-' then save to stdout
-        """
+        '''
         if outputfile == '-':
-            outputfp = zipfile.ZipFile(sys.stdout,"w")
+            outputfp = zipfile.ZipFile(sys.stdout, 'w')
         else:
             if addsuffix:
-                outputfile = outputfile + odmimetypes.get(self.mimetype,'.xxx')
-            outputfp = zipfile.ZipFile(outputfile, "w")
+                outputfile = outputfile + odmimetypes.get(self.mimetype, '.xxx')
+            outputfp = zipfile.ZipFile(outputfile, 'w')
         self.__zipwrite(outputfp)
         outputfp.close()
 
     def write(self, outputfp):
-        """ User API to write the ODF file to an open file descriptor
+        ''' User API to write the ODF file to an open file descriptor
             Writes the ZIP format
-        """
-        zipoutputfp = zipfile.ZipFile(outputfp,"w")
+        '''
+        zipoutputfp = zipfile.ZipFile(outputfp,'w')
         self.__zipwrite(zipoutputfp)
 
     def __zipwrite(self, outputfp):
-        """ Write the document to an open file pointer
+        ''' Write the document to an open file pointer
             This is where the real work is done
-        """
+        '''
         self._z = outputfp
         self._now = time.localtime()[:6]
         self.manifest = manifest.Manifest()
@@ -453,23 +453,23 @@ class OpenDocument:
         zi.external_attr = UNIXPERMS
         self._z.writestr(zi, self.mimetype)
 
-        self._saveXmlObjects(self,"")
+        self._saveXmlObjects(self,'')
 
         # Write pictures
-        self._savePictures(self,"")
+        self._savePictures(self,'')
 
         # Write the thumbnail
         if self.thumbnail is not None:
-            self.manifest.addElement(manifest.FileEntry(fullpath="Thumbnails/", mediatype=''))
-            self.manifest.addElement(manifest.FileEntry(fullpath="Thumbnails/thumbnail.png", mediatype=''))
-            zi = zipfile.ZipInfo("Thumbnails/thumbnail.png", self._now)
+            self.manifest.addElement(manifest.FileEntry(fullpath='Thumbnails/', mediatype=''))
+            self.manifest.addElement(manifest.FileEntry(fullpath='Thumbnails/thumbnail.png', mediatype=''))
+            zi = zipfile.ZipInfo('Thumbnails/thumbnail.png', self._now)
             zi.compress_type = zipfile.ZIP_DEFLATED
             zi.external_attr = UNIXPERMS
             self._z.writestr(zi, self.thumbnail)
 
         # Write any extra files
         for op in self._extra:
-            if op.filename == "META-INF/documentsignatures.xml":
+            if op.filename == 'META-INF/documentsignatures.xml':
                 continue  # Don't save signatures
             self.manifest.addElement(manifest.FileEntry(fullpath=op.filename, mediatype=op.mediatype))
             zi = zipfile.ZipInfo(op.filename.encode('utf-8'), self._now)
@@ -478,7 +478,7 @@ class OpenDocument:
             if op.content is not None:
                 self._z.writestr(zi, op.content)
         # Write manifest
-        zi = zipfile.ZipInfo("META-INF/manifest.xml", self._now)
+        zi = zipfile.ZipInfo('META-INF/manifest.xml', self._now)
         zi.compress_type = zipfile.ZIP_DEFLATED
         zi.external_attr = UNIXPERMS
         self._z.writestr(zi, self.__manifestxml())
@@ -488,35 +488,35 @@ class OpenDocument:
 
     def _saveXmlObjects(self, object, folder):
         if self == object:
-            self.manifest.addElement(manifest.FileEntry(fullpath="/", mediatype=object.mimetype))
+            self.manifest.addElement(manifest.FileEntry(fullpath='/', mediatype=object.mimetype))
         else:
             self.manifest.addElement(manifest.FileEntry(fullpath=folder, mediatype=object.mimetype))
         # Write styles
-        self.manifest.addElement(manifest.FileEntry(fullpath="%sstyles.xml" % folder, mediatype="text/xml"))
-        zi = zipfile.ZipInfo("%sstyles.xml" % folder, self._now)
+        self.manifest.addElement(manifest.FileEntry(fullpath=f'{folder}styles.xml', mediatype='text/xml'))
+        zi = zipfile.ZipInfo(f'{folder}styles.xml', self._now)
         zi.compress_type = zipfile.ZIP_DEFLATED
         zi.external_attr = UNIXPERMS
         self._z.writestr(zi, object.stylesxml())
 
         # Write content
-        self.manifest.addElement(manifest.FileEntry(fullpath="%scontent.xml" % folder, mediatype="text/xml"))
-        zi = zipfile.ZipInfo("%scontent.xml" % folder, self._now)
+        self.manifest.addElement(manifest.FileEntry(fullpath=f'{folder}content.xml', mediatype='text/xml'))
+        zi = zipfile.ZipInfo(f'{folder}content.xml', self._now)
         zi.compress_type = zipfile.ZIP_DEFLATED
         zi.external_attr = UNIXPERMS
         self._z.writestr(zi, object.contentxml())
 
         # Write settings
         if object.settings.hasChildNodes():
-            self.manifest.addElement(manifest.FileEntry(fullpath="%ssettings.xml" % folder, mediatype="text/xml"))
-            zi = zipfile.ZipInfo("%ssettings.xml" % folder, self._now)
+            self.manifest.addElement(manifest.FileEntry(fullpath=f'{folder}settings.xml', mediatype='text/xml'))
+            zi = zipfile.ZipInfo(f'{folder}settings.xml', self._now)
             zi.compress_type = zipfile.ZIP_DEFLATED
             zi.external_attr = UNIXPERMS
             self._z.writestr(zi, object.settingsxml())
 
         # Write meta
         if self == object:
-            self.manifest.addElement(manifest.FileEntry(fullpath="meta.xml", mediatype="text/xml"))
-            zi = zipfile.ZipInfo("meta.xml", self._now)
+            self.manifest.addElement(manifest.FileEntry(fullpath='meta.xml', mediatype='text/xml'))
+            zi = zipfile.ZipInfo('meta.xml', self._now)
             zi.compress_type = zipfile.ZIP_DEFLATED
             zi.external_attr = UNIXPERMS
             self._z.writestr(zi, object.metaxml())
@@ -524,47 +524,47 @@ class OpenDocument:
         # Write subobjects
         subobjectnum = 1
         for subobject in object.childobjects:
-            self._saveXmlObjects(subobject, '%sObject %d/' % (folder, subobjectnum))
+            self._saveXmlObjects(subobject, f'{folder}Object {subobjectnum}/')
             subobjectnum += 1
 
 # Document's DOM methods
     def createElement(self, element):
-        """ Inconvenient interface to create an element, but follows XML-DOM.
+        ''' Inconvenient interface to create an element, but follows XML-DOM.
             Does not allow attributes as argument, therefore can't check grammar.
-        """
+        '''
         return element(check_grammar=False)
 
     def createTextNode(self, data):
-        """ Method to create a text node """
+        ''' Method to create a text node '''
         return element.Text(data)
 
     def createCDATASection(self, data):
-        """ Method to create a CDATA section """
+        ''' Method to create a CDATA section '''
         return element.CDATASection(data)
 
     def getMediaType(self):
-        """ Returns the media type """
+        ''' Returns the media type '''
         return self.mimetype
 
     def getStyleByName(self, name):
-        """ Finds a style object based on the name """
+        ''' Finds a style object based on the name '''
         ncname = make_NCName(name)
         if self._styles_dict == {}:
             self.rebuild_caches()
         return self._styles_dict.get(ncname, None)
 
     def getElementsByType(self, element):
-        """ Gets elements based on the type, which is function from text.py, draw.py etc. """
+        ''' Gets elements based on the type, which is function from text.py, draw.py etc. '''
         obj = element(check_grammar=False)
         if self.element_dict == {}:
             self.rebuild_caches()
         return self.element_dict.get(obj.qname, [])
 
+
 # Convenience functions
 
-
 def OpenDocumentChart():
-    """ Creates a chart document """
+    ''' Creates a chart document '''
     doc = OpenDocument('application/vnd.oasis.opendocument.chart')
     doc.chart = Chart()
     doc.body.addElement(doc.chart)
@@ -572,7 +572,7 @@ def OpenDocumentChart():
 
 
 def OpenDocumentDrawing():
-    """ Creates a drawing document """
+    ''' Creates a drawing document '''
     doc = OpenDocument('application/vnd.oasis.opendocument.graphics')
     doc.drawing = Drawing()
     doc.body.addElement(doc.drawing)
@@ -580,7 +580,7 @@ def OpenDocumentDrawing():
 
 
 def OpenDocumentImage():
-    """ Creates an image document """
+    ''' Creates an image document '''
     doc = OpenDocument('application/vnd.oasis.opendocument.image')
     doc.image = Image()
     doc.body.addElement(doc.image)
@@ -588,7 +588,7 @@ def OpenDocumentImage():
 
 
 def OpenDocumentPresentation():
-    """ Creates a presentation document """
+    ''' Creates a presentation document '''
     doc = OpenDocument('application/vnd.oasis.opendocument.presentation')
     doc.presentation = Presentation()
     doc.body.addElement(doc.presentation)
@@ -596,7 +596,7 @@ def OpenDocumentPresentation():
 
 
 def OpenDocumentSpreadsheet():
-    """ Creates a spreadsheet document """
+    ''' Creates a spreadsheet document '''
     doc = OpenDocument('application/vnd.oasis.opendocument.spreadsheet')
     doc.spreadsheet = Spreadsheet()
     doc.body.addElement(doc.spreadsheet)
@@ -604,7 +604,7 @@ def OpenDocumentSpreadsheet():
 
 
 def OpenDocumentText():
-    """ Creates a text document """
+    ''' Creates a text document '''
     doc = OpenDocument('application/vnd.oasis.opendocument.text')
     doc.text = Text()
     doc.body.addElement(doc.text)
@@ -612,7 +612,7 @@ def OpenDocumentText():
 
 
 def OpenDocumentTextMaster():
-    """ Creates a text master document """
+    ''' Creates a text master document '''
     doc = OpenDocument('application/vnd.oasis.opendocument.text-master')
     doc.text = Text()
     doc.body.addElement(doc.text)
@@ -646,9 +646,9 @@ def __loadxmlparts(z, manifest, doc, objectpath):
 
 
 def load(odffile):
-    """ Load an ODF file into memory
+    ''' Load an ODF file into memory
         Returns a reference to the structure
-    """
+    '''
     z = zipfile.ZipFile(odffile)
     try:
         mimetype = z.read('mimetype')
@@ -658,21 +658,21 @@ def load(odffile):
 
     # Look in the manifest file to see if which of the four files there are
     manifestpart = z.read('META-INF/manifest.xml')
-    manifest =  manifestlist(manifestpart)
+    manifest = manifestlist(manifestpart)
     __loadxmlparts(z, manifest, doc, '')
     for mentry,mvalue in manifest.items():
-        if mentry[:9] == "Pictures/" and len(mentry) > 9:
+        if mentry[:9] == 'Pictures/' and len(mentry) > 9:
             doc.addPicture(mvalue['full-path'], mvalue['media-type'], z.read(mentry))
-        elif mentry == "Thumbnails/thumbnail.png":
+        elif mentry == 'Thumbnails/thumbnail.png':
             doc.addThumbnail(z.read(mentry))
         elif mentry in ('settings.xml', 'meta.xml', 'content.xml', 'styles.xml'):
             pass
         # Load subobjects into structure
-        elif mentry[:7] == "Object " and len(mentry) < 11 and mentry[-1] == "/":
+        elif mentry[:7] == 'Object ' and len(mentry) < 11 and mentry[-1] == '/':
             subdoc = OpenDocument(mvalue['media-type'], add_generator=False)
-            doc.addObject(subdoc, "/" + mentry[:-1])
+            doc.addObject(subdoc, '/' + mentry[:-1])
             __loadxmlparts(z, manifest, subdoc, mentry)
-        elif mentry[:7] == "Object ":
+        elif mentry[:7] == 'Object ':
             pass  # Don't load subobjects as opaque objects
         else:
             if mvalue['full-path'][-1] == '/':
diff --git a/src/odf/teletype.py b/src/odf/teletype.py
index 0384bc734b..c9db896977 100644
--- a/src/odf/teletype.py
+++ b/src/odf/teletype.py
@@ -17,14 +17,14 @@
 #   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
-"""
+'''
 Class for handling whitespace properly in OpenDocument.
 
 While it is possible to use getTextContent() and setTextContent()
 to extract or create ODF content, these won't extract or create
 the appropriate <text:s>, <text:tab>, or <text:line-break>
 elements.  This module takes care of that problem.
-"""
+'''
 
 
 from .element import Node
@@ -38,12 +38,12 @@ class WhitespaceText:
         self.spaceCount = 0
 
     def addTextToElement(self, odfElement, s):
-        """ Process an input string, inserting
+        ''' Process an input string, inserting
             <text:tab> elements for '\t',
             <text:line-break> elements for '\n', and
             <text:s> elements for runs of more than one blank.
             These will be added to the given element.
-        """
+        '''
         i = 0
         ch = ' '
 
@@ -83,17 +83,17 @@ class WhitespaceText:
         self._emitTextBuffer(odfElement)
 
     def _emitTextBuffer(self, odfElement):
-        """ Creates a Text Node whose contents are the current textBuffer.
+        ''' Creates a Text Node whose contents are the current textBuffer.
             Side effect: clears the text buffer.
-        """
+        '''
         if len(self.textBuffer) > 0:
             odfElement.addText(''.join(self.textBuffer))
         self.textBuffer = []
 
     def _emitSpaces(self, odfElement):
-        """ Creates a <text:s> element for the current spaceCount.
+        ''' Creates a <text:s> element for the current spaceCount.
             Side effect: sets spaceCount back to zero
-        """
+        '''
         if self.spaceCount > 0:
             spaceElement = S(c=self.spaceCount)
             odfElement.addElement(spaceElement)
@@ -106,12 +106,12 @@ def addTextToElement(odfElement, s):
 
 
 def extractText(odfElement):
-    """ Extract text content from an Element, with whitespace represented
+    ''' Extract text content from an Element, with whitespace represented
         properly. Returns the text, with tabs, spaces, and newlines
         correctly evaluated. This method recursively descends through the
         children of the given element, accumulating text and "unwrapping"
         <text:s>, <text:tab>, and <text:line-break> elements along the way.
-    """
+    '''
     result = []
 
     if len(odfElement.childNodes) != 0:
@@ -121,18 +121,18 @@ def extractText(odfElement):
             elif child.nodeType == Node.ELEMENT_NODE:
                 subElement = child
                 tagName = subElement.qname
-                if tagName == ("urn:oasis:names:tc:opendocument:xmlns:text:1.0", "line-break"):
-                    result.append("\n")
-                elif tagName == ("urn:oasis:names:tc:opendocument:xmlns:text:1.0", "tab"):
-                    result.append("\t")
-                elif tagName == ("urn:oasis:names:tc:opendocument:xmlns:text:1.0", "s"):
+                if tagName == ('urn:oasis:names:tc:opendocument:xmlns:text:1.0', 'line-break'):
+                    result.append('\n')
+                elif tagName == ('urn:oasis:names:tc:opendocument:xmlns:text:1.0', 'tab'):
+                    result.append('\t')
+                elif tagName == ('urn:oasis:names:tc:opendocument:xmlns:text:1.0', 's'):
                     c = subElement.getAttribute('c')
                     if c:
-                        spaceCount =  int(c)
+                        spaceCount = int(c)
                     else:
                         spaceCount = 1
 
-                    result.append(" " * spaceCount)
+                    result.append(' ' * spaceCount)
                 else:
                     result.append(extractText(subElement))
     return ''.join(result)
diff --git a/src/odf/thumbnail.py b/src/odf/thumbnail.py
index b2c65e03c2..e41362c304 100644
--- a/src/odf/thumbnail.py
+++ b/src/odf/thumbnail.py
@@ -4,7 +4,7 @@
 # License: GPL-3
 import base64
 
-iconstr = b"""
+iconstr = b'''
 iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAAAA3NCSVQICAjb4U/gAAAACXBIWXMA
 AA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAspQTFRF
 AAAAgICAZmZmVVVVgICAampqgICAYmJidnZ2aGhoa2treHh4ZGRkcHBwdnZ2ampqcXFxb29vc3Nz
@@ -48,7 +48,7 @@ BiRAqkN0UJpQckxaspHRj/IDhLE4KiAhJKLOko01SEYlmwSSY9OSjX1FYEo2RIpQrZDQZWdxSjZW
 UnLjko1lIrCOKLnkGFuysQfJpGRDQUTMko2dpMS0ZGM5OUaWbJJKjg1KNnaIMC3ZkJeMzEs21pZI
 5QEJcc0CH5TSZWdSAJ/96wq6H9jGaPO3R1IAo3Q9RwkoSwG8AdTT64YittdSAEVLL6r5iV9JCqB8
 9Dg1/e525oN8FrzYm21ctJGEBL49KQ6VKvpn/wE4qQRdyiC8rQAAAABJRU5ErkJggg==
-"""
+'''
 
 
 def thumbnail():
@@ -56,8 +56,8 @@ def thumbnail():
     return icon
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     icon = thumbnail()
-    f = open("thumbnail.png","wb")
+    f = open('thumbnail.png','wb')
     f.write(icon)
     f.close()
diff --git a/src/odf/userfield.py b/src/odf/userfield.py
index d9013e973b..6fdb452ff8 100644
--- a/src/odf/userfield.py
+++ b/src/odf/userfield.py
@@ -18,7 +18,7 @@
 #
 # $Id: userfield.py 447 2008-07-10 20:01:30Z roug $
 
-"""Class to show and manipulate user fields in odf documents."""
+'''Class to show and manipulate user fields in odf documents.'''
 
 
 import sys
@@ -28,7 +28,7 @@ from odf.namespaces import OFFICENS
 from odf.opendocument import load
 from odf.text import UserFieldDecl
 
-OUTENCODING = "utf-8"
+OUTENCODING = 'utf-8'
 
 
 # OpenDocument v.1.0 section 6.7.1
@@ -44,19 +44,19 @@ VALUE_TYPES = {
 
 
 class UserFields:
-    """List, view and manipulate user fields."""
+    '''List, view and manipulate user fields.'''
 
     # these attributes can be a filename or a file like object
     src_file = None
     dest_file = None
 
     def __init__(self, src=None, dest=None):
-        """Constructor
+        '''Constructor
 
         src ... source document name, file like object or None for stdin
         dest ... destination document name, file like object or None for stdout
 
-        """
+        '''
         self.src_file = src
         self.dest_file = dest
         self.document = None
@@ -65,7 +65,7 @@ class UserFields:
         if isinstance(self.src_file, (bytes, str)):
             # src_file is a filename, check if it is a zip-file
             if not zipfile.is_zipfile(self.src_file):
-                raise TypeError("%s is no odt file." % self.src_file)
+                raise TypeError(f'{self.src_file} is no odt file.')
         elif self.src_file is None:
             # use stdin if no file given
             self.src_file = sys.stdin
@@ -81,21 +81,21 @@ class UserFields:
             self.document.save(self.dest_file)
 
     def list_fields(self):
-        """List (extract) all known user-fields.
+        '''List (extract) all known user-fields.
 
         Returns list of user-field names.
 
-        """
+        '''
         return [x[0] for x in self.list_fields_and_values()]
 
     def list_fields_and_values(self, field_names=None):
-        """List (extract) user-fields with type and value.
+        '''List (extract) user-fields with type and value.
 
         field_names ... list of field names to show or None for all.
 
         Returns list of tuples (<field name>, <field type>, <value>).
 
-        """
+        '''
         self.loaddoc()
         found_fields = []
         all_fields = self.document.getElementsByType(UserFieldDecl)
@@ -114,32 +114,32 @@ class UserFields:
         return found_fields
 
     def list_values(self, field_names):
-        """Extract the contents of given field names from the file.
+        '''Extract the contents of given field names from the file.
 
         field_names ... list of field names
 
         Returns list of field values.
 
-        """
+        '''
         return [x[2] for x in self.list_fields_and_values(field_names)]
 
     def get(self, field_name):
-        """Extract the contents of this field from the file.
+        '''Extract the contents of this field from the file.
 
         Returns field value or None if field does not exist.
 
-        """
+        '''
         values = self.list_values([field_name])
         if not values:
             return None
         return values[0]
 
     def get_type_and_value(self, field_name):
-        """Extract the type and contents of this field from the file.
+        '''Extract the type and contents of this field from the file.
 
         Returns tuple (<type>, <field-value>) or None if field does not exist.
 
-        """
+        '''
         fields = self.list_fields_and_values([field_name])
         if not fields:
             return None
@@ -147,13 +147,13 @@ class UserFields:
         return value_type, value
 
     def update(self, data):
-        """Set the value of user fields. The field types will be the same.
+        '''Set the value of user fields. The field types will be the same.
 
         data ... dict, with field name as key, field value as value
 
         Returns None
 
-        """
+        '''
         self.loaddoc()
         all_fields = self.document.getElementsByType(UserFieldDecl)
         for f in all_fields:
diff --git a/src/qt/__init__.py b/src/qt/__init__.py
index 4366f1400b..d55b913aa6 100644
--- a/src/qt/__init__.py
+++ b/src/qt/__init__.py
@@ -19,5 +19,5 @@ top_level_module_names = ('QtCore',
 def __getattr__(name):
     if name in top_level_module_names:
         import importlib
-        return importlib.import_module("PyQt6." + name)
+        return importlib.import_module('PyQt6.' + name)
     raise AttributeError(name)
diff --git a/src/qt/__main__.py b/src/qt/__main__.py
index 379eac9a82..110f737b7e 100644
--- a/src/qt/__main__.py
+++ b/src/qt/__main__.py
@@ -29,7 +29,7 @@ module_lists = {
     ),
     'dbus': (
         'QtDBus',
-    )
+    ),
 }
 
 
@@ -85,6 +85,6 @@ with open(f'{base}/__init__.py', 'w') as f:
 def __getattr__(name):
     if name in top_level_module_names:
         import importlib
-        return importlib.import_module("{QT_WRAPPER}." + name)
+        return importlib.import_module('{QT_WRAPPER}.' + name)
     raise AttributeError(name)
 ''', end='', file=f)
diff --git a/src/qt/loader.py b/src/qt/loader.py
index 9ea3d178eb..803be33377 100644
--- a/src/qt/loader.py
+++ b/src/qt/loader.py
@@ -22,7 +22,7 @@ def dynamic_load(name, name_map, already_imported, qt_modules, module_names=()):
                     mod_name,
                     'with error:',
                     err,
-                    file=sys.stderr
+                    file=sys.stderr,
                 )
         if mod is not False:
             if name in module_names: