pycall 1.4.2 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2526ea3050985dc6d864e979804fb4ebaa9c36d8239b48809a9cd31dd01de5
-  data.tar.gz: 68df5fcac7fd5c574009ebbc33f0d9c1724ff8d5057d4dfaa69832b8509e4a92
+  metadata.gz: c0793d5cd5f93c4eb9cd5938b7999799649db72f2abd35b4ae3247c450aec7ce
+  data.tar.gz: 404e3c06167a752f94cfc9051734a259725366f7c981c654e4f8744a3613c907
 SHA512:
-  metadata.gz: c52cd3ac7b709238a1b3ec95ed7eb45bcfaa5ef8a40b74f8de15cec928350152769c915250f27290e1b7f2bfb84032faa3a39837d0598c2927a114f6989f11dc
-  data.tar.gz: 6c45f609e09251815588b0a02095af9d221e2c715d4e614d16888326fc46c6158a631b6cc514d9b3e673468abf2834e003074a5e77f27b46098c5ab698328459
+  metadata.gz: 2c8f666bb616b01f69bcd33130991cd22f9f2bfea3b67946e87550c846327032bd14d69d2522d8b83ee18db5551cea3bf0fa51f7043d7cfcfd8a8490c6bf04df
+  data.tar.gz: 041600f566b4d8158dc4772830ab1a8eb00479a82b118f0f135e20130d05d9047dba53b8ab32701c2bee20ec770a48cd540cd259d369163e64f4da775e7e26ae

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

data/.github/workflows/ci.yml

@@ -25,6 +25,7 @@ jobs:
         - ubuntu-20.04
         - macos-latest
         ruby:
+        - "3.3"
         - "3.2"
         - "3.1"
         - "3.0"
@@ -41,41 +42,28 @@ jobs:
         - { os: ubuntu-20.04   , ruby: 2.5   , python: "3.x"  , python_architecture: x64 , venv: "" }
         - { os: ubuntu-20.04   , ruby: 2.4   , python: "3.x"  , python_architecture: x64 , venv: "" }
 
-        # The latest Python 2
-        - { os: ubuntu-20.04   , ruby: 3.1   , python: "2.x"  , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 3.0   , python: "2.x"  , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.7   , python: "2.x"  , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.6   , python: "2.x"  , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.5   , python: "2.x"  , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: 2.4   , python: "2.x"  , python_architecture: x64 , venv: "" }
-
         # Ruby 2.7 with Each Python 3.x
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.12" , python_architecture: x64 , venv: "" }
         - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.11" , python_architecture: x64 , venv: "" }
         - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.10" , python_architecture: x64 , venv: "" }
         - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.9"  , python_architecture: x64 , venv: "" }
         - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.8"  , python_architecture: x64 , venv: "" }
         - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.7"  , python_architecture: x64 , venv: "" }
         - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.6"  , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-18.04   , ruby: 2.7   , python: "3.8"  , python_architecture: x64 , venv: "" }
 
         # Ruby-debug with the latest Python 3
         - { os: ubuntu-20.04   , ruby: debug , python: "3.x"  , python_architecture: x64 , venv: "" }
 
