summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-02-09 06:13:10 -0500
committerTim Graham <timograham@gmail.com>2014-02-09 06:13:10 -0500
commit4f8e8a6ec2e449e7a6c2e89f011c744ec6874c82 (patch)
tree4759a91aa39d95930087758da7b5c1b00bf7c1d9
parenta7e2957110e8cac6ad5bf233ce4cc1fa528ac0e0 (diff)
Removed unused imports + other flake8 fixes.
-rw-r--r--django/db/migrations/operations/special.py2
-rw-r--r--tests/decorators/tests.py3
-rw-r--r--tests/migrations/test_checks.py2
-rw-r--r--tests/migrations/test_operations.py1
4 files changed, 4 insertions, 4 deletions
diff --git a/django/db/migrations/operations/special.py b/django/db/migrations/operations/special.py
index 8d001034ad..91afa14326 100644
--- a/django/db/migrations/operations/special.py
+++ b/django/db/migrations/operations/special.py
@@ -1,7 +1,5 @@
import re
-import textwrap
from .base import Operation
-from django.utils import six
class SeparateDatabaseAndState(Operation):
diff --git a/tests/decorators/tests.py b/tests/decorators/tests.py
index bd4fa4756c..e72e6cfee3 100644
--- a/tests/decorators/tests.py
+++ b/tests/decorators/tests.py
@@ -174,6 +174,7 @@ def myattr2_dec(func):
myattr2_dec_m = method_decorator(myattr2_dec)
+
class ClsDec(object):
def __init__(self, myattr):
self.myattr = myattr
@@ -233,7 +234,7 @@ class MethodDecoratorTests(TestCase):
# t = Test()
self.assertEqual(Test().method(), False)
-
+
class XFrameOptionsDecoratorsTests(TestCase):
"""
diff --git a/tests/migrations/test_checks.py b/tests/migrations/test_checks.py
index 9ba5bb8e25..27a44c6164 100644
--- a/tests/migrations/test_checks.py
+++ b/tests/migrations/test_checks.py
@@ -1,7 +1,7 @@
# encoding: utf8
from django.core import checks
from django.core.checks.migrations import check_migrations
-from django.test import TestCase, override_settings
+from django.test import override_settings
from .test_base import MigrationTestBase
diff --git a/tests/migrations/test_operations.py b/tests/migrations/test_operations.py
index 9d5ae91510..ef23dcf80f 100644
--- a/tests/migrations/test_operations.py
+++ b/tests/migrations/test_operations.py
@@ -478,6 +478,7 @@ class OperationTests(MigrationTestBase):
"""
project_state = self.set_up_test_model("test_runpython")
+
# Create the operation
def inner_method(models, schema_editor):
Pony = models.get_model("test_runpython", "Pony")