Reorganize python sources into 'plinth' package

plinth/__main__.py

@@ -13,9 +13,9 @@ import cherrypy
 from cherrypy import _cpserver
 from cherrypy.process.plugins import Daemonizer
 
-import cfg
-import module_loader
-import service
+from plinth import cfg
+from plinth import module_loader
+from plinth import service
 
 __version__ = "0.2.14"
 __author__ = "James Vasile"
@@ -141,7 +141,7 @@ def configure_django():
         'django.core.context_processors.static',
         'django.core.context_processors.tz',
         'django.contrib.messages.context_processors.messages',
-        'context_processors.common']
+        'plinth.context_processors.common']
 
     logging_configuration = {
         'version': 1,
@@ -198,7 +198,7 @@ def configure_django():
             'django.middleware.clickjacking.XFrameOptionsMiddleware',
             'modules.first_boot.middleware.FirstBootMiddleware',
         ),
-        ROOT_URLCONF='urls',
+        ROOT_URLCONF='plinth.urls',
         SESSION_ENGINE='django.contrib.sessions.backends.file',
         SESSION_FILE_PATH=sessions_directory,
         STATIC_URL=cfg.server_dir + '/static/',

plinth/cfg.py

@@ -28,6 +28,7 @@ main_menu = Menu()
 def read():
     """Read configuration"""
     directory = os.path.dirname(os.path.realpath(__file__))