-        # Ruby 3.1 with the latest Python 3 with venv
-        - { os: ubuntu-20.04   , ruby: "3.1" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
-        - { os: ubuntu-18.04   , ruby: "3.1" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
-
-        # Ubuntu 18.04 with venv
-        - { os: ubuntu-18.04   , ruby: "3.1" , python: "3.8"  , python_architecture: x64 , venv: "venv:"  }
+        # The latest stable Ruby with the latest Python 3 with venv
+        - { os: ubuntu-20.04   , ruby: "3.3" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
 
         # macOS with venv
-        - { os: macos-latest   , ruby: "3.1" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
-        - { os: macos-latest   , ruby: "3.1" , python: "3.8"  , python_architecture: x64 , venv: "venv:"  }
+        - { os: macos-latest   , ruby: "3.3" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
 
         #- { os: macos-latest   , ruby: debug , python: "3.x" , python_architecture: x64 , venv: "" }
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 1
 
@@ -84,7 +72,7 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.python_architecture }}
@@ -119,7 +107,7 @@ jobs:
       matrix:
         os:
         - ubuntu-20.04
-        - macos-latest
+        #- macos-latest
         ruby:
         - "3.1"
         python:

data/.github/workflows/windows.yml

@@ -26,7 +26,6 @@ jobs:
         - 2.6
         python:
         - 3.x
-        - 2.x
         python_architecture:
         - x64
         include:
@@ -34,7 +33,7 @@ jobs:
         #- { os: windows-latest , ruby: mswin , python: 3.x , python_architecture: x64 }
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 1
 
@@ -43,7 +42,7 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.python_architecture }}

data/CHANGES.md

@@ -1,5 +1,36 @@
 # The change history of PyCall
 
+## 1.5.2
+
+* Fix memory leak with str(list) (#169).
+
+  *mknkmyza*
+
+* Fix SEGV occured on Ruby process finalization.
+
+* Fix for supporting Ruby >= 3.3.
+
+* Fix for supporting Python >= 3.2.
+
+## 1.5.1
+
+* Fix memory leak in rich compare methods (#167, #168).
+
+  *mknkmyza*
+
+## 1.5.0
+
+* Fix to prevent distutils deprecation warning (#159)
+
+  *Christopher Dilks*
+
+* Drop Python 2.7 support
+
+* Fix memory leak of Python objects. (#129)
+  This should fixes #128 and maybe also fixes #164.
+
+  *mknkmyza*
+
 ## 1.4.2
 
 * Add supports of unary operators: `+@`, `-@`, `~`

data/README.md

@@ -19,9 +19,7 @@ pycall.rb supports Ruby version 2.4 or higher.
 
 ## Supported Python versions
 
-pycall.rb supports Python version 2.7 or higher.
-
-Note that in Python 2.7 old-style class, that is defined without a super class, is not fully supported in pycall.rb.
+pycall.rb supports Python version 3.7 or higher.
 
 ## Note for pyenv users
 
@@ -144,9 +142,9 @@ Use [mrkn/pandas.rb](https://github.com/mrkn/pandas.rb) instead of just importin
 
 PyCall wraps pointers of Python objects in `PyCall::PyPtr` objects.
 `PyCall::PyPtr` class has two subclasses, `PyCall::PyTypePtr` and
-`PyCall::PyRubyPtr`.  `PyCall::PyTypePtr` is specialized for type (and classobj
-in 2.7) objects, and `PyCall::PyRubyPtr` is for the objects that wraps pointers
-of Ruby objects.
+`PyCall::PyRubyPtr`.  `PyCall::PyTypePtr` is specialized for type objects,
+and `PyCall::PyRubyPtr` is for the objects that wraps pointers of
+Ruby objects.
 
 These `PyCall::PyPtr` objects are used mainly in PyCall infrastructure.
 Instead, we usually treats the instances of `Object`, `Class`, `Module`, or
@@ -162,18 +160,33 @@ translates Ruby's coerce system into Python's swapped operation protocol.
 ## Deploying on Heroku
 
 Heroku's default version of Python is not compiled with the `--enabled-shared`
-option and can't be accessed by PyCall. Alternative [buildpacks](https://devcenter.heroku.com/articles/buildpacks) are available,
-including these that have been reported to work with PyCall:
-
-https://github.com/richgong/heroku-buildpack-python
-https://github.com/dsounded/heroku-buildpack-python
-https://github.com/ReforgeHQ/heroku-buildpack-python
-
-These community-developed buildpacks are not supported by Heroku, so it's
-worth examining the source to make sure the buildpack you use suits your
-needs. For instance, 'ReforgeHQ' works well with Python 3.8.1, but has not
-been configured to work with other versions and may not be as generally
-useful as the 'dsounded' or 'richgong' buildpacks.
+option and can't be accessed by PyCall.
+
+There are many ways to make our heroku use Python that is compiled with the `--enabled-shared` option:
+
+  - use Heroku's official Python buildpacks `post_compile` hooks to recompile the python if the `--enabled-shared` option is not enabled.
+    example script of `post_compile` in ruby on rails app `bin/post_compile`.
+
+        set -e
+        buildpack_url=https://github.com/heroku/heroku-buildpack-python
+        buildpack_vsn=v197 # adjust version accordingly https://github.com/heroku/heroku-buildpack-python/tags
+
+        # rebuild python if it's missing enable-shared
+        if  ! python3 -msysconfig | grep enable-shared \
+            > /dev/null; then
+          PYTHON_VERSION="$(< runtime.txt)"
+          git clone -b "$buildpack_vsn" "$buildpack_url" _buildpack
+          export WORKSPACE_DIR="$PWD/_buildpack/builds"
+          rm -f .heroku/python/bin/python   # prevent failing ln after build
+          sed -i 's!figure --pre!figure --enable-shared --pre!' \
+            "$WORKSPACE_DIR"/runtimes/python3
+          "$WORKSPACE_DIR/runtimes/$PYTHON_VERSION" /app/.heroku/python/
+          rm -fr _buildpack
+        fi
+
+  - use your own precompiled python with `--enabled-shared` options then fork the official heroku [python buildspacks](https://github.com/heroku/heroku-buildpack-python) and change the `BUILDPACK_S3_BASE_URL` with your own uploaded precompiled python in Amazon's S3.
+  - use 3rd party buildpacks from the [markets](https://elements.heroku.com/buildpacks) that have python with `--enabled-shared` option.
+
 
 The buildpack will expect to find both a `runtime.txt` and a `requirements.txt` 
 file in the root of your project. You will need to add these to specify the 

data/ext/pycall/extconf.rb

@@ -1,3 +1,5 @@
 require 'mkmf'
 
+have_func("RTYPEDDATA_GET_DATA")
+
 create_makefile('pycall')

data/ext/pycall/gc.c

@@ -1,5 +1,7 @@
 #include "pycall_internal.h"
 
+static ID id_gcguard_table;
+
 struct gcguard {
   st_table *guarded_objects;
 };
@@ -24,6 +26,7 @@ gcguard_free(void* ptr)
 {
   struct gcguard *gg = (struct gcguard *)ptr;
   st_free_table(gg->guarded_objects);
+  rb_ivar_set(mPyCall, id_gcguard_table, Qnil);
 }
 
 static size_t
@@ -69,7 +72,6 @@ gcguard_delete(VALUE gcguard, PyObject *pyptr)
   }
 }
 
-static ID id_gcguard_table;
 static PyObject *weakref_callback_pyobj;
 static PyObject *gcguard_weakref_destroyed(PyObject *self, PyObject *weakref);
 
@@ -98,7 +100,9 @@ void
 pycall_gcguard_delete(PyObject *pyobj)
 {
   VALUE gcguard = rb_ivar_get(mPyCall, id_gcguard_table);
-  gcguard_delete(gcguard, pyobj);
+  if (!NIL_P(gcguard)) {
+    gcguard_delete(gcguard, pyobj);
+  }
 }
 
 void

data/ext/pycall/libpython.c

@@ -217,6 +217,10 @@ pycall_init_libpython_api_table(VALUE libpython_handle)
     INIT_API_TABLE_ENTRY2(PyUnicode_DecodeUTF8, PyUnicodeUCS2_DecodeUTF8, required);
     INIT_API_TABLE_ENTRY2(PyUnicode_FromFormatV, PyUnicodeUCS2_FromFormatV, required);
   }
+
+  INIT_API_TABLE_ENTRY(PyGILState_Check, required);
+  INIT_API_TABLE_ENTRY(PyGILState_Ensure, required);
+  INIT_API_TABLE_ENTRY(PyGILState_Release, required);
 }
 
 void

data/ext/pycall/pycall.c

@@ -139,7 +139,15 @@ pycall_pyptr_free(void *ptr)
     fprintf(stderr, "zero refcnt object %p of type %s\n", pyobj, Py_TYPE(pyobj)->tp_name);
   }
 #endif /* PYCALL_DEBUG_DUMP_REFCNT */
-  pycall_Py_DecRef(pyobj);
+
+  if (Py_API(PyGILState_Check())) {
+    pycall_Py_DecRef(pyobj);
+  }
+  else {
+    PyGILState_STATE gstate = Py_API(PyGILState_Ensure)();
+    pycall_Py_DecRef(pyobj);
+    Py_API(PyGILState_Release)(gstate);
+  }
 }
 
 static size_t _PySys_GetSizeOf(PyObject *);
@@ -792,8 +800,9 @@ pycall_libpython_helpers_m_compare(VALUE mod, VALUE op, VALUE pyptr_a, VALUE pyp
   if (!res) {
     pycall_pyerror_fetch_and_raise("PyObject_RichCompare in pycall_libpython_helpers_m_compare");
   }
-
-  return pycall_pyobject_to_ruby(res);
+  VALUE obj = pycall_pyobject_to_ruby(res);
+  pycall_Py_DecRef(res);
+  return obj;
 }
 
 static int is_pyobject_wrapper(VALUE obj);
@@ -966,10 +975,10 @@ pycall_extract_kwargs_from_ruby_hash(VALUE key, VALUE value, VALUE arg)
   key_cstr = StringValueCStr(key);
   pyvalue = pycall_pyobject_from_ruby(value);
 
-  if (Py_API(PyDict_SetItemString)(kwargs, key_cstr, pyvalue) < 0) {
-    return ST_STOP;
-  }
-  return ST_CONTINUE;
+  int res = Py_API(PyDict_SetItemString)(kwargs, key_cstr, pyvalue);
+  pycall_Py_DecRef(pyvalue);
+
+  return (res < 0) ? ST_STOP : ST_CONTINUE;
 }
 
 static void
@@ -1061,6 +1070,10 @@ pycall_call_python_callable(PyObject *pycallable, int argc, VALUE *argv)
   }
 
   res = pyobject_call(pycallable, args, kwargs); /* New reference */
