Projet

Général

Profil

0014-misc-fix-no-name-in-module-pylint-error-55505.patch

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

Télécharger (5,01 ko)

Voir les différences:

Subject: [PATCH 14/23] misc: fix no-name-in-module pylint error (#55505)

 chrono/urls_utils.py             |  4 ++--
 chrono/utils/requests_wrapper.py | 12 ++++++------
 chrono/utils/signature.py        |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)
chrono/urls_utils.py
19 19
import django
20 20

  
21 21
if django.VERSION < (2, 0, 0):
22
    from django.urls.resolvers import RegexURLPattern as URLPattern
22
    from django.urls.resolvers import RegexURLPattern as URLPattern  # pylint: disable=no-name-in-module
23 23
else:
24
    from django.urls.resolvers import URLPattern
24
    from django.urls.resolvers import URLPattern  # pylint: disable=no-name-in-module
25 25

  
26 26

  
27 27
class DecoratedURLPattern(URLPattern):
chrono/utils/requests_wrapper.py
16 16

  
17 17
import hashlib
18 18
import logging
19
from urllib import parse
19 20

  
20 21
from django.conf import settings
21 22
from django.core.cache import cache
22 23
from django.utils.encoding import smart_bytes
23 24
from django.utils.http import urlencode
24 25
from django.utils.six import BytesIO
25
from django.utils.six.moves.urllib import parse as urlparse
26 26
from requests import Response
27 27
from requests import Session as RequestsSession
28 28
from requests.auth import AuthBase
......
60 60

  
61 61
        if remote_service == 'auto':
62 62
            remote_service = None
63
            scheme, netloc, path, params, query, fragment = urlparse.urlparse(url)
63
            scheme, netloc, path, params, query, fragment = parse.urlparse(url)
64 64
            for services in settings.KNOWN_SERVICES.values():
65 65
                for service in services.values():
66 66
                    remote_url = service.get('url')
67
                    remote_scheme, remote_netloc = urlparse.urlparse(remote_url)[:2]
67
                    remote_scheme, remote_netloc = parse.urlparse(remote_url)[:2]
68 68
                    if remote_scheme == scheme and remote_netloc == netloc:
69 69
                        remote_service = service
70 70
                        break
......
74 74
            if remote_service:
75 75
                # only keeps the path (URI) in url parameter, scheme and netloc are
76 76
                # in remote_service
77
                url = urlparse.urlunparse(('', '', path, params, query, fragment))
77
                url = parse.urlunparse(('', '', path, params, query, fragment))
78 78
            else:
79 79
                logging.warning('service not found in settings.KNOWN_SERVICES for %s', url)
80 80

  
......
102 102
            query_params['orig'] = remote_service.get('orig')
103 103

  
104 104
            remote_service_base_url = remote_service.get('url')
105
            scheme, netloc, dummy, params, old_query, fragment = urlparse.urlparse(remote_service_base_url)
105
            scheme, netloc, dummy, params, old_query, fragment = parse.urlparse(remote_service_base_url)
106 106

  
107 107
            query = urlencode(query_params)
108 108
            if '?' in url:
......
111 111
            else:
112 112
                path = url
113 113

  
114
            url = urlparse.urlunparse((scheme, netloc, path, params, query, fragment))
114
            url = parse.urlunparse((scheme, netloc, path, params, query, fragment))
115 115

  
116 116
        if method == 'GET' and cache_duration:
117 117
            # handle cache
chrono/utils/signature.py
19 19
import hashlib
20 20
import hmac
21 21
import random
22
from urllib import parse
22 23

  
23 24
from django.conf import settings
24 25
from django.utils.encoding import smart_bytes
25 26
from django.utils.http import quote, urlencode
26
from django.utils.six.moves.urllib import parse as urlparse
27 27

  
28 28
# Simple signature scheme for query strings
29 29

  
30 30

  
31 31
def sign_url(url, key, algo='sha256', timestamp=None, nonce=None):
32
    parsed = urlparse.urlparse(url)
32
    parsed = parse.urlparse(url)
33 33
    new_query = sign_query(parsed.query, key, algo, timestamp, nonce)
34
    return urlparse.urlunparse(parsed[:4] + (new_query,) + parsed[5:])
34
    return parse.urlunparse(parsed[:4] + (new_query,) + parsed[5:])
35 35

  
36 36

  
37 37
def sign_query(query, key, algo='sha256', timestamp=None, nonce=None):
......
71 71

  
72 72

  
73 73
def check_query(query, keys, known_nonce=None, timedelta=30):
74
    parsed = urlparse.parse_qs(query)
74
    parsed = parse.parse_qs(query)
75 75
    if not ('signature' in parsed and 'algo' in parsed and 'timestamp' in parsed and 'nonce' in parsed):
76 76
        return False
77 77
    unsigned_query, signature_content = query.split('&signature=', 1)
78
-