From ef1e7a814ec7578c81589fa5e34042f3f7a7e9ae Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Tue, 26 Jan 2021 01:45:04 -0800 Subject: [PATCH] Delinting --- src/ocrmypdf/_exec/pngquant.py | 2 -- src/ocrmypdf/_jobcontext.py | 1 - src/ocrmypdf/_plugin_manager.py | 13 +++++++++---- src/ocrmypdf/helpers.py | 2 +- src/ocrmypdf/hocrtransform.py | 3 +-- src/ocrmypdf/leptonica.py | 1 - src/ocrmypdf/optimize.py | 13 +++++++------ src/ocrmypdf/pdfinfo/info.py | 2 +- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/ocrmypdf/_exec/pngquant.py b/src/ocrmypdf/_exec/pngquant.py index d7e345f2..88a6370c 100644 --- a/src/ocrmypdf/_exec/pngquant.py +++ b/src/ocrmypdf/_exec/pngquant.py @@ -9,10 +9,8 @@ from contextlib import contextmanager from io import BytesIO -from os import fspath from pathlib import Path from subprocess import PIPE -from tempfile import NamedTemporaryFile from PIL import Image diff --git a/src/ocrmypdf/_jobcontext.py b/src/ocrmypdf/_jobcontext.py index 61391404..2363ccbb 100644 --- a/src/ocrmypdf/_jobcontext.py +++ b/src/ocrmypdf/_jobcontext.py @@ -10,7 +10,6 @@ import shutil import sys from argparse import Namespace from copy import copy -from io import IOBase from pathlib import Path from typing import Iterator diff --git a/src/ocrmypdf/_plugin_manager.py b/src/ocrmypdf/_plugin_manager.py index 510ae65b..c7e77c07 100644 --- a/src/ocrmypdf/_plugin_manager.py +++ b/src/ocrmypdf/_plugin_manager.py @@ -10,9 +10,8 @@ import importlib import importlib.util import pkgutil import sys -from functools import partial from pathlib import Path -from typing import Callable, List, Tuple, Union +from typing import List, Tuple, Union import pluggy @@ -32,7 +31,11 @@ class OcrmypdfPluginManager(pluggy.PluginManager): """ def __init__( - self, *args, plugins: List[Union[str, Path]], builtins: bool = True, **kwargs, + self, + *args, + plugins: List[Union[str, Path]], + builtins: bool = True, + **kwargs, ): self.__init_args = args self.__init_kwargs = kwargs @@ -88,7 +91,9 @@ class OcrmypdfPluginManager(pluggy.PluginManager): def get_plugin_manager(plugins: List[Union[str, Path]], builtins=True): pm = OcrmypdfPluginManager( - project_name='ocrmypdf', plugins=plugins, builtins=builtins, + project_name='ocrmypdf', + plugins=plugins, + builtins=builtins, ) return pm diff --git a/src/ocrmypdf/helpers.py b/src/ocrmypdf/helpers.py index 4823ee46..9fc27709 100644 --- a/src/ocrmypdf/helpers.py +++ b/src/ocrmypdf/helpers.py @@ -17,7 +17,7 @@ from functools import wraps from io import StringIO from math import isclose from pathlib import Path -from typing import Any, Sequence, TypeVar +from typing import Any, Sequence import pikepdf diff --git a/src/ocrmypdf/hocrtransform.py b/src/ocrmypdf/hocrtransform.py index 4e2b2def..ea75f51e 100755 --- a/src/ocrmypdf/hocrtransform.py +++ b/src/ocrmypdf/hocrtransform.py @@ -31,7 +31,6 @@ import argparse import os import re -from collections import namedtuple from itertools import chain from math import atan, cos, sin from pathlib import Path @@ -45,7 +44,7 @@ from reportlab.pdfgen.canvas import Canvas Element = ElementTree.Element -class Rect(NamedTuple): +class Rect(NamedTuple): # pylint: disable=inherit-non-class """A rectangle for managing PDF coordinates.""" x1: Any diff --git a/src/ocrmypdf/leptonica.py b/src/ocrmypdf/leptonica.py index 69f6e444..91715939 100644 --- a/src/ocrmypdf/leptonica.py +++ b/src/ocrmypdf/leptonica.py @@ -13,7 +13,6 @@ import argparse import logging import os -import platform import sys import threading import warnings diff --git a/src/ocrmypdf/optimize.py b/src/ocrmypdf/optimize.py index c097e32e..93658076 100644 --- a/src/ocrmypdf/optimize.py +++ b/src/ocrmypdf/optimize.py @@ -10,11 +10,9 @@ import sys import tempfile from collections import defaultdict from functools import partial -from io import BytesIO from os import fspath from pathlib import Path from typing import ( - Any, Callable, Dict, Iterator, @@ -49,7 +47,7 @@ DEFAULT_PNG_QUALITY = 70 Xref = NewType('Xref', int) -class XrefExt(NamedTuple): +class XrefExt(NamedTuple): # pylint: disable=inherit-non-class xref: Xref ext: str @@ -212,7 +210,10 @@ def extract_image_generic( def extract_images( - pike: Pdf, root: Path, options, extract_fn: Callable[..., Optional[XrefExt]], + pike: Pdf, + root: Path, + options, + extract_fn: Callable[..., Optional[XrefExt]], ) -> Iterator[Tuple[int, XrefExt]]: """Extract image using extract_fn @@ -564,10 +565,10 @@ def rewrite_png(pike: Pdf, im_obj: Object, compdata) -> None: # pragma: no cove # ncolors == 0 means we are using a colorspace without a palette if compdata.spp == 1: cs = Name.DeviceGray - elif compdata.spp == 3: - cs = Name.DeviceRGB elif compdata.spp == 4: cs = Name.DeviceCMYK + else: # spp == 3 + cs = Name.DeviceRGB im_obj.ColorSpace = cs im_obj.write(compdata.read(), filter=Name.FlateDecode, decode_parms=dparms) diff --git a/src/ocrmypdf/pdfinfo/info.py b/src/ocrmypdf/pdfinfo/info.py index ae02fb98..0ee921b0 100644 --- a/src/ocrmypdf/pdfinfo/info.py +++ b/src/ocrmypdf/pdfinfo/info.py @@ -15,7 +15,7 @@ from functools import partial from math import hypot, isclose from os import PathLike from pathlib import Path -from typing import Any, Container, Dict, Iterator, List, Optional, Tuple, Union +from typing import Container, Iterator, Optional, Tuple, Union from warnings import warn import pikepdf