From 45c7bd9a605eafdaf12a4d001b5aaed64008db0b Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Sat, 24 Feb 2018 12:38:58 -0800 Subject: [PATCH] lint: Remove shebangs from non-executable files --- ocrmypdf/exceptions.py | 1 - ocrmypdf/exec/__init__.py | 3 +-- ocrmypdf/exec/ghostscript.py | 1 - ocrmypdf/exec/qpdf.py | 1 - ocrmypdf/exec/tesseract.py | 3 +-- ocrmypdf/exec/unpaper.py | 1 - ocrmypdf/helpers.py | 5 ++--- ocrmypdf/leptonica.py | 4 ---- ocrmypdf/pdfa.py | 1 - ocrmypdf/pipeline.py | 1 - tests/conftest.py | 1 - tests/spoof/gs_render_failure.py | 2 +- tests/test_hocrtransform.py | 1 - tests/test_pageinfo.py | 3 +-- tests/test_tess3.py | 1 - tests/test_tess4.py | 5 ++--- tests/test_userunit.py | 1 - 17 files changed, 8 insertions(+), 27 deletions(-) diff --git a/ocrmypdf/exceptions.py b/ocrmypdf/exceptions.py index 8031040f..f32ef981 100644 --- a/ocrmypdf/exceptions.py +++ b/ocrmypdf/exceptions.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2016 James R. Barlow: github.com/jbarlow83 diff --git a/ocrmypdf/exec/__init__.py b/ocrmypdf/exec/__init__.py index 5a9e48aa..0444c3d0 100644 --- a/ocrmypdf/exec/__init__.py +++ b/ocrmypdf/exec/__init__.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2016 James R. Barlow: github.com/jbarlow83 """Wrappers to manage subprocess calls""" @@ -46,4 +45,4 @@ def get_version(program, *, "Message was:\n{}").format(program, output) ) - return version \ No newline at end of file + return version diff --git a/ocrmypdf/exec/ghostscript.py b/ocrmypdf/exec/ghostscript.py index 50b008a3..b7c7ea8b 100644 --- a/ocrmypdf/exec/ghostscript.py +++ b/ocrmypdf/exec/ghostscript.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2017 James R. Barlow: github.com/jbarlow83 from tempfile import NamedTemporaryFile diff --git a/ocrmypdf/exec/qpdf.py b/ocrmypdf/exec/qpdf.py index f247fa79..16e7c02a 100644 --- a/ocrmypdf/exec/qpdf.py +++ b/ocrmypdf/exec/qpdf.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2017 James R. Barlow: github.com/jbarlow83 from subprocess import CalledProcessError, STDOUT, PIPE, run diff --git a/ocrmypdf/exec/tesseract.py b/ocrmypdf/exec/tesseract.py index 1ead0c6b..e026cacc 100644 --- a/ocrmypdf/exec/tesseract.py +++ b/ocrmypdf/exec/tesseract.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2017 James R. Barlow: github.com/jbarlow83 import sys @@ -158,7 +157,7 @@ def tesseract_log_output(log, stdout, input_file): try: text = stdout.decode() - except UnicodeDecodeError as e: + except UnicodeDecodeError: log.error(prefix + "command line output was not utf-8. " + "This usually means Tesseract's language packs do not match " "the installed version of Tesseract.") diff --git a/ocrmypdf/exec/unpaper.py b/ocrmypdf/exec/unpaper.py index eea9099a..5ab9d580 100644 --- a/ocrmypdf/exec/unpaper.py +++ b/ocrmypdf/exec/unpaper.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2015 James R. Barlow: github.com/jbarlow83 # unpaper documentation: # https://github.com/Flameeyes/unpaper/blob/master/doc/basic-concepts.md diff --git a/ocrmypdf/helpers.py b/ocrmypdf/helpers.py index ac51a0df..db4fde65 100644 --- a/ocrmypdf/helpers.py +++ b/ocrmypdf/helpers.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2016 James R. Barlow: github.com/jbarlow83 from functools import partial @@ -74,7 +73,7 @@ def is_file_writable(test_file): else: try: fp = p.open('wb') - except OSError as e: + except OSError: return False else: fp.close() @@ -122,4 +121,4 @@ if sys.version_info[0:2] <= (3, 5): else: universal_open = open - fspath = os.fspath \ No newline at end of file + fspath = os.fspath diff --git a/ocrmypdf/leptonica.py b/ocrmypdf/leptonica.py index c32c6c1f..891b4b89 100644 --- a/ocrmypdf/leptonica.py +++ b/ocrmypdf/leptonica.py @@ -566,10 +566,6 @@ if __name__ == '__main__': parser_deskew.set_defaults(func=deskew) args = parser.parse_args() - - if get_leptonica_version() != u'leptonica-1.69': - print("Unexpected leptonica version: %s" % getLeptonicaVersion()) - args.func(args) diff --git a/ocrmypdf/pdfa.py b/ocrmypdf/pdfa.py index b10262f8..fb2aa0e6 100644 --- a/ocrmypdf/pdfa.py +++ b/ocrmypdf/pdfa.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2015 James R. Barlow: github.com/jbarlow83 # # Generate a PDFA_def.ps file for Ghostscript >= 9.14 diff --git a/ocrmypdf/pipeline.py b/ocrmypdf/pipeline.py index 6e0a4503..e59ca50c 100644 --- a/ocrmypdf/pipeline.py +++ b/ocrmypdf/pipeline.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2016 James R. Barlow: github.com/jbarlow83 from contextlib import suppress diff --git a/tests/conftest.py b/tests/conftest.py index 1a74b57c..f3ba0d0b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2017 James R. Barlow: github.com/jbarlow83 import sys diff --git a/tests/spoof/gs_render_failure.py b/tests/spoof/gs_render_failure.py index 044193de..cc1520f8 100755 --- a/tests/spoof/gs_render_failure.py +++ b/tests/spoof/gs_render_failure.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# © 2016 James R. Barlow: github.com/jbarlow83 +# © 2016-18 James R. Barlow: github.com/jbarlow83 import sys import os diff --git a/tests/test_hocrtransform.py b/tests/test_hocrtransform.py index 5bdbcc89..adc17815 100644 --- a/tests/test_hocrtransform.py +++ b/tests/test_hocrtransform.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2015 James R. Barlow: github.com/jbarlow83 from ocrmypdf import hocrtransform diff --git a/tests/test_pageinfo.py b/tests/test_pageinfo.py index 1b6459f0..15f877d2 100644 --- a/tests/test_pageinfo.py +++ b/tests/test_pageinfo.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2015 James R. Barlow: github.com/jbarlow83 from ocrmypdf import pdfinfo @@ -122,4 +121,4 @@ def test_no_contents(resources): def test_oversized_page(resources): pdf = pdfinfo.PdfInfo(resources / 'poster.pdf') image = pdf[0].images[0] - assert image.width * image.xres > 200, "this is supposed to be oversized" \ No newline at end of file + assert image.width * image.xres > 200, "this is supposed to be oversized" diff --git a/tests/test_tess3.py b/tests/test_tess3.py index 7cef255d..a8ad6c0c 100644 --- a/tests/test_tess3.py +++ b/tests/test_tess3.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2017 James R. Barlow: github.com/jbarlow83 import pytest diff --git a/tests/test_tess4.py b/tests/test_tess4.py index 56c2b2c4..a4c765e0 100644 --- a/tests/test_tess4.py +++ b/tests/test_tess4.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2017 James R. Barlow: github.com/jbarlow83 import pytest @@ -10,7 +9,7 @@ import os import PyPDF2 as pypdf from contextlib import contextmanager - +# pylint: disable=no-member spoof = pytest.helpers.spoof @@ -128,4 +127,4 @@ def test_content_preservation(ensure_tess4, resources, outpdf): info = pdfinfo.PdfInfo(outpdf) page = info[0] - assert len(page.images) > 1, "masks were rasterized" \ No newline at end of file + assert len(page.images) > 1, "masks were rasterized" diff --git a/tests/test_userunit.py b/tests/test_userunit.py index f60d4f2a..9f171c5d 100644 --- a/tests/test_userunit.py +++ b/tests/test_userunit.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # © 2017 James R. Barlow: github.com/jbarlow83 from subprocess import Popen, PIPE, check_output, check_call, DEVNULL