Fix lint.

src/allmydata/test/eliotutil.py

@@ -3,18 +3,6 @@ Tools aimed at the interaction between tests and Eliot.
 
 Ported to Python 3.
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-# Python 2 compatibility
-# Can't use `builtins.str` because it's not JSON encodable:
-# `exceptions.TypeError: <class 'future.types.newstr.newstr'> is not JSON-encodeable`
-from past.builtins import unicode as str
-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, max, min  # noqa: F401
 
 from six import ensure_text
 
@@ -23,11 +11,7 @@ __all__ = [
     "EliotLoggedRunTest",
 ]
 
-try:
-    from typing import Callable
-except ImportError:
-    pass
-
+from typing import Callable
 from functools import (
     partial,
     wraps,
@@ -147,8 +131,8 @@ class EliotLoggedRunTest(object):
 
 
 def with_logging(
-        test_id,      # type: str
-        test_method,  # type: Callable
+        test_id: str,
+        test_method: Callable,
 ):
     """
     Decorate a test method with additional log-related behaviors.