Commit 4c97101b authored by Alex Gaynor's avatar Alex Gaynor
Browse files

remove a bunch of unnescesarry iterkeys() calls

parent 576ec12f

django/conf/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ class UserSettingsHolder(BaseSettings): 
        return getattr(self.default_settings, name)



    def __dir__(self):

        return list(six.iterkeys(self.__dict__)) + dir(self.default_settings)

        return list(self.__dict__) + dir(self.default_settings)



    # For Python < 2.6:

    __members__ = property(lambda self: self.__dir__())

django/contrib/admin/options.py

+2 −2
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ class ModelAdmin(BaseModelAdmin): 
        if self.declared_fieldsets:

            return self.declared_fieldsets

        form = self.get_form(request, obj)

        fields = list(six.iterkeys(form.base_fields)) + list(self.get_readonly_fields(request, obj))

        fields = list(form.base_fields) + list(self.get_readonly_fields(request, obj))

        return [(None, {'fields': fields})]



    def get_form(self, request, obj=None, **kwargs):
@@ -1415,7 +1415,7 @@ class InlineModelAdmin(BaseModelAdmin): 
        if self.declared_fieldsets:

            return self.declared_fieldsets

        form = self.get_formset(request, obj).form

        fields = list(six.iterkeys(form.base_fields)) + list(self.get_readonly_fields(request, obj))

        fields = list(form.base_fields) + list(self.get_readonly_fields(request, obj))

        return [(None, {'fields': fields})]



    def queryset(self, request):

django/contrib/admin/templatetags/admin_list.py

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ def result_headers(cl): 
        if i in ordering_field_columns:

            sorted = True

            order_type = ordering_field_columns.get(i).lower()

            sort_priority = list(six.iterkeys(ordering_field_columns)).index(i) + 1

            sort_priority = list(ordering_field_columns).index(i) + 1

            th_classes.append('sorted %sending' % order_type)

            new_order_type = {'asc': 'desc', 'desc': 'asc'}[order_type]

django/contrib/auth/admin.py

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ class UserAdmin(admin.ModelAdmin): 
        else:

            form = self.change_password_form(user)



        fieldsets = [(None, {'fields': list(six.iterkeys(form.base_fields))})]

        fieldsets = [(None, {'fields': list(form.base_fields)})]

        adminForm = admin.helpers.AdminForm(form, fieldsets, {})



        context = {

django/contrib/auth/tests/forms.py

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ class PasswordChangeFormTest(TestCase): 
    def test_field_order(self):

        # Regression test - check the order of fields:

        user = User.objects.get(username='testclient')

        self.assertEqual(list(six.iterkeys(PasswordChangeForm(user, {}).fields)),

        self.assertEqual(list(PasswordChangeForm(user, {}).fields),

                         ['old_password', 'new_password1', 'new_password2'])