]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[2157] specify encoding explicitly for xml.etree.ElementTree.tostring
authorYoshitaka Aharen <aharen@jprs.co.jp>
Thu, 15 Nov 2012 06:22:08 +0000 (15:22 +0900)
committerYoshitaka Aharen <aharen@jprs.co.jp>
Thu, 15 Nov 2012 07:11:15 +0000 (16:11 +0900)
src/bin/auth/gen-statistics_items.py.pre.in

index 544db33afc46d8fe08a94af4f854c42450ab839a..e42e109ee65c5cc87161982167a21a0285dce6da 100755 (executable)
@@ -167,7 +167,8 @@ def generate_docfile(docfile, def_mtime):
 
     if need_generate(builddir+os.sep+docfile, def_mtime):
         doc_pre = open(srcdir+os.sep+docfile+pre_suffix, 'r')
-        doc_pre_xml = doc_pre.read().replace('@@LOCAL'+'STATEDIR@@', localstatedir)
+        doc_pre_xml = doc_pre.read().replace('@@LOCAL'+'STATEDIR@@',
+                                             localstatedir)
         doc_pre.close
 
         variable_tree = ElementTree.Element('variablelist')
@@ -175,7 +176,7 @@ def generate_docfile(docfile, def_mtime):
         doc = open(builddir+os.sep+docfile, 'w')
         doc.write(doc_pre_xml.replace(
             '<!-- ### STATISTICS DATA PLACEHOLDER ### -->',
-            ElementTree.tostring(variable_tree)))
+            str(ElementTree.tostring(variable_tree))))
         doc.close()
     else:
         print('skip generating ' + docfile)