Merge branch 'hotfix/v3.1.1' into develop

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.