diff --git a/server/documentation/api/modules/BaseModule.rst b/server/documentation/api/modules/BaseModule.rst index f6d2c8b19..294d2add7 100644 --- a/server/documentation/api/modules/BaseModule.rst +++ b/server/documentation/api/modules/BaseModule.rst @@ -25,8 +25,6 @@ BaseModule Environmentable --------------- -.. module:: uds.core.Environment - .. autoclass:: Environmentable :members: @@ -34,8 +32,6 @@ Environmentable Serializable ------------ -.. module:: uds.core.Serializable - .. autoclass:: Serializable :members: diff --git a/server/src/uds/core/BaseModule.py b/server/src/uds/core/BaseModule.py index 16ec10f9e..33305cb99 100644 --- a/server/src/uds/core/BaseModule.py +++ b/server/src/uds/core/BaseModule.py @@ -33,8 +33,8 @@ from django.utils.translation import ugettext as _ from uds.core.ui.UserInterface import UserInterface -from uds.core.Environment import Environmentable -from uds.core.Serializable import Serializable +from uds.core import Environmentable +from uds.core import Serializable import base64, os.path, sys, logging logger = logging.getLogger(__name__) diff --git a/server/src/uds/core/__init__.py b/server/src/uds/core/__init__.py index 77c79ce01..3dfd51728 100644 --- a/server/src/uds/core/__init__.py +++ b/server/src/uds/core/__init__.py @@ -34,6 +34,8 @@ This package contains all core-related code for UDS ''' # Core needs tasks manager to register scheduled jobs, so we ensure of that here +from Environment import Environmentable +from Serializable import Serializable from BaseModule import Module import services import auths diff --git a/server/src/uds/core/services/BaseDeployed.py b/server/src/uds/core/services/BaseDeployed.py index 8b500fe02..ae402ae5b 100644 --- a/server/src/uds/core/services/BaseDeployed.py +++ b/server/src/uds/core/services/BaseDeployed.py @@ -30,8 +30,8 @@ ''' .. moduleauthor:: Adolfo Gómez, dkmaster at dkmon dot com ''' -from uds.core.Environment import Environmentable -from uds.core.Serializable import Serializable +from uds.core import Environmentable +from uds.core import Serializable from uds.core.util.State import State class UserDeployment(Environmentable, Serializable): diff --git a/server/src/uds/core/services/BasePublication.py b/server/src/uds/core/services/BasePublication.py index da5db54f0..595078b93 100644 --- a/server/src/uds/core/services/BasePublication.py +++ b/server/src/uds/core/services/BasePublication.py @@ -30,8 +30,8 @@ ''' .. moduleauthor:: Adolfo Gómez, dkmaster at dkmon dot com ''' -from uds.core.Environment import Environmentable -from uds.core.Serializable import Serializable +from uds.core import Environmentable +from uds.core import Serializable class Publication(Environmentable, Serializable): ''' diff --git a/server/src/uds/core/transports/BaseTransport.py b/server/src/uds/core/transports/BaseTransport.py index 2bde21785..0fc4ba7d1 100644 --- a/server/src/uds/core/transports/BaseTransport.py +++ b/server/src/uds/core/transports/BaseTransport.py @@ -33,7 +33,7 @@ from django.utils.translation import ugettext as _ from uds.core.util import OsDetector -from uds.core.BaseModule import Module +from uds.core import Module class Transport(Module): '''