Commit 62eb79fc authored by Aymeric Augustin's avatar Aymeric Augustin Committed by Tim Graham
Browse files

[1.7.x] Appeased flake8 2.1.0. 

Backport of 428c0bbe from master
parent 50dddbdf

django/contrib/auth/management/__init__.py

+3 −3
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ def create_permissions(app_config, verbosity=2, interactive=True, using=DEFAULT_ 
    ))



    perms = [

        Permission(codename=codename, name=name, content_type=ctype)

        for ctype, (codename, name) in searched_perms

        if (ctype.pk, codename) not in all_perms

        Permission(codename=codename, name=name, content_type=ct)

        for ct, (codename, name) in searched_perms

        if (ct.pk, codename) not in all_perms

    ]

    # Validate the permissions before bulk_creation to avoid cryptic

    # database error when the verbose_name is longer than 50 characters

django/contrib/gis/views.py

+1 −5
Original line number Diff line number Diff line
@@ -9,11 +9,7 @@ def feed(request, url, feed_dict=None): 
    if not feed_dict:

        raise Http404(_("No feeds are registered."))



    try:

        slug, param = url.split('/', 1)

    except ValueError:

        slug, param = url, ''



    slug = url.partition('/')[0]

    try:

        f = feed_dict[slug]

    except KeyError:

django/contrib/staticfiles/management/commands/collectstatic.py

+4 −3
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ from django.core.management.base import CommandError, NoArgsCommand 
from django.utils.encoding import smart_text

from django.utils.six.moves import input



from django.contrib.staticfiles import finders, storage

from django.contrib.staticfiles.finders import get_finders

from django.contrib.staticfiles.storage import staticfiles_storage





class Command(NoArgsCommand):
@@ -52,7 +53,7 @@ class Command(NoArgsCommand): 
        self.symlinked_files = []

        self.unmodified_files = []

        self.post_processed_files = []

        self.storage = storage.staticfiles_storage

        self.storage = staticfiles_storage

        try:

            self.storage.path('')

        except NotImplementedError:
@@ -93,7 +94,7 @@ class Command(NoArgsCommand): 
            handler = self.copy_file



        found_files = OrderedDict()

        for finder in finders.get_finders():

        for finder in get_finders():

            for path, storage in finder.list(self.ignore_patterns):

                # Prefix the relative path if the source storage contains it

                if getattr(storage, 'prefix', None):

django/core/management/commands/loaddata.py

+3 −3
Original line number Diff line number Diff line
@@ -239,9 +239,9 @@ class Command(BaseCommand): 
        for app_config in apps.get_app_configs():

            if self.app_label and app_config.label != self.app_label:

                continue

            d = os.path.join(app_config.path, 'fixtures')

            if os.path.isdir(d):

                dirs.append(d)

            app_dir = os.path.join(app_config.path, 'fixtures')

            if os.path.isdir(app_dir):

                dirs.append(app_dir)

        dirs.extend(list(settings.FIXTURE_DIRS))

        dirs.append('')

        dirs = [upath(os.path.abspath(os.path.realpath(d))) for d in dirs]

django/db/models/base.py

+1 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ class Model(six.with_metaclass(ModelBase)): 


        errors = []

        managers = cls._meta.concrete_managers + cls._meta.abstract_managers

        for (_, _, manager) in managers:

        for __, __, manager in managers:

            errors.extend(manager.check(**kwargs))

        return errors