Issue #298: fix Python 3.10 support: import Callable from collections…

….abc

circuits/core/components.py

@@ -1,10 +1,13 @@
 """
 This module defines the BaseComponent and its subclass Component.
 """
-from collections import Callable
 from inspect import getmembers
 from itertools import chain
 from types import MethodType
+try:
+    from collections import Callable
+except ImportError:
+    from collections.abc import Callable
 
 from .events import Event, registered, unregistered
 from .handlers import HandlerMetaClass, handler

circuits/core/handlers.py

@@ -1,7 +1,10 @@
 """
 This module define the @handler decorator/function and the HandlesType type.
 """
-from collections import Callable
+try:
+    from collections import Callable
+except ImportError:
+    from collections.abc import Callable
 
 from circuits.tools import getargspec
 

circuits/web/controllers.py

@@ -3,8 +3,11 @@
 This module implements ...
 """
 import json
-from collections import Callable
 from functools import update_wrapper
+try:
+    from collections import Callable
+except ImportError:
+    from collections.abc import Callable
 
 from circuits.core import BaseComponent, handler
 from circuits.tools import getargspec

circuits/web/tools.py

@@ -3,7 +3,6 @@
 This module implements tools used throughout circuits.web.
 These tools can also be used within Controllers and request handlers.
 """
-import collections
 import hashlib
 import mimetypes
 import os
@@ -12,6 +11,10 @@
 from email.generator import _make_boundary
 from email.utils import formatdate
 from time import mktime
+try:
+    from collections import Callable
+except ImportError:
+    from collections.abc import Callable
 
 from circuits import BaseComponent, handler
 from circuits.web.wrappers import Host
@@ -314,7 +317,7 @@ def check_auth(request, response, realm, users, encrypt=None):
         if not encrypt:
             encrypt = _httpauth.DIGEST_AUTH_ENCODERS[_httpauth.MD5]
 
-        if isinstance(users, collections.Callable):
+        if isinstance(users, Callable):
             try:
                 # backward compatibility
                 users = users()  # expect it to return a dictionary

tests/conftest.py

@@ -1,10 +1,13 @@
 """py.test config"""
 
-import collections
 import sys
 import threading
 from collections import deque
 from time import sleep
+try:
+    from collections import Callable
+except ImportError:
+    from collections.abc import Callable
 
 import pytest
 
@@ -97,7 +100,7 @@ def wait(self):
 def wait_for(obj, attr, value=True, timeout=30.0):
     from circuits.core.manager import TIMEOUT
     for i in range(int(timeout / TIMEOUT)):
-        if isinstance(value, collections.Callable):
+        if isinstance(value, Callable):
             if value(obj, attr):
                 return True
         elif getattr(obj, attr) == value: