summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-06-18 07:47:13 -0700
committerTim Graham <timograham@gmail.com>2014-06-18 12:05:36 -0400
commit1d9f308fa19b7740cf9bd28ddada52b572e25c3a (patch)
tree0eb29311ece5bb8a4d26f29b5b54c401eb0222b9
parent819d5f0c89146dee0350290c9635e13a3069ccae (diff)
[1.7.x] Fixed several flake8 errors
Backport of d015c9d11c from master
-rw-r--r--tests/migrations/test_operations.py5
-rw-r--r--tests/schema/tests.py1
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/migrations/test_operations.py b/tests/migrations/test_operations.py
index f6ce5fc96a..380d8ba0a9 100644
--- a/tests/migrations/test_operations.py
+++ b/tests/migrations/test_operations.py
@@ -83,7 +83,7 @@ class OperationTestBase(MigrationTestBase):
("pink", models.IntegerField(default=3)),
("weight", models.FloatField()),
],
- options = {
+ options={
"swappable": "TEST_SWAP_MODEL",
},
)]
@@ -142,7 +142,6 @@ class OperationTests(OperationTestBase):
both forwards and backwards.
"""
-
def test_create_model(self):
"""
Tests the CreateModel operation.
@@ -1161,7 +1160,7 @@ class SwappableOperationTests(OperationTestBase):
("id", models.AutoField(primary_key=True)),
("pink", models.IntegerField(default=1)),
],
- options = {
+ options={
"swappable": "TEST_SWAP_MODEL",
},
)
diff --git a/tests/schema/tests.py b/tests/schema/tests.py
index 816c8e26c5..1acf132445 100644
--- a/tests/schema/tests.py
+++ b/tests/schema/tests.py
@@ -7,7 +7,6 @@ from django.db import connection, DatabaseError, IntegrityError, OperationalErro
from django.db.models.fields import IntegerField, TextField, CharField, SlugField, BooleanField, BinaryField
from django.db.models.fields.related import ManyToManyField, ForeignKey
from django.db.transaction import atomic
-from django.utils import six
from .models import (Author, AuthorWithM2M, Book, BookWithLongName,
BookWithSlug, BookWithM2M, Tag, TagIndexed, TagM2MTest, TagUniqueRename,
UniqueTest, Thing, TagThrough, BookWithM2MThrough, AuthorTag, AuthorWithM2MThrough)