From: doko@ubuntu.com <doko@ubuntu.com>
Date: Mon, 11 Jan 2016 20:43:29 +0000 (+0100)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~793
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0633cb7d7a19b2b300bf90edd72bf80ff707bfd3;p=python

Merge 3.5
---

0633cb7d7a19b2b300bf90edd72bf80ff707bfd3
diff --cc Misc/NEWS
index 089388ed08,20d8bb2e0d..1d1146f86c
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -131,8 -44,9 +131,11 @@@ Core and Builtin
  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
    original values after patching. Patch contributed by Sean McCully.