Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't catch ImportError when trying to unpack module functions #2395

Merged
merged 1 commit into from Sep 29, 2012
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions IPython/utils/pickleutil.py
Expand Up @@ -98,12 +98,8 @@ def _check_type(self, obj):
def get_object(self, g=None):
# try to load function back into its module:
if not self.module.startswith('__'):
try:
__import__(self.module)
except ImportError:
pass
else:
g = sys.modules[self.module].__dict__
__import__(self.module)
g = sys.modules[self.module].__dict__

if g is None:
g = {}
Expand Down