rename HandlerManager to RequestHandlerFactory

Author: fafhrd91

aiohttp/web.py

@@ -27,8 +27,8 @@
 __all__ = [
     'Application',
     'HttpVersion',
-    'HandlerManager',
     'RequestHandler',
+    'RequestHandlerFactory',
     'Request',
     'StreamResponse',
     'Response',
@@ -1200,7 +1200,7 @@ def handle_request(self, message, payload):
         self.log_access(message, None, resp_msg, self._loop.time() - now)
 
 
-class HandlerManager:
+class RequestHandlerFactory:
 
     def __init__(self, app, router, *,
                  handler=RequestHandler, loop=None, **kwargs):
@@ -1257,7 +1257,7 @@ def __call__(self):
 class Application(dict):
 
     def __init__(self, *, logger=web_logger, loop=None,
-                 router=None, handler=HandlerManager, **kwargs):
+                 router=None, handler_factory=RequestHandlerFactory, **kwargs):
         # TODO: explicitly accept *debug* param
         if loop is None:
             loop = asyncio.get_event_loop()
@@ -1266,7 +1266,7 @@ def __init__(self, *, logger=web_logger, loop=None,
         assert isinstance(router, AbstractRouter), router
 
         self._router = router
-        self._handler = handler
+        self._handler_factory = handler_factory
         self._finish_callbacks = []
         self._loop = loop
         self.logger = logger
@@ -1282,7 +1282,8 @@ def loop(self):
         return self._loop
 
     def make_handler(self, **kwargs):
-        return self._handler(self, self.router, loop=self.loop, **kwargs)
+        return self._handler_factory(
+            self, self.router, loop=self.loop, **kwargs)
 
     @asyncio.coroutine
     def finish(self):

docs/web.rst

@@ -663,7 +663,7 @@ Application is a synonym for web-server.
 
 To get fully working example, you have to make *application*, register
 supported urls in *router* and create a *server socket* with
-:class:`aiohttp.HandlerManager` as a *protocol factory*. *HandlerManager*
+:class:`aiohttp.RequestHandlerFactory` as a *protocol factory*. *RequestHandlerFactory*
 could be constructed with :meth:`make_handler`.
 
 *Application* contains a *router* instance and a list of callbacks that
@@ -719,7 +719,7 @@ arbitrary properties for later access from
 
       Creates HTTP protocol factory for handling requests.
 
-      :param kwargs: additional parameters for :class:`HandlerManager`
+      :param kwargs: additional parameters for :class:`RequestHandlerFactory`
                      constructor.
 
       You should pass result of the method as *protocol_factory* to
@@ -760,10 +760,10 @@ arbitrary properties for later access from
       :meth:`finish` will un-yield (`yield from`) the later.
 
 
-HandlerManager
-^^^^^^^^^^^^^^
+RequestHandlerFactory
+^^^^^^^^^^^^^^^^^^^^^
 
-HandlerManager is responsible for creating HTTP protocol objects that
+RequestHandlerFactory is responsible for creating HTTP protocol objects that
 can handle http connections.
 
    .. attribute:: connections

tests/test_web.py

@@ -91,7 +91,7 @@ def test_logging(self):
         self.assertIs(app.logger, logger)
 
 
-class TestHandlerManager(unittest.TestCase):
+class TestRequestHandlerFactory(unittest.TestCase):
 
     def setUp(self):
         self.loop = asyncio.new_event_loop()