pycall 0.1.0.alpha.20170403 → 0.1.0.alpha.20170419

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f71e741e2100584c7f767b479215f6738a1c2766
-  data.tar.gz: 86c1b2baafb99c7a4252bb24837b9b43ca3dc445
+  metadata.gz: 220ffefcf04f5d0eaeed99447b88e9c2df85be7e
+  data.tar.gz: 39549ff7df8bbe36cd9004438cb8c663ca150cd8
 SHA512:
-  metadata.gz: 16301b5fbff74a7beff8f64a1937a15868edd9666e89219f935d293a6f80f5b1aa9df64619a9a6addd0ef825349262b37aa4f19a7aff73d32a9e47140a879889
-  data.tar.gz: 1dc51fde23af83ae1dd7a161035f53890e4d52d08bc0ca05daf95d7cc23dc89c0b4a9ca86f687fc52a422fdf8fe269e824017b12be7a89c316cdcf90a04f23ab
+  metadata.gz: 3bf207903eda56329bd667660235994698b867d1a00a197da4053b19a0fb20cb98c9721bbd65a47954a1056e1c42f86e81167036de5f75083c23d84d7764f2a4
+  data.tar.gz: 97283d06818c407cff5b6fda9e394bf6a85875f7193748ad6a79e85d296a5e26fcd8ae5a84c01bdb52d9ec2905ab50e68c0f37033ebb4c0000f2fa38c6273670

data/lib/pycall/eval.rb

@@ -1,12 +1,20 @@
 module PyCall
   module Eval
+    Py_file_input = 257
     Py_eval_input = 258
 
-    def self.eval(str, filename: "pycall")
+    def self.input_type(sym)
+      return Py_file_input if sym == :file
+      return Py_eval_input if sym == :eval
+      raise ArgumentError, "Unknown input_type for compile Python code"
+    end
+
+    def self.eval(str, filename: "pycall", input_type: :eval)
+      input_type = self.input_type(input_type)
       globals_ptr = main_dict.__pyobj__
       locals_ptr = main_dict.__pyobj__
       defer_sigint do
-        py_code_ptr = LibPython.Py_CompileString(str, filename, Py_eval_input)
+        py_code_ptr = LibPython.Py_CompileString(str, filename, input_type)
         raise PyError.fetch if py_code_ptr.null?
         LibPython.PyEval_EvalCode(py_code_ptr, globals_ptr, locals_ptr)
       end
@@ -42,8 +50,8 @@ module PyCall
     end
   end
 
-  def self.eval(str, conversion: true)
-    result = Eval.eval(str)
+  def self.eval(str, conversion: true, filename: "pycall", input_type: :eval)
+    result = Eval.eval(str, filename: filename, input_type: input_type)
     conversion ? result.to_ruby : result
   end
 end

data/lib/pycall/libpython.rb

@@ -191,7 +191,6 @@ module PyCall
     attach_function :PyObject_HasAttrString, [PyObjectStruct.by_ref, :string], :int
     attach_function :PyObject_GetItem, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], PyObjectStruct.by_ref
     attach_function :PyObject_SetItem, [PyObjectStruct.by_ref, PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
-    attach_function :PyObject_DelItem, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
     attach_function :PyObject_Call, [PyObjectStruct.by_ref, PyObjectStruct.by_ref, PyObjectStruct.by_ref], PyObjectStruct.by_ref
     attach_function :PyObject_IsInstance, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
     attach_function :PyObject_Dir, [PyObjectStruct.by_ref], PyObjectStruct.by_ref
@@ -280,8 +279,6 @@ module PyCall
 
     attach_function :PyList_New, [:ssize_t], PyObjectStruct.by_ref
     attach_function :PyList_Size, [PyObjectStruct.by_ref], :ssize_t
-    attach_function :PyList_GetItem, [PyObjectStruct.by_ref, :ssize_t], PyObjectStruct.by_ref
-    attach_function :PyList_SetItem, [PyObjectStruct.by_ref, :ssize_t, PyObjectStruct.by_ref], :int
     attach_function :PyList_Append, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
 
     # Sequence
@@ -309,8 +306,6 @@ module PyCall
 
     attach_function :PySet_Size, [PyObjectStruct.by_ref], :ssize_t
     attach_function :PySet_Contains, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
-    attach_function :PySet_Add, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
-    attach_function :PySet_Discard, [PyObjectStruct.by_ref, PyObjectStruct.by_ref], :int
 
     # Module
 

data/lib/pycall/utils.rb

@@ -79,6 +79,13 @@ module PyCall
       @type.(pyobj)
     end
 
+    def with(ctx)
+      __exit__ = PyCall.getattr(ctx, :__exit__)
+      yield PyCall.getattr(ctx,:__enter__).()
+    ensure
+      __exit__.()
+    end
+
     def format_traceback(pyobj)
       @format_tb ||= import_module('traceback').format_tb
       @format_tb.(pyobj)

data/lib/pycall/version.rb

@@ -1,3 +1,3 @@
 module PyCall
-  VERSION = "0.1.0.alpha.20170403"
+  VERSION = "0.1.0.alpha.20170419"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.20170403
+  version: 0.1.0.alpha.20170419
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi