From bdca5ea345c548a82a80d198906818c9ccbef896 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Fri, 20 Jul 2012 14:48:51 +0200
Subject: [py3] Replaced unicode/str by six.text_type/bytes.

---
 django/forms/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'django/forms/models.py')

diff --git a/django/forms/models.py b/django/forms/models.py
index 1ef308d93a..0831d5f4b2 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -576,7 +576,7 @@ class BaseModelFormSet(BaseFormSet):
         else:
             return ugettext("Please correct the duplicate data for %(field)s, "
                 "which must be unique.") % {
-                    "field": get_text_list(unique_check, unicode(_("and"))),
+                    "field": get_text_list(unique_check, six.text_type(_("and"))),
                 }
 
     def get_date_error_message(self, date_check):
@@ -584,7 +584,7 @@ class BaseModelFormSet(BaseFormSet):
             "which must be unique for the %(lookup)s in %(date_field)s.") % {
             'field_name': date_check[2],
             'date_field': date_check[3],
-            'lookup': unicode(date_check[1]),
+            'lookup': six.text_type(date_check[1]),
         }
 
     def get_form_error(self):
-- 
cgit v1.3