+  pycall_Py_DecRef(args);
+  if (kwargs) {
+      pycall_Py_DecRef(kwargs);
+  }
   if (!res) {
     pycall_pyerror_fetch_and_raise("PyObject_Call in pycall_call_python_callable");
   }
@@ -1099,9 +1112,9 @@ pycall_pyobject_wrapper_wrapper_method(int argc, VALUE *argv, VALUE wrapper)
 
     name_cstr[RSTRING_LEN(name) - 1] = '\0';
     res = Py_API(PyObject_SetAttrString)(pyobj, name_cstr, attr);
+    pycall_Py_DecRef(attr);
     name_cstr[RSTRING_LEN(name) - 1] = '=';
     if (res == -1) {
-      pycall_Py_DecRef(attr);
       pycall_pyerror_fetch_and_raise("PyObject_SetAttrString in pycall_pyobject_wrapper_wrapper_method");
     }
 
@@ -1119,7 +1132,9 @@ pycall_pyobject_wrapper_wrapper_method(int argc, VALUE *argv, VALUE wrapper)
   if (PyType_Check(attr) || PyClass_Check(attr))
     return pycall_pyobject_to_ruby(attr);
 
-  return pycall_call_python_callable(attr, argc, argv);
+  VALUE obj = pycall_call_python_callable(attr, argc, argv);
+  pycall_Py_DecRef(attr);
+  return obj;
 }
 
 static VALUE
