From ce47c17ed59190fd53fe7d576ea829d3b2475d17 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 6 Dec 2021 10:38:53 -0500
Subject: [PATCH] pyflakes
---
src/_zkapauthorizer/_storage_server.py | 7 +++++--
src/_zkapauthorizer/lease_maintenance.py | 6 ++++++
src/_zkapauthorizer/tests/test_lease_maintenance.py | 9 ++++++---
src/_zkapauthorizer/tests/test_plugin.py | 5 ++---
src/_zkapauthorizer/tests/test_storage_server.py | 5 ++---
5 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/_zkapauthorizer/_storage_server.py b/src/_zkapauthorizer/_storage_server.py
index 50e1920..7d3b005 100644
--- a/src/_zkapauthorizer/_storage_server.py
+++ b/src/_zkapauthorizer/_storage_server.py
@@ -30,11 +30,14 @@ from os import listdir, stat
from os.path import join
from struct import calcsize, unpack
+try:
+ from typing import Generator, Iterable, Tuple, List, Dict, Optional
+except ImportError:
+ pass
+
import attr
from allmydata.interfaces import RIStorageServer
from allmydata.storage.common import storage_index_to_dir
-from allmydata.storage.immutable import ShareFile
-from allmydata.storage.mutable import MutableShareFile
from allmydata.storage.shares import get_share_file
from allmydata.util.base32 import b2a
from attr.validators import instance_of, provides
diff --git a/src/_zkapauthorizer/lease_maintenance.py b/src/_zkapauthorizer/lease_maintenance.py
index 9fe3186..2920a4b 100644
--- a/src/_zkapauthorizer/lease_maintenance.py
+++ b/src/_zkapauthorizer/lease_maintenance.py
@@ -21,6 +21,11 @@ from datetime import datetime, timedelta
from errno import ENOENT
from functools import partial
+try:
+ from typing import Iterable
+except ImportError:
+ pass
+
import attr
from allmydata.interfaces import IDirectoryNode, IFilesystemNode
from allmydata.util.hashutil import (
@@ -37,6 +42,7 @@ from zope.interface import implementer
from .controller import bracket
from .model import ILeaseMaintenanceObserver
+from .foolscap import ShareStat
SERVICE_NAME = u"lease maintenance service"
diff --git a/src/_zkapauthorizer/tests/test_lease_maintenance.py b/src/_zkapauthorizer/tests/test_lease_maintenance.py
index 8734528..a6e1680 100644
--- a/src/_zkapauthorizer/tests/test_lease_maintenance.py
+++ b/src/_zkapauthorizer/tests/test_lease_maintenance.py
@@ -20,6 +20,11 @@ from __future__ import absolute_import, unicode_literals
from datetime import datetime, timedelta
+try:
+ from typing import Dict, List
+except ImportError:
+ pass
+
import attr
from allmydata.client import SecretHolder
from allmydata.interfaces import IServer, IStorageBroker
@@ -37,7 +42,6 @@ from hypothesis.strategies import (
lists,
randoms,
sets,
- tuples,
)
from testtools import TestCase
from testtools.matchers import (
@@ -51,7 +55,7 @@ from testtools.matchers import (
)
from testtools.twistedsupport import succeeded
from twisted.application.service import IService
-from twisted.internet.defer import maybeDeferred, succeed
+from twisted.internet.defer import Deferred, maybeDeferred, succeed
from twisted.internet.task import Clock
from twisted.python.filepath import FilePath
from zope.interface import implementer
@@ -460,7 +464,6 @@ def lists_of_buckets():
min_size=count,
max_size=count,
)
- expiration_strategy = lists
return builds(
zip,
si_strategy,
diff --git a/src/_zkapauthorizer/tests/test_plugin.py b/src/_zkapauthorizer/tests/test_plugin.py
index f5fd113..48e0eaa 100644
--- a/src/_zkapauthorizer/tests/test_plugin.py
+++ b/src/_zkapauthorizer/tests/test_plugin.py
@@ -38,8 +38,7 @@ from foolscap.ipb import IReferenceable, IRemotelyCallable
from foolscap.referenceable import LocalReferenceable
from hypothesis import given, settings
from hypothesis.strategies import datetimes, just, sampled_from, timedeltas
-from isodate import duration_isoformat
-from prometheus_client import CollectorRegistry, Gauge
+from prometheus_client import Gauge
from StringIO import StringIO
from testtools import TestCase
from testtools.content import text_content
@@ -278,7 +277,7 @@ class ServerPluginTests(TestCase):
metrics_path = self.useFixture(TempDir()).join(u"metrics")
configuration = {
u"prometheus-metrics-path": metrics_path,
- u"prometheus-metrics-interval": duration_isoformat(metrics_interval),
+ u"prometheus-metrics-interval": str(metrics_interval.total_seconds()),
u"ristretto-issuer-root-url": "foo",
u"ristretto-signing-key-path": SIGNING_KEY_PATH.path,
}
diff --git a/src/_zkapauthorizer/tests/test_storage_server.py b/src/_zkapauthorizer/tests/test_storage_server.py
index e20da2a..6d79127 100644
--- a/src/_zkapauthorizer/tests/test_storage_server.py
+++ b/src/_zkapauthorizer/tests/test_storage_server.py
@@ -25,9 +25,9 @@ from prometheus_client import CollectorRegistry, Histogram
from challenge_bypass_ristretto import RandomToken, random_signing_key
from foolscap.referenceable import LocalReferenceable
from hypothesis import given, note
-from hypothesis.strategies import integers, just, lists, one_of, tuples, dictionaries
+from hypothesis.strategies import integers, just, lists, one_of, tuples
from testtools import TestCase, skip
-from testtools.matchers import AfterPreprocessing, Not, Equals, MatchesAll, MatchesPredicate, AllMatch
+from testtools.matchers import AfterPreprocessing, Equals, MatchesAll
from twisted.internet.task import Clock
from twisted.python.runtime import platform
@@ -51,7 +51,6 @@ from .strategies import (
lease_cancel_secrets,
lease_renew_secrets,
sharenum_sets,
- sharenums,
sizes,
slot_test_and_write_vectors_for_shares,
storage_indexes,
--
GitLab