Merge lp:~corey.bryant/heat/2015.1-b1-0ubuntu3 into lp:~ubuntu-server-dev/heat/kilo

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-12 09:22:27 +0000
+++ debian/changelog	2015-01-12 17:44:21 +0000
@@ -1,3 +1,9 @@
+heat (2015.1~b1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * d/p/oslo-i18n-private-classes.patch: Cherry picked from master.
+
+ -- Corey Bryant <[e-mail]>  Mon, 12 Jan 2015 11:29:45 -0500
+
 heat (2015.1~b1-0ubuntu2) vivid; urgency=medium
 
   [ Corey Bryant ]

=== added file 'debian/patches/oslo-i18n-private-classes.patch'
--- debian/patches/oslo-i18n-private-classes.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/oslo-i18n-private-classes.patch	2015-01-12 17:44:21 +0000
@@ -0,0 +1,44 @@
+From 40fa30fd741968a182e21f98d70ec256e542d49a Mon Sep 17 00:00:00 2001
+From: Doug Hellmann <[e-mail]>
+Date: Tue, 6 Jan 2015 10:56:10 -0500
+Subject: [PATCH] Do not use private classes from oslo.i18n
+
+Use oslo.i18n.translate() without first testing if the argument being
+passed is a Message instance. The Message class is meant to be hidden
+from consumers, and translate() correctly detects untranslatable strings
+and returns them as given.
+
+Change-Id: I6e907adf16d8cf6fbbcf526632c91ca81611ea09
+---
+ heat/common/wsgi.py | 15 ++-------------
+ 1 file changed, 2 insertions(+), 13 deletions(-)
+
+diff --git a/heat/common/wsgi.py b/heat/common/wsgi.py
+index 86d6166..28608ec 100644
+--- a/heat/common/wsgi.py
++++ b/heat/common/wsgi.py
+@@ -744,19 +744,8 @@ def translate_exception(exc, locale):
+         exc.message = i18n.translate(six.text_type(exc), locale)
+ 
+     if isinstance(exc, webob.exc.HTTPError):
+-        # If the explanation is not a Message, that means that the
+-        # explanation is the default, generic and not translatable explanation
+-        # from webop.exc. Since the explanation is the error shown when the
+-        # exception is converted to a response, let's actually swap it with
+-        # message, since message is what gets passed in at construction time
+-        # in the API
+-        if not isinstance(exc.explanation, i18n._message.Message):
+-            exc.explanation = six.text_type(exc)
+-            exc.detail = ''
+-        else:
+-            exc.explanation = \
+-                i18n.translate(exc.explanation, locale)
+-            exc.detail = i18n.translate(exc.detail, locale)
++        exc.explanation = i18n.translate(exc.explanation, locale)
++        exc.detail = i18n.translate(getattr(exc, 'detail', ''), locale)
+     return exc
+ 
+ 
+-- 
+2.1.0
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-01-05 20:56:10 +0000
+++ debian/patches/series	2015-01-12 17:44:21 +0000
@@ -1,3 +1,4 @@
+oslo-i18n-private-classes.patch
 remove-gettextutils-import.patch
 #default-sqlite.patch
 fix-requirements.patch