diff --git a/categories/editor/templatetags/admin_tree_list_tags.py b/categories/editor/templatetags/admin_tree_list_tags.py index a9f4db5..3a38a4a 100644 --- a/categories/editor/templatetags/admin_tree_list_tags.py +++ b/categories/editor/templatetags/admin_tree_list_tags.py @@ -3,12 +3,12 @@ from django.db import models from django.template import Library from django.contrib.admin.templatetags.admin_list import result_headers, _boolean_icon try: - from django.contrib.admin.util import lookup_field, display_for_field, label_for_field + from django.contrib.admin.utils import lookup_field, display_for_field, label_for_field except ImportError: from categories.editor.utils import lookup_field, display_for_field, label_for_field from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE from django.core.exceptions import ObjectDoesNotExist -from django.utils.encoding import smart_unicode, force_unicode +from django.utils.encoding import smart_text, force_text from django.utils.html import escape, conditional_escape from django.utils.safestring import mark_safe @@ -44,7 +44,7 @@ def items_for_tree_result(cl, result, form): allow_tags = True result_repr = _boolean_icon(value) else: - result_repr = smart_unicode(value) + result_repr = smart_text(value) # Strip HTML tags in the resulting text, except if the # function has an "allow_tags" attribute set to True. if not allow_tags: @@ -71,7 +71,7 @@ def items_for_tree_result(cl, result, form): except (AttributeError, ObjectDoesNotExist): pass - if force_unicode(result_repr) == '': + if force_text(result_repr) == '': result_repr = mark_safe(' ') # If list_display_links not defined, add the link tag to the first field if (first and not cl.list_display_links) or field_name in cl.list_display_links: @@ -88,7 +88,7 @@ def items_for_tree_result(cl, result, form): else: attr = pk value = result.serializable_value(attr) - result_id = repr(force_unicode(value))[1:] + result_id = repr(force_text(value))[1:] first = False if django.VERSION[1] < 4: yield mark_safe('<%s%s>%s%s%s>' % \ @@ -103,12 +103,12 @@ def items_for_tree_result(cl, result, form): # can provide fields on a per request basis if form and field_name in form.fields: bf = form[field_name] - result_repr = mark_safe(force_unicode(bf.errors) + force_unicode(bf)) + result_repr = mark_safe(force_text(bf.errors) + force_text(bf)) else: result_repr = conditional_escape(result_repr) yield mark_safe('