@@ -1203,6 +1218,7 @@ pycall_libpython_helpers_m_getitem(VALUE mod, VALUE pyptr, VALUE key)
   pyobj_key = pycall_convert_index(key);
 
   pyobj_v = Py_API(PyObject_GetItem)(pyobj, pyobj_key);
+  pycall_Py_DecRef(pyobj_key);
   if (!pyobj_v) {
     pycall_pyerror_fetch_and_raise("PyObject_GetItem in pycall_libpython_helpers_m_getitem");
   }
@@ -1223,11 +1239,11 @@ pycall_libpython_helpers_m_setitem(VALUE mod, VALUE pyptr, VALUE key, VALUE v)
   pyobj_value = pycall_pyobject_from_ruby(v);
 
   res = Py_API(PyObject_SetItem)(pyobj, pyobj_key, pyobj_value);
+  pycall_Py_DecRef(pyobj_key);
+  pycall_Py_DecRef(pyobj_value);
   if (res == -1) {
     pycall_pyerror_fetch_and_raise("PyObject_SetItem in pycall_libpython_helpers_m_setitem");
   }
-  Py_API(Py_DecRef(pyobj_key));
-  Py_API(Py_DecRef(pyobj_value));
 
   return v;
 }
@@ -1242,6 +1258,7 @@ pycall_libpython_helpers_m_delitem(VALUE mod, VALUE pyptr, VALUE key)
   pyobj_key = pycall_convert_index(key);
 
   res = Py_API(PyObject_DelItem)(pyobj, pyobj_key);
