Imported Upstream version 2.8.0+dfsg1

1 files changed, 106 insertions, 174 deletions

diff --git a/python/types.c b/python/types.c
index 31c909a..54b50de 100644
--- a/python/types.c
+++ b/python/types.c
@@ -9,83 +9,6 @@
 #include "libxml_wrap.h"
 #include <libxml/xpathInternals.h>
 
-#if PY_MAJOR_VERSION >= 3
-#define PY_IMPORT_STRING_SIZE PyUnicode_FromStringAndSize
-#define PY_IMPORT_STRING PyUnicode_FromString
-#define PY_IMPORT_INT PyLong_FromLong
-#else
-#define PY_IMPORT_STRING_SIZE PyString_FromStringAndSize
-#define PY_IMPORT_STRING PyString_FromString
-#define PY_IMPORT_INT PyInt_FromLong
-#endif
-
-#if PY_MAJOR_VERSION >= 3
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-FILE *
-libxml_PyFileGet(PyObject *f) {
-    int fd, flags;
-    FILE *res;
-    const char *mode;
-
-    fd = PyObject_AsFileDescriptor(f);
-    if (!_PyVerify_fd(fd))
-        return(NULL);
-    /*
-     * Get the flags on the fd to understand how it was opened
-     */
-    flags = fcntl(fd, F_GETFL, 0);
-    switch (flags & O_ACCMODE) {
-        case O_RDWR:
-	    if (flags & O_APPEND)
-	        mode = "a+";
-	    else
-	        mode = "rw";
-	    break;
-        case O_RDONLY:
-	    if (flags & O_APPEND)
-	        mode = "r+";
-	    else
-	        mode = "r";
-	    break;
-	case O_WRONLY:
-	    if (flags & O_APPEND)
-	        mode = "a";
-	    else
-	        mode = "w";
-	    break;
-	default:
-	    return(NULL);
-    }
-
-    /*
-     * the FILE struct gets a new fd, so that it can be closed
-     * independently of the file descriptor given. The risk though is
-     * lack of sync. So at the python level sync must be implemented
-     * before and after a conversion took place. No way around it
-     * in the Python3 infrastructure !
-     * The duplicated fd and FILE * will be released in the subsequent
-     * call to libxml_PyFileRelease() which must be genrated accodingly
-     */
-    fd = dup(fd);
-    if (fd == -1)
-        return(NULL);
-    res = fdopen(fd, mode);
-    if (res == NULL) {
-        close(fd);
-	return(NULL);
-    }
-    return(res);
-}
-
-void libxml_PyFileRelease(FILE *f) {
-    if (f != NULL)
-        fclose(f);
-}
-#endif
-
 PyObject *
 libxml_intWrap(int val)
 {
@@ -94,7 +17,7 @@ libxml_intWrap(int val)
 #ifdef DEBUG
     printf("libxml_intWrap: val = %d\n", val);
 #endif
-    ret = PY_IMPORT_INT((long) val);
+    ret = PyInt_FromLong((long) val);
     return (ret);
 }
 
@@ -106,7 +29,7 @@ libxml_longWrap(long val)
 #ifdef DEBUG
     printf("libxml_longWrap: val = %ld\n", val);
 #endif
-    ret = PyLong_FromLong(val);
+    ret = PyInt_FromLong(val);
     return (ret);
 }
 
@@ -134,7 +57,8 @@ libxml_charPtrWrap(char *str)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PY_IMPORT_STRING(str);
+    /* TODO: look at deallocation */
+    ret = PyString_FromString(str);
     xmlFree(str);
     return (ret);
 }
@@ -151,7 +75,8 @@ libxml_charPtrConstWrap(const char *str)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PY_IMPORT_STRING(str);
+    /* TODO: look at deallocation */
+    ret = PyString_FromString(str);
     return (ret);
 }
 
