[Python-checkins] CVS: python/dist/src/Lib/distutils dist.py,1.31,1.32

[Jeremy Hylton]

Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory slayer.i.sourceforge.net:/tmp/cvs-serv26614

Modified Files:
	dist.py 
Log Message:
fix inconsistent use of tabs and spaces


Index: dist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/dist.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** dist.py	2000/06/28 01:25:27	1.31
--- dist.py	2000/07/07 20:45:21	1.32
***************
*** 276,286 ****
          # What to call the per-user config file
          if os.name == 'posix':
! 	    user_filename = ".pydistutils.cfg"
! 	else:
! 	    user_filename = "pydistutils.cfg"
  	
          # And look for the user config file
! 	if os.environ.has_key('HOME'):
!     	    user_file = os.path.join(os.environ.get('HOME'), user_filename)
              if os.path.isfile(user_file):
                  files.append(user_file)
--- 276,286 ----
          # What to call the per-user config file
          if os.name == 'posix':
!             user_filename = ".pydistutils.cfg"
!         else:
!             user_filename = "pydistutils.cfg"
  	
          # And look for the user config file
!         if os.environ.has_key('HOME'):
!             user_file = os.path.join(os.environ.get('HOME'), user_filename)
              if os.path.isfile(user_file):
                  files.append(user_file)
***************
*** 440,444 ****
  	# Check for help_options in command class.  They have a different
  	# format (tuple of four) so we need to preprocess them here.
! 	if (hasattr(cmd_class, 'help_options') and
              type (cmd_class.help_options) is ListType):
              help_options = fix_help_options(cmd_class.help_options)
--- 440,444 ----
  	# Check for help_options in command class.  They have a different
  	# format (tuple of four) so we need to preprocess them here.
!         if (hasattr(cmd_class, 'help_options') and
              type (cmd_class.help_options) is ListType):
              help_options = fix_help_options(cmd_class.help_options)
***************
*** 458,472 ****
              return
  
! 	if (hasattr(cmd_class, 'help_options') and
              type (cmd_class.help_options) is ListType):
! 	    help_option_found=0
! 	    for (help_option, short, desc, func) in cmd_class.help_options:
! 		if hasattr(opts, parser.get_attr_name(help_option)):
! 		    help_option_found=1
  		    #print "showing help for option %s of command %s" % \
                      #      (help_option[0],cmd_class)
  
                      if callable(func):
! 			func()
                      else:
                          raise DistutilsClassError, \
--- 458,472 ----
              return
  
!         if (hasattr(cmd_class, 'help_options') and
              type (cmd_class.help_options) is ListType):
!             help_option_found=0
!             for (help_option, short, desc, func) in cmd_class.help_options:
!                 if hasattr(opts, parser.get_attr_name(help_option)):
!                     help_option_found=1
  		    #print "showing help for option %s of command %s" % \
                      #      (help_option[0],cmd_class)
  
                      if callable(func):
!                         func()
                      else:
                          raise DistutilsClassError, \
***************
*** 476,480 ****
  
              if help_option_found: 
! 		return
  
          # Put the options from the command-line into their official
--- 476,480 ----
  
              if help_option_found: 
!                 return
  
          # Put the options from the command-line into their official
***************
*** 527,536 ****
              else:
                  klass = self.get_command_class (command)
! 	    if (hasattr(klass, 'help_options') and
                  type (klass.help_options) is ListType):
! 		parser.set_option_table (klass.user_options +
                                           fix_help_options(klass.help_options))
! 	    else:
!         	parser.set_option_table (klass.user_options)
              parser.print_help ("Options for '%s' command:" % klass.__name__)
              print
--- 527,536 ----
              else:
                  klass = self.get_command_class (command)
!             if (hasattr(klass, 'help_options') and
                  type (klass.help_options) is ListType):
!                 parser.set_option_table (klass.user_options +
                                           fix_help_options(klass.help_options))
!             else:
!                 parser.set_option_table (klass.user_options)
              parser.print_help ("Options for '%s' command:" % klass.__name__)
              print