From 3beda6777bcc0795ed8171c14d247ee1826664c2 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 6 Dec 2021 13:50:18 -0500
Subject: [PATCH] fix merge lints
---
src/_zkapauthorizer/_storage_server.py | 7 +------
src/_zkapauthorizer/lease_maintenance.py | 5 -----
src/_zkapauthorizer/tests/test_lease_maintenance.py | 5 -----
3 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/src/_zkapauthorizer/_storage_server.py b/src/_zkapauthorizer/_storage_server.py
index 5a84e0c..e081a02 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 38130db..a5763b3 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 ed4fff9..156757e 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
--
GitLab