diff options
Diffstat (limited to 'django/utils/encoding.py')
-rw-r--r-- | django/utils/encoding.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/django/utils/encoding.py b/django/utils/encoding.py index 66077e2108..999ffae19a 100644 --- a/django/utils/encoding.py +++ b/django/utils/encoding.py @@ -145,6 +145,7 @@ def force_bytes(s, encoding='utf-8', strings_only=False, errors='strict'): else: return s.encode(encoding, errors) + if six.PY3: smart_str = smart_text force_str = force_text @@ -278,4 +279,5 @@ def get_system_encoding(): encoding = 'ascii' return encoding + DEFAULT_LOCALE_ENCODING = get_system_encoding() |