diff options
| author | qingfeng <qingfenghello@gmail.com> | 2014-07-22 01:38:34 +0800 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2014-07-26 18:04:01 +0200 |
| commit | 3a2badcbb73c2aed6451d2451da1c4fc8d934ab2 (patch) | |
| tree | 9b8e5844c97ac7318b429edd4c05c4b6be219b9a /django | |
| parent | 1ef544f91f0d4be3f44ae7fd0498530e57a9b160 (diff) | |
[1.7.x] Fixed #23060 -- Prevented UnicodeDecodeError in debug templatetag
Backport of 08451f17d0 from master.
Diffstat (limited to 'django')
| -rw-r--r-- | django/template/defaulttags.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index 74998cb403..6c2f33b862 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -89,7 +89,7 @@ class CycleNode(Node): class DebugNode(Node): def render(self, context): from pprint import pformat - output = [pformat(val) for val in context] + output = [force_text(pformat(val)) for val in context] output.append('\n\n') output.append(pformat(sys.modules)) return ''.join(output) |
