20 files changed, 83 insertions, 84 deletions
diff --git a/src/pikepdf/_cpphelpers.py b/src/pikepdf/_cpphelpers.py
index bc669cb..f66b182 100644
--- a/src/pikepdf/_cpphelpers.py
+++ b/src/pikepdf/_cpphelpers.py
@@ -12,7 +12,6 @@ called from Python, and subject to change at any time.
 import os
 import sys
 
-
 # Provide os.fspath equivalent for Python <3.6
 if sys.version_info[0:2] <= (3, 5):  # pragma: no cover
 
diff --git a/src/pikepdf/_methods.py b/src/pikepdf/_methods.py
index 33358b2..1eb9450 100644
--- a/src/pikepdf/_methods.py
+++ b/src/pikepdf/_methods.py
@@ -12,19 +12,16 @@ bindings after the fact.
 We can also move the implementation to C++ if desired.
 """
 
-from tempfile import NamedTemporaryFile
-from subprocess import run, PIPE
-from io import BytesIO
-
-from collections.abc import KeysView
-
 import inspect
+from collections.abc import KeysView
+from io import BytesIO
+from subprocess import PIPE, run
+from tempfile import NamedTemporaryFile
 
-from . import Pdf, Dictionary, Array, Name, Stream, Object
+from . import Array, Dictionary, Name, Object, Pdf, Stream
 from ._qpdf import _ObjectMapping
 from .models import PdfMetadata
 
-
 # pylint: disable=no-member,unsupported-membership-test,unsubscriptable-object
 
 
diff --git a/src/pikepdf/_version.py b/src/pikepdf/_version.py
index f18656c..c9d4b7b 100644
--- a/src/pikepdf/_version.py
+++ b/src/pikepdf/_version.py
@@ -4,7 +4,8 @@
 #
 # Copyright (C) 2017, James R. Barlow (https://github.com/jbarlow83/)
 
-from pkg_resources import get_distribution as _get_distribution, DistributionNotFound
+from pkg_resources import DistributionNotFound
+from pkg_resources import get_distribution as _get_distribution
 
 try:
     __version__ = _get_distribution(__package__).version
diff --git a/src/pikepdf/models/image.py b/src/pikepdf/models/image.py
index 4d845b2..83138fd 100644
--- a/src/pikepdf/models/image.py
+++ b/src/pikepdf/models/image.py
@@ -4,14 +4,13 @@
 #
 # Copyright (C) 2017, James R. Barlow (https://github.com/jbarlow83/)
 
-from io import BytesIO
-from itertools import zip_longest
-from abc import ABC, abstractmethod
 import struct
-
+from abc import ABC, abstractmethod
 from decimal import Decimal
+from io import BytesIO
+from itertools import zip_longest
 
-from .. import Object, Array, PdfError, Name, Dictionary, Stream
+from .. import Array, Dictionary, Name, Object, PdfError, Stream
 
 
 class DependencyError(Exception):
diff --git a/src/pikepdf/models/matrix.py b/src/pikepdf/models/matrix.py
index 7752760..4c5c2fb 100644
--- a/src/pikepdf/models/matrix.py
+++ b/src/pikepdf/models/matrix.py
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2017, James R. Barlow (https://github.com/jbarlow83/)
 
-from math import cos, sin, pi
+from math import cos, pi, sin
 
 
 class PdfMatrix:
diff --git a/src/pikepdf/models/metadata.py b/src/pikepdf/models/metadata.py
index a5aacf7..0712b7c 100644
--- a/src/pikepdf/models/metadata.py
+++ b/src/pikepdf/models/metadata.py
@@ -4,21 +4,22 @@
 #
 # Copyright (C) 2018, James R. Barlow (https://github.com/jbarlow83/)
 
+import re
+import sys
 from collections import namedtuple
 from collections.abc import MutableMapping
 from datetime import datetime
 from functools import wraps
 from io import BytesIO
-from pkg_resources import get_distribution as _get_distribution, DistributionNotFound
 from warnings import warn
-import re
-import sys
 
+from defusedxml.lxml import parse
 from lxml import etree
 from lxml.etree import QName, XMLSyntaxError
-from defusedxml.lxml import parse
+from pkg_resources import DistributionNotFound
+from pkg_resources import get_distribution as _get_distribution
 
-from .. import Stream, Name, String, PdfError
+from .. import Name, PdfError, Stream, String
 from .. import __version__ as pikepdf_version
 
 XMP_NS_DC = "http://purl.org/dc/elements/1.1/"
diff --git a/src/pikepdf/objects.py b/src/pikepdf/objects.py
index 1a0be2f..615da52 100644
--- a/src/pikepdf/objects.py
+++ b/src/pikepdf/objects.py
@@ -19,10 +19,9 @@ QPDFObjectHandle which is a generic type.
 """
 
 from . import _qpdf
