Minor changes to flake8 related updates

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>

plinth/modules/apache/components.py

@@ -69,8 +69,8 @@ class Uwsgi(app.LeaderComponent):
         component_id should be a unique ID across all components of an app and
         across all components.
 
-        uwsgi_name is the primary part of the configuration file path
-        which must be enabled/disabled by this component.
+        uwsgi_name is the primary part of the configuration file path which
+        must be enabled/disabled by this component.
 
         """
         super().__init__(component_id)

plinth/modules/diaspora/__init__.py

@@ -28,6 +28,8 @@ from plinth.modules.apache.components import Webserver
 from plinth.modules.firewall.components import Firewall
 from plinth.utils import format_lazy
 
+from .manifest import clients
+
 domain_name_file = "/etc/diaspora/domain_name"
 lazy_domain_name = None  # To avoid repeatedly reading from file
 
@@ -70,7 +72,6 @@ description = [
         ' federate with other diaspora* pods.')
 ]
 
-from .manifest import clients  # noqa pylint:disable=E402 isort:skip
 clients = clients
 
 app = None

plinth/modules/i2p/tests/test_helpers.py

@@ -63,7 +63,7 @@ def test_getting_nonexistent_props(editor):
     editor.read_conf()
     editor.idx = 0
     with pytest.raises(KeyError):
-        _ = editor['blabla']
+        _ = editor['blabla']  # noqa
 
 
 def test_setting_new_props(editor):

plinth/modules/sso/forms.py

@@ -18,10 +18,9 @@
 Forms for the Single Sign On app of FreedomBox.
 """
 
-from django.contrib.auth.forms import (
-    AuthenticationForm as DjangoAuthenticationForm
-)
 from captcha.fields import CaptchaField
+from django.contrib.auth.forms import \
+    AuthenticationForm as DjangoAuthenticationForm
 
 
 class AuthenticationForm(DjangoAuthenticationForm):