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

[scoder at codespeak.net]

Author: scoder
Date: Mon Jan 21 19:39:25 2008
New Revision: 50849

Modified:
   lxml/trunk/   (props changed)
   lxml/trunk/CHANGES.txt
   lxml/trunk/src/lxml/lxml.etree.pyx
   lxml/trunk/src/lxml/python.pxd
Log:
 r3275 at delle:  sbehnel | 2008-01-21 11:29:56 +0100
 fix Py2.4-isms


Modified: lxml/trunk/CHANGES.txt
==============================================================================
--- lxml/trunk/CHANGES.txt	(original)
+++ lxml/trunk/CHANGES.txt	Mon Jan 21 19:39:25 2008
@@ -11,6 +11,8 @@
 Bugs fixed
 ----------
 
+* Some Python 2.4-isms slipped through in beta1.
+
 Other changes
 -------------
 

Modified: lxml/trunk/src/lxml/lxml.etree.pyx
==============================================================================
--- lxml/trunk/src/lxml/lxml.etree.pyx	(original)
+++ lxml/trunk/src/lxml/lxml.etree.pyx	Mon Jan 21 19:39:25 2008
@@ -846,7 +846,7 @@
                         prefix = None
                     else:
                         prefix = funicode(c_ns.prefix)
-                    if not python.PyDict_Contains(nsmap, prefix):
+                    if not python.PyDict_GetItem(nsmap, prefix):
                         python.PyDict_SetItem(
                             nsmap, prefix, funicode(c_ns.href))
                     c_ns = c_ns.next

Modified: lxml/trunk/src/lxml/python.pxd
==============================================================================
--- lxml/trunk/src/lxml/python.pxd	(original)
+++ lxml/trunk/src/lxml/python.pxd	Mon Jan 21 19:39:25 2008
@@ -66,7 +66,7 @@
     cdef void PyDict_Clear(object d)
     cdef object PyDict_Copy(object d)
     cdef object PyDictProxy_New(object d)
-    cdef int PyDict_Contains(object d, object key) except -1
+    # cdef int PyDict_Contains(object d, object key) except -1 # Python 2.4+
     cdef Py_ssize_t PyDict_Size(object d)
     cdef object PySequence_List(object o)
     cdef object PySequence_Tuple(object o)