-from ._qpdf import Object, ObjectType
 
 # pylint: disable=unused-import
-from ._qpdf import Operator
+from ._qpdf import Object, ObjectType, Operator
 
 
 class _ObjectMeta(type):
diff --git a/tests/conftest.py b/tests/conftest.py
index 8a67e83..1b4747e 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,12 +1,12 @@
 import os
-import sys
 import platform
-
-pytest_plugins = ['helpers_namespace']
+import sys
+from pathlib import Path
+from subprocess import PIPE, Popen
 
 import pytest
-from pathlib import Path
-from subprocess import Popen, PIPE
+
+pytest_plugins = ['helpers_namespace']
 
 
 if sys.version_info < (3, 4):
diff --git a/tests/test_dictionary.py b/tests/test_dictionary.py
index 5341968..ffaf94f 100644
--- a/tests/test_dictionary.py
+++ b/tests/test_dictionary.py
@@ -1,6 +1,7 @@
-from pikepdf import Pdf
 import pytest
 
+from pikepdf import Pdf
+
 
 @pytest.fixture
 def congress(resources):
diff --git a/tests/test_formxobject.py b/tests/test_formxobject.py
index c62998f..7e252c9 100644
--- a/tests/test_formxobject.py
+++ b/tests/test_formxobject.py
@@ -1,5 +1,6 @@
 import pytest
-from pikepdf import Pdf, Object, Stream, Name, Dictionary
+
+from pikepdf import Dictionary, Name, Object, Pdf, Stream
 
 # pylint: disable=e1137
 
diff --git a/tests/test_image_access.py b/tests/test_image_access.py
index 6be46a4..30a055e 100644
--- a/tests/test_image_access.py
+++ b/tests/test_image_access.py
@@ -1,21 +1,20 @@
-import pytest
 import imghdr
-from io import BytesIO
-from PIL import Image, features as PIL_features
 import zlib
+from io import BytesIO
 
-# pylint: disable=w0621
-
+import pytest
+from PIL import Image
+from PIL import features as PIL_features
 
 from pikepdf import (
+    Name,
     Pdf,
-    PdfImage,
     PdfError,
-    Name,
-    parse_content_stream,
+    PdfImage,
     PdfInlineImage,
     Stream,
     StreamDecodeLevel,
+    parse_content_stream,
 )
 
 
