summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-02-16 08:54:25 -0500
committerTim Graham <timograham@gmail.com>2015-02-18 07:24:13 -0500
commit098fa12dd390e733c7568d824eea2c346550c75a (patch)
treea624f599731493bbb085f6f4468b7dc56677348f
parent307c0f299a6c26f5231d3516df5b4edc54b36553 (diff)
Refs #24324 -- Fixed crash in {% debug %} tag on Python 2.
If Django is installed in a path that contains non-ASCII characters, the tag failed with UnicodeDecodeError.
-rw-r--r--django/template/defaulttags.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index da68ec6a66..0dc6735ad6 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -94,7 +94,7 @@ class DebugNode(Node):
from pprint import pformat
output = [force_text(pformat(val)) for val in context]
output.append('\n\n')
- output.append(pformat(sys.modules))
+ output.append(force_text(pformat(sys.modules)))
return ''.join(output)