[GR-13496] bytes.maketrans has to return bytes, not dict.

Author: ppisl

graalpython/com.oracle.graal.python.test/src/tests/test_bytes.py

@@ -629,3 +629,19 @@ def test_add_mv_to_bytearray():
     mv = memoryview(b'world')
     ba += mv
     assert ba == b'hello world'
+
+class BaseLikeBytes:
+
+    def test_maketrans(self):
+        transtable = b'\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037 !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`xyzdefghijklmnopqrstuvwxyz{|}~\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377'
+        self.assertEqual(self.type2test.maketrans(b'abc', b'xyz'), transtable)
+        transtable = b'\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037 !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374xyz'
+        self.assertEqual(self.type2test.maketrans(b'\375\376\377', b'xyz'), transtable)
+        self.assertRaises(ValueError, self.type2test.maketrans, b'abc', b'xyzq')
+        self.assertRaises(TypeError, self.type2test.maketrans, 'abc', 'def')
+
+class BytesTest(BaseLikeBytes, unittest.TestCase):
+    type2test = bytes
+
+class ByteArrayTest(BaseLikeBytes, unittest.TestCase):
+    type2test = bytearray

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/AbstractBytesBuiltins.java

@@ -49,6 +49,7 @@
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.list.ListBuiltins.ListAppendNode;
 import com.oracle.graal.python.builtins.objects.list.PList;
+import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.argument.ReadArgumentNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
@@ -775,4 +776,34 @@ protected AbstractSplitNode createRecursiveNode() {
             return AbstractBytesBuiltinsFactory.RSplitNodeFactory.create(new ReadArgumentNode[]{});
         }
     }
+
+    // static bytes.maketrans()
+    // static bytearray.maketrans()
+    @Builtin(name = "maketrans", fixedNumOfPositionalArgs = 3, isClassmethod = true)
+    @GenerateNodeFactory
+    public abstract static class MakeTransNode extends PythonBuiltinNode {
+
+        @Specialization
+        public PBytes maketrans(PythonClass cls, Object from, Object to,
+                        @Cached("create()") BytesNodes.ToBytesNode toByteNode) {
+            byte[] fromB = toByteNode.execute(from);
+            byte[] toB = toByteNode.execute(to);
+            if (fromB.length != toB.length) {
+                throw raise(PythonErrorType.ValueError, "maketrans arguments must have same length");
+            }
+
+            byte[] table = new byte[256];
+            for (int i = 0; i < 256; i++) {
+                table[i] = (byte) i;
+            }
+
+            for (int i = 0; i < fromB.length; i++) {
+                byte value = fromB[i];
+                table[value < 0 ? value + 256 : value] = toB[i];
+            }
+
+            return factory().createBytes(table);
+        }
+
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesBuiltins.java

@@ -54,11 +54,8 @@
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
-import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes.SetItemNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.NormalizeIndexNode;
-import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.ToByteArrayNode;
-import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.iterator.PSequenceIterator;
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
@@ -546,32 +543,6 @@ Object getitem(PBytes self, Object idx, Object value) {
         }
     }
 
-    // static str.maketrans()
-    @Builtin(name = "maketrans", fixedNumOfPositionalArgs = 2)
-    @GenerateNodeFactory
-    public abstract static class MakeTransNode extends PythonBuiltinNode {
-
-        @Specialization
-        public PDict maketrans(PBytes from, PBytes to,
-                        @Cached("create()") SetItemNode setItemNode,
-                        @Cached("create()") ToByteArrayNode toByteArrayNode) {
-            byte[] fromB = toByteArrayNode.execute(from.getSequenceStorage());
-            byte[] toB = toByteArrayNode.execute(to.getSequenceStorage());
-            if (fromB.length != toB.length) {
-                throw new RuntimeException("maketrans arguments must have same length");
-            }
-
-            PDict translation = factory().createDict();
-            for (int i = 0; i < fromB.length; i++) {
-                int key = fromB[i];
-                int value = toB[i];
-                setItemNode.execute(translation, key, value);
-            }
-
-            return translation;
-        }
-    }
-
     @Builtin(name = "replace", fixedNumOfPositionalArgs = 3)
     @GenerateNodeFactory
     abstract static class ReplaceNode extends PythonTernaryBuiltinNode {