Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

sorted() is always a list and takes any iterable

Browse Source
This commit is contained in:
Eli Schwartz 2019-09-01 23:27:25 -04:00 committed by Kovid Goyal
parent 00559bef8f
commit 519cf86786
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/preferences/behavior.py
View File

@ -45,7 +45,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
r('upload_news_to_device', config) r('upload_news_to_device', config)
r('delete_news_from_library_on_upload', config) r('delete_news_from_library_on_upload', config)
output_formats = list(sorted(available_output_formats())) output_formats = sorted(available_output_formats())
output_formats.remove('oeb') output_formats.remove('oeb')
choices = [(x.upper(), x) for x in output_formats] choices = [(x.upper(), x) for x in output_formats]
r('output_format', prefs, choices=choices, setting=OutputFormatSetting) r('output_format', prefs, choices=choices, setting=OutputFormatSetting)

2
src/calibre/gui2/preferences/look_feel.py
View File

@ -496,7 +496,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
choices |= {'search'} choices |= {'search'}
self.opt_categories_using_hierarchy.update_items_cache(choices) self.opt_categories_using_hierarchy.update_items_cache(choices)
r('categories_using_hierarchy', db.prefs, setting=CommaSeparatedList, r('categories_using_hierarchy', db.prefs, setting=CommaSeparatedList,
choices=sorted(list(choices), key=sort_key)) choices=sorted(choices, key=sort_key))
fm = db.field_metadata fm = db.field_metadata
choices = sorted(((fm[k]['name'], k) for k in fm.displayable_field_keys() if fm[k]['name']), choices = sorted(((fm[k]['name'], k) for k in fm.displayable_field_keys() if fm[k]['name']),