diff options
| author | Claude Paroz <claude@2xlibre.net> | 2014-05-24 11:51:57 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2014-05-24 13:12:56 +0200 |
| commit | cdfefbec721b59695e28e5992eda1cc52af48212 (patch) | |
| tree | 8c8718e56fe784774e22e67ddbbdf15aaaa630e4 /django/utils | |
| parent | e692c5818b7a57a878dce8d96e697493d680a123 (diff) | |
[1.7.x] Applied unicode_literals to makemessages command
This also fixes #22686 as some sort of side-effect.
Backport of dbb48d2bb99 from master.
Diffstat (limited to 'django/utils')
| -rw-r--r-- | django/utils/translation/trans_real.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index 4f07012149..051edb8b23 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -13,7 +13,7 @@ from django.apps import apps 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 @@ -715,7 +715,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): |