+  pycall_Py_DecRef(pyobj_key);
   if (res == -1) {
     pycall_pyerror_fetch_and_raise("PyObject_DelItem");
   }
@@ -1261,7 +1278,9 @@ pycall_libpython_helpers_m_str(VALUE mod, VALUE pyptr)
     pycall_pyerror_fetch_and_raise("PyObject_Str");
   }
 
-  return pycall_pyobject_to_ruby(pyobj_str);
+  VALUE v = pycall_pyobject_to_ruby(pyobj_str);
+  pycall_Py_DecRef(pyobj_str);
+  return v;
 }
 
 static VALUE
@@ -1273,6 +1292,7 @@ pycall_libpython_helpers_m_dict_contains(VALUE mod, VALUE pyptr, VALUE key)
   pyobj = check_get_pyobj_ptr(pyptr, Py_API(PyDict_Type));
   pyobj_key = pycall_pyobject_from_ruby(key);
   res = Py_API(PyDict_Contains)(pyobj, pyobj_key);
+  pycall_Py_DecRef(pyobj_key);
   if (res == -1) {
     pycall_pyerror_fetch_and_raise("PyDict_Contains");
   }
@@ -1311,6 +1331,7 @@ pycall_libpython_helpers_m_sequence_contains(VALUE mod, VALUE pyptr, VALUE key)
 
   pyobj_key = pycall_pyobject_from_ruby(key);
   res = Py_API(PySequence_Contains)(pyobj, pyobj_key);
+  pycall_Py_DecRef(pyobj_key);
   if (res == -1) {
     pycall_pyerror_fetch_and_raise("PySequence_Contains");
   }
@@ -1679,19 +1700,21 @@ pycall_pyunicode_to_ruby(PyObject *pyobj)
     return Qnil;
   }
 
-  pyobj = Py_API(PyUnicode_AsUTF8String)(pyobj);
-  if (!pyobj) {
+  PyObject *pyobj_uni = Py_API(PyUnicode_AsUTF8String)(pyobj);
+  if (!pyobj_uni) {
     Py_API(PyErr_Clear)();
     return Qnil;
   }
 
-  res = Py_API(PyString_AsStringAndSize)(pyobj, &str, &len);
+  res = Py_API(PyString_AsStringAndSize)(pyobj_uni, &str, &len);
   if (res < 0) {
-    pycall_Py_DecRef(pyobj);
+    pycall_Py_DecRef(pyobj_uni);
     return Qnil;
   }
 
-  return rb_enc_str_new(str, len, rb_enc_from_index(rb_utf8_encindex()));
+  VALUE v = rb_enc_str_new(str, len, rb_enc_from_index(rb_utf8_encindex()));
+  pycall_Py_DecRef(pyobj_uni);
+  return v;
 }
 
 static VALUE
@@ -1708,6 +1731,7 @@ pycall_pytuple_to_a(PyObject *pyobj)
     PyObject *pytem = Py_API(PyTuple_GetItem)(pyobj, i);
     Py_API(Py_IncRef)(pytem);
     rb_ary_push(ary, pycall_pyobject_to_ruby(pytem));
+    pycall_Py_DecRef(pytem);
   }
 
   return ary;
