[Python-checkins] r73649 - in python/branches/py3k: Lib/string.py Misc/NEWS

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Jun 28 23:35:31 2009
New Revision: 73649

Log:
remove string.maketrans

Modified:
   python/branches/py3k/Lib/string.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Lib/string.py
==============================================================================
--- python/branches/py3k/Lib/string.py	(original)
+++ python/branches/py3k/Lib/string.py	Sun Jun 28 23:35:31 2009
@@ -40,28 +40,6 @@
     return (sep or ' ').join([x.capitalize() for x in s.split(sep)])
 
 
-# Construct a translation map for bytes.translate
-def maketrans(frm: bytes, to: bytes) -> bytes:
-    """maketrans(frm, to) -> bytes
-
-    Return a translation table (a bytes object of length 256)
-    suitable for use in bytes.translate where each byte in frm is
-    mapped to the byte at the same position in to.
-    The strings frm and to must be of the same length.
-    """
-    import warnings
-    warnings.warn("string.maketrans is deprecated, use bytes.maketrans instead",
-                  DeprecationWarning, 2)
-    if len(frm) != len(to):
-        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 = bytearray(range(256))
-    for i, c in enumerate(frm):
-        L[c] = to[i]
-    return bytes(L)
-
-
 ####################################################################
 import re as _re
 

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sun Jun 28 23:35:31 2009
@@ -17,6 +17,8 @@
 Library
 -------
 
+- The deprecated function string.maketrans has been removed.
+
 Build
 -----