From 7c5184cef8139695c441b1798502700be4f19eb4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 4 Feb 2019 13:54:13 +0530 Subject: [PATCH] Simplify elif chain --- src/calibre/gui2/catalog/catalog_epub_mobi.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.py b/src/calibre/gui2/catalog/catalog_epub_mobi.py index 09da96c2f2..d067647ab7 100644 --- a/src/calibre/gui2/catalog/catalog_epub_mobi.py +++ b/src/calibre/gui2/catalog/catalog_epub_mobi.py @@ -140,18 +140,17 @@ class PluginWidget(QWidget,Ui_Form): # Skip disabled and incomplete rules if not rule['enabled']: continue - elif not rule['field'] or not rule['pattern']: + if not rule['field'] or not rule['pattern']: continue - elif 'prefix' in rule and rule['prefix'] is None: + if 'prefix' in rule and rule['prefix'] is None: continue - else: - if rule['field'] != _('Tags'): - # Look up custom column friendly name - rule['field'] = self.eligible_custom_fields[rule['field']]['field'] - if rule['pattern'] in [_('any value'),_('any date')]: - rule['pattern'] = '.*' - elif rule['pattern'] == _('unspecified'): - rule['pattern'] = 'None' + if rule['field'] != _('Tags'): + # Look up custom column friendly name + rule['field'] = self.eligible_custom_fields[rule['field']]['field'] + if rule['pattern'] in [_('any value'),_('any date')]: + rule['pattern'] = '.*' + elif rule['pattern'] == _('unspecified'): + rule['pattern'] = 'None' if 'prefix' in rule: pr = (rule['name'],rule['field'],rule['pattern'],rule['prefix']) else: