summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-09-27 19:47:59 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2014-09-27 19:47:59 (GMT)
commitc5deed3a1497316d4aa2ac350048d0c770016bc7 (patch)
treecbe5c9964cf261d5f2907144ddb60ce4aabbcff7
parent9cc5fd7b59d554ea7d008bd12b9166a25b494465 (diff)
parent21c8d5c7d90e82202f680f0b7af8b9d7c0020949 (diff)
downloadcpython-c5deed3a1497316d4aa2ac350048d0c770016bc7.zip
cpython-c5deed3a1497316d4aa2ac350048d0c770016bc7.tar.gz
cpython-c5deed3a1497316d4aa2ac350048d0c770016bc7.tar.bz2
Merge heads.
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS6
-rw-r--r--setup.py4
3 files changed, 10 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 1821682..f077ff7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -588,6 +588,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 0b8ba0c..5647504 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,12 @@ Library
- Issue #22448: Improve canceled timer handles cleanup to prevent
unbound memory usage. Patch by Joshua Moore-Oliva.
+Build
+-----
+
+- Issue #16537: Check whether self.extensions is empty in setup.py. Patch by
+ Jonathan Hosmer.
+
What's New in Python 3.4.2?
===========================
diff --git a/setup.py b/setup.py
index 5d4f444..6f6da71 100644
--- a/setup.py
+++ b/setup.py
@@ -252,7 +252,9 @@ class PyBuildExt(build_ext):
build_ext.build_extensions(self)
- 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:
longest = max(longest, max([len(name) for name in self.failed]))