innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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

Backport of 57dbc87ade from master.
This commit is contained in:
Carl Meyer 2015-06-03 19:21:23 -06:00
parent feed5ad2a0
commit 2358c1e5d7
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/db/migrations/executor.py
View File

@ -187,7 +187,6 @@ class MigrationExecutor(object):
all its replaced migrations applied. In this case no new migration will all its replaced migrations applied. In this case no new migration will
be applied, but we still want to correctly maintain the applied state be applied, but we still want to correctly maintain the applied state
of the squash migration. of the squash migration.
""" """
applied = self.recorder.applied_migrations() applied = self.recorder.applied_migrations()
for key, migration in self.loader.replacements.items(): for key, migration in self.loader.replacements.items():

9
tests/migrations/test_executor.py
View File

@ -415,9 +415,7 @@ class ExecutorTests(MigrationTestBase):
@override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_squashed"}) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_squashed"})
def test_apply_all_replaced_marks_replacement_as_applied(self): def test_apply_all_replaced_marks_replacement_as_applied(self):
""" """
Applying all replaced migrations marks the replacement as applied. Applying all replaced migrations marks replacement as applied (#24628).
Ticket #24628.
""" """
recorder = MigrationRecorder(connection) recorder = MigrationRecorder(connection)
# Place the database in a state where the replaced migrations are # 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): 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 A new squash migration will be marked as applied even if all its
replaced migrations were previously already applied. replaced migrations were previously already applied (#24628).
Ticket #24628.
""" """
recorder = MigrationRecorder(connection) recorder = MigrationRecorder(connection)
# Record all replaced migrations as applied # Record all replaced migrations as applied