mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-28 14:37:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed #30184 -- Removed ellipsis characters from shell output strings.

Browse source 
Partially reverted 50b8493581 (refs #29654)
to avoid a crash when the user shell doesn't support non-ASCII characters.
This commit is contained in:
Dan Davis 2019-02-13 13:59:44 -05:00 • committed by Tim Graham
parent f63811f481
commit 2bd8df243a
19 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
django/db/models/sql/query.py
View file

@ -597,7 +597,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: