[Python-checkins] python/dist/src/Tools/bgen/bgen bgenObjectDefinition.py,1.18,1.19

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Tools/bgen/bgen
In directory sc8-pr-cvs1:/tmp/cvs-serv19152

Modified Files:
	bgenObjectDefinition.py 
Log Message:
Fixed two silly bugs in the PEP252 support code, added an assert
that basechain isn't set, and made the output a bit prettier.


Index: bgenObjectDefinition.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/bgen/bgen/bgenObjectDefinition.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** bgenObjectDefinition.py	25 Nov 2002 16:36:49 -0000	1.18
--- bgenObjectDefinition.py	28 Nov 2002 23:23:14 -0000	1.19
***************
*** 216,219 ****
--- 216,220 ----
  		assert self.outputGetattrBody == None
  		assert self.outputGetattrHook == None
+ 		assert self.basechain == "NULL"
  		
  	def outputGetattr(self):
***************
*** 294,301 ****
--- 295,304 ----
  				else:
  					Output("#define %s_get_%s NULL", self.prefix, name)
+ 					Output()
  				if set:
  					self.outputSetter(name, set)
  				else:
  					Output("#define %s_set_%s NULL", self.prefix, name)
+ 					Output()
  					
  			Output("static PyGetSetDef %s_getsetlist[] = {", self.prefix)
***************
*** 303,315 ****
  			for name, get, set, doc in self.getsetlist:
  				if doc:
! 					doc = `doc`
  				else:
  					doc = "NULL"
! 				Output("{\"%s\", (getter)%s_get_%s, (setter)%s_set_%s, %s}", 
  					name, self.prefix, name, self.prefix, name, doc)
  			DedentLevel()
  			Output("};")
  		else:
  			Output("#define %s_getsetlist NULL", self.prefix)
  			
  	def outputGetter(self, name, code):
--- 306,320 ----
  			for name, get, set, doc in self.getsetlist:
  				if doc:
! 					doc = '"' + doc + '"'
  				else:
  					doc = "NULL"
! 				Output("{\"%s\", (getter)%s_get_%s, (setter)%s_set_%s, %s},", 
  					name, self.prefix, name, self.prefix, name, doc)
+ 			Output("{NULL, NULL, NULL, NULL},")
  			DedentLevel()
  			Output("};")
  		else:
  			Output("#define %s_getsetlist NULL", self.prefix)
+ 		Output()
  			
  	def outputGetter(self, name, code):
***************
*** 319,325 ****
  		Output(code)
  		OutRbrace()
  		
  	def outputSetter(self, name, code):
! 		Output("static int %s_get_%s(%s *self, PyObject *v, void *closure)",
  			self.prefix, name, self.objecttype)
  		OutLbrace()
--- 324,331 ----
  		Output(code)
  		OutRbrace()
+ 		Output()
  		
  	def outputSetter(self, name, code):
! 		Output("static int %s_set_%s(%s *self, PyObject *v, void *closure)",
  			self.prefix, name, self.objecttype)
  		OutLbrace()
***************
*** 327,330 ****
--- 333,337 ----
  		Output("return 0;")
  		OutRbrace()
+ 		Output()
  
  class GlobalObjectDefinition(ObjectDefinition):