jython-checkins — For Jython checkin messages

[Jython-checkins] CVS: jython NEWS,2.20,2.21

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

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

Modified Files:
	NEWS 
Log Message:
Use correct year.



Index: NEWS
===================================================================
RCS file: /cvsroot/jython/jython/NEWS,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** NEWS	2001/01/07 09:14:20	2.20
--- NEWS	2001/01/07 09:20:05	2.21
***************
*** 1,5 ****
  Jython NEWS
  
! xx-Jan-2000 Jython 2.0 beta 2
  
    Bug fixes.
--- 1,5 ----
  Jython NEWS
  
! xx-Jan-2001 Jython 2.0 beta 2
  
    Bug fixes.

[Jython-checkins] CVS: CVSROOT loginfo,1.6,1.7

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

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

Modified Files:
	loginfo 
Log Message:
It looks like jyt...@so... are working again.
Removing the direct mail addresses to Samuele and me.



Index: loginfo
===================================================================
RCS file: /cvsroot/jython/CVSROOT/loginfo,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** loginfo	2000/12/23 13:54:17	1.6
--- loginfo	2001/01/07 09:18:57	1.7
***************
*** 26,28 ****
  #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
  
! DEFAULT /usr/bin/python $CVSROOT/CVSROOT/syncmail %{sVv} jyt...@li... pe...@in... bc...@wo...
--- 26,28 ----
  #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
  
! DEFAULT /usr/bin/python $CVSROOT/CVSROOT/syncmail %{sVv} jyt...@li...

[Jython-checkins] CVS: jython NEWS,2.19,2.20

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

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

Modified Files:
	NEWS 
Log Message:
More news.



Index: NEWS
===================================================================
RCS file: /cvsroot/jython/jython/NEWS,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** NEWS	2000/12/31 11:25:45	2.19
--- NEWS	2001/01/07 09:14:20	2.20
***************
*** 1,4 ****
--- 1,10 ----
  Jython NEWS
  
+ xx-Jan-2000 Jython 2.0 beta 2
+ 
+   Bug fixes.
+    - Fixed innerclass names with '$' #127200 
+    - Fixed a bug where final methods were overriden in proxy #127201.
+ 
  31-Dec-2000 Jython 2.0 beta 1
  

[Jython-checkins] CVS: jython/Tools/jythonc proxies.py,2.7,2.8

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

Update of /cvsroot/jython/jython/Tools/jythonc
In directory usw-pr-cvs1:/tmp/cvs-serv28653

Modified Files:
	proxies.py 
Log Message:
typeName(): Fix bug 127200.



Index: proxies.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/proxies.py,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -r2.7 -r2.8
*** proxies.py	2001/01/07 09:08:54	2.7
--- proxies.py	2001/01/07 09:11:10	2.8
***************
*** 26,29 ****
--- 26,34 ----
          return typeName(Class.getComponentType(cls))+"[]"
      else:
+         if '$' in cls.__name__:
+             outer = cls.getDeclaringClass()
+             if outer:
+                 l = len(outer.__name__)
+                 return "%s.%s" % (typeName(outer), cls.__name__[l+1:])
          return cls.__name__
  

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

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

Update of /cvsroot/jython/jython/Tools/jythonc
In directory usw-pr-cvs1:/tmp/cvs-serv28139

Modified Files:
	proxies.py 
Log Message:
JavaProxy.addMethods(): Fix bug 127201.



Index: proxies.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/proxies.py,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -r2.6 -r2.7
*** proxies.py	2000/11/10 15:15:17	2.6
--- proxies.py	2001/01/07 09:08:54	2.7
***************
*** 252,257 ****
                      pass
                      #addSuperMethod(method, access)     
!             elif isFinal(access):
!                 continue
  
              throws = method.exceptionTypes
--- 252,257 ----
                      pass
                      #addSuperMethod(method, access)     
!             #elif isFinal(access):
!             #    continue
  
              throws = method.exceptionTypes

Re: [Jython-checkins] Minor change to org/python/core/InternalTables.java

[<bc...@wo...>]

On Sun, 17 Dec 2000 13:21:12 +0100, you wrote:

>Automatic checkin notification is not working.
>Seems python is missing/not found on server.

A result of the SF upgrade I guess. Since the python project also
depends on python for their checkin messages (I stole the script from
them) I'll just sit back and wait for them (or SF) to come up with the
solution.

Until then: no checkin messages. Sorry.

regards,
finn

[Jython-checkins] Minor change to org/python/core/InternalTables.java

[Samuele P. <pe...@in...>]

Automatic checkin notification is not working.
Seems python is missing/not found on server.

sP.

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

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

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

Modified Files:
	PySystemState.java 
Log Message:
initPath(): Append the python.path after the <prefix>/Lib instead of 
before. Thjis matches the behavior of site.py and are much more
usefull when adding the CPython libraries.
Also introduce a new python.prepath that get inserted before <prefix>/Lib.
This python.prepath is only intended for very specialized use.



Index: PySystemState.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PySystemState.java,v
retrieving revision 2.36
retrieving revision 2.37
diff -C2 -r2.36 -r2.37
*** PySystemState.java	2000/12/15 03:19:00	2.36
--- PySystemState.java	2000/12/15 22:13:36	2.37
***************
*** 449,465 ****
          PyList path = new PyList();
          if (!Py.frozen) {
!             String pypath = props.getProperty("python.path", "");
!             StringTokenizer tok =
!             new StringTokenizer(pypath, java.io.File.pathSeparator);
!             while  (tok.hasMoreTokens())  {
!                 String p = tok.nextToken();
!                 path.append(new PyString(p.trim()));
!             }
              if (prefix != null) {
                  String libpath = new File(prefix, "Lib").toString();
                  path.append(new PyString(libpath));
              }
          }
          return path;
      }
  
--- 449,470 ----
          PyList path = new PyList();
          if (!Py.frozen) {
!             addPaths(path, props.getProperty("python.prepath", "."));
! 
              if (prefix != null) {
                  String libpath = new File(prefix, "Lib").toString();
                  path.append(new PyString(libpath));
              }
+ 
+             addPaths(path, props.getProperty("python.path", ""));
          }
          return path;
+     }
+ 
+ 
+     private static void addPaths(PyList path, String pypath) {
+         StringTokenizer tok = new StringTokenizer(pypath, 
+                                                   java.io.File.pathSeparator);
+         while  (tok.hasMoreTokens())
+             path.append(new PyString(tok.nextToken().trim()));
      }
  

[Jython-checkins] CVS: jython registry,2.9,2.10

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

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

Modified Files:
	registry 
Log Message:
Removed the default value for python.path. This value is instead handled
by python.prepath which defaults to "."



Index: registry
===================================================================
RCS file: /cvsroot/jython/jython/registry,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** registry	2000/12/15 03:19:00	2.9
--- registry	2000/12/15 22:18:28	2.10
***************
*** 7,11 ****
  # This is how Barry sets his path on his Unix development machine
  #python.path = /home/bwarsaw/projects/python/Lib
