black and flake8 cleanup

collective/__init__.py

@@ -1,6 +1,7 @@
 # See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
 try:
-    __import__('pkg_resources').declare_namespace(__name__)
+    __import__("pkg_resources").declare_namespace(__name__)
 except ImportError:
     from pkgutil import extend_path
+
     __path__ = extend_path(__path__, __name__)

collective/pwexpiry/__init__.py

@@ -1,25 +1,26 @@
 from AccessControl.Permissions import add_user_folders
 from AccessControl import allow_module
-from Products.PluggableAuthService.PluggableAuthService import \
-    registerMultiPlugin
+from Products.PluggableAuthService.PluggableAuthService import (
+    registerMultiPlugin,
+)
 from . import pwexpiry_plugin
 from . import pwdisable_plugin
 
 
 def initialize(context):
     """Initializer called when used as a Zope 2 product."""
 
-    allow_module('collective.pwexpiry.config')
+    allow_module("collective.pwexpiry.config")
 
     registerMultiPlugin(pwexpiry_plugin.PwExpiryPlugin.meta_type)
     context.registerClass(
         pwexpiry_plugin.PwExpiryPlugin,
         permission=add_user_folders,
         constructors=(
             pwexpiry_plugin.manage_addPwExpiryPluginForm,
-            pwexpiry_plugin.addPwExpiryPlugin
+            pwexpiry_plugin.addPwExpiryPlugin,
         ),
-        visibility=None
+        visibility=None,
     )
 
     registerMultiPlugin(pwdisable_plugin.PwDisablePlugin.meta_type)
@@ -28,7 +29,7 @@ def initialize(context):
         permission=add_user_folders,
         constructors=(
             pwdisable_plugin.manage_addPwDisablePluginForm,
-            pwdisable_plugin.addPwDisablePlugin
+            pwdisable_plugin.addPwDisablePlugin,
         ),
-        visibility=None
+        visibility=None,
     )

collective/pwexpiry/browser/emails/emails.py

@@ -5,7 +5,6 @@
 
 
 class NotificationEmail(BrowserView):
-
     def __call__(self, **kwargs):
         """ A E-Mail Template,
         call this like this:
@@ -21,79 +20,91 @@ def __call__(self, **kwargs):
             'language': language_code,
         })
         """
-        language = kwargs['language']
+        language = kwargs["language"]
 
         msg_mapping = {
-            'username': kwargs['username'],
-            'fullname': kwargs['fullname'],
-            'days': kwargs['days'],
+            "username": kwargs["username"],
+            "fullname": kwargs["fullname"],
+            "days": kwargs["days"],
         }
 
-        if self.request.get('SERVER_URL', 'http://foo') == 'http://foo':
+        if self.request.get("SERVER_URL", "http://foo") == "http://foo":
             server_url = ""
         else:
-            server_url = self.request.get('SERVER_URL')
+            server_url = self.request.get("SERVER_URL")
 
-        if server_url.endswith('/'):
+        if server_url.endswith("/"):
             server_url = server_url[:-1]
 
-        msg_mapping['server_url'] = server_url
+        msg_mapping["server_url"] = server_url
 
-        if self.request.get('SERVER_NAME', 'foo') == 'foo':
+        if self.request.get("SERVER_NAME", "foo") == "foo":
             server_name = ""
         else:
-            server_name = self.request.get('SERVER_NAME')
+            server_name = self.request.get("SERVER_NAME")
 
-        msg_mapping['server_name'] = server_name
+        msg_mapping["server_name"] = server_name
 
