Merge pull request #4208 from andfoy/ipython_quick_guide_import

PR: Surround deprecated IPython quick_quide import by try/except block
spyder-ide · Feb 27, 2017 · 66978e0 · 66978e0
2 parents 6e17c60 + 26ac88e
commit 66978e0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/spyder/widgets/ipythonconsole/shell.py b/spyder/widgets/ipythonconsole/shell.py
@@ -89,7 +89,10 @@ def set_cwd(self, dirname):
     def long_banner(self):
         """Banner for IPython widgets with pylab message"""
         # Default banner
-        from IPython.core.usage import quick_guide
+        try:
+            from IPython.core.usage import quick_guide
+        except Exception:
+            quick_guide = ''
         banner_parts = [
             'Python %s\n' % self.interpreter_versions['python_version'],
             'Type "copyright", "credits" or "license" for more information.\n\n',