diff options
| author | Dan Davis <danizen@users.noreply.github.com> | 2019-02-13 13:59:44 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2019-02-13 14:00:53 -0500 |
| commit | 5e94c817ee26a13e141a11a2f429f9ee2cc37ab0 (patch) | |
| tree | 1e72185ce851768a48cc49812f95af6f4770c9d8 /django/db/models/sql/query.py | |
| parent | f2b460231dc15d4d0629b856f31ff9433da07f95 (diff) | |
[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.
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |