embedaddon/libxml2/python/generator.py - diff

Return to generator.py CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libxml2 / python

Diff for /embedaddon/libxml2/python/generator.py between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:38:00	version 1.1.1.2, 2014/06/15 19:53:33
Line 47 class docParser(xml.sax.handler.ContentHandler):	Line 47 class docParser(xml.sax.handler.ContentHandler):

def close(self):	def close(self):
if debug:	if debug:
print "close"	print("close")

def getmethodname(self):	def getmethodname(self):
return self._methodname	return self._methodname

def data(self, text):	def data(self, text):
if debug:	if debug:
print "data %s" % text	print("data %s" % text)
self._data.append(text)	self._data.append(text)

def start(self, tag, attrs):	def start(self, tag, attrs):
if debug:	if debug:
print "start %s, %s" % (tag, attrs)	print("start %s, %s" % (tag, attrs))
if tag == 'function':	if tag == 'function':
self._data = []	self._data = []
self.in_function = 1	self.in_function = 1
Line 69 class docParser(xml.sax.handler.ContentHandler):	Line 69 class docParser(xml.sax.handler.ContentHandler):
self.function_descr = None	self.function_descr = None
self.function_return = None	self.function_return = None
self.function_file = None	self.function_file = None
if attrs.has_key('name'):	if 'name' in attrs.keys():
self.function = attrs['name']	self.function = attrs['name']
if attrs.has_key('file'):	if 'file' in attrs.keys():
self.function_file = attrs['file']	self.function_file = attrs['file']
elif tag == 'cond':	elif tag == 'cond':
self._data = []	self._data = []
Line 82 class docParser(xml.sax.handler.ContentHandler):	Line 82 class docParser(xml.sax.handler.ContentHandler):
self.function_arg_name = None	self.function_arg_name = None
self.function_arg_type = None	self.function_arg_type = None
self.function_arg_info = None	self.function_arg_info = None
if attrs.has_key('name'):	if 'name' in attrs.keys():
self.function_arg_name = attrs['name']	self.function_arg_name = attrs['name']
if attrs.has_key('type'):	if 'type' in attrs.keys():
self.function_arg_type = attrs['type']	self.function_arg_type = attrs['type']
if attrs.has_key('info'):	if 'info' in attrs.keys():
self.function_arg_info = attrs['info']	self.function_arg_info = attrs['info']
elif tag == 'return':	elif tag == 'return':
if self.in_function == 1:	if self.in_function == 1:
self.function_return_type = None	self.function_return_type = None
self.function_return_info = None	self.function_return_info = None
self.function_return_field = None	self.function_return_field = None
if attrs.has_key('type'):	if 'type' in attrs.keys():
self.function_return_type = attrs['type']	self.function_return_type = attrs['type']
if attrs.has_key('info'):	if 'info' in attrs.keys():
self.function_return_info = attrs['info']	self.function_return_info = attrs['info']
if attrs.has_key('field'):	if 'field' in attrs.keys():
self.function_return_field = attrs['field']	self.function_return_field = attrs['field']
elif tag == 'enum':	elif tag == 'enum':
enum(attrs['type'],attrs['name'],attrs['value'])	enum(attrs['type'],attrs['name'],attrs['value'])

