eval_code2(): Oops, in the last checkin, we shouldn't check for

warsaw · warsaw · commit b2ba9d896339 · 2000-03-29T18:36:49.000Z
PyErr_Occurred(), just set x=NULL and break.  Oh, and make Jeremy stop
nagging me about the "special" indentation for this block.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -1637,12 +1637,8 @@ eval_code2(co, globals, locals,
 			    }
 			    nstar = PySequence_Length(stararg);
 			    if (nstar < 0) {
-				    if (!PyErr_Occurred)
-					    PyErr_SetString(
-						    PyExc_TypeError,
-						    "len() of unsized object");
-				    x = NULL;
-				    break;
+				x = NULL;
+				break;
 			    }
 			}
 			if (nk > 0) {

Original file line number	Diff line number	Diff line change
`@@ -1637,12 +1637,8 @@ eval_code2(co, globals, locals,`
`1637`	`1637`	`}`
`1638`	`1638`	`nstar = PySequence_Length(stararg);`
`1639`	`1639`	`if (nstar < 0) {`
`1640`		`- if (!PyErr_Occurred)`
`1641`		`- PyErr_SetString(`
`1642`		`- PyExc_TypeError,`
`1643`		`- "len() of unsized object");`
`1644`		`- x = NULL;`
`1645`		`- break;`
	`1640`	`+ x = NULL;`
	`1641`	`+ break;`
`1646`	`1642`	`}`
`1647`	`1643`	`}`
`1648`	`1644`	`if (nk > 0) {`