Projet

Général

Profil

0001-django22-import-django.urls-49188.patch

Lauréline Guérin, 11 décembre 2020 11:52

Télécharger (18,1 ko)

Voir les différences: 

Subject: [PATCH 01/10] django22: import django.urls (#49188)


 passerelle/apps/api_entreprise/models.py | 2 +-
 passerelle/apps/arcgis/models.py         | 2 +-
 passerelle/apps/bdp/models.py            | 2 +-
 passerelle/apps/cartads_cs/models.py     | 2 +-
 passerelle/apps/clicrdv/models.py        | 2 +-
 passerelle/apps/mdel_ddpacs/abstract.py  | 2 +-
 passerelle/apps/opendatasoft/models.py   | 2 +-
 passerelle/apps/sp_fr/models.py          | 2 +-
 passerelle/base/models.py                | 2 +-
 passerelle/base/views.py                 | 2 +-
 passerelle/contrib/fake_family/models.py | 2 +-
 passerelle/contrib/solis_apa/models.py   | 2 +-
 passerelle/urls_utils.py                 | 2 +-
 passerelle/utils/api.py                  | 2 +-
 passerelle/views.py                      | 2 +-
 tests/test_api_access.py                 | 2 +-
 tests/test_api_particulier.py            | 2 +-
 tests/test_arcgis_nancy.py               | 2 +-
 tests/test_arpege_ecp.py                 | 2 +-
 tests/test_cmis.py                       | 2 +-
 tests/test_csv_datasource.py             | 2 +-
 tests/test_fake_family.py                | 2 +-
 tests/test_family.py                     | 2 +-
 tests/test_generic_endpoint.py           | 2 +-
 tests/test_greco.py                      | 2 +-
 tests/test_grenoble_gru.py               | 2 +-
 tests/test_import_export.py              | 2 +-
 tests/test_iparapheur.py                 | 2 +-
 tests/test_lille_kimoce.py               | 2 +-
 tests/test_misc.py                       | 2 +-
 tests/test_nancypoll.py                  | 2 +-
 tests/test_sms.py                        | 2 +-
 tests/test_solis_apa.py                  | 2 +-
 tests/utils.py                           | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)
passerelle/apps/api_entreprise/models.py
27 27 
from django.utils.timezone import datetime, make_aware, timedelta
28 28 
from django.http import HttpResponse, Http404
29 29 
from django.core import signing
30 
from django.core.urlresolvers import reverse
30 
from django.urls import reverse
31 31 

  		




  32
  32
  
    
from passerelle.base.models import BaseResource

  		




  33
  33
  
    
from passerelle.utils.api import endpoint

  		












  

    
      passerelle/apps/arcgis/models.py
    
  





  17
  17
  
    
import string

  		




  18
  18
  
    

  		




  19
  19
  
    
from django.core.exceptions import ValidationError

  		




  20
  
  
    
from django.core.urlresolvers import reverse

  		




  
  20
  
    
from django.urls import reverse

  		




  21
  21
  
    
from django.db import models

  		




  22
  22
  
    
from django.http import HttpResponse

  		




  23
  23
  
    
from django.shortcuts import get_object_or_404

  		












  

    
      passerelle/apps/bdp/models.py
    
  





  2
  2
  
    
import requests

  		




  3
  3
  
    
from requests.auth import HTTPBasicAuth

  		




  4
  4
  
    

  		




  5
  
  
    
from django.core.urlresolvers import reverse

  		




  
  5
  
    
from django.urls import reverse

  		




  6
  6
  
    
from django.db import models

  		




  7
  7
  
    
from django.utils.translation import ugettext_lazy as _

  		




  8
  8
  
    

  		












  

    
      passerelle/apps/cartads_cs/models.py
    
  





  34
  34
  
    
from django.contrib.postgres.fields import JSONField

  		




  35
  35
  
    
from django.core.files.storage import default_storage

  		




  36
  36
  
    
from django.core.signing import Signer

  		




  37
  
  
    
from django.core.urlresolvers import reverse

  		




  
  37
  
    
from django.urls import reverse

  		




  38
  38
  
    
