[Python-checkins] python/dist/src/Lib/distutils ccompiler.py,1.47,1.48

[gvanrossum@users.sourceforge.net]

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

Modified Files:
	ccompiler.py 
Log Message:
Commit fix for SF 603831.

Strangely, two out of three patches there seem already committed; but
the essential one (get rid of the assert in object_filenames in
ccompiler.py) was not yet applied.

This makes the build procedure for Twisted work again.

This is *not* a backport candidate despite the fact that identical
code appears to exist in 2.2.2; Twisted builds fine there, so there
must have been a change elsewhere.


Index: ccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/ccompiler.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** ccompiler.py	11 Sep 2002 16:31:53 -0000	1.47
--- ccompiler.py	1 Oct 2002 04:14:17 -0000	1.48
***************
*** 877,881 ****
  
      def object_filenames(self, source_filenames, strip_dir=0, output_dir=''):
!         assert output_dir is not None
          obj_names = []
          for src_name in source_filenames:
--- 877,882 ----
  
      def object_filenames(self, source_filenames, strip_dir=0, output_dir=''):
!         if output_dir is None:
!             output_dir = ''
          obj_names = []
          for src_name in source_filenames: