From d2b835c242cd4fb9ffa3059d2847a1f8585b3813 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <lists@ryanpetrello.com>
Date: Tue, 20 Mar 2012 19:25:28 -0400
Subject: [PATCH] Adding a shortcut for `pecan shell config.py --shell=XXX`.

---
 .DS_Store               | Bin 0 -> 6148 bytes
 pecan/commands/base.py  |   5 ++++-
 pecan/commands/shell.py |   6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a5c2315f7bb7cc4988bd116fdc15e67a4bdf779f
GIT binary patch
literal 6148
zcmeHKJ8DBg3>+nf7}B^*xmWNF7UP`27ce*w7ydv<T))ca%F#0V5MrL)1k!{NNVBWe
z?Bh-G^aQ{bA1`xY24G5e#M#5x{M>zHca<?Bop)?-#ObtpJM505>gx&TK46P??6LdF
zKfLCx*J;X10VyB_q<|EV0>4zidoOMJn5ZZPq<|FoR=~dxjqcbBhs5}FFvJKzoG=~6
zb<7gP<_Tgi91@wKSyG8fwHh%j>CCsP>xDyN(qT1xSUuTlLa}%{?{85K>xqg|Knh$c
zaG%?m_y1@5jrsqQq@5Iy0{=<@n=Dt$1z)Lp>*(dY*Eaf^?lqruH?D)i5bc;4?U);H
e$4^m|b<Nj2?}bBR(3uZ9Q9lE&i%bgqwE|zqi50j2

literal 0
HcmV?d00001

diff --git a/pecan/commands/base.py b/pecan/commands/base.py
index 5451444..c167c49 100644
--- a/pecan/commands/base.py
+++ b/pecan/commands/base.py
@@ -78,7 +78,10 @@ class CommandRunner(object):
             )
             for arg in getattr(cmd, 'arguments', tuple()):
                 arg = arg.copy()
-                sub.add_argument(arg.pop('command'), **arg)
+                if isinstance(arg.get('command'), basestring):
+                    sub.add_argument(arg.pop('command'), **arg)
+                elif isinstance(arg.get('command'), list):
+                    sub.add_argument(*arg.pop('command'), **arg)
 
     def run(self, args):
         ns = self.parser.parse_args(args)
diff --git a/pecan/commands/shell.py b/pecan/commands/shell.py
index dee6aa5..3424103 100644
--- a/pecan/commands/shell.py
+++ b/pecan/commands/shell.py
@@ -10,7 +10,7 @@ import sys
 class NativePythonShell(object):
 
     @classmethod
-    def invoke(cls, ns, banner):
+    def invoke(cls, ns, banner):  # pragma: nocover
         import code
         py_prefix = sys.platform.startswith('java') and 'J' or 'P'
         shell_banner = 'Pecan Interactive Shell\n%sython %s\n\n' % \
@@ -26,7 +26,7 @@ class NativePythonShell(object):
 class IPythonShell(object):
 
     @classmethod
-    def invoke(cls, ns, banner):
+    def invoke(cls, ns, banner):  # pragma: nocover
         try:
             from IPython.frontend.terminal.embed import (
                 InteractiveShellEmbed
@@ -51,7 +51,7 @@ class ShellCommand(BaseCommand):
     }    
 
     arguments = BaseCommand.arguments + ({
-        'command': '--shell',
+        'command': ['--shell', '-s'],
         'help': 'which Python shell to use',
         'choices': SHELLS.keys(),
         'default': 'python'