From b4dfa7378f23c016baca05afb064a7798af3dd9c Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 28 Aug 2019 16:50:30 -0400 Subject: [PATCH] py3: more work toward universal __future__s --- src/calibre/gui2/convert/__init__.py | 4 ++-- src/calibre/gui2/convert/bulk.py | 1 + src/calibre/gui2/convert/debug.py | 2 +- src/calibre/gui2/convert/font_key.py | 2 +- src/calibre/gui2/convert/gui_conversion.py | 1 + src/calibre/gui2/convert/heuristics.py | 5 +++-- src/calibre/gui2/convert/look_and_feel.py | 2 +- src/calibre/gui2/convert/metadata.py | 4 ++-- src/calibre/gui2/convert/page_setup.py | 2 +- src/calibre/gui2/convert/pdf_input.py | 1 + src/calibre/gui2/convert/pdf_output.py | 1 + src/calibre/gui2/convert/pml_output.py | 1 + src/calibre/gui2/convert/rb_output.py | 1 + src/calibre/gui2/convert/regex_builder.py | 3 ++- .../gui2/convert/search_and_replace.py | 3 ++- src/calibre/gui2/convert/snb_output.py | 1 + .../gui2/convert/structure_detection.py | 2 +- src/calibre/gui2/convert/toc.py | 2 +- src/calibre/gui2/convert/txt_input.py | 1 + src/calibre/gui2/convert/txt_output.py | 1 + src/calibre/gui2/convert/xpath_wizard.py | 3 +-- src/calibre/gui2/dbus_export/widgets.py | 10 ++++----- .../gui2/device_drivers/configwidget.py | 1 + src/calibre/gui2/dialogs/__init__.py | 3 +++ src/calibre/gui2/dialogs/add_empty_book.py | 2 ++ src/calibre/gui2/dialogs/add_from_isbn.py | 1 + src/calibre/gui2/dialogs/catalog.py | 2 +- src/calibre/gui2/dialogs/check_library.py | 2 ++ src/calibre/gui2/dialogs/choose_format.py | 3 ++- .../gui2/dialogs/choose_format_device.py | 2 ++ src/calibre/gui2/dialogs/choose_library.py | 2 +- src/calibre/gui2/dialogs/comments_dialog.py | 2 ++ src/calibre/gui2/dialogs/confirm_delete.py | 2 ++ .../gui2/dialogs/confirm_delete_location.py | 2 ++ src/calibre/gui2/dialogs/conversion_error.py | 3 ++- .../dialogs/delete_matching_from_device.py | 2 ++ .../gui2/dialogs/device_category_editor.py | 2 ++ src/calibre/gui2/dialogs/drm_error.py | 1 + .../gui2/dialogs/edit_authors_dialog.py | 2 ++ src/calibre/gui2/dialogs/message_box.py | 6 ++--- src/calibre/gui2/dialogs/metadata_bulk.py | 22 ++++++++++--------- src/calibre/gui2/dialogs/password.py | 3 +++ src/calibre/gui2/dialogs/progress.py | 4 +++- src/calibre/gui2/dialogs/quickview.py | 2 ++ .../gui2/dialogs/saved_search_editor.py | 1 + src/calibre/gui2/dialogs/scheduler.py | 7 +++--- src/calibre/gui2/dialogs/search.py | 5 +++-- src/calibre/gui2/dialogs/select_formats.py | 3 +-- src/calibre/gui2/dialogs/tag_categories.py | 3 ++- src/calibre/gui2/dialogs/tag_editor.py | 3 ++- src/calibre/gui2/dialogs/tag_list_editor.py | 3 +-- src/calibre/gui2/dialogs/template_dialog.py | 6 +++-- .../gui2/dialogs/template_line_editor.py | 1 + src/calibre/gui2/library/__init__.py | 1 + src/calibre/gui2/library/delegates.py | 11 +++++----- 55 files changed, 111 insertions(+), 57 deletions(-) diff --git a/src/calibre/gui2/convert/__init__.py b/src/calibre/gui2/convert/__init__.py index b347e648bd..97fcee0633 100644 --- a/src/calibre/gui2/convert/__init__.py +++ b/src/calibre/gui2/convert/__init__.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai -from __future__ import with_statement +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' @@ -271,7 +271,7 @@ class Widget(QWidget): def setup_widget_help(self, g): w = textwrap.TextWrapper(80) - htext = u'
%s
'%prepare_string_for_xml('\n'.join(w.wrap(g._help))) + htext = '
%s
'%prepare_string_for_xml('\n'.join(w.wrap(g._help))) g.setToolTip(htext) g.setWhatsThis(htext) g.__class__.enterEvent = lambda obj, event: self.set_help(getattr(obj, '_help', obj.toolTip())) diff --git a/src/calibre/gui2/convert/bulk.py b/src/calibre/gui2/convert/bulk.py index bbd3d685ee..c738242716 100644 --- a/src/calibre/gui2/convert/bulk.py +++ b/src/calibre/gui2/convert/bulk.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL 3' __copyright__ = '2009, John Schember ' diff --git a/src/calibre/gui2/convert/debug.py b/src/calibre/gui2/convert/debug.py index 16d4db42c9..b382f567fd 100644 --- a/src/calibre/gui2/convert/debug.py +++ b/src/calibre/gui2/convert/debug.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai -from __future__ import with_statement +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' diff --git a/src/calibre/gui2/convert/font_key.py b/src/calibre/gui2/convert/font_key.py index e7a237d4df..dc4dfbf031 100644 --- a/src/calibre/gui2/convert/font_key.py +++ b/src/calibre/gui2/convert/font_key.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai -from __future__ import with_statement +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' diff --git a/src/calibre/gui2/convert/gui_conversion.py b/src/calibre/gui2/convert/gui_conversion.py index d2b4877598..aed1ca2774 100644 --- a/src/calibre/gui2/convert/gui_conversion.py +++ b/src/calibre/gui2/convert/gui_conversion.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL 3' __copyright__ = '2009, John Schember ' diff --git a/src/calibre/gui2/convert/heuristics.py b/src/calibre/gui2/convert/heuristics.py index 41d3365fb7..e83da26eca 100644 --- a/src/calibre/gui2/convert/heuristics.py +++ b/src/calibre/gui2/convert/heuristics.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -24,8 +25,8 @@ class HeuristicsWidget(Widget, Ui_Form): def __init__(self, parent, get_option, get_help, db=None, book_id=None): Widget.__init__(self, parent, OPTIONS['pipe']['heuristics']) self.db, self.book_id = db, book_id - self.rssb_defaults = [u'', u'
', u'∗ ∗ ∗', u'• • •', u'♦ ♦ ♦', - u'† †', u'‡ ‡ ‡', u'∞ ∞ ∞', u'¤ ¤ ¤', u'§'] + self.rssb_defaults = ['', '
', '∗ ∗ ∗', '• • •', '♦ ♦ ♦', + '† †', '‡ ‡ ‡', '∞ ∞ ∞', '¤ ¤ ¤', '§'] self.initialize_options(get_option, get_help, db, book_id) self.load_histories() diff --git a/src/calibre/gui2/convert/look_and_feel.py b/src/calibre/gui2/convert/look_and_feel.py index 15470e3839..6e76aa735c 100644 --- a/src/calibre/gui2/convert/look_and_feel.py +++ b/src/calibre/gui2/convert/look_and_feel.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai -from __future__ import with_statement +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' diff --git a/src/calibre/gui2/convert/metadata.py b/src/calibre/gui2/convert/metadata.py index ec87f479a4..53afdc29eb 100644 --- a/src/calibre/gui2/convert/metadata.py +++ b/src/calibre/gui2/convert/metadata.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai -from __future__ import with_statement +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' @@ -204,7 +204,7 @@ class MetadataWidget(Widget, Ui_Form): cover = f.read() except IOError as e: d = error_dialog(self.parent(), _('Error reading file'), - _("

