Ticket #12224: ticket#1224.diff

django/contrib/auth/management/__init__.py

@@ -4 +4 @@
 
 from django.db.models import get_models, signals
 from django.contrib.auth import models as auth_app
+from django.utils.encoding import force_unicode
 
 def _get_permission_codename(action, opts):
     return u'%s_%s' % (action, opts.object_name.lower())
@@ -25 +26 @@
         ctype = ContentType.objects.get_for_model(klass)
         for codename, name in _get_all_permissions(klass._meta):
             p, created = Permission.objects.get_or_create(codename=codename, content_type__pk=ctype.id,
-                defaults={'name': name, 'content_type': ctype})
+                defaults={'name': force_unicode(name), 'content_type': ctype})
             if created and verbosity >= 2:
                 print "Adding permission '%s'" % p