Remove old venusian dependency

It is unmaintained and blocking Python 3.10

Author: linuxdaemon

cloudbot/bot.py

@@ -1,6 +1,7 @@
 import asyncio
 import collections
 import gc
+import importlib
 import logging
 import re
 import time
@@ -10,13 +11,12 @@
 from pathlib import Path
 from typing import Any, Dict, Optional, Type
 
-from sqlalchemy import Table, create_engine, inspect
+from sqlalchemy import Table, create_engine
+from sqlalchemy import inspect as sa_inspect
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import Session, scoped_session, sessionmaker
-from venusian import Scanner
 from watchdog.observers import Observer
 
-from cloudbot import clients
 from cloudbot.client import Client
 from cloudbot.config import Config
 from cloudbot.event import CommandEvent, Event, EventType, RegexEvent
@@ -315,8 +315,21 @@ def load_clients(self):
         """
         Load all clients from the "clients" directory
         """
-        scanner = Scanner(bot=self)
-        scanner.scan(clients, categories=["cloudbot.client"])
+        for file in (Path(__file__).parent / "clients").rglob("*.py"):
+            if file.name.startswith("_"):
+                continue
+
+            mod = importlib.import_module("cloudbot.clients." + file.stem)
+            for _, obj in vars(mod).items():
+                if not isinstance(obj, type):
+                    continue
+
+                try:
+                    _type = obj._cloudbot_client  # type: ignore
+                except AttributeError:
+                    continue
+
+                self.register_client(_type, obj)
 
     async def process(self, event):
         run_before_tasks = []
@@ -466,7 +479,7 @@ def migrate_db(self) -> None:
         old_session: Session = scoped_session(sessionmaker(bind=engine))()
         new_session: Session = database.Session()
         table: Table
-        inspector = inspect(engine)
+        inspector = sa_inspect(engine)
         for table in database.metadata.tables.values():
             logger.info("Migrating table %s", table.name)
             if not inspector.has_table(table.name):

cloudbot/client.py

@@ -4,8 +4,6 @@
 import random
 from typing import Any, Dict
 
-import venusian
-
 from cloudbot.permissions import PermissionManager
 from cloudbot.util import async_util
 
@@ -14,10 +12,7 @@
 
 def client(_type):
     def _decorate(cls):
-        def callback_cb(context, name, obj):
-            context.bot.register_client(_type, cls)
-
-        venusian.attach(cls, callback_cb, category="cloudbot.client")
+        cls._cloudbot_client = _type
         return cls
 
     return _decorate

requirements.txt

@@ -17,6 +17,5 @@ py-irclib == 0.3.0
 requests == 2.27.1
 tweepy == 3.10.0
 urllib3 == 1.26.7
-venusian == 3.0.0
 watchdog == 2.1.6
 yarl == 1.7.2