Fixed #18269 -- Applied unicode_literals for Python 3 compatibility.

Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.

1 files changed, 12 insertions, 10 deletions

diff --git a/django/forms/util.py b/django/forms/util.py
index 6690442534..ca53b1f3d4 100644
--- a/django/forms/util.py
+++ b/django/forms/util.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.conf import settings
 from django.utils.html import conditional_escape
 from django.utils.encoding import StrAndUnicode, force_unicode
@@ -16,7 +18,7 @@ def flatatt(attrs):
     XML-style pairs.  It is assumed that the keys do not need to be XML-escaped.
     If the passed dictionary is empty, then return an empty string.
     """
-    return u''.join([u' %s="%s"' % (k, conditional_escape(v)) for k, v in attrs.items()])
+    return ''.join([' %s="%s"' % (k, conditional_escape(v)) for k, v in attrs.items()])
 
 class ErrorDict(dict, StrAndUnicode):
     """
@@ -28,13 +30,13 @@ class ErrorDict(dict, StrAndUnicode):
         return self.as_ul()
 
     def as_ul(self):
-        if not self: return u''
-        return mark_safe(u'<ul class="errorlist">%s</ul>'
-                % ''.join([u'<li>%s%s</li>' % (k, conditional_escape(force_unicode(v)))
+        if not self: return ''
+        return mark_safe('<ul class="errorlist">%s</ul>'
+                % ''.join(['<li>%s%s</li>' % (k, conditional_escape(force_unicode(v)))
                     for k, v in self.items()]))
 
     def as_text(self):
-        return u'\n'.join([u'* %s\n%s' % (k, u'\n'.join([u'  * %s' % force_unicode(i) for i in v])) for k, v in self.items()])
+        return '\n'.join(['* %s\n%s' % (k, '\n'.join(['  * %s' % force_unicode(i) for i in v])) for k, v in self.items()])
 
 class ErrorList(list, StrAndUnicode):
     """
@@ -44,13 +46,13 @@ class ErrorList(list, StrAndUnicode):
         return self.as_ul()
 
     def as_ul(self):
-        if not self: return u''
-        return mark_safe(u'<ul class="errorlist">%s</ul>'
-                % ''.join([u'<li>%s</li>' % conditional_escape(force_unicode(e)) for e in self]))
+        if not self: return ''
+        return mark_safe('<ul class="errorlist">%s</ul>'
+                % ''.join(['<li>%s</li>' % conditional_escape(force_unicode(e)) for e in self]))
 
     def as_text(self):
-        if not self: return u''
-        return u'\n'.join([u'* %s' % force_unicode(e) for e in self])
+        if not self: return ''
+        return '\n'.join(['* %s' % force_unicode(e) for e in self])
 
     def __repr__(self):
         return repr([force_unicode(e) for e in self])