Skip to content

Commit 3c497ad

Browse files
committed
Make script python 3.5 compatible
Remove f-strings
1 parent 5cd681a commit 3c497ad

File tree

1 file changed

+7
-11
lines changed
  • lima_linguisticprocessing/src/linguisticProcessing/core/TensorFlowUnits/scripts

1 file changed

+7
-11
lines changed

lima_linguisticprocessing/src/linguisticProcessing/core/TensorFlowUnits/scripts/lima_models.py

+7-11
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def install_model(dir, fn, code, prefix_list):
103103
if mo:
104104
subdir = mo.group(1)
105105
if subdir is None or len(subdir) == 0:
106-
print(f'Error: can\'t parse \'{full_dir}\'\n',
106+
print('Error: can\'t parse \'{}\'\n'.format(full_dir),
107107
file=sys.stderr)
108108
sys.exit(1)
109109
target_dir = os.path.join(dir, subdir)
@@ -181,8 +181,7 @@ def list_installed_models(dest=None):
181181
lang = find_lang_code(code)[1]
182182
max_lang_len = max(len(lang), max_lang_len)
183183

184-
print(f'Language {" " * (max_lang_len - len("Language"))}(id ) \t '
185-
f'Tokenizer Lemmatizer Morphosyntax')
184+
print('Language {}(id ) \t Tokenizer Lemmatizer Morphosyntax'.format(" " * (max_lang_len - len("Language"))))
186185
print('---')
187186
for code in all_installed:
188187
lang = 'Unknown'
@@ -195,8 +194,7 @@ def list_installed_models(dest=None):
195194
if code in langs['lemm'] else ' --- '),
196195
'ms': langs['ms'][code] if code in langs['ms'] else ' --- ',
197196
}
198-
print(f"{lang} ({code}) \t {marks['tok']} {marks['lemm']} "
199-
f"{marks['ms']}")
197+
print("{} ({}) \t {} {} {}".format(lang, code, marks['tok'], marks['lemm'], marks['ms']))
200198

201199

202200
def list_installed_languages(target_dir):
@@ -225,29 +223,27 @@ def list_installed_languages_per_module(target_dir, prefix_list):
225223
if lang not in d:
226224
d[lang] = []
227225
if ext in d[lang]:
228-
print(f'Error: something wrong with "{f}"',
226+
print('Error: something wrong with "{}"'.format(f),
229227
file=sys.stderr)
230228
d[lang].append(ext)
231229

232230
r = {}
233231
for lang in d:
234232
if lang in r:
235-
print(f'Error: model for lang "{lang}" is installed twice?',
233+
print('Error: model for lang "{}" is installed twice?'.format(lang),
236234
file=sys.stderr)
237235
if 'morphosyntax' in prefix_list:
238236
if (len(d[lang]) != 3 or 'model' not in d[lang]
239237
or 'conf' not in d[lang] or 'bin' not in d[lang]):
240-
print(f'Error: model ({",".join(prefix_list)}) '
241-
f'for lang "{lang}" is installed incorrectly',
238+
print('Error: model ({}) for lang "{}" is installed incorrectly'.format(",".join(prefix_list), lang),
242239
file=sys.stderr)
243240
else:
244241
r[lang] = "installed"
245242
else:
246243
if (len(d[lang]) != 2 or 'model' not in d[lang]
247244
or 'conf' not in d[lang]):
248245
if 'lemmatizer' not in prefix_list or 'conf' not in d[lang]:
249-
print(f'Error: model ({",".join(prefix_list)}) '
250-
f'for lang "{lang}" is installed incorrectly',
246+
print('Error: model () for lang "{}" is installed incorrectly'.format({",".join(prefix_list)}, lang),
251247
file=sys.stderr)
252248
if ('lemmatizer' in prefix_list and 'conf' in d[lang]
253249
and 'model' not in d[lang]):

0 commit comments

Comments
 (0)