From: Guido van Rossum <guido@python.org>
Date: Wed, 5 Feb 1992 11:15:00 +0000 (+0000)
Subject: Fixed getargs() call in setfont.
X-Git-Tag: v0.9.8~526
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c8ba7a1eac574a6377e3c1642fb96c32cfca073;p=thirdparty%2FPython%2Fcpython.git

Fixed getargs() call in setfont.
Improved setwincursor() to allow None to explicitly turn the cursor off.
---

diff --git a/Modules/stdwinmodule.c b/Modules/stdwinmodule.c
index 5556f031a8ba..d3ecfb87d879 100644
--- a/Modules/stdwinmodule.c
+++ b/Modules/stdwinmodule.c
@@ -612,7 +612,7 @@ drawing_setfont(self, args)
 	char style = '\0';
 	int size = 0;
 	if (args == NULL || !is_tupleobject(args)) {
-		if (!getargs(args, "z", font))
+		if (!getargs(args, "z", &font))
 			return NULL;
 	}
 	else {
@@ -1596,12 +1596,16 @@ window_setwincursor(self, args)
 {
 	char *name;
 	CURSOR *c;
-	if (!getstrarg(args, &name))
-		return NULL;
-	c = wfetchcursor(name);
-	if (c == NULL) {
-		err_setstr(StdwinError, "no such cursor");
+	if (!getargs(args, "z", &name))
 		return NULL;
+	if (name == NULL)
+		c = NULL;
+	else {
+		c = wfetchcursor(name);
+		if (c == NULL) {
+			err_setstr(StdwinError, "no such cursor");
+			return NULL;
+		}
 	}
 	wsetwincursor(self->w_win, c);
 	INCREF(None);