get urlparse from six (#38923)

functests/cmis/tests_cmis.py

@@ -1,8 +1,8 @@
 import base64
 import hashlib
 import os
-import urlparse
 
+from django.utils.six.moves.urllib import parse as urlparse
 import pytest
 import requests
 

passerelle/apps/api_particulier/models.py

@@ -18,12 +18,12 @@
    https://particulier.api.gouv.fr/
 '''
 
-from urlparse import urljoin
 from collections import OrderedDict
 import requests
 
 from django.db import models
 from django.utils import six
+from django.utils.six.moves.urllib import parse
 from django.utils.translation import ugettext_lazy as _
 
 from passerelle.base.models import BaseResource
@@ -63,7 +63,7 @@ class APIParticulier(BaseResource):
 
     def get(self, path, **kwargs):
         user = kwargs.pop('user', None)
-        url = urljoin(self.url, path)
+        url = parse.urljoin(self.url, path)
         headers = {'X-API-KEY': self.api_key}
         if user:
             headers['X-User'] = user

passerelle/apps/arcgis/models.py

@@ -14,10 +14,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import urlparse
-
 from django.db import models
 from django.template import Template, Context
+from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.translation import ugettext_lazy as _
 
 from passerelle.utils.jsonresponse import APIError

passerelle/apps/arpege_ecp/models.py

@@ -15,11 +15,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import json
-import urlparse
 
 from requests import RequestException
 
 from django.db import models
+from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.translation import ugettext_lazy as _
 from django.utils.dateparse import parse_date, parse_time
 from django.utils import timezone

passerelle/apps/atos_genesys/models.py

@@ -15,13 +15,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import datetime
-import urlparse
 import requests
 import xml.etree.ElementTree as ET
 import jsonfield
 
 from django.db import models
 from django.utils import six
+from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.translation import ugettext_lazy as _
 
 from passerelle.utils import xml as xmlutils

passerelle/apps/base_adresse/models.py

@@ -1,6 +1,5 @@
 import bz2
 import json
-import urlparse
 import unicodedata
 
 from requests import RequestException
@@ -11,7 +10,7 @@ from django.utils.http import urlencode
 from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone
 from django.utils import six
-from django.utils.six.moves.urllib.parse import urljoin
+from django.utils.six.moves.urllib import parse as urlparse
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint
@@ -63,7 +62,7 @@ class BaseAdresse(BaseResource):
             return []
 
         scheme, netloc, path, params, query, fragment = urlparse.urlparse(self.service_url)
-        path = urljoin(path, 'search/')
+        path = urlparse.urljoin(path, 'search/')
         query_args = {'q': q, 'limit': 1}
         if zipcode:
             query_args['postcode'] = zipcode
@@ -98,7 +97,7 @@ class BaseAdresse(BaseResource):
             raise NotImplementedError()
 
         scheme, netloc, path, params, query, fragment = urlparse.urlparse(self.service_url)
-        path = urljoin(path, 'reverse/')
+        path = urlparse.urljoin(path, 'reverse/')
         query = urlencode({'lat': lat, 'lon': lon})
         url = urlparse.urlunparse((scheme, netloc, path, params, query, fragment))
 
@@ -313,7 +312,7 @@ class BaseAdresse(BaseResource):
             return
         error = None
         try:
-            response = self.requests.get(urljoin(self.api_geo_url, endpoint))
+            response = self.requests.get(urlparse.urljoin(self.api_geo_url, endpoint))
         except RequestException as e:
             error = e
         else:

passerelle/apps/vivaticket/models.py

@@ -15,10 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import hashlib
-import urlparse
 
 from django.core.cache import cache
 from django.db import models
+from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.translation import ugettext_lazy as _
 
 from passerelle.base.models import BaseResource

passerelle/base/signature.py

@@ -4,7 +4,8 @@ import hmac
 import hashlib
 import urllib
 import random
-import urlparse
+
+from django.utils.six.moves.urllib import parse as urlparse
 
 '''Simple signature scheme for query strings'''
 # from http://repos.entrouvert.org/portail-citoyen.git/tree/portail_citoyen/apps/data_source_plugin/signature.py

passerelle/contrib/grenoble_gru/models.py

@@ -15,7 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import json
-import urlparse
 
 from lxml import etree
 
@@ -24,6 +23,7 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.utils import dateparse
 from django.utils.http import urlencode
+from django.utils.six.moves.urllib import parse as urlparse
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/contrib/maarch/views.py

@@ -15,13 +15,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import json
-import urlparse
 import requests
 from datetime import datetime
 import logging
 
 from django.views.generic import DetailView as GenericDetailView
 from django.utils.decorators import method_decorator
+from django.utils.six.moves.urllib import parse as urlparse
 from django.views.decorators.csrf import csrf_exempt
 
 import passerelle.utils as utils

passerelle/contrib/mdph13/models.py

@@ -16,7 +16,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import base64
-import urlparse
 import datetime
 import re
 
@@ -24,6 +23,7 @@ import requests
 
 from django.db import models, transaction
 from django.utils import six, dateparse
+from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.translation import ugettext_lazy as _
 from django.utils.timezone import now
 

passerelle/contrib/planitech/models.py

@@ -19,13 +19,13 @@ from datetime import date, datetime, time, timedelta
 import hashlib
 import json
 import re
-import urlparse
 import uuid
 
 from django.core.cache import cache
 from django.db import models, transaction
 from django.utils import dateformat
 from django.utils import dateparse
+from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.translation import ugettext_lazy as _
 from jsonfield import JSONField
 from requests.exceptions import RequestException

passerelle/contrib/solis_apa/models.py

@@ -16,12 +16,12 @@
 
 import re
 import json
-import urlparse
 
 from django.db import models
 from django.core.cache import cache
 from django.core.urlresolvers import reverse
 from django.db import models
+from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.translation import ugettext_lazy as _
 from django.http import HttpResponse
 

passerelle/contrib/strasbourg_eu/models.py

@@ -16,10 +16,10 @@
 
 import datetime
 import json
-import urlparse
 
 from django.db import models
 from django.utils.encoding import force_text
+from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.translation import ugettext_lazy as _
 
 from passerelle.base.models import BaseResource

passerelle/soap.py

@@ -1,8 +1,8 @@
 import os.path
-import urlparse
 
 from django.utils.encoding import force_text
 from django.utils.six import StringIO
+from django.utils.six.moves.urllib import parse as urlparse
 import requests
 from suds.client import Client
 from suds.transport.http import HttpAuthenticated

passerelle/utils/http_authenticators.py

@@ -18,10 +18,10 @@ import base64
 import hashlib
 import hmac
 import time
-import urlparse
 
 from uuid import uuid4
 
+from django.utils.six.moves.urllib import parse as urlparse
 from requests.auth import AuthBase
 
 

tests/test_clicrdv.py

@@ -1,8 +1,8 @@
 import mock
 import pytest
-import urlparse
 
 from django.utils.six import StringIO
+from django.utils.six.moves.urllib import parse as urlparse
 
 from passerelle.base.models import ApiUser, AccessRight
 from passerelle.apps.clicrdv.models import ClicRdv

tests/test_tcl.py

@@ -1,7 +1,8 @@
 import copy
+
+from django.utils.six.moves.urllib import parse as urlparse
 import mock
 import pytest
-import urlparse
 
 from passerelle.contrib.tcl.models import Tcl, Line, Stop
 

tests/utils.py

@@ -1,11 +1,11 @@
 import json
-import urlparse
 
 import mock
 import httmock
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse
+from django.utils.six.moves.urllib import parse as urlparse
 
 from passerelle.base.models import ApiUser, AccessRight