diff --git a/CHANGES.txt b/CHANGES.txt index c6770c2d4..24fc431c8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -48,6 +48,9 @@ Bugs fixed Other changes ------------- +* In the public C-API, ``findOrBuildNodeNs()`` was replaced by the more + generic ``findOrBuildNodeNsPrefix`` + * major refactoring in XPath/XSLT extension function code diff --git a/TODO.txt b/TODO.txt index 48d50c92d..8eddc7ebe 100644 --- a/TODO.txt +++ b/TODO.txt @@ -62,9 +62,6 @@ lxml 2.0 * always use ns-prefixed type names in objectify's ``xsi:type`` attributes -* remove ``findOrBuildNodeNs()`` from C-API (replaced by - findOrBuildNodeNsPrefix) - * follow PEP 8 in API naming (avoidCamelCase in_favour_of_underscores) * clean support for entities (is the Entity element class enough?) diff --git a/src/lxml/etreepublic.pxd b/src/lxml/etreepublic.pxd index 839aeef47..db0eb27df 100644 --- a/src/lxml/etreepublic.pxd +++ b/src/lxml/etreepublic.pxd @@ -197,10 +197,6 @@ cdef extern from "etree.h": # append an element to the children of a parent element cdef void appendChild(_Element parent, _Element child) - # recursively lookup a namespace in element or ancestors, or create it - cdef tree.xmlNs* findOrBuildNodeNs(_Document doc, tree.xmlNode* c_node, - char* href) - # recursively lookup a namespace in element or ancestors, or create it cdef tree.xmlNs* findOrBuildNodeNsPrefix( _Document doc, tree.xmlNode* c_node, char* href, char* prefix) diff --git a/src/lxml/public-api.pxi b/src/lxml/public-api.pxi index a22d0e752..f4d4079e5 100644 --- a/src/lxml/public-api.pxi +++ b/src/lxml/public-api.pxi @@ -137,12 +137,6 @@ cdef public void iteratorStoreNext(_ElementIterator iterator, _Element node): cdef public void initTagMatch(_ElementTagMatcher matcher, tag): matcher._initTagMatch(tag) -cdef public tree.xmlNs* findOrBuildNodeNs(_Document doc, xmlNode* c_node, - char* href) except NULL: - if doc is None: - raise TypeError - return doc._findOrBuildNodeNs(c_node, href, NULL) - cdef public tree.xmlNs* findOrBuildNodeNsPrefix( _Document doc, xmlNode* c_node, char* href, char* prefix) except NULL: if doc is None: