From 01fbf09c0bfe67a0de3ff7b433536b4d8cc5ef82 Mon Sep 17 00:00:00 2001 From: Flaviu Tamas Date: Tue, 4 Sep 2018 19:49:44 -0400 Subject: [PATCH] Undo redundant imports & new-style raises New-style rasies need to be redone in a py2-friendly way, and the redudant imports are redudnant and can safely be removed --- setup/git_pre_commit_hook.py | 3 +-- setup/linux-installer.py | 1 - setup/vcvars.py | 1 - src/calibre/customize/zipplugin.py | 1 - src/calibre/db/backend.py | 2 +- src/calibre/db/tests/profiling.py | 1 - src/calibre/devices/mtp/driver.py | 1 - src/calibre/devices/mtp/unix/driver.py | 1 - src/calibre/devices/mtp/windows/remote.py | 1 - src/calibre/devices/prst1/driver.py | 1 - src/calibre/devices/winusb.py | 1 - src/calibre/ebooks/chardet.py | 1 - src/calibre/ebooks/djvu/djvubzzdec.py | 1 - src/calibre/ebooks/docx/container.py | 1 - src/calibre/ebooks/docx/dump.py | 1 - src/calibre/ebooks/docx/writer/container.py | 1 - src/calibre/ebooks/metadata/docx.py | 1 - src/calibre/ebooks/metadata/sources/google_images.py | 1 - src/calibre/ebooks/metadata/xmp.py | 1 - src/calibre/ebooks/mobi/debug/headers.py | 1 - src/calibre/ebooks/mobi/debug/main.py | 1 - src/calibre/ebooks/mobi/reader/index.py | 1 - src/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py | 1 - src/calibre/ebooks/oeb/polish/create.py | 1 - src/calibre/ebooks/oeb/polish/embed.py | 1 - src/calibre/ebooks/oeb/polish/parsing.py | 1 - src/calibre/ebooks/oeb/polish/subset.py | 1 - src/calibre/ebooks/oeb/polish/tests/parsing.py | 1 - src/calibre/ebooks/pdf/render/test.py | 1 - src/calibre/ebooks/readability/readability.py | 3 +-- src/calibre/ebooks/tweak.py | 1 - src/calibre/gui2/complete2.py | 1 - src/calibre/gui2/dbus_export/demo.py | 1 - src/calibre/gui2/device_drivers/mtp_folder_browser.py | 1 - src/calibre/gui2/dialogs/authors_edit.py | 1 - src/calibre/gui2/dialogs/duplicates.py | 1 - src/calibre/gui2/dialogs/opml.py | 1 - src/calibre/gui2/dialogs/trim_image.py | 1 - src/calibre/gui2/dnd.py | 1 - src/calibre/gui2/font_family_chooser.py | 1 - src/calibre/gui2/icon_theme.py | 2 +- src/calibre/gui2/library/alternate_views.py | 1 - src/calibre/gui2/linux_file_dialogs.py | 2 +- src/calibre/gui2/metadata/diff.py | 1 - src/calibre/gui2/metadata/pdf_covers.py | 1 - src/calibre/gui2/open_with.py | 1 - src/calibre/gui2/preferences/coloring.py | 1 - src/calibre/gui2/preferences/texture_chooser.py | 1 - src/calibre/gui2/store/stores/amazon_au_plugin.py | 1 - src/calibre/gui2/store/stores/amazon_ca_plugin.py | 1 - src/calibre/gui2/store/stores/amazon_de_plugin.py | 1 - src/calibre/gui2/store/stores/amazon_es_plugin.py | 1 - src/calibre/gui2/store/stores/amazon_fr_plugin.py | 1 - src/calibre/gui2/store/stores/amazon_in_plugin.py | 1 - src/calibre/gui2/store/stores/amazon_it_plugin.py | 1 - src/calibre/gui2/store/stores/amazon_plugin.py | 1 - src/calibre/gui2/store/stores/amazon_uk_plugin.py | 1 - src/calibre/gui2/tag_browser/model.py | 1 - src/calibre/gui2/tweak_book/completion/worker.py | 1 - src/calibre/gui2/tweak_book/download.py | 1 - src/calibre/gui2/tweak_book/editor/syntax/base.py | 1 - src/calibre/gui2/tweak_book/editor/syntax/html.py | 1 - src/calibre/gui2/tweak_book/reports.py | 1 - src/calibre/gui2/tweak_book/widgets.py | 1 - src/calibre/gui2/viewer/javascript.py | 1 - src/calibre/gui2/viewer/position.py | 1 - src/calibre/library/catalogs/epub_mobi.py | 1 - src/calibre/srv/http_response.py | 2 +- src/calibre/srv/metadata.py | 1 - src/calibre/srv/pre_activated.py | 1 - src/calibre/utils/fonts/sfnt/loca.py | 1 - src/calibre/utils/fonts/sfnt/metrics.py | 1 - src/calibre/utils/fonts/utils.py | 1 - src/calibre/utils/fonts/win_fonts.py | 1 - src/calibre/utils/https.py | 1 - src/calibre/utils/icu.py | 1 - src/calibre/utils/inotify.py | 1 - src/calibre/utils/ip_routing.py | 1 - src/calibre/utils/ipc/pool.py | 1 - src/calibre/utils/ipython.py | 1 - src/calibre/utils/iso8601.py | 1 - src/calibre/utils/shared_file.py | 4 ++-- src/calibre/utils/wmf/emf.py | 1 - src/css_selectors/select.py | 1 - src/css_selectors/tests.py | 1 - src/tinycss/tests/main.py | 1 - 86 files changed, 8 insertions(+), 89 deletions(-) diff --git a/setup/git_pre_commit_hook.py b/setup/git_pre_commit_hook.py index 2d199bd29f..99113de762 100755 --- a/setup/git_pre_commit_hook.py +++ b/setup/git_pre_commit_hook.py @@ -1,10 +1,9 @@ #!/usr/bin/env python # vim:fileencoding=utf-8 # License: GPLv3 Copyright: 2008, Kovid Goyal - +from __future__ import print_function import importlib -from __future__ import print_function import json import re import socket diff --git a/setup/linux-installer.py b/setup/linux-installer.py index 272607c025..21126d3267 100644 --- a/setup/linux-installer.py +++ b/setup/linux-installer.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' diff --git a/setup/vcvars.py b/setup/vcvars.py index 649d9131f4..4641ec06fd 100644 --- a/setup/vcvars.py +++ b/setup/vcvars.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/customize/zipplugin.py b/src/calibre/customize/zipplugin.py index b9b6096875..f61d2f63c5 100644 --- a/src/calibre/customize/zipplugin.py +++ b/src/calibre/customize/zipplugin.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function from future_builtins import map __license__ = 'GPL v3' diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py index 32a69c81d9..fd83e3aaf6 100644 --- a/src/calibre/db/backend.py +++ b/src/calibre/db/backend.py @@ -1626,7 +1626,7 @@ class DB(object): except EnvironmentError as err: if err.errno == errno.EEXIST: # Parent directory already exists, re-raise original exception - raise exc_info[0](exc_info[1]).with_traceback(exc_info[2]) + raise exc_info[0], exc_info[1], exc_info[2] raise finally: del exc_info diff --git a/src/calibre/db/tests/profiling.py b/src/calibre/db/tests/profiling.py index 7d5afe8ec2..c8d77301a1 100644 --- a/src/calibre/db/tests/profiling.py +++ b/src/calibre/db/tests/profiling.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/devices/mtp/driver.py b/src/calibre/devices/mtp/driver.py index ef13575369..272bca30e1 100644 --- a/src/calibre/devices/mtp/driver.py +++ b/src/calibre/devices/mtp/driver.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/devices/mtp/unix/driver.py b/src/calibre/devices/mtp/unix/driver.py index ea5ba52e89..e023ac00d2 100644 --- a/src/calibre/devices/mtp/unix/driver.py +++ b/src/calibre/devices/mtp/unix/driver.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/devices/mtp/windows/remote.py b/src/calibre/devices/mtp/windows/remote.py index 769058266c..8974388164 100644 --- a/src/calibre/devices/mtp/windows/remote.py +++ b/src/calibre/devices/mtp/windows/remote.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/devices/prst1/driver.py b/src/calibre/devices/prst1/driver.py index b72882c9ce..4d65f1ca6f 100644 --- a/src/calibre/devices/prst1/driver.py +++ b/src/calibre/devices/prst1/driver.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2011, Kovid Goyal ' diff --git a/src/calibre/devices/winusb.py b/src/calibre/devices/winusb.py index 840291683d..de1e9a9027 100644 --- a/src/calibre/devices/winusb.py +++ b/src/calibre/devices/winusb.py @@ -4,7 +4,6 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function import os, string, _winreg as winreg, re, sys from collections import namedtuple, defaultdict diff --git a/src/calibre/ebooks/chardet.py b/src/calibre/ebooks/chardet.py index 42c2142537..fd919d3c01 100644 --- a/src/calibre/ebooks/chardet.py +++ b/src/calibre/ebooks/chardet.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' diff --git a/src/calibre/ebooks/djvu/djvubzzdec.py b/src/calibre/ebooks/djvu/djvubzzdec.py index 1457b8dbb2..407794520c 100644 --- a/src/calibre/ebooks/djvu/djvubzzdec.py +++ b/src/calibre/ebooks/djvu/djvubzzdec.py @@ -2,7 +2,6 @@ # coding: utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2011, Anthon van der Neut ' diff --git a/src/calibre/ebooks/docx/container.py b/src/calibre/ebooks/docx/container.py index 9da70d997a..448ceb97c7 100644 --- a/src/calibre/ebooks/docx/container.py +++ b/src/calibre/ebooks/docx/container.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/ebooks/docx/dump.py b/src/calibre/ebooks/docx/dump.py index d3be7fd75e..b2b112c389 100644 --- a/src/calibre/ebooks/docx/dump.py +++ b/src/calibre/ebooks/docx/dump.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/ebooks/docx/writer/container.py b/src/calibre/ebooks/docx/writer/container.py index 01b27ed8ed..4d45910bc7 100644 --- a/src/calibre/ebooks/docx/writer/container.py +++ b/src/calibre/ebooks/docx/writer/container.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/ebooks/metadata/docx.py b/src/calibre/ebooks/metadata/docx.py index 94b76beecc..ceba4b7708 100644 --- a/src/calibre/ebooks/metadata/docx.py +++ b/src/calibre/ebooks/metadata/docx.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/ebooks/metadata/sources/google_images.py b/src/calibre/ebooks/metadata/sources/google_images.py index f2cf06b953..a40eca4589 100644 --- a/src/calibre/ebooks/metadata/sources/google_images.py +++ b/src/calibre/ebooks/metadata/sources/google_images.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/ebooks/metadata/xmp.py b/src/calibre/ebooks/metadata/xmp.py index dd51c4095a..9e01e8106c 100644 --- a/src/calibre/ebooks/metadata/xmp.py +++ b/src/calibre/ebooks/metadata/xmp.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2014, Kovid Goyal ' diff --git a/src/calibre/ebooks/mobi/debug/headers.py b/src/calibre/ebooks/mobi/debug/headers.py index 4e3508c137..5651f67966 100644 --- a/src/calibre/ebooks/mobi/debug/headers.py +++ b/src/calibre/ebooks/mobi/debug/headers.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/ebooks/mobi/debug/main.py b/src/calibre/ebooks/mobi/debug/main.py index 78171385db..d13155aeb0 100644 --- a/src/calibre/ebooks/mobi/debug/main.py +++ b/src/calibre/ebooks/mobi/debug/main.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/ebooks/mobi/reader/index.py b/src/calibre/ebooks/mobi/reader/index.py index 389b013fb2..1e9dcebc92 100644 --- a/src/calibre/ebooks/mobi/reader/index.py +++ b/src/calibre/ebooks/mobi/reader/index.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py b/src/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py index 59c854d3d9..887708f454 100644 --- a/src/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py +++ b/src/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2011, Kovid Goyal ' diff --git a/src/calibre/ebooks/oeb/polish/create.py b/src/calibre/ebooks/oeb/polish/create.py index ff3879390a..926b05ded4 100644 --- a/src/calibre/ebooks/oeb/polish/create.py +++ b/src/calibre/ebooks/oeb/polish/create.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/ebooks/oeb/polish/embed.py b/src/calibre/ebooks/oeb/polish/embed.py index dba76e6c41..5e2dbe7a6b 100644 --- a/src/calibre/ebooks/oeb/polish/embed.py +++ b/src/calibre/ebooks/oeb/polish/embed.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/ebooks/oeb/polish/parsing.py b/src/calibre/ebooks/oeb/polish/parsing.py index 5487156166..e89275393c 100644 --- a/src/calibre/ebooks/oeb/polish/parsing.py +++ b/src/calibre/ebooks/oeb/polish/parsing.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/ebooks/oeb/polish/subset.py b/src/calibre/ebooks/oeb/polish/subset.py index 32621f685f..888e6d169c 100644 --- a/src/calibre/ebooks/oeb/polish/subset.py +++ b/src/calibre/ebooks/oeb/polish/subset.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/ebooks/oeb/polish/tests/parsing.py b/src/calibre/ebooks/oeb/polish/tests/parsing.py index 750bb27c6c..43c81550dc 100644 --- a/src/calibre/ebooks/oeb/polish/tests/parsing.py +++ b/src/calibre/ebooks/oeb/polish/tests/parsing.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/ebooks/pdf/render/test.py b/src/calibre/ebooks/pdf/render/test.py index 94469a55a1..35600e33b3 100644 --- a/src/calibre/ebooks/pdf/render/test.py +++ b/src/calibre/ebooks/pdf/render/test.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/ebooks/readability/readability.py b/src/calibre/ebooks/readability/readability.py index 95615ed76b..537cc48085 100644 --- a/src/calibre/ebooks/readability/readability.py +++ b/src/calibre/ebooks/readability/readability.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function import re, sys from collections import defaultdict @@ -157,7 +156,7 @@ class Document: return cleaned_article except StandardError as e: self.log.exception('error getting summary: ') - raise Unparseable(str(e)).with_traceback(sys.exc_info()[2]) + raise Unparseable(str(e)), None, sys.exc_info()[2] def get_article(self, candidates, best_candidate): # Now that we have the top candidate, look through its siblings for content that might also be related. diff --git a/src/calibre/ebooks/tweak.py b/src/calibre/ebooks/tweak.py index 9cee103f2e..b4464e7020 100644 --- a/src/calibre/ebooks/tweak.py +++ b/src/calibre/ebooks/tweak.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/gui2/complete2.py b/src/calibre/gui2/complete2.py index 50630148dd..594758043e 100644 --- a/src/calibre/gui2/complete2.py +++ b/src/calibre/gui2/complete2.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/gui2/dbus_export/demo.py b/src/calibre/gui2/dbus_export/demo.py index 65f8f057ad..e3e4f7d712 100644 --- a/src/calibre/gui2/dbus_export/demo.py +++ b/src/calibre/gui2/dbus_export/demo.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2014, Kovid Goyal ' diff --git a/src/calibre/gui2/device_drivers/mtp_folder_browser.py b/src/calibre/gui2/device_drivers/mtp_folder_browser.py index c1e85557e9..b054977e82 100644 --- a/src/calibre/gui2/device_drivers/mtp_folder_browser.py +++ b/src/calibre/gui2/device_drivers/mtp_folder_browser.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/gui2/dialogs/authors_edit.py b/src/calibre/gui2/dialogs/authors_edit.py index d125c66db0..34ce34722c 100644 --- a/src/calibre/gui2/dialogs/authors_edit.py +++ b/src/calibre/gui2/dialogs/authors_edit.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/gui2/dialogs/duplicates.py b/src/calibre/gui2/dialogs/duplicates.py index 67e7c4f534..5154058095 100644 --- a/src/calibre/gui2/dialogs/duplicates.py +++ b/src/calibre/gui2/dialogs/duplicates.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/gui2/dialogs/opml.py b/src/calibre/gui2/dialogs/opml.py index 0313ae06e4..9235eea48d 100644 --- a/src/calibre/gui2/dialogs/opml.py +++ b/src/calibre/gui2/dialogs/opml.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2014, Kovid Goyal ' diff --git a/src/calibre/gui2/dialogs/trim_image.py b/src/calibre/gui2/dialogs/trim_image.py index 1457be4fa1..acac582e66 100644 --- a/src/calibre/gui2/dialogs/trim_image.py +++ b/src/calibre/gui2/dialogs/trim_image.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/gui2/dnd.py b/src/calibre/gui2/dnd.py index 243c57e93e..a46190351a 100644 --- a/src/calibre/gui2/dnd.py +++ b/src/calibre/gui2/dnd.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2011, Kovid Goyal ' diff --git a/src/calibre/gui2/font_family_chooser.py b/src/calibre/gui2/font_family_chooser.py index b649df4093..7fb0197866 100644 --- a/src/calibre/gui2/font_family_chooser.py +++ b/src/calibre/gui2/font_family_chooser.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/gui2/icon_theme.py b/src/calibre/gui2/icon_theme.py index d0995b2f1e..7083df3901 100644 --- a/src/calibre/gui2/icon_theme.py +++ b/src/calibre/gui2/icon_theme.py @@ -368,7 +368,7 @@ def create_themeball(report, progress=None, abort=None): return if errors: e = errors[0] - raise e[0](e[1]).with_traceback(e[2]) + raise e[0], e[1], e[2] if progress is not None: progress(next(num), _('Creating theme file')) diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py index 93a8e10fc6..5b8c8bd1c8 100644 --- a/src/calibre/gui2/library/alternate_views.py +++ b/src/calibre/gui2/library/alternate_views.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/gui2/linux_file_dialogs.py b/src/calibre/gui2/linux_file_dialogs.py index 8ee09193f4..656c4c10f1 100644 --- a/src/calibre/gui2/linux_file_dialogs.py +++ b/src/calibre/gui2/linux_file_dialogs.py @@ -314,7 +314,7 @@ def linux_native_dialog(name): t.start() loop.exec_(QEventLoop.ExcludeUserInputEvents) if ret[1] is not None: - raise ret[1][0](ret[1][1]).with_traceback(ret[1][2]) + raise ret[1][0], ret[1][1], ret[1][2] return ret[0] except Exception: linux_native_dialog.native_failed = True diff --git a/src/calibre/gui2/metadata/diff.py b/src/calibre/gui2/metadata/diff.py index b20a1d9e4f..45ae8fac7a 100644 --- a/src/calibre/gui2/metadata/diff.py +++ b/src/calibre/gui2/metadata/diff.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/gui2/metadata/pdf_covers.py b/src/calibre/gui2/metadata/pdf_covers.py index 897523ea6c..920628259c 100644 --- a/src/calibre/gui2/metadata/pdf_covers.py +++ b/src/calibre/gui2/metadata/pdf_covers.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/gui2/open_with.py b/src/calibre/gui2/open_with.py index 31eaf83e91..45d509e3dc 100644 --- a/src/calibre/gui2/open_with.py +++ b/src/calibre/gui2/open_with.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2015, Kovid Goyal ' diff --git a/src/calibre/gui2/preferences/coloring.py b/src/calibre/gui2/preferences/coloring.py index 27f787998c..5efb4a08d5 100644 --- a/src/calibre/gui2/preferences/coloring.py +++ b/src/calibre/gui2/preferences/coloring.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2011, Kovid Goyal ' diff --git a/src/calibre/gui2/preferences/texture_chooser.py b/src/calibre/gui2/preferences/texture_chooser.py index 075d8af0ac..bf50e95ac6 100644 --- a/src/calibre/gui2/preferences/texture_chooser.py +++ b/src/calibre/gui2/preferences/texture_chooser.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/gui2/store/stores/amazon_au_plugin.py b/src/calibre/gui2/store/stores/amazon_au_plugin.py index 021b18fba0..ef37e0a71e 100644 --- a/src/calibre/gui2/store/stores/amazon_au_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_au_plugin.py @@ -4,7 +4,6 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function store_version = 5 # Needed for dynamic plugin loading from contextlib import closing diff --git a/src/calibre/gui2/store/stores/amazon_ca_plugin.py b/src/calibre/gui2/store/stores/amazon_ca_plugin.py index 7e26085f5c..baa31f91a3 100644 --- a/src/calibre/gui2/store/stores/amazon_ca_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_ca_plugin.py @@ -4,7 +4,6 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function store_version = 7 # Needed for dynamic plugin loading from contextlib import closing diff --git a/src/calibre/gui2/store/stores/amazon_de_plugin.py b/src/calibre/gui2/store/stores/amazon_de_plugin.py index ed2b28fb43..06a6df7859 100644 --- a/src/calibre/gui2/store/stores/amazon_de_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_de_plugin.py @@ -4,7 +4,6 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function store_version = 15 # Needed for dynamic plugin loading from contextlib import closing diff --git a/src/calibre/gui2/store/stores/amazon_es_plugin.py b/src/calibre/gui2/store/stores/amazon_es_plugin.py index e0dfcef6bd..859473a660 100644 --- a/src/calibre/gui2/store/stores/amazon_es_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_es_plugin.py @@ -4,7 +4,6 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function store_version = 15 # Needed for dynamic plugin loading from contextlib import closing diff --git a/src/calibre/gui2/store/stores/amazon_fr_plugin.py b/src/calibre/gui2/store/stores/amazon_fr_plugin.py index 9c63516a81..59479b70f6 100644 --- a/src/calibre/gui2/store/stores/amazon_fr_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_fr_plugin.py @@ -4,7 +4,6 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function store_version = 15 # Needed for dynamic plugin loading from contextlib import closing diff --git a/src/calibre/gui2/store/stores/amazon_in_plugin.py b/src/calibre/gui2/store/stores/amazon_in_plugin.py index cc25b218c9..1b88c529b1 100644 --- a/src/calibre/gui2/store/stores/amazon_in_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_in_plugin.py @@ -4,7 +4,6 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function store_version = 5 # Needed for dynamic plugin loading from contextlib import closing diff --git a/src/calibre/gui2/store/stores/amazon_it_plugin.py b/src/calibre/gui2/store/stores/amazon_it_plugin.py index 1761bddf96..a9c79448fa 100644 --- a/src/calibre/gui2/store/stores/amazon_it_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_it_plugin.py @@ -4,7 +4,6 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function store_version = 15 # Needed for dynamic plugin loading from contextlib import closing diff --git a/src/calibre/gui2/store/stores/amazon_plugin.py b/src/calibre/gui2/store/stores/amazon_plugin.py index 96772c9b0a..b7ce325df4 100644 --- a/src/calibre/gui2/store/stores/amazon_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_plugin.py @@ -4,7 +4,6 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function store_version = 14 # Needed for dynamic plugin loading from contextlib import closing diff --git a/src/calibre/gui2/store/stores/amazon_uk_plugin.py b/src/calibre/gui2/store/stores/amazon_uk_plugin.py index 714575f6ea..12fb9064a4 100644 --- a/src/calibre/gui2/store/stores/amazon_uk_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_uk_plugin.py @@ -4,7 +4,6 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function store_version = 15 # Needed for dynamic plugin loading from contextlib import closing diff --git a/src/calibre/gui2/tag_browser/model.py b/src/calibre/gui2/tag_browser/model.py index f7efebac1e..cb7d3667c8 100644 --- a/src/calibre/gui2/tag_browser/model.py +++ b/src/calibre/gui2/tag_browser/model.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function from future_builtins import map __license__ = 'GPL v3' diff --git a/src/calibre/gui2/tweak_book/completion/worker.py b/src/calibre/gui2/tweak_book/completion/worker.py index bbefa174c5..4fb0c966aa 100644 --- a/src/calibre/gui2/tweak_book/completion/worker.py +++ b/src/calibre/gui2/tweak_book/completion/worker.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2014, Kovid Goyal ' diff --git a/src/calibre/gui2/tweak_book/download.py b/src/calibre/gui2/tweak_book/download.py index 7543316ea0..8a8b405e19 100644 --- a/src/calibre/gui2/tweak_book/download.py +++ b/src/calibre/gui2/tweak_book/download.py @@ -4,7 +4,6 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function from threading import Thread from PyQt5.Qt import ( diff --git a/src/calibre/gui2/tweak_book/editor/syntax/base.py b/src/calibre/gui2/tweak_book/editor/syntax/base.py index d1ecc3d7ec..dc6a12171e 100644 --- a/src/calibre/gui2/tweak_book/editor/syntax/base.py +++ b/src/calibre/gui2/tweak_book/editor/syntax/base.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/gui2/tweak_book/editor/syntax/html.py b/src/calibre/gui2/tweak_book/editor/syntax/html.py index a4774bfafc..e0296dd5e3 100644 --- a/src/calibre/gui2/tweak_book/editor/syntax/html.py +++ b/src/calibre/gui2/tweak_book/editor/syntax/html.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/calibre/gui2/tweak_book/reports.py b/src/calibre/gui2/tweak_book/reports.py index 5d70291f46..05dfc9f019 100644 --- a/src/calibre/gui2/tweak_book/reports.py +++ b/src/calibre/gui2/tweak_book/reports.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2015, Kovid Goyal ' diff --git a/src/calibre/gui2/tweak_book/widgets.py b/src/calibre/gui2/tweak_book/widgets.py index 637c2742bc..bfc7c11bec 100644 --- a/src/calibre/gui2/tweak_book/widgets.py +++ b/src/calibre/gui2/tweak_book/widgets.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2014, Kovid Goyal ' diff --git a/src/calibre/gui2/viewer/javascript.py b/src/calibre/gui2/viewer/javascript.py index 1a2afd50fe..1bc617d8b9 100644 --- a/src/calibre/gui2/viewer/javascript.py +++ b/src/calibre/gui2/viewer/javascript.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/gui2/viewer/position.py b/src/calibre/gui2/viewer/position.py index c9541b28c2..8e02683805 100644 --- a/src/calibre/gui2/viewer/position.py +++ b/src/calibre/gui2/viewer/position.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/library/catalogs/epub_mobi.py b/src/calibre/library/catalogs/epub_mobi.py index 4c0d8d5871..752db82aa3 100644 --- a/src/calibre/library/catalogs/epub_mobi.py +++ b/src/calibre/library/catalogs/epub_mobi.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/srv/http_response.py b/src/calibre/srv/http_response.py index cb43b1da85..2c244524d8 100644 --- a/src/calibre/srv/http_response.py +++ b/src/calibre/srv/http_response.py @@ -478,7 +478,7 @@ class HTTPConnection(HTTPRequest): if e.log: self.log.warn(e.log) return self.simple_response(e.http_code, msg=e.message or '', close_after_response=e.close_connection, extra_headers=eh) - raise etype(e).with_traceback(tb) + raise etype, e, tb data, output = result output = self.finalize_output(output, data, self.method is HTTP1) diff --git a/src/calibre/srv/metadata.py b/src/calibre/srv/metadata.py index 746e2a7c42..526a2e4a08 100644 --- a/src/calibre/srv/metadata.py +++ b/src/calibre/srv/metadata.py @@ -4,7 +4,6 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function import os from copy import copy from collections import namedtuple diff --git a/src/calibre/srv/pre_activated.py b/src/calibre/srv/pre_activated.py index 62819b7455..12dfaa0882 100644 --- a/src/calibre/srv/pre_activated.py +++ b/src/calibre/srv/pre_activated.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2015, Kovid Goyal ' diff --git a/src/calibre/utils/fonts/sfnt/loca.py b/src/calibre/utils/fonts/sfnt/loca.py index bff74d018a..0e3f079699 100644 --- a/src/calibre/utils/fonts/sfnt/loca.py +++ b/src/calibre/utils/fonts/sfnt/loca.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/utils/fonts/sfnt/metrics.py b/src/calibre/utils/fonts/sfnt/metrics.py index 97e5718d1b..a95ae82a0c 100644 --- a/src/calibre/utils/fonts/sfnt/metrics.py +++ b/src/calibre/utils/fonts/sfnt/metrics.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/utils/fonts/utils.py b/src/calibre/utils/fonts/utils.py index 91200d6bf4..553d8cb7e2 100644 --- a/src/calibre/utils/fonts/utils.py +++ b/src/calibre/utils/fonts/utils.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/utils/fonts/win_fonts.py b/src/calibre/utils/fonts/win_fonts.py index 0329192f6c..eec6118e6f 100644 --- a/src/calibre/utils/fonts/win_fonts.py +++ b/src/calibre/utils/fonts/win_fonts.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/utils/https.py b/src/calibre/utils/https.py index 7a5a4080e3..ee7e670c08 100644 --- a/src/calibre/utils/https.py +++ b/src/calibre/utils/https.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2014, Kovid Goyal ' diff --git a/src/calibre/utils/icu.py b/src/calibre/utils/icu.py index a2b0dc0112..e17d345a68 100644 --- a/src/calibre/utils/icu.py +++ b/src/calibre/utils/icu.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' diff --git a/src/calibre/utils/inotify.py b/src/calibre/utils/inotify.py index ed974a4346..17548c65ec 100644 --- a/src/calibre/utils/inotify.py +++ b/src/calibre/utils/inotify.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __copyright__ = '2013, Kovid Goyal ' __docformat__ = 'restructuredtext en' diff --git a/src/calibre/utils/ip_routing.py b/src/calibre/utils/ip_routing.py index 4665a2dff5..a6476b1cd2 100644 --- a/src/calibre/utils/ip_routing.py +++ b/src/calibre/utils/ip_routing.py @@ -4,7 +4,6 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function import subprocess, re from calibre.constants import iswindows, isosx diff --git a/src/calibre/utils/ipc/pool.py b/src/calibre/utils/ipc/pool.py index 517f460273..a36de998cd 100644 --- a/src/calibre/utils/ipc/pool.py +++ b/src/calibre/utils/ipc/pool.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2014, Kovid Goyal ' diff --git a/src/calibre/utils/ipython.py b/src/calibre/utils/ipython.py index 6915dfd198..4377a2c172 100644 --- a/src/calibre/utils/ipython.py +++ b/src/calibre/utils/ipython.py @@ -2,7 +2,6 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/utils/iso8601.py b/src/calibre/utils/iso8601.py index e6d533f7a5..00e6bdfc01 100644 --- a/src/calibre/utils/iso8601.py +++ b/src/calibre/utils/iso8601.py @@ -4,7 +4,6 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function from datetime import datetime from dateutil.tz import tzlocal, tzutc, tzoffset diff --git a/src/calibre/utils/shared_file.py b/src/calibre/utils/shared_file.py index d0dcee82ac..f089c9c612 100644 --- a/src/calibre/utils/shared_file.py +++ b/src/calibre/utils/shared_file.py @@ -119,7 +119,7 @@ if iswindows: } def raise_winerror(pywinerr): - raise WindowsError(pywinerr.winerror, (pywinerr.funcname or '') + b': ' + (pywinerr.strerror or '')).with_traceback(sys.exc_info()[2]) + raise WindowsError(pywinerr.winerror, (pywinerr.funcname or '') + b': ' + (pywinerr.strerror or '')), None, sys.exc_info()[2] def os_open(path, flags, mode=0o777, share_flags=FILE_SHARE_VALID_FLAGS): ''' @@ -173,7 +173,7 @@ else: return speedup.fdopen(os.open(path, flags), path, mode, buffering) def raise_winerror(x): - raise NotImplementedError().with_traceback(sys.exc_info()[2]) + raise NotImplementedError(), None, sys.exc_info()[2] def find_tests(): diff --git a/src/calibre/utils/wmf/emf.py b/src/calibre/utils/wmf/emf.py index 4349abedda..8b4ac522d2 100644 --- a/src/calibre/utils/wmf/emf.py +++ b/src/calibre/utils/wmf/emf.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' diff --git a/src/css_selectors/select.py b/src/css_selectors/select.py index e58bab4ed0..c112da802d 100644 --- a/src/css_selectors/select.py +++ b/src/css_selectors/select.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2015, Kovid Goyal ' diff --git a/src/css_selectors/tests.py b/src/css_selectors/tests.py index 1c27650310..b9ffd86da3 100644 --- a/src/css_selectors/tests.py +++ b/src/css_selectors/tests.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2015, Kovid Goyal ' diff --git a/src/tinycss/tests/main.py b/src/tinycss/tests/main.py index d66e51a57d..30ec5c39a7 100644 --- a/src/tinycss/tests/main.py +++ b/src/tinycss/tests/main.py @@ -2,7 +2,6 @@ # vim:fileencoding=utf-8 from __future__ import (unicode_literals, division, absolute_import, print_function) -from __future__ import print_function __license__ = 'GPL v3' __copyright__ = '2014, Kovid Goyal '