! python.path = .
  
  # Set the directory to use for caches (currently just package information)
--- 7,12 ----
  # This is how Barry sets his path on his Unix development machine
  #python.path = /home/bwarsaw/projects/python/Lib
! # This is how Finn  sets his path on his windows development machine
! #python.path = d:\\python20\\lib
  
  # Set the directory to use for caches (currently just package information)

[Jython-checkins] CVS: jython/org/python/util jython.java,2.15,2.16

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

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

Modified Files:
	jython.java 
Log Message:
Added -v (verbose) option.



Index: jython.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/util/jython.java,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** jython.java	2000/12/06 21:04:30	2.15
--- jython.java	2000/12/15 22:21:02	2.16
***************
*** 15,18 ****
--- 15,19 ----
          "-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"+
          "-jar jar : program read from __run__.py in jar file\n"+
***************
*** 241,244 ****
--- 242,254 ----
              else if (arg.equals("-X")) {
                  Options.classBasedExceptions = false;
+             }
+             else if (arg.equals("-v")) {
+                 Options.verbose++;
+             }
+             else if (arg.equals("-vv")) {
+                 Options.verbose += 2;
+             }
+             else if (arg.equals("-vvv")) {
+                 Options.verbose +=3 ;
              }
              else if (arg.equals("-S")) {

[Jython-checkins] CVS: jython/org/python/core SyspathJavaLoader.java,NONE,2.1 BytecodeLoader.java,2.8,2.9 MakeProxies.java,2.11,2.12 Options.java,2.3,2.4 PySystemState.java,2.35,2.36 imp.java,2.32,2.33

[Samuele P. <ped...@us...>]

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

Modified Files:
	BytecodeLoader.java MakeProxies.java Options.java 
	PySystemState.java imp.java 
Added Files:
	SyspathJavaLoader.java 
Log Message:
Modified:
 multi classloader support (I)
* Proxies retrieve classes for return-type conversions from their classloaders.
* BytecodeLoaders are setup with a set of referents and look for classes
  first through the sys.path loader and then through the loaders of the referents.
 makeup
* Added specific SyspathJavaLoader loader class.
* - python.options.extendedClassLoader


--- NEW FILE ---
// Copyright © Corporation for National Research Initiatives
// Copyright 2000 Samuele Pedroni

package org.python.core;
import java.io.*;
import java.util.StringTokenizer;
import java.util.Hashtable;

public class SyspathJavaLoader extends ClassLoader
{

    public InputStream getResourceAsStream(String res) {
        ClassLoader classLoader = Py.getSystemState().getClassLoader();
        if (classLoader != null) return classLoader.getResourceAsStream(res);

        classLoader = this.getClass().getClassLoader();

        InputStream ret;

        if (classLoader != null) ret = classLoader.getResourceAsStream(res);
        else ret = ClassLoader.getSystemResourceAsStream(res);

        if (ret != null) return ret;

        if(res.charAt(0) == '/') res = res.substring(1);

        res.replace('/',File.separatorChar);

        PyList path = Py.getSystemState().path;
        for (int i=0; i < path.__len__(); i++) {
            String dir = path.get(i).__str__().toString();
            if (dir.length() == 0) dir = null;
            try {
                return new BufferedInputStream(new FileInputStream(new File(dir,res)));
            }
            catch (IOException e) {
                continue;
            }
        }

        return null;
    }
  
    // override from abstract base class
    protected Class loadClass(String name, boolean resolve)
        throws ClassNotFoundException
    {
//         System.err.println("loadClass("+name+", "+resolve+")");
        // First, if the Python runtime system has a default class loader,
        // defer to it.
        ClassLoader classLoader = Py.getSystemState().getClassLoader();
        if (classLoader != null)
            return classLoader.loadClass(name);
        // Search the sys.path for a .class file matching the named class.
        // TBD: This registry option is temporary.
        try {
          return Class.forName(name);
        } 
        catch(ClassNotFoundException e) {
        }
        
        Class c = findLoadedClass(name);
        if (c != null)
         return c;
        
        /* previously: if
            Options.extendedClassLoader &&
            // KLUDGE ALERT: without this test, running jpython
            // interactively from the build directory will fail with
            // ClassCircularityError or LinkageError.  There's gotta be a
            // better way.
            !name.startsWith("org.python")
        */
        {
            PyList path = Py.getSystemState().path;
            for (int i=0; i < path.__len__(); i++) {
                String dir = path.get(i).__str__().toString();
                FileInputStream fis = open(dir, name);
                if (fis == null)
                    continue;
                try {
                    int size = fis.available();
                    byte[] buffer = new byte[size];
                    fis.read(buffer);
                    fis.close();
                    return loadClassFromBytes(name, buffer);
                }
                catch (IOException e) {
                    continue;
                }
            }
        }
        
        // couldn't find the .class file on sys.path        
        throw new ClassNotFoundException(name);
    }

    private FileInputStream open(String dir, String name) {
        String accum = "";
        boolean first = true;
        for (StringTokenizer t = new StringTokenizer(name, ".");
             t.hasMoreTokens();)
        {
            String token = t.nextToken();
            if (!first)
                accum += File.separator;
            accum += token;
            first = false;
        }
        try {
            if (dir.length() == 0)
                dir = null;
            return new FileInputStream(new File(dir, accum+".class"));
        }
        catch (FileNotFoundException e) {
            return null;
        }
    }

    private Class loadClassFromBytes(String name, byte[] data) {
//         System.err.println("loadClassFromBytes("+name+", byte[])");
        Class c = defineClass(name, data, 0, data.length);
        resolveClass(c);
        // This method has caused much trouble.  Using it breaks jdk1.2rc1
        // Not using it can make SUN's jdk1.1.6 JIT slightly unhappy.
        // Don't use by default, but allow python.options.compileClass to
        // override
        if (!Options.skipCompile) {
//             System.err.println("compile: "+name);
            Compiler.compileClass(c);
        }
        return c;
    }

}

Index: BytecodeLoader.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/BytecodeLoader.java,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** BytecodeLoader.java	2000/11/19 22:32:45	2.8
--- BytecodeLoader.java	2000/12/15 03:19:00	2.9
***************
*** 5,42 ****
  import java.util.StringTokenizer;
  import java.util.Hashtable;
  
  public class BytecodeLoader extends ClassLoader
  {
  
!     public InputStream getResourceAsStream(String res) {
!         ClassLoader classLoader = Py.getSystemState().getClassLoader();
!         if (classLoader != null) return classLoader.getResourceAsStream(res);
! 
!         classLoader = this.getClass().getClassLoader();
! 
!         InputStream ret;
! 
!         if (classLoader != null) ret = classLoader.getResourceAsStream(res);
!         else ret = ClassLoader.getSystemResourceAsStream(res);
! 
!         if (ret != null) return ret;
! 
!         if(res.charAt(0) == '/') res = res.substring(1);
! 
!         res.replace('/',File.separatorChar);
! 
!         PyList path = Py.getSystemState().path;
!         for (int i=0; i < path.__len__(); i++) {
!             String dir = path.get(i).__str__().toString();
!             if (dir.length() == 0) dir = null;
!             try {
!                 return new BufferedInputStream(new FileInputStream(new File(dir,res)));
!             }
!             catch (IOException e) {
!                 continue;
              }
          }
! 
!         return null;
      }
    
--- 5,36 ----
  import java.util.StringTokenizer;
  import java.util.Hashtable;
+ import java.util.Vector;
  
  public class BytecodeLoader extends ClassLoader
  {
  
!     private Vector parents;
!     
!     public BytecodeLoader() {
!         this(null);
!     }
!     
!     public BytecodeLoader(Vector referents) {
!         parents = new Vector();
!         
!         parents.addElement(imp.getSyspathJavaLoader());
!         
!         if (referents != null) {
!             for(int i = 0; i < referents.size(); i++) {
!                 try {
!                     ClassLoader cur = ((Class)referents.elementAt(i)).getClassLoader();
!                     if (cur != null && !parents.contains(cur)) {
!                         parents.addElement(cur);
!                     }
!                 } catch(SecurityException e) {
!                 }
              }
          }
!         
      }
    
***************
*** 44,118 ****
      protected Class loadClass(String name, boolean resolve)
          throws ClassNotFoundException
!     {
! //         System.err.println("loadClass("+name+", "+resolve+")");
!         // First, if the Python runtime system has a default class loader,
!         // defer to it.
!         ClassLoader classLoader = Py.getSystemState().getClassLoader();
!         if (classLoader != null)
!             return classLoader.loadClass(name);
!         // Search the sys.path for a .class file matching the named class.
!         // TBD: This registry option is temporary.
!         try {
!           return Class.forName(name);
!         } 
!         catch(ClassNotFoundException e) {
!         }
!         
          Class c = findLoadedClass(name);
          if (c != null)
           return c;
          
!         /* previously: if
!             Options.extendedClassLoader &&
!             // KLUDGE ALERT: without this test, running jpython
!             // interactively from the build directory will fail with
!             // ClassCircularityError or LinkageError.  There's gotta be a
!             // better way.
!             !name.startsWith("org.python")
!         */
!         {
!             PyList path = Py.getSystemState().path;
!             for (int i=0; i < path.__len__(); i++) {
!                 String dir = path.get(i).__str__().toString();
!                 FileInputStream fis = open(dir, name);
!                 if (fis == null)
!                     continue;
!                 try {
!                     int size = fis.available();
!                     byte[] buffer = new byte[size];
!                     fis.read(buffer);
!                     fis.close();
!                     return loadClassFromBytes(name, buffer);
!                 }
!                 catch (IOException e) {
!                     continue;
!                 }
              }
          }
          
          // couldn't find the .class file on sys.path        
          throw new ClassNotFoundException(name);
-     }
- 
-     private FileInputStream open(String dir, String name) {
-         String accum = "";
-         boolean first = true;
-         for (StringTokenizer t = new StringTokenizer(name, ".");
-              t.hasMoreTokens();)
-         {
-             String token = t.nextToken();
-             if (!first)
-                 accum += File.separator;
-             accum += token;
-             first = false;
-         }
-         try {
-             if (dir.length() == 0)
-                 dir = null;
-             return new FileInputStream(new File(dir, accum+".class"));
-         }
-         catch (FileNotFoundException e) {
-             return null;
-         }
      }
  
--- 38,56 ----
      protected Class loadClass(String name, boolean resolve)
          throws ClassNotFoundException
!     {        
          Class c = findLoadedClass(name);
          if (c != null)
           return c;
          
!         for (int i = 0; i < parents.size(); i++) {
!             try {
!                 return ((ClassLoader)parents.elementAt(i)).loadClass(name);
!             } catch(ClassNotFoundException e) {
              }
          }
+ 
          
          // couldn't find the .class file on sys.path        
          throw new ClassNotFoundException(name);
      }
  

Index: MakeProxies.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/MakeProxies.java,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -r2.11 -r2.12
*** MakeProxies.java	2000/10/19 18:10:28	2.11
--- MakeProxies.java	2000/12/15 03:19:00	2.12
***************
*** 14,34 ****
  class MakeProxies 
  {
!     private static Class makeClass(Class referent, String name,
                                     ByteArrayOutputStream bytes)
      {
!         BytecodeLoader bcl;
!         ClassLoader cl;
!         // Use the superclass's class loader if it is a BytecodeLoader.
!         // referent might be null if we're deriving from an interface.  In
!         // that case, this may or may not be the RTTD.
!         if (referent != null &&
!             (cl = referent.getClassLoader()) != null &&
!             cl instanceof BytecodeLoader)
!         {
!             bcl = (BytecodeLoader)cl;
          }
!         else
!             bcl = imp.getSyspathJavaLoader();
!         return bcl.makeClass(name, bytes.toByteArray());
      }
  
--- 14,35 ----
  class MakeProxies 
  {
!     private static Class makeClass(Class referent, Vector secondary,String name,
                                     ByteArrayOutputStream bytes)
      {
!         Vector referents = null;
!         
!         if (secondary != null) {
!             if (referent != null) {
!                 secondary.insertElementAt(referent,0);
!                 referents = secondary;
!             }
!         } else {
!             if (referent != null) {
!                 referents = new Vector();
!                 referents.addElement(referent);
!             }
          }
!         
!         return new BytecodeLoader(referents).makeClass(name, bytes.toByteArray());
      }
  
***************
*** 45,49 ****
          Py.saveClassFile(name, bytes);
  
!         Class pc = makeClass(c, name, bytes);
          return pc;
      }
--- 46,50 ----
          Py.saveClassFile(name, bytes);
  
!         Class pc = makeClass(c, null, name, bytes);
          return pc;
      }
***************
*** 78,82 ****
              Py.saveClassFile(proxyName, bytes);
  
!             return makeClass(superclass, jm.myClass, bytes);
          }
          catch (Exception exc) {
--- 79,83 ----
              Py.saveClassFile(proxyName, bytes);
  
!             return makeClass(superclass, vinterfaces, jm.myClass, bytes);
          }
          catch (Exception exc) {

Index: Options.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/Options.java,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -r2.3 -r2.4
*** Options.java	2000/09/30 12:30:35	2.3
--- Options.java	2000/12/15 03:19:00	2.4
***************
*** 36,44 ****
      public static boolean respectJavaAccessibility = true;
  
      // 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;
--- 36,46 ----
      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;
***************
*** 102,109 ****
              getBooleanOption("security.respectJavaAccessibility",
                               Options.respectJavaAccessibility);
- 
-         Options.extendedClassLoader =
-             getBooleanOption("options.extendedClassLoader",
-                              Options.extendedClassLoader);
  
          Options.proxyDebugDirectory =
--- 104,107 ----

Index: PySystemState.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PySystemState.java,v
retrieving revision 2.35
retrieving revision 2.36
diff -C2 -r2.35 -r2.36
*** PySystemState.java	2000/12/06 20:58:56	2.35
--- PySystemState.java	2000/12/15 03:19:00	2.36
***************
*** 165,169 ****
  
          // This isn't quite right...
!         builtins = PyJavaClass.lookup(__builtin__.class).__dict__;
          PyModule __builtin__ = new PyModule("__builtin__", builtins);
          modules.__setitem__("__builtin__", __builtin__);
--- 165,169 ----
  
          // This isn't quite right...
!         builtins = PyJavaClass.lookup(__builtin__.class).__getattr__("__dict__");
          PyModule __builtin__ = new PyModule("__builtin__", builtins);
          modules.__setitem__("__builtin__", __builtin__);

Index: imp.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/imp.java,v
retrieving revision 2.32
retrieving revision 2.33
diff -C2 -r2.32 -r2.33
*** imp.java	2000/12/11 18:45:25	2.32
--- imp.java	2000/12/15 03:19:00	2.33
***************
*** 154,162 ****
      }
  
!     private static BytecodeLoader syspathJavaLoader = null;
  
!     public static synchronized BytecodeLoader getSyspathJavaLoader() {
          if (syspathJavaLoader == null)
!             syspathJavaLoader = new BytecodeLoader();
          return syspathJavaLoader;
      }
--- 154,162 ----
      }
  
!     private static ClassLoader syspathJavaLoader = null;
  
!     public static synchronized ClassLoader getSyspathJavaLoader() {
          if (syspathJavaLoader == null)
!             syspathJavaLoader = new SyspathJavaLoader();
          return syspathJavaLoader;
      }

[Jython-checkins] CVS: jython registry,2.8,2.9

[Samuele P. <ped...@us...>]

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

Modified Files:
	registry 
Log Message:
Modified:
 multi classloader support (I)
* Proxies retrieve classes for return-type conversions from their classloaders.
* BytecodeLoaders are setup with a set of referents and look for classes
  first through the sys.path loader and then through the loaders of the referents.
 makeup
* Added specific SyspathJavaLoader loader class.
* - python.options.extendedClassLoader


Index: registry
===================================================================
RCS file: /cvsroot/jython/jython/registry,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** registry	2000/12/06 21:09:23	2.8
--- registry	2000/12/15 03:19:00	2.9
***************
*** 25,33 ****
  python.options.compileClass = false
  
- # Allow Jython'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.
- python.options.extendedClassLoader = true
- 
  # Set verbosity to error, warning, message, comment, or debug
  # for varying levels of informative messages from Jython
--- 25,28 ----

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

[Samuele P. <ped...@us...>]

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

Modified Files:
	ProxyMaker.java 
Log Message:
Modified:
 multi classloader support (I)
* Proxies retrieve classes for return-type conversions from their classloaders.
* BytecodeLoaders are setup with a set of referents and look for classes
  first through the sys.path loader and then through the loaders of the referents.
 makeup
* Added specific SyspathJavaLoader loader class.
* - python.options.extendedClassLoader


Index: ProxyMaker.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/compiler/ProxyMaker.java,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** ProxyMaker.java	2000/10/19 18:10:28	2.10
--- ProxyMaker.java	2000/12/15 03:19:00	2.11
***************
*** 381,389 ****
                  "([Ljava/lang/Object;)Lorg/python/core/PyObject;");
              code.invokevirtual(jcall);
