[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[matthias.klose]

https://hg.python.org/cpython/rev/2b0ff9e16955
changeset:   99855:2b0ff9e16955
parent:      99853:32c8bdcd66cc
parent:      99854:ef84d21f5292
user:        doko at ubuntu.com
date:        Mon Jan 11 21:43:29 2016 +0100
summary:
  Merge 3.5

files:
  Lib/sysconfig.py |  7 ++++++-
  Misc/NEWS        |  3 +++
  2 files changed, 9 insertions(+), 1 deletions(-)


diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -260,7 +260,12 @@
     while len(variables) > 0:
         for name in tuple(variables):
             value = notdone[name]
-            m = _findvar1_rx.search(value) or _findvar2_rx.search(value)
+            m1 = _findvar1_rx.search(value)
+            m2 = _findvar2_rx.search(value)
+            if m1 and m2:
+                m = m1 if m1.start() < m2.start() else m2
+            else:
+                m = m1 if m1 else m2
             if m is not None:
                 n = m.group(1)
                 found = True
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -131,6 +131,9 @@
 Library
 -------
 
+- Issue #24705: Fix sysconfig._parse_makefile not expanding ${} vars
+  appearing before $() vars.
+
 - Issue #26069: Remove the deprecated apis in the trace module.
 
 - Issue #22138: Fix mock.patch behavior when patching descriptors. Restore

-- 
Repository URL: https://hg.python.org/cpython