support for aiohttp 3.x

miguelgrinberg · Mar 5, 2018 · 810e759 · 810e759
1 parent 37b81ae
commit 810e759
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/engineio/async_aiohttp.py b/engineio/async_aiohttp.py
@@ -1,3 +1,4 @@
+import asyncio
 import sys
 from urllib.parse import urlsplit
 
@@ -100,9 +101,13 @@ async def close(self):
 
     async def send(self, message):
         if isinstance(message, bytes):
-            self._sock.send_bytes(message)
+            f = self._sock.send_bytes
         else:
-            self._sock.send_str(message)
+            f = self._sock.send_str
+        if asyncio.iscoroutinefunction(f):
+            await f(message)
+        else:
+            f(message)
 
     async def wait(self):
         msg = await self._sock.receive()

diff --git a/engineio/asyncio_server.py b/engineio/asyncio_server.py
@@ -176,7 +176,7 @@ async def handle_request(self, *args, **kwargs):
                 self.logger.warning('Method %s not supported', method)
                 r = self._method_not_found()
         if not isinstance(r, dict):
-            return r or []
+            return r if r is not None else []
         if self.http_compression and \
                 len(r['response']) >= self.compression_threshold:
             encodings = [e.split(';')[0].strip() for e in