Update of /cvsroot/jython/jython/Tools/jythonc
In directory usw-pr-cvs1:/tmp/cvs-serv14671
Modified Files:
PythonModule.py
Log Message:
Fix for [ #480373 ] Can't find _PyInner with classloader.
dumpMain(): Load the _PyInner class in the main class and pass the loaded
class to Py.runMain().
Index: PythonModule.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/PythonModule.py,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -d -r2.14 -r2.15
*** PythonModule.py 2001/05/27 18:50:56 2.14
--- PythonModule.py 2001/11/21 11:24:22 2.15
***************
*** 381,386 ****
code.append(jast.InvokeStatic("System", "arraycopy", args))
! args = [jast.StringConstant(self.getclassname(
! self.name+'$'+self.pyinner.name)),
jast.Identifier('newargs'),
self.getPackages(), self.getProperties(),
--- 381,386 ----
code.append(jast.InvokeStatic("System", "arraycopy", args))
! args = [jast.GetStaticAttribute(self.getclassname(
! self.name+'.'+self.pyinner.name), "class"),
jast.Identifier('newargs'),
self.getPackages(), self.getProperties(),
|