@@ -167,7 +92,8 @@ libxml_xmlCharPtrWrap(xmlChar * str)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PY_IMPORT_STRING((char *) str);
+    /* TODO: look at deallocation */
+    ret = PyString_FromString((char *) str);
     xmlFree(str);
     return (ret);
 }
@@ -184,7 +110,8 @@ libxml_xmlCharPtrConstWrap(const xmlChar * str)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PY_IMPORT_STRING((char *) str);
+    /* TODO: look at deallocation */
+    ret = PyString_FromString((char *) str);
     return (ret);
 }
 
@@ -200,7 +127,8 @@ libxml_constcharPtrWrap(const char *str)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PY_IMPORT_STRING(str);
+    /* TODO: look at deallocation */
+    ret = PyString_FromString(str);
     return (ret);
 }
 
@@ -216,7 +144,8 @@ libxml_constxmlCharPtrWrap(const xmlChar * str)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PY_IMPORT_STRING((char *) str);
+    /* TODO: look at deallocation */
+    ret = PyString_FromString((char *) str);
     return (ret);
 }
 
@@ -233,7 +162,9 @@ libxml_xmlDocPtrWrap(xmlDocPtr doc)
         return (Py_None);
     }
     /* TODO: look at deallocation */
-    ret = PyCapsule_New((void *) doc, (char *) "xmlDocPtr", NULL);
+    ret =
+        PyCObject_FromVoidPtrAndDesc((void *) doc, (char *) "xmlDocPtr",
+                                     NULL);
     return (ret);
 }
 
@@ -249,7 +180,9 @@ libxml_xmlNodePtrWrap(xmlNodePtr node)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PyCapsule_New((void *) node, (char *) "xmlNodePtr", NULL);
+    ret =
+        PyCObject_FromVoidPtrAndDesc((void *) node, (char *) "xmlNodePtr",
+                                     NULL);
     return (ret);
 }
 
@@ -265,7 +198,9 @@ libxml_xmlURIPtrWrap(xmlURIPtr uri)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PyCapsule_New((void *) uri, (char *) "xmlURIPtr", NULL);
+    ret =
+        PyCObject_FromVoidPtrAndDesc((void *) uri, (char *) "xmlURIPtr",
+                                     NULL);
     return (ret);
 }
 
@@ -281,7 +216,9 @@ libxml_xmlNsPtrWrap(xmlNsPtr ns)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PyCapsule_New((void *) ns, (char *) "xmlNsPtr", NULL);
+    ret =
+        PyCObject_FromVoidPtrAndDesc((void *) ns, (char *) "xmlNsPtr",
+                                     NULL);
     return (ret);
 }
 
@@ -297,7 +234,9 @@ libxml_xmlAttrPtrWrap(xmlAttrPtr attr)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PyCapsule_New((void *) attr, (char *) "xmlAttrPtr", NULL);
+    ret =
+        PyCObject_FromVoidPtrAndDesc((void *) attr, (char *) "xmlAttrPtr",
+                                     NULL);
     return (ret);
 }
 
@@ -313,7 +252,9 @@ libxml_xmlAttributePtrWrap(xmlAttributePtr attr)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PyCapsule_New((void *) attr, (char *) "xmlAttributePtr", NULL);
+    ret =
+        PyCObject_FromVoidPtrAndDesc((void *) attr,
+                                     (char *) "xmlAttributePtr", NULL);
     return (ret);
 }
 
@@ -329,7 +270,9 @@ libxml_xmlElementPtrWrap(xmlElementPtr elem)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PyCapsule_New((void *) elem, (char *) "xmlElementPtr", NULL);
+    ret =
+        PyCObject_FromVoidPtrAndDesc((void *) elem,
+                                     (char *) "xmlElementPtr", NULL);
     return (ret);
 }
 
@@ -345,7 +288,9 @@ libxml_xmlXPathContextPtrWrap(xmlXPathContextPtr ctxt)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PyCapsule_New((void *) ctxt, (char *) "xmlXPathContextPtr", NULL);
+    ret =
+        PyCObject_FromVoidPtrAndDesc((void *) ctxt,
+                                     (char *) "xmlXPathContextPtr", NULL);
     return (ret);
 }
 
