[GR-13505] string.translate() doesn't work as expected.

Author: ppisl

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

@@ -1,9 +1,9 @@
-# Copyright (c) 2018, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates.
 # Copyright (C) 1996-2017 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 import unittest
-
+import string
 import sys
 
 
@@ -902,6 +902,11 @@ def test_translate():
     else:
         assert False, "should raise"
 
+def test_translate_from_byte_table():
+    table = bytes.maketrans(bytes(string.ascii_lowercase, 'ascii'), bytes(string.ascii_uppercase, 'ascii'))
+    assert "ahoj".translate(table) == "AHOJ"
+    assert "ahoj".translate(bytearray(table)) == "AHOJ"
+    assert "ahoj".translate(memoryview(table)) == "AHOJ"
 
 def test_splitlines():
     assert len(str.splitlines("\n\n")) == 2

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

@@ -64,13 +64,16 @@
 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.bytes.BytesNodes;
+import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.SetItemNode;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.iterator.PStringIterator;
 import com.oracle.graal.python.builtins.objects.list.ListBuiltins.ListAppendNode;
 import com.oracle.graal.python.builtins.objects.list.ListBuiltins.ListReverseNode;
 import com.oracle.graal.python.builtins.objects.list.PList;
+import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
 import com.oracle.graal.python.builtins.objects.slice.PSlice;
 import com.oracle.graal.python.builtins.objects.slice.PSlice.SliceInfo;
 import com.oracle.graal.python.builtins.objects.str.StringBuiltinsFactory.SpliceNodeGen;
@@ -751,6 +754,29 @@ public String translate(String self, PDict table,
 
             return new String(translatedChars);
         }
+
+        private static String translateFromByteTable(String text, Object table, BytesNodes.ToBytesNode toBytesNode) {
+            byte[] translatedChars = text.getBytes();
+            byte[] byteTable = toBytesNode.execute(table);
+            for (int i = 0; i < translatedChars.length; i++) {
+                byte original = translatedChars[i];
+                translatedChars[i] = byteTable[original];
+            }
+            return new String(translatedChars);
+        }
+
+        @Specialization
+        public String translate(String self, PIBytesLike table,
+                        @Cached("create()") BytesNodes.ToBytesNode getBytesNode) {
+            return translateFromByteTable(self, table, getBytesNode);
+        }
+
+        @Specialization
+        public String translate(String self, PMemoryView table,
+                        @Cached("create()") BytesNodes.ToBytesNode getBytesNode) {
+            return translateFromByteTable(self, table, getBytesNode);
+        }
+
     }
 
     protected abstract static class SpliceNode extends PNodeWithContext {