rubypython 0.6.2 → 0.6.3

data/Contributors.rdoc

@@ -8,3 +8,4 @@ RubyPython has a growing list of contributors.
 * Austin Ziegler (halostatue)
 * Aman Gupta (tmm1)
 * Ben Doerr (bendoerr)
+* Akzhan Abdulin (azkhan)

data/History.rdoc

@@ -1,3 +1,12 @@
+=== 0.6.3 / 2012-09-25
+* Major Enhancements
+  * Legacy Mode removed
+* Minor Enhancements
+  * Depend on newer versions of FFI
+  * Make RubyPython correctly detect python on archlinux. [madjar]
+* Bug Fixes:
+  * Fixed some memory leaks, but still looking for others.
+
 === 0.6.2 / 2012-05-24
 * Bug Fixes:
   * Fixed a possible namespace collision bug with the FFI library. [Akzhan]

data/Manifest.txt

@@ -12,7 +12,6 @@ lib/rubypython.rb
 lib/rubypython/blankobject.rb
 lib/rubypython/conversion.rb
 lib/rubypython/interpreter.rb
-lib/rubypython/legacy.rb
 lib/rubypython/macros.rb
 lib/rubypython/operators.rb
 lib/rubypython/pygenerator.rb
@@ -26,7 +25,6 @@ lib/rubypython/type.rb
 spec/basic_spec.rb
 spec/callback_spec.rb
 spec/conversion_spec.rb
-spec/legacy_spec.rb
 spec/pymainclass_spec.rb
 spec/pyobject_spec.rb
 spec/python_helpers/basics.py

data/Rakefile

@@ -23,7 +23,7 @@ Hoe.spec 'rubypython' do
   self.readme_file = 'README.rdoc'
   self.extra_rdoc_files = FileList["*.rdoc"].to_a
 
-  self.extra_deps << ['ffi', '~> 1.0.7']
+  self.extra_deps << ['ffi', '>= 1.0.7']
   self.extra_deps << ['blankslate', '>= 2.1.2.3']
 
   self.extra_dev_deps << ['rspec', '~> 2.0']

data/lib/rubypython.rb

@@ -15,7 +15,7 @@
 #   puts cPickle.dumps("RubyPython is awesome!").rubify
 #   RubyPython.stop
 module RubyPython
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end
 
 require 'rubypython/blankobject'
@@ -31,63 +31,6 @@ require 'thread'
 
 module RubyPython
   class << self
-    ##
-    # :attr_accessor:
-    # Controls whether RubyPython is operating in <em>Proxy Mode</em> or
-    # <em>Legacy Mode</em>. This behavioural difference is deprecated as of
-    # RubyPython 0.6 and will be removed in a subsequent release.
-    #
-    # === Proxy Mode
-    # By default, +legacy_mode+ is +false+, meaning that any object returned
-    # from a \Python function call will be wrapped in a Ruby-Python proxy
-    # (an instance of +RubyPyProxy+ or one of its subclasses). This allows
-    # \Python method calls to be forwarded to the \Python object, even if it
-    # would otherwise be a native Ruby object.
-    #
-    #   RubyPython.session do
-    #     string = RubyPython.import 'string'
-    #     ascii_letters = string.ascii_letters
-    #     puts ascii_letters.isalpha # => True
-    #     puts ascii_letters.rubify.isalpha # throws NoMethodError
-    #   end
-    #
-    # === Legacy Mode
-    # If +legacy_mode+ is +true+, RubyPython automatically tries to convert
-    # returned objects to native Ruby object types. If there is no such
-    # conversion, the object remains wrapped in +RubyPyProxy+. This
-    # behaviour is the same as RubyPython 0.2 and earlier. This mode is
-    # deprecated as of RubyPython 0.6 and will be removed.
-    #
-    #   RubyPython.legacy_mode = true
-    #   RubyPython.session do
-    #     string = RubyPython.import 'string'
-    #     ascii_letters = string.ascii_letters
-    #     puts ascii_letters.isalpha # throws NoMethodError
-    #   end
-    def legacy_mode=(value)
-      warn_legacy_mode_deprecation unless defined? @legacy_mode
-      @legacy_mode = value
-    end
-
-    def legacy_mode
-      unless defined? @legacy_mode
-        warn_legacy_mode_deprecation
-        @legacy_mode = nil
-      end
-      @legacy_mode
-    end
-
-    def legacy_mode?
-      @legacy_mode = nil unless defined? @legacy_mode
-      @legacy_mode
-    end
-    private :legacy_mode?
-
-    def warn_legacy_mode_deprecation
-      warn "RubyPython's Legacy Mode is deprecated and will be removed after version #{VERSION}."
-    end
-    private :warn_legacy_mode_deprecation
-
     ## Starts the \Python interpreter. One of +RubyPython.start+,
     # RubyPython.session+, or +RubyPython.run+ must be run before using any
     # \Python code. Returns +true+ if the interpreter was started; +false+
