[Python-checkins] cpython (merge 3.4 -> default): Issue #21311: merge with 3.4
ned.deily
python-checkins at python.org
Sat Apr 19 22:27:49 CEST 2014
http://hg.python.org/cpython/rev/2a4401109672
changeset: 90416:2a4401109672
parent: 90413:cbe7b5a5a110
parent: 90415:3d1578c705c9
user: Ned Deily <nad at acm.org>
date: Sat Apr 19 13:27:06 2014 -0700
summary:
Issue #21311: merge with 3.4
files:
Lib/_osx_support.py | 2 +-
Misc/ACKS | 1 +
Misc/NEWS | 3 +++
3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py
--- a/Lib/_osx_support.py
+++ b/Lib/_osx_support.py
@@ -182,7 +182,7 @@
# Compiler is GCC, check if it is LLVM-GCC
data = _read_output("'%s' --version"
% (cc.replace("'", "'\"'\"'"),))
- if 'llvm-gcc' in data:
+ if data and 'llvm-gcc' in data:
# Found LLVM-GCC, fall back to clang
cc = _find_build_tool('clang')
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1283,6 +1283,7 @@
Paul Swartz
Thenault Sylvain
Péter Szabó
+John Szakmeister
Amir Szekely
Arfrever Frehtes Taifersar Arahesis
Hideaki Takahashi
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -244,6 +244,9 @@
- asyncio: Add gi_{frame,running,code} properties to CoroWrapper
(upstream issue #163).
+- Issue #21311: Avoid exception in _osx_support with non-standard compiler
+ configurations. Patch by John Szakmeister.
+
Extension Modules
-----------------
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list