Merge pull request #236 from KeepSafe/connection_error

Convert ConnectionError to ClientDisconnectedError of ServerDisconnectedError

Author: asvetlov

aiohttp/parsers.py

@@ -120,6 +120,11 @@ def exception(self):
         return self._exception
 
     def set_exception(self, exc):
+        if isinstance(exc, ConnectionError):
+            exc, old_exc = self._eof_exc_class(), exc
+            exc.__cause__ = old_exc
+            exc.__context__ = old_exc
+
         self._exception = exc
 
         if self._output is not None:

aiohttp/server.py

@@ -239,7 +239,7 @@ def start(self):
                         isinstance(handler, asyncio.Future)):
                     yield from handler
 
-            except (ConnectionError, asyncio.CancelledError,
+            except (asyncio.CancelledError,
                     errors.ClientDisconnectedError):
                 self.log_debug('Ignored premature client disconnection.')
                 break

tests/test_parsers.py

@@ -48,6 +48,17 @@ def test_exception(self):
         stream.set_exception(exc)
         self.assertIs(stream.exception(), exc)
 
+    def test_exception_connection_error(self):
+        stream = parsers.StreamParser()
+        self.assertIsNone(stream.exception())
+
+        exc = ConnectionError()
+        stream.set_exception(exc)
+        self.assertIsNot(stream.exception(), exc)
+        self.assertIsInstance(stream.exception(), RuntimeError)
+        self.assertIs(stream.exception().__cause__, exc)
+        self.assertIs(stream.exception().__context__, exc)
+
     def test_exception_waiter(self):
         stream = parsers.StreamParser()