pycall 1.0.3 → 1.3.1

data/ext/pycall/thread.c

@@ -0,0 +1,36 @@
+#include "pycall_internal.h"
+
+#if defined(PYCALL_THREAD_WIN32)
+int pycall_tls_create(pycall_tls_key *tls_key)
+{
+  *tls_key = TlsAlloc();
+  return *tls_key == TLS_OUT_OF_INDEXES;
+}
+
+void *pycall_tls_get(pycall_tls_key tls_key)
+{
+  return TlsGetValue(tls_key);
+}
+
+int pycall_tls_set(pycall_tls_key tls_key, void *ptr)
+{
+  return 0 == TlsSetValue(tls_key, ptr);
+}
+#endif
+
+#if defined(PYCALL_THREAD_PTHREAD)
+int pycall_tls_create(pycall_tls_key *tls_key)
+{
+  return pthread_key_create(tls_key, NULL);
+}
+
+void *pycall_tls_get(pycall_tls_key tls_key)
+{
+  return pthread_getspecific(tls_key);
+}
+
+int pycall_tls_set(pycall_tls_key tls_key, void *ptr)
+{
+  return pthread_setspecific(tls_key, ptr);
+}
+#endif

data/lib/pycall.rb

@@ -4,6 +4,7 @@ module PyCall
   require 'pycall/pyerror'
   require 'pycall/pyobject_wrapper'
   require 'pycall/pytypeobject_wrapper'
+  require 'pycall/pymodule_wrapper'
   require 'pycall/init'
 
   module_function
@@ -48,6 +49,15 @@ module PyCall
     end
   end
 
+  def getattr(*args)
+    obj, *rest = args
+    LibPython::Helpers.getattr(obj.__pyptr__, *rest)
+  end
+
+  def hasattr?(obj, name)
+    LibPython::Helpers.hasattr?(obj.__pyptr__, name)
+  end
+
   def import_module(name)
     LibPython::Helpers.import_module(name)
   end

data/lib/pycall/dict.rb

@@ -33,9 +33,9 @@ module PyCall
       v
     end
 
-    def each
+    def each(&block)
       return enum_for unless block_given?
-      LibPython::Helpers.dict_each(__pyptr__, &proc)
+      LibPython::Helpers.dict_each(__pyptr__, &block)
       self
     end
 

data/lib/pycall/iruby_helper.rb

@@ -1,4 +1,4 @@
-require 'pycall'
+require 'pycall' unless defined?(::PyCall)
 require 'iruby'
 
 module PyCall

data/lib/pycall/libpython/finder.rb

@@ -19,29 +19,26 @@ module PyCall
       LIBSUFFIX = libsuffix || 'so'
 
       class << self
+        DEFAULT_PYTHON = [
+          -'python3',
+          -'python',
+        ].freeze
+
+        def find_python_config(python = nil)
+          python ||= DEFAULT_PYTHON
+          Array(python).each do |python_cmd|
+            begin
+              python_config = investigate_python_config(python_cmd)
+              return [python_cmd, python_config] unless python_config.empty?
+            rescue
+            end
+          end
+          raise ::PyCall::PythonNotFound
+        end
+
         def find_libpython(python = nil)
           debug_report("find_libpython(#{python.inspect})")
-	  if python
-	    begin
-	      python_config = investigate_python_config(python)
-	    rescue
-              raise ::PyCall::PythonNotFound
-	    end
-          else
-            %w[python python3].each do |python_cmd|
-	      begin
-		python_config = investigate_python_config(python_cmd)
-		python = python_cmd
-                break
-	      rescue
-		raise ::PyCall::PythonNotFound
-	      end
-	    end
-	  end
-
-          set_PYTHONHOME(python_config)
-          libs = make_libs(python_config)
-          libpaths = make_libpaths(python_config)
+          python, python_config = find_python_config(python)
 
           # Try LIBPYTHON environment variable first.
           if (libpython = ENV['LIBPYTHON'])
@@ -58,6 +55,9 @@ module PyCall
           end
 
           # Find libpython (we hope):
+          set_PYTHONHOME(python_config)
+          libs = make_libs(python_config)
+          libpaths = make_libpaths(python_config)
           multiarch = python_config[:MULTIARCH] || python_config[:multiarch]
           libs.each do |lib|
             libpaths.each do |libpath|
