From efa7ea4fdee9e9a21815068547804250f7f28159 Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Wed, 19 Sep 2018 23:01:27 -0700 Subject: [PATCH] Fix log.error where log is None --- src/ocrmypdf/_pipeline.py | 2 +- src/ocrmypdf/pdfinfo.py | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/ocrmypdf/_pipeline.py b/src/ocrmypdf/_pipeline.py index 1472ba84..bd80c6cd 100644 --- a/src/ocrmypdf/_pipeline.py +++ b/src/ocrmypdf/_pipeline.py @@ -163,7 +163,7 @@ def repair_and_parse_pdf( copyfile(input_file, output_file) try: - pdfinfo = PdfInfo(output_file) + pdfinfo = PdfInfo(output_file, log=log) except pikepdf.PasswordError as e: raise EncryptedPdfError() except pikepdf.PdfError as e: diff --git a/src/ocrmypdf/pdfinfo.py b/src/ocrmypdf/pdfinfo.py index 2719441f..e25bba67 100644 --- a/src/ocrmypdf/pdfinfo.py +++ b/src/ocrmypdf/pdfinfo.py @@ -16,13 +16,14 @@ # You should have received a copy of the GNU General Public License # along with OCRmyPDF. If not, see . -from decimal import Decimal -from math import hypot, isclose -import re from collections import namedtuple -from pathlib import Path +from decimal import Decimal from enum import Enum +from math import hypot, isclose +from pathlib import Path from unittest.mock import Mock +import re +import xml.etree.ElementTree as ET from .exec import ghostscript from .helpers import fspath @@ -597,8 +598,9 @@ def _pdf_get_pageinfo(pdf, pageno: int, infile, xmltext): return pageinfo -def _pdf_get_all_pageinfo(infile, log=Mock()): - import xml.etree.ElementTree as ET +def _pdf_get_all_pageinfo(infile, log=None): + if not log: + log = Mock() pdf = pikepdf.open(infile) @@ -715,7 +717,7 @@ class PdfInfo: """ def __init__(self, infile, log=None): self._infile = infile - self._pages, pdf = _pdf_get_all_pageinfo(infile, log) + self._pages, pdf = _pdf_get_all_pageinfo(infile, log=log) self._needs_rendering = pdf.root.get('/NeedsRendering', False) @property