comparison Python/errors.c @ 42291:3772103200ec

Three patches by Amaury Forgeot d'Arc; SF patch# 1754484.
author Guido van Rossum <guido@python.org>
date Mon, 16 Jul 2007 20:46:27 +0000
parents bbc094c328ef
children 0fcc18aba385
comparison
equal deleted inserted replaced
42290:3f24209f251e 42291:3772103200ec
331 } 331 }
332 } 332 }
333 #endif /* Unix/Windows */ 333 #endif /* Unix/Windows */
334 #endif /* PLAN 9*/ 334 #endif /* PLAN 9*/
335 if (filenameObject != NULL) 335 if (filenameObject != NULL)
336 v = Py_BuildValue("(isO)", i, s, filenameObject); 336 v = Py_BuildValue("(iUO)", i, s, filenameObject);
337 else 337 else
338 v = Py_BuildValue("(is)", i, s); 338 v = Py_BuildValue("(iU)", i, s);
339 if (v != NULL) { 339 if (v != NULL) {
340 PyErr_SetObject(exc, v); 340 PyErr_SetObject(exc, v);
341 Py_DECREF(v); 341 Py_DECREF(v);
342 } 342 }
343 #ifdef MS_WINDOWS 343 #ifdef MS_WINDOWS
411 /* remove trailing cr/lf and dots */ 411 /* remove trailing cr/lf and dots */
412 while (len > 0 && (s[len-1] <= ' ' || s[len-1] == '.')) 412 while (len > 0 && (s[len-1] <= ' ' || s[len-1] == '.'))
413 s[--len] = '\0'; 413 s[--len] = '\0';
414 } 414 }
415 if (filenameObject != NULL) 415 if (filenameObject != NULL)
416 v = Py_BuildValue("(isO)", err, s, filenameObject); 416 v = Py_BuildValue("(iUO)", err, s, filenameObject);
417 else 417 else
418 v = Py_BuildValue("(is)", err, s); 418 v = Py_BuildValue("(iU)", err, s);
419 if (v != NULL) { 419 if (v != NULL) {
420 PyErr_SetObject(exc, v); 420 PyErr_SetObject(exc, v);
421 Py_DECREF(v); 421 Py_DECREF(v);
422 } 422 }
423 LocalFree(s_buf); 423 LocalFree(s_buf);