Merge 92bb43a into 73dd27e

reefab · Oct 19, 2019 · a842973 · a842973
2 parents 73dd27e + 92bb43a
commit a842973
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/foobot_async/__init__.py b/foobot_async/__init__.py
@@ -9,6 +9,13 @@
 from datetime import datetime, timezone
 from math import trunc
 
+
+try:
+    DEFAULT_TIMEOUT = aiohttp.client.DEFAULT_TIMEOUT.total  # aiohttp >= 3.3
+except AttributeError:
+    DEFAULT_TIMEOUT = aiohttp.client.DEFAULT_TIMEOUT
+
+
 class FoobotClient(object):
     """
     Foobot API client
@@ -21,11 +28,11 @@ class FoobotClient(object):
     :param session: aiohttp session to use or None
     :type session: object or None
     :param timeout: seconds to wait for before triggering a timeout
-    :type timeout: integer
+    :type timeout: float
     """
 
     def __init__(self, token, username, session=None,
-                 timeout=aiohttp.client.DEFAULT_TIMEOUT):
+                 timeout=DEFAULT_TIMEOUT):
         """
         Creates a new :class:`FoobotClient` instance.
         """

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
     packages=setuptools.find_packages(),
 
-    install_requires=['aiohttp>=2.3.10', 'async_timeout', 'typing>=3,<4'],
+    install_requires=['aiohttp>=2.3.10', 'async_timeout'],
     zip_safe=True,
 
     classifiers=[