@@ -108,7 +51,7 @@ module RubyPython
     #   p sys.version # => "2.7.1"
     #   RubyPython.stop
     def start(options = {})
-      Mutex.new.synchronize do
+      RubyPython::Python.synchronize do
         # Has the Runtime interpreter been defined?
         if self.const_defined?(:Runtime)
           # If this constant is defined, then yes it is. Since it is, let's
@@ -124,16 +67,16 @@ module RubyPython
             raise RubyPython::InvalidInterpreter, "An invalid interpreter was specified."
           end
         end
-
+        
         unless defined? RubyPython::Python.ffi_libraries
           Runtime.__send__(:infect!, RubyPython::Python)
         end
-      end
 
-      return false if RubyPython::Python.Py_IsInitialized != 0
-      RubyPython::Python.Py_Initialize
-      notify :start
-      true
+        return false if RubyPython::Python.Py_IsInitialized != 0
+        RubyPython::Python.Py_Initialize
+        notify :start
+        true
+      end
     end
 
     # Stops the \Python interpreter if it is running. Returns +true+ if the
@@ -141,12 +84,14 @@ module RubyPython
     # invocation of this method. If you need the values within the \Python
     # proxy objects, be sure to call +RubyPyProxy#rubify+ on them.
     def stop
-      if defined? Python.Py_IsInitialized and Python.Py_IsInitialized != 0
-        Python.Py_Finalize
-        notify :stop
-        true
-      else
-        false
+      RubyPython::Python.synchronize do
+        if defined? Python.Py_IsInitialized and Python.Py_IsInitialized != 0
+          Python.Py_Finalize
+          notify :stop
+          true
+        else
+          false
+        end
       end
     end
 

data/lib/rubypython/conversion.rb

@@ -11,12 +11,18 @@ module RubyPython::Conversion
   # Raised when RubyPython does not know how to convert an object from
   # \Python to Ruby or vice versa.
   class UnsupportedConversion < Exception; end
+  class ConversionError < RuntimeError; end
 
   # Convert a Ruby string to a \Python string. Returns an FFI::Pointer to
   # a PyStringObject.
   def self.rtopString(rString)
     size = rString.respond_to?(:bytesize) ? rString.bytesize : rString.size
-    RubyPython::Python.PyString_FromStringAndSize(rString, size)
+    ptr = RubyPython::Python.PyString_FromStringAndSize(rString, size)
+    if ptr.null?
+      raise ConversionError.new "Python failed to create a string with contents #{rString}"
+    else
+      ptr
+    end
   end
 
   # Convert a Ruby Array to \Python List. Returns an FFI::Pointer to
@@ -24,8 +30,15 @@ module RubyPython::Conversion
   def self.rtopArrayToList(rArray)
     size = rArray.length
     pList = RubyPython::Python.PyList_New size
+    if pList.null?
+      raise ConversionError.new "Python failed to create list of size #{size}"
+    end
     rArray.each_with_index do |el, i|
-      RubyPython::Python.PyList_SetItem pList, i, rtopObject(el)
+      # PyList_SetItem steals a reference, but rtopObject creates a new reference
+      # So we wind up with giving a new reference to the Python interpreter for every
+      # object
+      ret = RubyPython::Python.PyList_SetItem pList, i, rtopObject(el)
+      raise ConversionError.new "Failed to set item #{el} in array conversion" if ret == -1
     end
     pList
   end
