diff options
| -rw-r--r-- | module/Core.py | 2 | ||||
| -rw-r--r-- | module/HookManager.py | 2 | ||||
| -rw-r--r-- | module/ThreadManager.py | 2 | ||||
| -rw-r--r-- | module/setup.py | 2 | ||||
| -rw-r--r-- | module/threads/PluginThread.py (renamed from module/PluginThread.py) | 10 | ||||
| -rw-r--r-- | module/threads/ServerThread.py (renamed from module/webui/ServerThread.py) | 0 | ||||
| -rw-r--r-- | module/threads/__init__.py | 0 | ||||
| -rw-r--r-- | module/webui/__init__.py | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/module/Core.py b/module/Core.py index 5e9866a00..a3156d804 100644 --- a/module/Core.py +++ b/module/Core.py @@ -46,7 +46,7 @@ from module.ConfigParser import ConfigParser from module.plugins.PluginManager import PluginManager from module.PullEvents import PullManager from module.network.RequestFactory import RequestFactory -from module.webui.ServerThread import WebServer +from module.threads.ServerThread import WebServer from module.Scheduler import Scheduler from module.common.JsEngine import JsEngine from module import remote diff --git a/module/HookManager.py b/module/HookManager.py index 65c448437..6fd1162a7 100644 --- a/module/HookManager.py +++ b/module/HookManager.py @@ -25,7 +25,7 @@ from threading import RLock from types import MethodType -from module.PluginThread import HookThread +from module.threads.PluginThread import HookThread from module.plugins.PluginManager import literal_eval from utils import lock diff --git a/module/ThreadManager.py b/module/ThreadManager.py index 095dfc1ed..bdc6ca6e2 100644 --- a/module/ThreadManager.py +++ b/module/ThreadManager.py @@ -27,7 +27,7 @@ from random import choice import pycurl -import PluginThread +from module.threads import PluginThread from module.PyFile import PyFile from module.network.RequestFactory import getURL from module.utils import freeSpace, lock diff --git a/module/setup.py b/module/setup.py index 8f18b2568..719f66f03 100644 --- a/module/setup.py +++ b/module/setup.py @@ -40,7 +40,7 @@ class Setup: # viaweb = self.ask(_("Start initial webinterface for configuration?"), "y", bool=True) # if viaweb: # try: - # from module.webui import ServerThread + # from module.threads import ServerThread # ServerThread.setup = self # import module.webui as webinterface # webinterface.run_simple() diff --git a/module/PluginThread.py b/module/threads/PluginThread.py index 76cf42183..03e0bb31b 100644 --- a/module/PluginThread.py +++ b/module/threads/PluginThread.py @@ -30,11 +30,11 @@ from types import MethodType from pycurl import error -from PyFile import PyFile -from plugins.Plugin import Abort, Fail, Reconnect, Retry, SkipDownload -from common.packagetools import parseNames -from utils import safe_join -from Api import OnlineStatus +from module.PyFile import PyFile +from module.plugins.Plugin import Abort, Fail, Reconnect, Retry, SkipDownload +from module.common.packagetools import parseNames +from module.utils import safe_join +from module.Api import OnlineStatus class PluginThread(Thread): """abstract base class for thread types""" diff --git a/module/webui/ServerThread.py b/module/threads/ServerThread.py index e9fe14708..e9fe14708 100644 --- a/module/webui/ServerThread.py +++ b/module/threads/ServerThread.py diff --git a/module/threads/__init__.py b/module/threads/__init__.py new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/module/threads/__init__.py diff --git a/module/webui/__init__.py b/module/webui/__init__.py index 304a01498..85fec1b52 100644 --- a/module/webui/__init__.py +++ b/module/webui/__init__.py @@ -40,7 +40,7 @@ from middlewares import StripPathMiddleware, GZipMiddleWare, PrefixMiddleware SETUP = None PYLOAD = None -from module.webui import ServerThread +from module.threads import ServerThread if not ServerThread.core: if ServerThread.setup: |