r5444 - branches/stability/wooly/python/wooly

Author: tmckay
Date: 2012-08-13 17:00:17 +0000 (Mon, 13 Aug 2012)
New Revision: 5444

Modified:
   branches/stability/wooly/python/wooly/util.py
Log:
BZ807970
svn merge -c 5384 svn+ssh://svn.fedorahosted.org/svn/cumin/trunk .
svn merge -c 5401 svn+ssh://svn.fedorahosted.org/svn/cumin/trunk .
svn merge -c 5436 svn+ssh://svn.fedorahosted.org/svn/cumin/trunk .


Modified: branches/stability/wooly/python/wooly/util.py
===================================================================
--- branches/stability/wooly/python/wooly/util.py	2012-08-13 16:56:57 UTC (rev 5443)
+++ branches/stability/wooly/python/wooly/util.py	2012-08-13 17:00:17 UTC (rev 5444)
@@ -19,8 +19,13 @@
 
 from parsley.collectionsex import *
 
+quote_entities = {'"': """,
+                  "'": "'"}
+
 def xml_escape(string, entities=None):
     if type(string) in (str, unicode):
+        if entities is None:
+            entities = quote_entities
         return escape(string, entities)
     return string