@@ -1726,6 +1750,7 @@ pycall_pysequence_to_a(PyObject *pyobj)
   for (i = 0; i < n; ++i) {
     PyObject *pytem = Py_API(PySequence_GetItem)(pyobj, i);
     rb_ary_push(ary, pycall_pyobject_to_ruby(pytem));
+    pycall_Py_DecRef(pytem);
   }
 
   return ary;
@@ -1938,12 +1963,10 @@ pycall_pydict_from_ruby_iter(VALUE key, VALUE value, VALUE arg)
   pyobj_key = pycall_pyobject_from_ruby(key);
   pyobj_value = pycall_pyobject_from_ruby(value);
   res = Py_API(PyObject_SetItem)(pydictobj, pyobj_key, pyobj_value);
-  if (res == -1) {
-    return ST_STOP;
-  }
-  Py_API(Py_DecRef)(pyobj_key);
-  Py_API(Py_DecRef)(pyobj_value);
-  return ST_CONTINUE;
+  pycall_Py_DecRef(pyobj_key);
+  pycall_Py_DecRef(pyobj_value);
+
+  return (res == -1) ? ST_STOP : ST_CONTINUE;
 }
 
 PyObject *

data/ext/pycall/pycall_internal.h

@@ -519,6 +519,11 @@ PyObject * PyRuby_New(VALUE ruby_object);
 
 /* ==== thread support ==== */
 
+typedef enum {
+  PyGILState_LOCKED,
+  PyGILState_UNLOCKED
+} PyGILState_STATE;
+
 #if   defined(PYCALL_THREAD_WIN32)
 typedef DWORD pycall_tls_key;
 #elif defined(PYCALL_THREAD_PTHREAD)
@@ -669,6 +674,10 @@ typedef struct {
   PyObject * (* PyUnicode_AsUTF8String)(PyObject *);
   PyObject * (* PyUnicode_DecodeUTF8)(char const*, Py_ssize_t, char const *);
   PyObject * (* PyUnicode_FromFormatV)(char const*, ...);
+
+  int (* PyGILState_Check)(void);
+  PyGILState_STATE (* PyGILState_Ensure)(void);
+  void (* PyGILState_Release)(PyGILState_STATE);
 } pycall_libpython_api_table_t;
 
 pycall_libpython_api_table_t *pycall_libpython_api_table(void);

data/ext/pycall/range.c

@@ -6,6 +6,12 @@ struct enumerator_head {
     VALUE args;
 };
 
+#ifdef HAVE_RTYPEDDATA_GET_DATA
+# define GET_ENUMERATOR_DATA(obj) ((struct enumerator_head *)RTYPEDDATA_GET_DATA(obj))
+#else
+# define GET_ENUMERATOR_DATA(obj) ((struct enumerator_head *)DATA_PTR(obj))
+#endif
+
 int
 pycall_obj_is_step_range(VALUE obj)
 {
@@ -19,7 +25,7 @@ pycall_obj_is_step_range(VALUE obj)
     return 0;
   }
 
