[Jython-checkins] CVS: jython/Tools/jythonc PythonModule.py,2.16,2.17 proxies.py,2.13,2.14

[Samuele P. <ped...@us...>]

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

Modified Files:
	PythonModule.py proxies.py 
Log Message:
Fix for [ #451746 ] jythonc --deep jpy$packages problem


Index: PythonModule.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/PythonModule.py,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -d -r2.16 -r2.17
*** PythonModule.py	2001/11/21 11:37:25	2.16
--- PythonModule.py	2001/11/22 23:58:45	2.17
***************
*** 329,340 ****
  
      #Properties and packages for registry
!     def getMainProperties(self):
!         return jast.Identifier("jpy$mainProperties")
  
!     def getProxyProperties(self):
!         return jast.Identifier("jpy$proxyProperties")
  
!     def getPackages(self):
!         return jast.Identifier("jpy$packages")
  
      def dumpDictionary(self, dict, field):
--- 329,349 ----
  
      #Properties and packages for registry
!     def getMainProperties(self,qual=0):
!         if qual:
!             return jast.GetStaticAttribute(self.name,"jpy$mainProperties")
!         else:
!             return jast.Identifier("jpy$mainProperties")
  
!     def getProxyProperties(self,qual=0):
!         if qual:
!             return jast.GetStaticAttribute(self.name,"jpy$proxyProperties")
!         else:
!             return jast.Identifier("jpy$proxyProperties")
  
!     def getPackages(self,qual=0):
!         if qual:
!             return jast.GetStaticAttribute(self.name,"jpy$packages")
!         else:
!             return jast.Identifier("jpy$packages")
  
      def dumpDictionary(self, dict, field):
***************
*** 395,399 ****
                             self.name+'.'+self.pyinner.name), "class"),
                      jast.Identifier('newargs'), 
!                     self.getPackages(), self.getMainProperties(), 
                      self.getFrozen(), jast.StringArray(self.modules.keys())]
  
--- 404,408 ----
                             self.name+'.'+self.pyinner.name), "class"),
                      jast.Identifier('newargs'), 
!                     self.getPackages(qual=1), self.getMainProperties(qual=1), 
                      self.getFrozen(), jast.StringArray(self.modules.keys())]
  

Index: proxies.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/proxies.py,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -d -r2.13 -r2.14
*** proxies.py	2001/11/21 11:41:41	2.13
--- proxies.py	2001/11/22 23:58:45	2.14
***************
*** 130,135 ****
          self.module = module
          if module is not None:
!             self.packages = module.getPackages()
!             self.properties = module.getProxyProperties()
              self.modname = module.name
              if module.package is not None:
--- 130,135 ----
          self.module = module
          if module is not None:
!             self.packages = module.getPackages(qual=1)
!             self.properties = module.getProxyProperties(qual=1)
              self.modname = module.name
              if module.package is not None: