Skip to content
Snippets Groups Projects
Unverified Commit 3b1f6c9f authored by Fredrik Jonsson's avatar Fredrik Jonsson Committed by GitHub
Browse files

Merge pull request #1694 from OpenTechFund/enhancement/remove_replace_deprecated_functions_django_3

Remove/replace deprecated functions django 3
parents 90096566 bcf40dab
No related branches found
No related tags found
No related merge requests found
{% extends "modeladmin/choose_parent.html" %}
{% load i18n admin_static %}
{% load i18n %}
{% block content %}
<div>
......
......@@ -9,7 +9,7 @@ from django.core.validators import FileExtensionValidator
from django.db.models import BLANK_CHOICE_DASH
from django.forms.widgets import ClearableFileInput
from django.utils.dateparse import parse_datetime
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from django.utils.text import slugify
from django.utils.translation import ugettext_lazy as _
from unidecode import unidecode
......@@ -33,7 +33,7 @@ class FormFieldBlock(StructBlock):
template = 'stream_forms/render_field.html'
def get_slug(self, struct_value):
return force_text(slugify(unidecode(struct_value['field_label'])))
return force_str(slugify(unidecode(struct_value['field_label'])))
def get_field_class(self, struct_value):
return self.field_class
......
......@@ -11,7 +11,7 @@ from django.shortcuts import redirect, render, resolve_url
from django.template.response import TemplateResponse
from django.urls import reverse_lazy
from django.utils.decorators import method_decorator
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from django.utils.http import is_safe_url, urlsafe_base64_decode
from django.views.decorators.cache import never_cache
from django.views.decorators.csrf import csrf_protect
......@@ -149,7 +149,7 @@ class ActivationView(TemplateView):
"""
try:
user = User.objects.get(**{
'pk': force_text(urlsafe_base64_decode(uidb64))
'pk': force_str(urlsafe_base64_decode(uidb64))
})
return user
except (TypeError, ValueError, OverflowError, User.DoesNotExist):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment