Merge lp:~jtaylor/ubuntu-dev-tools/lp-shell-ipython into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

[Julian Taylor]

use ipython shell instead of normal python for lp-shell when it is available.
ipython is far better suited for interactive use:
http://ipython.org/ipython-doc/stable/interactive/reference.html#interactive-use

ipython is set to default, the regular python shell can be forced with --python

[Stefano Rivera (stefanor)]

I like it!

"an ipython shell" surely :)

please take proper credit in the changelog (dch -a should have added your name)

I'd use "shell" instead of "mode" as the option name. Mode is very broad.

[Stefano Rivera (stefanor)]

I'd also re-enable that pylint check as soon as possible.

[Julian Taylor (jtaylor)]

I don't know how to avoid the pylint problem.
The nested try except works fine, but pylint does not seem to be able to handle it.

If ipython 0.11 is installed (available https://launchpad.net/~jtaylor/+archive/ipython-dev) it will error out with "IPython does not have name Shell", although that code is never executed with 0.11 available.
It gets it right when 0.10.2 is installed.

[lp:~jtaylor/ubuntu-dev-tools/lp-shell-ipython]

1121. By Julian Taylor on 2011-08-14

doc/lp-shell.1: fix typo

1122. By Julian Taylor on 2011-08-14

lp-shell: rename options.mode to options.shell

1123. By Julian Taylor on 2011-08-14

fix changelog

[Stefano Rivera (stefanor)]

I just mean throw in an enable-msg again afterwards.

[Julian Taylor (jtaylor)]

the disable annotation is scoped, its only valid for the except block

[Stefano Rivera (stefanor)]

oh, I didn't know it worked like that :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-25 17:37:30 +0000
+++ debian/changelog	2011-08-14 16:58:24 +0000
@@ -1,8 +1,12 @@
 ubuntu-dev-tools (0.128) UNRELEASED; urgency=low
 
+  [ Stefano Rivera ]
   * ubuntutools.builder: Detect missing builder and fail early.
 
- -- Stefano Rivera <[e-mail]>  Mon, 25 Jul 2011 19:36:41 +0200
+  [ Julian Taylor ]
+  * lp-shell: use ipython shell if available
+
+ -- Julian Taylor <[e-mail]>  Sun, 14 Aug 2011 18:56:52 +0200
 
 ubuntu-dev-tools (0.127) unstable; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2011-06-25 15:53:44 +0000
+++ debian/control	2011-08-14 16:58:24 +0000
@@ -57,7 +57,7 @@
             python-gnupginterface,
             python-soappy,
             reportbug (>= 3.39ubuntu1)
-Suggests: python-simplejson | python (>= 2.7), qemu-user-static
+Suggests: ipython, python-simplejson | python (>= 2.7), qemu-user-static
 Description: useful tools for Ubuntu developers
  This is a collection of useful tools that Ubuntu developers use to make their
  packaging work a lot easier.

=== modified file 'doc/lp-shell.1'
--- doc/lp-shell.1	2010-12-03 12:54:28 +0000
+++ doc/lp-shell.1	2011-08-14 16:58:24 +0000
@@ -5,6 +5,8 @@
 .SH SYNOPSIS
 .B lp\-shell
 .RB [ \-a ]
+.RB [ \-\-python ]
+.RB [ \-\-ipython ]
 .RI [ service ]
 .RI [ "LP API version" ]
 
@@ -34,6 +36,14 @@
 .B \-a
 Login anonymously into Launchpad.
 
+.TP
+.B \-\-ipython
+Use an ipython shell if available (default).
+
+.TP
+.B \-\-python
+Use a regular python shell.
+
 .SH AUTHORS
 .B lp\-shell
 was written by Martin Pitt <[e-mail]>.

=== modified file 'lp-shell'
--- lp-shell	2010-12-27 20:54:31 +0000
+++ lp-shell	2011-08-14 16:58:24 +0000
@@ -33,6 +33,13 @@
     opt_parser.add_option('-a', action='store_true',
                           dest='anonymous', default=False,
                           help='Login anonymously into LP.')
+    opt_parser.add_option('--ipython',action='store_const',
+                          dest='shell',const='ipython', default="ipython",
+                          help='Use ipython shell (default).')
+    opt_parser.add_option('--python',action='store_const',
+                          dest='shell',const='python',
+                          help='Use python shell.')
+
 
     (options, args) = opt_parser.parse_args()
 
@@ -63,24 +70,43 @@
 
     banner += '\nNote: LP can be accessed through the "lp" object.'
 
-    class CompleterConsole(code.InteractiveConsole):
-        def __init__(self):
-            local = {'lp': launchpad}
-            code.InteractiveConsole.__init__(self, locals=local)
-            try:
-                import readline
-            except ImportError:
-                print 'I: readline module not available.'
-            else:
-                import rlcompleter
-                readline.parse_and_bind("tab: complete")
-
-    # Disable default apport hook, as lp-shell is intended for interactive use
-    # and thus exceptions often bubble up to the top level.
-    sys.excepthook = sys.__excepthook__
-
-    console = CompleterConsole()
-    console.interact(banner)
+    sh = None
+    if options.shell == "ipython":
+        try:
+            try: # ipython >= 0.11
+                from IPython.frontend.terminal.embed import InteractiveShellEmbed
+                sh = InteractiveShellEmbed(banner2=banner, user_ns={'lp': launchpad})
+            except ImportError: # ipython < 0.11
+                # pylint does not handle nested try-except, disable import error
+                # pylint: disable-msg=E0611
+                from IPython.Shell import IPShellEmbed
+                sh = IPShellEmbed(argv=[], user_ns={'lp': launchpad})
+                sh.set_banner(sh.IP.BANNER + '\n' + banner)
+            sh.excepthook = sys.__excepthook__
+        except ImportError:
+            print "E: ipython not available. Using normal python shell."
+
+    if sh:
+        sh()
+    else:
+        class CompleterConsole(code.InteractiveConsole):
+            def __init__(self):
+                local = {'lp': launchpad}
+                code.InteractiveConsole.__init__(self, locals=local)
+                try:
+                    import readline
+                except ImportError:
+                    print 'I: readline module not available.'
+                else:
+                    import rlcompleter
+                    readline.parse_and_bind("tab: complete")
+
+        # Disable default apport hook, as lp-shell is intended for interactive use
+        # and thus exceptions often bubble up to the top level.
+        sys.excepthook = sys.__excepthook__
+
+        console = CompleterConsole()
+        console.interact(banner)
 
 if __name__ == '__main__':
     main()