Handle bytearray from None

Fixes #972

Author: msimacek

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

@@ -72,6 +72,22 @@ def test_from_list():
     assert list(b) == ints
 
 
+def test_bytearray_from_none():
+    assert_raises(TypeError, bytes, None)
+    assert_raises(TypeError, bytearray, None)
+
+
+def test_bytes_with_encoding_does_not_call_dunder_bytes():
+    class BytesLike:
+        def __bytes__(self):
+            return b"bytes"
+
+    assert bytes(BytesLike()) == b"bytes"
+    assert_raises(TypeError, bytes, BytesLike(), None)
+    assert_raises(TypeError, bytes, encoding="utf-8")
+    assert_raises(TypeError, bytes, errors="strict")
+
+
 def test_from_ssize():
     assert bytes(0) == b''
     assert bytes(1) == b'\x00'

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates.
  * Copyright (c) 2014, Regents of the University of California
  *
  * All rights reserved.
@@ -164,20 +164,14 @@ protected ArgumentClinicProvider getArgumentClinic() {
             return ByteArrayBuiltinsClinicProviders.InitNodeClinicProviderGen.INSTANCE;
         }
 
-        @Specialization(guards = "!isNone(source)")
+        @Specialization
         static PNone doInit(VirtualFrame frame, PByteArray self, Object source, Object encoding, Object errors,
                         @Bind Node inliningTarget,
                         @Cached BytesNodes.BytesInitNode toBytesNode) {
             self.setSequenceStorage(new ByteSequenceStorage(toBytesNode.execute(frame, inliningTarget, source, encoding, errors)));
             return PNone.NONE;
         }
 
-        @Specialization(guards = "isNone(self)")
-        static PNone doInit(@SuppressWarnings("unused") PByteArray self, Object source, @SuppressWarnings("unused") Object encoding, @SuppressWarnings("unused") Object errors,
-                        @Bind Node inliningTarget) {
-            throw PRaiseNode.raiseStatic(inliningTarget, TypeError, ErrorMessages.CANNOT_CONVERT_P_OBJ_TO_S, source, "bytearray");
-        }
-
         @Specialization(guards = "!isBytes(self)")
         static PNone doInit(Object self, @SuppressWarnings("unused") Object source, @SuppressWarnings("unused") Object encoding, @SuppressWarnings("unused") Object errors,
                         @Bind Node inliningTarget) {

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

@@ -131,14 +131,14 @@ protected ArgumentClinicProvider getArgumentClinic() {
         }
 
         @SuppressWarnings("unused")
-        @Specialization(guards = "isNoValue(source)")
+        @Specialization(guards = {"isNoValue(source)", "isNoValue(encoding)", "isNoValue(errors)"})
         static Object doEmpty(Object cls, PNone source, PNone encoding, PNone errors,
                         @Bind Node inliningTarget,
                         @Exclusive @Cached CreateBytes createBytes) {
             return createBytes.execute(inliningTarget, cls, PythonUtils.EMPTY_BYTE_ARRAY);
         }
 
-        @Specialization(guards = "!isNoValue(source)")
+        @Specialization(guards = {"!isNoValue(source)", "isNoValue(encoding)", "isNoValue(errors)"})
         static Object doCallBytes(VirtualFrame frame, Object cls, Object source, PNone encoding, PNone errors,
                         @Bind Node inliningTarget,
                         @Cached GetClassNode getClassNode,

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

@@ -629,8 +629,8 @@ public abstract static class BytesInitNode extends PNodeWithContext {
 
         public abstract byte[] execute(VirtualFrame frame, Node inliningTarget, Object source, Object encoding, Object errors);
 
-        @Specialization
-        static byte[] none(@SuppressWarnings("unused") PNone source, @SuppressWarnings("unused") PNone encoding, @SuppressWarnings("unused") PNone errors) {
+        @Specialization(guards = "isNoValue(source)")
+        static byte[] noValue(@SuppressWarnings("unused") PNone source, @SuppressWarnings("unused") PNone encoding, @SuppressWarnings("unused") PNone errors) {
             return PythonUtils.EMPTY_BYTE_ARRAY;
         }