Merging the py3k-pep3137 branch back into the py3k branch.

No detailed change log; just check out the change log for the py3k-pep3137
branch.  The most obvious changes:

  - str8 renamed to bytes (PyString at the C level);
  - bytes renamed to buffer (PyBytes at the C level);
  - PyString and PyUnicode are no longer compatible.

I.e. we now have an immutable bytes type and a mutable bytes type.

The behavior of PyString was modified quite a bit, to make it more
bytes-like.  Some changes are still on the to-do list.

1 files changed, 1 insertions, 0 deletions

diff --git a/Misc/ACKS b/Misc/ACKS
index 78cc463..0870456 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -214,6 +214,7 @@ Nils Fischbeck
 Frederik Fix
 Matt Fleming
 Hernán Martínez Foffani
+Amaury Forgeot d'Arc
 Doug Fort
 John Fouhy
 Martin Franklin