pep8

src/calibre/gui2/preferences/look_feel.py

@@ -5,7 +5,6 @@ __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import json
 from collections import defaultdict
 from functools import partial
 from threading import Thread
@@ -36,7 +35,6 @@ from qt.core import (
     Qt,
     QTableWidget,
     QTableWidgetItem,
-    QTabWidget,
     QVBoxLayout,
     QWidget,
     pyqtSignal,
@@ -46,32 +44,13 @@ from calibre import human_readable
 from calibre.constants import ismacos, iswindows
 from calibre.ebooks.metadata.book.render import DEFAULT_AUTHOR_LINK
 from calibre.ebooks.metadata.sources.prefs import msprefs
-from calibre.gui2 import (
+from calibre.gui2 import config, default_author_link, error_dialog, gprefs, icon_resource_manager, open_local_file, qt_app, question_dialog
-    choose_files,
-    choose_save_file,
-    config,
-    default_author_link,
-    error_dialog,
-    gprefs,
-    icon_resource_manager,
-    open_local_file,
-    qt_app,
-    question_dialog,
-)
-
 from calibre.gui2.custom_column_widgets import get_field_list as em_get_field_list
 from calibre.gui2.dialogs.quickview import get_qv_field_list
 from calibre.gui2.library.alternate_views import CM_TO_INCH, auto_height
 from calibre.gui2.preferences import ConfigWidgetBase, Setting, set_help_tips, test_widget
 from calibre.gui2.preferences.coloring import EditRules
-from calibre.gui2.preferences.look_feel_tabs import (
+from calibre.gui2.preferences.look_feel_tabs import DisplayedFields, export_layout, import_layout, move_field_down, move_field_up, reset_layout
-    DisplayedFields,
-    export_layout,
-    import_layout,
-    move_field_down,
-    move_field_up,
-    reset_layout,
-)
 from calibre.gui2.preferences.look_feel_ui import Ui_Form
 from calibre.gui2.widgets import BusyCursor
 from calibre.gui2.widgets2 import Dialog

src/calibre/gui2/preferences/look_feel_tabs/__init__.py

@@ -9,13 +9,7 @@ import json
 
 from qt.core import QAbstractListModel, QIcon, QItemSelectionModel, Qt
 
-from calibre.gui2 import (
+from calibre.gui2 import choose_files, choose_save_file, error_dialog
-    choose_files,
-    choose_save_file,
-    config,
-    error_dialog,
-    gprefs,
-)
 from calibre.gui2.book_details import get_field_list
 
 
@@ -108,6 +102,7 @@ class DisplayedFields(QAbstractListModel):  # {{{
             self.changed = True
             return idx
 
+
 def export_layout(in_widget, model=None):
     filename = choose_save_file(in_widget, 'look_feel_prefs_import_export_field_list',
             _('Save column list to file'),
@@ -120,6 +115,7 @@ def export_layout(in_widget, model=None):
             error_dialog(in_widget, _('Export field layout'),
                          _('<p>Could not write field list. Error:<br>%s')%err, show=True)
 
+
 def import_layout(in_widget, model=None):
     filename = choose_files(in_widget, 'look_feel_prefs_import_export_field_list',
             _('Load column list from file'),
@@ -134,6 +130,7 @@ def import_layout(in_widget, model=None):
             error_dialog(in_widget, _('Import layout'),
                          _('<p>Could not read field list. Error:<br>%s')%err, show=True)
 
+
 def reset_layout(in_widget, model=None):
     model.initialize(use_defaults=True)
     in_widget.changed_signal.emit()

src/calibre/gui2/preferences/look_feel_tabs/cover_view.py

@@ -10,7 +10,7 @@ from qt.core import QKeySequence
 
 from calibre.gui2 import config, gprefs
 from calibre.gui2.dialogs.template_dialog import TemplateDialog
-from calibre.gui2.preferences import LazyConfigWidgetBase, ConfigWidgetBase, set_help_tips
+from calibre.gui2.preferences import ConfigWidgetBase, LazyConfigWidgetBase, set_help_tips
 from calibre.gui2.preferences.look_feel_tabs.cover_view_ui import Ui_Form
 
 

src/calibre/gui2/preferences/look_feel_tabs/tb_display.py

@@ -10,16 +10,10 @@ from functools import partial
 from calibre.db.categories import is_standard_category
 from calibre.gui2 import config, gprefs
 from calibre.gui2.preferences import ConfigWidgetBase, LazyConfigWidgetBase
-from calibre.gui2.preferences.look_feel_tabs import (
+from calibre.gui2.preferences.look_feel_tabs import DisplayedFields, export_layout, import_layout, move_field_down, move_field_up, reset_layout
-     DisplayedFields,
-     import_layout,
-     export_layout,
-     move_field_down,
-     move_field_up,
-     reset_layout
- )
 from calibre.gui2.preferences.look_feel_tabs.tb_display_ui import Ui_Form
 
+
 class TBDisplayedFields(DisplayedFields):  # {{{
     # The code in this class depends on the fact that the tag browser is
     # initialized before this class is instantiated.

src/calibre/gui2/preferences/look_feel_tabs/tb_partitioning.py

@@ -44,7 +44,7 @@ class TBPartitionedFields(DisplayedFields):  # {{{
             ans = [[k, True] for k in cats.keys()]
             self.changed = True
         elif pref_data_override:
-            po = {k:v for k,v in pref_data_override}
+            po = dict(pref_data_override)
             ans = [[k, po.get(k, True)] for k in cats.keys()]
             self.changed = True
         else:
@@ -93,6 +93,3 @@ class TbPartitioningTab(LazyConfigWidgetBase, Ui_Form):
     def commit(self):
         self.tb_categories_to_part_model.commit()
         return ConfigWidgetBase.commit(self)
-
-
-

src/calibre/gui2/preferences/look_feel_tabs/tb_quickview.py

@@ -10,10 +10,11 @@ from functools import partial
 from calibre.gui2 import gprefs
 from calibre.gui2.actions.show_quickview import get_quickview_action_plugin
 from calibre.gui2.dialogs.quickview import get_qv_field_list
-from calibre.gui2.preferences import LazyConfigWidgetBase, ConfigWidgetBase
+from calibre.gui2.preferences import ConfigWidgetBase, LazyConfigWidgetBase
 from calibre.gui2.preferences.look_feel_tabs import DisplayedFields, move_field_down, move_field_up
 from calibre.gui2.preferences.look_feel_tabs.tb_quickview_ui import Ui_Form
 
+
 class QVDisplayedFields(DisplayedFields):  # {{{
 
     def __init__(self, db, parent=None):
@@ -70,5 +71,3 @@ class QuickviewTab(LazyConfigWidgetBase, Ui_Form):
         rr = ConfigWidgetBase.commit(self, *args)
         self.qv_display_model.commit()
         return rr
-
-