[Lxml-checkins] r55090 - in lxml/trunk: . src/lxml

[scoder at codespeak.net]

Author: scoder
Date: Wed May 21 21:46:05 2008
New Revision: 55090

Modified:
   lxml/trunk/   (props changed)
   lxml/trunk/src/lxml/serializer.pxi
   lxml/trunk/src/lxml/xslt.pxi
Log:
 r4255 at delle:  sbehnel | 2008-05-21 00:06:30 +0200
 unicode fixes


Modified: lxml/trunk/src/lxml/serializer.pxi
==============================================================================
--- lxml/trunk/src/lxml/serializer.pxi	(original)
+++ lxml/trunk/src/lxml/serializer.pxi	Wed May 21 21:46:05 2008
@@ -54,7 +54,7 @@
             text = python.PyUnicode_DecodeUTF8(
                 c_text, tree.xmlBufferLength(c_buffer), 'strict')
             if encoding is not _unicode:
-                encoding = encoding.encode(u"ASCII")
+                encoding = _utf8(encoding)
                 text = python.PyUnicode_AsEncodedString(
                     text, encoding, 'strict')
         else:

Modified: lxml/trunk/src/lxml/xslt.pxi
==============================================================================
--- lxml/trunk/src/lxml/xslt.pxi	(original)
+++ lxml/trunk/src/lxml/xslt.pxi	Wed May 21 21:46:05 2008
@@ -366,7 +366,7 @@
 
         # make sure we always have a stylesheet URL
         if c_doc.URL is NULL:
-            doc_url_utf = "string://__STRING__XSLT__%s" % id(self)
+            doc_url_utf = "string://__STRING__XSLT__" + str(id(self))
             c_doc.URL = tree.xmlStrdup(_cstr(doc_url_utf))
 
         self._error_log = _ErrorLog()