Merge support for method cache from Acquisition trunk

CHANGES.txt

 Changelog
 =========
 
-2.12.5 (unreleased)
+2.13.1 (unreleased)
 -------------------
 
 
+2.13.0 (2010-02-14)
+-------------------
+
+- Added support for method cache in Acquisition. Patch contributed by
+  Yoshinori K. Okuji. See https://bugs.launchpad.net/zope2/+bug/486182.
+
 2.12.4 (2009-10-29)
 -------------------
 

setup.py

@@ -11,13 +11,13 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Setup for the Acquisition egg package
+"""Setup for the Acquisition distribution
 """
 import os
 from setuptools import setup, find_packages, Extension
 
 setup(name='Acquisition',
-      version = '2.12.5dev',
+      version = '2.13.1dev',
       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

@@ -1391,6 +1391,9 @@ static PyExtensionClass Wrappertype = {
   /* tp_flags          */ Py_TPFLAGS_DEFAULT 
                           | Py_TPFLAGS_BASETYPE
                           | Py_TPFLAGS_HAVE_GC
+#ifdef Py_TPFLAGS_HAVE_VERSION_TAG
+                          | Py_TPFLAGS_HAVE_VERSION_TAG
+#endif
                           ,
   "Wrapper object for implicit acquisition", /* Documentation string */
   /* tp_traverse       */ (traverseproc)Wrapper_traverse,
@@ -1435,6 +1438,9 @@ static PyExtensionClass XaqWrappertype = {
   /* tp_flags          */ Py_TPFLAGS_DEFAULT 
                           | Py_TPFLAGS_BASETYPE
                           | Py_TPFLAGS_HAVE_GC
+#ifdef Py_TPFLAGS_HAVE_VERSION_TAG
+                          | Py_TPFLAGS_HAVE_VERSION_TAG
+#endif
                           ,
   "Wrapper object for implicit acquisition", /* Documentation string */
   /* tp_traverse       */ (traverseproc)Wrapper_traverse,