rename deprecated toolbar_middleware_factory to middleware in tests a…

…nd exmple
aio-libs · Jun 1, 2015 · 579286c · 579286c
1 parent d272ca4
commit 579286c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/examples/simple.py b/examples/simple.py
@@ -21,8 +21,8 @@ def exception_handler(request):
 @asyncio.coroutine
 def init(loop):
     # add aiohttp_debugtoolbar middleware to you application
-    app = web.Application(loop=loop, middlewares=[aiohttp_debugtoolbar
-                          .toolbar_middleware_factory])
+    app = web.Application(loop=loop,
+                          middlewares=[aiohttp_debugtoolbar.middleware])
     # install aiohttp_debugtoolbar
     aiohttp_debugtoolbar.setup(app)
 

diff --git a/tests/test_exception_views.py b/tests/test_exception_views.py
@@ -4,8 +4,7 @@
 import jinja2
 from aiohttp import web
 
-from aiohttp_debugtoolbar import (toolbar_middleware_factory,
-                                  setup as tbsetup, APP_KEY)
+from aiohttp_debugtoolbar import (middleware, setup as tbsetup, APP_KEY)
 
 from .base import BaseTest
 
@@ -14,7 +13,7 @@ class TestExceptionViews(BaseTest):
     @asyncio.coroutine
     def _setup_app(self, handler, **kw):
         app = web.Application(loop=self.loop,
-                              middlewares=[toolbar_middleware_factory])
+                              middlewares=[middleware])
 
         tbsetup(app, **kw)
 

diff --git a/tests/test_middlware.py b/tests/test_middlware.py
@@ -4,7 +4,7 @@
 import jinja2
 from aiohttp import web
 
-from aiohttp_debugtoolbar import toolbar_middleware_factory, setup as tbsetup
+from aiohttp_debugtoolbar import middleware, setup as tbsetup
 
 from .base import BaseTest
 
@@ -14,7 +14,7 @@ class TestMiddleware(BaseTest):
     @asyncio.coroutine
     def _setup_app(self, handler, **kw):
         app = web.Application(loop=self.loop,
-                              middlewares=[toolbar_middleware_factory])
+                              middlewares=[middleware])
 
         tbsetup(app, **kw)
 
@@ -207,6 +207,6 @@ def test_setup_not_called_exception(self):
         def go():
             app = web.Application(loop=self.loop)
             with self.assertRaises(RuntimeError):
-                yield from toolbar_middleware_factory(app, lambda r: r)
+                yield from middleware(app, lambda r: r)
 
         self.loop.run_until_complete(go())
diff --git a/tests/test_server_push.py b/tests/test_server_push.py
@@ -5,17 +5,15 @@
 import jinja2
 from aiohttp import web
 
-from aiohttp_debugtoolbar import (toolbar_middleware_factory,
-                                  setup as tbsetup, APP_KEY)
+from aiohttp_debugtoolbar import middleware, setup as tbsetup, APP_KEY
 
 from .base import BaseTest
 
 
 class TestExceptionViews(BaseTest):
     @asyncio.coroutine
     def _setup_app(self, handler, **kw):
-        app = web.Application(loop=self.loop,
-                              middlewares=[toolbar_middleware_factory])
+        app = web.Application(loop=self.loop, middlewares=[middleware])
 
         tbsetup(app, **kw)