Browse Source

Make misago.conf pass pylint

rafalp 6 years ago
parent
commit
cbe8eebc47

+ 3 - 2
devproject/settings.py

@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long
 """
 Django settings for dev project.
 
@@ -339,8 +340,8 @@ MISAGO_SEARCH_CONFIG = "simple"
 
 
 # Allow users to download their personal data
-# Enables users to learn what data about them is being held by the site without having to contact
-# site's administrators.
+# Enables users to learn what data about them is being held by the site without having
+# to contact site's administrators.
 
 MISAGO_ENABLE_DOWNLOAD_OWN_DATA = True
 

+ 3 - 3
misago/conf/defaults.py

@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long
 """
 Default Misago settings. Override these with settings in the module pointed to
 by the DJANGO_SETTINGS_MODULE environment variable.
@@ -6,7 +7,6 @@ If you rely on any of those in your code, make sure you use `misago.conf.setting
 instead of Django's `django.conf.settings`.
 """
 
-
 # Complete HTTP address of your Misago installation
 
 MISAGO_ADDRESS = None
@@ -36,8 +36,8 @@ MISAGO_ANONYMOUS_USERNAME = "Ghost"
 
 
 # Allow users to download their personal data
-# Enables users to learn what data about them is being held by the site without having to contact
-# site's administrators.
+# Enables users to learn what data about them is being held by the site without having
+# to contact site's administrators.
 
 MISAGO_ENABLE_DOWNLOAD_OWN_DATA = True
 

+ 5 - 8
misago/conf/forms.py

@@ -51,8 +51,8 @@ def basic_kwargs(setting, extra):
 
     if kwargs["required"]:
         if kwargs.get("help_text"):
-            format = {"help_text": kwargs["help_text"]}
-            kwargs["help_text"] = _("Required. %(help_text)s") % format
+            help_text = {"help_text": kwargs["help_text"]}
+            kwargs["help_text"] = _("Required. %(help_text)s") % help_text
         else:
             kwargs["help_text"] = _("This field is required.")
 
@@ -74,8 +74,7 @@ def create_checkbox(setting, kwargs, extra):
 
     if setting.python_type == "int":
         return forms.TypedMultipleChoiceField(coerce="int", **kwargs)
-    else:
-        return forms.MultipleChoiceField(**kwargs)
+    return forms.MultipleChoiceField(**kwargs)
 
 
 def create_choice(setting, kwargs, extra):
@@ -88,16 +87,14 @@ def create_choice(setting, kwargs, extra):
 
     if setting.python_type == "int":
         return forms.TypedChoiceField(coerce="int", **kwargs)
-    else:
-        return forms.ChoiceField(**kwargs)
+    return forms.ChoiceField(**kwargs)
 
 
 def create_text(setting, kwargs, extra):
     kwargs.update(extra)
     if setting.python_type == "int":
         return forms.IntegerField(**kwargs)
-    else:
-        return forms.CharField(**kwargs)
+    return forms.CharField(**kwargs)
 
 
 def create_textarea(setting, kwargs, extra):

+ 3 - 2
misago/conf/models.py

@@ -14,7 +14,7 @@ class SettingsGroupsManager(models.Manager):
             groups_dict[_(group.name)] = group
 
         ordered_groups = []
-        for key in groups_dict.keys():
+        for key in groups_dict:
             ordered_groups.append(groups_dict[key])
         return ordered_groups
 
@@ -31,7 +31,8 @@ class SettingsManager(models.Manager):
     def change_setting(self, setting, dry_value=None, wet_value=None):
         if dry_value:
             return self.filter(setting=setting).update(dry_value=dry_value)
-        elif wet_value:
+
+        if wet_value:
             try:
                 setting = self.get(setting=setting)
                 setting.value = wet_value

+ 1 - 1
misago/conf/test.py

@@ -16,7 +16,7 @@ class override_dynamic_settings:
     def __call__(self, f):
         @wraps(f)
         def test_function_wrapper(*args, **kwargs):
-            with self as context:
+            with self:
                 return f(*args, **kwargs)
 
         return test_function_wrapper

+ 0 - 2
misago/conf/tests/test_context_processors.py

@@ -1,7 +1,5 @@
 from unittest.mock import Mock
 
-import pytest
-
 from ..context_processors import conf
 
 

+ 1 - 1
misago/conf/tests/test_getting_dynamic_settings_values.py

@@ -60,7 +60,7 @@ def test_accessing_attr_for_undefined_setting_raises_attribute_error(
 ):
     settings = DynamicSettings(cache_versions)
     with pytest.raises(AttributeError):
-        settings.not_existing
+        settings.not_existing  # pylint: disable=pointless-statement
 
 
 def test_accessing_attr_for_lazy_setting_with_value_returns_true(

+ 0 - 2
misago/conf/tests/test_overridding_dynamic_settings.py

@@ -1,5 +1,3 @@
-import pytest
-
 from ..dynamicsettings import DynamicSettings
 from ..test import override_dynamic_settings
 

+ 1 - 2
misago/conf/utils.py

@@ -4,8 +4,7 @@ from . import hydrators
 def get_setting_value(setting):
     if not setting.dry_value and setting.default_value:
         return hydrators.hydrate_value(setting.python_type, setting.default_value)
-    else:
-        return hydrators.hydrate_value(setting.python_type, setting.dry_value)
+    return hydrators.hydrate_value(setting.python_type, setting.dry_value)
 
 
 def set_setting_value(setting, new_value):

+ 1 - 1
misago/conf/views.py

@@ -13,7 +13,7 @@ def render(request, template, context=None):
 
     context["settings_groups"] = SettingsGroup.objects.ordered_alphabetically()
 
-    if not "active_group" in context:
+    if "active_group" not in context:
         context["active_group"] = {"key": None}
 
     return mi_render(request, template, context)