diff --git a/requirements.txt b/requirements.txt index a3155c0d..c04cfeeb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,12 +5,15 @@ dnspython ==2.0.0 feedparser ==6.0.2 html5lib ==1.0.1 isodate ==0.6.0 -lxml ==4.9.1 +lxml ==5.3.0 netifaces ==0.10.9 PySocks ==1.7.1 python-dateutil ==2.8.1 pytz ==2019.2 -requests ==2.22.0 +requests ==2.31.0 +scrypt ==0.8.13 +suds ==1.1.2 tornado ==6.0.3 tweepy ==3.8.0 requests-toolbelt ==0.9.1 +urllib3 ==1.26.15 diff --git a/src/ModuleManager.py b/src/ModuleManager.py index a43181fe..034be660 100644 --- a/src/ModuleManager.py +++ b/src/ModuleManager.py @@ -235,7 +235,7 @@ def _load_module(self, bot: "IRCBot.Bot", definition: ModuleDefinition, definition.filename) module = importlib.util.module_from_spec(import_spec) sys.modules[import_name] = module - loader = typing.cast(importlib.abc.Loader, import_spec.loader) + loader = typing.cast(importlib._abc.Loader, import_spec.loader) loader.exec_module(module) module_object_pointer = getattr(module, "Module", None) diff --git a/src/utils/http.py b/src/utils/http.py index b07afbeb..4df8e850 100644 --- a/src/utils/http.py +++ b/src/utils/http.py @@ -301,13 +301,11 @@ async def _request(request): responses[request.id] = Response(response.code, response.body, encoding, headers, {}) - loop = asyncio.new_event_loop() - awaits = [] - for request in requests: - awaits.append(_request(request)) - task = asyncio.wait(awaits, timeout=5) - loop.run_until_complete(task) - loop.close() + async def _getResponses(requests): + tasks = [asyncio.create_task(_request(request)) for request in requests] + done,pending = await asyncio.wait(tasks) + + asyncio.run(_getResponses(requests)) return responses