From ea0e925972c944ac4586887d7fd2e9c27225dd83 Mon Sep 17 00:00:00 2001
From: Nick Bartos <nick@pistoncloud.com>
Date: Sun, 19 Feb 2012 19:15:12 -0800
Subject: Escape apostrophe in utils.xhtml_escape() (lp#872450)

Also remove comment which is no longer relevant.

Change-Id: I33a951d08a34510b2a9dbacb9fb3ebf6bee978b4
---
 nova/utils.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'nova/utils.py')

diff --git a/nova/utils.py b/nova/utils.py
index 85f39dbe0..dc8a660a6 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -669,11 +669,8 @@ class LoopingCall(object):
 def xhtml_escape(value):
     """Escapes a string so it is valid within XML or XHTML.
 
-    Code is directly from the utf8 function in
-    http://github.com/facebook/tornado/blob/master/tornado/escape.py
-
     """
-    return saxutils.escape(value, {'"': '&quot;'})
+    return saxutils.escape(value, {'"': '&quot;', "'": '&apos;'})
 
 
 def utf8(value):
-- 
cgit