diff options
| author | Tim Graham <timograham@gmail.com> | 2015-11-17 18:33:03 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-11-18 10:26:39 -0500 |
| commit | c7adfe941bb1e5243c9d160bae33fa88764ce073 (patch) | |
| tree | 812aa2c4fafa5fb11a05a4724ced524a081c7020 | |
| parent | b3acdeee502e961065bfcdb7673d7cf91ab5b283 (diff) | |
Removed redundant termcolors.
Replaced MIGRATE_SUCCESS and MIGRATE_FAILURE with
SUCCESS and ERROR.
| -rw-r--r-- | django/core/management/commands/migrate.py | 10 | ||||
| -rw-r--r-- | django/core/management/commands/showmigrations.py | 2 | ||||
| -rw-r--r-- | django/utils/termcolors.py | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/django/core/management/commands/migrate.py b/django/core/management/commands/migrate.py index 3fc14080a1..5623f8402b 100644 --- a/django/core/management/commands/migrate.py +++ b/django/core/management/commands/migrate.py @@ -191,9 +191,9 @@ class Command(BaseCommand): elif action == "apply_success": elapsed = " (%.3fs)" % (time.time() - self.start) if compute_time else "" if fake: - self.stdout.write(self.style.MIGRATE_SUCCESS(" FAKED" + elapsed)) + self.stdout.write(self.style.SUCCESS(" FAKED" + elapsed)) else: - self.stdout.write(self.style.MIGRATE_SUCCESS(" OK" + elapsed)) + self.stdout.write(self.style.SUCCESS(" OK" + elapsed)) elif action == "unapply_start": if compute_time: self.start = time.time() @@ -202,9 +202,9 @@ class Command(BaseCommand): elif action == "unapply_success": elapsed = " (%.3fs)" % (time.time() - self.start) if compute_time else "" if fake: - self.stdout.write(self.style.MIGRATE_SUCCESS(" FAKED" + elapsed)) + self.stdout.write(self.style.SUCCESS(" FAKED" + elapsed)) else: - self.stdout.write(self.style.MIGRATE_SUCCESS(" OK" + elapsed)) + self.stdout.write(self.style.SUCCESS(" OK" + elapsed)) elif action == "render_start": if compute_time: self.start = time.time() @@ -212,7 +212,7 @@ class Command(BaseCommand): self.stdout.flush() elif action == "render_success": elapsed = " (%.3fs)" % (time.time() - self.start) if compute_time else "" - self.stdout.write(self.style.MIGRATE_SUCCESS(" DONE" + elapsed)) + self.stdout.write(self.style.SUCCESS(" DONE" + elapsed)) def sync_apps(self, connection, app_labels): "Runs the old syncdb-style operation on a list of app_labels." diff --git a/django/core/management/commands/showmigrations.py b/django/core/management/commands/showmigrations.py index 246bea588f..b3a4725b12 100644 --- a/django/core/management/commands/showmigrations.py +++ b/django/core/management/commands/showmigrations.py @@ -74,7 +74,7 @@ class Command(BaseCommand): shown.add(plan_node) # If we didn't print anything, then a small message if not shown: - self.stdout.write(" (no migrations)", self.style.MIGRATE_FAILURE) + self.stdout.write(" (no migrations)", self.style.ERROR) def show_plan(self, connection): """ diff --git a/django/utils/termcolors.py b/django/utils/termcolors.py index 4924918e25..e36b3639d8 100644 --- a/django/utils/termcolors.py +++ b/django/utils/termcolors.py @@ -92,8 +92,6 @@ PALETTES = { 'HTTP_SERVER_ERROR': {}, 'MIGRATE_HEADING': {}, 'MIGRATE_LABEL': {}, - 'MIGRATE_SUCCESS': {}, - 'MIGRATE_FAILURE': {}, }, DARK_PALETTE: { 'ERROR': {'fg': 'red', 'opts': ('bold',)}, @@ -113,8 +111,6 @@ PALETTES = { 'HTTP_SERVER_ERROR': {'fg': 'magenta', 'opts': ('bold',)}, 'MIGRATE_HEADING': {'fg': 'cyan', 'opts': ('bold',)}, 'MIGRATE_LABEL': {'opts': ('bold',)}, - 'MIGRATE_SUCCESS': {'fg': 'green', 'opts': ('bold',)}, - 'MIGRATE_FAILURE': {'fg': 'red', 'opts': ('bold',)}, }, LIGHT_PALETTE: { 'ERROR': {'fg': 'red', 'opts': ('bold',)}, @@ -134,8 +130,6 @@ PALETTES = { 'HTTP_SERVER_ERROR': {'fg': 'magenta', 'opts': ('bold',)}, 'MIGRATE_HEADING': {'fg': 'cyan', 'opts': ('bold',)}, 'MIGRATE_LABEL': {'opts': ('bold',)}, - 'MIGRATE_SUCCESS': {'fg': 'green', 'opts': ('bold',)}, - 'MIGRATE_FAILURE': {'fg': 'red', 'opts': ('bold',)}, } } DEFAULT_PALETTE = DARK_PALETTE |