From ed8e0a0075f47e3370d8749d3d4da85331ca94ba Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 27 Dec 2021 14:21:54 -0500
Subject: [PATCH] isort

---
 src/_zkapauthorizer/_storage_server.py            | 5 +----
 src/_zkapauthorizer/controller.py                 | 6 ++----
 src/_zkapauthorizer/eliot.py                      | 5 +----
 src/_zkapauthorizer/model.py                      | 7 ++-----
 src/_zkapauthorizer/resource.py                   | 7 ++-----
 src/_zkapauthorizer/storage_common.py             | 7 ++-----
 src/_zkapauthorizer/tests/strategies.py           | 5 +----
 src/_zkapauthorizer/tests/test_client_resource.py | 5 +----
 src/_zkapauthorizer/tests/test_controller.py      | 4 ++--
 src/_zkapauthorizer/tests/test_plugin.py          | 5 +----
 src/_zkapauthorizer/tests/test_pricecalculator.py | 7 ++-----
 11 files changed, 17 insertions(+), 46 deletions(-)

diff --git a/src/_zkapauthorizer/_storage_server.py b/src/_zkapauthorizer/_storage_server.py
index f81f75b..aebccdc 100644
--- a/src/_zkapauthorizer/_storage_server.py
+++ b/src/_zkapauthorizer/_storage_server.py
@@ -21,10 +21,7 @@ This is the server part of a storage access protocol.  The client part is
 implemented in ``_storage_client.py``.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from future.utils import PY2
 
diff --git a/src/_zkapauthorizer/controller.py b/src/_zkapauthorizer/controller.py
index c4f202e..b30ed60 100644
--- a/src/_zkapauthorizer/controller.py
+++ b/src/_zkapauthorizer/controller.py
@@ -17,12 +17,10 @@ This module implements controllers (in the MVC sense) for the web interface
 for the client side of the storage plugin.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from future.utils import PY2
+
 if PY2:
     from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
 
diff --git a/src/_zkapauthorizer/eliot.py b/src/_zkapauthorizer/eliot.py
index 2adc410..8daabaa 100644
--- a/src/_zkapauthorizer/eliot.py
+++ b/src/_zkapauthorizer/eliot.py
@@ -16,10 +16,7 @@
 Eliot field, message, and action definitions for ZKAPAuthorizer.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from future.utils import PY2
 
diff --git a/src/_zkapauthorizer/model.py b/src/_zkapauthorizer/model.py
index 14306b1..e6834f1 100644
--- a/src/_zkapauthorizer/model.py
+++ b/src/_zkapauthorizer/model.py
@@ -17,10 +17,7 @@ This module implements models (in the MVC sense) for the client side of
 the storage plugin.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from future.utils import PY2
 
@@ -48,7 +45,6 @@ if PY2:
         max,
         min,
     )  # noqa: F401
-from past.builtins import long
 
 from datetime import datetime
 from functools import wraps
@@ -58,6 +54,7 @@ from sqlite3 import connect as _connect
 
 import attr
 from aniso8601 import parse_datetime as _parse_datetime
+from past.builtins import long
 from twisted.logger import Logger
 from twisted.python.filepath import FilePath
 from zope.interface import Interface, implementer
diff --git a/src/_zkapauthorizer/resource.py b/src/_zkapauthorizer/resource.py
index 9436b19..556983e 100644
--- a/src/_zkapauthorizer/resource.py
+++ b/src/_zkapauthorizer/resource.py
@@ -21,10 +21,7 @@ vouchers for fresh tokens.
 In the future it should also allow users to read statistics about token usage.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from future.utils import PY2
 
@@ -52,12 +49,12 @@ if PY2:
         max,
         min,
     )  # noqa: F401
-from past.builtins import long
 
 from itertools import islice
 from json import dumps, load, loads
 from sys import maxint
 
