summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2015-06-03 19:21:23 -0600
committerCarl Meyer <carl@oddbird.net>2015-06-03 19:21:23 -0600
commit2358c1e5d771ab09ec555ffc8c3c46d56507293e (patch)
tree2226edce88301434de7e91951edeadf4fdd0e421
parentfeed5ad2a07223d14f8304920fa761c972559b07 (diff)
[1.8.x] Cleaned up docstring style, per Tim Graham review.
Backport of 57dbc87ade5533d78089690ec7795034ff69177a from master.
-rw-r--r--django/db/migrations/executor.py1
-rw-r--r--tests/migrations/test_executor.py9
2 files changed, 2 insertions, 8 deletions
diff --git a/django/db/migrations/executor.py b/django/db/migrations/executor.py
index 39ed2e4d3d..aeb021e33c 100644
--- a/django/db/migrations/executor.py
+++ b/django/db/migrations/executor.py
@@ -187,7 +187,6 @@ class MigrationExecutor(object):
all its replaced migrations applied. In this case no new migration will
be applied, but we still want to correctly maintain the applied state
of the squash migration.
-
"""
applied = self.recorder.applied_migrations()
for key, migration in self.loader.replacements.items():
diff --git a/tests/migrations/test_executor.py b/tests/migrations/test_executor.py
index 0eefc32b1f..12bdabb172 100644
--- a/tests/migrations/test_executor.py
+++ b/tests/migrations/test_executor.py
@@ -415,9 +415,7 @@ class ExecutorTests(MigrationTestBase):
@override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_squashed"})
def test_apply_all_replaced_marks_replacement_as_applied(self):
"""
- Applying all replaced migrations marks the replacement as applied.
-
- Ticket #24628.
+ Applying all replaced migrations marks replacement as applied (#24628).
"""
recorder = MigrationRecorder(connection)
# Place the database in a state where the replaced migrations are
@@ -441,10 +439,7 @@ class ExecutorTests(MigrationTestBase):
def test_migrate_marks_replacement_applied_even_if_it_did_nothing(self):
"""
A new squash migration will be marked as applied even if all its
- replaced migrations were previously already applied.
-
- Ticket #24628.
-
+ replaced migrations were previously already applied (#24628).
"""
recorder = MigrationRecorder(connection)
# Record all replaced migrations as applied