misc: remove six module usage (#63688)

mellon/adapters.py

@@ -20,6 +20,7 @@ import os
 import threading
 import time
 import uuid
+from urllib.parse import urlparse
 from xml.etree import ElementTree as ET
 
 import lasso
@@ -31,9 +32,7 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.core.exceptions import FieldDoesNotExist, PermissionDenied
 from django.core.files.storage import default_storage
-from django.utils import six
 from django.utils.encoding import force_text
-from django.utils.six.moves.urllib.parse import urlparse
 from django.utils.translation import ugettext as _
 
 from . import app_settings, models, models_utils, utils

mellon/utils.py

@@ -18,6 +18,7 @@ import datetime
 import importlib
 import logging
 from functools import wraps
+from urllib.parse import urlparse
 from xml.parsers import expat
 
 import isodate
@@ -27,7 +28,6 @@ from django.contrib import auth
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.encoding import force_text
-from django.utils.six.moves.urllib.parse import urlparse
 from django.utils.timezone import get_default_timezone, is_aware, make_aware, make_naive, now
 
 from . import app_settings

tests/test_sso_slo.py

@@ -17,6 +17,7 @@
 import base64
 import datetime
 import re
+import urllib.parse as urlparse
 import xml.etree.ElementTree as ET
 import zlib
 from html import unescape
@@ -26,9 +27,7 @@ import pytest
 from django.contrib.auth.models import User
 from django.contrib.sessions.models import Session
 from django.urls import reverse
-from django.utils import six
 from django.utils.encoding import force_str
-from django.utils.six.moves.urllib import parse as urlparse
 from httmock import HTTMock, all_requests
 from httmock import response as mock_response
 from pytest import fixture

tests/test_views.py

@@ -17,13 +17,13 @@
 import base64
 import hashlib
 from unittest import mock
+from urllib.parse import parse_qs, urlparse
 
 import lasso
 import pytest
 from django.urls import reverse
 from django.utils.encoding import force_text
 from django.utils.http import urlencode
-from django.utils.six.moves.urllib.parse import parse_qs, urlparse
 from httmock import HTTMock
 from utils import error_500, html_response
 from xml_utils import assert_xml_constraints