Update of /cvsroot/jython/jython/Tools/jythonc
In directory usw-pr-cvs1:/tmp/cvs-serv21988
Modified Files:
PythonModule.py SimpleCompiler.py
Log Message:
Moved the Future instance to the module (part of pep-238 changes).
Index: PythonModule.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/PythonModule.py,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -d -r2.18 -r2.19
*** PythonModule.py 2001/11/26 15:21:08 2.18
--- PythonModule.py 2002/01/13 18:33:59 2.19
***************
*** 10,13 ****
--- 10,14 ----
from org.python.core.PyTableCode import CO_OPTIMIZED,CO_NESTED
+ from org.python.compiler import Future
***************
*** 288,291 ****
--- 289,293 ----
self.javaclasses = []
self.addjavaclass(self.name)
+ self.futures = Future()
def getFrozen(self):
Index: SimpleCompiler.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/SimpleCompiler.py,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -d -r2.19 -r2.20
*** SimpleCompiler.py 2002/01/07 20:00:10 2.19
--- SimpleCompiler.py 2002/01/13 18:33:59 2.20
***************
*** 264,268 ****
def getFutures(self):
! return self._futures
def getFilename(self):
--- 264,268 ----
def getFutures(self):
! return self.module.futures
def getFilename(self):
***************
*** 280,285 ****
def parse(self, node):
if isinstance(self.frame,GlobalFrame):
! futures = self._futures = Future()
! futures.preprocessFutures(node,None)
ScopesCompiler(self).parse(node)
self.frame.setScope(node.scope)
--- 280,284 ----
def parse(self, node):
if isinstance(self.frame,GlobalFrame):
! self.getFutures().preprocessFutures(node,None)
ScopesCompiler(self).parse(node)
self.frame.setScope(node.scope)
|
