Skip to content

Commit 56e7e2a

Browse files
committed
Allow bytes-like in PyFloat_FromString
1 parent 740cb40 commit 56e7e2a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_float.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ class TestPyFloat(CPyExtTestCase):
146146
("nan",),
147147
("-inf",),
148148
("not-a-float",),
149+
(b"1",),
150+
(memoryview(b"1"),),
149151
),
150152
resultspec="O",
151153
argspec='O',

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextFloatBuiltins.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Direct;
4545
import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Ignored;
4646
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObject;
47-
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectAsTruffleString;
4847
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectTransfer;
4948
import static com.oracle.graal.python.nodes.ErrorMessages.BAD_ARG_TO_INTERNAL_FUNC_WAS_S_P;
5049

@@ -59,7 +58,6 @@
5958
import com.oracle.truffle.api.dsl.Cached;
6059
import com.oracle.truffle.api.dsl.Specialization;
6160
import com.oracle.truffle.api.nodes.Node;
62-
import com.oracle.truffle.api.strings.TruffleString;
6361

6462
public final class PythonCextFloatBuiltins {
6563

@@ -101,11 +99,11 @@ static double doGenericErr(Object object,
10199
}
102100
}
103101

104-
@CApiBuiltin(ret = PyObjectTransfer, args = {PyObjectAsTruffleString}, call = Direct)
102+
@CApiBuiltin(ret = PyObjectTransfer, args = {PyObject}, call = Direct)
105103
abstract static class PyFloat_FromString extends CApiUnaryBuiltinNode {
106104

107105
@Specialization
108-
static Object fromString(TruffleString string,
106+
static Object fromString(Object string,
109107
@Bind("this") Node inliningTarget,
110108
@Cached PyFloatFromString pyFloatFromString) {
111109
return pyFloatFromString.execute(null, inliningTarget, string);

0 commit comments

Comments
 (0)