jython-checkins — For Jython checkin messages

[Jython-checkins] CVS: jython/org/python/core ArgParser.java,1.4,1.5 BytecodeLoader.java,2.13,2.14 ClassDictInit.java,2.4,2.5 Loader.java,2.2,2.3 Options.java,2.6,2.7 PyException.java,2.4,2.5 PyFile.java,2.16,2.17 PyLong.java,2.11,2.12 PyObject.java,2.21,2.22 PyProxy.java,2.6,2.7

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

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

Modified Files:
	ArgParser.java BytecodeLoader.java ClassDictInit.java 
	Loader.java Options.java PyException.java PyFile.java 
	PyLong.java PyObject.java PyProxy.java 
Log Message:
Fixed formatting (long lines, trailing spaces).



Index: ArgParser.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/ArgParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ArgParser.java	2001/02/25 16:36:42	1.4
--- ArgParser.java	2001/03/04 18:04:31	1.5
***************
*** 60,65 ****
       * @param  args       The actual call arguments supplied in the call.
       * @param  args       The actual keyword names supplied in the call.
!      * @param  p0         The first expected argument in the method definition.
!      * @param  p1         The second expected argument in the method definition.
       */
      public ArgParser(String funcname, PyObject[] args, String[] kws,
--- 60,67 ----
       * @param  args       The actual call arguments supplied in the call.
       * @param  args       The actual keyword names supplied in the call.
!      * @param  p0         The first expected argument in the method
!                           definition.
!      * @param  p1         The second expected argument in the method
!                           definition.
       */
      public ArgParser(String funcname, PyObject[] args, String[] kws,
***************
*** 75,81 ****
       * @param  args       The actual call arguments supplied in the call.
       * @param  args       The actual keyword names supplied in the call.
!      * @param  p0         The first expected argument in the method definition.
!      * @param  p1         The second expected argument in the method definition.
!      * @param  p2         The third expected argument in the method definition.
       */
      public ArgParser(String funcname, PyObject[] args, String[] kws,
--- 77,86 ----
       * @param  args       The actual call arguments supplied in the call.
       * @param  args       The actual keyword names supplied in the call.
!      * @param  p0         The first expected argument in the method
!                           definition.
!      * @param  p1         The second expected argument in the method
!                           definition.
!      * @param  p2         The third expected argument in the method
!                           definition.
       */
      public ArgParser(String funcname, PyObject[] args, String[] kws,
***************
*** 91,95 ****
       * @param args       The actual call arguments supplied in the call.
       * @param args       The actual keyword names supplied in the call.
!      * @param paramnames The list of expected argument in the method definition.
       */
      public ArgParser(String funcname, PyObject[] args, String[] kws,
--- 96,101 ----
       * @param args       The actual call arguments supplied in the call.
       * @param args       The actual keyword names supplied in the call.
!      * @param paramnames The list of expected argument in the method
!                           definition.
       */
      public ArgParser(String funcname, PyObject[] args, String[] kws,

Index: BytecodeLoader.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/BytecodeLoader.java,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -r2.13 -r2.14
*** BytecodeLoader.java	2001/02/25 16:37:06	2.13
--- BytecodeLoader.java	2001/03/04 18:04:31	2.14
***************
*** 71,75 ****
       * Turn the java byte code in data into a java class.
       * @param name      the name of the class
!      * @param referents a list of superclass and interfaces that 
       *                  the new class will reference.
       * @param data      the java byte code.
--- 71,75 ----
       * Turn the java byte code in data into a java class.
       * @param name      the name of the class
!      * @param referents a list of superclass and interfaces that
       *                  the new class will reference.
       * @param data      the java byte code.
***************
*** 94,98 ****
  
      /**
!      * Turn the java byte code for a compiled python module into a 
       * java class.
       * @param name      the name of the class
--- 94,98 ----
  
      /**
!      * Turn the java byte code for a compiled python module into a
       * java class.
       * @param name      the name of the class

Index: ClassDictInit.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/ClassDictInit.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -r2.4 -r2.5
*** ClassDictInit.java	2001/02/25 16:38:06	2.4
--- ClassDictInit.java	2001/03/04 18:04:31	2.5
***************
*** 6,10 ****
   * An empty tagging interface that can be used if a java class
   * want control over the class dict initialization.
!  * When a java class implements this interface, it must also have 
   * a method like:
   * <pre>
--- 6,10 ----
   * An empty tagging interface that can be used if a java class
   * want control over the class dict initialization.
!  * When a java class implements this interface, it must also have
   * a method like:
   * <pre>

Index: Loader.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/Loader.java,v
retrieving revision 2.2
retrieving revision 2.3
diff -C2 -r2.2 -r2.3
*** Loader.java	2001/02/25 16:39:48	2.2
--- Loader.java	2001/03/04 18:04:31	2.3
***************
*** 5,9 ****
   * A common interface for bytecode loaders.
   * Jython 2.0 have two loaders, a standard loader and a
!  * Java2 SecureClassLoader. Both loader implements this 
   * interface.
   */
--- 5,9 ----
   * A common interface for bytecode loaders.
   * Jython 2.0 have two loaders, a standard loader and a
!  * Java2 SecureClassLoader. Both loader implements this
   * interface.
   */

Index: Options.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/Options.java,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -r2.6 -r2.7
*** Options.java	2001/02/25 16:42:04	2.6
--- Options.java	2001/03/04 18:04:31	2.7
***************
*** 21,25 ****
       * When true, python exception raised in overriden methods will
       * be shown on stderr. This option is remarkable usefull when
!      * python is used for implementing CORBA server. Some CORBA 
       * servers will turn python exception (say a NameError) into an
       * anonymous user exception without any stacktrace. Setting this
--- 21,25 ----
       * When true, python exception raised in overriden methods will
       * be shown on stderr. This option is remarkable usefull when
!      * python is used for implementing CORBA server. Some CORBA
       * servers will turn python exception (say a NameError) into an
       * anonymous user exception without any stacktrace. Setting this

Index: PyException.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyException.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -r2.4 -r2.5
*** PyException.java	2001/02/25 16:45:59	2.4
--- PyException.java	2001/03/04 18:04:31	2.5
***************
*** 6,10 ****
   * A wrapper for all python exception. Note that the wellknown
   * python exception are <b>not</b> subclasses of PyException.
!  * Instead the python exception class is stored in the 
   * <code>type</code> field and value or class instance is stored
   * in the <code>value</code> field.
--- 6,10 ----
   * A wrapper for all python exception. Note that the wellknown
   * python exception are <b>not</b> subclasses of PyException.
!  * Instead the python exception class is stored in the
   * <code>type</code> field and value or class instance is stored
   * in the <code>value</code> field.

Index: PyFile.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyFile.java,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -r2.16 -r2.17
*** PyFile.java	2001/02/25 16:47:44	2.16
--- PyFile.java	2001/03/04 18:04:31	2.17
***************
*** 13,17 ****
  
  /**
!  * A python file wrapper around a java stream, reader/writer or file. 
   */
  
--- 13,17 ----
  
  /**
!  * A python file wrapper around a java stream, reader/writer or file.
   */
  

Index: PyLong.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyLong.java,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -r2.11 -r2.12
*** PyLong.java	2001/02/25 16:51:51	2.11
--- PyLong.java	2001/03/04 18:04:31	2.12
***************
*** 6,10 ****
  
  /**
!  * A builtin python long. This is implemented as a 
   * java.math.BigInteger.
   */
--- 6,10 ----
  
  /**
!  * A builtin python long. This is implemented as a
   * java.math.BigInteger.
   */

Index: PyObject.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyObject.java,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -r2.21 -r2.22
*** PyObject.java	2001/02/25 16:58:26	2.21
--- PyObject.java	2001/03/04 18:04:31	2.22
***************
*** 464,468 ****
      /**
       * Equivalent to the standard Python __getitem__ method.
!      * This variant takes a primitive <code>int</code> as the key.  
       * This method should not be overridden.
       * Override the <code>__finditem__</code> method instead.
--- 464,468 ----
      /**
       * Equivalent to the standard Python __getitem__ method.
!      * This variant takes a primitive <code>int</code> as the key.
       * This method should not be overridden.
       * Override the <code>__finditem__</code> method instead.
***************
*** 529,533 ****
      /**
       * A variant of the __setitem__ method which accepts a primitive
!      * <code>int</code> as the key. 
       * By default, this will call
       * <code>__setitem__(PyObject key, PyObject value)</code>
--- 529,533 ----
      /**
       * A variant of the __setitem__ method which accepts a primitive
!      * <code>int</code> as the key.
       * By default, this will call
       * <code>__setitem__(PyObject key, PyObject value)</code>

Index: PyProxy.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyProxy.java,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -r2.6 -r2.7
*** PyProxy.java	2001/02/25 16:51:51	2.6
--- PyProxy.java	2001/03/04 18:04:31	2.7
***************
*** 4,13 ****
  /**
   * Common methods for all generated proxy classes.
!  * 
   * Proxies classes are created whenever a python class inherit
   * from a java class. Instances of such a python class consists
   * of two objects
   * <ul>
!  * <li>An instance of the proxy class. The _getPyInstance() will 
   *     return a reference to the PyInstance.
   * <li>An instance of PyInstance. The PyInstance.javaProxy contain
--- 4,13 ----
  /**
   * Common methods for all generated proxy classes.
!  *
   * Proxies classes are created whenever a python class inherit
   * from a java class. Instances of such a python class consists
   * of two objects
   * <ul>
!  * <li>An instance of the proxy class. The _getPyInstance() will
   *     return a reference to the PyInstance.
   * <li>An instance of PyInstance. The PyInstance.javaProxy contain
***************
*** 15,21 ****
   * </ul>
   *
!  * All proxy classes, both dynamicly generated and staticly 
   * generated by jythonc implements this interface.
!  */ 
  
  // This interface should be applicable to ANY class
--- 15,21 ----
   * </ul>
   *
!  * All proxy classes, both dynamicly generated and staticly
   * generated by jythonc implements this interface.
!  */
  
  // This interface should be applicable to ANY class
***************
*** 49,53 ****
      /**
       * Initialize the proxy instance. If the proxy have not
!      * been initialized already, this call will call the 
       * python constructor with the auplied arguments.
       * <p>
--- 49,53 ----
      /**
       * Initialize the proxy instance. If the proxy have not
!      * been initialized already, this call will call the
       * python constructor with the auplied arguments.
       * <p>

[Jython-checkins] CVS: jython/org/python/core PyMethod.java,2.12,2.13

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

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

Modified Files:
	PyMethod.java 
Log Message:
Disallow setting func-attr on all methods. This match a recent change in
CPython-2.1b1



Index: PyMethod.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyMethod.java,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -r2.12 -r2.13
*** PyMethod.java	2001/02/25 16:51:51	2.12
--- PyMethod.java	2001/03/04 17:54:38	2.13
***************
*** 66,75 ****
      }
  
-     public void __setattr__(String name, PyObject value) {
-         if (im_self != null)
-             throw Py.TypeError("cannot set attributes through bound methods");
-         im_func.__setattr__(name, value);
-     }
- 
      public void __delattr__(String name) {
          im_func.__delattr__(name);
--- 66,69 ----

[Jython-checkins] CVS: jython/org/python/core PyJavaClass.java,2.34,2.35

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

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

Modified Files:
	PyJavaClass.java 
Log Message:
A strange piece of code that makes Mac MRJ2.2.4 more happy. Peter
Brinkmann help with figuring out that it makes a difference.



Index: PyJavaClass.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyJavaClass.java,v
retrieving revision 2.34
retrieving revision 2.35
diff -C2 -r2.34 -r2.35
*** PyJavaClass.java	2001/02/25 16:56:06	2.34
--- PyJavaClass.java	2001/03/04 17:52:39	2.35
***************
*** 587,590 ****
--- 587,601 ----
  
              Class eClass = args[0];
+ 
+             // This test and call of getClassLoader() function as a
+             // workaround for a bug in MRJ2.2.4. The bug occured when
+             // this program was compiled with jythonc:
+             //    import java
+             //    print dir(java.awt.Button)
+             // The 'actionPerformed' attributed would be missing.
+             if (eClass.getInterfaces().length > 0)
+                  eClass.getInterfaces()[0].getClassLoader();
+             // And of Mac workaround
+ 
              if (!(java.util.EventListener.class.isAssignableFrom(eClass)))
                  continue;

[Jython-checkins] CVS: jython/org/python/modules time.java,2.12,2.13

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

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

Modified Files:
	time.java 
Log Message:
- Added docstring.
- Track changes to the default java.util.Locale.
- Fix a week-of-year bug where the return didn't match the documented
week no. 0 for the first incomplete week of the year.



Index: time.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/time.java,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -r2.12 -r2.13
*** time.java	2001/02/02 11:29:42	2.12
--- time.java	2001/03/04 17:39:38	2.13
***************
*** 25,33 ****
  import java.text.DateFormatSymbols;
  import java.text.DateFormat;
! import java.util.Calendar;
! import java.util.GregorianCalendar;
! import java.util.Date;
! import java.util.TimeZone;
! import java.util.SimpleTimeZone;
  
  
--- 25,29 ----
  import java.text.DateFormatSymbols;
  import java.text.DateFormat;
! import java.util.*;
  
  
***************
*** 53,56 ****
--- 49,97 ----
  public class time implements ClassDictInit
  {
+     public static PyString __doc__ = new PyString(
+         "This module provides various functions to manipulate time values.\n"+
+         "\n"+
+         "There are two standard representations of time.  One is the number\n"+
+         "of seconds since the Epoch, in UTC (a.k.a. GMT).  It may be an integer\n"+
+         "or a floating point number (to represent fractions of seconds).\n"+
+         "The Epoch is system-defined; on Unix, it is generally January 1st, 1970.\n"+
+         "The actual value can be retrieved by calling gmtime(0).\n"+
+         "\n"+
+         "The other representation is a tuple of 9 integers giving local time.\n"+
+         "The tuple items are:\n"+
+         "  year (four digits, e.g. 1998)\n"+
+         "  month (1-12)\n"+
+         "  day (1-31)\n"+
+         "  hours (0-23)\n"+
+         "  minutes (0-59)\n"+
+         "  seconds (0-59)\n"+
+         "  weekday (0-6, Monday is 0)\n"+
+         "  Julian day (day in the year, 1-366)\n"+
+         "  DST (Daylight Savings Time) flag (-1, 0 or 1)\n"+
+         "If the DST flag is 0, the time is given in the regular time zone;\n"+
+         "if it is 1, the time is given in the DST time zone;\n"+
+         "if it is -1, mktime() should guess based on the date and time.\n"+
+         "\n"+
+         "Variables:\n"+
+         "\n"+
+         "timezone -- difference in seconds between UTC and local standard time\n"+
+         "altzone -- difference in  seconds between UTC and local DST time\n"+
+         "daylight -- whether local time should reflect DST\n"+
+         "tzname -- tuple of (standard time zone name, DST time zone name)\n"+
+         "\n"+
+         "Functions:\n"+
+         "\n"+
+         "time() -- return current time in seconds since the Epoch as a float\n"+
+         "clock() -- return CPU time since process start as a float\n"+
+         "sleep() -- delay for a number of seconds given as a float\n"+
+         "gmtime() -- convert seconds since Epoch to UTC tuple\n"+
+         "localtime() -- convert seconds since Epoch to local time tuple\n"+
+         "asctime() -- convert time tuple to string\n"+
+         "ctime() -- convert time in seconds to string\n"+
+         "mktime() -- convert local time tuple to seconds since Epoch\n"+
+         "strftime() -- convert time tuple to string according to format specification\n"+
+         "strptime() -- parse string to time tuple according to format specification\n"
+     );
+ 
      public static void classDictInit(PyObject dict) {
          dict.__setitem__("time", new TimeFunctions("time", 0, 0));
***************
*** 228,231 ****
--- 269,273 ----
  
      // Python's time module specifies use of current locale
+     protected static Locale currentLocale = null;
      protected static DateFormatSymbols datesyms = new DateFormatSymbols();
      protected static String[] shortdays = null;
***************
*** 298,301 ****
--- 340,344 ----
  
      public static String asctime(PyTuple tup) {
+         checkLocale();
          int day = item(tup, 6);
          int mon = item(tup, 1);
***************
*** 327,330 ****
--- 370,375 ----
  
      public static String strftime(String format, PyTuple tup) {
+         checkLocale();
+ 
          String s = "";
          int lastc = 0;
***************
*** 432,435 ****
--- 477,482 ----
                  cal.setMinimalDaysInFirstWeek(7);
                  j = cal.get(cal.WEEK_OF_YEAR);
+                 if (cal.get(cal.MONTH) == cal.JANUARY && j >= 52)
+                     j = 0;
                  s = s + _twodigit(j);
                  break;
***************
*** 449,452 ****
--- 496,502 ----
                  cal.setMinimalDaysInFirstWeek(7);
                  j = cal.get(cal.WEEK_OF_YEAR);
+ 
+                 if (cal.get(cal.MONTH) == cal.JANUARY && j >= 52)
+                     j = 0;
                  s = s + _twodigit(j);
                  break;
***************
*** 524,526 ****
--- 574,587 ----
          return s;
      }
+ 
+ 
+     private static void checkLocale() {
+         if (!Locale.getDefault().equals(currentLocale)) {
+             currentLocale = Locale.getDefault();
+             datesyms = new DateFormatSymbols(currentLocale);
+             shortdays = null;
+             shortmonths = null;
+         }
+     }
+ 
  }

[Jython-checkins] CVS: jython/org/python/util jython.java,2.17,2.18

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

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

Modified Files:
	jython.java 
Log Message:
Removed -X option and classBasedExceptions.



Index: jython.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/util/jython.java,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -r2.17 -r2.18
*** jython.java	2001/02/22 13:05:32	2.17
--- jython.java	2001/02/25 17:10:12	2.18
***************
*** 14,18 ****
          "           prompts, even if stdin does not appear to be a terminal\n"+
          "-S       : don't imply `import site' on initialization\n"+
-         "-X       : disable class based standard exceptions\n"+
          "-v       : verbose (trace import statements)\n"+
          "-Dprop=v : Set the property `prop' to value `v'\n"+
--- 14,17 ----
***************
*** 246,252 ****
                  if (!fixInteractive)
                      interactive = false;
-             }
-             else if (arg.equals("-X")) {
-                 Options.classBasedExceptions = false;
              }
              else if (arg.equals("-v")) {
--- 245,248 ----

[Jython-checkins] CVS: htdocs users.ht,1.3,1.4

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

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

Modified Files:
	users.ht 
Log Message:
Our first user! I'm so proud.



Index: users.ht
===================================================================
RCS file: /cvsroot/jython/htdocs/users.ht,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** users.ht	2000/12/05 18:49:45	1.3
--- users.ht	2001/02/25 17:09:32	1.4
***************
*** 6,8 ****
  If you are aware of any others, or would like to get your 
  projects listed here, just drop us a message at 
! jyt...@li....
\ No newline at end of file
--- 6,17 ----
  If you are aware of any others, or would like to get your 
  projects listed here, just drop us a message at 
! jyt...@li....
! 
! <dl>
! 
! <p><dt><b><a href="http://www.cabochon.com">Wyvern</a></b>
! <dd>Wyvern is a 100% free, extensible, multi-player online adventure
! game that uses Jython as its extension language.  You can become a 
! Wizard player and develop new game areas and objects using Jython.
! 
! </dl>
\ No newline at end of file

[Jython-checkins] CVS: jython build.xml,1.8,1.9

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

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

Modified Files:
	build.xml 
Log Message:
Added a javadoc target.



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/jython/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** build.xml	2001/02/14 22:28:52	1.8
--- build.xml	2001/02/25 17:06:23	1.9
***************
*** 5,8 ****
--- 5,9 ----
          <property name="sourceDir" value="." />
          <property name="outputDir" value="build" />
+         <property name="apidocDir" value="Doc/api" />
          <property name="debug" value="off" />
  
***************
*** 80,84 ****
              includes="org/**"
              destdir="${outputDir}/" 
!             excludes="org/python/parser/python.java,${excludejava2files},${excludeservletfiles}"
              debug="${debug}"
          />
--- 81,87 ----
              includes="org/**"
              destdir="${outputDir}/" 
!             excludes="org/python/parser/python.java,
!                       ${excludejava2files},
!                       ${excludeservletfiles}"
              debug="${debug}"
          />
***************
*** 99,102 ****
--- 102,120 ----
               basedir="${outputDir}" 
               includes="**/*.class,**/ucnhash.dat" />
+     </target>
+ 
+     <target name="javadoc" depends="compile">
+         <mkdir dir="${apidocDir}" />
+         <javadoc sourcepath="${sourceDir}"
+                  destdir="${apidocDir}"
+                  Public="Yes"
+                  packagenames="org.python.core,
+                                org.python.modules,
+                                org.python.modules.sre,
+                                org.python.util,
+                                org.python.rmi"
+                  Windowtitle="Jython API documentation"
+                  bottom="&lt;a href='http://www.jython.org'>Jython homepage&lt;/a>"
+         />
      </target>
  

[Jython-checkins] CVS: jython/Doc embedding.ht,1.2,1.3

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

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

Modified Files:
	embedding.ht 
Log Message:
Link to newly generated PythonInterpreter.html docs.



Index: embedding.ht
===================================================================
RCS file: /cvsroot/jython/jython/Doc/embedding.ht,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** embedding.ht	2000/11/12 22:22:06	1.2
--- embedding.ht	2001/02/25 17:05:07	1.3
***************
*** 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="api/org/python/util/PythonInterpreter.html">
  org.python.util.PythonInterpreter</A>
  <BR>

[Jython-checkins] CVS: jython/Doc/api Makefile,1.1,NONE

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

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

Removed Files:
	Makefile 
Log Message:
Removed makefile, we use ant now.



--- Makefile DELETED ---

[Jython-checkins] CVS: jython/Doc/api org.python.util.PythonInterpreter.html,1.2,NONE

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

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

Removed Files:
	org.python.util.PythonInterpreter.html 
Log Message:
Remove generated file. It was out of date anyway.



--- org.python.util.PythonInterpreter.html DELETED ---

[Jython-checkins] CVS: jython/org/python/core PyObject.java,2.20,2.21

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

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

Modified Files:
	PyObject.java 
Log Message:
Reformatted most comments to follow javasoft stadard.
Added javadoc comments to a few methods.



Index: PyObject.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyObject.java,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** PyObject.java	2001/02/02 09:28:37	2.20
--- PyObject.java	2001/02/25 16:58:26	2.21
***************
*** 3,14 ****
  
  /**
! All objects known to the JPython runtime system are represented
! by an instance of the class <code>PyObject</code> or one of
! its subclasses.
! 
! @author Jim Hugunin - hu...@py...
! @version 1.1, 1/5/98
! @since JPython 0.0
! **/
[...1819 lines suppressed...]
!        interned string!
!        @param arg1 the first argument of the method.
!        @param arg2 the second argument of the method.
!        @return the result of calling the method name with arg1 and arg2
!     **/
      public PyObject invoke(String name, PyObject arg1, PyObject arg2) {
          PyObject f = __getattr__(name);
--- 2023,2034 ----
  
      /**
!      * Shortcut for calling a method on a PyObject with two args.
!      *
!      * @param name the name of the method to call.  This must be an
!      *        interned string!
!      * @param arg1 the first argument of the method.
!      * @param arg2 the second argument of the method.
!      * @return the result of calling the method name with arg1 and arg2
!      **/
      public PyObject invoke(String name, PyObject arg1, PyObject arg2) {
          PyObject f = __getattr__(name);

[Jython-checkins] CVS: jython/org/python/core PyClass.java,2.20,2.21

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

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

Modified Files:
	PyClass.java 
Log Message:
Added javadoc comments.
Made a ctor protected.



Index: PyClass.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyClass.java,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** PyClass.java	2001/02/14 22:17:54	2.20
--- PyClass.java	2001/02/25 16:57:01	2.21
***************
*** 4,7 ****
--- 4,11 ----
  import java.io.Serializable;
  
+ /**
+  * A python class.
+  */
+ 
  public class PyClass extends PyObject
  {
***************
*** 42,46 ****
      }
  
!     public PyClass(PyClass c) {
          super(c);
          proxyClass = null;
--- 46,50 ----
      }
  
!     protected PyClass(PyClass c) {
          super(c);
          proxyClass = null;

[Jython-checkins] CVS: jython/org/python/core PyJavaClass.java,2.33,2.34

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

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

Modified Files:
	PyJavaClass.java 
Log Message:
Added javadoc comments.



Index: PyJavaClass.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyJavaClass.java,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -r2.33 -r2.34
*** PyJavaClass.java	2001/02/16 18:10:19	2.33
--- PyJavaClass.java	2001/02/25 16:56:06	2.34
***************
*** 5,8 ****
--- 5,12 ----
  import java.beans.*;
  
+ /**
+  * A wrapper around a java class.
+  */
+ 
  public class PyJavaClass extends PyClass
  {

[Jython-checkins] CVS: jython/org/python/core PyComplex.java,2.4,2.5 PyDictionary.java,2.12,2.13 PyList.java,2.19,2.20

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

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

Modified Files:
	PyComplex.java PyDictionary.java PyList.java 
Log Message:
Added javadoc comments.



Index: PyComplex.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyComplex.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -r2.4 -r2.5
*** PyComplex.java	2001/02/02 09:28:36	2.4
--- PyComplex.java	2001/02/25 16:55:14	2.5
***************
*** 2,5 ****
--- 2,9 ----
  package org.python.core;
  
+ /**
+  * A builtin python comples number
+  */
+ 
  public class PyComplex extends PyObject {
      public double real, imag;

Index: PyDictionary.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyDictionary.java,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -r2.12 -r2.13
*** PyDictionary.java	2001/02/01 16:41:10	2.12
--- PyDictionary.java	2001/02/25 16:55:14	2.13
***************
*** 77,80 ****
--- 77,84 ----
  
  
+ /**
+  * A builtin python dictionary.
+  */
+ 
  public class PyDictionary extends PyObject implements ClassDictInit
  {

Index: PyList.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyList.java,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** PyList.java	2001/02/21 14:34:09	2.19
--- PyList.java	2001/02/25 16:55:14	2.20
***************
*** 79,82 ****
--- 79,86 ----
  
  
+ /**
+  * A builtin python list.
+  */
+ 
  public class PyList extends PySequence implements ClassDictInit
  {

[Jython-checkins] CVS: jython/org/python/core ThreadStateMapping.java,2.3,2.4 ThreadStateMapping2.java,2.3,2.4

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

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

Modified Files:
	ThreadStateMapping.java ThreadStateMapping2.java 
Log Message:
Made classes package private.



Index: ThreadStateMapping.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/ThreadStateMapping.java,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -r2.3 -r2.4
*** ThreadStateMapping.java	2001/02/02 09:28:37	2.3
--- ThreadStateMapping.java	2001/02/25 16:53:24	2.4
***************
*** 2,6 ****
  package org.python.core;
  
! public class ThreadStateMapping {
      private static boolean checkedJava2 = false;
  
--- 2,6 ----
  package org.python.core;
  
! class ThreadStateMapping {
      private static boolean checkedJava2 = false;
  

Index: ThreadStateMapping2.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/ThreadStateMapping2.java,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -r2.3 -r2.4
*** ThreadStateMapping2.java	2001/02/01 16:41:11	2.3
--- ThreadStateMapping2.java	2001/02/25 16:53:24	2.4
***************
*** 2,6 ****
  package org.python.core;
  
! public class ThreadStateMapping2 extends ThreadStateMapping {
      private static ThreadLocal cachedThreadState = new ThreadLocal();
  
--- 2,6 ----
  package org.python.core;
  
! class ThreadStateMapping2 extends ThreadStateMapping {
      private static ThreadLocal cachedThreadState = new ThreadLocal();
  

[Jython-checkins] CVS: jython/org/python/core parser.java,2.7,2.8 imp.java,2.39,2.40 exceptions.java,1.5,1.6

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

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

Modified Files:
	parser.java imp.java exceptions.java 
Log Message:
Added javadoc comments.
Added a provate ctor to indicate that these are static classes.



Index: parser.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/parser.java,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -r2.7 -r2.8
*** parser.java	2001/02/02 09:28:37	2.7
--- parser.java	2001/02/25 16:52:54	2.8
***************
*** 5,10 ****
  import java.io.*;
  
  public class parser {
!     public static String getLine(BufferedReader reader, int line) {
          if (reader == null)
              return "";
--- 5,17 ----
  import java.io.*;
  
+ /**
+  * Facade for the classes in the org.python.parser package.
+  */
+ 
  public class parser {
! 
!     private parser() { ; }
! 
!     static String getLine(BufferedReader reader, int line) {
          if (reader == null)
              return "";

Index: imp.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/imp.java,v
retrieving revision 2.39
retrieving revision 2.40
diff -C2 -r2.39 -r2.40
*** imp.java	2001/02/14 22:32:22	2.39
--- imp.java	2001/02/25 16:52:54	2.40
***************
*** 7,13 ****
--- 7,18 ----
  import java.util.Properties;
  
+ /**
+  * Utility functions for "import" support.
+  */
  public class imp
  {
      public static final int APIVersion = 8;
+ 
+     private imp() { ; }
  
      public static PyModule addModule(String name) {

Index: exceptions.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/exceptions.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** exceptions.java	2001/02/22 13:01:52	1.5
--- exceptions.java	2001/02/25 16:52:54	1.6
***************
*** 4,8 ****
  
  import java.lang.reflect.*;
! 	
  public class exceptions implements ClassDictInit {
  
--- 4,14 ----
  
  import java.lang.reflect.*;
! 
! /**
!  * The builtin exceptions module. The entire module should be imported
!  * from python. None of the methods defined here should be called
!  * from java.
!  */
! 
  public class exceptions implements ClassDictInit {
  
***************
*** 72,75 ****
--- 78,82 ----
  "      +-- RuntimeWarning";
  
+     private exceptions() { ; }
  
      public static void classDictInit(PyObject dict) {

[Jython-checkins] CVS: jython/org/python/core PyLong.java,2.10,2.11 PyMethod.java,2.11,2.12 PyProxy.java,2.5,2.6 PyRunnable.java,2.0,2.1 PySlice.java,2.2,2.3 PyString.java,2.40,2.41 PyStringMap.java,2.9,2.10 PySystemState.java,2.49,2.50 PyTableCode.java,2.10,2.11 PyTraceback.java,2.2,2.3 PyTuple.java,2.7,2.8 __builtin__.java,2.29,2.30 codecs.java,2.8,2.9

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

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

Modified Files:
	PyLong.java PyMethod.java PyProxy.java PyRunnable.java 
	PySlice.java PyString.java PyStringMap.java PySystemState.java 
	PyTableCode.java PyTraceback.java PyTuple.java 
	__builtin__.java codecs.java 
Log Message:
Added javadoc comments.



Index: PyLong.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyLong.java,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** PyLong.java	2001/02/07 09:23:52	2.10
--- PyLong.java	2001/02/25 16:51:51	2.11
***************
*** 5,8 ****
--- 5,13 ----
  import java.io.Serializable;
  
+ /**
+  * A builtin python long. This is implemented as a 
+  * java.math.BigInteger.
+  */
+ 
  public class PyLong extends PyObject
  {

Index: PyMethod.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyMethod.java,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -r2.11 -r2.12
*** PyMethod.java	2001/02/02 09:28:37	2.11
--- PyMethod.java	2001/02/25 16:51:51	2.12
***************
*** 2,5 ****
--- 2,9 ----
  package org.python.core;
  
+ /**
+  * A python method.
+  */
+ 
  public class PyMethod extends PyObject
  {

Index: PyProxy.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyProxy.java,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -r2.5 -r2.6
*** PyProxy.java	2001/02/14 22:27:32	2.5
--- PyProxy.java	2001/02/25 16:51:51	2.6
***************
*** 2,15 ****
--- 2,62 ----
  package org.python.core;
  
+ /**
+  * Common methods for all generated proxy classes.
+  * 
+  * Proxies classes are created whenever a python class inherit
+  * from a java class. Instances of such a python class consists
+  * of two objects
+  * <ul>
+  * <li>An instance of the proxy class. The _getPyInstance() will 
+  *     return a reference to the PyInstance.
+  * <li>An instance of PyInstance. The PyInstance.javaProxy contain
+  *     a reference to the proxy class instance.
+  * </ul>
+  *
+  * All proxy classes, both dynamicly generated and staticly 
+  * generated by jythonc implements this interface.
+  */ 
+ 
  // This interface should be applicable to ANY class
  // Choose names that are extremely unlikely to have conflicts
  public interface PyProxy
  {
+     /**
+      * Associate an PyInstance with this proxy instance.
+      * This is done during construction and initialization
+      * of the proxy instance.
+      */
      abstract public void _setPyInstance(PyInstance proxy);
+ 
+     /**
+      * Return the associated PyInstance instance.
+      */
      abstract public PyInstance _getPyInstance();
  
+     /**
+      * Associate an system state with this proxy instance.
+      * This is done during construction and initialization
+      * of the proxy instance.
+      */
      abstract public void _setPySystemState(PySystemState ss);
+ 
+     /**
+      * Return the associated system state.
+      */
      abstract public PySystemState _getPySystemState();
  
+     /**
+      * Initialize the proxy instance. If the proxy have not
+      * been initialized already, this call will call the 
+      * python constructor with the auplied arguments.
+      * <p>
+      * In some situations is it necesary to call the __initProxy__
+      * method from the java superclass ctor before the ctor makes
+      * call to methods that is overriden in python.
+      * <p>
+      * In most sitation the __initProxy__ is called automticly
+      * by the jython runtime.
+      */
      abstract public void __initProxy__(Object[] args);
  }

Index: PyRunnable.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyRunnable.java,v
retrieving revision 2.0
retrieving revision 2.1
diff -C2 -r2.0 -r2.1
*** PyRunnable.java	1999/04/14 18:27:02	2.0
--- PyRunnable.java	2001/02/25 16:51:51	2.1
***************
*** 2,6 ****
--- 2,14 ----
  package org.python.core;
  
+ /**
+  * Interface implemented by compiled modules which allow access to
+  * to the module code object.
+  */
+ 
  public interface PyRunnable {
+     /**
+      * Return the modules code object.
+      */
      abstract public PyCode getMain();
  }

Index: PySlice.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PySlice.java,v
retrieving revision 2.2
retrieving revision 2.3
diff -C2 -r2.2 -r2.3
*** PySlice.java	1999/05/18 17:44:35	2.2
--- PySlice.java	2001/02/25 16:51:51	2.3
***************
*** 2,5 ****
--- 2,10 ----
  package org.python.core;
  
+ 
+ /**
+  * A python slice object.
+  */
+ 
  public class PySlice extends PyObject {
      public PyObject start, stop, step;

Index: PyString.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyString.java,v
retrieving revision 2.40
retrieving revision 2.41
diff -C2 -r2.40 -r2.41
*** PyString.java	2001/02/16 18:12:02	2.40
--- PyString.java	2001/02/25 16:51:51	2.41
***************
*** 226,229 ****
--- 226,232 ----
  
  
+ /**
+  * A builtin python string.
+  */
  public class PyString extends PySequence implements ClassDictInit
  {

Index: PyStringMap.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyStringMap.java,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** PyStringMap.java	2001/02/02 09:28:37	2.9
--- PyStringMap.java	2001/02/25 16:51:51	2.10
***************
*** 2,5 ****
--- 2,11 ----
  package org.python.core;
  
+ /**
+  * A faster Dictionary where the keys have to be strings.
+  * <p>
+  * This is the default for all __dict__ instances.
+  */
+ 
  public class PyStringMap extends PyObject
  {

Index: PySystemState.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PySystemState.java,v
retrieving revision 2.49
retrieving revision 2.50
diff -C2 -r2.49 -r2.50
*** PySystemState.java	2001/02/22 11:10:38	2.49
--- PySystemState.java	2001/02/25 16:51:51	2.50
***************
*** 9,12 ****
--- 9,16 ----
  import org.python.modules.Setup;
  
+ /**
+  * The "sys" module.
+  */
+ 
  public class PySystemState extends PyObject
  {

Index: PyTableCode.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyTableCode.java,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** PyTableCode.java	2001/02/02 09:28:37	2.10
--- PyTableCode.java	2001/02/25 16:51:51	2.11
***************
*** 2,5 ****
--- 2,10 ----
  package org.python.core;
  
+ /**
+  * An implementation of PyCode where the actual executable content
+  * is stored as a PyFunctionTable instance and an integer index.
+  */
+ 
  public class PyTableCode extends PyCode
  {

Index: PyTraceback.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyTraceback.java,v
retrieving revision 2.2
retrieving revision 2.3
diff -C2 -r2.2 -r2.3
*** PyTraceback.java	2000/01/17 21:56:53	2.2
--- PyTraceback.java	2001/02/25 16:51:51	2.3
***************
*** 2,5 ****
--- 2,9 ----
  package org.python.core;
  
+ /**
+  * A python traceback object.
+  */
+ 
  public class PyTraceback extends PyObject
  {

Index: PyTuple.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyTuple.java,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -r2.7 -r2.8
*** PyTuple.java	2001/02/01 16:41:11	2.7
--- PyTuple.java	2001/02/25 16:51:51	2.8
***************
*** 33,36 ****
--- 33,40 ----
  
  
+ /**
+  * A builtin python tuple.
+  */
+ 
  public class PyTuple extends PySequence implements ClassDictInit
  {

Index: __builtin__.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/__builtin__.java,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -r2.29 -r2.30
*** __builtin__.java	2001/02/16 18:12:42	2.29
--- __builtin__.java	2001/02/25 16:51:51	2.30
***************
*** 103,106 ****
--- 103,109 ----
  
  
+ /**
+  * The builtin module. All builtin functions are defined here
+  */
  public class __builtin__ implements ClassDictInit
  {

Index: codecs.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/codecs.java,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** codecs.java	2001/02/02 09:28:37	2.8
--- codecs.java	2001/02/25 16:51:51	2.9
***************
*** 9,12 ****
--- 9,16 ----
  package org.python.core;
  
+ /**
+  * Contains the implementation of the builtin codecs.
+  * @since Jython 2.0
+  */
  
  public class codecs {
***************
*** 16,21 ****
      private static PyStringMap searchCache = new PyStringMap();
  
- 
- 
      private static String default_encoding = "ascii";
  
--- 20,23 ----
***************
*** 29,34 ****
      }
  
- 
- 
      public static void register(PyObject search_function) {
          if (!search_function.isCallable())
--- 31,34 ----
***************
*** 68,74 ****
      }
  
- 
- 
- 
      private static String normalizestring(String string) {
          return string.toLowerCase().replace(' ', '-');
--- 68,71 ----
***************
*** 89,96 ****
          }
      }
- 
- 
- 
- 
  
  
--- 86,89 ----

[Jython-checkins] CVS: jython/org/python/core PyFile.java,2.15,2.16 PyFinalizableInstance.java,2.2,2.3 PyFloat.java,2.7,2.8 PyFrame.java,2.5,2.6 PyFunction.java,2.8,2.9 PyFunctionTable.java,2.0,2.1 PyInstance.java,2.19,2.20 PyInteger.java,2.9,2.10 PyJavaInnerClass.java,2.7,2.8 PyJavaInstance.java,2.4,2.5 PyJavaPackage.java,2.9,2.10

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

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

Modified Files:
	PyFile.java PyFinalizableInstance.java PyFloat.java 
	PyFrame.java PyFunction.java PyFunctionTable.java 
	PyInstance.java PyInteger.java PyJavaInnerClass.java 
	PyJavaInstance.java PyJavaPackage.java 
Log Message:
Added javadoc comments.



Index: PyFile.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyFile.java,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** PyFile.java	2001/02/02 09:28:36	2.15
--- PyFile.java	2001/02/25 16:47:44	2.16
***************
*** 12,15 ****
--- 12,19 ----
  // - name, mode, closed should be read-only
  
+ /**
+  * A python file wrapper around a java stream, reader/writer or file. 
+  */
+ 
  public class PyFile extends PyObject
  {

Index: PyFinalizableInstance.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyFinalizableInstance.java,v
retrieving revision 2.2
retrieving revision 2.3
diff -C2 -r2.2 -r2.3
*** PyFinalizableInstance.java	2001/02/01 13:48:26	2.2
--- PyFinalizableInstance.java	2001/02/25 16:47:44	2.3
***************
*** 6,9 ****
--- 6,17 ----
  package org.python.core;
  
+ 
+ /**
+  * A python class instance with __del__ defined.
+  * <p>
+  * This is a special class due to performance. Defining
+  * finalize() on a class, makes the class a lot slower.
+  */
+ 
  public class PyFinalizableInstance extends PyInstance
  {

Index: PyFloat.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyFloat.java,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -r2.7 -r2.8
*** PyFloat.java	2001/02/07 09:23:52	2.7
--- PyFloat.java	2001/02/25 16:47:44	2.8
***************
*** 4,7 ****
--- 4,12 ----
  import java.io.Serializable;
  
+ 
+ /**
+  * A builtin python float.
+  */
+ 
  public class PyFloat extends PyObject
  {

Index: PyFrame.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyFrame.java,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -r2.5 -r2.6
*** PyFrame.java	2001/02/01 16:41:10	2.5
--- PyFrame.java	2001/02/25 16:47:44	2.6
***************
*** 2,5 ****
--- 2,10 ----
  package org.python.core;
  
+ 
+ /**
+  * A python frame object.
+  */
+ 
  public class PyFrame extends PyObject
  {

Index: PyFunction.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyFunction.java,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** PyFunction.java	2001/02/02 13:06:36	2.8
--- PyFunction.java	2001/02/25 16:47:44	2.9
***************
*** 2,5 ****
--- 2,9 ----
  package org.python.core;
  
+ /**
+  * A python function.
+  */
+ 
  public class PyFunction extends PyObject
  {

Index: PyFunctionTable.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyFunctionTable.java,v
retrieving revision 2.0
retrieving revision 2.1
diff -C2 -r2.0 -r2.1
*** PyFunctionTable.java	1999/04/14 15:33:04	2.0
--- PyFunctionTable.java	2001/02/25 16:47:44	2.1
***************
*** 2,5 ****
--- 2,13 ----
  package org.python.core;
  
+ /**
+  * An entry point for class that implements several function calls.
+  * <P>
+  * Used together with the PyTableCode class.
+  *
+  * @see PyTableCode
+  */
+ 
  public abstract class PyFunctionTable {
      abstract public PyObject call_function(int index, PyFrame frame);

Index: PyInstance.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyInstance.java,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** PyInstance.java	2001/02/14 22:21:58	2.19
--- PyInstance.java	2001/02/25 16:47:44	2.20
***************
*** 4,7 ****
--- 4,11 ----
  import java.io.Serializable;
  
+ /**
+  * A python class instance.
+  */
+ 
  public class PyInstance extends PyObject
  {

Index: PyInteger.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyInteger.java,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** PyInteger.java	2001/02/07 09:23:52	2.9
--- PyInteger.java	2001/02/25 16:47:44	2.10
***************
*** 4,7 ****
--- 4,11 ----
  import java.io.Serializable;
  
+ /**
+  * A builtin python int.
+  */
+ 
  public class PyInteger extends PyObject
  {

Index: PyJavaInnerClass.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyJavaInnerClass.java,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -r2.7 -r2.8
*** PyJavaInnerClass.java	2000/12/16 13:37:14	2.7
--- PyJavaInnerClass.java	2001/02/25 16:47:44	2.8
***************
*** 2,5 ****
--- 2,10 ----
  package org.python.core;
  
+ 
+ /**
+  * A wrapper around a java inner class.
+  */
+ 
  public class PyJavaInnerClass extends PyJavaClass
  {

Index: PyJavaInstance.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyJavaInstance.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -r2.4 -r2.5
*** PyJavaInstance.java	2001/02/02 09:28:37	2.4
--- PyJavaInstance.java	2001/02/25 16:47:44	2.5
***************
*** 3,6 ****
--- 3,10 ----
  import java.lang.reflect.Modifier;
  
+ /**
+  * A wrapper around a java instance.
+  */
+ 
  public class PyJavaInstance
      extends PyInstance

Index: PyJavaPackage.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyJavaPackage.java,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** PyJavaPackage.java	2001/02/02 09:28:37	2.9
--- PyJavaPackage.java	2001/02/25 16:47:44	2.10
***************
*** 7,10 ****
--- 7,14 ----
  import java.io.File;
  
+ /**
+  * A representation of java package.
+  */
+ 
  public class PyJavaPackage extends PyObject {
      public String __name__;

[Jython-checkins] CVS: jython/org/python/core PyException.java,2.3,2.4 PySyntaxError.java,2.2,2.3

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

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

Modified Files:
	PyException.java PySyntaxError.java 
Log Message:
Added javadoc comments.



Index: PyException.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyException.java,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -r2.3 -r2.4
*** PyException.java	2001/02/01 16:41:10	2.3
--- PyException.java	2001/02/25 16:45:59	2.4
***************
*** 3,10 ****
--- 3,28 ----
  import java.io.*;
  
+ /**
+  * A wrapper for all python exception. Note that the wellknown
+  * python exception are <b>not</b> subclasses of PyException.
+  * Instead the python exception class is stored in the 
+  * <code>type</code> field and value or class instance is stored
+  * in the <code>value</code> field.
+  */
+ 
  public class PyException extends RuntimeException
  {
+     /**
+      * The python exception class (for class exception) or
+      * identifier (for string exception).
+      */
      public PyObject type;
+ 
+     /**
+      * The exception instance (for class exception) or exception
+      * value (for string exception).
+      */
      public PyObject value = Py.None;
+ 
      public PyTraceback traceback;
      private boolean instantiated=false;

Index: PySyntaxError.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PySyntaxError.java,v
retrieving revision 2.2
retrieving revision 2.3
diff -C2 -r2.2 -r2.3
*** PySyntaxError.java	2001/02/01 16:41:11	2.2
--- PySyntaxError.java	2001/02/25 16:45:59	2.3
***************
*** 2,5 ****
--- 2,13 ----
  package org.python.core;
  
+ /**
+  * A convience class for creating Syntax errors. Note that the
+  * syntax error is still taken from Py.SyntaxError.
+  * <p>
+  * Generally subclassing from PyException is not the right way
+  * of creating new exception classes.
+  */
+ 
  public class PySyntaxError extends PyException {
      int lineno, column;

[Jython-checkins] CVS: jython/org/python/core PyNone.java,2.4,2.5

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

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

Modified Files:
	PyNone.java 
Log Message:
Added javadoc comments.
Since this is a singleton, the ctor is made package private.



Index: PyNone.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyNone.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -r2.4 -r2.5
*** PyNone.java	2001/01/31 13:34:35	2.4
--- PyNone.java	2001/02/25 16:45:29	2.5
***************
*** 2,8 ****
  package org.python.core;
  
  public class PyNone extends PySingleton
  {
!     public PyNone() {
          super("None");
      }
--- 2,11 ----
  package org.python.core;
  
+ /**
+  * A class representing the singleton None object,
+  */
  public class PyNone extends PySingleton
  {
!     PyNone() {
          super("None");
      }

[Jython-checkins] CVS: jython/org/python/core PyEllipsis.java,2.1,2.2

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

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

Modified Files:
	PyEllipsis.java 
Log Message:
Added javadoc comments.
Since this is a singleton, the ctor is made package private.



Index: PyEllipsis.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyEllipsis.java,v
retrieving revision 2.1
retrieving revision 2.2
diff -C2 -r2.1 -r2.2
*** PyEllipsis.java	1999/05/17 19:59:12	2.1
--- PyEllipsis.java	2001/02/25 16:45:09	2.2
***************
*** 2,7 ****
  package org.python.core;
  
  public class PyEllipsis extends PySingleton {
!     public PyEllipsis() {
          super("Ellipsis");
      }
--- 2,11 ----
  package org.python.core;
  
+ /**
+  * A class representing the singleton Ellipsis <code>...</code>
+  * object.
+  */
  public class PyEllipsis extends PySingleton {
!     PyEllipsis() {
          super("Ellipsis");
      }

[Jython-checkins] CVS: jython/org/python/core PyCode.java,2.3,2.4

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

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

Modified Files:
	PyCode.java 
Log Message:
Added javadoc comments.



Index: PyCode.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyCode.java,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -r2.3 -r2.4
*** PyCode.java	2001/02/01 16:41:10	2.3
--- PyCode.java	2001/02/25 16:43:19	2.4
***************
*** 2,5 ****
--- 2,8 ----
  package org.python.core;
  
+ /**
+  * A super class for all python code implementations.
+  */
  public abstract class PyCode extends PyObject
  {

[Jython-checkins] CVS: jython/org/python/core PyBuiltinFunctionSet.java,2.10,2.11

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

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

Modified Files:
	PyBuiltinFunctionSet.java 
Log Message:
Added javadoc comments.



Index: PyBuiltinFunctionSet.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyBuiltinFunctionSet.java,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** PyBuiltinFunctionSet.java	2001/02/01 16:41:10	2.10
--- PyBuiltinFunctionSet.java	2001/02/25 16:42:34	2.11
***************
*** 2,5 ****
--- 2,13 ----
  package org.python.core;
  
+ /**
+  * A helper class for faster implementations of commonly called
+  * methods.
+  * <p>
+  * Subclasses of PyBuiltinFunctionSet will implement some or all
+  * of the __call__ method with a switch on the index number.
+  *
+  */
  public class PyBuiltinFunctionSet extends PyObject implements Cloneable
  {

[Jython-checkins] CVS: jython/org/python/core PyArray.java,2.4,2.5

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

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

Modified Files:
	PyArray.java 
Log Message:
Added javadoc comments.



Index: PyArray.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyArray.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -r2.4 -r2.5
*** PyArray.java	2001/02/01 16:41:10	2.4
--- PyArray.java	2001/02/25 16:42:18	2.5
***************
*** 3,6 ****
--- 3,15 ----
  import java.lang.reflect.Array;
  
+ /**
+  * A wrapper class around native java arrays.
+  *
+  * Instances of PyArray are created either by java functions or
+  * directly by the jarray module.
+  *
+  * @see org.python.modules.jarray
+  */
+ 
  public class PyArray extends PySequence {
      Object data;

[Jython-checkins] CVS: jython/org/python/core Options.java,2.5,2.6

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

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

Modified Files:
	Options.java 
Log Message:
Added javadoc comments.
Removed unused options: classBasedExceptions, verbosePackageCache,
parserVerboseExceptions



Index: Options.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/Options.java,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -r2.5 -r2.6
*** Options.java	2001/02/01 16:41:10	2.5
--- Options.java	2001/02/25 16:42:04	2.6
***************
*** 2,5 ****
--- 2,10 ----
  package org.python.core;
  
+ /**
+  * A class with static fields for each of the settable options.
+  * The options from registry and command line is copied into
+  * the fields here and the rest of Jyhton checks these fields.
+  */
  public class Options
  {
***************
*** 7,59 ****
      // options, but all can be controlled through the JPython registry
  
!     // when an exception occurs in Java code, and it is not caught, should
!     // the interpreter print out the Java exception in the traceback?
      public static boolean showJavaExceptions = false;
  
!     // if this is not null, it must be a string indicating the directory to
!     // save proxy adapter class files to
!     public static String proxyCacheDirectory = null;
! 
!     // TBD
      public static boolean showPythonProxyExceptions = false;
  
!     // TBD
      public static boolean skipCompile = true;
- 
-     // TBD
-     public static boolean verbosePackageCache = false;
  
!     // TBD
      public static boolean pollStandardIn = false;
  
!     // TBD
!     public static boolean classBasedExceptions = true;
! 
!     // If true, JPython respects Java the accessibility flag for fields,
!     // methods, and constructors.  This means you can only access public
!     // members.  Set this to false to access all members by toggling the
!     // accessible flag on the member.
      public static boolean respectJavaAccessibility = true;
- 
-     /* no longer necessary
-     // Allow JPython's classloader to find and load .class files on
-     // sys.path.  This only happens for anonymous inner classes, but may
-     // have unintended side-effects.  This option is temporary.
-     public static boolean extendedClassLoader = true;
-     */
  
!     // TBD
      public static boolean importSite = true;
  
!     // TBD
      public static int verbose = Py.MESSAGE;
  
!     // TBD
      public static boolean deprecatedKeywordMangling = true;
  
!     // TBD
!     public static boolean parserVerboseExceptions = false;
! 
!     // TBD
      public static String proxyDebugDirectory = null;
  
--- 12,75 ----
      // options, but all can be controlled through the JPython registry
  
!     /**
!      * when an exception occurs in Java code, and it is not caught, should
!      * the interpreter print out the Java exception in the traceback?
!      */
      public static boolean showJavaExceptions = false;
  
!     /**
!      * When true, python exception raised in overriden methods will
!      * be shown on stderr. This option is remarkable usefull when
!      * python is used for implementing CORBA server. Some CORBA 
!      * servers will turn python exception (say a NameError) into an
!      * anonymous user exception without any stacktrace. Setting this
!      * option will show the stacktrace.
!      */
      public static boolean showPythonProxyExceptions = false;
  
!     /**
!      * To force JIT compilation of Jython code -- should be unnecessary
!      * Setting this to true will cause jdk1.2rc1 to core dump on Windows
!      */
      public static boolean skipCompile = true;
  
!     /**
!      * Setting this to true will cause the console to poll standard in.
!      * This might be helpful on systems without system-level threads.
!      */
      public static boolean pollStandardIn = false;
  
!     /**
!      * If true, JPython respects Java the accessibility flag for fields,
!      * methods, and constructors.  This means you can only access public
!      * members.  Set this to false to access all members by toggling the
!      * accessible flag on the member.
!      */
      public static boolean respectJavaAccessibility = true;
  
!     /**
!      * When false the <code>site.py</code> will not be imported.
!      * This is only honored by the command line main class.
!      */
      public static boolean importSite = true;
  
!     /**
!      * Set verbosity to Py.ERROR, Py.WARNING, Py.MESSAGE, Py.COMMENT,
!      * or Py.DEBUG for varying levels of informative messages from
!      * Jython. Normally this option is set from the command line.
!      */
      public static int verbose = Py.MESSAGE;
  
!     /**
!      * Setting this to true will support old 1.0 style keyword+"_" names.
!      * This isn't needed any more due to improvements in the parser
!      */
      public static boolean deprecatedKeywordMangling = true;
  
!     /**
!      * A directory where the dynamicly generated classes are written.
!      * Nothing is ever read from here, it is only for debugging
!      * purposes.
!      */
      public static String proxyDebugDirectory = null;
  
***************
*** 62,65 ****
--- 78,83 ----
      //
  
+     private Options() { ; }
+ 
      private static boolean getBooleanOption(String name, boolean defaultValue)
      {
***************
*** 77,80 ****
--- 95,102 ----
      }
  
+ 
+     /**
+      * Initialize the static fields from the registry options.
+      */
      public static void setFromRegistry() {
          // Set the more unusual options
***************
*** 96,103 ****
          Options.pollStandardIn =
              getBooleanOption("console.poll", Options.pollStandardIn);
- 
-         Options.classBasedExceptions =
-             getBooleanOption("options.classExceptions",
-                              Options.classBasedExceptions);
  
          Options.respectJavaAccessibility =
--- 118,121 ----