jython-checkins — For Jython checkin messages

[Jython-checkins] CVS: jython/Lib/jxxload_help PackageManager.java,1.4,1.5

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

Update of /cvsroot/jython/jython/Lib/jxxload_help
In directory usw-pr-cvs1:/tmp/cvs-serv5604

Modified Files:
	PackageManager.java 
Log Message:
Comply to the new interface for PackageManager.



Index: PackageManager.java
===================================================================
RCS file: /cvsroot/jython/jython/Lib/jxxload_help/PackageManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PackageManager.java	2001/07/29 14:57:04	1.4
--- PackageManager.java	2001/12/06 16:21:23	1.5
***************
*** 49,57 ****
      }
  
!     public void addJarDir(String jdir) {
          throw new RuntimeException("addJarDir not supported for reloadable packages");
      }  
  
!     public void addJar(String jdir) {
          throw new RuntimeException("addDir not supported for reloadable packages");
      }  
--- 49,57 ----
      }
  
!     public void addJarDir(String jdir, boolean cache) {
          throw new RuntimeException("addJarDir not supported for reloadable packages");
      }  
  
!     public void addJar(String jdir, boolean cache) {
          throw new RuntimeException("addDir not supported for reloadable packages");
      }  

[Jython-checkins] CVS: jython/org/python/core PackageManager.java,2.11,2.12 PySystemState.java,2.69,2.70 SysPackageManager.java,1.10,1.11 SyspathArchive.java,1.3,1.4

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

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv6411

Modified Files:
	PackageManager.java PySystemState.java SysPackageManager.java 
	SyspathArchive.java 
Log Message:
Added a boolean to PackageManager.addJar() and PackageManager.addJarDir()
that controls if the created package index should be saved in cachedir.

Added a similar optional boolean to sys.add_extdir().



Index: PackageManager.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PackageManager.java,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -d -r2.11 -r2.12
*** PackageManager.java	2001/11/27 13:51:37	2.11
--- PackageManager.java	2001/12/06 14:31:12	2.12
***************
*** 57,61 ****
       * @param dir   A directory name.
       */
!     public abstract void addJarDir(String dir);
  
      /**
--- 57,61 ----
       * @param dir   A directory name.
       */
!     public abstract void addJarDir(String dir, boolean cache);
  
      /**
***************
*** 65,69 ****
       * @param jarfile   A directory name.
       */
!     public abstract void addJar(String jarfile);
  
      /** Basic helper implementation of {@link #doDir}.
--- 65,69 ----
       * @param jarfile   A directory name.
       */
!     public abstract void addJar(String jarfile, boolean cache);
  
      /** Basic helper implementation of {@link #doDir}.

Index: PySystemState.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PySystemState.java,v
retrieving revision 2.69
retrieving revision 2.70
diff -C2 -d -r2.69 -r2.70
*** PySystemState.java	2001/11/28 19:25:33	2.69
--- PySystemState.java	2001/12/06 14:31:12	2.70
***************
*** 566,571 ****
      /**
       * Add a .jar & .zip directory to the list of places that are searched
!      * for java .jar and .zip files. The .jar and .zip files found will be
!      * cached
       * <p>
       * <b>Note</b>. Classes in .jar and .zip files found in the directory
--- 566,571 ----
      /**
       * Add a .jar & .zip directory to the list of places that are searched
!      * for java .jar and .zip files. The .jar and .zip files found will not
!      * be cached.
       * <p>
       * <b>Note</b>. Classes in .jar and .zip files found in the directory
***************
*** 573,580 ****
       * add_classdir(dir) for more details.
       *
       * @see #add_classdir
       */
      public static void add_extdir(String directoryPath) {
!         packageManager.addJarDir(directoryPath);
      }
  
--- 573,600 ----
       * add_classdir(dir) for more details.
       *
+      * @param directoryPath The name of a directory.
+      *
       * @see #add_classdir
       */
      public static void add_extdir(String directoryPath) {
!         packageManager.addJarDir(directoryPath, false);
!     }
! 
!     /**
!      * Add a .jar & .zip directory to the list of places that are searched
!      * for java .jar and .zip files. 
!      * <p>
!      * <b>Note</b>. Classes in .jar and .zip files found in the directory
!      * are not made available to jython by this call. See the note for
!      * add_classdir(dir) for more details.
!      *
!      * @param directoryPath The name of a directory.
!      * @param cache         Controls if the packages in the zip and jar 
!      *                      file should be cached.
!      *
!      * @see #add_classdir
!      */
!     public static void add_extdir(String directoryPath, boolean cache) {
!         packageManager.addJarDir(directoryPath, cache);
      }
  

Index: SysPackageManager.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/SysPackageManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SysPackageManager.java	2001/12/04 10:24:34	1.10
--- SysPackageManager.java	2001/12/06 14:31:12	1.11
***************
*** 37,49 ****
      }
  
!     public void addJar(String jarfile) {
!         addJarToPackages(new File(jarfile), false);
      }
  
!     public void addJarDir(String jdir) {
!         addJarDir(jdir, true);
      }
  
!     public void addJarDir(String jdir, boolean save) {
          File file = new File(jdir);
          if (!file.isDirectory()) return;
--- 37,51 ----
      }
  
!     public void addJar(String jarfile, boolean cache) {
!         addJarToPackages(new File(jarfile), cache);
!         if (cache)
!             saveCache();
      }
  
!     public void addJarDir(String jdir, boolean cache) {
!         addJarDir(jdir, cache, cache);
      }
  
!     private void addJarDir(String jdir, boolean cache, boolean saveCache) {
          File file = new File(jdir);
          if (!file.isDirectory()) return;
***************
*** 52,59 ****
              String entry = files[i];
              if (entry.endsWith(".jar") || entry.endsWith(".zip")) {
!                 addJarToPackages(new File(jdir,entry),true);
              }
          }
!         if (save)
              saveCache();
      }
--- 54,61 ----
              String entry = files[i];
              if (entry.endsWith(".jar") || entry.endsWith(".zip")) {
!                 addJarToPackages(new File(jdir,entry), cache);
              }
          }
!         if (saveCache)
              saveCache();
      }
***************
*** 65,69 ****
              // ??pending: do jvms trim? how is interpreted entry=""?
              String entry = tok.nextToken();
!             addJarDir(entry, false);
          }
      }
--- 67,71 ----
              // ??pending: do jvms trim? how is interpreted entry=""?
              String entry = tok.nextToken();
!             addJarDir(entry, true, false);
          }
      }

Index: SyspathArchive.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/SyspathArchive.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SyspathArchive.java	2001/11/27 13:51:37	1.3
--- SyspathArchive.java	2001/12/06 14:31:12	1.4
***************
*** 11,15 ****
          archiveName = getArchiveName(archiveName);
          zipFile = new ZipFile(new File(archiveName));
!         Py.getSystemState().packageManager.addJar(archiveName);
      }
  
--- 11,15 ----
          archiveName = getArchiveName(archiveName);
          zipFile = new ZipFile(new File(archiveName));
!         Py.getSystemState().packageManager.addJar(archiveName, false);
      }
  

[Jython-checkins] CVS: bugtests test345.py,NONE,1.1 test345c.py,NONE,1.1

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

Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv19679

Added Files:
	test345.py test345c.py 
Log Message:
Test for "[ #489836 ] Private names is not mangled".



--- NEW FILE: test345.py ---
"""
[ #489836 ] Private names is not mangled
"""

import support

support.compileJPythonc("test345c.py", jar="test345.jar", core=1,
                        output="test345.out")
support.runJava("-jar test345.jar")

--- NEW FILE: test345c.py ---
"""

"""

import support

class A:
    def __init__(self):
        self.__stop("A")
        self.__x = 1
        self.__y = 1
        del self.__x

    def __stop(self, s):
        pass

    __c = 1


if dir(A) != ['_A__c', '_A__stop', '__doc__', '__init__', '__module__']:
    raise support.TestError("bug in private class var mangling %s" % dir(A))
if dir(A()) != ['_A__y']:
    raise support.TestError("bug in private var mangling %s" % dir(A()))

[Jython-checkins] CVS: jython/org/python/core SysPackageManager.java,1.9,1.10

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

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv20852

Modified Files:
	SysPackageManager.java 
Log Message:
Fix for "[ #456926 ] PackageManager doesn't work correctly".

When f.ex. PyServlet called sys.add_extdir(), the cache file was written
but the index wasn't updated.



Index: SysPackageManager.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/SysPackageManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SysPackageManager.java	2001/10/28 17:13:43	1.9
--- SysPackageManager.java	2001/12/04 10:24:34	1.10
***************
*** 42,45 ****
--- 42,49 ----
  
      public void addJarDir(String jdir) {
+         addJarDir(jdir, true);
+     }
+ 
+     public void addJarDir(String jdir, boolean save) {
          File file = new File(jdir);
          if (!file.isDirectory()) return;
***************
*** 51,54 ****
--- 55,60 ----
              }
          }
+         if (save)
+             saveCache();
      }
  
***************
*** 59,63 ****
              // ??pending: do jvms trim? how is interpreted entry=""?
              String entry = tok.nextToken();
!             addJarDir(entry);
          }
      }
--- 65,69 ----
              // ??pending: do jvms trim? how is interpreted entry=""?
              String entry = tok.nextToken();
!             addJarDir(entry, false);
          }
      }

[Jython-checkins] CVS: jython/com/ziclix/python/sql/handler InformixDataHandler.java,1.1,1.2 MySQLDataHandler.java,1.1,1.2 PostgresqlDataHandler.java,1.1,1.2

[brian z. <bz...@us...>]

Update of /cvsroot/jython/jython/com/ziclix/python/sql/handler
In directory usw-pr-cvs1:/tmp/cvs-serv28814/ziclix/python/sql/handler

Modified Files:
	InformixDataHandler.java MySQLDataHandler.java 
	PostgresqlDataHandler.java 
Log Message:
added .rowid to PyCursor and .getRowId(Statement) to DataHandlers

