From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Tue, 30 Oct 2012 20:49:16 +0000 (+0200)
Subject: Issue #15721: apply PEP 384 Refactoring to tkinter module.
X-Git-Tag: v3.4.0a1~2141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2217a83d4e2ee9aec1a0bf590820aa77b7ed5e7;p=thirdparty%2FPython%2Fcpython.git

Issue #15721: apply PEP 384 Refactoring to tkinter module.
---

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 84724392d3e0..bb689fc3541e 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -794,7 +794,7 @@ static PyType_Slot PyTclObject_Type_slots[] = {
     {Py_tp_dealloc, (destructor)PyTclObject_dealloc},
     {Py_tp_repr, (reprfunc)PyTclObject_repr},
     {Py_tp_str, (reprfunc)PyTclObject_str},
-    {Py_tp_getattro, NULL},
+    {Py_tp_getattro, PyObject_GenericGetAttr},
     {Py_tp_richcompare, PyTclObject_richcompare},
     {Py_tp_getset, PyTclObject_getsetlist},
     {0, 0}
@@ -2831,11 +2831,6 @@ PyInit__tkinter(void)
 {
   PyObject *m, *uexe, *cexe, *o;
 
-    /* Due to cross platform compiler issues the slots must be filled
-     * here. It's required for portability to Windows without requiring
-     * C++. See xxxlimited.c*/
-    PyTclObject_Type_slots[3].pfunc = PyObject_GenericGetAttr;
-
 #ifdef WITH_THREAD
     tcl_lock = PyThread_allocate_lock();
     if (tcl_lock == NULL)