From a3a4d71f4b005a43ef4562b2ba3e2575a41b4f38 Mon Sep 17 00:00:00 2001 From: Elizaveta Shashkova Date: Thu, 12 Nov 2015 20:51:28 +0300 Subject: [PATCH] Suppress warning with IPython 4 (PY-17634) --- python/helpers/pydev/pydev_ipython_console_011.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python/helpers/pydev/pydev_ipython_console_011.py b/python/helpers/pydev/pydev_ipython_console_011.py index da0f7a8333ba..d555d4e913dc 100644 --- a/python/helpers/pydev/pydev_ipython_console_011.py +++ b/python/helpers/pydev/pydev_ipython_console_011.py @@ -29,7 +29,10 @@ try: except ImportError: # Versions of IPython [0.11,1.0) had an extra hierarchy level from IPython.frontend.terminal.interactiveshell import TerminalInteractiveShell -from IPython.utils.traitlets import CBool, Unicode +try: + from traitlets import CBool, Unicode +except ImportError: + from IPython.utils.traitlets import CBool, Unicode from IPython.core import release from pydev_imports import xmlrpclib