summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/command/build_ext.py
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2012-02-15 16:13:26 (GMT)
committerÉric Araujo <merwok@netwok.org>2012-02-15 16:13:26 (GMT)
commit1d175f776836ef0106d06ff2f264635df125340e (patch)
tree0dcab83efe344871fd69ff20724f5edfc280ac9e /Lib/distutils/command/build_ext.py
parent8b4d64f2564a44dadff0bd8f54f6591926044b1b (diff)
parentccddc474c3c7c664bec879deb41bb91aa5dab109 (diff)
downloadcpython-1d175f776836ef0106d06ff2f264635df125340e.zip
cpython-1d175f776836ef0106d06ff2f264635df125340e.tar.gz
cpython-1d175f776836ef0106d06ff2f264635df125340e.tar.bz2
Merge fixes for #1326113 and #12297 from 3.2
Diffstat (limited to 'Lib/distutils/command/build_ext.py')
-rw-r--r--Lib/distutils/command/build_ext.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 8baf538..59d0cd2 100644
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -165,8 +165,7 @@ class build_ext(Command):
if plat_py_include != py_include:
self.include_dirs.append(plat_py_include)
- if isinstance(self.libraries, str):
- self.libraries = [self.libraries]
+ self.ensure_string_list('libraries')
# Life is easier if we're not forever checking for None, so
# simplify these options to empty lists if unset