from django.db import models

  		




  39
  39
  
    
from django.http import HttpResponse

  		




  40
  40
  
    
from django.utils.encoding import force_text

  		












  

    
      passerelle/apps/clicrdv/models.py
    
  





  10
  10
  
    
import requests

  		




  11
  11
  
    

  		




  12
  12
  
    
from django.conf import settings

  		




  13
  
  
    
from django.core.urlresolvers import reverse

  		




  
  13
  
    
from django.urls import reverse

  		




  14
  14
  
    
from django.db import models

  		




  15
  15
  
    
from django.utils.dateformat import format as date_format

  		




  16
  16
  
    
from django.utils.dateformat import time_format

  		












  

    
      passerelle/apps/mdel_ddpacs/abstract.py
    
  





  26
  26
  
    

  		




  27
  27
  
    
from django.contrib.postgres.fields import JSONField

  		




  28
  28
  
    
from django.db import models, IntegrityError, transaction

  		




  29
  
  
    
from django.core.urlresolvers import reverse

  		




  
  29
  
    
from django.urls import reverse

  		




  30
  30
  
    
from django.http import HttpResponse

  		




  31
  31
  
    
from django.utils.translation import ugettext_lazy as _

  		




  32
  32
  
    
from django.utils import six, functional

  		












  

    
      passerelle/apps/opendatasoft/models.py
    
  





  17
  17
  
    
from django.db import models

  		




  18
  18
  
    
from django.shortcuts import get_object_or_404

  		




  19
  19
  
    
from django.template import Context, Template

  		




  20
  
  
    
from django.core.urlresolvers import reverse

  		




  
  20
  
    
from django.urls import reverse

  		




  21
  21
  
    
from django.utils.encoding import force_text

  		




  22
  22
  
    
from django.utils.six.moves.urllib import parse as urlparse

  		




  23
  23
  
    
from django.utils.translation import ugettext_lazy as _

  		












  

    
      passerelle/apps/sp_fr/models.py
    
  





  26
  26
  
    
from lxml import etree as ET

  		




  27
  27
  
    

  		




  28
  28
  
    
from django.contrib.postgres.fields import JSONField

  		




  29
  
  
    
from django.core.urlresolvers import reverse

  		




  
  29
  
    
from django.urls import reverse

  		




  30
  30
  
    
from django.core.files import File

  		




  31
  31
  
    
from django.db import models, transaction

  		




  32
  32
  
    
from django.template import engines

  		












  

    
      passerelle/base/models.py
    
  





  15
  15
  
    
from django.conf import settings

  		




  16
  16
  
    
from django.contrib.postgres.fields import JSONField

  		




  17
  17
  
    
from django.core.exceptions import ValidationError, PermissionDenied

  		




  18
  
  
    
from django.core.urlresolvers import reverse

  		




  
  18
  
    
from django.urls import reverse

  		




  19
  19
  
    
from django.db import connection, models, transaction

  		




  20
  20
  
    
from django.db.models import Q

  		




  21
  21
  
    
from django.forms.models import modelform_factory

  		












  

    
      passerelle/base/views.py
    
  





  21
  21
  
    

  		




  22
  22
  
    
from django.conf import settings

  		




  23
  23
  
    
from django.contrib.contenttypes.models import ContentType

  		




  24
  
  
    
from django.core.urlresolvers import reverse

  		




  
  24
  
    
from django.urls import reverse

  		




  25
  25
  
    
from django.core.exceptions import ObjectDoesNotExist, PermissionDenied

  		




  26
  26
  
    
from django.db.models import Q

  		




  27
  27
  
    
from django.forms import models as model_forms

  		












  

    
      passerelle/contrib/fake_family/models.py
    
  





  15
  15
  
    
# along with this program.  If not, see <http://www.gnu.org/licenses/>.

  		




  16
  16
  
    

  		




  17
  17
  
    
from django.contrib.postgres.fields import JSONField

  		




  18
  
  
    
from django.core.urlresolvers import reverse

  		




  
  18
  
    
from django.urls import reverse

  		




  19
  19
  
    
