Fix deprecations

CHANGELOG.rst

@@ -21,6 +21,10 @@ are used for versioning (schema follows below):
 
 - Tested against Python 3.9, Django 3.2 and 4.0.
 
+.. note::
+
+    Release dedicated to my dear son, Tigran, who turned 10 recently.
+
 0.17.1
 ------
 2021-01-25

README.rst

@@ -34,8 +34,8 @@ handling the submitted form data).
 
 Prerequisites
 =============
-- Django 2.2, 3.0 and 3.1.
-- Python 3.5, 3.6, 3.7, 3.8 and 3.9.
+- Django 2.2, 3.0, 3.1, 3.2 and 4.0.
+- Python 3.6, 3.7, 3.8 and 3.9.
 
 Key concepts
 ============

examples/mezzanine_example/urls.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from django.conf.urls import include, url
+from django.urls import include, re_path as url
 from django.conf.urls.i18n import i18n_patterns
 from django.contrib import admin
 

examples/quick_start/quick_start/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include, url
+from django.urls import include, re_path as url
 from django.contrib import admin
 
 urlpatterns = [

examples/simple/bar/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include, url
+from django.urls import include, re_path as url
 from django.utils.translation import gettext_lazy as _
 
 from .views import my_view

examples/simple/foo/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.urls import re_path as url
 
 from .views import (
     endpoint as foo_views_endpoint,

examples/simple/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include, url
+from django.urls import include, re_path as url
 from django.conf.urls.i18n import i18n_patterns
 from django.conf import settings
 from django.contrib import admin

examples/tutorial/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include, url
+from django.urls import include, re_path as url
 
 from django.conf import settings
 from django.contrib import admin

setup.py

@@ -3,7 +3,7 @@
 from distutils.version import LooseVersion
 from setuptools import setup, find_packages
 
-version = '0.18.1'
+version = '0.18'
 
 # ***************************************************************************
 # ************************** Django version *********************************

src/fobi/__init__.py

@@ -1,7 +1,7 @@
 __title__ = 'django-fobi'
-__version__ = '0.17.1'
+__version__ = '0.18'
 __author__ = 'Artur Barseghyan <[email protected]>'
-__copyright__ = '2014-2020 Artur Barseghyan'
+__copyright__ = '2014-2022 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 
 default_app_config = 'fobi.apps.Config'

src/fobi/admin.py

@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.urls import re_path as url
 from django.contrib import admin
 from django.contrib import messages
 from django.contrib.admin import helpers

src/fobi/contrib/apps/drf_integration/form_elements/fields/duration/base.py

@@ -2,7 +2,7 @@
 import datetime
 
 from django.utils.dateparse import parse_duration
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.translation import gettext_lazy as _
 
 from rest_framework.fields import DurationField
@@ -47,7 +47,7 @@ def get_custom_field_instances(self,
         }
 
         if form_element_plugin.data.initial:
-            data_initial = force_text(form_element_plugin.data.initial)
+            data_initial = force_str(form_element_plugin.data.initial)
             if not isinstance(data_initial, datetime.timedelta):
                 parsed_initial = parse_duration(data_initial)
                 if parsed_initial is not None:

src/fobi/contrib/plugins/form_elements/fields/duration/forms.py

@@ -4,7 +4,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.utils.dateparse import parse_duration
 from django.utils.duration import duration_string
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 from fobi.base import BaseFormFieldPluginForm, get_theme
 
@@ -90,7 +90,7 @@ def clean(self):
 
         if initial not in forms.Field.empty_values:
             if not isinstance(initial, datetime.timedelta):
-                if parse_duration(force_text(initial)) is None:
+                if parse_duration(force_str(initial)) is None:
                     self.add_error(
                         'initial',
                         _("Enter a valid duration.")

src/fobi/form_utils.py

@@ -2,7 +2,7 @@
     ErrorDict as DjangoErrorDict,
     ErrorList as DjangoErrorList,
 )
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 __title__ = 'fobi.form_utils'
 __author__ = 'Artur Barseghyan <[email protected]>'
@@ -20,7 +20,7 @@ class ErrorDict(DjangoErrorDict):
     def as_text(self):
         """As text."""
         return '\n'.join(
-            [' %s\n%s' % (k, '\n'.join([' %s' % force_text(i) for i in v]))
+            [' %s\n%s' % (k, '\n'.join([' %s' % force_str(i) for i in v]))
              for k, v in self.items()]
         )
 
@@ -32,4 +32,4 @@ def as_text(self):
         """As text."""
         if not self:
             return ''
-        return '\n'.join([' %s' % force_text(e) for e in self])
+        return '\n'.join([' %s' % force_str(e) for e in self])

src/fobi/helpers.py

@@ -23,7 +23,7 @@
 from django.http import HttpResponse
 from django.templatetags.static import static
 from django.test.client import RequestFactory
-from django.utils.encoding import force_text, smart_text
+from django.utils.encoding import force_str, smart_str
 from django.utils.html import format_html_join
 from django.utils.translation import gettext_lazy as _
 
@@ -99,11 +99,11 @@ def safe_text(text):
 
     :return str:
     """
-    return smart_text(text)
+    return smart_str(text)
     # if PY3:
-    #     return force_text(text, encoding='utf-8')
+    #     return force_str(text, encoding='utf-8')
     # else:
-    #     return force_text(text, encoding='utf-8').encode('utf-8')
+    #     return force_str(text, encoding='utf-8').encode('utf-8')
 
 
 def lists_overlap(sub, main):

src/fobi/templatetags/future_compat.py

@@ -18,7 +18,7 @@
 
     from django.template import Library
     from django.template.base import Node, TemplateSyntaxError
-    from django.utils.encoding import force_text
+    from django.utils.encoding import force_str
     from django.utils.formats import localize
     from django.utils.html import escape as html_escape
     from django.utils.safestring import mark_safe, EscapeData, SafeData
@@ -35,7 +35,7 @@ def render_value_in_context(value, context):
         """
         value = template_localtime(value, use_tz=context.use_tz)
         value = localize(value, use_l10n=context.use_l10n)
-        value = force_text(value)
+        value = force_str(value)
         if ((context.autoescape and not isinstance(value, SafeData)) or
                 isinstance(value, EscapeData)):
             return html_escape(value)