diff --git a/src/ocrmypdf/_validation.py b/src/ocrmypdf/_validation.py index d7acbf09..16096aa3 100644 --- a/src/ocrmypdf/_validation.py +++ b/src/ocrmypdf/_validation.py @@ -27,14 +27,14 @@ from shutil import copyfileobj import PIL -from ._unicodefun import verify_python3_env -from .exceptions import ( +from ocrmypdf._unicodefun import verify_python3_env +from ocrmypdf.exceptions import ( BadArgsError, InputFileError, MissingDependencyError, OutputFileAccessError, ) -from .exec import ( +from ocrmypdf.exec import ( check_external_program, ghostscript, jbig2enc, @@ -42,7 +42,12 @@ from .exec import ( tesseract, unpaper, ) -from .helpers import is_file_writable, is_iterable_notstr, monotonic, safe_symlink +from ocrmypdf.helpers import ( + is_file_writable, + is_iterable_notstr, + monotonic, + safe_symlink, +) # ------------- # External dependencies diff --git a/src/ocrmypdf/exec/_support.py b/src/ocrmypdf/exec/_support.py index eba2a472..bd8ed0e6 100644 --- a/src/ocrmypdf/exec/_support.py +++ b/src/ocrmypdf/exec/_support.py @@ -28,7 +28,7 @@ from distutils.version import LooseVersion from subprocess import PIPE, STDOUT, CalledProcessError from subprocess import run as subprocess_run -from ..exceptions import MissingDependencyError +from ocrmypdf.exceptions import MissingDependencyError log = logging.getLogger(__name__) diff --git a/src/ocrmypdf/exec/jbig2enc.py b/src/ocrmypdf/exec/jbig2enc.py index 5218edbd..979b8eb7 100644 --- a/src/ocrmypdf/exec/jbig2enc.py +++ b/src/ocrmypdf/exec/jbig2enc.py @@ -20,8 +20,8 @@ from functools import lru_cache from subprocess import PIPE -from ..exceptions import MissingDependencyError -from . import get_version, run +from ocrmypdf.exceptions import MissingDependencyError +from ocrmypdf.exec import get_version, run @lru_cache(maxsize=1) diff --git a/src/ocrmypdf/exec/pngquant.py b/src/ocrmypdf/exec/pngquant.py index 17721065..f99fd421 100644 --- a/src/ocrmypdf/exec/pngquant.py +++ b/src/ocrmypdf/exec/pngquant.py @@ -23,8 +23,8 @@ from tempfile import NamedTemporaryFile from PIL import Image -from ..exceptions import MissingDependencyError -from . import get_version +from ocrmypdf.exceptions import MissingDependencyError +from ocrmypdf.exec import get_version @lru_cache(maxsize=1) diff --git a/src/ocrmypdf/exec/unpaper.py b/src/ocrmypdf/exec/unpaper.py index 80243129..2f77701b 100644 --- a/src/ocrmypdf/exec/unpaper.py +++ b/src/ocrmypdf/exec/unpaper.py @@ -30,9 +30,9 @@ from tempfile import TemporaryDirectory from PIL import Image -from ..exceptions import MissingDependencyError, SubprocessOutputError -from . import get_version -from . import run as external_run +from ocrmypdf.exceptions import MissingDependencyError, SubprocessOutputError +from ocrmypdf.exec import get_version +from ocrmypdf.exec import run as external_run log = logging.getLogger(__name__) diff --git a/src/ocrmypdf/pdfinfo/__init__.py b/src/ocrmypdf/pdfinfo/__init__.py index 093fea5e..0e8b8750 100644 --- a/src/ocrmypdf/pdfinfo/__init__.py +++ b/src/ocrmypdf/pdfinfo/__init__.py @@ -16,4 +16,4 @@ # You should have received a copy of the GNU General Public License # along with OCRmyPDF. If not, see . -from .info import Colorspace, Encoding, PdfInfo +from ocrmypdf.pdfinfo.info import Colorspace, Encoding, PdfInfo diff --git a/src/ocrmypdf/pdfinfo/layout.py b/src/ocrmypdf/pdfinfo/layout.py index db159c2e..2c3d2b2a 100644 --- a/src/ocrmypdf/pdfinfo/layout.py +++ b/src/ocrmypdf/pdfinfo/layout.py @@ -31,7 +31,7 @@ from pdfminer.pdffont import PDFSimpleFont, PDFUnicodeNotDefined from pdfminer.pdfpage import PDFPage from pdfminer.utils import bbox2str, matrix2str -from ..exceptions import EncryptedPdfError +from ocrmypdf.exceptions import EncryptedPdfError STRIP_NAME = re.compile(r'[0-9]+')