Make setup.py less chatty by default.
This is a conservative version of SF patch 504889. It uses the log
module instead of calling print in various places, and it ignores the
verbose argument passed to many functions and set as an attribute on
some objects. Instead, it uses the verbosity set on the logger via
the command line.
The log module is now preferred over announce() and warn() methods
that exist only for backwards compatibility.
XXX This checkin changes a lot of modules that have no test suite and
aren't exercised by the Python build process. It will need
substantial testing.
diff --git a/Lib/distutils/command/config.py b/Lib/distutils/command/config.py
index 27c2cc1..d74aa6a 100644
--- a/Lib/distutils/command/config.py
+++ b/Lib/distutils/command/config.py
@@ -17,7 +17,7 @@
from types import *
from distutils.core import Command
from distutils.errors import DistutilsExecError
-
+from distutils import log
LANG_EXT = {'c': '.c',
'c++': '.cxx'}
@@ -103,9 +103,7 @@
from distutils.ccompiler import CCompiler, new_compiler
if not isinstance(self.compiler, CCompiler):
self.compiler = new_compiler(compiler=self.compiler,
- verbose=self.noisy,
- dry_run=self.dry_run,
- force=1)
+ dry_run=self.dry_run, force=1)
if self.include_dirs:
self.compiler.set_include_dirs(self.include_dirs)
if self.libraries:
@@ -161,7 +159,7 @@
if not filenames:
filenames = self.temp_files
self.temp_files = []
- self.announce("removing: " + string.join(filenames))
+ log.info("removing: %s", string.join(filenames))
for filename in filenames:
try:
os.remove(filename)
@@ -239,7 +237,7 @@
except CompileError:
ok = 0
- self.announce(ok and "success!" or "failure.")
+ log.info(ok and "success!" or "failure.")
self._clean()
return ok
@@ -260,7 +258,7 @@
except (CompileError, LinkError):
ok = 0
- self.announce(ok and "success!" or "failure.")
+ log.info(ok and "success!" or "failure.")
self._clean()
return ok
@@ -282,7 +280,7 @@
except (CompileError, LinkError, DistutilsExecError):
ok = 0
- self.announce(ok and "success!" or "failure.")
+ log.info(ok and "success!" or "failure.")
self._clean()
return ok