summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2018-08-22 15:13:58 +0200
committerTim Graham <timograham@gmail.com>2018-08-22 09:13:58 -0400
commit50b8493581fea3d7137dd8db33bac7008868d23a (patch)
tree17e10260f66489ec5ecc60464e9fb94889c61aa2
parent233c70f0479beb3bff9027e6cff680882978fd4d (diff)
Refs #29654 -- Replaced three dots with ellipsis character in output strings.
-rw-r--r--django/contrib/admin/templates/admin/popup_response.html2
-rw-r--r--django/contrib/admin/templatetags/admin_list.py2
-rw-r--r--django/contrib/gis/utils/layermapping.py2
-rw-r--r--django/core/management/commands/loaddata.py4
-rw-r--r--django/core/management/commands/migrate.py10
-rw-r--r--django/core/management/commands/runserver.py2
-rw-r--r--django/core/management/commands/showmigrations.py2
-rw-r--r--django/core/management/commands/squashmigrations.py2
-rw-r--r--django/db/backends/base/creation.py4
-rw-r--r--django/db/backends/mysql/creation.py2
-rw-r--r--django/db/backends/oracle/creation.py18
-rw-r--r--django/db/backends/postgresql/creation.py2
-rw-r--r--django/db/backends/sqlite3/creation.py4
-rw-r--r--django/db/models/query.py2
-rw-r--r--django/db/models/sql/query.py2
-rw-r--r--django/views/debug.py2
-rw-r--r--django/views/templates/technical_500.html2
-rw-r--r--docs/intro/tutorial01.txt2
-rw-r--r--docs/intro/tutorial02.txt4
-rw-r--r--docs/intro/tutorial05.txt8
-rw-r--r--docs/topics/migrations.txt4
-rw-r--r--docs/topics/testing/overview.txt2
-rw-r--r--tests/migrations/test_commands.py36
23 files changed, 60 insertions, 60 deletions
diff --git a/django/contrib/admin/templates/admin/popup_response.html b/django/contrib/admin/templates/admin/popup_response.html
index 6e4fac8e8d..303960ff5d 100644
--- a/django/contrib/admin/templates/admin/popup_response.html
+++ b/django/contrib/admin/templates/admin/popup_response.html
@@ -1,6 +1,6 @@
{% load i18n static %}<!DOCTYPE html>
<html>
- <head><title>{% trans 'Popup closing...' %}</title></head>
+ <head><title>{% trans 'Popup closing…' %}</title></head>
<body>
<script type="text/javascript"
id="django-admin-popup-response-constants"
diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
index 0211452d17..99013f0d9f 100644
--- a/django/contrib/admin/templatetags/admin_list.py
+++ b/django/contrib/admin/templatetags/admin_list.py
@@ -32,7 +32,7 @@ def paginator_number(cl, i):
Generate an individual page index link in a paginated list.
"""
if i == DOT:
- return '... '
+ return '… '
elif i == cl.page_num:
return format_html('<span class="this-page">{}</span> ', i + 1)
else:
diff --git a/django/contrib/gis/utils/layermapping.py b/django/contrib/gis/utils/layermapping.py
index b184de53ef..1faef51b8b 100644
--- a/django/contrib/gis/utils/layermapping.py
+++ b/django/contrib/gis/utils/layermapping.py
@@ -594,7 +594,7 @@ class LayerMapping:
# Printing progress information, if requested.
if progress and num_feat % progress_interval == 0:
- stream.write('Processed %d features, saved %d ...\n' % (num_feat, num_saved))
+ stream.write('Processed %d features, saved %d …\n' % (num_feat, num_saved))
# Only used for status output purposes -- incremental saving uses the
# values returned here.
diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py
index aae156f911..aaf9775407 100644
--- a/django/core/management/commands/loaddata.py
+++ b/django/core/management/commands/loaddata.py
@@ -226,7 +226,7 @@ class Command(BaseCommand):
ser_fmts = serializers.get_public_serializer_formats() if ser_fmt is None else [ser_fmt]
if self.verbosity >= 2:
- self.stdout.write("Loading '%s' fixtures..." % fixture_name)
+ self.stdout.write("Loading '%s' fixtures…" % fixture_name)
if os.path.isabs(fixture_name):
fixture_dirs = [os.path.dirname(fixture_name)]
@@ -247,7 +247,7 @@ class Command(BaseCommand):
fixture_files = []
for fixture_dir in fixture_dirs:
if self.verbosity >= 2:
- self.stdout.write("Checking %s for fixtures..." % humanize(fixture_dir))
+ self.stdout.write("Checking %s for fixtures…" % humanize(fixture_dir))
fixture_files_in_dir = []
path = os.path.join(fixture_dir, fixture_name)
for candidate in glob.iglob(glob.escape(path) + '*'):
diff --git a/django/core/management/commands/migrate.py b/django/core/management/commands/migrate.py
index 299edbe421..68aa52bb4a 100644
--- a/django/core/management/commands/migrate.py
+++ b/django/core/management/commands/migrate.py
@@ -250,7 +250,7 @@ class Command(BaseCommand):
if action == "apply_start":
if compute_time:
self.start = time.time()
- self.stdout.write(" Applying %s..." % migration, ending="")
+ self.stdout.write(" Applying %s…" % migration, ending="")
self.stdout.flush()
elif action == "apply_success":
elapsed = " (%.3fs)" % (time.time() - self.start) if compute_time else ""
@@ -261,7 +261,7 @@ class Command(BaseCommand):
elif action == "unapply_start":
if compute_time:
self.start = time.time()
- self.stdout.write(" Unapplying %s..." % migration, ending="")
+ self.stdout.write(" Unapplying %s…" % migration, ending="")
self.stdout.flush()
elif action == "unapply_success":
elapsed = " (%.3fs)" % (time.time() - self.start) if compute_time else ""
@@ -272,7 +272,7 @@ class Command(BaseCommand):
elif action == "render_start":
if compute_time:
self.start = time.time()
- self.stdout.write(" Rendering model states...", ending="")
+ self.stdout.write(" Rendering model states…", ending="")
self.stdout.flush()
elif action == "render_success":
elapsed = " (%.3fs)" % (time.time() - self.start) if compute_time else ""
@@ -308,7 +308,7 @@ class Command(BaseCommand):
# Create the tables for each model
if self.verbosity >= 1:
- self.stdout.write(" Creating tables...\n")
+ self.stdout.write(" Creating tables…\n")
with connection.schema_editor() as editor:
for app_name, model_list in manifest.items():
for model in model_list:
@@ -325,7 +325,7 @@ class Command(BaseCommand):
# Deferred SQL is executed when exiting the editor's context.
if self.verbosity >= 1:
- self.stdout.write(" Running deferred SQL...\n")
+ self.stdout.write(" Running deferred SQL…\n")
@staticmethod
def describe_operation(operation, backwards):
diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py
index 0e0fd1ca2c..69a94adbec 100644
--- a/django/core/management/commands/runserver.py
+++ b/django/core/management/commands/runserver.py
@@ -113,7 +113,7 @@ class Command(BaseCommand):
shutdown_message = options.get('shutdown_message', '')
quit_command = 'CTRL-BREAK' if sys.platform == 'win32' else 'CONTROL-C'
- self.stdout.write("Performing system checks...\n\n")
+ self.stdout.write("Performing system checks…\n\n")
self.check(display_num_errors=True)
# Need to check migrations here, so can't use the
# requires_migrations_check attribute.
diff --git a/django/core/management/commands/showmigrations.py b/django/core/management/commands/showmigrations.py
index c4521132c0..abac283160 100644
--- a/django/core/management/commands/showmigrations.py
+++ b/django/core/management/commands/showmigrations.py
@@ -118,7 +118,7 @@ class Command(BaseCommand):
for parent in sorted(node.parents):
out.append("%s.%s" % parent.key)
if out:
- return " ... (%s)" % ", ".join(out)
+ return " … (%s)" % ", ".join(out)
return ""
for node in plan:
diff --git a/django/core/management/commands/squashmigrations.py b/django/core/management/commands/squashmigrations.py
index 6132f4e1b3..ee91241369 100644
--- a/django/core/management/commands/squashmigrations.py
+++ b/django/core/management/commands/squashmigrations.py
@@ -134,7 +134,7 @@ class Command(BaseCommand):
new_operations = operations
else:
if self.verbosity > 0:
- self.stdout.write(self.style.MIGRATE_HEADING("Optimizing..."))
+ self.stdout.write(self.style.MIGRATE_HEADING("Optimizing…"))
optimizer = MigrationOptimizer()
new_operations = optimizer.optimize(operations, migration.app_label)
diff --git a/django/db/backends/base/creation.py b/django/db/backends/base/creation.py
index f36d60a5fe..2f0f8af504 100644
--- a/django/db/backends/base/creation.py
+++ b/django/db/backends/base/creation.py
@@ -45,7 +45,7 @@ class BaseDatabaseCreation:
if keepdb:
action = "Using existing"
- self.log('%s test database for alias %s...' % (
+ self.log('%s test database for alias %s…' % (
action,
self._get_database_display_str(verbosity, test_database_name),
))
@@ -182,7 +182,7 @@ class BaseDatabaseCreation:
if autoclobber or confirm == 'yes':
try:
if verbosity >= 1:
- self.log('Destroying old test database for alias %s...' % (
+ self.log('Destroying old test database for alias %s…' % (
self._get_database_display_str(verbosity, test_database_name),
))
cursor.execute('DROP DATABASE %(dbname)s' % test_db_params)
diff --git a/django/db/backends/mysql/creation.py b/django/db/backends/mysql/creation.py
index 3c702d6979..f342d85f05 100644
--- a/django/db/backends/mysql/creation.py
+++ b/django/db/backends/mysql/creation.py
@@ -51,7 +51,7 @@ class DatabaseCreation(BaseDatabaseCreation):
except Exception:
try:
if verbosity >= 1:
- self.log('Destroying old test database for alias %s...' % (
+ self.log('Destroying old test database for alias %s…' % (
self._get_database_display_str(verbosity, target_database_name),
))
cursor.execute('DROP DATABASE %(dbname)s' % test_db_params)
diff --git a/django/db/backends/oracle/creation.py b/django/db/backends/oracle/creation.py
index 1f30844330..109b97b3f2 100644
--- a/django/db/backends/oracle/creation.py
+++ b/django/db/backends/oracle/creation.py
@@ -44,7 +44,7 @@ class DatabaseCreation(BaseDatabaseCreation):
"Type 'yes' to delete it, or 'no' to cancel: " % parameters['user'])
if autoclobber or confirm == 'yes':
if verbosity >= 1:
- self.log("Destroying old test database for alias '%s'..." % self.connection.alias)
+ self.log("Destroying old test database for alias '%s'…" % self.connection.alias)
try:
self._execute_test_db_destruction(cursor, parameters, verbosity)
except DatabaseError as e:
@@ -69,7 +69,7 @@ class DatabaseCreation(BaseDatabaseCreation):
if self._test_user_create():
if verbosity >= 1:
- self.log('Creating test user...')
+ self.log('Creating test user…')
try:
self._create_test_user(cursor, parameters, verbosity, keepdb)
except Exception as e:
@@ -84,10 +84,10 @@ class DatabaseCreation(BaseDatabaseCreation):
if autoclobber or confirm == 'yes':
try:
if verbosity >= 1:
- self.log('Destroying old test user...')
+ self.log('Destroying old test user…')
self._destroy_test_user(cursor, parameters, verbosity)
if verbosity >= 1:
- self.log('Creating test user...')
+ self.log('Creating test user…')
self._create_test_user(cursor, parameters, verbosity, keepdb)
except Exception as e:
self.log('Got an error recreating the test user: %s' % e)
@@ -143,14 +143,14 @@ class DatabaseCreation(BaseDatabaseCreation):
if autoclobber or confirm == 'yes':
try:
if verbosity >= 1:
- self.log('Destroying old test user...')
+ self.log('Destroying old test user…')
self._destroy_test_user(cursor, parameters, verbosity)
except Exception as e:
self.log('Got an error destroying the test user: %s' % e)
sys.exit(2)
try:
if verbosity >= 1:
- self.log("Destroying old test database for alias '%s'..." % self.connection.alias)
+ self.log("Destroying old test database for alias '%s'…" % self.connection.alias)
self._execute_test_db_destruction(cursor, parameters, verbosity)
except Exception as e:
self.log('Got an error destroying the test database: %s' % e)
@@ -176,11 +176,11 @@ class DatabaseCreation(BaseDatabaseCreation):
with self._maindb_connection.cursor() as cursor:
if self._test_user_create():
if verbosity >= 1:
- self.log('Destroying test user...')
+ self.log('Destroying test user…')
self._destroy_test_user(cursor, parameters, verbosity)
if self._test_database_create():
if verbosity >= 1:
- self.log('Destroying test database tables...')
+ self.log('Destroying test database tables…')
self._execute_test_db_destruction(cursor, parameters, verbosity)
self._maindb_connection.close()
@@ -243,7 +243,7 @@ class DatabaseCreation(BaseDatabaseCreation):
def _destroy_test_user(self, cursor, parameters, verbosity):
if verbosity >= 2:
self.log('_destroy_test_user(): user=%s' % parameters['user'])
- self.log('Be patient. This can take some time...')
+ self.log('Be patient. This can take some time…')
statements = [
'DROP USER %(user)s CASCADE',
]
diff --git a/django/db/backends/postgresql/creation.py b/django/db/backends/postgresql/creation.py
index 01e3b5d10a..d1e766421f 100644
--- a/django/db/backends/postgresql/creation.py
+++ b/django/db/backends/postgresql/creation.py
@@ -67,7 +67,7 @@ class DatabaseCreation(BaseDatabaseCreation):
except Exception as e:
try:
if verbosity >= 1:
- self.log('Destroying old test database for alias %s...' % (
+ self.log('Destroying old test database for alias %s…' % (
self._get_database_display_str(verbosity, target_database_name),
))
cursor.execute('DROP DATABASE %(dbname)s' % test_db_params)
diff --git a/django/db/backends/sqlite3/creation.py b/django/db/backends/sqlite3/creation.py
index 7e929f3451..a714eebb3a 100644
--- a/django/db/backends/sqlite3/creation.py
+++ b/django/db/backends/sqlite3/creation.py
@@ -25,7 +25,7 @@ class DatabaseCreation(BaseDatabaseCreation):
if not self.is_in_memory_db(test_database_name):
# Erase the old test database
if verbosity >= 1:
- self.log('Destroying old test database for alias %s...' % (
+ self.log('Destroying old test database for alias %s…' % (
self._get_database_display_str(verbosity, test_database_name),
))
if os.access(test_database_name, os.F_OK):
@@ -64,7 +64,7 @@ class DatabaseCreation(BaseDatabaseCreation):
if keepdb:
return
if verbosity >= 1:
- self.log('Destroying old test database for alias %s...' % (
+ self.log('Destroying old test database for alias %s…' % (
self._get_database_display_str(verbosity, target_database_name),
))
try:
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 22835d1607..00e505d08e 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -244,7 +244,7 @@ class QuerySet:
def __repr__(self):
data = list(self[:REPR_OUTPUT_SIZE + 1])
if len(data) > REPR_OUTPUT_SIZE:
- data[-1] = "...(remaining elements truncated)..."
+ data[-1] = "…(remaining elements truncated)…"
return '<%s %r>' % (self.__class__.__name__, data)
def __len__(self):
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index f5f26b9426..74eec72291 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -614,7 +614,7 @@ class Query:
# really make sense (or return consistent value sets). Not worth
# the extra complexity when you can write a real query instead.
if self._extra and rhs._extra:
- raise ValueError("When merging querysets using 'or', you cannot have extra(select=...) on both sides.")
+ raise ValueError("When merging querysets using 'or', you cannot have extra(select=…) on both sides.")
self.extra.update(rhs.extra)
extra_select_mask = set()
if self.extra_select_mask is not None:
diff --git a/django/views/debug.py b/django/views/debug.py
index c76c59c5bc..8a898c600b 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -269,7 +269,7 @@ class ExceptionReporter:
v = pprint(v)
# Trim large blobs of data
if len(v) > 4096:
- v = '%s... <trimmed %d bytes string>' % (v[0:4096], len(v))
+ v = '%s… <trimmed %d bytes string>' % (v[0:4096], len(v))
frame_vars.append((k, v))
frame['vars'] = frame_vars
frames[i] = frame
diff --git a/django/views/templates/technical_500.html b/django/views/templates/technical_500.html
index 25cf231ead..0cf0dc10e1 100644
--- a/django/views/templates/technical_500.html
+++ b/django/views/templates/technical_500.html
@@ -237,7 +237,7 @@
</ol>
{% endif %}
<ol start="{{ frame.lineno }}" class="context-line">
- <li onclick="toggle('pre{{ frame.id }}', 'post{{ frame.id }}')"><pre>{{ frame.context_line }}</pre>{% if not is_email %} <span>...</span>{% endif %}</li>
+ <li onclick="toggle('pre{{ frame.id }}', 'post{{ frame.id }}')"><pre>{{ frame.context_line }}</pre>{% if not is_email %} <span>…</span>{% endif %}</li>
</ol>
{% if frame.post_context and not is_email %}
<ol start='{{ frame.lineno|add:"1" }}' class="post-context" id="post{{ frame.id }}">
diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
index aca496580e..d387e2d6a7 100644
--- a/docs/intro/tutorial01.txt
+++ b/docs/intro/tutorial01.txt
@@ -131,7 +131,7 @@ You'll see the following output on the command line:
.. parsed-literal::
- Performing system checks...
+ Performing system checks…
System check identified no issues (0 silenced).
diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt
index c1f0aeef46..ea9c3dff56 100644
--- a/docs/intro/tutorial02.txt
+++ b/docs/intro/tutorial02.txt
@@ -338,8 +338,8 @@ Now, run :djadmin:`migrate` again to create those model tables in your database:
Operations to perform:
Apply all migrations: admin, auth, contenttypes, polls, sessions
Running migrations:
- Rendering model states... DONE
- Applying polls.0001_initial... OK
+ Rendering model states… DONE
+ Applying polls.0001_initial… OK
The :djadmin:`migrate` command takes all the migrations that haven't been
applied (Django tracks which ones are applied using a special table in your
diff --git a/docs/intro/tutorial05.txt b/docs/intro/tutorial05.txt
index c6c5e2900d..ad5d09ca1d 100644
--- a/docs/intro/tutorial05.txt
+++ b/docs/intro/tutorial05.txt
@@ -203,7 +203,7 @@ In the terminal, we can run our test:
and you'll see something like::
- Creating test database for alias 'default'...
+ Creating test database for alias 'default'…
System check identified no issues (0 silenced).
F
======================================================================
@@ -218,7 +218,7 @@ and you'll see something like::
Ran 1 test in 0.001s
FAILED (failures=1)
- Destroying test database for alias 'default'...
+ Destroying test database for alias 'default'…
What happened is this:
@@ -257,14 +257,14 @@ past:
and run the test again::
- Creating test database for alias 'default'...
+ Creating test database for alias 'default'…
System check identified no issues (0 silenced).
.
----------------------------------------------------------------------
Ran 1 test in 0.001s
OK
- Destroying test database for alias 'default'...
+ Destroying test database for alias 'default'…
After identifying a bug, we wrote a test that exposes it and corrected the bug
in the code so our test passes.
diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt
index 4fc1fdd47e..1073ce0cbe 100644
--- a/docs/topics/migrations.txt
+++ b/docs/topics/migrations.txt
@@ -134,8 +134,8 @@ database to make sure they work as expected::
Operations to perform:
Apply all migrations: books
Running migrations:
- Rendering model states... DONE
- Applying books.0003_auto... OK
+ Rendering model states… DONE
+ Applying books.0003_auto… OK
Once the migration is applied, commit the migration and the models change
to your version control system as a single commit - that way, when other
diff --git a/docs/topics/testing/overview.txt b/docs/topics/testing/overview.txt
index 12efb381c7..a0aab28d15 100644
--- a/docs/topics/testing/overview.txt
+++ b/docs/topics/testing/overview.txt
@@ -279,7 +279,7 @@ When you run your tests, you'll see a number of messages as the test runner
prepares itself. You can control the level of detail of these messages with the
``verbosity`` option on the command line::
- Creating test database...
+ Creating test database…
Creating table myapp_animal
Creating table myapp_mineral
diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py
index c216b10e68..aee89ed912 100644
--- a/tests/migrations/test_commands.py
+++ b/tests/migrations/test_commands.py
@@ -41,7 +41,7 @@ class MigrateTests(MigrationTestBase):
call_command('migrate', 'migrations', '0001', verbosity=1, stdout=stdout, no_color=True)
stdout = stdout.getvalue()
self.assertIn('Target specific migration: 0001_initial, from migrations', stdout)
- self.assertIn('Applying migrations.0001_initial... OK', stdout)
+ self.assertIn('Applying migrations.0001_initial… OK', stdout)
# The correct tables exist
self.assertTableExists("migrations_author")
self.assertTableExists("migrations_tribble")
@@ -57,7 +57,7 @@ class MigrateTests(MigrationTestBase):
call_command('migrate', 'migrations', 'zero', verbosity=1, stdout=stdout, no_color=True)
stdout = stdout.getvalue()
self.assertIn('Unapply all migrations: migrations', stdout)
- self.assertIn('Unapplying migrations.0002_second... OK', stdout)
+ self.assertIn('Unapplying migrations.0002_second… OK', stdout)
# Tables are gone
self.assertTableNotExists("migrations_author")
self.assertTableNotExists("migrations_tribble")
@@ -157,7 +157,7 @@ class MigrateTests(MigrationTestBase):
call_command("migrate", "migrations", "0001", fake_initial=True, stdout=out, verbosity=1)
call_command("migrate", "migrations", "0001", fake_initial=True, verbosity=0, database="other")
self.assertIn(
- "migrations.0001_initial... faked",
+ "migrations.0001_initial… faked",
out.getvalue().lower()
)
# Run migrations all the way
@@ -208,8 +208,8 @@ class MigrateTests(MigrationTestBase):
with mock.patch('django.core.management.color.supports_color', lambda *args: False):
call_command("migrate", "migrations", "0002", fake_initial=True, stdout=out, verbosity=1)
value = out.getvalue().lower()
- self.assertIn("migrations.0001_initial... faked", value)
- self.assertIn("migrations.0002_second... faked", value)
+ self.assertIn("migrations.0001_initial… faked", value)
+ self.assertIn("migrations.0002_second… faked", value)
# Fake an apply
call_command("migrate", "migrations", fake=True, verbosity=0)
# Unmigrate everything
@@ -271,8 +271,8 @@ class MigrateTests(MigrationTestBase):
call_command("showmigrations", format='plan', stdout=out, verbosity=2)
self.assertEqual(
"[ ] migrations.0001_initial\n"
- "[ ] migrations.0003_third ... (migrations.0001_initial)\n"
- "[ ] migrations.0002_second ... (migrations.0001_initial, migrations.0003_third)\n",
+ "[ ] migrations.0003_third … (migrations.0001_initial)\n"
+ "[ ] migrations.0002_second … (migrations.0001_initial, migrations.0003_third)\n",
out.getvalue().lower()
)
call_command("migrate", "migrations", "0003", verbosity=0)
@@ -290,8 +290,8 @@ class MigrateTests(MigrationTestBase):
call_command("showmigrations", format='plan', stdout=out, verbosity=2)
self.assertEqual(
"[x] migrations.0001_initial\n"
- "[x] migrations.0003_third ... (migrations.0001_initial)\n"
- "[ ] migrations.0002_second ... (migrations.0001_initial, migrations.0003_third)\n",
+ "[x] migrations.0003_third … (migrations.0001_initial)\n"
+ "[ ] migrations.0002_second … (migrations.0001_initial, migrations.0003_third)\n",
out.getvalue().lower()
)
@@ -398,10 +398,10 @@ class MigrateTests(MigrationTestBase):
call_command("showmigrations", format='plan', stdout=out, verbosity=2)
self.assertEqual(
"[ ] migrations.1_auto\n"
- "[ ] migrations.2_auto ... (migrations.1_auto)\n"
- "[ ] migrations.3_squashed_5 ... (migrations.2_auto)\n"
- "[ ] migrations.6_auto ... (migrations.3_squashed_5)\n"
- "[ ] migrations.7_auto ... (migrations.6_auto)\n",
+ "[ ] migrations.2_auto … (migrations.1_auto)\n"
+ "[ ] migrations.3_squashed_5 … (migrations.2_auto)\n"
+ "[ ] migrations.6_auto … (migrations.3_squashed_5)\n"
+ "[ ] migrations.7_auto … (migrations.6_auto)\n",
out.getvalue().lower()
)
@@ -422,10 +422,10 @@ class MigrateTests(MigrationTestBase):
call_command("showmigrations", format='plan', stdout=out, verbosity=2)
self.assertEqual(
"[x] migrations.1_auto\n"
- "[x] migrations.2_auto ... (migrations.1_auto)\n"
- "[x] migrations.3_squashed_5 ... (migrations.2_auto)\n"
- "[ ] migrations.6_auto ... (migrations.3_squashed_5)\n"
- "[ ] migrations.7_auto ... (migrations.6_auto)\n",
+ "[x] migrations.2_auto … (migrations.1_auto)\n"
+ "[x] migrations.3_squashed_5 … (migrations.2_auto)\n"
+ "[ ] migrations.6_auto … (migrations.3_squashed_5)\n"
+ "[ ] migrations.7_auto … (migrations.6_auto)\n",
out.getvalue().lower()
)
@@ -659,7 +659,7 @@ class MigrateTests(MigrationTestBase):
self.assertGreater(len(execute.mock_calls), 2)
stdout = stdout.getvalue()
self.assertIn('Synchronize unmigrated apps: unmigrated_app_syncdb', stdout)
- self.assertIn('Creating tables...', stdout)
+ self.assertIn('Creating tables…', stdout)
table_name = truncate_name('unmigrated_app_syncdb_classroom', connection.ops.max_name_length())
self.assertIn('Creating table %s' % table_name, stdout)