[pywin32-checkins] pywin32/com/win32com/client genpy.py,1.43,1.44

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21984

Modified Files:
	genpy.py 
Log Message:
If a property had a reserved word, things got messy.  via:
[ 1049836 ] makepy and reserved word propertyes


Index: genpy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/genpy.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** genpy.py	25 Apr 2004 03:29:38 -0000	1.43
--- genpy.py	19 Oct 2004 23:02:56 -0000	1.44
***************
*** 24,28 ****
  
  error = "makepy.error"
! makepy_version = "0.4.91" # Written to generated file.
  
  GEN_FULL="full"
--- 24,28 ----
  
  error = "makepy.error"
! makepy_version = "0.4.92" # Written to generated file.
  
  GEN_FULL="full"
***************
*** 409,413 ****
                          continue 
  
!                 print >> stream, '\t\t"%s": %s,' % (key, mapEntry)
          names = self.propMapGet.keys(); names.sort()
          for key in names:
--- 409,413 ----
                          continue 
  
!                 print >> stream, '\t\t"%s": %s,' % (build.MakePublicAttributeName(key), mapEntry)
          names = self.propMapGet.keys(); names.sort()
          for key in names:
***************
*** 433,437 ****
                      if entry.desc[0]==pythoncom.DISPID_NEWENUM:
                          continue 
!                 print >> stream, '\t\t"%s": %s,' % (key, mapEntry)
  
          print >> stream, "\t}"
--- 433,437 ----
                      if entry.desc[0]==pythoncom.DISPID_NEWENUM:
                          continue 
!                 print >> stream, '\t\t"%s": %s,' % (build.MakePublicAttributeName(key), mapEntry)
  
          print >> stream, "\t}"
***************
*** 451,455 ****
                  else:
                      defArgDesc = defArgDesc + ","
!                 print >> stream, '\t\t"%s" : ((%s, LCID, %d, 0),(%s)),' % (key, details[0], pythoncom.DISPATCH_PROPERTYPUT, defArgDesc)
  
          names = self.propMapPut.keys(); names.sort()
--- 451,455 ----
                  else:
                      defArgDesc = defArgDesc + ","
!                 print >> stream, '\t\t"%s" : ((%s, LCID, %d, 0),(%s)),' % (build.MakePublicAttributeName(key), details[0], pythoncom.DISPATCH_PROPERTYPUT, defArgDesc)
  
          names = self.propMapPut.keys(); names.sort()
***************
*** 459,463 ****
                  details = entry.desc
                  defArgDesc = MakeDefaultArgsForPropertyPut(details[2])
!                 print >> stream, '\t\t"%s": ((%s, LCID, %d, 0),%s),' % (key, details[0], details[4], defArgDesc)
          print >> stream, "\t}"
          
--- 459,463 ----
                  details = entry.desc
                  defArgDesc = MakeDefaultArgsForPropertyPut(details[2])
!                 print >> stream, '\t\t"%s": ((%s, LCID, %d, 0),%s),' % (build.MakePublicAttributeName(key), details[0], details[4], defArgDesc)
          print >> stream, "\t}"