[svn r3812] r4476@delle: sbehnel | 2008-06-05 21:21:58 +0200

 nogil declaration fixes

--HG--
branch : trunk

8 files changed, 17 insertions, 17 deletions

diff --git a/src/lxml/apihelpers.pxi b/src/lxml/apihelpers.pxi
index 7a91144b..6ddc0b7e 100644
--- a/src/lxml/apihelpers.pxi
+++ b/src/lxml/apihelpers.pxi
@@ -720,7 +720,7 @@ cdef inline xmlNode* _findChildBackwards(xmlNode* c_node, Py_ssize_t index):
         c_child = c_child.prev
     return NULL
     
-cdef inline xmlNode* _textNodeOrSkip(xmlNode* c_node):
+cdef inline xmlNode* _textNodeOrSkip(xmlNode* c_node) nogil:
     u"""Return the node if it's a text node.  Skip over ignorable nodes in a
     series of text nodes.  Return NULL if a non-ignorable node is found.
 
diff --git a/src/lxml/iterparse.pxi b/src/lxml/iterparse.pxi
index 71da5ab6..592e198e 100644
--- a/src/lxml/iterparse.pxi
+++ b/src/lxml/iterparse.pxi
@@ -357,7 +357,7 @@ Other keyword arguments:
     cdef object _source
     cdef object _buffer
     cdef int (*_parse_chunk)(xmlparser.xmlParserCtxt* ctxt,
-                             char* chunk, int size, int terminate)
+                             char* chunk, int size, int terminate) nogil
     def __init__(self, source, events=(u"end",), *, tag=None,
                  attribute_defaults=False, dtd_validation=False,
                  load_dtd=False, no_network=True, remove_blank_text=False,
diff --git a/src/lxml/parser.pxi b/src/lxml/parser.pxi
index 6b679a19..37cbfc42 100644
--- a/src/lxml/parser.pxi
+++ b/src/lxml/parser.pxi
@@ -394,7 +394,7 @@ cdef  xmlparser.xmlParserInput* _parser_resolve_from_python(
     return c_input
 
 cdef xmlparser.xmlParserInput* _local_resolver(char* c_url, char* c_pubid,
-                                               xmlparser.xmlParserCtxt* c_context):
+                                               xmlparser.xmlParserCtxt* c_context) nogil:
     # no Python objects here, may be called without thread context !
     # when we declare a Python object, Pyrex will INCREF(None) !
     cdef xmlparser.xmlParserInput* c_input
diff --git a/src/lxml/proxy.pxi b/src/lxml/proxy.pxi
index 2025be7d..12bf67c1 100644
--- a/src/lxml/proxy.pxi
+++ b/src/lxml/proxy.pxi
@@ -193,7 +193,7 @@ cdef int canDeallocateChildNodes(xmlNode* c_parent):
 ################################################################################
 # fix _Document references and namespaces when a node changes documents
 
-cdef void _copyParentNamespaces(xmlNode* c_from_node, xmlNode* c_to_node):
+cdef void _copyParentNamespaces(xmlNode* c_from_node, xmlNode* c_to_node) nogil:
     u"""Copy the namespaces of all ancestors of c_from_node to c_to_node.
     """
     cdef xmlNode* c_parent
diff --git a/src/lxml/tree.pxd b/src/lxml/tree.pxd
index 74b56119..7cbc5058 100644
--- a/src/lxml/tree.pxd
+++ b/src/lxml/tree.pxd
@@ -48,7 +48,7 @@ cdef extern from "libxml/chvalid.h":
 
 cdef extern from "libxml/hash.h":
     ctypedef struct xmlHashTable
-    ctypedef void xmlHashScanner(void* payload, void* data, char* name) nogil
+    ctypedef void xmlHashScanner(void* payload, void* data, char* name) # may require GIL!
     void xmlHashScan(xmlHashTable* table, xmlHashScanner f, void* data) nogil
     void* xmlHashLookup(xmlHashTable* table, char* name) nogil
 
@@ -263,12 +263,12 @@ cdef extern from "libxml/xmlIO.h":
     cdef int xmlOutputBufferClose(xmlOutputBuffer* out) nogil
 
     ctypedef int (*xmlInputReadCallback)(void* context,
-                                         char* buffer, int len) nogil
-    ctypedef int (*xmlInputCloseCallback)(void* context) nogil
+                                         char* buffer, int len)
+    ctypedef int (*xmlInputCloseCallback)(void* context)
 
     ctypedef int (*xmlOutputWriteCallback)(void* context,
-                                           char* buffer, int len) nogil
-    ctypedef int (*xmlOutputCloseCallback)(void* context) nogil
+                                           char* buffer, int len)
+    ctypedef int (*xmlOutputCloseCallback)(void* context)
 
     cdef xmlOutputBuffer* xmlAllocOutputBuffer(
         xmlCharEncodingHandler* encoder) nogil
diff --git a/src/lxml/xmlerror.pxi b/src/lxml/xmlerror.pxi
index 06bdea14..590c3377 100644
--- a/src/lxml/xmlerror.pxi
+++ b/src/lxml/xmlerror.pxi
@@ -13,7 +13,7 @@ def clear_error_log():
     __GLOBAL_ERROR_LOG.clear()
 
 # dummy function: no debug output at all
-cdef void _nullGenericErrorFunc(void* ctxt, char* msg, ...):
+cdef void _nullGenericErrorFunc(void* ctxt, char* msg, ...) nogil:
     pass
 
 # setup for global log:
diff --git a/src/lxml/xpath.pxd b/src/lxml/xpath.pxd
index a5d05a10..b6c1d2ce 100644
--- a/src/lxml/xpath.pxd
+++ b/src/lxml/xpath.pxd
@@ -70,10 +70,10 @@ cdef extern from "libxml/xpath.h":
 
     ctypedef struct xmlXPathCompExpr
 
-    ctypedef void (*xmlXPathFunction)(xmlXPathParserContext* ctxt, int nargs)
+    ctypedef void (*xmlXPathFunction)(xmlXPathParserContext* ctxt, int nargs) nogil
     ctypedef xmlXPathFunction (*xmlXPathFuncLookupFunc)(void* ctxt,
                                                         char* name,
-                                                        char* ns_uri)
+                                                        char* ns_uri) nogil
     
     cdef xmlXPathContext* xmlXPathNewContext(tree.xmlDoc* doc) nogil
     cdef xmlXPathObject* xmlXPathEvalExpression(char* str,
diff --git a/src/lxml/xslt.pxd b/src/lxml/xslt.pxd
index 6d4b2c84..6cae5d24 100644
--- a/src/lxml/xslt.pxd
+++ b/src/lxml/xslt.pxd
@@ -41,7 +41,7 @@ cdef extern from "libxslt/extensions.h":
     ctypedef void (*xsltTransformFunction)(xsltTransformContext* ctxt,
                                            xmlNode* context_node,
                                            xmlNode* inst,
-                                           void* precomp_unused)
+                                           void* precomp_unused) nogil
 
     cdef int xsltRegisterExtFunction(xsltTransformContext* ctxt,
                                      char* name,
@@ -67,7 +67,7 @@ cdef extern from "libxslt/documents.h":
     ctypedef xmlDoc* (*xsltDocLoaderFunc)(char* URI, xmlDict* dict,
                                           int options,
                                           void* ctxt,
-                                          xsltLoadType type)
+                                          xsltLoadType type) nogil
     cdef xsltDocLoaderFunc xsltDocDefaultLoader
     cdef void xsltSetLoaderFunc(xsltDocLoaderFunc f) nogil
 
@@ -80,7 +80,7 @@ cdef extern from "libxslt/transform.h":
                                          xsltTransformContext* context) nogil
     cdef void xsltProcessOneNode(xsltTransformContext* ctxt,
                                  xmlNode* contextNode,
-                                 xsltStackElem* params)
+                                 xsltStackElem* params) nogil
     cdef xsltTransformContext* xsltNewTransformContext(xsltStylesheet* style,
                                                        xmlDoc* doc) nogil
     cdef void xsltFreeTransformContext(xsltTransformContext* context) nogil
@@ -95,7 +95,7 @@ cdef extern from "libxslt/xsltutils.h":
         void* ctxt, void (*handler)(void* ctxt, char* msg, ...)) nogil
     cdef void xsltSetTransformErrorFunc(
         xsltTransformContext*, void* ctxt,
-        void (*handler)(void* ctxt, char* msg, ...)) nogil
+        void (*handler)(void* ctxt, char* msg, ...) nogil) nogil
     cdef void xsltTransformError(xsltTransformContext* ctxt, 
                                  xsltStylesheet* style, 
                                  xmlNode* node, char* msg, ...)
@@ -110,7 +110,7 @@ cdef extern from "libxslt/security.h":
 
     ctypedef int (*xsltSecurityCheck)(xsltSecurityPrefs* sec,
                                       xsltTransformContext* ctxt,
-                                      char* value)
+                                      char* value) nogil
 
     cdef xsltSecurityPrefs* xsltNewSecurityPrefs() nogil
     cdef void xsltFreeSecurityPrefs(xsltSecurityPrefs* sec) nogil