diff options
| author | Brett Cannon <brett@python.org> | 2012-04-14 18:10:13 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2012-04-14 18:10:13 (GMT) |
| commit | fd0741555b733f66c0a35c698d0cac5e73010ae0 (patch) | |
| tree | 739b3aeb0a9d31f49dd334e5f57b5376b20d7dc7 /Objects/exceptions.c | |
| parent | d2cbd9053975d6d6a98adb23b2735b2125ed0626 (diff) | |
| download | cpython-fd0741555b733f66c0a35c698d0cac5e73010ae0.zip cpython-fd0741555b733f66c0a35c698d0cac5e73010ae0.tar.gz cpython-fd0741555b733f66c0a35c698d0cac5e73010ae0.tar.bz2 | |
Issue #2377: Make importlib the implementation of __import__().
importlib._bootstrap is now frozen into Python/importlib.h and stored
as _frozen_importlib in sys.modules. Py_Initialize() loads the frozen
code along with sys and imp and then uses _frozen_importlib._install()
to set builtins.__import__() w/ _frozen_importlib.__import__().
Diffstat (limited to 'Objects/exceptions.c')
| -rw-r--r-- | Objects/exceptions.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Objects/exceptions.c b/Objects/exceptions.c index f3dde11..a2f2e44 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -2344,9 +2344,9 @@ PyObject *PyExc_RecursionErrorInst = NULL; #endif /* MS_WINDOWS */ void -_PyExc_Init(void) +_PyExc_Init(PyObject *bltinmod) { - PyObject *bltinmod, *bdict; + PyObject *bdict; PRE_INIT(BaseException) PRE_INIT(Exception) @@ -2414,9 +2414,6 @@ _PyExc_Init(void) PRE_INIT(ProcessLookupError); PRE_INIT(TimeoutError); - bltinmod = PyImport_ImportModule("builtins"); - if (bltinmod == NULL) - Py_FatalError("exceptions bootstrapping error."); bdict = PyModule_GetDict(bltinmod); if (bdict == NULL) Py_FatalError("exceptions bootstrapping error."); @@ -2546,7 +2543,6 @@ _PyExc_Init(void) Py_DECREF(args_tuple); } } - Py_DECREF(bltinmod); } void |