[Jython-checkins] SF.net SVN: jython:[5137] branches/asm/src/org/python/core

[<pj...@us...>]

Revision: 5137
          http://jython.svn.sourceforge.net/jython/?rev=5137&view=rev
Author:   pjenvey
Date:     2008-08-10 21:30:15 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
o __float__ should always return a PyFloat, no need to cast in complex new
o prefer PyObject.isCallable to __builtin__'s

Modified Paths:
--------------
    branches/asm/src/org/python/core/PyComplex.java
    branches/asm/src/org/python/core/PyMethod.java

Modified: branches/asm/src/org/python/core/PyComplex.java
===================================================================
--- branches/asm/src/org/python/core/PyComplex.java	2008-08-10 21:19:00 UTC (rev 5136)
+++ branches/asm/src/org/python/core/PyComplex.java	2008-08-10 21:30:15 UTC (rev 5137)
@@ -53,7 +53,7 @@
 
         PyComplex complexReal;
         PyComplex complexImag;
-        PyObject toFloat = null;
+        PyFloat toFloat = null;
         if (real instanceof PyComplex) {
             complexReal = (PyComplex)real;
         } else {
@@ -66,11 +66,7 @@
                 }
                 throw pye;
             }
-            if (!(toFloat instanceof PyFloat)) {
-                throw Py.TypeError(String.format("__float__ returned non-float (type %.200s)",
-                                                 imag.getType().fastGetName()));
-            }
-            complexReal = new PyComplex(((PyFloat)toFloat).getValue());
+            complexReal = new PyComplex(toFloat.getValue());
         }
 
         if (imag == null) {
@@ -88,11 +84,7 @@
                 }
                 throw pye;
             }
-            if (!(toFloat instanceof PyFloat)) {
-                throw Py.TypeError(String.format("__float__ returned non-float (type %.200s)",
-                                                 imag.getType().fastGetName()));
-            }
-            complexImag = new PyComplex(((PyFloat)toFloat).getValue());
+            complexImag = new PyComplex(toFloat.getValue());
         }
 
         complexReal.real -= complexImag.imag;

Modified: branches/asm/src/org/python/core/PyMethod.java
===================================================================
--- branches/asm/src/org/python/core/PyMethod.java	2008-08-10 21:19:00 UTC (rev 5136)
+++ branches/asm/src/org/python/core/PyMethod.java	2008-08-10 21:30:15 UTC (rev 5137)
@@ -45,7 +45,7 @@
         PyObject self = ap.getPyObject(1);
         PyObject classObj = ap.getPyObject(2, null);
 
-        if (!__builtin__.callable(func)) {
+        if (!func.isCallable()) {
             throw Py.TypeError("first argument must be callable");
         }
         if (self == Py.None && classObj == null) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.