From df1cef973b9d8520f4968611464a22d90c4b0a54 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Thu, 7 Apr 2022 17:59:36 +0200
Subject: [PATCH] misc: remove six module usage (#63688)

---
 mellon/adapters.py             |  3 +--
 mellon/sessions_backends/db.py | 12 ++++++++----
 mellon/utils.py                |  2 +-
 tests/test_sso_slo.py          |  3 +--
 tests/test_views.py            |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/mellon/adapters.py b/mellon/adapters.py
index 24a0957..73a59d5 100644
--- a/mellon/adapters.py
+++ b/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
diff --git a/mellon/sessions_backends/db.py b/mellon/sessions_backends/db.py
index dbec306..6d1187c 100644
--- a/mellon/sessions_backends/db.py
+++ b/mellon/sessions_backends/db.py
@@ -27,12 +27,16 @@ class SessionStore(SessionStore):
 
     def get_expiry_age(self, **kwargs):
         session_not_on_or_after = self.get_session_not_on_or_after()
+        expiry_age = super().get_expiry_age(**kwargs)
         if session_not_on_or_after and 'expiry' not in kwargs:
-            kwargs['expiry'] = session_not_on_or_after
-        return super().get_expiry_age(**kwargs)
+            max_expiry_age = super().get_expiry_age(expiry=session_not_on_or_after)
+            return min(expiry_age, max_expiry_age)
+        return expiry_age
 
     def get_expiry_date(self, **kwargs):
         session_not_on_or_after = self.get_session_not_on_or_after()
+        expiry_date = super().get_expiry_date(**kwargs)
         if session_not_on_or_after and 'expiry' not in kwargs:
-            kwargs['expiry'] = session_not_on_or_after
-        return super().get_expiry_date(**kwargs)
+            max_expiry_date = session_not_on_or_after
+            return min(expiry_date, max_expiry_date)
+        return expiry_date
diff --git a/mellon/utils.py b/mellon/utils.py
index 6ae5fb7..49faa41 100644
--- a/mellon/utils.py
+++ b/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
diff --git a/tests/test_sso_slo.py b/tests/test_sso_slo.py
index 196e33a..6d0d99a 100644
--- a/tests/test_sso_slo.py
+++ b/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
diff --git a/tests/test_views.py b/tests/test_views.py
index d2b13dc..93ab7a8 100644
--- a/tests/test_views.py
+++ b/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
-- 
2.35.1