Merge pull request #2864 from stevepiercy/scripts-optparse-to-argparse

Scripts optparse to argparse

9 files changed, 22 insertions, 54 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 12dd27722..b9d2958b0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,11 +51,11 @@ book = os.environ.get('BOOK')
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.doctest',
+    'repoze.sphinx.autointerface',
+    'sphinx.ext.viewcode',
     'sphinx.ext.intersphinx',
+    'sphinxcontrib.autoprogram',
     'sphinx.ext.todo',
-    'sphinx.ext.viewcode',
-    'repoze.sphinx.autointerface',
-    'sphinxcontrib.programoutput',
     # enable pylons_sphinx_latesturl when this branch is no longer "latest"
     # 'pylons_sphinx_latesturl',
     ]
diff --git a/docs/pscripts/pcreate.rst b/docs/pscripts/pcreate.rst
index b5ec3f4e2..c48a70acd 100644
--- a/docs/pscripts/pcreate.rst
+++ b/docs/pscripts/pcreate.rst
@@ -1,13 +1,9 @@
 .. index::
-   single: pcreate; --help
+    single: pcreate; --help
 
 .. _pcreate_script:
 
-``pcreate``
------------
-
-.. program-output:: pcreate --help
-   :prompt:
-   :shell:
+.. autoprogram:: pyramid.scripts.pcreate:PCreateCommand.parser
+    :prog: pcreate
 
 .. seealso:: :ref:`creating_a_project`
diff --git a/docs/pscripts/pdistreport.rst b/docs/pscripts/pdistreport.rst
index 1c53fb6e9..b3c9dffd8 100644
--- a/docs/pscripts/pdistreport.rst
+++ b/docs/pscripts/pdistreport.rst
@@ -1,13 +1,9 @@
 .. index::
-   single: pdistreport; --help
+    single: pdistreport; --help
 
 .. _pdistreport_script:
 
-``pdistreport``
----------------
-
-.. program-output:: pdistreport --help
-   :prompt:
-   :shell:
+.. autoprogram:: pyramid.scripts.pdistreport:get_parser()
+    :prog: pdistreport
 
 .. seealso:: :ref:`showing_distributions`
diff --git a/docs/pscripts/prequest.rst b/docs/pscripts/prequest.rst
index a15827767..64ed01739 100644
--- a/docs/pscripts/prequest.rst
+++ b/docs/pscripts/prequest.rst
@@ -1,13 +1,9 @@
 .. index::
-   single: prequest; --help
+    single: prequest; --help
 
 .. _prequest_script:
 
-``prequest``
-------------
-
-.. program-output:: prequest --help
-   :prompt:
-   :shell:
+.. autoprogram:: pyramid.scripts.prequest:PRequestCommand.parser
+    :prog: prequest
 
 .. seealso:: :ref:`invoking_a_request`
diff --git a/docs/pscripts/proutes.rst b/docs/pscripts/proutes.rst
index 09ed013e1..ee7c209e3 100644
--- a/docs/pscripts/proutes.rst
+++ b/docs/pscripts/proutes.rst
@@ -3,11 +3,7 @@
 
 .. _proutes_script:
 
-``proutes``
------------
-
-.. program-output:: proutes --help
-   :prompt:
-   :shell:
+.. autoprogram:: pyramid.scripts.proutes:PRoutesCommand.parser
+    :prog: proutes
 
 .. seealso:: :ref:`displaying_application_routes`
diff --git a/docs/pscripts/pserve.rst b/docs/pscripts/pserve.rst
index d33d4a484..991976aea 100644
--- a/docs/pscripts/pserve.rst
+++ b/docs/pscripts/pserve.rst
@@ -3,11 +3,7 @@
 
 .. _pserve_script:
 
-``pserve``
-----------
-
-.. program-output:: pserve --help
-   :prompt:
-   :shell:
+.. autoprogram:: pyramid.scripts.pserve:PServeCommand.parser
+    :prog: pserve
 
 .. seealso:: :ref:`running_the_project_application`
diff --git a/docs/pscripts/pshell.rst b/docs/pscripts/pshell.rst
index cfd84d4f8..4e2ce74cb 100644
--- a/docs/pscripts/pshell.rst
+++ b/docs/pscripts/pshell.rst
@@ -3,11 +3,7 @@
 
 .. _pshell_script:
 
-``pshell``
-----------
-
-.. program-output:: pshell --help
-   :prompt:
-   :shell:
+.. autoprogram:: pyramid.scripts.pshell:PShellCommand.parser
+    :prog: pshell
 
 .. seealso:: :ref:`interactive_shell`
diff --git a/docs/pscripts/ptweens.rst b/docs/pscripts/ptweens.rst
index 02e23e49a..f586e1467 100644
--- a/docs/pscripts/ptweens.rst
+++ b/docs/pscripts/ptweens.rst
@@ -3,11 +3,7 @@
 
 .. _ptweens_script:
 
-``ptweens``
------------
-
-.. program-output:: ptweens --help
-   :prompt:
-   :shell:
+.. autoprogram:: pyramid.scripts.ptweens:PTweensCommand.parser
+    :prog: ptweens
 
 .. seealso:: :ref:`displaying_tweens`
diff --git a/docs/pscripts/pviews.rst b/docs/pscripts/pviews.rst
index b4de5c054..da4660779 100644
--- a/docs/pscripts/pviews.rst
+++ b/docs/pscripts/pviews.rst
@@ -3,11 +3,7 @@
 
 .. _pviews_script:
 
-``pviews``
-----------
-
-.. program-output:: pviews --help
-   :prompt:
-   :shell:
+.. autoprogram:: pyramid.scripts.pviews:PViewsCommand.parser
+    :prog: pviews
 
 .. seealso:: :ref:`displaying_matching_views`