diff options
Diffstat (limited to 'python/libxml.py')
| -rw-r--r-- | python/libxml.py | 109 |
1 files changed, 28 insertions, 81 deletions
diff --git a/python/libxml.py b/python/libxml.py index e507e0f..c861a70 100644 --- a/python/libxml.py +++ b/python/libxml.py @@ -5,23 +5,13 @@ import sys # The root of all libxml2 errors. class libxmlError(Exception): pass -# Type of the wrapper class for the C objects wrappers -def checkWrapper(obj): - try: - n = type(_obj).__name__ - if n != 'PyCObject' and n != 'PyCapsule': - return 1 - except: - return 0 - return 0 - # # id() is sometimes negative ... # def pos_id(o): i = id(o) if (i < 0): - return (sys.maxsize - i) + return (sys.maxint - i) return i # @@ -72,20 +62,9 @@ class ioWrapper: def io_read(self, len = -1): if self.__io == None: return(-1) - try: - if len < 0: - ret = self.__io.read() - else: - ret = self.__io.read(len) - except Exception: - import sys - e = sys.exc_info()[1] - print("failed to read from Python:", type(e)) - print("on IO:", self.__io) - self.__io == None - return(-1) - - return(ret) + if len < 0: + return(self.__io.read()) + return(self.__io.read(len)) def io_write(self, str, len = -1): if self.__io == None: @@ -100,7 +79,7 @@ class ioReadWrapper(ioWrapper): self._o = libxml2mod.xmlCreateInputBuffer(self, enc) def __del__(self): - print("__del__") + print "__del__" self.io_close() if self._o != None: libxml2mod.xmlFreeParserInputBuffer(self._o) @@ -116,19 +95,12 @@ class ioWriteWrapper(ioWrapper): def __init__(self, _obj, enc = ""): # print "ioWriteWrapper.__init__", _obj if type(_obj) == type(''): - print("write io from a string") + print "write io from a string" self.o = None - elif type(_obj).__name__ == 'PyCapsule': - file = libxml2mod.outputBufferGetPythonFile(_obj) - if file != None: - ioWrapper.__init__(self, file) - else: - ioWrapper.__init__(self, _obj) - self._o = _obj -# elif type(_obj) == types.InstanceType: -# print(("write io from instance of %s" % (_obj.__class__))) -# ioWrapper.__init__(self, _obj) -# self._o = libxml2mod.xmlCreateOutputBuffer(self, enc) + elif type(_obj) == types.InstanceType: + print "write io from instance of %s" % (_obj.__class__) + ioWrapper.__init__(self, _obj) + self._o = libxml2mod.xmlCreateOutputBuffer(self, enc) else: file = libxml2mod.outputBufferGetPythonFile(_obj) if file != None: @@ -293,22 +265,22 @@ class xmlCore: ret = libxml2mod.parent(self._o) if ret == None: return None - return nodeWrap(ret) + return xmlNode(_obj=ret) def get_children(self): ret = libxml2mod.children(self._o) if ret == None: return None - return nodeWrap(ret) + return xmlNode(_obj=ret) def get_last(self): ret = libxml2mod.last(self._o) if ret == None: return None - return nodeWrap(ret) + return xmlNode(_obj=ret) def get_next(self): ret = libxml2mod.next(self._o) if ret == None: return None - return nodeWrap(ret) + return xmlNode(_obj=ret) def get_properties(self): ret = libxml2mod.properties(self._o) if ret == None: @@ -318,7 +290,7 @@ class xmlCore: ret = libxml2mod.prev(self._o) if ret == None: return None - return nodeWrap(ret) + return xmlNode(_obj=ret) def get_content(self): return libxml2mod.xmlNodeGetContent(self._o) getContent = get_content # why is this duplicate naming needed ? @@ -345,7 +317,7 @@ class xmlCore: ret = libxml2mod.parent(self._o) if ret == None: return None - return nodeWrap(ret) + return xmlNode(_obj=ret) elif attr == "properties": ret = libxml2mod.properties(self._o) if ret == None: @@ -355,22 +327,22 @@ class xmlCore: ret = libxml2mod.children(self._o) if ret == None: return None - return nodeWrap(ret) + return xmlNode(_obj=ret) elif attr == "last": ret = libxml2mod.last(self._o) if ret == None: return None - return nodeWrap(ret) + return xmlNode(_obj=ret) elif attr == "next": ret = libxml2mod.next(self._o) if ret == None: return None - return nodeWrap(ret) + return xmlNode(_obj=ret) elif attr == "prev": ret = libxml2mod.prev(self._o) if ret == None: return None - return nodeWrap(ret) + return xmlNode(_obj=ret) elif attr == "content": return libxml2mod.xmlNodeGetContent(self._o) elif attr == "name": @@ -385,7 +357,7 @@ class xmlCore: else: return None return xmlDoc(_obj=ret) - raise AttributeError(attr) + raise AttributeError,attr else: parent = property(get_parent, None, None, "Parent node") children = property(get_children, None, None, "First child node") @@ -428,7 +400,7 @@ class xmlCore: prefixes=None, with_comments=0): if nodes: - nodes = [n._o for n in nodes] + nodes = map(lambda n: n._o, nodes) return libxml2mod.xmlC14NDocDumpMemory( self.get_doc()._o, nodes, @@ -442,7 +414,7 @@ class xmlCore: prefixes=None, with_comments=0): if nodes: - nodes = [n._o for n in nodes] + nodes = map(lambda n: n._o, nodes) return libxml2mod.xmlC14NDocSaveTo( self.get_doc()._o, nodes, @@ -592,10 +564,10 @@ def nodeWrap(o): def xpathObjectRet(o): otype = type(o) if otype == type([]): - ret = list(map(xpathObjectRet, o)) + ret = map(xpathObjectRet, o) return ret elif otype == type(()): - ret = list(map(xpathObjectRet, o)) + ret = map(xpathObjectRet, o) return tuple(ret) elif otype == type('') or otype == type(0) or otype == type(0.0): return o @@ -631,7 +603,7 @@ def registerErrorHandler(f, ctx): """Register a Python written function to for error reporting. The function is called back as f(ctx, error). """ import sys - if 'libxslt' not in sys.modules: + if not sys.modules.has_key('libxslt'): # normal behaviour when libxslt is not imported ret = libxml2mod.xmlRegisterErrorHandler(f,ctx) else: @@ -710,9 +682,8 @@ class relaxNgValidCtxtCore: libxml2mod.xmlRelaxNGSetValidErrors(self._o, err_func, warn_func, arg) -def _xmlTextReaderErrorFunc(xxx_todo_changeme,msg,severity,locator): +def _xmlTextReaderErrorFunc((f,arg),msg,severity,locator): """Intermediate callback to wrap the locator""" - (f,arg) = xxx_todo_changeme return f(arg,msg,severity,xmlTextReaderLocator(locator)) class xmlTextReaderCore: @@ -748,35 +719,11 @@ class xmlTextReaderCore: return arg # -# The cleanup now goes though a wrapper in libxml.c +# The cleanup now goes though a wrappe in libxml.c # def cleanupParser(): libxml2mod.xmlPythonCleanupParser() -# -# The interface to xmlRegisterInputCallbacks. -# Since this API does not allow to pass a data object along with -# match/open callbacks, it is necessary to maintain a list of all -# Python callbacks. -# -__input_callbacks = [] -def registerInputCallback(func): - def findOpenCallback(URI): - for cb in reversed(__input_callbacks): - o = cb(URI) - if o is not None: - return o - libxml2mod.xmlRegisterInputCallback(findOpenCallback) - __input_callbacks.append(func) - -def popInputCallbacks(): - # First pop python-level callbacks, when no more available - start - # popping built-in ones. - if len(__input_callbacks) > 0: - __input_callbacks.pop() - if len(__input_callbacks) == 0: - libxml2mod.xmlUnregisterInputCallback() - # WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING # # Everything before this line comes from libxml.py |