Commit ee191715 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

[py3] Fixed access to dict keys/values/items.

parent fa3f0aa0

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 self.__dict__.keys() + dir(self.default_settings)

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



    # For Python < 2.6:

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

django/contrib/admin/helpers.py

+2 −2
Original line number Diff line number Diff line
@@ -325,11 +325,11 @@ class AdminErrorList(forms.util.ErrorList): 
    """

    def __init__(self, form, inline_formsets):

        if form.is_bound:

            self.extend(form.errors.values())

            self.extend(list(six.itervalues(form.errors)))

            for inline_formset in inline_formsets:

                self.extend(inline_formset.non_form_errors())

                for errors_in_inline_form in inline_formset.errors:

                    self.extend(errors_in_inline_form.values())

                    self.extend(list(six.itervalues(errors_in_inline_form)))



def normalize_fieldsets(fieldsets):

    """

django/contrib/admin/options.py

+3 −3
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 = form.base_fields.keys() + list(self.get_readonly_fields(request, obj))

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

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



    def get_form(self, request, obj=None, **kwargs):
@@ -608,7 +608,7 @@ class ModelAdmin(BaseModelAdmin): 
        tuple (name, description).

        """

        choices = [] + default_choices

        for func, name, description in self.get_actions(request).itervalues():

        for func, name, description in six.itervalues(self.get_actions(request)):

            choice = (name, description % model_format_dict(self.opts))

            choices.append(choice)

        return choices
@@ -1415,7 +1415,7 @@ class InlineModelAdmin(BaseModelAdmin): 
        if self.declared_fieldsets:

            return self.declared_fieldsets

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

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

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

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



    def queryset(self, request):

django/contrib/admin/sites.py

+4 −3
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ from django.core.exceptions import ImproperlyConfigured 
from django.core.urlresolvers import reverse, NoReverseMatch

from django.template.response import TemplateResponse

from django.utils.safestring import mark_safe

from django.utils import six

from django.utils.text import capfirst

from django.utils.translation import ugettext as _

from django.views.decorators.cache import never_cache
@@ -133,7 +134,7 @@ class AdminSite(object): 
        """

        Get all the enabled actions as an iterable of (name, func).

        """

        return self._actions.iteritems()

        return six.iteritems(self._actions)



    def has_permission(self, request):

        """
@@ -239,7 +240,7 @@ class AdminSite(object): 
        )



        # Add in each model's views.

        for model, model_admin in self._registry.iteritems():

        for model, model_admin in six.iteritems(self._registry):

            urlpatterns += patterns('',

                url(r'^%s/%s/' % (model._meta.app_label, model._meta.module_name),

                    include(model_admin.urls))
@@ -370,7 +371,7 @@ class AdminSite(object): 
                        }



        # Sort the apps alphabetically.

        app_list = app_dict.values()

        app_list = list(six.itervalues(app_dict))

        app_list.sort(key=lambda x: x['name'])



        # Sort the models alphabetically within each app.

django/contrib/admin/templatetags/admin_list.py

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ from django.db import models 
from django.utils import formats

from django.utils.html import format_html

from django.utils.safestring import mark_safe

from django.utils import six

from django.utils.text import capfirst

from django.utils.translation import ugettext as _

from django.utils.encoding import smart_unicode, force_unicode
@@ -125,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 = ordering_field_columns.keys().index(i) + 1

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

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

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