comparison Python/pythonrun.c @ 73949:021e5bb297d1

Issue #13575: there is only one class type.
author Florent Xicluna <florent.xicluna@gmail.com>
date Mon, 12 Dec 2011 18:54:29 +0100
parents c86fb10eaf68
children 87331661042b
comparison
equal deleted inserted replaced
73948:24238e89f938 73949:021e5bb297d1
472 472
473 /* Flush stdout+stderr (again, in case more was printed) */ 473 /* Flush stdout+stderr (again, in case more was printed) */
474 flush_std_files(); 474 flush_std_files();
475 475
476 /* Collect final garbage. This disposes of cycles created by 476 /* Collect final garbage. This disposes of cycles created by
477 * new-style class definitions, for example. 477 * class definitions, for example.
478 * XXX This is disabled because it caused too many problems. If 478 * XXX This is disabled because it caused too many problems. If
479 * XXX a __del__ or weakref callback triggers here, Python code has 479 * XXX a __del__ or weakref callback triggers here, Python code has
480 * XXX a hard time running, because even the sys module has been 480 * XXX a hard time running, because even the sys module has been
481 * XXX cleared out (sys.stdout is gone, sys.excepthook is gone, etc). 481 * XXX cleared out (sys.stdout is gone, sys.excepthook is gone, etc).
482 * XXX One symptom is a sequence of information-free messages 482 * XXX One symptom is a sequence of information-free messages
1345 _Py_IDENTIFIER(msg); 1345 _Py_IDENTIFIER(msg);
1346 _Py_IDENTIFIER(filename); 1346 _Py_IDENTIFIER(filename);
1347 _Py_IDENTIFIER(lineno); 1347 _Py_IDENTIFIER(lineno);
1348 _Py_IDENTIFIER(offset); 1348 _Py_IDENTIFIER(offset);
1349 _Py_IDENTIFIER(text); 1349 _Py_IDENTIFIER(text);
1350
1351 /* old style errors */
1352 if (PyTuple_Check(err))
1353 return PyArg_ParseTuple(err, "O(ziiz)", message, filename,
1354 lineno, offset, text);
1355 1350
1356 /* new style errors. `err' is an instance */ 1351 /* new style errors. `err' is an instance */
1357 1352
1358 if (! (v = _PyObject_GetAttrId(err, &PyId_msg))) 1353 if (! (v = _PyObject_GetAttrId(err, &PyId_msg)))
1359 goto finally; 1354 goto finally;