Refactor obtaining version from subprocesses

Issue #196 raised the need to deal with linker warnings on --version.
This commit is contained in:
James R. Barlow
2017-11-01 01:44:36 -07:00
parent c7b8b6e18b
commit fcbf34a4d3
5 changed files with 43 additions and 60 deletions
+6 -13
View File
@@ -9,19 +9,7 @@ import sys
import os
from functools import lru_cache
from ..exceptions import MissingDependencyError
from . import get_program
@lru_cache(maxsize=1)
def version():
args_unpaper = [
get_program('unpaper'),
'--version'
]
ver = check_output(
args_unpaper, close_fds=True, universal_newlines=True,
stderr=STDOUT, timeout=5)
return ver.strip()
from . import get_program, get_version
try:
@@ -31,6 +19,11 @@ except ImportError:
raise
@lru_cache(maxsize=1)
def version():
return get_version('unpaper')
def run(input_file, output_file, dpi, log, mode_args):
args_unpaper = [
get_program('unpaper'),