Index: InformixDataHandler.java
===================================================================
RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/handler/InformixDataHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InformixDataHandler.java	2001/11/20 04:55:18	1.1
--- InformixDataHandler.java	2001/12/04 03:09:44	1.2
***************
*** 25,31 ****
  public class InformixDataHandler extends FilterDataHandler {
  
- 	/** Field serial */
- 	public int serial;
- 
  	/**
  	 * Decorator for handling Informix specific issues.
--- 25,28 ----
***************
*** 34,53 ****
  	 */
  	public InformixDataHandler(DataHandler datahandler) {
- 
  		super(datahandler);
- 
- 		this.serial = 0;
  	}
  
  	/**
! 	 * Sets the serial attribute to the last serial id.
  	 */
! 	public void postExecute(Statement stmt) throws SQLException {
  
  		if (stmt instanceof com.informix.jdbc.IfmxStatement) {
! 			serial = ((com.informix.jdbc.IfmxStatement)stmt).getSerial();
  		}
  
! 		super.postExecute(stmt);
  	}
  
--- 31,54 ----
  	 */
  	public InformixDataHandler(DataHandler datahandler) {
  		super(datahandler);
  	}
  
  	/**
! 	 * Returns the serial for the statement.
! 	 *
! 	 * @param Statement stmt
! 	 *
! 	 * @return PyObject
! 	 *
! 	 * @throws SQLException
! 	 *
  	 */
! 	public PyObject getRowId(Statement stmt) throws SQLException {
  
  		if (stmt instanceof com.informix.jdbc.IfmxStatement) {
! 			return Py.newInteger(((com.informix.jdbc.IfmxStatement)stmt).getSerial());
  		}
  
! 		return super.getRowId(stmt);
  	}
  

Index: MySQLDataHandler.java
===================================================================
RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/handler/MySQLDataHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MySQLDataHandler.java	2001/11/20 04:55:18	1.1
--- MySQLDataHandler.java	2001/12/04 03:09:45	1.2
***************
*** 24,30 ****
  public class MySQLDataHandler extends FilterDataHandler {
  
- 	/** Field lastInsertId */
- 	public long lastInsertId;
- 
  	/**
  	 * Decorator for handling MySql specific issues.
--- 24,27 ----
***************
*** 33,52 ****
  	 */
  	public MySQLDataHandler(DataHandler datahandler) {
- 
  		super(datahandler);
- 
- 		this.lastInsertId = 0;
  	}
  
  	/**
! 	 * Captures the last inserted id.
  	 */
! 	public void postExecute(Statement stmt) throws SQLException {
  
  		if (stmt instanceof org.gjt.mm.mysql.Statement) {
! 			lastInsertId = ((org.gjt.mm.mysql.Statement)stmt).getLastInsertID();
  		}
  
! 		super.postExecute(stmt);
  	}
  
--- 30,53 ----
  	 */
  	public MySQLDataHandler(DataHandler datahandler) {
  		super(datahandler);
  	}
  
  	/**
! 	 * Returns the last insert id for the statement.
! 	 *
! 	 * @param Statement stmt
! 	 *
! 	 * @return PyObject
! 	 *
! 	 * @throws SQLException
! 	 *
  	 */
! 	public PyObject getRowId(Statement stmt) throws SQLException {
  
  		if (stmt instanceof org.gjt.mm.mysql.Statement) {
! 			return Py.newInteger(((org.gjt.mm.mysql.Statement)stmt).getLastInsertID());
  		}
  
! 		return super.getRowId(stmt);
  	}
  

Index: PostgresqlDataHandler.java
===================================================================
RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/handler/PostgresqlDataHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PostgresqlDataHandler.java	2001/11/20 04:55:18	1.1
--- PostgresqlDataHandler.java	2001/12/04 03:09:45	1.2
***************
*** 14,17 ****
--- 14,18 ----
  import java.sql.SQLException;
  import java.sql.PreparedStatement;
+ import java.sql.Statement;
  import java.math.BigDecimal;
  import org.python.core.*;
***************
*** 34,37 ****
--- 35,57 ----
  	public PostgresqlDataHandler(DataHandler datahandler) {
  		super(datahandler);
+ 	}
+ 
+ 	/**
+ 	 * Returns the last insert OID for the statement.
+ 	 *
+ 	 * @param Statement stmt
+ 	 *
+ 	 * @return PyObject
+ 	 *
+ 	 * @throws SQLException
+ 	 *
+ 	 */
+ 	public PyObject getRowId(Statement stmt) throws SQLException {
+ 
+ 		if (stmt instanceof org.postgresql.Statement) {
+ 			return Py.newInteger(((org.postgresql.Statement)stmt).getInsertedOID());
+ 		}
+ 
+ 		return super.getRowId(stmt);
  	}
  

[Jython-checkins] CVS: jython/com/ziclix/python/sql DataHandler.java,1.1,1.2 FilterDataHandler.java,1.1,1.2 PyCursor.java,1.3,1.4

[brian z. <bz...@us...>]

Update of /cvsroot/jython/jython/com/ziclix/python/sql
In directory usw-pr-cvs1:/tmp/cvs-serv28814/ziclix/python/sql

Modified Files:
	DataHandler.java FilterDataHandler.java PyCursor.java 
Log Message:
added .rowid to PyCursor and .getRowId(Statement) to DataHandlers

Index: DataHandler.java
===================================================================
RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/DataHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DataHandler.java	2001/11/20 04:55:18	1.1
--- DataHandler.java	2001/12/04 03:09:44	1.2
***************
*** 41,53 ****
  
  	/**
! 	 * A callback prior to each execution of the statement.  If the statement is a PreparedStatement, all the
! 	 * parameters will have been set.
  	 */
! 	public void preExecute(Statement stmt) throws SQLException {}
  
  	/**
  	 * A callback after successfully executing the statement.
  	 */
! 	public void postExecute(Statement stmt) throws SQLException {}
  
  	/**
--- 41,71 ----
  
  	/**
! 	 * Returns the row id of the last executed statement.
! 	 *
! 	 * @param Statement stmt
! 	 *
! 	 * @return PyObject
! 	 *
! 	 * @throws SQLException
! 	 *
  	 */
! 	public PyObject getRowId(Statement stmt) throws SQLException {
! 		return Py.None;
! 	}
  
  	/**
+ 	 * A callback prior to each execution of the statement.  If the statement is
+ 	 * a PreparedStatement, all the parameters will have been set.
+ 	 */
+ 	public void preExecute(Statement stmt) throws SQLException {
+ 		return;
+ 	}
+ 
+ 	/**
  	 * A callback after successfully executing the statement.
  	 */
! 	public void postExecute(Statement stmt) throws SQLException {
! 		return;
! 	}
  
  	/**
***************
*** 67,71 ****
  	 * Any .execute() which uses prepared statements will receive a callback for deciding
  	 * how to map the PyObject to the appropriate JDBC type.  The <i>type</i> is the JDBC
! 	 * as obtained from <i>java.sql.Types</i>.
  	 *
  	 * @param stmt the current PreparedStatement
--- 85,89 ----
  	 * Any .execute() which uses prepared statements will receive a callback for deciding
  	 * how to map the PyObject to the appropriate JDBC type.  The <i>type</i> is the JDBC
! 	 * type as obtained from <i>java.sql.Types</i>.
  	 *
  	 * @param stmt the current PreparedStatement

Index: FilterDataHandler.java
===================================================================
RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/FilterDataHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FilterDataHandler.java	2001/11/20 04:55:18	1.1
--- FilterDataHandler.java	2001/12/04 03:09:44	1.2
***************
*** 39,42 ****
--- 39,56 ----
  
  	/**
+ 	 * Returns the row id of the last executed statement.
+ 	 *
+ 	 * @param Statement stmt
+ 	 *
+ 	 * @return PyObject
+ 	 *
+ 	 * @throws SQLException
+ 	 *
+ 	 */
+ 	public PyObject getRowId(Statement stmt) throws SQLException {
+ 		return this.delegate.getRowId(stmt);
+ 	}
+ 
+ 	/**
  	 * Method preExecute
  	 *

Index: PyCursor.java
===================================================================
RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/PyCursor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PyCursor.java	2001/11/27 10:48:04	1.3
--- PyCursor.java	2001/12/04 03:09:44	1.4
***************
*** 36,39 ****
--- 36,42 ----
  	protected PyObject warnings;
  
+ 	/** Field warnings */
+ 	protected PyObject rowid;
+ 
  	/** Field dynamicFetch */
  	protected boolean dynamicFetch;
***************
*** 112,116 ****
  		m[6] = new PyString("callproc");
  		__methods__ = new PyList(m);
! 		m = new PyObject[5];
  		m[0] = new PyString("arraysize");
  		m[1] = new PyString("rowcount");
--- 115,119 ----
  		m[6] = new PyString("callproc");
  		__methods__ = new PyList(m);
! 		m = new PyObject[6];
  		m[0] = new PyString("arraysize");
  		m[1] = new PyString("rowcount");
***************
*** 118,121 ****
--- 121,125 ----
  		m[3] = new PyString("datahandler");
  		m[4] = new PyString("warnings");
+ 		m[5] = new PyString("rowid");
  		__members__ = new PyList(m);
  	}
***************
*** 167,170 ****
--- 171,176 ----
  		} else if ("warnings".equals(name)) {
  			return warnings;
+ 		} else if ("rowid".equals(name)) {
+ 			return rowid;
  		} else if ("datahandler".equals(name)) {
  			return Py.java2py(this.datahandler);
***************
*** 366,370 ****
  
  	/**
! 	 * Perform the execution of a statement.
  	 */
  	protected void execute(PyObject params, PyObject bindings) throws SQLException {
--- 372,382 ----
  
  	/**
! 	 * Method execute
! 	 *
! 	 * @param PyObject params
! 	 * @param PyObject bindings
! 	 *
! 	 * @throws SQLException
! 	 *
  	 */
  	protected void execute(PyObject params, PyObject bindings) throws SQLException {
***************
*** 428,431 ****
--- 440,446 ----
  		this.datahandler.preExecute(this.sqlStatement);
  		this.sqlStatement.execute();
+ 
+ 		this.rowid = this.datahandler.getRowId(this.sqlStatement);
+ 
  		create(this.sqlStatement.getResultSet());
  		this.datahandler.postExecute(this.sqlStatement);
***************
*** 556,559 ****
--- 571,575 ----
  
  		this.warnings = Py.None;
+ 		this.rowid = Py.None;
  
  		try {

[Jython-checkins] CVS: htdocs build.xml,1.3,1.4

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

Update of /cvsroot/jython/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv26204

Modified Files:
	build.xml 
Log Message:
Make sure that images and generated javadoc gets included in the .tar
file.



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/htdocs/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml	2001/12/03 21:11:49	1.3
--- build.xml	2001/12/03 21:39:58	1.4
***************
*** 93,99 ****
      <target name="collect" depends="generate">
          <tar tarfile="${htdocs.tar}" basedir="."
!              includes="*.html docs/*.html docs/api applets/*.html
!                       applets/*.class applets/*.java applets/*.jar
!                       applets/*.cab graphics/*.* mac/*.*"/>
          <gzip zipfile="${htdocs.tgz}" src="${htdocs.tar}" />
      </target>
--- 93,107 ----
      <target name="collect" depends="generate">
          <tar tarfile="${htdocs.tar}" basedir="."
!              includes="*.html
!                        images/*.gif
!                        docs/*.html
!                        docs/javadoc/**
!                        applets/*.html
!                        applets/*.class
!                        applets/*.java
!                        applets/*.jar
!                        applets/*.cab
!                        graphics/*.*
!                        mac/*.*"/>
          <gzip zipfile="${htdocs.tgz}" src="${htdocs.tar}" />
      </target>

[Jython-checkins] CVS: htdocs/docs links.h,1.6,1.7

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

Update of /cvsroot/jython/htdocs/docs
In directory usw-pr-cvs1:/tmp/cvs-serv18689/docs

Modified Files:
	links.h 
Log Message:
Updated to 2.1b1.
Added link to zxJDBC.



Index: links.h
===================================================================
RCS file: /cvsroot/jython/htdocs/docs/links.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** links.h	2001/07/29 21:05:04	1.6
--- links.h	2001/12/03 21:17:11	1.7
***************
*** 4,8 ****
  <li><a href="../license.html">License</a>
  <li><a href="../download.html">Jython 2.0</a>
! <li><a href="http://sourceforge.net/project/showfiles.php?group_id=12867&release_id=45862">Jython 2.1a3</a>
  <li><a href="../install.html">Installing</a>
  <li><a href="../platform.html">JVM Compatibility</a>
--- 4,8 ----
  <li><a href="../license.html">License</a>
  <li><a href="../download.html">Jython 2.0</a>
! <li><a href="http://sourceforge.net/project/showfiles.php?group_id=12867&release_id=64027">Jython 2.1b1</a>
  <li><a href="../install.html">Installing</a>
  <li><a href="../platform.html">JVM Compatibility</a>
***************
*** 23,26 ****
--- 23,27 ----
  <li><a href="jythonc.html">Building applets, servlets, beans...</a>
  <li><a href="jreload.html">Reloading java classes</a>
+ <li><a href="zxjdbc.html">zxJDBC</a>
  
  <h3>Python Docs (exits)</h3>

[Jython-checkins] CVS: htdocs index.ht,1.23,1.24 links.h,1.10,1.11

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

Update of /cvsroot/jython/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv17986

Modified Files:
	index.ht links.h 
Log Message:
Updated to 2.1b1.



Index: index.ht
===================================================================
RCS file: /cvsroot/jython/htdocs/index.ht,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** index.ht	2001/11/08 18:35:41	1.23
--- index.ht	2001/12/03 21:14:45	1.24
***************
*** 20,34 ****
  
  <dl>
!     <p><dt><b>Jython 2.1 alpha 3 released!</b>
      <dd>Download the latest release of Jython 
!         <a href="http://sourceforge.net/project/showfiles.php?group_id=12867&release_id=45862">here</a>, or 
          <a href="NEWS.html">read a summary</a>
! 	of recent changes. (29-jul-2001).
! 
!     <p><dt><b>Jython 2.1a2 released!</b>
!     <dd>The second alpha release of Jython 2.1 is available (18-jul-2001)
! 
!     <p><dt><b>Jython 2.1a1 released!</b>
!     <dd>The first alpha release of Jython 2.1 is available (14-mar-2001)
  
      <p><dt><b>Jython 2.0 released!</b>
--- 20,28 ----
  
  <dl>
!     <p><dt><b>Jython 2.1 beta 1 released!</b>
      <dd>Download the latest release of Jython 
!         <a href="http://sourceforge.net/project/showfiles.php?group_id=12867&release_id=64027">here</a>, or 
          <a href="NEWS.html">read a summary</a>
! 	of recent changes. (03-dec-2001).
  
      <p><dt><b>Jython 2.0 released!</b>
***************
*** 88,92 ****
  </dl>
  
! <font size=-1> last updated 17-jan-2001 </font>
  
  
--- 82,86 ----
  </dl>
  
! <font size=-1> last updated 03-dec-2001 </font>
  
  

Index: links.h
===================================================================
RCS file: /cvsroot/jython/htdocs/links.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** links.h	2001/07/29 21:05:04	1.10
--- links.h	2001/12/03 21:14:45	1.11
***************
*** 4,8 ****
  <li><a href="license.html">License</a>
  <li><a href="download.html">Jython 2.0</a>
! <li><a href="http://sourceforge.net/project/showfiles.php?group_id=12867&release_id=45862">Jython 2.1a3</a>
  <li><a href="install.html">Installing</a>
  <li><a href="platform.html">JVM Compatibility</a>
--- 4,8 ----
  <li><a href="license.html">License</a>
  <li><a href="download.html">Jython 2.0</a>
! <li><a href="http://sourceforge.net/project/showfiles.php?group_id=12867&release_id=64027">Jython 2.1b1</a>
  <li><a href="install.html">Installing</a>
  <li><a href="platform.html">JVM Compatibility</a>

[Jython-checkins] CVS: htdocs license.ht,1.4,1.5

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

Update of /cvsroot/jython/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv17703

Modified Files:
	license.ht 
Log Message:
Generated from jython/LICENSE.txt.



Index: license.ht
===================================================================
RCS file: /cvsroot/jython/htdocs/license.ht,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** license.ht	2001/07/19 14:52:11	1.4
--- license.ht	2001/12/03 21:13:56	1.5
***************
*** 3,7 ****
  =======================
  
! JPython was created in late 1997 by Jim Hugunin. Jim was also the 
  primary developer while he was at CNRI. In February 1999 Barry Warsaw
  took over as primary developer and released JPython version 1.1.
--- 3,7 ----
  =======================
  
! JPython was created in late 1997 by Jim Hugunin. Jim was also the
  primary developer while he was at CNRI. In February 1999 Barry Warsaw
  took over as primary developer and released JPython version 1.1.
***************
*** 14,21 ****
  Lib/LICENSE file for details.
  
! The oro regular expresion matcher is covered by the apache license. 
  See the org/apache/LICENSE file for details.
  
! 
  
  Jython changes Software License.
--- 14,23 ----
  Lib/LICENSE file for details.
  
! The oro regular expresion matcher is covered by the apache license.
  See the org/apache/LICENSE file for details.
  
! The zxJDBC package was written by Brian Zimmer and originally licensed
! under the GNU Public License.  The package is now covered by the Jython
! Software License.
  
  Jython changes Software License.
***************
*** 25,54 ****
  All rights reserved.
  
! Redistribution and use in source and binary forms, with or without 
! modification, are permitted provided that the following conditions 
  are met:
  
!  - Redistributions of source code must retain the above copyright 
     notice, this list of conditions and the following disclaimer.
  
!  - Redistributions in binary form must reproduce the above copyright 
!    notice, this list of conditions and the following disclaimer in 
     the documentation and/or other materials provided with the distribution.
  
!  - Neither the name of the Jython Developers nor the names of 
!    its contributors may be used to endorse or promote products 
!    derived from this software without specific prior written permission. 
  
! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
! PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
! SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  
  
--- 27,56 ----
  All rights reserved.
  
! Redistribution and use in source and binary forms, with or without
! modification, are permitted provided that the following conditions
  are met:
  
!  - Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
  
!  - Redistributions in binary form must reproduce the above copyright
!    notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the distribution.
  
!  - Neither the name of the Jython Developers nor the names of
!    its contributors may be used to endorse or promote products
!    derived from this software without specific prior written permission.
  
! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
! PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
! SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  

[Jython-checkins] CVS: htdocs NEWS.ht,1.11,1.12

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

Update of /cvsroot/jython/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv17452

Modified Files:
	NEWS.ht 
Log Message:
Generated from jython/NEWS.



Index: NEWS.ht
===================================================================
RCS file: /cvsroot/jython/htdocs/NEWS.ht,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** NEWS.ht	2001/07/29 21:05:04	1.11
--- NEWS.ht	2001/12/03 21:13:15	1.12
***************
*** 2,5 ****
--- 2,45 ----
  Jython NEWS
  
+ 03-dec-2001 Jython 2.1 beta 1
+ 
+   New features.
+    - The weakref module is now available.
+    - The sys.exitfunc hook is called on exit and the sys.excepthook
+      is called when an exception occur.
+    - A CPython compatible xreadlines module.
+    - Support for os.environ and os.system() on common platforms.
+    - Includes zxJDBC for Python DB API 2.0 compatibility.
+ 
+   Bug fixes.
+    - [ #438297 ] SimpleHTTPServer does not work
+    - [ #440660 ] using nested java cls @ level >2 fails
+    - [ #448485 ] Tuple unpacking raises KeyError
+    - [ #448523 ] Support "ASCII" as builtin codec.
+    - [ #449316 ] ArrayList()[0] should raise IndexError
+    - [ #449956 ] jythonc 2.1a3 --package problem
+    - [ #450938 ] time module requires JDK 1.4
+    - [ #451746 ] jythonc --deep pjy$packages problem
+    - [ #452526 ] traceback lineno is the except line
+    - [ #452947 ] Class of innerclass inst <> innerclas
+    - [ #453301 ] jythonc --compileropts on Windows
+    - [ #457614 ] pls change &copyright; to (c) in sources
+    - [ #458945 ] Missing 'lastindex' on match objects
+    - [ #462280 ] builtin method as a class variable
+    - [ #467826 ] SHA digest() method doesn't work
+    - [ #473676 ] cStringIO bug
+    - [ #475445 ] incompatibility with python
+    - [ #475666 ] __nonzero__ exceptions must be ignored
+    - [ #476580 ] 'del obj.non_member' : wrong exception
+    - [ #476772 ] shutdowns in jython / atexit
+    - [ #477608 ] os.path.getmtime() missing
+    - [ #477768 ] ord([123]) 21a3
+    - [ #477793 ] os.utime() is missing.
+    - [ #480373 ] Can't find _PyInner with classloader.
+    - [ #480390 ] main() does not throw exceptions
+    - [ #484181 ] command line args in dos
+    - [ #485558 ] Synchronization bug in sys.initialize.
+    - [ #485968 ] cStringIO.softspace is not assignable.
+ 
  29-jul-2001 Jython 2.1 alpha 3
  

[Jython-checkins] CVS: htdocs build.xml,1.2,1.3

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

Update of /cvsroot/jython/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv17121

Modified Files:
	build.xml 
Log Message:
Rename Doc/api to Doc/javadoc.



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/htdocs/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml	2001/11/08 18:50:55	1.2
--- build.xml	2001/12/03 21:11:49	1.3
***************
*** 78,83 ****
              <fileset dir="${jython.home}/Doc" includes="*.ht"/>
          </copy>
!         <copy todir="docs/api">
!             <fileset dir="${jython.home}/Doc/api" includes="**/*.html"/>
          </copy>
          <execon executable="${python.home}/python" dir="docs">
--- 78,83 ----
              <fileset dir="${jython.home}/Doc" includes="*.ht"/>
          </copy>
!         <copy todir="docs/javadoc">
!             <fileset dir="${jython.home}/Doc/javadoc" includes="**/*.html"/>
          </copy>
          <execon executable="${python.home}/python" dir="docs">

[Jython-checkins] CVS: jython/installer liftoff.filelist,1.24,1.25

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

Update of /cvsroot/jython/jython/installer
In directory usw-pr-cvs1:/tmp/cvs-serv32243

Modified Files:
	liftoff.filelist 
Log Message:
Switching to PyXML-0.6.6 added one new file.



Index: liftoff.filelist
===================================================================
RCS file: /cvsroot/jython/jython/installer/liftoff.filelist,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** liftoff.filelist	2001/12/02 20:01:58	1.24
--- liftoff.filelist	2001/12/03 20:17:37	1.25
***************
*** 675,679 ****
  t Lib/xml/sax/drivers2/drv_xmlproc.py ..\Lib\xml\sax\drivers2\drv_xmlproc.py
  t Lib/xml/sax/drivers2/__init__.py    ..\Lib\xml\sax\drivers2\__init__.py
- t Lib/xml/utils/characters.py         ..\Lib\xml\utils\characters.py
  t Lib/xml/utils/iso8601.py            ..\Lib\xml\utils\iso8601.py
  t Lib/xml/utils/qp_xml.py             ..\Lib\xml\utils\qp_xml.py
--- 675,678 ----

[Jython-checkins] CVS: bugtests test336.py,1.1,1.2 test338.py,1.1,1.2 test342.py,1.1,1.2

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

Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv30559

Modified Files:
	test336.py test338.py test342.py 
Log Message:
Changed failing tests into warnings. When/if we fix them, we should 
turn the tests back into real errors.



Index: test336.py
===================================================================
RCS file: /cvsroot/jython/bugtests/test336.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test336.py	2001/11/03 23:23:52	1.1
--- test336.py	2001/12/03 20:13:22	1.2
***************
*** 4,10 ****
  
  import support
  
  support.compileJava("classes/test336p/Data.java")
  support.compileJava("classes/test336p/data/MyData.java")
  
! from test336p.data import MyData
--- 4,14 ----
  
  import support
+ import java
  
  support.compileJava("classes/test336p/Data.java")
  support.compileJava("classes/test336p/data/MyData.java")
  
! try:
!     from test336p.data import MyData
! except java.lang.NoClassDefFoundError:
!     raise support.TestWarning("Should not fail")

Index: test338.py
===================================================================
RCS file: /cvsroot/jython/bugtests/test338.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test338.py	2001/11/09 14:50:21	1.1
--- test338.py	2001/12/03 20:13:22	1.2
***************
*** 9,12 ****
  support.compileJava("test338j.java", classpath=".")
  
! support.runJava("test338j", classpath=".")
  
--- 9,13 ----
  support.compileJava("test338j.java", classpath=".")
  
! #support.runJava("test338j", classpath=".")
! raise support.TestWarning("Should (maybe) not fail.")
  

Index: test342.py
===================================================================
RCS file: /cvsroot/jython/bugtests/test342.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test342.py	2001/11/23 18:52:13	1.1
--- test342.py	2001/12/03 20:13:22	1.2
***************
*** 7,9 ****
  from test342p import doimp
  
! support.compare(doimp.kind,"absolute")
--- 7,11 ----
  from test342p import doimp
  
! #support.compare(doimp.kind,"absolute")
! if doimp.kind != "absolute":
!     raise support.TestWarning("Should be absolute")

[Jython-checkins] CVS: jython README.txt,1.11,1.12

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

Update of /cvsroot/jython/jython
In directory usw-pr-cvs1:/tmp/cvs-serv29454

Modified Files:
	README.txt 
Log Message:
Changes to sys.path zipfile support was backward incompatible.



Index: README.txt
===================================================================
RCS file: /cvsroot/jython/jython/README.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** README.txt	2001/07/23 19:36:27	1.11
--- README.txt	2001/12/03 20:11:13	1.12
***************
*** 12,13 ****
--- 12,17 ----
    filesystems like windows. This matches CPython behaviour.
  
+ - The way .zip and .jar files is added to sys.path is changed from 2.1a3.
+   Use the form: sys.path.append("/path/to/file.zip/Lib") to search for 
+   modules with the zipped named of "Lib/module.py"
+ 

[Jython-checkins] CVS: jython NEWS,2.39,2.40

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

Update of /cvsroot/jython/jython
In directory usw-pr-cvs1:/tmp/cvs-serv29021

Modified Files:
	NEWS 
Log Message:
Updated beta1 news.



Index: NEWS
===================================================================
RCS file: /cvsroot/jython/jython/NEWS,v
retrieving revision 2.39
retrieving revision 2.40
diff -C2 -d -r2.39 -r2.40
*** NEWS	2001/11/26 11:02:00	2.39
--- NEWS	2001/12/03 20:09:38	2.40
***************
*** 1,5 ****
  Jython NEWS
  
! xx-nov-2001 Jython 2.1 beta 1
  
    New features.
--- 1,5 ----
  Jython NEWS
  
! 03-dec-2001 Jython 2.1 beta 1
  
    New features.
***************
*** 8,11 ****
--- 8,43 ----
       is called when an exception occur.
     - A CPython compatible xreadlines module.
+    - Support for os.environ and os.system() on common platforms.
+    - Includes zxJDBC for Python DB API 2.0 compatibility.
+ 
+   Bug fixes.
+    - [ #438297 ] SimpleHTTPServer does not work
+    - [ #440660 ] using nested java cls @ level >2 fails
+    - [ #448485 ] Tuple unpacking raises KeyError
+    - [ #448523 ] Support "ASCII" as builtin codec.
+    - [ #449316 ] ArrayList()[0] should raise IndexError
+    - [ #449956 ] jythonc 2.1a3 --package problem
+    - [ #450938 ] time module requires JDK 1.4
+    - [ #451746 ] jythonc --deep pjy$packages problem
+    - [ #452526 ] traceback lineno is the except line
+    - [ #452947 ] Class of innerclass inst <> innerclas
+    - [ #453301 ] jythonc --compileropts on Windows
+    - [ #457614 ] pls change &copyright; to (c) in sources
+    - [ #458945 ] Missing 'lastindex' on match objects
+    - [ #462280 ] builtin method as a class variable
+    - [ #467826 ] SHA digest() method doesn't work
+    - [ #473676 ] cStringIO bug
+    - [ #475445 ] incompatibility with python
+    - [ #475666 ] __nonzero__ exceptions must be ignored
+    - [ #476580 ] 'del obj.non_member' : wrong exception
+    - [ #476772 ] shutdowns in jython / atexit
+    - [ #477608 ] os.path.getmtime() missing
+    - [ #477768 ] ord([123]) 21a3
+    - [ #477793 ] os.utime() is missing.
+    - [ #480373 ] Can't find _PyInner with classloader.
+    - [ #480390 ] main() does not throw exceptions
+    - [ #484181 ] command line args in dos
+    - [ #485558 ] Synchronization bug in sys.initialize.
+    - [ #485968 ] cStringIO.softspace is not assignable.
  
  29-jul-2001 Jython 2.1 alpha 3

[Jython-checkins] CVS: jython ACKNOWLEDGMENTS,2.16,2.17

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

Update of /cvsroot/jython/jython
In directory usw-pr-cvs1:/tmp/cvs-serv21395

Modified Files:
	ACKNOWLEDGMENTS 
Log Message:
Updated section about primary maintainer. Added separate PythonLabs acks.



Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /cvsroot/jython/jython/ACKNOWLEDGMENTS,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -d -r2.16 -r2.17
*** ACKNOWLEDGMENTS	2001/12/02 19:54:50	2.16
--- ACKNOWLEDGMENTS	2001/12/03 19:45:52	2.17
***************
*** 4,22 ****
      Jim Hugunin invented JPython and was the primary developer while
      he was at CNRI.  In February 1999, Jim left CNRI for sunny
!     California and Barry Warsaw became the primary maintainer.  Jim
!     continues to provide valuable assistance, as does Python's
!     inventor Guido van Rossum.
  
      You can contact the Jython maintainers directly via
      jyt...@li..., or the Jython community at
      jyt...@li....
- 
-     Finn Bock has been a frequent and valuable contributor to 
-     Jython, and has provided bug fixes and these important modules:
- 
-         cPickle.java
-         cStringIO.java
-         struct.java
-         binascii.java
  
      Harry Mantakos contributed the underlying md5 implementation.
--- 4,19 ----
      Jim Hugunin invented JPython and was the primary developer while
      he was at CNRI.  In February 1999, Jim left CNRI for sunny
!     California and Barry Warsaw became the primary maintainer.
!     When Barry and the rest of PythonLabs left CNRI, Barry renamed
!     JPython to Jython, put the sources on SourceForge and made 
!     Finn Bock the primary maintainer.
  
+     Python's inventor Guido van Rossum and the rest of PythonLabs
+     continues to help and support Jython by their understanding
+     of how Jython must live with the limits of Java.
+ 
      You can contact the Jython maintainers directly via
      jyt...@li..., or the Jython community at
      jyt...@li....
  
      Harry Mantakos contributed the underlying md5 implementation.

[Jython-checkins] CVS: bugtests test312.py,1.1,1.2 test313c.py,1.2,1.3

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

Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv12990

Modified Files:
	test312.py test313c.py 
Log Message:
Switched to PyXML-0.6.6. Apparently the use of the namespace feature is
now required.



Index: test312.py
===================================================================
RCS file: /cvsroot/jython/bugtests/test312.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test312.py	2001/08/06 17:53:54	1.1
--- test312.py	2001/12/03 19:18:05	1.2
***************
*** 38,42 ****
  
  parser = make_parser()
! #parser.setFeature(feature_namespaces,0)
  dh = FindIssue('Sandman', '62')
  parser.setContentHandler(dh)
--- 38,42 ----
  
  parser = make_parser()
! parser.setFeature(feature_namespaces,0)
  dh = FindIssue('Sandman', '62')
  parser.setContentHandler(dh)

Index: test313c.py
===================================================================
RCS file: /cvsroot/jython/bugtests/test313c.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test313c.py	2001/08/11 10:21:45	1.2
--- test313c.py	2001/12/03 19:18:05	1.3
***************
*** 37,41 ****
  
  parser = make_parser()
! #parser.setFeature(feature_namespaces,0)
  dh = FindIssue('Sandman', '62')
  parser.setContentHandler(dh)
--- 37,41 ----
  
  parser = make_parser()
! parser.setFeature(feature_namespaces,0)
  dh = FindIssue('Sandman', '62')
  parser.setContentHandler(dh)

[Jython-checkins] CVS: jython/installer liftoff.filelist,1.23,1.24

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

Update of /cvsroot/jython/jython/installer
In directory usw-pr-cvs1:/tmp/cvs-serv27536

Modified Files:
	liftoff.filelist 
Log Message:
Directory renamed: api -> javadoc.



Index: liftoff.filelist
===================================================================
RCS file: /cvsroot/jython/jython/installer/liftoff.filelist,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** liftoff.filelist	2001/11/27 19:34:16	1.23
--- liftoff.filelist	2001/12/02 20:01:58	1.24
***************
*** 85,207 ****
  b Doc/images/jython-new-small.gif     ..\Doc/images/jython-new-small.gif
  b Doc/images/PythonPoweredSmall.gif   ..\Doc/images/PythonPoweredSmall.gif
! t Doc/api/allclasses-frame.html       ..\Doc\api\allclasses-frame.html
! t Doc/api/allclasses-noframe.html     ..\Doc\api\allclasses-noframe.html
! t Doc/api/constant-values.html        ..\Doc\api\constant-values.html
! t Doc/api/deprecated-list.html        ..\Doc\api\deprecated-list.html
! t Doc/api/help-doc.html               ..\Doc\api\help-doc.html
! t Doc/api/index-all.html              ..\Doc\api\index-all.html
! t Doc/api/index.html                  ..\Doc\api\index.html
! t Doc/api/overview-frame.html         ..\Doc\api\overview-frame.html
! t Doc/api/overview-summary.html       ..\Doc\api\overview-summary.html
! t Doc/api/overview-tree.html          ..\Doc\api\overview-tree.html
! t Doc/api/packages.html               ..\Doc\api\packages.html
! t Doc/api/serialized-form.html        ..\Doc\api\serialized-form.html
! t Doc/api/stylesheet.css              ..\Doc\api\stylesheet.css
! t Doc/api/org/python/core/ArgParser.html ..\Doc\api\org\python\core\ArgParser.html
! t Doc/api/org/python/core/AutoInternalTables.html ..\Doc\api\org\python\core\AutoInternalTables.html
! t Doc/api/org/python/core/BytecodeLoader.html ..\Doc\api\org\python\core\BytecodeLoader.html
! t Doc/api/org/python/core/CachedJarsPackageManager.html ..\Doc\api\org\python\core\CachedJarsPackageManager.html
! t Doc/api/org/python/core/CachedJarsPackageManager.JarXEntry.html ..\Doc\api\org\python\core\CachedJarsPackageManager.JarXEntry.html
! t Doc/api/org/python/core/ClassDictInit.html ..\Doc\api\org\python\core\ClassDictInit.html
! t Doc/api/org/python/core/codecs.html ..\Doc\api\org\python\core\codecs.html
! t Doc/api/org/python/core/CompilerFlags.html ..\Doc\api\org\python\core\CompilerFlags.html
! t Doc/api/org/python/core/exceptions.html ..\Doc\api\org\python\core\exceptions.html
! t Doc/api/org/python/core/ExtraMath.html ..\Doc\api\org\python\core\ExtraMath.html
! t Doc/api/org/python/core/imp.html    ..\Doc\api\org\python\core\imp.html
! t Doc/api/org/python/core/InitModule.html ..\Doc\api\org\python\core\InitModule.html
! t Doc/api/org/python/core/InternalTables.html ..\Doc\api\org\python\core\InternalTables.html
! t Doc/api/org/python/core/InternalTables._LazyRep.html ..\Doc\api\org\python\core\InternalTables._LazyRep.html
! t Doc/api/org/python/core/InternalTables1.html ..\Doc\api\org\python\core\InternalTables1.html
! t Doc/api/org/python/core/InternalTables2.html ..\Doc\api\org\python\core\InternalTables2.html
! t Doc/api/org/python/core/Loader.html ..\Doc\api\org\python\core\Loader.html
! t Doc/api/org/python/core/Options.html ..\Doc\api\org\python\core\Options.html
! t Doc/api/org/python/core/package-frame.html ..\Doc\api\org\python\core\package-frame.html
! t Doc/api/org/python/core/package-summary.html ..\Doc\api\org\python\core\package-summary.html
! t Doc/api/org/python/core/package-tree.html ..\Doc\api\org\python\core\package-tree.html
! t Doc/api/org/python/core/PackageManager.html ..\Doc\api\org\python\core\PackageManager.html
! t Doc/api/org/python/core/parser.html ..\Doc\api\org\python\core\parser.html
! t Doc/api/org/python/core/PathPackageManager.html ..\Doc\api\org\python\core\PathPackageManager.html
! t Doc/api/org/python/core/Py.html     ..\Doc\api\org\python\core\Py.html
! t Doc/api/org/python/core/PyArray.html ..\Doc\api\org\python\core\PyArray.html
! t Doc/api/org/python/core/PyBeanEvent.html ..\Doc\api\org\python\core\PyBeanEvent.html
! t Doc/api/org/python/core/PyBeanEventProperty.html ..\Doc\api\org\python\core\PyBeanEventProperty.html
! t Doc/api/org/python/core/PyBeanProperty.html ..\Doc\api\org\python\core\PyBeanProperty.html
! t Doc/api/org/python/core/PyBuiltinFunctionSet.html ..\Doc\api\org\python\core\PyBuiltinFunctionSet.html
! t Doc/api/org/python/core/PyCell.html ..\Doc\api\org\python\core\PyCell.html
! t Doc/api/org/python/core/PyClass.html ..\Doc\api\org\python\core\PyClass.html
! t Doc/api/org/python/core/PyCode.html ..\Doc\api\org\python\core\PyCode.html
! t Doc/api/org/python/core/PyComplex.html ..\Doc\api\org\python\core\PyComplex.html
! t Doc/api/org/python/core/PyCompoundCallable.html ..\Doc\api\org\python\core\PyCompoundCallable.html
! t Doc/api/org/python/core/PyDictionary.html ..\Doc\api\org\python\core\PyDictionary.html
! t Doc/api/org/python/core/PyEllipsis.html ..\Doc\api\org\python\core\PyEllipsis.html
! t Doc/api/org/python/core/PyException.html ..\Doc\api\org\python\core\PyException.html
! t Doc/api/org/python/core/PyFile.html ..\Doc\api\org\python\core\PyFile.html
! t Doc/api/org/python/core/PyFinalizableInstance.html ..\Doc\api\org\python\core\PyFinalizableInstance.html
! t Doc/api/org/python/core/PyFloat.html ..\Doc\api\org\python\core\PyFloat.html
! t Doc/api/org/python/core/PyFrame.html ..\Doc\api\org\python\core\PyFrame.html
! t Doc/api/org/python/core/PyFunction.html ..\Doc\api\org\python\core\PyFunction.html
! t Doc/api/org/python/core/PyFunctionTable.html ..\Doc\api\org\python\core\PyFunctionTable.html
! t Doc/api/org/python/core/PyIgnoreMethodTag.html ..\Doc\api\org\python\core\PyIgnoreMethodTag.html
! t Doc/api/org/python/core/PyInstance.html ..\Doc\api\org\python\core\PyInstance.html
! t Doc/api/org/python/core/PyInteger.html ..\Doc\api\org\python\core\PyInteger.html
! t Doc/api/org/python/core/PyJavaClass.html ..\Doc\api\org\python\core\PyJavaClass.html
! t Doc/api/org/python/core/PyJavaInnerClass.html ..\Doc\api\org\python\core\PyJavaInnerClass.html
! t Doc/api/org/python/core/PyJavaInstance.html ..\Doc\api\org\python\core\PyJavaInstance.html
! t Doc/api/org/python/core/PyJavaPackage.html ..\Doc\api\org\python\core\PyJavaPackage.html
! t Doc/api/org/python/core/PyList.html ..\Doc\api\org\python\core\PyList.html
! t Doc/api/org/python/core/PyLong.html ..\Doc\api\org\python\core\PyLong.html
! t Doc/api/org/python/core/PyMetaClass.html ..\Doc\api\org\python\core\PyMetaClass.html
! t Doc/api/org/python/core/PyMethod.html ..\Doc\api\org\python\core\PyMethod.html
! t Doc/api/org/python/core/PyModule.html ..\Doc\api\org\python\core\PyModule.html
! t Doc/api/org/python/core/PyNone.html ..\Doc\api\org\python\core\PyNone.html
! t Doc/api/org/python/core/PyObject.html ..\Doc\api\org\python\core\PyObject.html
! t Doc/api/org/python/core/PyProxy.html ..\Doc\api\org\python\core\PyProxy.html
! t Doc/api/org/python/core/PyReflectedConstructor.html ..\Doc\api\org\python\core\PyReflectedConstructor.html
! t Doc/api/org/python/core/PyReflectedField.html ..\Doc\api\org\python\core\PyReflectedField.html
! t Doc/api/org/python/core/PyReflectedFunction.html ..\Doc\api\org\python\core\PyReflectedFunction.html
! t Doc/api/org/python/core/PyRunnable.html ..\Doc\api\org\python\core\PyRunnable.html
! t Doc/api/org/python/core/PySequence.html ..\Doc\api\org\python\core\PySequence.html
! t Doc/api/org/python/core/PySingleton.html ..\Doc\api\org\python\core\PySingleton.html
! t Doc/api/org/python/core/PySlice.html ..\Doc\api\org\python\core\PySlice.html
! t Doc/api/org/python/core/PyString.html ..\Doc\api\org\python\core\PyString.html
! t Doc/api/org/python/core/PyStringMap.html ..\Doc\api\org\python\core\PyStringMap.html
! t Doc/api/org/python/core/PySyntaxError.html ..\Doc\api\org\python\core\PySyntaxError.html
! t Doc/api/org/python/core/PySystemState.html ..\Doc\api\org\python\core\PySystemState.html
! t Doc/api/org/python/core/PyTableCode.html ..\Doc\api\org\python\core\PyTableCode.html
! t Doc/api/org/python/core/PyTraceback.html ..\Doc\api\org\python\core\PyTraceback.html
! t Doc/api/org/python/core/PyTuple.html ..\Doc\api\org\python\core\PyTuple.html
! t Doc/api/org/python/core/PyXRange.html ..\Doc\api\org\python\core\PyXRange.html
! t Doc/api/org/python/core/SoftIInternalTables.html ..\Doc\api\org\python\core\SoftIInternalTables.html
! t Doc/api/org/python/core/StderrWrapper.html ..\Doc\api\org\python\core\StderrWrapper.html
! t Doc/api/org/python/core/StdoutWrapper.html ..\Doc\api\org\python\core\StdoutWrapper.html
! t Doc/api/org/python/core/SysPackageManager.html ..\Doc\api\org\python\core\SysPackageManager.html
! t Doc/api/org/python/core/SyspathArchive.html ..\Doc\api\org\python\core\SyspathArchive.html
! t Doc/api/org/python/core/SyspathJavaLoader.html ..\Doc\api\org\python\core\SyspathJavaLoader.html
! t Doc/api/org/python/core/ThreadState.html ..\Doc\api\org\python\core\ThreadState.html
! t Doc/api/org/python/core/TraceFunction.html ..\Doc\api\org\python\core\TraceFunction.html
! t Doc/api/org/python/core/ucnhashAPI.html ..\Doc\api\org\python\core\ucnhashAPI.html
! t Doc/api/org/python/core/WeakInternalTables.html ..\Doc\api\org\python\core\WeakInternalTables.html
! t Doc/api/org/python/core/__builtin__.html ..\Doc\api\org\python\core\__builtin__.html
! t Doc/api/org/python/util/InteractiveConsole.html ..\Doc\api\org\python\util\InteractiveConsole.html
! t Doc/api/org/python/util/InteractiveInterpreter.html ..\Doc\api\org\python\util\InteractiveInterpreter.html
! t Doc/api/org/python/util/jython.html ..\Doc\api\org\python\util\jython.html
! t Doc/api/org/python/util/package-frame.html ..\Doc\api\org\python\util\package-frame.html
! t Doc/api/org/python/util/package-summary.html ..\Doc\api\org\python\util\package-summary.html
! t Doc/api/org/python/util/package-tree.html ..\Doc\api\org\python\util\package-tree.html
! t Doc/api/org/python/util/PyServlet.html ..\Doc\api\org\python\util\PyServlet.html
! t Doc/api/org/python/util/PythonInterpreter.html ..\Doc\api\org\python\util\PythonInterpreter.html
! t Doc/api/org/python/util/PythonObjectInputStream.html ..\Doc\api\org\python\util\PythonObjectInputStream.html
! t Doc/api/org/python/util/ReadlineConsole.html ..\Doc\api\org\python\util\ReadlineConsole.html
! t Doc/api/com/ziclix/python/sql/DataHandler.html ..\Doc\api\com\ziclix\python\sql\DataHandler.html
! t Doc/api/com/ziclix/python/sql/Fetch.html ..\Doc\api\com\ziclix\python\sql\Fetch.html
! t Doc/api/com/ziclix/python/sql/FilterDataHandler.html ..\Doc\api\com\ziclix\python\sql\FilterDataHandler.html
! t Doc/api/com/ziclix/python/sql/JDBC20DataHandler.html ..\Doc\api\com\ziclix\python\sql\JDBC20DataHandler.html
! t Doc/api/com/ziclix/python/sql/package-frame.html ..\Doc\api\com\ziclix\python\sql\package-frame.html
! t Doc/api/com/ziclix/python/sql/package-summary.html ..\Doc\api\com\ziclix\python\sql\package-summary.html
! t Doc/api/com/ziclix/python/sql/package-tree.html ..\Doc\api\com\ziclix\python\sql\package-tree.html
! t Doc/api/com/ziclix/python/sql/PyConnection.html ..\Doc\api\com\ziclix\python\sql\PyConnection.html
! t Doc/api/com/ziclix/python/sql/PyCursor.html ..\Doc\api\com\ziclix\python\sql\PyCursor.html
! t Doc/api/com/ziclix/python/sql/PyExtendedCursor.html ..\Doc\api\com\ziclix\python\sql\PyExtendedCursor.html
! t Doc/api/com/ziclix/python/sql/zxJDBC.html ..\Doc\api\com\ziclix\python\sql\zxJDBC.html
  #
  # Demos
--- 85,207 ----
  b Doc/images/jython-new-small.gif     ..\Doc/images/jython-new-small.gif
  b Doc/images/PythonPoweredSmall.gif   ..\Doc/images/PythonPoweredSmall.gif
! t Doc/javadoc/allclasses-frame.html   ..\Doc\javadoc\allclasses-frame.html
! t Doc/javadoc/allclasses-noframe.html ..\Doc\javadoc\allclasses-noframe.html
! t Doc/javadoc/constant-values.html    ..\Doc\javadoc\constant-values.html
! t Doc/javadoc/deprecated-list.html    ..\Doc\javadoc\deprecated-list.html
! t Doc/javadoc/help-doc.html           ..\Doc\javadoc\help-doc.html
! t Doc/javadoc/index-all.html          ..\Doc\javadoc\index-all.html
! t Doc/javadoc/index.html              ..\Doc\javadoc\index.html
! t Doc/javadoc/overview-frame.html     ..\Doc\javadoc\overview-frame.html
! t Doc/javadoc/overview-summary.html   ..\Doc\javadoc\overview-summary.html
! t Doc/javadoc/overview-tree.html      ..\Doc\javadoc\overview-tree.html
! t Doc/javadoc/packages.html           ..\Doc\javadoc\packages.html
! t Doc/javadoc/serialized-form.html    ..\Doc\javadoc\serialized-form.html
! t Doc/javadoc/stylesheet.css          ..\Doc\javadoc\stylesheet.css
! t Doc/javadoc/org/python/core/ArgParser.html ..\Doc\javadoc\org\python\core\ArgParser.html
! t Doc/javadoc/org/python/core/AutoInternalTables.html ..\Doc\javadoc\org\python\core\AutoInternalTables.html
! t Doc/javadoc/org/python/core/BytecodeLoader.html ..\Doc\javadoc\org\python\core\BytecodeLoader.html
! t Doc/javadoc/org/python/core/CachedJarsPackageManager.html ..\Doc\javadoc\org\python\core\CachedJarsPackageManager.html
! t Doc/javadoc/org/python/core/CachedJarsPackageManager.JarXEntry.html ..\Doc\javadoc\org\python\core\CachedJarsPackageManager.JarXEntry.html
! t Doc/javadoc/org/python/core/ClassDictInit.html ..\Doc\javadoc\org\python\core\ClassDictInit.html
! t Doc/javadoc/org/python/core/codecs.html ..\Doc\javadoc\org\python\core\codecs.html
! t Doc/javadoc/org/python/core/CompilerFlags.html ..\Doc\javadoc\org\python\core\CompilerFlags.html
! t Doc/javadoc/org/python/core/exceptions.html ..\Doc\javadoc\org\python\core\exceptions.html
! t Doc/javadoc/org/python/core/ExtraMath.html ..\Doc\javadoc\org\python\core\ExtraMath.html
! t Doc/javadoc/org/python/core/imp.html ..\Doc\javadoc\org\python\core\imp.html
! t Doc/javadoc/org/python/core/InitModule.html ..\Doc\javadoc\org\python\core\InitModule.html
! t Doc/javadoc/org/python/core/InternalTables.html ..\Doc\javadoc\org\python\core\InternalTables.html
! t Doc/javadoc/org/python/core/InternalTables._LazyRep.html ..\Doc\javadoc\org\python\core\InternalTables._LazyRep.html
! t Doc/javadoc/org/python/core/InternalTables1.html ..\Doc\javadoc\org\python\core\InternalTables1.html
! t Doc/javadoc/org/python/core/InternalTables2.html ..\Doc\javadoc\org\python\core\InternalTables2.html
! t Doc/javadoc/org/python/core/Loader.html ..\Doc\javadoc\org\python\core\Loader.html
! t Doc/javadoc/org/python/core/Options.html ..\Doc\javadoc\org\python\core\Options.html
! t Doc/javadoc/org/python/core/package-frame.html ..\Doc\javadoc\org\python\core\package-frame.html
! t Doc/javadoc/org/python/core/package-summary.html ..\Doc\javadoc\org\python\core\package-summary.html
! t Doc/javadoc/org/python/core/package-tree.html ..\Doc\javadoc\org\python\core\package-tree.html
! t Doc/javadoc/org/python/core/PackageManager.html ..\Doc\javadoc\org\python\core\PackageManager.html
! t Doc/javadoc/org/python/core/parser.html ..\Doc\javadoc\org\python\core\parser.html
! t Doc/javadoc/org/python/core/PathPackageManager.html ..\Doc\javadoc\org\python\core\PathPackageManager.html
! t Doc/javadoc/org/python/core/Py.html ..\Doc\javadoc\org\python\core\Py.html
! t Doc/javadoc/org/python/core/PyArray.html ..\Doc\javadoc\org\python\core\PyArray.html
! t Doc/javadoc/org/python/core/PyBeanEvent.html ..\Doc\javadoc\org\python\core\PyBeanEvent.html
! t Doc/javadoc/org/python/core/PyBeanEventProperty.html ..\Doc\javadoc\org\python\core\PyBeanEventProperty.html
! t Doc/javadoc/org/python/core/PyBeanProperty.html ..\Doc\javadoc\org\python\core\PyBeanProperty.html
! t Doc/javadoc/org/python/core/PyBuiltinFunctionSet.html ..\Doc\javadoc\org\python\core\PyBuiltinFunctionSet.html
! t Doc/javadoc/org/python/core/PyCell.html ..\Doc\javadoc\org\python\core\PyCell.html
! t Doc/javadoc/org/python/core/PyClass.html ..\Doc\javadoc\org\python\core\PyClass.html
! t Doc/javadoc/org/python/core/PyCode.html ..\Doc\javadoc\org\python\core\PyCode.html
! t Doc/javadoc/org/python/core/PyComplex.html ..\Doc\javadoc\org\python\core\PyComplex.html
! t Doc/javadoc/org/python/core/PyCompoundCallable.html ..\Doc\javadoc\org\python\core\PyCompoundCallable.html
! t Doc/javadoc/org/python/core/PyDictionary.html ..\Doc\javadoc\org\python\core\PyDictionary.html
! t Doc/javadoc/org/python/core/PyEllipsis.html ..\Doc\javadoc\org\python\core\PyEllipsis.html
! t Doc/javadoc/org/python/core/PyException.html ..\Doc\javadoc\org\python\core\PyException.html
! t Doc/javadoc/org/python/core/PyFile.html ..\Doc\javadoc\org\python\core\PyFile.html
! t Doc/javadoc/org/python/core/PyFinalizableInstance.html ..\Doc\javadoc\org\python\core\PyFinalizableInstance.html
! t Doc/javadoc/org/python/core/PyFloat.html ..\Doc\javadoc\org\python\core\PyFloat.html
! t Doc/javadoc/org/python/core/PyFrame.html ..\Doc\javadoc\org\python\core\PyFrame.html
! t Doc/javadoc/org/python/core/PyFunction.html ..\Doc\javadoc\org\python\core\PyFunction.html
! t Doc/javadoc/org/python/core/PyFunctionTable.html ..\Doc\javadoc\org\python\core\PyFunctionTable.html
! t Doc/javadoc/org/python/core/PyIgnoreMethodTag.html ..\Doc\javadoc\org\python\core\PyIgnoreMethodTag.html
! t Doc/javadoc/org/python/core/PyInstance.html ..\Doc\javadoc\org\python\core\PyInstance.html
! t Doc/javadoc/org/python/core/PyInteger.html ..\Doc\javadoc\org\python\core\PyInteger.html
! t Doc/javadoc/org/python/core/PyJavaClass.html ..\Doc\javadoc\org\python\core\PyJavaClass.html
! t Doc/javadoc/org/python/core/PyJavaInnerClass.html ..\Doc\javadoc\org\python\core\PyJavaInnerClass.html
! t Doc/javadoc/org/python/core/PyJavaInstance.html ..\Doc\javadoc\org\python\core\PyJavaInstance.html
! t Doc/javadoc/org/python/core/PyJavaPackage.html ..\Doc\javadoc\org\python\core\PyJavaPackage.html
! t Doc/javadoc/org/python/core/PyList.html ..\Doc\javadoc\org\python\core\PyList.html
! t Doc/javadoc/org/python/core/PyLong.html ..\Doc\javadoc\org\python\core\PyLong.html
! t Doc/javadoc/org/python/core/PyMetaClass.html ..\Doc\javadoc\org\python\core\PyMetaClass.html
! t Doc/javadoc/org/python/core/PyMethod.html ..\Doc\javadoc\org\python\core\PyMethod.html
! t Doc/javadoc/org/python/core/PyModule.html ..\Doc\javadoc\org\python\core\PyModule.html
! t Doc/javadoc/org/python/core/PyNone.html ..\Doc\javadoc\org\python\core\PyNone.html
! t Doc/javadoc/org/python/core/PyObject.html ..\Doc\javadoc\org\python\core\PyObject.html
! t Doc/javadoc/org/python/core/PyProxy.html ..\Doc\javadoc\org\python\core\PyProxy.html
! t Doc/javadoc/org/python/core/PyReflectedConstructor.html ..\Doc\javadoc\org\python\core\PyReflectedConstructor.html
! t Doc/javadoc/org/python/core/PyReflectedField.html ..\Doc\javadoc\org\python\core\PyReflectedField.html
! t Doc/javadoc/org/python/core/PyReflectedFunction.html ..\Doc\javadoc\org\python\core\PyReflectedFunction.html
! t Doc/javadoc/org/python/core/PyRunnable.html ..\Doc\javadoc\org\python\core\PyRunnable.html
! t Doc/javadoc/org/python/core/PySequence.html ..\Doc\javadoc\org\python\core\PySequence.html
! t Doc/javadoc/org/python/core/PySingleton.html ..\Doc\javadoc\org\python\core\PySingleton.html
! t Doc/javadoc/org/python/core/PySlice.html ..\Doc\javadoc\org\python\core\PySlice.html
! t Doc/javadoc/org/python/core/PyString.html ..\Doc\javadoc\org\python\core\PyString.html
! t Doc/javadoc/org/python/core/PyStringMap.html ..\Doc\javadoc\org\python\core\PyStringMap.html
! t Doc/javadoc/org/python/core/PySyntaxError.html ..\Doc\javadoc\org\python\core\PySyntaxError.html
! t Doc/javadoc/org/python/core/PySystemState.html ..\Doc\javadoc\org\python\core\PySystemState.html
! t Doc/javadoc/org/python/core/PyTableCode.html ..\Doc\javadoc\org\python\core\PyTableCode.html
! t Doc/javadoc/org/python/core/PyTraceback.html ..\Doc\javadoc\org\python\core\PyTraceback.html
! t Doc/javadoc/org/python/core/PyTuple.html ..\Doc\javadoc\org\python\core\PyTuple.html
! t Doc/javadoc/org/python/core/PyXRange.html ..\Doc\javadoc\org\python\core\PyXRange.html
! t Doc/javadoc/org/python/core/SoftIInternalTables.html ..\Doc\javadoc\org\python\core\SoftIInternalTables.html
! t Doc/javadoc/org/python/core/StderrWrapper.html ..\Doc\javadoc\org\python\core\StderrWrapper.html
! t Doc/javadoc/org/python/core/StdoutWrapper.html ..\Doc\javadoc\org\python\core\StdoutWrapper.html
! t Doc/javadoc/org/python/core/SysPackageManager.html ..\Doc\javadoc\org\python\core\SysPackageManager.html
! t Doc/javadoc/org/python/core/SyspathArchive.html ..\Doc\javadoc\org\python\core\SyspathArchive.html
! t Doc/javadoc/org/python/core/SyspathJavaLoader.html ..\Doc\javadoc\org\python\core\SyspathJavaLoader.html
! t Doc/javadoc/org/python/core/ThreadState.html ..\Doc\javadoc\org\python\core\ThreadState.html
! t Doc/javadoc/org/python/core/TraceFunction.html ..\Doc\javadoc\org\python\core\TraceFunction.html
! t Doc/javadoc/org/python/core/ucnhashAPI.html ..\Doc\javadoc\org\python\core\ucnhashAPI.html
! t Doc/javadoc/org/python/core/WeakInternalTables.html ..\Doc\javadoc\org\python\core\WeakInternalTables.html
! t Doc/javadoc/org/python/core/__builtin__.html ..\Doc\javadoc\org\python\core\__builtin__.html
! t Doc/javadoc/org/python/util/InteractiveConsole.html ..\Doc\javadoc\org\python\util\InteractiveConsole.html
! t Doc/javadoc/org/python/util/InteractiveInterpreter.html ..\Doc\javadoc\org\python\util\InteractiveInterpreter.html
! t Doc/javadoc/org/python/util/jython.html ..\Doc\javadoc\org\python\util\jython.html
! t Doc/javadoc/org/python/util/package-frame.html ..\Doc\javadoc\org\python\util\package-frame.html
! t Doc/javadoc/org/python/util/package-summary.html ..\Doc\javadoc\org\python\util\package-summary.html
! t Doc/javadoc/org/python/util/package-tree.html ..\Doc\javadoc\org\python\util\package-tree.html
! t Doc/javadoc/org/python/util/PyServlet.html ..\Doc\javadoc\org\python\util\PyServlet.html
! t Doc/javadoc/org/python/util/PythonInterpreter.html ..\Doc\javadoc\org\python\util\PythonInterpreter.html
! t Doc/javadoc/org/python/util/PythonObjectInputStream.html ..\Doc\javadoc\org\python\util\PythonObjectInputStream.html
! t Doc/javadoc/org/python/util/ReadlineConsole.html ..\Doc\javadoc\org\python\util\ReadlineConsole.html
! t Doc/javadoc/com/ziclix/python/sql/DataHandler.html ..\Doc\javadoc\com\ziclix\python\sql\DataHandler.html
! t Doc/javadoc/com/ziclix/python/sql/Fetch.html ..\Doc\javadoc\com\ziclix\python\sql\Fetch.html
! t Doc/javadoc/com/ziclix/python/sql/FilterDataHandler.html ..\Doc\javadoc\com\ziclix\python\sql\FilterDataHandler.html
! t Doc/javadoc/com/ziclix/python/sql/JDBC20DataHandler.html ..\Doc\javadoc\com\ziclix\python\sql\JDBC20DataHandler.html
! t Doc/javadoc/com/ziclix/python/sql/package-frame.html ..\Doc\javadoc\com\ziclix\python\sql\package-frame.html
! t Doc/javadoc/com/ziclix/python/sql/package-summary.html ..\Doc\javadoc\com\ziclix\python\sql\package-summary.html
! t Doc/javadoc/com/ziclix/python/sql/package-tree.html ..\Doc\javadoc\com\ziclix\python\sql\package-tree.html
! t Doc/javadoc/com/ziclix/python/sql/PyConnection.html ..\Doc\javadoc\com\ziclix\python\sql\PyConnection.html
! t Doc/javadoc/com/ziclix/python/sql/PyCursor.html ..\Doc\javadoc\com\ziclix\python\sql\PyCursor.html
! t Doc/javadoc/com/ziclix/python/sql/PyExtendedCursor.html ..\Doc\javadoc\com\ziclix\python\sql\PyExtendedCursor.html
! t Doc/javadoc/com/ziclix/python/sql/zxJDBC.html ..\Doc\javadoc\com\ziclix\python\sql\zxJDBC.html
  #
  # Demos

[Jython-checkins] CVS: jython/installer mklist.py,1.28,1.29

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

Update of /cvsroot/jython/jython/installer
In directory usw-pr-cvs1:/tmp/cvs-serv27078

Modified Files:
	mklist.py 
Log Message:
Directory renamed: api -> javadoc.



Index: mklist.py
===================================================================
RCS file: /cvsroot/jython/jython/installer/mklist.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** mklist.py	2001/11/27 19:34:17	1.28
--- mklist.py	2001/12/02 20:00:06	1.29
***************
*** 191,198 ****
  binary("Doc/images/jython-new-small.gif")
  binary("Doc/images/PythonPoweredSmall.gif")
! listfiles(None, "Doc/api", '*.html', '*.css')
! listfiles(None, "Doc/api/org/python/core", '*.html')
! listfiles(None, "Doc/api/org/python/util", '*.html')
! listfiles(None, "Doc/api/com/ziclix/python/sql", '*.html')
  
  comment("Demos")
--- 191,198 ----
  binary("Doc/images/jython-new-small.gif")
  binary("Doc/images/PythonPoweredSmall.gif")
! listfiles(None, "Doc/javadoc", '*.html', '*.css')
! listfiles(None, "Doc/javadoc/org/python/core", '*.html')
! listfiles(None, "Doc/javadoc/org/python/util", '*.html')
! listfiles(None, "Doc/javadoc/com/ziclix/python/sql", '*.html')
  
  comment("Demos")

[Jython-checkins] CVS: jython/Doc embedding.ht,1.3,1.4 index.ht,1.8,1.9

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

Update of /cvsroot/jython/jython/Doc
In directory usw-pr-cvs1:/tmp/cvs-serv26770

Modified Files:
	embedding.ht index.ht 
Log Message:
Java doc directory renamed: api -> javadoc.



Index: embedding.ht
===================================================================
RCS file: /cvsroot/jython/jython/Doc/embedding.ht,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** embedding.ht	2001/02/25 17:05:07	1.3
--- embedding.ht	2001/12/02 19:58:34	1.4
***************
*** 10,14 ****
  
  <P>JavaDoc documentation for 
! <A HREF="api/org/python/util/PythonInterpreter.html">
  org.python.util.PythonInterpreter</A>
  <BR>
--- 10,14 ----
  
  <P>JavaDoc documentation for 
! <A HREF="javadoc/org/python/util/PythonInterpreter.html">
  org.python.util.PythonInterpreter</A>
  <BR>

Index: index.ht
===================================================================
RCS file: /cvsroot/jython/jython/Doc/index.ht,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** index.ht	2001/11/19 17:57:11	1.8
--- index.ht	2001/12/02 19:58:34	1.9
***************
*** 30,35 ****
  
      <li>The generated JavaDoc documentation of the API is available 
! 	as <a href="api/index.html">frame</a>
!         and as <a href="api/overview-summary.html">
          non-frame</a> versions.
  
--- 30,35 ----
  
      <li>The generated JavaDoc documentation of the API is available 
! 	as <a href="javadoc/index.html">frame</a>
!         and as <a href="javadoc/overview-summary.html">
          non-frame</a> versions.
  

[Jython-checkins] CVS: jython build.xml,1.24,1.25

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

Update of /cvsroot/jython/jython
In directory usw-pr-cvs1:/tmp/cvs-serv26325

Modified Files:
	build.xml 
Log Message:
Give up on using the Doc/api directory for the generated javadoc. The 
directory was mistakingly added to the CVS repository. So it sometimes
exists and sometimes does not exists depending on the options to CVS.

Instead use Doc/javadoc.



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/jython/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** build.xml	2001/11/27 12:33:21	1.24
--- build.xml	2001/12/02 19:57:44	1.25
***************
*** 31,35 ****
          <property name="sourceDir" value="${basedir}" />
          <property name="outputDir" value="${basedir}/build" />
!         <property name="apidocDir" value="${basedir}/Doc/api" />
          <property name="debug" value="off" />
          <property name="optimize" value="on" />
--- 31,35 ----
          <property name="sourceDir" value="${basedir}" />
          <property name="outputDir" value="${basedir}/build" />
!         <property name="apidocDir" value="${basedir}/Doc/javadoc" />
          <property name="debug" value="off" />
          <property name="optimize" value="on" />
***************
*** 230,241 ****
  
      <target name="javadoc" depends="compile">
!         <delete>
!             <fileset dir="${apidocDir}" includes="**/*.html" />
!             <fileset dir="${apidocDir}" includes="**/*.css" />
!             <fileset dir="${apidocDir}" includes="package-list" />
!         </delete>
!         <delete dir="${apidocDir}/org" />
!         <delete dir="${apidocDir}/com" />
! 
          <mkdir dir="${apidocDir}" />
          <javadoc sourcepath="${sourceDir}"
--- 230,234 ----
  
      <target name="javadoc" depends="compile">
!         <delete dir="${apidocDir}" />
          <mkdir dir="${apidocDir}" />
          <javadoc sourcepath="${sourceDir}"

[Jython-checkins] CVS: jython ACKNOWLEDGMENTS,2.15,2.16

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

Update of /cvsroot/jython/jython
In directory usw-pr-cvs1:/tmp/cvs-serv25928

Modified Files:
	ACKNOWLEDGMENTS 
Log Message:
Randy Jay Yarger for the truncate patch.



Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /cvsroot/jython/jython/ACKNOWLEDGMENTS,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -d -r2.15 -r2.16
*** ACKNOWLEDGMENTS	2001/11/26 08:53:30	2.15
--- ACKNOWLEDGMENTS	2001/12/02 19:54:50	2.16
***************
*** 55,58 ****
--- 55,59 ----
      Phil Surette
      Michael Becke
+     Randy Jay Yarger
  
  Local Variables:

[Jython-checkins] CVS: jython/org/python/core Py.java,2.58,2.59 PyException.java,2.6,2.7 PySystemState.java,2.68,2.69

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

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv15808

Modified Files:
	Py.java PyException.java PySystemState.java 
Log Message:
Add a file argument to Py.displayException() and use that from 
PyException.toString().



Index: Py.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/Py.java,v
retrieving revision 2.58
retrieving revision 2.59
diff -C2 -d -r2.58 -r2.59
*** Py.java	2001/11/27 19:07:21	2.58
--- Py.java	2001/11/28 19:25:33	2.59
***************
*** 913,924 ****
              } catch (PyException exc2) {
                  stderr.println("Error in sys.excepthook:");
!                 displayException(exc2.type, exc2.value, exc2.traceback);
                  stderr.println();
                  stderr.println("Original exception was:");
!                 displayException(exc.type, exc.value, exc.traceback);
              }
          } else {
              stderr.println("sys.excepthook is missing");
!             displayException(exc.type, exc.value, exc.traceback);
          }
  
--- 913,924 ----
              } catch (PyException exc2) {
                  stderr.println("Error in sys.excepthook:");
!                 displayException(exc2.type, exc2.value, exc2.traceback, file);
                  stderr.println();
                  stderr.println("Original exception was:");
!                 displayException(exc.type, exc.value, exc.traceback, file);
              }
          } else {
              stderr.println("sys.excepthook is missing");
!             displayException(exc.type, exc.value, exc.traceback, file);
          }
  
***************
*** 927,932 ****
  
      public static void displayException(PyObject type, PyObject value,
!                                         PyObject tb)
      {
          if (tb instanceof PyTraceback)
              stderr.print(((PyTraceback) tb).dumpStack());
--- 927,937 ----
  
      public static void displayException(PyObject type, PyObject value,
!                                         PyObject tb, PyObject file)
      {
+         StdoutWrapper stderr = Py.stderr;
+         if (file != null) {
+             stderr = new FixedFileWrapper(file);
+         }
+ 
          if (tb instanceof PyTraceback)
              stderr.print(((PyTraceback) tb).dumpStack());

Index: PyException.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyException.java,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -d -r2.6 -r2.7
*** PyException.java	2001/10/28 17:13:43	2.6
--- PyException.java	2001/11/28 19:25:33	2.7
***************
*** 93,97 ****
              try {
                  printingStackTrace = true;
!                 Py.printException(this, null, new PyFile(s));
              } finally {
                  printingStackTrace = false;
--- 93,97 ----
              try {
                  printingStackTrace = true;
!                 Py.displayException(type, value, traceback, new PyFile(s));
              } finally {
                  printingStackTrace = false;

Index: PySystemState.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PySystemState.java,v
retrieving revision 2.68
retrieving revision 2.69
diff -C2 -d -r2.68 -r2.69
*** PySystemState.java	2001/11/27 19:07:21	2.68
--- PySystemState.java	2001/11/28 19:25:33	2.69
***************
*** 635,639 ****
  
      static void excepthook(PyObject type, PyObject val, PyObject tb) {
!         Py.displayException(type, val, tb);
      }
  
--- 635,639 ----
  
      static void excepthook(PyObject type, PyObject val, PyObject tb) {
!         Py.displayException(type, val, tb, null);
      }
  

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

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

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv14117

Modified Files:
	PyFile.java 
Log Message:
Add truncate() method to files.



Index: PyFile.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyFile.java,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -d -r2.22 -r2.23
*** PyFile.java	2001/10/28 17:13:43	2.22
--- PyFile.java	2001/11/28 19:19:54	2.23
***************
*** 54,57 ****
--- 54,60 ----
          public void close() throws java.io.IOException {
          }
+         public void truncate(long position) throws java.io.IOException {
+             throw new java.io.IOException("file doens't support truncate");
+         }
  
          public Object __tojava__(Class cls) throws IOException {
***************
*** 472,475 ****
--- 475,483 ----
          }
  
+         public void truncate(long position) throws java.io.IOException {
+             flush();
+             file.setLength(position);
+         }
+ 
          public Object __tojava__(Class cls) throws IOException {
              if (OutputStream.class.isAssignableFrom(cls) && writing)
***************
*** 565,568 ****
--- 573,580 ----
          }
  
+         public void truncate(long position) throws java.io.IOException {
+             file.truncate(position);
+         }
+ 
          public Object __tojava__(Class cls) throws IOException {
              return file.__tojava__(cls);
***************
*** 868,871 ****
--- 880,900 ----
          file = new FileWrapper();
      }
+ 
+      public void truncate() {
+           try {
+               file.truncate(file.tell());
+           } catch (java.io.IOException e) {
+               throw Py.IOError(e);
+           }
+      }
+ 
+      public void truncate(long position) {
+          try {
+               file.truncate(position);
+          } catch (java.io.IOException e) {
+               throw Py.IOError(e);
+          }
+      }
+ 
  
      // TBD: should this be removed?  I think it's better to raise an