summaryrefslogtreecommitdiff
path: root/Python/pythonrun.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-09-15 19:38:54 +0200
committerVictor Stinner <victor.stinner@haypocalc.com>2011-09-15 19:38:54 +0200
commit7ac5a3797aae5590c017b16e09f60c79d41679f4 (patch)
tree15a5696401a3a1b93aef4ce33b05183484beb289 /Python/pythonrun.c
parentcc168ab700b56d1903e374708efe3647037af937 (diff)
parentdee6b0855426e3641a7119a592f2ff1db69baef3 (diff)
downloadcpython-7ac5a3797aae5590c017b16e09f60c79d41679f4.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