From 6e27ecd2b98dff7569a6fccfa016cc1b33c156dc Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Wed, 18 Jan 2017 17:40:50 -0800 Subject: [PATCH] =?UTF-8?q?Finalize=20=E2=80=98exec=E2=80=99=20migration?= =?UTF-8?q?=20and=20make=20it=20backward=20compatibility=20for=20now?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ocrmypdf/__init__.py | 11 ++++++++--- ocrmypdf/exec/tesseract.py | 2 +- ocrmypdf/helpers.py | 4 ++++ ocrmypdf/pipeline.py | 4 ++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ocrmypdf/__init__.py b/ocrmypdf/__init__.py index 8a52d3f3..1efe3991 100644 --- a/ocrmypdf/__init__.py +++ b/ocrmypdf/__init__.py @@ -1,4 +1,3 @@ -import os import pkg_resources PROGRAM_NAME = 'ocrmypdf' @@ -6,5 +5,11 @@ PROGRAM_NAME = 'ocrmypdf' VERSION = pkg_resources.get_distribution('ocrmypdf').version -def page_number(input_file): - return int(os.path.basename(input_file)[0:6]) +# These imports are for v4.x backward compatibility for consumers of ocrmypdf +# (if any). They are deprecated and will be removed in v5.x. +from .exec import ghostscript, qpdf, tesseract, unpaper, get_program +from .exceptions import ExitCode +from .helpers import page_number, is_iterable_notstr + + + diff --git a/ocrmypdf/exec/tesseract.py b/ocrmypdf/exec/tesseract.py index 40dd4d54..7eea3df7 100644 --- a/ocrmypdf/exec/tesseract.py +++ b/ocrmypdf/exec/tesseract.py @@ -7,7 +7,7 @@ import re import shutil from functools import lru_cache from ..exceptions import MissingDependencyError -from .. import page_number +from ..helpers import page_number from . import get_program from collections import namedtuple from textwrap import dedent diff --git a/ocrmypdf/helpers.py b/ocrmypdf/helpers.py index 17ec0f91..8da245db 100644 --- a/ocrmypdf/helpers.py +++ b/ocrmypdf/helpers.py @@ -49,3 +49,7 @@ def re_symlink(input_file, soft_link_name, log=None): def is_iterable_notstr(thing): return isinstance(thing, Iterable) and not isinstance(thing, str) + + +def page_number(input_file): + return int(os.path.basename(input_file)[0:6]) diff --git a/ocrmypdf/pipeline.py b/ocrmypdf/pipeline.py index b9395297..a4ea9ba7 100644 --- a/ocrmypdf/pipeline.py +++ b/ocrmypdf/pipeline.py @@ -24,11 +24,11 @@ from ruffus import formatter, regex, Pipeline, suffix from .hocrtransform import HocrTransform from .pageinfo import pdf_get_all_pageinfo from .pdfa import generate_pdfa_def, file_claims_pdfa -from .helpers import re_symlink, is_iterable_notstr +from .helpers import re_symlink, is_iterable_notstr, page_number from .exec import ghostscript, tesseract, qpdf from .exceptions import * from . import leptonica -from . import page_number, PROGRAM_NAME, VERSION +from . import PROGRAM_NAME, VERSION VECTOR_PAGE_DPI = 400