diff --git a/auquotidien/modules/payments.py b/auquotidien/modules/payments.py index 48fd2ec..7f41fce 100644 --- a/auquotidien/modules/payments.py +++ b/auquotidien/modules/payments.py @@ -6,7 +6,7 @@ import time from decimal import Decimal -from django.utils.six.moves.urllib import parse as urllib +import urllib.parse from quixote import redirect, get_publisher, get_request, get_session, get_response from quixote.directory import Directory @@ -525,7 +525,7 @@ class PublicPaymentRegieBackDirectory(Directory): request = get_request() query_string = get_request().get_query() if request.get_method() == 'POST' and query_string == '': - query_string = urllib.urlencode(request.form) + query_string = urllib.parse.urlencode(request.form) try: regie = Regie.get(component) except KeyError: diff --git a/auquotidien/modules/root.py b/auquotidien/modules/root.py index e7bdbc2..9b4d8d2 100644 --- a/auquotidien/modules/root.py +++ b/auquotidien/modules/root.py @@ -11,8 +11,6 @@ import os import re import string -from django.utils.six.moves.urllib import parse as urlparse - try: import lasso except ImportError: @@ -132,7 +130,7 @@ class AlternateLoginDirectory(OldLoginDirectory): after_url = get_request().form.get('next') if after_url: root_url = get_publisher().get_root_url() - after_path = urlparse.urlparse(after_url)[2] + after_path = urllib.parse.urlparse(after_url)[2] after_path = after_path[len(root_url) :] if after_path.startswith(str('admin')) or after_path.startswith(str('backoffice')): ident_methods = ['idp'] diff --git a/tests/test_admin_pages.py b/tests/test_admin_pages.py index 222178b..449ee78 100644 --- a/tests/test_admin_pages.py +++ b/tests/test_admin_pages.py @@ -1,6 +1,5 @@ import os import shutil -from django.utils.six import StringIO import time try: diff --git a/tests/test_backoffice_pages.py b/tests/test_backoffice_pages.py index af6c85d..794a1ad 100644 --- a/tests/test_backoffice_pages.py +++ b/tests/test_backoffice_pages.py @@ -1,6 +1,5 @@ import os import shutil -from django.utils.six import StringIO import time import pytest diff --git a/tests/test_user_pages.py b/tests/test_user_pages.py index d235261..ef0b618 100644 --- a/tests/test_user_pages.py +++ b/tests/test_user_pages.py @@ -1,6 +1,5 @@ import os import shutil -from django.utils.six import StringIO import time import pytest diff --git a/tests/utilities.py b/tests/utilities.py index 5c0e3a7..8d78108 100644 --- a/tests/utilities.py +++ b/tests/utilities.py @@ -1,4 +1,4 @@ -from django.utils.six.moves import configparser as ConfigParser +import configparser import os import tempfile @@ -18,7 +18,7 @@ wcs.middleware.AfterJobsMiddleware.ASYNC = False def create_temporary_pub(): - config = ConfigParser.ConfigParser() + config = configparser.ConfigParser() APP_DIR = tempfile.mkdtemp() compat.CompatWcsPublisher.APP_DIR = APP_DIR compat.CompatWcsPublisher.DATA_DIR = os.path.abspath(