def end(self, tag):	def end(self, tag):
if debug:	if debug:
print "end %s" % tag	print("end %s" % tag)
if tag == 'function':	if tag == 'function':
if self.function != None:	if self.function != None:
function(self.function, self.function_descr,	function(self.function, self.function_descr,
Line 133 class docParser(xml.sax.handler.ContentHandler):	Line 133 class docParser(xml.sax.handler.ContentHandler):
str = str + c	str = str + c
if self.in_function == 1:	if self.in_function == 1:
self.function_cond = str	self.function_cond = str


def function(name, desc, ret, args, file, cond):	def function(name, desc, ret, args, file, cond):
functions[name] = (desc, ret, args, file, cond)	functions[name] = (desc, ret, args, file, cond)

def enum(type, name, value):	def enum(type, name, value):
if not enums.has_key(type):	if type not in enums:
enums[type] = {}	enums[type] = {}
enums[type][name] = value	enums[type][name] = value

Line 339 def skip_function(name):	Line 339 def skip_function(name):
return 1	return 1
if name == "xmlValidateAttributeDecl":	if name == "xmlValidateAttributeDecl":
return 1	return 1
	if name == "xmlPopInputCallbacks":
	return 1

return 0	return 0

Line 351 def print_function_wrapper(name, output, export, inclu	Line 353 def print_function_wrapper(name, output, export, inclu
try:	try:
(desc, ret, args, file, cond) = functions[name]	(desc, ret, args, file, cond) = functions[name]
except:	except:
print "failed to get function %s infos"	print("failed to get function %s infos")
return	return

if skipped_modules.has_key(file):	if file in skipped_modules:
return 0	return 0
if skip_function(name) == 1:	if skip_function(name) == 1:
return 0	return 0
Line 368 def print_function_wrapper(name, output, export, inclu	Line 370 def print_function_wrapper(name, output, export, inclu
c_args=""	c_args=""
c_return=""	c_return=""
c_convert=""	c_convert=""
	c_release=""
num_bufs=0	num_bufs=0
for arg in args:	for arg in args:
# This should be correct	# This should be correct
if arg[1][0:6] == "const ":	if arg[1][0:6] == "const ":
arg[1] = arg[1][6:]	arg[1] = arg[1][6:]
c_args = c_args + " %s %s;\n" % (arg[1], arg[0])	c_args = c_args + " %s %s;\n" % (arg[1], arg[0])
if py_types.has_key(arg[1]):	if arg[1] in py_types:
(f, t, n, c) = py_types[arg[1]]	(f, t, n, c) = py_types[arg[1]]
if (f == 'z') and (name in foreign_encoding_args) and (num_bufs == 0):	if (f == 'z') and (name in foreign_encoding_args) and (num_bufs == 0):
f = 't#'	f = 's#'
if f != None:	if f != None:
format = format + f	format = format + f
if t != None:	if t != None:
Line 388 def print_function_wrapper(name, output, export, inclu	Line 391 def print_function_wrapper(name, output, export, inclu
arg[1], t, arg[0])	arg[1], t, arg[0])
else:	else:
format_args = format_args + ", &%s" % (arg[0])	format_args = format_args + ", &%s" % (arg[0])
if f == 't#':	if f == 's#':
format_args = format_args + ", &py_buffsize%d" % num_bufs	format_args = format_args + ", &py_buffsize%d" % num_bufs
c_args = c_args + " int py_buffsize%d;\n" % num_bufs	c_args = c_args + " int py_buffsize%d;\n" % num_bufs
num_bufs = num_bufs + 1	num_bufs = num_bufs + 1
if c_call != "":	if c_call != "":
c_call = c_call + ", "	c_call = c_call + ", "
c_call = c_call + "%s" % (arg[0])	c_call = c_call + "%s" % (arg[0])
	if t == "File":
	c_release = c_release + \
	" PyFile_Release(%s);\n" % (arg[0])
else:	else:
if skipped_types.has_key(arg[1]):	if arg[1] in skipped_types:
return 0	return 0
if unknown_types.has_key(arg[1]):	if arg[1] in unknown_types:
lst = unknown_types[arg[1]]	lst = unknown_types[arg[1]]
lst.append(name)	lst.append(name)
else:	else:
Line 420 def print_function_wrapper(name, output, export, inclu	Line 426 def print_function_wrapper(name, output, export, inclu
else:	else:
c_call = "\n %s(%s);\n" % (name, c_call)	c_call = "\n %s(%s);\n" % (name, c_call)
ret_convert = " Py_INCREF(Py_None);\n return(Py_None);\n"	ret_convert = " Py_INCREF(Py_None);\n return(Py_None);\n"
elif py_types.has_key(ret[0]):	elif ret[0] in py_types:
(f, t, n, c) = py_types[ret[0]]	(f, t, n, c) = py_types[ret[0]]
c_return = " %s c_retval;\n" % (ret[0])	c_return = c_return + " %s c_retval;\n" % (ret[0])
if file == "python_accessor" and ret[2] != None:	if file == "python_accessor" and ret[2] != None:
c_call = "\n c_retval = %s->%s;\n" % (args[0][0], ret[2])	c_call = "\n c_retval = %s->%s;\n" % (args[0][0], ret[2])
else:	else:
c_call = "\n c_retval = %s(%s);\n" % (name, c_call)	c_call = "\n c_retval = %s(%s);\n" % (name, c_call)
ret_convert = " py_retval = libxml_%sWrap((%s) c_retval);\n" % (n,c)	ret_convert = " py_retval = libxml_%sWrap((%s) c_retval);\n" % (n,c)
ret_convert = ret_convert + " return(py_retval);\n"	ret_convert = ret_convert + " return(py_retval);\n"
elif py_return_types.has_key(ret[0]):	elif ret[0] in py_return_types:
(f, t, n, c) = py_return_types[ret[0]]	(f, t, n, c) = py_return_types[ret[0]]
c_return = " %s c_retval;\n" % (ret[0])	c_return = c_return + " %s c_retval;\n" % (ret[0])
c_call = "\n c_retval = %s(%s);\n" % (name, c_call)	c_call = "\n c_retval = %s(%s);\n" % (name, c_call)
ret_convert = " py_retval = libxml_%sWrap((%s) c_retval);\n" % (n,c)	ret_convert = " py_retval = libxml_%sWrap((%s) c_retval);\n" % (n,c)
ret_convert = ret_convert + " return(py_retval);\n"	ret_convert = ret_convert + " return(py_retval);\n"
else:	else:
if skipped_types.has_key(ret[0]):	if ret[0] in skipped_types:
return 0	return 0
if unknown_types.has_key(ret[0]):	if ret[0] in unknown_types:
lst = unknown_types[ret[0]]	lst = unknown_types[ret[0]]
lst.append(name)	lst.append(name)
else:	else:
Line 489 def print_function_wrapper(name, output, export, inclu	Line 495 def print_function_wrapper(name, output, export, inclu
output.write(" return(NULL);\n")	output.write(" return(NULL);\n")
if c_convert != "":	if c_convert != "":
output.write(c_convert)	output.write(c_convert)

output.write(c_call)	output.write(c_call)
	if c_release != "":
	output.write(c_release)
output.write(ret_convert)	output.write(ret_convert)
output.write("}\n\n")	output.write("}\n\n")
if cond != None and cond != "":	if cond != None and cond != "":
Line 510 def buildStubs():	Line 518 def buildStubs():
(parser, target) = getparser()	(parser, target) = getparser()
parser.feed(data)	parser.feed(data)
parser.close()	parser.close()
except IOError, msg:	except IOError as msg:
try:	try:
f = open(os.path.join(srcPref,"..","doc","libxml2-api.xml"))	f = open(os.path.join(srcPref,"..","doc","libxml2-api.xml"))
data = f.read()	data = f.read()
(parser, target) = getparser()	(parser, target) = getparser()
parser.feed(data)	parser.feed(data)
parser.close()	parser.close()
except IOError, msg:	except IOError as msg:
print file, ":", msg	print(file, ":", msg)
sys.exit(1)	sys.exit(1)

n = len(functions.keys())	n = len(list(functions.keys()))
print "Found %d functions in libxml2-api.xml" % (n)	print("Found %d functions in libxml2-api.xml" % (n))

py_types['pythonObject'] = ('O', "pythonObject", "pythonObject", "pythonObject")	py_types['pythonObject'] = ('O', "pythonObject", "pythonObject", "pythonObject")
try:	try:
Line 531 def buildStubs():	Line 539 def buildStubs():
(parser, target) = getparser()	(parser, target) = getparser()
parser.feed(data)	parser.feed(data)
parser.close()	parser.close()
except IOError, msg:	except IOError as msg:
print file, ":", msg	print(file, ":", msg)


print "Found %d functions in libxml2-python-api.xml" % (	print("Found %d functions in libxml2-python-api.xml" % (
len(functions.keys()) - n)	len(list(functions.keys())) - n))
nb_wrap = 0	nb_wrap = 0
failed = 0	failed = 0
skipped = 0	skipped = 0
Line 567 def buildStubs():	Line 575 def buildStubs():
export.close()	export.close()
wrapper.close()	wrapper.close()

print "Generated %d wrapper functions, %d failed, %d skipped\n" % (nb_wrap,	print("Generated %d wrapper functions, %d failed, %d skipped\n" % (nb_wrap,
failed, skipped)	failed, skipped))
print "Missing type converters: "	print("Missing type converters: ")
for type in unknown_types.keys():	for type in list(unknown_types.keys()):
print "%s:%d " % (type, len(unknown_types[type])),	print("%s:%d " % (type, len(unknown_types[type])))
print	print()

#######################################################################	#######################################################################
#	#
Line 697 def nameFixup(name, classe, type, file):	Line 705 def nameFixup(name, classe, type, file):
l = len(classe)	l = len(classe)
if name[0:l] == listname:	if name[0:l] == listname:
func = name[l:]	func = name[l:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:12] == "xmlParserGet" and file == "python_accessor":	elif name[0:12] == "xmlParserGet" and file == "python_accessor":
func = name[12:]	func = name[12:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:12] == "xmlParserSet" and file == "python_accessor":	elif name[0:12] == "xmlParserSet" and file == "python_accessor":
func = name[12:]	func = name[12:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:10] == "xmlNodeGet" and file == "python_accessor":	elif name[0:10] == "xmlNodeGet" and file == "python_accessor":
func = name[10:]	func = name[10:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:9] == "xmlURIGet" and file == "python_accessor":	elif name[0:9] == "xmlURIGet" and file == "python_accessor":
func = name[9:]	func = name[9:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:9] == "xmlURISet" and file == "python_accessor":	elif name[0:9] == "xmlURISet" and file == "python_accessor":
func = name[6:]	func = name[6:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:11] == "xmlErrorGet" and file == "python_accessor":	elif name[0:11] == "xmlErrorGet" and file == "python_accessor":
func = name[11:]	func = name[11:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:17] == "xmlXPathParserGet" and file == "python_accessor":	elif name[0:17] == "xmlXPathParserGet" and file == "python_accessor":
func = name[17:]	func = name[17:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:11] == "xmlXPathGet" and file == "python_accessor":	elif name[0:11] == "xmlXPathGet" and file == "python_accessor":
func = name[11:]	func = name[11:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:11] == "xmlXPathSet" and file == "python_accessor":	elif name[0:11] == "xmlXPathSet" and file == "python_accessor":
func = name[8:]	func = name[8:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:15] == "xmlOutputBuffer" and file != "python":	elif name[0:15] == "xmlOutputBuffer" and file != "python":
func = name[15:]	func = name[15:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:20] == "xmlParserInputBuffer" and file != "python":	elif name[0:20] == "xmlParserInputBuffer" and file != "python":
func = name[20:]	func = name[20:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:9] == "xmlRegexp" and file == "xmlregexp":	elif name[0:9] == "xmlRegexp" and file == "xmlregexp":
func = "regexp" + name[9:]	func = "regexp" + name[9:]
elif name[0:6] == "xmlReg" and file == "xmlregexp":	elif name[0:6] == "xmlReg" and file == "xmlregexp":
Line 745 def nameFixup(name, classe, type, file):	Line 753 def nameFixup(name, classe, type, file):
func = name[9:]	func = name[9:]
elif name[0:11] == "xmlACatalog":	elif name[0:11] == "xmlACatalog":
func = name[11:]	func = name[11:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:l] == classe:	elif name[0:l] == classe:
func = name[l:]	func = name[l:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:7] == "libxml_":	elif name[0:7] == "libxml_":
func = name[7:]	func = name[7:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:6] == "xmlGet":	elif name[0:6] == "xmlGet":
func = name[6:]	func = name[6:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
elif name[0:3] == "xml":	elif name[0:3] == "xml":
func = name[3:]	func = name[3:]
func = string.lower(func[0:1]) + func[1:]	func = func[0:1].lower() + func[1:]
else:	else:
func = name	func = name
if func[0:5] == "xPath":	if func[0:5] == "xPath":
Line 795 def functionCompare(info1, info2):	Line 803 def functionCompare(info1, info2):
return 1	return 1
return 0	return 0

	def cmp_to_key(mycmp):
	'Convert a cmp= function into a key= function'
	class K(object):
	def __init__(self, obj, *args):
	self.obj = obj
	def __lt__(self, other):
	return mycmp(self.obj, other.obj) < 0
	def __gt__(self, other):
	return mycmp(self.obj, other.obj) > 0
	def __eq__(self, other):
	return mycmp(self.obj, other.obj) == 0
	def __le__(self, other):
	return mycmp(self.obj, other.obj) <= 0
	def __ge__(self, other):
	return mycmp(self.obj, other.obj) >= 0
	def __ne__(self, other):
	return mycmp(self.obj, other.obj) != 0
	return K
def writeDoc(name, args, indent, output):	def writeDoc(name, args, indent, output):
if functions[name][0] is None or functions[name][0] == "":	if functions[name][0] is None or functions[name][0] == "":
return	return
val = functions[name][0]	val = functions[name][0]
val = string.replace(val, "NULL", "None")	val = val.replace("NULL", "None")
output.write(indent)	output.write(indent)
output.write('"""')	output.write('"""')
while len(val) > 60:	while len(val) > 60:
Line 807 def writeDoc(name, args, indent, output):	Line 833 def writeDoc(name, args, indent, output):
val = val[1:]	val = val[1:]
continue	continue
str = val[0:60]	str = val[0:60]
i = string.rfind(str, " ")	i = str.rfind(" ")
if i < 0:	if i < 0:
i = 60	i = 60
str = val[0:i]	str = val[0:i]
Line 857 def buildWrappers():	Line 883 def buildWrappers():
ctypes.append(type)	ctypes.append(type)
ctypes_processed[type] = ()	ctypes_processed[type] = ()
for type in sorted(classes_type.keys()):	for type in sorted(classes_type.keys()):
if ctypes_processed.has_key(type):	if type in ctypes_processed:
continue	continue
tinfo = classes_type[type]	tinfo = classes_type[type]
if not classes_processed.has_key(tinfo[2]):	if tinfo[2] not in classes_processed:
classes_list.append(tinfo[2])	classes_list.append(tinfo[2])
classes_processed[tinfo[2]] = ()	classes_processed[tinfo[2]] = ()

ctypes.append(type)	ctypes.append(type)
ctypes_processed[type] = ()	ctypes_processed[type] = ()

Line 912 def buildWrappers():	Line 938 def buildWrappers():
txt.write(" Generated Classes for libxml2-python\n\n")	txt.write(" Generated Classes for libxml2-python\n\n")

txt.write("#\n# Global functions of the module\n#\n\n")	txt.write("#\n# Global functions of the module\n#\n\n")
if function_classes.has_key("None"):	if "None" in function_classes:
flist = function_classes["None"]	flist = function_classes["None"]
flist.sort(functionCompare)	flist = sorted(flist, key=cmp_to_key(functionCompare))
oldfile = ""	oldfile = ""
for info in flist:	for info in flist:
(index, func, name, ret, args, file) = info	(index, func, name, ret, args, file) = info
Line 934 def buildWrappers():	Line 960 def buildWrappers():
writeDoc(name, args, ' ', classes)	writeDoc(name, args, ' ', classes)

for arg in args:	for arg in args:
if classes_type.has_key(arg[1]):	if arg[1] in classes_type:
classes.write(" if %s is None: %s__o = None\n" %	classes.write(" if %s is None: %s__o = None\n" %
(arg[0], arg[0]))	(arg[0], arg[0]))
classes.write(" else: %s__o = %s%s\n" %	classes.write(" else: %s__o = %s%s\n" %
(arg[0], arg[0], classes_type[arg[1]][0]))	(arg[0], arg[0], classes_type[arg[1]][0]))
	if arg[1] in py_types:
	(f, t, n, c) = py_types[arg[1]]
	if t == "File":
	classes.write(" if %s is not None: %s.flush()\n" % (
	arg[0], arg[0]))

if ret[0] != "void":	if ret[0] != "void":
classes.write(" ret = ")	classes.write(" ret = ")
else:	else:
Line 949 def buildWrappers():	Line 981 def buildWrappers():
if n != 0:	if n != 0:
classes.write(", ")	classes.write(", ")
classes.write("%s" % arg[0])	classes.write("%s" % arg[0])
if classes_type.has_key(arg[1]):	if arg[1] in classes_type:
classes.write("__o")	classes.write("__o")
n = n + 1	n = n + 1
classes.write(")\n")	classes.write(")\n")

	# This may be needed to reposition the I/O, but likely to cause more harm
	# than good. Those changes in Python3 really break the model.
	# for arg in args:
	# if arg[1] in py_types:
	# (f, t, n, c) = py_types[arg[1]]
	# if t == "File":
	# classes.write(" if %s is not None: %s.seek(0,0)\n"%(
	# arg[0], arg[0]))

if ret[0] != "void":	if ret[0] != "void":
if classes_type.has_key(ret[0]):	if ret[0] in classes_type:
#	#
# Raise an exception	# Raise an exception
#	#
if functions_noexcept.has_key(name):	if name in functions_noexcept:
classes.write(" if ret is None:return None\n")	classes.write(" if ret is None:return None\n")
elif string.find(name, "URI") >= 0:	elif name.find("URI") >= 0:
classes.write(	classes.write(
" if ret is None:raise uriError('%s() failed')\n"	" if ret is None:raise uriError('%s() failed')\n"
% (name))	% (name))
elif string.find(name, "XPath") >= 0:	elif name.find("XPath") >= 0:
classes.write(	classes.write(
" if ret is None:raise xpathError('%s() failed')\n"	" if ret is None:raise xpathError('%s() failed')\n"
% (name))	% (name))
elif string.find(name, "Parse") >= 0:	elif name.find("Parse") >= 0:
classes.write(	classes.write(
" if ret is None:raise parserError('%s() failed')\n"	" if ret is None:raise parserError('%s() failed')\n"
% (name))	% (name))
Line 988 def buildWrappers():	Line 1030 def buildWrappers():
if classname == "None":	if classname == "None":
pass	pass
else:	else:
if classes_ancestor.has_key(classname):	if classname in classes_ancestor:
txt.write("\n\nClass %s(%s)\n" % (classname,	txt.write("\n\nClass %s(%s)\n" % (classname,
classes_ancestor[classname]))	classes_ancestor[classname]))
classes.write("class %s(%s):\n" % (classname,	classes.write("class %s(%s):\n" % (classname,
Line 996 def buildWrappers():	Line 1038 def buildWrappers():
classes.write(" def __init__(self, _obj=None):\n")	classes.write(" def __init__(self, _obj=None):\n")
if classes_ancestor[classname] == "xmlCore" or \	if classes_ancestor[classname] == "xmlCore" or \
classes_ancestor[classname] == "xmlNode":	classes_ancestor[classname] == "xmlNode":
classes.write(" if type(_obj).__name__ != ")	classes.write(" if checkWrapper(_obj) != 0:")
classes.write("'PyCObject':\n")	classes.write(" raise TypeError")
classes.write(" raise TypeError, ")	classes.write("('%s got a wrong wrapper object type')\n" % \
classes.write("'%s needs a PyCObject argument'\n" % \
classname)	classname)
if reference_keepers.has_key(classname):	if classname in reference_keepers:
rlist = reference_keepers[classname]	rlist = reference_keepers[classname]
for ref in rlist:	for ref in rlist:
classes.write(" self.%s = None\n" % ref[1])	classes.write(" self.%s = None\n" % ref[1])
Line 1012 def buildWrappers():	Line 1053 def buildWrappers():
classes_ancestor[classname] == "xmlNode":	classes_ancestor[classname] == "xmlNode":
classes.write(" def __repr__(self):\n")	classes.write(" def __repr__(self):\n")
format = "<%s (%%s) object at 0x%%x>" % (classname)	format = "<%s (%%s) object at 0x%%x>" % (classname)
classes.write(" return \"%s\" %% (self.name, long(pos_id (self)))\n\n" % (	classes.write(" return \"%s\" %% (self.name, int(pos_id (self)))\n\n" % (
format))	format))
else:	else:
txt.write("Class %s()\n" % (classname))	txt.write("Class %s()\n" % (classname))
classes.write("class %s:\n" % (classname))	classes.write("class %s:\n" % (classname))
classes.write(" def __init__(self, _obj=None):\n")	classes.write(" def __init__(self, _obj=None):\n")
if reference_keepers.has_key(classname):	if classname in reference_keepers:
list = reference_keepers[classname]	list = reference_keepers[classname]
for ref in list:	for ref in list:
classes.write(" self.%s = None\n" % ref[1])	classes.write(" self.%s = None\n" % ref[1])
classes.write(" if _obj != None:self._o = _obj;return\n")	classes.write(" if _obj != None:self._o = _obj;return\n")
classes.write(" self._o = None\n\n")	classes.write(" self._o = None\n\n")
destruct=None	destruct=None
if classes_destructors.has_key(classname):	if classname in classes_destructors:
classes.write(" def __del__(self):\n")	classes.write(" def __del__(self):\n")
classes.write(" if self._o != None:\n")	classes.write(" if self._o != None:\n")
classes.write(" libxml2mod.%s(self._o)\n" %	classes.write(" libxml2mod.%s(self._o)\n" %
Line 1033 def buildWrappers():	Line 1074 def buildWrappers():
classes.write(" self._o = None\n\n")	classes.write(" self._o = None\n\n")
destruct=classes_destructors[classname]	destruct=classes_destructors[classname]
flist = function_classes[classname]	flist = function_classes[classname]
flist.sort(functionCompare)	flist = sorted(flist, key=cmp_to_key(functionCompare))
oldfile = ""	oldfile = ""
for info in flist:	for info in flist:
(index, func, name, ret, args, file) = info	(index, func, name, ret, args, file) = info
Line 1065 def buildWrappers():	Line 1106 def buildWrappers():
writeDoc(name, args, ' ', classes)	writeDoc(name, args, ' ', classes)
n = 0	n = 0
for arg in args:	for arg in args:
if classes_type.has_key(arg[1]):	if arg[1] in classes_type:
if n != index:	if n != index:
classes.write(" if %s is None: %s__o = None\n" %	classes.write(" if %s is None: %s__o = None\n" %
(arg[0], arg[0]))	(arg[0], arg[0]))
Line 1083 def buildWrappers():	Line 1124 def buildWrappers():
classes.write(", ")	classes.write(", ")
if n != index:	if n != index:
classes.write("%s" % arg[0])	classes.write("%s" % arg[0])
if classes_type.has_key(arg[1]):	if arg[1] in classes_type:
classes.write("__o")	classes.write("__o")
else:	else:
classes.write("self")	classes.write("self")
if classes_type.has_key(arg[1]):	if arg[1] in classes_type:
classes.write(classes_type[arg[1]][0])	classes.write(classes_type[arg[1]][0])
n = n + 1	n = n + 1
classes.write(")\n")	classes.write(")\n")
if ret[0] != "void":	if ret[0] != "void":
if classes_type.has_key(ret[0]):	if ret[0] in classes_type:
#	#
# Raise an exception	# Raise an exception
#	#
if functions_noexcept.has_key(name):	if name in functions_noexcept:
classes.write(	classes.write(
" if ret is None:return None\n")	" if ret is None:return None\n")
elif string.find(name, "URI") >= 0:	elif name.find("URI") >= 0:
classes.write(	classes.write(
" if ret is None:raise uriError('%s() failed')\n"	" if ret is None:raise uriError('%s() failed')\n"
% (name))	% (name))
elif string.find(name, "XPath") >= 0:	elif name.find("XPath") >= 0:
classes.write(	classes.write(
" if ret is None:raise xpathError('%s() failed')\n"	" if ret is None:raise xpathError('%s() failed')\n"
% (name))	% (name))
elif string.find(name, "Parse") >= 0:	elif name.find("Parse") >= 0:
classes.write(	classes.write(
" if ret is None:raise parserError('%s() failed')\n"	" if ret is None:raise parserError('%s() failed')\n"
% (name))	% (name))
Line 1129 def buildWrappers():	Line 1170 def buildWrappers():
# See reference_keepers for the list	# See reference_keepers for the list
#	#
tclass = classes_type[ret[0]][2]	tclass = classes_type[ret[0]][2]
if reference_keepers.has_key(tclass):	if tclass in reference_keepers:
list = reference_keepers[tclass]	list = reference_keepers[tclass]
for pref in list:	for pref in list:
if pref[0] == classname:	if pref[0] == classname:
Line 1139 def buildWrappers():	Line 1180 def buildWrappers():
# return the class	# return the class
#	#
classes.write(" return __tmp\n")	classes.write(" return __tmp\n")
elif converter_type.has_key(ret[0]):	elif ret[0] in converter_type:
#	#
# Raise an exception	# Raise an exception
#	#
if functions_noexcept.has_key(name):	if name in functions_noexcept:
classes.write(	classes.write(
" if ret is None:return None")	" if ret is None:return None")
elif string.find(name, "URI") >= 0:	elif name.find("URI") >= 0:
classes.write(	classes.write(
" if ret is None:raise uriError('%s() failed')\n"	" if ret is None:raise uriError('%s() failed')\n"
% (name))	% (name))
elif string.find(name, "XPath") >= 0:	elif name.find("XPath") >= 0:
classes.write(	classes.write(
" if ret is None:raise xpathError('%s() failed')\n"	" if ret is None:raise xpathError('%s() failed')\n"
% (name))	% (name))
elif string.find(name, "Parse") >= 0:	elif name.find("Parse") >= 0:
classes.write(	classes.write(
" if ret is None:raise parserError('%s() failed')\n"	" if ret is None:raise parserError('%s() failed')\n"
% (name))	% (name))
Line 1175 def buildWrappers():	Line 1216 def buildWrappers():
for type,enum in enums.items():	for type,enum in enums.items():
classes.write("# %s\n" % type)	classes.write("# %s\n" % type)
items = enum.items()	items = enum.items()
items.sort(lambda i1,i2: cmp(long(i1[1]),long(i2[1])))	items = sorted(items, key=(lambda i: int(i[1])))
for name,value in items:	for name,value in items:
classes.write("%s = %s\n" % (name,value))	classes.write("%s = %s\n" % (name,value))
classes.write("\n")	classes.write("\n")

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.2