From 50ca77c407c4d1221740b70a417ed3922c8dcd95 Mon Sep 17 00:00:00 2001 From: Jan Fabry Date: Thu, 23 May 2013 11:12:04 +0200 Subject: [PATCH] Don't add extra newline after indented block Only replace the newlines that were initially there. --- deployer/loggers/trace.py | 2 +- deployer/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployer/loggers/trace.py b/deployer/loggers/trace.py index 16312f2..6d8903d 100644 --- a/deployer/loggers/trace.py +++ b/deployer/loggers/trace.py @@ -116,7 +116,7 @@ def print_color(self): [ '%s=%s' % (k, repr(v)) for k,v in self.trace.kwargs.items() ]) if self.trace.items: return (f('%s(%s)\n[\n' % (self.trace.func_name, params)) + - ''.join([ indent(self._print_item_color(i), prefix=' ') for i in self.trace.items ]) + + '\n'.join([ indent(self._print_item_color(i), prefix=' ') for i in self.trace.items ]) + f(']')) else: return f('%s(%s)' % (self.trace.func_name, params)) diff --git a/deployer/utils.py b/deployer/utils.py index 358d30e..6faf914 100644 --- a/deployer/utils.py +++ b/deployer/utils.py @@ -24,7 +24,7 @@ def indent(string, prefix=' '): """ Indent every line of this string. """ - return ''.join('%s%s\n' % (prefix, s) for s in string.split('\n')) + return '\n'.join('%s%s' % (prefix, s) for s in string.split('\n')) class capture(object):