Run isort, no other change

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

docs/build-schemas-list.py

@@ -1,15 +1,15 @@
 #!/usr/bin/env python3
 
 import os
-import tempfile
+import site
 import sys
+import tempfile
 import venv
-import site
-from subprocess import run
 from collections import defaultdict
 from dataclasses import dataclass
-from urllib.parse import urljoin
+from subprocess import run
 from textwrap import wrap
+from urllib.parse import urljoin
 
 
 SCHEMAS_FILE = "schema-packages.txt"

docs/conf.py

@@ -14,6 +14,7 @@
 import os
 import sys
 
+
 sys.path.insert(0, os.path.abspath("../"))
 
 import fedora_messaging  # noqa: E402

docs/sample_schema_package/mailman_messages/tests/test_messages.py

@@ -17,6 +17,7 @@
 import unittest
 
 from jsonschema import ValidationError
+
 from .. import messages
 
 

docs/sample_schema_package/setup.py

@@ -17,7 +17,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 import os
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 
 here = os.path.abspath(os.path.dirname(__file__))

fedora_messaging/api.py

@@ -4,21 +4,22 @@
 import inspect
 import logging
 
-from twisted.internet import reactor, defer
 import crochet
+from twisted.internet import defer, reactor
 
-from . import exceptions, config
-from .signals import pre_publish_signal, publish_signal, publish_failed_signal
-from .message import (
-    Message,
-    SEVERITIES,
-    loads,
+from . import config, exceptions
+from .message import (  # noqa: F401
     dumps,
+    loads,
+    Message,
     SERIALIZED_MESSAGE_SCHEMA,
-)  # noqa: F401
+    SEVERITIES,
+)
+from .signals import pre_publish_signal, publish_failed_signal, publish_signal
 from .twisted import service
 from .twisted.consumer import Consumer  # noqa: F401
 
+
 _log = logging.getLogger(__name__)
 
 

fedora_messaging/cli.py

@@ -21,21 +21,22 @@
 """
 
 
+import errno
 import importlib
 import logging
 import logging.config
 import os
 import sys
-import errno
 
-from twisted.python import log as legacy_twisted_log
-from twisted.internet import reactor, error
 import click
 import pkg_resources
+from twisted.internet import error, reactor
+from twisted.python import log as legacy_twisted_log
 
-from . import config, api, exceptions
+from . import api, config, exceptions
 from .message import dumps, loads
 
+
 _log = logging.getLogger(__name__)
 
 _conf_help = (

fedora_messaging/config.py

@@ -289,6 +289,7 @@ def callback(message):
 
 from . import exceptions
 
+
 _log = logging.getLogger(__name__)
 
 _fedora_version = pkg_resources.get_distribution("fedora_messaging").version

fedora_messaging/schema_utils.py

@@ -20,7 +20,6 @@
 
 import collections
 from hashlib import sha256
-
 from urllib import parse
 
 

fedora_messaging/signals.py

@@ -21,6 +21,7 @@
 
 import blinker
 
+
 _signals = blinker.Namespace()
 
 pre_publish_signal = _signals.signal("pre_publish")

fedora_messaging/testing.py

@@ -23,9 +23,8 @@
 consider contributing it here!
 """
 
-from contextlib import contextmanager
 import inspect
-
+from contextlib import contextmanager
 from unittest import mock
 
 

fedora_messaging/tests/__init__.py

@@ -18,6 +18,7 @@
 
 import crochet
 
+
 FIXTURES_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "fixtures/"))
 
 # Tests use pytest-twisted, which manages the Twisted reactor for us. This stops

fedora_messaging/tests/integration/test_api.py

@@ -4,15 +4,16 @@
 import time
 import uuid
 from collections import defaultdict
+from unittest import mock
 from urllib.parse import quote
 
-from unittest import mock
 import pytest
 import pytest_twisted
 import treq
+from twisted.internet import defer, reactor, task, threads
+
 from fedora_messaging import api, config, exceptions, message
 from fedora_messaging.twisted.consumer import _add_timeout
-from twisted.internet import defer, reactor, task, threads
 
 
 HTTP_API = "http://localhost:15672/api/"

fedora_messaging/tests/integration/test_cli.py

@@ -19,10 +19,10 @@
 import subprocess
 import uuid
 
-from twisted.internet import threads
 import pytest
 import pytest_twisted
 import requests
+from twisted.internet import threads
 
 from fedora_messaging import api, exceptions, message
 from fedora_messaging.tests import FIXTURES_DIR

fedora_messaging/tests/unit/test_api.py

@@ -19,18 +19,18 @@
 
 from unittest import mock, TestCase
 
-from twisted.internet import threads, defer
 import pytest
 import pytest_twisted
+from twisted.internet import defer, threads
 
 from fedora_messaging import api, config
 from fedora_messaging.exceptions import PublishException
-from fedora_messaging.twisted import consumer
 from fedora_messaging.signals import (
     pre_publish_signal,
-    publish_signal,
     publish_failed_signal,
+    publish_signal,
 )
+from fedora_messaging.twisted import consumer
 
 
 class CheckCallbackTests(TestCase):

fedora_messaging/tests/unit/test_cli.py

@@ -19,16 +19,17 @@
 
 import errno
 import os
+from unittest import mock, TestCase
 
 import click
-from unittest import mock, TestCase
 from click.testing import CliRunner
+from twisted.internet import error
+from twisted.python import failure
+
 from fedora_messaging import cli, config, exceptions, message, testing
 from fedora_messaging.tests import FIXTURES_DIR
 from fedora_messaging.twisted import consumer
 