from django.utils.translation import ugettext_lazy as _

  		




  20
  20
  
    
from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned

  		




  21
  21
  
    

  		












  

    
      passerelle/contrib/solis_apa/models.py
    
  





  19
  19
  
    

  		




  20
  20
  
    
from django.db import models

  		




  21
  21
  
    
from django.core.cache import cache

  		




  22
  
  
    
from django.core.urlresolvers import reverse

  		




  
  22
  
    
from django.urls import reverse

  		




  23
  23
  
    
from django.db import models

  		




  24
  24
  
    
from django.utils.six.moves.urllib import parse as urlparse

  		




  25
  25
  
    
from django.utils.translation import ugettext_lazy as _

  		












  

    
      passerelle/urls_utils.py
    
  





  5
  5
  
    
from django.conf import settings

  		




  6
  6
  
    
from django.contrib.auth.decorators import user_passes_test

  		




  7
  7
  
    
from django.core.exceptions import PermissionDenied

  		




  8
  
  
    
from django.core.urlresolvers import RegexURLPattern, RegexURLResolver

  		




  
  8
  
    
from django.urls import RegexURLPattern, RegexURLResolver

  		




  9
  9
  
    
from django.views.debug import technical_404_response

  		




  10
  10
  
    
from django.http import Http404

  		




  11
  11
  
    

  		












  

    
      passerelle/utils/api.py
    
  





  18
  18
  
    

  		




  19
  19
  
    
import inspect

  		




  20
  20
  
    

  		




  21
  
  
    
from django.core.urlresolvers import reverse

  		




  
  21
  
    
from django.urls import reverse

  		




  22
  22
  
    
from django.utils import six

  		




  23
  23
  
    
from django.utils.safestring import mark_safe

  		




  24
  24
  
    

  		












  

    
      passerelle/views.py
    
  





  37
  37
  
    
from django.views.generic.detail import SingleObjectMixin

  		




  38
  38
  
    
from django.conf import settings

  		




  39
  39
  
    
from django.shortcuts import resolve_url

  		




  40
  
  
    
from django.core.urlresolvers import reverse

  		




  
  40
  
    
from django.urls import reverse

  		




  41
  41
  
    
from django.utils.timezone import make_aware

  		




  42
  42
  
    
from django.utils.translation import ugettext_lazy as _

  		




  43
  43
  
    
from django.utils.encoding import force_bytes, force_text

  		












  

    
      tests/test_api_access.py
    
  





  3
  3
  
    

  		




  4
  4
  
    
from django.contrib.auth.models import User

  		




  5
  5
  
    
from django.contrib.contenttypes.models import ContentType

  		




  6
  
  
    
from django.core.urlresolvers import reverse

  		




  
  6
  
    
from django.urls import reverse

  		




  7
  7
  
    

  		




  8
  8
  
    
import pytest

  		




  9
  9
  
    
import utils

  		












  

    
      tests/test_api_particulier.py
    
  





  20
  20
  
    
import pytest

  		




  21
  21
  
    
from httmock import urlmatch, HTTMock, response

  		




  22
  22
  
    

  		




  23
  
  
    
from django.core.urlresolvers import reverse

  		




  
  23
  
    
from django.urls import reverse

  		




  24
  24
  
    

  		




  25
  25
  
    
import requests

  		




  26
  26
  
    

  		












  

    
      tests/test_arcgis_nancy.py
    
  





  4
  4
  
    
import mock

  		




  5
  5
  
    

  		




  6
  6
  
    

  		




  7
  
  
    
from django.core.urlresolvers import reverse

  		




  
  7
  
    
from django.urls import reverse

  		




  8
  8
  
    
from django.contrib.contenttypes.models import ContentType

  		




  9
  9
  
    

  		




  10
  10
  
    
from passerelle.apps.arcgis.models import ArcGIS

  		












  

    
      tests/test_arpege_ecp.py
    
  





  4
  4
  
    
import mock

  		




  5
  5
  
    
import pytest

  		




  6
  6
  
    

  		




  7
  
  
    
from django.core.urlresolvers import reverse

  		




  
  7
  
    
