Anpassungen des Codes an Django 1.11 mit Python 3

Grapelli wurde entfernt, das neue Django Admin ist hübsch genug.

src/utils/html5/base.py

@@ -3,7 +3,7 @@ import re
 from django.core.urlresolvers import reverse
 from django.core.serializers.json import DjangoJSONEncoder
 from django.http import HttpResponse
-from django.utils.encoding import smart_unicode, force_unicode
+from django.utils.encoding import smart_text, force_text
 
 
 try:
@@ -29,13 +29,13 @@ class LookupBase(object):
         return []
 
     def get_item_label(self, item):
-        return smart_unicode(item)
+        return smart_text(item)
 
     def get_item_id(self, item):
-        return smart_unicode(item)
+        return smart_text(item)
 
     def get_item_value(self, item):
-        return smart_unicode(item)
+        return smart_text(item)
 
     def get_item(self, value):
         return value
@@ -84,7 +84,7 @@ class LookupRegistry(object):
 
     def register(self, lookup):
         self.validate(lookup)
-        name = force_unicode(lookup.name())
+        name = force_text(lookup.name())
         if name in self._registry:
             raise LookupAlreadyRegistered(u'The name %s is already registered'
                                           % name)
@@ -92,7 +92,7 @@ class LookupRegistry(object):
 
     def unregister(self, lookup):
         self.validate(lookup)
-        name = force_unicode(lookup.name())
+        name = force_text(lookup.name())
         if name not in self._registry:
             raise LookupNotRegistered(u'The name %s is not registered' % name)
         del self._registry[name]

src/utils/html5/widgets.py

@@ -7,7 +7,7 @@ from django.conf import settings
 from django.forms import widgets
 from django.forms.utils import flatatt
 from django.utils import formats
-from django.utils.encoding import force_unicode, force_text
+from django.utils.encoding import force_text
 from django.utils.html import conditional_escape
 from django.utils.http import urlencode
 from django.utils.safestring import mark_safe
@@ -98,7 +98,7 @@ class CheckboxInput(widgets.CheckboxInput):
         if not (
                 value is True or value is False or value is None or value == ''):  # @IgnorePep8
             # Only add the 'value' attribute if a value is non-empty.
-            final_attrs['value'] = force_unicode(value)
+            final_attrs['value'] = force_text(value)
 
         return mark_safe(u'<input%s /> %s' % (flatatt(final_attrs), title))
 
@@ -161,7 +161,7 @@ class Textarea(widgets.Widget):
         final_attrs = self.build_attrs(attrs, name=name)
         return mark_safe(u'<textarea%s>%s</textarea>' % (flatatt(final_attrs),
                                                          conditional_escape(
-                                                             force_unicode(
+                                                             force_text(
                                                                  value))))
 
 
@@ -208,7 +208,7 @@ class LookupMultipleHiddenInput(widgets.MultipleHiddenInput):
             if model and isinstance(v, model):
                 item = v
                 v = lookup.get_item_id(item)
-            input_attrs = dict(value=force_unicode(v), **final_attrs)
+            input_attrs = dict(value=force_text(v), **final_attrs)
             if id_:
                 # An ID attribute was given. Add a numeric index as a suffix
                 # so that the inputs don't all have the same ID attribute.