From 864542fdca488e9173503afb45adfb765a53fc2e Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 21 Mar 2014 10:38:05 +0100 Subject: [PATCH] fix django-cms plugins loading, remove sys.path tampering --- portail_citoyen/__init__.py | 7 ------- portail_citoyen/admin.py | 2 +- portail_citoyen/apps/auquotidien_plugin/cms_plugins.py | 4 ++-- portail_citoyen/apps/auquotidien_plugin/models.py | 2 +- portail_citoyen/dashboard.py | 4 ++-- portail_citoyen/settings.py | 10 +++++----- 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/portail_citoyen/__init__.py b/portail_citoyen/__init__.py index 7a1d20e..11d27f8 100644 --- a/portail_citoyen/__init__.py +++ b/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) diff --git a/portail_citoyen/admin.py b/portail_citoyen/admin.py index a8ccbad..b3a3530 100644 --- a/portail_citoyen/admin.py +++ b/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'], diff --git a/portail_citoyen/apps/auquotidien_plugin/cms_plugins.py b/portail_citoyen/apps/auquotidien_plugin/cms_plugins.py index 9231501..8a03baa 100644 --- a/portail_citoyen/apps/auquotidien_plugin/cms_plugins.py +++ b/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, diff --git a/portail_citoyen/apps/auquotidien_plugin/models.py b/portail_citoyen/apps/auquotidien_plugin/models.py index b4bf2ff..d5079f6 100644 --- a/portail_citoyen/apps/auquotidien_plugin/models.py +++ b/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' ] diff --git a/portail_citoyen/dashboard.py b/portail_citoyen/dashboard.py index 4279bd2..05640f6 100644 --- a/portail_citoyen/dashboard.py +++ b/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', ), )) diff --git a/portail_citoyen/settings.py b/portail_citoyen/settings.py index 3b946d4..dfd3907 100644 --- a/portail_citoyen/settings.py +++ b/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', )