!                         
              code.ldc(ret.getName());
              int tojava = code.pool.Methodref(
                  "org/python/core/Py", "tojava",
!                 "(Lorg/python/core/PyObject;Ljava/lang/String;)Ljava/lang/Object;");
              code.invokestatic(tojava);
              // I guess I need this checkcast to keep the verifier happy
--- 381,411 ----
                  "([Ljava/lang/Object;)Lorg/python/core/PyObject;");
              code.invokevirtual(jcall);
!             /* catching exceptions is not vm mandatory
!             Label forname_start =code.getLabel();
!             Label forname_end = code.getLabel();
!             Label forname_exch_start = code.getLabel();
!             Label forname_exch_end = code.getLabel();
!             forname_start.setPosition();      
!             */  
!             int forname = code.pool.Methodref(
!                 "java/lang/Class","forName",
!                 "(Ljava/lang/String;)Ljava/lang/Class;");
              code.ldc(ret.getName());
+             code.invokestatic(forname);
+             /*
+             forname_end.setPosition();
+             code.goto_(forname_exch_end);
+             forname_exch_start.setPosition();
+             code.stack = 1;
+             code.pop(); // never reached, but this code keeps the verifier happy
+             code.aconst_null();
+             code.dup();
+             forname_exch_end.setPosition();
+             
+             code.addExceptionHandler(forname_start,forname_end,forname_exch_start,code.pool.Class("java/lang/ClassNotFoundException"));
+             */  
              int tojava = code.pool.Methodref(
                  "org/python/core/Py", "tojava",
!                 "(Lorg/python/core/PyObject;Ljava/lang/Class;)Ljava/lang/Object;");
              code.invokestatic(tojava);
              // I guess I need this checkcast to keep the verifier happy