@@ -101,6 +101,7 @@ module PyCall
           IO.popen(python_env, [python, python_investigator_py], 'r') do |io|
             {}.tap do |config|
               io.each_line do |line|
+                next unless line =~ /: /
                 key, value = line.chomp.split(': ', 2)
                 case value
                 when 'True', 'true', 'False', 'false'
@@ -119,7 +120,7 @@ module PyCall
         end
 
         def set_PYTHONHOME(python_config)
-          if !ENV.has_key?('PYTHONHOME') && python_config[:conda]
+          if !ENV.has_key?('PYTHONHOME')
             case RUBY_PLATFORM
             when /mingw32/, /cygwin/, /mswin/
               ENV['PYTHONHOME'] = python_config[:exec_prefix]

data/lib/pycall/list.rb

@@ -13,9 +13,9 @@ module PyCall
       PyCall.len(self)
     end
 
-    def each
+    def each(&block)
       return enum_for unless block_given?
-      LibPython::Helpers.sequence_each(__pyptr__, &proc)
+      LibPython::Helpers.sequence_each(__pyptr__, &block)
       self
     end
 

data/lib/pycall/pymodule_wrapper.rb

@@ -0,0 +1,46 @@
+require 'pycall/pyobject_wrapper'
+
+module PyCall
+  module PyModuleWrapper
+    include PyObjectWrapper
+
+    def [](*args)
+      case args[0]
+      when String, Symbol
+        PyCall.getattr(self, args[0])
+      else
+        super
+      end
+    end
+  end
+
+  module_function
+
+  class WrapperModuleCache < WrapperObjectCache
+    def initialize
+      super(LibPython::API::PyModule_Type)
+    end
+
+    def check_wrapper_object(wrapper_object)
+      unless wrapper_object.kind_of?(Module) && wrapper_object.kind_of?(PyObjectWrapper)
+        raise TypeError, "unexpected type #{wrapper_object.class} (expected Module extended by PyObjectWrapper)"
+      end
+    end
+
+    def self.instance
+      @instance ||= self.new
+    end
+  end
+
+  private_constant :WrapperModuleCache
+
+  def wrap_module(pymodptr)
+    check_ismodule(pymodptr)
+    WrapperModuleCache.instance.lookup(pymodptr) do
+      Module.new do |mod|
+        mod.instance_variable_set(:@__pyptr__, pymodptr)
+        mod.extend PyModuleWrapper
+      end
+    end
+  end
+end

data/lib/pycall/pyobject_wrapper.rb

@@ -170,43 +170,15 @@ module PyCall
 
   module_function
 
-  class WrapperModuleCache < WrapperObjectCache
-    def initialize
-      super(LibPython::API::PyModule_Type)
-    end
-
-    def check_wrapper_object(wrapper_object)
-      unless wrapper_object.kind_of?(Module) && wrapper_object.kind_of?(PyObjectWrapper)
-        raise TypeError, "unexpected type #{wrapper_object.class} (expected Module extended by PyObjectWrapper)"
-      end
-    end
-
-    def self.instance
-      @instance ||= self.new
-    end
-  end
-
-  private_constant :WrapperModuleCache
-
-  def wrap_module(pymodptr)
-    check_ismodule(pymodptr)
-    WrapperModuleCache.instance.lookup(pymodptr) do
-      Module.new do |mod|
-        mod.instance_variable_set(:@__pyptr__, pymodptr)
-        mod.extend PyObjectWrapper
-      end
-    end
+  def check_ismodule(pyptr)
+    return if pyptr.kind_of? LibPython::API::PyModule_Type
+    raise TypeError, "PyModule object is required"
   end
 
   def check_isclass(pyptr)
     pyptr = pyptr.__pyptr__ if pyptr.kind_of? PyObjectWrapper
     return if pyptr.kind_of? LibPython::API::PyType_Type
-    return defined?(LibPython::API::PyClass_Type) && pyptr.kind_of?(LibPython::API::PyClass_Type)
+    return if defined?(LibPython::API::PyClass_Type) && pyptr.kind_of?(LibPython::API::PyClass_Type)
     raise TypeError, "PyType object is required"
   end
