Merge pull request #7634 from QuLogic/tkagg-pointers

tacaswell · web-flow · commit 84890dfba46f · 2016-12-18T13:33:28.000-05:00
FIX: Use correct type for Tk addresses.
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -183,32 +183,23 @@ static int PyAggImagePhoto(ClientData clientdata, Tcl_Interp *interp, int
     return TCL_OK;
 }
 
-static PyObject *_pyobj_addr(PyObject *self, PyObject *args)
-{
-    PyObject *pyobj;
-    if (!PyArg_ParseTuple(args, "O", &pyobj)) {
-        return NULL;
-    }
-    return Py_BuildValue("n", (Py_ssize_t)pyobj);
-}
-
 static PyObject *_tkinit(PyObject *self, PyObject *args)
 {
     Tcl_Interp *interp;
     TkappObject *app;
 
-    Py_ssize_t arg;
+    PyObject *arg;
     int is_interp;
-    if (!PyArg_ParseTuple(args, "ni", &arg, &is_interp)) {
+    if (!PyArg_ParseTuple(args, "Oi", &arg, &is_interp)) {
         return NULL;
     }
 
     if (is_interp) {
-        interp = (Tcl_Interp *)arg;
+        interp = (Tcl_Interp *)PyLong_AsVoidPtr(arg);
     } else {
         /* Do it the hard way.  This will break if the TkappObject
            layout changes */
-        app = (TkappObject *)arg;
+        app = (TkappObject *)PyLong_AsVoidPtr(arg);
         interp = app->interp;
     }
 
@@ -226,7 +217,7 @@ static PyObject *_tkinit(PyObject *self, PyObject *args)
 
 static PyMethodDef functions[] = {
     /* Tkinter interface stuff */
-    { "_pyobj_addr", (PyCFunction)_pyobj_addr, 1 }, { "tkinit", (PyCFunction)_tkinit, 1 },
+    { "tkinit", (PyCFunction)_tkinit, 1 },
     { NULL, NULL } /* sentinel */
 };
 
