summaryrefslogtreecommitdiff
path: root/django/db
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 /django/db
parent233c70f0479beb3bff9027e6cff680882978fd4d (diff)
Refs #29654 -- Replaced three dots with ellipsis character in output strings.
Diffstat (limited to 'django/db')
-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
7 files changed, 17 insertions, 17 deletions
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: