From 37d385daced531061bd7209cbae4b5d8958839d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laur=C3=A9line=20Gu=C3=A9rin?= Date: Fri, 9 Jul 2021 17:53:42 +0200 Subject: [PATCH] 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(-) diff --git a/chrono/urls.py b/chrono/urls.py index 003930e2..dfcd5e1c 100644 --- a/chrono/urls.py +++ b/chrono/urls.py @@ -37,7 +37,7 @@ if 'mellon' in settings.INSTALLED_APPS: urlpatterns.append(url(r'^accounts/mellon/', include('mellon.urls'))) if settings.DEBUG and 'debug_toolbar' in settings.INSTALLED_APPS: - import debug_toolbar + import debug_toolbar # pylint: disable=import-error urlpatterns = [ url(r'^__debug__/', include(debug_toolbar.urls)), diff --git a/chrono/utils/spooler.py b/chrono/utils/spooler.py index 3ab6c3ca..161d6abc 100644 --- a/chrono/utils/spooler.py +++ b/chrono/utils/spooler.py @@ -16,13 +16,13 @@ # along with this program. If not, see . from django.db import connection -from uwsgidecorators import spool +from uwsgidecorators import spool # pylint: disable=import-error from chrono.agendas.models import ICSError, TimePeriodExceptionSource def set_connection(domain): - from hobo.multitenant.middleware import TenantMiddleware + from hobo.multitenant.middleware import TenantMiddleware # pylint: disable=import-error tenant = TenantMiddleware.get_tenant_by_hostname(domain) connection.set_tenant(tenant) diff --git a/tests/test_requests.py b/tests/test_requests.py index 866ca85d..ecb8e157 100644 --- a/tests/test_requests.py +++ b/tests/test_requests.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- +from urllib import parse + import mock import pytest from django.contrib.auth.models import AnonymousUser -from django.utils.six.moves.urllib import parse as urlparse from chrono.utils.requests_wrapper import NothingInCacheException, requests from chrono.utils.signature import check_query @@ -34,8 +35,8 @@ def test_sign(): requests.get('/foo/bar/', remote_service=remote_service) url = send.call_args[0][0].url assert url.startswith('http://example.org/foo/bar/?') - querystring = urlparse.urlparse(url)[4] - query = urlparse.parse_qs(querystring, keep_blank_values=True) + querystring = parse.urlparse(url)[4] + query = parse.parse_qs(querystring, keep_blank_values=True) assert query['orig'][0] == 'myself' assert query['email'][0] == '' assert query['NameID'][0] == '' @@ -44,8 +45,8 @@ def test_sign(): requests.get('/foo/bar/', remote_service=remote_service, without_user=True) url = send.call_args[0][0].url assert url.startswith('http://example.org/foo/bar/?') - querystring = urlparse.urlparse(url)[4] - query = urlparse.parse_qs(querystring, keep_blank_values=True) + querystring = parse.urlparse(url)[4] + query = parse.parse_qs(querystring, keep_blank_values=True) assert query['orig'][0] == 'myself' assert 'email' not in query assert 'NameID' not in query @@ -57,8 +58,8 @@ def test_auto_sign(): requests.get('http://example.org/foo/bar/', remote_service='auto') url = send.call_args[0][0].url assert url.startswith('http://example.org/foo/bar/?') - querystring = urlparse.urlparse(url)[4] - query = urlparse.parse_qs(querystring, keep_blank_values=True) + querystring = parse.urlparse(url)[4] + query = parse.parse_qs(querystring, keep_blank_values=True) assert query['orig'][0] == 'chrono' assert check_query(querystring, 'chrono') is True @@ -75,8 +76,8 @@ def test_sign_user(): requests.get('/foo/bar/', remote_service=remote_service, user=user) url = send.call_args[0][0].url assert url.startswith('http://example.org/foo/bar/?') - querystring = urlparse.urlparse(url)[4] - query = urlparse.parse_qs(querystring, keep_blank_values=True) + querystring = parse.urlparse(url)[4] + query = parse.parse_qs(querystring, keep_blank_values=True) assert query['NameID'][0] == 'r2d2' assert 'email' not in query assert query['orig'][0] == 'myself' @@ -85,8 +86,8 @@ def test_sign_user(): requests.get('/foo/bar/', remote_service=remote_service, user=user, federation_key='email') url = send.call_args[0][0].url assert url.startswith('http://example.org/foo/bar/?') - querystring = urlparse.urlparse(url)[4] - query = urlparse.parse_qs(querystring, keep_blank_values=True) + querystring = parse.urlparse(url)[4] + query = parse.parse_qs(querystring, keep_blank_values=True) assert query['email'][0] == 'foo@example.net' assert 'NameID' not in query assert query['orig'][0] == 'myself' @@ -97,8 +98,8 @@ def test_sign_user(): requests.get('/foo/bar/', remote_service=remote_service, user=user) url = send.call_args[0][0].url assert url.startswith('http://example.org/foo/bar/?') - querystring = urlparse.urlparse(url)[4] - query = urlparse.parse_qs(querystring, keep_blank_values=True) + querystring = parse.urlparse(url)[4] + query = parse.parse_qs(querystring, keep_blank_values=True) assert 'NameID' not in query assert query['email'][0] == 'foo@example.net' assert query['orig'][0] == 'myself' @@ -114,8 +115,8 @@ def test_sign_anonymous_user(): requests.get('/foo/bar/', remote_service=remote_service, user=user) url = send.call_args[0][0].url assert url.startswith('http://example.org/foo/bar/?') - querystring = urlparse.urlparse(url)[4] - query = urlparse.parse_qs(querystring, keep_blank_values=True) + querystring = parse.urlparse(url)[4] + query = parse.parse_qs(querystring, keep_blank_values=True) assert query['NameID'][0] == '' assert query['email'][0] == '' assert query['orig'][0] == 'myself'