from django.urls import reverse

  		




  8
  8
  
    

  		




  9
  9
  
    
from passerelle.apps.arpege_ecp.models import ArpegeECP

  		




  10
  10
  
    
from passerelle.utils.jsonresponse import APIError

  		












  

    
      tests/test_cmis.py
    
  





  12
  12
  
    
from cmislib.exceptions import UpdateConflictException

  		




  13
  13
  
    
from cmislib.exceptions import InvalidArgumentException

  		




  14
  14
  
    
from django.contrib.contenttypes.models import ContentType

  		




  15
  
  
    
from django.core.urlresolvers import reverse

  		




  
  15
  
    
from django.urls import reverse

  		




  16
  16
  
    
from django.utils.encoding import force_bytes, force_text

  		




  17
  17
  
    
from django.utils.six.moves.urllib import error as urllib2

  		




  18
  18
  
    
from mock import call, Mock

  		












  

    
      tests/test_csv_datasource.py
    
  





  27
  27
  
    
from stat import ST_MTIME

  		




  28
  28
  
    

  		




  29
  29
  
    
from django.core.files import File

  		




  30
  
  
    
from django.core.urlresolvers import reverse

  		




  
  30
  
    
from django.urls import reverse

  		




  31
  31
  
    
from django.contrib.contenttypes.models import ContentType

  		




  32
  32
  
    
from django.test import Client, override_settings

  		




  33
  33
  
    
from django.core.management import call_command

  		












  

    
      tests/test_fake_family.py
    
  





  2
  2
  
    

  		




  3
  3
  
    
import json

  		




  4
  4
  
    

  		




  5
  
  
    
from django.core.urlresolvers import reverse

  		




  
  5
  
    
from django.urls import reverse

  		




  6
  6
  
    

  		




  7
  7
  
    
import pytest

  		




  8
  8
  
    
from passerelle.contrib.fake_family.models import FakeFamily

  		












  

    
      tests/test_family.py
    
  





  9
  9
  
    

  		




  10
  10
  
    
from django.core.exceptions import ValidationError

  		




  11
  11
  
    
from django.core.files import File

  		




  12
  
  
    
from django.core.urlresolvers import reverse

  		




  
  12
  
    
from django.urls import reverse

  		




  13
  13
  
    
from django.utils import timezone

  		




  14
  14
  
    
from django.utils.http import urlencode

  		




  15
  15
  
    
from django.core.files import File

  		












  

    
      tests/test_generic_endpoint.py
    
  





  29
  29
  
    
import utils

  		




  30
  30
  
    

  		




  31
  31
  
    
from django.contrib.contenttypes.models import ContentType

  		




  32
  
  
    
from django.core.urlresolvers import reverse

  		




  
  32
  
    
from django.urls import reverse

  		




  33
  33
  
    

  		




  34
  34
  
    
from passerelle.apps.arcgis.models import ArcGIS

  		




  35
  35
  
    
from passerelle.apps.api_particulier.models import APIParticulier

  		












  

    
      tests/test_greco.py
    
  





  4
  4
  
    
from requests import Response

  		




  5
  5
  
    
import utils

  		




  6
  6
  
    

  		




  7
  
  
    
from django.core.urlresolvers import reverse

  		




  
  7
  
    
from django.urls import reverse

  		




  8
  8
  
    
from django.contrib.contenttypes.models import ContentType

  		




  9
  9
  
    

  		




  10
  10
  
    
from passerelle.base.models import ApiUser, AccessRight

  		












  

    
      tests/test_grenoble_gru.py
    
  





  23
  23
  
    

  		




  24
  24
  
    
import utils

  		




  25
  25
  
    

  		




  26
  
  
    
from django.core.urlresolvers import reverse

  		




  
  26
  
    
from django.urls import reverse

  		




  27
  27
  
    

  		




  28
  28
  
    
from passerelle.contrib.grenoble_gru.models import GrenobleGRU

  		




  29
  29
  
    

  		












  

    
      tests/test_import_export.py
    
  





  6
  6
  
    
import tempfile

  		




  7
  7
  
    

  		




  8
  8
  
    
