Fix compatibility with Django 3.0 alpha

Removed django.utils.six dependency, copied the parts we still need for
Python 2 compatibility.
This commit is contained in:
Diederik van der Boor
2019-07-12 17:38:49 +02:00
parent 7a315f7c17
commit 8fb8f47fb0
10 changed files with 71 additions and 26 deletions
+1 -2
View File
@@ -5,7 +5,6 @@ import inspect
from django.contrib import admin
from django.urls import resolve
from django.utils import six
from django.utils.translation import ugettext_lazy as _
from polymorphic.utils import get_base_polymorphic_model
@@ -216,7 +215,7 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin):
# By not declaring the fields/form in the base class,
# get_form() will populate the form with all available fields.
form = self.get_form(request, obj, exclude=exclude)
subclass_fields = list(six.iterkeys(form.base_fields)) + list(self.get_readonly_fields(request, obj))
subclass_fields = list(form.base_fields.keys()) + list(self.get_readonly_fields(request, obj))
# Find which fields are not part of the common fields.
for fieldset in self.get_base_fieldsets(request, obj):