Merge pull request #2886 from stevepiercy/master

Steve Piercy

2016-12-24 4ccf364c4d3b05af458b70f5306e84cac4919299

Merge pull request #2886 from stevepiercy/master

improve display of help's description for p* scripts

 CHANGES.txt

@@ -255,3 +255,6 @@

  See https://github.com/Pylons/pyramid/pull/2881 and
  https://github.com/Pylons/pyramid/pull/2883.

- Improve output of p* script descriptions for help.
  See https://github.com/Pylons/pyramid/pull/2886

 pyramid/scripts/pcreate.py

@@ -23,13 +23,16 @@

class PCreateCommand(object):
    verbosity = 1  # required
    parser = argparse.ArgumentParser(description="""\
    parser = argparse.ArgumentParser(
        description="""\
Render Pyramid scaffolding to an output directory.

Note: As of Pyramid 1.8, this command is deprecated. Use a specific
cookiecutter instead:
https://github.com/Pylons/?q=cookiecutter
""")
""",
        formatter_class=argparse.RawDescriptionHelpFormatter,
    )
    parser.add_argument('-s', '--scaffold',
                        dest='scaffold_name',
                        action='append',

 pyramid/scripts/prequest.py

@@ -47,7 +47,8 @@
    """

    parser = argparse.ArgumentParser(
        description=textwrap.dedent(description)
        description=textwrap.dedent(description),
        formatter_class=argparse.RawDescriptionHelpFormatter,
        )
    parser.add_argument(
        '-n', '--app-name',

 pyramid/scripts/proutes.py

@@ -249,7 +249,8 @@
    stdout = sys.stdout
    ConfigParser = configparser.ConfigParser  # testing
    parser = argparse.ArgumentParser(
        description=textwrap.dedent(description)
        description=textwrap.dedent(description),
        formatter_class=argparse.RawDescriptionHelpFormatter,
        )
    parser.add_argument('-g', '--glob',
                        action='store',

 pyramid/scripts/pserve.py

@@ -51,7 +51,8 @@
    default_verbosity = 1

    parser = argparse.ArgumentParser(
        description=textwrap.dedent(description)
        description=textwrap.dedent(description),
        formatter_class=argparse.RawDescriptionHelpFormatter,
        )
    parser.add_argument(
        '-n', '--app-name',

 pyramid/scripts/pshell.py

@@ -45,7 +45,8 @@
    pkg_resources = pkg_resources  # for testing

    parser = argparse.ArgumentParser(
        description=textwrap.dedent(description)
        description=textwrap.dedent(description),
        formatter_class=argparse.RawDescriptionHelpFormatter,
        )
    parser.add_argument('-p', '--python-shell',
                        action='store',

 pyramid/scripts/ptweens.py

@@ -29,6 +29,7 @@
    """
    parser = argparse.ArgumentParser(
        description=textwrap.dedent(description),
        formatter_class=argparse.RawDescriptionHelpFormatter,
        )

    parser.add_argument('config_uri',

 pyramid/scripts/pviews.py

@@ -28,7 +28,8 @@
    stdout = sys.stdout

    parser = argparse.ArgumentParser(
        description=textwrap.dedent(description)
        description=textwrap.dedent(description),
        formatter_class=argparse.RawDescriptionHelpFormatter,
        )

    parser.add_argument('config_uri',