jython-checkins

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

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

Modified Files:
	Py.java imp.java 
Log Message:
Renamed 'assert' to 'assert_' because it is a 1.4 reserved word.



Index: Py.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/Py.java,v
retrieving revision 2.66
retrieving revision 2.67
diff -C2 -d -r2.66 -r2.67
*** Py.java	30 May 2002 16:15:14 -0000	2.66
--- Py.java	30 May 2002 19:20:29 -0000	2.67
***************
*** 1008,1012 ****
  
      /* Equivalent to Python's assert statement */
!     public static void assert(PyObject test, PyObject message) {
          if (!test.__nonzero__()) {
              throw new PyException(Py.AssertionError, message);
--- 1008,1012 ----
  
      /* Equivalent to Python's assert statement */
!     public static void assert_(PyObject test, PyObject message) {
          if (!test.__nonzero__()) {
              throw new PyException(Py.AssertionError, message);
***************
*** 1014,1019 ****
      }
  
!     public static void assert(PyObject test) {
!         assert(test, Py.None);
      }
  
--- 1014,1019 ----
      }
  
!     public static void assert_(PyObject test) {
!         assert_(test, Py.None);
      }
  

Index: imp.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/imp.java,v
retrieving revision 2.62
retrieving revision 2.63
diff -C2 -d -r2.62 -r2.63
*** imp.java	30 May 2002 16:15:14 -0000	2.62
--- imp.java	30 May 2002 19:20:29 -0000	2.63
***************
*** 13,17 ****
  public class imp
  {
!     public static final int APIVersion = 11;
  
      private imp() { ; }
--- 13,17 ----
  public class imp
  {
!     public static final int APIVersion = 12;
  
      private imp() { ; }