mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
python3: convert filter iterables to list in order to access as a list
This commit is contained in:
parent
2c156d3000
commit
696afe85bd
@ -54,7 +54,7 @@ def builtin_dictionaries():
|
|||||||
if _builtins is None:
|
if _builtins is None:
|
||||||
dics = []
|
dics = []
|
||||||
for lc in glob.glob(os.path.join(P('dictionaries', allow_user_override=False), '*/locales')):
|
for lc in glob.glob(os.path.join(P('dictionaries', allow_user_override=False), '*/locales')):
|
||||||
locales = filter(None, open(lc, 'rb').read().decode('utf-8').splitlines())
|
locales = list(filter(None, open(lc, 'rb').read().decode('utf-8').splitlines()))
|
||||||
locale = locales[0]
|
locale = locales[0]
|
||||||
base = os.path.dirname(lc)
|
base = os.path.dirname(lc)
|
||||||
dics.append(Dictionary(
|
dics.append(Dictionary(
|
||||||
@ -69,7 +69,7 @@ def custom_dictionaries(reread=False):
|
|||||||
if _custom is None or reread:
|
if _custom is None or reread:
|
||||||
dics = []
|
dics = []
|
||||||
for lc in glob.glob(os.path.join(config_dir, 'dictionaries', '*/locales')):
|
for lc in glob.glob(os.path.join(config_dir, 'dictionaries', '*/locales')):
|
||||||
locales = filter(None, open(lc, 'rb').read().decode('utf-8').splitlines())
|
locales = list(filter(None, open(lc, 'rb').read().decode('utf-8').splitlines()))
|
||||||
try:
|
try:
|
||||||
name, locale, locales = locales[0], locales[1], locales[1:]
|
name, locale, locales = locales[0], locales[1], locales[1:]
|
||||||
except IndexError:
|
except IndexError:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user