Auto fix excess blank lines

2025-07-09 03:04:10 -04:00 · 2019-11-20 07:29:37 +05:30 · 2019-11-20 07:29:37 +05:30 · 01b0fba8ad
commit 01b0fba8ad
parent 4f47385bd5
162 changed files with 1 additions and 168 deletions
--- a/bypy/macos/main.py
+++ b/bypy/macos/main.py
@ -2,8 +2,6 @@
 # vim:fileencoding=utf-8
 # License: GPLv3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>

-
-
 import errno
 import glob
 import json
@ -504,7 +502,7 @@ class Freeze(object):
        for x in (
                'usb-1.0.0', 'mtp.9', 'chm.0', 'sqlite3.0', 'hunspell-1.7.0',
                'icudata.64', 'icui18n.64', 'icuio.64', 'icuuc.64', 'hyphen.0',
-                'xslt.1', 'exslt.0', 'xml2.2', 'z.1', 'unrar',
+                'xslt.1', 'exslt.0', 'xml2.2', 'z.1', 'unrar', 'lzma.5',
                'crypto.1.0.0', 'ssl.1.0.0', 'iconv.2',  # 'ltdl.7'
        ):
            print('\nAdding', x)
--- a/bypy/windows/main.py
+++ b/bypy/windows/main.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>


-
 import errno
 import glob
 import os
--- a/manual/plugin_examples/webengine_demo/init.py
+++ b/manual/plugin_examples/webengine_demo/init.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2019, Kovid Goyal <kovid at kovidgoyal.net>


-
 # The class that all Interface Action plugin wrappers must inherit from
 from calibre.customize import InterfaceActionBase

--- a/manual/plugin_examples/webengine_demo/main.py
+++ b/manual/plugin_examples/webengine_demo/main.py
@ -3,7 +3,6 @@
 # License: GPL v3 Copyright: 2019, Kovid Goyal <kovid at kovidgoyal.net>


-
 from PyQt5.Qt import QUrl
 from PyQt5.QtWebEngineWidgets import QWebEngineView

--- a/setup/browser_data.py
+++ b/setup/browser_data.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import os
 import json
 import gzip
--- a/setup/git_version.py
+++ b/setup/git_version.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2019, Eli Schwartz <eschwartz@archlinux.org>


-
 import re
 import subprocess

--- a/setup/install.py
+++ b/setup/install.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2009, Kovid Goyal <kovid at kovidgoyal.net>


-
 import atexit
 import glob
 import os
--- a/setup/port.py
+++ b/setup/port.py
@ -3,7 +3,6 @@
 # License: GPL v3 Copyright: 2019, Kovid Goyal <kovid at kovidgoyal.net>


-
 import errno
 import hashlib
 import json
--- a/setup/publish.py
+++ b/setup/publish.py
@ -2,7 +2,6 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai


-
 __license__ = 'GPL v3'
 __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
--- a/setup/test.py
+++ b/setup/test.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>


-
 import os
 import unittest

--- a/setup/unix-ci.py
+++ b/setup/unix-ci.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import os
 import shlex
 import subprocess
--- a/setup/win-ci.py
+++ b/setup/win-ci.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>


-
 import io
 import os
 import subprocess
--- a/src/calibre/db/cli/init.py
+++ b/src/calibre/db/cli/init.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import importlib


--- a/src/calibre/db/cli/cmd_add.py
+++ b/src/calibre/db/cli/cmd_add.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import os
 import sys
 from contextlib import contextmanager
--- a/src/calibre/db/cli/cmd_add_custom_column.py
+++ b/src/calibre/db/cli/cmd_add_custom_column.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import json

 from calibre import prints
--- a/src/calibre/db/cli/cmd_add_format.py
+++ b/src/calibre/db/cli/cmd_add_format.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import os
 from io import BytesIO

--- a/src/calibre/db/cli/cmd_backup_metadata.py
+++ b/src/calibre/db/cli/cmd_backup_metadata.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 from calibre import prints

 readonly = True
--- a/src/calibre/db/cli/cmd_catalog.py
+++ b/src/calibre/db/cli/cmd_catalog.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import os

 from calibre.customize.ui import available_catalog_formats, plugin_for_catalog_format
--- a/src/calibre/db/cli/cmd_check_library.py
+++ b/src/calibre/db/cli/cmd_check_library.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import csv
 import sys

