From df8d8d4292684d6ffa7474f1e201aed486f02b53 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 28 Mar 2016 18:33:29 -0400 Subject: Fixed E128 flake8 warnings in django/. --- django/db/models/fields/__init__.py | 41 +++++++++++------------- django/db/models/fields/files.py | 3 +- django/db/models/fields/related.py | 43 ++++++++++++++----------- django/db/models/fields/related_descriptors.py | 44 ++++++++++++++++---------- django/db/models/fields/reverse_related.py | 13 ++++---- 5 files changed, 78 insertions(+), 66 deletions(-) (limited to 'django/db/models/fields') diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index 14f7058285..812e5425fc 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -137,12 +137,12 @@ class Field(RegisterLookupMixin): description = property(_description) def __init__(self, verbose_name=None, name=None, primary_key=False, - max_length=None, unique=False, blank=False, null=False, - db_index=False, rel=None, default=NOT_PROVIDED, editable=True, - serialize=True, unique_for_date=None, unique_for_month=None, - unique_for_year=None, choices=None, help_text='', db_column=None, - db_tablespace=None, auto_created=False, validators=[], - error_messages=None): + max_length=None, unique=False, blank=False, null=False, + db_index=False, rel=None, default=NOT_PROVIDED, editable=True, + serialize=True, unique_for_date=None, unique_for_month=None, + unique_for_year=None, choices=None, help_text='', db_column=None, + db_tablespace=None, auto_created=False, validators=[], + error_messages=None): self.name = name self.verbose_name = verbose_name # May be set by set_attributes_from_name self._verbose_name = verbose_name # Store original for deconstruction @@ -806,8 +806,7 @@ class Field(RegisterLookupMixin): if callable(self.default): return self.default() return self.default - if (not self.empty_strings_allowed or (self.null and - not connection.features.interprets_empty_strings_as_nulls)): + if not self.empty_strings_allowed or self.null and not connection.features.interprets_empty_strings_as_nulls: return None return "" @@ -1177,10 +1176,8 @@ class DateTimeCheckMixin(object): # auto_now, auto_now_add, and default are mutually exclusive # options. The use of more than one of these options together # will trigger an Error - mutually_exclusive_options = [self.auto_now_add, self.auto_now, - self.has_default()] - enabled_options = [option not in (None, False) - for option in mutually_exclusive_options].count(True) + mutually_exclusive_options = [self.auto_now_add, self.auto_now, self.has_default()] + enabled_options = [option not in (None, False) for option in mutually_exclusive_options].count(True) if enabled_options > 1: return [ checks.Error( @@ -1314,12 +1311,14 @@ class DateField(DateTimeCheckMixin, Field): def contribute_to_class(self, cls, name, **kwargs): super(DateField, self).contribute_to_class(cls, name, **kwargs) if not self.null: - setattr(cls, 'get_next_by_%s' % self.name, - curry(cls._get_next_or_previous_by_FIELD, field=self, - is_next=True)) - setattr(cls, 'get_previous_by_%s' % self.name, - curry(cls._get_next_or_previous_by_FIELD, field=self, - is_next=False)) + setattr( + cls, 'get_next_by_%s' % self.name, + curry(cls._get_next_or_previous_by_FIELD, field=self, is_next=True) + ) + setattr( + cls, 'get_previous_by_%s' % self.name, + curry(cls._get_next_or_previous_by_FIELD, field=self, is_next=False) + ) def get_prep_value(self, value): value = super(DateField, self).get_prep_value(value) @@ -1633,8 +1632,7 @@ class DecimalField(Field): return utils.format_number(value, self.max_digits, self.decimal_places) def get_db_prep_save(self, value, connection): - return connection.ops.adapt_decimalfield_value(self.to_python(value), - self.max_digits, self.decimal_places) + return connection.ops.adapt_decimalfield_value(self.to_python(value), self.max_digits, self.decimal_places) def get_prep_value(self, value): value = super(DecimalField, self).get_prep_value(value) @@ -2002,8 +2000,7 @@ class GenericIPAddressField(Field): value = force_text(value) value = value.strip() if ':' in value: - return clean_ipv6_address(value, - self.unpack_ipv4, self.error_messages['invalid']) + return clean_ipv6_address(value, self.unpack_ipv4, self.error_messages['invalid']) return value def get_db_prep_value(self, value, connection, prepared=False): diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py index 763fdd8093..1d0308b7da 100644 --- a/django/db/models/fields/files.py +++ b/django/db/models/fields/files.py @@ -369,8 +369,7 @@ class ImageField(FileField): descriptor_class = ImageFileDescriptor description = _("Image") - def __init__(self, verbose_name=None, name=None, width_field=None, - height_field=None, **kwargs): + def __init__(self, verbose_name=None, name=None, width_field=None, height_field=None, **kwargs): self.width_field, self.height_field = width_field, height_field super(ImageField, self).__init__(verbose_name, name, **kwargs) diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 001b0907ab..0539647bcc 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -221,8 +221,7 @@ class RelatedField(Field): # model_set and it clashes with Target.model_set. potential_clashes = rel_opts.fields + rel_opts.many_to_many for clash_field in potential_clashes: - clash_name = "%s.%s" % (rel_opts.object_name, - clash_field.name) # i. e. "Target.model_set" + clash_name = "%s.%s" % (rel_opts.object_name, clash_field.name) # i.e. "Target.model_set" if not rel_is_hidden and clash_field.name == rel_name: errors.append( checks.Error( @@ -441,8 +440,8 @@ class ForeignObject(RelatedField): rel_class = ForeignObjectRel def __init__(self, to, on_delete, from_fields, to_fields, rel=None, related_name=None, - related_query_name=None, limit_choices_to=None, parent_link=False, - swappable=True, **kwargs): + related_query_name=None, limit_choices_to=None, parent_link=False, + swappable=True, **kwargs): if rel is None: rel = self.rel_class( @@ -491,8 +490,9 @@ class ForeignObject(RelatedField): has_unique_constraint = any(u <= foreign_fields for u in unique_foreign_fields) if not has_unique_constraint and len(self.foreign_related_fields) > 1: - field_combination = ', '.join("'%s'" % rel_field.name - for rel_field in self.foreign_related_fields) + field_combination = ', '.join( + "'%s'" % rel_field.name for rel_field in self.foreign_related_fields + ) model_name = self.remote_field.model.__name__ return [ checks.Error( @@ -743,8 +743,8 @@ class ForeignKey(ForeignObject): description = _("Foreign Key (type determined by related field)") def __init__(self, to, on_delete=None, related_name=None, related_query_name=None, - limit_choices_to=None, parent_link=False, to_field=None, - db_constraint=True, **kwargs): + limit_choices_to=None, parent_link=False, to_field=None, + db_constraint=True, **kwargs): try: to._meta.model_name except AttributeError: @@ -1111,9 +1111,9 @@ class ManyToManyField(RelatedField): description = _("Many-to-many relationship") def __init__(self, to, related_name=None, related_query_name=None, - limit_choices_to=None, symmetrical=None, through=None, - through_fields=None, db_constraint=True, db_table=None, - swappable=True, **kwargs): + limit_choices_to=None, symmetrical=None, through=None, + through_fields=None, db_constraint=True, db_table=None, + swappable=True, **kwargs): try: to._meta except AttributeError: @@ -1241,8 +1241,10 @@ class ManyToManyField(RelatedField): # Count foreign keys in intermediate model if self_referential: - seen_self = sum(from_model == getattr(field.remote_field, 'model', None) - for field in self.remote_field.through._meta.fields) + seen_self = sum( + from_model == getattr(field.remote_field, 'model', None) + for field in self.remote_field.through._meta.fields + ) if seen_self > 2 and not self.remote_field.through_fields: errors.append( @@ -1260,10 +1262,14 @@ class ManyToManyField(RelatedField): else: # Count foreign keys in relationship model - seen_from = sum(from_model == getattr(field.remote_field, 'model', None) - for field in self.remote_field.through._meta.fields) - seen_to = sum(to_model == getattr(field.remote_field, 'model', None) - for field in self.remote_field.through._meta.fields) + seen_from = sum( + from_model == getattr(field.remote_field, 'model', None) + for field in self.remote_field.through._meta.fields + ) + seen_to = sum( + to_model == getattr(field.remote_field, 'model', None) + for field in self.remote_field.through._meta.fields + ) if seen_from > 1 and not self.remote_field.through_fields: errors.append( @@ -1469,8 +1475,7 @@ class ManyToManyField(RelatedField): elif self.db_table: return self.db_table else: - return utils.truncate_name('%s_%s' % (opts.db_table, self.name), - connection.ops.max_name_length()) + return utils.truncate_name('%s_%s' % (opts.db_table, self.name), connection.ops.max_name_length()) def _get_m2m_attr(self, related, attr): """ diff --git a/django/db/models/fields/related_descriptors.py b/django/db/models/fields/related_descriptors.py index b6349e5c49..8599911a41 100644 --- a/django/db/models/fields/related_descriptors.py +++ b/django/db/models/fields/related_descriptors.py @@ -868,16 +868,19 @@ def create_forward_many_to_many_manager(superclass, rel, reverse): def clear(self): db = router.db_for_write(self.through, instance=self.instance) with transaction.atomic(using=db, savepoint=False): - signals.m2m_changed.send(sender=self.through, action="pre_clear", + signals.m2m_changed.send( + sender=self.through, action="pre_clear", instance=self.instance, reverse=self.reverse, - model=self.model, pk_set=None, using=db) - + model=self.model, pk_set=None, using=db, + ) filters = self._build_remove_filters(super(ManyRelatedManager, self).get_queryset().using(db)) self.through._default_manager.using(db).filter(filters).delete() - signals.m2m_changed.send(sender=self.through, action="post_clear", + signals.m2m_changed.send( + sender=self.through, action="post_clear", instance=self.instance, reverse=self.reverse, - model=self.model, pk_set=None, using=db) + model=self.model, pk_set=None, using=db, + ) clear.alters_data = True def set(self, objs, **kwargs): @@ -905,9 +908,10 @@ def create_forward_many_to_many_manager(superclass, rel, reverse): new_objs = [] for obj in objs: - fk_val = (self.target_field.get_foreign_related_value(obj)[0] - if isinstance(obj, self.model) else obj) - + fk_val = ( + self.target_field.get_foreign_related_value(obj)[0] + if isinstance(obj, self.model) else obj + ) if fk_val in old_ids: old_ids.remove(fk_val) else: @@ -998,9 +1002,11 @@ def create_forward_many_to_many_manager(superclass, rel, reverse): if self.reverse or source_field_name == self.source_field_name: # Don't send the signal when we are inserting the # duplicate data row for symmetrical reverse entries. - signals.m2m_changed.send(sender=self.through, action='pre_add', + signals.m2m_changed.send( + sender=self.through, action='pre_add', instance=self.instance, reverse=self.reverse, - model=self.model, pk_set=new_ids, using=db) + model=self.model, pk_set=new_ids, using=db, + ) # Add the ones that aren't there already self.through._default_manager.using(db).bulk_create([ @@ -1014,9 +1020,11 @@ def create_forward_many_to_many_manager(superclass, rel, reverse): if self.reverse or source_field_name == self.source_field_name: # Don't send the signal when we are inserting the # duplicate data row for symmetrical reverse entries. - signals.m2m_changed.send(sender=self.through, action='post_add', + signals.m2m_changed.send( + sender=self.through, action='post_add', instance=self.instance, reverse=self.reverse, - model=self.model, pk_set=new_ids, using=db) + model=self.model, pk_set=new_ids, using=db, + ) def _remove_items(self, source_field_name, target_field_name, *objs): # source_field_name: the PK colname in join table for the source object @@ -1037,9 +1045,11 @@ def create_forward_many_to_many_manager(superclass, rel, reverse): db = router.db_for_write(self.through, instance=self.instance) with transaction.atomic(using=db, savepoint=False): # Send a signal to the other end if need be. - signals.m2m_changed.send(sender=self.through, action="pre_remove", + signals.m2m_changed.send( + sender=self.through, action="pre_remove", instance=self.instance, reverse=self.reverse, - model=self.model, pk_set=old_ids, using=db) + model=self.model, pk_set=old_ids, using=db, + ) target_model_qs = super(ManyRelatedManager, self).get_queryset() if target_model_qs._has_filters(): old_vals = target_model_qs.using(db).filter(**{ @@ -1049,8 +1059,10 @@ def create_forward_many_to_many_manager(superclass, rel, reverse): filters = self._build_remove_filters(old_vals) self.through._default_manager.using(db).filter(filters).delete() - signals.m2m_changed.send(sender=self.through, action="post_remove", + signals.m2m_changed.send( + sender=self.through, action="post_remove", instance=self.instance, reverse=self.reverse, - model=self.model, pk_set=old_ids, using=db) + model=self.model, pk_set=old_ids, using=db, + ) return ManyRelatedManager diff --git a/django/db/models/fields/reverse_related.py b/django/db/models/fields/reverse_related.py index 0d2ed35c69..93f0d4aba0 100644 --- a/django/db/models/fields/reverse_related.py +++ b/django/db/models/fields/reverse_related.py @@ -40,7 +40,7 @@ class ForeignObjectRel(object): null = True def __init__(self, field, to, related_name=None, related_query_name=None, - limit_choices_to=None, parent_link=False, on_delete=None): + limit_choices_to=None, parent_link=False, on_delete=None): self.field = field self.model = to self.related_name = related_name @@ -212,7 +212,7 @@ class ManyToOneRel(ForeignObjectRel): """ def __init__(self, field, to, field_name, related_name=None, related_query_name=None, - limit_choices_to=None, parent_link=False, on_delete=None): + limit_choices_to=None, parent_link=False, on_delete=None): super(ManyToOneRel, self).__init__( field, to, related_name=related_name, @@ -235,8 +235,7 @@ class ManyToOneRel(ForeignObjectRel): """ field = self.model._meta.get_field(self.field_name) if not field.concrete: - raise exceptions.FieldDoesNotExist("No related field named '%s'" % - self.field_name) + raise exceptions.FieldDoesNotExist("No related field named '%s'" % self.field_name) return field def set_field_name(self): @@ -252,7 +251,7 @@ class OneToOneRel(ManyToOneRel): """ def __init__(self, field, to, field_name, related_name=None, related_query_name=None, - limit_choices_to=None, parent_link=False, on_delete=None): + limit_choices_to=None, parent_link=False, on_delete=None): super(OneToOneRel, self).__init__( field, to, field_name, related_name=related_name, @@ -274,8 +273,8 @@ class ManyToManyRel(ForeignObjectRel): """ def __init__(self, field, to, related_name=None, related_query_name=None, - limit_choices_to=None, symmetrical=True, through=None, through_fields=None, - db_constraint=True): + limit_choices_to=None, symmetrical=True, through=None, + through_fields=None, db_constraint=True): super(ManyToManyRel, self).__init__( field, to, related_name=related_name, -- cgit v1.3