Merge pull request #43 from squio/master

Fix Django 4.0 compatibility

slick_reporting/form_factory.py

@@ -2,7 +2,7 @@
 
 from django import forms
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from . import app_settings
 from .helpers import get_foreign_keys

slick_reporting/templatetags/slick_reporting_tags.py

@@ -3,7 +3,7 @@
 from django import template
 from django.core.serializers import serialize
 from django.db.models import QuerySet
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.functional import Promise
 from django.utils.safestring import mark_safe
 
@@ -20,7 +20,7 @@ def date_handler(obj):
         if hasattr(obj, 'isoformat'):
             return obj.isoformat()
         elif isinstance(obj, Promise):
-            return force_text(obj)
+            return force_str(obj)
 
     if isinstance(object, QuerySet):
         return serialize('json', object)

slick_reporting/views.py

@@ -3,7 +3,7 @@
 import simplejson as json
 from django.conf import settings
 from django.http import HttpResponse
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.functional import Promise
 from django.views.generic import FormView
 
@@ -77,7 +77,7 @@ def date_handler(obj):
             elif hasattr(obj, 'isoformat'):
                 return obj.isoformat()
             elif isinstance(obj, Promise):
-                return force_text(obj)
+                return force_str(obj)
 
         indent = None
         if settings.DEBUG:

tests/models.py

@@ -2,7 +2,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class Product(models.Model):

tests/report_generators.py

@@ -1,7 +1,7 @@
 import datetime
 
 from django.db.models import Sum
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from slick_reporting.fields import SlickReportField
 from slick_reporting.generator import ReportGenerator

tests/views.py

@@ -2,7 +2,7 @@
 from slick_reporting.fields import SlickReportField
 from django.db.models import Sum, Count
 from .models import SimpleSales, ComplexSales
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class MonthlyProductSales(SlickReportView):