[gentoo-commits] proj/javatoolkit:master commit in: src/py/javatoolkit/xml/

[gentoo-commits] proj/javatoolkit:master commit in: src/py/javatoolkit/xml/

[Patrice Clement]

commit:     0742a5a62058db8c3b8ff5d21e8fe662915d8cd2
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 12:27:21 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Aug 10 12:27:21 2017 +0000
URL:        https://gitweb.gentoo.org/proj/javatoolkit.git/commit/?id=0742a5a6

swap around string encoding

 src/py/javatoolkit/xml/SaxRewriter.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/py/javatoolkit/xml/SaxRewriter.py b/src/py/javatoolkit/xml/SaxRewriter.py
index bd6e8de..f9e224a 100644
--- a/src/py/javatoolkit/xml/SaxRewriter.py
+++ b/src/py/javatoolkit/xml/SaxRewriter.py
@@ -115,7 +115,7 @@ class SaxRewriter(XMLGenerator):
 
 
     def p(self,str):
-        self.buffer.write(str.encode('utf8'))
+        self.buffer.write(str)
 
 
     def write_attr(self,a,v):
@@ -125,7 +125,7 @@ class SaxRewriter(XMLGenerator):
     def process(self, in_stream, callback):
         self.startElement = callback
         from xml.sax import parseString
-        parseString(in_stream, self)
+        parseString(in_stream.encode('UTF8'), self)
         self.p('\n')
 
 # vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:

[gentoo-commits] proj/javatoolkit:master commit in: src/py/javatoolkit/xml/

[Patrice Clement]

commit:     358365183a2ece6b193f5b766e8d8e89e756f98a
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  8 21:36:35 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Sep  8 21:36:55 2017 +0000
URL:        https://gitweb.gentoo.org/proj/javatoolkit.git/commit/?id=35836518

decode bytes string to unicode string

 src/py/javatoolkit/xml/DomRewriter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/py/javatoolkit/xml/DomRewriter.py b/src/py/javatoolkit/xml/DomRewriter.py
index 7cd5a2f..d1200b6 100644
--- a/src/py/javatoolkit/xml/DomRewriter.py
+++ b/src/py/javatoolkit/xml/DomRewriter.py
@@ -71,6 +71,6 @@ class DomRewriter:
 
 
     def write(self,stream):
-        stream.write(self.document.toxml("utf-8"))
+        stream.write(self.document.toxml('utf-8').decode('utf-8'))
 
 # vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap: