From 3adcf13ce1778e31ebdc17c1cbe8b3dfbd44657d Mon Sep 17 00:00:00 2001
From: Brian Matherly <brian@gramps-project.org>
Date: Mon, 21 Jul 2008 04:44:07 +0000
Subject: [PATCH] 0002279: report-options.xml cannot manage option value with
 double quotes.

svn: r10894
---
 src/PluginUtils/_Options.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/PluginUtils/_Options.py b/src/PluginUtils/_Options.py
index fb74f6cc3..bafbf08f8 100644
--- a/src/PluginUtils/_Options.py
+++ b/src/PluginUtils/_Options.py
@@ -39,10 +39,10 @@ import os
 #-------------------------------------------------------------------------
 try:
     from xml.sax import make_parser, handler,SAXParseException
-    from xml.sax.saxutils import escape
+    from xml.sax.saxutils import quoteattr
 except:
     from _xmlplus.sax import make_parser, handler,SAXParseException
-    from _xmlplus.sax.saxutils import escape
+    from _xmlplus.sax.saxutils import quoteattr
 
 #-------------------------------------------------------------------------
 #
@@ -196,22 +196,22 @@ class OptionListCollection:
 
         for module_name in self.get_module_names():
             option_list = self.get_option_list(module_name)
-            f.write('<module name="%s">\n' % escape(module_name))
+            f.write('<module name=%s>\n' % quoteattr(module_name))
             options = option_list.get_options()
             for option_name in options.keys():
                 if type(options[option_name]) in (type(list()),type(tuple())):
-                    f.write('  <option name="%s" value="" length="%d">\n' % (
-                                escape(option_name),
+                    f.write('  <option name=%s value="" length="%d">\n' % (
+                                quoteattr(option_name),
                                 len(options[option_name]) ) )
                     for list_index in range(len(options[option_name])):
-                        f.write('    <listitem number="%d" value="%s"/>\n' % (
+                        f.write('    <listitem number="%d" value=%s/>\n' % (
                                 list_index,
-                                escape(unicode(options[option_name][list_index]))) )
+                                quoteattr(unicode(options[option_name][list_index]))) )
                     f.write('  </option>\n')
                 else:
-                    f.write('  <option name="%s" value="%s"/>\n' % (
-                            escape(option_name),
-                            escape(unicode(options[option_name]))) )
+                    f.write('  <option name=%s value=%s/>\n' % (
+                            quoteattr(option_name),
+                            quoteattr(unicode(options[option_name]))) )
 
             self.write_module_common(f, option_list)