[Jython-checkins] SF.net SVN: jython:[5522] trunk/jython/src/org/python/core/__builtin__.java

[<fwi...@us...>]

Revision: 5522
          http://jython.svn.sourceforge.net/jython/?rev=5522&view=rev
Author:   fwierzbicki
Date:     2008-10-27 21:15:22 +0000 (Mon, 27 Oct 2008)

Log Message:
-----------
Another change to checking for AST as the first arg to __builtins__.compile().
Using the reasonably forward-compatible __tojava__ now instead of the more
implementation dependent javaProxy field.

Modified Paths:
--------------
    trunk/jython/src/org/python/core/__builtin__.java

Modified: trunk/jython/src/org/python/core/__builtin__.java
===================================================================
--- trunk/jython/src/org/python/core/__builtin__.java	2008-10-27 17:35:45 UTC (rev 5521)
+++ trunk/jython/src/org/python/core/__builtin__.java	2008-10-27 21:15:22 UTC (rev 5522)
@@ -303,10 +303,11 @@
      *      java integration changes.
      */
     private static modType py2node(PyObject obj) {
-        if (obj != null && obj.javaProxy instanceof modType) {
-            return (modType)obj.javaProxy;
+        Object node = obj.__tojava__(modType.class);
+        if (node == Py.NoConversion) {
+            return null;
         }
-        return null;
+        return (modType)node;
     }
 
 }


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