@@ -34,8 +47,11 @@ module RubyPython::Conversion
   # \Python \tuple. Returns an FFI::Pointer to a PyTupleObject.
   def self.rtopArrayToTuple(rArray)
     pList = rtopArrayToList(rArray)
-    pTuple = RubyPython::Python.PySequence_Tuple(pList)
+    pTuple = RubyPython::Python.PyList_AsTuple(pList)
     RubyPython::Python.Py_DecRef(pList)
+    if pTuple.null?
+      raise Conversion.new "Python failed to convert an intermediate list of #{rArray} to a tuple"
+    end
     pTuple
   end
 
@@ -43,29 +59,49 @@ module RubyPython::Conversion
   # PyDictObject.
   def self.rtopHash(rHash)
     pDict = RubyPython::Python.PyDict_New
+    if pDict.null?
+      raise ConversionError.new "Python failed to create new dict"
+    end
     rHash.each do |k,v|
-      RubyPython::Python.PyDict_SetItem pDict, rtopObject(k, key = true),
-        rtopObject(v)
+      key = rtopObject(k, :key => true)
+      value = rtopObject(v)
+
+      # PyDict_SetItem INCREFS both the key and the value passed to it.
+      # Since rtopObject already gives us a new reference, this is not necessary.
+      # Thus, we decref the passed in objects to balancy things out
+      if RubyPython::Python.PyDict_SetItem(pDict, key, value) == -1
+        raise ConversionError.new "Python failed to set #{key}, #{value} in dict conversion"
+      end
+
+      RubyPython::Python.Py_DecRef key
+      RubyPython::Python.Py_DecRef value
     end
+
     pDict
   end
 
   # Convert a Ruby Fixnum to a \Python Int. Returns an FFI::Pointer to a
   # PyIntObject.
   def self.rtopFixnum(rNum)
-    RubyPython::Python.PyInt_FromLong(rNum)
+    num = RubyPython::Python.PyInt_FromLong(rNum)
+    raise ConversionError.new "Failed to convert #{rNum}" if num.null?
+    num
   end
 
   # Convert a Ruby Bignum to a \Python Long. Returns an FFI::Pointer to a
   # PyLongObject.
   def self.rtopBigNum(rNum)
-    RubyPython::Python.PyLong_FromLong(rNum)
+    num = RubyPython::Python.PyLong_FromLong(rNum)
+    raise ConversionError.new "Failed to convert #{rNum}" if num.null?
+    num
   end
 
   # Convert a Ruby float to a \Python Float. Returns an FFI::Pointer to a
   # PyFloatObject.
   def self.rtopFloat(rNum)
-    RubyPython::Python.PyFloat_FromDouble(rNum)
+    num = RubyPython::Python.PyFloat_FromDouble(rNum)
+    raise ConversionError.new "Failed to convert #{rNum}" if num.null?
+    num
   end
 
   # Returns a \Python False value (equivalent to Ruby's +false+). Returns an
@@ -89,7 +125,7 @@ module RubyPython::Conversion
   # Convert a Ruby Symbol to a \Python String. Returns an FFI::Pointer to a
   # PyStringObject.
   def self.rtopSymbol(rSymbol)
-    RubyPython::Python.PyString_FromString rSymbol.to_s
+    rtopString rSymbol.to_s
   end
 
   # Convert a Ruby Proc to a \Python Function. Returns an FFI::Pointer to a
@@ -115,7 +151,7 @@ module RubyPython::Conversion
 
   # This will attempt to convert a Ruby object to an equivalent \Python
   # native type. Returns an FFI::Pointer to a \Python object (the
-  # appropriate Py…Object C structure). If the conversion is unsuccessful,
+  # appropriate Py_Object C structure). If the conversion is unsuccessful,
   # will raise UnsupportedConversion.
   #
   # [rObj]    A native Ruby object.
@@ -151,16 +187,14 @@ module RubyPython::Conversion
     when Symbol
       rtopSymbol rObj
     when Proc, Method
-      if RubyPython.legacy_mode
-        raise UnsupportedConversion.new("Callbacks are not supported in Legacy Mode.")
-      end
-      rtopFunction rObj
-    when Method
       rtopFunction rObj
     when nil
       rtopNone
     when RubyPython::PyObject
+      rObj.xIncref
       rObj.pointer
