fixes

[wolnelektury.git] / src / ajaxable / templatetags / ajaxable_tags.py

diff --git a/src/ajaxable/templatetags/ajaxable_tags.py b/src/ajaxable/templatetags/ajaxable_tags.py
index 31897d1..a9a308d 100644 (file)
--- a/src/ajaxable/templatetags/ajaxable_tags.py
+++ b/src/ajaxable/templatetags/ajaxable_tags.py
@@ -1,12 +1,12 @@
-# -*- coding: utf-8 -*-
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import template
-from django.utils.encoding import force_unicode
+from django.utils.encoding import force_str
 from django.utils.safestring import mark_safe
-
 from ajaxable.utils import placeholdized
+
+
 register = template.Library()
 
 
@@ -23,7 +23,7 @@ def placeholdized_ul(form):
 @register.filter
 def pretty_field(field, template=None):
     if template is None:
-        template = u'''
+        template = '''
             <li>
               <span class="error">%(errors)s</span>
               <label class="nohide"><span class="label">%(label)s: </span>%(input)s</label>
@@ -32,14 +32,14 @@ def pretty_field(field, template=None):
     return mark_safe(template % {
         'errors': field.errors,
         'input': field,
-        'label': ('*' if field.field.required else '') + force_unicode(field.label),
-        'helptext': force_unicode(field.help_text),
+        'label': ('*' if field.field.required else '') + force_str(field.label),
+        'helptext': force_str(field.help_text),
     })
 
 
 @register.filter
 def pretty_checkbox(field):
-    return pretty_field(field, template=u'''
+    return pretty_field(field, template='''
         <li class="checkbox">
           <span class="error">%(errors)s</span>
           <label class="nohide">%(input)s<span class="label"> %(label)s</span></label>