Mercurial > cpython-lru_cache-weakref

comparison Python/pythonrun.c @ 44098:0889daf6d0d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#1535: rename __builtin__ module to builtins.
author Georg Brandl <georg@python.org>
date Sun, 02 Dec 2007 09:40:06 +0000
parents 28c802837252
children f324631462a2
comparison
equal deleted inserted replaced
44090:6d7fd95ef14a 44098:0889daf6d0d9
209 /* Init Unicode implementation; relies on the codec registry */ 209 /* Init Unicode implementation; relies on the codec registry */
210 _PyUnicode_Init(); 210 _PyUnicode_Init();
211 211
212 bimod = _PyBuiltin_Init(); 212 bimod = _PyBuiltin_Init();
213 if (bimod == NULL) 213 if (bimod == NULL)
214 Py_FatalError("Py_Initialize: can't initialize __builtin__"); 214 Py_FatalError("Py_Initialize: can't initialize builtins modules");
215 interp->builtins = PyModule_GetDict(bimod); 215 interp->builtins = PyModule_GetDict(bimod);
216 if (interp->builtins == NULL) 216 if (interp->builtins == NULL)
217 Py_FatalError("Py_Initialize: can't initialize builtins dict"); 217 Py_FatalError("Py_Initialize: can't initialize builtins dict");
218 Py_INCREF(interp->builtins); 218 Py_INCREF(interp->builtins);
219 219
241 PySys_SetObject("__stderr__", pstderr); 241 PySys_SetObject("__stderr__", pstderr);
242 242
243 _PyImport_Init(); 243 _PyImport_Init();
244 244
245 /* phase 2 of builtins */ 245 /* phase 2 of builtins */
246 _PyImport_FixupExtension("__builtin__", "__builtin__"); 246 _PyImport_FixupExtension("builtins", "builtins");
247 247
248 _PyImportHooks_Init(); 248 _PyImportHooks_Init();
249 249
250 if (install_sigs) 250 if (install_sigs)
251 initsigs(); /* Signal handling stuff, including initintr() */ 251 initsigs(); /* Signal handling stuff, including initintr() */
570 /* XXX The following is lax in error checking */ 570 /* XXX The following is lax in error checking */
571 571
572 interp->modules = PyDict_New(); 572 interp->modules = PyDict_New();
573 interp->modules_reloading = PyDict_New(); 573 interp->modules_reloading = PyDict_New();
574 574
575 bimod = _PyImport_FindExtension("__builtin__", "__builtin__"); 575 bimod = _PyImport_FindExtension("builtins", "builtins");
576 if (bimod != NULL) { 576 if (bimod != NULL) {
577 interp->builtins = PyModule_GetDict(bimod); 577 interp->builtins = PyModule_GetDict(bimod);
578 if (interp->builtins == NULL) 578 if (interp->builtins == NULL)
579 goto handle_error; 579 goto handle_error;
580 Py_INCREF(interp->builtins); 580 Py_INCREF(interp->builtins);
680 m = PyImport_AddModule("__main__"); 680 m = PyImport_AddModule("__main__");
681 if (m == NULL) 681 if (m == NULL)
682 Py_FatalError("can't create __main__ module"); 682 Py_FatalError("can't create __main__ module");
683 d = PyModule_GetDict(m); 683 d = PyModule_GetDict(m);
684 if (PyDict_GetItemString(d, "__builtins__") == NULL) { 684 if (PyDict_GetItemString(d, "__builtins__") == NULL) {
685 PyObject *bimod = PyImport_ImportModule("__builtin__"); 685 PyObject *bimod = PyImport_ImportModule("builtins");
686 if (bimod == NULL || 686 if (bimod == NULL ||
687 PyDict_SetItemString(d, "__builtins__", bimod) != 0) 687 PyDict_SetItemString(d, "__builtins__", bimod) != 0)
688 Py_FatalError("can't add __builtins__ to __main__"); 688 Py_FatalError("can't add __builtins__ to __main__");
689 Py_DECREF(bimod); 689 Py_DECREF(bimod);
690 } 690 }
715 else { 715 else {
716 Py_DECREF(m); 716 Py_DECREF(m);
717 } 717 }
718 } 718 }
719 719
720 /* Initialize sys.stdin, stdout, stderr and __builtin__.open */ 720 /* Initialize sys.stdin, stdout, stderr and builtins.open */
721 static int 721 static int
722 initstdio(void) 722 initstdio(void)
723 { 723 {
724 PyObject *iomod = NULL, *wrapper; 724 PyObject *iomod = NULL, *wrapper;
725 PyObject *bimod = NULL; 725 PyObject *bimod = NULL;
737 if (!(m = PyImport_ImportModule("encodings.latin_1"))) { 737 if (!(m = PyImport_ImportModule("encodings.latin_1"))) {
738 goto error; 738 goto error;
739 } 739 }
740 Py_DECREF(m); 740 Py_DECREF(m);
741 741
742 if (!(bimod = PyImport_ImportModule("__builtin__"))) { 742 if (!(bimod = PyImport_ImportModule("builtins"))) {
743 goto error; 743 goto error;
744 } 744 }
745 745
746 if (!(iomod = PyImport_ImportModule("io"))) { 746 if (!(iomod = PyImport_ImportModule("io"))) {
747 goto error; 747 goto error;
748 } 748 }
749 if (!(wrapper = PyObject_GetAttrString(iomod, "OpenWrapper"))) { 749 if (!(wrapper = PyObject_GetAttrString(iomod, "OpenWrapper"))) {
750 goto error; 750 goto error;
751 } 751 }
752 752
753 /* Set __builtin__.open */ 753 /* Set builtins.open */
754 if (PyObject_SetAttrString(bimod, "open", wrapper) == -1) { 754 if (PyObject_SetAttrString(bimod, "open", wrapper) == -1) {
755 goto error; 755 goto error;
756 } 756 }
757 757
758 /* Set sys.stdin */ 758 /* Set sys.stdin */
1360 Py_DECREF(moduleName); 1360 Py_DECREF(moduleName);
1361 err = PyFile_WriteString("<unknown>", f); 1361 err = PyFile_WriteString("<unknown>", f);
1362 } 1362 }
1363 else { 1363 else {
1364 char* modstr = PyUnicode_AsString(moduleName); 1364 char* modstr = PyUnicode_AsString(moduleName);
1365 if (modstr && strcmp(modstr, "__builtin__")) 1365 if (modstr && strcmp(modstr, "builtins"))
1366 { 1366 {
1367 err = PyFile_WriteString(modstr, f); 1367 err = PyFile_WriteString(modstr, f);
1368 err += PyFile_WriteString(".", f); 1368 err += PyFile_WriteString(".", f);
1369 } 1369 }
1370 Py_DECREF(moduleName); 1370 Py_DECREF(moduleName);