diff options
| author | Pete <pete@coderpete.net> | 2012-03-21 14:19:56 -0700 |
|---|---|---|
| committer | Pete <pete@coderpete.net> | 2012-03-21 14:19:56 -0700 |
| commit | e46b9fcb58b290eb96f24989dd31ee99a335e245 (patch) | |
| tree | ae8bd20ce765648741c9f14e4bda9a8a1fc382be /pecan/commands | |
| parent | 535f85e33155093e752083bfc4b9929b4bfc2df8 (diff) | |
| parent | 7f61483f64ba8672401a4af580589cb421dc0123 (diff) | |
| download | pecan-e46b9fcb58b290eb96f24989dd31ee99a335e245.tar.gz | |
Merge branch 'next' of git://github.com/dreamhost/pecan into next
Conflicts:
pecan/commands/shell.py
rsolved conflict
Diffstat (limited to 'pecan/commands')
| -rw-r--r-- | pecan/commands/shell.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pecan/commands/shell.py b/pecan/commands/shell.py index 1a8b7c4..b562f1d 100644 --- a/pecan/commands/shell.py +++ b/pecan/commands/shell.py @@ -54,8 +54,9 @@ class IPythonShell(object): shell = InteractiveShellEmbed(banner2=banner) shell(local_ns=ns) except ImportError: + # Support for the IPython <= 0.10 shell API from IPython.Shell import IPShellEmbed - shell = IPShellEmbed(argv=self.args) + shell = IPShellEmbed(argv=[]) shell.set_banner(shell.IP.BANNER + '\n\n' + banner) shell(local_ns=ns, global_ns={}) |