[h5py] 20/26: Apply Darren's multiprocessing/IPy patch from August. :(

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to annotated tag 1.3.1
in repository h5py.

commit 5515b600509f9a7fe42452e860ae830ff8ef4c51
Author: andrewcollette <andrew.collette at gmail.com>
Date:   Sun Nov 28 20:30:21 2010 +0000

    Apply Darren's multiprocessing/IPy patch from August. :(
---
 h5py/__init__.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/h5py/__init__.py b/h5py/__init__.py
index 97a2100..899719c 100644
--- a/h5py/__init__.py
+++ b/h5py/__init__.py
@@ -60,11 +60,13 @@ __all__ = ['h5', 'h5f', 'h5g', 'h5s', 'h5t', 'h5d', 'h5a', 'h5p', 'h5r',
 
 try:
     try:
-        import IPython.core.ipapi as _IP
+        from IPython.core.iplib import InteractiveShell
+        ip_running = InteractiveShell.initialized()
     except ImportError:
         # support <ipython-0.11
-        import IPython.ipapi as _IP
-    if _IP.get() is not None:
+        from IPython import ipapi
+        ip_running = ipapi.get() is not None
+    if ip_running:
         import _ipy_completer
         _ipy_completer.activate()
 except Exception:

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