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

@@ -1,10 +1,9 @@
 #!/usr/bin/env python
 # vim:fileencoding=utf-8
 # License: GPLv3 Copyright: 2008, Kovid Goyal <kovid at kovidgoyal.net>
-
+from __future__ import print_function
 
 import importlib
-from __future__ import print_function
 import json
 import re
 import socket

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 <kovid@kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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'

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

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid@kovidgoyal.net>'

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

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 <kovid@kovidgoyal.net>'

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 <A.van.der.Neut@ruamel.eu>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid@kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid@kovidgoyal.net>'

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 <kovid@kovidgoyal.net>'

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 <kovid@kovidgoyal.net>'

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 <kovid@kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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.

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 <kovid@kovidgoyal.net>'

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 <kovid@kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid@kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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'))

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 <kovid at kovidgoyal.net>'

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

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid@kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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

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

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

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

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

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

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

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

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

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'

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 <kovid at kovidgoyal.net>'

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 (

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid@kovidgoyal.net>'

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 <kovid@kovidgoyal.net>'

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 <kovid@kovidgoyal.net>'

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)

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

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid@kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'

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
 

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 <kovid at kovidgoyal.net>'

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 <kovid@kovidgoyal.net>'

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

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():

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'

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 <kovid at kovidgoyal.net>'