From: Éric Araujo <merwok@netwok.org>
Date: Sun, 9 Oct 2011 05:32:35 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.2.3rc1~514
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5bc34fa00602911f1ab870456d1319af1cd6391;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

a5bc34fa00602911f1ab870456d1319af1cd6391
diff --cc Misc/NEWS
index d33f3413ddde,1ecb1255794b..186ea2145cfb
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -43,10 -43,12 +43,16 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11171: Fix distutils.sysconfig.get_makefile_filename when Python was
+   configured with different prefix and exec-prefix.
+ 
+ - Issue #11254: Teach distutils to compile .pyc and .pyo files in
+   PEP 3147-compliant __pycache__ directories.
+ 
 +- Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
 +  with line feeds.  This was ported from the sandbox to the 3.3 branch, but
 +  didn't make it into 3.2.
 +
  - Issue #7367: Fix pkgutil.walk_paths to skip directories whose
    contents cannot be read.