Remove deprecated functions for Django 4 (force_text() and url())

private_storage/fields.py

@@ -13,7 +13,7 @@ from django.db import models
 from django.db.models.fields.files import ImageFieldFile, ImageFileDescriptor
 from django.forms import ImageField
 from django.template.defaultfilters import filesizeformat
-from django.utils.encoding import force_str, force_text
+from django.utils.encoding import force_str
 from django.utils.translation import gettext_lazy as _
 
 from .storage import private_storage
@@ -72,7 +72,7 @@ class PrivateFileField(models.FileField):
                 dirname, filename = os.path.split(self.upload_to(instance, filename))
                 path_parts.append(dirname)
             else:
-                dirname = force_text(datetime.datetime.now().strftime(force_str(self.upload_to)))
+                dirname = force_str(datetime.datetime.now().strftime(force_str(self.upload_to)))
                 path_parts.append(dirname)
 
         # Add our custom subdir function.

private_storage/storage/files.py

@@ -4,7 +4,7 @@ Django Storage interface, using the file system backend.
 from django.core.files.storage import FileSystemStorage
 from django.urls import reverse_lazy
 from django.utils.deconstruct import deconstructible
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 from private_storage import appconfig
 
@@ -32,6 +32,6 @@ class PrivateFileSystemStorage(FileSystemStorage):
             self.base_url = reverse_lazy('serve_private_file', kwargs={'path': ''})
 
     def url(self, name):
-        # Make sure reverse_lazy() is evaluated, as Python 3 won't do this here.
-        self.base_url = force_text(self.base_url)
+        # Make sure reverse_lazy() is evaluated
+        self.base_url = force_str(self.base_url)
         return super(PrivateFileSystemStorage, self).url(name)

private_storage/urls.py

-from django.conf.urls import url
+from django.urls import re_path
 
 from .views import PrivateStorageView
 
 urlpatterns = [
-    url(r'^(?P<path>.*)$', PrivateStorageView.as_view(), name='serve_private_file'),
+    re_path(r'^(?P<path>.*)$', PrivateStorageView.as_view(), name='serve_private_file'),
 ]

tox.ini

 [tox]
 envlist=
     py38-django{22,31,32},
-    # py36-django-dev,
+    py38-django-dev,
     coverage,
 
 [base]
@@ -16,7 +16,7 @@ deps =
     django30: Django~=3.0
     django31: Django~=3.1
     django32: Django~=3.2
-    django-dev: https://github.com/django/django/tarball/master
+    django-dev: https://github.com/django/django/tarball/main
 commands=
     python runtests.py