From 10ae7d8cd706062742d0cdb1803d49909aef9e06 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Mon, 29 Jun 2020 22:15:58 +0200
Subject: New upstream version 1.25.91

---
 tools/generate-docs-nm-settings-docs-gir.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'tools')

diff --git a/tools/generate-docs-nm-settings-docs-gir.py b/tools/generate-docs-nm-settings-docs-gir.py
index 0eb0da97..ebda9956 100755
--- a/tools/generate-docs-nm-settings-docs-gir.py
+++ b/tools/generate-docs-nm-settings-docs-gir.py
@@ -8,6 +8,7 @@ from __future__ import print_function
 
 import os
 import gi
+import xml.sax.saxutils as saxutils
 
 gi.require_version("GIRepository", "2.0")
 from gi.repository import GIRepository
@@ -179,8 +180,8 @@ def settings_sort_key(x):
     return (x_prefix != "setting_connection", x_prefix)
 
 
-def escape(val):
-    return str(val).replace('"', "&quot;")
+def xml_quoteattr(val):
+    return saxutils.quoteattr(str(val))
 
 
 def usage():
@@ -275,11 +276,17 @@ for settingxml in settings:
 
         default_value_as_xml = ""
         if default_value is not None:
-            default_value_as_xml = ' default="%s"' % (escape(default_value))
+            default_value_as_xml = " default=%s" % (xml_quoteattr(default_value))
 
         outfile.write(
-            '    <property name="%s" name_upper="%s" type="%s"%s description="%s" />\n'
-            % (prop, prop_upper, value_type, default_value_as_xml, escape(value_desc))
+            '    <property name="%s" name_upper="%s" type="%s"%s description=%s />\n'
+            % (
+                prop,
+                prop_upper,
+                value_type,
+                default_value_as_xml,
+                xml_quoteattr(value_desc),
+            )
         )
 
     outfile.write("  </setting>\n")
-- 
cgit 1.3.0-6-gf8a5