Déplace des utilitaires liés au MP de 'utils' vers 'mp'

zds/member/commons.py

@@ -11,7 +11,7 @@
 
 from zds.member.models import Profile, TokenRegister, Ban
 from zds.utils.models import get_hat_from_settings
-from zds.utils.mps import send_mp
+from zds.mp.utils import send_mp
 
 
 class ProfileCreate:

zds/member/views/admin.py

@@ -10,7 +10,7 @@
 from zds.member.forms import PromoteMemberForm
 from zds.member.models import Profile
 from zds.utils.models import get_hat_from_settings
-from zds.utils.mps import send_mp
+from zds.mp.utils import send_mp
 
 
 @login_required

zds/member/views/register.py

@@ -46,7 +46,7 @@
 )
 import logging
 
-from zds.utils.mps import send_mp
+from zds.mp.utils import send_mp
 
 
 class RegisterView(CreateView, ProfileCreate, TokenGenerator):

zds/mp/api/serializers.py

@@ -8,7 +8,7 @@
 from zds.mp.commons import UpdatePrivatePost
 from zds.mp.models import PrivateTopic, PrivatePost
 from zds.mp.validators import ParticipantsUserValidator, TitleValidator, TextValidator
-from zds.utils.mps import send_mp, send_message_mp
+from zds.mp.utils import send_mp, send_message_mp
 
 
 class PrivatePostSerializer(ZdSModelSerializer):

zds/mp/views.py

@@ -21,7 +21,7 @@
 from zds.mp.decorator import is_participant
 from zds.utils.models import get_hat_from_request
 from zds.utils.forums import CreatePostView
-from zds.utils.mps import send_mp, send_message_mp
+from zds.mp.utils import send_mp, send_message_mp
 from zds.utils.paginator import ZdSPagingListView
 from .forms import PrivateTopicForm, PrivatePostForm, PrivateTopicEditForm
 from .models import PrivateTopic, PrivatePost, mark_read, NotReachableError

zds/notification/api/tests.py

@@ -9,7 +9,7 @@
 from zds.member.tests.factories import ProfileFactory
 from zds.mp.tests.factories import PrivateTopicFactory
 from zds.notification.models import Notification
-from zds.utils.mps import send_message_mp
+from zds.mp.utils import send_message_mp
 
 
 class NotificationListAPITest(APITestCase):

zds/notification/tests/tests_basics.py

@@ -31,7 +31,7 @@
 from zds.tutorialv2.publication_utils import publish_content
 from zds.utils import old_slugify
 from zds.utils.tests.factories import SubCategoryFactory, LicenceFactory
-from zds.utils.mps import send_mp, send_message_mp
+from zds.mp.utils import send_mp, send_message_mp
 
 
 class NotificationForumTest(TestCase):

zds/notification/tests/tests_tricky.py

@@ -27,7 +27,7 @@
 from zds.tutorialv2.publication_utils import publish_content, notify_update
 from zds.tutorialv2.tests import TutorialTestMixin, override_for_contents
 from zds.utils.tests.factories import SubCategoryFactory, LicenceFactory
-from zds.utils.mps import send_mp, send_message_mp
+from zds.mp.utils import send_mp, send_message_mp
 from zds.utils.header_notifications import get_header_notifications
 
 overridden_zds_app = deepcopy(settings.ZDS_APP)

zds/tutorialv2/management/commands/migrate_to_zep25.py

@@ -7,7 +7,7 @@
 from django.conf import settings
 from zds.tutorialv2.models.database import PublishableContent
 from zds.utils.models import Category, SubCategory, CategorySubCategory, Tag
-from zds.utils.mps import send_mp
+from zds.mp.utils import send_mp
 
 
 @transaction.atomic

zds/tutorialv2/views/authors.py

@@ -13,7 +13,7 @@
 from zds.tutorialv2.forms import AuthorForm, RemoveAuthorForm
 from zds.tutorialv2.mixins import SingleContentFormViewMixin
 from zds.utils.models import get_hat_from_settings
-from zds.utils.mps import send_mp
+from zds.mp.utils import send_mp
 
 
 class AddAuthorToContent(LoggedWithReadWriteHability, SingleContentFormViewMixin):

