Commit 2358c1e5 authored by Carl Meyer's avatar Carl Meyer
Browse files

[1.8.x] Cleaned up docstring style, per Tim Graham review. 

Backport of 57dbc87a from master.
parent feed5ad2

django/db/migrations/executor.py

+0 −1
Original line number Diff line number Diff line
@@ -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():

tests/migrations/test_executor.py

+2 −7
Original line number Diff line number Diff line
@@ -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