Shut up flake8

aio-libs · Mar 2, 2016 · 204b5d6 · 204b5d6
1 parent 6774b04
commit 204b5d6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/aiohttp/__init__.py b/aiohttp/__init__.py
@@ -17,15 +17,15 @@
 from .websocket_client import *  # noqa
 
 
-__all__ = (client.__all__ +
-           client_reqrep.__all__ +
-           errors.__all__ +
-           helpers.__all__ +
-           parsers.__all__ +
-           protocol.__all__ +
-           connector.__all__ +
-           streams.__all__ +
-           multidict.__all__ +
-           multipart.__all__ +
-           websocket_client.__all__ +
+__all__ = (client.__all__ +  # noqa
+           client_reqrep.__all__ +  # noqa
+           errors.__all__ +  # noqa
+           helpers.__all__ +  # noqa
+           parsers.__all__ +  # noqa
+           protocol.__all__ +  # noqa
+           connector.__all__ +  # noqa
+           streams.__all__ +  # noqa
+           multidict.__all__ +  # noqa
+           multipart.__all__ +  # noqa
+           websocket_client.__all__ +  # noqa
            ('hdrs', '__version__'))
diff --git a/aiohttp/web.py b/aiohttp/web.py
@@ -65,7 +65,7 @@ def handle_request(self, message, payload):
             now = self._loop.time()
 
         app = self._app
-        request = Request(
+        request = web_reqrep.Request(
             app, message, payload,
             self.transport, self.reader, self.writer,
             secure_proxy_ssl_header=self._secure_proxy_ssl_header)
@@ -89,11 +89,11 @@ def handle_request(self, message, payload):
                     handler = yield from factory(app, handler)
                 resp = yield from handler(request)
 
-            assert isinstance(resp, StreamResponse), \
+            assert isinstance(resp, web_reqrep.StreamResponse), \
                 ("Handler {!r} should return response instance, "
                  "got {!r} [middlewares {!r}]").format(
                      match_info.handler, type(resp), self._middlewares)
-        except HTTPException as exc:
+        except web_exceptions.HTTPException as exc:
             resp = exc
 
         resp_msg = yield from resp.prepare(request)
@@ -193,7 +193,7 @@ def __init__(self, *, logger=web_logger, loop=None,
         if loop is None:
             loop = asyncio.get_event_loop()
         if router is None:
-            router = UrlDispatcher()
+            router = web_urldispatcher.UrlDispatcher()
         assert isinstance(router, AbstractRouter), router
 
         self._debug = debug