cpplearner
diff --git a/‎index2devhelp.py‎
Lines changed: 1 addition & 1 deletion b/‎index2devhelp.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎index_transform/devhelp.py‎
Lines changed: 22 additions & 22 deletions b/‎index_transform/devhelp.py‎
Lines changed: 22 additions & 22 deletions
@@ -41,7 +41,7 @@ def main():
         help='the path of the destination file')
     args = parser.parse_args()
 
-    with open(args.dest_fn, 'w', encoding='utf-8') as out_f:
+    with open(args.dest_fn, 'wb') as out_f:
         output = transform_devhelp(args.book_title, args.book_name,
                                     args.book_base, args.rel_link,
                                     args.chapters_path, args.in_fn)
 
@@ -21,13 +21,14 @@
 from index_transform.common import IndexTransform
 from xml_utils import xml_escape
 from index_transform import *
+from lxml import etree
 import io
 
 class Index2Devhelp(IndexTransform):
 
-    def __init__(self, out_file):
+    def __init__(self, functions_el):
         super().__init__()
-        self.out_file = out_file
+        self.functions_el = functions_el
 
     def get_mark(self, el):
         if el.tag == 'const': return 'macro'
@@ -44,32 +45,31 @@ def get_mark(self, el):
         return ''
 
     def process_item_hook(self, el, full_name, full_link):
-        self.out_file.write('<keyword type="' + xml_escape(self.get_mark(el))
-                    + '" name="' + xml_escape(full_name)
-                    + '" link="' + xml_escape(full_link) + '"/>\n')
+        keyword_el = etree.SubElement(self.functions_el, 'keyword')
+        keyword_el.set('type', self.get_mark(el))
+        keyword_el.set('name', full_name)
+        keyword_el.set('link', full_link)
+
         IndexTransform.process_item_hook(self, el, full_name, full_link)
 
 def transform_devhelp(book_title, book_name, book_base, rel_link, chapters_fn,
                        in_fn):
-    out_f = io.StringIO()
-    out_f.write('<?xml version="1.0"?>\n'
-               + '<book title="' + xml_escape(book_title)
-               + '" xmlns="http://www.devhelp.net/book'
-               + '" name="' + xml_escape(book_name)
-               + '" base="' + xml_escape(book_base)
-               + '" link="' + xml_escape(rel_link)
-               + '" version="2" language="c++">\n')
+    root_el = etree.Element('book')
+    root_el.set('xmlns', 'http://www.devhelp.net/book')
+    root_el.set('title', book_title)
+    root_el.set('name', book_name)
+    root_el.set('base', book_base)
+    root_el.set('link', rel_link)
+    root_el.set('version', '2')
+    root_el.set('language', 'c++')
 
-    with open(chapters_fn, 'r', encoding='utf-8') as chapters_f:
-        out_f.write(chapters_f.read() + '\n')
+    chapters_tree = etree.parse(chapters_fn)
+    root_el.append(chapters_tree.getroot())
 
-    out_f.write('<functions>')
+    functions_el = etree.SubElement(root_el, 'functions')
 
-    tr = Index2Devhelp(out_f)
+    tr = Index2Devhelp(functions_el)
     tr.transform_file(in_fn)
 
-    out_f.write('''
-  </functions>
-</book>
-''')
-    return out_f.getvalue()
+    return etree.tostring(root_el, pretty_print=True, xml_declaration=True,
+                          encoding='utf-8')