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

[scoder at codespeak.net]

Author: scoder
Date: Tue May 20 00:01:43 2008
New Revision: 54976

Modified:
   lxml/trunk/   (props changed)
   lxml/trunk/src/lxml/nsclasses.pxi
   lxml/trunk/src/lxml/saxparser.pxi
   lxml/trunk/src/lxml/serializer.pxi
Log:
 r4233 at delle:  sbehnel | 2008-05-19 23:52:26 +0200
 Py3 fixes


Modified: lxml/trunk/src/lxml/nsclasses.pxi
==============================================================================
--- lxml/trunk/src/lxml/nsclasses.pxi	(original)
+++ lxml/trunk/src/lxml/nsclasses.pxi	Tue May 20 00:01:43 2008
@@ -73,7 +73,7 @@
         return self._entries.items()
 
     def iteritems(self):
-        return self._entries.iteritems()
+        return iter(self._entries.items())
 
     def clear(self):
         python.PyDict_Clear(self._entries)
@@ -223,7 +223,7 @@
     u"Internal lookup function to find all function prefixes for XSLT/XPath."
     cdef _XPathFunctionNamespaceRegistry registry
     ns_prefixes = []
-    for registry in __FUNCTION_NAMESPACE_REGISTRIES.itervalues():
+    for registry in __FUNCTION_NAMESPACE_REGISTRIES.values():
         if registry._prefix_utf is not None:
             if registry._ns_uri_utf is not None:
                 python.PyList_Append(
@@ -231,7 +231,7 @@
     return ns_prefixes
 
 cdef object _iter_ns_extension_functions():
-    return __FUNCTION_NAMESPACE_REGISTRIES.iteritems()
+    return __FUNCTION_NAMESPACE_REGISTRIES.items()
 
 cdef object _find_extension(ns_uri_utf, name_utf):
     cdef python.PyObject* dict_result

Modified: lxml/trunk/src/lxml/saxparser.pxi
==============================================================================
--- lxml/trunk/src/lxml/saxparser.pxi	(original)
+++ lxml/trunk/src/lxml/saxparser.pxi	Tue May 20 00:01:43 2008
@@ -351,7 +351,7 @@
     cdef int _flush(self) except -1:
         if python.PyList_GET_SIZE(self._data) > 0:
             if self._last is not None:
-                text = "".join(self._data)
+                text = u"".join(self._data)
                 if self._in_tail:
                     assert self._last.tail is None, u"internal error (tail)"
                     self._last.tail = text

Modified: lxml/trunk/src/lxml/serializer.pxi
==============================================================================
--- lxml/trunk/src/lxml/serializer.pxi	(original)
+++ lxml/trunk/src/lxml/serializer.pxi	Tue May 20 00:01:43 2008
@@ -54,6 +54,7 @@
             text = python.PyUnicode_DecodeUTF8(
                 c_text, tree.xmlBufferLength(c_buffer), 'strict')
             if encoding is not _unicode:
+                encoding = encoding.encode(u"ASCII")
                 text = python.PyUnicode_AsEncodedString(
                     text, encoding, 'strict')
         else: