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

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

Revision: 7041
          http://jython.svn.sourceforge.net/jython/?rev=7041&view=rev
Author:   pjenvey
Date:     2010-04-18 21:45:51 +0000 (Sun, 18 Apr 2010)

Log Message:
-----------
this doesn't need to grab the javaProxy field directly

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	2010-04-18 18:06:07 UTC (rev 7040)
+++ trunk/jython/src/org/python/core/__builtin__.java	2010-04-18 21:45:51 UTC (rev 7041)
@@ -1544,12 +1544,13 @@
         PyObject obj = ap.getPyObject(0);
         if (obj.getJavaProxy() != null) {
             int bufsize = ap.getInt(2, -1);
-            if (obj.javaProxy instanceof InputStream) {
+            Object javaProxy = obj.getJavaProxy();
+            if (javaProxy instanceof InputStream) {
                 Py.warning(Py.DeprecationWarning, warning);
-                return new PyFile((InputStream)obj.javaProxy, bufsize);
-            } else if (obj.javaProxy instanceof OutputStream) {
+                return new PyFile((InputStream) javaProxy, bufsize);
+            } else if (javaProxy instanceof OutputStream) {
                 Py.warning(Py.DeprecationWarning, warning);
-                return new PyFile((OutputStream)obj.javaProxy, bufsize);
+                return new PyFile((OutputStream) javaProxy, bufsize);
             }
         }
         return PyFile.TYPE.__call__(args, kwds);


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