+    when RubyPython::RubyPyProxy
+      rtopObject(rObj.pObject, is_key)
     else
       raise UnsupportedConversion.new("Unsupported type #{rObj.class} for conversion.")
     end
@@ -169,6 +203,9 @@ module RubyPython::Conversion
   # Convert an FFI::Pointer to a \Python String (PyStringObject) to a Ruby
   # String.
   def self.ptorString(pString)
+    #strPtr is a pointer to a pointer to the internal character array.
+    #FFI will free strPtr when we are done but the internal array MUST
+    #not be modified
     strPtr  = ::FFI::MemoryPointer.new(:pointer)
     sizePtr = ::FFI::MemoryPointer.new(:ssize_t)
 
@@ -196,8 +233,6 @@ module RubyPython::Conversion
 
     list_size.times do |i|
       element = RubyPython::Python.PyList_GetItem(pList, i)
-      # PyList_GetItem returns borrowed ref
-      RubyPython::Python.Py_IncRef element
       rObject = ptorObject(element)
       rb_array.push rObject
     end
@@ -226,6 +261,8 @@ module RubyPython::Conversion
   # Convert an FFI::Pointer to a \Python Tuple (PyTupleObject) to an
   # instance of RubyPython::Tuple, a subclass of the Ruby Array class.
   def self.ptorTuple(pTuple)
+    #PySequence_List returns a new list. Since we are only using it as a temporary
+    #here, we will have to DecRef it once we are done.
     pList = RubyPython::Python.PySequence_List pTuple
     rArray = ptorList pList
     RubyPython::Python.Py_DecRef pList
@@ -243,10 +280,16 @@ module RubyPython::Conversion
     val = ::FFI::MemoryPointer.new :pointer
 
     while RubyPython::Python.PyDict_Next(pDict, pos, key, val) != 0
+      #PyDict_Next sets key and val to borrowed references. We do not care
+      #if we are able to convert them to native ruby types, but if we wind up
+      #wrapping either in a proxy we better IncRef it to make sure it stays
+      #around.
       pKey = key.read_pointer
       pVal = val.read_pointer
       rKey = ptorObject(pKey)
       rVal = ptorObject(pVal)
+      RubyPython.Py_IncRef pKey if rKey.kind_of? ::FFI::Pointer
+      RubyPython.Py_IncRef pVal if rVal.kind_of? ::FFI::Pointer
       rb_hash[rKey] = rVal
     end
 

data/lib/rubypython/interpreter.rb

@@ -40,6 +40,14 @@ class RubyPython::Interpreter
     @python_exe = options[:python_exe]
     # Windows: 'C:\\Python27\python.exe'
     # Mac OS X: '/usr/bin/
+
+    # The default interpreter might be python3 on some systems
+    rc, majorversion = runpy "import sys; print(sys.version_info[0])"
+    if majorversion == "3"
+      warn "The python interpreter is python 3, switching to python2"
+      @python_exe = "python2"
+    end
+
     rc, @python     = runpy "import sys; print sys.executable"
     if rc.exitstatus.nonzero?
       raise RubyPython::InvalidInterpreter, "An invalid interpreter was specified."
@@ -58,9 +66,10 @@ class RubyPython::Interpreter
       end
     else
       basename = File.basename(@python)
-
       if basename =~ /#{@version}/
         @version_name = basename
+      elsif basename.end_with?("2")
+        @version_name = "#{basename[0..-2]}#{@version}"
       else
         @version_name = "#{basename}#{@version}"
       end

data/lib/rubypython/operators.rb

@@ -9,9 +9,7 @@ module RubyPython::Operators
     @@operator ||= RubyPython.import('operator')
   end
 
-  # Creates a method to delegate a binary operation. The result of the
-  # operation will follow the conversion rules appropriate to the current
-  # mode of operation as set by {RubyPython.legacy_mode}.
+  # Creates a method to delegate a binary operation.
   # [rname] The name of the Ruby method for this operation. Can be either a
   # Symbol or a String.
   # [pname] The name of the \Python magic method to which this method should
@@ -37,10 +35,8 @@ module RubyPython::Operators
     end
   end
 
