Mailing List Archive

python/dist/src/Lib/distutils ccompiler.py,1.47,1.48
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:
Re: python/dist/src/Lib/distutils ccompiler.py,1.47,1.48 [ In reply to ]
This also affected mxBase. I believe the other change you are referring to
was adding a compiler class to config.py, which mx subclasses in its
setup.py Both Twisted and mx attempt to compile conftest.c before doing
the normal compiler setup and both stopped at the assert you just removed.

Strangely, this assert did not affect Windows installs, probably because of
the special case for adding Release and Debug dirs.

I got mx to install by adding an output_dir to it's subclassed
config.compiler.

At 09:14 PM 9/30/2002 -0700, gvanrossum@users.sourceforge.net wrote:
>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:
>
>
>
>_______________________________________________
>Python-checkins mailing list
>Python-checkins@python.org
>http://mail.python.org/mailman/listinfo/python-checkins