[GR-35304] Fix: bytes.__init__ did not accept keywords.

PullRequest: graalpython/2046

Author: fangerer

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

@@ -693,35 +693,38 @@ def test_add_mv_to_bytearray():
     mv = memoryview(b'world')
     ba += mv
     assert ba == b'hello world'
-    
+
 def test_bytearray_init():
     ba = bytearray(b'abc')
     assert_raises(TypeError, bytearray.__init__, ba, encoding='latin1')
     assert_raises(TypeError, bytearray.__init__, ba, errors='replace', encoding='latin1')
     assert_raises(TypeError, bytearray.__init__, ba, errors='replace')
-    
+
     bytearray.__init__(ba, b'xxx')
     assert ba == bytearray(b'xxx')
     bytearray.__init__(ba, 'zzz', encoding='latin1')
     assert ba == bytearray(b'zzz')
     bytearray.__init__(ba, 1)
     assert ba == bytearray(b'\x00')
-    
+
 def test_bytes_init():
     ba = bytes(b'abc')
-    
+
     bytes.__init__(ba, b'zzz')
     assert ba == bytes(b'abc')
-    
+
+    ba = bytes('abc', encoding='utf-8')
+    assert ba == b'abc'
+
 def test_bytes_mod():
     assert b'%s' % (b'a') == b'a'
     raised = False
     try:
-        b'%s' % (b'a', b'b') 
+        b'%s' % (b'a', b'b')
     except TypeError:
         raised = True
     assert raised
-    
+
 def test__bytes__():
     class C: pass
     setattr(C, "__bytes__", bytes)
@@ -731,14 +734,14 @@ class C(int): pass
     setattr(C, "__bytes__", bytes)
     assert bytes(C()) == b''
     assert bytes(C(1)) == b''
-    
+
     setattr(C, "__bytes__", complex)
     raised = False
     try:
         bytes(C(1))
     except(TypeError):
         raised = True
-    assert raised    
+    assert raised
 
     def b(o):
         return b'abc'
@@ -749,7 +752,7 @@ class BA(bytearray): pass
 
     class BAA(BA): pass
     assert bytes(BAA(b'cde')) == b'abc'
-        
+
 class BaseLikeBytes:
 
     def test_maketrans(self):
@@ -792,7 +795,7 @@ def test_translate(self):
             self.assertEqual(c, b'hee')
             c = b.translate(None, delete=b'e')
             self.assertEqual(c, b'hllo')
-                        
+
         t = bytearray(range(256))
         self.assertEqual(b'\xff'.translate(t), b'\xff')
         self.assertEqual(b'\xff'.translate(t, t), b'')

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

@@ -118,6 +118,7 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonQuaternaryClinicBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryClinicBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
+import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentCastNode;
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentCastNode.ArgumentCastNodeWithRaiseAndIndirectCall;
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
@@ -217,13 +218,19 @@ public static byte[] doEncode(Charset charset, String string, CodingErrorAction
         return barr;
     }
 
-    @Builtin(name = __INIT__, minNumOfPositionalArgs = 1, takesVarArgs = true)
+    @Builtin(name = __INIT__, minNumOfPositionalArgs = 1, takesVarArgs = true, takesVarKeywordArgs = true)
     @GenerateNodeFactory
-    public abstract static class InitNode extends PythonBuiltinNode {
+    public abstract static class InitNode extends PythonVarargsBuiltinNode {
+
+        @SuppressWarnings("unused")
+        @Override
+        public Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments, PKeyword[] keywords) throws VarargsBuiltinDirectInvocationNotSupported {
+            return PNone.NONE;
+        }
 
         @SuppressWarnings("unused")
         @Specialization
-        public Object byteDone(VirtualFrame frame, PBytes self, Object args) {
+        static Object byteDone(VirtualFrame frame, Object self, Object[] arguments, PKeyword[] keywords) {
             return PNone.NONE;
         }
     }