1313from types import *
1414from distutils .errors import *
1515from distutils import util , dir_util , file_util , archive_util , dep_util
16-
16+ from distutils import log
1717
1818class Command :
1919 """Abstract base class for defining command classes, the "worker bees"
@@ -72,11 +72,15 @@ def __init__ (self, dist):
7272 # commands fallback on the Distribution's behaviour. None means
7373 # "not defined, check self.distribution's copy", while 0 or 1 mean
7474 # false and true (duh). Note that this means figuring out the real
75- # value of each flag is a touch complicated -- hence "self.verbose "
76- # (etc.) will be handled by __getattr__, below.
77- self . _verbose = None
75+ # value of each flag is a touch complicated -- hence "self._dry_run "
76+ # will be handled by __getattr__, below.
77+ # XXX This needs to be fixed.
7878 self ._dry_run = None
7979
80+ # verbose is largely ignored, but needs to be set for
81+ # backwards compatibility (I think)?
82+ self .verbose = dist .verbose
83+
8084 # Some commands define a 'self.force' option to ignore file
8185 # timestamps, but methods defined *here* assume that
8286 # 'self.force' exists for all commands. So define it here
@@ -96,8 +100,10 @@ def __init__ (self, dist):
96100 # __init__ ()
97101
98102
103+ # XXX A more explicit way to customize dry_run would be better.
104+
99105 def __getattr__ (self , attr ):
100- if attr in ( 'verbose' , ' dry_run') :
106+ if attr == ' dry_run' :
101107 myval = getattr (self , "_" + attr )
102108 if myval is None :
103109 return getattr (self .distribution , attr )
@@ -186,9 +192,7 @@ def announce (self, msg, level=1):
186192 """If the current verbosity level is of greater than or equal to
187193 'level' print 'msg' to stdout.
188194 """
189- if self .verbose >= level :
190- print msg
191- sys .stdout .flush ()
195+ log .debug (msg )
192196
193197 def debug_print (self , msg ):
194198 """Print 'msg' to stdout if the global DEBUG (taken from the
@@ -352,12 +356,11 @@ def warn (self, msg):
352356
353357
354358 def execute (self , func , args , msg = None , level = 1 ):
355- util .execute (func , args , msg , self . verbose >= level , self .dry_run )
359+ util .execute (func , args , msg , dry_run = self .dry_run )
356360
357361
358362 def mkpath (self , name , mode = 0777 ):
359- dir_util .mkpath (name , mode ,
360- self .verbose , self .dry_run )
363+ dir_util .mkpath (name , mode , dry_run = self .dry_run )
361364
362365
363366 def copy_file (self , infile , outfile ,
@@ -371,8 +374,7 @@ def copy_file (self, infile, outfile,
371374 preserve_mode , preserve_times ,
372375 not self .force ,
373376 link ,
374- self .verbose >= level ,
375- self .dry_run )
377+ dry_run = self .dry_run )
376378
377379
378380 def copy_tree (self , infile , outfile ,
@@ -385,30 +387,21 @@ def copy_tree (self, infile, outfile,
385387 infile , outfile ,
386388 preserve_mode ,preserve_times ,preserve_symlinks ,
387389 not self .force ,
388- self .verbose >= level ,
389- self .dry_run )
390-
390+ dry_run = self .dry_run )
391391
392392 def move_file (self , src , dst , level = 1 ):
393- """Move a file respecting verbose and dry-run flags."""
394- return file_util .move_file (src , dst ,
395- self .verbose >= level ,
396- self .dry_run )
397-
393+ """Move a file respectin dry-run flag."""
394+ return file_util .move_file (src , dst , dry_run = self .dry_run )
398395
399396 def spawn (self , cmd , search_path = 1 , level = 1 ):
400- """Spawn an external command respecting verbose and dry-run flags ."""
397+ """Spawn an external command respecting dry-run flag ."""
401398 from distutils .spawn import spawn
402- spawn (cmd , search_path ,
403- self .verbose >= level ,
404- self .dry_run )
405-
399+ spawn (cmd , search_path , dry_run = self .dry_run )
406400
407401 def make_archive (self , base_name , format ,
408402 root_dir = None , base_dir = None ):
409403 return archive_util .make_archive (
410- base_name , format , root_dir , base_dir ,
411- self .verbose , self .dry_run )
404+ base_name , format , root_dir , base_dir , dry_run = self .dry_run )
412405
413406
414407 def make_file (self , infiles , outfile , func , args ,
@@ -443,7 +436,7 @@ def make_file (self, infiles, outfile, func, args,
443436
444437 # Otherwise, print the "skip" message
445438 else :
446- self . announce (skip_msg , level )
439+ log . debug (skip_msg )
447440
448441 # make_file ()
449442
0 commit comments