[Python-checkins] cpython (merge default -> default): Merge heads.
berker.peksag
python-checkins at python.org
Sat Sep 27 21:49:38 CEST 2014
https://hg.python.org/cpython/rev/56742effd397
changeset: 92605:56742effd397
parent: 92601:9909de463dc9
parent: 92603:491a4d3e2bdd
user: Berker Peksag <berker.peksag at gmail.com>
date: Sat Sep 27 22:48:58 2014 +0300
summary:
Merge heads.
files:
Misc/ACKS | 1 +
Misc/NEWS | 3 +++
setup.py | 4 +++-
3 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -592,6 +592,7 @@
Nadav Horesh
Alon Horev
Jan Hosang
+Jonathan Hosmer
Alan Hourihane
Ken Howard
Brad Howes
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -977,6 +977,9 @@
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
--- a/setup.py
+++ b/setup.py
@@ -263,7 +263,9 @@
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]))
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list