[gentoo-commits] proj/g-sorcery:master commit in: g_sorcery/, tests/

[Jauhien Piatlicki]

commit:     72ebc34dc4ff6fa2c56a3629f267b74c32723951
Author:     Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
AuthorDate: Tue Jul  2 13:55:50 2013 +0000
Commit:     Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com>
CommitDate: Tue Jul  2 13:55:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=72ebc34d

py2: encoding unicode -> utf-8 (in xml.etree.ElementTree.tostring)

---
 g_sorcery/metadata.py  |  2 +-
 tests/test_metadata.py | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/g_sorcery/metadata.py b/g_sorcery/metadata.py
index da4d291..1ce8fdc 100644
--- a/g_sorcery/metadata.py
+++ b/g_sorcery/metadata.py
@@ -17,7 +17,7 @@ import xml.etree.ElementTree as ET
 import xml.dom.minidom as minidom
 
 def prettify(tree):
-    rough_str = ET.tostring(tree, 'unicode')
+    rough_str = ET.tostring(tree, "utf-8").decode("utf-8")
     reparsed = minidom.parseString(rough_str)
     return reparsed.toprettyxml(encoding="utf-8").decode("utf-8")
 

diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index 39155fb..288d8b1 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -19,6 +19,9 @@ from g_sorcery import exceptions, metadata, package_db
 
 from tests.base import BaseTest
 
+def tostring(element):
+    return ET.tostring(element, encoding='utf-8').decode('utf-8')
+
 class TestXMLGenerator(BaseTest):
 
     def test_generate(self):
@@ -52,22 +55,22 @@ class TestXMLGenerator(BaseTest):
         xg = metadata.XMLGenerator('test_ext', schema)
         self.assertRaises(exceptions.XMLGeneratorError, xg.generate, {})
         tree = xg.generate({'desc' : 'test xml'})
-        self.assertEqual(ET.tostring(tree, encoding='unicode'),
+        self.assertEqual(tostring(tree),
                          '<test_ext><desc>test xml</desc></test_ext>')
         tree = xg.generate({'desc' : 'test xml', 
                             'contact' : {'email' : 'test@×××××××.com',
                                          'phone' : '00-0'}})
-        self.assertEqual(ET.tostring(tree, encoding='unicode'),
+        self.assertEqual(tostring(tree),
                     '<test_ext><desc>test xml</desc><contact><email>test@×××××××.com\
 </email><phone>00-0</phone></contact></test_ext>')
         tree = xg.generate({'desc' : 'test xml', 
                             'multiple' : ['test1', 'test2', 'test3']})
-        self.assertEqual(ET.tostring(tree, encoding='unicode'),
+        self.assertEqual(tostring(tree),
                          '<test_ext><desc>test xml</desc><multiple>test1</multiple>\
 <multiple>test2</multiple><multiple>test3</multiple></test_ext>')
         tree = xg.generate({'desc' : 'test xml', 
                             'flag' : [('flag1', 'test1'), ('flag2', 'test2')]})
-        self.assertEqual(ET.tostring(tree, encoding='unicode'),
+        self.assertEqual(tostring(tree),
                          '<test_ext><desc>test xml</desc><flag name="flag1">test1</flag>\
 <flag name="flag2">test2</flag></test_ext>')
 
@@ -109,7 +112,7 @@ class TestMetadataGenerator(BaseTest):
 
     def test_process(self):
         mg = DummyMetadataGenerator(None)
-        self.assertEqual(ET.tostring(mg.process(None, description), encoding='unicode'),
+        self.assertEqual(tostring(mg.process(None, description)),
                          '<pkgmetadata><herd>test</herd><maintainer><email>test@×××××××.com</email>\
 <name>testor</name></maintainer><longdescription>test metadata</longdescription><use>\
 <flag name="flag1">test flag1</flag><flag name="flag2">test flag2</flag></use>\