From dbb48d2bb99a5f660cf2d85f137b8d87fc12d99f Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sat, 24 May 2014 11:51:57 +0200 Subject: Applied unicode_literals to makemessages command This also fixes #22686 as some sort of side-effect. --- django/utils/translation/trans_real.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django/utils') diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index f1497ca728..b94c4e515d 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -14,7 +14,7 @@ from django.conf import settings from django.dispatch import receiver from django.test.signals import setting_changed from django.utils.deprecation import RemovedInDjango19Warning -from django.utils.encoding import force_str, force_text +from django.utils.encoding import force_text from django.utils._os import upath from django.utils.safestring import mark_safe, SafeData from django.utils import six, lru_cache @@ -701,7 +701,7 @@ def templatize(src, origin=None): comment_lineno_cache = t.lineno else: out.write(blankout(t.contents, 'X')) - return force_str(out.getvalue()) + return out.getvalue() def parse_accept_lang_header(lang_string): -- cgit v1.3