From af49cf1f156e68dcd8d34a3de59c40ee5bd12b66 Mon Sep 17 00:00:00 2001 From: Felipe Reyes Date: Wed, 16 Jul 2014 17:50:03 +0200 Subject: Replace force_unicode with force_text Django changed the name to force_unicode and it's only available in python2 as an alias of force_text. The new name is available since Django 1.4.2 Closes-Bug: #1345642 Change-Id: Ida8c545ceec7c31999f2497d540a0dc5a653d286 --- horizon/exceptions.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'horizon/exceptions.py') diff --git a/horizon/exceptions.py b/horizon/exceptions.py index 673ef79ff..a1a7151f4 100644 --- a/horizon/exceptions.py +++ b/horizon/exceptions.py @@ -261,7 +261,7 @@ def handle(request, message=None, redirect=None, ignore=False, exc_type, exc_value, exc_traceback = exc_value.wrapped wrap = True - log_entry = encoding.force_unicode(exc_value) + log_entry = encoding.force_text(exc_value) # We trust messages from our own exceptions if issubclass(exc_type, HorizonException): @@ -271,9 +271,9 @@ def handle(request, message=None, redirect=None, ignore=False, message = exc_value._safe_message # If the message has a placeholder for the exception, fill it in elif message and "%(exc)s" in message: - message = encoding.force_unicode(message) % {"exc": log_entry} + message = encoding.force_text(message) % {"exc": log_entry} if message: - message = encoding.force_unicode(message) + message = encoding.force_text(message) if issubclass(exc_type, UNAUTHORIZED): if ignore: -- cgit v1.2.1