[Jython-checkins] SF.net SVN: jython:[5673] branches/newstyle-java-types/src/org/python/core/ __builtin__.java

[<cg...@us...>]

Revision: 5673
          http://jython.svn.sourceforge.net/jython/?rev=5673&view=rev
Author:   cgroves
Date:     2008-12-02 05:23:26 +0000 (Tue, 02 Dec 2008)

Log Message:
-----------
Changing the items in the dicts of loaded classes seemed to be confusing the
exceptions module at least, so let's leave reloading Java classes a no-op until
a later date.

Modified Paths:
--------------
    branches/newstyle-java-types/src/org/python/core/__builtin__.java

Modified: branches/newstyle-java-types/src/org/python/core/__builtin__.java
===================================================================
--- branches/newstyle-java-types/src/org/python/core/__builtin__.java	2008-12-02 03:31:45 UTC (rev 5672)
+++ branches/newstyle-java-types/src/org/python/core/__builtin__.java	2008-12-02 05:23:26 UTC (rev 5673)
@@ -98,7 +98,8 @@
                     if (arg1 instanceof PySystemState) {
                         return __builtin__.reload((PySystemState)arg1);
                     } else if(arg1 instanceof PyJavaType) {
-                        return __builtin__.reload((PyJavaType)arg1);
+                        // This has always been a no-op.  Should be disabled in py3k.
+                        return arg1;
                     }
                     throw Py.TypeError("reload() argument must be a module");
                 }
@@ -1107,12 +1108,6 @@
         return o;
     }
 
-    public static PyObject reload(PyJavaType o) {
-        // Reset the contents of our dict to the state from our class
-        o.init();
-        return o;
-    }
-
     public static PyString repr(PyObject o) {
         return o.__repr__();
     }


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