Merge lp:~andrea-crotti-0/mailman/py_interactive into lp:mailman

[Andrea Crotti]

[Barry Warsaw (barry)]

Great branch, thanks! After face-to-face review, we came up with a few minor things to fix. When you push the update, I'll merge this into trunk.

review: Approve (code)

[lp:~andrea-crotti-0/mailman/py_interactive]

7106. By Andrea Crotti on 2012-03-13

various small fixes after reviewing with Barry Warsaw

=== modified file 'src/mailman/commands/cli_withlist.py'
--- src/mailman/commands/cli_withlist.py	2012-01-01 19:14:46 +0000
+++ src/mailman/commands/cli_withlist.py	2012-03-13 04:37:19 +0000
@@ -27,7 +27,9 @@
 
 
 import re
+import sys
 
+from lazr.config import as_boolean
 from zope.component import getUtility
 from zope.interface import implements
 
@@ -149,7 +151,31 @@
                 abort=config.db.abort,
                 config=config,
                 )
-            interact(upframe=False, banner=banner, overrides=overrides)
+            
+            banner = config.shell.banner + '\n' + banner
+            if as_boolean(config.shell.use_ipython):
+                self._start_ipython(overrides, banner)
+            else:
+                self._start_python(overrides, banner)
+
+    def _start_ipython(self, overrides, banner):
+        try:
+            from IPython.frontend.terminal.embed import InteractiveShellEmbed
+            ipshell = InteractiveShellEmbed(banner1=banner, user_ns=overrides)
+            ipshell()
+        except ImportError:
+            print _('ipython is not available, set use_ipython to no')
+
+    def _start_python(self, overrides, banner):
+        # set the tab completion
+        try:
+            import readline, rlcompleter
+            readline.parse_and_bind('tab: complete')
+        except ImportError:
+            pass
+        else:
+            sys.ps1 = config.shell.ps1 + ' '
+        interact(upframe=False, banner=banner, overrides=overrides)
 
     def _details(self):
         """Print detailed usage."""
 
=== modified file 'src/mailman/config/schema.cfg'
--- src/mailman/config/schema.cfg	2012-03-03 18:40:16 +0000
+++ src/mailman/config/schema.cfg	2012-03-13 04:37:19 +0000
@@ -62,6 +62,17 @@
 # Which paths.* file system layout to use.
 layout: dev
 
+[shell]
+
+# customize the interpreter prompt
+ps1: << MM >>
+
+# Banner to show on startup.
+banner: welcome to the GNU Mailman shell
+
+# If IPython is found use it as the shell
+use_ipython: no
+
 
 [paths.master]
 # Important directories for Mailman operation.  These are defined here so that
 
=== modified file 'src/mailman/interact.py'
--- src/mailman/interact.py	2012-01-01 19:14:46 +0000
+++ src/mailman/interact.py	2012-03-13 04:37:19 +0000
@@ -28,7 +28,7 @@
 import sys
 import code
 
-DEFAULT_BANNER = object()
+DEFAULT_BANNER = ''
 
 
 
 
@@ -69,7 +69,7 @@
         except:
             pass
     # We don't want the funky console object in parentheses in the banner.
-    if banner is DEFAULT_BANNER:
+    if banner == DEFAULT_BANNER:
         banner = '''\
 Python %s on %s
 Type "help", "copyright", "credits" or "license" for more information.''' % (