[Jython-checkins] CVS: jython/org/python/core imp.java,2.30,2.31

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/core
In directory slayer.i.sourceforge.net:/tmp/cvs-serv23572

Modified Files:
	imp.java 
Log Message:
Removed the support for ModuleDictInit. It was a mistake. 



Index: imp.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/imp.java,v
retrieving revision 2.30
retrieving revision 2.31
diff -C2 -r2.30 -r2.31
*** imp.java	2000/11/19 22:32:45	2.30
--- imp.java	2000/11/20 21:57:37	2.31
***************
*** 180,202 ****
              }
          }
!         PyJavaClass ret = PyJavaClass.lookup(c);
!         initModule(c, ret.__getattr__("__dict__"));
!         return ret;
      }
  
-     public static void initModule(Class c, PyObject dict) {
-         if (ModuleDictInit.class.isAssignableFrom(c) 
-                             && c != ModuleDictInit.class) {
-             try {
-                 Method m = c.getMethod("moduleDictInit", 
-                      new Class[] { PyObject.class });
-                 m.invoke(null, new Object[] { dict });
-             } catch (Exception exc) {
-                 // System.err.println("Got exception: " + exc + " " + proxyClass);
-                 throw Py.JavaError(exc);
-             }
-         }
-     }
- 
      private static PyObject loadBuiltin(String name, PyList path) {
          if (name == "sys")
--- 180,186 ----
              }
          }
!         return PyJavaClass.lookup(c);
      }
  
      private static PyObject loadBuiltin(String name, PyList path) {
          if (name == "sys")
***************
*** 324,328 ****
                                           false);
              }
- 
          }
          return null;
--- 308,311 ----