From 57dbc87ade5533d78089690ec7795034ff69177a Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Wed, 3 Jun 2015 19:20:12 -0600 Subject: [PATCH] Cleaned up docstring style, per Tim Graham review. --- django/db/migrations/executor.py | 1 - tests/migrations/test_executor.py | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/django/db/migrations/executor.py b/django/db/migrations/executor.py index 39ed2e4d3de..aeb021e33cd 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 0eefc32b1fe..12bdabb1721 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