diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2016-01-14 10:26:31 -0800 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-01-14 10:26:31 -0800 |
commit | 05b30bf83e0bc8723472b6d609c692c3b83b486c (patch) | |
tree | ebc53ef3142046d9cfe8ac86942fe058ce435602 /lib/spack/llnl/util/tty/__init__.py | |
parent | b02faf56411c734b91a7f51b60f8921a31e12c16 (diff) | |
download | spack-05b30bf83e0bc8723472b6d609c692c3b83b486c.tar.gz spack-05b30bf83e0bc8723472b6d609c692c3b83b486c.tar.bz2 spack-05b30bf83e0bc8723472b6d609c692c3b83b486c.tar.xz spack-05b30bf83e0bc8723472b6d609c692c3b83b486c.zip |
Make text wrapping off by default in tty, add a kwarg for it.
Diffstat (limited to 'lib/spack/llnl/util/tty/__init__.py')
-rw-r--r-- | lib/spack/llnl/util/tty/__init__.py | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/lib/spack/llnl/util/tty/__init__.py b/lib/spack/llnl/util/tty/__init__.py index 203f429a48..3ecd3a4ac2 100644 --- a/lib/spack/llnl/util/tty/__init__.py +++ b/lib/spack/llnl/util/tty/__init__.py @@ -63,35 +63,46 @@ def msg(message, *args): def info(message, *args, **kwargs): format = kwargs.get('format', '*b') stream = kwargs.get('stream', sys.stdout) + wrap = kwargs.get('wrap', False) cprint("@%s{==>} %s" % (format, cescape(str(message))), stream=stream) for arg in args: - lines = textwrap.wrap( - str(arg), initial_indent=indent, subsequent_indent=indent) - for line in lines: - stream.write(line + '\n') + if wrap: + lines = textwrap.wrap( + str(arg), initial_indent=indent, subsequent_indent=indent) + for line in lines: + stream.write(line + '\n') + else: + stream.write(indent + str(arg) + '\n') -def verbose(message, *args): +def verbose(message, *args, **kwargs): if _verbose: - info(message, *args, format='c') + kwargs.setdefault('format', 'c') + info(message, *args, **kwargs) -def debug(message, *args): +def debug(message, *args, **kwargs): if _debug: - info(message, *args, format='g', stream=sys.stderr) + kwargs.setdefault('format', 'g') + kwargs.setdefault('stream', sys.stderr) + info(message, *args, **kwargs) -def error(message, *args): - info("Error: " + str(message), *args, format='*r', stream=sys.stderr) +def error(message, *args, **kwargs): + kwargs.setdefault('format', '*r') + kwargs.setdefault('stream', sys.stderr) + info("Error: " + str(message), *args, **kwargs) -def warn(message, *args): - info("Warning: " + str(message), *args, format='*Y', stream=sys.stderr) +def warn(message, *args, **kwargs): + kwargs.setdefault('format', '*Y') + kwargs.setdefault('stream', sys.stderr) + info("Warning: " + str(message), *args, **kwargs) -def die(message, *args): - error(message, *args) +def die(message, *args, **kwargs): + error(message, *args, **kwargs) sys.exit(1) |