Support for Django 4.x

Author: ralphje

Diff for: docs/changelog.rst

@@ -4,6 +4,10 @@ Changelog
 
 This file contains the changelog for the project.
 
+0.4.3 (2022-04-04)
+==================
+* Support for Django 4.x
+
 0.4.2 (2021-11-06)
 ==================
 * Updates CLDR data to v39

Diff for: internationalflavor/timezone/data.py

@@ -1,7 +1,10 @@
 import datetime
 
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.encoding import force_text
+try:
+    from django.utils.encoding import force_str as force_text
+except ImportError:
+    from django.utils.encoding import force_text
 from django.utils.functional import lazy
 from django.utils.translation import gettext_lazy as _, gettext
 import itertools

Diff for: tests/requirements.txt

@@ -5,4 +5,4 @@ django-discover-runner==1.0
 pytz
 polib
 
-suds-jurko==0.6
+suds==1.0

Diff for: tests/test_timezone.py

@@ -3,7 +3,10 @@
 from __future__ import unicode_literals
 from django.test import SimpleTestCase
 from django.utils import translation
-from django.utils.encoding import force_text
+try:
+    from django.utils.encoding import force_text
+except ImportError:
+    from django.utils.encoding import force_str as force_text
 
 from internationalflavor.timezone.data import get_metazone_name, CURRENT_METAZONES
 from internationalflavor.timezone.forms import TimezoneFormField, MetazoneFormField

Diff for: tox.ini

@@ -5,7 +5,8 @@ envlist =
     {py35,py36,py37,py38,py39}-2.2
     {py36,py37,py38,py39}-3.1
     {py36,py37,py38,py39,py310}-3.2
-    {py36,py37,py38,py39,py310}-main
+    {py38,py39,py310}-4.0
+    {py38,py39,py310}-main
 
 [testenv]
 basepython =
@@ -23,6 +24,7 @@ deps =
     3.0: Django>=3.0,<3.1
     3.1: Django>=3.1,<3.2
     3.2: Django>=3.2,<3.3
+    4.0: Django>=4.0,<4.1
     main: https://github.com/django/django/archive/main.tar.gz
     -r{toxinidir}/tests/requirements.txt