Merge pull request #5038 from tacaswell/prf_fix_import_time

efiring · efiring · commit e62d9fa9f4ba · 2015-09-08T16:17:22.000-10:00
PRF: only try IPython if it is already imported
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -112,6 +112,7 @@ def _backend_selection():
 _IP_REGISTERED = None
 _INSTALL_FIG_OBSERVER = False
 
+
 def install_repl_displayhook():
     """
     Install a repl display hook so that any stale figure are automatically
@@ -128,27 +129,30 @@ class _NotIPython(Exception):
     # see if we have IPython hooks around, if use them
 
     try:
-        from IPython import get_ipython
-        ip = get_ipython()
-        if ip is None:
-            raise _NotIPython()
-
-        if _IP_REGISTERED:
-            return
-
-        def post_execute():
-            if matplotlib.is_interactive():
-                draw_all()
-
-        # IPython >= 2
-        try:
-            ip.events.register('post_execute', post_execute)
-        except AttributeError:
-            # IPython 1.x
-            ip.register_post_execute(post_execute)
-
-        _IP_REGISTERED = post_execute
-        _INSTALL_FIG_OBSERVER = False
+        if 'IPython' in sys.modules:
+            from IPython import get_ipython
+            ip = get_ipython()
+            if ip is None:
+                raise _NotIPython()
+
+            if _IP_REGISTERED:
+                return
+
+            def post_execute():
+                if matplotlib.is_interactive():
+                    draw_all()
+
+            # IPython >= 2
+            try:
+                ip.events.register('post_execute', post_execute)
+            except AttributeError:
+                # IPython 1.x
+                ip.register_post_execute(post_execute)
+
+            _IP_REGISTERED = post_execute
+            _INSTALL_FIG_OBSERVER = False
+        else:
+            _INSTALL_FIG_OBSERVER = True
 
     # import failed or ipython is not running
     except (ImportError, _NotIPython):
