diff --git a/src/ocrmypdf/__main__.py b/src/ocrmypdf/__main__.py index 0f69f14e..cbe6e027 100755 --- a/src/ocrmypdf/__main__.py +++ b/src/ocrmypdf/__main__.py @@ -32,11 +32,6 @@ import argparse import PyPDF2 as pypdf import PIL -try: - import fitz -except ImportError: - fitz = None - import ruffus.ruffus_exceptions as ruffus_exceptions import ruffus.cmdline as cmdline import ruffus.proxy_logger as proxy_logger @@ -47,6 +42,7 @@ from .pdfa import file_claims_pdfa from .helpers import is_iterable_notstr, re_symlink, is_file_writable, \ available_cpu_count from .exec import tesseract, qpdf, ghostscript +from .lib import fitz from . import PROGRAM_NAME, VERSION from .exceptions import ExitCode, ExitCodeException, MissingDependencyError, \ diff --git a/src/ocrmypdf/lib/__init__.py b/src/ocrmypdf/lib/__init__.py index 85a31022..13d09e45 100644 --- a/src/ocrmypdf/lib/__init__.py +++ b/src/ocrmypdf/lib/__init__.py @@ -1,4 +1,3 @@ -"""Bindings to external libraries""" # © 2017 James R. Barlow: github.com/jbarlow83 # # This file is part of OCRmyPDF. @@ -15,3 +14,10 @@ # # You should have received a copy of the GNU General Public License # along with OCRmyPDF. If not, see . + +"""Bindings to external libraries""" + +try: + import fitz +except ImportError: + fitz = None \ No newline at end of file diff --git a/src/ocrmypdf/pdfinfo.py b/src/ocrmypdf/pdfinfo.py index a5c9d50d..1de162b8 100644 --- a/src/ocrmypdf/pdfinfo.py +++ b/src/ocrmypdf/pdfinfo.py @@ -29,11 +29,7 @@ from enum import Enum from contextlib import contextmanager import PyPDF2 as pypdf -try: - import fitz -except ImportError: - fitz = None - +from .lib import fitz from .helpers import universal_open, fspath diff --git a/src/ocrmypdf/pipeline.py b/src/ocrmypdf/pipeline.py index 97fcbafc..0fe72e6d 100644 --- a/src/ocrmypdf/pipeline.py +++ b/src/ocrmypdf/pipeline.py @@ -34,15 +34,12 @@ from .pdfinfo import PdfInfo, Encoding, Colorspace from .pdfa import generate_pdfa_ps from .helpers import re_symlink, is_iterable_notstr, page_number from .exec import ghostscript, tesseract, qpdf +from .lib import fitz from .exceptions import PdfMergeFailedError, UnsupportedImageFormatError, \ DpiError, PriorOcrFoundError, InputFileError from . import leptonica from . import PROGRAM_NAME, VERSION -try: - import fitz -except ImportError: - fitz = None VECTOR_PAGE_DPI = 400 diff --git a/tests/test_metadata.py b/tests/test_metadata.py index 91fb3e6a..3b355b64 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -18,13 +18,10 @@ import pytest import PyPDF2 as pypdf -try: - import fitz -except ImportError: - fitz = None from ocrmypdf.pdfa import file_claims_pdfa from ocrmypdf.exceptions import ExitCode +from ocrmypdf.lib import fitz # pytest.helpers is dynamic # pylint: disable=no-member