[pytango] 352/483: Fix #650

[Sandor Bodo-Merle]

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

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit 4daec619b77210bb07c5e668f0e107bd75fa8fb0
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Thu Feb 6 12:18:15 2014 +0000

    Fix #650
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@24853 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 doc/revision.rst                   |  1 +
 src/boost/python/ipython/common.py | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/doc/revision.rst b/doc/revision.rst
index 49ff5de..ce1ee8a 100644
--- a/doc/revision.rst
+++ b/doc/revision.rst
@@ -89,6 +89,7 @@ Version history
 | 8.1.2    | Bug fixes:                                                                                                                                                        |
 |          | - `648: PyTango unicode method parameters fail <https://sourceforge.net/p/tango-cs/bugs/648/>`_                                                                   |
 |          | - `649: write_attribute of spectrum/image fails in PyTango without numpy <https://sourceforge.net/p/tango-cs/bugs/649/>`_                                         |
+|          | - `650: [pytango] 8.1.1 not compatible with ipyton 1.2.0-rc1 <https://sourceforge.net/p/tango-cs/bugs/650/>`_                                                     |
 +----------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | 8.1.1    | Features:                                                                                                                                                         |
 |          | - Implemented tango C++ 8.1 API                                                                                                                                   |
diff --git a/src/boost/python/ipython/common.py b/src/boost/python/ipython/common.py
index 1ae516f..2ee7ada 100644
--- a/src/boost/python/ipython/common.py
+++ b/src/boost/python/ipython/common.py
@@ -35,16 +35,19 @@ def get_ipython_version():
     """Returns the current IPython version"""
     import IPython
     v = None
-    try:
+    if hasattr(IPython, "version_info"):
+        v = '.'.join(map(str, IPython.version_info[:3]))
+    else:
         try:
-            v = IPython.Release.version
-        except:
             try:
-                v = IPython.release.version
+                v = IPython.Release.version
             except:
-                pass
-    except:
-        pass
+                try:
+                    v = IPython.release.version
+                except:
+                    pass
+        except:
+            pass
     return StrictVersion(v)
 
 #-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-

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