summaryrefslogtreecommitdiff
path: root/django/db/models
diff options
context:
space:
mode:
Diffstat (limited to 'django/db/models')
-rw-r--r--django/db/models/base.py4
-rw-r--r--django/db/models/fields/__init__.py4
-rw-r--r--django/db/models/fields/related.py4
3 files changed, 6 insertions, 6 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py
index c7c62ea367..cd872a3559 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -566,8 +566,8 @@ class Model(six.with_metaclass(ModelBase)):
deferred_fields = [
f.attname for f in self._meta.fields
if f.attname not in self.__dict__
- and isinstance(self.__class__.__dict__[f.attname],
- DeferredAttribute)]
+ and isinstance(self.__class__.__dict__[f.attname],
+ DeferredAttribute)]
loaded_fields = field_names.difference(deferred_fields)
if loaded_fields:
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 019714af6e..8fe1c9e4e4 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -704,7 +704,7 @@ class AutoField(Field):
def __init__(self, *args, **kwargs):
assert kwargs.get('primary_key', False) is True, \
- "%ss must have primary_key=True." % self.__class__.__name__
+ "%ss must have primary_key=True." % self.__class__.__name__
kwargs['blank'] = True
Field.__init__(self, *args, **kwargs)
@@ -746,7 +746,7 @@ class AutoField(Field):
def contribute_to_class(self, cls, name):
assert not cls._meta.has_auto_field, \
- "A model can't have more than one AutoField."
+ "A model can't have more than one AutoField."
super(AutoField, self).contribute_to_class(cls, name)
cls._meta.has_auto_field = True
cls._meta.auto_field = self
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
index 8252cce672..f82fdc91b9 100644
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -1247,8 +1247,8 @@ class ForeignKey(ForeignObject):
using = router.db_for_read(model_instance.__class__, instance=model_instance)
qs = self.rel.to._default_manager.using(using).filter(
- **{self.rel.field_name: value}
- )
+ **{self.rel.field_name: value}
+ )
qs = qs.complex_filter(self.rel.limit_choices_to)
if not qs.exists():
raise exceptions.ValidationError(