summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-10-09 05:32:35 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-10-09 05:32:35 (GMT)
commita5bc34fa00602911f1ab870456d1319af1cd6391 (patch)
tree708d2d803179fa6f2440204de3a0f6f0b35c7df8 /Misc
parentc0bbe7d38a9a7b43de4a921876072662ba5c82fc (diff)
parent5819dcc0d262ef0ceaffc68d1b65f3d031e27b68 (diff)
downloadcpython-a5bc34fa00602911f1ab870456d1319af1cd6391.zip
cpython-a5bc34fa00602911f1ab870456d1319af1cd6391.tar.gz
cpython-a5bc34fa00602911f1ab870456d1319af1cd6391.tar.bz2
Branch merge
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS6
2 files changed, 7 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 3dc3de1..0fd2192 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -722,6 +722,7 @@ Pierre Quentel
Brian Quinlan
Anders Qvist
Burton Radons
+Jeff Ramnani
Brodie Rao
Antti Rasinen
Sridhar Ratnakumar
diff --git a/Misc/NEWS b/Misc/NEWS
index d33f341..186ea21 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,12 @@ Core and Builtins
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.