Merge pull request #9 from jacobtomlinson/async_timeout

Fix Async Timeout

aioslacker/__init__.py

@@ -2,6 +2,7 @@
 from urllib.parse import urlencode
 
 import aiohttp
+import async_timeout
 import requests
 import slacker
 
@@ -79,7 +80,7 @@ def __request(self, method, api, **kwargs):
         _response = None
 
         try:
-            with aiohttp.Timeout(self.timeout, loop=self.loop):
+            with async_timeout.timeout(self.timeout, loop=self.loop):
                 _response = yield from _request
 
             _response.raise_for_status()
@@ -285,7 +286,7 @@ def post(self, data):
         _response = None
 
         try:
-            with aiohttp.Timeout(self.timeout, loop=self.loop):
+            with async_timeout.timeout(self.timeout, loop=self.loop):
                 _response = yield from _request
 
             _response.raise_for_status()

setup.py

@@ -30,6 +30,7 @@ def read(*parts):
     long_description=read('README.rst'),
     install_requires=[
         'aiohttp>=1.3.0',
+        'async_timeout>=3.0.0',
         'slacker<=0.9.42',
     ],
     packages=['aioslacker'],