diff --git a/tests/test_ipython.py b/tests/test_ipython.py
index 4f616c8..36e2e4b 100644
--- a/tests/test_ipython.py
+++ b/tests/test_ipython.py
@@ -2,9 +2,10 @@
 Test IPython/Jupyter display hooks
 """
 
-import pikepdf
 import pytest
 
+import pikepdf
+
 
 @pytest.fixture
 def graph(resources):
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index 2146c23..b0e8345 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -1,23 +1,23 @@
-from pathlib import Path
-from datetime import datetime, timezone, timedelta
 import re
+from datetime import datetime, timedelta, timezone
+from pathlib import Path
 
+import defusedxml.ElementTree as ET
 import pytest
 from hypothesis import given
 from hypothesis.strategies import integers
+
 import pikepdf
-from pikepdf import Pdf, Dictionary, Name, PasswordError, Stream
+from pikepdf import Dictionary, Name, PasswordError, Pdf, Stream
 from pikepdf.models.metadata import (
-    decode_pdf_date,
-    encode_pdf_date,
     XMP_NS_DC,
     XMP_NS_PDF,
     XMP_NS_XMP,
     DateConverter,
+    decode_pdf_date,
+    encode_pdf_date,
 )
 
-import defusedxml.ElementTree as ET
-
 try:
     from libxmp import XMPMeta
 except ImportError:
diff --git a/tests/test_object.py b/tests/test_object.py
index 4af43a3..f2725f2 100644
--- a/tests/test_object.py
+++ b/tests/test_object.py
@@ -1,23 +1,23 @@
-from decimal import Decimal, InvalidOperation
-from math import isclose, isfinite
 import json
 import sys
+from decimal import Decimal, InvalidOperation
+from math import isclose, isfinite
 
-import pikepdf
-from pikepdf import _qpdf as qpdf
-from pikepdf import Object, String, Array, Name, Dictionary, Operator, PdfError
-from hypothesis import given, example, assume
+import pytest
+from hypothesis import assume, example, given
 from hypothesis.strategies import (
-    integers,
     binary,
-    lists,
-    floats,
+    booleans,
     characters,
+    floats,
+    integers,
+    lists,
     recursive,
-    booleans,
 )
-import pytest
 
+import pikepdf
+from pikepdf import Array, Dictionary, Name, Object, Operator, PdfError, String
+from pikepdf import _qpdf as qpdf
 
 # pylint: disable=eval-used,unnecessary-lambda
 
diff --git a/tests/test_pages.py b/tests/test_pages.py
index b80aacd..2dd3783 100644
--- a/tests/test_pages.py
+++ b/tests/test_pages.py
@@ -1,12 +1,12 @@
-import pytest
-from pikepdf import Pdf, Stream, PdfMatrix
-
+import gc
 from contextlib import suppress
 from shutil import copy
-import gc
-
 from sys import getrefcount as refcount
 
+import pytest
+
+from pikepdf import Pdf, PdfMatrix, Stream
+
 
 @pytest.fixture
 def graph(resources):
diff --git a/tests/test_parsers.py b/tests/test_parsers.py
index b2bcf42..0ed400b 100644
--- a/tests/test_parsers.py
+++ b/tests/test_parsers.py
@@ -1,12 +1,12 @@
+import shutil
 import sys
+from subprocess import PIPE, run
 
 import pytest
-from pikepdf import parse_content_stream, Pdf, Stream, Operator, Object, Dictionary
-from pikepdf.models import _Page as Page
-from pikepdf._qpdf import StreamParser
-from subprocess import run, PIPE
-import shutil
 
+from pikepdf import Dictionary, Object, Operator, Pdf, Stream, parse_content_stream
+from pikepdf._qpdf import StreamParser
+from pikepdf.models import _Page as Page
 
 # pylint: disable=useless-super-delegation
 
diff --git a/tests/test_pdfa.py b/tests/test_pdfa.py
index 975b258..305b2d1 100644
--- a/tests/test_pdfa.py
+++ b/tests/test_pdfa.py
@@ -1,9 +1,11 @@
-import pytest
-from pikepdf import Pdf
 import os
-from pathlib import Path
-from subprocess import run, PIPE, STDOUT
 import xml.etree.ElementTree as ET
+from pathlib import Path
+from subprocess import PIPE, STDOUT, run
+
+import pytest
+
+from pikepdf import Pdf
 
 try:
     VERAPDF = Path(os.environ['HOME']) / 'verapdf' / 'verapdf'
diff --git a/tests/test_private_pdfs.py b/tests/test_private_pdfs.py
index e37794e..410f698 100644
--- a/tests/test_private_pdfs.py
+++ b/tests/test_private_pdfs.py
@@ -1,14 +1,14 @@
-import pytest
-from pikepdf import Pdf, PdfError
-
+import gzip
 import os
 import platform
 import shutil
 from contextlib import suppress
-from shutil import copy
-import gzip
 from pathlib import Path
+from shutil import copy
 
+import pytest
+
+from pikepdf import Pdf, PdfError
 
 # Files with unknown copyright status can't be shared publicly
 PRIVATE_RESOURCES = Path(__file__).parent / 'resources' / 'private'
diff --git a/tests/test_refcount.py b/tests/test_refcount.py
index 044b6af..0cbe01b 100644
--- a/tests/test_refcount.py
+++ b/tests/test_refcount.py
@@ -1,11 +1,10 @@
 import gc
 import sys
-import pytest
-from pikepdf import Pdf
-
-# This will break on pypy, but we're not quite targetting pypy...
 from sys import getrefcount as refcount
 
+import pytest
+
+from pikepdf import Pdf
 
 # Try to do some things without blowing up
 
diff --git a/tests/test_sanity.py b/tests/test_sanity.py
index 17af7c7..a4f72b0 100644
--- a/tests/test_sanity.py
+++ b/tests/test_sanity.py
@@ -2,15 +2,15 @@
 A bunch of quick tests that confirm nothing is horribly wrong
 """
 
-import pytest
-
 import gc
+import sys
 from contextlib import suppress
 from shutil import copy
-import sys
+
+import pytest
 
 import pikepdf
-from pikepdf import Pdf, Object, Name, Stream
+from pikepdf import Name, Object, Pdf, Stream
 
 
 def test_minimum_qpdf_version():