From 8d3640138df8b9590d29f7d84f40e3b7eb473f28 Mon Sep 17 00:00:00 2001 From: Thomas Wilson Date: Mon, 6 Jan 2020 17:20:46 +0800 Subject: [PATCH] Structure fixes --- shepherd/__main__.py | 2 +- shepherd/agent/control.py | 2 +- shepherd/agent/scheduler.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shepherd/__main__.py b/shepherd/__main__.py index 8f2e00d..5e25588 100644 --- a/shepherd/__main__.py +++ b/shepherd/__main__.py @@ -1,3 +1,3 @@ if __name__ == '__main__': - from .core import cli + from .agent.core import cli cli() diff --git a/shepherd/agent/control.py b/shepherd/agent/control.py index 4dcffdf..fa28e70 100644 --- a/shepherd/agent/control.py +++ b/shepherd/agent/control.py @@ -7,7 +7,7 @@ import json from urllib.parse import urlparse, urlunparse, urljoin from collections import namedtuple -import shepherd.plugin +from . import plugin # Check for shepherd.new file in edit conf dir. If there, # or if no shepherd.id file can be found, generate a new one. # For now, also attempt to delete /var/lib/zerotier-one/identity.public and identity.secret diff --git a/shepherd/agent/scheduler.py b/shepherd/agent/scheduler.py index a9321e7..0118771 100644 --- a/shepherd/agent/scheduler.py +++ b/shepherd/agent/scheduler.py @@ -16,7 +16,7 @@ import time import subprocess import os -import shepherd.plugin +from . import plugin import io