Add pycodestyle rules

Author: maclick

oioioi/base/menu.py

@@ -95,7 +95,8 @@ def _get_all_registered_items(self, request):
     def __init__(self, text=None, condition=None, show_icons=False):
         self.text = text
         if condition is None:
-            condition = lambda request: True
+            def condition(request):
+                return True
         self.condition = condition
         self.show_icons = show_icons
         self._registry = []

oioioi/base/models.py

@@ -3,13 +3,20 @@
 
 import django.dispatch
 from django.conf import settings
+from django.contrib.auth.models import User
+from django.db import models
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+from django.utils.translation import gettext_lazy as _
 
 # pylint: disable=unused-import
 # Important. This import is to register signal handlers. Do not remove it.
 import oioioi.base.signal_handlers  # noqa: F401
 from oioioi.base.captcha_check import captcha_check
 from oioioi.base.setup_check import setup_check
 
+import logging
+
 # Check if deployment and installation config versions match.
 # Check if database settings are correct.
 setup_check()
@@ -24,14 +31,6 @@
         except ImportError:
             pass
 
-import logging
-
-from django.contrib.auth.models import User
-from django.db import models
-from django.db.models.signals import post_save
-from django.dispatch import receiver
-from django.utils.translation import gettext_lazy as _
-
 auditLogger = logging.getLogger(__name__ + ".audit")
 
 # Sender will be equal to the form that was completed

oioioi/base/permissions.py

@@ -44,21 +44,20 @@ def __call__(self, *args, **kwargs):
     def __or__(self, other):
         if not isinstance(other, Condition):
             return NotImplemented
-        condition_or = lambda *args, **kwargs: self(*args, **kwargs) or other(
-            *args, **kwargs
-        )
+        def condition_or(*args, **kwargs):
+            return self(*args, **kwargs) or other(*args, **kwargs)
         return Condition(condition_or)
 
     def __and__(self, other):
         if not isinstance(other, Condition):
             return NotImplemented
-        condition_and = lambda *args, **kwargs: self(*args, **kwargs) and other(
-            *args, **kwargs
-        )
+        def condition_and(*args, **kwargs):
+            return self(*args, **kwargs) and other(*args, **kwargs)
         return Condition(condition_and)
 
     def __invert__(self):
-        condition_inverted = lambda *args, **kwargs: not self(*args, **kwargs)
+        def condition_inverted(*args, **kwargs):
+            return not self(*args, **kwargs)
         return Condition(condition_inverted)
 
 

oioioi/base/tests/tests.py

@@ -1210,23 +1210,23 @@ def setUp(self):
         self.url_edit_profile = reverse('edit_profile')
 
     def test_message(self):
-        for l in self.invalid_logins:
-            self.user.username = l
+        for valid_login in self.invalid_logins:
+            self.user.username = valid_login
             self.user.save()
 
             response = self.client.get(self.url_index, follow=True)
             self.assertContains(response, 'contains forbidden characters')
 
-        for l in self.valid_logins:
-            self.user.username = l
+        for valid_login in self.valid_logins:
+            self.user.username = valid_login
             self.user.save()
 
             response = self.client.get(self.url_index, follow=True)
             self.assertNotContains(response, 'contains forbidden characters')
 
     def test_can_change_login_from_invalid(self):
-        for l in self.invalid_logins:
-            self.user.username = l
+        for invalid_login in self.invalid_logins:
+            self.user.username = invalid_login
             self.user.save()
 
             response = self.client.get(self.url_edit_profile)
@@ -1235,7 +1235,7 @@ def test_can_change_login_from_invalid(self):
                 response,
                 '<input type="text" id="id_username" name="username" '
                 'value="%s" class="form-control" '
-                'maxlength="150" required />' % l,
+                'maxlength="150" required />' % invalid_login,
                 html=True,
             )
 
@@ -1248,7 +1248,7 @@ def test_can_change_login_from_invalid(self):
                 },
                 follow=True,
             )
-            self.assertEqual(self.user.username, l)
+            self.assertEqual(self.user.username, invalid_login)
 
             response = self.client.post(self.url_index, follow=True)
             self.assertNotContains(response, 'contains not allowed characters')
@@ -1263,16 +1263,16 @@ def test_can_change_login_from_invalid(self):
             )
 
     def test_login_cannot_change_from_valid(self):
-        for l in self.valid_logins:
-            self.user.username = l
+        for valid_login in self.valid_logins:
+            self.user.username = valid_login
             self.user.save()
 
             response = self.client.get(self.url_edit_profile)
             self.assertContains(
                 response,
                 '<input type="text" id="id_username" name="username" '
                 'value="%s" class="form-control" '
-                'maxlength="150" readonly required />' % l,
+                'maxlength="150" readonly required />' % valid_login,
                 html=True,
             )
 
@@ -1281,7 +1281,7 @@ def test_login_cannot_change_from_valid(self):
                 {'username': 'valid_user', 'terms_accepted': True},
                 follow=True,
             )
-            self.assertEqual(self.user.username, l)
+            self.assertEqual(self.user.username, valid_login)
             self.assertContains(response, 'You cannot change your username.')
 
             response = self.client.get(self.url_index, follow=True)
