Projet

Général

Profil

0037-misc-fix-pointless-statement-pylint-error-56982.patch

Valentin Deniaud, 21 septembre 2021 17:09

Télécharger (7,09 ko)

Voir les différences: 

Subject: [PATCH 37/59] misc: fix pointless-statement pylint error (#56982)


 src/authentic2/disco_service/disco_responder.py           | 3 +--
 src/authentic2/management/commands/slapd-shell.py         | 1 -
 src/authentic2/utils/misc.py                              | 2 +-
 src/authentic2_auth_oidc/backends.py                      | 2 +-
 .../management/commands/oidc-register-issuer.py           | 1 -
 tests/test_all.py                                         | 1 -
 tests/test_api.py                                         | 1 -
 tests/test_commands.py                                    | 1 -
 tests/test_journal.py                                     | 8 ++++----
 9 files changed, 7 insertions(+), 13 deletions(-)
src/authentic2/disco_service/disco_responder.py
63 63 
def get_prefered_idp(request):
64 64 
    # XXX: Read cookie if any
65 65 
    if 'prefered_idp' in request.session:
66 
        request.session['prefered_idp']
66 
        return request.session['prefered_idp']
67 67 

  		




  68
  68
  
    

  		




  69
  69
  
    
def is_known_idp(idp):

  		




  ......




  75
  75
  
    
    liberty_provider = None

  		




  76
  76
  
    
    try:

  		




  77
  77
  
    
        liberty_provider = LibertyProvider.objects.get(entity_id=entity_id)

  		




  78
  
  
    
        liberty_provider.service_provider

  		




  79
  78
  
    
    except Exception:

  		




  80
  79
  
    
        logger.warn('get_disco_return_url_from_metadata: unknown service provider %s', entity_id)

  		




  81
  80
  
    
        return None

  		












  

    
      src/authentic2/management/commands/slapd-shell.py
    
  





  110
  110
  
    
            elif state == ATTR:

  		




  111
  111
  
    
                if line == '\n':

  		




  112
  112
  
    
                    self.ldap(command, attrs)

  		




  113
  
  
    
                    state == COMMAND

  		




  114
  113
  
    
                    attrs = {}

  		




  115
  114
  
    
                    sys.stdout.flush()

  		




  116
  115
  
    
                    sys.exit(0)

  		












  

    
      src/authentic2/utils/misc.py
    
  





  534
  534
  
    

  		




  535
  535
  
    
def form_add_error(form, msg, safe=False):

  		




  536
  536
  
    
    # without this line form._errors is not initialized

  		




  537
  
  
    
    form.errors

  		




  
  537
  
    
    form.errors  # pylint: disable=pointless-statement

  		




  538
  538
  
    
    errors = form._errors.setdefault(forms.forms.NON_FIELD_ERRORS, ErrorList())

  		




  539
  539
  
    
    if safe:

  		




  540
  540
  
    
        msg = html.mark_safe(msg)

  		












  

    
      src/authentic2_auth_oidc/backends.py
    
  





  87
  87
  
    

  		




  88
  88
  
    
        if key_or_keyset:

  		




  89
  89
  
    
            jwt = JWT(jwt=original_id_token, key=key_or_keyset, check_claims={}, algs=algs)

  		




  90
  
  
    
            jwt.claims

  		




  
  90
  
    
            jwt.claims  # pylint: disable=pointless-statement

  		




  91
  91
  
    

  		




  92
  92
  
    
        if isinstance(id_token.aud, str) and provider.client_id != id_token.aud:

  		




  93
  93
  
    
            logger.warning(

  		












  

    
      src/authentic2_auth_oidc/management/commands/oidc-register-issuer.py
    
  





  130
  130
  
    
                print(field.verbose_name, ':')

  		




  131
  131
  
    
                value = getattr(provider, field.name)

  		




  132
  132
  
    
                if isinstance(value, dict):

  		




  133
  
  
    
                    print

  		




  134
  133
  
    
                    pprint.pprint(value)

  		




  135
  134
  
    
                elif hasattr(provider, str('get_' + field.attname + '_display')):

  		




  136
  135
  
    
                    print(getattr(provider, 'get_' + field.attname + '_display')(), '(%s)' % value)

  		












  

    
      tests/test_all.py
    
  





  543
  543
  
    
        # disable existing attributes

  		




  544
  544
  
    
        models.Attribute.objects.update(disabled=True)

  		




  545
  545
  
    

  		




  546
  
  
    
        user = self.reguser3

  		




  547
  546
  
    
        cred = self.reguser3_cred

  		




  548
  547
  
    
        User = get_user_model()

  		




  549
  548
  
    
        user_count = User.objects.count()

  		












  

    
      tests/test_api.py
    
  





  2435
  2435
  
    
    method2 = {'how': 'fc'}

  		




  2436
  2436
  
    

  		




  2437
  2437
  
    
    event_type = EventType.objects.get_for_name(event_type_name)

  		




  2438
  
  
    
    event_type_definition = event_type.definition

  		




  2439
  2438
  
    

  		




  2440
  2439
  
    
    freezer.move_to('2020-02-03 12:00')

  		




  2441
  2440
  
    
    event = Event.objects.create(type=event_type, references=[portal], data=method)

  		












  

    
      tests/test_commands.py
    
  





  297
  297
  
    
    manager_role1 = Role.objects.create(name='Managers of Role 1', slug='_a2-managers-of-role-role1')

  		




  298
  298
  
    
    manager_role1.permissions.add(perm1)

  		




  299
  299
  
    
    manager_role1.save()

  		




  300
  
  
    
    manager_role1_id = manager_role1.id

  		




  301
  300
  
    

  		




  302
  301
  
    
    call_command('check-and-repair', '--repair', '--noinput')

  		




  303
  302
  
    

  		












  

    
      tests/test_journal.py
    
  





  114
  114
  
    
        events = list(Event.objects.prefetch_references())

  		




  115
  115
  
    
        assert len(events) == 12

  		




  116
  116
  
    
        event = events[0]

  		




  117
  
  
    
        event.type.name

  		




  
  117
  
    
        assert event.type.name == 'sso'

  		




  118
  118
  
    
        assert event.user == user

  		




  119
  119
  
    
        assert len(event.references) == 1

  		




  120
  120
  
    
        assert event.references[0] == service

  		




  ......




  439
  439
  
    
    journal.record('user.login', user=user, how='password')

  		




  440
  440
  
    
    event = Event.objects.get()

  		




  441
  441
  
    

  		




  442
  
  
    
    event.message

  		




  
  442
  
    
    assert event.message

  		




  443
  443
  
    
    assert not (caplog.records)

  		




  444
  444
  
    

  		




  445
  445
  
    
    caplog.clear()

  		




  446
  446
  
    
    with mock.patch.object(some_event_types['UserLogin'], 'get_message', side_effect=Exception('boum')):

  		




  447
  
  
    
        event.message

  		




  
  447
  
    
        assert event.message

  		




  448
  448
  
    
    assert len(caplog.records) == 1

  		




  449
  449
  
    
    assert caplog.records[0].levelname == 'ERROR'

  		




  450
  450
  
    
    assert caplog.records[0].message == 'could not render message of event type "user.login"'

  		




  451
  451
  
    

  		




  452
  452
  
    
    caplog.clear()

  		




  453
  453
  
    
    with mock.patch.object(some_event_types['UserLogin'], 'get_message', side_effect=Exception('boum')):

  		




  454
  
  
    
        event.message_in_context(None)

  		




  
  454
  
    
        assert event.message_in_context(None)

  		




  455
  455
  
    
    assert len(caplog.records) == 1

  		




  456
  456
  
    
    assert caplog.records[0].levelname == 'ERROR'

  		




  457
  457
  
    
    assert caplog.records[0].message == 'could not render message of event type "user.login"'

  		




  458
  
  
    
-