Convert to Django 3.2

diff --git a/teleforma/fields.py b/teleforma/fields.py
index 06bc6921ac266f1f5e1009dd8ab9aee96a276eac..eacf681363797ef98a95b977ad2338ad85bd1747 100644 (file)
--- a/teleforma/fields.py
+++ b/teleforma/fields.py
@@ -6,7 +6,7 @@ from django.core.exceptions import ValidationError
 from django.core import exceptions
 from django import forms
 import datetime
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 import re
 
 try:

diff --git a/teleforma/forms.py b/teleforma/forms.py
index cf53b531030d8dd4defa75d20ec23006997dfe6c..6936c714421fd63b5b2e6b092b5a3bb9636bb6f9 100644 (file)
--- a/teleforma/forms.py
+++ b/teleforma/forms.py
@@ -2,7 +2,7 @@
 from django.forms import ModelForm, HiddenInput
 from teleforma.models import *
 from django.forms import ModelForm
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from teleforma.models.profile import UserProfile
 

diff --git a/teleforma/models/ae.py b/teleforma/models/ae.py
index 024056789eb1914a2fb28dfb8aafe8f08acf7ffe..c824c067e5d2bd5bf5b0199d882fdd0b2e2f5ee9 100644 (file)
--- a/teleforma/models/ae.py
+++ b/teleforma/models/ae.py
@@ -35,7 +35,7 @@
 """
 
 import django.db.models as models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from teleforma.models.core import *
 
 

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index a70118de0df05803b4208222c337f4c5afba14e0..84d29d775f2adcb1e1ef34f8f9a0d678f4b76c90 100755 (executable)
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -45,7 +45,7 @@ from django.conf import settings
 from django.db.models import *
 from teleforma.fields import *
 import django.db.models as models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils.functional import cached_property
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError

diff --git a/teleforma/models/crfpa.py b/teleforma/models/crfpa.py
index 1c9f1175cc041774b04e1c86c3896800d4666860..41d823f444cabaad9e3c11cf1eb6d66e6302ffa0 100644 (file)
--- a/teleforma/models/crfpa.py
+++ b/teleforma/models/crfpa.py
@@ -35,7 +35,7 @@
 """
 
 import django.db.models as models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from teleforma.models.core import *
 
 

diff --git a/teleforma/models/pro.py b/teleforma/models/pro.py
index 6e68ee72138881d37064a958a76ade6ebc08cddd..0d647cb90eb28587f42b66f11e222b350e11644a 100644 (file)
--- a/teleforma/models/pro.py
+++ b/teleforma/models/pro.py
@@ -37,7 +37,7 @@
 import os
 from django.conf import settings
 import django.db.models as models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from teleforma.models.core import *
 from forms_builder.forms.models import Form
 from mezzanine.core.managers import DisplayableManager

diff --git a/teleforma/models/profile.py b/teleforma/models/profile.py
index 501e4d09ba05bf16556df012b81fb8a21e054bce..48b7b8dfe9a1fcbebd332576188a8ef789938026 100644 (file)
--- a/teleforma/models/profile.py
+++ b/teleforma/models/profile.py
@@ -1,12 +1,12 @@
 from django.db import models
 from django.contrib.auth.models import User
 from teleforma.models.core import MetaCore
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 class UserProfile(models.Model):
     "User profile extension"
 
-    user            = models.ForeignKey(User, unique=True, related_name="profile")
+    user            = models.ForeignKey(User, on_delete=models.CASCADE,  unique=True, related_name="profile")
     institution     = models.CharField(_('Institution'))
     department      = models.CharField(_('Department'))
     attachment      = models.CharField(_('Attachment'))

diff --git a/teleforma/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py
index 978c642ab8c0416ac749d16862d90ae82742f6b8..eef23a3bb120cf9adb2b1ebfff9ce7216632105c 100644 (file)
--- a/teleforma/templatetags/teleforma_tags.py
+++ b/teleforma/templatetags/teleforma_tags.py
@@ -33,13 +33,13 @@
 # Authors: Guillaume Pellerin <yomguy@parisson.com>
 
 from django import template
-from django.utils.http import urlquote
+from urllib.parse import quote
 from teleforma.models import *
 from django.core.urlresolvers import reverse
 from django.utils import html
 from django import template
 from django.utils.text import capfirst
-from django.utils.translation import ungettext
+from django.utils.translation import ngettext
 from docutils.core import publish_parts
 from django.utils.encoding import smart_str, force_unicode
 from django.utils.safestring import mark_safe
@@ -50,7 +50,7 @@ import datetime
 from django.conf import settings
 from django.template.defaultfilters import stringfilter
 import django.utils.timezone as timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from urllib.parse import urlparse
 from docutils.core import publish_parts
 from django.utils.encoding import smart_str, force_unicode

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 45ab8845f3701141ebccb5e2d57c65a86d93915e..229032f884fdd46b90ccffb99d52bca71b0c5298 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -61,8 +61,8 @@ from django.contrib.auth.decorators import login_required, permission_required
 from django.core.context_processors import csrf
 from django.forms.models import modelformset_factory, inlineformset_factory
 from django.contrib.auth.models import User
-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 django.contrib.auth.forms import UserChangeForm
 from django.core.exceptions import ObjectDoesNotExist
 from django.contrib.syndication.views import Feed

diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py
index f011e7bdcaaf1faa5b16f204339fcef76298453e..36c7024d7f436d5d2fed336d6d09509306276521 100644 (file)
--- a/teleforma/views/pro.py
+++ b/teleforma/views/pro.py
@@ -37,7 +37,7 @@ from teleforma.views.core import *
 from teleforma.context_processors import *
 from django.core.exceptions import PermissionDenied
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.template import loader, Context, RequestContext
 from django.views.generic.base import TemplateResponseMixin
 from django.http import HttpResponse

diff --git a/teleforma/views/profile.py b/teleforma/views/profile.py
index 0f4285242347e2164e96814d78fc30749fa39546..e0fb0d09cdc22452994b388d2da895f36bf6d765 100644 (file)
--- a/teleforma/views/profile.py
+++ b/teleforma/views/profile.py
@@ -42,7 +42,7 @@ from django.utils.decorators import method_decorator
 from django.contrib.auth.decorators import login_required
 from teleforma.models.profile import UserProfile
 from teleforma.forms import UserProfileForm
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 
 class ProfileView(object):
     """Provide Collections web UI methods"""
@@ -68,9 +68,9 @@ class ProfileView(object):
 
         user = User.objects.get(username=username)
         if user != request.user and not request.user.is_staff:
-            mess = ugettext('Access not allowed')
-            title = ugettext('User profile') + ' : ' + username + ' : ' + mess
-            description = ugettext('Please login or contact the website administator to get a private access.')
+            mess = gettext('Access not allowed')
+            title = gettext('User profile') + ' : ' + username + ' : ' + mess
+            description = gettext('Please login or contact the website administator to get a private access.')
             messages.error(request, title)
             return render(request, 'teleforma/messages.html', {'description' : description})