diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_itertools.py b/graalpython/com.oracle.graal.python.test/src/tests/test_itertools.py index 9d4b272c59..5795c120ef 100644 --- a/graalpython/com.oracle.graal.python.test/src/tests/test_itertools.py +++ b/graalpython/com.oracle.graal.python.test/src/tests/test_itertools.py @@ -3,7 +3,7 @@ # # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 -import unittest, sys +import itertools, unittest, sys from itertools import * @@ -182,3 +182,19 @@ def test_pairwise_drained(self): p = pairwise("abcd") self.assertEqual(list(p), [('a', 'b'), ('b', 'c'), ('c', 'd')]) self.assertEqual(list(p), []) + + +class TeeDataObjectTests(unittest.TestCase): + + def test_teedataobject_rejects_none_values(self): + self.assertRaises(TypeError, itertools._tee_dataobject, iter([]), None, None) + self.assertRaises(TypeError, itertools._tee_dataobject, iter([]), None, 5) + + def test_teedataobject_requires_three_arguments(self): + self.assertRaises(TypeError, itertools._tee_dataobject) + self.assertRaises(TypeError, itertools._tee_dataobject, 1) + self.assertRaises(TypeError, itertools._tee_dataobject, iter([]), []) + + def test_teedataobject_list_values(self): + t = itertools._tee_dataobject(iter([]), [1, 2], None) + self.assertIs(type(t), itertools._tee_dataobject) diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/TeeDataObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/TeeDataObjectBuiltins.java index 6c4e578458..0cd35b10d5 100644 --- a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/TeeDataObjectBuiltins.java +++ b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/itertools/TeeDataObjectBuiltins.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * The Universal Permissive License (UPL), Version 1.0 @@ -119,7 +119,7 @@ PTeeDataObject construct(Object cls, Object[] arguments, PKeyword[] keywords, } @Slot(value = SlotKind.tp_init, isComplex = true) - @SlotSignature(name = "TeeDataObject", minNumOfPositionalArgs = 1, parameterNames = {"$self", "it", "values", "nxt"}) + @SlotSignature(name = "TeeDataObject", minNumOfPositionalArgs = 4, parameterNames = {"$self", "it", "values", "nxt"}) @ArgumentClinic(name = "values", defaultValue = "PNone.NONE", useDefaultForNone = true) @ArgumentClinic(name = "nxt", defaultValue = "PNone.NONE", useDefaultForNone = true) @GenerateNodeFactory @@ -132,26 +132,6 @@ protected ArgumentClinicProvider getArgumentClinic() { abstract Object execute(VirtualFrame frame, PTeeDataObject self, Object it, Object values, Object nxt); - @Specialization(guards = "isNone(values)") - static Object init(PTeeDataObject self, Object it, @SuppressWarnings("unused") Object values, @SuppressWarnings("unused") PNone nxt) { - init(self, it, null); - return PNone.NONE; - } - - @Specialization(guards = "isNone(values)") - static Object init(PTeeDataObject self, Object it, @SuppressWarnings("unused") Object values, PTeeDataObject nxt) { - init(self, it, nxt); - return PNone.NONE; - } - - private static void init(PTeeDataObject self, Object it, PTeeDataObject nxt) { - self.setIt(it); - self.setValues(new Object[LINKCELLS]); - self.setNumread(0); - self.setRunning(false); - self.setNextlink(nxt); - } - @Specialization static Object init(VirtualFrame frame, PTeeDataObject self, Object it, PList values, Object nxt, @Bind Node inliningTarget, @@ -182,7 +162,7 @@ static Object init(VirtualFrame frame, PTeeDataObject self, Object it, PList val } @SuppressWarnings("unused") - @Specialization(guards = {"!isList(values)", "!isNone(values)"}) + @Specialization(guards = "!isList(values)") static Object init(VirtualFrame frame, PTeeDataObject self, Object it, Object values, Object nxt, @Bind Node inliningTarget) { throw PRaiseNode.raiseStatic(inliningTarget, TypeError, ARG_D_MUST_BE_S_NOT_P, "teedataobject()", 2, "list", values);