Merge of descr-branch back into trunk.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index c74b062..e616230 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -115,6 +115,9 @@
Py_FatalError("Py_Initialize: can't make first thread");
(void) PyThreadState_Swap(tstate);
+ if (PyType_InitDict(&PyType_Type) < 0)
+ Py_FatalError("Py_Initialize: can't initialize 'type'");
+
interp->modules = PyDict_New();
if (interp->modules == NULL)
Py_FatalError("Py_Initialize: can't make modules dictionary");
@@ -144,7 +147,7 @@
_PyImport_Init();
/* initialize builtin exceptions */
- init_exceptions();
+ _PyExc_Init();
/* phase 2 of builtins */
_PyImport_FixupExtension("__builtin__", "__builtin__");
@@ -238,7 +241,7 @@
below has been checked to make sure no exceptions are ever
raised.
*/
- fini_exceptions();
+ _PyExc_Fini();
/* Delete current thread */
PyInterpreterState_Clear(interp);
@@ -1345,7 +1348,7 @@
{
char buf[256];
- printf("%s [ny] ", prompt);
+ fprintf(stderr, "%s [ny] ", prompt);
if (fgets(buf, sizeof buf, stdin) == NULL)
return 0;
return buf[0] == 'y' || buf[0] == 'Y';