grab url methods form six (#39533)

This commit is contained in:
Emmanuel Cazenave 2020-02-04 17:25:01 +01:00
parent 87c7468ab1
commit 0ecaa0d858
1 changed files with 5 additions and 7 deletions

View File

@ -25,9 +25,6 @@ import binascii
import datetime
import json
import os
import urlparse
from urllib import quote
import magic
@ -38,6 +35,7 @@ from django.core.files.base import ContentFile
from django.core.exceptions import ValidationError
from django.utils.encoding import force_text
from django.utils import six
from django.utils.six.moves.urllib import parse as urlparse
from passerelle.base.models import BaseResource, HTTPResource
from passerelle.utils.api import endpoint
@ -765,7 +763,7 @@ class AtrealOpenads(BaseResource, HTTPResource, BaseModel):
self.logger.debug("----- files (end) -----")
# make a request to openADS.API (with the payload)
url = urlparse.urljoin(self.openADS_API_url, 'dossiers/%s' % quote(type_dossier))
url = urlparse.urljoin(self.openADS_API_url, 'dossiers/%s' % urlparse.quote(type_dossier))
response = self.requests.post(
url,
json=payload,
@ -880,7 +878,7 @@ class AtrealOpenads(BaseResource, HTTPResource, BaseModel):
# make a request to openADS.API
url = urlparse.urljoin(self.openADS_API_url, 'dossier/%s/%s' % (
quote(type_dossier), quote(numero_dossier)))
urlparse.quote(type_dossier), urlparse.quote(numero_dossier)))
response = self.requests.get(url)
# response is an error
@ -1017,7 +1015,7 @@ class AtrealOpenads(BaseResource, HTTPResource, BaseModel):
# make a request to openADS.API
url = urlparse.urljoin(self.openADS_API_url, 'dossier/%s/%s/courrier/%s' % (
quote(type_dossier), quote(numero_dossier), quote(lettre_type)))
urlparse.quote(type_dossier), urlparse.quote(numero_dossier), urlparse.quote(lettre_type)))
response = self.requests.get(url)
# response is an error
@ -1177,7 +1175,7 @@ class AtrealOpenads(BaseResource, HTTPResource, BaseModel):
# make the request to openADS.API (with a specific timeout)
url = urlparse.urljoin(self.openADS_API_url, 'dossier/%s/%s/files' % (
quote(type_dossier), quote(numero_dossier)))
urlparse.quote(type_dossier), urlparse.quote(numero_dossier)))
response = self.requests.post(
url,
json=payload,