-        if kwargs['days'] > 0:
+        if kwargs["days"] > 0:
             msg = translate(
-                _('email_text',
-                  default=u"""Hello ${fullname},
+                _(
+                    "email_text",
+                    default=u"""Hello ${fullname},
 
 There are ${days} days left before your password expires!
 
 Please ensure to reset your password before it's expired.""",
-                  mapping=msg_mapping,
-                  ),
-                target_language=language
+                    mapping=msg_mapping,
+                ),
+                target_language=language,
             )
 
             msg += translate(
-                _('change_password_email_text',
-                  default=u"""\n\nIn order to change your password, please visit ${server_url}/@@change-password""",
-                  mapping=msg_mapping,
-                  ),
-                target_language=language
+                _(
+                    "change_password_email_text",
+                    default=(
+                        u"""\n\nIn order to change your password, please """
+                        u"""visit ${server_url}/@@change-password"""
+                    ),
+                    mapping=msg_mapping,
+                ),
+                target_language=language,
             )
         else:
             msg = translate(
-                _('email_text_expired',
-                  default=u"""Hello ${fullname},
+                _(
+                    "email_text_expired",
+                    default=u"""Hello ${fullname},
 
 Your password has expired.
 
 Please ensure to reset your password before it's expired.""",
-                  mapping=msg_mapping,
-                  ),
-                target_language=language
+                    mapping=msg_mapping,
+                ),
+                target_language=language,
             )
 
             msg += translate(
-                _('reset_password_email_text',
-                  default=u"""\n\nIn order to reset your password, please visit ${server_url}/mail_password_form?userid=${username}""",
-                  mapping=msg_mapping,
-                  ),
-                target_language=language
+                _(
+                    "reset_password_email_text",
+                    default=(
+                        u"""\n\nIn order to reset your password, please """
+                        u"""visit ${server_url}/mail_password_form?"""
+                        u"""userid=${username}"""
+                    ),
+                    mapping=msg_mapping,
+                ),
+                target_language=language,
             )
 
-        if msg_mapping['server_name'] != "":
+        if msg_mapping["server_name"] != "":
             msg += translate(
-                _('server_name_email_text',
-                  default=u"""\n\nThis email was sent from ${server_name}""",
-                  mapping=msg_mapping,
-                  ),
-                target_language=language
+                _(
+                    "server_name_email_text",
+                    default=u"""\n\nThis email was sent from ${server_name}""",
+                    mapping=msg_mapping,
+                ),
+                target_language=language,
             )
 
         return msg

collective/pwexpiry/browser/login.py

@@ -14,50 +14,55 @@ class PWExpiryLoginForm(LoginForm):
     """
     """
 
-    @button.buttonAndHandler(PMF_('Log in'), name='login')
+    @button.buttonAndHandler(PMF_("Log in"), name="login")
     def handleLogin(self, action):
         data, errors = self.extractData()
         if errors:
             self.status = self.formErrorsMessage
             return
-        membership_tool = getToolByName(self.context, 'portal_membership')
+        membership_tool = getToolByName(self.context, "portal_membership")
         status_msg = IStatusMessage(self.request)
         if membership_tool.isAnonymousUser():
-            self.request.response.expireCookie('__ac', path='/')
+            self.request.response.expireCookie("__ac", path="/")
             if self.use_email_as_login():
                 status_msg.addStatusMessage(
-                    _(u'Login failed. Both email address and password are case '
-                      u'sensitive, check that caps lock is not enabled. If you '
-                      u'have entered your password correctly, your account might '
-                      u'be locked. You can reset your password, or contact an '
-                      u'administrator to unlock it, using the Contact form.'),
-                    type='error'
+                    _(
+                        u"Login failed. Both email address and password are "
+                        u"case sensitive, check that caps lock is not "
+                        u"enabled. If you have entered your password "
+                        u"correctly, your account might be locked. You can "
+                        u"reset your password, or contact an administrator "
+                        u"to unlock it, using the Contact form."
+                    ),
+                    type="error",
                 )
             else:
                 status_msg.addStatusMessage(
-                    _(u'Login failed. Both login name and password are case '
-                      u'sensitive, check that caps lock is not enabled. If you '
-                      u'have entered your password correctly, your account might '
-                      u'be locked. You can reset your password, or contact an '
-                      u'administrator to unlock it, using the Contact form.'),
-                    type='error'
+                    _(
+                        u"Login failed. Both login name and password are "
+                        u"case sensitive, check that caps lock is not "
+                        u"enabled. If you have entered your password "
+                        u"correctly, your account might be locked. You can "
+                        u"reset your password, or contact an administrator "
+                        u"to unlock it, using the Contact form."
+                    ),
+                    type="error",
                 )
             return
 
         is_initial_login = self._post_login()
         status_msg.addStatusMessage(
             PMF_(
-                u'you_are_now_logged_in',
-                default=u'Welcome! You are now logged in.',
+                u"you_are_now_logged_in",
+                default=u"Welcome! You are now logged in.",
             ),
-            'info'
+            "info",
         )
 
-        came_from = data.get('came_from', None)
+        came_from = data.get("came_from", None)
         self.redirect_after_login(came_from, is_initial_login)
 
 
 class PWExpiryFailsafeLoginForm(PWExpiryLoginForm):
-
     def render(self):
         return self.index()