Fix tornado and asyncio backends

Author: zimbatm

pusher/aiohttp.py

@@ -14,7 +14,7 @@ def __init__(self, config):
         self.config = config
         self.conn = aiohttp.TCPConnector()
 
-    def send_request(_, request):
+    def send_request(self, request):
         method = request.method
         url = "%s%s" % (request.base_url, request.path)
         params = request.query_params

pusher/tornado.py

@@ -2,9 +2,12 @@
 
 from __future__ import (print_function, unicode_literals, absolute_import,
                         division)
+from pusher.http import process_response
 
+import six
 import tornado
 import tornado.httpclient
+from tornado.concurrent import TracebackFuture
 
 class TornadoBackend(object):
     """Adapter for the tornado.httpclient module.
@@ -14,12 +17,28 @@ class TornadoBackend(object):
     """
     def __init__(self, config, **kwargs):
         self.config = config
-        self.http = httpclient.HTTPClient(**kwargs)
+        self.http = tornado.httpclient.AsyncHTTPClient(**kwargs)
 
     def send_request(self, request):
         method = request.method
         data = request.body
         headers = {'Content-Type': 'application/json'}
+        future = TracebackFuture()
+
+        def process_response_future(response):
+            if response.exc_info() is not None:
+                future.set_exc_info(response.exc_info())
+            elif response.exception() is not None:
+                future.set_exception(response.exception())
+            else:
+                result = response.result()
+                code = result.code
+                body = (result.body or b'').decode('utf8')
+                future.set_result(process_response(code, body))
+
+        request = tornado.httpclient.HTTPRequest(request.url, method=method, body=data, headers=headers, request_timeout=self.config.timeout)
+        response_future = self.http.fetch(request, raise_error=False)
+        response_future.add_done_callback(process_response_future)
+
+        return future
 
-        request = self.http.request.httpclient.HTTPRequest(request.url, method=method, body=data, headers=headers, request_timeout=self.config.timeout)
-        return self.http.fetch(request, raise_error=False)