From bde0ef17af0461799f04ace144526a06c6215776 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 27 Nov 2016 12:49:28 -0800 Subject: fix autoprogram argument - restore argv - use standard Python syntax for string formatting --- docs/pscripts/pcreate.rst | 2 +- pyramid/scripts/pcreate.py | 2 +- pyramid/scripts/pdistreport.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/pscripts/pcreate.rst b/docs/pscripts/pcreate.rst index 7159395b7..648491600 100644 --- a/docs/pscripts/pcreate.rst +++ b/docs/pscripts/pcreate.rst @@ -6,7 +6,7 @@ ``pcreate`` ----------- -.. autoprogram:: pyramid.scripts.pcreate:PCreateCommand +.. autoprogram:: pyramid.scripts.pcreate:PCreateCommand.parser :prog: pcreate.py .. seealso:: :ref:`creating_a_project` diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py index ba4fcc8ae..027a52c06 100644 --- a/pyramid/scripts/pcreate.py +++ b/pyramid/scripts/pcreate.py @@ -85,7 +85,7 @@ https://github.com/Pylons/?q=cookiecutter def __init__(self, argv, quiet=False): self.quiet = quiet - self.args = self.parser.parse_args() + self.args = self.parser.parse_args(argv) if not self.args.interactive and not self.args.overwrite: self.args.interactive = True self.scaffolds = self.all_scaffolds() diff --git a/pyramid/scripts/pdistreport.py b/pyramid/scripts/pdistreport.py index a504c9545..c090d3311 100644 --- a/pyramid/scripts/pdistreport.py +++ b/pyramid/scripts/pdistreport.py @@ -14,7 +14,7 @@ def main(argv=sys.argv, pkg_resources=pkg_resources, platform=platform.platform, out=out): # all args except argv are for unit testing purposes only description = "Show Python distribution versions and locations in use" - usage = "usage: %prog" + usage = "usage: %(prog)s" parser = argparse.ArgumentParser(usage, description=description) parser.parse_args(argv[1:]) packages = [] -- cgit v1.2.3