--- a/src/calibre/db/cli/cmd_clone.py
+++ b/src/calibre/db/cli/cmd_clone.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import os

 from calibre import patheq
--- a/src/calibre/db/cli/cmd_custom_columns.py
+++ b/src/calibre/db/cli/cmd_custom_columns.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 from pprint import pformat

 from calibre import prints
--- a/src/calibre/db/cli/cmd_embed_metadata.py
+++ b/src/calibre/db/cli/cmd_embed_metadata.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 from calibre import prints
 from calibre.db.cli import integers_from_string
 from calibre.srv.changes import formats_added
--- a/src/calibre/db/cli/cmd_export.py
+++ b/src/calibre/db/cli/cmd_export.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import os

 from calibre.db.cli import integers_from_string
--- a/src/calibre/db/cli/cmd_list.py
+++ b/src/calibre/db/cli/cmd_list.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import json
 import os
 import sys
--- a/src/calibre/db/cli/cmd_list_categories.py
+++ b/src/calibre/db/cli/cmd_list_categories.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import csv
 import sys
 from textwrap import TextWrapper
--- a/src/calibre/db/cli/cmd_remove.py
+++ b/src/calibre/db/cli/cmd_remove.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 from calibre.db.cli import integers_from_string
 from calibre.db.delete_service import delete_service
 from calibre.srv.changes import books_deleted
--- a/src/calibre/db/cli/cmd_remove_custom_column.py
+++ b/src/calibre/db/cli/cmd_remove_custom_column.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import sys
 from calibre import prints
 from calibre.db.legacy import LibraryDatabase
--- a/src/calibre/db/cli/cmd_remove_format.py
+++ b/src/calibre/db/cli/cmd_remove_format.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 from calibre.db.delete_service import delete_service
 from calibre.srv.changes import formats_removed

--- a/src/calibre/db/cli/cmd_restore_database.py
+++ b/src/calibre/db/cli/cmd_restore_database.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 from calibre import prints
 from calibre.db.restore import Restore

--- a/src/calibre/db/cli/cmd_saved_searches.py
+++ b/src/calibre/db/cli/cmd_saved_searches.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 readonly = False
 version = 0  # change this if you change signature of implementation()

--- a/src/calibre/db/cli/cmd_search.py
+++ b/src/calibre/db/cli/cmd_search.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 from calibre import prints

 readonly = True
--- a/src/calibre/db/cli/cmd_set_custom.py
+++ b/src/calibre/db/cli/cmd_set_custom.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 from calibre import prints
 from calibre.db import _get_series_values
 from calibre.srv.changes import metadata
--- a/src/calibre/db/cli/cmd_set_metadata.py
+++ b/src/calibre/db/cli/cmd_set_metadata.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import os

 from calibre import prints
--- a/src/calibre/db/cli/cmd_show_metadata.py
+++ b/src/calibre/db/cli/cmd_show_metadata.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import sys

 from calibre import prints
--- a/src/calibre/db/cli/utils.py
+++ b/src/calibre/db/cli/utils.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 from polyglot.builtins import map

 import unicodedata
--- a/src/calibre/db/copy_to_library.py
+++ b/src/calibre/db/copy_to_library.py
@ -3,7 +3,6 @@
 # License: GPL v3 Copyright: 2019, Kovid Goyal <kovid at kovidgoyal.net>


-
 from calibre.db.utils import find_identical_books
 from calibre.utils.config import tweaks
 from calibre.utils.date import now
--- a/src/calibre/db/restore.py
+++ b/src/calibre/db/restore.py
@ -2,7 +2,6 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai


-
 __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/devices/cli.py
+++ b/src/calibre/devices/cli.py
@ -1,7 +1,6 @@
 #!/usr/bin/env python


