[pytango] 04/25: Avoid deprecation warning with IPython 4.x

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to tag v8.1.9
in repository pytango.

commit fc7c39c78fbd1ec90209e2225b36c1ff5c1f5fd0
Author: cpascual <cpascual at cells.es>
Date:   Wed Mar 23 12:12:49 2016 +0100

    Avoid deprecation warning with IPython 4.x
    
    IPython 4.x moves  IPython.config --> traitlets.config
    Avoid deprecation warnings by using traitlets.
---
 src/boost/python/ipython/ipython_10_00/ipython_10_00.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/boost/python/ipython/ipython_10_00/ipython_10_00.py b/src/boost/python/ipython/ipython_10_00/ipython_10_00.py
index 3e28b10..cc764a2 100644
--- a/src/boost/python/ipython/ipython_10_00/ipython_10_00.py
+++ b/src/boost/python/ipython/ipython_10_00/ipython_10_00.py
@@ -27,7 +27,10 @@ from IPython.core.error import UsageError
 from IPython.utils.ipstruct import Struct
 from IPython.core.page import page
 from IPython.core.interactiveshell import InteractiveShell
-from IPython.config.application import Application
+try:  # IPython 4.x
+    from traitlets.config.application import Application
+except: # IPython < 4.x
+    from IPython.config.application import Application
 from IPython.terminal.ipapp import launch_new_instance
 
 import PyTango

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git