diff options
| author | Guido van Rossum <guido@python.org> | 2002-10-01 04:14:17 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2002-10-01 04:14:17 (GMT) |
| commit | cc3a6df506db57d614225b3657b4e97efc078970 (patch) | |
| tree | 5f9b62a7caac22f8e655a4ba2fb88a5b9788641a /Lib/distutils/ccompiler.py | |
| parent | 5b9da893d3590106398afed0383bc06738d8c095 (diff) | |
| download | cpython-cc3a6df506db57d614225b3657b4e97efc078970.zip cpython-cc3a6df506db57d614225b3657b4e97efc078970.tar.gz cpython-cc3a6df506db57d614225b3657b4e97efc078970.tar.bz2 | |
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.
Diffstat (limited to 'Lib/distutils/ccompiler.py')
| -rw-r--r-- | Lib/distutils/ccompiler.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py index 5a0641e..43dfa73 100644 --- a/Lib/distutils/ccompiler.py +++ b/Lib/distutils/ccompiler.py @@ -876,7 +876,8 @@ class CCompiler: # extension for executable files, eg. '' or '.exe' def object_filenames(self, source_filenames, strip_dir=0, output_dir=''): - assert output_dir is not None + if output_dir is None: + output_dir = '' obj_names = [] for src_name in source_filenames: base, ext = os.path.splitext(src_name) |