trivial: remove usage of django.utils.six imports (#63677)
This commit is contained in:
parent
8cd0a45619
commit
364be777ae
|
@ -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:
|
||||
|
|
|
@ -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']
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
import os
|
||||
import shutil
|
||||
from django.utils.six import StringIO
|
||||
import time
|
||||
|
||||
try:
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
import os
|
||||
import shutil
|
||||
from django.utils.six import StringIO
|
||||
import time
|
||||
|
||||
import pytest
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
import os
|
||||
import shutil
|
||||
from django.utils.six import StringIO
|
||||
import time
|
||||
|
||||
import pytest
|
||||
|
|
|
@ -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(
|
||||
|
|
Reference in New Issue