Fix PyCall.import_module for callables

Author: mrkn

lib/pycall/import.rb

@@ -53,8 +53,8 @@ def pyfrom(mod_name, import: nil)
           name, asname = import_name, import_name
         end
 
-        if mod.respond_to? name
-          pyobj = mod.__send__ name
+        if PyCall::LibPython::Helpers.hasattr?(mod.__pyptr__, name)
+          pyobj = PyCall::LibPython::Helpers.getattr(mod.__pyptr__, name)
           define_name(asname, pyobj)
           next
         end
@@ -77,12 +77,18 @@ def pyfrom(mod_name, import: nil)
     private
 
     def define_name(name, pyobj)
-      if constant_name?(name)
-        context = self
-        context = (self == PyCall::Import.main_object) ? Object : self
-        context.module_eval { const_set(name, pyobj) }
+      if callable?(pyobj) && !type_object?(pyobj)
+        define_singleton_method(name) do |*args|
+          LibPython::Helpers.call_object(pyobj.__pyptr__, *args)
+        end
       else
-        define_singleton_method(name) { pyobj }
+        if constant_name?(name)
+          context = self
+          context = (self == PyCall::Import.main_object) ? Object : self
+          context.module_eval { const_set(name, pyobj) }
+        else
+          define_singleton_method(name) { pyobj }
+        end
       end
     end
 
@@ -102,5 +108,13 @@ def assoc_array_matcher
         ary.is_a?(Array) && ary.length == 2
       end
     end
+
+    def callable?(pyobj)
+      LibPython::Helpers.callable?(pyobj.__pyptr__)
+    end
+
+    def type_object?(pyobj)
+      pyobj.__pyptr__.kind_of? PyTypePtr
+    end
   end
 end

spec/pycall/import_spec.rb

@@ -50,9 +50,10 @@ module PyCall
         it 'defines methods with the given names in the Hash values' do
           expect(mod).not_to be_respond_to(:foo)
           expect(mod).not_to be_respond_to(:bar)
-          mod.pyfrom 'pycall.import_test', import: { Foo: :foo, TestClass: :bar }
+          mod.pyfrom 'pycall.import_test', import: { Foo: :foo, TestClass: :bar, to_list: :to_list }
           expect(mod.foo).to be_kind_of(PyTypeObjectWrapper)
           expect(mod.bar).to be_kind_of(PyObjectWrapper)
+          expect(mod.to_list(42)).to eq(PyCall::List.new([42]))
         end
       end
 

spec/python/pycall/import_test/__init__.py

@@ -1,2 +1,5 @@
 class Foo:
     pass
+
+def to_list(x):
+    return [x]