Backported c109389 and c109390 from trunk

CHANGES.txt

@@ -3,3 +3,10 @@ Changelog
 
 2.11.2 (unreleased)
 -------------------
+
+- Fix the ``tp_name`` of the ImplicitAcquisitionWrapper and
+  ExplicitAcquisitionWrapper to match their Python visible names and thus have
+  a correct ``__name__``.
+
+- Expand the ``tp_name`` of our extension types to hold the fully qualified
+  name. This ensures classes have their ``__module__`` set correctly.

src/Acquisition/_Acquisition.c

@@ -1227,7 +1227,7 @@ static struct PyMethodDef Wrapper_methods[] = {
 static PyExtensionClass Wrappertype = {
   PyObject_HEAD_INIT(NULL)
   0,					/*ob_size*/
-  "ImplicitAcquirerWrapper",		/*tp_name*/
+  "Acquisition.ImplicitAcquisitionWrapper",		/*tp_name*/
   sizeof(Wrapper),       		/*tp_basicsize*/
   0,					/*tp_itemsize*/
   /* methods */
@@ -1271,7 +1271,7 @@ static PyExtensionClass Wrappertype = {
 static PyExtensionClass XaqWrappertype = {
   PyObject_HEAD_INIT(NULL)
   0,					/*ob_size*/
-  "ExplicitAcquirerWrapper",		/*tp_name*/
+  "Acquisition.ExplicitAcquisitionWrapper",		/*tp_name*/
   sizeof(Wrapper),       		/*tp_basicsize*/
   0,					/*tp_itemsize*/
   /* methods */