zds/tutorialv2/views/beta.py

@@ -15,7 +15,7 @@
 from zds.tutorialv2.models.database import PublishableContent
 from zds.utils.forums import create_topic, send_post, lock_topic, unlock_topic
 from zds.utils.models import get_hat_from_settings
-from zds.utils.mps import send_mp, send_message_mp
+from zds.mp.utils import send_mp, send_message_mp
 
 
 class ManageBetaContent(LoggedWithReadWriteHability, SingleContentFormViewMixin):

zds/tutorialv2/views/contents.py

@@ -43,7 +43,7 @@
 from zds.tutorialv2.utils import init_new_repo
 from zds.tutorialv2.views.authors import RemoveAuthorFromContent
 from zds.utils.models import get_hat_from_settings
-from zds.utils.mps import send_mp, send_message_mp
+from zds.mp.utils import send_mp, send_message_mp
 from zds.utils.uuslug_wrapper import slugify
 
 logger = logging.getLogger(__name__)

zds/tutorialv2/views/contributors.py

@@ -17,7 +17,7 @@
 from zds.tutorialv2.mixins import SingleContentFormViewMixin
 from zds.tutorialv2.models import TYPE_CHOICES_DICT
 from zds.tutorialv2.models.database import ContentContribution, PublishableContent
-from zds.utils.mps import send_mp
+from zds.mp.utils import send_mp
 from zds.utils.paginator import ZdSPagingListView
 
 

zds/tutorialv2/views/misc.py

@@ -16,7 +16,7 @@
 from zds.tutorialv2.forms import WarnTypoForm
 from zds.tutorialv2.mixins import SingleOnlineContentViewMixin, SingleContentFormViewMixin
 from zds.tutorialv2.utils import search_container_or_404
-from zds.utils.mps import send_mp
+from zds.mp.utils import send_mp
 
 
 class RequestFeaturedContent(LoggedWithReadWriteHability, FeatureableMixin, SingleOnlineContentViewMixin, FormView):

zds/tutorialv2/views/validations_contents.py

@@ -39,7 +39,7 @@
     save_validation_state,
 )
 from zds.utils.models import SubCategory, get_hat_from_settings
-from zds.utils.mps import send_mp, send_message_mp
+from zds.mp.utils import send_mp, send_message_mp
 
 logger = logging.getLogger(__name__)
 

zds/tutorialv2/views/validations_opinions.py

@@ -30,7 +30,7 @@
 from zds.tutorialv2.utils import clone_repo
 from zds.tutorialv2.views.validations_contents import logger
 from zds.utils.models import get_hat_from_settings
-from zds.utils.mps import send_mp, send_message_mp
+from zds.mp.utils import send_mp, send_message_mp
 
 
 class PublishOpinion(LoggedWithReadWriteHability, DoesNotRequireValidationFormViewMixin):

zds/utils/models.py

@@ -7,7 +7,6 @@
 from django.conf import settings
 
 from django.contrib.auth.models import User, Group
-from django.db.models.signals import post_save
 from django.urls import reverse
 from django.utils.encoding import smart_str
 from django.db import models
@@ -21,7 +20,7 @@
 from zds.utils import signals
 from zds.mp.models import PrivateTopic
 from zds.tutorialv2.models import TYPE_CHOICES, TYPE_CHOICES_DICT
-from zds.utils.mps import send_mp
+from zds.mp.utils import send_mp
 from zds.utils import old_slugify
 from zds.utils.misc import contains_utf8mb4
 from zds.utils.templatetags.emarkdown import render_markdown

zds/utils/tests/tests_interventions.py

@@ -9,7 +9,7 @@
 from zds.tutorialv2.tests.factories import PublishableContentFactory
 from zds.member.tests.factories import ProfileFactory, StaffProfileFactory
 from zds.utils.tests.factories import SubCategoryFactory, LicenceFactory
-from zds.utils.mps import send_message_mp, send_mp
+from zds.mp.utils import send_message_mp, send_mp
 
 
 class InterventionsTest(TestCase):