-
-  def check_ismodule(pyptr)
-    return if pyptr.kind_of? LibPython::API::PyModule_Type
-    raise TypeError, "PyModule object is required"
-  end
 end

data/lib/pycall/python/investigator.py

@@ -1,12 +1,8 @@
 from distutils.sysconfig import get_config_var
 import sys
 
-def conda():
-    return 'conda' in sys.version or 'Continuum' in sys.version
-
 for var in ('executable', 'exec_prefix', 'prefix'):
   print(var + ': ' + str(getattr(sys, var)))
-print('conda: ' + ('true' if conda() else 'false'))
 print('multiarch: ' + str(getattr(getattr(sys, 'implementation', sys), '_multiarch', None)))
 for var in ('VERSION', 'INSTSONAME', 'LIBRARY', 'LDLIBRARY', 'LIBDIR', 'PYTHONFRAMEWORKPREFIX', 'MULTIARCH'):
   print(var + ': ' + str(get_config_var(var)))

data/lib/pycall/pytypeobject_wrapper.rb

@@ -49,6 +49,25 @@ module PyCall
       end
     end
 
+    def <(other)
+      case other
+      when self
+        false
+      when PyTypeObjectWrapper
+        __pyptr__ < other.__pyptr__
+      when Class
+        false if other.ancestors.include?(self)
+      when Module
+        if ancestors.include?(other)
+          true
+        elsif other.ancestors.include?(self)
+          false
+        end
+      else
+        raise TypeError, "compared with non class/module"
+      end
+    end
+
     private
 
     def register_python_type_mapping

data/lib/pycall/version.rb

@@ -1,3 +1,9 @@
 module PyCall
-  VERSION = "1.0.3"
+  VERSION = "1.3.1"
+
+  module Version
+    numbers, TAG = VERSION.split("-")
+    MAJOR, MINOR, MICRO = numbers.split(".").map(&:to_i)
+    STRING = VERSION
+  end
 end

data/pycall.gemspec

@@ -5,7 +5,13 @@ require 'pycall/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "pycall"
-  spec.version       = PyCall::VERSION
+  version_components = [
+    PyCall::Version::MAJOR.to_s,
+    PyCall::Version::MINOR.to_s,
+    PyCall::Version::MICRO.to_s,
+    PyCall::Version::TAG,
+  ]
+  spec.version       = version_components.compact.join(".")
   spec.authors       = ["Kenta Murata"]
   spec.email         = ["mrkn@mrkn.jp"]
 
@@ -17,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     case f
     when %r{^Guardfile},  # NOTE: Skip symlink for Windows
+         %r{^ext/pycall/spec_helper/},
          %r{^(test|spec|features)/}
       true
     else
@@ -29,11 +36,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/pycall/extconf.rb"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "rake-compiler-dock"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "launchy"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.3.1
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,7 @@ extensions:
 - ext/pycall/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -167,11 +168,14 @@ files:
 - ext/pycall/gc.c
 - ext/pycall/libpython.c
 - ext/pycall/pycall.c
+- ext/pycall/pycall.h
 - ext/pycall/pycall_internal.h
 - ext/pycall/range.c
 - ext/pycall/ruby_wrapper.c
+- ext/pycall/thread.c
+- images/pycallrb_logo.png
+- images/pycallrb_logo_200.png
 - lib/pycall.rb
-- lib/pycall/conversion.rb
 - lib/pycall/dict.rb
 - lib/pycall/error.rb
 - lib/pycall/gc_guard.rb
@@ -185,6 +189,7 @@ files:
 - lib/pycall/list.rb
 - lib/pycall/pretty_print.rb
 - lib/pycall/pyerror.rb
+- lib/pycall/pymodule_wrapper.rb
 - lib/pycall/pyobject_wrapper.rb
 - lib/pycall/python/PyCall/__init__.py
 - lib/pycall/python/PyCall/six.py
@@ -192,7 +197,6 @@ files:
 - lib/pycall/pytypeobject_wrapper.rb
 - lib/pycall/set.rb
 - lib/pycall/slice.rb
-- lib/pycall/tuple.rb
 - lib/pycall/version.rb
 - lib/pycall/wrapper_object_cache.rb
 - pycall.gemspec
@@ -217,8 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: pycall