From 2e67031ffb981ae1a47043cd48d50470eb6dc0b6 Mon Sep 17 00:00:00 2001
From: Andy Smith <code@term.ie>
Date: Mon, 25 Oct 2010 19:21:09 +0900
Subject: Duplicate the two trivial escaping functions remaining from tornado's
 code and remove the dependency.

---
 nova/utils.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'nova/utils.py')

diff --git a/nova/utils.py b/nova/utils.py
index 7683fc9f4..e58302c11 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -28,6 +28,7 @@ import random
 import subprocess
 import socket
 import sys
+from xml.sax import saxutils
 
 from twisted.internet.threads import deferToThread
 
@@ -212,3 +213,27 @@ def deferredToThread(f):
     def g(*args, **kwargs):
         return deferToThread(f, *args, **kwargs)
     return g
+
+
+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;"})
+
+
+def utf8(value):
+    """Try to turn a string into utf-8 if possible.
+
+    Code is directly from the utf8 function in
+    http://github.com/facebook/tornado/blob/master/tornado/escape.py
+
+    """
+    if isinstance(value, unicode):
+        return value.encode("utf-8")
+    assert isinstance(value, str)
+    return value
+    
-- 
cgit