The module generator now tells its object generators about the module name (through the new setmodulename() method). If the module name has been set the object generators output it as part of the tp_name field for the object type.

jackjansen · jackjansen · commit a8626d6166eb · 2001-12-09T23:25:00.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@24638 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Tools/bgen/bgen/bgenModule.py b/Tools/bgen/bgen/bgenModule.py
@@ -19,6 +19,7 @@ def __init__(self, name, prefix = None,
 	def addobject(self, od):
 		self.generators.append(od)
 		self.typeobjects.append(od)
+		od.setmodulename(self.name)
 
 	def generate(self):
 		OutHeader1("Module " + self.name)
diff --git a/Tools/bgen/bgen/bgenObjectDefinition.py b/Tools/bgen/bgen/bgenObjectDefinition.py
@@ -22,6 +22,7 @@ def __init__(self, name, prefix, itselftype):
 		self.typename = name + '_Type'
 		self.argref = ""	# set to "*" if arg to <type>_New should be pointer
 		self.static = "static " # set to "" to make <type>_New and <type>_Convert public
+		self.modulename = None
 
 	def add(self, g, dupcheck=0):
 		g.setselftype(self.objecttype, self.itselftype)
@@ -30,6 +31,9 @@ def add(self, g, dupcheck=0):
 	def reference(self):
 		# In case we are referenced from a module
 		pass
+		
+	def setmodulename(self, name):
+		self.modulename = name
 
 	def generate(self):
 		# XXX This should use long strings and %(varname)s substitution!
@@ -166,7 +170,10 @@ def outputTypeObject(self):
 		IndentLevel()
 		Output("PyObject_HEAD_INIT(NULL)")
 		Output("0, /*ob_size*/")
-		Output("\"%s\", /*tp_name*/", self.name)
+		if self.modulename:
+			Output("\"%s.%s\", /*tp_name*/", self.modulename, self.name)
+		else:
+			Output("\"%s\", /*tp_name*/", self.name)
 		Output("sizeof(%s), /*tp_basicsize*/", self.objecttype)
 		Output("0, /*tp_itemsize*/")
 		Output("/* methods */")
