jython-checkins — For Jython checkin messages

[Jython-checkins] CVS: jython/org/python/util PyServlet.java,1.8,1.9

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

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

Modified Files:
	PyServlet.java 
Log Message:
Made the javadoc a little more usefull.



Index: PyServlet.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/util/PyServlet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** PyServlet.java	2001/03/13 20:25:46	1.8
--- PyServlet.java	2001/03/14 14:31:57	1.9
***************
*** 13,33 ****
   * bytecode for JPython servlets and re-uses it if the underlying .py
   * file has not changed.
!  *
   * Many people have been involved with this class:
!  *
!  * Chris Gokey
!  * David Syer
!  * Finn Bock
!  *
   * If somebody is missing from this list, let us know. 
   *
-  *
-  * <pre>
-  *
   * e.g. http://localhost:8080/test/hello.py
   *
   * from javax.servlet.http import HttpServlet
   * class hello(HttpServlet):
!  *     def doGet(self,req, res):
   *         res.setContentType("text/html");
   *         out = res.getOutputStream()
--- 13,32 ----
   * bytecode for JPython servlets and re-uses it if the underlying .py
   * file has not changed.
!  * <p>
   * Many people have been involved with this class:
!  * <ul>
!  * <li>Chris Gokey
!  * <li>David Syer
!  * <li>Finn Bock
!  * </ul>
   * If somebody is missing from this list, let us know. 
+  * <p>
   *
   * e.g. http://localhost:8080/test/hello.py
+  * <pre>
   *
   * from javax.servlet.http import HttpServlet
   * class hello(HttpServlet):
!  *     def doGet(self, req, res):
   *         res.setContentType("text/html");
   *         out = res.getOutputStream()
***************
*** 39,59 ****
   *         out.close()
   *         return
   *
   * in web.xml for the PyServlet context:
!  *
!  * <web-app>
!  *     <servlet>
!  *         <servlet-name>PyServlet</servlet-name>
!  *         <servlet-class>org.python.util.PyServlet</servlet-class>
!  *         <init-param>
!  *             <param-name>python.home</param-name>
!  *             <param-value>/usr/home/jython-2.0</param-value>
!  *         </init-param>
!  *     </servlet>
!  *     <servlet-mapping>
!  *         <servlet-name>PyServlet</servlet-name>
!  *         <url-pattern>*.py</url-pattern>
!  *     </servlet-mapping>
!  * </web-app>
   *
   * </pre>
--- 38,59 ----
   *         out.close()
   *         return
+  * </pre>
   *
   * in web.xml for the PyServlet context:
!  * <pre>
!  * &lt;web-app>
!  *     &lt;servlet>
!  *         &lt;servlet-name>PyServlet&lt;/servlet-name>
!  *         &lt;servlet-class>org.python.util.PyServlet&lt;/servlet-class>
!  *         &lt;init-param>
!  *             &lt;param-name>python.home&lt;/param-name>
!  *             &lt;param-value>/usr/home/jython-2.1&lt;/param-value>
!  *         &lt;/init-param>
!  *     &lt;/servlet>
!  *     &lt;servlet-mapping>
!  *         &lt;servlet-name>PyServlet&lt;/servlet-name>
!  *         &lt;url-pattern>*.py&lt;/url-pattern>
!  *     &lt;/servlet-mapping>
!  * &lt;/web-app>
   *
   * </pre>

[Jython-checkins] CVS: jython/org/python/core PySystemState.java,2.52,2.53

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

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

Modified Files:
	PySystemState.java 
Log Message:
Update doc to match the code.



Index: PySystemState.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PySystemState.java,v
retrieving revision 2.52
retrieving revision 2.53
diff -C2 -r2.52 -r2.53
*** PySystemState.java	2001/03/14 13:48:25	2.52
--- PySystemState.java	2001/03/14 14:31:27	2.53
***************
*** 514,518 ****
       * usefull if jython is embedded in an application that deals with
       * its own classloaders. A servlet container is a very good example.
!      * Calling add_classpath("<context>/WEB-INF/classes") makes the java 
       * packages in WEB-INF classes available to jython import. However the
       * actual classloading is completely handled by the servlet container's
--- 514,518 ----
       * usefull if jython is embedded in an application that deals with
       * its own classloaders. A servlet container is a very good example.
