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

@@ -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'

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.