From 59753ae05a4d8bcaec64e2433e74e4e0a1298769 Mon Sep 17 00:00:00 2001 From: Firepup Sixfifty Date: Mon, 20 May 2024 22:23:16 -0500 Subject: [PATCH] Bitbot Python3.11 Inital Commit - Port to develop --- modules/check_certificate.py | 4 ++-- src/ModuleManager.py | 2 +- src/utils/http.py | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/check_certificate.py b/modules/check_certificate.py index 6695fc22..aab191a9 100644 --- a/modules/check_certificate.py +++ b/modules/check_certificate.py @@ -15,8 +15,8 @@ class Module(ModuleManager.BaseModule): today = datetime.datetime.utcnow().date() week = datetime.timedelta(days=7) - not_valid_until = (today-certificate.not_valid_before.date()).days - not_valid_after = (certificate.not_valid_after.date()-today).days + not_valid_until = (today-certificate.not_valid_before_utc.date()).days + not_valid_after = (certificate.not_valid_after_utc.date()-today).days if not_valid_until < 0: self.log.warn( 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 @@ class ModuleManager(object): 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..d2f92ec2 100644 --- a/src/utils/http.py +++ b/src/utils/http.py @@ -304,7 +304,11 @@ def request_many(requests: typing.List[Request]) -> typing.Dict[str, Response]: loop = asyncio.new_event_loop() awaits = [] for request in requests: +<<<<<<< HEAD awaits.append(_request(request)) +======= + awaits.append(loop.create_task(_request(request))) +>>>>>>> 3bf47d9d (Bitbot Python3.11 Inital Commit) task = asyncio.wait(awaits, timeout=5) loop.run_until_complete(task) loop.close()