django22: import django.urls (#49188)

passerelle/apps/api_entreprise/models.py

@@ -27,7 +27,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.timezone import datetime, make_aware, timedelta
 from django.http import HttpResponse, Http404
 from django.core import signing
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/arcgis/models.py

@@ -17,7 +17,7 @@
 import string
 
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404

passerelle/apps/bdp/models.py

@@ -2,7 +2,7 @@ import json
 import requests
 from requests.auth import HTTPBasicAuth
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 

passerelle/apps/cartads_cs/models.py

@@ -34,7 +34,7 @@ from django.conf import settings
 from django.contrib.postgres.fields import JSONField
 from django.core.files.storage import default_storage
 from django.core.signing import Signer
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.http import HttpResponse
 from django.utils.encoding import force_text

passerelle/apps/clicrdv/models.py

@@ -10,7 +10,7 @@ import json
 import requests
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.utils.dateformat import format as date_format
 from django.utils.dateformat import time_format

passerelle/apps/mdel_ddpacs/abstract.py

@@ -26,7 +26,7 @@ import zipfile
 
 from django.contrib.postgres.fields import JSONField
 from django.db import models, IntegrityError, transaction
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponse
 from django.utils.translation import ugettext_lazy as _
 from django.utils import six, functional

passerelle/apps/opendatasoft/models.py

@@ -17,7 +17,7 @@
 from django.db import models
 from django.shortcuts import get_object_or_404
 from django.template import Context, Template
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 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 _

passerelle/apps/sp_fr/models.py

@@ -26,7 +26,7 @@ import datetime
 from lxml import etree as ET
 
 from django.contrib.postgres.fields import JSONField
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.files import File
 from django.db import models, transaction
 from django.template import engines

passerelle/base/models.py

@@ -15,7 +15,7 @@ from django.apps import apps
 from django.conf import settings
 from django.contrib.postgres.fields import JSONField
 from django.core.exceptions import ValidationError, PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import connection, models, transaction
 from django.db.models import Q
 from django.forms.models import modelform_factory

passerelle/base/views.py

@@ -21,7 +21,7 @@ from dateutil import parser as date_parser
 
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.db.models import Q
 from django.forms import models as model_forms

passerelle/contrib/fake_family/models.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.contrib.postgres.fields import JSONField
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
 

passerelle/contrib/solis_apa/models.py

@@ -19,7 +19,7 @@ import json
 
 from django.db import models
 from django.core.cache import cache
-from django.core.urlresolvers import reverse
+from django.urls 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 _

passerelle/urls_utils.py

@@ -5,7 +5,7 @@ from functools import wraps
 from django.conf import settings
 from django.contrib.auth.decorators import user_passes_test
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import RegexURLPattern, RegexURLResolver
+from django.urls import RegexURLPattern, RegexURLResolver
 from django.views.debug import technical_404_response
 from django.http import Http404
 

passerelle/utils/api.py

@@ -18,7 +18,7 @@ from __future__ import absolute_import
 
 import inspect
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils import six
 from django.utils.safestring import mark_safe
 

passerelle/views.py

@@ -37,7 +37,7 @@ from django.views.generic import (
 from django.views.generic.detail import SingleObjectMixin
 from django.conf import settings
 from django.shortcuts import resolve_url
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.timezone import make_aware
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import force_bytes, force_text

tests/test_api.py

@@ -17,7 +17,7 @@
 import mock
 import pytest
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.contenttypes.models import ContentType
 from django.test import override_settings
 

tests/test_api_access.py

@@ -3,7 +3,7 @@ import sys
 
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 import pytest
 import utils

tests/test_api_particulier.py

@@ -20,7 +20,7 @@ import logging
 import pytest
 from httmock import urlmatch, HTTMock, response
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 import requests
 

tests/test_arcgis_nancy.py

@@ -4,7 +4,7 @@ import pytest
 import mock
 
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.contenttypes.models import ContentType
 
 from passerelle.apps.arcgis.models import ArcGIS

tests/test_arpege_ecp.py

@@ -4,7 +4,7 @@ import json
 import mock
 import pytest
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from passerelle.apps.arpege_ecp.models import ArpegeECP
 from passerelle.utils.jsonresponse import APIError

tests/test_cmis.py

@@ -12,7 +12,7 @@ from cmislib.exceptions import PermissionDeniedException
 from cmislib.exceptions import UpdateConflictException
 from cmislib.exceptions import InvalidArgumentException
 from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.encoding import force_bytes, force_text
 from django.utils.six.moves.urllib import error as urllib2
 from mock import call, Mock

tests/test_csv_datasource.py

@@ -27,7 +27,7 @@ from posix import stat_result
 from stat import ST_MTIME
 
 from django.core.files import File
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.contenttypes.models import ContentType
 from django.test import Client, override_settings
 from django.core.management import call_command

tests/test_fake_family.py

@@ -2,7 +2,7 @@
 
 import json
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 import pytest
 from passerelle.contrib.fake_family.models import FakeFamily

tests/test_family.py

@@ -9,7 +9,7 @@ import shutil
 
 from django.core.exceptions import ValidationError
 from django.core.files import File
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.http import urlencode
 from django.core.files import File

tests/test_generic_endpoint.py

@@ -29,7 +29,7 @@ import pytest
 import utils
 
 from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from passerelle.apps.arcgis.models import ArcGIS
 from passerelle.apps.api_particulier.models import APIParticulier

tests/test_greco.py

@@ -4,7 +4,7 @@ import mock
 from requests import Response
 import utils
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.contenttypes.models import ContentType
 
 from passerelle.base.models import ApiUser, AccessRight

tests/test_grenoble_gru.py

@@ -23,7 +23,7 @@ import six
 
 import utils
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from passerelle.contrib.grenoble_gru.models import GrenobleGRU
 

tests/test_import_export.py

@@ -6,7 +6,7 @@ import pytest
 import tempfile
 
 from django.core.files import File
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.management import call_command
 from django.contrib.contenttypes.models import ContentType
 from django.test import Client

tests/test_iparapheur.py

@@ -10,7 +10,7 @@ from dateutil import parser
 from requests import Response
 
 from requests.exceptions import ConnectionError
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.contenttypes.models import ContentType
 from django.utils import timezone
 from django.utils.encoding import force_bytes

tests/test_lille_kimoce.py

@@ -23,7 +23,7 @@ import pytest
 
 import utils
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from passerelle.contrib.lille_kimoce.models import Kimoce
 from passerelle.utils.jsonresponse import APIError

tests/test_misc.py

@@ -6,7 +6,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.files import File
 from django.db import connection
 from django.db.migrations.executor import MigrationExecutor
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.six import StringIO
 

tests/test_nancypoll.py

@@ -1,7 +1,7 @@
 import pytest
 
 from django.core.files import File
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.contenttypes.models import ContentType
 from django.test import Client
 from django.utils.six import StringIO

tests/test_sms.py

@@ -6,7 +6,7 @@ from requests import RequestException
 
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from passerelle.apps.ovh.models import OVHSMSGateway
 from passerelle.base.models import ApiUser, AccessRight, Job

tests/test_solis_apa.py

@@ -6,7 +6,7 @@ from decimal import Decimal
 import mock
 import pytest
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.contenttypes.models import ContentType
 
 from passerelle.base.models import ApiUser, AccessRight

tests/utils.py

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