diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2013-09-04 22:23:08 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2013-09-04 22:23:08 (GMT) |
| commit | 555e57de1951aa74e94fcc07778b87fff9b61843 (patch) | |
| tree | 6abf09eedfa82fcdc1ce58b3967c9dda6952945b | |
| parent | e619427f7eb17c370f31c6d4f7625eda8a0e9dce (diff) | |
| parent | e1040e276b11f21b7007c139269c38d5eba04f5e (diff) | |
| download | cpython-555e57de1951aa74e94fcc07778b87fff9b61843.zip cpython-555e57de1951aa74e94fcc07778b87fff9b61843.tar.gz cpython-555e57de1951aa74e94fcc07778b87fff9b61843.tar.bz2 | |
(Merge 3.3) Issue #18909: Fix _tkinter.tkapp.interpaddr() on Windows 64-bit,
don't cast 64-bit pointer to long (32 bits).
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_tkinter.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -54,6 +54,9 @@ Core and Builtins 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 under which the file was opened. Patch by Erik Bray. diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 9a0db0e..bef7837 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -2462,7 +2462,7 @@ Tkapp_InterpAddr(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, ":interpaddr")) return NULL; - return PyLong_FromLong((long)Tkapp_Interp(self)); + return PyLong_FromVoidPtr(Tkapp_Interp(self)); } static PyObject * |