Resolve (most) linter complaints

Author: cnweaver

adc/__init__.py

@@ -1,8 +1,8 @@
 try:
-    from importlib.metadata import version, PackageNotFoundError
+    from importlib.metadata import PackageNotFoundError, version
 except ImportError:
     # NOTE: remove after dropping support for Python < 3.8
-    from importlib_metadata import version, PackageNotFoundError
+    from importlib_metadata import PackageNotFoundError, version
 
 try:
     __version__ = version("adc-streaming")

adc/consumer.py

@@ -1,12 +1,13 @@
 import dataclasses
 import enum
 import logging
-from datetime import datetime, timedelta
 import threading
+from collections import defaultdict
+from datetime import datetime, timedelta
 # Imports from typing are deprecated as of Python 3.9 but required for
 # compatibility with earlier versions
-from typing import Dict, Iterable, Iterator, List, Optional, Set, Union, Collection
-from collections import defaultdict
+from typing import (Collection, Dict, Iterable, Iterator, List, Optional, Set,
+                    Union)
 
 import confluent_kafka  # type: ignore
 import confluent_kafka.admin  # type: ignore
@@ -15,6 +16,7 @@
 from .errors import ErrorCallback, log_client_errors
 from .oidc import set_oauth_cb
 
+
 class LogicalOffset(enum.IntEnum):
     BEGINNING = confluent_kafka.OFFSET_BEGINNING
     EARLIEST = confluent_kafka.OFFSET_BEGINNING
@@ -26,6 +28,7 @@ class LogicalOffset(enum.IntEnum):
 
     INVALID = confluent_kafka.OFFSET_INVALID
 
+
 class Consumer:
     conf: 'ConsumerConfig'
     _consumer: confluent_kafka.Consumer
@@ -99,14 +102,15 @@ def mark_done(self, msg: confluent_kafka.Message, asynchronous: bool = True):
             self._consumer.commit(msg, asynchronous=False)
 
     def _offsets_for_position(self, partitions: Collection[confluent_kafka.TopicPartition],
-                              position: Union[datetime, LogicalOffset]) -> List[confluent_kafka.TopicPartition]:
+                              position: Union[datetime, LogicalOffset]) \
+            -> List[confluent_kafka.TopicPartition]:
         if isinstance(position, datetime):
             offset = int(position.timestamp() * 1000)
         elif isinstance(position, LogicalOffset):
             offset = position
         else:
             raise TypeError("Only datetime objects and logical offsets supported")
-        
+
         _partitions = [
             confluent_kafka.TopicPartition(topic=tp.topic, partition=tp.partition, offset=offset)
             for tp in partitions
@@ -248,6 +252,7 @@ def close(self):
         """ Close the consumer, ending its subscriptions. """
         self._consumer.close()
 
+
 # Used to be called ConsumerStartPosition, though this was confusing because
 # it only affects "auto.offset.reset" not the start position for a call to
 # consume.
@@ -258,10 +263,12 @@ class ConsumerDefaultPosition(enum.Enum):
     def __str__(self):
         return self.name.lower()
 
+
 # Alias to the old name
 # TODO: Remove alias on the next breaking release
 ConsumerStartPosition = ConsumerDefaultPosition
 
+
 @dataclasses.dataclass
 class ConsumerConfig:
     broker_urls: List[str]

adc/oidc.py

@@ -18,7 +18,7 @@ def set_oauth_cb(config):
 
     from authlib.integrations.requests_client import OAuth2Session
     session = OAuth2Session(client_id, client_secret, scope=scope)
-    
+
     def oauth_cb(*_, **__):
         token = session.fetch_token(
             token_endpoint, grant_type='client_credentials')

adc/producer.py

@@ -1,9 +1,9 @@
 import abc
-from ast import comprehension
 import dataclasses
 import logging
 from datetime import timedelta
 from typing import Dict, List, Optional, Union
+
 try:  # this will work only in python >= 3.8
     from typing import Literal
 except ImportError:
@@ -112,7 +112,8 @@ class ProducerConfig:
     # between attempts to reconnect to Kafka.
     reconnect_max_time: timedelta = timedelta(seconds=10)
 
-    compression_type: Optional[Union[Literal['gzip'], Literal['snappy'], Literal['lz4'], Literal['zstd']]] = None
+    compression_type: Optional[Union[Literal['gzip'], Literal['snappy'],
+                                     Literal['lz4'], Literal['zstd']]] = None
 
     # maximum message size, before compression
     message_max_bytes: Optional[int] = None