Merge branch 'master' of https://github.com/Pylons/pyramid

4 files changed, 9 insertions, 9 deletions

diff --git a/tests/pkgs/restbugapp/views.py b/tests/pkgs/restbugapp/views.py
index 6930d3668..d7e253ac2 100644
--- a/tests/pkgs/restbugapp/views.py
+++ b/tests/pkgs/restbugapp/views.py
@@ -8,7 +8,7 @@ class BaseRESTView:
 
 
 class PetRESTView(BaseRESTView):
-    """ REST Controller to control action of an avatar """
+    """REST Controller to control action of an avatar"""
 
     def __init__(self, context, request):
         super().__init__(context, request)
diff --git a/tests/test_config/test_init.py b/tests/test_config/test_init.py
index 0a9e2988c..4ecd081e0 100644
--- a/tests/test_config/test_init.py
+++ b/tests/test_config/test_init.py
@@ -1349,7 +1349,7 @@ class TestConfigurator__add_predicate(unittest.TestCase):
             kw=None,
             order=0,
             introspectables=(),
-            **extra
+            **extra,
         ):
             self.assertEqual(len(introspectables), 1)
             self.assertEqual(introspectables[0]['name'], 'testing')
@@ -1368,7 +1368,7 @@ class TestConfigurator__add_predicate(unittest.TestCase):
             kw=None,
             order=0,
             introspectables=(),
-            **extra
+            **extra,
         ):
             self.assertEqual(len(introspectables), 1)
             self.assertEqual(introspectables[0]['name'], 'testing')
diff --git a/tests/test_config/test_views.py b/tests/test_config/test_views.py
index fcccbfba3..72f8f0145 100644
--- a/tests/test_config/test_views.py
+++ b/tests/test_config/test_views.py
@@ -248,7 +248,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         from pyramid.renderers import null_renderer
 
         def view(request):
-            """ ABC """
+            """ABC"""
             return 'OK'
 
         def view_wrapper(fn):
@@ -271,7 +271,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         from pyramid.renderers import null_renderer
 
         def view(request):
-            """ ABC """
+            """ABC"""
             return 'OK'
 
         def view_wrapper1(fn):
@@ -306,7 +306,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         response = Response('OK')
 
         def view(request):
-            """ ABC """
+            """ABC"""
             return response
 
         config = self._makeOne(autocommit=True)
@@ -3790,7 +3790,7 @@ class Test_preserve_view_attrs(unittest.TestCase):
 
     def test_it_different(self):
         class DummyView1:
-            """ 1 """
+            """1"""
 
             __name__ = '1'
             __module__ = '1'
@@ -3808,7 +3808,7 @@ class Test_preserve_view_attrs(unittest.TestCase):
                 """ """
 
         class DummyView2:
-            """ 2 """
+            """2"""
 
             __name__ = '2'
             __module__ = '2'
diff --git a/tests/test_router.py b/tests/test_router.py
index 857e8aea5..f136e5ab3 100644
--- a/tests/test_router.py
+++ b/tests/test_router.py
@@ -56,7 +56,7 @@ class TestRouter(unittest.TestCase):
         virtual_root=None,
         virtual_root_path=None,
         raise_error=None,
-        **kw
+        **kw,
     ):
         from pyramid.interfaces import ITraverser