Merge pull request #567 from frmdstryr/funchelper-updates

Update funchelper call_func
nucleic · Jan 18, 2025 · 1f13f6a · 1f13f6a
2 parents aa286f0 + b0c9e78
commit 1f13f6a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/enaml/src/funchelper.cpp b/enaml/src/funchelper.cpp
@@ -20,18 +20,19 @@ from Python's funcobject.c
 
 */
 PyObject*
-call_func( PyObject* mod, PyObject* args )
+call_func( PyObject* mod, PyObject *const *args, Py_ssize_t nargs )
 {
-    PyObject* func;
-    PyObject* func_args;
-    PyObject* func_kwargs;
-    PyObject* func_locals = Py_None;
-
-    if( !PyArg_UnpackTuple( args, "call_func", 3, 4, &func, &func_args, &func_kwargs, &func_locals ) )
+    if( !(nargs == 4 || nargs == 3) )
     {
+        PyErr_SetString( PyExc_TypeError, "call_func must have 3 or 4 arguments" );
         return 0;
     }
 
+    PyObject* func = args[0];
+    PyObject* func_args = args[1];
+    PyObject* func_kwargs = args[2];
+    PyObject* func_locals = nargs == 4 ? args[3] : Py_None;
+
     if( !PyFunction_Check( func ) )
     {
         PyErr_SetString( PyExc_TypeError, "function must be a Python function" );
@@ -64,11 +65,11 @@ call_func( PyObject* mod, PyObject* args )
     if( ( argdefs ) && PyTuple_Check( argdefs ) )
     {
         defaults = &PyTuple_GET_ITEM( reinterpret_cast<PyTupleObject*>( argdefs ), 0 );
-        num_defaults = PyTuple_Size( argdefs );
+        num_defaults = PyTuple_GET_SIZE( argdefs );
     }
 
     PyObject** keywords = 0;
-    Py_ssize_t num_keywords = PyDict_Size( func_kwargs );
+    Py_ssize_t num_keywords = PyDict_GET_SIZE( func_kwargs );
     if( num_keywords > 0 )
     {
         keywords = PyMem_NEW( PyObject*, 2 * num_keywords );
@@ -90,7 +91,7 @@ call_func( PyObject* mod, PyObject* args )
         PyFunction_GET_GLOBALS( func ),
         func_locals,
         &PyTuple_GET_ITEM( func_args, 0 ),
-        PyTuple_Size( func_args ),
+        PyTuple_GET_SIZE( func_args ),
         keywords, num_keywords, defaults, num_defaults,
         NULL, PyFunction_GET_CLOSURE( func )
     );
@@ -115,7 +116,7 @@ funchelper_modexec( PyObject *mod )
 
 static PyMethodDef
 funchelper_methods[] = {
-    { "call_func", ( PyCFunction )call_func, METH_VARARGS,
+    { "call_func", ( PyCFunction )call_func, METH_FASTCALL,
       "call_func(func, args, kwargs[, locals])" },
     { 0 } // sentinel
 };

diff --git a/tests/core/test_funchelper.py b/tests/core/test_funchelper.py
@@ -67,3 +67,7 @@ def test_handling_wrong_arguments():
     with pytest.raises(TypeError) as excinfo:
         call_func(func, (), {}, 1)
     assert 'mapping' in excinfo.exconly()
+
+    with pytest.raises(TypeError) as excinfo:
+        call_func(func, ())
+    assert 'must have 3 or 4 arguments' in excinfo.exconly()