WebSocketDisconnectionError -> WSClientDisconnectionError

Author: asvetlov

aiohttp/errors.py

@@ -9,7 +9,7 @@
 
     'ClientError', 'ClientHttpProcessingError', 'ClientConnectionError',
     'ClientOSError', 'ClientTimeoutError', 'ProxyConnectionError',
-    'ClientRequestError', 'ClientResponseError', 'WebSocketDisconnectedError']
+    'ClientRequestError', 'ClientResponseError', 'WSClientDisconnectedError']
 
 from asyncio import TimeoutError
 
@@ -26,8 +26,8 @@ class ServerDisconnectedError(DisconnectedError):
     """Server disconnected."""
 
 
-class WebSocketDisconnectedError(ClientDisconnectedError):
-    """Raised on closing websocket by peer."""
+class WSClientDisconnectedError(ClientDisconnectedError):
+    """Raised on closing server websocket."""
 
     def __init__(self, code=None, message=None):
         super().__init__(code, message)

aiohttp/web.py

@@ -25,11 +25,11 @@
 from .server import ServerHttpProtocol
 from .streams import EOF_MARKER
 from .websocket import do_handshake, MSG_BINARY, MSG_CLOSE, MSG_PING, MSG_TEXT
-from .errors import HttpProcessingError, WebSocketDisconnectedError
+from .errors import HttpProcessingError, WSClientDisconnectedError
 
 
 __all__ = [
-    'WebSocketDisconnectedError',
+    'WSClientDisconnectedError',
     'Application',
     'HttpVersion',
     'RequestHandler',
@@ -831,14 +831,14 @@ def receive_msg(self):
 
             if msg.tp == MSG_CLOSE:
                 if self._closing:
-                    exc = WebSocketDisconnectedError(msg.data, msg.extra)
+                    exc = WSClientDisconnectedError(msg.data, msg.extra)
                     self._closing_fut.set_exception(exc)
                     raise exc
                 else:
                     self._closing = True
                     self._writer.close(msg.data, msg.extra)
                     yield from self.drain()
-                    exc = WebSocketDisconnectedError(msg.data, msg.extra)
+                    exc = WSClientDisconnectedError(msg.data, msg.extra)
                     self._closing_fut.set_exception(exc)
                     raise exc
             elif not self._closing:

examples/web_ws.py

@@ -5,7 +5,7 @@
 import asyncio
 import os
 from aiohttp.web import (Application, Response,
-                         WebSocketResponse, WebSocketDisconnectedError)
+                         WebSocketResponse, WSClientDisconnectedError)
 
 WS_FILE = os.path.join(os.path.dirname(__file__), 'websocket.html')
 
@@ -31,7 +31,7 @@ def wshandler(request):
             for ws in request.app['sockets']:
                 if ws is not resp:
                     ws.send_str(msg)
-    except WebSocketDisconnectedError:
+    except WSClientDisconnectedError:
         if resp not in request.app['sockets']:
             return resp
         request.app['sockets'].remove(resp)

tests/test_web_websocket.py

@@ -3,7 +3,7 @@
 from unittest import mock
 from aiohttp import CIMultiDict
 from aiohttp.web import (Request, WebSocketResponse,
-                         WebSocketDisconnectedError,
+                         WSClientDisconnectedError,
                          HTTPMethodNotAllowed, HTTPBadRequest)
 from aiohttp.protocol import RawRequestMessage, HttpVersion11
 from aiohttp import websocket
@@ -145,7 +145,7 @@ def test_nested_exception(self):
 
         @asyncio.coroutine
         def a():
-            raise WebSocketDisconnectedError()
+            raise WSClientDisconnectedError()
 
         @asyncio.coroutine
         def b():
@@ -155,7 +155,7 @@ def b():
         def c():
             yield from b()
 
-        with self.assertRaises(WebSocketDisconnectedError):
+        with self.assertRaises(WSClientDisconnectedError):
             self.loop.run_until_complete(c())
 
     def test_can_start_ok(self):

tests/test_web_websocket_functional.py

@@ -92,7 +92,7 @@ def handler(request):
             ws.close()
             try:
                 yield from ws.receive_str()
-            except web.WebSocketDisconnectedError:
+            except web.WSClientDisconnectedError:
                 closed.set_result(None)
             return ws
 
@@ -155,7 +155,7 @@ def handler(request):
 
             try:
                 yield from ws.receive_str()
-            except web.WebSocketDisconnectedError as exc:
+            except web.WSClientDisconnectedError as exc:
                 self.assertEqual(1, exc.code)
                 self.assertEqual(b'exit message', exc.message)
                 closed.set_result(None)
@@ -185,7 +185,7 @@ def handler(request):
             ws.ping('data')
             try:
                 yield from ws.receive_str()
-            except web.WebSocketDisconnectedError as exc:
+            except web.WSClientDisconnectedError as exc:
                 self.assertEqual(2, exc.code)
                 self.assertEqual(b'exit message', exc.message)
                 closed.set_result(None)
@@ -215,7 +215,7 @@ def handler(request):
 
             try:
                 yield from ws.receive_str()
-            except web.WebSocketDisconnectedError:
+            except web.WSClientDisconnectedError:
                 closed.set_result(None)
                 raise
 
@@ -245,7 +245,7 @@ def handler(request):
             ws.pong('data')
             try:
                 yield from ws.receive_str()
-            except web.WebSocketDisconnectedError as exc:
+            except web.WSClientDisconnectedError as exc:
                 self.assertEqual(2, exc.code)
                 self.assertEqual(b'exit message', exc.message)
                 closed.set_result(None)
@@ -318,7 +318,7 @@ def handler(request):
             ws.close()
             try:
                 yield from ws.receive_str()
-            except web.WebSocketDisconnectedError:
+            except web.WSClientDisconnectedError:
                 closed.set_result(None)
             return ws
 
@@ -344,7 +344,7 @@ def handler(request):
             ws.start(request)
             try:
                 yield from ws.receive_str()
-            except web.WebSocketDisconnectedError:
+            except web.WSClientDisconnectedError:
                 closed.set_result(None)
             return ws
 
@@ -370,7 +370,7 @@ def closer(ws):
             ws.close()
             try:
                 yield from ws.wait_closed()
-            except web.WebSocketDisconnectedError:
+            except web.WSClientDisconnectedError:
                 closed2.set_result(None)
 
         @asyncio.coroutine
@@ -380,7 +380,7 @@ def handler(request):
             asyncio.async(closer(ws), loop=request.app.loop)
             try:
                 yield from ws.receive_str()
-            except web.WebSocketDisconnectedError:
+            except web.WSClientDisconnectedError:
                 closed.set_result(None)
             return ws
 
@@ -407,7 +407,7 @@ def handler(request):
             ws.close()
             try:
                 yield from ws.receive_str()
-            except web.WebSocketDisconnectedError:
+            except web.WSClientDisconnectedError:
                 closed.set_result(None)
             return ws