diff options
| -rw-r--r-- | pyramid/scripts/pserve.py | 18 | ||||
| -rw-r--r-- | pyramid/tests/test_scripts/test_pserve.py | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py index c012abb01..89bfc765f 100644 --- a/pyramid/scripts/pserve.py +++ b/pyramid/scripts/pserve.py @@ -45,8 +45,8 @@ if WIN and not hasattr(os, 'kill'): # pragma: no cover else: kill = os.kill -def main(argv=sys.argv, quiet=False): - command = PServeCommand(argv, quiet=quiet) +def main(argv=sys.argv): + command = PServeCommand(argv) return command.run() class DaemonizeException(Exception): @@ -129,8 +129,14 @@ class PServeCommand(object): '-v', '--verbose', default=default_verbosity, dest='verbose', - type=int, + action='count', help="Set verbose level (default "+str(default_verbosity)+")") + parser.add_option( + '-q', '--quiet', + action='store_const', + const=0, + dest='verbose', + help="Suppress verbose output") if hasattr(os, 'setuid'): # I don't think these are available on Windows @@ -159,13 +165,11 @@ class PServeCommand(object): possible_subcommands = ('start', 'stop', 'restart', 'status') - def __init__(self, argv, quiet=False): - self.quiet = quiet + def __init__(self, argv): self.options, self.args = self.parser.parse_args(argv[1:]) def out(self, msg): # pragma: no cover - if not self.quiet: - print(msg) + print(msg) def get_options(self): if (len(self.args) > 1 diff --git a/pyramid/tests/test_scripts/test_pserve.py b/pyramid/tests/test_scripts/test_pserve.py index 107ff4c0a..350487e2a 100644 --- a/pyramid/tests/test_scripts/test_pserve.py +++ b/pyramid/tests/test_scripts/test_pserve.py @@ -259,7 +259,7 @@ class Test_read_pidfile(unittest.TestCase): class Test_main(unittest.TestCase): def _callFUT(self, argv): from pyramid.scripts.pserve import main - return main(argv, quiet=True) + return main(argv) def test_it(self): result = self._callFUT(['pserve']) |