0015-misc-fix-function-redefined-pylint-error-56982.patch

Valentin Deniaud, 21 septembre 2021 17:09

Voir les différences: en ligne côte à côte

Subject: [PATCH 15/59] misc: fix function-redefined pylint error (#56982)

 src/authentic2/api_views.py               | 8 ++++----
 src/authentic2/backends/ldap_backend.py   | 1 -
 src/authentic2/backends/models_backend.py | 4 ++--
 src/authentic2/journal.py                 | 4 ++--
 src/authentic2/manager/apps.py            | 4 ++--
 src/authentic2/manager/journal_views.py   | 8 ++++----
 src/authentic2_auth_fc/authenticators.py  | 2 +-
 src/authentic2_auth_saml/backends.py      | 4 ++--
 src/authentic2_idp_cas/models.py          | 5 +++--
 tests/test_commands.py                    | 2 +-
 tests/test_concurrency.py                 | 2 +-
 11 files changed, 22 insertions(+), 22 deletions(-)

     from django.utils.translation import ugettext_lazy as _
     from django.views.decorators.cache import cache_control
     from django.views.decorators.vary import vary_on_headers
     from django_filters.fields import IsoDateTimeField
     from django_filters.filters import IsoDateTimeFilter
     from django_filters.fields import IsoDateTimeField as BaseIsoDateTimeField
     from django_filters.filters import IsoDateTimeFilter as BaseIsoDateTimeFilter
     from django_filters.rest_framework import FilterSet
     from django_filters.utils import handle_timezone
     from pytz.exceptions import AmbiguousTimeError, NonExistentTimeError
-...
     # override to handle ambiguous naive DateTime on DST change
     class IsoDateTimeField(IsoDateTimeField):
     class IsoDateTimeField(BaseIsoDateTimeField):
         def __init__(self, *args, **kwargs):
             self.bound = kwargs.pop('bound')
             assert self.bound in ['upper', 'lesser']
-...
                     return possible[1]
     class IsoDateTimeFilter(IsoDateTimeFilter):
     class IsoDateTimeFilter(BaseIsoDateTimeFilter):
         @property
         def field_class(self):
             if self.lookup_expr.startswith('gt'):

src/authentic2/backends/ldap_backend.py
27	27	from ldap.ldapobject import ReconnectLDAPObject as NativeLDAPObject
28	28
29	29	PYTHON_LDAP3 = [int(x) for x in ldap.__version__.split('.')] >= [3]
30		LDAPObject = NativeLDAPObject
31	30	except ImportError:
32	31	ldap = None
33	32	PYTHON_LDAP3 = None

     import functools
     from django.contrib.auth import get_user_model
     from django.contrib.auth.backends import ModelBackend
     from django.contrib.auth.backends import ModelBackend as BaseModelBackend
     from django.db import models
     from authentic2.backends import get_user_queryset
-...
     PROXY_USER_MODEL = None
     class ModelBackend(ModelBackend):
     class ModelBackend(BaseModelBackend):
         """
         Authenticates against settings.AUTH_USER_MODEL.
         """

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     from authentic2.apps.journal.journal import Journal
     from authentic2.apps.journal.journal import Journal as BaseJournal
     from authentic2.utils.service import get_service_from_request
     class Journal(Journal):
     class Journal(BaseJournal):
         def __init__(self, **kwargs):
             self._service = kwargs.pop('service', None)
             super().__init__(**kwargs)

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     from django.apps import AppConfig
     from django.apps import AppConfig as BaseAppConfig
     class AppConfig(AppConfig):
     class AppConfig(BaseAppConfig):
         name = 'authentic2.manager'
         verbose_name = 'Authentic2 Manager'

     from django.utils.translation import ugettext_lazy as _
     from django.views.generic.list import ListView
     from authentic2.apps.journal.forms import JournalForm
     from authentic2.apps.journal.forms import JournalForm as BaseJournalForm
     from authentic2.apps.journal.models import EventType, n_2_pairing
     from authentic2.apps.journal.search_engine import JournalSearchEngine
     from authentic2.apps.journal.search_engine import JournalSearchEngine as BaseJournalSearchEngine
     from authentic2.apps.journal.views import JournalView
     from authentic2.custom_user.models import DeletedUser
-...
     User = get_user_model()
     class JournalSearchEngine(JournalSearchEngine):
     class JournalSearchEngine(BaseJournalSearchEngine):
         def search_by_uuid(self, lexem):
             # by user uuid
             try:
-...
+    )
     class JournalForm(JournalForm):
     class JournalForm(BaseJournalForm):
         search_engine_class = JournalSearchEngine
         event_type = forms.ChoiceField(label=_('Event type'), required=False, choices=EVENT_TYPE_CHOICES)

         def name(self):
             return gettext_noop('FranceConnect')
         def id(self):
         def id(self):  # pylint: disable=E0102
             return 'fc'
         def autorun(self, request, block_id):

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     from mellon.backends import SAMLBackend
     from mellon.backends import SAMLBackend as BaseSAMLBackend
     from authentic2.middleware import StoreRequestMiddleware
     from . import app_settings
     class SAMLBackend(SAMLBackend):
     class SAMLBackend(BaseSAMLBackend):
         def authenticate(self, request=None, **kwargs):
             if not app_settings.enable:
                 return None

     from django.utils.timezone import now
     from django.utils.translation import ugettext_lazy as _
     from authentic2.models import LogoutUrlAbstract, Service
     from authentic2.models import LogoutUrlAbstract
     from authentic2.models import Service as BaseService
     from authentic2.utils.misc import check_session_key
     from . import constants, managers, utils
-...
+    )
     class Service(LogoutUrlAbstract, Service):
     class Service(LogoutUrlAbstract, BaseService):
         urls = models.TextField(verbose_name=_('urls'))
         identifier_attribute = models.CharField(max_length=64, verbose_name=_('attribute name'), blank=False)
         proxy = models.ManyToManyField(

         call_command('load-ldif', ldif.strpath, result='result', extra_attribute={'ldap_attr': 'first_name'})
         # test ExtraAttributeAction
         class MockPArser:
         class MockPArser:  # pylint: disable=E0102
             def __init__(self, *args, **kwargs):
                 self.users = []
                 assert len(args) == 1

             map_threads(f, range(concurrency))
             assert AttributeValue.objects.filter(attribute=multiple_at).count() == 1
             def f(i):
             def f(i):  # pylint: disable=E0102
                 simple_user.attributes.single = str(i)
                 connection.close()
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0015-misc-fix-function-redefined-pylint-error-56982.patch