Fix naming to follow naming conventions, leftovers from copy/paste code

plone · Jan 17, 2018 · c12d66b · c12d66b
1 parent 75231c0
commit c12d66b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/plone/restapi/services/configure.zcml b/src/plone/restapi/services/configure.zcml
@@ -27,6 +27,6 @@
   <include package=".workflow"/>
   <include package=".multilingual"
       zcml:condition="have plone-5"/>
-  <include package=".contact"
+  <include package=".email_notification"
       zcml:condition="have plone-5"/>
 </configure>
diff --git a/...lone/restapi/services/contact/__init__.py → ...i/services/email_notification/__init__.py b/...lone/restapi/services/contact/__init__.py → ...i/services/email_notification/__init__.py
diff --git a/...e/restapi/services/contact/configure.zcml → ...ervices/email_notification/configure.zcml b/...e/restapi/services/contact/configure.zcml → ...ervices/email_notification/configure.zcml
@@ -7,7 +7,7 @@
       method="POST"
       name="@email-notification"
       for="Products.CMFCore.interfaces.ISiteRoot"
-      factory=".post.ContactPost"
+      factory=".post.EmailNotificationPost"
       permission="zope2.View"
     />
 

diff --git a/src/plone/restapi/services/contact/post.py → ...stapi/services/email_notification/post.py b/src/plone/restapi/services/contact/post.py → ...stapi/services/email_notification/post.py
@@ -7,7 +7,7 @@
 import plone
 
 
-class ContactPost(Service):
+class EmailNotificationPost(Service):
 
     def reply(self):
         data = json_body(self.request)
@@ -23,9 +23,9 @@ def reply(self):
                 type='BadRequest',
                 message='Missing from or message parameters'))
 
-        ctrlOverview = getMultiAdapter((self.context, self.request),
-                                       name='overview-controlpanel')
-        if ctrlOverview.mailhost_warning():
+        overview_controlpanel = getMultiAdapter((self.context, self.request),
+                                                name='overview-controlpanel')
+        if overview_controlpanel.mailhost_warning():
             self.request.response.setStatus(400)
             return dict(error=dict(
                 type='BadRequest',

diff --git a/...plone/restapi/tests/test_services_mail.py → ...tests/test_services_email_notification.py b/...plone/restapi/tests/test_services_mail.py → ...tests/test_services_email_notification.py
@@ -21,8 +21,8 @@
     PLONE5 = True
 
 
-@unittest.skipIf(not PLONE5, 'Just Plone 5 currently.')
-class TestUsersEndpoint(unittest.TestCase):
+@unittest.skipIf(not PLONE5, 'email notification not implemented for Plone < 5.') # noqa
+class EmailNotificationEndpoint(unittest.TestCase):
 
     layer = PLONE_RESTAPI_DX_FUNCTIONAL_TESTING