fix django-cms plugins loading, remove sys.path tampering

portail_citoyen/__init__.py

@@ -1,8 +1 @@
-import os.path
-import sys
-
 __version__ = '0.1'
-
-apps_dir = os.path.join(os.path.dirname(__file__), 'apps')
-if apps_dir not in sys.path:
-    sys.path.append(apps_dir)

portail_citoyen/admin.py

@@ -186,7 +186,7 @@ if 'wcsinst.wcsinst' in settings.INSTALLED_APPS:
                 c += 1
                 sleep_length *= 2
                 if done and 'auquotidien_plugin' in settings.INSTALLED_APPS:
-                    from auquotidien_plugin.models import AuQuotidienAPI
+                    from .apps.auquotidien_plugin.models import AuQuotidienAPI
                     defaults = {
                         'name': instance.title,
                         'orig': request.META['HTTP_HOST'],

portail_citoyen/apps/auquotidien_plugin/cms_plugins.py

@@ -7,8 +7,8 @@ from django.utils.translation import ugettext_lazy as _
 from cms.plugin_pool import plugin_pool
 
 
-from data_source_plugin.cms_plugins import DataSourcePlugin, Data
-from data_source_plugin.models import DataSource
+from ..data_source_plugin.cms_plugins import DataSourcePlugin, Data
+from ..data_source_plugin.models import DataSource
 
 from .models import (
         AuQuotidienActiveFormsPlugin as AuQuotidienActiveFormsPluginModel,

portail_citoyen/apps/auquotidien_plugin/models.py

@@ -5,7 +5,7 @@ from django.db import models
 from cms.models import CMSPlugin
 
 
-from data_source_plugin.models import DataSource
+from ..data_source_plugin.models import DataSource
 
 
 __all__ = [ 'AuQuotidienAPI', 'AuQuotidienActiveFormsPlugin' ]

portail_citoyen/dashboard.py

@@ -30,8 +30,8 @@ class CustomIndexDashboard(Dashboard):
             _('Contents'),
             models=(
                 'cms.models.pagemodel.Page',
-                'data_source_plugin.models.DataSource',
-                'feed_plugin.models.Feed',
+                'portail_citoyen.apps.data_source_plugin.models.DataSource',
+                'portail_citoyen.apps.feed_plugin.models.Feed',
             ),
         ))
 

portail_citoyen/settings.py

@@ -141,11 +141,11 @@ INSTALLED_APPS = (
     'cms.plugins.video',
     'cmsplugin_text_wrapper',
     'cms_ajax_text_plugin',
-    'feed_plugin',
-    'data_source_plugin',
-    'a2_service_list_plugin',
-    'federation_plugin',
-    'auquotidien_plugin',
+    'portail_citoyen.apps.feed_plugin',
+    'portail_citoyen.apps.data_source_plugin',
+    'portail_citoyen.apps.a2_service_list_plugin',
+    'portail_citoyen.apps.federation_plugin',
+    'portail_citoyen.apps.auquotidien_plugin',
     'sekizai',
     'portail_citoyen',
 )