From f784d91215ae32c11309cab0b2ab2f11ae286140 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 24 Apr 2007 15:27:25 +0000 Subject: [PATCH] Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file (as opposed to the command line) will now write file names ending in ".cpp" too. (backport from rev. 54941) --- Lib/distutils/command/build_ext.py | 3 ++- Misc/NEWS | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index 82474de823..12d4083743 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -533,7 +533,8 @@ class build_ext (Command): if self.swig_cpp: log.warn("--swig-cpp is deprecated - use --swig-opts=-c++") - if self.swig_cpp or ('-c++' in self.swig_opts): + if self.swig_cpp or ('-c++' in self.swig_opts) or \ + ('-c++' in extension.swig_opts): target_ext = '.cpp' else: target_ext = '.c' diff --git a/Misc/NEWS b/Misc/NEWS index 1d1ef10502..e464714cd5 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,10 @@ What's New in Python 2.5.2c1? Library ------- +- Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file + (as opposed to the command line) will now write file names ending in + ".cpp" too. + - Patch #1695229: Fix a regression with tarfile.open() and a missing name argument. -- 2.50.1