-  eh = (struct enumerator_head *)DATA_PTR(obj);
+  eh = GET_ENUMERATOR_DATA(obj);
 
   if (!rb_obj_is_kind_of(eh->obj, rb_cRange)) {
     return 0;
@@ -50,7 +56,7 @@ pycall_extract_range(VALUE obj, VALUE *pbegin, VALUE *pend, int *pexclude_end, V
     exclude_end = rb_funcallv(obj, id_exclude_end, 0, 0);
   }
   else if (pycall_obj_is_step_range(obj)) {
-    struct enumerator_head *eh = (struct enumerator_head *)DATA_PTR(obj);
+    struct enumerator_head *eh = GET_ENUMERATOR_DATA(obj);
     begin = rb_funcallv(eh->obj, id_begin, 0, 0);
     end   = rb_funcallv(eh->obj, id_end,   0, 0);
     exclude_end = rb_funcallv(eh->obj, id_exclude_end, 0, 0);

data/ext/pycall/ruby_wrapper.c

@@ -59,10 +59,11 @@ PyObject *
 PyRuby_New(VALUE ruby_object)
 {
   if (!ruby_thread_has_gvl_p()) {
-    CALL_WITH_GVL(PyRuby_New_impl, ruby_object);
+    return CALL_WITH_GVL(PyRuby_New_impl, ruby_object);
+  }
+  else {
+    return PyRuby_New_impl(ruby_object);
   }
-
-  return PyRuby_New_impl(ruby_object);
 }
 
 static void *
@@ -90,7 +91,9 @@ PyRuby_dealloc_with_gvl(PyRubyObject *pyro)
   if (!ruby_thread_has_gvl_p()) {
     CALL_WITH_GVL(PyRuby_dealloc, pyro);
   }
-  PyRuby_dealloc(pyro);
+  else {
+    PyRuby_dealloc(pyro);
+  }
 }
 
 static PyObject *
@@ -114,7 +117,9 @@ PyRuby_repr_with_gvl(PyRubyObject *pyro)
   if (!ruby_thread_has_gvl_p()) {
     return CALL_WITH_GVL(PyRuby_repr, pyro);
   }
-  return PyRuby_repr(pyro);
+  else {
+    return PyRuby_repr(pyro);
+  }
 }
 
 #if SIZEOF_SSIZE_T < 8
@@ -154,7 +159,9 @@ PyRuby_hash_long_with_gvl(PyRubyObject *pyro)
   if (!ruby_thread_has_gvl_p()) {
     return (long)(intptr_t)CALL_WITH_GVL(PyRuby_hash_long, pyro);
   }
-  return (long)(intptr_t)PyRuby_hash_long(pyro);
+  else {
+    return (long)(intptr_t)PyRuby_hash_long(pyro);
+  }
 }
 
 static void *
@@ -185,7 +192,9 @@ PyRuby_hash_hash_t_with_gvl(PyRubyObject *pyro)
   if (!ruby_thread_has_gvl_p()) {
     return (Py_hash_t)CALL_WITH_GVL(PyRuby_hash_hash_t, pyro);
   }
-  return (Py_hash_t)PyRuby_hash_hash_t(pyro);
+  else {
+    return (Py_hash_t)PyRuby_hash_hash_t(pyro);
+  }
 }
 
 struct call_rb_funcallv_params {
@@ -269,8 +278,9 @@ PyRuby_call_with_gvl(PyRubyObject *pyro, PyObject *pyobj_args, PyObject *pyobj_k
   if (!ruby_thread_has_gvl_p()) {
     return CALL_WITH_GVL(PyRuby_call, &params);
   }
-
-  return PyRuby_call(&params);
+  else {
+    return PyRuby_call(&params);
+  }
 }
 
 struct PyRuby_getattro_params {
@@ -348,8 +358,9 @@ PyRuby_getattro_with_gvl(PyRubyObject *pyro, PyObject *pyobj_name)
   if (!ruby_thread_has_gvl_p()) {
     return CALL_WITH_GVL(PyRuby_getattro, &params);
   }
-
-  return PyRuby_getattro(&params);
+  else {
+    return PyRuby_getattro(&params);
+  }
 }
 
 /* ==== PyCall::PyRubyPtr ==== */

data/lib/pycall/python/investigator.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import ctypes.util
-from distutils.sysconfig import get_config_var, get_python_version
+from sysconfig import get_config_var, get_python_version
 import os
 import sys
 

data/lib/pycall/version.rb

@@ -1,5 +1,5 @@
 module PyCall
-  VERSION = "1.4.2"
+  VERSION = "1.5.2"
 
   module Version
     numbers, TAG = VERSION.split("-")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.2
 platform: ruby
 authors:
 - Kenta Murata
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-08 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,6 +144,7 @@ extensions:
 - ext/pycall/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/windows.yml"
 - ".gitignore"
@@ -221,7 +222,7 @@ homepage: https://github.com/mrkn/pycall
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -236,8 +237,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.13
-signing_key: 
+rubygems_version: 3.5.10
+signing_key:
 specification_version: 4
 summary: pycall
 test_files: []