[Python-checkins] python/dist/src/Lib/plat-mac bgenlocations.py,1.4,1.5 gensuitemodule.py,1.6,1.7

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/plat-mac
In directory sc8-pr-cvs1:/tmp/cvs-serv30892

Modified Files:
	bgenlocations.py gensuitemodule.py 
Log Message:
Oops, _propdeclarations and friends are needed: gensuitemodule uses them
to lookup properties declared in base classes. Looking at it I'm not sure
what the official scope if the property codes is, maybe it is only the
(OSA) class in which they are used. But giving them global scope hasn't been
a problem so far.

Regenerated the standard suites, which are now also space-indented.


Index: bgenlocations.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/bgenlocations.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** bgenlocations.py	9 Apr 2003 13:25:42 -0000	1.4
--- bgenlocations.py	12 Apr 2003 22:27:05 -0000	1.5
***************
*** 27,33 ****
  #
  if sys.platform == 'mac':
!     _MWERKSDIR="Sap:Applications (Mac OS 9):Metrowerks CodeWarrior 7.0:Metrowerks CodeWarrior"
  else:
!     _MWERKSDIR="/Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/"
  INCLUDEDIR=os.path.join(_MWERKSDIR, "MacOS Support", "Universal", "Interfaces", "CIncludes")
  
--- 27,33 ----
  #
  if sys.platform == 'mac':
!     _MWERKSDIR="Moes:Applications (Mac OS 9):Metrowerks CodeWarrior 7.0:Metrowerks CodeWarrior"
  else:
!     _MWERKSDIR="/Volumes/Moes/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/"
  INCLUDEDIR=os.path.join(_MWERKSDIR, "MacOS Support", "Universal", "Interfaces", "CIncludes")
  

Index: gensuitemodule.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/gensuitemodule.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gensuitemodule.py	9 Apr 2003 13:25:42 -0000	1.6
--- gensuitemodule.py	12 Apr 2003 22:27:05 -0000	1.7
***************
*** 988,993 ****
                  self.fp.write("\n_Prop_%s = _Prop_%s\n"%(pname, othername))
          else:
-             if self.hasname(pname):
-                 pass
              if self.fp:
                  self.fp.write("class _Prop_%s(aetools.NProperty):\n" % pname)
--- 988,991 ----
***************
*** 1109,1132 ****
          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("    %s : _Prop_%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("    %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("    %s : %s,\n" % (`k`, v))
! ##      self.fp.write("}\n")
  
  def compiledata(data):
--- 1107,1130 ----
          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("    %s : _Prop_%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("    %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("    %s : %s,\n" % (`k`, v))
!         self.fp.write("}\n")
  
  def compiledata(data):