Merge pull request #196 from thomwiggers/fix-py310-compat

Fix python 3.10 compatibility issues

Author: gawel

.github/workflows/tox.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: [3.5, 3.6, 3.7, 3.8, 3.9]
+        python: [3.5, 3.6, 3.7, 3.8, 3.9, "3.10"]
 
     steps:
       - uses: actions/checkout@v2

irc3/compat.py

@@ -4,6 +4,7 @@
 
 PY34 = bool(sys.version_info[0:2] >= (3, 4))
 PY35 = bool(sys.version_info[0:2] >= (3, 5))
+PY37 = bool(sys.version_info[0:2] >= (3, 7))
 
 
 try:  # pragma: no cover
@@ -13,9 +14,36 @@
 
 try:  # pragma: no cover
     import asyncio
-    from asyncio.queues import Queue
+    from asyncio.queues import Queue as BaseQueue
     from asyncio.queues import QueueFull  # NOQA
+    from asyncio import sleep as _original_sleep
+    from asyncio import wait as _original_wait
 except ImportError:  # pragma: no cover
     import trollius as asyncio  # NOQA
-    from trollius.queues import Queue  # NOQA
+    from trollius.queues import Queue  as BaseQueue # NOQA
     from trollius.queues import QueueFull  # NOQA
+    from trollius import sleep as _original_sleep
+    from trollius import wait as _original_wait
+
+
+def __sleep(*args, **kwargs):
+    if PY37 and "loop" in kwargs:
+        del kwargs["loop"]
+    return _original_sleep(*args, **kwargs)
+
+
+def __wait(*args, **kwargs):
+    if PY37 and "loop" in kwargs:
+        del kwargs["loop"]
+    return _original_wait(*args, **kwargs)
+
+
+asyncio.sleep = __sleep
+asyncio.wait = __wait
+
+class Queue(BaseQueue):
+    def __init__(self, *args, **kwargs):
+        if PY37 and "loop" in kwargs:
+            del kwargs["loop"]
+
+        super().__init__(*args, **kwargs)

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py35,py36,py37,py38,py39,flake8,docs
+envlist = py35,py36,py37,py38,py39,py310,flake8,docs
 
 [testenv]
 skipsdist=true