From f296f9e6b9de414ff65140cfb9cc7c9cda6c2d6d Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 27 Dec 2021 16:17:33 -0500
Subject: [PATCH] fix all the noqa comments

---
 src/_zkapauthorizer/_storage_server.py        |  4 ++--
 src/_zkapauthorizer/controller.py             | 24 ++++++++++++++++++-
 src/_zkapauthorizer/eliot.py                  |  4 ++--
 src/_zkapauthorizer/model.py                  |  4 ++--
 src/_zkapauthorizer/resource.py               |  4 ++--
 src/_zkapauthorizer/storage_common.py         |  4 ++--
 src/_zkapauthorizer/tests/strategies.py       |  4 ++--
 .../tests/test_client_resource.py             |  4 ++--
 src/_zkapauthorizer/tests/test_plugin.py      |  4 ++--
 .../tests/test_pricecalculator.py             |  4 ++--
 10 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/_zkapauthorizer/_storage_server.py b/src/_zkapauthorizer/_storage_server.py
index aebccdc..5d94598 100644
--- a/src/_zkapauthorizer/_storage_server.py
+++ b/src/_zkapauthorizer/_storage_server.py
@@ -26,7 +26,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -48,7 +48,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from datetime import timedelta
 from errno import ENOENT
diff --git a/src/_zkapauthorizer/controller.py b/src/_zkapauthorizer/controller.py
index b30ed60..f9536b2 100644
--- a/src/_zkapauthorizer/controller.py
+++ b/src/_zkapauthorizer/controller.py
@@ -22,7 +22,29 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 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
+    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
 
 from base64 import b64decode, b64encode
 from datetime import timedelta
diff --git a/src/_zkapauthorizer/eliot.py b/src/_zkapauthorizer/eliot.py
index 8daabaa..8267605 100644
--- a/src/_zkapauthorizer/eliot.py
+++ b/src/_zkapauthorizer/eliot.py
@@ -21,7 +21,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -43,7 +43,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from eliot import ActionType, Field, MessageType
 
diff --git a/src/_zkapauthorizer/model.py b/src/_zkapauthorizer/model.py
index e6834f1..7caa8ef 100644
--- a/src/_zkapauthorizer/model.py
+++ b/src/_zkapauthorizer/model.py
@@ -22,7 +22,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -44,7 +44,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from datetime import datetime
 from functools import wraps
diff --git a/src/_zkapauthorizer/resource.py b/src/_zkapauthorizer/resource.py
index 556983e..9dbb51e 100644
--- a/src/_zkapauthorizer/resource.py
+++ b/src/_zkapauthorizer/resource.py
@@ -26,7 +26,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -48,7 +48,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from itertools import islice
 from json import dumps, load, loads
diff --git a/src/_zkapauthorizer/storage_common.py b/src/_zkapauthorizer/storage_common.py
index 2ddd2a8..b847073 100644
--- a/src/_zkapauthorizer/storage_common.py
+++ b/src/_zkapauthorizer/storage_common.py
@@ -21,7 +21,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -43,7 +43,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from base64 import b64encode
 
diff --git a/src/_zkapauthorizer/tests/strategies.py b/src/_zkapauthorizer/tests/strategies.py
index eef5878..7f29860 100644
--- a/src/_zkapauthorizer/tests/strategies.py
+++ b/src/_zkapauthorizer/tests/strategies.py
@@ -21,7 +21,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -43,7 +43,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from base64 import b64encode, urlsafe_b64encode
 from datetime import datetime, timedelta
diff --git a/src/_zkapauthorizer/tests/test_client_resource.py b/src/_zkapauthorizer/tests/test_client_resource.py
index c9ef767..f559b3e 100644
--- a/src/_zkapauthorizer/tests/test_client_resource.py
+++ b/src/_zkapauthorizer/tests/test_client_resource.py
@@ -22,7 +22,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -44,7 +44,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from datetime import datetime
 from io import BytesIO
diff --git a/src/_zkapauthorizer/tests/test_plugin.py b/src/_zkapauthorizer/tests/test_plugin.py
index e3d1f71..831f423 100644
--- a/src/_zkapauthorizer/tests/test_plugin.py
+++ b/src/_zkapauthorizer/tests/test_plugin.py
@@ -21,7 +21,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -43,7 +43,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from datetime import timedelta
 from functools import partial
diff --git a/src/_zkapauthorizer/tests/test_pricecalculator.py b/src/_zkapauthorizer/tests/test_pricecalculator.py
index ab8990f..b69135b 100644
--- a/src/_zkapauthorizer/tests/test_pricecalculator.py
+++ b/src/_zkapauthorizer/tests/test_pricecalculator.py
@@ -22,7 +22,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -44,7 +44,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from functools import partial
 
-- 
GitLab