From 3781bd3aca1e82b0ccdb73b90ad8e1ae7ae023be Mon Sep 17 00:00:00 2001 From: Elizaveta Shashkova Date: Mon, 24 Nov 2014 12:35:21 +0300 Subject: [PATCH] fix PY-14472 Matplotlib import has failed in Python Console (AttributeError: 'module' object has no attribute 'rcParams') --- python/helpers/pydev/pydev_import_hook.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/python/helpers/pydev/pydev_import_hook.py b/python/helpers/pydev/pydev_import_hook.py index 64bc623c22fe..1a2b2bd3e3f5 100644 --- a/python/helpers/pydev/pydev_import_hook.py +++ b/python/helpers/pydev/pydev_import_hook.py @@ -26,10 +26,16 @@ class ImportHookManager(ModuleType): else: # default value for level parameter in other versions level = -1 - module = self._system_import(name, globals, locals, fromlist, level) + activate_func = None if DictContains(self._modules_to_patch, name): - self._modules_to_patch[name]() #call activate function - self._modules_to_patch.pop(name) + activate_func = self._modules_to_patch.pop(name) + + module = self._system_import(name, globals, locals, fromlist, level) + try: + if activate_func: + activate_func() #call activate function + except: + sys.stderr.write("Matplotlib support failed") return module try: