Fixed #25875 -- Prevented UnicodeDecodeError for Q object repr

Thanks Ben Kraft for the report, and Simon Charette for the review.

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/or_lookups/tests.py b/tests/or_lookups/tests.py
index 55afed3fc4..35c7f34d61 100644
--- a/tests/or_lookups/tests.py
+++ b/tests/or_lookups/tests.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 from __future__ import unicode_literals
 
 from datetime import datetime
@@ -5,6 +6,7 @@ from operator import attrgetter
 
 from django.db.models import Q
 from django.test import TestCase
+from django.utils.encoding import force_str
 
 from .models import Article
 
@@ -123,6 +125,12 @@ class OrLookupsTests(TestCase):
             attrgetter("headline"),
         )
 
+    def test_q_repr(self):
+        or_expr = Q(baz=Article(headline="Foö"))
+        self.assertEqual(repr(or_expr), force_str("<Q: (AND: ('baz', <Article: Foö>))>"))
+        negated_or = ~Q(baz=Article(headline="Foö"))
+        self.assertEqual(repr(negated_or), force_str("<Q: (NOT (AND: ('baz', <Article: Foö>)))>"))
+
     def test_q_negated(self):
         # Q objects can be negated
         self.assertQuerysetEqual(