← Back to branch summary

~ubuntu-branches/ubuntu/utopic/h5py/utopic

« back to all changes in this revision

Viewing changes to h5py/__init__.py

  • Committer: Bazaar Package Importer
  • Author(s): Soeren Sonnenburg
  • Date: 2011-01-12 14:48:19 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110112144819-9kbgh192yngf6o05
Tags: 1.3.1-1
New upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
h5py/__init__.py
60
60
 
61
61
try:
62
62
    try:
63
 
        import IPython.core.ipapi as _IP
 
63
        from IPython.core.iplib import InteractiveShell
 
64
        ip_running = InteractiveShell.initialized()
64
65
    except ImportError:
65
66
        # support <ipython-0.11
66
 
        import IPython.ipapi as _IP
67
 
    if _IP.get() is not None:
 
67
        from IPython import ipapi
 
68
        ip_running = ipapi.get() is not None
 
69
    if ip_running:
68
70
        import _ipy_completer
69
71
        _ipy_completer.activate()
70
72
except Exception: