diff -r 07571d2968b0 Modules/_tkinter.c --- a/Modules/_tkinter.c Sun May 03 13:00:37 2015 -0400 +++ b/Modules/_tkinter.c Sun May 03 12:58:41 2015 -0700 @@ -2682,8 +2682,6 @@ Py_RETURN_NONE; } -static PyMethodDef Tktt_methods[]; - static TkttObject * Tktt_New(PyObject *func) { @@ -2725,22 +2723,6 @@ v->func == NULL ? ", handler deleted" : ""); } -static PyType_Slot Tktt_Type_slots[] = { - {Py_tp_dealloc, Tktt_Dealloc}, - {Py_tp_repr, Tktt_Repr}, - {Py_tp_methods, Tktt_methods}, - {0, 0} -}; - -static PyType_Spec Tktt_Type_spec = { - "_tkinter.tktimertoken", - sizeof(TkttObject), - 0, - Py_TPFLAGS_DEFAULT, - Tktt_Type_slots, -}; - - /** Timer Handler **/ static void @@ -3001,11 +2983,6 @@ } -/**** Tkapp Method List ****/ - -static PyMethodDef Tkapp_methods[]; - - /**** Tkapp Type Methods ****/ static void @@ -3021,21 +2998,6 @@ DisableEventHook(); } -static PyType_Slot Tkapp_Type_slots[] = { - {Py_tp_dealloc, Tkapp_Dealloc}, - {Py_tp_methods, Tkapp_methods}, - {0, 0} -}; - - -static PyType_Spec Tkapp_Type_spec = { - "_tkinter.tkapp", - sizeof(TkappObject), - 0, - Py_TPFLAGS_DEFAULT, - Tkapp_Type_slots, -}; - /**** Tkinter Module ****/ @@ -3218,6 +3180,24 @@ {NULL, NULL} }; +static PyType_Slot Tktt_Type_slots[] = { + {Py_tp_dealloc, Tktt_Dealloc}, + {Py_tp_repr, Tktt_Repr}, + {Py_tp_methods, Tktt_methods}, + {0, 0} +}; + +static PyType_Spec Tktt_Type_spec = { + "_tkinter.tktimertoken", + sizeof(TkttObject), + 0, + Py_TPFLAGS_DEFAULT, + Tktt_Type_slots, +}; + + +/**** Tkapp Method List ****/ + static PyMethodDef Tkapp_methods[] = { _TKINTER_TKAPP_WILLDISPATCH_METHODDEF @@ -3255,6 +3235,21 @@ {NULL, NULL} }; +static PyType_Slot Tkapp_Type_slots[] = { + {Py_tp_dealloc, Tkapp_Dealloc}, + {Py_tp_methods, Tkapp_methods}, + {0, 0} +}; + + +static PyType_Spec Tkapp_Type_spec = { + "_tkinter.tkapp", + sizeof(TkappObject), + 0, + Py_TPFLAGS_DEFAULT, + Tkapp_Type_slots, +}; + static PyMethodDef moduleMethods[] = { _TKINTER__FLATTEN_METHODDEF