!      * Calling add_classdir("<context>/WEB-INF/classes") makes the java 
       * packages in WEB-INF classes available to jython import. However the
       * actual classloading is completely handled by the servlet container's
***************
*** 530,536 ****
       * <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_classpath(dir) for more details.
       *
!      * @see add_classpath
       */
      public static void add_extdir(String directoryPath) {
--- 530,536 ----
       * <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.
       *
!      * @see #add_classdir
       */
      public static void add_extdir(String directoryPath) {

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

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

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

Modified Files:
	PyArray.java 
Log Message:
Silence a javadoc warning.



Index: PyArray.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyArray.java,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -r2.5 -r2.6
*** PyArray.java	2001/02/25 16:42:18	2.5
--- PyArray.java	2001/03/14 14:31:00	2.6
***************
*** 8,13 ****
   * Instances of PyArray are created either by java functions or
   * directly by the jarray module.
!  *
!  * @see org.python.modules.jarray
   */
  
--- 8,13 ----
   * Instances of PyArray are created either by java functions or
   * directly by the jarray module.
!  * <p>
!  * See also the jarray module.
   */
  

[Jython-checkins] CVS: jython/org/python/core CachedJarsPackageManager.java,1.7,1.8

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

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

Modified Files:
	CachedJarsPackageManager.java 
Log Message:
Silence a javadoc warning.



Index: CachedJarsPackageManager.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/CachedJarsPackageManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** CachedJarsPackageManager.java	2001/03/04 18:06:45	1.7
--- CachedJarsPackageManager.java	2001/03/14 14:30:48	1.8
***************
*** 422,426 ****
  
      /** To pass a cachefile id by ref. And for internal use.
!      * @see outCreateCacheFile
       */
      public static class JarXEntry extends Object {
--- 422,426 ----
  
      /** To pass a cachefile id by ref. And for internal use.
!      * See outCreateCacheFile
       */
      public static class JarXEntry extends Object {

[Jython-checkins] CVS: jython/installer mklist.py,1.12,1.13

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

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

Modified Files:
	mklist.py 
Log Message:
- Updated to Python21
- Include subdirs on Doc/api



Index: mklist.py
===================================================================
RCS file: /cvsroot/jython/jython/installer/mklist.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** mklist.py	2001/03/13 20:15:44	1.12
--- mklist.py	2001/03/14 14:30:14	1.13
***************
*** 2,6 ****
  import glob, os
  
! PYTHONDIR = r"d:/Python20"
  
  def listfiles(root, d, *masks, **kws):
--- 2,6 ----
  import glob, os
  
! PYTHONDIR = r"i:/Python21"
  
  def listfiles(root, d, *masks, **kws):
***************
*** 46,52 ****
--- 46,54 ----
  #list of files that will be taken from CPython.
  pylibfiles = [
+     '__future__.py',
      'BaseHTTPServer.py',
      'CGIHTTPServer.py',
      'ConfigParser.py',
+     'Cookie.py',
      'MimeWriter.py',
      'Queue.py',
***************
*** 57,60 ****
--- 59,63 ----
      'UserList.py',
      'anydbm.py',
+     'base64.py',
      'bdb.py',
      'binhex.py',
***************
*** 83,86 ****
--- 86,90 ----
      'glob.py',
      'gopherlib.py',
+     'gzip.py',
      'htmlentitydefs.py',
      'htmllib.py',
***************
*** 120,123 ****
--- 124,128 ----
      'sched.py',
      'sgmllib.py',
+     'site.py',
      'shelve.py',
      'shutil.py',
***************
*** 139,142 ****
--- 144,148 ----
      'xdrlib.py',
      'xmllib.py',
+     'zipfile.py',
      'test/pystone.py',
  
***************
*** 181,185 ****
  binary("Doc/images/jython-new-small.gif")
  binary("Doc/images/PythonPoweredSmall.gif")
! listfiles(None, "Doc/api", '*.html')
  
  comment("Demos")
--- 187,193 ----
  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')
  
  comment("Demos")
***************
*** 209,212 ****
  print "t Lib/LICENSE %s\LICENSE.txt" % PYTHONDIR
  listfiles(PYTHONDIR, "Lib", *pylibfiles)
! listfiles(None, "Lib", 'site.py')
  print "#===== end of list generated by mklist.py ====="
--- 217,220 ----
  print "t Lib/LICENSE %s\LICENSE.txt" % PYTHONDIR
  listfiles(PYTHONDIR, "Lib", *pylibfiles)
! #listfiles(None, "Lib", 'site.py')
  print "#===== end of list generated by mklist.py ====="

[Jython-checkins] CVS: jython/installer liftoff.props,1.8,1.9

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

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

Modified Files:
	liftoff.props 
Log Message:
Updated to 2.1a1



Index: liftoff.props
===================================================================
RCS file: /cvsroot/jython/jython/installer/liftoff.props,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** liftoff.props	2001/01/17 15:41:58	1.8
--- liftoff.props	2001/03/14 14:29:12	1.9
***************
*** 2,9 ****
  product.author=The Jython Team
  product.string=Jython
! product.version=2.0
  java.minVersion=1.1
  product.root=
! destination.package_prefix=jython-2.0
  license.licenseText=LICENSE.txt
  product.readmeText=README.txt
--- 2,9 ----
  product.author=The Jython Team
  product.string=Jython
! product.version=2.1a1
  java.minVersion=1.1
  product.root=
! destination.package_prefix=jython-2.1a1
  license.licenseText=LICENSE.txt
  product.readmeText=README.txt

[Jython-checkins] CVS: jython/Doc/images jpython-new-small.gif,1.1,NONE

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

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

Removed Files:
	jpython-new-small.gif 
Log Message:
JPython image never used.



--- jpython-new-small.gif DELETED ---

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

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

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

Modified Files:
	build.xml 
Log Message:
Only run javadoc in core and util. We can included modules later.



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/jython/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** build.xml	2001/02/25 17:06:23	1.9
--- build.xml	2001/03/14 14:28:08	1.10
***************
*** 110,117 ****
                   Public="Yes"
                   packagenames="org.python.core,
!                                org.python.modules,
!                                org.python.modules.sre,
!                                org.python.util,
!                                org.python.rmi"
                   Windowtitle="Jython API documentation"
                   bottom="<a href='http://www.jython.org'>Jython homepage</a>"
--- 110,114 ----
                   Public="Yes"
                   packagenames="org.python.core,
!                                org.python.util"
                   Windowtitle="Jython API documentation"
                   bottom="<a href='http://www.jython.org'>Jython homepage</a>"

[Jython-checkins] CVS: jython/org/python/core PySystemState.java,2.51,2.52

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

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

Modified Files:
	PySystemState.java 
Log Message:
Updated version to 2.1a1.



Index: PySystemState.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PySystemState.java,v
retrieving revision 2.51
retrieving revision 2.52
diff -C2 -r2.51 -r2.52
*** PySystemState.java	2001/03/13 20:21:59	2.51
--- PySystemState.java	2001/03/14 13:48:25	2.52
***************
*** 18,22 ****
       * The current version of JPython.
       */
!     public static String version = "2.1pre-a1";
  
      /**
--- 18,22 ----
       * The current version of JPython.
       */
!     public static String version = "2.1a1";
  
      /**

[Jython-checkins] CVS: jython/org/python/core imp.java,2.40,2.41

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

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

Modified Files:
	imp.java 
Log Message:
importAll(): Don't look for __all__ in java packages. Compiled applets
don't like that at all.



Index: imp.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/imp.java,v
retrieving revision 2.40
retrieving revision 2.41
diff -C2 -r2.40 -r2.41
*** imp.java	2001/02/25 16:52:54	2.40
--- imp.java	2001/03/14 13:47:53	2.41
***************
*** 617,622 ****
          if (module instanceof PyJavaPackage)
              names = ((PyJavaPackage)module).fillDir();
!         else
!             names = module.__dir__();
  
          loadNames(names, module, frame.getf_locals());
--- 617,624 ----
          if (module instanceof PyJavaPackage)
              names = ((PyJavaPackage)module).fillDir();
!         else {
!             PyObject __all__ = module.__findattr__("__all__");
!             names = (__all__ != null)  ? __all__ : module.__dir__();
!         }
  
          loadNames(names, module, frame.getf_locals());
***************
*** 626,631 ****
                                    PyObject locals)
      {
-         PyObject __all__ = module.__findattr__("__all__");
-         if (__all__ != null) names = __all__;
          int i=0;
          PyObject name;
--- 628,631 ----

[Jython-checkins] CVS: jython NEWS,2.30,2.31

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

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

Modified Files:
	NEWS 
Log Message:
Lastest news.



Index: NEWS
===================================================================
RCS file: /cvsroot/jython/jython/NEWS,v
retrieving revision 2.30
retrieving revision 2.31
diff -C2 -r2.30 -r2.31
*** NEWS	2001/03/13 20:32:24	2.30
--- NEWS	2001/03/14 13:45:02	2.31
***************
*** 1,5 ****
  Jython NEWS
  
! xx-xxx-2001 Jython 2.1 alpha 1
  
    New features.
--- 1,5 ----
  Jython NEWS
  
! 14-mar-2001 Jython 2.1 alpha 1
  
    New features.
***************
*** 17,20 ****
--- 17,21 ----
     - Warning framework (pep-0230).
     - Added sys.add_classdir and sys.add_extdir.
+    - Added nested scope to the interpreter (pep-0227).
  
    Bug fixes.
***************
*** 25,28 ****
--- 26,30 ----
       instead of the wrapped java object.
     - Include a LineNumberTable in the compiled class files.
+    - Fixed a java version test bug in the installer.
  
  17-Jan-2001 Jython 2.0 final release

[Jython-checkins] CVS: jython/Lib javaos.py,2.5,2.6

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

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

Modified Files:
	javaos.py 
Log Message:
Added docstring from cpython.



Index: javaos.py
===================================================================
RCS file: /cvsroot/jython/jython/Lib/javaos.py,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -r2.5 -r2.6
*** javaos.py	2001/01/31 10:38:36	2.5
--- javaos.py	2001/03/13 20:32:47	2.6
***************
*** 1,2 ****
--- 1,23 ----
+ r"""OS routines for Mac, DOS, NT, or Posix depending on what system we're on.
+ 
+ This exports:
+   - all functions from posix, nt, dos, os2, mac, or ce, e.g. unlink, stat, etc.
+   - os.path is one of the modules posixpath, ntpath, macpath, or dospath
+   - os.name is 'posix', 'nt', 'dos', 'os2', 'mac', 'ce' or 'riscos'
+   - os.curdir is a string representing the current directory ('.' or ':')
+   - os.pardir is a string representing the parent directory ('..' or '::')
+   - os.sep is the (or a most common) pathname separator ('/' or ':' or '\\')
+   - os.altsep is the alternate pathname separator (None or '/')
+   - os.pathsep is the component separator used in $PATH etc
+   - os.linesep is the line separator in text files ('\r' or '\n' or '\r\n')
+   - os.defpath is the default search path for executables
+ 
+ Programs that import and use 'os' stand a better chance of being
+ portable between different platforms.  Of course, they must then
+ only use functions that are defined by all platforms (e.g., unlink
+ and opendir), and leave all pathname manipulation to os.path
+ (e.g., split and join).
+ """
+ 
  import java
  from java.io import File

[Jython-checkins] CVS: jython NEWS,2.29,2.30

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

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

Modified Files:
	NEWS 
Log Message:
Thw two new sys methods.



Index: NEWS
===================================================================
RCS file: /cvsroot/jython/jython/NEWS,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -r2.29 -r2.30
*** NEWS	2001/02/22 13:07:01	2.29
--- NEWS	2001/03/13 20:32:24	2.30
***************
*** 16,19 ****
--- 16,20 ----
     - Added a PyServlet class to the util package.
     - Warning framework (pep-0230).
+    - Added sys.add_classdir and sys.add_extdir.
  
    Bug fixes.

[Jython-checkins] CVS: jython ACKNOWLEDGMENTS,2.10,2.11

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

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

Modified Files:
	ACKNOWLEDGMENTS 
Log Message:
Added Kent Johnson



Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /cvsroot/jython/jython/ACKNOWLEDGMENTS,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** ACKNOWLEDGMENTS	2001/02/23 20:20:17	2.10
--- ACKNOWLEDGMENTS	2001/03/13 20:31:57	2.11
***************
*** 46,49 ****
--- 46,50 ----
      Ype Kingma
      Ian Castleden
+     Kent Johnson
  
  Local Variables:

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

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

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

Modified Files:
	os.java 
Log Message:
Reworked import mechanisme. Mostly to ensure that javaos.__doc__ gets
imported into the os module.



Index: os.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/os.java,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -r2.5 -r2.6
*** os.java	2001/02/07 09:26:19	2.5
--- os.java	2001/03/13 20:29:42	2.6
***************
*** 9,22 ****
      // An ugly hack, but it keeps the site.py from CPython2.0 happy
  
-     public static String __file__;
- 
      public static void classDictInit(PyObject dict) {
-         String prefix = Py.getSystemState().prefix;
-         if (prefix != null)
-             __file__ = prefix + "/Lib/javaos.py";
  
          // Fake from javaos import *
!         PyFrame frame = new PyFrame(null, dict, dict, null);
!         org.python.core.imp.importAll("javaos", frame);
      }
  }
--- 9,31 ----
      // An ugly hack, but it keeps the site.py from CPython2.0 happy
  
      public static void classDictInit(PyObject dict) {
  
          // Fake from javaos import *
! 
!         PyTuple all = new PyTuple(new PyString[] { Py.newString('*') });
!         PyObject module = __builtin__.__import__("javaos", null, null, all);
! 
!         PyObject names = module.__dir__();
!         PyObject name;
!         for (int i = 0; (name=names.__finditem__(i)) != null; i++) {
!             String sname = name.toString().intern();
!             dict.__setitem__(name, module.__getattr__(sname));
!         }
! 
!         String prefix = Py.getSystemState().prefix;
!         if (prefix != null) {
!             String libdir = prefix + "/Lib/javaos.py";
!             dict.__setitem__("__file__", new PyString(libdir));
!         }
      }
  }

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

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

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

Modified Files:
	types.java 
Log Message:
Added docstring.



Index: types.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/types.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -r2.4 -r2.5
*** types.java	2001/02/02 11:29:42	2.4
--- types.java	2001/03/13 20:28:22	2.5
***************
*** 4,7 ****
--- 4,13 ----
  
  public class types implements ClassDictInit {
+     public static PyString __doc__ = new PyString(
+         "Define names for all type symbols known in the standard interpreter.\n"+
+         "\n"+
+         "Types that are part of optional modules (e.g. array) are not listed.\n"
+     );
+ 
      public static void classDictInit(PyObject dict) {
          dict.__setitem__("ArrayType", PyJavaClass.lookup(PyArray.class));

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

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

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

Modified Files:
	thread.java 
Log Message:
Added docstring.



Index: thread.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/thread.java,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -r2.3 -r2.4
*** thread.java	2001/02/02 11:29:42	2.3
--- thread.java	2001/03/13 20:28:10	2.4
***************
*** 28,31 ****
--- 28,36 ----
  public class thread implements ClassDictInit
  {
+     public static PyString __doc__ = new PyString(
+         "This module provides primitive operations to write multi-threaded programs.\n" +
+         "The 'threading' module provides a more convenient interface."
+     );
+ 
      public static void classDictInit(PyObject dict) {
          dict.__setitem__("LockType", PyJavaClass.lookup(PyLock.class));

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

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

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

Modified Files:
	operator.java 
Log Message:
Added docstring.



Index: operator.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/operator.java,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -r2.5 -r2.6
*** operator.java	2001/02/02 11:29:42	2.5
--- operator.java	2001/03/13 20:27:43	2.6
***************
*** 81,84 ****
--- 81,94 ----
  public class operator implements ClassDictInit
  {
+     public static PyString __doc__ = new PyString(
+         "Operator interface.\n"+
+         "\n"+
+         "This module exports a set of functions implemented in C corresponding\n"+
+         "to the intrinsic operators of Python.  For example, operator.add(x, y)\n"+
+         "is equivalent to the expression x+y.  The function names are those\n"+
+         "used for special class methods; variants without leading and trailing\n"+
+         "'__' are also provided for convenience.\n"
+     );
+ 
      public static void classDictInit(PyObject dict) {
          dict.__setitem__("__add__", new OperatorFunctions("__add__", 0, 2));

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

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

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

Modified Files:
	imp.java 
Log Message:
Added docstring.



Index: imp.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/imp.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -r2.4 -r2.5
*** imp.java	2001/02/02 11:29:42	2.4
--- imp.java	2001/03/13 20:27:30	2.5
***************
*** 14,17 ****
--- 14,21 ----
  
  public class imp {
+     public static PyString __doc__ = new PyString(
+         "This module provides the components needed to build your own\n"+
+         "__import__ function.  Undocumented functions are obsolete.\n"
+     );
  
      public static final int PY_SOURCE = 1;

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

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

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

Modified Files:
	codeop.java 
Log Message:
Added docstring.



Index: codeop.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/codeop.java,v
retrieving revision 2.2
retrieving revision 2.3
diff -C2 -r2.2 -r2.3
*** codeop.java	2001/02/04 15:08:03	2.2
--- codeop.java	2001/03/13 20:27:18	2.3
***************
*** 5,8 ****
--- 5,12 ----
  
  public class codeop {
+     public static PyString __doc__ = new PyString(
+         "Utility to compile possibly incomplete Python source code.\n"
+     );
+ 
      public static PyList __all__ = new PyList(new PyString[] {
          new PyString("compile_command") 

[Jython-checkins] CVS: jython/org/python/modules Setup.java,2.16,2.17

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

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

Modified Files:
	Setup.java 
Log Message:
Removed the obsolete cPickle_exceptions module.



Index: Setup.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/Setup.java,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -r2.16 -r2.17
*** Setup.java	2001/02/02 11:29:42	2.16
--- Setup.java	2001/03/13 20:26:57	2.17
***************
*** 39,43 ****
          "synchronize",
          "cPickle",
-         "cPickle_exceptions",
          "cStringIO",
          "struct",
--- 39,42 ----

[Jython-checkins] CVS: jython/org/python/modules MD5Module.java,2.7,2.8

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

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

Modified Files:
	MD5Module.java 
Log Message:
Added docstring.



Index: MD5Module.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/MD5Module.java,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -r2.7 -r2.8
*** MD5Module.java	2001/02/02 11:29:41	2.7
--- MD5Module.java	2001/03/13 20:26:28	2.8
***************
*** 41,44 ****
--- 41,63 ----
  public class MD5Module implements ClassDictInit
  {
+     public static PyString __doc__ = new PyString(
+         "This module implements the interface to RSA's MD5 message digest\n"+
+         "algorithm (see also Internet RFC 1321). Its use is quite\n"+
+         "straightforward: use the new() to create an md5 object. You can now\n"+
+         "feed this object with arbitrary strings using the update() method, and\n"+
+         "at any point you can ask it for the digest (a strong kind of 128-bit\n"+
+         "checksum, a.k.a. ``fingerprint'') of the concatenation of the strings\n"+
+         "fed to it so far using the digest() method.\n"+
+         "\n"+
+         "Functions:\n"+
+         "\n"+
+         "new([arg]) -- return a new md5 object, initialized with arg if provided\n"+
+         "md5([arg]) -- DEPRECATED, same as new, but for compatibility\n"+
+         "\n"+
+         "Special Objects:\n"+
+         "\n"+
+         "MD5Type -- type object for md5 objects\n"
+     );
+ 
      public static void classDictInit(PyObject dict) {
          dict.__setitem__("new", new MD5Functions("new", 0, 0, 1));

[Jython-checkins] CVS: jython/org/python/util PyServlet.java,1.7,1.8

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

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

Modified Files:
	PyServlet.java 
Log Message:
Use the new sys.add_ methods instead of playing with registry options.
Fixed an inconsistency with tomcat-3.1 where the rootpath already
ended with a path seperator.
Use Properties.put to ensure complication on jdk1.1



Index: PyServlet.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/util/PyServlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** PyServlet.java	2001/02/16 18:13:45	1.7
--- PyServlet.java	2001/03/13 20:25:46	1.8
***************
*** 68,71 ****
--- 68,73 ----
      public void init() {
          rootPath = getServletContext().getRealPath("/");
+         if (!rootPath.endsWith(File.separator))
+             rootPath += File.separator;
  
          Properties props = new Properties();
***************
*** 73,100 ****
          while (e.hasMoreElements()) {
              String name = (String) e.nextElement();
!             props.setProperty(name, getInitParameter(name));
          }
          if (props.getProperty("python.home") == null && 
                                     System.getProperty("python.home") == null) {
!             props.setProperty("python.home", rootPath + File.separator +
!                                              "WEB-INF" + File.separator +
!                                              "lib");
          }
  
-         props.setProperty("python.packages.directories",
-                           "java.ext.dirs,pyservlet.lib");
-         props.setProperty("pyservlet.lib",
-                           rootPath + File.separator +
-                           "WEB-INF" + File.separator +
-                           "lib");
- 
-         props.setProperty("python.packages.paths",
-                           "java.class.path,sun.boot.class.path,"+
-                           "pyservlet.classes");
-         props.setProperty("pyservlet.classes",
-                           rootPath + File.separator +
-                           "WEB-INF" + File.separator +
-                           "classes");
-  
          PythonInterpreter.initialize(System.getProperties(), props, new String[0]);
          reset();
--- 75,86 ----
          while (e.hasMoreElements()) {
              String name = (String) e.nextElement();
!             props.put(name, getInitParameter(name));
          }
          if (props.getProperty("python.home") == null && 
                                     System.getProperty("python.home") == null) {
!             props.setProperty("python.home", rootPath + "WEB-INF" +
!                                              File.separator + "lib");
          }
  
          PythonInterpreter.initialize(System.getProperties(), props, new String[0]);
          reset();
***************
*** 105,108 ****
--- 91,100 ----
          sys.add_package("javax.servlet.jsp");
          sys.add_package("javax.servlet.jsp.tagext");
+ 
+         sys.add_classdir(rootPath + "WEB-INF" +
+                           File.separator + "classes");
+ 
+         sys.add_extdir(rootPath + "WEB-INF" +
+                           File.separator + "lib");
      }
  
***************
*** 133,139 ****
          sys.path.append(new PyString(rootPath));
  
!         String modulesDir = rootPath + File.separator +
!                             "WEB-INF" + File.separator +
!                             "jython";
          sys.path.append(new PyString(modulesDir));
      }
--- 125,130 ----
          sys.path.append(new PyString(rootPath));
  
!         String modulesDir = rootPath + "WEB-INF" +
!                             File.separator + "jython";
          sys.path.append(new PyString(modulesDir));
      }
***************
*** 195,199 ****
          destroyCache();
      }
- 
  
      private void destroyCache() {
--- 186,189 ----

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

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

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

Modified Files:
	SysPackageManager.java 
Log Message:
Make addJarDir() method public.



Index: SysPackageManager.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/SysPackageManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** SysPackageManager.java	2001/02/02 09:28:37	1.6
--- SysPackageManager.java	2001/03/13 20:22:25	1.7
***************
*** 37,41 ****
      }
  
!     private void addJarDir(String jdir) {
          File file = new File(jdir);
          if (!file.isDirectory()) return;
--- 37,41 ----
      }
  
!     public void addJarDir(String jdir) {
          File file = new File(jdir);
          if (!file.isDirectory()) return;

[Jython-checkins] CVS: jython/org/python/core PySystemState.java,2.50,2.51

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

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

Modified Files:
	PySystemState.java 
Log Message:
Added add_classdir() and add_extdir() methods.



Index: PySystemState.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PySystemState.java,v
retrieving revision 2.50
retrieving revision 2.51
diff -C2 -r2.50 -r2.51
*** PySystemState.java	2001/02/25 16:51:51	2.50
--- PySystemState.java	2001/03/13 20:21:59	2.51
***************
*** 505,508 ****
--- 505,541 ----
      }
  
+     /**
+      * Add a classpath directory to the list of places that are searched
+      * for java packages. 
+      * <p>
+      * <b>Note</b>. Classes found in directory and subdirectory are not 
+      * made available to jython by this call. It only make the java 
+      * package found ion the directory available. This call is mostly
+      * usefull if jython is embedded in an application that deals with
+      * its own classloaders. A servlet container is a very good example.
+      * Calling add_classpath("<context>/WEB-INF/classes") makes the java 
+      * packages in WEB-INF classes available to jython import. However the
+      * actual classloading is completely handled by the servlet container's
+      * context classloader.
+      */
+     public static void add_classdir(String directoryPath) {
+         packageManager.addDirectory(new File(directoryPath));
+     }
+ 
+     /**
+      * 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
+      * are not made available to jython by this call. See the note for
+      * add_classpath(dir) for more details.
+      *
+      * @see add_classpath
+      */
+     public static void add_extdir(String directoryPath) {
+         packageManager.addJarDir(directoryPath);
+     }
+ 
      public TraceFunction tracefunc = null;
      public TraceFunction profilefunc = null;