+    directory = os.path.join(directory, '..')
     parser = SafeConfigParser(
         defaults={
             'root': directory,

plinth/module_loader.py

@@ -24,8 +24,8 @@ import importlib
 import logging
 import os
 
-import urls
-import cfg
+from plinth import cfg
+from plinth import urls
 
 LOGGER = logging.getLogger(__name__)
 
@@ -39,8 +39,9 @@ def load_modules():
     """
     module_names = []
     modules = {}
-    for name in os.listdir('modules/enabled'):
-        full_name = 'modules.{module}'.format(module=name)
+    directory = os.path.dirname(os.path.abspath(__file__))
+    for name in os.listdir(os.path.join(directory, 'modules', 'enabled')):
+        full_name = 'plinth.modules.{module}'.format(module=name)
 
         LOGGER.info('Importing %s', full_name)
         try:
@@ -139,7 +140,7 @@ def get_template_directories():
     core_directory = os.path.join(directory, 'templates')
 
     directories = set((core_directory,))
-    for name in os.listdir('modules/enabled'):
+    for name in os.listdir(os.path.join(directory, 'modules', 'enabled')):
         directories.add(os.path.join(directory, 'modules', name, 'templates'))
 
     return directories

plinth/modules/apps/apps.py

@@ -1,7 +1,7 @@
 from django.template.response import TemplateResponse
 from gettext import gettext as _
 
-import cfg
+from plinth import cfg
 
 
 def init():

plinth/modules/apps/urls.py

@@ -23,6 +23,6 @@ from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns(  # pylint: disable-msg=C0103
-    'modules.apps.apps',
+    'plinth.modules.apps.apps',
     url(r'^apps/$', 'index', name='index')
     )

plinth/modules/config/config.py

@@ -29,9 +29,9 @@ import logging
 import re
 import socket
 
-import actions
-import cfg
-import util
+from plinth import actions
+from plinth import cfg
+from plinth import util
 
 
 LOGGER = logging.getLogger(__name__)

plinth/modules/config/urls.py

@@ -23,6 +23,6 @@ from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns(  # pylint: disable-msg=C0103
-    'modules.config.config',
+    'plinth.modules.config.config',
     url(r'^sys/config/$', 'index', name='index'),
     )

plinth/modules/diagnostics/diagnostics.py

@@ -23,9 +23,9 @@ from django.contrib.auth.decorators import login_required
 from django.template.response import TemplateResponse
 from gettext import gettext as _
 
-import actions
-import cfg
-from errors import ActionError
+from plinth import actions
+from plinth import cfg
+from plinth.errors import ActionError
 
 
 def init():

plinth/modules/diagnostics/urls.py

@@ -23,7 +23,7 @@ from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns(  # pylint: disable-msg=C0103
-    'modules.diagnostics.diagnostics',
+    'plinth.modules.diagnostics.diagnostics',
     url(r'^sys/diagnostics/$', 'index', name='index'),
     url(r'^sys/diagnostics/test/$', 'test', name='test'),
     )

plinth/modules/expert_mode/expert_mode.py

@@ -4,8 +4,8 @@ from django.contrib.auth.decorators import login_required
 from django.template.response import TemplateResponse
 from gettext import gettext as _
 
-import cfg
-from ..lib.auth import get_group
+from plinth import cfg
+from plinth.modules.lib.auth import get_group
 
 
 class ExpertsForm(forms.Form):  # pylint: disable-msg=W0232

plinth/modules/expert_mode/urls.py

@@ -23,6 +23,6 @@ from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns(  # pylint: disable-msg=C0103
-    'modules.expert_mode.expert_mode',
+    'plinth.modules.expert_mode.expert_mode',
     url(r'^sys/expert/$', 'index', name='index'),
     )

plinth/modules/firewall/firewall.py

@@ -24,9 +24,9 @@ from django.template.response import TemplateResponse
 from gettext import gettext as _
 import logging
 
-import actions
-import cfg
-import service as service_module
+from plinth import actions
+from plinth import cfg
+import plinth.service as service_module
 
 
 LOGGER = logging.getLogger(__name__)

plinth/modules/firewall/urls.py

@@ -23,6 +23,6 @@ from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns(  # pylint: disable-msg=C0103
-    'modules.firewall.firewall',
+    'plinth.modules.firewall.firewall',
     url(r'^sys/firewall/$', 'index', name='index')
     )

plinth/modules/first_boot/first_boot.py

@@ -26,10 +26,10 @@ from django.http.response import HttpResponseRedirect
 from django.template.response import TemplateResponse
 from gettext import gettext as _
 
-from ..lib.auth import add_user
-from ..config import config
+from plinth import cfg
+from plinth.modules.config import config
+from plinth.modules.lib.auth import add_user
 from withsqlite.withsqlite import sqlite_db
-import cfg
 
 
 ## TODO: flesh out these tests values

plinth/modules/first_boot/urls.py

@@ -23,7 +23,7 @@ from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns(  # pylint: disable-msg=C0103
-    'modules.first_boot.first_boot',
+    'plinth.modules.first_boot.first_boot',
     url(r'^firstboot/$', 'index', name='index'),
     url(r'^firstboot/state0/$', 'state0', name='state0'),
     url(r'^firstboot/state1/$', 'state1', name='state1')

plinth/modules/help/help.py

@@ -3,7 +3,7 @@ from gettext import gettext as _
 from django.http import Http404
 from django.template.response import TemplateResponse
 
-import cfg
+from plinth import cfg
 
 
 def init():

plinth/modules/help/urls.py

@@ -23,7 +23,7 @@ from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns(  # pylint: disable-msg=C0103
-    'modules.help.help',
+    'plinth.modules.help.help',
     # having two urls for one page is a hack to help the current url/menu
     # system highlight the correct menu item. Every submenu-item with the same
     # url prefix as the main-menu is highlighted automatically.

plinth/modules/owncloud/owncloud.py

@@ -4,9 +4,9 @@ from django.contrib.auth.decorators import login_required
 from django.template.response import TemplateResponse
 from gettext import gettext as _
 
-import actions
-import cfg
-import service
+from plinth import actions
+from plinth import cfg
+from plinth import service
 
 
 SERVICE = None

plinth/modules/owncloud/urls.py

@@ -23,6 +23,6 @@ from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns(  # pylint: disable-msg=C0103
-    'modules.owncloud.owncloud',
+    'plinth.modules.owncloud.owncloud',
     url(r'^apps/owncloud/$', 'index', name='index'),
     )

plinth/modules/packages/packages.py

@@ -4,8 +4,8 @@ from django.contrib.auth.decorators import login_required
 from django.template.response import TemplateResponse
 from gettext import gettext as _
 
-import actions
-import cfg
+from plinth import actions
+from plinth import cfg
 
 
 def get_modules_available():

plinth/modules/packages/urls.py

@@ -23,6 +23,6 @@ from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns(  # pylint: disable-msg=C0103
-    'modules.packages.packages',
-    url(r'^sys/packages/$', 'index', name='index'),
-    )
+    'plinth.modules.packages.packages',
+    url(r'^sys/packages/$', 'index', name='index')
+)

plinth/modules/pagekite/pagekite.py

@@ -30,8 +30,8 @@ from django.template.response import TemplateResponse
 from gettext import gettext as _
 import logging
 
-import actions
-import cfg
+from plinth import actions
+from plinth import cfg
 
 
 LOGGER = logging.getLogger(__name__)

plinth/modules/pagekite/urls.py

@@ -23,7 +23,7 @@ from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns(  # pylint: disable-msg=C0103
-    'modules.pagekite.pagekite',
+    'plinth.modules.pagekite.pagekite',
     url(r'^apps/pagekite/$', 'index', name='index'),
     url(r'^apps/pagekite/configure/$', 'configure', name='configure'),
     )

plinth/modules/system/system.py

@@ -1,7 +1,7 @@
 from gettext import gettext as _
 from django.template.response import TemplateResponse
 
-import cfg
+from plinth import cfg
 
 
 def init():

plinth/modules/system/urls.py

@@ -23,6 +23,6 @@ from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns(  # pylint: disable-msg=C0103
-    'modules.system.system',
+    'plinth.modules.system.system',
     url(r'^sys/$', 'index', name='index'),
     )

plinth/modules/tor/tor.py

@@ -23,8 +23,8 @@ from django.contrib.auth.decorators import login_required
 from django.template.response import TemplateResponse
 from gettext import gettext as _
 
-import actions
-import cfg
+from plinth import actions
+from plinth import cfg
 
 
 def init():

plinth/modules/tor/urls.py

@@ -23,6 +23,6 @@ from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns(  # pylint: disable-msg=C0103
-    'modules.tor.tor',
+    'plinth.modules.tor.tor',
     url(r'^apps/tor/$', 'index', name='index')
     )

plinth/modules/users/urls.py

@@ -23,8 +23,8 @@ from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns(  # pylint: disable-msg=C0103
-    'modules.users.users',
+    'plinth.modules.users.users',
     url(r'^sys/users/$', 'index', name='index'),
     url(r'^sys/users/add/$', 'add', name='add'),
     url(r'^sys/users/edit/$', 'edit', name='edit')
-    )
+)

plinth/modules/users/users.py

@@ -10,8 +10,8 @@ from django.template.response import TemplateResponse
 from gettext import gettext as _
 import logging
 
-import cfg
-from ..lib.auth import add_user
+from plinth import cfg
+from plinth.modules.lib.auth import add_user
 
 
 LOGGER = logging.getLogger(__name__)

plinth/modules/xmpp/urls.py

@@ -23,8 +23,8 @@ from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns(  # pylint: disable-msg=C0103
-    'modules.xmpp.xmpp',
+    'plinth.modules.xmpp.xmpp',
     url(r'^apps/xmpp/$', 'index', name='index'),
     url(r'^apps/xmpp/configure/$', 'configure', name='configure'),
     url(r'^apps/xmpp/register/$', 'register', name='register')
-    )
+)

plinth/modules/xmpp/xmpp.py

@@ -8,9 +8,9 @@ from django.template.response import TemplateResponse
 from gettext import gettext as _
 import logging
 
-import actions
-import cfg
-import service
+from plinth import actions
+from plinth import cfg
+from plinth import service
 
 
 LOGGER = logging.getLogger(__name__)