+from past.builtins import long
 from twisted.logger import Logger
 from twisted.web.http import BAD_REQUEST
 from twisted.web.resource import ErrorPage, IResource, NoResource, Resource
diff --git a/src/_zkapauthorizer/storage_common.py b/src/_zkapauthorizer/storage_common.py
index 4239ee5..2ddd2a8 100644
--- a/src/_zkapauthorizer/storage_common.py
+++ b/src/_zkapauthorizer/storage_common.py
@@ -16,10 +16,7 @@
 Functionality shared between the storage client and server.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from future.utils import PY2
 
@@ -47,11 +44,11 @@ if PY2:
         max,
         min,
     )  # noqa: F401
-from past.builtins import long
 
 from base64 import b64encode
 
 import attr
+from past.builtins import long
 from pyutil.mathutil import div_ceil
 
 from .eliot import MUTABLE_PASSES_REQUIRED
diff --git a/src/_zkapauthorizer/tests/strategies.py b/src/_zkapauthorizer/tests/strategies.py
index 1b6528c..eef5878 100644
--- a/src/_zkapauthorizer/tests/strategies.py
+++ b/src/_zkapauthorizer/tests/strategies.py
@@ -16,10 +16,7 @@
 Hypothesis strategies for property testing.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from future.utils import PY2
 
diff --git a/src/_zkapauthorizer/tests/test_client_resource.py b/src/_zkapauthorizer/tests/test_client_resource.py
index 6b0d677..c9ef767 100644
--- a/src/_zkapauthorizer/tests/test_client_resource.py
+++ b/src/_zkapauthorizer/tests/test_client_resource.py
@@ -17,10 +17,7 @@ Tests for the web resource provided by the client part of the Tahoe-LAFS
 plugin.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from future.utils import PY2
 
diff --git a/src/_zkapauthorizer/tests/test_controller.py b/src/_zkapauthorizer/tests/test_controller.py
index fa15e3c..4742a14 100644
--- a/src/_zkapauthorizer/tests/test_controller.py
+++ b/src/_zkapauthorizer/tests/test_controller.py
@@ -42,8 +42,8 @@ from testtools.matchers import (
     Always,
     Equals,
     HasLength,
-    IsInstance,
     Is,
+    IsInstance,
     MatchesAll,
     MatchesStructure,
 )
@@ -73,8 +73,8 @@ from ..controller import (
     Unpaid,
     UnpaidRedeemer,
     UnrecognizedFailureReason,
-    token_count_for_group,
     bracket,
+    token_count_for_group,
 )
 from ..model import DoubleSpend as model_DoubleSpend
 from ..model import Error as model_Error
diff --git a/src/_zkapauthorizer/tests/test_plugin.py b/src/_zkapauthorizer/tests/test_plugin.py
index 10f25b4..e3d1f71 100644
--- a/src/_zkapauthorizer/tests/test_plugin.py
+++ b/src/_zkapauthorizer/tests/test_plugin.py
@@ -16,10 +16,7 @@
 Tests for the Tahoe-LAFS plugin.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from future.utils import PY2
 
diff --git a/src/_zkapauthorizer/tests/test_pricecalculator.py b/src/_zkapauthorizer/tests/test_pricecalculator.py
index b2b3969..ab8990f 100644
--- a/src/_zkapauthorizer/tests/test_pricecalculator.py
+++ b/src/_zkapauthorizer/tests/test_pricecalculator.py
@@ -17,10 +17,7 @@
 Tests for ``_zkapauthorizer.pricecalculator``.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from future.utils import PY2
 
@@ -48,12 +45,12 @@ if PY2:
         max,
         min,
     )  # noqa: F401
-from past.builtins import long
 
 from functools import partial
 
 from hypothesis import given
 from hypothesis.strategies import integers, lists, tuples
+from past.builtins import long
 from testtools import TestCase
 from testtools.matchers import Equals, GreaterThan, IsInstance, MatchesAll
 
-- 
GitLab