@@ -361,7 +306,9 @@ libxml_xmlXPathParserContextPtrWrap(xmlXPathParserContextPtr ctxt)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PyCapsule_New((void *)ctxt, (char *)"xmlXPathParserContextPtr", NULL);
+    ret = PyCObject_FromVoidPtrAndDesc((void *) ctxt,
+                                       (char *) "xmlXPathParserContextPtr",
+                                       NULL);
     return (ret);
 }
 
@@ -378,35 +325,28 @@ libxml_xmlParserCtxtPtrWrap(xmlParserCtxtPtr ctxt)
         return (Py_None);
     }
 
-    ret = PyCapsule_New((void *) ctxt, (char *) "xmlParserCtxtPtr", NULL);
+    ret =
+        PyCObject_FromVoidPtrAndDesc((void *) ctxt,
+                                     (char *) "xmlParserCtxtPtr", NULL);
     return (ret);
 }
 
 /**
  * libxml_xmlXPathDestructNsNode:
- * cap: xmlNsPtr namespace node capsule object
+ * cobj: xmlNsPtr namespace node
+ * desc: ignored string
  *
  * This function is called if and when a namespace node returned in
  * an XPath node set is to be destroyed. That's the only kind of
  * object returned in node set not directly linked to the original
  * xmlDoc document, see xmlXPathNodeSetDupNs.
  */
-#if PY_VERSION_HEX < 0x02070000
-static void
-libxml_xmlXPathDestructNsNode(void *cap, void *desc ATTRIBUTE_UNUSED)
-#else
 static void
