misc: apply isort (#52937)

functests/cmis/conftest.py

@@ -1,7 +1,7 @@
 import random
 
-import pytest
 import cmislib
+import pytest
 
 
 def pytest_addoption(parser):

functests/cmis/tests_cmis.py

@@ -2,10 +2,9 @@ import base64
 import hashlib
 import os
 
-from django.utils.six.moves.urllib import parse as urlparse
 import pytest
 import requests
-
+from django.utils.six.moves.urllib import parse as urlparse
 
 SPECIAL_CHARS = '!#$%&+-^_`;[]{}+='
 

functests/planitech/test_planitech.py

@@ -1,8 +1,8 @@
 import pprint
 import random
 
-from django.utils.six.moves.urllib import parse
 import requests
+from django.utils.six.moves.urllib import parse
 
 
 def test_main(conn):

functests/toulouse_axel/test_toulouse_axel.py

@@ -1,4 +1,5 @@
 import pprint
+
 import requests
 
 

functests/vivaticket/test_vivaticket.py

@@ -1,9 +1,11 @@
 from __future__ import print_function
-import pprint
+
 import datetime
-import requests
+import pprint
 import random
 
+import requests
+
 
 def call_generic(conn, endpoint):
     print("%s \n" % endpoint)

passerelle/api/views.py

@@ -15,8 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.core.exceptions import PermissionDenied
-from django.http import Http404
+from django.http import Http404, JsonResponse
-from django.http import JsonResponse
 from django.views.generic import DetailView
 
 from passerelle.base.models import Job

passerelle/apps/actesweb/models.py

@@ -15,10 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from __future__ import unicode_literals
 
+import contextlib
 import os
 import stat
 import tempfile
-import contextlib
 
 from django.core.files.storage import default_storage
 from django.template.loader import get_template
@@ -30,8 +30,8 @@ from django.utils.translation import ugettext_lazy as _
 from passerelle.base.models import BaseResource
 from passerelle.compat import json_loads
 from passerelle.utils.api import endpoint
-from passerelle.utils.jsonresponse import APIError
 from passerelle.utils.conversion import ensure_encoding
+from passerelle.utils.jsonresponse import APIError
 
 
 @contextlib.contextmanager

passerelle/apps/api_entreprise/models.py

@@ -18,16 +18,14 @@
    https://entreprise.api.gouv.fr
 '''
 
-from six.moves.urllib_parse import urljoin
 import requests
-
-
-from django.db import models
-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.db import models
+from django.http import Http404, HttpResponse
 from django.urls import reverse
+from django.utils.timezone import datetime, make_aware, timedelta
+from django.utils.translation import ugettext_lazy as _
+from six.moves.urllib_parse import urljoin
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/api_particulier/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/api_particulier/models.py

@@ -19,6 +19,7 @@
 '''
 
 from collections import OrderedDict
+
 import requests
 
 try:

passerelle/apps/arcgis/forms.py

@@ -17,6 +17,7 @@
 from django import forms
 
 from passerelle.base.forms import BaseQueryFormMixin
+
 from . import models
 
 

passerelle/apps/arcgis/migrations/0005_auto_20200310_1517.py

@@ -2,8 +2,9 @@
 # Generated by Django 1.11.20 on 2020-03-10 20:17
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
+
 import passerelle.apps.arcgis.models
 import passerelle.utils.templates
 

passerelle/apps/arcgis/migrations/0006_auto_20200401_1025.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.11.18 on 2020-04-01 08:25
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/arcgis/models.py

@@ -17,21 +17,21 @@
 import string
 
 from django.core.exceptions import ValidationError
-from django.urls import reverse
 from django.db import models
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
-from django.utils.six.moves.urllib import parse as urlparse
+from django.urls import reverse
 from django.utils import six
+from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.text import slugify
 from django.utils.translation import ugettext_lazy as _
 
+from passerelle.base.models import BaseQuery, BaseResource, HTTPResource
 from passerelle.utils import mark_safe_lazy
-from passerelle.utils.jsonresponse import APIError
 from passerelle.utils.api import endpoint
 from passerelle.utils.conversion import num2deg
+from passerelle.utils.jsonresponse import APIError
 from passerelle.utils.templates import render_to_string, validate_template
-from passerelle.base.models import BaseResource, HTTPResource, BaseQuery
 
 
 class ArcGISError(APIError):

passerelle/apps/arcgis/views.py

@@ -14,7 +14,7 @@
 # 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/>.
 
-from django.views.generic import UpdateView, CreateView, DeleteView
+from django.views.generic import CreateView, DeleteView, UpdateView
 
 from passerelle.base.mixins import ResourceChildViewMixin
 

passerelle/apps/arpege_ecp/models.py

@@ -16,14 +16,12 @@
 
 import json
 
-from requests import RequestException
-
 from django.db import models
-from django.utils import six
+from django.utils import six, timezone
+from django.utils.dateparse import parse_date, parse_time
 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 requests import RequestException
-from django.utils import timezone
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/astech/models.py

@@ -16,17 +16,16 @@
 
 import base64
 from collections import OrderedDict
-from requests.exceptions import ConnectionError
 
 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 requests.exceptions import ConnectionError
 
-from passerelle.utils.jsonresponse import APIError
-from passerelle.utils.api import endpoint
 from passerelle.base.models import BaseResource, HTTPResource
-
+from passerelle.utils.api import endpoint
+from passerelle.utils.jsonresponse import APIError
 
 DEMAND_SCHEMA = {
     '$schema': 'http://json-schema.org/draft-04/schema#',

passerelle/apps/astregs/migrations/0001_initial.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.11.20 on 2019-06-19 10:24
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/astregs/models.py

@@ -15,13 +15,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import base64
-import zeep
-from zeep.helpers import serialize_object
 
+import zeep
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
-from django.utils.six.moves.urllib import parse as urlparse
 from django.http import Http404
+from django.utils.six.moves.urllib import parse as urlparse
+from django.utils.translation import ugettext_lazy as _
+from zeep.helpers import serialize_object
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/atal/models.py

@@ -17,20 +17,20 @@
 import base64
 import binascii
 
+import lxml.etree
 from django.db import models
 from django.utils import dateformat, dateparse
 from django.utils.encoding import force_text
 from django.utils.six.moves import urllib
 from django.utils.translation import ugettext_lazy as _
-import lxml.etree
 from zeep import helpers
 from zeep.exceptions import Fault
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint
 from passerelle.utils.jsonresponse import APIError
-from . import schemas
 
+from . import schemas
 
 DATE_FORMAT = 'l d F Y, G:i'
 

passerelle/apps/atos_genesys/migrations/0001_initial.py

@@ -2,9 +2,9 @@
 # Generated by Django 1.11.10 on 2018-09-18 09:42
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-import django.db.models.deletion
 import django.contrib.postgres.fields.jsonb
+import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/atos_genesys/models.py

@@ -15,21 +15,21 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import datetime
-import requests
 import xml.etree.ElementTree as ET
 
+import requests
 from django.contrib.postgres.fields 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.base.models import BaseResource, HTTPResource
 from passerelle.utils import xml as xmlutils
 from passerelle.utils.api import endpoint
 from passerelle.utils.conversion import to_ascii
 from passerelle.utils.jsonresponse import APIError
 from passerelle.utils.validation import is_number
-from passerelle.base.models import BaseResource, HTTPResource
 
 from . import utils
 

passerelle/apps/atos_genesys/utils.py

@@ -1,8 +1,8 @@
 import time
 from contextlib import contextmanager
 
-from django.db import transaction
 from django.core.cache import cache
+from django.db import transaction
 from django.utils import six
 
 from passerelle.utils.jsonresponse import APIError

passerelle/apps/base_adresse/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/base_adresse/migrations/0002_auto_20150705_0330.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/base_adresse/migrations/0003_baseaddresse_log_level.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/base_adresse/migrations/0004_auto_20160316_0910.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/base_adresse/migrations/0005_auto_20160407_0456.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/base_adresse/migrations/0008_delete_updatestreetmodel.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/base_adresse/migrations/0009_streetmodel_simple_name.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/base_adresse/migrations/0010_auto_20160914_0826.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/base_adresse/migrations/0011_auto_20160919_0949.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/base_adresse/migrations/0015_auto_20191206_1244.py

@@ -2,8 +2,9 @@
 # Generated by Django 1.11.18 on 2019-12-06 11:44
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
+
 import passerelle.apps.base_adresse.models
 
 

passerelle/apps/base_adresse/migrations/0016_auto_20200130_1604.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.11.18 on 2020-01-30 15:04
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/base_adresse/models.py

@@ -1,18 +1,16 @@
 import datetime
 import gzip
 
-from requests import RequestException
-from requests.exceptions import ConnectionError
-
 from django.contrib.postgres.fields import JSONField
 from django.db import connection, models
 from django.db.models import Q
+from django.utils import six, timezone
 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 import StringIO
 from django.utils.six.moves.urllib import parse as urlparse
+from django.utils.translation import ugettext_lazy as _
+from requests import RequestException
+from requests.exceptions import ConnectionError
 
 from passerelle.base.models import BaseResource
 from passerelle.compat import json_loads

passerelle/apps/bdp/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/bdp/migrations/0002_bdp_log_level.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/bdp/migrations/0003_auto_20160316_0910.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/bdp/migrations/0004_auto_20160407_0456.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/bdp/models.py

@@ -1,10 +1,10 @@
 import json
-import requests
-from requests.auth import HTTPBasicAuth
 
-from django.urls import reverse
+import requests
 from django.db import models
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
+from requests.auth import HTTPBasicAuth
 
 from passerelle.base.models import BaseResource
 

passerelle/apps/bdp/urls.py

@@ -1,6 +1,7 @@
-from django.views.decorators.csrf import csrf_exempt
 from django.conf.urls import url
-from .views import BdpDetailView, ResourcesView, PostAdherentView
+from django.views.decorators.csrf import csrf_exempt
+
+from .views import BdpDetailView, PostAdherentView, ResourcesView
 
 urlpatterns = [
     url(r'^(?P<slug>[\w,-]+)/$', BdpDetailView.as_view(), name='bdp-view'),

passerelle/apps/bdp/views.py

@@ -1,9 +1,9 @@
 from django.http import Http404
 from django.views.generic.base import View
-from django.views.generic.detail import SingleObjectMixin, DetailView
+from django.views.generic.detail import DetailView, SingleObjectMixin
 
-from passerelle.compat import json_loads
 import passerelle.utils as utils
+from passerelle.compat import json_loads
 
 from .models import Bdp
 

passerelle/apps/cartads_cs/migrations/0001_initial.py

@@ -3,6 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
+
 import passerelle.apps.cartads_cs.models
 
 

passerelle/apps/cartads_cs/migrations/0002_cartadsdatacache.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.11.12 on 2019-08-31 09:48
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/cartads_cs/migrations/0004_cartadsdossier_cartads_steps_cache.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.11.12 on 2019-09-03 07:19
 from __future__ import unicode_literals
 
-from django.db import migrations
 import django.contrib.postgres.fields.jsonb
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

passerelle/apps/cartads_cs/migrations/0011_cartadsdossier_cartads_cache_infos.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.11.12 on 2019-09-30 15:42
 from __future__ import unicode_literals
 
-from django.db import migrations
 import django.contrib.postgres.fields.jsonb
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

passerelle/apps/cartads_cs/models.py

@@ -17,34 +17,31 @@
 
 import base64
 import datetime
-from ftplib import FTP
 import json
 import os
 import random
 import re
-from xml.etree import ElementTree as etree
 import zipfile
+from ftplib import FTP
+from xml.etree import ElementTree as etree
 
 import pdfrw
 import pdfrw.findobjs
-
+import zeep.exceptions
+import zeep.helpers as zeep_helpers
 from Crypto.Cipher import AES
-
 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.urls import reverse
 from django.db import models
 from django.http import HttpResponse
+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.text import slugify
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
-from django.utils.six.moves.urllib import parse as urlparse
-
-import zeep.exceptions
-import zeep.helpers as zeep_helpers
 
 from passerelle.base.models import BaseResource
 from passerelle.base.signature import sign_url

passerelle/apps/choosit/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/choosit/migrations/0002_auto_20160316_0528.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/choosit/migrations/0003_auto_20160316_0910.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/choosit/migrations/0004_auto_20160407_0456.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/choosit/migrations/0005_choositsmsgateway_default_trunk_prefix.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/choosit/migrations/0010_auto_20210202_1304.py

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 
 import django.contrib.postgres.fields
 from django.db import migrations, models
+
 import passerelle.sms.models
 
 

passerelle/apps/choosit/models.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import json
-import requests
 
+import requests
 from django.db import models
 from django.utils.six import string_types
 from django.utils.translation import ugettext_lazy as _

passerelle/apps/cityweb/cityweb.py

@@ -16,17 +16,17 @@
 
 import os
 import stat
-from lxml import etree, objectify as xobject
 
-from django.core.files.storage import default_storage
 from django.core.files.base import ContentFile
+from django.core.files.storage import default_storage
 from django.utils import six
 from django.utils.dateparse import parse_date
 from django.utils.encoding import force_bytes
+from lxml import etree
+from lxml import objectify as xobject
 
-from passerelle.utils.jsonresponse import APIError
 from passerelle.utils.files import atomic_write
-
+from passerelle.utils.jsonresponse import APIError
 
 CERTIFICATE_TYPES = [
     {"id": "NAI", "text": "Naissance"},

passerelle/apps/cityweb/models.py

@@ -16,8 +16,8 @@
 
 import os
 
-from django.utils.translation import ugettext_lazy as _
 from django.core.files.storage import default_storage
+from django.utils.translation import ugettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.compat import json_loads
@@ -25,13 +25,13 @@ from passerelle.utils.api import endpoint
 from passerelle.utils.jsonresponse import APIError
 
 from .cityweb import (
-    CivilStatusApplication,
-    TITLES,
-    SEXES,
-    DOCUMENT_TYPES,
     CERTIFICATE_TYPES,
     CONCERNED,
+    DOCUMENT_TYPES,
     ORIGINS,
+    SEXES,
+    TITLES,
+    CivilStatusApplication,
 )
 
 

passerelle/apps/clicrdv/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/clicrdv/models.py

@@ -7,15 +7,15 @@ It is a gateway to http://developers.clicrdv.com/fr/rest-api.html
 import base64
 import datetime
 import json
-import requests
 
+import requests
 from django.conf import settings
-from django.urls import reverse
 from django.db import models
+from django.urls import reverse
 from django.utils.dateformat import format as date_format
 from django.utils.dateformat import time_format
-from django.utils.translation import ugettext_lazy as _
 from django.utils.http import urlquote
+from django.utils.translation import ugettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/clicrdv/urls.py

@@ -1,9 +1,8 @@
-from django.views.decorators.csrf import csrf_exempt
 from django.conf.urls import include, url
-
+from django.views.decorators.csrf import csrf_exempt
-from passerelle.urls_utils import decorated_includes, required, app_enabled
 
 from passerelle.apps.clicrdv.views import *
+from passerelle.urls_utils import app_enabled, decorated_includes, required
 
 urlpatterns = [
     url(r'^(?P<slug>[\w,-]+)/$', ClicRdvDetailView.as_view(), name='clicrdv-view'),

passerelle/apps/clicrdv/views.py

@@ -1,10 +1,9 @@
 from django.views.generic.base import View
-from django.views.generic.detail import SingleObjectMixin, DetailView
+from django.views.generic.detail import DetailView, SingleObjectMixin
 
-from passerelle.compat import json_loads
 import passerelle.utils as utils
-
 from passerelle.apps.clicrdv.models import ClicRdv
+from passerelle.compat import json_loads
 
 
 class ClicRdvDetailView(DetailView):

passerelle/apps/cmis/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/cmis/models.py

@@ -17,25 +17,26 @@
 import base64
 import binascii
 import functools
-import httplib2
 import re
 
+import httplib2
 from cmislib import CmisClient
-from cmislib.exceptions import CmisException
+from cmislib.exceptions import (
-from cmislib.exceptions import ObjectNotFoundException
+    CmisException,
-from cmislib.exceptions import PermissionDeniedException
+    InvalidArgumentException,
-from cmislib.exceptions import UpdateConflictException
+    ObjectNotFoundException,
-from cmislib.exceptions import InvalidArgumentException
+    PermissionDeniedException,
+    UpdateConflictException,
+)
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
 from django.utils.six import BytesIO
 from django.utils.six.moves.urllib import error as urllib2
+from django.utils.translation import ugettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint
 from passerelle.utils.jsonresponse import APIError
 
-
 SPECIAL_CHARS = '!#$%&+-^_`~;[]{}+=~'
 FILE_PATH_PATTERN = r'^(/|(/[\w%s]+)+)$' % re.escape(SPECIAL_CHARS)
 FILE_NAME_PATTERN = r'[\w%s\.]+$' % re.escape(SPECIAL_CHARS)

passerelle/apps/cmis/views.py

@@ -16,7 +16,6 @@
 
 from cmislib import CmisClient
 from cmislib.exceptions import ObjectNotFoundException
-
 from django.http import Http404
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import TemplateView

passerelle/apps/cryptor/migrations/0001_initial.py

@@ -2,11 +2,13 @@
 # Generated by Django 1.11.18 on 2020-03-04 10:25
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-import django.db.models.deletion
-import passerelle.apps.cryptor.models
 import uuid
 
+import django.db.models.deletion
+from django.db import migrations, models
+
+import passerelle.apps.cryptor.models
+
 
 class Migration(migrations.Migration):
 

passerelle/apps/cryptor/models.py

@@ -20,11 +20,10 @@ import json
 import os
 from uuid import uuid4
 
-from Cryptodome.PublicKey import RSA
-from Cryptodome.Random import get_random_bytes
 from Cryptodome.Cipher import AES, PKCS1_OAEP
 from Cryptodome.Hash import SHA512
-
+from Cryptodome.PublicKey import RSA
+from Cryptodome.Random import get_random_bytes
 from django.core.exceptions import ValidationError
 from django.core.files.storage import default_storage
 from django.db import models
@@ -37,7 +36,6 @@ from passerelle.utils.api import endpoint
 from passerelle.utils.files import atomic_write
 from passerelle.utils.jsonresponse import APIError
 
-
 FILE_SCHEMA = {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "title": "File to encrypt",

passerelle/apps/csvdatasource/management/commands/change-csv.py

@@ -14,8 +14,8 @@
 # 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 os
 import argparse
+import os
 
 from django.core.files import File
 from django.core.management.base import BaseCommand, CommandError

passerelle/apps/csvdatasource/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/csvdatasource/migrations/0002_csvdatasource_log_level.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/csvdatasource/migrations/0003_auto_20160316_0910.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/csvdatasource/migrations/0004_auto_20160407_0456.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/csvdatasource/migrations/0005_csvdatasource__dialect_options.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
 import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/csvdatasource/migrations/0006_auto_20160905_1031.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/csvdatasource/migrations/0009_auto_20161109_0353.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/csvdatasource/migrations/0011_auto_20180905_0936.py

@@ -2,9 +2,9 @@
 # Generated by Django 1.11.12 on 2018-09-05 14:36
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-import django.db.models.deletion
 import django.contrib.postgres.fields.jsonb
+import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/csvdatasource/migrations/0016_auto_20200406_1702.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.11.18 on 2020-04-06 15:02
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/csvdatasource/migrations/0019_csv_upload_to.py

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
+
 import passerelle.apps.csvdatasource.models
 
 

passerelle/apps/csvdatasource/migrations/0020_csv_upload_to.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import os
 
 from django.db import migrations

passerelle/apps/csvdatasource/models.py

@@ -14,34 +14,31 @@
 # 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 csv
 import datetime
 import os
 import re
-import csv
-from collections import OrderedDict
 import tempfile
+from collections import OrderedDict
 
-import six
 import pytz
-
+import six
+from django.conf import settings
+from django.contrib.postgres.fields import JSONField
+from django.core.exceptions import ValidationError
+from django.db import models, transaction
+from django.urls import reverse
+from django.utils.encoding import force_str, force_text, smart_text
+from django.utils.timezone import make_aware, now
+from django.utils.translation import ugettext_lazy as _
 from pyexcel_ods import get_data as get_data_ods
 from pyexcel_xls import get_data as get_data_xls
 
-from django.contrib.postgres.fields import JSONField
-from django.utils.encoding import force_str, smart_text, force_text
-from django.utils.timezone import make_aware
-from django.conf import settings
-from django.db import models, transaction
-from django.core.exceptions import ValidationError
-from django.urls import reverse
-from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
-
 from passerelle.base.models import BaseResource
 from passerelle.utils import batch
-from passerelle.utils.jsonresponse import APIError
 from passerelle.utils.api import endpoint
 from passerelle.utils.conversion import normalize
+from passerelle.utils.jsonresponse import APIError
 
 identifier_re = re.compile(r"^[^\d\W]\w*\Z", re.UNICODE)
 

passerelle/apps/csvdatasource/views.py

@@ -18,7 +18,7 @@ import os
 
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
-from django.views.generic import View, UpdateView, CreateView, DeleteView
+from django.views.generic import CreateView, DeleteView, UpdateView, View
 
 from .forms import QueryForm
 from .models import CsvDataSource, Query

passerelle/apps/esirius/migrations/0001_initial.py

@@ -3,6 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
+
 import passerelle.apps.esirius.models
 
 

passerelle/apps/esirius/models.py

@@ -22,9 +22,8 @@ from urllib.parse import urljoin
 
 from Cryptodome.Cipher import DES
 from Cryptodome.Util.Padding import pad
-
-from django.db import models
 from django.core.exceptions import ValidationError
+from django.db import models
 from django.utils.encoding import force_bytes
 from django.utils.translation import ugettext_lazy as _
 
@@ -32,7 +31,6 @@ from passerelle.base.models import BaseResource, HTTPResource
 from passerelle.utils.api import endpoint
 from passerelle.utils.jsonresponse import APIError
 
-
 CREATE_APPOINTMENT_SCHEMA = {
     '$schema': 'http://json-schema.org/draft-04/schema#',
     "type": "object",

passerelle/apps/family/loaders/concerto_fondettes.py

@@ -16,15 +16,15 @@
 
 import csv
 import datetime
-from decimal import Decimal
 import json
 import os
 import sys
 import zipfile
+from decimal import Decimal
 
 from django.core.exceptions import ValidationError
-from django.utils.encoding import force_text
 from django.utils import six
+from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
 from ..models import Invoice

passerelle/apps/family/loaders/concerto_orleans.py

@@ -14,19 +14,18 @@
 # 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 os
 import csv
+import os
 from decimal import Decimal
 
-from django.utils.timezone import make_aware, datetime
+from django.core.exceptions import ValidationError
+from django.core.files.storage import DefaultStorage
 from django.utils import six, timezone
 from django.utils.encoding import force_text
-from django.core.exceptions import ValidationError
+from django.utils.timezone import datetime, make_aware
 from django.utils.translation import ugettext_lazy as _
-from django.core.files.storage import DefaultStorage
 
-from ..models import Family, Adult, Child, Invoice
+from ..models import Adult, Child, Family, Invoice, dict_cherry_pick, get_date, get_datetime
-from ..models import dict_cherry_pick, get_datetime, get_date
 
 
 def normalize_adult(adult):

passerelle/apps/family/loaders/opus_fondettes.py

@@ -16,15 +16,15 @@
 
 import csv
 import datetime
-from decimal import Decimal
 import json
 import os
 import sys
 import zipfile
+from decimal import Decimal
 
 from django.core.exceptions import ValidationError
-from django.utils.encoding import force_text
 from django.utils import six
+from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
 from ..models import Invoice

passerelle/apps/family/management/commands/import_orleans_data.py

@@ -14,15 +14,15 @@
 # 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 fcntl
 import os
 import sys
-import zipfile
 import tempfile
-import fcntl
+import zipfile
 
 from django.core.files.base import File
-from django.core.management.base import BaseCommand, CommandError
 from django.core.files.storage import DefaultStorage
+from django.core.management.base import BaseCommand, CommandError
 
 from passerelle.apps.family.models import GenericFamily, Invoice
 

passerelle/apps/family/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/family/migrations/0007_auto_20161122_1816.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
 import datetime
+
+from django.db import migrations, models
 from django.utils.timezone import utc
 
 

passerelle/apps/family/models.py

@@ -16,22 +16,20 @@
 # 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/>.
 
-from datetime import date
 import os
 import sys
 import zipfile
+from collections import defaultdict
+from datetime import date
 
 import pytz
-
-from collections import defaultdict
-
 from django.core.exceptions import ValidationError
 from django.core.files.storage import default_storage
-from django.utils import six
-from django.utils.translation import ugettext_lazy as _
-from django.http import Http404, HttpResponse
 from django.db import models, transaction
-from django.utils.timezone import make_aware, datetime, now, is_naive
+from django.http import Http404, HttpResponse
+from django.utils import six
+from django.utils.timezone import datetime, is_naive, make_aware, now
+from django.utils.translation import ugettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.compat import json_loads

passerelle/apps/feeds/models.py

@@ -15,7 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import feedparser
-
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 

passerelle/apps/gdc/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/gdc/migrations/0002_gdc_log_level.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/gdc/migrations/0003_auto_20160316_0910.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/gdc/migrations/0004_auto_20160407_0456.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

passerelle/apps/gdc/urls.py

@@ -14,9 +14,10 @@
 # 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/>.
 
-from django.views.decorators.csrf import csrf_exempt
 from django.conf.urls import url
-from .views import GdcDetailView, VoiesView, PostDemandeView, StatusView
+from django.views.decorators.csrf import csrf_exempt
+
+from .views import GdcDetailView, PostDemandeView, StatusView, VoiesView
 
 urlpatterns = [
     url(r'^(?P<slug>[\w,-]+)/$', GdcDetailView.as_view(), name='gdc-view'),

passerelle/apps/gdc/views.py

@@ -17,10 +17,10 @@
 
 from django.utils.encoding import force_text
 from django.views.generic.base import View
-from django.views.generic.detail import SingleObjectMixin, DetailView
+from django.views.generic.detail import DetailView, SingleObjectMixin
 
-from passerelle.compat import json_loads
 import passerelle.utils as utils
+from passerelle.compat import json_loads
 from passerelle.utils.conversion import normalize
 
 from .models import Gdc, phpserialize, phpserialize_loads

passerelle/apps/gesbac/migrations/0001_initial.py

@@ -2,9 +2,10 @@
 # Generated by Django 1.11.20 on 2019-09-19 15:23
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-import django.db.models.deletion
 import django.contrib.postgres.fields.jsonb
+import django.db.models.deletion
+from django.db import migrations, models
+
 import passerelle.utils.sftp
 
 

passerelle/apps/gesbac/models.py

@@ -16,20 +16,18 @@
 
 import csv
 import io
-
 from collections import OrderedDict
 
 from django.contrib.postgres.fields import JSONField
-from django.db import models, transaction, IntegrityError
+from django.db import IntegrityError, models, transaction
+from django.http import Http404
 from django.utils import six
 from django.utils.encoding import force_bytes
 from django.utils.translation import ugettext_lazy as _
-from django.http import Http404
 
 from passerelle.base.models import BaseResource
-from passerelle.utils.api import endpoint, APIError
 from passerelle.utils import SFTPField
-
+from passerelle.utils.api import APIError, endpoint
 
 CSV_DELIMITER = ';'
 FILES_ENCODING = 'latin-1'

passerelle/apps/jsondatastore/migrations/0001_initial.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-import passerelle.apps.jsondatastore.models
 import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+
+import passerelle.apps.jsondatastore.models
 
 
 class Migration(migrations.Migration):

passerelle/apps/jsondatastore/models.py

@@ -23,7 +23,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.compat import json_loads
-from passerelle.utils.api import endpoint, APIError
+from passerelle.utils.api import APIError, endpoint
 from passerelle.utils.conversion import simplify
 
 

passerelle/apps/maelis/migrations/0001_initial.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.11.29 on 2020-09-29 13:56
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):