[Jython-checkins] CVS: jython/org/python/compiler CodeCompiler.java,2.8,2.9

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

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

Modified Files:
	CodeCompiler.java 
Log Message:
Fix bug 122838. A traceback object is also created when catching
an exception in a try: finally: statement.



Index: CodeCompiler.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/compiler/CodeCompiler.java,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** CodeCompiler.java	2000/12/06 20:55:30	2.8
--- CodeCompiler.java	2000/12/12 21:27:27	2.9
***************
*** 975,978 ****
--- 975,979 ----
      }
  
+     public int add_traceback;
      public Object tryFinally(SimpleNode trySuite, SimpleNode finallySuite)
          throws Exception
***************
*** 1009,1012 ****
--- 1010,1024 ----
          int excLocal = code.getLocal();
          code.astore(excLocal);
+ 
+         code.aload(excLocal);
+         loadFrame();
+ 
+         if (mrefs.add_traceback == 0) {
+             mrefs.add_traceback = code.pool.Methodref(
+                 "org/python/core/Py", "addTraceback",
+                 "(Ljava/lang/Throwable;Lorg/python/core/PyFrame;)V");
+         }
+         code.invokestatic(mrefs.add_traceback);
+ 
          code.jsr(finallyStart);
          code.aload(excLocal);

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

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

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

Modified Files:
	Py.java 
Log Message:
Fix bug 122838. A traceback object is also created when catching
an exception in a try: finally: statement.