-libxml_xmlXPathDestructNsNode(PyObject *cap)
-#endif
-{
+libxml_xmlXPathDestructNsNode(void *cobj, void *desc ATTRIBUTE_UNUSED) {
 #ifdef DEBUG
-    fprintf(stderr, "libxml_xmlXPathDestructNsNode called %p\n", cap);
-#endif
-#if PY_VERSION_HEX < 0x02070000
-    xmlXPathNodeSetFreeNs((xmlNsPtr) cap);
-#else
-    xmlXPathNodeSetFreeNs((xmlNsPtr) PyCapsule_GetPointer(cap, "xmlNsPtr"));
+    fprintf(stderr, "libxml_xmlXPathDestructNsNode called %p\n", cobj);
 #endif
+    xmlXPathNodeSetFreeNs((xmlNsPtr) cobj);
 }
 
 PyObject *
@@ -460,7 +400,8 @@ libxml_xmlXPathObjectPtrWrap(xmlXPathObjectPtr obj)
                 for (i = 0; i < obj->nodesetval->nodeNr; i++) {
                     node = obj->nodesetval->nodeTab[i];
                     if (node->type == XML_NAMESPACE_DECL) {
-		        PyObject *ns = PyCapsule_New((void *) node,
+		        PyObject *ns = 
+			    PyCObject_FromVoidPtrAndDesc((void *) node,
                                      (char *) "xmlNsPtr",
 				     libxml_xmlXPathDestructNsNode);
 			PyList_SetItem(ret, i, ns);
@@ -473,13 +414,13 @@ libxml_xmlXPathObjectPtrWrap(xmlXPathObjectPtr obj)
             }
             break;
         case XPATH_BOOLEAN:
-            ret = PY_IMPORT_INT((long) obj->boolval);
+            ret = PyInt_FromLong((long) obj->boolval);
             break;
         case XPATH_NUMBER:
             ret = PyFloat_FromDouble(obj->floatval);
             break;
         case XPATH_STRING:
-	    ret = PY_IMPORT_STRING((char *) obj->stringval);
+            ret = PyString_FromString((char *) obj->stringval);
             break;
         case XPATH_POINT:
         {
@@ -488,7 +429,7 @@ libxml_xmlXPathObjectPtrWrap(xmlXPathObjectPtr obj)
             PyObject *tuple;
 
             node = libxml_xmlNodePtrWrap(obj->user);
-            indexIntoNode = PY_IMPORT_INT((long) obj->index);
+            indexIntoNode = PyInt_FromLong((long) obj->index);
 
             tuple = PyTuple_New(2);
             PyTuple_SetItem(tuple, 0, node);
@@ -512,7 +453,7 @@ libxml_xmlXPathObjectPtrWrap(xmlXPathObjectPtr obj)
                 list = PyList_New(1);
 
                 node = libxml_xmlNodePtrWrap(obj->user);
-                indexIntoNode = PY_IMPORT_INT((long) obj->index);
+                indexIntoNode = PyInt_FromLong((long) obj->index);
 
                 tuple = PyTuple_New(2);
                 PyTuple_SetItem(tuple, 0, node);
@@ -530,7 +471,7 @@ libxml_xmlXPathObjectPtrWrap(xmlXPathObjectPtr obj)
                 list = PyList_New(2);
 
                 node = libxml_xmlNodePtrWrap(obj->user);
-                indexIntoNode = PY_IMPORT_INT((long) obj->index);
+                indexIntoNode = PyInt_FromLong((long) obj->index);
 
                 tuple = PyTuple_New(2);
                 PyTuple_SetItem(tuple, 0, node);
@@ -539,7 +480,7 @@ libxml_xmlXPathObjectPtrWrap(xmlXPathObjectPtr obj)
                 PyList_SetItem(list, 0, tuple);
 
                 node = libxml_xmlNodePtrWrap(obj->user2);
-                indexIntoNode = PY_IMPORT_INT((long) obj->index2);
+                indexIntoNode = PyInt_FromLong((long) obj->index2);
 
                 tuple = PyTuple_New(2);
                 PyTuple_SetItem(tuple, 0, node);
@@ -604,14 +545,14 @@ libxml_xmlXPathObjectPtrConvert(PyObject * obj)
     if (obj == NULL) {
         return (NULL);
     }
-    if PyFloat_Check (obj) {
+    if PyFloat_Check
+        (obj) {
         ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj));
-    } else if PyLong_Check(obj) {
-#ifdef PyLong_AS_LONG
-        ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj));
-#else
+
+    } else if PyInt_Check(obj) {
+
         ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));
-#endif
+
 #ifdef PyBool_Check
     } else if PyBool_Check (obj) {
 
@@ -622,37 +563,15 @@ libxml_xmlXPathObjectPtrConvert(PyObject * obj)
           ret = xmlXPathNewBoolean(0);
         }
 #endif
-    } else if PyBytes_Check (obj) {
+    } else if PyString_Check
+        (obj) {
         xmlChar *str;
 
-        str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj),
-                         PyBytes_GET_SIZE(obj));
+        str = xmlStrndup((const xmlChar *) PyString_AS_STRING(obj),
+                         PyString_GET_SIZE(obj));
         ret = xmlXPathWrapString(str);