@@ -1296,9 +1296,9 @@ def test_failed_login_change(self):
         self.user.username = self.invalid_logins[0]
         self.user.save()
 
-        for l in self.invalid_logins:
+        for invalid_login in self.invalid_logins:
             self.client.post(
-                url_edit_profile, {'username': l, 'terms_accepted': True}, follow=True
+                url_edit_profile, {'username': invalid_login, 'terms_accepted': True}, follow=True
             )
             self.assertEqual(self.user.username, self.invalid_logins[0])
 

oioioi/base/utils/__init__.py

@@ -506,7 +506,8 @@ def strip_num_or_hash(filename):
 
 
 def naturalsort_key(key):
-    convert = lambda text: int(text) if text.isdigit() else text
+    def convert(text):
+        return int(text) if text.isdigit() else text
     return [convert(c) for c in re.split('([0-9]+)', key)]
 
 

oioioi/contestexcl/middleware.py

@@ -56,9 +56,8 @@ def _default_selector(user, contest):
         if selector is None:
             final_selector = _default_selector
         else:
-            final_selector = lambda user, contest: _default_selector(
-                user, contest
-            ) and selector(user, contest)
+            def final_selector(user, contest):
+                return _default_selector(user, contest) and selector(user, contest)
 
         if settings.ONLY_DEFAULT_CONTEST:
             qs = [Contest.objects.get(id=settings.DEFAULT_CONTEST)]

oioioi/contests/date_registration.py

@@ -53,21 +53,24 @@ def decorator(original_class):
             )
             return original_class
 
+        def none_returner(obj):
+            return None
+
+        def default_name_generator(obj):
+            return str(model._meta.verbose_name) + " " + str(model._meta.get_field(date_field).verbose_name)
+
         if model is None:
             return decorator
 
         if name_generator is None:
-            name_generator = (
-                lambda obj: str(model._meta.verbose_name)
-                + " "
-                + str(model._meta.get_field(date_field).verbose_name)
-            )
+            name_generator = default_name_generator
 
         if round_chooser is None:
-            round_chooser = lambda obj: None
+            round_chooser = none_returner
 
         if qs_filter is None:
-            qs_filter = lambda qs, contest_id: qs.filter(contest=contest_id)
+            def qs_filter(qs, contest_id):
+                return qs.filter(contest=contest_id)
 
         date_item = self.DateItem(
             date_field, name_generator, round_chooser, qs_filter, model

oioioi/contests/models.py

@@ -739,7 +739,7 @@ def contest_links_generator(request):
     for link in links:
         # pylint: disable=cell-var-from-loop
         # http://docs.python-guide.org/en/latest/writing/gotchas/#late-binding-closures
-        url_generator = lambda request, url=link.url: url
+        url_generator = lambda request, url=link.url: url  # noqa: E731
         item = MenuItem(
             name='contest_link_%d' % link.id,
             text=link.description,

oioioi/contests/urls.py

@@ -59,8 +59,8 @@ def make_patterns(neutrals=None, contests=None, noncontests=None, globs=None):
     # namespaced with 'contest' or 'noncontest', we have to extract
     # and add them to our patterns so they are taken into account.
     def glob_namespaced_patterns(namespace):
-        pattern_lists = [l for l in globs if getattr(l, 'namespace', None) == namespace]
-        return [pattern for l in pattern_lists for pattern in l.url_patterns]
+        pattern_lists = [glob for glob in globs if getattr(glob, 'namespace', None) == namespace]
+        return [pattern for pattern_list in pattern_lists for pattern in pattern_list.url_patterns]
 
     neutrals = neutrals or []
     contests = (contests or []) + neutrals + glob_namespaced_patterns('contest')

oioioi/default_settings.py

@@ -12,6 +12,7 @@
 from django.utils.translation import gettext_lazy as _
 
 import oioioi
+from oioioi.contests.current_contest import ContestMode
 
 INSTALLATION_CONFIG_VERSION = 49
 
@@ -43,8 +44,8 @@
         'NAME': os.getenv('OIOIOI_DB_NAME', 'oioioi'),              # Or path to database file if using sqlite3.
         'USER': os.getenv('OIOIOI_DB_USER', 'oioioi'),              # Not used with sqlite3.
         'PASSWORD': os.getenv('OIOIOI_DB_PASSWORD', 'password'),    # Not used with sqlite3.
-        'HOST': os.getenv('OIOIOI_DB_HOST', 'db'),                  # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': os.getenv('OIOIOI_DB_PORT', ''),                    # Set to empty string for default. Not used with sqlite3.
+        'HOST': os.getenv('OIOIOI_DB_HOST', 'db'),           # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': os.getenv('OIOIOI_DB_PORT', ''),             # Set to empty string for default. Not used with sqlite3.
         'ATOMIC_REQUESTS': True,         # Don't touch unless you know what you're doing.
     }
 }
@@ -591,7 +592,6 @@
 #
 # Some features may depend on this setting, e.g. the "portals" app requires
 # that either the "neutral" or the "contest_if_possible" option is picked.
-from oioioi.contests.current_contest import ContestMode
 CONTEST_MODE = ContestMode.contest_if_possible
 
 # A sample logging configuration. The only tangible logging