Merge pull request #169 from gyana/patch-1

Update import for django 4.0

invitations/adapters.py

@@ -9,9 +9,12 @@
 from .utils import import_attribute
 
 try:
-    from django.utils.encoding import force_text
+    from django.utils.encoding import force_str as force_text
 except ImportError:
-    from django.utils.encoding import force_unicode as force_text
+    try:
+        from django.utils.encoding import force_text
+    except ImportError:
+        from django.utils.encoding import force_unicode as force_text
 
 
 # Code credits here to django-allauth

invitations/base_invitation.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .managers import BaseInvitationManager
 

invitations/forms.py

@@ -1,6 +1,6 @@
 from django import forms
 from django.contrib.auth import get_user_model
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .adapters import get_invitations_adapter
 from .exceptions import AlreadyAccepted, AlreadyInvited, UserRegisteredEmail

invitations/models.py

@@ -9,7 +9,7 @@
 from django.db import models
 from django.utils import timezone
 from django.utils.crypto import get_random_string
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from . import signals
 from .adapters import get_invitations_adapter

invitations/signals.py

@@ -1,7 +1,7 @@
 from django.dispatch import Signal
 
-invite_url_sent = Signal(providing_args=['invite_url_sent', 'inviter'])
-invite_accepted = Signal(providing_args=['email'])
+invite_url_sent = Signal()
+invite_accepted = Signal()
 
 """
 @receiver(invite_url_sent, sender=Invitation)

invitations/urls.py

@@ -1,15 +1,15 @@
-from django.conf.urls import url
+from django.urls import re_path
 
 from . import views
 
 app_name = 'invitations'
 urlpatterns = [
-    url(r'^send-invite/$', views.SendInvite.as_view(),
+    re_path(r'^send-invite/$', views.SendInvite.as_view(),
         name='send-invite'),
 
-    url(r'^send-json-invite/$', views.SendJSONInvite.as_view(),
+    re_path(r'^send-json-invite/$', views.SendJSONInvite.as_view(),
         name='send-json-invite'),
 
-    url(r'^accept-invite/(?P<key>\w+)/?$', views.AcceptInvite.as_view(),
+    re_path(r'^accept-invite/(?P<key>\w+)/?$', views.AcceptInvite.as_view(),
         name='accept-invite'),
 ]

invitations/views.py

@@ -7,7 +7,7 @@
 from django.http import Http404, HttpResponse
 from django.shortcuts import redirect
 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.generic import FormView, View
 from django.views.generic.detail import SingleObjectMixin