mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

using log.warn for sys.stderr

Browse source
This commit is contained in:
Tarek Ziadé 2009-03-31 20:48:31 +00:00
parent ef660e8e50
commit c7cd138bc2
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/distutils/cmd.py
View file

@ -352,10 +352,9 @@ class Command:
# -- External world manipulation ----------------------------------- # -- External world manipulation -----------------------------------
def warn (self, msg): def warn (self, msg):
sys.stderr.write("warning: %s: %s\n" % log.warn("warning: %s: %s\n" %
(self.get_command_name(), msg)) (self.get_command_name(), msg))
def execute (self, func, args, msg=None, level=1): def execute (self, func, args, msg=None, level=1):
util.execute(func, args, msg, dry_run=self.dry_run) util.execute(func, args, msg, dry_run=self.dry_run)

13
Lib/distutils/log.py
View file

@ -18,13 +18,14 @@ class Log:
def _log(self, level, msg, args): def _log(self, level, msg, args):
if level >= self.threshold: if level >= self.threshold:
if not args: if args:
# msg may contain a '%'. If args is empty, msg = msg % args
# don't even try to string-format if level in (WARN, ERROR, FATAL):
print msg stream = sys.stderr
else: else:
print msg % args stream = sys.stdout
sys.stdout.flush() stream.write('%s\n' % msg)
stream.flush()
def log(self, level, msg, *args): def log(self, level, msg, *args):
self._log(level, msg, args) self._log(level, msg, args)