From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 19 May 2003 19:57:42 +0000 (+0000)
Subject: Only return objects if wantobjects is set in GetVar.
X-Git-Tag: v2.3c1~671
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fd86cc46e0f056bd8af5dfe4c6ad1a30af453d5;p=thirdparty%2FPython%2Fcpython.git

Only return objects if wantobjects is set in GetVar.
---

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 288ed153e975..fbc6ec10c9b6 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1647,7 +1647,12 @@ GetVar(PyObject *self, PyObject *args, int flags)
 	ENTER_TCL
 	tres = Tcl_GetVar2Ex(Tkapp_Interp(self), name1, name2, flags);
 	ENTER_OVERLAP
-	res = FromObj(self, tres);
+	if (((TkappObject*)self)->wantobjects) {
+		res = FromObj(self, tres);
+	}
+	else {
+		res = PyString_FromString(Tcl_GetString(tres));
+	}
 	LEAVE_OVERLAP_TCL
 	return res;
 }