Index: Py.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/Py.java,v
retrieving revision 2.26
retrieving revision 2.27
diff -C2 -r2.26 -r2.27
*** Py.java	2000/11/17 21:23:42	2.26
--- Py.java	2000/12/12 21:27:31	2.27
***************
*** 925,928 ****
--- 925,938 ----
      }
  
+     /* Helpers to implement finally clauses */
+     public static void addTraceback(Throwable t, PyFrame frame) {
+         PyException e = Py.JavaError(t);
+ 
+         //Add another traceback object to the exception if needed
+         if (e.traceback.tb_frame != frame) {
+             e.traceback = new PyTraceback(e.traceback);
+         }
+     }
+ 
      /* Helpers to implement except clauses */
      public static PyException setException(Throwable t, PyFrame frame) {

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

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

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

Modified Files:
	PythonGrammar.java 
Log Message:
Commit generated files for latest python.jjt change ("as").



Index: PythonGrammar.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammar.java,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** PythonGrammar.java	2000/12/12 21:16:12	2.10
--- PythonGrammar.java	2000/12/12 21:23:17	2.11
***************
*** 45,48 ****
--- 45,49 ----
        case EXEC:
        case ASSERT:
+       case AS:
        case NAME:
        case DECNUMBER:
***************
*** 136,139 ****
--- 137,141 ----
          case EXEC:
[...1562 lines suppressed...]
    }
--- 6674,6678 ----
      jjtree.reset();
      jj_gen = 0;
!     for (int i = 0; i < 104; i++) jj_la1[i] = -1;
      for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
    }
***************
*** 6733,6737 ****
        jj_kind = -1;
      }
