pycall 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b016b6c9b12867d113713238ecc171cc4fde8965197c79c59abf66d8bb3b252e
-  data.tar.gz: abb36597376d37744972f7bb537ab61032387c73947d7846b9947bb622bf04ac
+  metadata.gz: 9b2526ea3050985dc6d864e979804fb4ebaa9c36d8239b48809a9cd31dd01de5
+  data.tar.gz: 68df5fcac7fd5c574009ebbc33f0d9c1724ff8d5057d4dfaa69832b8509e4a92
 SHA512:
-  metadata.gz: 18bc020ef0c1f1d82e3796ae023170ee287bbf966c3efd12dd48f730eec585b7b70e00352d316e8e524e608c70bff0348937c1afc434ba7d6ae634223f0e1fa6
-  data.tar.gz: 9ea69bb090386a7a280be6a7c779b406f49a3de2da5b406c64529be6a462535cbe9eefaad404e3dd1dab6bc98a5840e2825708f8d1602e1404ab4dbd83ce43b2
+  metadata.gz: c52cd3ac7b709238a1b3ec95ed7eb45bcfaa5ef8a40b74f8de15cec928350152769c915250f27290e1b7f2bfb84032faa3a39837d0598c2927a114f6989f11dc
+  data.tar.gz: 6c45f609e09251815588b0a02095af9d221e2c715d4e614d16888326fc46c6158a631b6cc514d9b3e673468abf2834e003074a5e77f27b46098c5ab698328459

data/.github/workflows/ci.yml

@@ -21,35 +21,58 @@ jobs:
       fail-fast: false
       matrix:
         os:
+        - ubuntu-latest
         - ubuntu-20.04
         - macos-latest
         ruby:
+        - "3.2"
+        - "3.1"
         - "3.0"
-        - 2.7
-        - 2.6
+        - "2.7"
         python:
-        - 3.x
-        - 2.x
+        - "3.x"
         python_architecture:
         - x64
         venv:
         - ""
         include:
-        - { 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: "" }
-        - { 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: "" }
-        - { 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: "" }
-        - { os: ubuntu-20.04   , ruby: debug , python: 3.x , python_architecture: x64 , venv: "" }
-        - { os: ubuntu-20.04   , ruby: "3.0" , python: 3.x , python_architecture: x64 , venv: "venv:"  }
-        - { os: ubuntu-18.04   , ruby: "3.0" , python: 3.x , python_architecture: x64 , venv: "venv:"  }
-        - { os: ubuntu-18.04   , ruby: "3.0" , python: 3.8 , python_architecture: x64 , venv: "venv:"  }
-        - { os: macos-latest   , ruby: "3.0" , python: 3.x , python_architecture: x64 , venv: "venv:"  }
-        - { os: macos-latest   , ruby: "3.0" , python: 3.8 , python_architecture: x64 , venv: "venv:"  }
-        #- { os: macos-latest   , ruby: debug , python: 3.x , python_architecture: x64 , venv: "" }
+        # Old ruby and the latest Python 3
+        - { os: ubuntu-20.04   , ruby: 2.6   , python: "3.x"  , python_architecture: x64 , venv: "" }
+        - { 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.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:"  }
+
+        # 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: debug , python: "3.x" , python_architecture: x64 , venv: "" }
 
     steps:
     - uses: actions/checkout@v2
@@ -98,9 +121,9 @@ jobs:
         - ubuntu-20.04
         - macos-latest
         ruby:
-        - "3.0"
+        - "3.1"
         python:
-        - 3.8
+        - "3.10"
 
     steps:
     - uses: actions/checkout@v2

data/CHANGES.md

@@ -1,5 +1,11 @@
 # The change history of PyCall
 
+## 1.4.2
+
+* Add supports of unary operators: `+@`, `-@`, `~`
+* Fix `without_gvl` for exceptions occurred in the given block
+* Add PyCall.setattr and PyCall.delattr
+
 ## 1.4.1
 
 * Fix SEGV occurred on Windows

data/README.md

@@ -32,12 +32,6 @@ pyenv does not build the shared library in default, so you need to specify `--en
 $ env PYTHON_CONFIGURE_OPTS='--enable-shared' pyenv install 3.7.2
 ```
 
-## Note for Windows users
-
-Currently, pycall.rb does not support Windows.  Please try to use pycall.rb on WSL2 environment.
-
-On Windows, the error "[BUG] object allocation during garbage collection phase" is occurred at unpredictable timings.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -59,9 +53,8 @@ Or install it yourself as:
 Here is a simple example to call Python's `math.sin` function and compare it to
 the `Math.sin` in Ruby:
 
-    require 'pycall/import'
-    include PyCall::Import
-    pyimport :math
+    require 'pycall'
+    math = PyCall.import_module("math")
     math.sin(math.pi / 4) - Math.sin(Math::PI / 4)   # => 0.0
 
 Type conversions from Ruby to Python are automatically performed for numeric,

data/ext/pycall/libpython.c

@@ -110,6 +110,7 @@ pycall_init_libpython_api_table(VALUE libpython_handle)
   INIT_API_TABLE_ENTRY(PyObject_GetAttrString, required);
   INIT_API_TABLE_ENTRY(PyObject_SetAttrString, required);
   INIT_API_TABLE_ENTRY(PyObject_HasAttrString, required);
+  INIT_API_TABLE_ENTRY(PyObject_DelAttrString, optional);
   INIT_API_TABLE_ENTRY(PyObject_GetItem, required);
   INIT_API_TABLE_ENTRY(PyObject_SetItem, required);
   INIT_API_TABLE_ENTRY(PyObject_DelItem, required);

data/ext/pycall/pycall.c

@@ -52,7 +52,7 @@ pycall_python_hexversion(void)
 
 #define python_is_unicode_literals (python_major_version >= 3)
 
-long pycall_hash_salt;
+intptr_t pycall_hash_salt;
 
 static VALUE pycall_call_python_callable(PyObject *pycallable, int argc, VALUE *argv);
 
@@ -80,7 +80,7 @@ pycall_without_gvl_p(void)
    *
    * In Win32 thread, the default value is 0 (initialized by TlsAlloc).
    */
-  return (int)pycall_tls_get(without_gvl_key);
+  return pycall_tls_get(without_gvl_key) != (void*)0;
 }
 
 static inline int