from django.core.files import File

  		




  9
  
  
    
from django.core.urlresolvers import reverse

  		




  
  9
  
    
from django.urls import reverse

  		




  10
  10
  
    
from django.core.management import call_command

  		




  11
  11
  
    
from django.contrib.contenttypes.models import ContentType

  		




  12
  12
  
    
from django.test import Client

  		












  

    
      tests/test_iparapheur.py
    
  





  10
  10
  
    
from requests import Response

  		




  11
  11
  
    

  		




  12
  12
  
    
from requests.exceptions import ConnectionError

  		




  13
  
  
    
from django.core.urlresolvers import reverse

  		




  
  13
  
    
from django.urls import reverse

  		




  14
  14
  
    
from django.contrib.contenttypes.models import ContentType

  		




  15
  15
  
    
from django.utils import timezone

  		




  16
  16
  
    
from django.utils.encoding import force_bytes

  		












  

    
      tests/test_lille_kimoce.py
    
  





  23
  23
  
    

  		




  24
  24
  
    
import utils

  		




  25
  25
  
    

  		




  26
  
  
    
from django.core.urlresolvers import reverse

  		




  
  26
  
    
from django.urls import reverse

  		




  27
  27
  
    

  		




  28
  28
  
    
from passerelle.contrib.lille_kimoce.models import Kimoce

  		




  29
  29
  
    
from passerelle.utils.jsonresponse import APIError

  		












  

    
      tests/test_misc.py
    
  





  6
  6
  
    
from django.core.files import File

  		




  7
  7
  
    
from django.db import connection

  		




  8
  8
  
    
from django.db.migrations.executor import MigrationExecutor

  		




  9
  
  
    
from django.core.urlresolvers import reverse

  		




  
  9
  
    
from django.urls import reverse

  		




  10
  10
  
    
from django.utils import timezone

  		




  11
  11
  
    
from django.utils.six import StringIO

  		




  12
  12
  
    

  		












  

    
      tests/test_nancypoll.py
    
  





  1
  1
  
    
import pytest

  		




  2
  2
  
    

  		




  3
  3
  
    
from django.core.files import File

  		




  4
  
  
    
from django.core.urlresolvers import reverse

  		




  
  4
  
    
from django.urls import reverse

  		




  5
  5
  
    
from django.contrib.contenttypes.models import ContentType

  		




  6
  6
  
    
from django.test import Client

  		




  7
  7
  
    
from django.utils.six import StringIO

  		












  

    
      tests/test_sms.py
    
  





  6
  6
  
    

  		




  7
  7
  
    
from django.conf import settings

  		




  8
  8
  
    
from django.contrib.contenttypes.models import ContentType

  		




  9
  
  
    
from django.core.urlresolvers import reverse

  		




  
  9
  
    
from django.urls import reverse

  		




  10
  10
  
    

  		




  11
  11
  
    
from passerelle.apps.ovh.models import OVHSMSGateway

  		




  12
  12
  
    
from passerelle.base.models import ApiUser, AccessRight, Job

  		












  

    
      tests/test_solis_apa.py
    
  





  6
  6
  
    
import mock

  		




  7
  7
  
    
import pytest

  		




  8
  8
  
    

  		




  9
  
  
    
from django.core.urlresolvers import reverse

  		




  
  9
  
    
from django.urls import reverse

  		




  10
  10
  
    
from django.contrib.contenttypes.models import ContentType

  		




  11
  11
  
    

  		




  12
  12
  
    
from passerelle.base.models import ApiUser, AccessRight

  		












  

    
      tests/utils.py
    
  





  4
  4
  
    
import httmock

  		




  5
  5
  
    

  		




  6
  6
  
    
from django.contrib.contenttypes.models import ContentType

  		




  7
  
  
    
from django.core.urlresolvers import reverse

  		




  
  7
  
    
from django.urls import reverse

  		




  8
  8
  
    
from django.utils.six.moves.urllib import parse as urlparse

  		




  9
  9
  
    

  		




  10
  10
  
    
from passerelle.base.models import ApiUser, AccessRight

  		




  11
  
  
    
-