From cb92023e9d0ddb56d20dcc445a5e028fec581342 Mon Sep 17 00:00:00 2001
From: John Anderson <sontek@gmail.com>
Date: Sun, 6 Sep 2015 15:26:35 -0700
Subject: Use entry points for pshell

---
 docs/narr/commandline.rst | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'docs/narr')

diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index 1fe2d9278..89df13ce4 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -288,6 +288,40 @@ specifically invoke one of your choice with the ``-p choice`` or
 
    $ $VENV/bin/pshell -p ipython | bpython | python development.ini#MyProject
 
+Alternative Shells
+~~~~~~~~~~~~~~~~~~
+If you want to use a shell that isn't supported out of the box you can introduce
+a new shell by registering an entrypoint in your setup.py:
+
+.. code-block:: python
+
+    setup(
+        entry_points = """\
+            [pyramid.pshell]
+            myshell=my_app.ptpython_shell_factory
+        """
+    )
+
+and then your shell factory should return a function that accepts two arguments,
+``env`` and ``help``, this would look like this:
+
+.. code-block:: python
+
+    def ptpython_shell_factory():
+        try:
+            from ptpython.repl import embed
+            def PTPShell(banner, **kwargs):
+                print(banner)
+                return embed(**kwargs)
+        except ImportError:
+            return None
+
+        def shell(env, help):
+            PTPShell(banner=help, locals=env)
+
+        return shell
+
+
 .. index::
    pair: routes; printing
    single: proutes
-- 
cgit v1.2.3


From b932a45f834ae6bdb5850a2c58d1317844b32914 Mon Sep 17 00:00:00 2001
From: John Anderson <sontek@gmail.com>
Date: Sun, 11 Oct 2015 00:50:54 -0700
Subject: removed default fall through when passed a specific shell

---
 docs/narr/commandline.rst | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'docs/narr')

diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index 89df13ce4..cb0c914d7 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -245,7 +245,7 @@ exposed, and the request is configured to generate urls from the host
 .. code-block:: text
 
     $ $VENV/bin/pshell starter/development.ini
-    Python 2.6.5 (r265:79063, Apr 29 2010, 00:31:32) 
+    Python 2.6.5 (r265:79063, Apr 29 2010, 00:31:32)
     [GCC 4.4.3] on linux2
     Type "help" for more information.
 
@@ -278,10 +278,10 @@ IPython or bpython
 
 If you have `IPython <http://en.wikipedia.org/wiki/IPython>`_ and/or
 `bpython <http://bpython-interpreter.org/>`_ in
-the interpreter you use to invoke the ``pshell`` command, ``pshell`` will 
+the interpreter you use to invoke the ``pshell`` command, ``pshell`` will
 autodiscover and use the first one found, in this order:
-IPython, bpython, standard Python interpreter. However you could 
-specifically invoke one of your choice with the ``-p choice`` or 
+IPython, bpython, standard Python interpreter. However you could
+specifically invoke one of your choice with the ``-p choice`` or
 ``--python-shell choice`` option.
 
 .. code-block:: text
@@ -308,20 +308,16 @@ and then your shell factory should return a function that accepts two arguments,
 .. code-block:: python
 
     def ptpython_shell_factory():
-        try:
-            from ptpython.repl import embed
-            def PTPShell(banner, **kwargs):
-                print(banner)
-                return embed(**kwargs)
-        except ImportError:
-            return None
+        from ptpython.repl import embed
+        def PTPShell(banner, **kwargs):
+            print(banner)
+            return embed(**kwargs)
 
         def shell(env, help):
             PTPShell(banner=help, locals=env)
 
         return shell
 
-
 .. index::
    pair: routes; printing
    single: proutes
-- 
cgit v1.2.3