summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-09-27 22:48:58 +0300
committerBerker Peksag <berker.peksag@gmail.com>2014-09-27 22:48:58 +0300
commit8a698ed75aab54b4735c20784b23c9387c8d0883 (patch)
treefb023ff95ae663885de2a6580de1b874f8b934e6
parent6f1e400d976b741bd808bc3518ca01e53f7a8ad2 (diff)
parenta72bc8c3cff1ebcdbcbc8453c0aec62eca1fd6a1 (diff)
downloadcpython-git-8a698ed75aab54b4735c20784b23c9387c8d0883.tar.gz
Merge heads.
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
-rw-r--r--setup.py4
3 files changed, 7 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index e00f88311f..2e25430860 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -592,6 +592,7 @@ Randall Hopper
Nadav Horesh
Alon Horev
Jan Hosang
+Jonathan Hosmer
Alan Hourihane
Ken Howard
Brad Howes
diff --git a/Misc/NEWS b/Misc/NEWS
index 4fd4f174ac..182942abfd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -977,6 +977,9 @@ IDLE
Build
-----
+- Issue #16537: Check whether self.extensions is empty in setup.py. Patch by
+ Jonathan Hosmer.
+
- Issue #22359: Remove incorrect uses of recursive make. Patch by Jonas
Wagner.
diff --git a/setup.py b/setup.py
index 016c455689..a0a22a5f9d 100644
--- a/setup.py
+++ b/setup.py
@@ -263,7 +263,9 @@ class PyBuildExt(build_ext):
for ext in self.extensions:
self.check_extension_import(ext)
- longest = max([len(e.name) for e in self.extensions])
+ longest = 0
+ if self.extensions:
+ longest = max([len(e.name) for e in self.extensions])
if self.failed or self.failed_on_import:
all_failed = self.failed + self.failed_on_import
longest = max(longest, max([len(name) for name in all_failed]))