Skip to content

Fix _thread.RLock() rejecting arguments that CPython ignores #1269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jseop-lim wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix _thread.RLock() rejecting arguments that CPython ignores #1269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions graalpython/com.oracle.graal.python.test/src/tests/test_threading.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,10 @@ def test_blocking_os_read_thread_does_not_deadlock_import_re():
)
assert result.returncode == 0, result.stderr
assert result.stdout.rstrip().endswith("ok"), result.stdout


def test_rlock_new_ignores_arguments():
import _thread

assert type(_thread.RLock(0)) is _thread.RLock
assert type(_thread.RLock(x=1)) is _thread.RLock
9 changes: 6 additions & 3 deletions ...racle.graal.python/src/com/oracle/graal/python/builtins/objects/thread/RLockBuiltins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import com.oracle.graal.python.builtins.PythonBuiltins;
import com.oracle.graal.python.builtins.objects.PNone;
import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
import com.oracle.graal.python.builtins.objects.function.PKeyword;
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
import com.oracle.graal.python.builtins.objects.type.TpSlots;
import com.oracle.graal.python.builtins.objects.type.TypeNodes;
Expand All @@ -62,6 +63,7 @@
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
import com.oracle.graal.python.nodes.util.CastToJavaUnsignedLongNode;
import com.oracle.graal.python.runtime.GilNode;
import com.oracle.graal.python.runtime.exception.PythonErrorType;
Expand All @@ -85,11 +87,12 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
}

@Slot(value = SlotKind.tp_new, isComplex = true)
@SlotSignature(name = "RLock", minNumOfPositionalArgs = 1)
@SlotSignature(name = "RLock", minNumOfPositionalArgs = 1, takesVarArgs = true, takesVarKeywordArgs = true)
@GenerateNodeFactory
public abstract static class ConstructRLockNode extends PythonUnaryBuiltinNode {
public abstract static class ConstructRLockNode extends PythonVarargsBuiltinNode {
@SuppressWarnings("unused")
@Specialization
PRLock construct(Object cls,
PRLock construct(Object cls, Object[] arguments, PKeyword[] keywords,
@Cached TypeNodes.GetInstanceShape getInstanceShape) {
return PFactory.createRLock(cls, getInstanceShape.execute(cls));
}
Expand Down