12 files changed, 122 insertions, 20 deletions
diff --git a/stevedore/_cache.py b/stevedore/_cache.py
index 28a45fa..cd0e1cd 100644
--- a/stevedore/_cache.py
+++ b/stevedore/_cache.py
@@ -72,8 +72,7 @@ def _ftobytes(f):
 
 
 def _hash_settings_for_path(path):
-    """Return a hash and the path settings that created it.
-    """
+    """Return a hash and the path settings that created it."""
     paths = []
     h = hashlib.sha256()
 
diff --git a/stevedore/driver.py b/stevedore/driver.py
index 2fd4ade..bccbcd1 100644
--- a/stevedore/driver.py
+++ b/stevedore/driver.py
@@ -10,7 +10,8 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-from .exception import NoMatches, MultipleMatches
+from .exception import MultipleMatches
+from .exception import NoMatches
 from .named import NamedExtensionManager
 
 
@@ -142,7 +143,6 @@ class DriverManager(NamedExtensionManager):
 
     @property
     def driver(self):
-        """Returns the driver being used by this manager.
-        """
+        """Returns the driver being used by this manager."""
         ext = self.extensions[0]
         return ext.obj if ext.obj else ext.plugin
diff --git a/stevedore/example/base.py b/stevedore/example/base.py
index 08f8a5c..cd48bf2 100644
--- a/stevedore/example/base.py
+++ b/stevedore/example/base.py
@@ -1,3 +1,18 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2020 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 import abc
 
 
diff --git a/stevedore/example/load_as_driver.py b/stevedore/example/load_as_driver.py
index 6838c9d..a3de5df 100644
--- a/stevedore/example/load_as_driver.py
+++ b/stevedore/example/load_as_driver.py
@@ -1,3 +1,17 @@
+# Copyright (C) 2020 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 import argparse
 
 from stevedore import driver
diff --git a/stevedore/example/load_as_extension.py b/stevedore/example/load_as_extension.py
index f751852..1af1f46 100644
--- a/stevedore/example/load_as_extension.py
+++ b/stevedore/example/load_as_extension.py
@@ -1,3 +1,17 @@
+# Copyright (C) 2020 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 import argparse
 
 from stevedore import extension
diff --git a/stevedore/example/setup.py b/stevedore/example/setup.py
index 33e2aee..c0ea667 100644
--- a/stevedore/example/setup.py
+++ b/stevedore/example/setup.py
@@ -1,4 +1,19 @@
-from setuptools import setup, find_packages
+# Copyright (C) 2020 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from setuptools import find_packages
+from setuptools import setup
 
 setup(
     name='stevedore-examples',
diff --git a/stevedore/example/simple.py b/stevedore/example/simple.py
index 1cad96a..0cc3acd 100644
--- a/stevedore/example/simple.py
+++ b/stevedore/example/simple.py
@@ -1,9 +1,21 @@
+# Copyright (C) 2020 Red Hat, Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
 from stevedore.example import base
 
 
 class Simple(base.FormatterBase):
-    """A very basic formatter.
-    """
+    """A very basic formatter."""
 
     def format(self, data):
         """Format the data and return unicode text.
diff --git a/stevedore/example2/fields.py b/stevedore/example2/fields.py
index f5c8e19..82db747 100644
--- a/stevedore/example2/fields.py
+++ b/stevedore/example2/fields.py
@@ -1,3 +1,18 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2020 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 import textwrap
 
 from stevedore.example import base
diff --git a/stevedore/example2/setup.py b/stevedore/example2/setup.py
index 31d7145..2293c66 100644
--- a/stevedore/example2/setup.py
+++ b/stevedore/example2/setup.py
@@ -1,4 +1,19 @@
-from setuptools import setup, find_packages
+# Copyright (C) 2020 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from setuptools import find_packages
+from setuptools import setup
 
 setup(
     name='stevedore-examples2',
diff --git a/stevedore/extension.py b/stevedore/extension.py
index d738189..06ac067 100644
--- a/stevedore/extension.py
+++ b/stevedore/extension.py
@@ -13,8 +13,8 @@
 """ExtensionManager
 """
 
-import operator
 import logging
+import operator
 
 from . import _cache
 from .exception import NoMatches
@@ -331,8 +331,7 @@ class ExtensionManager(object):
                 LOG.exception(err)
 
     def items(self):
-        """
-        Return an iterator of tuples of the form (name, extension).
+        """Return an iterator of tuples of the form (name, extension).
 
         This is analogous to the Mapping.items() method.
         """
@@ -356,6 +355,5 @@ class ExtensionManager(object):
         return self._extensions_by_name[name]
 
     def __contains__(self, name):
-        """Return true if name is in list of enabled extensions.
-        """
+        """Return true if name is in list of enabled extensions."""
         return any(extension.name == name for extension in self.extensions)
diff --git a/stevedore/tests/test_dispatch.py b/stevedore/tests/test_dispatch.py
index f1c305a..e54e492 100644
--- a/stevedore/tests/test_dispatch.py
+++ b/stevedore/tests/test_dispatch.py
@@ -10,8 +10,8 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-from stevedore.tests import utils
 from stevedore import dispatch
+from stevedore.tests import utils
 
 
 def check_dispatch(ep, *args, **kwds):
diff --git a/stevedore/tests/test_test_manager.py b/stevedore/tests/test_test_manager.py
index 54bb454..3ada139 100644
--- a/stevedore/tests/test_test_manager.py
+++ b/stevedore/tests/test_test_manager.py
@@ -10,15 +10,20 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-from unittest.mock import Mock, sentinel
+from unittest.mock import Mock
+from unittest.mock import sentinel
 
-from stevedore import (ExtensionManager, NamedExtensionManager, HookManager,
-                       DriverManager, EnabledExtensionManager)
-from stevedore.dispatch import (DispatchExtensionManager,
-                                NameDispatchExtensionManager)
+from stevedore.dispatch import DispatchExtensionManager
+from stevedore.dispatch import NameDispatchExtensionManager
 from stevedore.extension import Extension
 from stevedore.tests import utils
 
+from stevedore import DriverManager
+from stevedore import EnabledExtensionManager
+from stevedore import ExtensionManager
+from stevedore import HookManager
+from stevedore import NamedExtensionManager
+
 
 test_extension = Extension('test_extension', None, None, None)
 test_extension2 = Extension('another_one', None, None, None)