There was an error reading from file:
") + _file + "


"+str(e)) + _("

There was an error reading from file:
") + _file + "


"+unicode_type(e)) d.exec_() if cover: pix = QPixmap() diff --git a/src/calibre/gui2/convert/page_setup.py b/src/calibre/gui2/convert/page_setup.py index 093cda0496..91a3fc97be 100644 --- a/src/calibre/gui2/convert/page_setup.py +++ b/src/calibre/gui2/convert/page_setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai -from __future__ import with_statement +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' diff --git a/src/calibre/gui2/convert/pdf_input.py b/src/calibre/gui2/convert/pdf_input.py index c90186217a..764e29417f 100644 --- a/src/calibre/gui2/convert/pdf_input.py +++ b/src/calibre/gui2/convert/pdf_input.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL 3' __copyright__ = '2009, John Schember ' diff --git a/src/calibre/gui2/convert/pdf_output.py b/src/calibre/gui2/convert/pdf_output.py index 1192307358..98e0b99b43 100644 --- a/src/calibre/gui2/convert/pdf_output.py +++ b/src/calibre/gui2/convert/pdf_output.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL 3' __copyright__ = '2009, John Schember ' diff --git a/src/calibre/gui2/convert/pml_output.py b/src/calibre/gui2/convert/pml_output.py index 99648add98..8102697e75 100644 --- a/src/calibre/gui2/convert/pml_output.py +++ b/src/calibre/gui2/convert/pml_output.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL 3' __copyright__ = '2009, John Schember ' diff --git a/src/calibre/gui2/convert/rb_output.py b/src/calibre/gui2/convert/rb_output.py index 90be61edf0..4414a0ddd7 100644 --- a/src/calibre/gui2/convert/rb_output.py +++ b/src/calibre/gui2/convert/rb_output.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL 3' __copyright__ = '2009, John Schember ' diff --git a/src/calibre/gui2/convert/regex_builder.py b/src/calibre/gui2/convert/regex_builder.py index 50136d101f..6a02384aa6 100644 --- a/src/calibre/gui2/convert/regex_builder.py +++ b/src/calibre/gui2/convert/regex_builder.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL 3' __copyright__ = '2009, John Schember ' @@ -101,7 +102,7 @@ class RegexBuilder(QDialog, Ui_RegexBuilder): if self.match_locs: self.next.setEnabled(True) self.previous.setEnabled(True) - self.occurrences.setText(str(len(self.match_locs))) + self.occurrences.setText(unicode_type(len(self.match_locs))) def goto_previous(self): pos = self.preview.textCursor().position() diff --git a/src/calibre/gui2/convert/search_and_replace.py b/src/calibre/gui2/convert/search_and_replace.py index c31d6d9115..9125eb2d60 100644 --- a/src/calibre/gui2/convert/search_and_replace.py +++ b/src/calibre/gui2/convert/search_and_replace.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL 3' __copyright__ = '2011, John Schember , 2012 Eli Algranti ' @@ -131,7 +132,7 @@ class SearchAndReplaceWidget(Widget, Ui_Form): if filename: with codecs.open(filename, 'w', 'utf-8') as f: for search, replace in self.get_definitions(): - f.write(escape(search) + u'\n' + escape(replace) + u'\n\n') + f.write(escape(search) + '\n' + escape(replace) + '\n\n') def sr_up_clicked(self): self.cell_rearrange(-1) diff --git a/src/calibre/gui2/convert/snb_output.py b/src/calibre/gui2/convert/snb_output.py index 9296a92380..b47e7eb493 100644 --- a/src/calibre/gui2/convert/snb_output.py +++ b/src/calibre/gui2/convert/snb_output.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL 3' __copyright__ = '2010, Li Fanxi ' diff --git a/src/calibre/gui2/convert/structure_detection.py b/src/calibre/gui2/convert/structure_detection.py index dc28fb0940..2e9cd88505 100644 --- a/src/calibre/gui2/convert/structure_detection.py +++ b/src/calibre/gui2/convert/structure_detection.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai -from __future__ import with_statement +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' diff --git a/src/calibre/gui2/convert/toc.py b/src/calibre/gui2/convert/toc.py index d02d691771..34be14a83c 100644 --- a/src/calibre/gui2/convert/toc.py +++ b/src/calibre/gui2/convert/toc.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai -from __future__ import with_statement +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' diff --git a/src/calibre/gui2/convert/txt_input.py b/src/calibre/gui2/convert/txt_input.py index dc66e16278..01c7b5d42e 100644 --- a/src/calibre/gui2/convert/txt_input.py +++ b/src/calibre/gui2/convert/txt_input.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL 3' __copyright__ = '2009, John Schember ' diff --git a/src/calibre/gui2/convert/txt_output.py b/src/calibre/gui2/convert/txt_output.py index d2182296be..5837ce9b2f 100644 --- a/src/calibre/gui2/convert/txt_output.py +++ b/src/calibre/gui2/convert/txt_output.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL 3' __copyright__ = '2009, John Schember ' diff --git a/src/calibre/gui2/convert/xpath_wizard.py b/src/calibre/gui2/convert/xpath_wizard.py index 092a04e773..feb6fc123d 100644 --- a/src/calibre/gui2/convert/xpath_wizard.py +++ b/src/calibre/gui2/convert/xpath_wizard.py @@ -1,7 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai -from __future__ import with_statement -from __future__ import print_function +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' diff --git a/src/calibre/gui2/dbus_export/widgets.py b/src/calibre/gui2/dbus_export/widgets.py index 4eefe6ca19..73b5754031 100644 --- a/src/calibre/gui2/dbus_export/widgets.py +++ b/src/calibre/gui2/dbus_export/widgets.py @@ -11,7 +11,7 @@ from PyQt5.Qt import ( QObject, QMenuBar, QAction, QEvent, QSystemTrayIcon, QApplication, Qt) from calibre.constants import iswindows, isosx -from polyglot.builtins import range +from polyglot.builtins import range, unicode_type UNITY_WINDOW_REGISTRAR = ('com.canonical.AppMenu.Registrar', '/com/canonical/AppMenu/Registrar', 'com.canonical.AppMenu.Registrar') STATUS_NOTIFIER = ("org.kde.StatusNotifierWatcher", "/StatusNotifierWatcher", "org.kde.StatusNotifierWatcher") @@ -124,7 +124,7 @@ class Factory(QObject): import dbus self.dbus = dbus except ImportError as err: - log('Failed to import dbus, with error:', str(err)) + log('Failed to import dbus, with error:', unicode_type(err)) self.dbus = None self.menu_registrar = None @@ -163,7 +163,7 @@ class Factory(QObject): self._bus.watch_name_owner(UNITY_WINDOW_REGISTRAR[0], self.window_registrar_changed) self._bus.watch_name_owner(STATUS_NOTIFIER[0], self.status_notifier_registrar_changed) except Exception as err: - log('Failed to connect to DBUS session bus, with error:', str(err)) + log('Failed to connect to DBUS session bus, with error:', unicode_type(err)) self._bus = False return self._bus or None @@ -177,7 +177,7 @@ class Factory(QObject): self.detect_menu_registrar() except Exception as err: self.menu_registrar = False - log('Failed to detect window menu registrar, with error:', str(err)) + log('Failed to detect window menu registrar, with error:', unicode_type(err)) return bool(self.menu_registrar) def detect_menu_registrar(self): @@ -195,7 +195,7 @@ class Factory(QObject): self.detect_status_notifier() except Exception as err: self.status_notifier = False - log('Failed to detect window status notifier, with error:', str(err)) + log('Failed to detect window status notifier, with error:', unicode_type(err)) return bool(self.status_notifier) def detect_status_notifier(self): diff --git a/src/calibre/gui2/device_drivers/configwidget.py b/src/calibre/gui2/device_drivers/configwidget.py index 9e8970d4b6..6948a29431 100644 --- a/src/calibre/gui2/device_drivers/configwidget.py +++ b/src/calibre/gui2/device_drivers/configwidget.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL 3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/gui2/dialogs/__init__.py b/src/calibre/gui2/dialogs/__init__.py index 35fe75b80f..891411dd71 100644 --- a/src/calibre/gui2/dialogs/__init__.py +++ b/src/calibre/gui2/dialogs/__init__.py @@ -1,3 +1,6 @@ +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' + '''Various dialogs used in the GUI''' diff --git a/src/calibre/gui2/dialogs/add_empty_book.py b/src/calibre/gui2/dialogs/add_empty_book.py index 66fa354f0f..f7a212b7e2 100644 --- a/src/calibre/gui2/dialogs/add_empty_book.py +++ b/src/calibre/gui2/dialogs/add_empty_book.py @@ -1,4 +1,6 @@ #!/usr/bin/env python2 +from __future__ import absolute_import, division, print_function, unicode_literals + __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' __license__ = 'GPL v3' diff --git a/src/calibre/gui2/dialogs/add_from_isbn.py b/src/calibre/gui2/dialogs/add_from_isbn.py index 590e123cef..ffd3776a10 100644 --- a/src/calibre/gui2/dialogs/add_from_isbn.py +++ b/src/calibre/gui2/dialogs/add_from_isbn.py @@ -1,5 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' diff --git a/src/calibre/gui2/dialogs/catalog.py b/src/calibre/gui2/dialogs/catalog.py index 11ec86e87d..25a3d2a3ac 100644 --- a/src/calibre/gui2/dialogs/catalog.py +++ b/src/calibre/gui2/dialogs/catalog.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai -from __future__ import with_statement +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' diff --git a/src/calibre/gui2/dialogs/check_library.py b/src/calibre/gui2/dialogs/check_library.py index 52108e16c4..b87e8dda3c 100644 --- a/src/calibre/gui2/dialogs/check_library.py +++ b/src/calibre/gui2/dialogs/check_library.py @@ -1,4 +1,6 @@ #!/usr/bin/env python2 +from __future__ import absolute_import, division, print_function, unicode_literals + __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' __license__ = 'GPL v3' diff --git a/src/calibre/gui2/dialogs/choose_format.py b/src/calibre/gui2/dialogs/choose_format.py index 3a5461a897..c9ef37118b 100644 --- a/src/calibre/gui2/dialogs/choose_format.py +++ b/src/calibre/gui2/dialogs/choose_format.py @@ -1,4 +1,5 @@ -from __future__ import print_function +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' diff --git a/src/calibre/gui2/dialogs/choose_format_device.py b/src/calibre/gui2/dialogs/choose_format_device.py index 63af23d726..76b0c2e3c1 100644 --- a/src/calibre/gui2/dialogs/choose_format_device.py +++ b/src/calibre/gui2/dialogs/choose_format_device.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/dialogs/choose_library.py b/src/calibre/gui2/dialogs/choose_library.py index 419ed96da7..207bb1cf09 100644 --- a/src/calibre/gui2/dialogs/choose_library.py +++ b/src/calibre/gui2/dialogs/choose_library.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai -from __future__ import print_function +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' diff --git a/src/calibre/gui2/dialogs/comments_dialog.py b/src/calibre/gui2/dialogs/comments_dialog.py index 854e0a6f76..2588b8b7b6 100644 --- a/src/calibre/gui2/dialogs/comments_dialog.py +++ b/src/calibre/gui2/dialogs/comments_dialog.py @@ -1,4 +1,6 @@ #!/usr/bin/env python2 +from __future__ import absolute_import, division, print_function, unicode_literals + __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' __license__ = 'GPL v3' diff --git a/src/calibre/gui2/dialogs/confirm_delete.py b/src/calibre/gui2/dialogs/confirm_delete.py index d7cefedd00..6fadd8d684 100644 --- a/src/calibre/gui2/dialogs/confirm_delete.py +++ b/src/calibre/gui2/dialogs/confirm_delete.py @@ -1,4 +1,6 @@ #!/usr/bin/env python2 +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' diff --git a/src/calibre/gui2/dialogs/confirm_delete_location.py b/src/calibre/gui2/dialogs/confirm_delete_location.py index 3a82f399fb..12e4a78144 100644 --- a/src/calibre/gui2/dialogs/confirm_delete_location.py +++ b/src/calibre/gui2/dialogs/confirm_delete_location.py @@ -1,4 +1,6 @@ #!/usr/bin/env python2 +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' \ '2010, John Schember ' diff --git a/src/calibre/gui2/dialogs/conversion_error.py b/src/calibre/gui2/dialogs/conversion_error.py index d1fb40e096..e876120743 100644 --- a/src/calibre/gui2/dialogs/conversion_error.py +++ b/src/calibre/gui2/dialogs/conversion_error.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' @@ -19,4 +21,3 @@ class ConversionErrorDialog(QDialog, Ui_ConversionErrorDialog): def set_message(self, html): self.text.setHtml('%s -from __future__ import print_function +from __future__ import absolute_import, division, print_function, unicode_literals import re, numbers from collections import defaultdict, namedtuple @@ -32,7 +32,9 @@ from calibre.utils.date import qt_to_dt, internal_iso_format_string from calibre.utils.icu import capitalize, sort_key from calibre.utils.titlecase import titlecase from calibre.gui2.widgets import LineEditECM -from polyglot.builtins import iteritems, itervalues, unicode_type, error_message, filter +from polyglot.builtins import ( + error_message, filter, iteritems, itervalues, native_string_type, unicode_type +) Settings = namedtuple('Settings', 'remove_all remove add au aus do_aus rating pub do_series do_autonumber ' @@ -715,10 +717,10 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.destination_field.currentIndexChanged[int].connect(self.s_r_destination_field_changed) self.replace_mode.currentIndexChanged[int].connect(self.s_r_paint_results) - self.replace_func.currentIndexChanged[str].connect(self.s_r_paint_results) - self.search_for.editTextChanged[str].connect(self.s_r_paint_results) - self.replace_with.editTextChanged[str].connect(self.s_r_paint_results) - self.test_text.editTextChanged[str].connect(self.s_r_paint_results) + self.replace_func.currentIndexChanged[native_string_type].connect(self.s_r_paint_results) + self.search_for.editTextChanged[native_string_type].connect(self.s_r_paint_results) + self.replace_with.editTextChanged[native_string_type].connect(self.s_r_paint_results) + self.test_text.editTextChanged[native_string_type].connect(self.s_r_paint_results) self.comma_separated.stateChanged.connect(self.s_r_paint_results) self.case_sensitive.stateChanged.connect(self.s_r_paint_results) self.s_r_src_ident.currentIndexChanged[int].connect(self.s_r_identifier_type_changed) @@ -745,7 +747,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.query_field.addItem("") self.query_field_values = sorted(self.queries, key=sort_key) self.query_field.addItems(self.query_field_values) - self.query_field.currentIndexChanged[str].connect(self.s_r_query_change) + self.query_field.currentIndexChanged[native_string_type].connect(self.s_r_query_change) self.query_field.setCurrentIndex(0) self.search_field.setCurrentIndex(0) self.s_r_search_field_changed(0) @@ -774,14 +776,14 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): else: val = mi.get(field, None) if isinstance(val, (numbers.Number, bool)): - val = str(val) + val = unicode_type(val) elif fm['is_csp']: # convert the csp dict into a list id_type = unicode_type(self.s_r_src_ident.currentText()) if id_type: val = [val.get(id_type, '')] else: - val = [u'%s:%s'%(t[0], t[1]) for t in iteritems(val)] + val = ['%s:%s'%(t[0], t[1]) for t in iteritems(val)] if val is None: val = [] if fm['is_multiple'] else [''] elif not fm['is_multiple']: @@ -959,7 +961,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): dest_val = [dest_val.get(dst_id_type, '')] else: # convert the csp dict into a list - dest_val = [u'%s:%s'%(t[0], t[1]) for t in iteritems(dest_val)] + dest_val = ['%s:%s'%(t[0], t[1]) for t in iteritems(dest_val)] if dest_val is None: dest_val = [] elif not isinstance(dest_val, list): diff --git a/src/calibre/gui2/dialogs/password.py b/src/calibre/gui2/dialogs/password.py index 708cc9d1ba..6c1d3580a6 100644 --- a/src/calibre/gui2/dialogs/password.py +++ b/src/calibre/gui2/dialogs/password.py @@ -1,5 +1,8 @@ +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' + import re from PyQt5.Qt import QDialog, QLineEdit, Qt diff --git a/src/calibre/gui2/dialogs/progress.py b/src/calibre/gui2/dialogs/progress.py index 63a44a90d3..53f8110d57 100644 --- a/src/calibre/gui2/dialogs/progress.py +++ b/src/calibre/gui2/dialogs/progress.py @@ -1,4 +1,6 @@ #!/usr/bin/env python2 +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' @@ -16,7 +18,7 @@ class ProgressDialog(QDialog): canceled_signal = pyqtSignal() - def __init__(self, title, msg=u'\u00a0', min=0, max=99, parent=None, cancelable=True, icon=None): + def __init__(self, title, msg='\u00a0', min=0, max=99, parent=None, cancelable=True, icon=None): QDialog.__init__(self, parent) if icon is None: self.l = l = QVBoxLayout(self) diff --git a/src/calibre/gui2/dialogs/quickview.py b/src/calibre/gui2/dialogs/quickview.py index 305e66d74f..35dbf8d9f2 100644 --- a/src/calibre/gui2/dialogs/quickview.py +++ b/src/calibre/gui2/dialogs/quickview.py @@ -1,4 +1,6 @@ #!/usr/bin/env python2 +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' diff --git a/src/calibre/gui2/dialogs/saved_search_editor.py b/src/calibre/gui2/dialogs/saved_search_editor.py index f8a87b89c4..ec100c7f8f 100644 --- a/src/calibre/gui2/dialogs/saved_search_editor.py +++ b/src/calibre/gui2/dialogs/saved_search_editor.py @@ -1,6 +1,7 @@ #!/usr/bin/env python2 # vim:fileencoding=utf-8 # License: GPLv3 Copyright: 2008, Kovid Goyal +from __future__ import absolute_import, division, print_function, unicode_literals from PyQt5.Qt import ( diff --git a/src/calibre/gui2/dialogs/scheduler.py b/src/calibre/gui2/dialogs/scheduler.py index e5c14ca357..a1f1c1f605 100644 --- a/src/calibre/gui2/dialogs/scheduler.py +++ b/src/calibre/gui2/dialogs/scheduler.py @@ -1,4 +1,5 @@ -from __future__ import with_statement +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' @@ -477,7 +478,7 @@ class SchedulerDialog(QDialog): self.recipe_model.un_schedule_recipe(urn) add_title_tag = self.add_title_tag.isChecked() - keep_issues = u'0' + keep_issues = '0' if self.keep_issues.isEnabled(): keep_issues = unicode_type(self.keep_issues.value()) custom_tags = unicode_type(self.custom_tags.text()).strip() @@ -556,7 +557,7 @@ class SchedulerDialog(QDialog): self.schedule_stack.currentWidget().initialize(typ, sch) add_title_tag, custom_tags, keep_issues = customize_info self.add_title_tag.setChecked(add_title_tag) - self.custom_tags.setText(u', '.join(custom_tags)) + self.custom_tags.setText(', '.join(custom_tags)) self.last_downloaded.setText(_('Last downloaded:') + ' ' + ld_text) try: keep_issues = int(keep_issues) diff --git a/src/calibre/gui2/dialogs/search.py b/src/calibre/gui2/dialogs/search.py index 27b7e73867..38e87dd21f 100644 --- a/src/calibre/gui2/dialogs/search.py +++ b/src/calibre/gui2/dialogs/search.py @@ -1,4 +1,5 @@ -from __future__ import print_function +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' @@ -200,7 +201,7 @@ def create_date_tab(self, db): dm.addItem(text, val) self.date_day = dd = add(_('&day'), QSpinBox(w)) dd.setRange(0, 31) - dd.setSpecialValueText(u' \xa0') + dd.setSpecialValueText(' \xa0') h.addStretch(10) w.h3 = h = QHBoxLayout() diff --git a/src/calibre/gui2/dialogs/select_formats.py b/src/calibre/gui2/dialogs/select_formats.py index 8fb53c015c..56022a9bdc 100644 --- a/src/calibre/gui2/dialogs/select_formats.py +++ b/src/calibre/gui2/dialogs/select_formats.py @@ -1,7 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai -from __future__ import with_statement -from __future__ import print_function +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' diff --git a/src/calibre/gui2/dialogs/tag_categories.py b/src/calibre/gui2/dialogs/tag_categories.py index 52756a5a8a..43f975fe85 100644 --- a/src/calibre/gui2/dialogs/tag_categories.py +++ b/src/calibre/gui2/dialogs/tag_categories.py @@ -1,5 +1,6 @@ -__license__ = 'GPL v3' +from __future__ import absolute_import, division, print_function, unicode_literals +__license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' from PyQt5.Qt import ( diff --git a/src/calibre/gui2/dialogs/tag_editor.py b/src/calibre/gui2/dialogs/tag_editor.py index a5f16ff706..b801a37b73 100644 --- a/src/calibre/gui2/dialogs/tag_editor.py +++ b/src/calibre/gui2/dialogs/tag_editor.py @@ -1,4 +1,5 @@ -from __future__ import print_function +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' diff --git a/src/calibre/gui2/dialogs/tag_list_editor.py b/src/calibre/gui2/dialogs/tag_list_editor.py index 92aed628c1..eaeaa62916 100644 --- a/src/calibre/gui2/dialogs/tag_list_editor.py +++ b/src/calibre/gui2/dialogs/tag_list_editor.py @@ -1,7 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=utf-8 # License: GPLv3 Copyright: 2008, Kovid Goyal - from __future__ import absolute_import, division, print_function, unicode_literals from PyQt5.Qt import (Qt, QDialog, QTableWidgetItem, QIcon, QByteArray, QSize, @@ -68,7 +67,7 @@ class NameTableWidgetItem(QTableWidgetItem): class CountTableWidgetItem(QTableWidgetItem): def __init__(self, count): - QTableWidgetItem.__init__(self, str(count)) + QTableWidgetItem.__init__(self, unicode_type(count)) self._count = count def __ge__(self, other): diff --git a/src/calibre/gui2/dialogs/template_dialog.py b/src/calibre/gui2/dialogs/template_dialog.py index 7f8838933a..6c9a154d10 100644 --- a/src/calibre/gui2/dialogs/template_dialog.py +++ b/src/calibre/gui2/dialogs/template_dialog.py @@ -1,4 +1,6 @@ #!/usr/bin/env python2 +from __future__ import absolute_import, division, print_function, unicode_literals + __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' __license__ = 'GPL v3' @@ -20,7 +22,7 @@ from calibre.ebooks.metadata.book.formatter import SafeFormat from calibre.library.coloring import (displayable_columns, color_row_key) from calibre.gui2 import error_dialog, choose_files, pixmap_to_data from calibre.utils.localization import localize_user_manual_link -from polyglot.builtins import unicode_type +from polyglot.builtins import native_string_type, unicode_type class ParenPosition: @@ -330,7 +332,7 @@ class TemplateDialog(QDialog, Ui_TemplateDialog): self.function.addItem('') self.function.addItems(func_names) self.function.setCurrentIndex(0) - self.function.currentIndexChanged[str].connect(self.function_changed) + self.function.currentIndexChanged[native_string_type].connect(self.function_changed) self.textbox_changed() self.rule = (None, '') diff --git a/src/calibre/gui2/dialogs/template_line_editor.py b/src/calibre/gui2/dialogs/template_line_editor.py index a33f691a7c..9db863e5c1 100644 --- a/src/calibre/gui2/dialogs/template_line_editor.py +++ b/src/calibre/gui2/dialogs/template_line_editor.py @@ -1,5 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' diff --git a/src/calibre/gui2/library/__init__.py b/src/calibre/gui2/library/__init__.py index 0dfc895552..d298f22d07 100644 --- a/src/calibre/gui2/library/__init__.py +++ b/src/calibre/gui2/library/__init__.py @@ -1,5 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py index b5192b280f..cfd040c981 100644 --- a/src/calibre/gui2/library/delegates.py +++ b/src/calibre/gui2/library/delegates.py @@ -1,5 +1,6 @@ #!/usr/bin/env python2 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai +from __future__ import absolute_import, division, print_function, unicode_literals __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' @@ -51,7 +52,7 @@ class UpdateEditorGeometry(object): else: # The line edit box seems to extend by the space consumed by an 'M'. # So add that to the text - text = self.displayText(index.data(Qt.DisplayRole), QLocale()) + u'M' + text = self.displayText(index.data(Qt.DisplayRole), QLocale()) + 'M' srect = style.itemTextRect(fm, editor.geometry(), Qt.AlignLeft, False, text) new_width = srect.width() @@ -581,7 +582,7 @@ class CcNumberDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{ val = editor.maximum() text = editor.textFromValue(val) srect = style.itemTextRect(fm, editor.geometry(), Qt.AlignLeft, False, - text + u'M') + text + 'M') return srect.width() # }}} @@ -619,7 +620,7 @@ class CcEnumDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{ def get_required_width(self, editor, style, fm): srect = style.itemTextRect(fm, editor.geometry(), Qt.AlignLeft, False, - self.longest_text + u'M') + self.longest_text + 'M') return srect.width() def setEditorData(self, editor, index): @@ -722,7 +723,7 @@ class CcBoolDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{ def get_required_width(self, editor, style, fm): srect = style.itemTextRect(fm, editor.geometry(), Qt.AlignLeft, False, - self.longest_text + u'M') + self.longest_text + 'M') return srect.width() + editor.iconSize().width() def setModelData(self, editor, model, index): @@ -754,7 +755,7 @@ class CcTemplateDelegate(QStyledItemDelegate): # {{{ m = index.model() mi = m.db.get_metadata(index.row(), index_is_id=False) if check_key_modifier(Qt.ControlModifier): - text = u'' + text = '' else: text = m.custom_columns[m.column_map[index.column()]]['display']['composite_template'] editor = TemplateDialog(parent, text, mi)