From ea498af93c70f8b9aada5a0fa7d5129cdb71ff36 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 21 Oct 2024 18:50:32 +0530 Subject: [PATCH] Cleanup previous PR --- src/calibre/ebooks/conversion/plugins/pdb_output.py | 2 +- src/calibre/ebooks/pdb/__init__.py | 2 +- src/calibre/linux.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/ebooks/conversion/plugins/pdb_output.py b/src/calibre/ebooks/conversion/plugins/pdb_output.py index a1cecafd82..305d729353 100644 --- a/src/calibre/ebooks/conversion/plugins/pdb_output.py +++ b/src/calibre/ebooks/conversion/plugins/pdb_output.py @@ -20,7 +20,7 @@ class PDBOutput(OutputFormatPlugin): OptionRecommendation(name='format', recommended_value='doc', level=OptionRecommendation.LOW, short_switch='f', choices=ALL_FORMAT_WRITERS, - help=(_('Format to use inside the PDB container. Choices are:') + ', '.join(ALL_FORMAT_WRITERS))), + help=(_('Format to use inside the PDB container. Choices are: ') + ', '.join(ALL_FORMAT_WRITERS))), OptionRecommendation(name='pdb_output_encoding', recommended_value='cp1252', level=OptionRecommendation.LOW, help=_('Specify the character encoding of the output document. ' diff --git a/src/calibre/ebooks/pdb/__init__.py b/src/calibre/ebooks/pdb/__init__.py index b99ce1b3c2..c90a57c1d4 100644 --- a/src/calibre/ebooks/pdb/__init__.py +++ b/src/calibre/ebooks/pdb/__init__.py @@ -31,7 +31,7 @@ def _import_readers(): } -ALL_FORMAT_WRITERS = ('doc', 'ereader', 'ztxt') # keep sorted alphabetically +ALL_FORMAT_WRITERS = 'doc', 'ereader', 'ztxt' # keep sorted alphabetically FORMAT_WRITERS = None diff --git a/src/calibre/linux.py b/src/calibre/linux.py index 1237ffd413..5d5a6fdef5 100644 --- a/src/calibre/linux.py +++ b/src/calibre/linux.py @@ -289,7 +289,7 @@ class ZshCompleter: # {{{ elif opt.choices: arg += "(%s)"%'|'.join(opt.choices) elif set(file_map).intersection(set(opt._long_opts)): - k = list(set(file_map).intersection(set(opt._long_opts))) + k = tuple(set(file_map).intersection(set(opt._long_opts))) exts = file_map[k[0]] if exts: exts = ('*.%s'%x for x in sorted(exts + [x.upper() for x in exts]))