py: improve ParseTuple{,AndKeywords} to handle 'y{,*,#}'

Signed-off-by: Sebastien Binet <binet@cern.ch>

Author: sbinet

py/args.go

@@ -519,6 +519,23 @@ func ParseTupleAndKeywords(args Tuple, kwargs StringDict, format string, kwlist
 				}
 			}
 			*result = arg
+		case 'y':
+			switch op.modifier {
+			default:
+				if _, ok := arg.(Bytes); !ok {
+					return ExceptionNewf(TypeError, "%s() argument %d must be bytes-like, not %s", name, i+1, arg.Type().Name)
+				}
+			case '#':
+				fallthrough // FIXME(sbinet): check for read-only?
+			case '*':
+				switch arg := arg.(type) {
+				case Bytes:
+					// ok.
+				default:
+					return ExceptionNewf(TypeError, "%s() argument %d must be bytes-like, not %s", name, i+1, arg.Type().Name)
+				}
+			}
+			*result = arg
 		case 'i', 'n':
 			if _, ok := arg.(Int); !ok {
 				return ExceptionNewf(TypeError, "%s() argument %d must be int, not %s", name, i+1, arg.Type().Name)

py/args_test.go

@@ -174,6 +174,57 @@ func TestParseTupleAndKeywords(t *testing.T) {
 			results: []Object{nil},
 			err:     fmt.Errorf("TypeError: 'func() argument 1 must be str or bytes-like, not NoneType'"),
 		},
+		{
+			args:    Tuple{Bytes("a")},
+			format:  "y:func",
+			results: []Object{Bytes("a")},
+		},
+		{
+			args:    Tuple{None},
+			format:  "y:func",
+			results: []Object{nil},
+			err:     fmt.Errorf("TypeError: 'func() argument 1 must be bytes-like, not NoneType'"),
+		},
+		{
+			args:    Tuple{String("a")},
+			format:  "y:func",
+			results: []Object{nil},
+			err:     fmt.Errorf("TypeError: 'func() argument 1 must be bytes-like, not str'"),
+		},
+		{
+			args:    Tuple{Bytes("a")},
+			format:  "y#:func",
+			results: []Object{Bytes("a")},
+		},
+		{
+			args:    Tuple{String("a")},
+			format:  "y#:func",
+			results: []Object{nil},
+			err:     fmt.Errorf("TypeError: 'func() argument 1 must be bytes-like, not str'"),
+		},
+		{
+			args:    Tuple{None},
+			format:  "y#:func",
+			results: []Object{nil},
+			err:     fmt.Errorf("TypeError: 'func() argument 1 must be bytes-like, not NoneType'"),
+		},
+		{
+			args:    Tuple{Bytes("a")},
+			format:  "y*:func",
+			results: []Object{Bytes("a")},
+		},
+		{
+			args:    Tuple{String("a")},
+			format:  "y*:func",
+			results: []Object{nil},
+			err:     fmt.Errorf("TypeError: 'func() argument 1 must be bytes-like, not str'"),
+		},
+		{
+			args:    Tuple{None},
+			format:  "y*:func",
+			results: []Object{nil},
+			err:     fmt.Errorf("TypeError: 'func() argument 1 must be bytes-like, not NoneType'"),
+		},
 		{
 			args:    Tuple{String("a")},
 			format:  "U:func",