From 670ce2b969b1d88e6e8f037738dd5582f61d03a5 Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Thu, 4 Aug 2022 03:58:10 -0700 Subject: [PATCH] Remove support for non-callable version checker --- src/ocrmypdf/subprocess/__init__.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/ocrmypdf/subprocess/__init__.py b/src/ocrmypdf/subprocess/__init__.py index cc5b3550..1254727a 100644 --- a/src/ocrmypdf/subprocess/__init__.py +++ b/src/ocrmypdf/subprocess/__init__.py @@ -314,7 +314,7 @@ def check_external_program( program: The name of the program to test. package: The name of a software package that typically supplies this program. Usually the same as program. - version_check: A callable without arguments that retrieves the installed + version_checker: A callable without arguments that retrieves the installed version of program. need_version: The minimum required version. required_for: The name of an argument of feature that requires this program. @@ -325,10 +325,7 @@ def check_external_program( """ try: - if callable(version_checker): - found_version = version_checker() - else: # deprecated - found_version = version_checker + found_version = version_checker() except (CalledProcessError, FileNotFoundError) as e: _error_missing_program(program, package, required_for, recommended) if not recommended: