]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit
projects / thirdparty / Python / cpython.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 37ccd6f 1619132)
Merge 3.2: Fix the import machinery if there is an error on sys.path or sys.meta_path
authorVictor Stinner <victor.stinner@haypocalc.com>
Thu, 15 Sep 2011 17:38:54 +0000 (19:38 +0200)
committerVictor Stinner <victor.stinner@haypocalc.com>
Thu, 15 Sep 2011 17:38:54 +0000 (19:38 +0200)
commit84b8e40fd7229303ddc76f13b33f5fa00687de2a
tree2ad6e07598d4d59f1c834360f220ceeccd5aa4a7tree | snapshot
parent37ccd6f794539e0678b7a7ad938e571cc73e106ccommit | diff
parent1619132e5dba825cdfae200cf619470129116c3dcommit | diff
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.
Python/import.c diff1 | diff2 | blob | history
Mirror of https://github.com/python/cpython.git