Update of /cvsroot/jython/jython/Tools/jythonc
In directory usw-pr-cvs1:/tmp/cvs-serv17047
Modified Files:
ObjectFactory.py compile.py
Log Message:
fix for [ #449956 ] jythonc 2.1a3 --package problem.
Index: ObjectFactory.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/ObjectFactory.py,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -d -r2.10 -r2.11
*** ObjectFactory.py 2001/07/09 20:23:30 2.10
--- ObjectFactory.py 2001/11/20 16:52:23 2.11
***************
*** 208,212 ****
self.pySupername = full_py
self.supername = modname
- self.supername = ':'+self.supername # ':' => Compiler will in case prefix this with opts.javapackage
def isSuperclassJava(self):
--- 208,211 ----
***************
*** 254,258 ****
if cls:
if cls.value.isSuperclassJava():
! self._takeSupername(cls.value,mod,modname = modname)
continue
--- 253,259 ----
if cls:
if cls.value.isSuperclassJava():
! # pass no modname but just mod,
! # javapackage should be included
! self._takeSupername(cls.value,mod)
continue
Index: compile.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/compile.py,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -d -r2.19 -r2.20
*** compile.py 2001/06/30 01:03:13 2.19
--- compile.py 2001/11/20 16:52:23 2.20
***************
*** 314,320 ****
if pyc.isSuperclassJava():
supername, pySupername = pyc.supername, pyc.pySupername
- if supername and supername[0] == ':':
- supername = supername[1:]
- if self.javapackage: supername = self.javapackage + '.' + supername
return proxies.JavaProxy(pyc.name, (supername, pySupername),
pyc.javaclasses, methods, module, pyc.issuperproxy)
--- 314,317 ----
|
