Fix compatibility with asyncio 3.4.1+ #170

Author: asvetlov

CHANGES.txt

@@ -1,6 +1,14 @@
 CHANGES
 =======
 
+0.9.3 (10-30-2014)
+------------------
+
+- Fix compatibility with asyncio 3.4.1+ #170
+
+0.9.2 (10-16-2014)
+------------------
+
 - Improve redirect handling #157
 
 - Send raw files as is #153

aiohttp/client.py

@@ -515,7 +515,12 @@ def write_bytes(self, request, reader):
                     'Can not write request body for %s' % self.url))
         else:
             try:
-                request.write_eof()
+                ret = request.write_eof()
+                # NB: in asyncio 3.4.1+ StreamWriter.drain() is coroutine
+                # see bug #170
+                if (asyncio.iscoroutine(ret) or
+                        isinstance(ret, asyncio.Future)):
+                    yield from ret
             except Exception as exc:
                 reader.set_exception(
                     aiohttp.ClientConnectionError(

aiohttp/server.py

@@ -219,9 +219,10 @@ def start(self):
                 self.log_debug('Ignored premature client disconnection.')
                 break
             except errors.HttpException as exc:
-                self.handle_error(exc.code, message, None, exc, exc.headers)
+                yield from self.handle_error(exc.code, message,
+                                             None, exc, exc.headers)
             except Exception as exc:
-                self.handle_error(500, message, None, exc)
+                yield from self.handle_error(500, message, None, exc)
             finally:
                 if self.transport is None:
                     self.log_debug('Ignored premature client disconnection.')
@@ -290,9 +291,10 @@ def handle_error(self, status=500,
             response.send_headers()
 
             response.write(html)
-            response.write_eof()
+            drain = response.write_eof()
 
             self.log_access(message, None, response, time.time() - now)
+            return drain
         finally:
             self.keep_alive(False)
 

examples/mpsrv.py

@@ -97,7 +97,7 @@ def handle_request(self, message, payload):
             except OSError:
                 response.write(b'Cannot open')
 
-        response.write_eof()
+        yield from response.write_eof()
         if response.keep_alive():
             self.keep_alive(True)
 

examples/wssrv.py

@@ -107,7 +107,7 @@ def handle_request(self, message, payload):
             except OSError:
                 response.write(b'Cannot open')
 
-            response.write_eof()
+            yield from response.write_eof()
             if response.keep_alive():
                 self.keep_alive(True)