diff options
| author | Georg Brandl <georg@python.org> | 2007-12-02 09:40:06 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2007-12-02 09:40:06 +0000 |
| commit | 7d4a05a4ebffb688137ca5b5a92825a756927e7e (patch) | |
| tree | 012f200cbef14b454fbce4325f11ab7c6b08f4f4 /Modules | |
| parent | 76c3522261540b3660a5172f01c99d29db08c579 (diff) | |
| download | cpython-7d4a05a4ebffb688137ca5b5a92825a756927e7e.tar.gz | |
#1535: rename __builtin__ module to builtins.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_bsddb.c | 2 | ||||
| -rw-r--r-- | Modules/_lsprof.c | 6 | ||||
| -rw-r--r-- | Modules/config.c.in | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c index 0587071c2d..24f25627ce 100644 --- a/Modules/_bsddb.c +++ b/Modules/_bsddb.c @@ -6002,7 +6002,7 @@ PyMODINIT_FUNC init_bsddb(void) * using one base class. */ PyDict_SetItemString(d, "KeyError", PyExc_KeyError); { - PyObject *builtin_mod = PyImport_ImportModule("__builtin__"); + PyObject *builtin_mod = PyImport_ImportModule("builtins"); PyDict_SetItemString(d, "__builtins__", builtin_mod); } PyRun_String("class DBNotFoundError(DBError, KeyError): pass\n" diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c index 7e85dcf8d4..1707679e6e 100644 --- a/Modules/_lsprof.c +++ b/Modules/_lsprof.c @@ -186,13 +186,13 @@ normalizeUserObj(PyObject *obj) modname = PyModule_GetName(mod); if (modname == NULL) { PyErr_Clear(); - modname = "__builtin__"; + modname = "builtins"; } } else { - modname = "__builtin__"; + modname = "builtins"; } - if (strcmp(modname, "__builtin__") != 0) + if (strcmp(modname, "builtins") != 0) return PyUnicode_FromFormat("<%s.%s>", modname, fn->m_ml->ml_name); diff --git a/Modules/config.c.in b/Modules/config.c.in index e9c54a9bdb..0531fab6bb 100644 --- a/Modules/config.c.in +++ b/Modules/config.c.in @@ -48,7 +48,7 @@ struct _inittab _PyImport_Inittab[] = { /* These entries are here for sys.builtin_module_names */ {"__main__", NULL}, - {"__builtin__", NULL}, + {"builtins", NULL}, {"sys", NULL}, /* This lives in gcmodule.c */ |