diff --git a/src/_zkapauthorizer/_storage_server.py b/src/_zkapauthorizer/_storage_server.py index 5a84e0c49f831d9388a872e1b985cdf03f33d4d3..e081a02e3d51c613785d3fc0fd92374d7ddccfc2 100644 --- a/src/_zkapauthorizer/_storage_server.py +++ b/src/_zkapauthorizer/_storage_server.py @@ -30,11 +30,6 @@ from os import listdir, stat from os.path import join from struct import calcsize, unpack -try: - from typing import Dict, Generator, Iterable, List, Optional, Tuple -except ImportError: - pass - import attr from allmydata.interfaces import RIStorageServer, TestAndWriteVectorsForShares from allmydata.storage.common import storage_index_to_dir @@ -66,7 +61,7 @@ from .storage_common import ( ) try: - from typing import Dict, List, Optional + from typing import Dict, Generator, Iterable, List, Optional, Tuple except ImportError: pass diff --git a/src/_zkapauthorizer/lease_maintenance.py b/src/_zkapauthorizer/lease_maintenance.py index 38130db91b8f8910ef245a1cfce9eb3cf7042ff6..a5763b3dd25b0df80f10f479de197bf8f4a54806 100644 --- a/src/_zkapauthorizer/lease_maintenance.py +++ b/src/_zkapauthorizer/lease_maintenance.py @@ -21,11 +21,6 @@ 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 ( diff --git a/src/_zkapauthorizer/tests/test_lease_maintenance.py b/src/_zkapauthorizer/tests/test_lease_maintenance.py index ed4fff90c33cfe891043e564b1cd3c9aca66d2fe..156757ef6e70c5d7b6d05773c4780ea800b2d1c6 100644 --- a/src/_zkapauthorizer/tests/test_lease_maintenance.py +++ b/src/_zkapauthorizer/tests/test_lease_maintenance.py @@ -20,11 +20,6 @@ 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