Skip to content
Browse files

Merge branch 'master' of github.com:inducer/pudb

  • Loading branch information...
2 parents 6a886c2 + 5767d71 commit 260f8b376490d58972366d8f07a1060a7806e5ea @inducer committed Jan 31, 2014
Showing with 9 additions and 3 deletions.
  1. +9 −3 pudb/shell.py
View
12 pudb/shell.py
@@ -113,9 +113,15 @@ def run_ipython_shell_v11(locals, globals, first_time):
else:
banner = ""
- from IPython.frontend.terminal.interactiveshell import \
- TerminalInteractiveShell
- from IPython.frontend.terminal.ipapp import load_default_config
+ try:
+ # IPython 1.0 got rid of the frontend intermediary, and complains with
+ # a deprecated warning when you use it.
+ from IPython.terminal.interactiveshell import TerminalInteractiveShell
+ from IPython.terminal.ipapp import load_default_config
+ except ImportError:
+ from IPython.frontend.terminal.interactiveshell import \
+ TerminalInteractiveShell
+ from IPython.frontend.terminal.ipapp import load_default_config
# XXX: in the future it could be useful to load a 'pudb' config for the
# user (if it exists) that could contain the user's macros and other
# niceities.

0 comments on commit 260f8b3

Please sign in to comment.
Something went wrong with that request. Please try again.