-#ifdef PyUnicode_Check
-    } else if PyUnicode_Check (obj) {
-#if PY_VERSION_HEX >= 0x03030000
-        xmlChar *str;
-	const char *tmp;
-	size_t size;
-
-	/* tmp doesn't need to be deallocated */
-        tmp = PyUnicode_AsUTF8AndSize(obj, &size);
-        str = xmlStrndup(tmp, (int) size);
-        ret = xmlXPathWrapString(str);
-#else
-        xmlChar *str = NULL;
-        PyObject *b;
-
-	b = PyUnicode_AsUTF8String(obj);
-	if (b != NULL) {
-	    str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(b),
-			     PyBytes_GET_SIZE(b));
-	    Py_DECREF(b);
-	}
-	ret = xmlXPathWrapString(str);
-#endif
-#endif
-    } else if PyList_Check (obj) {
+    } else if PyList_Check
+        (obj) {
         int i;
         PyObject *node;
         xmlNodePtr cur;
@@ -666,18 +585,28 @@ libxml_xmlXPathObjectPtrConvert(PyObject * obj)
                 continue;
 
             cur = NULL;
-            if (PyCapsule_CheckExact(node)) {
+            if (PyCObject_Check(node)) {
 #ifdef DEBUG
-                printf("Got a Capsule\n");
+                printf("Got a CObject\n");
 #endif
                 cur = PyxmlNode_Get(node);
-            } else if ((PyObject_HasAttrString(node, (char *) "_o")) &&
-	               (PyObject_HasAttrString(node, (char *) "get_doc"))) {
-		PyObject *wrapper;
-
-		wrapper = PyObject_GetAttrString(node, (char *) "_o");
-		if (wrapper != NULL)
-		    cur = PyxmlNode_Get(wrapper);
+            } else if (PyInstance_Check(node)) {
+                PyInstanceObject *inst = (PyInstanceObject *) node;
+                PyObject *name = inst->in_class->cl_name;
+
+                if PyString_Check
+                    (name) {
+                    char *type = PyString_AS_STRING(name);
+                    PyObject *wrapper;
+
+                    if (!strcmp(type, "xmlNode")) {
+                        wrapper =
+                            PyObject_GetAttrString(node, (char *) "_o");
+                        if (wrapper != NULL) {
+                            cur = PyxmlNode_Get(wrapper);
+                        }
+                    }
+                    }
             } else {
 #ifdef DEBUG
                 printf("Unknown object in Python return list\n");
@@ -693,6 +622,7 @@ libxml_xmlXPathObjectPtrConvert(PyObject * obj)
         printf("Unable to convert Python Object to XPath");
 #endif
     }
+    Py_DECREF(obj);
     return (ret);
 }
 
@@ -700,7 +630,7 @@ PyObject *
 libxml_xmlValidCtxtPtrWrap(xmlValidCtxtPtr valid)
 {
 	PyObject *ret;
-
+	
 #ifdef DEBUG
 	printf("libxml_xmlValidCtxtPtrWrap: valid = %p\n", valid);
 #endif
@@ -710,7 +640,7 @@ libxml_xmlValidCtxtPtrWrap(xmlValidCtxtPtr valid)
 	}
 
 	ret = 
-		PyCapsule_New((void *) valid,
+		PyCObject_FromVoidPtrAndDesc((void *) valid,
 									 (char *) "xmlValidCtxtPtr", NULL);
 
 	return (ret);
@@ -729,7 +659,7 @@ libxml_xmlCatalogPtrWrap(xmlCatalogPtr catal)
         return (Py_None);
     }
     ret =
-        PyCapsule_New((void *) catal,
+        PyCObject_FromVoidPtrAndDesc((void *) catal,
                                      (char *) "xmlCatalogPtr", NULL);
     return (ret);
 }
@@ -747,7 +677,7 @@ libxml_xmlOutputBufferPtrWrap(xmlOutputBufferPtr buffer)
         return (Py_None);
     }
     ret =
-        PyCapsule_New((void *) buffer,
+        PyCObject_FromVoidPtrAndDesc((void *) buffer,
                                      (char *) "xmlOutputBufferPtr", NULL);
     return (ret);
 }
@@ -765,7 +695,7 @@ libxml_xmlParserInputBufferPtrWrap(xmlParserInputBufferPtr buffer)
         return (Py_None);
     }
     ret =
-        PyCapsule_New((void *) buffer,
+        PyCObject_FromVoidPtrAndDesc((void *) buffer,
                                      (char *) "xmlParserInputBufferPtr", NULL);
     return (ret);
 }
@@ -784,7 +714,7 @@ libxml_xmlRegexpPtrWrap(xmlRegexpPtr regexp)
         return (Py_None);
     }
     ret =
-        PyCapsule_New((void *) regexp,
+        PyCObject_FromVoidPtrAndDesc((void *) regexp,
                                      (char *) "xmlRegexpPtr", NULL);
     return (ret);
 }
@@ -804,7 +734,7 @@ libxml_xmlTextReaderPtrWrap(xmlTextReaderPtr reader)
         return (Py_None);
     }
     ret =
-        PyCapsule_New((void *) reader,
+        PyCObject_FromVoidPtrAndDesc((void *) reader,
                                      (char *) "xmlTextReaderPtr", NULL);
     return (ret);
 }
@@ -822,7 +752,7 @@ libxml_xmlTextReaderLocatorPtrWrap(xmlTextReaderLocatorPtr locator)
         return (Py_None);
     }
     ret =
-        PyCapsule_New((void *) locator,
+        PyCObject_FromVoidPtrAndDesc((void *) locator,
                                      (char *) "xmlTextReaderLocatorPtr", NULL);
     return (ret);
 }
@@ -842,7 +772,7 @@ libxml_xmlRelaxNGPtrWrap(xmlRelaxNGPtr ctxt)
         return (Py_None);
     }
     ret =
-        PyCapsule_New((void *) ctxt,
+        PyCObject_FromVoidPtrAndDesc((void *) ctxt,
                                      (char *) "xmlRelaxNGPtr", NULL);
     return (ret);
 }
@@ -860,7 +790,7 @@ libxml_xmlRelaxNGParserCtxtPtrWrap(xmlRelaxNGParserCtxtPtr ctxt)
         return (Py_None);
     }
     ret =
-        PyCapsule_New((void *) ctxt,
+        PyCObject_FromVoidPtrAndDesc((void *) ctxt,
                                      (char *) "xmlRelaxNGParserCtxtPtr", NULL);
     return (ret);
 }
@@ -877,7 +807,7 @@ libxml_xmlRelaxNGValidCtxtPtrWrap(xmlRelaxNGValidCtxtPtr valid)
         return (Py_None);
     }
     ret =
-        PyCapsule_New((void *) valid,
+        PyCObject_FromVoidPtrAndDesc((void *) valid,
                                      (char *) "xmlRelaxNGValidCtxtPtr", NULL);
     return (ret);
 }
@@ -895,7 +825,7 @@ libxml_xmlSchemaPtrWrap(xmlSchemaPtr ctxt)
 		return (Py_None);
 	}
 	ret =
-		PyCapsule_New((void *) ctxt,
+		PyCObject_FromVoidPtrAndDesc((void *) ctxt,
 									 (char *) "xmlSchemaPtr", NULL);
 	return (ret);
 }
@@ -913,7 +843,7 @@ libxml_xmlSchemaParserCtxtPtrWrap(xmlSchemaParserCtxtPtr ctxt)
 		return (Py_None);
 	}
 	ret = 
-		PyCapsule_New((void *) ctxt,
+		PyCObject_FromVoidPtrAndDesc((void *) ctxt,
 									 (char *) "xmlSchemaParserCtxtPtr", NULL);
 
 	return (ret);
@@ -933,7 +863,7 @@ libxml_xmlSchemaValidCtxtPtrWrap(xmlSchemaValidCtxtPtr valid)
 	}
 
 	ret = 
-		PyCapsule_New((void *) valid,
+		PyCObject_FromVoidPtrAndDesc((void *) valid,
 									 (char *) "xmlSchemaValidCtxtPtr", NULL);
 
 	return (ret);
@@ -952,6 +882,8 @@ libxml_xmlErrorPtrWrap(xmlErrorPtr error)
         Py_INCREF(Py_None);
         return (Py_None);
     }
-    ret = PyCapsule_New((void *) error, (char *) "xmlErrorPtr", NULL);
+    ret =
+        PyCObject_FromVoidPtrAndDesc((void *) error,
+                                     (char *) "xmlErrorPtr", NULL);
     return (ret);
 }