[Checkins] SVN: zope.proxy/trunk/s Support Python 3.2

[Gediminas Paulauskas]

Log message for revision 121932:
  Support Python 3.2
  

Changed:
  U   zope.proxy/trunk/setup.py
  U   zope.proxy/trunk/src/zope/proxy/_zope_proxy_proxy.c

-=-
Modified: zope.proxy/trunk/setup.py
===================================================================
--- zope.proxy/trunk/setup.py	2011-06-14 16:03:07 UTC (rev 121931)
+++ zope.proxy/trunk/setup.py	2011-06-14 16:56:00 UTC (rev 121932)
@@ -56,6 +56,7 @@
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3.1',
+          'Programming Language :: Python :: 3.2',
           'Natural Language :: English',
           'Operating System :: OS Independent'],
       keywords='proxy generic transparent',

Modified: zope.proxy/trunk/src/zope/proxy/_zope_proxy_proxy.c
===================================================================
--- zope.proxy/trunk/src/zope/proxy/_zope_proxy_proxy.c	2011-06-14 16:03:07 UTC (rev 121931)
+++ zope.proxy/trunk/src/zope/proxy/_zope_proxy_proxy.c	2011-06-14 16:56:00 UTC (rev 121932)
@@ -53,9 +53,12 @@
   #define MOD_DEF(ob, name, doc, methods) \
           ob = Py_InitModule3(name, methods, doc);
 
+  #define PyCapsule_New(pointer, name, destr) \
+          PyCObject_FromVoidPtr(pointer, destr)
+
 #else
 
-#define IS_STRING PyUnicode_Check
+  #define IS_STRING PyUnicode_Check
 
   #define MAKE_STRING(name) PyBytes_AS_STRING( \
           PyUnicode_AsUTF8String(name))
@@ -73,6 +76,7 @@
 #endif
 
 
+
 /*
  *   Slot methods.
  */
@@ -924,7 +928,7 @@
     wrap_init,				/* tp_init */
     0,                   		/* tp_alloc */
     wrap_new,				/* tp_new */
-    0, /*_PyObject_GC_Del,*/		/* tp_free */
+    0, /*PyObject_GC_Del,*/		/* tp_free */
 };
 
 static PyObject *
@@ -1217,7 +1221,7 @@
     if (empty_tuple == NULL)
         empty_tuple = PyTuple_New(0);
 
-    ProxyType.tp_free = _PyObject_GC_Del;
+    ProxyType.tp_free = PyObject_GC_Del;
 
     if (PyType_Ready(&ProxyType) < 0)
         return MOD_ERROR_VAL;
@@ -1226,7 +1230,7 @@
     PyModule_AddObject(m, "ProxyBase", (PyObject *)&ProxyType);
 
     if (api_object == NULL) {
-        api_object = PyCObject_FromVoidPtr(&wrapper_capi, NULL);
+        api_object = PyCapsule_New(&wrapper_capi, NULL, NULL);
         if (api_object == NULL)
         return MOD_ERROR_VAL;
     }