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.
diff --git a/Lib/gettext.py b/Lib/gettext.py
index 8ff0a80..be24f1d 100644
--- a/Lib/gettext.py
+++ b/Lib/gettext.py
@@ -292,7 +292,7 @@
# Catalog description
lastk = k = None
for b_item in tmsg.split('\n'.encode("ascii")):
- item = str(b_item).strip()
+ item = b_item.decode().strip()
if not item:
continue
if ':' in item: