[Python-checkins] python/dist/src/Lib/distutils unixccompiler.py,1.42,1.43

[jhylton@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory usw-pr-cvs1:/tmp/cvs-serv19787

Modified Files:
	unixccompiler.py 
Log Message:
Some more style improvements


Index: unixccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/unixccompiler.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** unixccompiler.py	13 Jun 2002 14:58:30 -0000	1.42
--- unixccompiler.py	13 Jun 2002 15:01:38 -0000	1.43
***************
*** 19,24 ****
  
  import os, sys
! from types import *
  from copy import copy
  from distutils import sysconfig
  from distutils.dep_util import newer
--- 19,25 ----
  
  import os, sys
! from types import StringType, NoneType
  from copy import copy
+ 
  from distutils import sysconfig
  from distutils.dep_util import newer
***************
*** 44,49 ****
  #     options and carry on.
  
! 
! class UnixCCompiler (CCompiler):
  
      compiler_type = 'unix'
--- 45,49 ----
  #     options and carry on.
  
! class UnixCCompiler(CCompiler):
  
      compiler_type = 'unix'
***************
*** 86,91 ****
                   dry_run=0,
                   force=0):
!         CCompiler.__init__ (self, verbose, dry_run, force)
! 
  
      def preprocess(self,
--- 86,90 ----
                   dry_run=0,
                   force=0):
!         CCompiler.__init__(self, verbose, dry_run, force)
  
      def preprocess(self,
***************
*** 96,100 ****
                     extra_preargs=None,
                     extra_postargs=None):
- 
          (_, macros, include_dirs) = \
              self._fix_compile_args(None, macros, include_dirs)
--- 95,98 ----
***************
*** 120,124 ****
                  raise CompileError, msg
  
- 
      def compile(self,
                  sources,
--- 118,121 ----
***************
*** 129,133 ****
                  extra_preargs=None,
                  extra_postargs=None):
- 
          (output_dir, macros, include_dirs) = \
              self._fix_compile_args(output_dir, macros, include_dirs)
--- 126,129 ----
***************
*** 162,168 ****
          return objects
  
-     # compile ()
- 
- 
      def create_static_lib(self,
                            objects,
--- 158,161 ----
***************
*** 170,174 ****
                            output_dir=None,
                            debug=0):
- 
          (objects, output_dir) = self._fix_object_args(objects, output_dir)
  
--- 163,166 ----
***************
*** 195,201 ****
              log.debug("skipping %s (up-to-date)", output_filename)
  
-     # create_static_lib ()
- 
- 
      def link(self,
               target_desc,
--- 187,190 ----
***************
*** 211,215 ****
               extra_postargs=None,
               build_temp=None):
- 
          (objects, output_dir) = self._fix_object_args(objects, output_dir)
          (libraries, library_dirs, runtime_library_dirs) = \
--- 200,203 ----
***************
*** 244,250 ****
              log.debug("skipping %s (up-to-date)", output_filename)
  
-     # link ()
- 
- 
      # -- Miscellaneous methods -----------------------------------------
      # These are all used by the 'gen_lib_options() function, in
--- 232,235 ----
***************
*** 276,282 ****
          return "-l" + lib
  
- 
      def find_library_file(self, dirs, lib, debug=0):
- 
          for dir in dirs:
              shared = os.path.join(
--- 261,265 ----
***************
*** 301,306 ****
              # Oops, didn't find it in *any* of 'dirs'
              return None
- 
-     # find_library_file ()
- 
- # class UnixCCompiler
--- 284,285 ----