Hardcode the "plugins" package name

dosagelib/loader.py

@@ -1,26 +1,27 @@
 # SPDX-License-Identifier: MIT
 # Copyright (C) 2012-2014 Bastian Kleineidam
-# Copyright (C) 2016-2019 Tobias Gruetzmacher
+# Copyright (C) 2016-2020 Tobias Gruetzmacher
 """
 Functions to load plugin modules.
 
 Example usage:
-    modules = loader.get_modules('plugins')
+    modules = loader.get_plugin_modules()
     plugins = loader.get_plugins(modules, PluginClass)
 """
 import importlib
 import pkgutil
+
+from .plugins import (__name__ as plugin_package, __path__ as plugin_path)
 from .output import out
 
 
-def get_modules(folder):
+def get_plugin_modules():
-    """Find (and import) all valid modules in the given submodule of this file.
+    """Find (and import) all valid modules in the "plugins" package.
     @return: all loaded valid modules
     @rtype: iterator of module
     """
-    mod = importlib.import_module(".." + folder, __name__)
+    prefix = plugin_package + "."
-    prefix = mod.__name__ + "."
+    modules = [m[1] for m in pkgutil.iter_modules(plugin_path, prefix)]
-    modules = [m[1] for m in pkgutil.iter_modules(mod.__path__, prefix)]
 
     for elm in _get_all_modules_pyinstaller():
         if elm.startswith(prefix):

dosagelib/scraper.py

@@ -574,7 +574,7 @@ class Cache:
 
     def load(self):
         out.debug("Loading comic modules...")
-        modules = loader.get_modules('plugins')
+        modules = loader.get_plugin_modules()
         plugins = list(loader.get_plugins(modules, Scraper))
         self.data = list([m for x in plugins for m in x.getmodules()])
         self.validate()