@@ -107,6 +107,10 @@ pycall_without_gvl(VALUE (* func)(VALUE), VALUE arg)
 
   pycall_set_with_gvl();
 
+  if (state) {
+    rb_jump_tag(state);
+  }
+
   return result;
 }
 
@@ -410,7 +414,6 @@ pycall_pyptr_inspect(VALUE obj)
 
   cname = rb_class_name(CLASS_OF(obj));
   str = rb_sprintf("#<%"PRIsVALUE":%p type=%s addr=%p>", cname, (void*)obj, Py_TYPE(pyobj)->tp_name, pyobj);
-  OBJ_INFECT(str, obj);
 
   return str;
 }
@@ -861,6 +864,51 @@ pycall_libpython_helpers_m_hasattr_p(VALUE mod, VALUE pyptr, VALUE name)
   return res ? Qtrue : Qfalse;
 }
 
+static VALUE
+pycall_libpython_helpers_m_setattr(VALUE mod, VALUE pyptr, VALUE name, VALUE val)
+{
+  PyObject *pyobj, *pyval;
+
+  if (!is_pycall_pyptr(pyptr)) {
+    rb_raise(rb_eTypeError, "PyCall::PyPtr is required");
+  }
+
+  pyobj = get_pyobj_ptr(pyptr);
+
+  if (RB_TYPE_P(name, T_SYMBOL)) {
+    name = rb_sym_to_s(name);
+  }
+
+  pyval = pycall_pyobject_from_ruby(val);
+  if (Py_API(PyObject_SetAttrString)(pyobj, StringValueCStr(name), pyval) == -1) {
+    pycall_pyerror_fetch_and_raise("PyObject_SetAttrString");
+  }
+
+  return Qnil;
+}
+
+static VALUE
+pycall_libpython_helpers_m_delattr(VALUE mod, VALUE pyptr, VALUE name)
+{
+  PyObject *pyobj;
+
+  if (!is_pycall_pyptr(pyptr)) {
+    rb_raise(rb_eTypeError, "PyCall::PyPtr is required");
+  }
+
+  pyobj = get_pyobj_ptr(pyptr);
+
+  if (RB_TYPE_P(name, T_SYMBOL)) {
+    name = rb_sym_to_s(name);
+  }
+
+  if (Py_API(PyObject_DelAttrString)(pyobj, StringValueCStr(name)) == -1) {
+    pycall_pyerror_fetch_and_raise("PyObject_DelAttrString");
+  }
+
+  return Qnil;
+}
+
 static VALUE
 pycall_libpython_helpers_m_callable_p(VALUE mod, VALUE pyptr)
 {
@@ -1077,7 +1125,7 @@ pycall_pyobject_wrapper_wrapper_method(int argc, VALUE *argv, VALUE wrapper)
 static VALUE
 pycall_libpython_helpers_m_define_wrapper_method(VALUE mod, VALUE wrapper, VALUE name)
 {
-  VALUE pyptr, name_sym;
+  VALUE pyptr;
   PyObject *pyobj, *attr;
   char *name_cstr;
 
@@ -1089,12 +1137,8 @@ pycall_libpython_helpers_m_define_wrapper_method(VALUE mod, VALUE wrapper, VALUE
   pyobj = get_pyobj_ptr(pyptr);
 
   if (RB_TYPE_P(name, T_SYMBOL)) {
-    name_sym = name;
     name = rb_sym_to_s(name);
   }
-  else if (RB_TYPE_P(name, T_STRING)) {
-    name_sym = rb_str_intern(name);
-  }
 
   name_cstr = StringValueCStr(name);
   if (name_cstr[RSTRING_LEN(name) - 1] == '=') {
@@ -1189,7 +1233,7 @@ pycall_libpython_helpers_m_setitem(VALUE mod, VALUE pyptr, VALUE key, VALUE v)
 }
 
 static VALUE
-pycall_libpython_helpers_m_delitem(VALUE mod, VALUE pyptr, VALUE key, VALUE v)
+pycall_libpython_helpers_m_delitem(VALUE mod, VALUE pyptr, VALUE key)
 {
   PyObject *pyobj, *pyobj_key;
   int res;
@@ -1202,7 +1246,7 @@ pycall_libpython_helpers_m_delitem(VALUE mod, VALUE pyptr, VALUE key, VALUE v)
     pycall_pyerror_fetch_and_raise("PyObject_DelItem");
   }
 
-  return v;
+  return Qnil;
 }
 
 static VALUE
@@ -2017,6 +2061,8 @@ pycall_pyerror_fetch_and_raise(char const *format, ...)
   va_list args;
   VALUE pyerror, msg;
 
+  RBIMPL_NONNULL_ARG(format);
+
   pyerror = pycall_pyerror_fetch();
   if (!NIL_P(pyerror))
     rb_exc_raise(pyerror);
@@ -2074,11 +2120,24 @@ pycall_pystring_from_formatv(char const *format, va_list vargs)
 
 /* ==== Python ==== */
 
+int
+pycall_PyObject_DelAttrString(PyObject *pyobj, const char *attr_name)
+{
+  /* PyObject_DelAttrString is defined by using PyObject_SetAttrString in CPython's abstract.h */
+  return Py_API(PyObject_SetAttrString)(pyobj, attr_name, NULL);
+}
+
 static void
 init_python(void)
 {
   static char const *argv[1] = { "" };
 
+  /* optional functions */
+  if (! Py_API(PyObject_DelAttrString)) {
+    /* The case of PyObject_DelAttrString as a macro */
+    Py_API(PyObject_DelAttrString) = pycall_PyObject_DelAttrString;
+  }
+
   Py_API(Py_InitializeEx)(0);
   Py_API(PySys_SetArgvEx)(0, (char **)argv, 0);
 
@@ -2236,7 +2295,7 @@ Init_pycall(void)
 
   rb_define_module_function(mPyCall, "after_fork", pycall_after_fork, 0);
 
-  pycall_tls_create(&without_gvl_key);
+  pycall_tls_create((pycall_tls_key *)&without_gvl_key);
   rb_define_module_function(mPyCall, "without_gvl", pycall_m_without_gvl, 0);
 
   /* PyCall::PyPtr */
@@ -2301,6 +2360,8 @@ Init_pycall(void)
   rb_define_module_function(mHelpers, "compare", pycall_libpython_helpers_m_compare, 3);
   rb_define_module_function(mHelpers, "getattr", pycall_libpython_helpers_m_getattr, -1);
   rb_define_module_function(mHelpers, "hasattr?", pycall_libpython_helpers_m_hasattr_p, 2);
+  rb_define_module_function(mHelpers, "setattr", pycall_libpython_helpers_m_setattr, 3);
+  rb_define_module_function(mHelpers, "delattr", pycall_libpython_helpers_m_delattr, 2);
   rb_define_module_function(mHelpers, "callable?", pycall_libpython_helpers_m_callable_p, 1);
   rb_define_module_function(mHelpers, "call_object", pycall_libpython_helpers_m_call_object, -1);
   rb_define_module_function(mHelpers, "getitem", pycall_libpython_helpers_m_getitem, 2);

data/ext/pycall/pycall_internal.h

@@ -34,6 +34,22 @@ extern "C" {
 # error ---->> ruby requires sizeof(void*) == sizeof(long) or sizeof(LONG_LONG) to be compiled. <<----
 #endif
 
+#ifndef RUBY_ASSERT
+# define RUBY_ASSERT(expr) assert(expr)
+#endif
+
+#ifndef RBIMPL_ATTR_NONNULL
+# define RBIMPL_ATTR_NONNULL(list) /* void */
+#endif
+
+#ifndef RBIMPL_NONNULL_ARG
+# define RBIMPL_NONNULL_ARG(arg) RUBY_ASSERT(arg)
+#endif
+
+#ifndef RBIMPL_ATTR_FORMAT
+# define RBIMPL_ATTR_FORMAT(x, y, z) /* void */
+#endif
+
 #ifndef RB_INTEGER_TYPE_P
 # define RB_INTEGER_TYPE_P(obj) pycall_integer_type_p(obj)
 static inline int
@@ -568,6 +584,7 @@ typedef struct {
   PyObject * (* PyObject_GetAttrString)(PyObject *, char const *);
   int (* PyObject_SetAttrString)(PyObject *, char const *, PyObject *);
   int (* PyObject_HasAttrString)(PyObject *, char const *);
+  int (* PyObject_DelAttrString)(PyObject *, char const *);
   PyObject * (* PyObject_GetItem)(PyObject *, PyObject *);
   int (* PyObject_SetItem)(PyObject *obj, PyObject *key, PyObject *value);
   int (* PyObject_DelItem)(PyObject *, PyObject *);
@@ -692,6 +709,8 @@ PyObject *pycall_pylist_from_ruby(VALUE);
 PyObject *pycall_pydict_from_ruby(VALUE);
 PyObject *pycall_pyslice_from_ruby(VALUE);
 
+RBIMPL_ATTR_NONNULL((1))
+RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 1, 0)
 NORETURN(void pycall_pyerror_fetch_and_raise(char const *format, ...));
 
 unsigned long pycall_default_tp_flags(void);
@@ -714,7 +733,7 @@ void pycall_init_gcguard(void);
 void pycall_init_ruby_wrapper(void);
 
 #define pycall_hash_salt_32 0xb592cd9b
-extern long pycall_hash_salt;
+extern intptr_t pycall_hash_salt;
 extern VALUE pycall_mPyCall;
 extern VALUE pycall_cPyPtr;
 extern VALUE pycall_eError;

data/ext/pycall/ruby_wrapper.c

@@ -136,7 +136,7 @@ static void *
 PyRuby_hash_long(PyRubyObject *pyro)
 {
   VALUE obj, rbhash;
-  long h;
+  intptr_t h;
 
   obj = PyRuby_get_ruby_object_and_set_pyerr((PyObject *)pyro);
   if (obj == Qundef)
@@ -152,9 +152,9 @@ static long
 PyRuby_hash_long_with_gvl(PyRubyObject *pyro)
 {
   if (!ruby_thread_has_gvl_p()) {
-    return (long)CALL_WITH_GVL(PyRuby_hash_long, pyro);
+    return (long)(intptr_t)CALL_WITH_GVL(PyRuby_hash_long, pyro);
   }
-  return (long)PyRuby_hash_long(pyro);
+  return (long)(intptr_t)PyRuby_hash_long(pyro);
 }
 
 static void *
@@ -171,10 +171,10 @@ PyRuby_hash_hash_t(PyRubyObject *pyro)
 #if SIZEOF_PY_HASH_T == SIZEOF_LONG
   /* In this case, we can assume sizeof(Py_hash_t) == sizeof(long) */
   h = NUM2SSIZET(rbhash);
-  return (void *)(h == -1 ? (Py_hash_t)pycall_hash_salt : h);
+  return (void *)(h == -1 ? pycall_hash_salt : h);
 #else
   /* In this case, we can assume sizeof(long) == 4 and sizeof(Py_hash_t) == 8 */
-  h = (pycall_hash_salt_32 << 32) | FIX2LONG(rbhash);
+  h = ((Py_hash_t)pycall_hash_salt_32 << 32) | FIX2LONG(rbhash);
   return (void *)(h == -1 ? ((pycall_hash_salt << 32) | pycall_hash_salt) : h);
 #endif
 }

data/lib/pycall/pyobject_wrapper.rb

@@ -13,6 +13,12 @@ module PyCall
     end
 
     OPERATOR_METHOD_NAMES = {
+      # Unary operators
+      :+@ => :__pos__,
+      :-@ => :__neg__,
+      :~  => :__invert__,
+
+      # Binary operators
       :+  => :__add__,
       :-  => :__sub__,
       :*  => :__mul__,

data/lib/pycall/version.rb

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

data/lib/pycall.rb

@@ -59,6 +59,14 @@ module PyCall
     LibPython::Helpers.hasattr?(obj.__pyptr__, name)
   end
 
+  def setattr(obj, name, val)
+    LibPython::Helpers.setattr(obj.__pyptr__, name, val)
+  end
+
+  def delattr(obj, name)
+    LibPython::Helpers.delattr(obj.__pyptr__, name)
+  end
+
   def same?(left, right)
     case left
     when PyObjectWrapper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2023-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.3.13
 signing_key: 
 specification_version: 4
 summary: pycall