Some more refactoring done

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:
 

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__)

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

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):

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):
     '''

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):
     '''