Projet

Général

Profil

0006-misc-pylint-fix-singleton-comparison-52630.patch

Lauréline Guérin, 02 avril 2021 17:21

Télécharger (5,65 ko)

Voir les différences:

Subject: [PATCH 06/18] misc: pylint fix singleton-comparison (#52630)

 tests/form_pages/test_all.py  |  4 ++--
 tests/test_fields.py          |  4 ++--
 tests/test_saml2utils.py      |  2 +-
 tests/test_widgets.py         |  2 +-
 tests/test_workflow_import.py |  2 +-
 tests/test_workflows.py       | 10 +++++-----
 6 files changed, 12 insertions(+), 12 deletions(-)
tests/form_pages/test_all.py
4528 4528
    formdata = formdef.data_class().select()[0]
4529 4529
    assert formdata.status == 'draft'
4530 4530
    assert formdef.data_class().select()[0].data['1'] == 'bar'
4531
    assert formdef.data_class().select()[0].data.get('3') == None
4531
    assert formdef.data_class().select()[0].data.get('3') is None
4532 4532

  
4533 4533
    resp = resp.forms[0].submit('submit')
4534 4534
    resp.form['f3$element1'].checked = True
......
4565 4565
    formdata = formdef.data_class().select()[0]
4566 4566
    assert formdata.status == 'draft'
4567 4567
    assert formdef.data_class().select()[0].data['1'] == 'bar'
4568
    assert formdef.data_class().select()[0].data.get('3') == None
4568
    assert formdef.data_class().select()[0].data.get('3') is None
4569 4569

  
4570 4570
    resp = resp.forms[0].submit('submit')
4571 4571
    app.post('/test/autosave', params=resp.form.submit_fields())
tests/test_fields.py
364 364
    assert fields.MapField().get_json_value('42.2;10.2') == {'lat': 42.2, 'lon': 10.2}
365 365
    assert fields.MapField().get_json_value('-42.2;10.2') == {'lat': -42.2, 'lon': 10.2}
366 366
    assert fields.MapField().get_json_value(' 42.2 ; 10.2 ') == {'lat': 42.2, 'lon': 10.2}
367
    assert fields.MapField().get_json_value('') == None
368
    assert fields.MapField().get_json_value('foobar') == None
367
    assert fields.MapField().get_json_value('') is None
368
    assert fields.MapField().get_json_value('foobar') is None
369 369

  
370 370

  
371 371
def test_item_render():
tests/test_saml2utils.py
30 30
        },
31 31
        provider_id='provider_id_1',
32 32
    )
33
    assert meta != None
33
    assert meta is not None
34 34
    content = meta.get_saml2_metadata(pkey, '', True, True)
35 35
    assert isinstance(content, str) and content != ''
36 36
    assert 'EntityDescriptor' in content
tests/test_widgets.py
655 655

  
656 656
    widget = ComputedExpressionWidget('test')
657 657
    mock_form_submission(req, widget, {'test$value_text': '', 'test$type': ['text']})
658
    assert widget.parse() == None
658
    assert widget.parse() is None
659 659
    assert not widget.has_error()
660 660

  
661 661
    # python value left empty
tests/test_workflow_import.py
500 500
    add_to_journal2.to = [role.id]
501 501
    st1.items.append(add_to_journal2)
502 502
    add_to_journal2.parent = st1
503
    assert wf.possible_status[0].items[0].to == None
503
    assert wf.possible_status[0].items[0].to is None
504 504
    assert wf.possible_status[0].items[1].to == [role.id]
505 505

  
506 506
    xml_root = wf.export_to_xml()
tests/test_workflows.py
4097 4097
        if date_value not in (None, ''):  # bad value : do nothing
4098 4098
            assert User.get(user.id).form_data.get('4').tm_year == year
4099 4099
        else:  # empty value : empty field
4100
            assert User.get(user.id).form_data.get('4') == None
4100
            assert User.get(user.id).form_data.get('4') is None
4101 4101

  
4102 4102
        with mock.patch('wcs.wf.profile.http_patch_request') as http_patch_request:
4103 4103
            http_patch_request.return_value = (None, 200, '', None)
......
4158 4158

  
4159 4159
    item.perform(formdata)
4160 4160
    formdata = formdef.data_class().get(formdata.id)
4161
    assert formdata.data.get('bo1') == None
4161
    assert formdata.data.get('bo1') is None
4162 4162

  
4163 4163
    item.fields = [{'field_id': 'bo1', 'value': '=form_var_string'}]
4164 4164
    item.perform(formdata)
......
4325 4325
    two_pubs.substitutions.feed(formdata)
4326 4326
    item.perform(formdata)
4327 4327
    formdata = formdef.data_class().get(formdata.id)
4328
    assert formdata.data['bo1'] == None
4328
    assert formdata.data['bo1'] is None
4329 4329

  
4330 4330
    # store a PiclableUpload
4331 4331
    upload = PicklableUpload('test.jpeg', 'image/jpeg')
......
5275 5275

  
5276 5276
    item.url = '[if-any nada]https://www.example.net/[end]'
5277 5277
    pub.substitutions.feed(formdata)
5278
    assert item.perform(formdata) == None
5278
    assert item.perform(formdata) is None
5279 5279

  
5280 5280
    item.url = '{% if nada %}https://www.example.net/{% endif %}'
5281 5281
    pub.substitutions.feed(formdata)
5282
    assert item.perform(formdata) == None
5282
    assert item.perform(formdata) is None
5283 5283

  
5284 5284

  
5285 5285
def test_workflow_jump_condition_migration(pub):
5286
-