rubypython 0.6.1 → 0.6.2

data.tar.gz.sig

@@ -1,2 +1,2 @@
-��C_c��P�g��S�v�jG�j��
-}MK����(��)If�1:gL�-e�}�p�#
�w7Y�[!@�K\j���{kI�l�Y|�/'��S��J{���`%J3�bG��<X����f^�#*JVq�|������=�\q��R�8��L(�m��챣�%�5��m�_I%�f)���"<�:��2�I檻��3>�+Z׎���4�

����u������W�U� '�Q$��m��B94����
+������M��2*��{\l�W�0��1��?n��v{}<)�B���� �e%d\<n��{�"ۗD�qc�<7S()d{p�-x�C�O�Z�j[.�w�u�1��!���LI���x�>��Jݓ=Z����c\Ћ����z�Q:|�w�0�Hu�����k�q�0�*�d�r/�e| 0�m��5iRwypu0��6%ã����Rτ�M�
�KE�y��<p�;������
+��|�j��ʶ�>d���>av�

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.6.2 / 2012-05-24
+* Bug Fixes:
+  * Fixed a possible namespace collision bug with the FFI library. [Akzhan]
+
 === 0.6.1 / 2012-05-18
 * Bug Fixes:
   * Widened the library naming schemes that RubyPython will search for the Python library. [Akzhan]

data/lib/rubypython.rb

@@ -15,7 +15,7 @@
 #   puts cPickle.dumps("RubyPython is awesome!").rubify
 #   RubyPython.stop
 module RubyPython
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end
 
 require 'rubypython/blankobject'

data/lib/rubypython/conversion.rb

@@ -95,7 +95,7 @@ module RubyPython::Conversion
   # Convert a Ruby Proc to a \Python Function. Returns an FFI::Pointer to a
   # PyCFunction.
   def self.rtopFunction(rObj)
-    proc = FFI::Function.new(:pointer, [:pointer, :pointer]) do |p_self, p_args|
+    proc = ::FFI::Function.new(:pointer, [:pointer, :pointer]) do |p_self, p_args|
       retval = rObj.call(*ptorTuple(p_args))
       pObject = retval.is_a?(RubyPython::RubyPyProxy) ? retval.pObject : RubyPython::PyObject.new(retval)
 
@@ -105,7 +105,7 @@ module RubyPython::Conversion
     end
 
     defn = RubyPython::Python::PyMethodDef.new
-    defn[:ml_name] = FFI::MemoryPointer.from_string("RubyPython::Proc::%s" % rObj.object_id)
+    defn[:ml_name] = ::FFI::MemoryPointer.from_string("RubyPython::Proc::%s" % rObj.object_id)
     defn[:ml_meth] = proc
     defn[:ml_flags] = RubyPython::Python::METH_VARARGS
     defn[:ml_doc] = nil
@@ -169,17 +169,17 @@ module RubyPython::Conversion
   # Convert an FFI::Pointer to a \Python String (PyStringObject) to a Ruby
   # String.
   def self.ptorString(pString)
-    strPtr  = FFI::MemoryPointer.new(:pointer)
-    sizePtr = FFI::MemoryPointer.new(:ssize_t)
+    strPtr  = ::FFI::MemoryPointer.new(:pointer)
+    sizePtr = ::FFI::MemoryPointer.new(:ssize_t)
 
     RubyPython::Python.PyString_AsStringAndSize(pString, strPtr, sizePtr)
 
-    size = case FFI.find_type(:ssize_t)
-           when FFI.find_type(:long)
+    size = case ::FFI.find_type(:ssize_t)
+           when ::FFI.find_type(:long)
              sizePtr.read_long
-           when FFI.find_type(:int)
+           when ::FFI.find_type(:int)
              sizePtr.read_int
-           when FFI.find_type(:long_long)
+           when ::FFI.find_type(:long_long)
              sizePtr.read_long_long
            else
              nil
@@ -237,10 +237,10 @@ module RubyPython::Conversion
   def self.ptorDict(pDict)
     rb_hash = {}
 
-    pos = FFI::MemoryPointer.new :ssize_t
+    pos = ::FFI::MemoryPointer.new :ssize_t
     pos.write_int 0
-    key = FFI::MemoryPointer.new :pointer
-    val = FFI::MemoryPointer.new :pointer
+    key = ::FFI::MemoryPointer.new :pointer
+    val = ::FFI::MemoryPointer.new :pointer
 
     while RubyPython::Python.PyDict_Next(pDict, pos, key, val) != 0
       pKey = key.read_pointer

data/lib/rubypython/interpreter.rb

@@ -47,7 +47,7 @@ class RubyPython::Interpreter
     rc, @version    = runpy "import sys; print '%d.%d' % sys.version_info[:2]"
     rc, @sys_prefix = runpy "import sys; print sys.prefix"
 
-    if FFI::Platform.windows?
+    if ::FFI::Platform.windows?
       flat_version  = @version.tr('.', '')
       basename      = File.basename(@python, '.exe')
 
@@ -72,15 +72,15 @@ class RubyPython::Interpreter
   def find_python_lib
     # By default, the library name will be something like
     # libpython2.6.so, but that won't always work.
-    @libbase = "#{FFI::Platform::LIBPREFIX}#{@version_name}"
-    @libext = FFI::Platform::LIBSUFFIX
+    @libbase = "#{::FFI::Platform::LIBPREFIX}#{@version_name}"
+    @libext = ::FFI::Platform::LIBSUFFIX
     @libname = "#{@libbase}.#{@libext}"
 
     # We may need to look in multiple locations for Python, so let's
     # build this as an array.
     @locations = [ File.join(@sys_prefix, "lib", @libname) ]
 
-    if FFI::Platform.mac?
+    if ::FFI::Platform.mac?
       # On the Mac, let's add a special case that has even a different
       # @libname. This may not be fully useful on future versions of OS
       # X, but it should work on 10.5 and 10.6. Even if it doesn't, the
@@ -92,12 +92,12 @@ class RubyPython::Interpreter
       File.join(@sys_prefix, "lib", "#{@realname}", "config", @libname)
     end
 
-    if FFI::Platform.unix?
+    if ::FFI::Platform.unix?
       # On Unixes, let's look in some standard alternative places, too.
       # Just in case. Some Unixes don't include a .so symlink when they
       # should, so let's look for the base cases of .so.1 and .so.1.0, too.
       [ @libname, "#{@libname}.1", "#{@libname}.1.0" ].each do |name|
-        if FFI::Platform::ARCH != 'i386'
+        if ::FFI::Platform::ARCH != 'i386'
           @locations << File.join("/opt/local/lib64", name)
           @locations << File.join("/opt/lib64", name)
           @locations << File.join("/usr/local/lib64", name)
@@ -110,7 +110,7 @@ class RubyPython::Interpreter
       end
     end
 
-    if FFI::Platform.windows?
+    if ::FFI::Platform.windows?
       # On Windows, the appropriate DLL is usually be found in
       # %SYSTEMROOT%\system or %SYSTEMROOT%\system32; as a fallback we'll
       # use C:\Windows\system{,32} as well as the install directory and the
@@ -190,7 +190,7 @@ class RubyPython::Interpreter
   # Run a Python command-line command.
   def runpy(command)
     i = @python || @python_exe || 'python'
-    if FFI::Platform.windows?
+    if ::FFI::Platform.windows?
       o = %x(#{i} -c "#{command}" 2> NUL:)
     else
       o = %x(#{i} -c "#{command}" 2> /dev/null)
@@ -212,9 +212,9 @@ class RubyPython::Interpreter
 
   def debug_s(format = nil)
     system = ""
-    system << "windows " if FFI::Platform.windows?
-    system << "mac " if FFI::Platform.mac?
-    system << "unix " if FFI::Platform.unix?
+    system << "windows " if ::FFI::Platform.windows?
+    system << "mac " if ::FFI::Platform.mac?
+    system << "unix " if ::FFI::Platform.unix?
     system << "unknown " if system.empty?
 
     case format

data/lib/rubypython/pygenerator.rb

@@ -42,7 +42,7 @@ def rubypython_generator(callback):
           fib = Fiber.new do
             yield *args
             Python.PyErr_SetNone(Python.PyExc_StopIteration)
-            FFI::Pointer::NULL
+            ::FFI::Pointer::NULL
           end
           generator_type.__call__(lambda { fib.resume })
         end

data/lib/rubypython/pyobject.rb

@@ -11,7 +11,7 @@ class RubyPython::PyObject # :nodoc: all
   # This class wraps C <tt>Py…Object</tt>s so that the RubyPython::Python
   # reference count is automatically decreased when the Ruby object
   # referencing them goes out of scope.
-  class AutoPyPointer < FFI::AutoPointer # :nodoc:
+  class AutoPyPointer < ::FFI::AutoPointer # :nodoc:
     class << self
       # Keeps track of which objects are associated with the currently
       # running RubyPython::Python interpreter, so that RubyPython knows not
@@ -57,11 +57,11 @@ class RubyPython::PyObject # :nodoc: all
   # and wrapped in an AutoPyPointer. The conversion is done with
   # +RubyPython::Conversion.rtopObject+.
   def initialize(rObject)
-    if rObject.kind_of? FFI::AutoPointer
-      new_pointer = FFI::Pointer.new rObject
+    if rObject.kind_of? ::FFI::AutoPointer
+      new_pointer = ::FFI::Pointer.new rObject
       @pointer = AutoPyPointer.new new_pointer
       xIncref
-    elsif rObject.kind_of? FFI::Pointer
+    elsif rObject.kind_of? ::FFI::Pointer
       @pointer = AutoPyPointer.new rObject
     else
       @pointer = AutoPyPointer.new RubyPython::Conversion.rtopObject(rObject)

data/lib/rubypython/python.rb

@@ -18,7 +18,7 @@ class RubyPython::Interpreter
         undef :infect!
       end
 
-      mod.extend FFI::Library
+      mod.extend ::FFI::Library
       # FFI::DynamicLibrary::RTLD_LAZY | FFI::DynamicLibrary::RTLD_GLOBAL
       mod.ffi_lib_flags :lazy, :global
       mod.ffi_lib self.library
@@ -26,7 +26,7 @@ class RubyPython::Interpreter
       # This class is a little bit of a hack to extract the address of
       # global structs. If someone knows a better way please let me know.
       mod.module_eval do
-        self.const_set :DummyStruct, Class.new(FFI::Struct)
+        self.const_set :DummyStruct, Class.new(::FFI::Struct)
         self::DummyStruct.layout :dummy_var, :int
 
         self.const_set(:PY_FILE_INPUT, 257)
@@ -177,12 +177,12 @@ class RubyPython::Interpreter
         # struct. The C struct is actually much larger, but since we only access
         # the first two data members via FFI and always deal with struct
         # pointers there is no need to mess around with the rest of the object.
-        self.const_set :PyObjectStruct, Class.new(FFI::Struct)
+        self.const_set :PyObjectStruct, Class.new(::FFI::Struct)
         self::PyObjectStruct.layout :ob_refcnt, :ssize_t,
           :ob_type, :pointer
 
         # This struct is used when defining Python methods.
-        self.const_set :PyMethodDef, Class.new(FFI::Struct)
+        self.const_set :PyMethodDef, Class.new(::FFI::Struct)
         self::PyMethodDef.layout :ml_name, :pointer,
           :ml_meth, :PyCFunction,
           :ml_flags, :int,

data/lib/rubypython/pythonerror.rb

@@ -56,9 +56,9 @@ class RubyPython::PythonError < RuntimeError
   # with three PyObject instances, representing the Type, the Value, and the
   # stack trace of the Python error.
   def self.fetch
-    typePointer = FFI::MemoryPointer.new :pointer
-    valuePointer = FFI::MemoryPointer.new :pointer
-    tracebackPointer = FFI::MemoryPointer.new :pointer
+    typePointer = ::FFI::MemoryPointer.new :pointer
+    valuePointer = ::FFI::MemoryPointer.new :pointer
+    tracebackPointer = ::FFI::MemoryPointer.new :pointer
 
     RubyPython::Python.PyErr_Fetch typePointer, valuePointer, tracebackPointer
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubypython
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -39,11 +39,11 @@ cert_chain:
   OWdkQjNqVmViN0puVExZK1dsSFd0MnJGVmJlcXY3S3RKbHA3KzR1V01La3pU
   YlcvdWpkRwpjZ3VKTWlRQ1NPbFVQWnhDV1dNa2pmWmJYdnRTNVZkekpldlNx
   UT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70327225730940 !ruby/object:Gem::Requirement
+  requirement: &70207972655700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -51,10 +51,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70327225730940
+  version_requirements: *70207972655700
 - !ruby/object:Gem::Dependency
   name: blankslate
-  requirement: &70327225730320 !ruby/object:Gem::Requirement
+  requirement: &70207972655080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +62,10 @@ dependencies:
         version: 2.1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70327225730320
+  version_requirements: *70207972655080
 - !ruby/object:Gem::Dependency
   name: rubyforge
-  requirement: &70327225729260 !ruby/object:Gem::Requirement
+  requirement: &70207972653860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,10 +73,10 @@ dependencies:
         version: 2.0.4
   type: :development
   prerelease: false
-  version_requirements: *70327225729260
+  version_requirements: *70207972653860
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70327225727800 !ruby/object:Gem::Requirement
+  requirement: &70207972652560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -84,10 +84,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70327225727800
+  version_requirements: *70207972652560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70327225726700 !ruby/object:Gem::Requirement
+  requirement: &70207972651440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -95,10 +95,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70327225726700
+  version_requirements: *70207972651440
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70327225725280 !ruby/object:Gem::Requirement
+  requirement: &70207972649980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -106,10 +106,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70327225725280
+  version_requirements: *70207972649980
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70327225723880 !ruby/object:Gem::Requirement
+  requirement: &70207972648560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,7 +117,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70327225723880
+  version_requirements: *70207972648560
 description: ! 'RubyPython is a bridge between the Ruby and Python interpreters. It
   embeds a