1 files changed, 63 insertions, 22 deletions
diff --git a/tests/test_config/test_factories.py b/tests/test_config/test_factories.py
index ea8dec720..325ba52f3 100644
--- a/tests/test_config/test_factories.py
+++ b/tests/test_config/test_factories.py
@@ -2,14 +2,17 @@ import unittest
 
 from . import dummyfactory
 
+
 class TestFactoriesMixin(unittest.TestCase):
     def _makeOne(self, *arg, **kw):
         from pyramid.config import Configurator
+
         config = Configurator(*arg, **kw)
         return config
 
     def test_set_request_factory(self):
         from pyramid.interfaces import IRequestFactory
+
         config = self._makeOne(autocommit=True)
         factory = object()
         config.set_request_factory(factory)
@@ -17,14 +20,16 @@ class TestFactoriesMixin(unittest.TestCase):
 
     def test_set_request_factory_dottedname(self):
         from pyramid.interfaces import IRequestFactory
+
         config = self._makeOne(autocommit=True)
-        config.set_request_factory(
-            'tests.test_config.dummyfactory')
-        self.assertEqual(config.registry.getUtility(IRequestFactory),
-                         dummyfactory)
+        config.set_request_factory('tests.test_config.dummyfactory')
+        self.assertEqual(
+            config.registry.getUtility(IRequestFactory), dummyfactory
+        )
 
     def test_set_response_factory(self):
         from pyramid.interfaces import IResponseFactory
+
         config = self._makeOne(autocommit=True)
         factory = lambda r: object()
         config.set_response_factory(factory)
@@ -32,58 +37,72 @@ class TestFactoriesMixin(unittest.TestCase):
 
     def test_set_response_factory_dottedname(self):
         from pyramid.interfaces import IResponseFactory
+
         config = self._makeOne(autocommit=True)
-        config.set_response_factory(
-            'tests.test_config.dummyfactory')
-        self.assertEqual(config.registry.getUtility(IResponseFactory),
-                         dummyfactory)
+        config.set_response_factory('tests.test_config.dummyfactory')
+        self.assertEqual(
+            config.registry.getUtility(IResponseFactory), dummyfactory
+        )
 
     def test_set_root_factory(self):
         from pyramid.interfaces import IRootFactory
+
         config = self._makeOne()
         config.set_root_factory(dummyfactory)
         self.assertEqual(config.registry.queryUtility(IRootFactory), None)
         config.commit()
-        self.assertEqual(config.registry.getUtility(IRootFactory), dummyfactory)
+        self.assertEqual(
+            config.registry.getUtility(IRootFactory), dummyfactory
+        )
 
     def test_set_root_factory_as_None(self):
         from pyramid.interfaces import IRootFactory
         from pyramid.traversal import DefaultRootFactory
+
         config = self._makeOne()
         config.set_root_factory(None)
         self.assertEqual(config.registry.queryUtility(IRootFactory), None)
         config.commit()
-        self.assertEqual(config.registry.getUtility(IRootFactory),
-                         DefaultRootFactory)
+        self.assertEqual(
+            config.registry.getUtility(IRootFactory), DefaultRootFactory
+        )
 
     def test_set_root_factory_dottedname(self):
         from pyramid.interfaces import IRootFactory
+
         config = self._makeOne()
         config.set_root_factory('tests.test_config.dummyfactory')
         self.assertEqual(config.registry.queryUtility(IRootFactory), None)
         config.commit()
-        self.assertEqual(config.registry.getUtility(IRootFactory), dummyfactory)
+        self.assertEqual(
+            config.registry.getUtility(IRootFactory), dummyfactory
+        )
 
     def test_set_session_factory(self):
         from pyramid.interfaces import ISessionFactory
+
         config = self._makeOne()
         config.set_session_factory(dummyfactory)
         self.assertEqual(config.registry.queryUtility(ISessionFactory), None)
         config.commit()
-        self.assertEqual(config.registry.getUtility(ISessionFactory),
-                         dummyfactory)
+        self.assertEqual(
+            config.registry.getUtility(ISessionFactory), dummyfactory
+        )
 
     def test_set_session_factory_dottedname(self):
         from pyramid.interfaces import ISessionFactory
+
         config = self._makeOne()
         config.set_session_factory('tests.test_config.dummyfactory')
         self.assertEqual(config.registry.queryUtility(ISessionFactory), None)
         config.commit()
-        self.assertEqual(config.registry.getUtility(ISessionFactory),
-                         dummyfactory)
+        self.assertEqual(
+            config.registry.getUtility(ISessionFactory), dummyfactory
+        )
 
     def test_add_request_method_with_callable(self):
         from pyramid.interfaces import IRequestExtensions
+
         config = self._makeOne(autocommit=True)
         callable = lambda x: None
         config.add_request_method(callable, name='foo')
@@ -92,23 +111,34 @@ class TestFactoriesMixin(unittest.TestCase):
 
     def test_add_request_method_with_unnamed_callable(self):
         from pyramid.interfaces import IRequestExtensions
+
         config = self._makeOne(autocommit=True)
-        def foo(self): pass
+
+        def foo(self):
+            pass
+
         config.add_request_method(foo)
         exts = config.registry.getUtility(IRequestExtensions)
         self.assertTrue('foo' in exts.methods)
 
     def test_set_multiple_request_methods_conflict(self):
         from pyramid.exceptions import ConfigurationConflictError
+
         config = self._makeOne()
-        def foo(self): pass
-        def bar(self): pass
+
+        def foo(self):
+            pass
+
+        def bar(self):
+            pass
+
         config.add_request_method(foo, name='bar')
         config.add_request_method(bar, name='bar')
         self.assertRaises(ConfigurationConflictError, config.commit)
 
     def test_add_request_method_with_None_callable(self):
         from pyramid.interfaces import IRequestExtensions
+
         config = self._makeOne(autocommit=True)
         config.add_request_method(name='foo')
         exts = config.registry.queryUtility(IRequestExtensions)
@@ -116,8 +146,12 @@ class TestFactoriesMixin(unittest.TestCase):
 
     def test_add_request_method_with_None_callable_conflict(self):
         from pyramid.exceptions import ConfigurationConflictError
+
         config = self._makeOne()
-        def bar(self): pass
+
+        def bar(self):
+            pass
+
         config.add_request_method(name='foo')
         config.add_request_method(bar, name='foo')
         self.assertRaises(ConfigurationConflictError, config.commit)
@@ -132,7 +166,9 @@ class TestFactoriesMixin(unittest.TestCase):
         from pyramid.exceptions import ConfigurationError
 
         config = self._makeOne(autocommit=True)
-        def boomshaka(r): pass
+
+        def boomshaka(r):
+            pass
 
         def get_bad_name():
             if PY2:
@@ -146,8 +182,12 @@ class TestFactoriesMixin(unittest.TestCase):
 
     def test_set_execution_policy(self):
         from pyramid.interfaces import IExecutionPolicy
+
         config = self._makeOne(autocommit=True)
-        def dummy_policy(environ, router): pass
+
+        def dummy_policy(environ, router):
+            pass
+
         config.set_execution_policy(dummy_policy)
         registry = config.registry
         result = registry.queryUtility(IExecutionPolicy)
@@ -156,6 +196,7 @@ class TestFactoriesMixin(unittest.TestCase):
     def test_set_execution_policy_to_None(self):
         from pyramid.interfaces import IExecutionPolicy
         from pyramid.router import default_execution_policy
+
         config = self._makeOne(autocommit=True)
         config.set_execution_policy(None)
         registry = config.registry