summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-03-31 20:48:31 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-03-31 20:48:31 (GMT)
commitc7cd138bc2127079642ee8a3f2fa9d58c889dec0 (patch)
tree2af64c18845e30170cb22c79fbe90dc49503e24a /Lib
parentef660e8e50c607c8abcb02274decdcb6eff1d1b8 (diff)
downloadcpython-c7cd138bc2127079642ee8a3f2fa9d58c889dec0.zip
cpython-c7cd138bc2127079642ee8a3f2fa9d58c889dec0.tar.gz
cpython-c7cd138bc2127079642ee8a3f2fa9d58c889dec0.tar.bz2
using log.warn for sys.stderr
Diffstat (limited to 'Lib')
-rw-r--r--Lib/distutils/cmd.py5
-rw-r--r--Lib/distutils/log.py13
2 files changed, 9 insertions, 9 deletions
diff --git a/Lib/distutils/cmd.py b/Lib/distutils/cmd.py
index 012fca1..dfcbe23 100644
--- a/Lib/distutils/cmd.py
+++ b/Lib/distutils/cmd.py
@@ -352,9 +352,8 @@ class Command:
# -- External world manipulation -----------------------------------
def warn (self, msg):
- sys.stderr.write("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 fcaa545..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)