Projet

Général

Profil

0021-misc-fix-import-error-pylint-error-55505.patch

Lauréline Guérin, 12 juillet 2021 11:24

Télécharger (6,12 ko)

Voir les différences:

Subject: [PATCH 21/23] misc: fix import-error pylint error (#55505)

 chrono/urls.py          |  2 +-
 chrono/utils/spooler.py |  4 ++--
 tests/test_requests.py  | 31 ++++++++++++++++---------------
 3 files changed, 19 insertions(+), 18 deletions(-)
chrono/urls.py
37 37
    urlpatterns.append(url(r'^accounts/mellon/', include('mellon.urls')))
38 38

  
39 39
if settings.DEBUG and 'debug_toolbar' in settings.INSTALLED_APPS:
40
    import debug_toolbar
40
    import debug_toolbar  # pylint: disable=import-error
41 41

  
42 42
    urlpatterns = [
43 43
        url(r'^__debug__/', include(debug_toolbar.urls)),
chrono/utils/spooler.py
16 16
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
17 17

  
18 18
from django.db import connection
19
from uwsgidecorators import spool
19
from uwsgidecorators import spool  # pylint: disable=import-error
20 20

  
21 21
from chrono.agendas.models import ICSError, TimePeriodExceptionSource
22 22

  
23 23

  
24 24
def set_connection(domain):
25
    from hobo.multitenant.middleware import TenantMiddleware
25
    from hobo.multitenant.middleware import TenantMiddleware  # pylint: disable=import-error
26 26

  
27 27
    tenant = TenantMiddleware.get_tenant_by_hostname(domain)
28 28
    connection.set_tenant(tenant)
tests/test_requests.py
1 1
# -*- coding: utf-8 -*-
2 2

  
3
from urllib import parse
4

  
3 5
import mock
4 6
import pytest
5 7
from django.contrib.auth.models import AnonymousUser
6
from django.utils.six.moves.urllib import parse as urlparse
7 8

  
8 9
from chrono.utils.requests_wrapper import NothingInCacheException, requests
9 10
from chrono.utils.signature import check_query
......
34 35
        requests.get('/foo/bar/', remote_service=remote_service)
35 36
        url = send.call_args[0][0].url
36 37
        assert url.startswith('http://example.org/foo/bar/?')
37
        querystring = urlparse.urlparse(url)[4]
38
        query = urlparse.parse_qs(querystring, keep_blank_values=True)
38
        querystring = parse.urlparse(url)[4]
39
        query = parse.parse_qs(querystring, keep_blank_values=True)
39 40
        assert query['orig'][0] == 'myself'
40 41
        assert query['email'][0] == ''
41 42
        assert query['NameID'][0] == ''
......
44 45
        requests.get('/foo/bar/', remote_service=remote_service, without_user=True)
45 46
        url = send.call_args[0][0].url
46 47
        assert url.startswith('http://example.org/foo/bar/?')
47
        querystring = urlparse.urlparse(url)[4]
48
        query = urlparse.parse_qs(querystring, keep_blank_values=True)
48
        querystring = parse.urlparse(url)[4]
49
        query = parse.parse_qs(querystring, keep_blank_values=True)
49 50
        assert query['orig'][0] == 'myself'
50 51
        assert 'email' not in query
51 52
        assert 'NameID' not in query
......
57 58
        requests.get('http://example.org/foo/bar/', remote_service='auto')
58 59
        url = send.call_args[0][0].url
59 60
        assert url.startswith('http://example.org/foo/bar/?')
60
        querystring = urlparse.urlparse(url)[4]
61
        query = urlparse.parse_qs(querystring, keep_blank_values=True)
61
        querystring = parse.urlparse(url)[4]
62
        query = parse.parse_qs(querystring, keep_blank_values=True)
62 63
        assert query['orig'][0] == 'chrono'
63 64
        assert check_query(querystring, 'chrono') is True
64 65

  
......
75 76
        requests.get('/foo/bar/', remote_service=remote_service, user=user)
76 77
        url = send.call_args[0][0].url
77 78
        assert url.startswith('http://example.org/foo/bar/?')
78
        querystring = urlparse.urlparse(url)[4]
79
        query = urlparse.parse_qs(querystring, keep_blank_values=True)
79
        querystring = parse.urlparse(url)[4]
80
        query = parse.parse_qs(querystring, keep_blank_values=True)
80 81
        assert query['NameID'][0] == 'r2d2'
81 82
        assert 'email' not in query
82 83
        assert query['orig'][0] == 'myself'
......
85 86
        requests.get('/foo/bar/', remote_service=remote_service, user=user, federation_key='email')
86 87
        url = send.call_args[0][0].url
87 88
        assert url.startswith('http://example.org/foo/bar/?')
88
        querystring = urlparse.urlparse(url)[4]
89
        query = urlparse.parse_qs(querystring, keep_blank_values=True)
89
        querystring = parse.urlparse(url)[4]
90
        query = parse.parse_qs(querystring, keep_blank_values=True)
90 91
        assert query['email'][0] == 'foo@example.net'
91 92
        assert 'NameID' not in query
92 93
        assert query['orig'][0] == 'myself'
......
97 98
        requests.get('/foo/bar/', remote_service=remote_service, user=user)
98 99
        url = send.call_args[0][0].url
99 100
        assert url.startswith('http://example.org/foo/bar/?')
100
        querystring = urlparse.urlparse(url)[4]
101
        query = urlparse.parse_qs(querystring, keep_blank_values=True)
101
        querystring = parse.urlparse(url)[4]
102
        query = parse.parse_qs(querystring, keep_blank_values=True)
102 103
        assert 'NameID' not in query
103 104
        assert query['email'][0] == 'foo@example.net'
104 105
        assert query['orig'][0] == 'myself'
......
114 115
        requests.get('/foo/bar/', remote_service=remote_service, user=user)
115 116
        url = send.call_args[0][0].url
116 117
        assert url.startswith('http://example.org/foo/bar/?')
117
        querystring = urlparse.urlparse(url)[4]
118
        query = urlparse.parse_qs(querystring, keep_blank_values=True)
118
        querystring = parse.urlparse(url)[4]
119
        query = parse.parse_qs(querystring, keep_blank_values=True)
119 120
        assert query['NameID'][0] == ''
120 121
        assert query['email'][0] == ''
121 122
        assert query['orig'][0] == 'myself'
122
-