Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory sc8-pr-cvs1:/tmp/cvs-serv29682
Modified Files:
genpy.py
Log Message:
When generating vtable information we were unpacking the data for the
runtime wrong.
Index: genpy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/genpy.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** genpy.py 18 Mar 2003 07:33:32 -0000 1.32
--- genpy.py 26 Jul 2003 00:52:14 -0000 1.33
***************
*** 24,28 ****
error = "makepy.error"
! makepy_version = "0.4.5" # Written to generated file.
GEN_FULL="full"
--- 24,28 ----
error = "makepy.error"
! makepy_version = "0.4.6" # Written to generated file.
GEN_FULL="full"
***************
*** 230,254 ****
chunks = []
names, dispid, desc = v
- name = names[0]
- named_params = names[1:]
- invkind = desc[4]
arg_desc = desc[2]
- ret_desc = desc[8]
! chunks.append("\t(%s, %d, %d, (" % (repr(name), dispid, invkind))
for arg in arg_desc:
- chunks.append("(%d,%d," % (arg[0], arg[1]))
defval = build.MakeDefaultArgRepr(arg)
- if defval is None:
- chunks.append("None, ")
- else:
- chunks.append(defval + ", ")
if arg[3] is None:
! chunks.append("None")
else:
! chunks.append(repr(arg[3]))
! chunks.append("),")
! chunks.append("), %s, %s)," % (repr(ret_desc), repr(named_params)))
! #chunks.append(' # vtable entry %d' % (desc[7]/4,) )
print "".join(chunks)
print "]"
--- 230,245 ----
chunks = []
names, dispid, desc = v
arg_desc = desc[2]
! arg_reprs = []
for arg in arg_desc:
defval = build.MakeDefaultArgRepr(arg)
if arg[3] is None:
! arg3_repr = None
else:
! arg3_repr = repr(arg[3])
! arg_reprs.append((arg[0], arg[1], defval, arg3_repr))
! desc = desc[:2] + (arg_reprs,) + desc[3:]
! chunks.append("\t(%r, %d, %r)," % (names, dispid, desc))
print "".join(chunks)
print "]"
|
