django4: replaced ugettext* calls with corresponding gettext* calls (#68576)

passerelle/address/models.py

@@ -19,7 +19,7 @@ from urllib.parse import urljoin
 from django.conf import settings
 from django.db import models
 from django.db.models import Q
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.apps.sector.models import (
     MAX_HOUSENUMBER,

passerelle/apps/actesweb/models.py

@@ -26,7 +26,7 @@ from django.template.loader import get_template
 from django.utils.dateparse import parse_date
 from django.utils.encoding import force_bytes
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/airquality/models.py

@@ -19,7 +19,7 @@ import datetime
 
 from django.db import models
 from django.http import Http404
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/api_entreprise/models.py

@@ -26,7 +26,7 @@ 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 django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/api_particulier/models.py

@@ -32,7 +32,7 @@ except ImportError:
 from django.contrib.postgres.fields import ArrayField
 from django.core.cache import cache
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/arcgis/models.py

@@ -23,7 +23,7 @@ from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseQuery, BaseResource, HTTPResource
 from passerelle.utils import mark_safe_lazy

passerelle/apps/arpege_ecp/models.py

@@ -20,7 +20,7 @@ from urllib import parse as urlparse
 from django.db import models
 from django.utils import timezone
 from django.utils.dateparse import parse_date, parse_time
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests import RequestException
 
 from passerelle.base.models import BaseResource

passerelle/apps/astech/models.py

@@ -20,7 +20,7 @@ from urllib import parse as urlparse
 
 from django.core.cache import cache
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests.exceptions import ConnectionError
 
 from passerelle.base.models import BaseResource, HTTPResource

passerelle/apps/astre_rest/models.py

@@ -20,7 +20,7 @@ import urllib.parse
 
 import requests
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/astregs/models.py

@@ -20,7 +20,7 @@ from urllib import parse as urlparse
 import zeep
 from django.db import models
 from django.http import Http404
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from zeep.helpers import serialize_object
 
 from passerelle.base.models import BaseResource

passerelle/apps/atal/models.py

@@ -22,7 +22,7 @@ import lxml.etree
 from django.db import models
 from django.utils import dateformat, dateparse
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from zeep import helpers
 from zeep.exceptions import Fault
 

passerelle/apps/atos_genesys/models.py

@@ -21,7 +21,7 @@ from urllib import parse as urlparse
 import requests
 from django.contrib.postgres.fields import JSONField
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource, HTTPResource
 from passerelle.utils import xml as xmlutils

passerelle/apps/base_adresse/models.py

@@ -10,7 +10,7 @@ from django.db import connection, models
 from django.db.models import Q
 from django.utils import timezone
 from django.utils.http import urlencode
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests import RequestException
 
 from passerelle.address.models import AddressResource

passerelle/apps/bdp/models.py

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

passerelle/apps/cartads_cs/models.py

@@ -40,7 +40,7 @@ from django.http import HttpResponse
 from django.urls import reverse
 from django.utils.encoding import force_text
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.base.signature import sign_url

passerelle/apps/choosit/models.py

@@ -3,7 +3,7 @@ import json
 
 import requests
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.sms.models import SMSResource
 from passerelle.utils.jsonresponse import APIError

passerelle/apps/cityweb/models.py

@@ -18,7 +18,7 @@ import json
 import os
 
 from django.core.files.storage import default_storage
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/clicrdv/models.py

@@ -11,7 +11,7 @@ from django.db import models
 from django.utils.dateformat import format as date_format
 from django.utils.dateformat import time_format
 from django.utils.http import urlquote
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/cmis/models.py

@@ -33,7 +33,7 @@ from cmislib.exceptions import (
 )
 from django.db import models
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/cmis/views.py

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

passerelle/apps/cryptor/models.py

@@ -29,7 +29,7 @@ from django.core.exceptions import ValidationError
 from django.core.files.storage import default_storage
 from django.db import models
 from django.http import HttpResponse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/csvdatasource/forms.py

@@ -16,7 +16,7 @@
 
 from django import forms
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .models import Query, get_code, identifier_re
 

passerelle/apps/csvdatasource/models.py

@@ -33,7 +33,7 @@ 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 django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils import batch

passerelle/apps/esabora/models.py

@@ -3,7 +3,7 @@ import urllib.parse
 import requests
 from django.db import models
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource, HTTPResource
 from passerelle.utils.api import endpoint

passerelle/apps/esirius/models.py

@@ -25,7 +25,7 @@ from Cryptodome.Util.Padding import pad
 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 _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource, HTTPResource
 from passerelle.utils.api import endpoint

passerelle/apps/family/loaders/concerto_fondettes.py

@@ -21,7 +21,7 @@ from decimal import Decimal
 
 from django.core.exceptions import ValidationError
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from ..models import Invoice
 

passerelle/apps/family/loaders/concerto_orleans.py

@@ -23,7 +23,7 @@ from django.core.exceptions import ValidationError
 from django.core.files.storage import DefaultStorage
 from django.utils import timezone
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from ..models import Adult, Child, Family, Invoice, dict_cherry_pick, get_date, get_datetime
 

passerelle/apps/family/loaders/egee_thonon.py

@@ -18,7 +18,7 @@ import datetime
 from xml.etree import ElementTree as ET
 
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from ..models import Invoice
 

passerelle/apps/family/loaders/opus_fondettes.py

@@ -21,7 +21,7 @@ from decimal import Decimal
 
 from django.core.exceptions import ValidationError
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from ..models import Invoice
 

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

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.core.management.base import BaseCommand
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from ...models import GenericFamily
 

passerelle/apps/family/models.py

@@ -29,7 +29,7 @@ from django.core.files.storage import default_storage
 from django.db import models, transaction
 from django.http import Http404, HttpResponse
 from django.utils.timezone import datetime, make_aware, now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/feeds/models.py

@@ -16,7 +16,7 @@
 
 import feedparser
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/franceconnect_data/fc.py

@@ -21,7 +21,7 @@ import urllib.parse
 import uuid
 
 import requests
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class FranceConnectError(Exception):

passerelle/apps/franceconnect_data/models.py

@@ -27,7 +27,7 @@ from django.template.response import TemplateResponse
 from django.urls import reverse
 from django.utils.http import urlencode
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils import get_trusted_services

passerelle/apps/gdc/models.py

@@ -23,7 +23,7 @@ except ImportError:
 
 from django.db import models
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/gesbac/models.py

@@ -21,7 +21,7 @@ from collections import OrderedDict
 from django.contrib.postgres.fields import JSONField
 from django.db import IntegrityError, models, transaction
 from django.http import Http404
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils import SFTPField

passerelle/apps/holidays/forms.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 import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.forms import GenericConnectorForm
 

passerelle/apps/holidays/models.py

@@ -19,7 +19,7 @@ import vobject
 from django.contrib.postgres.fields import ArrayField
 from django.db import models
 from django.http import HttpResponse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/jsondatastore/models.py

@@ -20,7 +20,7 @@ import uuid
 from django.contrib.postgres.fields import JSONField
 from django.db import models
 from django.template import Context, Template
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import APIError, endpoint

passerelle/apps/maelis/models.py

@@ -22,7 +22,7 @@ import zeep
 from django.db import models
 from django.utils import timezone
 from django.utils.dateparse import parse_date
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from zeep.helpers import serialize_object
 from zeep.wsse.username import UsernameToken
 

passerelle/apps/mdel/models.py

@@ -19,7 +19,7 @@ import json
 import os
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils import SFTPField

passerelle/apps/mdel_ddpacs/abstract.py

@@ -29,7 +29,7 @@ from django.db import IntegrityError, models, transaction
 from django.http import HttpResponse
 from django.urls import reverse
 from django.utils import functional
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource, SkipJob
 from passerelle.utils import sftp, xml

passerelle/apps/mdel_ddpacs/models.py

@@ -19,7 +19,7 @@ from __future__ import unicode_literals
 
 import xmlschema
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.utils.api import endpoint
 from passerelle.utils.xml import JSONSchemaFromXMLSchema

passerelle/apps/mobyt/models.py

@@ -1,6 +1,6 @@
 import requests
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.sms.models import SMSResource
 from passerelle.utils.jsonresponse import APIError

passerelle/apps/okina/models.py

@@ -19,7 +19,7 @@ import json
 from django.db import models
 from django.http import HttpResponse
 from django.utils.http import urlencode
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/opendatasoft/models.py

@@ -20,7 +20,7 @@ from urllib import parse as urlparse
 from django.db import models
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests import RequestException
 
 from passerelle.base.models import BaseQuery, BaseResource

passerelle/apps/opengis/forms.py

@@ -18,7 +18,7 @@ from xml.etree import ElementTree as ET
 
 from django import forms
 from django.forms import formset_factory
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.forms import BaseQueryFormMixin
 

passerelle/apps/opengis/models.py

@@ -28,7 +28,7 @@ from django.shortcuts import get_object_or_404
 from django.template import Context, Template, TemplateSyntaxError
 from django.urls import reverse
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseQuery, BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/orange/models.py

@@ -20,7 +20,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.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.sms.models import SMSResource
 from passerelle.utils.jsonresponse import APIError

passerelle/apps/ovh/models.py

@@ -13,7 +13,7 @@ from django.db import models
 from django.template.loader import render_to_string
 from django.utils import timezone
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import SkipJob
 from passerelle.sms.models import SMSResource

passerelle/apps/ovh/views.py

@@ -2,7 +2,7 @@ import uuid
 
 from django.contrib import messages
 from django.shortcuts import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic.base import RedirectView
 from requests import RequestException
 

passerelle/apps/oxyd/models.py

@@ -1,7 +1,7 @@
 import requests
 from django.db import models
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.sms.models import SMSResource
 from passerelle.utils.jsonresponse import APIError

passerelle/apps/phonecalls/models.py

@@ -20,7 +20,7 @@ from django.http import HttpResponseRedirect
 from django.shortcuts import render
 from django.utils.http import urlencode
 from django.utils.timezone import make_naive, now, timedelta
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/photon/models.py

@@ -22,7 +22,7 @@ from django.contrib.postgres.fields import JSONField
 from django.db import models
 from django.utils.encoding import force_bytes
 from django.utils.http import urlencode
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests import RequestException
 
 from passerelle.base.models import BaseResource

passerelle/apps/plone_restapi/models.py

@@ -21,7 +21,7 @@ from django.core.cache import cache
 from django.db import models
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests import RequestException
 
 from passerelle.base.models import BaseQuery, BaseResource, HTTPResource

passerelle/apps/sector/models.py

@@ -27,7 +27,7 @@ from django.db.models import Q
 from django.http import HttpResponse
 from django.utils.encoding import force_bytes, force_str, smart_text
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/sfr_dmc/models.py

@@ -16,7 +16,7 @@
 import json
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.sms.models import SMSResource
 from passerelle.utils.jsonresponse import APIError

passerelle/apps/signal_arretes/models.py

@@ -24,7 +24,7 @@ from datetime import datetime
 from django.db import models
 from django.http import HttpResponse
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests import RequestException
 
 from passerelle.base.models import BaseResource, HTTPResource

passerelle/apps/sivin/models.py

@@ -19,7 +19,7 @@ from urllib.parse import urljoin
 
 from django.core.cache import cache
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests import RequestException
 
 from passerelle.base.models import BaseResource

passerelle/apps/soap/models.py

@@ -23,7 +23,7 @@ import zeep.xsd
 from django.db import models
 from django.forms import ValidationError
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from zeep.wsse.username import UsernameToken
 
 from passerelle.base.models import BaseResource, HTTPResource

passerelle/apps/solis/models.py

@@ -22,7 +22,7 @@ from django.db import models
 from django.template.loader import get_template
 from django.utils.encoding import force_text
 from django.utils.http import urlencode
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/apps/sp_fr/models.py

@@ -28,8 +28,8 @@ from django.core.files import File
 from django.db import models, transaction
 from django.template import engines
 from django.urls import reverse
-from django.utils.translation import ugettext
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext
+from django.utils.translation import gettext_lazy as _
 from lxml import etree as ET
 
 from passerelle.base.models import BaseResource
@@ -628,7 +628,7 @@ class Mapping(models.Model):
         yield 'convention_specifique'
 
     def __str__(self):
-        return ugettext('Mapping from "{procedure}" to formdef "{formdef}"').format(
+        return gettext('Mapping from "{procedure}" to formdef "{formdef}"').format(
             procedure=self.get_procedure_display(), formdef=self.formdef.title if self.formdef else '-'
         )
 

passerelle/apps/twilio/models.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import requests
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests.auth import HTTPBasicAuth
 
 from passerelle.sms.models import SMSResource

passerelle/apps/vivaticket/models.py

@@ -19,7 +19,7 @@ from urllib import parse as urlparse
 
 from django.core.cache import cache
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/base/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .models import AccessRight, ApiUser, AvailabilityParameters
 

passerelle/base/models.py

@@ -31,7 +31,7 @@ from django.utils.encoding import force_text
 from django.utils.log import AdminEmailHandler
 from django.utils.text import slugify
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from model_utils.managers import InheritanceManager as ModelUtilsInheritanceManager
 
 import passerelle

passerelle/base/templatetags/passerelle.py

@@ -27,7 +27,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.template.defaultfilters import stringfilter
 from django.utils.html import format_html, mark_safe
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from passerelle.utils import get_trusted_services
 

passerelle/base/views.py

@@ -26,7 +26,7 @@ from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.utils.timezone import make_aware
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import CreateView, DeleteView, DetailView, FormView, ListView, UpdateView, View
 
 from ..utils import ImportSiteError, export_site, get_trusted_services, import_site

passerelle/contrib/adict/models.py

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

passerelle/contrib/caluire_axel/models.py

@@ -24,7 +24,7 @@ from django.db import models
 from django.http import HttpResponse
 from django.utils import dateformat
 from django.utils.timezone import localtime
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.contrib.utils import axel

passerelle/contrib/caluire_axel/schemas.py

@@ -18,7 +18,7 @@ import copy
 import os
 
 import xmlschema
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.contrib.utils import axel
 

passerelle/contrib/dpark/models.py

@@ -25,7 +25,7 @@ from django.conf import settings
 from django.core.cache import cache
 from django.db import models
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from zeep.exceptions import Fault as WebFault
 from zeep.helpers import serialize_object
 

passerelle/contrib/esirius_swi/models.py

@@ -18,7 +18,7 @@ from urllib.parse import urljoin
 
 import zeep
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/contrib/fake_family/models.py

@@ -16,7 +16,7 @@
 
 from django.contrib.postgres.fields import JSONField
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 

passerelle/contrib/gdema/models.py

@@ -21,7 +21,7 @@ import re
 from django.db import models
 from django.utils.dateparse import parse_date, parse_datetime
 from django.utils.timezone import get_fixed_timezone, is_naive, make_aware, utc
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/contrib/grandlyon_streetsections/models.py

@@ -20,7 +20,7 @@ import re
 from django.db import models
 from django.utils import timezone
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/contrib/greco/models.py

@@ -23,7 +23,7 @@ from email.mime.text import MIMEText
 import suds.sudsobject
 from django.core.cache import cache
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from suds.client import Client
 from suds.transport import Reply
 from suds.transport.http import HttpAuthenticated

passerelle/contrib/grenoble_gru/models.py

@@ -23,7 +23,7 @@ from django.db import models
 from django.utils import dateparse
 from django.utils.http import urlencode
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from lxml import etree
 
 from passerelle.base.models import BaseResource

passerelle/contrib/isere_ens/models.py

@@ -21,7 +21,7 @@ from urllib import parse as urlparse
 from django.core.cache import cache
 from django.db import models
 from django.utils.formats import date_format
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource, HTTPResource
 from passerelle.utils.api import endpoint

passerelle/contrib/iws/models.py

@@ -20,7 +20,7 @@ import lxml.etree
 import pkg_resources
 from django.db import models
 from django.utils import dateformat
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/contrib/lille_kimoce/models.py

@@ -19,7 +19,7 @@ from urllib.parse import urljoin
 
 from django.core.cache import cache
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/contrib/lille_urban_card/models.py

@@ -21,7 +21,7 @@ import re
 from urllib.parse import urljoin
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/contrib/mdph13/models.py

@@ -22,7 +22,7 @@ from urllib import parse as urlparse
 
 import requests
 from django.db import models, transaction
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource, HTTPResource
 from passerelle.utils.api import endpoint

passerelle/contrib/nancypoll/models.py

@@ -2,7 +2,7 @@ import csv
 
 from django.db import models
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/contrib/planitech/models.py

@@ -27,7 +27,7 @@ from django.core.cache import cache
 from django.db import models, transaction
 from django.utils import dateformat, dateparse
 from django.utils.encoding import force_bytes
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests.exceptions import RequestException
 
 from passerelle.base.models import BaseResource

passerelle/contrib/rsa13/models.py

@@ -25,7 +25,7 @@ from django.http import HttpResponse
 from django.urls import reverse
 from django.utils.http import urlencode
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource, HTTPResource
 from passerelle.utils.api import endpoint

passerelle/contrib/sigerly/models.py

@@ -17,7 +17,7 @@
 from urllib.parse import urljoin
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource, HTTPResource
 from passerelle.utils.api import endpoint

passerelle/contrib/solis_afi_mss/models.py

@@ -17,7 +17,7 @@
 import base64
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource, HTTPResource
 from passerelle.utils.api import endpoint

passerelle/contrib/solis_apa/models.py

@@ -20,7 +20,7 @@ from urllib import parse as urlparse
 
 from django.core.cache import cache
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.contrib.solis_apa import conciliation, integration, suivi

passerelle/contrib/solis_apa/views.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import DetailView as GenericDetailView
 from django.views.generic import View

passerelle/contrib/strasbourg_eu/models.py

@@ -20,7 +20,7 @@ from urllib import parse as urlparse
 
 from django.db import models
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests import RequestException
 
 from passerelle.base.models import BaseResource

passerelle/contrib/stub_invoices/models.py

@@ -20,7 +20,7 @@ from decimal import Decimal
 
 from django.http import HttpResponse
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/contrib/tcl/models.py

@@ -19,7 +19,7 @@ import re
 from django.conf import settings
 from django.db import models, transaction
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.utils.api import endpoint

passerelle/contrib/teamnet_axel/models.py

@@ -24,7 +24,7 @@ from django.contrib.postgres.fields import JSONField
 from django.db import models
 from django.http import HttpResponse, HttpResponseNotFound
 from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.soap import client_to_jsondict

passerelle/contrib/toulouse_axel/models.py

@@ -25,7 +25,7 @@ from django.db import models
 from django.http import HttpResponse
 from django.utils import dateformat
 from django.utils.dates import WEEKDAYS as WEEKDAYS_LABELS
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.contrib.utils import axel

passerelle/contrib/toulouse_foederis/models.py

@@ -24,7 +24,7 @@ from django.db.models import Q
 from django.http import Http404, HttpResponse
 from django.urls import reverse
 from django.utils.timezone import localtime, now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource, HTTPResource
 from passerelle.utils.api import endpoint

passerelle/contrib/toulouse_smart/models.py

@@ -30,7 +30,7 @@ from django.db.transaction import atomic
 from django.urls import reverse
 from django.utils.text import slugify
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests import RequestException
 
 from passerelle.base.models import BaseResource, HTTPResource, SkipJob

passerelle/forms.py

@@ -16,7 +16,7 @@
 
 from django import forms
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class GenericConnectorForm(forms.ModelForm):

passerelle/sms/forms.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 import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.forms import GenericConnectorForm
 

passerelle/sms/models.py

@@ -22,7 +22,7 @@ from django.core.validators import RegexValidator
 from django.db import models
 from django.urls import reverse
 from django.utils.module_loading import import_string
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource
 from passerelle.sms.forms import SMSConnectorForm