Fix test failures from preceding

This commit is contained in:
James R. Barlow
2023-06-19 23:25:31 -07:00
parent 7293847da7
commit 5124daa79f
2 changed files with 12 additions and 9 deletions
+7 -4
View File
@@ -51,7 +51,9 @@ def check_platform() -> None:
)
def check_options_languages(options: Namespace, ocr_engine_languages: set[str]) -> None:
def check_options_languages(
options: Namespace, ocr_engine_languages: list[str]
) -> None:
if not options.languages:
options.languages = [DEFAULT_LANGUAGE]
system_lang = locale.getlocale()[0]
@@ -59,7 +61,7 @@ def check_options_languages(options: Namespace, ocr_engine_languages: set[str])
log.debug("No language specified; assuming --language %s", DEFAULT_LANGUAGE)
if not ocr_engine_languages:
return
missing_languages = set(options.languages) - ocr_engine_languages
missing_languages = set(options.languages) - set(ocr_engine_languages)
if missing_languages:
lang_text = '\n'.join(lang for lang in missing_languages)
msg = (
@@ -71,8 +73,9 @@ def check_options_languages(options: Namespace, ocr_engine_languages: set[str])
"See the online documentation for instructions:\n"
" https://ocrmypdf.readthedocs.io/en/latest/languages.html\n"
"\n"
"Note: most languages are identified by a 3-digit ISO 639-2 Code.\n"
"For example, English is 'eng', German is 'deu', and Spanish is 'spa'."
"Note: most languages are identified by a 3-letter ISO 639-2 Code.\n"
"For example, English is 'eng', German is 'deu', and Spanish is 'spa'.\n"
"Simplified Chinese is 'chi_sim' and Traditional Chinese is 'chi_tra'."
"\n"
)
raise MissingDependencyError(msg)
+5 -5
View File
@@ -166,8 +166,8 @@ def test_language_warning(caplog):
with patch(
'ocrmypdf._validation.locale.getlocale', return_value=('en_US', 'UTF-8')
) as mock:
vd.check_options_languages(opts, {'eng'})
assert opts.languages == {'eng'}
vd.check_options_languages(opts, ['eng'])
assert opts.languages == ['eng']
assert '' in caplog.text
mock.assert_called_once()
@@ -175,8 +175,8 @@ def test_language_warning(caplog):
with patch(
'ocrmypdf._validation.locale.getlocale', return_value=('fr_FR', 'UTF-8')
) as mock:
vd.check_options_languages(opts, {'eng'})
assert opts.languages == {'eng'}
vd.check_options_languages(opts, ['eng'])
assert opts.languages == ['eng']
assert 'assuming --language' in caplog.text
mock.assert_called_once()
@@ -282,7 +282,7 @@ def test_two_languages():
parser=get_parser(),
language='fakelang1+fakelang2',
),
{'fakelang1', 'fakelang2'},
['fakelang1', 'fakelang2'],
)