diff options
| -rw-r--r-- | src/mailman/commands/cli_withlist.py | 20 | ||||
| -rw-r--r-- | src/mailman/config/schema.cfg | 8 | ||||
| -rw-r--r-- | src/mailman/interact.py | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/mailman/commands/cli_withlist.py b/src/mailman/commands/cli_withlist.py index bc25363b1..dd1596227 100644 --- a/src/mailman/commands/cli_withlist.py +++ b/src/mailman/commands/cli_withlist.py @@ -27,9 +27,9 @@ __all__ = [ import re +import sys from lazr.config import as_boolean - from zope.component import getUtility from zope.interface import implements @@ -150,25 +150,24 @@ class Withlist: commit=config.db.commit, abort=config.db.abort, config=config, - ) - banner = '\n'.join([unicode(config.shell.banner), banner]) + ) + + banner = config.shell.banner + '\n' + banner if as_boolean(config.shell.use_ipython): - self._start_ipython(overrides, banner) #config.shell.banner) + self._start_ipython(overrides, banner) else: - self._start_python(overrides, banner) #config.shell.banner) + 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 = InteractiveShellEmbed(banner1=banner, user_ns=overrides) ipshell() except ImportError: - print _("ipython is not available, set use_ipython to no") + print _('ipython is not available, set use_ipython to no') def _start_python(self, overrides, banner): # set the tab completion - import sys try: import readline, rlcompleter readline.parse_and_bind('tab: complete') @@ -176,8 +175,7 @@ class Withlist: pass else: sys.ps1 = config.shell.ps1 + ' ' - interact(upframe=False, banner=config.shell.banner, - overrides=overrides) + interact(upframe=False, banner=banner, overrides=overrides) def _details(self): """Print detailed usage.""" diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg index 22ad878c7..d0a8e9e20 100644 --- a/src/mailman/config/schema.cfg +++ b/src/mailman/config/schema.cfg @@ -66,9 +66,11 @@ layout: dev # customize the interpreter prompt ps1: << MM >> -# banner to show on startup -banner: welcome to the mailman shell -# if IPython is found use it as the shell + +# Banner to show on startup. +banner: welcome to the GNU Mailman shell + +# If IPython is found use it as the shell use_ipython: no diff --git a/src/mailman/interact.py b/src/mailman/interact.py index 613a85b0d..25dcfbc85 100644 --- a/src/mailman/interact.py +++ b/src/mailman/interact.py @@ -28,7 +28,7 @@ import os import sys import code -DEFAULT_BANNER = "" +DEFAULT_BANNER = '' |