merge method caching fixes

CHANGES.txt

 Changelog
 =========
 
-2.13.1 (unreleased)
+2.13.2 (unreleased)
 -------------------
 
 
+2.13.1 (2010-02-23)
+-------------------
+
+- Update to include ExtensionClass 2.13.0.
+
+- 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.
+
 2.13.0 (2010-02-14)
 -------------------
 

setup.py

@@ -17,7 +17,7 @@ import os
 from setuptools import setup, find_packages, Extension
 
 setup(name='Acquisition',
-      version = '2.13.1dev',
+      version = '2.13.2dev',
       url='http://pypi.python.org/pypi/Acquisition',
       license='ZPL 2.1',
       description="Acquisition is a mechanism that allows objects to obtain "

src/Acquisition/_Acquisition.c

@@ -1369,7 +1369,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 */
@@ -1416,7 +1416,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 */