summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShai Berger <shai@platonix.com>2014-03-12 20:34:05 +0200
committerShai Berger <shai@platonix.com>2014-03-12 20:34:05 +0200
commitfc79c3fb3daf64b911b1ff8fed30f73c56630416 (patch)
treed75a8895d8264ee8c3aced02c0ac8049d5f2018d
parentd181384e5f01e9d23fd9872b2cb532e0d70249b6 (diff)
Flake8 corrections
-rw-r--r--django/db/models/sql/compiler.py7
-rw-r--r--tests/invalid_models_tests/test_relative_fields.py1
-rw-r--r--tests/model_fields/models.py1
3 files changed, 4 insertions, 5 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 5636f344df..e166492896 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -956,10 +956,9 @@ class SQLUpdateCompiler(SQLCompiler):
val = val.prepare_database_save(field)
else:
raise TypeError("Database is trying to update a relational field "
- "of type %s with a value of type %s. Make sure "
- "you are setting the correct relations" %
- (field.__class__.__name__,
- val.__class__.__name__))
+ "of type %s with a value of type %s. Make sure "
+ "you are setting the correct relations" %
+ (field.__class__.__name__, val.__class__.__name__))
else:
val = field.get_db_prep_save(val, connection=self.connection)
diff --git a/tests/invalid_models_tests/test_relative_fields.py b/tests/invalid_models_tests/test_relative_fields.py
index dabbe61723..a1a4c6037f 100644
--- a/tests/invalid_models_tests/test_relative_fields.py
+++ b/tests/invalid_models_tests/test_relative_fields.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
from django.core.checks import Error
from django.db import models
-from django.db.models.fields import FieldDoesNotExist
from django.test.utils import override_settings
from django.test.testcases import skipIfDBFeature
diff --git a/tests/model_fields/models.py b/tests/model_fields/models.py
index b16287a66c..c9e6555525 100644
--- a/tests/model_fields/models.py
+++ b/tests/model_fields/models.py
@@ -48,6 +48,7 @@ class Whiz(models.Model):
class BigD(models.Model):
d = models.DecimalField(max_digits=38, decimal_places=30)
+
class FloatModel(models.Model):
size = models.FloatField()