summaryrefslogtreecommitdiff
path: root/docs/narr/commandline.rst
diff options
context:
space:
mode:
authorJohn Anderson <sontek@gmail.com>2015-10-11 00:50:54 -0700
committerJohn Anderson <sontek@gmail.com>2015-10-11 00:50:54 -0700
commitb932a45f834ae6bdb5850a2c58d1317844b32914 (patch)
treea8b77c3fc13bf51d841b70768f81da9b6626dc99 /docs/narr/commandline.rst
parente0a40abac5322f06022799f55f339d6f49b5abd8 (diff)
downloadpyramid-b932a45f834ae6bdb5850a2c58d1317844b32914.tar.gz
pyramid-b932a45f834ae6bdb5850a2c58d1317844b32914.tar.bz2
pyramid-b932a45f834ae6bdb5850a2c58d1317844b32914.zip
removed default fall through when passed a specific shell
Diffstat (limited to 'docs/narr/commandline.rst')
-rw-r--r--docs/narr/commandline.rst20
1 files changed, 8 insertions, 12 deletions
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