diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-20 14:26:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-20 14:26:25 +0000 |
| commit | 1d5b9dca8b237b53a8f09aa8a4dd7846796ea96b (patch) | |
| tree | a4c0f081f09704622438c9b0f0f96347d61d77df /nova/utils.py | |
| parent | c1939e576be7ce96735c4734913ae9274752fed9 (diff) | |
| parent | ea0e925972c944ac4586887d7fd2e9c27225dd83 (diff) | |
| download | nova-1d5b9dca8b237b53a8f09aa8a4dd7846796ea96b.tar.gz nova-1d5b9dca8b237b53a8f09aa8a4dd7846796ea96b.tar.xz nova-1d5b9dca8b237b53a8f09aa8a4dd7846796ea96b.zip | |
Merge "Escape apostrophe in utils.xhtml_escape() (lp#872450)"
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 5 |
1 files changed, 1 insertions, 4 deletions
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, {'"': '"'}) + return saxutils.escape(value, {'"': '"', "'": '''}) def utf8(value): |