-
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 """
--- a/src/calibre/devices/kindle/bookmark.py
+++ b/src/calibre/devices/kindle/bookmark.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__   = 'GPL v3'
 __docformat__ = 'restructuredtext en'

--- a/src/calibre/devices/kobo/init.py
+++ b/src/calibre/devices/kobo/init.py
@ -2,7 +2,6 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai


-
 __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/devices/smart_device_app/init.py
+++ b/src/calibre/devices/smart_device_app/init.py
@ -2,7 +2,6 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai


-
 __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/devices/usbms/books.py
+++ b/src/calibre/devices/usbms/books.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2009, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/devices/winusb.py
+++ b/src/calibre/devices/winusb.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>


-
 import os, string, re, sys
 from collections import namedtuple, defaultdict
 from operator import itemgetter
--- a/src/calibre/ebooks/BeautifulSoup.py
+++ b/src/calibre/ebooks/BeautifulSoup.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2019, Kovid Goyal <kovid at kovidgoyal.net>


-
 import bs4
 from bs4 import (  # noqa
    CData, Comment, Declaration, NavigableString, ProcessingInstruction,
--- a/src/calibre/ebooks/conversion/plugins/djvu_input.py
+++ b/src/calibre/ebooks/conversion/plugins/djvu_input.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, Anthon van der Neut <anthon@mnt.org>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/ebooks/conversion/plugins/htmlz_input.py
+++ b/src/calibre/ebooks/conversion/plugins/htmlz_input.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/ebooks/conversion/plugins/htmlz_output.py
+++ b/src/calibre/ebooks/conversion/plugins/htmlz_output.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/ebooks/conversion/search_replace.py
+++ b/src/calibre/ebooks/conversion/search_replace.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import regex

 REGEX_FLAGS = regex.VERSION1 | regex.WORD | regex.FULLCASE | regex.MULTILINE | regex.UNICODE
--- a/src/calibre/ebooks/epub/pages.py
+++ b/src/calibre/ebooks/epub/pages.py
@ -3,7 +3,6 @@ Add page mapping information to an EPUB book.
 '''


-
 __license__   = 'GPL v3'
 __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/ebooks/htmlz/oeb2html.py
+++ b/src/calibre/ebooks/htmlz/oeb2html.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/ebooks/lrf/pylrs/pylrfopt.py
+++ b/src/calibre/ebooks/lrf/pylrs/pylrfopt.py
@ -1,6 +1,5 @@


-
 def _optimize(tagList, tagName, conversion):
    # copy the tag of interest plus any text
    newTagList = []
--- a/src/calibre/ebooks/metadata/book/serialize.py
+++ b/src/calibre/ebooks/metadata/book/serialize.py
@ -3,8 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
-
 from calibre.constants import preferred_encoding
 from calibre.ebooks.metadata.book import SERIALIZABLE_FIELDS
 from calibre.ebooks.metadata.book.base import Metadata
--- a/src/calibre/ebooks/metadata/kfx.py
+++ b/src/calibre/ebooks/metadata/kfx.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>, John Howell <jhowell@acm.org>'


-
 # Based on work of John Howell reversing the KFX format
 # https://www.mobileread.com/forums/showpost.php?p=3176029&postcount=89

--- a/src/calibre/ebooks/metadata/opf.py
+++ b/src/calibre/ebooks/metadata/opf.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>


-
 from lxml import etree

 from calibre.ebooks.metadata.opf2 import OPF, pretty_print
--- a/src/calibre/ebooks/metadata/opf3.py
+++ b/src/calibre/ebooks/metadata/opf3.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>


-
 import json
 import re
 from collections import defaultdict, namedtuple
--- a/src/calibre/ebooks/metadata/opf_2_to_3.py
+++ b/src/calibre/ebooks/metadata/opf_2_to_3.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>


-
 from lxml import etree

 from calibre.ebooks.metadata.opf3 import (
--- a/src/calibre/ebooks/metadata/plucker.py
+++ b/src/calibre/ebooks/metadata/plucker.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 '''
 Read meta information from Plucker pdb files.
 '''
--- a/src/calibre/ebooks/metadata/search_internet.py
+++ b/src/calibre/ebooks/metadata/search_internet.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 from polyglot.builtins import iteritems
 from polyglot.urllib import quote, quote_plus

--- a/src/calibre/ebooks/metadata/snb.py
+++ b/src/calibre/ebooks/metadata/snb.py
@ -1,7 +1,6 @@
 '''Read meta information from SNB files'''


-
 __license__   = 'GPL v3'
 __copyright__ = '2010, Li Fanxi <lifanxi@freemindworld.com>'

--- a/src/calibre/ebooks/oeb/polish/download.py
+++ b/src/calibre/ebooks/oeb/polish/download.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>


-
 import cgi
 import mimetypes
 import os
--- a/src/calibre/ebooks/oeb/polish/upgrade.py
+++ b/src/calibre/ebooks/oeb/polish/upgrade.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>


-
 import sys

 from calibre.ebooks.metadata.opf_2_to_3 import upgrade_metadata
--- a/src/calibre/ebooks/oeb/transforms/unsmarten.py
+++ b/src/calibre/ebooks/oeb/transforms/unsmarten.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/ebooks/pdb/ereader/reader202.py
+++ b/src/calibre/ebooks/pdb/ereader/reader202.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 '''
 Read content from ereader pdb file with a 116 and 202 byte header created by Makebook.
 '''
--- a/src/calibre/ebooks/pdb/header.py
+++ b/src/calibre/ebooks/pdb/header.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 '''
 Read the header data from a pdb file.
 '''
--- a/src/calibre/ebooks/pdb/plucker/reader.py
+++ b/src/calibre/ebooks/pdb/plucker/reader.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__   = 'GPL v3'
 __copyright__ = '20011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/ebooks/pdf/develop.py
+++ b/src/calibre/ebooks/pdf/develop.py
@ -3,7 +3,6 @@
 # License: GPL v3 Copyright: 2019, Kovid Goyal <kovid at kovidgoyal.net>


-
 import sys

 from PyQt5.Qt import QApplication, QUrl, QPageLayout, QPageSize, QMarginsF
--- a/src/calibre/ebooks/pdf/image_writer.py
+++ b/src/calibre/ebooks/pdf/image_writer.py
@ -3,7 +3,6 @@
 # License: GPL v3 Copyright: 2019, Kovid Goyal <kovid at kovidgoyal.net>


-
 from PyQt5.Qt import QMarginsF, QPageLayout, QPageSize, QSize

 from calibre.constants import filesystem_encoding
--- a/src/calibre/ebooks/pdf/test_html_writer.py
+++ b/src/calibre/ebooks/pdf/test_html_writer.py
@ -3,7 +3,6 @@
 # License: GPL v3 Copyright: 2019, Kovid Goyal <kovid at kovidgoyal.net>


-
 import unittest
 from .html_writer import merge_w_arrays, merge_cmaps

--- a/src/calibre/ebooks/readability/debug.py
+++ b/src/calibre/ebooks/readability/debug.py
@ -1,6 +1,5 @@


-
 def save_to_file(text, filename):
    with open(filename, 'wb') as f:
        f.write(b'<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />')
--- a/src/calibre/ebooks/render_html.py
+++ b/src/calibre/ebooks/render_html.py
@ -3,7 +3,6 @@
 # License: GPL v3 Copyright: 2019, Kovid Goyal <kovid at kovidgoyal.net>


-
 import os
 import sys

--- a/src/calibre/gui2/actions/author_mapper.py
+++ b/src/calibre/gui2/actions/author_mapper.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>


-
 from calibre.gui2 import gprefs
 from calibre.gui2.actions import InterfaceAction
 from polyglot.builtins import iteritems, map, range
--- a/src/calibre/gui2/actions/store.py
+++ b/src/calibre/gui2/actions/store.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/gui2/actions/virtual_library.py
+++ b/src/calibre/gui2/actions/virtual_library.py
@ -2,8 +2,6 @@
 # vim:fileencoding=utf-8
 # License: GPLv3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>

-
-
 from PyQt5.Qt import QToolButton, QAction

 from calibre.gui2.actions import InterfaceAction
--- a/src/calibre/gui2/add_filters.py
+++ b/src/calibre/gui2/add_filters.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>


-
 from collections import OrderedDict
 from polyglot.builtins import map, unicode_type

--- a/src/calibre/gui2/author_mapper.py
+++ b/src/calibre/gui2/author_mapper.py
@ -3,7 +3,6 @@
 # License: GPL v3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>


-
 from collections import OrderedDict

 from calibre.ebooks.metadata import authors_to_string, string_to_authors
--- a/src/calibre/gui2/changes.py
+++ b/src/calibre/gui2/changes.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 from calibre.srv.changes import (
    BooksAdded, BooksDeleted, FormatsAdded, FormatsRemoved, MetadataChanged,
    SavedSearchesChanged
--- a/src/calibre/gui2/convert/single.py
+++ b/src/calibre/gui2/convert/single.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2009, Kovid Goyal <kovid at kovidgoyal.net>


-
 import shutil

 from PyQt5.Qt import (
--- a/src/calibre/gui2/css_transform_rules.py
+++ b/src/calibre/gui2/css_transform_rules.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>


-
 from PyQt5.Qt import (
    QWidget, QVBoxLayout, QHBoxLayout, QLabel, QComboBox, QLineEdit,
    QPushButton, QSize, pyqtSignal, QMenu
--- a/src/calibre/gui2/dialogs/choose_plugin_toolbars.py
+++ b/src/calibre/gui2/dialogs/choose_plugin_toolbars.py
@ -2,7 +2,6 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai


-
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __license__   = 'GPL v3'
--- a/src/calibre/gui2/dialogs/restore_library.py
+++ b/src/calibre/gui2/dialogs/restore_library.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2011, Kovid Goyal <kovid at kovidgoyal.net>


-
 from PyQt5.Qt import (QDialog, QLabel, QVBoxLayout, QDialogButtonBox,
        QProgressBar, QSize, QTimer, pyqtSignal, Qt)

--- a/src/calibre/gui2/dialogs/saved_search_editor.py
+++ b/src/calibre/gui2/dialogs/saved_search_editor.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2008, Kovid Goyal <kovid at kovidgoyal.net>


-
 from PyQt5.Qt import (
    QFormLayout, QIcon, QLabel, QLineEdit, QListWidget, Qt, QVBoxLayout
 )
--- a/src/calibre/gui2/ebook_download.py
+++ b/src/calibre/gui2/ebook_download.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/gui2/layout_menu.py
+++ b/src/calibre/gui2/layout_menu.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 from PyQt5.Qt import (
    QFontMetrics, QHBoxLayout, QIcon, QMenu, QPainter, QPushButton, QSize,
    QSizePolicy, Qt, QWidget, QStyleOption, QStyle)
--- a/src/calibre/gui2/pin_columns.py
+++ b/src/calibre/gui2/pin_columns.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>


-
 from PyQt5.Qt import QSplitter, QTableView

 from calibre.gui2.library import DEFAULT_SORT
--- a/src/calibre/gui2/preferences/emailp.py
+++ b/src/calibre/gui2/preferences/emailp.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2010, Kovid Goyal <kovid at kovidgoyal.net>


-
 import re
 import textwrap

--- a/src/calibre/gui2/preferences/tweaks.py
+++ b/src/calibre/gui2/preferences/tweaks.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2010, Kovid Goyal <kovid at kovidgoyal.net>


-
 import textwrap
 from collections import OrderedDict
 from functools import partial
--- a/src/calibre/gui2/progress_indicator/init.py
+++ b/src/calibre/gui2/progress_indicator/init.py
@ -2,8 +2,6 @@
 # vim:fileencoding=utf-8
 # License: GPLv3 Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>

-
-
 from PyQt5.Qt import (
    QDialog, QLabel, QSizePolicy, QStackedLayout, QStackedWidget, Qt, QVBoxLayout,
    QWidget
--- a/src/calibre/gui2/qt_file_dialogs.py
+++ b/src/calibre/gui2/qt_file_dialogs.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>


-
 import os

 from PyQt5.Qt import QFileDialog, QObject
--- a/src/calibre/gui2/splash_screen.py
+++ b/src/calibre/gui2/splash_screen.py
@ -3,7 +3,6 @@
 # License: GPLv3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>


-
 from PyQt5.Qt import (
    QApplication, QBrush, QColor, QFont, QFontMetrics, QPen, QPixmap, QSplashScreen,
    Qt
--- a/src/calibre/gui2/store/init.py
+++ b/src/calibre/gui2/store/init.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/gui2/store/basic_config.py
+++ b/src/calibre/gui2/store/basic_config.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/gui2/store/config/chooser/adv_search_builder.py
+++ b/src/calibre/gui2/store/config/chooser/adv_search_builder.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/gui2/store/config/chooser/chooser_dialog.py
+++ b/src/calibre/gui2/store/config/chooser/chooser_dialog.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/gui2/store/config/chooser/chooser_widget.py
+++ b/src/calibre/gui2/store/config/chooser/chooser_widget.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/gui2/store/config/chooser/models.py
+++ b/src/calibre/gui2/store/config/chooser/models.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/gui2/store/config/chooser/results_view.py
+++ b/src/calibre/gui2/store/config/chooser/results_view.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/gui2/store/config/search/search_widget.py
+++ b/src/calibre/gui2/store/config/search/search_widget.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/gui2/store/config/store.py
+++ b/src/calibre/gui2/store/config/store.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/gui2/store/opensearch_store.py
+++ b/src/calibre/gui2/store/opensearch_store.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/src/calibre/gui2/store/search/adv_search_builder.py
+++ b/src/calibre/gui2/store/search/adv_search_builder.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-


-
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
--- a/Show More
+++ b/Show More