diff options
Diffstat (limited to 'django/utils/tree.py')
| -rw-r--r-- | django/utils/tree.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/django/utils/tree.py b/django/utils/tree.py index 9eb3aeb5d6..50712bb866 100644 --- a/django/utils/tree.py +++ b/django/utils/tree.py @@ -5,6 +5,8 @@ ORM. import copy +from django.utils.encoding import force_str, force_text + class Node(object): """ @@ -42,14 +44,11 @@ class Node(object): return obj def __str__(self): - if self.negated: - return '(NOT (%s: %s))' % (self.connector, ', '.join(str(c) for c - in self.children)) - return '(%s: %s)' % (self.connector, ', '.join(str(c) for c in - self.children)) + template = '(NOT (%s: %s))' if self.negated else '(%s: %s)' + return force_str(template % (self.connector, ', '.join(force_text(c) for c in self.children))) def __repr__(self): - return "<%s: %s>" % (self.__class__.__name__, self) + return str("<%s: %s>") % (self.__class__.__name__, self) def __deepcopy__(self, memodict): """ |