[Python-checkins] python/dist/src/Mac/scripts gensuitemodule.py,1.35,1.36

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Fri, 28 Mar 2003 15:37:09 -0800


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

Modified Files:
	gensuitemodule.py 
Log Message:
Sigh: didn't catch all lists that needed to be sorted.


Index: gensuitemodule.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/gensuitemodule.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** gensuitemodule.py	28 Mar 2003 22:04:22 -0000	1.35
--- gensuitemodule.py	28 Mar 2003 23:37:05 -0000	1.36
***************
*** 128,131 ****
--- 128,132 ----
  		edit_modnames=None, creatorsignature=None):
  	"""Ask an application for its terminology and process that"""
+ 	print "\nASKING FOR aete DICTIONARY IN", `fullname`
  	try:
  		aedescobj, launched = OSATerminology.GetAppTerminology(fullname)
***************
*** 857,862 ****
--- 858,865 ----
  				self.fp.write('\twant = %s\n' % `code`)
  		self.namemappers[0].addnamecode('class', pname, code)
+ 		properties.sort()
  		for prop in properties:
  			self.compileproperty(prop)
+ 		elements.sort()
  		for elem in elements:
  			self.compileelement(elem)
***************
*** 926,929 ****
--- 929,935 ----
  			else:
  				elist.append((name, ename))
+ 				
+ 		plist.sort()
+ 		elist.sort()
  		
  		if self.fp:
***************
*** 975,992 ****
  			return
  		self.fp.write("\n#\n# Indices of types declared in this module\n#\n")
  		self.fp.write("_classdeclarations = {\n")
! 		for k, v in self.namemappers[0].getall('class'):
  			self.fp.write("\t%s : %s,\n" % (`k`, v))
  		self.fp.write("}\n")
  		self.fp.write("\n_propdeclarations = {\n")
! 		for k, v in self.namemappers[0].getall('property'):
  			self.fp.write("\t%s : %s,\n" % (`k`, v))
  		self.fp.write("}\n")
  		self.fp.write("\n_compdeclarations = {\n")
! 		for k, v in self.namemappers[0].getall('comparison'):
  			self.fp.write("\t%s : %s,\n" % (`k`, v))
  		self.fp.write("}\n")
  		self.fp.write("\n_enumdeclarations = {\n")
! 		for k, v in self.namemappers[0].getall('enum'):
  			self.fp.write("\t%s : %s,\n" % (`k`, v))
  		self.fp.write("}\n")
--- 981,1010 ----
  			return
  		self.fp.write("\n#\n# Indices of types declared in this module\n#\n")
+ 		
  		self.fp.write("_classdeclarations = {\n")
! 		classlist = self.namemappers[0].getall('class')
! 		classlist.sort()
! 		for k, v in classlist:
  			self.fp.write("\t%s : %s,\n" % (`k`, v))
  		self.fp.write("}\n")
+ 		
  		self.fp.write("\n_propdeclarations = {\n")
! 		proplist = self.namemappers[0].getall('property')
! 		proplist.sort()
! 		for k, v in proplist:
  			self.fp.write("\t%s : %s,\n" % (`k`, v))
  		self.fp.write("}\n")
+ 		
  		self.fp.write("\n_compdeclarations = {\n")
! 		complist = self.namemappers[0].getall('comparison')
! 		complist.sort()
! 		for k, v in complist:
  			self.fp.write("\t%s : %s,\n" % (`k`, v))
  		self.fp.write("}\n")
+ 		
  		self.fp.write("\n_enumdeclarations = {\n")
! 		enumlist = self.namemappers[0].getall('enum')
! 		enumlist.sort()
! 		for k, v in enumlist:
  			self.fp.write("\t%s : %s,\n" % (`k`, v))
  		self.fp.write("}\n")