Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

(Merge 3.3) Issue #18909: Fix _tkinter.tkapp.interpaddr() on Windows 64-bit, 

don't cast 64-bit pointer to long (32 bits).
This commit is contained in:
Victor Stinner 2013-09-05 00:23:08 +02:00
parent e619427f7e e1040e276b
commit 555e57de19
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -54,6 +54,9 @@ Core and Builtins
Library Library
------- -------
- Issue #18909: Fix _tkinter.tkapp.interpaddr() on Windows 64-bit, don't cast
64-bit pointer to long (32 bits).
- Issue #18876: The FileIO.mode attribute now better reflects the actual mode - Issue #18876: The FileIO.mode attribute now better reflects the actual mode
under which the file was opened. Patch by Erik Bray. under which the file was opened. Patch by Erik Bray.

2
Modules/_tkinter.c
View File

@ -2462,7 +2462,7 @@ Tkapp_InterpAddr(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, ":interpaddr")) if (!PyArg_ParseTuple(args, ":interpaddr"))
return NULL; return NULL;
return PyLong_FromLong((long)Tkapp_Interp(self)); return PyLong_FromVoidPtr(Tkapp_Interp(self));
} }
static PyObject * static PyObject *