pycall 0.1.0.alpha.20170308 → 0.1.0.alpha.20170309

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 438d4095d0ef876b3a9593ee86a5608851cc5384
-  data.tar.gz: 044d40dcceed8e34a5c3a701a60fa7baf7879d5f
+  metadata.gz: e9498fcad907f67277117e9e637247b85228485e
+  data.tar.gz: b0981d9a5d30e35d80480905381210323d86d852
 SHA512:
-  metadata.gz: 9928a513029558ef850a99c209ab9a821037a9473406f5f6159d873d535a72ca9869ccd82a241444bcf64a25909b1c6c41e1b2a4393a7cd89645f3063efb9a7e
-  data.tar.gz: e04f844e7d2d239556ca4e32c82a6ea4e8a40bc7f53dcd9bf30700bdd02269abed6c63a81d060a36954d87897db170021c0da4fee7a80740eace43df65c4b023
+  metadata.gz: 20a307abbe8494a1bfb584d1a9c7acceea1f10ad1c7416e01adb2320a8c62f3a315ab1c25693c227ee984319c8139d0c78498df9c2fbee5f5fa8af63679ce678
+  data.tar.gz: 17aae937f321ae1590e4c8bbf089b6024288defe20457282908d090fb6c56a3c7641dd171d5dd832115ac2515b459236364a6f6ee1310c7507b19eb69032bb1a

data/lib/pycall/conversion.rb

@@ -45,6 +45,8 @@ module PyCall
 
     def self.from_ruby(obj)
       case obj
+      when LibPython::PyObjectStruct
+        obj
       when PyObject, PyObjectWrapper
         obj.__pyobj__
       when TrueClass, FalseClass

data/lib/pycall/pyerror.rb

@@ -7,9 +7,9 @@ module PyCall
       ptraceback = ptrs + 2 * ptrs.type_size
       LibPython.PyErr_Fetch(ptype, pvalue, ptraceback)
       LibPython.PyErr_NormalizeException(ptype, pvalue, ptraceback)
-      type = PyObject.new(LibPython::PyObjectStruct.new(ptype.read(:pointer)))
-      value = PyObject.new(LibPython::PyObjectStruct.new(pvalue.read(:pointer)))
-      traceback = PyObject.new(LibPython::PyObjectStruct.new(ptraceback.read(:pointer)))
+      type = Conversions.to_ruby(LibPython::PyObjectStruct.new(ptype.read(:pointer)))
+      value = Conversions.to_ruby(LibPython::PyObjectStruct.new(pvalue.read(:pointer)))
+      traceback = Conversions.to_ruby(LibPython::PyObjectStruct.new(ptraceback.read(:pointer)))
       new(type, value, traceback)
     end
 
@@ -23,7 +23,7 @@ module PyCall
     attr_reader :type, :value, :traceback
 
     def message
-      "#{PyObject.new(type.to_ptr)}: #{value}".tap do |msg|
+      "#{type}: #{value}".tap do |msg|
         unless traceback.null?
           if (o = PyCall.format_traceback(traceback))
             msg.concat("\n", *o)

data/lib/pycall/pyobject_wrapper.rb

@@ -122,41 +122,41 @@ module PyCall
 
     def +(other)
       other = Conversions.from_ruby(other)
-      value = LibPython.PyNumber_Add(self, other)
+      value = LibPython.PyNumber_Add(__pyobj__, other)
       return value.to_ruby unless value.null?
       raise PyError.fetch
     end
 
     def -(other)
       other = Conversions.from_ruby(other)
-      value = LibPython.PyNumber_Subtract(self, other)
+      value = LibPython.PyNumber_Subtract(__pyobj__, other)
       return value.to_ruby unless value.null?
       raise PyError.fetch
     end
 
     def *(other)
       other = Conversions.from_ruby(other)
-      value = LibPython.PyNumber_Multiply(self, other)
+      value = LibPython.PyNumber_Multiply(__pyobj__, other)
       return value.to_ruby unless value.null?
       raise PyError.fetch
     end
 
     def /(other)
       other = Conversions.from_ruby(other)
-      value = LibPython.PyNumber_TrueDivide(self, other)
+      value = LibPython.PyNumber_TrueDivide(__pyobj__, other)
       return value.to_ruby unless value.null?
       raise PyError.fetch
     end
 
     def **(other)
       other = Conversions.from_ruby(other)
-      value = LibPython.PyNumber_Power(self, other, PyCall.None)
+      value = LibPython.PyNumber_Power(__pyobj__, other, PyCall.None)
       return value.to_ruby unless value.null?
       raise PyError.fetch
     end
 
     def coerce(other)
-      [Conversions.from_ruby(other), self]
+      [PyObject.new(Conversions.from_ruby(other)), self]
     end
 
     def call(*args, **kwargs)

data/lib/pycall/utils.rb

@@ -2,7 +2,7 @@ module PyCall
   module Utils
     def append_sys_path(path_str)
       pyobj = LibPython.PyUnicode_DecodeUTF8(path_str, path_str.bytesize, nil)
-      sys.path.append.(pyobj)
+      sys.path << pyobj
     end
 
     def callable?(pyobj)

data/lib/pycall/version.rb

@@ -1,3 +1,3 @@
 module PyCall
-  VERSION = "0.1.0.alpha.20170308"
+  VERSION = "0.1.0.alpha.20170309"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.20170308
+  version: 0.1.0.alpha.20170309
 platform: ruby
 authors:
 - Kenta Murata