[Python-checkins] python/dist/src/Mac/scripts gensuitemodule.py,1.25,1.26

[jackjansen@users.sourceforge.net]

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

Modified Files:
	gensuitemodule.py 
Log Message:
- If an OSA identifier is a Python reserved word we now append an _
  in stead of prepending it, which messes up "import * from".
- A few ascii()s added again.
- Changed the getbaseclasses a little, but it still isn't perfect.


Index: gensuitemodule.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/gensuitemodule.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** gensuitemodule.py	7 Aug 2002 15:05:42 -0000	1.25
--- gensuitemodule.py	7 Aug 2002 15:44:53 -0000	1.26
***************
*** 296,308 ****
  	# 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'):\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")
  	fp.write("import StdSuites\n")
  	if allprecompinfo:
--- 296,310 ----
  	# 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 v._superclassnames:\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")
+ 	fp.write("\t\tv._superclassnames = None\n")
+ 	fp.write("\n")
  	fp.write("import StdSuites\n")
  	if allprecompinfo:
***************
*** 475,479 ****
  	# available documentation, due to our name-remaping)
  	#
! 	fp.write('\t\t"""%s: %s\n'%(name, desc))
  	if has_arg:
  		fp.write("\t\tRequired argument: %s\n"%getdatadoc(accepts))
--- 477,481 ----
  	# available documentation, due to our name-remaping)
  	#
! 	fp.write('\t\t"""%s: %s\n'%(ascii(name), ascii(desc)))
  	if has_arg:
  		fp.write("\t\tRequired argument: %s\n"%getdatadoc(accepts))
***************
*** 801,805 ****
  	def compileenumerator(self, item):
  		[name, code, desc] = item
! 		self.fp.write("\t%s : %s,\t# %s\n" % (`identify(name)`, `code`, desc))
  		
  	def checkforenum(self, enum):
--- 803,807 ----
  	def compileenumerator(self, item):
  		[name, code, desc] = item
! 		self.fp.write("\t%s : %s,\t# %s\n" % (`identify(name)`, `code`, ascii(desc)))
  		
  	def checkforenum(self, enum):
***************
*** 888,892 ****
  	"""
  	if not str:
! 		return "_empty_ae_name"
  	rv = ''
  	ok = string.ascii_letters + '_'
--- 890,894 ----
  	"""
  	if not str:
! 		return "empty_ae_name_"
  	rv = ''
  	ok = string.ascii_letters + '_'
***************
*** 901,905 ****
  		ok = ok2
  	if keyword.iskeyword(rv):
! 		rv = '_' + rv
  	return rv
  
--- 903,907 ----
  		ok = ok2
  	if keyword.iskeyword(rv):
! 		rv = rv + '_'
  	return rv