-from twisted.internet import error
-from twisted.python import failure
 
 GOOD_CONF = os.path.join(FIXTURES_DIR, "good_conf.toml")
 BAD_CONF = os.path.join(FIXTURES_DIR, "bad_conf.toml")

fedora_messaging/tests/unit/test_config.py

@@ -17,9 +17,11 @@
 """Unit tests for :module:`fedora_messaging.config`."""
 
 from unittest import mock, TestCase
+
 from fedora_messaging import config as msg_config
 from fedora_messaging.exceptions import ConfigurationException
 
+
 full_config = """
 amqp_url = "amqp://guest:guest@rabbit-server1:5672/%2F"
 

fedora_messaging/tests/unit/test_message.py

@@ -17,12 +17,12 @@
 
 import datetime
 import json
+from unittest import mock, TestCase
 
 import jsonschema
-from unittest import mock, TestCase
 import pika
 
-from fedora_messaging import message, exceptions
+from fedora_messaging import exceptions, message
 
 
 class GetMessageTests(TestCase):

fedora_messaging/tests/unit/test_testing.py

@@ -18,7 +18,7 @@
 
 from unittest import mock, TestCase
 
-from fedora_messaging import testing, api, message
+from fedora_messaging import api, message, testing
 
 
 class CustomMessage(api.Message):

fedora_messaging/tests/unit/twisted/test_consumer.py

@@ -25,16 +25,17 @@
 
 from fedora_messaging.exceptions import (
     ConnectionException,
-    PermissionException,
     ConsumerCanceled,
-    Nack,
     Drop,
     HaltConsumer,
+    Nack,
+    PermissionException,
 )
-from fedora_messaging.twisted.consumer import Consumer, _add_timeout
+from fedora_messaging.twisted.consumer import _add_timeout, Consumer
 
 from .utils import MockProtocol
 
+
 try:
     import pytest_twisted
 except ImportError:
@@ -102,8 +103,7 @@ def _check(_):
     # Consuming
 
     def _queue_contents(self, values):
-        for value in values:
-            yield value
+        yield from values
         self.consumer._running = False
         yield defer.CancelledError()
 

fedora_messaging/tests/unit/twisted/test_factory.py

@@ -20,15 +20,13 @@
 
 import pika
 import pytest
+from twisted.internet import defer
+from twisted.internet.error import ConnectionDone, ConnectionLost
+
 from fedora_messaging.exceptions import ConnectionException
 from fedora_messaging.twisted.consumer import Consumer
-from fedora_messaging.twisted.factory import (
-    ConsumerRecord,
-    FedoraMessagingFactoryV2,
-)
+from fedora_messaging.twisted.factory import ConsumerRecord, FedoraMessagingFactoryV2
 
-from twisted.internet import defer
-from twisted.internet.error import ConnectionDone, ConnectionLost
 
 try:
     import pytest_twisted

fedora_messaging/tests/unit/twisted/test_protocol.py

@@ -21,6 +21,8 @@
 
 import pika
 import pytest
+from twisted.internet import defer
+
 from fedora_messaging import config
 from fedora_messaging.exceptions import (
     ConnectionException,
@@ -29,14 +31,11 @@
     PublishReturned,
 )
 from fedora_messaging.message import Message
-from fedora_messaging.twisted.protocol import (
-    Consumer,
-    FedoraMessagingProtocolV2,
-)
+from fedora_messaging.twisted.protocol import Consumer, FedoraMessagingProtocolV2
 
-from twisted.internet import defer
 from .utils import MockProtocol
 
+
 try:
     import pytest_twisted
 except ImportError:

fedora_messaging/tests/unit/twisted/test_service.py

@@ -19,20 +19,20 @@
 import os
 from unittest import mock, TestCase
 
-from twisted.application.internet import TCPClient, SSLClient
-from twisted.internet import ssl as twisted_ssl
-from pika import URLParameters
 import pika
+from pika import URLParameters
+from twisted.application.internet import SSLClient, TCPClient
+from twisted.internet import ssl as twisted_ssl
 
 from fedora_messaging import config, exceptions
+from fedora_messaging.tests import FIXTURES_DIR
 from fedora_messaging.twisted.factory import FedoraMessagingFactoryV2
 from fedora_messaging.twisted.service import (
-    FedoraMessagingServiceV2,
     _configure_tls_parameters,
     _ssl_context_factory,
+    FedoraMessagingServiceV2,
     SSLOptions,
 )
-from fedora_messaging.tests import FIXTURES_DIR
 
 
 class ServiceTests(TestCase):

fedora_messaging/twisted/consumer.py

@@ -20,11 +20,10 @@
 import uuid
 
 import pika
-from twisted.internet import defer, reactor, threads, error
+from twisted.internet import defer, error, reactor, threads
 from twisted.python.failure import Failure
 
 from .. import config
-from ..message import get_message
 from ..exceptions import (
     ConnectionException,
     ConsumerCanceled,
@@ -34,6 +33,8 @@
     PermissionException,
     ValidationError,
 )
+from ..message import get_message
+
 
 _std_log = logging.getLogger(__name__)
 

fedora_messaging/twisted/factory.py

@@ -32,13 +32,13 @@
 from collections import namedtuple
 
 import pika
-
 from twisted.internet import defer, error, protocol
 from twisted.python.failure import Failure
 
 from ..exceptions import ConnectionException
 from .protocol import FedoraMessagingProtocolV2
 
+
 _std_log = logging.getLogger(__name__)