!     for (int i = 0; i < 103; i++) {
        if (jj_la1[i] == jj_gen) {
          for (int j = 0; j < 32; j++) {
--- 6789,6793 ----
        jj_kind = -1;
      }
!     for (int i = 0; i < 104; i++) {
        if (jj_la1[i] == jj_gen) {
          for (int j = 0; j < 32; j++) {

[Jython-checkins] CVS: jython/org/python/parser python.jjt,2.11,2.12

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

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

Modified Files:
	python.jjt 
Log Message:
Fix bug 125440 by making the "as" word a valid Name() node.



Index: python.jjt
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/python.jjt,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -r2.11 -r2.12
*** python.jjt	2000/12/12 21:09:34	2.11
--- python.jjt	2000/12/12 21:19:10	2.12
***************
*** 805,808 ****
--- 805,809 ----
  {
      t = <NAME> { jjtThis.setInfo(t.image); }
+ |   t = <AS> { jjtThis.setInfo(t.image); }
  }
  

[Jython-checkins] CVS: jython/org/python/parser PythonGrammar.java,2.9,2.10 PythonGrammarConstants.java,2.4,2.5 PythonGrammarTokenManager.java,2.8,2.9

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

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

Modified Files:
	PythonGrammar.java PythonGrammarConstants.java 
	PythonGrammarTokenManager.java 
Log Message:
Commit generated files for last python.jjt change.



Index: PythonGrammar.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammar.java,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** PythonGrammar.java	2000/10/18 13:03:10	2.9
--- PythonGrammar.java	2000/12/12 21:16:12	2.10
***************
*** 54,58 ****
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 109:
          simple_stmt();
          break;
--- 54,58 ----
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 113:
          simple_stmt();
          break;
***************
*** 145,149 ****
          case TRIPLE_STRING:
          case TRIPLE_STRING2:
!         case 109:
            ;
            break;
--- 145,149 ----
          case TRIPLE_STRING:
          case TRIPLE_STRING2:
!         case 113:
            ;
            break;
***************
*** 191,195 ****
          case TRIPLE_STRING:
          case TRIPLE_STRING2:
!         case 109:
            stmt();
            break;
--- 191,195 ----
          case TRIPLE_STRING:
          case TRIPLE_STRING2:
!         case 113:
            stmt();
            break;
***************
*** 637,641 ****
      case TRIPLE_STRING:
      case TRIPLE_STRING2:
!     case 109:
        simple_stmt();
        break;
--- 637,641 ----
      case TRIPLE_STRING:
      case TRIPLE_STRING2:
!     case 113:
        simple_stmt();
        break;
***************
*** 699,703 ****
      case TRIPLE_STRING:
      case TRIPLE_STRING2:
!     case 109:
        expr_stmt();
        break;
--- 699,703 ----
      case TRIPLE_STRING:
      case TRIPLE_STRING2:
!     case 113:
        expr_stmt();
        break;
***************
*** 1340,1344 ****
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 109:
          SmartTestList();
          break;
--- 1340,1344 ----
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 113:
          SmartTestList();
          break;
***************
*** 1396,1400 ****
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 109:
          test();
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
--- 1396,1400 ----
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 113:
          test();
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
***************
*** 2123,2127 ****
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 109:
          test();
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
--- 2123,2127 ----
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 113:
          test();
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
***************
*** 2199,2203 ****
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 109:
          simple_stmt();
          break;
--- 2199,2203 ----
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 113:
          simple_stmt();
          break;
***************
*** 2244,2248 ****
            case TRIPLE_STRING:
            case TRIPLE_STRING2:
!           case 109:
              ;
              break;
--- 2244,2248 ----
            case TRIPLE_STRING:
            case TRIPLE_STRING2:
!           case 113:
              ;
              break;
***************
*** 2303,2307 ****
      case TRIPLE_STRING:
      case TRIPLE_STRING2:
!     case 109:
        and_test();
        label_16:
--- 2303,2307 ----
      case TRIPLE_STRING:
      case TRIPLE_STRING2:
!     case 113:
        and_test();
        label_16:
***************
*** 2441,2445 ****
      case TRIPLE_STRING:
      case TRIPLE_STRING2:
!     case 109:
        comparison();
        break;
--- 2441,2445 ----
      case TRIPLE_STRING:
      case TRIPLE_STRING2:
!     case 113:
        comparison();
        break;
***************
*** 3178,3182 ****
      case TRIPLE_STRING:
      case TRIPLE_STRING2:
!     case 109:
        power();
        break;
--- 3178,3182 ----
      case TRIPLE_STRING:
      case TRIPLE_STRING2:
!     case 113:
        power();
        break;
***************
*** 3377,3381 ****
          case TRIPLE_STRING:
          case TRIPLE_STRING2:
!         case 109:
            SmartTestList();
            break;
--- 3377,3381 ----
          case TRIPLE_STRING:
          case TRIPLE_STRING2:
!         case 113:
            SmartTestList();
            break;
***************
*** 3411,3415 ****
            case TRIPLE_STRING:
            case TRIPLE_STRING2:
!           case 109:
              listmaker();
              break;
--- 3411,3415 ----
            case TRIPLE_STRING:
            case TRIPLE_STRING2:
!           case 113:
              listmaker();
              break;
***************
*** 3465,3469 ****
            case TRIPLE_STRING:
            case TRIPLE_STRING2:
!           case 109:
              dictmaker();
              break;
--- 3465,3469 ----
            case TRIPLE_STRING:
            case TRIPLE_STRING2:
!           case 113:
              dictmaker();
              break;
***************
*** 3494,3499 ****
          }
          break;
!       case 109:
!         jj_consume_token(109);
          SmartTestList();
                            SimpleNode jjtn004 = new SimpleNode(JJTSTR_1OP);
--- 3494,3499 ----
          }
          break;
!       case 113:
!         jj_consume_token(113);
          SmartTestList();
                            SimpleNode jjtn004 = new SimpleNode(JJTSTR_1OP);
***************
*** 3502,3506 ****
                            jjtreeOpenNodeScope(jjtn004);
          try {
!           jj_consume_token(109);
          } finally {
                            if (jjtc004) {
--- 3502,3506 ----
                            jjtreeOpenNodeScope(jjtn004);
          try {
!           jj_consume_token(113);
          } finally {
                            if (jjtc004) {
***************
*** 3701,3705 ****
      case TRIPLE_STRING:
      case TRIPLE_STRING2:
!     case 109:
        SimpleNode jjtn002 = new SimpleNode(JJTSLICE);
        boolean jjtc002 = true;
--- 3701,3705 ----
      case TRIPLE_STRING:
      case TRIPLE_STRING2:
!     case 113:
        SimpleNode jjtn002 = new SimpleNode(JJTSLICE);
        boolean jjtc002 = true;
***************
*** 3793,3797 ****
      case TRIPLE_STRING:
      case TRIPLE_STRING2:
!     case 109:
        test();
        break;
--- 3793,3797 ----
      case TRIPLE_STRING:
      case TRIPLE_STRING2:
!     case 113:
        test();
        break;
***************
*** 3821,3825 ****
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 109:
          test();
          break;
--- 3821,3825 ----
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 113:
          test();
          break;
***************
*** 4284,4288 ****
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 109:
          normalargs();
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
--- 4284,4288 ----
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 113:
          normalargs();
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
***************
*** 5424,5478 ****
    }
  
-   final private boolean jj_3R_40() {
-     Token xsp;
-     xsp = jj_scanpos;
-     if (jj_3R_61()) {
-     jj_scanpos = xsp;
-     if (jj_3R_62()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
-   final private boolean jj_3R_61() {
-     if (jj_3R_110()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
-   final private boolean jj_3_24() {
-     if (jj_3R_46()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     if (jj_scan_token(EQUAL)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
-   final private boolean jj_3R_45() {
-     Token xsp;
-     xsp = jj_scanpos;
-     if (jj_3_24()) jj_scanpos = xsp;
-     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     if (jj_3R_40()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
-   final private boolean jj_3_23() {
-     if (jj_scan_token(COMMA)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     if (jj_3R_45()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
-   final private boolean jj_3R_44() {
-     if (jj_scan_token(MULTIPLY)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     if (jj_3R_40()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
    final private boolean jj_3_22() {
      if (jj_3R_44()) return true;
--- 5424,5427 ----
***************
*** 5712,5716 ****
  
    final private boolean jj_3R_137() {
!     if (jj_scan_token(109)) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
--- 5661,5665 ----
  
    final private boolean jj_3R_137() {
!     if (jj_scan_token(113)) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
***************
*** 6543,6546 ****
--- 6492,6546 ----
    }
  
+   final private boolean jj_3R_40() {
+     Token xsp;
+     xsp = jj_scanpos;
+     if (jj_3R_61()) {
+     jj_scanpos = xsp;
+     if (jj_3R_62()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
+   final private boolean jj_3R_61() {
+     if (jj_3R_110()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
+   final private boolean jj_3_24() {
+     if (jj_3R_46()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     if (jj_scan_token(EQUAL)) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
+   final private boolean jj_3R_45() {
+     Token xsp;
+     xsp = jj_scanpos;
+     if (jj_3_24()) jj_scanpos = xsp;
+     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     if (jj_3R_40()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
+   final private boolean jj_3_23() {
+     if (jj_scan_token(COMMA)) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     if (jj_3R_45()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
+   final private boolean jj_3R_44() {
+     if (jj_scan_token(MULTIPLY)) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     if (jj_3R_40()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
    public PythonGrammarTokenManager token_source;
    ASCII_CharStream jj_input_stream;
***************
*** 6556,6560 ****
    final private int[] jj_la1_1 = {0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x90000008,0x0,0x90000008,0x80,0x3ff8000,0x0,0x0,0x0,0x0,0x0,0x90000008,0x0,0x0,0x90000008,0x0,0x0,0x0,0xfc000000,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x4000000,0x90000008,0x8000000,0x10000008,0x70007f00,0x50007f00,0x20000000,0x20,0x10,0x40,0x3,0x3,0x0,0x0,0x4,0x4,0x8,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfc000008,0x0,0x0,0x0,0xfc000000,};
    final private int[] jj_la1_2 = {0x1ebffdb9,0x1ebffdb9,0x1ebffdb9,0x0,0x800000,0x0,0x0,0x0,0x800000,0x0,0x0,0x800000,0x0,0x1ebffdb9,0x0,0x1ebffc00,0x0,0x0,0x0,0x0,0x0,0x400,0x47000,0x1e800000,0x0,0x0,0x1e800000,0x18000,0x0,0x0,0xffffff,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x1b9,0x4,0x2,0x2,0x2,0x40,0x2,0x240,0x0,0x1e800000,0x1ebffdb9,0x1ebffc00,0x0,0x1e800000,0x0,0x1e800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e800000,0x0,0x0,0x0,0x1e800000,0x1e800000,0x1e800000,0x0,0x1e800000,0x800000,0x0,0x0,0x1e800000,0x1e800000,0x1e800000,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x11,0x11,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1effffff,0x0,0x1e000000,0x0,0xffffff,};
!   final private int[] jj_la1_3 = {0x2078,0x2078,0x2078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2078,0x0,0x2078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2078,0x0,0x0,0x2078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2078,0x2078,0x2078,0x0,0x2078,0x0,0x2078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2078,0x0,0x0,0x0,0x2078,0x2078,0x2078,0x78,0x2078,0x0,0x0,0x0,0x2078,0x2078,0x2078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2078,0x0,0x0,0x78,0x0,};
    final private JJCalls[] jj_2_rtns = new JJCalls[24];
    private boolean jj_rescan = false;
--- 6556,6560 ----
    final private int[] jj_la1_1 = {0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x90000008,0x0,0x90000008,0x80,0x3ff8000,0x0,0x0,0x0,0x0,0x0,0x90000008,0x0,0x0,0x90000008,0x0,0x0,0x0,0xfc000000,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x4000000,0x90000008,0x8000000,0x10000008,0x70007f00,0x50007f00,0x20000000,0x20,0x10,0x40,0x3,0x3,0x0,0x0,0x4,0x4,0x8,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfc000008,0x0,0x0,0x0,0xfc000000,};
    final private int[] jj_la1_2 = {0x1ebffdb9,0x1ebffdb9,0x1ebffdb9,0x0,0x800000,0x0,0x0,0x0,0x800000,0x0,0x0,0x800000,0x0,0x1ebffdb9,0x0,0x1ebffc00,0x0,0x0,0x0,0x0,0x0,0x400,0x47000,0x1e800000,0x0,0x0,0x1e800000,0x18000,0x0,0x0,0xffffff,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x1b9,0x4,0x2,0x2,0x2,0x40,0x2,0x240,0x0,0x1e800000,0x1ebffdb9,0x1ebffc00,0x0,0x1e800000,0x0,0x1e800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e800000,0x0,0x0,0x0,0x1e800000,0x1e800000,0x1e800000,0x0,0x1e800000,0x800000,0x0,0x0,0x1e800000,0x1e800000,0x1e800000,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x11,0x11,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1effffff,0x0,0x1e000000,0x0,0xffffff,};
!   final private int[] jj_la1_3 = {0x20078,0x20078,0x20078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20078,0x0,0x20078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20078,0x0,0x0,0x20078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20078,0x20078,0x20078,0x0,0x20078,0x0,0x20078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20078,0x0,0x0,0x0,0x20078,0x20078,0x20078,0x78,0x20078,0x0,0x0,0x0,0x20078,0x20078,0x20078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20078,0x0,0x0,0x78,0x0,};
    final private JJCalls[] jj_2_rtns = new JJCalls[24];
    private boolean jj_rescan = false;
***************
*** 6725,6730 ****
    final public ParseException generateParseException() {
      jj_expentries.removeAllElements();
!     boolean[] la1tokens = new boolean[110];
!     for (int i = 0; i < 110; i++) {
        la1tokens[i] = false;
      }
--- 6725,6730 ----
    final public ParseException generateParseException() {
      jj_expentries.removeAllElements();
!     boolean[] la1tokens = new boolean[114];
!     for (int i = 0; i < 114; i++) {
        la1tokens[i] = false;
      }
***************
*** 6751,6755 ****
        }
      }
!     for (int i = 0; i < 110; i++) {
        if (la1tokens[i]) {
          jj_expentry = new int[1];
--- 6751,6755 ----
        }
      }
!     for (int i = 0; i < 114; i++) {
        if (la1tokens[i]) {
          jj_expentry = new int[1];

Index: PythonGrammarConstants.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarConstants.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -r2.4 -r2.5
*** PythonGrammarConstants.java	2000/10/10 14:30:45	2.4
--- PythonGrammarConstants.java	2000/12/12 21:16:12	2.5
***************
*** 214,223 ****
      "\"\\\'\\\'\\\'\"",
      "\"\\\"\\\"\\\"\"",
!     "<token of kind 103>",
      "<token of kind 104>",
      "\"\\\\\\\'\\\'\\\'\"",
      "\"\\\\\\\"\\\"\\\"\"",
!     "<token of kind 107>",
!     "<token of kind 108>",
      "\"`\"",
    };
--- 214,227 ----
      "\"\\\'\\\'\\\'\"",
      "\"\\\"\\\"\\\"\"",
!     "\"\\\\\\r\\n\"",
      "<token of kind 104>",
+     "<token of kind 105>",
+     "<token of kind 106>",
      "\"\\\\\\\'\\\'\\\'\"",
      "\"\\\\\\\"\\\"\\\"\"",
!     "\"\\r\\n\"",
!     "\"\\n\"",
!     "\"\\r\"",
!     "<token of kind 112>",
      "\"`\"",
    };

Index: PythonGrammarTokenManager.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarTokenManager.java,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** PythonGrammarTokenManager.java	2000/10/13 19:29:58	2.8
--- PythonGrammarTokenManager.java	2000/12/12 21:16:12	2.9
***************
*** 52,67 ****
     {
        case 0:
!          if ((active1 & 0x44000000000L) != 0L)
           {
!             jjmatchedKind = 108;
              return -1;
           }
           return -1;
        case 1:
!          if ((active1 & 0x44000000000L) != 0L)
[...1068 lines suppressed...]
+             image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+          else
+             image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+     matchedToken.image = image.toString();
+          break;
+       case 101 :
+         if (image == null)
+             image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+          else
+             image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+     matchedToken.image = image.toString();
+          break;
+       case 102 :
+         if (image == null)
+             image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+          else
+             image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+     matchedToken.image = image.toString();
           break;
        default : 

[Jython-checkins] CVS: jython/org/python/parser python.jjt,2.10,2.11

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

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

Modified Files:
	python.jjt 
Log Message:
Fix a bug with \ quoted newlines and CRLF in TQS.



Index: python.jjt
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/python.jjt,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** python.jjt	2000/10/18 13:01:10	2.10
--- python.jjt	2000/12/12 21:09:34	2.11
***************
*** 341,356 ****
  }
  
! <IN_STRING11> TOKEN : { <SINGLE_STRING: "'"> : DEFAULT}
! <IN_STRING21> TOKEN : { <SINGLE_STRING2: "\""> : DEFAULT}
! <IN_STRING13> TOKEN : { <TRIPLE_STRING: "'''"> : DEFAULT}
! <IN_STRING23> TOKEN : { <TRIPLE_STRING2: "\"\"\""> :DEFAULT }
  
! <IN_STRING11> MORE: { <("\\" ("\\"|"'"|"\r\n"|"\n"|"\r")) | ~["\n","\r"]> }
! <IN_STRING21> MORE: { <("\\" ("\\"|"\""|"\r\n"|"\n"|"\r")) | ~["\n","\r"]> }
  <IN_STRING13> MORE: { "\\'''" }
  <IN_STRING23> MORE: { "\\\"\"\"" }
  
  <IN_STRING13, IN_STRING23> MORE:
! { <"\r\n"|"\n"|"\r">  | <~["\n","\r"]> }
  
  
--- 341,375 ----
  }
  
! <IN_STRING11> TOKEN : { <SINGLE_STRING: "'"> {
!     matchedToken.image = image.toString(); } : DEFAULT}
! <IN_STRING21> TOKEN : { <SINGLE_STRING2: "\""> {
!     matchedToken.image = image.toString(); } : DEFAULT}
! <IN_STRING13> TOKEN : { <TRIPLE_STRING: "'''"> {
!     matchedToken.image = image.toString(); } : DEFAULT}
! <IN_STRING23> TOKEN : { <TRIPLE_STRING2: "\"\"\""> { 
!     matchedToken.image = image.toString(); } : DEFAULT}
  
! <IN_STRING11,IN_STRING21> MORE: 
! {
!     <"\\\r\n">           { image.setLength(image.length()-3); }
! |   <("\\" ("\n"|"\r"))> { image.setLength(image.length()-2); }
! }
! 
! <IN_STRING11> MORE: { <("\\" ("\\"|"'")) | ~["\n","\r"]> }
! <IN_STRING21> MORE: { <("\\" ("\\"|"\"")) | ~["\n","\r"]> }
  <IN_STRING13> MORE: { "\\'''" }
  <IN_STRING23> MORE: { "\\\"\"\"" }
  
  <IN_STRING13, IN_STRING23> MORE:
! {
!     <"\r\n"> {
!         int l = image.length(); 
!         image.setLength(l-1);
!         image.setCharAt(l-2, '\n');
!     } 
! |   <"\n">
! |   <"\r"> { image.setCharAt(image.length()-1, '\n'); }
! |   <~["\n","\r"]> 
! }
  
  

[Jython-checkins] CVS: jython/org/python/util PythonObjectInputStream.java,1.5,1.6

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

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

Modified Files:
	PythonObjectInputStream.java 
Log Message:
Use the __builtin__.__import__() API.



Index: PythonObjectInputStream.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/util/PythonObjectInputStream.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** PythonObjectInputStream.java	2000/11/29 19:39:27	1.5
--- PythonObjectInputStream.java	2000/12/11 18:57:03	1.6
***************
*** 49,75 ****
  
      private static PyObject importModule(String name) {
-         PyFrame frame = Py.getFrame();
-         if (frame == null)
-             return null;
-         PyObject globals = frame.f_globals;
- 
-         PyObject builtins = frame.f_builtins;
-         if (builtins == null)
-             builtins = Py.getSystemState().builtins;
- 
          PyObject silly_list = new PyTuple(new PyString[] { 
              Py.newString("__doc__"),
          });
! 
!         PyObject __import__ = builtins.__finditem__("__import__");
!         if (__import__ == null)
!             return null;
! 
!         PyObject module = __import__.__call__(new PyObject[] {
!                 Py.newString(name),
!                 globals,
!                 globals,
!                 silly_list } );
!         return module;
      }
  }
--- 49,56 ----
  
      private static PyObject importModule(String name) {
          PyObject silly_list = new PyTuple(new PyString[] { 
              Py.newString("__doc__"),
          });
!         return __builtin__.__import__(name, null, null, silly_list);
      }
  }

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

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

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

Modified Files:
	PythonInterpreter.java 
Log Message:
PythonInterpreter(): Moved the PySystemState.initialize() call to the 
start. This will later become a requirement that initialize() is
called before any jython object are created. This change will cover
the most common case.



Index: PythonInterpreter.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/util/PythonInterpreter.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -r2.4 -r2.5
*** PythonInterpreter.java	2000/09/29 09:02:35	2.4
--- PythonInterpreter.java	2000/12/11 18:56:34	2.5
***************
*** 38,41 ****
--- 38,42 ----
      
      public PythonInterpreter(PyObject dict, PySystemState systemState) {
+         PySystemState.initialize();
          if (dict == null)
              dict = new PyStringMap();
***************
*** 45,49 ****
                  systemState = new PySystemState();
          }
-         PySystemState.initialize();
          module = new PyModule("main", dict);
          this.systemState = systemState;
--- 46,49 ----

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

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

Update of /cvsroot/jython/htdocs
In directory slayer.i.sourceforge.net:/tmp/cvs-serv32328

Modified Files:
	install.ht 
Log Message:
Better description of the situation where jython is installed using
the JRE instead of the JDK.



Index: install.ht
===================================================================
RCS file: /cvsroot/jython/htdocs/install.ht,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** install.ht	2000/11/26 19:08:06	1.3
--- install.ht	2000/12/11 18:54:30	1.4
***************
*** 36,40 ****
  </BLOCKQUOTE>
  
! <P>Which command to use depends on your operating system and java version.
  
  <P>If you do not have a GUI, then add <tt>-o dir_to_install_to</tt> to the 
--- 36,46 ----
  </BLOCKQUOTE>
  
! <P>Which command to use depends on your operating system and java version. 
! If you have more than one java installed, you may have to supply an explicit 
! path the java command. When installing the JDK 1.2 from javasoft, the 
! default is it install both the JDK and a plugin JRE. The plugin JRE is added
! to your PATH, so running the <tt>java jython-20a</tt> command will make jython
! use the JRE. Specify the full path if you want to use JDK instead, ie:
! <tt>c:\Programs\JDK1.2\bin\java -cp . jython-20a1</tt>.
  
  <P>If you do not have a GUI, then add <tt>-o dir_to_install_to</tt> to the 

[Jython-checkins] CVS: htdocs graphics.ht,1.1,1.2

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

Update of /cvsroot/jython/htdocs
In directory slayer.i.sourceforge.net:/tmp/cvs-serv32175

Modified Files:
	graphics.ht 
Log Message:
Added R. Lonstein's image



Index: graphics.ht
===================================================================
RCS file: /cvsroot/jython/htdocs/graphics.ht,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** graphics.ht	2000/11/24 17:10:19	1.1
--- graphics.ht	2000/12/11 18:53:11	1.2
***************
*** 34,37 ****
--- 34,46 ----
    <td><a href="graphics/sample01.html">sample page</a></td>
  </tr>
+ 
+ <tr>
+   <td><hr><font size=+1>R. Lonstein</font></td>
+ </tr>
+ <tr>
+   <td><image src="graphics/small02.gif"></td>
+   <td></td>
+   <td></td>
+ </tr>
  </table>
  

[Jython-checkins] CVS: jython/Demo/javaclasses readme.txt,1.6,1.7

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

Update of /cvsroot/jython/jython/Demo/javaclasses
In directory slayer.i.sourceforge.net:/tmp/cvs-serv32011

Modified Files:
	readme.txt 
Log Message:
Updated to sue the modern --package option.



Index: readme.txt
===================================================================
RCS file: /cvsroot/jython/jython/Demo/javaclasses/readme.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** readme.txt	2000/12/04 21:30:39	1.6
--- readme.txt	2000/12/11 18:52:27	1.7
***************
*** 11,15 ****
     This is just to make sure the Jython code works on your machine
  
! 2. run "jythonc -package pygraph Graph.py" in this directory
  
     This should produce the Java class pygraph.Graph.  Because this is
--- 11,15 ----
     This is just to make sure the Jython code works on your machine
  
! 2. run "jythonc --package pygraph Graph.py" in this directory
  
     This should produce the Java class pygraph.Graph.  Because this is

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

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

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

Modified Files:
	Setup.java 
Log Message:
Make sre the default re module. The ORO re is renamed to pre.



Index: Setup.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/Setup.java,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -r2.11 -r2.12
*** Setup.java	2000/12/04 21:56:20	2.11
--- Setup.java	2000/12/11 18:47:53	2.12
***************
*** 35,39 ****
          "py_compile",
          "codeop",
!         "re",
          "_sre",
          "code",
--- 35,39 ----
          "py_compile",
          "codeop",
!         "pre:org.python.modules.re",
          "_sre",
          "code",