[Jython-checkins] CVS: jython/Tools/jythonc proxies.py,2.8,2.9

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

Update of /cvsroot/jython/jython/Tools/jythonc
In directory usw-pr-cvs1:/tmp/cvs-serv13056

Modified Files:
	proxies.py 
Log Message:
addPyProxyInterface(): Moved call to Py.initProxy into __initProxy__
method and call __initProxy__ from proxy ctor.



Index: proxies.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/proxies.py,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** proxies.py	2001/01/07 09:11:10	2.8
--- proxies.py	2001/02/14 22:30:23	2.9
***************
*** 415,425 ****
          frozen = self.module.getFrozen()
  
!         initargs = [this, jast.StringConstant(self.modname),
!                     jast.StringConstant(self.name),
!                     objects, self.packages, self.properties,
!                     frozen, jast.StringArray(self.modules)]
  
-         initproxy = jast.InvokeStatic("Py", "initProxy", initargs)
- 
          code = jast.Block([supercall, initproxy])
          self.statements.append(jast.Constructor(
--- 415,421 ----
          frozen = self.module.getFrozen()
  
!         initargs = [objects]
!         initproxy = jast.InvokeLocal("__initProxy__", initargs)
  
          code = jast.Block([supercall, initproxy])
          self.statements.append(jast.Constructor(
***************
*** 450,453 ****
--- 446,464 ----
          self.statements.append(jast.Method("_getPySystemState", "public",
                                             ["PySystemState"], code))
+ 
+ 
+         frozen = self.module.getFrozen()
+         this = jast.Identifier("this")
+         initargs = [this, jast.StringConstant(self.modname),
+                     jast.StringConstant(self.name),
+                     jast.Identifier("args"), self.packages, self.properties,
+                     frozen, jast.StringArray(self.modules)]
+ 
+         initproxy = jast.InvokeStatic("Py", "initProxy", initargs)
+ 
+ 
+         code = jast.Block([initproxy])
+         self.statements.append(jast.Method("__initProxy__", "public",
+                                            ["void", ("Object[]", "args")], code))
  
          self.interfaces.append(org.python.core.PyProxy)