-  # Creates a method to delegate a relational operator. The result of the
-  # operation will follow the conversion rules appropriate to the current
-  # mode of operation as set by {RubyPython.legacy_mode}. These methods are
-  # implemented with calls the _operator_ module.
+  # Creates a method to delegate a relational operator. 
+  # These methods are implemented with calls the _operator_ module.
   # [rname] The name of the Ruby method for this operation. Can be a Symbol
   # or a String.
   # [pname] The name of the \Python magic method to which this method should

data/lib/rubypython/pyobject.rb

@@ -27,6 +27,10 @@ class RubyPython::PyObject # :nodoc: all
       def release(pointer)
         obj_id = pointer.object_id
         deleted = @current_pointers.delete(obj_id)
+        if pointer.null?
+          puts "Warning: Trying to DecRef NULL pointer" if RubyPython::Python.Py_IsInitialized != 0
+          return
+        end
         if deleted and (RubyPython::Python.Py_IsInitialized != 0)
           RubyPython::Python.Py_DecRef pointer
         end
@@ -95,6 +99,7 @@ class RubyPython::PyObject # :nodoc: all
   # [rbPyAttr] A PyObject wrapper around the value that we wish to set the
   # attribute to.
   def setAttr(attrName, rbPyAttr)
+    #SetAttrString should incref whatever gets passed to it.
     RubyPython::Python.PyObject_SetAttrString(@pointer, attrName, rbPyAttr.pointer) != -1
   end
 
@@ -119,8 +124,7 @@ class RubyPython::PyObject # :nodoc: all
   # Decrease the reference count of the wrapped object.
   def xDecref
     AutoPyPointer.release(@pointer)
-    @pointer.free
-    nil
+    @pointer = nil
   end
 
   # Increase the reference count of the wrapped object
@@ -174,59 +178,12 @@ class RubyPython::PyObject # :nodoc: all
     check != 0
   end
 
-  # Manipulates the supplied PyObject instance such that it is suitable to
-  # passed to #callObject or #callObjectKeywords. If +rbObject+ is a tuple
-  # then the argument passed in is returned. If it is a list then the list
-  # is converted to a tuple. Otherwise returns a tuple with one element:
-  # +rbObject+.
-  # [rbObject]  The argument to be turned into a Tuple.
-  def self.makeTuple(rbObject)
-    pTuple = nil
-
-    if RubyPython::Macros.PyObject_TypeCheck(rbObject.pointer, RubyPython::Python.PyList_Type.to_ptr) != 0
-      pTuple = RubyPython::Python.PySequence_Tuple(rbObject.pointer)
-    elsif RubyPython::Macros.PyObject_TypeCheck(rbObject.pointer, RubyPython::Python.PyTuple_Type.to_ptr) != 0
-      pTuple = rbObject.pointer
-    else
-      pTuple = RubyPython::Python.PyTuple_Pack(1, :pointer, rbObject.pointer)
-    end
-
-    self.new pTuple
-  end
-
-  # Wraps up the supplied arguments in a \Python List.
-  def self.newList(*args)
-    rbList = self.new RubyPython::Python.PyList_New(args.length)
-
-    args.each_with_index do |el, i|
-      el.xIncref # PyList_SetItem steals references!
-      RubyPython::Python.PyList_SetItem rbList.pointer, i, el.pointer
-    end
-
-    rbList
-  end
-
-  # Converts the supplied arguments to PyObject instances.
-  def self.convert(*args)
-    args.map do |arg|
-      if arg.kind_of? RubyPython::PyObject
-        arg
-      elsif arg.kind_of? RubyPython::RubyPyProxy
-        arg.pObject
-      else
-        RubyPython::PyObject.new arg
-      end
-    end
-  end
 
-  # Takes an array of wrapped \Python objects and wraps them in a Tuple such
-  # that they may be passed to #callObject.
-  # [args] An array of PyObjects; the arguments to be inserted into the
+  # Takes an array of objects, converting them to \Python objects if necessary,
+  # and wraps them in a Tuple such that they may be passed to #callObject.
+  # [args] An array; the arguments to be inserted into the
   # Tuple.
   def self.buildArgTuple(*args)
-    pList = newList(*args)
-    pTuple = makeTuple(pList)
-    pList.xDecref
-    pTuple
+    self.new RubyPython::Conversion.rtopArrayToTuple(args)
   end
 end