diff options
author | Larry Hastings <larry@hastings.org> | 2015-08-25 21:21:59 (GMT) |
---|---|---|
committer | Larry Hastings <larry@hastings.org> | 2015-08-25 21:21:59 (GMT) |
commit | 45d1c0083115b11dff4acbc76232633262f7b1a8 (patch) | |
tree | 263010dc1d82ddc2283fd61671c22da129a40974 /Lib/importlib/_bootstrap.py | |
parent | ccf426e7e77472b1ff1a919791aa3dd402836b83 (diff) | |
parent | 06a7d611da25fab11b7a7ab7a7f0bbce7d6a65fd (diff) | |
download | cpython-45d1c0083115b11dff4acbc76232633262f7b1a8.zip cpython-45d1c0083115b11dff4acbc76232633262f7b1a8.tar.gz cpython-45d1c0083115b11dff4acbc76232633262f7b1a8.tar.bz2 |
Merge from 3.5 (with 3.5.0rc2 changes) into default (3.6). Messy!
Diffstat (limited to 'Lib/importlib/_bootstrap.py')
-rw-r--r-- | Lib/importlib/_bootstrap.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index 931754e..6f62bb3 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -745,7 +745,7 @@ class BuiltinImporter: @classmethod def exec_module(self, module): """Exec a built-in module""" - _call_with_frames_removed(_imp.exec_dynamic, module) + _call_with_frames_removed(_imp.exec_builtin, module) @classmethod @_requires_builtin |