Merge pull request #8 from skip-pay/tda/chore/django_bump

chore: Django bump to <=5.0

Author: Formulka

pymess/backend/__init__.py

@@ -4,7 +4,7 @@
 from django.db import transaction
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _l
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 from django.utils.timezone import now
 
 from pymess.config import settings
@@ -47,10 +47,10 @@ def is_turned_on_batch_sending(self):
     def publish_or_retry_message(self, message):
         backend = self.get_backend(recipient=message.recipient)
         if message.number_of_send_attempts > backend.get_batch_max_number_of_send_attempts():
-            backend._set_message_as_failed(message, error=ugettext('the number of send attempts exceeded the limit'))
+            backend._set_message_as_failed(message, error=gettext('the number of send attempts exceeded the limit'))
             return False
         elif message.created_at < now() - timedelta(seconds=self.get_batch_max_seconds_to_send()):
-            backend._set_message_as_failed(message, error=ugettext('the age of the message exceeds the send limit'))
+            backend._set_message_as_failed(message, error=gettext('the age of the message exceeds the send limit'))
             return False
         else:
             backend.publish_message(message)

pymess/backend/dialer/daktela.py

@@ -1,7 +1,7 @@
 import re
 
 from django.utils import timezone as tz
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from pymess.backend.dialer import DialerBackend
 from pymess.config import settings

pymess/backend/emails/mandrill.py

@@ -8,8 +8,8 @@
 from enum import Enum
 
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ugettext
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext
 
 import mandrill
 
@@ -97,9 +97,9 @@ def publish_message(self, message):
             state = self.MANDRILL_STATES_MAPPING.get(mandrill_state)
             error = None
             if mandrill_state == MandrillState.INVALID:
-                error = ugettext('invalid')
+                error = gettext('invalid')
             elif mandrill_state == MandrillState.REJECTED:
-                error = ugettext('rejected, mandrill message: "{}"').format(result['reject_reason'])
+                error = gettext('rejected, mandrill message: "{}"').format(result['reject_reason'])
 
             extra_sender_data = message.extra_sender_data or {}
             extra_sender_data['result'] = result

pymess/backend/sms/__init__.py

@@ -3,7 +3,7 @@
 
 from django.utils import timezone
 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 chamber.exceptions import PersistenceException
 

pymess/backend/sms/ats_sms_operator.py

@@ -5,7 +5,7 @@
 from enum import Enum
 
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils.safestring import mark_safe
 from django.template.loader import render_to_string
 

pymess/backend/sms/sms_operator.py

@@ -5,7 +5,7 @@
 from enum import Enum
 
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.template.loader import render_to_string
 
 from enumfields import IntegerChoicesEnum

pymess/backend/sms/twilio.py

@@ -2,7 +2,7 @@
 
 from django.conf import settings
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _l
+from django.utils.translation import gettext_lazy as _l
 
 from pymess.backend.sms import SMSBackend
 from pymess.enums import OutputSMSMessageState

pymess/enums.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from enumfields import IntegerChoicesEnum
 

pymess/models/common.py

@@ -10,7 +10,7 @@
 from django.db.models.functions import Cast
 from django.template import Context, Template
 from django.template.exceptions import TemplateDoesNotExist, TemplateSyntaxError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from chamber.models import SmartModel
 

pymess/models/dialer.py

@@ -1,7 +1,7 @@
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.encoding import force_str
+from django.utils.translation import gettext_lazy as _
 
 from pymess.config import settings
 from pymess.enums import DialerMessageState
@@ -45,7 +45,7 @@ def clean(self):
         super().clean()
 
     def clean_recipient(self):
-        self.recipient = normalize_phone_number(force_text(self.recipient))
+        self.recipient = normalize_phone_number(force_str(self.recipient))
 
     @property
     def failed(self):