diff Lib/string.py @ 43777:0d462d789b18

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.
author Guido van Rossum <guido@python.org>
date Tue, 06 Nov 2007 21:34:58 +0000
parents e946073dee38
children cbc8b3bd3157
line wrap: on
line diff
--- a/Lib/string.py	Tue Nov 06 20:51:31 2007 +0000
+++ b/Lib/string.py	Tue Nov 06 21:34:58 2007 +0000
@@ -41,7 +41,7 @@
 
 
 # Construct a translation map for bytes.translate
-def maketrans(frm, to):
+def maketrans(frm: bytes, to: bytes) -> bytes:
     """maketrans(frm, to) -> bytes
 
     Return a translation table (a bytes object of length 256)
@@ -53,10 +53,10 @@
         raise ValueError("maketrans arguments must have same length")
     if not (isinstance(frm, bytes) and isinstance(to, bytes)):
         raise TypeError("maketrans arguments must be bytes objects")
-    L = bytes(range(256))
+    L = buffer(range(256))
     for i, c in enumerate(frm):
         L[c] = to[i]
-    return L
+    return bytes(L)
 
 
 ####################################################################