From 5e94c817ee26a13e141a11a2f429f9ee2cc37ab0 Mon Sep 17 00:00:00 2001 From: Dan Davis Date: Wed, 13 Feb 2019 13:59:44 -0500 Subject: [2.2.x] Fixed #30184 -- Removed ellipsis characters from shell output strings. Partially reverted 50b8493581fea3d7137dd8db33bac7008868d23a (refs #29654) to avoid a crash when the user shell doesn't support non-ASCII characters. Backport of 2bd8df243ac6fc35e58c9fe90b20c9e42519a5ac from master. --- django/db/models/sql/query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django/db/models/sql/query.py') diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 675ff8c176..ffa8db86f2 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: -- cgit v1.3