[Python-checkins] python/dist/src/Mac/scripts gensuitemodule.py,1.29,1.30

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Fri, 21 Mar 2003 04:04:22 -0800


Update of /cvsroot/python/python/dist/src/Mac/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv20157/Mac/scripts

Modified Files:
	gensuitemodule.py 
Log Message:
Patch 702620 by Donovan Preston: Fix AE inheritance.


Index: gensuitemodule.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/gensuitemodule.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** gensuitemodule.py	6 Mar 2003 23:04:38 -0000	1.29
--- gensuitemodule.py	21 Mar 2003 12:04:19 -0000	1.30
***************
*** 322,333 ****
  	
  	# Generate property dicts and element dicts for all types declared in this module
! 	fp.write("def getbaseclasses(v):\n")
! 	fp.write("\tif hasattr(v, '_superclassnames') and not hasattr(v, '_propdict'):\n")
  	fp.write("\t\tv._propdict = {}\n")
  	fp.write("\t\tv._elemdict = {}\n")
! 	fp.write("\t\tfor superclass in v._superclassnames:\n")
! ##	fp.write("\t\t\tgetbaseclasses(superclass)\n")
! 	fp.write("\t\t\tv._propdict.update(getattr(eval(superclass), '_privpropdict', {}))\n")
! 	fp.write("\t\t\tv._elemdict.update(getattr(eval(superclass), '_privelemdict', {}))\n")
  	fp.write("\t\tv._propdict.update(v._privpropdict)\n")
  	fp.write("\t\tv._elemdict.update(v._privelemdict)\n")
--- 322,334 ----
  	
  	# Generate property dicts and element dicts for all types declared in this module
! 	fp.write("\ndef getbaseclasses(v):\n")
! 	fp.write("\tif not v._propdict:\n")
  	fp.write("\t\tv._propdict = {}\n")
  	fp.write("\t\tv._elemdict = {}\n")
! 	fp.write("\t\tfor superclassname in getattr(v, '_superclassnames', []):\n")
! 	fp.write("\t\t\tsuperclass = eval(superclassname)\n")
! 	fp.write("\t\t\tgetbaseclasses(superclass)\n")
! 	fp.write("\t\t\tv._propdict.update(getattr(superclass, '_propdict', {}))\n")
! 	fp.write("\t\t\tv._elemdict.update(getattr(superclass, '_elemdict', {}))\n")
  	fp.write("\t\tv._propdict.update(v._privpropdict)\n")
  	fp.write("\t\tv._elemdict.update(v._privelemdict)\n")