From 1bef65ea7355e699289446300a138ea4c73840db Mon Sep 17 00:00:00 2001 From: dece Date: Mon, 28 Nov 2022 23:29:22 +0100 Subject: [PATCH] plugins: dependencies are not required What, exactly, are you going to do? --- edmond/bot.py | 4 ---- edmond/plugins/journee_mondiale.py | 7 +------ edmond/plugins/meteo_france.py | 7 +------ edmond/plugins/music.py | 7 +------ edmond/plugins/translate.py | 7 +------ edmond/plugins/unknown_command.py | 7 ------- edmond/plugins/wikipedia.py | 7 +------ edmond/plugins/youtube.py | 9 ++------- edmond/plugins/youtube_parser.py | 7 +------ 9 files changed, 8 insertions(+), 54 deletions(-) diff --git a/edmond/bot.py b/edmond/bot.py index cc898f9..214b733 100644 --- a/edmond/bot.py +++ b/edmond/bot.py @@ -146,10 +146,6 @@ class Bot(irc.client.SimpleIRCClient, Logger): ) for plugin_name in plugin_names: module = importlib.import_module(f"edmond.plugins.{plugin_name}") - are_dependencies_ok = getattr(module, "DEPENDENCIES_FOUND", True) - if not are_dependencies_ok: - self.log_e(f"Dependencies not found for plugin {plugin_name}.") - continue # Get plugin class name from its module name. class_name = ( "".join(map(lambda w: w.capitalize(), plugin_name.split("_"))) diff --git a/edmond/plugins/journee_mondiale.py b/edmond/plugins/journee_mondiale.py index 3b1c563..0f2cfe3 100644 --- a/edmond/plugins/journee_mondiale.py +++ b/edmond/plugins/journee_mondiale.py @@ -1,12 +1,7 @@ import datetime from typing import cast -# BS is optional and only for scrapping journee-mondiale.com, thus why we do not -# mark the dependencies flag here. -try: - from bs4 import BeautifulSoup -except ImportError: - BeautifulSoup = None +from bs4 import BeautifulSoup from edmond.plugin import Plugin from edmond.plugins.plus import PlusPlugin diff --git a/edmond/plugins/meteo_france.py b/edmond/plugins/meteo_france.py index 6d226b6..23855b9 100644 --- a/edmond/plugins/meteo_france.py +++ b/edmond/plugins/meteo_france.py @@ -1,11 +1,6 @@ import time -try: - import meteofrance_api as mf - - DEPENDENCIES_FOUND = True -except ImportError: - DEPENDENCIES_FOUND = False +import meteofrance_api as mf from edmond.plugin import Plugin diff --git a/edmond/plugins/music.py b/edmond/plugins/music.py index b3993c0..1fc68f1 100644 --- a/edmond/plugins/music.py +++ b/edmond/plugins/music.py @@ -1,11 +1,6 @@ import random -try: - from scaruffi.api import ScaruffiApi - - DEPENDENCIES_FOUND = True -except ImportError: - DEPENDENCIES_FOUND = False +from scaruffi.api import ScaruffiApi from edmond.plugin import Plugin diff --git a/edmond/plugins/translate.py b/edmond/plugins/translate.py index f95fdad..cb4acb6 100644 --- a/edmond/plugins/translate.py +++ b/edmond/plugins/translate.py @@ -1,9 +1,4 @@ -try: - from translate import Translator - - DEPENDENCIES_FOUND = True -except ImportError: - DEPENDENCIES_FOUND = False +from translate import Translator from edmond.plugin import Plugin diff --git a/edmond/plugins/unknown_command.py b/edmond/plugins/unknown_command.py index 808f681..72b5033 100644 --- a/edmond/plugins/unknown_command.py +++ b/edmond/plugins/unknown_command.py @@ -1,10 +1,3 @@ -try: - import wolframalpha - - DEPENDENCIES_FOUND = True -except ImportError: - DEPENDENCIES_FOUND = False - from edmond.plugin import Plugin diff --git a/edmond/plugins/wikipedia.py b/edmond/plugins/wikipedia.py index 8653568..774179a 100644 --- a/edmond/plugins/wikipedia.py +++ b/edmond/plugins/wikipedia.py @@ -1,12 +1,7 @@ import time from typing import cast -try: - import wikipedia - - DEPENDENCIES_FOUND = True -except ImportError: - DEPENDENCIES_FOUND = False +import wikipedia from edmond.plugin import Plugin from edmond.plugins.plus import PlusPlugin diff --git a/edmond/plugins/youtube.py b/edmond/plugins/youtube.py index 25eaa3d..4d0f9e9 100644 --- a/edmond/plugins/youtube.py +++ b/edmond/plugins/youtube.py @@ -1,12 +1,7 @@ from typing import cast, Optional -try: - from googleapiclient.discovery import build as gapi_discovery_build - from googleapiclient.errors import Error as GoogleApiError - - DEPENDENCIES_FOUND = True -except ImportError: - DEPENDENCIES_FOUND = False +from googleapiclient.discovery import build as gapi_discovery_build +from googleapiclient.errors import Error as GoogleApiError from edmond.plugin import Plugin from edmond.plugins.playlist_of_the_day import PlaylistOfTheDayPlugin diff --git a/edmond/plugins/youtube_parser.py b/edmond/plugins/youtube_parser.py index 7b51380..2c57b86 100644 --- a/edmond/plugins/youtube_parser.py +++ b/edmond/plugins/youtube_parser.py @@ -1,12 +1,7 @@ import re from typing import cast, Optional -try: - from googleapiclient.errors import Error as GoogleApiError # type: ignore - - DEPENDENCIES_FOUND = True -except ImportError: - DEPENDENCIES_FOUND = False +from googleapiclient.errors import Error as GoogleApiError # type: ignore from edmond.plugin import Plugin from edmond.plugins.playlist_of_the_day import PlaylistOfTheDayPlugin