Commit 14ecbd02 authored by Curtis Maloney's avatar Curtis Maloney
Browse files

Removed cases of six.iter* wrapped in a list() 

There's absolutely no advantage [and a mild performance hit] to using six.iter*
in these cases.
parent 36e90d1f

django/contrib/admin/helpers.py

+2 −2
Original line number Diff line number Diff line
@@ -353,8 +353,8 @@ class AdminErrorList(forms.utils.ErrorList): 
        super(AdminErrorList, self).__init__()



        if form.is_bound:

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

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

            for inline_formset in inline_formsets:

                self.extend(inline_formset.non_form_errors())

                for errors_in_inline_form in inline_formset.errors:

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

django/contrib/admin/sites.py

+2 −3
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ class AdminSite(object): 
        # Add in each model's views, and create a list of valid URLS for the

        # app_index

        valid_app_labels = []

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

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

            urlpatterns += [

                url(r'^%s/%s/' % (model._meta.app_label, model._meta.model_name), include(model_admin.urls)),

            ]
@@ -470,8 +470,7 @@ class AdminSite(object): 
        app_dict = self._build_app_dict(request)



        # Sort the apps alphabetically.

        app_list = list(six.itervalues(app_dict))

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

        app_list = sorted(app_dict.values(), key=lambda x: x['name'].lower())



        # Sort the models alphabetically within each app.

        for app in app_list:

django/contrib/admindocs/views.py

+2 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ from django.template.base import ( 
    libraries,

)

from django.template.engine import Engine

from django.utils import six

from django.utils._os import upath

from django.utils.decorators import method_decorator

from django.utils.translation import ugettext as _
@@ -64,7 +63,7 @@ class TemplateTagIndexView(BaseAdminDocsView): 
        load_all_installed_template_libraries()



        tags = []

        app_libs = list(six.iteritems(libraries))

        app_libs = list(libraries.items())

        builtin_libs = [(None, lib) for lib in builtins]

        for module_name, library in builtin_libs + app_libs:

            for tag_name, tag_func in library.tags.items():
@@ -97,7 +96,7 @@ class TemplateFilterIndexView(BaseAdminDocsView): 
        load_all_installed_template_libraries()



        filters = []

        app_libs = list(six.iteritems(libraries))

        app_libs = list(libraries.items())

        builtin_libs = [(None, lib) for lib in builtins]

        for module_name, library in builtin_libs + app_libs:

            for filter_name, filter_func in library.filters.items():

django/contrib/sitemaps/views.py

+1 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ from django.core import urlresolvers 
from django.core.paginator import EmptyPage, PageNotAnInteger

from django.http import Http404

from django.template.response import TemplateResponse

from django.utils import six

from django.utils.http import http_date
@@ -56,7 +55,7 @@ def sitemap(request, sitemaps, section=None, 
            raise Http404("No sitemap available for section: %r" % section)

        maps = [sitemaps[section]]

    else:

        maps = list(six.itervalues(sitemaps))

        maps = sitemaps.values()

    page = request.GET.get("p", 1)



    urls = []

django/db/models/query_utils.py

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ from django.apps import apps 
from django.core.exceptions import FieldDoesNotExist

from django.db.backends import utils

from django.db.models.constants import LOOKUP_SEP

from django.utils import six, tree

from django.utils import tree



# PathInfo is used when converting lookups (fk__somecol). The contents

# describe the relation in Model terms (model Options and Fields for both
@@ -53,7 +53,7 @@ class Q(tree.Node): 
    default = AND



    def __init__(self, *args, **kwargs):

        super(Q, self).__init__(children=list(args) + list(six.iteritems(kwargs)))

        super(Q, self).__init__(children=list(args) + list(kwargs.items()))



    def _combine(self, other, conn):

        if not isinstance(other, Q):