diff --git a/examples b/examples index a1d5760..13160cb 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit a1d5760b4936690ad9c1d925c16519b8e7edcc6b +Subproject commit 13160cb81a37b011082ad4e1e3a9f217540c2c24 diff --git a/src/sshare/main.py b/src/sshare/main.py index e015c9d..a717ac2 100644 --- a/src/sshare/main.py +++ b/src/sshare/main.py @@ -24,11 +24,11 @@ import tomllib import subprocess import sys from pathlib import Path -from version import version +from sshare.version import version -from plugins.config import Flag -from plugins.config import NoArgument -from plugins.config import NoDefault +from sshare.plugins.config import Flag +from sshare.plugins.config import NoArgument +from sshare.plugins.config import NoDefault class Congloggerate: def __init__(self, loggers): @@ -70,17 +70,17 @@ def main(): # so that it can be used to report errors while loading and # configuring plugins # i.e. before other logging plugins have had a chance to be initialised - logger = importlib.import_module("plugins.default.command_line") + logger = importlib.import_module("sshare.plugins.default.command_line") fatalicize(logger) # Load inbuilt plugins plugins_flat = [ Plugin("command_line", logger), - Plugin("file", importlib.import_module("plugins.default.file")), - Plugin("current_time", importlib.import_module("plugins.default.current_time")), - Plugin("append_type", importlib.import_module("plugins.default.append_type")), - Plugin("ssh", importlib.import_module("plugins.default.ssh")), - Plugin("log_result", importlib.import_module("plugins.default.log_result")), + Plugin("file", importlib.import_module("sshare.plugins.default.file")), + Plugin("current_time", importlib.import_module("sshare.plugins.default.current_time")), + Plugin("append_type", importlib.import_module("sshare.plugins.default.append_type")), + Plugin("ssh", importlib.import_module("sshare.plugins.default.ssh")), + Plugin("log_result", importlib.import_module("sshare.plugins.default.log_result")), ] plugins = {} for type in [ "logger", "source", "name", "upload", "result" ]: