diff options
author | James Abbatiello <abbeyj@gmail.com> | 2009-10-15 19:42:41 -0400 |
---|---|---|
committer | R. Tyler Ballance <tyler@monkeypox.org> | 2009-11-16 00:04:04 -0800 |
commit | a23cfe7fc38af7f38a5d032592456152f635f995 (patch) | |
tree | 96fa32a756109681bd27bf277168e245b4ea6a7b | |
parent | 4213bbe9856d9c33a35ed2d7d5dba1ca16472015 (diff) | |
download | python-cheetah-a23cfe7fc38af7f38a5d032592456152f635f995.tar.gz |
Add --quiet option and use it to suppress messages from the Unicode tests
-rw-r--r-- | cheetah/CheetahWrapper.py | 4 | ||||
-rw-r--r-- | cheetah/Tests/Unicode.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cheetah/CheetahWrapper.py b/cheetah/CheetahWrapper.py index a7fef80..3b1f991 100644 --- a/cheetah/CheetahWrapper.py +++ b/cheetah/CheetahWrapper.py @@ -161,7 +161,8 @@ class CheetahWrapper(object): pao("--iext", action="store", dest="iext", default=".tmpl", help='File input extension (defaults: compile: .tmpl, fill: .tmpl)') pao("--oext", action="store", dest="oext", default=defaultOext, help='File output extension (defaults: compile: .py, fill: .html)') pao("-R", action="store_true", dest="recurse", default=False, help='Recurse through subdirectories looking for input files') - pao("--stdout", "-p", action="store_true", dest="stdout", default=False, help='Verbosely print informational messages to stdout') + pao("--stdout", "-p", action="store_true", dest="stdout", default=False, help='Send output to stdout instead of writing to a file') + pao("--quiet", action="store_false", dest="verbose", default=True, help='Do not print informational messages to stdout') pao("--debug", action="store_true", dest="debug", default=False, help='Print diagnostic/debug information to stderr') pao("--env", action="store_true", dest="env", default=False, help='Pass the environment into the search list') pao("--pickle", action="store", dest="pickle", default="", help='Unpickle FILE and pass it through in the search list') @@ -222,7 +223,6 @@ Files are %s""", args, pprint.pformat(vars(opts)), files) unpickled = pickle.load(f) f.close() self.searchList.insert(0, unpickled) - opts.verbose = not opts.stdout ################################################## ## COMMAND METHODS diff --git a/cheetah/Tests/Unicode.py b/cheetah/Tests/Unicode.py index 12c00ac..315f6d1 100644 --- a/cheetah/Tests/Unicode.py +++ b/cheetah/Tests/Unicode.py @@ -21,7 +21,7 @@ class CommandLineTest(unittest.TestCase): fd.close() wrap = CheetahWrapper.CheetahWrapper() - wrap.main(['cheetah', 'compile', '--nobackup', sourcefile]) + wrap.main(['cheetah', 'compile', '--quiet', '--nobackup', sourcefile]) module_path, module_name = os.path.split(sourcefile) module = loadModule(module_name, [module_path]) template = getattr(module, module_name) |