Fix django 1.7 incompatibilities: Remove get_fieldsets() methods which don't work any more because of Django's move from using its own SortedDict to python's OrderedDict (which always is available in python 2.7 and later). The get_fieldsets() method on Form wasn't available in early versions of django, but since it's provided now, we don't need own code for this method.

 - Legacy-Id: 8830

Author: levkowetz

ietf/liaisons/forms.py

@@ -118,20 +118,6 @@ def set_organization_field(self):
     def as_div(self):
         return render_to_string('liaisons/liaisonform.html', {'form': self})
 
-    def get_fieldsets(self):
-        if not self.fieldsets:
-            yield dict(name=None, fields=self)
-        else:
-            for fieldset, fields in self.fieldsets:
-                fieldset_dict = dict(name=fieldset, fields=[])
-                for field_name in fields:
-                    if field_name in self.fields.keyOrder:
-                        fieldset_dict['fields'].append(self[field_name])
-                    if not fieldset_dict['fields']:
-                        # if there is no fields in this fieldset, we continue to next fieldset
-                        continue
-                yield fieldset_dict
-
     def full_clean(self):
         self.set_required_fields()
         super(LiaisonForm, self).full_clean()

ietf/nomcom/forms.py

@@ -89,21 +89,6 @@ def __unicode__(self):
     def as_div(self):
         return render_to_string('nomcom/nomcomform.html', {'form': self})
 
-    def get_fieldsets(self):
-        if not self.fieldsets:
-            yield dict(name=None, fields=self)
-        else:
-            for fieldset, fields in self.fieldsets:
-                fieldset_dict = dict(name=fieldset, fields=[])
-                for field_name in fields:
-                    if field_name in self.fields.keyOrder:
-                        fieldset_dict['fields'].append(self[field_name])
-                    if not fieldset_dict['fields']:
-                        # if there is no fields in this fieldset, we continue to next fieldset
-                        continue
-                yield fieldset_dict
-
-
 class EditMembersForm(BaseNomcomForm, forms.Form):
 
     members = MultiEmailField(label="Members email", required=False, widget=forms.Textarea)