[py3] Replaced unicode/str by six.text_type/bytes.

3 files changed, 5 insertions, 4 deletions

diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py
index 11b14dcb51..1bc843cdf9 100644
--- a/django/contrib/admin/helpers.py
+++ b/django/contrib/admin/helpers.py
@@ -189,7 +189,7 @@ class AdminReadonlyField(object):
                 if value is None:
                     result_repr = EMPTY_CHANGELIST_VALUE
                 elif isinstance(f.rel, ManyToManyRel):
-                    result_repr = ", ".join(map(unicode, value.all()))
+                    result_repr = ", ".join(map(six.text_type, value.all()))
                 else:
                     result_repr = display_for_field(value, f)
         return conditional_escape(result_repr)
diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py
index a529bacd18..16bdfe0566 100644
--- a/django/contrib/admin/util.py
+++ b/django/contrib/admin/util.py
@@ -275,10 +275,10 @@ def label_for_field(name, model, model_admin=None, return_attr=False):
     except models.FieldDoesNotExist:
         if name == "__unicode__":
             label = force_unicode(model._meta.verbose_name)
-            attr = unicode
+            attr = six.text_type
         elif name == "__str__":
             label = smart_str(model._meta.verbose_name)
-            attr = str
+            attr = bytes
         else:
             if callable(name):
                 attr = name
diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py
index 37f286d0d4..550ed0f7e2 100644
--- a/django/contrib/admin/widgets.py
+++ b/django/contrib/admin/widgets.py
@@ -15,6 +15,7 @@ from django.utils.text import Truncator
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.encoding import force_unicode
+from django.utils import six
 
 
 class FilteredSelectMultiple(forms.SelectMultiple):
@@ -121,7 +122,7 @@ def url_params_from_lookup_dict(lookups):
                 # See django.db.fields.BooleanField.get_prep_lookup
                 v = ('0', '1')[v]
             else:
-                v = unicode(v)
+                v = six.text_type(v)
             items.append((k, v))
         params.update(dict(items))
     return params