Merge branch 'hotfix/v3.1.1'

Don't exit when qpdf repairs the file successfully but displays warning

RELEASE_NOTES.rst

@@ -6,6 +6,14 @@ Please always read this file before installing the package
 Download software here: https://github.com/jbarlow83/OCRmyPDF/tags
 
 
+v3.1.1:
+
+Changes
+-------
+
+-  Fixed bug that caused incorrect page size and DPI calculations on documents with mixed page sizes
+
+
 v3.1:
 =====
 

ocrmypdf/main.py

@@ -39,7 +39,7 @@ warnings.simplefilter('ignore', pypdf.utils.PdfReadWarning)
 
 
 BASEDIR = os.path.dirname(os.path.realpath(__file__))
-VERSION = '3.1'
+VERSION = '3.1.1'
 
 
 # -------------
@@ -356,14 +356,20 @@ def repair_pdf(
     try:
         out = check_output(args_qpdf, stderr=STDOUT, universal_newlines=True)
     except CalledProcessError as e:
+        exit_with_error = True
         if e.returncode == 2:
             print("{0}: not a valid PDF, and could not repair it.".format(
                     options.input_file))
             print("Details:")
             print(e.output)
+        elif e.returncode == 3 and e.output.find("operation succeeded"):
+            exit_with_error = False
+            out = e.output
+            print(e.output)
         else:
             print(e.output)
-        sys.exit(ExitCode.input_file)
+        if exit_with_error:
+            sys.exit(ExitCode.input_file)
 
     log.debug(out)
 

ocrmypdf/pageinfo.py

@@ -126,13 +126,13 @@ def _page_has_text(pdf, page):
     return False
 
 
-def _pdf_get_pageinfo(infile, page: int):
+def _pdf_get_pageinfo(infile, pageno: int):
     pageinfo = {}
-    pageinfo['pageno'] = page
+    pageinfo['pageno'] = pageno
     pageinfo['images'] = []
 
     pdf = pypdf.PdfFileReader(infile)
-    page = pdf.pages[page - 1]
+    page = pdf.pages[pageno]
 
     pageinfo['has_text'] = _page_has_text(pdf, page)
 

setup.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 # © 2015 James R. Barlow: github.com/jbarlow83
 
+from __future__ import print_function, unicode_literals
 from setuptools import setup
 from subprocess import Popen, STDOUT, check_output, CalledProcessError
 from string import Template
@@ -9,6 +10,10 @@ import re
 import sys
 
 
+if sys.version_info < (3, 4):
+    print("Python 3.4 or newer is required")
+    sys.exit(1)
+
 missing_program = '''
 The program '{program}' could not be executed or was not found on your
 system PATH.
@@ -179,7 +184,7 @@ tests_require = open('test_requirements.txt').read().splitlines()
 
 setup(
     name='ocrmypdf',
-    version='3.1',  # also update: release notes, main.py
+    version='3.1.1',  # also update: release notes, main.py
     description='OCRmyPDF adds an OCR text layer to scanned PDF files, allowing them to be searched',
     url='https://github.com/jbarlow83/OCRmyPDF',
     author='James R. Barlow',