jython-checkins — For Jython checkin messages

[Jython-checkins] CVS: jython/Tools/jythonc proxies.py,2.5,2.6

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

Update of /cvsroot/jython/jython/Tools/jythonc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv31349

Modified Files:
	proxies.py 
Log Message:
wrapThrows(): Do not generate a "catch (java.lang.Throwable)" if it 
is already generated based on throws method signature clause.



Index: proxies.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/proxies.py,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -r2.5 -r2.6
*** proxies.py	2000/10/28 19:17:36	2.5
--- proxies.py	2000/11/10 15:15:17	2.6
***************
*** 88,91 ****
--- 88,92 ----
      if len(throws) == 0: return stmt
      catches = []
+     throwableFound = 0
      for i in range(len(throws)):
          throw = throws[i]
***************
*** 94,102 ****
          body = jast.Block([jast.Throw(excname)])
          catches.append( (exctype, excname, body) )
  
!     body = jast.Block([jast.Invoke(jast.Identifier("inst"),
                                     "_jthrow", [jast.Identifier("t")]),
                         nullReturn(retType)])
!     catches.append( ("java.lang.Throwable", jast.Identifier("t"), body) )
      return jast.TryCatches(jast.Block([stmt]), catches)
  
--- 95,106 ----
          body = jast.Block([jast.Throw(excname)])
          catches.append( (exctype, excname, body) )
+         if throw == "java.lang.Throwable":
+             throwableFound = 1
  
!     if not throwableFound:
!         body = jast.Block([jast.Invoke(jast.Identifier("inst"),
                                     "_jthrow", [jast.Identifier("t")]),
                         nullReturn(retType)])
!         catches.append( ("java.lang.Throwable", jast.Identifier("t"), body) )
      return jast.TryCatches(jast.Block([stmt]), catches)
  

[Jython-checkins] CVS: jython/Tools/jythonc compile.py,2.11,2.12

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

Update of /cvsroot/jython/jython/Tools/jythonc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv24286

Modified Files:
	compile.py 
Log Message:
Compiler.addDependency(): Support tracking the __builtin__ modules
which have neither __path__ nor __file__ attributes.



Index: compile.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/compile.py,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -r2.11 -r2.12
*** compile.py	2000/10/28 19:17:36	2.11
--- compile.py	2000/11/10 14:57:45	2.12
***************
*** 250,257 ****
          elif isinstance(m, ImportName.Module):
              if m.file is None:
!                 file = os.path.join(m.path[0], '__init__.py')
!                 name = m.name+'.__init__'
!                 self.depends[file] = name
!                 self.pypackages[m.path[0]] = m.name
              else:
                  self.depends[m.file] = m.name
--- 250,258 ----
          elif isinstance(m, ImportName.Module):
              if m.file is None:
!                 if m.path is not None:
!                     file = os.path.join(m.path[0], '__init__.py')
!                     name = m.name+'.__init__'
!                     self.depends[file] = name
!                     self.pypackages[m.path[0]] = m.name
              else:
                  self.depends[m.file] = m.name

[Jython-checkins] CVS: jython/Tools/jythonc/jast Statement.py,2.3,2.4

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

Update of /cvsroot/jython/jython/Tools/jythonc/jast
In directory slayer.i.sourceforge.net:/tmp/cvs-serv27808

Modified Files:
	Statement.py 
Log Message:
TryCatches.exits(): Fix a bug "TryCatches instance has attribute 
catchbody". Looks like this methods had been copied from the 
TryCatch class



Index: Statement.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/jast/Statement.py,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -r2.3 -r2.4
*** Statement.py	2000/10/13 19:11:18	2.3
--- Statement.py	2000/11/08 08:20:16	2.4
***************
*** 279,284 ****
  
      def exits(self):
!         return self.body.exits() and self.catchbody.exits()
! 
  
  
--- 279,286 ----
  
      def exits(self):
!         r = self.body.exits()
!         for exctype, excname, catchbody in self.catches:
!             r = r and catchbody.exits()
!         return r
  
  

[Jython-checkins] CVS: jython/org/python/core Py.java,2.23,2.24

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

Update of /cvsroot/jython/jython/org/python/core
In directory slayer.i.sourceforge.net:/tmp/cvs-serv16461

Modified Files:
	Py.java 
Log Message:
saveClassFile(): Do not use File.getParentFile() because it is a 
java2 method.



Index: Py.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/Py.java,v
retrieving revision 2.23
retrieving revision 2.24
diff -C2 -r2.23 -r2.24
*** Py.java	2000/10/28 19:17:36	2.23
--- Py.java	2000/11/07 18:44:20	2.24
***************
*** 1507,1511 ****
          File dir = new File(dirname);
          File file = makeFilename(name, dir);
!         file.getParentFile().mkdirs();
          try {
              FileOutputStream o = new FileOutputStream(file);
--- 1507,1511 ----
          File dir = new File(dirname);
          File file = makeFilename(name, dir);
!         new File(file.getParent()).mkdirs();
          try {
              FileOutputStream o = new FileOutputStream(file);

[Jython-checkins] CVS: jython/org/python/modules sha.java,2.2,2.3

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

Update of /cvsroot/jython/jython/org/python/modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv28142

Modified Files:
	sha.java 
Log Message:
No change to file., only a test of jython-checkins. 



Index: sha.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/sha.java,v
retrieving revision 2.2
retrieving revision 2.3
diff -C2 -r2.2 -r2.3
*** sha.java	2000/10/28 11:55:10	2.2
--- sha.java	2000/10/29 17:14:38	2.3
***************
*** 5,9 ****
  import org.python.core.*;
  
- 
  public class sha {
      public int blocksize = 1;
--- 5,8 ----