diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-09-15 19:38:54 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-09-15 19:38:54 +0200 |
| commit | 84b8e40fd7229303ddc76f13b33f5fa00687de2a (patch) | |
| tree | 2ad6e07598d4d59f1c834360f220ceeccd5aa4a7 /Python/pythonrun.c | |
| parent | 37ccd6f794539e0678b7a7ad938e571cc73e106c (diff) | |
| parent | 1619132e5dba825cdfae200cf619470129116c3d (diff) | |
| download | cpython-git-84b8e40fd7229303ddc76f13b33f5fa00687de2a.tar.gz | |
Merge 3.2: Fix the import machinery if there is an error on sys.path or sys.meta_path
find_module() now raises a RuntimeError, instead of ImportError, on an error on
sys.path or sys.meta_path because load_package() and import_submodule() returns
None and clear the exception if a ImportError occurred.
Diffstat (limited to 'Python/pythonrun.c')
0 files changed, 0 insertions, 0 deletions