diff options
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/cmd.py | 3 | ||||
| -rw-r--r-- | Lib/distutils/log.py | 13 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Lib/distutils/cmd.py b/Lib/distutils/cmd.py index 46055b4..5829a56 100644 --- a/Lib/distutils/cmd.py +++ b/Lib/distutils/cmd.py @@ -333,7 +333,8 @@ class Command: # -- External world manipulation ----------------------------------- def warn(self, msg): - log.warn("warning: %s: %s\n" % (self.get_command_name(), msg)) + log.warn("warning: %s: %s\n" % + (self.get_command_name(), msg)) def execute(self, func, args, msg=None, level=1): util.execute(func, args, msg, dry_run=self.dry_run) diff --git a/Lib/distutils/log.py b/Lib/distutils/log.py index 97319a0..6f949d5 100644 --- a/Lib/distutils/log.py +++ b/Lib/distutils/log.py @@ -18,13 +18,14 @@ class Log: def _log(self, level, msg, args): if level >= self.threshold: - if not args: - # msg may contain a '%'. If args is empty, - # don't even try to string-format - print(msg) + if args: + msg = msg % args + if level in (WARN, ERROR, FATAL): + stream = sys.stderr else: - print(msg % args) - sys.stdout.flush() + stream = sys.stdout + stream.write('%s\n' % msg) + stream.flush() def log(self, level, msg, *args): self._log(level, msg, args) |