From: Finn B. <bc...@us...> - 2001-02-23 20:22:46
|
Update of /cvsroot/jython/jython/org/python/compiler In directory usw-pr-cvs1:/tmp/cvs-serv19564 Modified Files: JavaMaker.java Log Message: A fix to bug #122819 (SubSubDate). The very special super method (both with and without super__ name) should only be added to the topmost proxy class. Same fix should be made to jyhtonc. Index: JavaMaker.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/JavaMaker.java,v retrieving revision 2.8 retrieving revision 2.9 diff -C2 -r2.8 -r2.9 *** JavaMaker.java 2001/02/14 22:23:40 2.8 --- JavaMaker.java 2001/02/23 20:23:52 2.9 *************** *** 126,129 **** --- 126,139 ---- + public void addSuperMethod(String methodName, String superName, + String superclass, Class[] parameters, + Class ret, String sig, int access) + throws Exception + { + if (!superclass.startsWith("org/python/proxies")) { + super.addSuperMethod(methodName,superName,superclass,parameters,ret,sig,access); + } + } + public void addMain() throws Exception { Code code = classfile.addMethod("main", "([Ljava/lang/String;)V", |