From: Yoshitaka Aharen <aharen@jprs.co.jp>
Date: Thu, 15 Nov 2012 06:22:08 +0000 (+0900)
Subject: [2157] specify encoding explicitly for xml.etree.ElementTree.tostring
X-Git-Tag: bind10-1.1.0beta1-release~85^2~5^2~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b08a456d702942de353ae57529bdbe2d1ba22d07;p=thirdparty%2Fkea.git

[2157] specify encoding explicitly for xml.etree.ElementTree.tostring
---

diff --git a/src/bin/auth/gen-statistics_items.py.pre.in b/src/bin/auth/gen-statistics_items.py.pre.in
index 544db33afc..e42e109ee6 100755
--- a/src/bin/auth/gen-statistics_items.py.pre.in
+++ b/src/bin/auth/gen-statistics_items.py.pre.in
@@ -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)