From 12e221750190903675256ed4ef99aab842b40774 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 3 Mar 2003 21:16:39 +0000
Subject: [PATCH] Fix SF #692416, don't crash interpreter for
 _tkinter.deletefilehandler in addition to createfilehandler and
 creaetetimerhandler.

---
 Misc/NEWS          |  4 ++++
 Modules/_tkinter.c | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index 5bf335a5a9f..fa1b8f9fc3c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -24,6 +24,10 @@ Core and builtins
 Extension modules
 -----------------
 
+- Using createfilehandler, deletefilehandler, createtimerhandler functions
+  on Tkinter.tkinter (_tkinter module) no longer crashes the interpreter.
+  See SF bug #692416.
+
 - Modified the fcntl.ioctl() function to allow modification of a passed
   mutable buffer (for details see the reference documentation).
 
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 813d27c793e..100e06f227f 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -2243,7 +2243,19 @@ Tkapp_DeleteFileHandler(PyObject *self, PyObject *args)
 
 	if (!PyArg_ParseTuple(args, "O:deletefilehandler", &file))
 		return NULL;
-	CHECK_TCL_APPARTMENT;
+
+	if (!self && !tcl_lock) {
+		/* We don't have the Tcl lock since Tcl is threaded. */
+		PyErr_SetString(PyExc_RuntimeError,
+				"_tkinter.deletefilehandler not supported "
+				"for threaded Tcl");
+		return NULL;
+	}
+
+	if (self) {
+		CHECK_TCL_APPARTMENT;
+	}
+
 	tfile = PyObject_AsFileDescriptor(file);
 	if (tfile < 0)
 		return NULL;