diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-04-23 11:52:44 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-04 11:11:27 -0400 |
| commit | 77d73a68fde9f45eac91f03aba0586bc48dba6e0 (patch) | |
| tree | 556ff9783f23639e748889086eb7bad8ecaff0b7 /src/lib | |
| parent | dcca31b923a65467f9f69a44025730eece634ac1 (diff) | |
| download | bcfg2-77d73a68fde9f45eac91f03aba0586bc48dba6e0.tar.gz bcfg2-77d73a68fde9f45eac91f03aba0586bc48dba6e0.tar.bz2 bcfg2-77d73a68fde9f45eac91f03aba0586bc48dba6e0.zip | |
9cd1a68... cleaner handling of line-wrapping in bcfg2-lint
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Server/Lint/__init__.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/lib/Server/Lint/__init__.py b/src/lib/Server/Lint/__init__.py index ff5293a81..4d6df8c8f 100644 --- a/src/lib/Server/Lint/__init__.py +++ b/src/lib/Server/Lint/__init__.py @@ -132,11 +132,12 @@ class ErrorHandler (object): termsize = get_termsize() if termsize is not None: - self._wrapper = textwrap.TextWrapper(initial_indent=" ", - subsequent_indent=" ", - width=termsize[0]) + twrap = textwrap.TextWrapper(initial_indent=" ", + subsequent_indent=" ", + width=termsize[0]) + self._wrapper = twrap.wrap else: - self._wrapper = None + self._wrapper = lambda s: [s] self._handlers = {} if config is not None: @@ -191,13 +192,10 @@ class ErrorHandler (object): rawlines = msg.splitlines() firstline = True for rawline in rawlines: - if self._wrapper: - lines = self._wrapper.wrap(rawline) - else: - lines = [rawline] + lines = self._wrapper(rawline) for line in lines: if firstline: - logfunc("%s%s" % (prefix, line.lstrip())) + logfunc(prefix + line.lstrip()) firstline = False else: logfunc(line) |