Jython

Revision: 4978
          http://jython.svn.sourceforge.net/jython/?rev=4978&view=rev
Author:   pjenvey
Date:     2008-07-21 01:59:47 +0000 (Mon, 21 Jul 2008)

Log Message:
-----------
fix __finditem__(int) not trying subclasses' __getitem__ if the parent overrode
it (like PySequence does)

Modified Paths:
--------------
    trunk/jython/src/org/python/core/PyArrayDerived.java
    trunk/jython/src/org/python/core/PyBooleanDerived.java
    trunk/jython/src/org/python/core/PyClassMethodDerived.java
    trunk/jython/src/org/python/core/PyComplexDerived.java
    trunk/jython/src/org/python/core/PyDictionaryDerived.java
    trunk/jython/src/org/python/core/PyEnumerateDerived.java
    trunk/jython/src/org/python/core/PyFileDerived.java
    trunk/jython/src/org/python/core/PyFloatDerived.java
    trunk/jython/src/org/python/core/PyFrozenSetDerived.java
    trunk/jython/src/org/python/core/PyIntegerDerived.java
    trunk/jython/src/org/python/core/PyListDerived.java
    trunk/jython/src/org/python/core/PyLongDerived.java
    trunk/jython/src/org/python/core/PyModuleDerived.java
    trunk/jython/src/org/python/core/PyObjectDerived.java
    trunk/jython/src/org/python/core/PyPropertyDerived.java
    trunk/jython/src/org/python/core/PySetDerived.java
    trunk/jython/src/org/python/core/PySliceDerived.java
    trunk/jython/src/org/python/core/PyStringDerived.java
    trunk/jython/src/org/python/core/PySuperDerived.java
    trunk/jython/src/org/python/core/PyTupleDerived.java
    trunk/jython/src/org/python/core/PyTypeDerived.java
    trunk/jython/src/org/python/core/PyUnicodeDerived.java
    trunk/jython/src/org/python/modules/_weakref/ReferenceTypeDerived.java
    trunk/jython/src/org/python/modules/collections/PyDefaultDictDerived.java
    trunk/jython/src/org/python/modules/collections/PyDequeDerived.java
    trunk/jython/src/org/python/modules/random/PyRandomDerived.java
    trunk/jython/src/org/python/modules/thread/PyLocalDerived.java
    trunk/jython/src/org/python/modules/zipimport/zipimporterDerived.java
    trunk/jython/src/templates/object.derived

Added Paths:
-----------
    trunk/jython/Lib/test/test_iter_jy.py

Added: trunk/jython/Lib/test/test_iter_jy.py
===================================================================
--- trunk/jython/Lib/test/test_iter_jy.py	                        (rev 0)
+++ trunk/jython/Lib/test/test_iter_jy.py	2008-07-21 01:59:47 UTC (rev 4978)
@@ -0,0 +1,32 @@
+"""Misc iterator tests.
+
+Made for Jython.
+"""
+import test_support
+import unittest
+
+class IterTestCase(unittest.TestCase):
+
+    def test_fastiter(self):
+        class MyList(list):
+            def __getitem__(self, index):
+                return str(index) + '!'
+        class MyTuple(tuple):
+            def __getitem__(self, index):
+                return str(index) + '!'
+        self.assertEqual(iter(MyList(['a', 'b'])).next(), 'a')
+        self.assertEqual(iter(MyTuple(['a', 'b'])).next(), 'a')
+
+    def test_slowiter(self):
+        class MyStr(str):
+            def __getitem__(self, index):
+                return str(index) + '!'
+        self.assertEqual(iter(MyStr('ab')).next(), '0!')
+
+
+def test_main():
+    test_support.run_unittest(IterTestCase)
+
+
+if __name__ == '__main__':
+    test_main()

Modified: trunk/jython/src/org/python/core/PyArrayDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyArrayDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyArrayDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyBooleanDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyBooleanDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyBooleanDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyClassMethodDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyClassMethodDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyClassMethodDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyComplexDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyComplexDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyComplexDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyDictionaryDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyDictionaryDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyDictionaryDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyEnumerateDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyEnumerateDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyEnumerateDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyFileDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyFileDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyFileDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyFloatDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyFloatDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyFloatDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyFrozenSetDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyFrozenSetDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyFrozenSetDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyIntegerDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyIntegerDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyIntegerDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyListDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyListDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyListDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyLongDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyLongDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyLongDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyModuleDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyModuleDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyModuleDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -767,6 +767,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyObjectDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyObjectDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyObjectDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyPropertyDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyPropertyDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyPropertyDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PySetDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PySetDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PySetDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PySliceDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PySliceDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PySliceDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyStringDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyStringDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyStringDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PySuperDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PySuperDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PySuperDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyTupleDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyTupleDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyTupleDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyTypeDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyTypeDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyTypeDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -767,6 +767,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/core/PyUnicodeDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyUnicodeDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/core/PyUnicodeDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -791,6 +791,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/modules/_weakref/ReferenceTypeDerived.java
===================================================================
--- trunk/jython/src/org/python/modules/_weakref/ReferenceTypeDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/modules/_weakref/ReferenceTypeDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -793,6 +793,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/modules/collections/PyDefaultDictDerived.java
===================================================================
--- trunk/jython/src/org/python/modules/collections/PyDefaultDictDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/modules/collections/PyDefaultDictDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -793,6 +793,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/modules/collections/PyDequeDerived.java
===================================================================
--- trunk/jython/src/org/python/modules/collections/PyDequeDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/modules/collections/PyDequeDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -793,6 +793,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/modules/random/PyRandomDerived.java
===================================================================
--- trunk/jython/src/org/python/modules/random/PyRandomDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/modules/random/PyRandomDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -793,6 +793,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/modules/thread/PyLocalDerived.java
===================================================================
--- trunk/jython/src/org/python/modules/thread/PyLocalDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/modules/thread/PyLocalDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -769,6 +769,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/org/python/modules/zipimport/zipimporterDerived.java
===================================================================
--- trunk/jython/src/org/python/modules/zipimport/zipimporterDerived.java	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/org/python/modules/zipimport/zipimporterDerived.java	2008-07-21 01:59:47 UTC (rev 4978)
@@ -769,6 +769,20 @@
         return super.__finditem__(key);
     }
 
+    public PyObject __finditem__(int key) {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(new PyInteger(key));
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__finditem__(key);
+    }
+
     public PyObject __getitem__(PyObject key) {
         // Same as __finditem__, without swallowing LookupErrors. This allows
         // __getitem__ implementations written in Python to raise custom

Modified: trunk/jython/src/templates/object.derived
===================================================================
--- trunk/jython/src/templates/object.derived	2008-07-21 01:43:14 UTC (rev 4977)
+++ trunk/jython/src/templates/object.derived	2008-07-21 01:59:47 UTC (rev 4978)
@@ -179,6 +179,20 @@
     return super.__finditem__(key);
   }
 
+  public PyObject __finditem__(int key) {
+    PyType self_type = getType();
+    PyObject impl = self_type.lookup("__getitem__");
+    if (impl != null)
+      try {
+        return impl.__get__(this,self_type).__call__(new PyInteger(key));  
+      } catch (PyException exc) {
+        if (Py.matchException(exc, Py.LookupError))
+          return null;
+        throw exc;
+      }
+    return super.__finditem__(key);
+  }
+
   public PyObject __getitem__(PyObject key) {
     // Same as __finditem__, without swallowing LookupErrors. This allows
     // __getitem__ implementations written in Python to raise custom


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5206
          http://jython.svn.sourceforge.net/jython/?rev=5206&view=rev
Author:   fwierzbicki
Date:     2008-08-19 21:06:39 +0000 (Tue, 19 Aug 2008)

Log Message:
-----------
Merged revisions 4386,4388-4390,4392,4403,4405,4408,4418,4424-4425,4434,4466,4474,4490,4493,4496,4499-4501,4504,4523-4524,4548-4549,4577-4579,4581-4582,4585-4589,4599-4600,4603-4605,4607-4608,4613,4628,4640,4642-4643,4648,4652-4662,4665,4667,4672,4676,4678-4680,4682,4684,4693-4695,4704-4706,4708-4712,4714-4715,4720,4729,4732-4735,4740-4751,4753-4758,4761-4765,4767-4772,4774,4777-4779,4781-4802,4806-4810,4821-4843,4845-4850,4852-4853,4855-4857,4859,4863-4870,4876-4885,4887-4897,4901-4914,4916-4919,4922,4924-4925,4928,4930,4932-4937,4939-4945,4947,4949-4952,4959,4961,4963,4965,4967-4971,4973-4974,4980,4982-5100,5102-5117,5119-5166,5168-5197 via svnmerge from 
https://jython.svn.sourceforge.net/svnroot/jython/branches/asm

........
  r4386 | fwierzbicki | 2008-05-08 14:55:44 -0400 (Thu, 08 May 2008) | 2 lines
  
  Recreate asmified old compiler.
........
  r4388 | fwierzbicki | 2008-05-10 13:19:27 -0400 (Sat, 10 May 2008) | 3 lines
  
  Hand merged changes in trunk to copiler code.  Removed Attribute support --
  needs to be replaced by either ASM Attributes or Annotations.
........
  r4389 | fwierzbicki | 2008-05-12 13:48:35 -0400 (Mon, 12 May 2008) | 4 lines
  
  Reworked Code.java back towards old API (so methods like code.dup() are back
  so it is not necessary to use code.visitInsn(DUP).  This makes it easier to
  read the code and to compare with the old code base.
........
  r4390 | fwierzbicki | 2008-05-12 22:00:02 -0400 (Mon, 12 May 2008) | 2 lines
  
  Converted everything over to antlr from javacc.
........
  r4392 | fwierzbicki | 2008-05-13 15:38:04 -0400 (Tue, 13 May 2008) | 3 lines
  
  Moved more code to older style Code.java methods (still based on ASM).
  Added Visitor and ParseException.
........
  r4403 | fwierzbicki | 2008-05-15 12:39:30 -0400 (Thu, 15 May 2008) | 2 lines
  
  Enough compiler and parser tweaking to keep site.py from exploding.
........
  r4405 | fwierzbicki | 2008-05-15 15:18:26 -0400 (Thu, 15 May 2008) | 2 lines
  
  Fix for "from mod import *" and start of setline support.
........
  r4408 | fwierzbicki | 2008-05-15 19:29:22 -0400 (Thu, 15 May 2008) | 2 lines
  
  Temporary fix for line number problems causing NPEs.
........
  r4418 | fwierzbicki | 2008-05-17 12:20:34 -0400 (Sat, 17 May 2008) | 2 lines
  
  Remove old parser.
........
  r4424 | fwierzbicki | 2008-05-20 13:39:32 -0400 (Tue, 20 May 2008) | 4 lines
  
  Added a shell script to run Jython.  This was adapted from a script from the JRuby project.
  I also included the same suport for The Java Interactive Profiler (JIP) that JRuby includes.
  See http://jiprof.sourceforge.net/
........
  r4425 | fwierzbicki | 2008-05-20 13:50:01 -0400 (Tue, 20 May 2008) | 2 lines
  
  Alter profile.properties for Jython.
........
  r4434 | pjenvey | 2008-05-20 17:11:36 -0400 (Tue, 20 May 2008) | 1 line
  
  missed one part of the PyMethod constructor signature change in r4400, from trunk
........
  r4466 | fwierzbicki | 2008-05-27 22:05:18 -0400 (Tue, 27 May 2008) | 12 lines
  
  Now that things are close to working, time to completely
  destroy things again.  Switched to pulling in 2.5 Python
  libraries.  Took first baby step by attempting to support
  
  def f():
      yield
  
  which is not valid 2.3 syntax.  (This is actually what
  motivated this -- I was about to "fix" the grammar to
  disallow this when I accidentally noticed that it was
  valid 2.5 syntax.
........
  r4474 | fwierzbicki | 2008-05-29 15:34:22 -0400 (Thu, 29 May 2008) | 2 lines
  
  First stab at decorator support.
........
  r4490 | fwierzbicki | 2008-05-30 11:19:42 -0400 (Fri, 30 May 2008) | 15 lines
  
  Begin experimenting with a partial parser -- that is a recognizer
  that will be able to tell if a string of code from an interactive
  session is a true syntax error, or if it is part of a potentially
  valid string of code.  For example, in the interactive session:
  
  >>> s = """
  ... hello
  
  Is the start of a valid string, and should be recognized as a 
  valid partial parse.  On the other hand
  
  >>> print ,
  
  Is still a syntax error.
........
  r4493 | nriley | 2008-06-01 15:50:00 -0400 (Sun, 01 Jun 2008) | 1 line
  
  add ImportWarning; update exceptions class doc to 2.5
........
  r4496 | fwierzbicki | 2008-06-01 20:11:03 -0400 (Sun, 01 Jun 2008) | 2 lines
  
  Need to see exception print outs.
........
  r4499 | fwierzbicki | 2008-06-01 21:03:08 -0400 (Sun, 01 Jun 2008) | 2 lines
  
  Switched to 2.4 CPython lib.
........
  r4500 | nriley | 2008-06-01 21:59:37 -0400 (Sun, 01 Jun 2008) | 1 line
  
  startswith/endswith on str/unicode, passes test_str from 2.5
........
  r4501 | nriley | 2008-06-01 22:34:18 -0400 (Sun, 01 Jun 2008) | 1 line
  
  TypeError rather than NotImplemented for wrong type on str.__mul__, fixes test_mul
........
  r4504 | nriley | 2008-06-01 23:55:14 -0400 (Sun, 01 Jun 2008) | 1 line
  
  r4500 broke http://pylonshq.com/pasties/827, reverting
........
  r4523 | fwierzbicki | 2008-06-03 02:39:41 -0400 (Tue, 03 Jun 2008) | 6 lines
  
  Most of this change is generated -- the real code changes
  are in Python.g, PythonWalker.g, and asdl_antlr.py.
  
  Moving to antlr 3.1 style of AST production.  Changed the
  Num processing only so far.
........
  r4524 | fwierzbicki | 2008-06-03 10:47:46 -0400 (Tue, 03 Jun 2008) | 6 lines
  
  Moved Str processing from PythonWalker.g to Python.g.  Made Unicode and Str
  hold PyUnicode and PyString objects instead of java.lang.String objects.
  This will help compatibility with CPython AST -- though *may* hurt performance
  more investigation will be needed.  Certainly the way CodeCompiler is working
  will need adjustment if this strategy is the way to go.
........
  r4548 | nriley | 2008-06-06 16:48:42 -0400 (Fri, 06 Jun 2008) | 1 line
  
  sync sre opcodes with Python 2.4; implement SRE_OP_GROUPREF_EXISTS
........
  r4549 | nriley | 2008-06-06 17:12:40 -0400 (Fri, 06 Jun 2008) | 1 line
  
  fix comment typo
........
  r4577 | nriley | 2008-06-08 22:14:13 -0400 (Sun, 08 Jun 2008) | 1 line
  
  Jython-specific test_cmd_line
........
  r4578 | fwierzbicki | 2008-06-08 22:34:43 -0400 (Sun, 08 Jun 2008) | 2 lines
  
  Generator Expressions.
........
  r4579 | nriley | 2008-06-08 22:39:10 -0400 (Sun, 08 Jun 2008) | 1 line
  
  fix regrtest ant target dependencies so it works from clean
........
  r4581 | fwierzbicki | 2008-06-08 22:58:09 -0400 (Sun, 08 Jun 2008) | 3 lines
  
  Better name for comprehension local var (comp instead of lc -- originally
  stolen from the list comprehension code).
........
  r4582 | nriley | 2008-06-08 23:09:46 -0400 (Sun, 08 Jun 2008) | 1 line
  
  cookielib works now
........
  r4585 | fwierzbicki | 2008-06-09 09:06:46 -0400 (Mon, 09 Jun 2008) | 2 lines
  
  Conditional Expression
........
  r4586 | fwierzbicki | 2008-06-09 10:10:41 -0400 (Mon, 09 Jun 2008) | 3 lines
  
  switch to _(1_1) style names for the temporaries of gen expressions, so that vars
  with unlikely but possible names like __gen1_1 do not get clobbered.
........
  r4587 | nriley | 2008-06-09 17:19:49 -0400 (Mon, 09 Jun 2008) | 1 line
  
  provenance of test_cmd_line
........
  r4588 | fwierzbicki | 2008-06-09 22:29:18 -0400 (Mon, 09 Jun 2008) | 2 lines
  
  Remove unnecessary vars.
........
  r4589 | fwierzbicki | 2008-06-10 07:40:31 -0400 (Tue, 10 Jun 2008) | 2 lines
  
  Remove comment that I no longer believe :)
........
  r4599 | fwierzbicki | 2008-06-11 17:26:33 -0400 (Wed, 11 Jun 2008) | 6 lines
  
  Make ParseException the only exception that comes out of the antlr
  parsing.  Unfortunately I haven't figured out how to remove
  "throws RecognitionException" from the generated code, so some
  references remain.  Also renamed PythonGrammer -> ModuleParser, and
  some other related refactorings.
........
  r4600 | fwierzbicki | 2008-06-11 17:40:36 -0400 (Wed, 11 Jun 2008) | 2 lines
  
  More  descriptive name antlr.java -> ParserFacade.java
........
  r4603 | fwierzbicki | 2008-06-11 21:34:06 -0400 (Wed, 11 Jun 2008) | 4 lines
  
  Added a null guard for lexing errors (they have no token) and added an
  experimental getOffset() method on ParseException which intends to get
  the char position from the start of the file where the error occured.
........
  r4604 | fwierzbicki | 2008-06-11 21:38:05 -0400 (Wed, 11 Jun 2008) | 2 lines
  
  Crap, left in debugging.  Removed.
........
  r4605 | fwierzbicki | 2008-06-11 22:14:26 -0400 (Wed, 11 Jun 2008) | 2 lines
  
  Fix offset for lexer errors.
........
  r4607 | fwierzbicki | 2008-06-12 11:27:35 -0400 (Thu, 12 Jun 2008) | 2 lines
  
  oops, wrong directory position.
........
  r4608 | fwierzbicki | 2008-06-12 17:08:38 -0400 (Thu, 12 Jun 2008) | 5 lines
  
  pep 263.  There is some roughness remaining, especially a strange
  problem around utf-8 that I need to look into (I ended up letting
  Jython go with its default in the case of a utf-8 encoding
  specified for now).
........
  r4613 | fwierzbicki | 2008-06-13 13:33:31 -0400 (Fri, 13 Jun 2008) | 4 lines
  
  Add a token source for partial parsing (for now -- can probably become
  a subclass of PythonTokenSource once the kinks are out).  Unterminated
  triple strings now pass.
........
  r4628 | zyasoft | 2008-06-14 19:23:52 -0400 (Sat, 14 Jun 2008) | 1 line
  
  Added visitWith to support the with-statement. Changed ClassFile so that it does frame analysis with COMPUTE_FRAMES (used by Java 6, seems OK with Java 5 - and prevents code from being compiled that would fail bytecode verifier. Generally that would be a good thing. Fixed threading.Lock.__enter__ so it returns the lock object, not just do an acquire.
........
  r4640 | zyasoft | 2008-06-15 01:13:59 -0400 (Sun, 15 Jun 2008) | 1 line
  
  Changed Code.ldc such that for large string constants (>32767 char), it splits into chunked ldcsand assembles with a StringBuilder
........
  r4642 | nriley | 2008-06-15 17:45:22 -0400 (Sun, 15 Jun 2008) | 1 line
  
  jna-posix from http://svn.codehaus.org/jruby-contrib/trunk/jna-posix r179
........
  r4643 | nriley | 2008-06-15 18:04:11 -0400 (Sun, 15 Jun 2008) | 1 line
  
  os.stat, chmod, getegid, geteuid, getgid, getlogin, getpgrp, getpid, getppid, getuid, setpgrp, setsid via jna-posix
........
  r4648 | nriley | 2008-06-16 01:23:39 -0400 (Mon, 16 Jun 2008) | 1 line
  
  enable test_posix
........
  r4652 | fwierzbicki | 2008-06-16 15:23:38 -0400 (Mon, 16 Jun 2008) | 3 lines
  
  Extrated PythonTreeAdaptor from the *Parser classes, some
  work to improve offsets.
........
  r4653 | zyasoft | 2008-06-16 15:51:12 -0400 (Mon, 16 Jun 2008) | 1 line
  
  Now supports coroutines. At this point, I have only done limited testing, especially with respect to exceptions.
........
  r4654 | fwierzbicki | 2008-06-16 16:35:50 -0400 (Mon, 16 Jun 2008) | 2 lines
  
  More offset work for IDE support.
........
  r4655 | zyasoft | 2008-06-16 18:54:40 -0400 (Mon, 16 Jun 2008) | 1 line
  
  Reordered public members of PyGenerator so that dir will have the same order as CPython
........
  r4656 | fwierzbicki | 2008-06-16 19:11:25 -0400 (Mon, 16 Jun 2008) | 2 lines
  
  Move some imaginary tokens to concrete tokens.
........
  r4657 | zyasoft | 2008-06-16 20:21:52 -0400 (Mon, 16 Jun 2008) | 1 line
  
  Added support of __future__.with_statement; this includes aligning PyTableCode with __future__.py as of 2.5. Does not yet support interactive future import of the with_statement, however
........
  r4658 | fwierzbicki | 2008-06-16 20:26:20 -0400 (Mon, 16 Jun 2008) | 3 lines
  
  pass statement turned to concrete token.  Also preparing to absorb more
  of PythonWalker.g into Python.g.
........
  r4659 | pjenvey | 2008-06-16 20:42:38 -0400 (Mon, 16 Jun 2008) | 1 line
  
  we want the absolute path here
........
  r4660 | fwierzbicki | 2008-06-16 22:34:20 -0400 (Mon, 16 Jun 2008) | 3 lines
  
  parameter passing that I am not using yet.  Will be crucial for a
  one pass parse.
........
  r4661 | fwierzbicki | 2008-06-16 22:47:21 -0400 (Mon, 16 Jun 2008) | 2 lines
  
  break and continue only newed in Python.g
........
  r4662 | fwierzbicki | 2008-06-17 11:12:43 -0400 (Tue, 17 Jun 2008) | 2 lines
  
  Slowly adding more needed params to Python.g from PythonWalker.g.
........
  r4665 | fwierzbicki | 2008-06-18 10:59:31 -0400 (Wed, 18 Jun 2008) | 3 lines
  
  Introduce an ENDMARK imaginary token to handle unfinished but
  partially valid statements.
........
  r4667 | fwierzbicki | 2008-06-18 16:21:10 -0400 (Wed, 18 Jun 2008) | 2 lines
  
  Incremental improvement on interactive mode.
........
  r4672 | fwierzbicki | 2008-06-18 21:26:41 -0400 (Wed, 18 Jun 2008) | 3 lines
  
  Fix PythonPartialTester.  Added some info to toStringTree output of
  PythonTree.
........
  r4676 | fwierzbicki | 2008-06-19 11:30:05 -0400 (Thu, 19 Jun 2008) | 3 lines
  
  Added an ImaginaryToken type so that the char positions of
  INDENT and DEDENT can be easily tracked.
........
  r4678 | fwierzbicki | 2008-06-19 13:58:08 -0400 (Thu, 19 Jun 2008) | 2 lines
  
  Replace many imaginary tokens with concrete tokens.
........
  r4679 | fwierzbicki | 2008-06-19 18:31:55 -0400 (Thu, 19 Jun 2008) | 2 lines
  
  whitespace
........
  r4680 | fwierzbicki | 2008-06-19 19:50:49 -0400 (Thu, 19 Jun 2008) | 2 lines
  
  Update comments and rule positions compared to CPython's Grammar/Grammar
........
  r4682 | pjenvey | 2008-06-19 20:07:46 -0400 (Thu, 19 Jun 2008) | 1 line
  
  fix whitespace
........
  r4684 | pjenvey | 2008-06-19 20:50:11 -0400 (Thu, 19 Jun 2008) | 4 lines
  
  compile inplace operations to a PyObject._ixx wrapper (which uses _binop_rule,
  like _xxx), instead of __ixx__
  for #1873148
........
  r4693 | pjenvey | 2008-06-20 01:45:14 -0400 (Fri, 20 Jun 2008) | 5 lines
  
  o fix builtin inplace methods to work as MethodType.BINARY
  o add missing inplace functions to operator module
  o fix CPython specific usage of __iadd__ in lists_tests to operator.__iadd__
  for #1873148
........
  r4694 | pjenvey | 2008-06-20 02:01:14 -0400 (Fri, 20 Jun 2008) | 3 lines
  
  make deriveds inplace ops work like binary ops
  for #1873148
........
  r4695 | zyasoft | 2008-06-20 02:21:29 -0400 (Fri, 20 Jun 2008) | 1 line
  
  Updated most builtins to 2.5; intern, object do not yet conform. Float conversion is richer in Java than it is in Python for hex (Java supports floating point hex values, test_float). Derived longs are failing (test_longconversion). cmp might be fixed by Leo Soto. Remaining issues are probably due to partial parse problems. Added contextlib, functools. The latter uses a pure-Python implementation, so it does not look like a native type for some of the tests in test_functools; TBD.
........
  r4704 | fwierzbicki | 2008-06-20 13:32:49 -0400 (Fri, 20 Jun 2008) | 3 lines
  
  Cleared up some bad behavior in Python.g (was reporting and recovering
  from missing tokens).
........
  r4705 | fwierzbicki | 2008-06-20 13:35:59 -0400 (Fri, 20 Jun 2008) | 2 lines
  
  Switch debugging off.
........
  r4706 | fwierzbicki | 2008-06-20 14:33:18 -0400 (Fri, 20 Jun 2008) | 2 lines
  
  Repaired partial strings.  Partial lists, dicts, etc *sometimes* work.
........
  r4708 | fwierzbicki | 2008-06-20 15:58:27 -0400 (Fri, 20 Jun 2008) | 2 lines
  
  Pretty good nested [,(,{ support for interactive mode.
........
  r4709 | zyasoft | 2008-06-20 21:16:24 -0400 (Fri, 20 Jun 2008) | 1 line
  
  Added wsgiref from 2.5
........
  r4710 | fwierzbicki | 2008-06-21 08:20:13 -0400 (Sat, 21 Jun 2008) | 2 lines
  
  whitespace.
........
  r4711 | fwierzbicki | 2008-06-21 08:39:06 -0400 (Sat, 21 Jun 2008) | 2 lines
  
  Now simple tests of the interactive mode are working well.
........
  r4712 | pjenvey | 2008-06-21 19:42:05 -0400 (Sat, 21 Jun 2008) | 1 line
  
  always re-generate .class until APIVersion is fixed
........
  r4714 | nriley | 2008-06-22 22:38:45 -0400 (Sun, 22 Jun 2008) | 1 line
  
  os.isatty, file.isatty support
........
  r4715 | fwierzbicki | 2008-06-23 11:57:31 -0400 (Mon, 23 Jun 2008) | 2 lines
  
  Fix for one line compound statements in interactive mode.
........
  r4720 | fwierzbicki | 2008-06-23 15:28:04 -0400 (Mon, 23 Jun 2008) | 2 lines
  
  return None for getfilesystemencoding  for now.
........
  r4729 | pjenvey | 2008-06-23 18:06:02 -0400 (Mon, 23 Jun 2008) | 7 lines
  
  merge trunk/jython@... to branches/asm
  branches/pep352 failures:
  test_coercion test_deque test_doctest test_exceptions test_extcall
  test_generators test_pickletools
  new asm failures:
  test_coercion test_deque test_pickletools test_wsgiref
........
  r4732 | fwierzbicki | 2008-06-23 19:41:21 -0400 (Mon, 23 Jun 2008) | 2 lines
  
  moving to 2.5 Lib.  Also small fix for encoding check.
........
  r4733 | pjenvey | 2008-06-23 20:31:42 -0400 (Mon, 23 Jun 2008) | 3 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_exceptions.py@...>
........
  r4734 | pjenvey | 2008-06-23 20:45:53 -0400 (Mon, 23 Jun 2008) | 3 lines
  
  o 2.5 EnvironmentError needs a custom __reduce__
  o disable failing testInfiniteRecursion
........
  r4735 | fwierzbicki | 2008-06-23 21:14:18 -0400 (Mon, 23 Jun 2008) | 2 lines
  
  better order for suite subrule.
........
  r4740 | pjenvey | 2008-06-23 22:07:21 -0400 (Mon, 23 Jun 2008) | 3 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_support.py@...>
........
  r4741 | fwierzbicki | 2008-06-23 22:10:11 -0400 (Mon, 23 Jun 2008) | 4 lines
  
  Realized that CPython forces an extra newline for *all* compound
  statments (including statments like "class Foo:pass").  Greatly
  simplified the grammar.
........
  r4742 | pjenvey | 2008-06-23 22:14:19 -0400 (Mon, 23 Jun 2008) | 1 line
  
  merge Jython specific changes back into 2.5 test_support
........
  r4743 | fwierzbicki | 2008-06-23 22:36:57 -0400 (Mon, 23 Jun 2008) | 2 lines
  
  Fix exploding newlines on interactive prompt.
........
  r4744 | pjenvey | 2008-06-23 22:43:05 -0400 (Mon, 23 Jun 2008) | 1 line
  
  re-enable setdict, fixed by pep352
........
  r4745 | pjenvey | 2008-06-24 03:01:10 -0400 (Tue, 24 Jun 2008) | 3 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_optparse.py@...>
........
  r4746 | pjenvey | 2008-06-24 03:03:33 -0400 (Tue, 24 Jun 2008) | 1 line
  
  allow imports outside of test
........
  r4747 | pjenvey | 2008-06-24 03:04:43 -0400 (Tue, 24 Jun 2008) | 1 line
  
  don't assume __builtins__ and skip a CPython specific test
........
  r4748 | fwierzbicki | 2008-06-24 09:59:06 -0400 (Tue, 24 Jun 2008) | 2 lines
  
  Finally - the threshold for a version change has been hit.  Yay!
........
  r4749 | zyasoft | 2008-06-24 11:45:48 -0400 (Tue, 24 Jun 2008) | 1 line
  
  Use CPythonLib's re.py, not our own
........
  r4750 | fwierzbicki | 2008-06-24 12:46:35 -0400 (Tue, 24 Jun 2008) | 2 lines
  
  Support longs regardless of radix.
........
  r4751 | fwierzbicki | 2008-06-24 13:10:39 -0400 (Tue, 24 Jun 2008) | 3 lines
  
  move the Jython specific test_array out of the way so we can test against
  the CPython test_array
........
  r4753 | pjenvey | 2008-06-24 17:31:29 -0400 (Tue, 24 Jun 2008) | 1 line
  
  disable test_asynchat for now, re #1064
........
  r4754 | pjenvey | 2008-06-24 17:31:42 -0400 (Tue, 24 Jun 2008) | 1 line
  
  small cleanup
........
  r4755 | pjenvey | 2008-06-24 19:12:17 -0400 (Tue, 24 Jun 2008) | 3 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_logging.py@...>
........
  r4756 | pjenvey | 2008-06-24 19:13:31 -0400 (Tue, 24 Jun 2008) | 1 line
  
  re-integrate r4098:4167
........
  r4757 | pjenvey | 2008-06-24 19:57:42 -0400 (Tue, 24 Jun 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/doctest.py@...>
........
  r4758 | pjenvey | 2008-06-24 20:11:28 -0400 (Tue, 24 Jun 2008) | 5 lines
  
  o bring in decimal (test_decimal passes). also hashlib and platform
  which don't quite work yet
  o Jython changes for doctest, though test_doctest still fails. bring
  in trace for test_doctest
........
  r4761 | fwierzbicki | 2008-06-25 13:22:09 -0400 (Wed, 25 Jun 2008) | 3 lines
  
  removed special handling of RecognitionException, since errors
  are always of type ParseException now anyway.
........
  r4762 | fwierzbicki | 2008-06-25 13:51:08 -0400 (Wed, 25 Jun 2008) | 3 lines
  
  Created a flag so that external tools can use Python.g with
  Antlr's default error handling.
........
  r4763 | fwierzbicki | 2008-06-25 14:10:21 -0400 (Wed, 25 Jun 2008) | 4 lines
  
  antlrErrorHandling needs to be public to be used by external tools.
  Looking at the nice error messages that are coming out makes me
  wonder if I might want to rethink my error handling mechanism.
........
  r4764 | pjenvey | 2008-06-25 15:03:08 -0400 (Wed, 25 Jun 2008) | 1 line
  
  reapply compiled name as <module> from r4321
........
  r4765 | pjenvey | 2008-06-25 15:05:09 -0400 (Wed, 25 Jun 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/inspect.py@...>
........
  r4767 | pjenvey | 2008-06-25 15:45:51 -0400 (Wed, 25 Jun 2008) | 1 line
  
  re-integrate r4053
........
  r4768 | pjenvey | 2008-06-25 15:49:17 -0400 (Wed, 25 Jun 2008) | 3 lines
  
  o fix string exceptions which I broke in r4754
  o kill OverflowWarning and the custom warnings.py that we no longer need
........
  r4769 | pjenvey | 2008-06-25 16:12:14 -0400 (Wed, 25 Jun 2008) | 1 line
  
  match messages to CPython 2.5
........
  r4770 | pjenvey | 2008-06-25 16:27:31 -0400 (Wed, 25 Jun 2008) | 1 line
  
  small cleanup to unpackSequence
........
  r4771 | pjenvey | 2008-06-25 16:46:49 -0400 (Wed, 25 Jun 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/regrtest.py@...>
........
  r4772 | pjenvey | 2008-06-25 16:48:27 -0400 (Wed, 25 Jun 2008) | 2 lines
  
  re-integrate jython specifics: mostly just -e support and java platform
  test defines
........
  r4774 | fwierzbicki | 2008-06-25 19:08:30 -0400 (Wed, 25 Jun 2008) | 2 lines
  
  Can't live without -m.
........
  r4777 | pjenvey | 2008-06-25 20:12:35 -0400 (Wed, 25 Jun 2008) | 4 lines
  
  skip a number of tests we won't pass anytime soon. mark most of the
  cjkencodings tests and xml_etree as perm failures for now. re-enable
  test_unicode as it's close to passing
........
  r4778 | pjenvey | 2008-06-25 20:12:50 -0400 (Wed, 25 Jun 2008) | 1 line
  
  test_uuid passes
........
  r4779 | nriley | 2008-06-25 21:16:20 -0400 (Wed, 25 Jun 2008) | 1 line
  
  Return permission denied for files opened for reading.
........
  r4781 | nriley | 2008-06-25 21:47:39 -0400 (Wed, 25 Jun 2008) | 1 line
  
  Match CPython behavior, hiding banner/prompt if stdin is not interactive and showing prompt if file argument is a tty; remove related workaround from test_cmd_line.
........
  r4782 | fwierzbicki | 2008-06-26 13:11:56 -0400 (Thu, 26 Jun 2008) | 2 lines
  
  hexoct is passing.
........
  r4783 | fwierzbicki | 2008-06-26 13:15:03 -0400 (Thu, 26 Jun 2008) | 3 lines
  
  Corner case for fplist fixed.  def foo((x)) should be treated the same as
  def foo(x).
........
  r4784 | fwierzbicki | 2008-06-26 16:11:35 -0400 (Thu, 26 Jun 2008) | 2 lines
  
  genexp should be sole argument if no parens.  First half of fix.
........
  r4785 | zyasoft | 2008-06-26 18:43:05 -0400 (Thu, 26 Jun 2008) | 1 line
  
  Removed old Jython-specific tests in favor of CPythonLib versions (except that test_urllib.py has a dependency on fileno being int, so changed accordingly). Cleaned up SRE engine code such that it more closely follows _sre.c. Removed optimization of Unicode charset in sre_compile since for UCS-4 for CPython, it doesn't appear to use this optimization anyway.
........
  r4786 | zyasoft | 2008-06-26 20:44:30 -0400 (Thu, 26 Jun 2008) | 1 line
  
  re.sub, re.subn now coerce to the right type (unicode/str), based on the spec provided by test_re.test_bug_1140
........
  r4787 | zyasoft | 2008-06-26 20:50:25 -0400 (Thu, 26 Jun 2008) | 1 line
  
  Removed obsolete test, superseded by 2.5 coercion rules for emptry strings on re.sub
........
  r4788 | pjenvey | 2008-06-26 21:14:25 -0400 (Thu, 26 Jun 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_urllib2_localnet.py@...>
........
  r4789 | pjenvey | 2008-06-26 21:15:47 -0400 (Thu, 26 Jun 2008) | 1 line
  
  explicitly close the server socket instead of relying on GC
........
  r4790 | zyasoft | 2008-06-26 21:26:29 -0400 (Thu, 26 Jun 2008) | 1 line
  
  test_re now passes completely. This was done by commenting inapplicable tests re recursion limits, since we are not going to implement a non-recursive variant, as well as adding the unimplemented typecodes for PyArray. Too bad that there's a lot more to do to get array working as well!
........
  r4791 | pjenvey | 2008-06-26 21:30:12 -0400 (Thu, 26 Jun 2008) | 2 lines
  
  upgrade socket._fileobject to 2.5's
........
  r4792 | pjenvey | 2008-06-26 22:39:20 -0400 (Thu, 26 Jun 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_hashlib.py@...>
........
  r4793 | pjenvey | 2008-06-26 22:52:59 -0400 (Thu, 26 Jun 2008) | 3 lines
  
  add _hashlib with support for everything but sha224, via
  java.security.MessageDigest. supersedes our md5 module
........
  r4794 | pjenvey | 2008-06-26 23:04:45 -0400 (Thu, 26 Jun 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_hmac.py@...>
........
  r4795 | zyasoft | 2008-06-26 23:14:37 -0400 (Thu, 26 Jun 2008) | 1 line
  
  Added stack_size to thread, threading since it's available since 1.4, but only as a hint to the JVM. test_re was not added in the prev commit. test_threading's test of foreign threads doesn't make sense for Jython, or so I decree
........
  r4796 | pjenvey | 2008-06-26 23:25:09 -0400 (Thu, 26 Jun 2008) | 3 lines
  
  optimize _hashlib.HASH to take advantage of MessageDigest.clone which is
  supported for all of our hashing types
........
  r4797 | pjenvey | 2008-06-26 23:26:55 -0400 (Thu, 26 Jun 2008) | 3 lines
  
  o sha is superceded by hashlib
  o special case test_hmac to avoid our lack of sha224 support
........
  r4798 | zyasoft | 2008-06-26 23:50:14 -0400 (Thu, 26 Jun 2008) | 1 line
  
  Fixed test_bigmem to reflect Java realities. Didn't get the commit in last time of commenting out test_foreign_thread, not applicable to Jython
........
  r4799 | zyasoft | 2008-06-27 00:17:33 -0400 (Fri, 27 Jun 2008) | 1 line
  
  Working too fast here, here's the test_bigmem.py fixes. Also added all methods to threading such that it passes tests in test_contextlib
........
  r4800 | pjenvey | 2008-06-27 00:27:32 -0400 (Fri, 27 Jun 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/fileinput.py@...>
........
  r4801 | pjenvey | 2008-06-27 00:28:43 -0400 (Fri, 27 Jun 2008) | 1 line
  
  reapply Jython workaround for lack of fstat
........
  r4802 | zyasoft | 2008-06-27 00:30:59 -0400 (Fri, 27 Jun 2008) | 1 line
  
  Enable testing of stack size changing for java platform
........
  r4806 | zyasoft | 2008-06-27 00:50:06 -0400 (Fri, 27 Jun 2008) | 1 line
  
  NA'ed test_traceback.test_members since it depends on sys.exc_traceback global var, which is not implemented in Jython (not threadsafe/deprecated since Python 1.5)
........
  r4807 | zyasoft | 2008-06-27 01:28:40 -0400 (Fri, 27 Jun 2008) | 1 line
  
  binascii.a2b_qp now escapes '= ' to '= '. a2b_uu takes empty strings
........
  r4808 | pjenvey | 2008-06-27 01:45:44 -0400 (Fri, 27 Jun 2008) | 1 line
  
  unused var
........
  r4809 | zyasoft | 2008-06-27 03:24:14 -0400 (Fri, 27 Jun 2008) | 1 line
  
  Added to os module: devnull, urandom. Worked around issue in java.io.File#mkdirs when adding directory like x/y/z/.
........
  r4810 | fwierzbicki | 2008-06-27 13:47:50 -0400 (Fri, 27 Jun 2008) | 8 lines
  
  Cleaned up Call node creation, and
  now gen expressions are checked from both sides so that:
  
  foo(x for x in range(10), 100)
  foo(100, x for x in range(10))
  
  properly fail.
........
  r4821 | zyasoft | 2008-06-30 03:06:55 -0400 (Mon, 30 Jun 2008) | 1 line
  
  Rewrote cStringIO to use StringBuffer instead of managing its own buffer (also not StringBuilder)
........
  r4822 | zyasoft | 2008-06-30 03:41:08 -0400 (Mon, 30 Jun 2008) | 1 line
  
  Fixed cStringIO to support ops for cPickle
........
  r4823 | zyasoft | 2008-06-30 04:18:38 -0400 (Mon, 30 Jun 2008) | 1 line
  
  Fixed unicode coercion for str.__mod__ with unicode args
........
  r4824 | zyasoft | 2008-06-30 04:59:43 -0400 (Mon, 30 Jun 2008) | 1 line
  
  Fixed unicode coercion logic for PyString.__mod__. Removed 2.5 contextlib.py in favor of direct from CPythonLib
........
  r4825 | zyasoft | 2008-06-30 12:14:30 -0400 (Mon, 30 Jun 2008) | 1 line
  
  Change cStringIO to use StringBuilder semantics. Use via thread confinement, or with external locking. Keep it simple, keep it lightweight.
........
  r4826 | zyasoft | 2008-06-30 14:08:37 -0400 (Mon, 30 Jun 2008) | 1 line
  
  Restored cStringIO.getString
........
  r4827 | zyasoft | 2008-07-01 09:52:38 -0400 (Tue, 01 Jul 2008) | 1 line
  
  Removed modules and tests exactly duplicated from CPythonLib
........
  r4828 | zyasoft | 2008-07-01 11:50:43 -0400 (Tue, 01 Jul 2008) | 1 line
  
  Removed modules/tests that are trivially changed with respect to CPythonLib
........
  r4829 | zyasoft | 2008-07-01 13:21:43 -0400 (Tue, 01 Jul 2008) | 1 line
  
  Removed modules/tests that should be updated to CPythonLib. Incidentally, test_cmath now tests that cmath.log takes a base
........
  r4830 | zyasoft | 2008-07-01 16:38:05 -0400 (Tue, 01 Jul 2008) | 1 line
  
  test_mailbox has been rewritten since 2.2, the version that was committed
........
  r4831 | zyasoft | 2008-07-01 17:12:34 -0400 (Tue, 01 Jul 2008) | 1 line
  
  Removed spurious placement of test_bigmem
........
  r4832 | leosoto | 2008-07-01 17:30:12 -0400 (Tue, 01 Jul 2008) | 1 line
  
  pyBoolean.__tojava__(Object.class) now returns a Boolean instead of an Integer. Also used valueOf static methods instead of constructors.
........
  r4833 | zyasoft | 2008-07-01 18:02:55 -0400 (Tue, 01 Jul 2008) | 1 line
  
  cStringIO#readline should not insert backslash-n (ambigous reading, but CPython implementation says otherwise)
........
  r4834 | leosoto | 2008-07-01 18:24:50 -0400 (Tue, 01 Jul 2008) | 1 line
  
  zxJDBC: Added BigInteger support to the PostgreSQLDataHandler
........
  r4835 | leosoto | 2008-07-01 19:38:37 -0400 (Tue, 01 Jul 2008) | 1 line
  
  zxJDBC: Avoid preparing a statement when executemany() is called with an empty sequence
........
  r4836 | leosoto | 2008-07-01 20:33:20 -0400 (Tue, 01 Jul 2008) | 1 line
  
  Workaround for issue 1047. At least on my system (jdk 1.6.0_06) it makes pulldom usable
........
  r4837 | leosoto | 2008-07-01 23:51:43 -0400 (Tue, 01 Jul 2008) | 1 line
  
  Another string interpolation fix, this time when the left operand is an unicode containing non-ascii chars and there are no unicodes on the right argument
........
  r4838 | zyasoft | 2008-07-02 01:56:10 -0400 (Wed, 02 Jul 2008) | 1 line
  
  cmath.log now takes a base parameter; all functions now test for ValueError to reraise as a TypeError, to be consistent with CPython
........
  r4839 | leosoto | 2008-07-02 16:17:29 -0400 (Wed, 02 Jul 2008) | 1 line
  
  Updated eclipse configuration to use the antlr3.1b1 JAR instead of 3.0.1
........
  r4840 | leosoto | 2008-07-02 17:09:14 -0400 (Wed, 02 Jul 2008) | 1 line
  
  Syncing PyBaseExceptionDerived
........
  r4841 | leosoto | 2008-07-02 17:43:16 -0400 (Wed, 02 Jul 2008) | 1 line
  
  Fixing Derived#__cmp__ to avoid raise TypeError when __cmp__ has not been overrided and super.__cmp__() returns -2 (see #1031)
........
  r4842 | leosoto | 2008-07-02 20:36:50 -0400 (Wed, 02 Jul 2008) | 1 line
  
  Enable utf-8 source encoding support (the test_cookielib issue was fixed upstream:  http://bugs.python.org/issue3261). Also recognize 'latin-1' as an alias for 'iso8859-1'
........
  r4843 | leosoto | 2008-07-02 22:39:07 -0400 (Wed, 02 Jul 2008) | 1 line
  
  Limiting the buffer size used for discovering the encoding, to avoid crashing when reading big files (such as django/tests/regressiontests/forms/fields.py), as the default size of BufferedReader was too close to the readlimit set by the mark() call
........
  r4845 | fwierzbicki | 2008-07-03 21:13:07 -0400 (Thu, 03 Jul 2008) | 3 lines
  
  change token name from ENDMARK to ENDMARKER to better fit with
  CPython's Grammar/Grammar file.  Alse some tabs->spaces.
........
  r4846 | fwierzbicki | 2008-07-03 21:49:41 -0400 (Thu, 03 Jul 2008) | 3 lines
  
  Introduced ENDMARKER to Python.g -- needed for files that
  lack a newline.
........
  r4847 | fwierzbicki | 2008-07-03 22:01:44 -0400 (Thu, 03 Jul 2008) | 2 lines
  
  import test_support.
........
  r4848 | fwierzbicki | 2008-07-04 08:21:30 -0400 (Fri, 04 Jul 2008) | 3 lines
  
  Removed ENDMARKER from Python.g and applied Leo Soto's patch to
  add a newline to the end of input that ends w/o a newline.
........
  r4849 | fwierzbicki | 2008-07-04 08:33:14 -0400 (Fri, 04 Jul 2008) | 2 lines
  
  Formatting and remove unused variable.
........
  r4850 | fwierzbicki | 2008-07-04 17:25:24 -0400 (Fri, 04 Jul 2008) | 3 lines
  
  Moved the actual emit of the generated newline (for input
  w/o a newline) to *after* dedents are emitted.
........
  r4852 | leosoto | 2008-07-05 20:37:12 -0400 (Sat, 05 Jul 2008) | 20 lines
  
  StringFormatter: '%d' and '%f' support for the __int__ and __float__ protocol
  respectively.
  
  The implementation is more convulted than it should be, because we have PyString
  implementing __float__ and __int__ at the "java level" but not at the "python
  level". For string formatting, only "python level" __float__ and __int__ must be
  supported.
  
  Also, considering that __int__ can return a PyLong, this case needs special
  care. Basically formatInteger now can call formatLong if a PyLong is found as
  the result of calling __int__. Then, as formatLong can also be called from
  formatInteger, __hex__, __oct__ and __str__ conversions were moved inside
  formatLong.
  
  Finally, test_format_jy was changed to stop checking that we don't support big
  floats on '%d' (CPython doesn't, but that seems a limitation of the specific
  implementation and I can't imagine a program that could break on Jython because we
  *support* it).
........
  r4853 | pjenvey | 2008-07-05 21:51:20 -0400 (Sat, 05 Jul 2008) | 1 line
  
  always recompile bytecode from zipimporter too
........
  r4855 | fwierzbicki | 2008-07-07 05:08:22 -0400 (Mon, 07 Jul 2008) | 3 lines
  
  Create a jython-complete.jar to make it easier to put out
  a 2.5 alpha.
........
  r4856 | zyasoft | 2008-07-07 07:22:16 -0400 (Mon, 07 Jul 2008) | 1 line
  
  Removed double-checked locking used to init ThreadStateMap; didn't make sense to do any locking here anyway. Moved trycatch emit in visitWith to be where it ahappens (doesn't change output, but makes it easier to follow code).
........
  r4857 | pjenvey | 2008-07-07 15:59:32 -0400 (Mon, 07 Jul 2008) | 1 line
  
  no need to go through __builtin__ for issubclass
........
  r4859 | pjenvey | 2008-07-07 19:21:43 -0400 (Mon, 07 Jul 2008) | 1 line
  
  simplify
........
  r4863 | pjenvey | 2008-07-07 21:14:55 -0400 (Mon, 07 Jul 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_enumerate.py@...>
........
  r4864 | pjenvey | 2008-07-07 21:15:40 -0400 (Mon, 07 Jul 2008) | 1 line
  
  avoid implementation detail tests
........
  r4865 | pjenvey | 2008-07-08 01:20:37 -0400 (Tue, 08 Jul 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_iter.py@...>
........
  r4866 | pjenvey | 2008-07-08 01:24:17 -0400 (Tue, 08 Jul 2008) | 4 lines
  
  o make StopIteration (and the like) a 'sink state' in iter and call-iter, to
  fix the test_iter test_sinkstate_* tests
  o workaround test_iter test_unpack_iter GC related issues 
........
  r4867 | pjenvey | 2008-07-08 01:37:05 -0400 (Tue, 08 Jul 2008) | 5 lines
  
  o wrap the fstat usage in is_jython instead of commenting it out
  o "sync" with:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_largefile.py@...>
  (no changes; equiv to 2.3's)
........
  r4868 | pjenvey | 2008-07-08 02:20:46 -0400 (Tue, 08 Jul 2008) | 4 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_repr.py@...>
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_richcmp.py@...>
........
  r4869 | pjenvey | 2008-07-08 03:27:03 -0400 (Tue, 08 Jul 2008) | 4 lines
  
  o workaround jython issues in test_richcmp and test_repr
  o our custom test_operations isn't really necessary and we pass stdlib's. also
  now pass stdlib's test_long
........
  r4870 | fwierzbicki | 2008-07-08 04:59:37 -0400 (Tue, 08 Jul 2008) | 2 lines
  
  some tweaks to help the install task.
........
  r4876 | pjenvey | 2008-07-08 15:55:47 -0400 (Tue, 08 Jul 2008) | 3 lines
  
  always re-generating byte code is more trouble than it's worth right now
  (breaks the imp module)
........
  r4877 | pjenvey | 2008-07-08 16:38:02 -0400 (Tue, 08 Jul 2008) | 5 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_scope.py@...>
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_types.py@...>
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_zlib.py@...>
........
  r4878 | pjenvey | 2008-07-08 17:05:48 -0400 (Tue, 08 Jul 2008) | 4 lines
  
  o allow a length argument to zlib decompressobj flush
  o workarounds for 2.5 test_scope test_types (which output now matches stdlib's)
  and test_zlib
........
  r4879 | pjenvey | 2008-07-08 20:41:01 -0400 (Tue, 08 Jul 2008) | 3 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/platform.py@...>
........
  r4880 | pjenvey | 2008-07-08 20:42:59 -0400 (Tue, 08 Jul 2008) | 1 line
  
  s/java.os/os/g
........
  r4881 | nriley | 2008-07-08 23:50:19 -0400 (Tue, 08 Jul 2008) | 1 line
  
  overriding fillInStackTrace for PyException speeds things up quite a bit
........
  r4882 | nriley | 2008-07-10 01:12:05 -0400 (Thu, 10 Jul 2008) | 1 line
  
  need bash to test the script, too
........
  r4883 | leosoto | 2008-07-10 15:51:37 -0400 (Thu, 10 Jul 2008) | 1 line
  
  zxJDBC: Map SQLExceptions to zxJDBC.IntegrityError if the sqlState says the exception was caused by a integrity violation
........
  r4884 | pjenvey | 2008-07-10 23:36:29 -0400 (Thu, 10 Jul 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_support.py@...>
........
  r4885 | pjenvey | 2008-07-10 23:46:09 -0400 (Thu, 10 Jul 2008) | 3 lines
  
  add a -j option to regrtest for capturing test output to JUnit XML files (one
  file per TestCase or module import or doctest) in the specified dir
........
  r4887 | fwierzbicki | 2008-07-11 07:52:55 -0400 (Fri, 11 Jul 2008) | 3 lines
  
  move "not needed" checks into separate task because all such tasks *are* needed
  during a full build regardless of up to date status of files.
........
  r4888 | zyasoft | 2008-07-11 08:16:28 -0400 (Fri, 11 Jul 2008) | 1 line
  
  Begin port of PyPy's _rawffi, which with their pure-Python ctypes wrapper, implements ctypes
........
  r4889 | fwierzbicki | 2008-07-11 08:45:41 -0400 (Fri, 11 Jul 2008) | 4 lines
  
  added svnant-jars by default for more convenient full-build.
  Fixed jarjar and jar-complete (so jarjar only recompiles on
  changes and jar-complete properly depends on jarjar).
........
  r4890 | zyasoft | 2008-07-11 10:05:13 -0400 (Fri, 11 Jul 2008) | 1 line
  
  From PyPy's test__rawffi, broke out standard ctypes_test code they use (to avoid using their compilation toolchain). Implemented minimum to get test__rawffi.test_short_addition to pass.
........
  r4891 | pjenvey | 2008-07-11 15:37:19 -0400 (Fri, 11 Jul 2008) | 1 line
  
  test_pep263 passes now
........
  r4892 | pjenvey | 2008-07-11 16:10:32 -0400 (Fri, 11 Jul 2008) | 3 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/string_tests.py@...>
........
  r4893 | pjenvey | 2008-07-11 16:16:53 -0400 (Fri, 11 Jul 2008) | 5 lines
  
  o re-integrate workarounds for string_tests
  o add rsplit
  fixes #1023
  thanks Nimish Telang
........
  r4894 | pjenvey | 2008-07-11 20:10:28 -0400 (Fri, 11 Jul 2008) | 2 lines
  
  fix unicode(str_subclass) not using its __unicode__ method
........
  r4895 | pjenvey | 2008-07-11 20:13:15 -0400 (Fri, 11 Jul 2008) | 3 lines
  
  fix some odder 2.5 tests of string count/find/rfind. rewrite join to act like
  CPython's, mainly so: a.join([b]) is b
........
  r4896 | pjenvey | 2008-07-11 20:33:21 -0400 (Fri, 11 Jul 2008) | 1 line
  
  fix java exception names being prefixed with <unknown> in Python tracebacks
........
  r4897 | pjenvey | 2008-07-11 20:53:44 -0400 (Fri, 11 Jul 2008) | 1 line
  
  fake reload(sys), like reload(PyJavaClass). fix ClassCastException in reload
........
  r4901 | pjenvey | 2008-07-11 21:28:39 -0400 (Fri, 11 Jul 2008) | 1 line
  
  expect test_mhlib to pass on posix and skip elsewhere
........
  r4902 | zyasoft | 2008-07-12 05:13:38 -0400 (Sat, 12 Jul 2008) | 1 line
  
  Removed tests not appropriate for Jython, test_peepholer, test_profile; added test_strptime, test_csv
........
  r4903 | zyasoft | 2008-07-12 06:08:11 -0400 (Sat, 12 Jul 2008) | 1 line
  
  Replaced Lib/datetime.py with version from PyPy, http://codespeak.net/svn/pypy/dist/pypy/lib/datetime.py@...>
........
  r4904 | zyasoft | 2008-07-12 09:50:19 -0400 (Sat, 12 Jul 2008) | 1 line
  
  Fixed str|string|unicode.replace for PyString or PyUnicode in the basic plane
........
  r4905 | zyasoft | 2008-07-12 09:51:06 -0400 (Sat, 12 Jul 2008) | 1 line
  
  Removed tests not relevant to Jython around CPython code compilation
........
  r4906 | zyasoft | 2008-07-12 10:09:20 -0400 (Sat, 12 Jul 2008) | 1 line
  
  Operations on unicode objs in basic plane can only result in basic plane objs (btw, not true of astral)
........
  r4907 | zyasoft | 2008-07-12 11:42:09 -0400 (Sat, 12 Jul 2008) | 1 line
  
  Added datetime.strptime
........
  r4908 | zyasoft | 2008-07-12 11:55:44 -0400 (Sat, 12 Jul 2008) | 1 line
  
  datetime.fromtimestamp now rounds seconds,microseconds within 1 microsecond of an integer second to that second
........
  r4909 | zyasoft | 2008-07-12 12:50:22 -0400 (Sat, 12 Jul 2008) | 1 line
  
  ascii codec will always be in basic plane, so at least optimize setting of that when constructing unicode
........
  r4910 | leosoto | 2008-07-12 15:50:43 -0400 (Sat, 12 Jul 2008) | 1 line
  
  Now test_strptime pass. This is done by improving the current SimpleDateFormat-backed implementation a bit, and delegating to _strptime.strptime for formats not supported by SimpleDateFormat.
........
  r4911 | leosoto | 2008-07-12 15:52:59 -0400 (Sat, 12 Jul 2008) | 1 line
  
  Removing a duplicate line on CPythonLib.includes I introduced on r4910
........
  r4912 | pjenvey | 2008-07-12 15:57:48 -0400 (Sat, 12 Jul 2008) | 4 lines
  
  o add popen2.cleanup for CPython compat. and to fix test_popen2
  o make threading.currentThread() is threading.currentThread() (with the help of
  a WeakKeyDictionary) to allow _threading_local to work
........
  r4913 | pjenvey | 2008-07-12 20:47:08 -0400 (Sat, 12 Jul 2008) | 4 lines
  
  max_read_chunk of 10mb kills test_gzip.test_many_append's performance due to
  repeated 10mb reads. CPython doesn't suffer from this -- maybe its allocator
  recycles the same 10mb. lowering to 256K speeds test time from 15 to 1 second
........
  r4914 | pjenvey | 2008-07-12 22:07:51 -0400 (Sat, 12 Jul 2008) | 1 line
  
  add C_EXTENSION because pkgutil references it
........
  r4916 | pjenvey | 2008-07-12 23:36:31 -0400 (Sat, 12 Jul 2008) | 2 lines
  
  fix to make the 'g' formatter closer to CPython's. fixes test_tokenize
........
  r4917 | zyasoft | 2008-07-14 06:47:01 -0400 (Mon, 14 Jul 2008) | 1 line
  
  split and rsplit do not need to be UTF-16 aware
........
  r4918 | zyasoft | 2008-07-14 06:52:18 -0400 (Mon, 14 Jul 2008) | 3 lines
  
  From
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_str@...>
........
  r4919 | zyasoft | 2008-07-14 07:03:54 -0400 (Mon, 14 Jul 2008) | 1 line
  
  Removed inapplicable test due to different algorithm in expandtabs which cannot overflow in Jython
........
  r4922 | zyasoft | 2008-07-14 07:44:28 -0400 (Mon, 14 Jul 2008) | 1 line
  
  time.struct_time can now take any obj that can be turned into a list and converted into 9 integers
........
  r4924 | zyasoft | 2008-07-14 08:11:26 -0400 (Mon, 14 Jul 2008) | 3 lines
  
  From
  http://svn.python.org/projects/python/branches/release25-maint/Lib/uu.py@...>
........
  r4925 | zyasoft | 2008-07-14 08:19:10 -0400 (Mon, 14 Jul 2008) | 2 lines
  
  Fixed uu.encode, decode so that it does not rely on refcounting to close files
........
  r4928 | zyasoft | 2008-07-14 11:19:01 -0400 (Mon, 14 Jul 2008) | 3 lines
  
  ReferenceQueue objs, by their nature, only make sense if transient.
  So make them so, this enables interoperation with Terracotta. 
........
  r4930 | pjenvey | 2008-07-14 15:24:49 -0400 (Mon, 14 Jul 2008) | 1 line
  
  couple small array fixes
........
  r4932 | fwierzbicki | 2008-07-14 15:25:59 -0400 (Mon, 14 Jul 2008) | 2 lines
  
  unbreak --memo again :)
........
  r4933 | pjenvey | 2008-07-14 15:26:58 -0400 (Mon, 14 Jul 2008) | 3 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/distutils@...>
........
  r4934 | fwierzbicki | 2008-07-14 15:27:40 -0400 (Mon, 14 Jul 2008) | 3 lines
  
  generate newlines before the dedents again.  Although the reverse
  was solving some problems, it was creating more.
........
  r4935 | pjenvey | 2008-07-14 15:31:38 -0400 (Mon, 14 Jul 2008) | 3 lines
  
  o re-integrate Jython distutils changes
  o check for $py.class on Jython instead of pyc in test_build_py
........
  r4936 | leosoto | 2008-07-14 16:12:27 -0400 (Mon, 14 Jul 2008) | 1 line
  
  Allow derived types written in Jython to implement a __tojava__ method. This will allow better integration with java for python types such as decimal.Decimal, datetime.date, etc.
........
  r4937 | fwierzbicki | 2008-07-15 11:23:32 -0400 (Tue, 15 Jul 2008) | 4 lines
  
  Fixes in build.xml to make full-build work again.  Some cleanup
  like the removal of old parser and old website tasks.  Changed
  README to describe 2.5 alpha release.
........
  r4939 | leosoto | 2008-07-15 12:13:50 -0400 (Tue, 15 Jul 2008) | 1 line
  
  decimal.py from http://svn.python.org/projects/python/branches/release25-maint/Lib/decimal.py@...>
........
  r4940 | leosoto | 2008-07-15 12:24:18 -0400 (Tue, 15 Jul 2008) | 1 line
  
  Implemented decimal.Decimal.__tojava__ to convert decimal instances to java BigDecimal when python -> java conversion is requested
........
  r4941 | leosoto | 2008-07-15 13:16:16 -0400 (Tue, 15 Jul 2008) | 1 line
  
  Implemented __tojava__ on datetime.time, datetime.date and datetime.datetime. On the current implementation, they can be converted to java.sql.Time, java.sql.Date, java.sql.Timestamp, respectively. All of them can also be converted to  java.util.Calendar. Only one caveat: the tzinfo attribute of times and datetimes is currently ignored
........
  r4942 | leosoto | 2008-07-15 14:00:57 -0400 (Tue, 15 Jul 2008) | 1 line
  
  Removing decimal.py from CPythonLib.includes. I forgot to do that on r4939
........
  r4943 | fwierzbicki | 2008-07-15 14:33:40 -0400 (Tue, 15 Jul 2008) | 2 lines
  
  build tweaks + workaround for an NT problem in site.py
........
  r4944 | nriley | 2008-07-15 14:42:08 -0400 (Tue, 15 Jul 2008) | 1 line
  
  fix for startup problem on Windows - AttributeError was accidentally trapping posixpath abspath failure
........
  r4945 | fwierzbicki | 2008-07-15 15:27:53 -0400 (Tue, 15 Jul 2008) | 3 lines
  
  already incrementing to 2.5a1 -- sourceforge is caching the old one too hard
  and I really need to get Windows fixed.
........
  r4947 | leosoto | 2008-07-15 17:21:30 -0400 (Tue, 15 Jul 2008) | 18 lines
  
  Improvements to the zxJDBC default DataHandler:
  
   - Map DATE, TIME and TIMESTAMP columns to datetime.date, datetime.time and
     datetime.datetime respectively. Factory methods to create instances of
     datetime.* were added to Py.java.
  
   - Map VARCHAR columns to unicode instead of str.
  
   - Don't try to guess the precision of NUMERIC columns .
  
   - Use Py.True and Py.False instead of Py.One and Py.Zero.
  
  Some of this changes may cause backwards-incompatibility, so I've copied the old
  DataHandler logic into Jython22DataHandler. Then, old code should simply setup
  this datahandler on its connections if it is not going to be adapted to the new
  DataHandler default behaviour.
........
  r4949 | amak | 2008-07-15 17:33:35 -0400 (Tue, 15 Jul 2008) | 1 line
  
  Merging support for IPv6 and UDP <broadcast>
........
  r4950 | nriley | 2008-07-15 18:33:04 -0400 (Tue, 15 Jul 2008) | 1 line
  
  (Partial) Windows port of Jython launcher script; should work on Windows 2000 and later.
........
  r4951 | nriley | 2008-07-15 18:37:38 -0400 (Tue, 15 Jul 2008) | 1 line
  
  Oops, left some debugging code in.
........
  r4952 | amak | 2008-07-15 18:51:51 -0400 (Tue, 15 Jul 2008) | 1 line
  
  Backing out what I thought were simple changes, which appear to have broken the build.
........
  r4959 | pjenvey | 2008-07-16 21:23:59 -0400 (Wed, 16 Jul 2008) | 1 line
  
  add symlink on posix
........
  r4961 | pjenvey | 2008-07-16 23:21:35 -0400 (Wed, 16 Jul 2008) | 5 lines
  
  fix the symlink related tests by adding readlink, using _posix.lstat and
  utilizing _posix symlink stuff in posixpath.
  also utilize real stat results in posixpath, and re-enable ismount in ntpath
  since we can support it in posixpath
........
  r4963 | pjenvey | 2008-07-17 00:59:53 -0400 (Thu, 17 Jul 2008) | 9 lines
  
  o fix PythonPOSIXHandler getEnv/getCurrentWorkingDirectory return signatures
  o fix posixpath.__all__
  o only enable os.symlink/readlink and posixpath friends if the posix factory
  appears native. pure java support for symlinks is still sketchy -- in
  particular with dead links -- switching these on enables tests in test_glob,
  test_posixpath, test_tarfile that utilize dead links and are doomed to failure
  o allow partial filling of stat results from jna-posix, padding the rest with
  0s
........
  r4965 | fwierzbicki | 2008-07-17 17:19:56 -0400 (Thu, 17 Jul 2008) | 2 lines
  
  added custom toStringTree to each node.
........
  r4967 | pjenvey | 2008-07-17 20:28:49 -0400 (Thu, 17 Jul 2008) | 3 lines
  
  boost the mark limit even higher for the lenghty lines in
  pygments.lexers._vimbuiltins
........
  r4968 | nriley | 2008-07-18 15:20:39 -0400 (Fri, 18 Jul 2008) | 1 line
  
  Work with jython-complete.jar; handle spaces in $JAVA_HOME.
........
  r4969 | nriley | 2008-07-18 15:21:37 -0400 (Fri, 18 Jul 2008) | 1 line
  
  Actually use JYTHON_OPTS; correct error message and properly delete _JYTHON_HOME.
........
  r4970 | nriley | 2008-07-18 16:40:17 -0400 (Fri, 18 Jul 2008) | 1 line
  
  Make ant regrtest work on Windows again.
........
  r4971 | nriley | 2008-07-18 16:51:00 -0400 (Fri, 18 Jul 2008) | 1 line
  
  Conditionalize launcher test; no need for Cygwin test.
........
  r4973 | nriley | 2008-07-19 01:54:20 -0400 (Sat, 19 Jul 2008) | 1 line
  
  Clean up install targets; allow install to be run without full-build; normalize source directory structure between checked-out and installed versions.
........
  r4974 | fwierzbicki | 2008-07-19 18:48:21 -0400 (Sat, 19 Jul 2008) | 4 lines
  
  Make PythonTree's toStringTree more easily comparable with ast/astview.py
  output.  This will help with the walkerless Python.g, as it doesn't quite
  parse ast/astview.py yet.
........
  r4980 | pjenvey | 2008-07-21 01:00:49 -0400 (Mon, 21 Jul 2008) | 1 line
  
  integrate the sink state conditions
........
  r4982 | pjenvey | 2008-07-21 15:11:48 -0400 (Mon, 21 Jul 2008) | 1 line
  
  fix exposed __getitem__ possibly returning null
........
  r4983 | pjenvey | 2008-07-21 15:45:12 -0400 (Mon, 21 Jul 2008) | 3 lines
  
  o fix filter to pass test_builtin.test_filter and test_filter_subclasses
  o remove the unnecessary __builtin__.tuple
........
  r4984 | pjenvey | 2008-07-21 15:48:17 -0400 (Mon, 21 Jul 2008) | 1 line
  
  make the failure verbose because test_site_flag occasionally fails on the buildbot mysteriously
........
  r4985 | pjenvey | 2008-07-22 21:18:53 -0400 (Tue, 22 Jul 2008) | 4 lines
  
  o make Py.makeCharacter consisitent in never returning unicode unless it was asked for
  o move calculateIndex into PySequence for PyArray
  o allow PyLong.getLong access for PyArray
........
  r4986 | pjenvey | 2008-07-22 21:19:34 -0400 (Tue, 22 Jul 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_array.py@...>
........
  r4987 | pjenvey | 2008-07-22 21:21:32 -0400 (Tue, 22 Jul 2008) | 1 line
  
  many various PyArray fixes for 2.5 test_array
........
  r4988 | fwierzbicki | 2008-07-22 21:58:01 -0400 (Tue, 22 Jul 2008) | 4 lines
  
  Made Str offsets better match CPython.
  PythonTree now extends BaseTree (too much of CommonTree was getting changed anyway).
  astdump.py repaired so that it is a useful testing ground for ast comparisons.
........
  r4989 | fwierzbicki | 2008-07-23 14:39:09 -0400 (Wed, 23 Jul 2008) | 2 lines
  
  Offset fixes for Try/Catch and Call.
........
  r4990 | fwierzbicki | 2008-07-23 15:13:04 -0400 (Wed, 23 Jul 2008) | 6 lines
  
  Made except blocks optional in PythonPartial.g since:
  
  try:
  
  Is a valid partial parse.
........
  r4991 | pjenvey | 2008-07-23 16:36:42 -0400 (Wed, 23 Jul 2008) | 2 lines
  
  o fix passing chars > 256 to Py.makeCharacter
  o make struct.error a class and raise struct.errors instead of OverflowErrors
........
  r4992 | pjenvey | 2008-07-23 16:55:03 -0400 (Wed, 23 Jul 2008) | 3 lines
  
  support the new float.__get/setformat__ classmethods -- they just claim our
  formats are 'unknown'
........
  r4993 | pjenvey | 2008-07-24 03:22:38 -0400 (Thu, 24 Jul 2008) | 2 lines
  
  fix a regression from the bug 1140 fix
........
  r4994 | pjenvey | 2008-07-24 03:29:54 -0400 (Thu, 24 Jul 2008) | 3 lines
  
  add codecs.charmap_build which builds optimized encoding maps now used by the
  charmap encoder
........
  r4995 | fwierzbicki | 2008-07-24 09:51:47 -0400 (Thu, 24 Jul 2008) | 2 lines
  
  Make stopCharIndex consistent.
........
  r4996 | fwierzbicki | 2008-07-24 12:58:24 -0400 (Thu, 24 Jul 2008) | 2 lines
  
  Fix for wrong line numbers in func.co_firstlineno.
........
  r4997 | pjenvey | 2008-07-24 19:42:09 -0400 (Thu, 24 Jul 2008) | 1 line
  
  cleanup unused var
........
  r4998 | nriley | 2008-07-25 02:07:24 -0400 (Fri, 25 Jul 2008) | 1 line
  
  Suppress exception truncating /dev/null when opening it for write on Linux and Solaris; should fix test_os.
........
  r4999 | fwierzbicki | 2008-07-25 21:27:25 -0400 (Fri, 25 Jul 2008) | 3 lines
  
  Re-enabled APIVersion checking in imp.java.  Used ASM to read and write APIVersion
  as an annotation.  Incremented APIVersion from 12 to 13.
........
  r5000 | fwierzbicki | 2008-07-25 21:34:48 -0400 (Fri, 25 Jul 2008) | 2 lines
  
  Small cleanups in imp.
........
  r5001 | fwierzbicki | 2008-07-25 21:51:48 -0400 (Fri, 25 Jul 2008) | 2 lines
  
  Small cleanup in Py.java -- killing stray System.outs.
........
  r5002 | fwierzbicki | 2008-07-25 21:55:04 -0400 (Fri, 25 Jul 2008) | 2 lines
  
  Removed stray System.outs.
........
  r5003 | fwierzbicki | 2008-07-26 10:41:46 -0400 (Sat, 26 Jul 2008) | 2 lines
  
  Changing comment convention back to proper style (start with Returns).
........
  r5004 | fwierzbicki | 2008-07-27 09:21:12 -0400 (Sun, 27 Jul 2008) | 2 lines
  
  comment out DEBUG.class in the repo.
........
  r5005 | fwierzbicki | 2008-07-27 22:41:38 -0400 (Sun, 27 Jul 2008) | 2 lines
  
  Better error messages in the face of parser errors (line numbers + char column).
........
  r5006 | pjenvey | 2008-07-28 00:56:03 -0400 (Mon, 28 Jul 2008) | 3 lines
  
  o add os.link (fixes test_shutil)
  o fix test_re's test output -- it shouldn't have any now
........
  r5007 | pjenvey | 2008-07-28 02:38:44 -0400 (Mon, 28 Jul 2008) | 7 lines
  
  PEP 357 (__index__), adds:
  o PyObject.isIndex - true if int, long or implements __index__
  o PyObject.asIndex - like asInt for indexes
  o also fixed a dispatching to __get/set/delitem__ vs __get/set/delslice__ bug
  and __get/set/delitem__ indices weren't utilizing __len__ when available (fixes
  test_userstring)
........
  r5008 | pjenvey | 2008-07-28 02:40:09 -0400 (Mon, 28 Jul 2008) | 2 lines
  
  deriveds changes for __index__
........
  r5009 | zyasoft | 2008-07-28 07:51:51 -0400 (Mon, 28 Jul 2008) | 3 lines
  
  test__rawffi will now skip if it cannot load ctypes_test, a test
  dynamic library that we do not yet have an ant task to create.
........
  r5010 | zyasoft | 2008-07-28 08:13:52 -0400 (Mon, 28 Jul 2008) | 3 lines
  
  Replaced test_inspect.py with rewritten version (using unittest!) from 2.5:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_inspect.py@...>
........
  r5011 | zyasoft | 2008-07-28 09:33:50 -0400 (Mon, 28 Jul 2008) | 5 lines
  
  Excluded test cases that depend on tuple unpacking in the arg
  specification, since this depends on introspecing bytecode. (Perhaps
  we should provide a Jython-specific version where appropriate metadata
  is emitted in the compiled code object?)
........
  r5012 | pjenvey | 2008-07-28 15:46:39 -0400 (Mon, 28 Jul 2008) | 5 lines
  
  fix stock UserList/test_userlist:
  o handle __get/set/delslice__ start/stop as null or None in PySlice.indices2
  o fix list slice assignments of the same underlying list (always copy first
  as CPython does)
........
  r5013 | pjenvey | 2008-07-28 15:50:43 -0400 (Mon, 28 Jul 2008) | 1 line
  
  include UserList
........
  r5014 | nriley | 2008-07-28 18:55:35 -0400 (Mon, 28 Jul 2008) | 1 line
  
  jna-posix from http://svn.codehaus.org/jruby-contrib/trunk/jna-posix r210
........
  r5015 | nriley | 2008-07-28 18:56:55 -0400 (Mon, 28 Jul 2008) | 1 line
  
  pwd, grp; test_posix no longer skipped
........
  r5016 | pjenvey | 2008-07-28 19:13:21 -0400 (Mon, 28 Jul 2008) | 1 line
  
  fix chdir('/') on windows
........
  r5017 | fwierzbicki | 2008-07-28 21:40:32 -0400 (Mon, 28 Jul 2008) | 2 lines
  
  IParserHost is no longer used.
........
  r5018 | fwierzbicki | 2008-07-29 08:31:46 -0400 (Tue, 29 Jul 2008) | 2 lines
  
  Move testing classes out of main code.
........
  r5019 | pjenvey | 2008-07-29 16:29:08 -0400 (Tue, 29 Jul 2008) | 4 lines
  
  add an InputStream tie-in to TextIOBases, for parsing in universal newlines
  mode
  fixes #1082
........
  r5020 | zyasoft | 2008-07-29 18:33:56 -0400 (Tue, 29 Jul 2008) | 5 lines
  
  cStringIO.tell needs to return an int for it to be used by __len__
  (perhaps that should be relaxed instead?). Found by testing against
  PyAMF which uses cStringIO as a backing store for its
  BufferedByteStream objs.
........
  r5021 | pjenvey | 2008-07-29 18:40:05 -0400 (Tue, 29 Jul 2008) | 2 lines
  
  fix readChunk reading more than CHUNK_SIZE, which'll blow up packReadahead
........
  r5022 | zyasoft | 2008-07-30 11:46:31 -0400 (Wed, 30 Jul 2008) | 4 lines
  
  Support inf, -inf, nan literals (and any
  uppercasing). struct.pack("d") ducktypes like CPython and calls
  __float__. This fixes a number of issues for PyAMF.
........
  r5023 | zyasoft | 2008-07-30 15:57:16 -0400 (Wed, 30 Jul 2008) | 3 lines
  
  Changed default format for __getformat__/__setformat__ to "IEEE,
  big-endian", and supported switching back and forth with "unknown".
........
  r5024 | pjenvey | 2008-07-30 18:39:24 -0400 (Wed, 30 Jul 2008) | 2 lines
  
  add a builtin _functools.partial type
........
  r5025 | pjenvey | 2008-07-30 19:00:32 -0400 (Wed, 30 Jul 2008) | 1 line
  
  include functools
........
  r5026 | fwierzbicki | 2008-07-31 09:10:57 -0400 (Thu, 31 Jul 2008) | 2 lines
  
  Switch to Antlr 3.1b2.
........
  r5027 | nriley | 2008-07-31 12:03:59 -0400 (Thu, 31 Jul 2008) | 1 line
  
  Update Eclipse classpath to Antlr 3.1b2.
........
  r5028 | fwierzbicki | 2008-07-31 12:14:55 -0400 (Thu, 31 Jul 2008) | 14 lines
  
  Adding a Jython specific version of CommonErrorNode to use when there are errors
  in the AST but we want to continue parsing (for now this is only of use by external
  tools, but I'm considering making it an option since the information can be useful.
  
  Thanks to Allan Davis for the original version of CommonErrorNode.  I've refactored his
  version so that PythonErrorNode does not repeat much of CommonErrorNode and put the
  creation logic into PythonTreeAdaptor.
  
  I have also added an interface ErrorHandler that allows the error handling in antlr to
  be customized.  FailFastHandler implements the default behavior of dying on the first
  parse error.  I also made the parse error output more useful, and factored a BaseParser
  out of the org/python/antlr/*Parser classes.
........
  r5029 | pjenvey | 2008-07-31 14:47:34 -0400 (Thu, 31 Jul 2008) | 3 lines
  
  rearrange imports to fix test_threaded_import -- a bogus fix, but also what
  CPython did for this problem
........
  r5030 | pjenvey | 2008-07-31 15:50:45 -0400 (Thu, 31 Jul 2008) | 4 lines
  
  o fix test_softspace and reset softspace (and append a newline) in various
  places (equiv. of CPython's ceval.c::Py_FlushLine)
  o fix traceback source lines without trailing newlines (fixes #1087)
........
  r5031 | fwierzbicki | 2008-07-31 16:13:12 -0400 (Thu, 31 Jul 2008) | 2 lines
  
  Fixed generator args check (antlr3.1b2 broke this, fixed it again).
........
  r5032 | fwierzbicki | 2008-07-31 16:50:59 -0400 (Thu, 31 Jul 2008) | 3 lines
  
  Tightened up signature of ErrorHandler and added a ListErrorHandler that
  mimics Antlr default behavior for error handling.
........
  r5033 | pjenvey | 2008-07-31 18:07:13 -0400 (Thu, 31 Jul 2008) | 1 line
  
  deprecate complex divmod(), // and %
........
  r5034 | pjenvey | 2008-07-31 19:16:37 -0400 (Thu, 31 Jul 2008) | 1 line
  
  move __index__ out of the generated code section
........
  r5035 | pjenvey | 2008-07-31 19:18:33 -0400 (Thu, 31 Jul 2008) | 1 line
  
  sync with a couple of manual changes PyInstance has had
........
  r5036 | pjenvey | 2008-07-31 19:32:03 -0400 (Thu, 31 Jul 2008) | 2 lines
  
  support threading._RLock, as twisted uses it
  fixes #1079
........
  r5037 | pjenvey | 2008-07-31 19:49:50 -0400 (Thu, 31 Jul 2008) | 5 lines
  
  fix a couple test_coercion cases:
  o fix broken PyComplex.__rfloordiv__
  o prevent stack overflows when old style classes return __coerce__ args in
  reversed order
........
  r5038 | pjenvey | 2008-07-31 19:57:11 -0400 (Thu, 31 Jul 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_operator.py@...>
........
  r5039 | pjenvey | 2008-07-31 19:59:25 -0400 (Thu, 31 Jul 2008) | 2 lines
  
  o filter operator slice args through __index__
  o workaround Jython's lack of a real repeat/concat binop in test_operator
........
  r5040 | fwierzbicki | 2008-07-31 20:50:28 -0400 (Thu, 31 Jul 2008) | 2 lines
  
  remove unneeded member.
........
  r5041 | nriley | 2008-08-01 16:06:44 -0400 (Fri, 01 Aug 2008) | 1 line
  
  Make the ihooks module importable.
........
  r5042 | nriley | 2008-08-01 16:07:47 -0400 (Fri, 01 Aug 2008) | 1 line
  
  Support one-argument builtin apply.
........
  r5043 | nriley | 2008-08-01 16:22:22 -0400 (Fri, 01 Aug 2008) | 1 line
  
  Replace python.prepath with python.path.
........
  r5044 | fwierzbicki | 2008-08-01 16:37:46 -0400 (Fri, 01 Aug 2008) | 3 lines
  
  Better handling of bad dedent.  Not perfect since it throws the
  wrong exception.
........
  r5045 | pjenvey | 2008-08-01 17:47:30 -0400 (Fri, 01 Aug 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_class.py@...>
........
  r5046 | pjenvey | 2008-08-01 17:49:29 -0400 (Fri, 01 Aug 2008) | 1 line
  
  fix instancemethod cmp to make test_class pass
........
  r5047 | nriley | 2008-08-01 18:28:33 -0400 (Fri, 01 Aug 2008) | 1 line
  
  Read python.executable from whole registry, not just top level.
........
  r5048 | pjenvey | 2008-08-01 18:28:52 -0400 (Fri, 01 Aug 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_descrtut.py@...>
........
  r5049 | pjenvey | 2008-08-01 18:38:32 -0400 (Fri, 01 Aug 2008) | 3 lines
  
  list.__nonzero__ needn't be exposed, couple test_descrtut fixes (though it
  still fails due to parser problems)
........
  r5050 | nriley | 2008-08-01 19:02:47 -0400 (Fri, 01 Aug 2008) | 1 line
  
  JYTHONPATH support.
........
  r5051 | nriley | 2008-08-02 04:48:11 -0400 (Sat, 02 Aug 2008) | 1 line
  
  Handle scripts on stdin.
........
  r5052 | nriley | 2008-08-02 04:49:57 -0400 (Sat, 02 Aug 2008) | 1 line
  
  jna-posix from http://svn.codehaus.org/jruby-contrib/trunk/jna-posix r213 + patch in http://jira.codehaus.org/browse/JRUBY-2885 for isatty on Windows
........
  r5053 | pjenvey | 2008-08-02 15:51:15 -0400 (Sat, 02 Aug 2008) | 5 lines
  
  switch some new style unary ops to throw TypeErrors instead of AttributeErrors
  when not implemented. the old styles still raise AttributeErrors (both styles
  now match CPython). we assume __len/int/long/float/complex__ raise
  AttributeErrors in many places so leaving them alone for now
........
  r5054 | zyasoft | 2008-08-02 17:35:23 -0400 (Sat, 02 Aug 2008) | 3 lines
  
  Raise a ValueError if attempt to set thread.stack_size > 0 but <
  32768. Fixes test_thread.
........
  r5055 | zyasoft | 2008-08-02 17:40:59 -0400 (Sat, 02 Aug 2008) | 4 lines
  
  threading does not maintain a dict of limbo threads, since this
  doesn't make sense in Jython. Remove code testing cleanup of
  threading._limbo in test_support.threading_setup/thread_cleanup
........
  r5056 | zyasoft | 2008-08-02 17:43:22 -0400 (Sat, 02 Aug 2008) | 5 lines
  
  Fixed roundtripping so that eval(str(a)) == a where a uses a typecode
  of a Java object, along with other similar minor issues. Rewrote
  test_array_jy to use unittest, and removed testing now being done by
  standard 2.5 test_array
........
  r5057 | pjenvey | 2008-08-02 22:13:36 -0400 (Sat, 02 Aug 2008) | 3 lines
  
  o pre and xreadlines were removed in CPython 2.4
  o include some other modules I hope actually work
........
  r5058 | zyasoft | 2008-08-02 23:09:49 -0400 (Sat, 02 Aug 2008) | 4 lines
  
  Unicode arrays -- array.array('u') -- now work as expected, by special
  casing the fact that we are storing them as an array of codepoints
  (ints). Because of this, byteswap doesn't make sense.
........
  r5059 | nriley | 2008-08-03 00:33:38 -0400 (Sun, 03 Aug 2008) | 1 line
  
  Remove workaround for issue 1059 (was fixed in r4713).
........
  r5060 | nriley | 2008-08-03 00:45:30 -0400 (Sun, 03 Aug 2008) | 1 line
  
  jna-posix from http://svn.codehaus.org/jruby-contrib/trunk/jna-posix r213 + patch in http://jira.codehaus.org/browse/JRUBY-2885 for isatty on Windows + patch in http://jira.codehaus.org/browse/JRUBY-2887 for atime setting
........
  r5061 | zyasoft | 2008-08-03 00:45:39 -0400 (Sun, 03 Aug 2008) | 5 lines
  
  Allow typecodes of B, H, I to fully use their storage. Don't run
  test_byteswap for u (Unicode) because it doesn't make sense given
  UTF-16 decoding.
  Fixes test_array.
........
  r5062 | nriley | 2008-08-03 00:47:37 -0400 (Sun, 03 Aug 2008) | 1 line
  
  Support setting atime from os.utime.
........
  r5063 | nriley | 2008-08-03 00:49:27 -0400 (Sun, 03 Aug 2008) | 1 line
  
  Don't create file opened with r+; better validate file modes (fixes test_mailbox).
........
  r5064 | zyasoft | 2008-08-03 01:11:47 -0400 (Sun, 03 Aug 2008) | 2 lines
  
  Basic cleanup so that test_socket is runnable under current testing.
........
  r5065 | nriley | 2008-08-03 03:42:24 -0400 (Sun, 03 Aug 2008) | 1 line
  
  Fix mistaken assumption that 'r+' will create a file.
........
  r5066 | nriley | 2008-08-03 05:50:01 -0400 (Sun, 03 Aug 2008) | 1 line
  
  jna-posix from http://svn.codehaus.org/jruby-contrib/trunk/jna-posix r213 + patch in http://jira.codehaus.org/browse/JRUBY-2885 for isatty on Windows + patch in http://jira.codehaus.org/browse/JRUBY-2887 for atime setting (now with Windows support)
........
  r5067 | fwierzbicki | 2008-08-03 10:42:44 -0400 (Sun, 03 Aug 2008) | 7 lines
  
  Passed filename along to parsers and PythonTokenSource.  created
  a PyIndentationError to allow me derive IndentationErrors from 
  ParseException.  Added a "type" to ParseException to recognize
  when an IndentationError is needed.  Changed test_traceback slightly
  because I believe Antlr comes up with a better placement for the
  carot vs CPython (at the indent and not end of line for indent errors.
........
  r5068 | fwierzbicki | 2008-08-03 12:30:08 -0400 (Sun, 03 Aug 2008) | 5 lines
  
  Small change for Jython -- it will be too hard in the short term to use
  CPython's "Store" where Jython uses "AugStore" for AugAssigns.  Eventually I do
  intend to fix this, but it will take a little more work in the compiler than I
  want to do just now.
........
  r5069 | pjenvey | 2008-08-03 14:14:53 -0400 (Sun, 03 Aug 2008) | 1 line
  
  expand tabs
........
  r5070 | pjenvey | 2008-08-03 14:18:34 -0400 (Sun, 03 Aug 2008) | 2 lines
  
  o FileIO whitespace, small refactor
  o re-enable test_ast
........
  r5071 | fwierzbicki | 2008-08-03 16:17:40 -0400 (Sun, 03 Aug 2008) | 2 lines
  
  Partial fix for #1092 (just a comment no newline).
........
  r5072 | fwierzbicki | 2008-08-03 17:45:49 -0400 (Sun, 03 Aug 2008) | 2 lines
  
  whitespace
........
  r5073 | fwierzbicki | 2008-08-03 18:54:14 -0400 (Sun, 03 Aug 2008) | 3 lines
  
  CommonToken now appears to cover the cases that ClassicToken was left around
  to cover.  Removed all ClassicToken.
........
  r5074 | fwierzbicki | 2008-08-03 21:15:48 -0400 (Sun, 03 Aug 2008) | 2 lines
  
  Fixes to handle parsing with files that have no newline at the end.
........
  r5075 | fwierzbicki | 2008-08-03 22:36:46 -0400 (Sun, 03 Aug 2008) | 2 lines
  
  Some checks for assignment to None.
........
  r5076 | nriley | 2008-08-03 23:23:57 -0400 (Sun, 03 Aug 2008) | 1 line
  
  Truncate files opened with the 'w+' mode; some FileIO cleanup.  Re-fixes test_fileno.
........
  r5077 | fwierzbicki | 2008-08-04 13:57:34 -0400 (Mon, 04 Aug 2008) | 15 lines
  
  In test_decorators.py, test_eval_order cleverly instruments a decorated call so
  the order of evaluation and calls can be determined.  It also checks to see if
  the decoration works exactly the same when translated to nested function calls. 
  Jython was evaluating the arguments before the function name, the opposite of
  CPython.  This patch makes the order correct for both decorators and normal
  function calls.  Also, PyObject.invoke states in its comments that it is for use
  from Java and shows the equivalent
  
  o.__getattr__(name).__call__(args, keywords)
  
  which is how I am constructing a call in the bytecode.  I also thought that
  "Invoke" with a capitalized name was non-ideal, so I changed the name to
  invokeNoKeywords, which also allowed me to remove a comment that conveyed the
  same meaning.
........
  r5078 | pjenvey | 2008-08-04 17:34:24 -0400 (Mon, 04 Aug 2008) | 1 line
  
  gather more info about the flakey test_hash OutOfMemoryError
........
  r5079 | fwierzbicki | 2008-08-05 12:55:18 -0400 (Tue, 05 Aug 2008) | 4 lines
  
  Reworked lexing of newlines and EOF.  Broke up PythonTokenSource into more
  useful methods.  Removed inSingle from Python.g and added it to
  PythonTokenSource.
........
  r5080 | fwierzbicki | 2008-08-05 13:16:19 -0400 (Tue, 05 Aug 2008) | 2 lines
  
  Guard against null text in PySyntaxError.
........
  r5081 | fwierzbicki | 2008-08-05 16:21:24 -0400 (Tue, 05 Aug 2008) | 3 lines
  
  Commenting out the strange eval parsing errors - I'm working elsewhere at the
  moment and having test_jy_compile as a coal mine canary will be very helpful.
........
  r5082 | fwierzbicki | 2008-08-05 18:39:04 -0400 (Tue, 05 Aug 2008) | 3 lines
  
  Fix test_pkgimport for Jython (was deleting .pyc and .pyo files, now
  deleted $py.class files on Jython).
........
  r5083 | fwierzbicki | 2008-08-05 18:40:19 -0400 (Tue, 05 Aug 2008) | 2 lines
  
  Forgot our convention.
........
  r5084 | fwierzbicki | 2008-08-05 18:45:16 -0400 (Tue, 05 Aug 2008) | 3 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_pkgimport.py@...>
........
  r5085 | fwierzbicki | 2008-08-05 18:51:03 -0400 (Tue, 05 Aug 2008) | 3 lines
  
  Fix test_pkgimport for Jython.  Now deleting $py.class files on Jython, and
  using __builtin__ instead of the CPython implementatin specific __buitlins__.
........
  r5086 | fwierzbicki | 2008-08-05 19:44:49 -0400 (Tue, 05 Aug 2008) | 2 lines
  
  2 new passing tests.
........
  r5087 | fwierzbicki | 2008-08-05 19:46:30 -0400 (Tue, 05 Aug 2008) | 2 lines
  
  Finish out "IN" as a token.
........
  r5088 | fwierzbicki | 2008-08-05 22:19:54 -0400 (Tue, 05 Aug 2008) | 2 lines
  
  fix for Java integration ("in" and "class" can now be used as non-keywords).
........
  r5089 | fwierzbicki | 2008-08-05 22:27:45 -0400 (Tue, 05 Aug 2008) | 2 lines
  
  Extra comment as a reminder about keywords.
........
  r5090 | pjenvey | 2008-08-05 22:48:46 -0400 (Tue, 05 Aug 2008) | 4 lines
  
  PEP 305 (csv module)
  patches from Paul Drummond, Dave Kuhlman (thanks!)
  fixes #1650802
........
  r5091 | fwierzbicki | 2008-08-06 07:59:35 -0400 (Wed, 06 Aug 2008) | 4 lines
  
  call clean if grammars change.  Really only needed when *tokens* change,
  but token changes break things so subtly, and so few work on the grammars
  anyway, that this is the way to go I think.
........
  r5092 | fwierzbicki | 2008-08-06 08:08:16 -0400 (Wed, 06 Aug 2008) | 2 lines
  
  trigger jarjar if grammar changes (since clean is triggered).
........
  r5093 | fwierzbicki | 2008-08-06 09:05:15 -0400 (Wed, 06 Aug 2008) | 8 lines
  
  Support "in" as an attribute for Java compatibility, but not as a
  NAME since this is overkill and causes errors (for example:
  
  for x, in ((1,),(2,)):
  
  parses "x, in" as a tuple (x,in) if "in" is treated like a name.  bad.
........
  r5094 | fwierzbicki | 2008-08-06 13:54:07 -0400 (Wed, 06 Aug 2008) | 10 lines
  
  Changed grammars to allow most keywords to be used as attributes for Java
  compatibility.  Also added some tests.  Removed a couple of tests that use
  keywords as function names as this is no longer permitted.  Allowing keywords to
  be used as arbitrary NAMEs causes very weird grammar issues.  For example
  
  for x, in ((1,),(2,)):
  
  matched "x, in" as a tuple.  Now the permitted use is limited to things like
  foo.in()
........
  r5095 | fwierzbicki | 2008-08-06 14:15:17 -0400 (Wed, 06 Aug 2008) | 4 lines
  
  improved jarjar conditional -- but made build.xml slightly more impenetrable.
  Sigh.
........
  r5096 | pjenvey | 2008-08-06 14:45:50 -0400 (Wed, 06 Aug 2008) | 3 lines
  
  fix zipimport not handling mismatched APIVersion, and imp.load_module not
  handling it either for packages
........
  r5097 | fwierzbicki | 2008-08-06 15:05:52 -0400 (Wed, 06 Aug 2008) | 2 lines
  
  More thorough keyword testing.
........
  r5098 | fwierzbicki | 2008-08-06 15:35:41 -0400 (Wed, 06 Aug 2008) | 10 lines
  
  Line and column position for
  
  from __future__ import braces
  
  Also fixed
  
  from __future__ import GIL
  
  Good thing there are unit tests for this  :)
........
  r5099 | fwierzbicki | 2008-08-06 19:51:03 -0400 (Wed, 06 Aug 2008) | 4 lines
  
  Putting in fake SystemRandom that throws NotImplementedError on
  all accesses so the rest of test_random.py can run (and fail for
  better reasons).
........
  r5100 | leosoto | 2008-08-06 22:27:08 -0400 (Wed, 06 Aug 2008) | 1 line
  
  Experimental interpreter restarting support, aimed at webapp dev-server 'reloading', without having to resort to process forking. There is more info here: <http://codereview.appspot.com/2810>, where I posted the first attempt of this patch
........
  r5102 | nriley | 2008-08-07 13:11:16 -0400 (Thu, 07 Aug 2008) | 1 line
  
  Don't attempt to test AWT if we have no display.
........
  r5103 | zyasoft | 2008-08-07 17:07:09 -0400 (Thu, 07 Aug 2008) | 3 lines
  
  From
  http://svn.python.org/projects/python/branches/release25-maint/Lib/pkgutil.py@...>
........
  r5104 | zyasoft | 2008-08-07 17:18:44 -0400 (Thu, 07 Aug 2008) | 9 lines
  
  Replaces pkgutil.read_code with read_jython_code (diff args); this
  depends on the actual bytecode storage, so we have to have something
  specific here. get_loader special cases for the sys module, since
  Jython doesn't actually implement this as a module (and it appears to
  be a non-trivial decoupling to make it so with the current
  PySystemState).
  
  This fixes test_runpy.
........
  r5105 | zyasoft | 2008-08-08 11:37:43 -0400 (Fri, 08 Aug 2008) | 7 lines
  
  With statements now keep their own stack of exit functions in PyFrame
  so that they don't get stepped on by generators save/restore of local
  temporary registers. Fixes most problems in test_with, including JVM
  verification errors. (Remaining issues seem to be with generator exit
  issues, to be resolved separately.)
........
  r5106 | fwierzbicki | 2008-08-08 13:42:06 -0400 (Fri, 08 Aug 2008) | 3 lines
  
  make jarjar run all of the time until I figure out why the conditionals
  are not working.
........
  r5107 | fwierzbicki | 2008-08-08 13:56:53 -0400 (Fri, 08 Aug 2008) | 3 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_codeop.py@...>
........
  r5108 | fwierzbicki | 2008-08-08 14:24:44 -0400 (Fri, 08 Aug 2008) | 10 lines
  
  Various fixes to improve Jython compatibility with CPython, especially when
  passing PyCF_DONT_IMPLY_DEDENT.  Added PyCF_DONT_IMPLY_DEDENT to codeop.py,
  PyTableCode.java, and CompilerFlags.java to help test_codeop.py run.  Began to
  integrate tests from test_jy_compile.py, which appears to have started as a copy
  of test_codeop.py, into test_codeop.py.  Once test_jy_compile is fully
  integrated into test_codeop.py I should be able to delete test_jy_compile.  Also
  added eval support to PythonPartial.g, since test_codeop exercises that
  functionality.
........
  r5109 | fwierzbicki | 2008-08-08 15:24:38 -0400 (Fri, 08 Aug 2008) | 2 lines
  
  Remove debug string.
........
  r5110 | fwierzbicki | 2008-08-08 15:30:38 -0400 (Fri, 08 Aug 2008) | 5 lines
  
  Extracted the actions from the grammars into a single GrammarActions
  file.  This will help if I ever get far enough on integrating the two
  grammars into one.  Also started an ErrorStmt node to handle bogus
  statements in the walker.
........
  r5111 | pjenvey | 2008-08-08 18:07:24 -0400 (Fri, 08 Aug 2008) | 5 lines
  
  o another fix to make 'currentThread() is currentThread()' from
  thread.start_new_thread threads. use a WeakHashMap because weakrefs of
  javainstances ref the wrapper, not the actual java object
  o custom toString for FunctionThread
........
  r5112 | fwierzbicki | 2008-08-08 19:54:06 -0400 (Fri, 08 Aug 2008) | 2 lines
  
  New error nodes for tool ASTs.  Added errorhandling methods to ErrorHandler.
........
  r5113 | pjenvey | 2008-08-08 20:37:11 -0400 (Fri, 08 Aug 2008) | 1 line
  
  allow subclasses in getPyObjectByType
........
  r5114 | zyasoft | 2008-08-09 01:36:17 -0400 (Sat, 09 Aug 2008) | 3 lines
  
  Reordered code to test for raising exceptions thrown into a generator,
  fixing test cases in test_contextlib, test_generators, and test_with.
........
  r5115 | pjenvey | 2008-08-09 02:12:17 -0400 (Sat, 09 Aug 2008) | 2 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/list_tests.py@...>
........
  r5116 | pjenvey | 2008-08-09 02:17:43 -0400 (Sat, 09 Aug 2008) | 4 lines
  
  o re-integrate list_tests workaround and use stock 2.5 seq_tests
  o fix list.index handling of long start values and slice assignment of strings
  o raise MemoryErrors as per seq_tests.test_bigrepeat
........
  r5117 | pjenvey | 2008-08-09 02:18:29 -0400 (Sat, 09 Aug 2008) | 1 line
  
  fix test_weakref, re-enable 2.5isms
........
  r5119 | fwierzbicki | 2008-08-09 09:52:14 -0400 (Sat, 09 Aug 2008) | 3 lines
  
  debug() is not really all that necessary now that these have been extracted from
  the .g files.
........
  r5120 | fwierzbicki | 2008-08-09 10:00:30 -0400 (Sat, 09 Aug 2008) | 2 lines
  
  Surely a typo?
........
  r5121 | fwierzbicki | 2008-08-09 10:25:25 -0400 (Sat, 09 Aug 2008) | 3 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test_genexps.py@...>
........
  r5122 | fwierzbicki | 2008-08-09 12:27:42 -0400 (Sat, 09 Aug 2008) | 4 lines
  
  added #doctest: +IGNORE_EXCEPTION_DETAIL for SyntaxErrors that
  just have "invalid syntax" as the detail, since this is the
  default message and Antlr actually gives more information.
........
  r5123 | fwierzbicki | 2008-08-09 13:07:19 -0400 (Sat, 09 Aug 2008) | 2 lines
  
  Don't allow generator expressions on left side of assignment.
........
  r5124 | fwierzbicki | 2008-08-09 13:35:06 -0400 (Sat, 09 Aug 2008) | 2 lines
  
  Call __iter__ on the iter part of gen expressions.
........
  r5125 | pjenvey | 2008-08-09 17:53:44 -0400 (Sat, 09 Aug 2008) | 3 lines
  
  fix remove() not fully zeroing out the end of the array, causing a small memory
  leak. fixes test_deque.test_weakref
........
  r5126 | pjenvey | 2008-08-09 18:02:39 -0400 (Sat, 09 Aug 2008) | 2 lines
  
  reprStack isn't exposed anywhere, simplify it as a Stack
........
  r5127 | pjenvey | 2008-08-09 18:05:00 -0400 (Sat, 09 Aug 2008) | 2 lines
  
  typo/thinko
  pointed out by lsoto
........
  r5128 | pjenvey | 2008-08-09 19:02:50 -0400 (Sat, 09 Aug 2008) | 1 line
  
  oops, Stack won't work because we need to compare via identity. revert r5126
........
  r5129 | nriley | 2008-08-09 19:40:43 -0400 (Sat, 09 Aug 2008) | 1 line
  
  Don't try tests expecting MemoryError which can pass with large Java heaps.
........
  r5130 | fwierzbicki | 2008-08-10 11:03:21 -0400 (Sun, 10 Aug 2008) | 3 lines
  
  Ignoring other SyntaxError details for now -- though I probably want to
  re-enable these two later.
........
  r5131 | fwierzbicki | 2008-08-10 11:31:52 -0400 (Sun, 10 Aug 2008) | 4 lines
  
  Choose a name for the bound parameter to generator expressions that can't
  collide with a real NAME.  Arbitrarily picked _(x) just because it looks a bit
  like the names of the gen expressions themselves.
........
  r5132 | zyasoft | 2008-08-10 15:52:51 -0400 (Sun, 10 Aug 2008) | 5 lines
  
  After a more careful reading of PEP 342: need to emit bytecode for
  getGeneratorInput and possible raising exception before any yields;
  and after each yield point.
  This one-line change fixes test_contextlib
........
  r5133 | leosoto | 2008-08-10 16:50:55 -0400 (Sun, 10 Aug 2008) | 3 lines
  
  Added coercion to the cmp() algorithm, which is also used for comparison operators in the absence of rich cmp methods (See #1031). In the process, __coerce_ex__ was added to deriveds, and a slight refactor was made on types exposing __coerce__ to avoid using the __coerce_ex__ virtual method on the exposed methods code.
  
  Fixes test_coercion.
........
  r5134 | leosoto | 2008-08-10 17:09:42 -0400 (Sun, 10 Aug 2008) | 1 line
  
  Added test_cmp_jy, with should have tests to ensure CPython compatibility on cmp(). Currently, it only contains test cases for the problems exposed on  http://bugs.jython.org/issue1889394
........
  r5135 | leosoto | 2008-08-10 17:14:36 -0400 (Sun, 10 Aug 2008) | 1 line
  
  Added cmp test for http://bugs.jython.org/issue1869347
........
  r5136 | leosoto | 2008-08-10 17:19:00 -0400 (Sun, 10 Aug 2008) | 1 line
  
  Added test for http://bugs.jython.org/issue1804011 (derived_dict() must be equal to {})
........
  r5137 | pjenvey | 2008-08-10 17:30:15 -0400 (Sun, 10 Aug 2008) | 3 lines
  
  o __float__ should always return a PyFloat, no need to cast in complex new
  o prefer PyObject.isCallable to __builtin__'s
........
  r5138 | zyasoft | 2008-08-10 18:57:07 -0400 (Sun, 10 Aug 2008) | 3 lines
  
  Properly closes a generator upon close/throw including throwing
  StopIteration upon a send to a closed generator.
........
  r5139 | zyasoft | 2008-08-10 19:14:13 -0400 (Sun, 10 Aug 2008) | 2 lines
  
  Import test_support from test
........
  r5140 | fwierzbicki | 2008-08-10 20:32:24 -0400 (Sun, 10 Aug 2008) | 3 lines
  
  Can't assign to Num and better placement for checkAssign, so
  lambdef and fplist also get checks for args.
........
  r5141 | zyasoft | 2008-08-10 22:56:53 -0400 (Sun, 10 Aug 2008) | 3 lines
  
  from X import * now raises the appropriate syntax errors (for nested
  scopes) or warning (otherwise).
........
  r5142 | zyasoft | 2008-08-10 23:17:44 -0400 (Sun, 10 Aug 2008) | 5 lines
  
  Commented out inappropriate doctest in test_genexps that tested for
  the reuse of memory objects. This obviously doesn't apply to Jython
  and other nonrefcounted implementations.
  Fixes test_genexps
........
  r5143 | zyasoft | 2008-08-11 00:09:35 -0400 (Mon, 11 Aug 2008) | 3 lines
  
  From
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_generators.py@...>
........
  r5144 | leosoto | 2008-08-11 01:35:18 -0400 (Mon, 11 Aug 2008) | 1 line
  
  Really fix coercion on derived this time
........
  r5145 | fwierzbicki | 2008-08-11 01:37:15 -0400 (Mon, 11 Aug 2008) | 2 lines
  
  Properly handle tuples in subscripts (last test_grammar problem!)
........
  r5146 | zyasoft | 2008-08-11 01:52:43 -0400 (Mon, 11 Aug 2008) | 4 lines
  
  Another corner case for generators: .throw on a just-started generator
  should immediately raise an exception in the current context. Also
  fixed buggy tests in test_generators.
........
  r5147 | pjenvey | 2008-08-11 02:59:28 -0400 (Mon, 11 Aug 2008) | 4 lines
  
  o change PySlice.indices to work like CPython's PySlice_GetIndicesEx (include a
  slicelength value)
  o reject PySequence slice assignments with a step and mismatching slicelengths
........
  r5148 | pjenvey | 2008-08-11 03:03:25 -0400 (Mon, 11 Aug 2008) | 1 line
  
  cleanup/coding standards
........
  r5149 | fwierzbicki | 2008-08-11 08:44:54 -0400 (Mon, 11 Aug 2008) | 2 lines
  
  Switch to for-each syntax in walker.
........
  r5150 | fwierzbicki | 2008-08-11 12:43:44 -0400 (Mon, 11 Aug 2008) | 2 lines
  
  Added 3 arg and 4 arg __call__
........
  r5151 | fwierzbicki | 2008-08-11 14:31:41 -0400 (Mon, 11 Aug 2008) | 3 lines
  
  remove LeadingSpaceSkippingStream and replace with LEADING_WS in Python.g.
  No idea what I was thinking with LeadingSpaceSkippingStream...
........
  r5152 | fwierzbicki | 2008-08-11 15:25:46 -0400 (Mon, 11 Aug 2008) | 2 lines
  
  Tightened up eval and uncommented tests in test_jy_compile.
........
  r5153 | fwierzbicki | 2008-08-11 15:48:31 -0400 (Mon, 11 Aug 2008) | 2 lines
  
  Moved buffered stream creation from many places to one place.
........
  r5154 | pjenvey | 2008-08-11 18:24:20 -0400 (Mon, 11 Aug 2008) | 3 lines
  
  make the stepless slice ops more consistent with the compiler by passing null
  for step instead of Py.One, fixes test_operator.test_setslice
........
  r5155 | leosoto | 2008-08-11 19:27:27 -0400 (Mon, 11 Aug 2008) | 1 line
  
  __findattr__ refactor. The overridable version is not called __findattr_ex__ (in the abscense of a better name), and can return null or raise AttributeError, whatever is more efficient for the implementing code. This makes *Derived getattr() more correct and fixes #1041 and #1095. 
........
  r5156 | fwierzbicki | 2008-08-12 13:17:12 -0400 (Tue, 12 Aug 2008) | 4 lines
  
  Implement BOM handling as much as CPython 2.5 does.  Altered
  bad_coding2.py because Java, unlike CPython accepts "utf8" as
  a synonymn for "utf-8"
........
  r5157 | fwierzbicki | 2008-08-12 14:11:38 -0400 (Tue, 12 Aug 2008) | 2 lines
  
  Disallow encodings from unicode input.  Fixes one test in test_compile.py.
........
  r5158 | fwierzbicki | 2008-08-12 14:17:00 -0400 (Tue, 12 Aug 2008) | 3 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_compile.py@...>
........
  r5159 | fwierzbicki | 2008-08-12 14:24:24 -0400 (Tue, 12 Aug 2008) | 2 lines
  
  Don't try really long args on Jython for now.
........
  r5160 | fwierzbicki | 2008-08-12 14:40:38 -0400 (Tue, 12 Aug 2008) | 2 lines
  
  Trailing commas not allowed outside of parens.
........
  r5161 | fwierzbicki | 2008-08-12 14:57:22 -0400 (Tue, 12 Aug 2008) | 3 lines
  
  Since the comment for test_leading_newlines suggests that this
  may be CPython implementation specific, skip.
........
  r5162 | fwierzbicki | 2008-08-12 15:47:24 -0400 (Tue, 12 Aug 2008) | 2 lines
  
  fixes, workarounds, and a couple of punts for test_compile.py.
........
  r5163 | leosoto | 2008-08-12 18:58:47 -0400 (Tue, 12 Aug 2008) | 1 line
  
  subprocess.Popen now "inherits" os.environ if env is not explictely set. Fixes #1104
........
  r5164 | fwierzbicki | 2008-08-12 20:30:38 -0400 (Tue, 12 Aug 2008) | 4 lines
  
  Before this check-in there was an AST inconsistency with CPython.  To pick one
  example, CPython's AST for --1 is (USub(-1)) and Jython is (Usub(Usub(1)).  This
  fixes that inconsistency.
........
  r5165 | fwierzbicki | 2008-08-12 20:53:09 -0400 (Tue, 12 Aug 2008) | 4 lines
  
  Avoiding a test for constant folding -- I think it is an implementation detail
  though I think it wouldn't be too hard to fix in the grammar.  It's just not a
  top priority.
........
  r5166 | fwierzbicki | 2008-08-12 23:48:00 -0400 (Tue, 12 Aug 2008) | 2 lines
  
  Remove direct exception throwing for tooling. 
........
  r5168 | fwierzbicki | 2008-08-13 10:52:12 -0400 (Wed, 13 Aug 2008) | 2 lines
  
  Jython can handle atof with hex floats and large unicode values.
........
  r5169 | fwierzbicki | 2008-08-13 12:21:18 -0400 (Wed, 13 Aug 2008) | 2 lines
  
  remove comment that is no longer True, thanks to Leo Soto for pointing this out.
........
  r5170 | fwierzbicki | 2008-08-13 15:25:13 -0400 (Wed, 13 Aug 2008) | 3 lines
  
  from:
  http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_syntax.py@...>
........
  r5171 | fwierzbicki | 2008-08-13 15:48:08 -0400 (Wed, 13 Aug 2008) | 2 lines
  
  Make errtext optional in test_syntax and fixed illegal delete of function call.
........
  r5172 | pjenvey | 2008-08-13 19:35:12 -0400 (Wed, 13 Aug 2008) | 3 lines
  
  fix alignment of little and big endian long longs. caused extra padding which
  broke test_zipfile zip64 tests
........
  r5173 | fwierzbicki | 2008-08-13 20:07:31 -0400 (Wed, 13 Aug 2008) | 2 lines
  
  Add EOF check for file_input.
........
  r5174 | fwierzbicki | 2008-08-13 20:35:01 -0400 (Wed, 13 Aug 2008) | 2 lines
  
  antlr 3.1 final.
........
  r5175 | fwierzbicki | 2008-08-13 22:00:01 -0400 (Wed, 13 Aug 2008) | 2 lines
  
  Add EOF to single_input.
........
  r5176 | fwierzbicki | 2008-08-14 13:51:34 -0400 (Thu, 14 Aug 2008) | 2 lines
  
  Updated comment.
........
  r5177 | fwierzbicki | 2008-08-14 14:48:37 -0400 (Thu, 14 Aug 2008) | 4 lines
  
  Ignoring exception message details.  This actually allows more of this test to
  run (the doctests don't run if any of the regular tests fail).  This reveals
  more legitimate failures than before.
........
  r5178 | fwierzbicki | 2008-08-15 07:43:53 -0400 (Fri, 15 Aug 2008) | 2 lines
  
  Use same lexer and token source for parsing and partial parsing.
........
  r5179 | fwierzbicki | 2008-08-15 13:55:20 -0400 (Fri, 15 Aug 2008) | 2 lines
  
  small name change.
........
  r5180 | fwierzbicki | 2008-08-15 14:37:14 -0400 (Fri, 15 Aug 2008) | 3 lines
  
  don't allow assignment to yields.  Fixes 2 doctests in test_generator as long as we
  ignore the exact error message.
........
  r5181 | fwierzbicki | 2008-08-15 15:44:57 -0400 (Fri, 15 Aug 2008) | 2 lines
  
  Refactor: put repeated code into one method.
........
  r5182 | leosoto | 2008-08-15 16:15:50 -0400 (Fri, 15 Aug 2008) | 1 line
  
  A start for unicodedata. Only implements normalize()
........
  r5183 | leosoto | 2008-08-15 19:03:17 -0400 (Fri, 15 Aug 2008) | 1 line
  
  Reverted r5182, as the implementation of unicodedata.normalize required Java 1.6. Sorry!
........
  r5184 | zyasoft | 2008-08-16 01:35:48 -0400 (Sat, 16 Aug 2008) | 18 lines
  
  Fixes for and in test_builtin:
  
   * test_builtin.test_cmp because we let Jython compare objects with cycles
     in them, unlike CPython
  
   * test_builtin.test_general_eval - Jython can use arbitrary maps for
     globals; this was discussed for CPython. Not in current 2.6,
     perhaps because it touched a lot of code or issues with performance
     (see http://bugs.python.org/issue1402289)
  
   * __builtin__#eval/compile - Now validate that locals or globals are
     in fact mapping objects, as well as ensure that locals().keys() is
     a PyList (to avoid throwing a CheckCastException)
  
   * Py#compile_flags - if passed in a String to compile, ensure it does
     not contain a null byte
........
  r5185 | nriley | 2008-08-16 02:09:33 -0400 (Sat, 16 Aug 2008) | 1 line
  
  Permit removal/modification of attributes on PySystemState; add __name__.
........
  r5186 | nriley | 2008-08-16 02:18:30 -0400 (Sat, 16 Aug 2008) | 1 line
  
  Update Eclipse classpath to Antlr 3.1 final.
........
  r5187 | zyasoft | 2008-08-16 02:22:40 -0400 (Sat, 16 Aug 2008) | 5 lines
  
  input and raw_input now appropriately raise a RuntimeError if
  sys.stdin/stdout are deleted (via the facade of
  PySystemState.PyAttributeDeleted)
........
  r5188 | fwierzbicki | 2008-08-16 09:56:28 -0400 (Sat, 16 Aug 2008) | 2 lines
  
  Method not used.
........
  r5189 | fwierzbicki | 2008-08-16 15:31:55 -0400 (Sat, 16 Aug 2008) | 2 lines
  
  Shouldn't be discarding hidden tokens.
........
  r5190 | fwierzbicki | 2008-08-16 18:46:04 -0400 (Sat, 16 Aug 2008) | 2 lines
  
  Fix comment/newline parsing problems in interactive (single) parsing.
........
  r5191 | fwierzbicki | 2008-08-16 20:02:42 -0400 (Sat, 16 Aug 2008) | 3 lines
  
  check for Py.None in runCode as well as null for locals
  and globals.  Fixes test_decorators.py
........
  r5192 | nriley | 2008-08-16 22:23:19 -0400 (Sat, 16 Aug 2008) | 1 line
  
  Option to enable bytecode verifier.
........
  r5193 | nriley | 2008-08-17 11:24:17 -0400 (Sun, 17 Aug 2008) | 1 line
  
  Better comment for PySystemState method hack: depends on "functions" in __dict__ appearing as methods.
........
  r5194 | leosoto | 2008-08-17 22:12:34 -0400 (Sun, 17 Aug 2008) | 1 line
  
  PythonInterpreter#cflags initialization moved to PythonInterpreter itself. Fixes a crash on modjy
........
  r5195 | leosoto | 2008-08-17 22:39:57 -0400 (Sun, 17 Aug 2008) | 1 line
  
  PyArray#array_fromunicode: Worked around the issue described on #1105 (wrong exposed bytecode when receiving a PyUnicode argument on a exposed method), by receiving a PyObject and doing the type-check manually
........
  r5196 | zyasoft | 2008-08-18 03:17:46 -0400 (Mon, 18 Aug 2008) | 7 lines
  
  Strings are UTF-8 encoded in the runtime constant pool, meaning that
  naively (and that is a reasonable strategy here), we need up to 4
  bytes per codepoint. So allocate string constants up to 16000 bytes
  and combine as necessary. This resolves one Pygments problem (and the
  one we can directly do anything about, the other is isolated
  surrogates in unistring.Cs).
........
  r5197 | nriley | 2008-08-18 10:46:22 -0400 (Mon, 18 Aug 2008) | 1 line
  
  Run Jython regrtest (on unix) with bytecode verification.
........

Modified Paths:
--------------
    trunk/jython/.classpath
    trunk/jython/CPythonLib.includes
    trunk/jython/CoreExposed.includes
    trunk/jython/Lib/codeop.py
    trunk/jython/Lib/datetime.py
    trunk/jython/Lib/distutils/ccompiler.py
    trunk/jython/Lib/distutils/command/bdist.py
    trunk/jython/Lib/distutils/command/bdist_dumb.py
    trunk/jython/Lib/distutils/command/install.py
    trunk/jython/Lib/distutils/command/sdist.py
    trunk/jython/Lib/distutils/file_util.py
    trunk/jython/Lib/distutils/spawn.py
    trunk/jython/Lib/distutils/sysconfig.py
    trunk/jython/Lib/distutils/util.py
    trunk/jython/Lib/doctest.py
    trunk/jython/Lib/fileinput.py
    trunk/jython/Lib/gzip.py
    trunk/jython/Lib/inspect.py
    trunk/jython/Lib/ntpath.py
    trunk/jython/Lib/os.py
    trunk/jython/Lib/popen2.py
    trunk/jython/Lib/posixpath.py
    trunk/jython/Lib/site.py
    trunk/jython/Lib/socket.py
    trunk/jython/Lib/subprocess.py
    trunk/jython/Lib/test/list_tests.py
    trunk/jython/Lib/test/regrtest.py
    trunk/jython/Lib/test/string_tests.py
    trunk/jython/Lib/test/test_ast.py
    trunk/jython/Lib/test/test_builtin.py
    trunk/jython/Lib/test/test_deque.py
    trunk/jython/Lib/test/test_descr.py
    trunk/jython/Lib/test/test_descr_jy.py
    trunk/jython/Lib/test/test_descrtut.py
    trunk/jython/Lib/test/test_dict_jy.py
    trunk/jython/Lib/test/test_enumerate.py
    trunk/jython/Lib/test/test_file_newlines.py
    trunk/jython/Lib/test/test_float_jy.py
    trunk/jython/Lib/test/test_format.py
    trunk/jython/Lib/test/test_format_jy.py
    trunk/jython/Lib/test/test_grammar_jy.py
    trunk/jython/Lib/test/test_importhooks.py
    trunk/jython/Lib/test/test_inspect.py
    trunk/jython/Lib/test/test_iter.py
    trunk/jython/Lib/test/test_iter_jy.py
    trunk/jython/Lib/test/test_java_integration.py
    trunk/jython/Lib/test/test_javashell.py
    trunk/jython/Lib/test/test_jreload.py
    trunk/jython/Lib/test/test_jser2.py
    trunk/jython/Lib/test/test_jy_compile.py
    trunk/jython/Lib/test/test_jy_internals.py
    trunk/jython/Lib/test/test_largefile.py
    trunk/jython/Lib/test/test_logging.py
    trunk/jython/Lib/test/test_long_int_args.py
    trunk/jython/Lib/test/test_mhlib.py
    trunk/jython/Lib/test/test_optparse.py
    trunk/jython/Lib/test/test_re_jy.py
    trunk/jython/Lib/test/test_repr.py
    trunk/jython/Lib/test/test_richcmp.py
    trunk/jython/Lib/test/test_scope.py
    trunk/jython/Lib/test/test_select.py
    trunk/jython/Lib/test/test_select_new.py
    trunk/jython/Lib/test/test_slots_jy.py
    trunk/jython/Lib/test/test_socket.py
    trunk/jython/Lib/test/test_str_jy.py
    trunk/jython/Lib/test/test_subclasses.py
    trunk/jython/Lib/test/test_sys_jy.py
    trunk/jython/Lib/test/test_time.py
    trunk/jython/Lib/test/test_types.py
    trunk/jython/Lib/test/test_zlib.py
    trunk/jython/Lib/threading.py
    trunk/jython/Lib/xml/dom/pulldom.py
    trunk/jython/Lib/zlib.py
    trunk/jython/Misc/make_binops.py
    trunk/jython/NEWS
    trunk/jython/README.txt
    trunk/jython/ast/asdl_antlr.py
    trunk/jython/ast/astdump.py
    trunk/jython/build.xml
    trunk/jython/grammar/Python.g
    trunk/jython/grammar/PythonWalker.g
    trunk/jython/src/com/ziclix/python/sql/DataHandler.java
    trunk/jython/src/com/ziclix/python/sql/Fetch.java
    trunk/jython/src/com/ziclix/python/sql/PyConnection.java
    trunk/jython/src/com/ziclix/python/sql/PyCursor.java
    trunk/jython/src/com/ziclix/python/sql/PyExtendedCursor.java
    trunk/jython/src/com/ziclix/python/sql/PyStatement.java
    trunk/jython/src/com/ziclix/python/sql/connect/Connect.java
    trunk/jython/src/com/ziclix/python/sql/connect/Connectx.java
    trunk/jython/src/com/ziclix/python/sql/connect/Lookup.java
    trunk/jython/src/com/ziclix/python/sql/handler/PostgresqlDataHandler.java
    trunk/jython/src/com/ziclix/python/sql/util/BCP.java
    trunk/jython/src/com/ziclix/python/sql/zxJDBC.java
    trunk/jython/src/org/python/antlr/ExpressionParser.java
    trunk/jython/src/org/python/antlr/InteractiveParser.java
    trunk/jython/src/org/python/antlr/ParseException.java
    trunk/jython/src/org/python/antlr/PythonTokenSource.java
    trunk/jython/src/org/python/antlr/PythonTree.java
    trunk/jython/src/org/python/antlr/ast/Assert.java
    trunk/jython/src/org/python/antlr/ast/Assign.java
    trunk/jython/src/org/python/antlr/ast/Attribute.java
    trunk/jython/src/org/python/antlr/ast/AugAssign.java
    trunk/jython/src/org/python/antlr/ast/BinOp.java
    trunk/jython/src/org/python/antlr/ast/BoolOp.java
    trunk/jython/src/org/python/antlr/ast/Break.java
    trunk/jython/src/org/python/antlr/ast/Call.java
    trunk/jython/src/org/python/antlr/ast/ClassDef.java
    trunk/jython/src/org/python/antlr/ast/Compare.java
    trunk/jython/src/org/python/antlr/ast/Continue.java
    trunk/jython/src/org/python/antlr/ast/Delete.java
    trunk/jython/src/org/python/antlr/ast/Dict.java
    trunk/jython/src/org/python/antlr/ast/Ellipsis.java
    trunk/jython/src/org/python/antlr/ast/Exec.java
    trunk/jython/src/org/python/antlr/ast/Expr.java
    trunk/jython/src/org/python/antlr/ast/Expression.java
    trunk/jython/src/org/python/antlr/ast/ExtSlice.java
    trunk/jython/src/org/python/antlr/ast/For.java
    trunk/jython/src/org/python/antlr/ast/FunctionDef.java
    trunk/jython/src/org/python/antlr/ast/GeneratorExp.java
    trunk/jython/src/org/python/antlr/ast/Global.java
    trunk/jython/src/org/python/antlr/ast/If.java
    trunk/jython/src/org/python/antlr/ast/IfExp.java
    trunk/jython/src/org/python/antlr/ast/Import.java
    trunk/jython/src/org/python/antlr/ast/ImportFrom.java
    trunk/jython/src/org/python/antlr/ast/Index.java
    trunk/jython/src/org/python/antlr/ast/Interactive.java
    trunk/jython/src/org/python/antlr/ast/Lambda.java
    trunk/jython/src/org/python/antlr/ast/List.java
    trunk/jython/src/org/python/antlr/ast/ListComp.java
    trunk/jython/src/org/python/antlr/ast/Module.java
    trunk/jython/src/org/python/antlr/ast/Name.java
    trunk/jython/src/org/python/antlr/ast/Num.java
    trunk/jython/src/org/python/antlr/ast/Pass.java
    trunk/jython/src/org/python/antlr/ast/Print.java
    trunk/jython/src/org/python/antlr/ast/Raise.java
    trunk/jython/src/org/python/antlr/ast/Repr.java
    trunk/jython/src/org/python/antlr/ast/Return.java
    trunk/jython/src/org/python/antlr/ast/Slice.java
    trunk/jython/src/org/python/antlr/ast/Str.java
    trunk/jython/src/org/python/antlr/ast/Subscript.java
    trunk/jython/src/org/python/antlr/ast/Suite.java
    trunk/jython/src/org/python/antlr/ast/TryExcept.java
    trunk/jython/src/org/python/antlr/ast/TryFinally.java
    trunk/jython/src/org/python/antlr/ast/Tuple.java
    trunk/jython/src/org/python/antlr/ast/UnaryOp.java
    trunk/jython/src/org/python/antlr/ast/Unicode.java
    trunk/jython/src/org/python/antlr/ast/VisitorBase.java
    trunk/jython/src/org/python/antlr/ast/While.java
    trunk/jython/src/org/python/antlr/ast/With.java
    trunk/jython/src/org/python/antlr/ast/Yield.java
    trunk/jython/src/org/python/antlr/ast/aliasType.java
    trunk/jython/src/org/python/antlr/ast/argumentsType.java
    trunk/jython/src/org/python/antlr/ast/comprehensionType.java
    trunk/jython/src/org/python/antlr/ast/excepthandlerType.java
    trunk/jython/src/org/python/antlr/ast/exprType.java
    trunk/jython/src/org/python/antlr/ast/keywordType.java
    trunk/jython/src/org/python/antlr/ast/modType.java
    trunk/jython/src/org/python/antlr/ast/sliceType.java
    trunk/jython/src/org/python/antlr/ast/stmtType.java
    trunk/jython/src/org/python/compiler/APIVersion.java
    trunk/jython/src/org/python/compiler/AdapterMaker.java
    trunk/jython/src/org/python/compiler/ArgListCompiler.java
    trunk/jython/src/org/python/compiler/ClassFile.java
    trunk/jython/src/org/python/compiler/Code.java
    trunk/jython/src/org/python/compiler/CodeCompiler.java
    trunk/jython/src/org/python/compiler/CompilationContext.java
    trunk/jython/src/org/python/compiler/Constant.java
    trunk/jython/src/org/python/compiler/Future.java
    trunk/jython/src/org/python/compiler/JavaMaker.java
    trunk/jython/src/org/python/compiler/LineNumberTable.java
    trunk/jython/src/org/python/compiler/Module.java
    trunk/jython/src/org/python/compiler/ProxyMaker.java
    trunk/jython/src/org/python/compiler/ScopeInfo.java
    trunk/jython/src/org/python/compiler/ScopesCompiler.java
    trunk/jython/src/org/python/compiler/SourceFile.java
    trunk/jython/src/org/python/core/AbstractArray.java
    trunk/jython/src/org/python/core/ArgParser.java
    trunk/jython/src/org/python/core/AutoInternalTables.java
    trunk/jython/src/org/python/core/CompilerFlags.java
    trunk/jython/src/org/python/core/FunctionThread.java
    trunk/jython/src/org/python/core/IdImpl.java
    trunk/jython/src/org/python/core/NewCompilerResources.java
    trunk/jython/src/org/python/core/Options.java
    trunk/jython/src/org/python/core/Py.java
    trunk/jython/src/org/python/core/PyArray.java
    trunk/jython/src/org/python/core/PyArrayDerived.java
    trunk/jython/src/org/python/core/PyBoolean.java
    trunk/jython/src/org/python/core/PyBooleanDerived.java
    trunk/jython/src/org/python/core/PyCallIter.java
    trunk/jython/src/org/python/core/PyClass.java
    trunk/jython/src/org/python/core/PyClassMethodDerived.java
    trunk/jython/src/org/python/core/PyComplex.java
    trunk/jython/src/org/python/core/PyComplexDerived.java
    trunk/jython/src/org/python/core/PyDictionaryDerived.java
    trunk/jython/src/org/python/core/PyEnumerateDerived.java
    trunk/jython/src/org/python/core/PyException.java
    trunk/jython/src/org/python/core/PyFastSequenceIter.java
    trunk/jython/src/org/python/core/PyFileDerived.java
    trunk/jython/src/org/python/core/PyFloat.java
    trunk/jython/src/org/python/core/PyFloatDerived.java
    trunk/jython/src/org/python/core/PyFrame.java
    trunk/jython/src/org/python/core/PyFrozenSetDerived.java
    trunk/jython/src/org/python/core/PyGenerator.java
    trunk/jython/src/org/python/core/PyInstance.java
    trunk/jython/src/org/python/core/PyInteger.java
    trunk/jython/src/org/python/core/PyIntegerDerived.java
    trunk/jython/src/org/python/core/PyJavaClass.java
    trunk/jython/src/org/python/core/PyJavaPackage.java
    trunk/jython/src/org/python/core/PyList.java
    trunk/jython/src/org/python/core/PyListDerived.java
    trunk/jython/src/org/python/core/PyLong.java
    trunk/jython/src/org/python/core/PyLongDerived.java
    trunk/jython/src/org/python/core/PyMethod.java
    trunk/jython/src/org/python/core/PyModule.java
    trunk/jython/src/org/python/core/PyModuleDerived.java
    trunk/jython/src/org/python/core/PyObject.java
    trunk/jython/src/org/python/core/PyObjectDerived.java
    trunk/jython/src/org/python/core/PyPropertyDerived.java
    trunk/jython/src/org/python/core/PySequence.java
    trunk/jython/src/org/python/core/PySequenceIter.java
    trunk/jython/src/org/python/core/PySet.java
    trunk/jython/src/org/python/core/PySetDerived.java
    trunk/jython/src/org/python/core/PySlice.java
    trunk/jython/src/org/python/core/PySliceDerived.java
    trunk/jython/src/org/python/core/PyString.java
    trunk/jython/src/org/python/core/PyStringDerived.java
    trunk/jython/src/org/python/core/PySuper.java
    trunk/jython/src/org/python/core/PySuperDerived.java
    trunk/jython/src/org/python/core/PySyntaxError.java
    trunk/jython/src/org/python/core/PySystemState.java
    trunk/jython/src/org/python/core/PyTableCode.java
    trunk/jython/src/org/python/core/PyTraceback.java
    trunk/jython/src/org/python/core/PyTuple.java
    trunk/jython/src/org/python/core/PyTupleDerived.java
    trunk/jython/src/org/python/core/PyType.java
    trunk/jython/src/org/python/core/PyTypeDerived.java
    trunk/jython/src/org/python/core/PyUnicode.java
    trunk/jython/src/org/python/core/PyUnicodeDerived.java
    trunk/jython/src/org/python/core/StdoutWrapper.java
    trunk/jython/src/org/python/core/ThreadState.java
    trunk/jython/src/org/python/core/ThreadStateMapping.java
    trunk/jython/src/org/python/core/__builtin__.java
    trunk/jython/src/org/python/core/codecs.java
    trunk/jython/src/org/python/core/exceptions.java
    trunk/jython/src/org/python/core/imp.java
    trunk/jython/src/org/python/core/io/FileIO.java
    trunk/jython/src/org/python/core/io/StreamIO.java
    trunk/jython/src/org/python/core/io/TextIOBase.java
    trunk/jython/src/org/python/modules/ArrayModule.java
    trunk/jython/src/org/python/modules/Setup.java
    trunk/jython/src/org/python/modules/_codecs.java
    trunk/jython/src/org/python/modules/_sre.java
    trunk/jython/src/org/python/modules/_weakref/ProxyType.java
    trunk/jython/src/org/python/modules/_weakref/ReferenceTypeDerived.java
    trunk/jython/src/org/python/modules/binascii.java
    trunk/jython/src/org/python/modules/cPickle.java
    trunk/jython/src/org/python/modules/cStringIO.java
    trunk/jython/src/org/python/modules/cmath.java
    trunk/jython/src/org/python/modules/collections/PyDefaultDictDerived.java
    trunk/jython/src/org/python/modules/collections/PyDeque.java
    trunk/jython/src/org/python/modules/collections/PyDequeDerived.java
    trunk/jython/src/org/python/modules/imp.java
    trunk/jython/src/org/python/modules/operator.java
    trunk/jython/src/org/python/modules/random/PyRandomDerived.java
    trunk/jython/src/org/python/modules/sre/MatchObject.java
    trunk/jython/src/org/python/modules/sre/PatternObject.java
    trunk/jython/src/org/python/modules/sre/SRE_STATE.java
    trunk/jython/src/org/python/modules/struct.java
    trunk/jython/src/org/python/modules/thread/PyLocalDerived.java
    trunk/jython/src/org/python/modules/thread/thread.java
    trunk/jython/src/org/python/modules/time/PyTimeTuple.java
    trunk/jython/src/org/python/modules/time/Time.java
    trunk/jython/src/org/python/modules/zipimport/zipimport.java
    trunk/jython/src/org/python/modules/zipimport/zipimporter.java
    trunk/jython/src/org/python/modules/zipimport/zipimporterDerived.java
    trunk/jython/src/org/python/util/InteractiveConsole.java
    trunk/jython/src/org/python/util/InteractiveInterpreter.java
    trunk/jython/src/org/python/util/PythonInterpreter.java
    trunk/jython/src/org/python/util/jython.java
    trunk/jython/src/shell/jython
    trunk/jython/src/templates/gderived-defs
    trunk/jython/src/templates/make_binops.py
    trunk/jython/src/templates/mappings
    trunk/jython/src/templates/object.derived
    trunk/jython/tests/shell/test-jython.sh

Added Paths:
-----------
    trunk/jython/Lib/_rawffi.py
    trunk/jython/Lib/decimal.py
    trunk/jython/Lib/distutils/tests/
    trunk/jython/Lib/distutils/tests/test_build_py.py
    trunk/jython/Lib/grp.py
    trunk/jython/Lib/pkgutil.py
    trunk/jython/Lib/platform.py
    trunk/jython/Lib/posix.py
    trunk/jython/Lib/pwd.py
    trunk/jython/Lib/random.py
    trunk/jython/Lib/sre_compile.py
    trunk/jython/Lib/test/bad_coding2.py
    trunk/jython/Lib/test/junit_xml.py
    trunk/jython/Lib/test/test__rawffi.py
    trunk/jython/Lib/test/test_array.py
    trunk/jython/Lib/test/test_array_jy.py
    trunk/jython/Lib/test/test_bigmem.py
    trunk/jython/Lib/test/test_class.py
    trunk/jython/Lib/test/test_cmd_line.py
    trunk/jython/Lib/test/test_cmp_jy.py
    trunk/jython/Lib/test/test_codeop.py
    trunk/jython/Lib/test/test_compile.py
    trunk/jython/Lib/test/test_exceptions.py
    trunk/jython/Lib/test/test_exceptions_jy.py
    trunk/jython/Lib/test/test_functools.py
    trunk/jython/Lib/test/test_generators.py
    trunk/jython/Lib/test/test_genexps.py
    trunk/jython/Lib/test/test_hashlib.py
    trunk/jython/Lib/test/test_hmac.py
    trunk/jython/Lib/test/test_isatty.py
    trunk/jython/Lib/test/test_operator.py
    trunk/jython/Lib/test/test_pkgimport.py
    trunk/jython/Lib/test/test_re.py
    trunk/jython/Lib/test/test_str.py
    trunk/jython/Lib/test/test_subprocess_jy.py
    trunk/jython/Lib/test/test_support.py
    trunk/jython/Lib/test/test_syntax.py
    trunk/jython/Lib/test/test_thread.py
    trunk/jython/Lib/test/test_threading.py
    trunk/jython/Lib/test/test_traceback.py
    trunk/jython/Lib/test/test_tuple.py
    trunk/jython/Lib/test/test_urllib.py
    trunk/jython/Lib/test/test_urllib2_localnet.py
    trunk/jython/Lib/uu.py
    trunk/jython/extlibs/antlr-3.1.jar
    trunk/jython/extlibs/antlr-runtime-3.1.jar
    trunk/jython/extlibs/jna-posix.jar
    trunk/jython/extlibs/jna.jar
    trunk/jython/extlibs/stringtemplate-3.2.jar
    trunk/jython/extlibs/svnant-jars/
    trunk/jython/extlibs/svnant-jars/svnClientAdapter.jar
    trunk/jython/extlibs/svnant-jars/svnant.jar
    trunk/jython/extlibs/svnant-jars/svnjavahl.jar
    trunk/jython/grammar/PythonPartial.g
    trunk/jython/src/com/ziclix/python/sql/Jython22DataHandler.java
    trunk/jython/src/org/python/antlr/BaseParser.java
    trunk/jython/src/org/python/antlr/ErrorHandler.java
    trunk/jython/src/org/python/antlr/FailFastHandler.java
    trunk/jython/src/org/python/antlr/GrammarActions.java
    trunk/jython/src/org/python/antlr/ListErrorHandler.java
    trunk/jython/src/org/python/antlr/ModuleParser.java
    trunk/jython/src/org/python/antlr/NoCloseReaderStream.java
    trunk/jython/src/org/python/antlr/PythonErrorNode.java
    trunk/jython/src/org/python/antlr/PythonTreeAdaptor.java
    trunk/jython/src/org/python/antlr/Visitor.java
    trunk/jython/src/org/python/antlr/ast/Context.java
    trunk/jython/src/org/python/antlr/ast/ErrorExpr.java
    trunk/jython/src/org/python/antlr/ast/ErrorMod.java
    trunk/jython/src/org/python/antlr/ast/ErrorSlice.java
    trunk/jython/src/org/python/antlr/ast/ErrorStmt.java
    trunk/jython/src/org/python/core/APIReader.java
    trunk/jython/src/org/python/core/ParserFacade.java
    trunk/jython/src/org/python/core/PyBaseException.java
    trunk/jython/src/org/python/core/PyBaseExceptionDerived.java
    trunk/jython/src/org/python/core/PyIndentationError.java
    trunk/jython/src/org/python/core/io/TextIOInputStream.java
    trunk/jython/src/org/python/modules/_csv/
    trunk/jython/src/org/python/modules/_csv/PyDialect.java
    trunk/jython/src/org/python/modules/_csv/PyDialectDerived.java
    trunk/jython/src/org/python/modules/_csv/PyReader.java
    trunk/jython/src/org/python/modules/_csv/PyWriter.java
    trunk/jython/src/org/python/modules/_csv/QuoteStyle.java
    trunk/jython/src/org/python/modules/_csv/_csv.java
    trunk/jython/src/org/python/modules/_functools/
    trunk/jython/src/org/python/modules/_functools/PyPartial.java
    trunk/jython/src/org/python/modules/_functools/PyPartialDerived.java
    trunk/jython/src/org/python/modules/_functools/_functools.java
    trunk/jython/src/org/python/modules/_hashlib.java
    trunk/jython/src/org/python/modules/_systemrestart.java
    trunk/jython/src/shell/jython.bat
    trunk/jython/src/templates/BaseException.derived
    trunk/jython/src/templates/dialect.derived
    trunk/jython/src/templates/partial.derived
    trunk/jython/tests/c/
    trunk/jython/tests/c/ctypes_test.c
    trunk/jython/tests/java/org/python/antlr/
    trunk/jython/tests/java/org/python/antlr/GrammarTester.java
    trunk/jython/tests/java/org/python/antlr/PythonPartialTester.java
    trunk/jython/tests/java/org/python/antlr/PythonTreeTester.java
    trunk/jython/tests/java/org/python/antlr/WalkerTester.java

Removed Paths:
-------------
    trunk/jython/Lib/Queue.py
    trunk/jython/Lib/UserList.py
    trunk/jython/Lib/UserString.py
    trunk/jython/Lib/copy.py
    trunk/jython/Lib/distutils/tests/test_build_py.py
    trunk/jython/Lib/re.py
    trunk/jython/Lib/sre_compile.py
    trunk/jython/Lib/test/mapping_tests.py
    trunk/jython/Lib/test/output/test_array
    trunk/jython/Lib/test/output/test_operations
    trunk/jython/Lib/test/output/test_re
    trunk/jython/Lib/test/output/test_types
    trunk/jython/Lib/test/seq_tests.py
    trunk/jython/Lib/test/test_array.py
    trunk/jython/Lib/test/test_bisect.py
    trunk/jython/Lib/test/test_call.py
    trunk/jython/Lib/test/test_dict.py
    trunk/jython/Lib/test/test_exceptions_jy.py
    trunk/jython/Lib/test/test_funcattrs.py
    trunk/jython/Lib/test/test_generators.py
    trunk/jython/Lib/test/test_iterlen.py
    trunk/jython/Lib/test/test_list.py
    trunk/jython/Lib/test/test_long.py
    trunk/jython/Lib/test/test_mailbox.py
    trunk/jython/Lib/test/test_math.py
    trunk/jython/Lib/test/test_operations.py
    trunk/jython/Lib/test/test_popen.py
    trunk/jython/Lib/test/test_queue.py
    trunk/jython/Lib/test/test_slice.py
    trunk/jython/Lib/test/test_socket_ipv6.py
    trunk/jython/Lib/test/test_support.py
    trunk/jython/Lib/test/test_unicodedata.py
    trunk/jython/Lib/test/test_urllib.py
    trunk/jython/Lib/test/test_userlist.py
    trunk/jython/Lib/uu.py
    trunk/jython/Lib/weakref.py
    trunk/jython/extlibs/antlr-3.1b1.jar
    trunk/jython/extlibs/antlr-runtime-3.1b1.jar
    trunk/jython/extlibs/stringtemplate-3.1b1.jar
    trunk/jython/extlibs/svnant-jars/svnClientAdapter.jar
    trunk/jython/extlibs/svnant-jars/svnant.jar
    trunk/jython/extlibs/svnant-jars/svnjavahl.jar
    trunk/jython/src/org/python/antlr/GrammarTester.java
    trunk/jython/src/org/python/antlr/IParserHost.java
    trunk/jython/src/org/python/antlr/LeadingSpaceSkippingStream.java
    trunk/jython/src/org/python/antlr/PythonGrammar.java
    trunk/jython/src/org/python/antlr/PythonTreeTester.java
    trunk/jython/src/org/python/antlr/WalkerTester.java
    trunk/jython/src/org/python/compiler/Attribute.java
    trunk/jython/src/org/python/compiler/ConstantPool.java
    trunk/jython/src/org/python/compiler/Label.java
    trunk/jython/src/org/python/core/antlr.java
    trunk/jython/src/org/python/core/parser.java
    trunk/jython/src/org/python/modules/MD5Module.java
    trunk/jython/src/org/python/modules/MD5Object.java
    trunk/jython/src/org/python/modules/SHA1.java
    trunk/jython/src/org/python/modules/_csv/PyDialect.java
    trunk/jython/src/org/python/modules/_csv/PyDialectDerived.java
    trunk/jython/src/org/python/modules/_csv/PyReader.java
    trunk/jython/src/org/python/modules/_csv/PyWriter.java
    trunk/jython/src/org/python/modules/_csv/QuoteStyle.java
    trunk/jython/src/org/python/modules/_csv/_csv.java
    trunk/jython/src/org/python/modules/_functools/PyPartial.java
    trunk/jython/src/org/python/modules/_functools/PyPartialDerived.java
    trunk/jython/src/org/python/modules/_functools/_functools.java
    trunk/jython/src/org/python/modules/md.java
    trunk/jython/src/org/python/modules/sha.java
    trunk/jython/src/org/python/modules/xreadlines.java
    trunk/jython/src/org/python/parser/
    trunk/jython/tests/c/ctypes_test.c
    trunk/jython/tests/java/org/python/antlr/GrammarTester.java
    trunk/jython/tests/java/org/python/antlr/PythonPartialTester.java
    trunk/jython/tests/java/org/python/antlr/PythonTreeTester.java
    trunk/jython/tests/java/org/python/antlr/WalkerTester.java

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svn:externals
   - CPythonLib http://svn.python.org/projects/python/branches/release23-maint/Lib/

   + CPythonLib http://svn.python.org/projects/python/branches/release25-maint/Lib/

Modified: svnmerge-integrated
   - /branches/asm:1-4384
   + /branches/asm:1-5205

Modified: trunk/jython/.classpath
===================================================================
--- trunk/jython/.classpath	2008-08-19 15:07:48 UTC (rev 5205)
+++ trunk/jython/.classpath	2008-08-19 21:06:39 UTC (rev 5206)
@@ -14,7 +14,7 @@
 	<classpathentry kind="lib" path="extlibs/postgresql-8.3-603.jdbc4.jar"/>
 	<classpathentry kind="lib" path="extlibs/servlet-api-2.5.jar"/>
 	<classpathentry kind="lib" path="build/jarjar"/>
-	<classpathentry kind="lib" path="extlibs/antlr-3.0.1.jar"/>
 	<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
+	<classpathentry kind="lib" path="extlibs/antlr-runtime-3.1.jar"/>
 	<classpathentry kind="output" path="bugtests/classes"/>
 </classpath>

Modified: trunk/jython/CPythonLib.includes
===================================================================
--- trunk/jython/CPythonLib.includes	2008-08-19 15:07:48 UTC (rev 5205)
+++ trunk/jython/CPythonLib.includes	2008-08-19 21:06:39 UTC (rev 5206)
@@ -11,6 +11,10 @@
 
 # Lib files, in alphabetical order:
 __future__.py
+_LWPCookieJar.py
+_MozillaCookieJar.py
+_strptime.py
+_threading_local.py
 aifc.py
 anydbm.py
 atexit.py
@@ -33,14 +37,18 @@
 colorsys.py
 commands.py
 compileall.py
+contextlib.py
 ConfigParser.py
+cookielib.py
 copy.py
 copy_reg.py
 Cookie.py
+csv.py
 difflib.py
 dircache.py
 dircmp.py
 dis.py
+DocXMLRPCServer.py
 dospath.py
 dumbdbm.py
 exceptions.py
@@ -50,17 +58,20 @@
 formatter.py
 fpformat.py
 ftplib.py
+functools.py
 getopt.py
 gettext.py
 glob.py
 gopherlib.py
 gzip.py
+hashlib.py
 heapq.py
 hmac.py
 htmlentitydefs.py
 htmllib.py
 HTMLParser.py
 httplib.py
+ihooks.py
 imaplib.py
 imghdr.py
 inspect.py
@@ -72,6 +83,7 @@
 mailbox.py
 mailcap.py
 markupbase.py
+md5.py
 mhlib.py
 mimetools.py
 mimetypes.py
@@ -91,6 +103,7 @@
 pickletools.py
 pipes.py
 pkgutil.py
+platform.py
 poplib.py
 posixfile.py
 pprint.py
@@ -101,11 +114,15 @@
 Queue.py
 quopri.py
 random.py
+re.py
 reconvert.py
 repr.py
 rfc822.py
 rlcompleter.py
+robotparser.py
+runpy.py
 sched.py
+sha.py
 sets.py
 sgmllib.py
 shelve.py
@@ -123,12 +140,14 @@
 string.py
 StringIO.py
 symbol.py
+tabnanny.py
 this.py
 threading.py
 textwrap.py
 timeit.py
 token.py
 tokenize.py
+trace.py
 traceback.py
 tzparse.py
 unittest.py
@@ -137,12 +156,15 @@
 urlparse.py
 user.py
 UserDict.py
+UserList.py
 UserString.py
 uu.py
+uuid.py
 warnings.py
 weakref.py
 whichdb.py
 whrandom.py
+wsgiref/*.py
 xdrlib.py
 xmllib.py
 xmlrpclib.py

Modified: trunk/jython/CoreExposed.includes
===================================================================
--- trunk/jython/CoreExposed.includes	2008-08-19 15:07:48 UTC (rev 5205)
+++ trunk/jython/CoreExposed.includes	2008-08-19 21:06:39 UTC (rev 5206)
@@ -1,5 +1,6 @@
 org/python/core/PyArray.class
 org/python/core/PyBaseString.class
+org/python/core/PyBaseException.class
 org/python/core/PyBoolean.class
 org/python/core/PyBuiltinFunction.class
 org/python/core/PyCell.class
@@ -34,9 +35,15 @@
 org/python/core/PyType.class
 org/python/core/PyUnicode.class
 org/python/core/PyXRange.class
+org/python/modules/_codecs$EncodingMap.class
+org/python/modules/_csv/PyDialect.class
+org/python/modules/_csv/PyReader.class
+org/python/modules/_csv/PyWriter.class
+org/python/modules/_functools/PyPartial.class
 org/python/modules/_weakref/CallableProxyType.class
 org/python/modules/_weakref/ReferenceType.class
 org/python/modules/_weakref/ProxyType.class
+org/python/modules/_hashlib$Hash.class
 org/python/modules/collections/PyDefaultDict.class
 org/python/modules/collections/PyDeque.class
 org/python/modules/operator$PyAttrGetter.class

Deleted: trunk/jython/Lib/Queue.py
===================================================================
--- trunk/jython/Lib/Queue.py	2008-08-19 15:07:48 UTC (rev 5205)
+++ trunk/jython/Lib/Queue.py	2008-08-19 21:06:39 UTC (rev 5206)
@@ -1,215 +0,0 @@
-"""A multi-producer, multi-consumer queue."""
-
-from time import time as _time
-from collections import deque
-
-__all__ = ['Empty', 'Full', 'Queue']
-
-class Empty(Exception):
-    "Exception raised by Queue.get(block=0)/get_nowait()."
-    pass
-
-class Full(Exception):
-    "Exception raised by Queue.put(block=0)/put_nowait()."
-    pass
-
-class Queue:
-    """Create a queue object with a given maximum size.
-
-    If maxsize is <= 0, the queue size is infinite.
-    """
-    def __init__(self, maxsize=0):
-        try:
-            import threading
-        except ImportError:
-            import dummy_threading as threading
-        self._init(maxsize)
-        # mutex must be held whenever the queue is mutating.  All methods
-        # that acquire mutex must release it before returning.  mutex
-        # is shared between the two conditions, so acquiring and
-        # releasing the conditions also acquires and releases mutex.
-        self.mutex = threading.Lock()
-        # Notify not_empty whenever an item is added to the queue; a
-        # thread waiting to get is notified then.
-        self.not_empty = threading.Condition(self.mutex)
-        # Notify not_full whenever an item is removed from the queue;
-        # a thread waiting to put is notified then.
-        self.not_full = threading.Condition(self.mutex)
-        # Notify all_tasks_done whenever the number of unfinished tasks
-        # drops to zero; thread waiting to join() is notified to resume
-        self.all_tasks_done = threading.Condition(self.mutex)
-        self.unfinished_tasks = 0
-
-    def task_done(self):
-        """Indicate that a formerly enqueued task is complete.
-
-        Used by Queue consumer threads.  For each get() used to fetch a task,
-        a subsequent call to task_done() tells the queue that the processing
-        on the task is complete.
-
-        If a join() is currently blocking, it will resume when all items
-        have been processed (meaning that a task_done() call was received
-        for every item that had been put() into the queue).
-
-        Raises a ValueError if called more times than there were items
-        placed in the queue.
-        """
-        self.all_tasks_done.acquire()
-        try:
-            unfinished = self.unfinished_tasks - 1
-            if unfinished <= 0:
-                if unfinished < 0:
-                    raise ValueError('task_done() called too many times')
-                self.all_tasks_done.notifyAll()
-            self.unfinished_tasks = unfinished
-        finally:
-            self.all_tasks_done.release()
-
-    def join(self):
-        """Blocks until all items in the Queue have been gotten and processed.
-
-        The count of unfinished tasks goes up whenever an item is added to the
-        queue. The count goes down whenever a consumer thread calls task_done()
-        to indicate the item was retrieved and all work on it is complete.
-
-        When the count of unfinished tasks drops to zero, join() unblocks.
-        """
-        self.all_tasks_done.acquire()
-        try:
-            while self.unfinished_tasks:
-                self.all_tasks_done.wait()
-        finally:
-            self.all_tasks_done.release()
-
-    def qsize(self):
-        """Return the approximate size of the queue (not reliable!)."""
-        self.mutex.acquire()
-        n = self._qsize()
-        self.mutex.release()
-        return n
-
-    def empty(self):
-        """Return True if the queue is empty, False otherwise (not reliable!)."""
-        self.mutex.acquire()
-        n = self._empty()
-        self.mutex.release()
-        return n
-
-    def full(self):
-        """Return True if the queue is full, False otherwise (not reliable!)."""
-        self.mutex.acquire()
-        n = self._full()
-        self.mutex.release()
-        return n
-
-    def put(self, item, block=True, timeout=None):
-        """Put an item into the queue.
-
-        If optional args 'block' is true and 'timeout' is None (the default),
-        block if necessary until a free slot is available. If 'timeout' is
-        a positive number, it blocks at most 'timeout' seconds and raises
-        the Full exception if no free slot was available within that time.
-        Otherwise ('block' is false), put an item on the queue if a free slot
-        is immediately available, else raise the Full exception ('timeout'
-        is ignored in that case).
-        """
-        self.not_full.acquire()
-        try:
-            if not block:
-                if self._full():
-                    raise Full
-            elif timeout is None:
-                while self._full():
-                    self.not_full.wait()
-            else:
-                if timeout < 0:
-                    raise ValueError("'timeout' must be a positive number")
-                endtime = _time() + timeout
-                while self._full():
-                    remaining = endtime - _time()
-                    if remaining <= 0.0:
-                        raise Full
-                    self.not_full.wait(remaining)
-            self._put(item)
-            self.unfinished_tasks += 1
-            self.not_empty.notify()
-        finally:
-            self.not_full.release()
-
-    def put_nowait(self, item):
-        """Put an item into the queue without blocking.
-
-        Only enqueue the item if a free slot is immediately available.
-        Otherwise raise the Full exception.
-        """
-        return self.put(item, False)
-
-    def get(self, block=True, timeout=None):
-        """Remove and return an item from the queue.
-
-        If optional args 'block' is true and 'timeout' is None (the default),
-        block if necessary until an item is available. If 'timeout' is
-        a positive number, it blocks at most 'timeout' seconds and raises
-        the Empty exception if no item was available within that time.
-        Otherwise ('block' is false), return an item if one is immediately
-        available, else raise the Empty exception ('timeout' is ignored
-        in that case).
-        """
-        self.not_empty.acquire()
-        try:
-            if not block:
-                if self._empty():
-                    raise Empty
-            elif timeout is None:
-                while self._empty():
-                    self.not_empty.wait()
-            else:
-                if timeout < 0:
-                    raise ValueError("'timeout' must be a positive number")
-                endtime = _time() + timeout
-                while self._empty():
-                    remaining = endtime - _time()
-                    if remaining <= 0.0:
-                        raise Empty
-                    self.not_empty.wait(remaining)
-            item = self._get()
-            self.not_full.notify()
-            return item
-        finally:
-            self.not_empty.release()
-
-    def get_nowait(self):
-        """Remove and return an item from the queue without blocking.
-
-        Only get an item if one is immediately available. Otherwise
-        raise the Empty exception.
-        """
-        return self.get(False)
-
-    # Override these methods to implement other queue organizations
-    # (e.g. stack or priority queue).
-    # These will only be called with appropriate locks held
-
-    # Initialize the queue representation
-    def _init(self, maxsize):
-        self.maxsize = maxsize
-        self.queue = deque()
-
-    def _qsize(self):
-        return len(self.queue)
-
-    # Check whether the queue is empty
-    def _empty(self):
-        return not self.queue
-
-    # Check whether the queue is full
-    def _full(self):
-        return self.maxsize > 0 and len(self.queue) == self.maxsize
-
-    # Put a new item in the queue
-    def _put(self, item):
-        self.queue.append(item)
-
-    # Get an item from the queue
-    def _get(self):
-        return self.queue.popleft()

Deleted: trunk/jython/Lib/UserList.py
===================================================================
--- trunk/jython/Lib/UserList.py	2008-08-19 15:07:48 UTC (rev 5205)
+++ trunk/jython/Lib/UserList.py	2008-08-19 21:06:39 UTC (rev 5206)
@@ -1,94 +0,0 @@
-"""A more or less complete user-defined wrapper around list objects."""
-
-#Imported from Python 2.3.5 and added _fixindex
-class UserList:
-    def __init__(self, initlist=None):
-        self.data = []
-        if initlist is not None:
-            # XXX should this accept an arbitrary sequence?
-            if type(initlist) == type(self.data):
-                self.data[:] = initlist
-            elif isinstance(initlist, UserList):
-                self.data[:] = initlist.data[:]
-            else:
-                self.data = list(initlist)
-    def __repr__(self): return repr(self.data)
-    def __lt__(self, other): return self.data <  self.__cast(other)
-    def __le__(self, other): return self.data <= self.__cast(other)
-    def __eq__(self, other): return self.data == self.__cast(other)
-    def __ne__(self, other): return self.data != self.__cast(other)
-    def __gt__(self, other): return self.data >  self.__cast(other)
-    def __ge__(self, other): return self.data >= self.__cast(other)
-    def __cast(self, other):
-        if isinstance(other, UserList): return other.data
-        else: return other
-    def __cmp__(self, other):
-        return cmp(self.data, self.__cast(other))
-    def __contains__(self, item): return item in self.data
-    def __len__(self): return len(self.data)
-    def __getitem__(self, i): return self.data[i]
-    def __setitem__(self, i, item): self.data[i] = item
-    def __delitem__(self, i): del self.data[i]
-    def __getslice__(self, i, j):
-        i = self._fixindex(i); j = self._fixindex(j)
-        return self.__class__(self.data[i:j])
-    def __setslice__(self, i, j, other):
-        i = self._fixindex(i); j = self._fixindex(j)
-        if isinstance(other, UserList):
-            self.data[i:j] = other.data
-        elif isinstance(other, type(self.data)):
-            self.data[i:j] = other
-        else:
-            self.data[i:j] = list(other)
-    def __delslice__(self, i, j):
-        i = self._fixindex(i); j = self._fixindex(j)
-        del self.data[i:j]
-    def __add__(self, other):
-        if isinstance(other, UserList):
-            return self.__class__(self.data + other.data)
-        elif isinstance(other, type(self.data)):
-            return self.__class__(self.data + other)
-        else:
-            return self.__class__(self.data + list(other))
-    def __radd__(self, other):
-        if isinstance(other, UserList):
-            return self.__class__(other.data + self.data)
-        elif isinstance(other, type(self.data)):
-            return self.__class__(other + self.data)
-        else:
-            return self.__class__(list(other) + self.data)
-    def __iadd__(self, other):
-        if isinstance(other, UserList):
-            self.data += other.data
-        elif isinstance(other, type(self.data)):
-            self.data += other
-        else:
-            self.data += list(other)
-        return self
-    def __mul__(self, n):
-        return self.__class__(self.data*n)
-    __rmul__ = __mul__
-    def __imul__(self, n):
-        self.data *= n
-        return self
-    def append(self, item): self.data.append(item)
-    def insert(self, i, item): self.data.insert(i, item)
-    def pop(self, i=-1): return self.data.pop(i)
-    def remove(self, item): self.data.remove(item)
-    def count(self, item): return self.data.count(item)
-    def index(self, item, *args): return self.data.index(item, *args)
-    def reverse(self): self.data.reverse()
-    def sort(self, *args): self.data.sort(*args)
-    def extend(self, other):
-        if isinstance(other, UserList):
-            self.data.extend(other.data)
-        else:
-            self.data.extend(other)
-    def _fixindex(self, index):
-        if index < 0:
-            index += len(self.data)
-        elif index > len(self.data):
-            index = len(self.data)
-        index = max(index, 0)
-        return index
-        

Deleted: trunk/jython/Lib/UserString.py
===================================================================
--- trunk/jython/Lib/UserString.py	2008-08-19 15:07:48 UTC (rev 5205)
+++ trunk/jython/Lib/UserString.py	2008-08-19 21:06:39 UTC (rev 5206)
@@ -1,194 +0,0 @@
-#!/usr/bin/env python
-## vim:ts=4:et:nowrap
-"""A user-defined wrapper around string objects
-
-Note: string objects have grown methods in Python 1.6
-This module requires Python 1.6 or later.
-"""
-import sys
-
-__all__ = ["UserString","MutableString"]
-
-class UserString:
-    def __init__(self, seq):
-        if isinstance(seq, basestring):
-            self.data = seq
-        elif isinstance(seq, UserString):
-            self.data = seq.data[:]
-        else:
-            self.data = str(seq)
-    def __str__(self): return str(self.data)
-    def __repr__(self): return repr(self.data)
-    def __int__(self): return int(self.data)
-    def __long__(self): return long(self.data)
-    def __float__(self): return float(self.data)
-    def __complex__(self): return complex(self.data)
-    def __hash__(self): return hash(self.data)
-
-    def __cmp__(self, string):
-        if isinstance(string, UserString):
-            return cmp(self.data, string.data)
-        else:
-            return cmp(self.data, string)
-    def __contains__(self, char):
-        return char in self.data
-
-    def __len__(self): return len(self.data)
-    def __getitem__(self, index): return self.__class__(self.data[index])
-    def __getslice__(self, start, end):
-        start = max(start, 0); end = max(end, 0)
-        return self.__class__(self.data[start:end])
-
-    def __add__(self, other):
-        if isinstance(other, UserString):
-            return self.__class__(self.data + other.data)
-        elif isinstance(other, basestring):
-            return self.__class__(self.data + other)
-        else:
-            return self.__class__(self.data + str(other))
-    def __radd__(self, other):
-        if isinstance(other, basestring):
-            return self.__class__(other + self.data)
-        else:
-            return self.__class__(str(other) + self.data)
-    def __mul__(self, n):
-        return self.__class__(self.data*n)
-    __rmul__ = __mul__
-    def __mod__(self, args):
-        return self.__class__(self.data % args)
-
-    # the following methods are defined in alphabetical order:
-    def capitalize(self): return self.__class__(self.data.capitalize())
-    def center(self, width, *args):
-        return self.__class__(self.data.center(width, *args))
-    def count(self, sub, start=0, end=sys.maxint):
-        return self.data.count(sub, start, end)
-    def decode(self, encoding=None, errors=None): # XXX improve this?
-        if encoding:
-            if errors:
-                return self.__class__(self.data.decode(encoding, errors))
-            else:
-                return self.__class__(self.data.decode(encoding))
-        else:
-            return self.__class__(self.data.decode())
-    def encode(self, encoding=None, errors=None): # XXX improve this?
-        if encoding:
-            if errors:
-                return self.__class__(self.data.encode(encoding, errors))
-            else:
-                return self.__class__(self.data.encode(encoding))
-        else:
-            return self.__class__(self.data.encode())
-    def endswith(self, suffix, start=0, end=sys.maxint):
-        return self.data.endswith(suffix, start, end)
-    def expandtabs(self, tabsize=8):
-        return self.__class__(self.data.expandtabs(tabsize))
-    def find(self, sub, start=0, end=sys.maxint):
-        return self.data.find(sub, start, end)
-    def index(self, sub, start=0, end=sys.maxint):
-        return self.data.index(sub, start, end)
-    def isalpha(self): return self.data.isalpha()
-    def isalnum(self): return self.data.isalnum()
-    def isdecimal(self): return self.data.isdecimal()
-    def isdigit(self): return self.data.isdigit()
-    def islower(self): return self.data.islower()
-    def isnumeric(self): return self.data.isnumeric()
-    def isspace(self): return self.data.isspace()
-    def istitle(self): return self.data.istitle()
-    def isupper(self): return self.data.isupper()
-    def join(self, seq): return self.data.join(seq)
-    def ljust(self, width, *args):
-        return self.__class__(self.data.ljust(width, *args))
-    def lower(self): return self.__class__(self.data.lower())
-    def lstrip(self, chars=None): return self.__class__(self.data.lstrip(chars))
-    def partition(self, sep):
-        return self.data.partition(sep)
-    def replace(self, old, new, maxsplit=-1):
-        return self.__class__(self.data.replace(old, new, maxsplit))
-    def rfind(self, sub, start=0, end=sys.maxint):
-        return self.data.rfind(sub, start, end)
-    def rindex(self, sub, start=0, end=sys.maxint):
-        return self.data.rindex(sub, start, end)
-    def rjust(self, width, *args):
-        return self.__class__(self.data.rjust(width, *args))
-    def rpartition(self, sep):
-        return self.data.rpartition(sep)
-    def rstrip(self, chars=None): return self.__class__(self.data.rstrip(chars))
-    def split(self, sep=None, maxsplit=-1):
-        return self.data.split(sep, maxsplit)
-    def rsplit(self, sep=None, maxsplit=-1):
-        return self.data.rsplit(sep, maxsplit)
-    def splitlines(self, keepends=0): return self.data.splitlines(keepends)
-    def startswith(self, prefix, start=0, end=sys.maxint):
-        return self.data.startswith(prefix, start, end)
-    def strip(self, chars=None): return self.__class__(self.data.strip(chars))
-    def swapcase(self): return self.__class__(self.data.swapcase())
-    def title(self): return self.__class__(self.data.title())
-    def translate(self, *args):
-        return self.__class__(self.data.translate(*args))
-    def upper(self): return self.__class__(self.data.upper())
-    def zfill(self, width): return self.__class__(self.data.zfill(width))
-
-class MutableString(UserString):
-    """mutable string objects
-
-    Python strings are immutable objects.  This has the advantage, that
-    strings may be used as dictionary keys.  If this property isn't needed
-    and you insist on changing string values in place instead, you may cheat
-    and use MutableString.
-
-    But the purpose of this class is an educational one: to prevent
-    people from inventing their own mutable string class derived
-    from UserString and than forget thereby to remove (override) the
-    __hash__ method inherited from UserString.  This would lead to
-    errors that would be very hard to track down.
-
-    A faster and better solution is to rewrite your program using lists."""
-    def __init__(self, string=""):
-        self.data = string
-    def __hash__(self):
-        raise TypeError, "unhashable type (it is mutable)"
-    def __setitem__(self, index, sub):
-        if index < 0:
-            index += len(self.data)
-        if index < 0 or index >= len(self.data): raise IndexError
-        self.data = self.data[:index] + sub + self.data[index+1:]
-    def __delitem__(self, index):
-        if index < 0:
-            index += len(self.data)
-        if index < 0 or index >= len(self.data): raise IndexError
-        self.data = self.data[:index] + self.data[index+1:]
-    def __setslice__(self, start, end, sub):
-        start = max(start, 0); end = max(end, 0)
-        if isinstance(sub, UserString):
-            self.data = self.data[:start]+sub.data+self.data[end:]
-        elif isinstance(sub, basestring):
-            self.data = self.data[:start]+sub+self.data[end:]
-        else:
-            self.data =  self.data[:start]+str(sub)+self.data[end:]
-    def __delslice__(self, start, end):
-        start = max(start, 0); end = max(end, 0)
-        self.data = self.data[:start] + self.data[end:]
-    def immutable(self):
-        return UserString(self.data)
-    def __iadd__(self, other):
-        if isinstance(other, UserString):
-            self.data += other.data
-        elif isinstance(other, basestring):
-            self.data += other
-        else:
-            self.data += str(other)
-        return self
-    def __imul__(self, n):
-        self.data *= n
-        return self
-
-if __name__ == "__main__":
-    # execute the regression test to stdout, if called as a script:
-    import os
-    called_in_dir, called_as = os.path.split(sys.argv[0])
-    called_as, py = os.path.splitext(called_as)
-    if '-q' in sys.argv:
-        from test import test_support
-        test_support.verbose = 0
-    __import__('test.test_' + called_as.lower())

Copied: trunk/jython/Lib/_rawffi.py (from rev 4897, branches/asm/Lib/_rawffi.py)
===================================================================
--- trunk/jython/Lib/_rawffi.py	                        (rev 0)
+++ trunk/jython/Lib/_rawffi.py	2008-08-19 21:06:39 UTC (rev 5206)
@@ -0,0 +1,57 @@
+import com.sun.jna as jna
+
+def get_libc():
+    return CDLL("c")
+
+typecode_map = {'h': 2, 'H': 2}
+
+class Array(object):
+    def __init__(self, typecode):
+        self.typecode = typecode
+        self.itemsize = typecode_map[typecode]
+
+    def __call__(self, size, autofree=False):
+        if not autofree:
+            raise Exception
+        return ArrayInstance(self, size)
+
+class ArrayInstance(object):
+    def __init__(self, shape, size):
+        self.shape = shape
+        self.alloc = jna.Memory(shape.itemsize * size)
+
+    def __setitem__(self, index, value):
+        self.alloc.setShort(index, value)
+
+    def __getitem__(self, index):
+        return self.alloc.getShort(index)
+
+class FuncPtr(object):
+    def __init__(self, fn, name, argtypes, restype):
+        self.fn = fn
+        self.name = name
+        self.argtypes = argtypes
+        self.restype = restype
+
+    def __call__(self, *args):
+        container = Array('H')(1, autofree=True)
+        container[0] = self.fn.invokeInt([i[0] for i in args])
+        return container
+
+class CDLL(object):
+    def __init__(self, libname):
+        self.lib = jna.NativeLibrary.getInstance(libname)
+        self.cache = dict()
+
+    def ptr(self, name, argtypes, restype):
+        key = (name, tuple(argtypes), restype)
+        try:
+            return self.cache[key]
+        except KeyError:
+            fn = self.lib.getFunction(name)
+            fnp = FuncPtr(fn, name, argtypes, restype)
+            self.cache[key] = fnp
+            return fnp
+
+
+

Modified: trunk/jython/Lib/codeop.py
===================================================================
--- trunk/jython/Lib/codeop.py	2008-08-19 15:07:48 UTC (rev 5205)
+++ trunk/jython/Lib/codeop.py	2008-08-19 21:06:39 UTC (rev 5206)
@@ -58,6 +58,7 @@
 
 # import internals, not guaranteed interface
 from org.python.core import Py,CompilerFlags
+from org.python.core.PyTableCode import PyCF_DONT_IMPLY_DEDENT
 
 # public interface
 

Deleted: trunk/jython/Lib/copy.py
===================================================================
--- trunk/jython/Lib/copy.py	2008-08-19 15:07:48 UTC (rev 5205)
+++ trunk/jython/Lib/copy.py	2008-08-19 21:06:39 UTC (rev 5206)
@@ -1,413 +0,0 @@
-"""Generic (shallow and deep) copying operations.
-
-Interface summary:
-
-        import copy
-
-        x = copy.copy(y)        # make a shallow copy of y
-        x = copy.deepcopy(y)    # make a deep copy of y
-
-For module specific errors, copy.Error is raised.
-
-The difference between shallow and deep copying is only relevant for
-compound objects (objects that contain other objects, like lists or
-class instances).
-
-- A shallow copy constructs a new compound object and then (to the
-  extent possible) inserts *the same objects* into it that the
-  original contains.
-
-- A deep copy constructs a new compound object and then, recursively,
-  inserts *copies* into it of the objects found in the original.
-
-Two problems often exist with deep copy operations that don't exist
-with shallow copy operations:
-
- a) recursive objects (compound objects that, directly or indirectly,
-    contain a reference to themselves) may cause a recursive loop
-
- b) because deep copy copies *everything* it may copy too much, e.g.
-    administrative data structures that should be shared even between
-    copies
-
-Python's deep copy operation avoids these problems by:
-
- a) keeping a table of objects already copied during the current
-    copying pass
-
- b) letting user-defined classes override the copying operation or the
-    set of components copied
-
-This version does not copy types like module, class, function, method,
-nor stack trace, stack frame, nor file, socket, window, nor array, nor
-any similar types.
-
-Classes can use the same interfaces to control copying that they use
-to control pickling: they can define methods called __getinitargs__(),
-__getstate__() and __setstate__().  See the documentation for module
-"pickle" for information on these methods.
-"""
-
-import types
-from copy_reg import dispatch_table
-
-class Error(Exception):
-    pass
-error = Error   # backward compatibility
-
-try:
-    from org.python.core import PyStringMap
-except ImportError:
-    PyStringMap = None
-
-__all__ = ["Error", "copy", "deepcopy"]
-
-def copy(x):
-    """Shallow copy operation on arbitrary Python objects.
-
-    See the module's __doc__ string for more info.
-    """
-
-    cls = type(x)
-
-    copier = _copy_dispatch.get(cls)
-    if copier:
-        return copier(x)
-
-    copier = getattr(cls, "__copy__", None)
-    if copier:
-        return copier(x)
-
-    reductor = dispatch_table.get(cls)
-    if reductor:
-        rv = reductor(x)
-    else:
-        reductor = getattr(x, "__reduce_ex__", None)
-        if reductor:
-            rv = reductor(2)
-        else:
-            reductor = getattr(x, "__reduce__", None)
-            if reductor:
-                rv = reductor()
-            else:
-                raise Error("un(shallow)copyable object of type %s" % cls)
-
-    return _reconstruct(x, rv, 0)
-
-
-_copy_dispatch = d = {}
-
-def _copy_immutable(x):
-    return x
-for t in (type(None), int, long, float, bool, str, tuple,
-          frozenset, type, xrange, types.ClassType,
-          types.BuiltinFunctionType,
-          types.FunctionType):
-    d[t] = _copy_immutable
-for name in ("ComplexType", "UnicodeType", "CodeType"):
-    t = getattr(types, name, None)
-    if t is not None:
-        d[t] = _copy_immutable
-
-def _copy_with_constructor(x):
-    return type(x)(x)
-for t in (list, dict, set):
-    d[t] = _copy_with_constructor
-
-def _copy_with_copy_method(x):
-    return x.copy()
-if PyStringMap is not None:
-    d[PyStringMap] = _copy_with_copy_method
-
-def _copy_inst(x):
-    if hasattr(x, '__copy__'):
-        return x.__copy__()
-    if hasattr(x, '__getinitargs__'):
-        args = x.__getinitargs__()
-        y = x.__class__(*args)
-    else:
-        y = _EmptyClass()
-        y.__class__ = x.__class__
-    if hasattr(x, '__getstate__'):
-        state = x.__getstate__()
-    else:
-        state = x.__dict__
-    if hasattr(y, '__setstate__'):
-        y.__setstate__(state)
-    else:
-        y.__dict__.update(state)
-    return y
-d[types.InstanceType] = _copy_inst
-
-del d
-
-def deepcopy(x, memo=None, _nil=[]):
-    """Deep copy operation on arbitrary Python objects.
-
-    See the module's __doc__ string for more info.
-    """
-    if memo is None:
-        memo = {}
-
-    d = id(x)
-    y = memo.get(d, _nil)
-    if y is not _nil:
-        return y
-
-    cls = type(x)
-
-    copier = _deepcopy_dispatch.get(cls)
-    if copier:
-        y = copier(x, memo)
-    else:
-        try:
-            issc = issubclass(cls, type)
-        except TypeError: # cls is not a class (old Boost; see SF #502085)
-            issc = 0
-        if issc:
-            y = _deepcopy_atomic(x, memo)
-        else:
-            copier = getattr(x, "__deepcopy__", None)
-            if copier:
-                y = copier(memo)
-            else:
-                reductor = dispatch_table.get(cls)
-                if reductor:
-                    rv = reductor(x)
-                else:
-                    reductor = getattr(x, "__reduce_ex__", None)
-                    if reductor:
-                        rv = reductor(2)
-                    else:
-                        reductor = getattr(x, "__reduce__", None)
-                        if reductor:
-                            rv = reductor()
-                        else:
-                            raise Error(
-                                "un(deep)copyable object of type %s" % cls)
-                y = _reconstruct(x, rv, 1, memo)
-
-    memo[d] = y
-    _keep_alive(x, memo) # Make sure x lives at least as long as d
-    return y
-
-_deepcopy_dispatch = d = {}
-
-def _deepcopy_atomic(x, memo):
-    return x
-d[type(None)] = _deepcopy_atomic
-d[int] = _deepcopy_atomic
-d[long] = _deepcopy_atomic
-d[float] = _deepcopy_atomic
-d[bool] = _deepcopy_atomic
-try:
-    d[complex] = _deepcopy_atomic
-except NameError:
-    pass
-d[str] = _deepcopy_atomic
-try:
-    d[unicode] = _deepcopy_atomic
-except NameError:
-    pass
-try:
-    d[types.CodeType] = _deepcopy_atomic
-except AttributeError:
-    pass
-d[type] = _deepcopy_atomic
-d[xrange] = _deepcopy_atomic
-d[types.ClassType] = _deepcopy_atomic
-d[types.BuiltinFunctionType] = _deepcopy_atomic
-d[types.FunctionType] = _deepcopy_atomic
-
-def _deepcopy_list(x, memo):
-    y = []
-    memo[id(x)] = y
-    for a in x:
-        y.append(deepcopy(a, memo))
-    return y
-d[list] = _deepcopy_list
-
-def _deepcopy_tuple(x, memo):
-    y = []
-    for a in x:
-        y.append(deepcopy(a, memo))
-    d = id(x)
-    try:
-        return memo[d]
-    except KeyError:
-        pass
-    for i in range(len(x)):
-        if x[i] is not y[i]:
-            y = tuple(y)
-            break
-    else:
-        y = x
-    memo[d] = y
-    return y
-d[tuple] = _deepcopy_tuple
-
-def _deepcopy_dict(x, memo):
-    y = {}
-    memo[id(x)] = y
-    for key, value in x.iteritems():
-        y[deepcopy(key, memo)] = deepcopy(value, memo)
-    return y
-d[dict] = _deepcopy_dict
-if PyStringMap is not None:
-    d[PyStringMap] = _deepcopy_dict
-
-def _keep_alive(x, memo):
-    """Keeps a reference to the object x in the memo.
-
-    Because we remember objects by their id, we have
-    to assure that possibly temporary objects are kept
-    alive by referencing them.
-    We store a reference at the id of the memo, which should
-    normally not be used unless someone tries to deepcopy
-    the memo itself...
-    """
-    try:
-        memo[id(memo)].append(x)
-    except KeyError:
-        # aha, this is the first one :-)
-        memo[id(memo)]=[x]
-
-def _deepcopy_inst(x, memo):
-    if hasattr(x, '__deepcopy__'):
-        return x.__deepcopy__(memo)
-    if hasattr(x, '__getinitargs__'):
-        args = x.__getinitargs__()
-        args = deepcopy(args, memo)
-        y = x.__class__(*args)
-    else:
-        y = _EmptyClass()
-        y.__class__ = x.__class__
-    memo[id(x)] = y
-    if hasattr(x, '__getstate__'):
-        state = x.__getstate__()
-    else:
-        state = x.__dict__
-    state = deepcopy(state, memo)
-    if hasattr(y, '__setstate__'):
-        y.__setstate__(state)
-    else:
-        y.__dict__.update(state)
-    return y
-d[types.InstanceType] = _deepcopy_inst
-
-def _reconstruct(x, info, deep, memo=None):
-    if isinstance(info, str):
-        return x
-    assert isinstance(info, tuple)
-    if memo is None:
-        memo = {}
-    n = len(info)
-    assert n in (2, 3, 4, 5)
-    callable, args = info[:2]
-    if n > 2:
-        state = info[2]
-    else:
-        state = {}
-    if n > 3:
-        listiter = info[3]
-    else:
-        listiter = None
-    if n > 4:
-        dictiter = info[4]
-    else:
-        dictiter = None
-    if deep:
-        args = deepcopy(args, memo)
-    y = callable(*args)
-    memo[id(x)] = y
-    if listiter is not None:
-        for item in listiter:
-            if deep:
-                item = deepcopy(item, memo)
-            y.append(item)
-    if dictiter is not None:
-        for key, value in dictiter:
-            if deep:
-                key = deepcopy(key, memo)
-                value = deepcopy(value, memo)
-            y[key] = value
-    if state:
-        if deep:
-            state = deepcopy(state, memo)
-        if hasattr(y, '__setstate__'):
-            y.__setstate__(state)
-        else:
-            if isinstance(state, tuple) and len(state) == 2:
-                state, slotstate = state
-            else:
-                slotstate = None
-            if state is not None:
-                y.__dict__.update(state)
-            if slotstate is not None:
-                for key, value in slotstate.iteritems():
-                    setattr(y, key, value)
-    return y
-
-del d
-
-del types
-
-# Helper for instance creation without calling __init__
-class _EmptyClass:
-    pass
-
-def _test():
-    l = [None, 1, 2L, 3.14, 'xyzzy', (1, 2L), [3.14, 'abc'],
-         {'abc': 'ABC'}, (), [], {}]
-    l1 = copy(l)
-    print l1==l
-    l1 = map(copy, l)
-    print l1==l
-    l1 = deepcopy(l)
-    print l1==l
-    class C:
-        def __init__(self, arg=None):
-            self.a = 1
-            self.arg = arg
-            if __name__ == '__main__':
-                import sys
-                file = sys.argv[0]
-            else:
-                file = __file__
-            self.fp = open(file)
-            self.fp.close()
-        def __getstate__(self):
-            return {'a': self.a, 'arg': self.arg}
-        def __setstate__(self, state):
-            for key, value in state.iteritems():
-                setattr(self, key, value)
-        def __deepcopy__(self, memo=None):
-            new = self.__class__(deepcopy(self.arg, memo))
-            new.a = self.a
-            return new
-    c = C('argument sketch')
-    l.append(c)
-    l2 = copy(l)
-    print l == l2
-    print l
-    print l2
-    l2 = deepcopy(l)
-    print l == l2
-    print l
-    print l2
-    l.append({l[1]: l, 'xyz': l[2]})
-    l3 = copy(l)
-    import repr
-    print map(repr.repr, l)
-    print map(repr.repr, l1)
-    print map(repr.repr, l2)
-    print map(repr.repr, l3)
-    l3 = deepcopy(l)
-    import repr
-    print map(repr.repr, l)
-    print map(repr.repr, l1)
-    print map(repr.repr, l2)
-    print map(repr.repr, l3)
-
-if __name__ == '__main__':
-    _test()

Modified: trunk/jython/Lib/datetime.py
===================================================================
--- trunk/jython/Lib/datetime.py	2008-08-19 15:07:48 UTC (rev 5205)
+++ trunk/jython/Lib/datetime.py	2008-08-19 21:06:39 UTC (rev 5206)
@@ -12,6 +12,8 @@
 
 Sources for time zone and DST data: http://www.twinsun.com/tz/tz-link.htm
 
+This was originally copied from the sandbox of the CPython CVS repository.
+Thanks to Tim Peters for suggesting using it. 
 """
 
 import time as _time
@@ -575,6 +577,8 @@
 
     def __add__(self, other):
         if isinstance(other, timedelta):
+            # for CPython compatibility, we cannot use
+            # our __class__ here, but need a real timedelta
             return timedelta(self.__days + other.__days,
                              self.__seconds + other.__seconds,
                              self.__microseconds + other.__microseconds)
@@ -593,9 +597,11 @@
         return NotImplemented
 
     def __neg__(self):
-        return self.__class__(-self.__days,
-                              -self.__seconds,
-                              -self.__microseconds)
+            # for CPython compatibility, we cannot use
+            # our __class__ here, but need a real timedelta
+            return timedelta(-self.__days,
+                             -self.__seconds,
+                             -self.__microseconds)
 
     def __pos__(self):
         return self
@@ -608,9 +614,11 @@
 
     def __mul__(self, other):
         if isinstance(other, (int, long)):
-            return self.__class__(self.__days * other,
-                                  self.__seconds * other,
-                                  self.__microseconds * other)
+            # for CPython compatibility, we cannot use
+            # our __class__ here, but need a real timedelta
+            return timedelta(self.__days * other,
+                             self.__seconds * other,
+                             self.__microseconds * other)
         return NotImplemented
 
     __rmul__ = __mul__
@@ -619,7 +627,7 @@
         if isinstance(other, (int, long)):
             usec = ((self.__days * (24*3600L) + self.__seconds) * 1000000 +
                     self.__microseconds)
-            return self.__class__(0, 0, usec // other)
+            return timedelta(0, 0, usec // other)
         return NotImplemented
 
     __floordiv__ = __div__
@@ -728,7 +736,7 @@
         if isinstance(year, str):
             # Pickle support
             self = object.__new__(cls)
-            self.__setstate((year,))
+            self.__setstate(year)
             return self
         _check_date_fields(year, month, day)
         self = object.__new__(cls)
@@ -901,9 +909,10 @@
                       self.__month,
                       self.__day + other.days)
             self._checkOverflow(t.year)
-            result = self.__class__(t.year, t.month, t.day)
+            result = date(t.year, t.month, t.day)
             return result
-        return NotImplemented
+        raise TypeError
+        # XXX Should be 'return NotImplemented', but there's a bug in 2.2...
 
     __radd__ = __add__
 
@@ -963,16 +972,33 @@
         yhi, ylo = divmod(self.__year, 256)
         return ("%c%c%c%c" % (yhi, ylo, self.__month, self.__day), )
 
-    def __setstate(self, t):
-        assert isinstance(t, tuple) and len(t) == 1, `t`
-        string = t[0]
-        assert len(string) == 4
+    def __setstate(self, string):
+        if len(string) != 4 or not (1 <= ord(string[2]) <= 12):
+            raise TypeError("not enough arguments")
         yhi, ylo, self.__month, self.__day = map(ord, string)
         self.__year = yhi * 256 + ylo
 
     def __reduce__(self):
         return (self.__class__, self.__getstate())
 
+    def __tojava__(self, java_class):
+        from java.lang import Object
+        from java.sql import Date
+        from java.util import Calendar
+        from org.python.core import Py
+
+        if java_class not in (Calendar, Date, Object):
+            return Py.NoConversion
+
+        calendar = Calendar.getInstance()
+        calendar.clear()
+        calendar.set(self.year, self.month - 1, self.day)
+        if java_class == Calendar:
+            return calendar
+        else:
+            return Date(calendar.getTimeInMillis())
+
+
 _date_class = date  # so functions w/ args named "date" can get at the class
 
 date.min = date(1, 1, 1)
@@ -1089,7 +1115,7 @@
         self = object.__new__(cls)
         if isinstance(hour, str):
             # Pickle support
-            self.__setstate((hour, minute or None))
+            self.__setstate(hour, minute or None)
             return self
         _check_tzinfo_arg(tzinfo)
         _check_time_fields(hour, minute, second, microsecond)
@@ -1327,22 +1353,39 @@
         else:
             return (basestate, self._tzinfo)
 
-    def __setstate(self, state):
-        assert isinstance(state, tuple)
-        assert 1 <= len(state) <= 2
-        string = state[0]
-        assert len(string) == 6
+    def __setstate(self, string, tzinfo):
+        if len(string) != 6 or ord(string[0]) >= 24:
+            raise TypeError("an integer is required")
         self.__hour, self.__minute, self.__second, us1, us2, us3 = \
                                                             map(ord, string)
         self.__microsecond = (((us1 << 8) | us2) << 8) | us3
-        if len(state) == 1:
-            self._tzinfo = None
-        else:
-            self._tzinfo = state[1]
+        self._tzinfo = tzinfo
 
     def __reduce__(self):
-        return (self.__class__, self.__getstate())
+        return (time, self.__getstate())
 
+    def __tojava__(self, java_class):
+        # TODO, if self.tzinfo is not None, convert time to UTC
+        from java.lang import Object
+        from java.sql import Time
+        from java.util import Calendar
+        from org.python.core import Py
+
+        if java_class not in (Calendar, Time, Object):
+            return Py.NoConversion
+
+        calendar = Calendar.getInstance()
+        calendar.clear()
+        calendar.set(Calendar.HOUR_OF_DAY, self.hour)
+        calendar.set(Calendar.MINUTE, self.minute)
+        calendar.set(Calendar.SECOND, self.second)
+        calendar.set(Calendar.MILLISECOND, self.microsecond // 1000)
+        if java_class == Calendar:
+            return calendar
+        else:
+            return Time(calendar.getTimeInMillis())
+
+
 _time_class = time  # so functions w/ args named "time" can get at the class
 
 time.min = time(0, 0, 0)
@@ -1359,7 +1402,7 @@
         if isinstance(year, str):
             # Pickle support
             self = date.__new__(cls, year[:4])
-            self.__setstate((year, month))
+            self.__setstate(year, month)
             return self
         _check_tzinfo_arg(tzinfo)
         _check_time_fields(hour, minute, second, microsecond)
@@ -1396,8 +1439,17 @@
             converter = _time.gmtime
         y, m, d, hh, mm, ss, weekday, jday, dst = converter(t)
         us = int((t % 1.0) * 1000000)
+
+        if us == 1000001 or us == 999999:
+            us = 0
+            rounded = True
+        else:
+            rounded = False
+
         ss = min(ss, 59)    # clamp out leap seconds if the platform has them
         result = cls(y, m, d, hh, mm, ss, us, tz)
+        if rounded:
+            result += timedelta(seconds=1)
         if tz is not None:
             result = tz.fromutc(result)
         return result
@@ -1439,6 +1491,15 @@
                    time.tzinfo)
     combine = classmethod(combine)
 
+    def strptime(cls, date_string, format):
+        """datetime(year, month, day[, hour[, minute[, second[, microsecond[,tzinfo]]]]])
+
+        The year, month and day arguments are required. tzinfo may be None, or an
+        instance of a tzinfo subclass. The remaining arguments may be ints or longs."""
+        return cls(*(_time.strptime(date_string, format))[0:6])
+
+    strptime = classmethod(strptime)
+
     def timetuple(self):
         "Return local time tuple compatible with time.localtime()."
         dst = self._dst()
@@ -1561,7 +1622,7 @@
         if L[-1] == 0:
             del L[-1]
         if L[-1] == 0:
-            del L[-1]
+            del L[-1]            
         s = ", ".join(map(str, L))
         s = "%s(%s)" % ('datetime.' + self.__class__.__name__, s)
         if self._tzinfo is not None:
@@ -1625,7 +1686,7 @@
     def __eq__(self, other):
         if isinstance(other, datetime):
             return self.__cmp(other) == 0
-        elif hasattr(other, "timetuple"):
+        elif hasattr(other, "timetuple") and not isinstance(other, date):
             return NotImplemented
         else:
             return False
@@ -1633,7 +1694,7 @@
     def __ne__(self, other):
         if isinstance(other, datetime):
             return self.__cmp(other) != 0
-        elif hasattr(other, "timetuple"):
+        elif hasattr(other, "timetuple") and not isinstance(other, date):
             return NotImplemented
         else:
             return True
@@ -1641,7 +1702,7 @@
     def __le__(self, other):
         if isinstance(other, datetime):
             return self.__cmp(other) <= 0
-        elif hasattr(other, "timetuple"):
+        elif hasattr(other, "timetuple") and not isinstance(other, date):
             return NotImplemented
         else:
             _cmperror(self, other)
@@ -1649,7 +1710,7 @@
     def __lt__(self, other):
         if isinstance(other, datetime):
             return self.__cmp(other) < 0
-        elif hasattr(other, "timetuple"):
+        elif hasattr(other, "timetuple") and not isinstance(other, date):
             return NotImplemented
         else:
             _cmperror(self, other)
@@ -1657,7 +1718,7 @@
     def __ge__(self, other):
         if isinstance(other, datetime):
             return self.__cmp(other) >= 0
-        elif hasattr(other, "timetuple"):
+        elif hasattr(other, "timetuple") and not isinstance(other, date):
             return NotImplemented
         else:
             _cmperror(self, other)
@@ -1665,7 +1726,7 @@
     def __gt__(self, other):
         if isinstance(other, datetime):
             return self.__cmp(other) > 0
-        elif hasattr(other, "timetuple"):
+        elif hasattr(other, "timetuple") and not isinstance(other, date):
             return NotImplemented
         else:
             _cmperror(self, other)
@@ -1713,7 +1774,7 @@
                   self.__second + other.seconds,
                   self.__microsecond + other.microseconds)
         self._checkOverflow(t.year)
-        result = self.__class__(t.year, t.month, t.day,
+        result = datetime(t.year, t.month, t.day,
                                 t.hour, t.minute, t.second,
                                 t.microsecond, tzinfo=self._tzinfo)
         return result
@@ -1768,24 +1829,38 @@
         else:
             return (basestate, self._tzinfo)
 
-    def __setstate(self, state):
-        assert isinstance(state, tuple)
-        assert 1 <= len(state) <= 2
-        string = state[0]
-        assert len(string) == 10
+    def __setstate(self, string, tzinfo):
         (yhi, ylo, self.__month, self.__day, self.__hour,
          self.__minute, self.__second, us1, us2, us3) = map(ord, string)
         self.__year = yhi * 256 + ylo
         self.__microsecond = (((us1 << 8) | us2) << 8) | us3
-        if len(state) == 1:
-            self._tzinfo = None
-        else:
-            self._tzinfo = state[1]
+        self._tzinfo = tzinfo
 
     def __reduce__(self):
         return (self.__class__, self.__getstate())
 
+    def __tojava__(self, java_class):
+        # TODO, if self.tzinfo is not None, convert time to UTC
+        from java.lang import Object
+        from java.sql import Timestamp
+        from java.util import Calendar
+        from org.python.core import Py
 
+        if java_class not in (Calendar, Timestamp, Object):
+            return Py.NoConversion
+
+        calendar = Calendar.getInstance()
+        calendar.clear()
+        calendar.set(self.year, self.month - 1, self.day,
+                     self.hour, self.minute, self.second)
+        calendar.set(Calendar.MILLISECOND, self.microsecond // 1000)
+
+        if java_class == Calendar:
+            return calendar
+        else:
+            return Timestamp(calendar.getTimeInMillis())
+
+
 datetime.min = datetime(1, 1, 1)
 datetime.max = datetime(9999, 12, 31, 23, 59, 59, 999999)
 datetime.resolution = timedelta(microseconds=1)
@@ -2000,9 +2075,3 @@
 pretty bizarre, and a tzinfo subclass can override fromutc() if it is.
 """
 
-def _test():
-    import test_datetime
-    test_datetime.test_main()
-
-if __name__ == "__main__":
-    _test()

Copied: trunk/jython/Lib/decimal.py (from rev 4961, branches/asm/Lib/decimal.py)
===================================================================
--- trunk/jython/Lib/decimal.py	                        (rev 0)
+++ trunk/jython/Lib/decimal.py	2008-08-19 21:06:39 UTC (rev 5206)
@@ -0,0 +1,5173 @@
+# Copyright (c) 2004 Python Software Foundation.
+# All rights reserved.
+
+# Written by Eric Price <eprice at tjhsst.edu>
+#    and Facundo Batista <facundo at taniquetil.com.ar>
+#    and Raymond Hettinger <python at rcn.com>
+#    and Aahz <aahz at pobox.com>
+#    and Tim Peters
+
+# This module is currently Py2.3 compatible and should be kept that way
+# unless a major compelling advantage arises.  IOW, 2.3 compatibility is
+# strongly preferred, but not guaranteed.
+
+# Also, this module should be kept in sync with the latest updates of
+# the IBM specification as it evolves.  Those updates will be treated
+# as bug fixes (deviation from the spec is a compatibility, usability
+# bug) and will be backported.  At this point the spec is stabilizing
+# and the updates are becoming fewer, smaller, and less significant.
+
+"""
+This is a Py2.3 implementation of decimal floating point arithmetic based on
+the General Decimal Arithmetic Specification:
+
+    www2.hursley.ibm.com/decimal/decarith.html
+
+and IEEE standard 854-1987:
+
+    http://www.cs.berkeley.edu/~ejr/projects/754/private/drafts/854-1987/dir.html
+
+Decimal floating point has finite precision with arbitrarily large bounds.
+
+The purpose of this module is to support arithmetic using familiar
+"schoolhouse" rules and to avoid some of the tricky representation
+issues associated with binary floating point.  The package is especially
+useful for financial applications or for contexts where users have
+expectations that are at odds with binary floating point (for instance,
+in binary floating point, 1.00 % 0.1 gives 0.09999999999999995 instead
+of the expected Decimal("0.00") returned by decimal floating point).
+
+Here are some examples of using the decimal module:
+
+>>> from decimal import *
+>>> setcontext(ExtendedContext)
+>>> Decimal(0)
+Decimal("0")
+>>> Decimal("1")
+Decimal("1")
+>>> Decimal("-.0123")
+Decimal("-0.0123")
+>>> Decimal(123456)
+Decimal("123456")
+>>> Decimal("123.45e12345678901234567890")
+Decimal("1.2345E+12345678901234567892")
+>>> Decimal("1.33") + Decimal("1.27")
+Decimal("2.60")
+>>> Decimal("12.34") + Decimal("3.87") - Decimal("18.41")
+Decimal("-2.20")
+>>> dig = Decimal(1)
+>>> print dig / Decimal(3)
+0.333333333
+>>> getcontext().prec = 18
+>>> print dig / Decimal(3)
+0.333333333333333333
+>>> print dig.sqrt()
+1
+>>> print Decimal(3).sqrt()
+1.73205080756887729
+>>> print Decimal(3) ** 123
+4.85192780976896427E+58
+>>> inf = Decimal(1) / Decimal(0)
+>>> print inf
+Infinity
+>>> neginf = Decimal(-1) / Decimal(0)
+>>> print neginf
+-Infinity
+>>> print neginf + inf
+NaN
+>>> print neginf * inf
+-Infinity
+>>> print dig / 0
+Infinity
+>>> getcontext().traps[DivisionByZero] = 1
+>>> print dig / 0
+Traceback (most recent call last):
+  ...
+  ...
+  ...
+DivisionByZero: x / 0
+>>> c = Context()
+>>> c.traps[InvalidOperation] = 0
+>>> print c.flags[InvalidOperation]
+0
+>>> c.divide(Decimal(0), Decimal(0))
+Decimal("NaN")
+>>> c.traps[InvalidOperation] = 1
+>>> print c.flags[InvalidOperation]
+1
+>>> c.flags[InvalidOperation] = 0
+>>> print c.flags[InvalidOperation]
+0
+>>> print c.divide(Decimal(0), Decimal(0))
+Traceback (most recent call last):
+  ...
+  ...
+  ...
+InvalidOperation: 0 / 0
+>>> print c.flags[InvalidOperation]
+1
+>>> c.flags[InvalidOperation] = 0
+>>> c.traps[InvalidOperation] = 0
+>>> print c.divide(Decimal(0), Decimal(0))
+NaN
+>>> print c.flags[InvalidOperation]
+1
+>>>
+"""
+
+__all__ = [
+    # Two major classes
+    'Decimal', 'Context',
+
+    # Contexts
+    'DefaultContext', 'BasicContext', 'ExtendedContext',
+
+    # Exceptions
+    'DecimalException', 'Clamped', 'InvalidOperation', 'DivisionByZero',
+    'Inexact', 'Rounded', 'Subnormal', 'Overflow', 'Underflow',
+
+    # Constants for use in setting up contexts
+    'ROUND_DOWN', 'ROUND_HALF_UP', 'ROUND_HALF_EVEN', 'ROUND_CEILING',
+    'ROUND_FLOOR', 'ROUND_UP', 'ROUND_HALF_DOWN', 'ROUND_05UP',
+
+    # Functions for manipulating contexts
+    'setcontext', 'getcontext', 'localcontext'
+]
+
+import copy as _copy
+
+# Rounding
+ROUND_DOWN = 'ROUND_DOWN'
+ROUND_HALF_UP = 'ROUND_HALF_UP'
+ROUND_HALF_EVEN = 'ROUND_HALF_EVEN'
+ROUND_CEILING = 'ROUND_CEILING'
+ROUND_FLOOR = 'ROUND_FLOOR'
+ROUND_UP = 'ROUND_UP'
+ROUND_HALF_DOWN = 'ROUND_HALF_DOWN'
+ROUND_05UP = 'ROUND_05UP'
+
+# Errors
+
+class DecimalException(ArithmeticError):
+    """Base exception class.
+
+    Used exceptions derive from this.
+    If an exception derives from another exception besides this (such as
+    Underflow (Inexact, Rounded, Subnormal) that indicates that it is only
+    called if the others are present.  This isn't actually used for
+    anything, though.
+
+    handle  -- Called when context._raise_error is called and the
+               trap_enabler is set.  First argument is self, second is the
+               context.  More arguments can be given, those being after
+               the explanation in _raise_error (For example,
+               context._raise_error(NewError, '(-x)!', self._sign) would
+               call NewError().handle(context, self._sign).)
+
+    To define a new exception, it should be sufficient to have it derive
+    from DecimalException.
+    """
+    def handle(self, context, *args):
+        pass
+
+
+class Clamped(DecimalException):
+    """Exponent of a 0 changed to fit bounds.
+
+    This occurs and signals clamped if the exponent of a result has been
+    altered in order to fit the constraints of a specific concrete
+    representation.  This may occur when the exponent of a zero result would
+    be outside the bounds of a representation, or when a large normal
+    number would have an encoded exponent that cannot be represented.  In
+    this latter case, the exponent is reduced to fit and the corresponding
+    number of zero digits are appended to the coefficient ("fold-down").
+    """
+
+class InvalidOperation(DecimalException):
+    """An invalid operation was performed.
+
+    Various bad things cause this:
+
+    Something creates a signaling NaN
+    -INF + INF
+    0 * (+-)INF
+    (+-)INF / (+-)INF
+    x % 0
+    (+-)INF % x
+    x._rescale( non-integer )
+    sqrt(-x) , x > 0
+    0 ** 0
+    x ** (non-integer)
+    x ** (+-)INF
+    An operand is invalid
+
+    The result of the operation after these is a quiet positive NaN,
+    except when the cause is a signaling NaN, in which case the result is
+    also a quiet NaN, but with the original sign, and an optional
+    diagnostic information.
+    """
+    def handle(self, context, *args):
+        if args:
+            ans = _dec_from_triple(args[0]._sign, args[0]._int, 'n', True)
+            return ans._fix_nan(context)
+        return NaN
+
+class ConversionSyntax(InvalidOperation):
+    """Trying to convert badly formed string.
+
+    This occurs and signals invalid-operation if an string is being
+    converted to a number and it does not conform to the numeric string
+    syntax.  The result is [0,qNaN].
+    """
+    def handle(self, context, *args):
+        return NaN
+
+class DivisionByZero(DecimalException, ZeroDivisionError):
+    """Division by 0.
+
+    This occurs and signals division-by-zero if division of a finite number
+    by zero was attempted (during a divide-integer or divide operation, or a
+    power operation with negative right-hand operand), and the dividend was
+    not zero.
+
+    The result of the operation is [sign,inf], where sign is the exclusive
+    or of the signs of the operands for divide, or is 1 for an odd power of
+    -0, for power.
+    """
+
+    def handle(self, context, sign, *args):
+        return Infsign[sign]
+
+class DivisionImpossible(InvalidOperation):
+    """Cannot perform the division adequately.
+
+    This occurs and signals invalid-operation if the integer result of a
+    divide-integer or remainder operation had too many digits (would be
+    longer than precision).  The result is [0,qNaN].
+    """
+
+    def handle(self, context, *args):
+        return NaN
+
+class DivisionUndefined(InvalidOperation, ZeroDivisionError):
+    """Undefined result of division.
+
+    This occurs and signals invalid-operation if division by zero was
+    attempted (during a divide-integer, divide, or remainder operation), and
+    the dividend is also zero.  The result is [0,qNaN].
+    """
+
+    def handle(self, context, *args):
+        return NaN
+
+class Inexact(DecimalException):
+    """Had to round, losing information.
+
+    This occurs and signals inexact whenever the result of an operation is
+    not exact (that is, it needed to be rounded and any discarded digits
+    were non-zero), or if an overflow or underflow condition occurs.  The
+    result in all cases is unchanged.
+
+    The inexact signal may be tested (or trapped) to determine if a given
+    operation (or sequence of operations) was inexact.
+    """
+
+class InvalidContext(InvalidOperation):
+    """Invalid context.  Unknown rounding, for example.
+
+    This occurs and signals invalid-operation if an invalid context was
+    detected during an operation.  This can occur if contexts are not checked
+    on creation and either the precision exceeds the capability of the
+    underlying concrete representation or an unknown or unsupported rounding
+    was specified.  These aspects of the context need only be checked when
+    the values are required to be used.  The result is [0,qNaN].
+    """
+
+    def handle(self, context, *args):
+        return NaN
+
+class Rounded(DecimalException):
+    """Number got rounded (not  necessarily changed during rounding).
+
+    This occurs and signals rounded whenever the result of an operation is
+    rounded (that is, some zero or non-zero digits were discarded from the
+    coefficient), or if an overflow or underflow condition occurs.  The
+    result in all cases is unchanged.
+
+    The rounded signal may be tested (or trapped) to determine if a given
+    operation (or sequence of operations) caused a loss of precision.
+    """
+
+class Subnormal(DecimalException):
+    """Exponent < Emin before rounding.
+
+    This occurs and signals subnormal whenever the result of a conversion or
+    operation is subnormal (that is, its adjusted exponent is less than
+    Emin, before any rounding).  The result in all cases is unchanged.
+
+    The subnormal signal may be tested (or trapped) to determine if a given
+    or operation (or sequence of operations) yielded a subnormal result.
+    """
+
+class Overflow(Inexact, Rounded):
+    """Numerical overflow.
+
+    This occurs and signals overflow if the adjusted exponent of a result
+    (from a conversion or from an operation that is not an attempt to divide
+    by zero), after rounding, would be greater than the largest value that
+    can be handled by the implementation (the value Emax).
+
+    The result depends on the rounding mode:
+
+    For round-half-up and round-half-even (and for round-half-down and
+    round-up, if implemented), the result of the operation is [sign,inf],
+    where sign is the sign of the intermediate result.  For round-down, the
+    result is the largest finite number that can be represented in the
+    current precision, with the sign of the intermediate result.  For
+    round-ceiling, the result is the same as for round-down if the sign of
+    the intermediate result is 1, or is [0,inf] otherwise.  For round-floor,
+    the result is the same as for round-down if the sign of the intermediate
+    result is 0, or is [1,inf] otherwise.  In all cases, Inexact and Rounded
+    will also be raised.
+    """
+
+    def handle(self, context, sign, *args):
+        if context.rounding in (ROUND_HALF_UP, ROUND_HALF_EVEN,
+                                ROUND_HALF_DOWN, ROUND_UP):
+            return Infsign[sign]
+        if sign == 0:
+            if context.rounding == ROUND_CEILING:
+                return Infsign[sign]
+            return _dec_from_triple(sign, '9'*context.prec,
+                            context.Emax-context.prec+1)
+        if sign == 1:
+            if context.rounding == ROUND_FLOOR:
+                return Infsign[sign]
+            return _dec_from_triple(sign, '9'*context.prec,
+                             context.Emax-context.prec+1)
+
+
+class Underflow(Inexact, Rounded, Subnormal):
+    """Numerical underflow with result rounded to 0.
+
+    This occurs and signals underflow if a result is inexact and the
+    adjusted exponent of the result would be smaller (more negative) than
+    the smallest value that can be handled by the implementation (the value
+    Emin).  That is, the result is both inexact and subnormal.
+
+    The result after an underflow will be a subnormal number rounded, if
+    necessary, so that its exponent is not less than Etiny.  This may result
+    in 0 with the sign of the intermediate result and an exponent of Etiny.
+
+    In all cases, Inexact, Rounded, and Subnormal will also be raised.
+    """
+
+# List of public traps and flags
+_signals = [Clamped, DivisionByZero, Inexact, Overflow, Rounded,
+           Underflow, InvalidOperation, Subnormal]
+
+# Map conditions (per the spec) to signals
+_condition_map = {ConversionSyntax:InvalidOperation,
+                  DivisionImpossible:InvalidOperation,
+                  DivisionUndefined:InvalidOperation,
+                  InvalidContext:InvalidOperation}
+
+##### Context Functions ##################################################
+
+# The getcontext() and setcontext() function manage access to a thread-local
+# current context.  Py2.4 offers direct support for thread locals.  If that
+# is not available, use threading.currentThread() which is slower but will
+# work for older Pythons.  If threads are not part of the build, create a
+# mock threading object with threading.local() returning the module namespace.
+
+try:
+    import threading
+except ImportError:
+    # Python was compiled without threads; create a mock object instead
+    import sys
+    class MockThreading(object):
+        def local(self, sys=sys):
+            return sys.modules[__name__]
+    threading = MockThreading()
+    del sys, MockThreading
+
+try:
+    threading.local
+
+except AttributeError:
+
+    # To fix reloading, force it to create a new context
+    # Old contexts have different exceptions in their dicts, making problems.
+    if hasattr(threading.currentThread(), '__decimal_context__'):
+        del threading.currentThread().__decimal_context__
+
+    def setcontext(context):
+        """Set this thread's context to context."""
+        if context in (DefaultContext, BasicContext, ExtendedContext):
+            context = context.copy()
+            context.clear_flags()
+        threading.currentThread().__decimal_context__ = context
+
+    def getcontext():
+        """Returns this thread's context.
+
+        If this thread does not yet have a context, returns
+        a new context and sets this thread's context.
+        New contexts are copies of DefaultContext.
+        """
+        try:
+            return threading.currentThread().__decimal_context__
+        except AttributeError:
+            context = Context()
+            threading.currentThread().__decimal_context__ = context
+            return context
+
+else:
+
+    local = threading.local()
+    if hasattr(local, '__decimal_context__'):
+        del local.__decimal_context__
+
+    def getcontext(_local=local):
+        """Returns this thread's context.
+
+        If this thread does not yet have a context, returns
+        a new context and sets this thread's context.
+        New contexts are copies of DefaultContext.
+        """
+        try:
+            return _local.__decimal_context__
+        except AttributeError:
+            context = Context()
+            _local.__decimal_context__ = context
+            return context
+
+    def setcontext(context, _local=local):
+        """Set this thread's context to context."""
+        if context in (DefaultContext, BasicContext, ExtendedContext):
+            context = context.copy()
+            context.clear_flags()
+        _local.__decimal_context__ = context
+
+    del threading, local        # Don't contaminate the namespace
+
+def localcontext(ctx=None):
+    """Return a context manager for a copy of the supplied context
+
+    Uses a copy of the current context if no context is specified
+    The returned context manager creates a local decimal context
+    in a with statement:
+        def sin(x):
+             with localcontext() as ctx:
+                 ctx.prec += 2
+                 # Rest of sin calculation algorithm
+                 # uses a precision 2 greater than normal
+             return +s  # Convert result to normal precision
+
+         def sin(x):
+             with localcontext(ExtendedContext):
+                 # Rest of sin calculation algorithm
+                 # uses the Extended Context from the
+                 # General Decimal Arithmetic Specification
+             return +s  # Convert result to normal context
+
+    """
+    # The string below can't be included in the docstring until Python 2.6
+    # as the doctest module doesn't understand __future__ statements
+    """
+    >>> from __future__ import with_statement
+    >>> print getcontext().prec
+    28
+    >>> with localcontext():
+    ...     ctx = getcontext()
+    ...     ctx.prec += 2
+    ...     print ctx.prec
+    ...
+    30
+    >>> with localcontext(ExtendedContext):
+    ...     print getcontext().prec
+    ...
+    9
+    >>> print getcontext().prec
+    28
+    """
+    if ctx is None: ctx = getcontext()
+    return _ContextManager(ctx)
+
+
+##### Decimal class #######################################################
+
+class Decimal(object):
+    """Floating point class for decimal arithmetic."""
+
+    __slots__ = ('_exp','_int','_sign', '_is_special')
+    # Generally, the value of the Decimal instance is given by
+    #  (-1)**_sign * _int * 10**_exp
+    # Special values are signified by _is_special == True
+
+    # We're immutable, so use __new__ not __init__
+    def __new__(cls, value="0", context=None):
+        """Create a decimal point instance.
+
+        >>> Decimal('3.14')              # string input
+        Decimal("3.14")
+        >>> Decimal((0, (3, 1, 4), -2))  # tuple (sign, digit_tuple, exponent)
+        Decimal("3.14")
+        >>> Decimal(314)                 # int or long
+        Decimal("314")
+        >>> Decimal(Decimal(314))        # another decimal instance
+        Decimal("314")
+        """
+
+        # Note that the coefficient, self._int, is actually stored as
+        # a string rather than as a tuple of digits.  This speeds up
+        # the "digits to integer" and "integer to digits" conversions
+        # that are used in almost every arithmetic operation on
+        # Decimals.  This is an internal detail: the as_tuple function
+        # and the Decimal constructor still deal with tuples of
+        # digits.
+
+        self = object.__new__(cls)
+
+        # From a string
+        # REs insist on real strings, so we can too.
+        if isinstance(value, basestring):
+            m = _parser(value)
+            if m is None:
+                if context is None:
+                    context = getcontext()
+                return context._raise_error(ConversionSyntax,
+                                "Invalid literal for Decimal: %r" % value)
+
+            if m.group('sign') == "-":
+                self._sign = 1
+            else:
+                self._sign = 0
+            intpart = m.group('int')
+            if intpart is not None:
+                # finite number
+                fracpart = m.group('frac')
+                exp = int(m.group('exp') or '0')
+                if fracpart is not None:
+                    self._int = str((intpart+fracpart).lstrip('0') or '0')
+                    self._exp = exp - len(fracpart)
+                else:
+                    self._int = str(intpart.lstrip('0') or '0')
+                    self._exp = exp
+                self._is_special = False
+            else:
+                diag = m.group('diag')
+                if diag is not None:
+                    # NaN
+                    self._int = str(diag.lstrip('0'))
+                    if m.group('signal'):
+                        self._exp = 'N'
+                    else:
+                        self._exp = 'n'
+                else:
+                    # infinity
+                    self._int = '0'
+                    self._exp = 'F'
+                self._is_special = True
+            return self
+
+        # From an integer
+        if isinstance(value, (int,long)):
+            if value >= 0:
+                self._sign = 0
+            else:
+                self._sign = 1
+            self._exp = 0
+            self._int = str(abs(value))
+            self._is_special = False
+            return self
+
+        # From another decimal
+        if isinstance(value, Decimal):
+            self._exp  = value._exp
+            self._sign = value._sign
+            self._int  = value._int
+            self._is_special  = value._is_special
+            return self
+
+        # From an internal working value
+        if isinstance(value, _WorkRep):
+            self._sign = value.sign
+            self._int = str(value.int)
+            self._exp = int(value.exp)
+            self._is_special = False
+            return self
+
+        # tuple/list conversion (possibly from as_tuple())
+        if isinstance(value, (list,tuple)):
+            if len(value) != 3:
+                raise ValueError('Invalid tuple size in creation of Decimal '
+                                 'from list or tuple.  The list or tuple '
+                                 'should have exactly three elements.')
+            # process sign.  The isinstance test rejects floats
+            if not (isinstance(value[0], (int, long)) and value[0] in (0,1)):
+                raise ValueError("Invalid sign.  The first value in the tuple "
+                                 "should be an integer; either 0 for a "
+                                 "positive number or 1 for a negative number.")
+            self._sign = value[0]
+            if value[2] == 'F':
+                # infinity: value[1] is ignored
+                self._int = '0'
+                self._exp = value[2]
+                self._is_special = True
+            else:
+                # process and validate the digits in value[1]
+                digits = []
+                for digit in value[1]:
+                    if isinstance(digit, (int, long)) and 0 <= digit <= 9:
+                        # skip leading zeros
+                        if digits or digit != 0:
+                            digits.append(digit)
+                    else:
+                        raise ValueError("The second value in the tuple must "
+                                         "be composed of integers in the range "
+                                         "0 through 9.")
+                if value[2] in ('n', 'N'):
+                    # NaN: digits form the diagnostic
+                    self._int = ''.join(map(str, digits))
+                    self._exp = value[2]
+                    self._is_special = True
+                elif isinstance(value[2], (int, long)):
+                    # finite number: digits give the coefficient
+                    self._int = ''.join(map(str, digits or [0]))
+                    self._exp = value[2]
+                    self._is_special = False
+                else:
+                    raise ValueError("The third value in the tuple must "
+                                     "be an integer, or one of the "
+                                     "strings 'F', 'n', 'N'.")
+            return self
+
+        if isinstance(value, float):
+            raise TypeError("Cannot convert float to Decimal.  " +
+                            "First convert the float to a string")
+
+        raise TypeError("Cannot convert %r to Decimal" % value)
+
+    def _isnan(self):
+        """Returns whether the number is not actually one.
+
+        0 if a number
+        1 if NaN
+        2 if sNaN
+        """
+        if self._is_special:
+            exp = self._exp
+            if exp == 'n':
+                return 1
+            elif exp == 'N':
+                return 2
+        return 0
+
+    def _isinfinity(self):
+        """Returns whether the number is infinite
+
+        0 if finite or not a number
+        1 if +INF
+        -1 if -INF
+        """
+        if self._exp == 'F':
+            if self._sign:
+                return -1
+            return 1
+        return 0
+
+    def _check_nans(self, other=None, context=None):
+        """Returns whether the number is not actually one.
+
+        if self, other are sNaN, signal
+        if self, other are NaN return nan
+        return 0
+
+        Done before operations.
+        """
+
+        self_is_nan = self._isnan()
+        if other is None:
+            other_is_nan = False
+        else:
+            other_is_nan = other._isnan()
+
+        if self_is_nan or other_is_nan:
+            if context is None:
+                context = getcontext()
+
+            if self_is_nan == 2:
+                return context._raise_error(InvalidOperation, 'sNaN',
+                                        self)
+            if other_is_nan == 2:
+                return context._raise_error(InvalidOperation, 'sNaN',
+                                        other)
+            if self_is_nan:
+                return self._fix_nan(context)
+
+            return other._fix_nan(context)
+        return 0
+
+    def __nonzero__(self):
+        """Return True if self is nonzero; otherwise return False.
+
+        NaNs and infinities are considered nonzero.
+        """
+        return self._is_special or self._int != '0'
+
+    def __cmp__(self, other):
+        other = _convert_other(other)
+        if other is NotImplemented:
+            # Never return NotImplemented
+            return 1
+
+        if self._is_special or other._is_special:
+            # check for nans, without raising on a signaling nan
+            if self._isnan() or other._isnan():
+                return 1  # Comparison involving NaN's always reports self > other
+
+            # INF = INF
+            return cmp(self._isinfinity(), other._isinfinity())
+
+        # check for zeros;  note that cmp(0, -0) should return 0
+        if not self:
+            if not other:
+                return 0
+            else:
+                return -((-1)**other._sign)
+        if not other:
+            return (-1)**self._sign
+
+        # If different signs, neg one is less
+        if other._sign < self._sign:
+            return -1
+        if self._sign < other._sign:
+            return 1
+
+        self_adjusted = self.adjusted()
+        other_adjusted = other.adjusted()
+        if self_adjusted == other_adjusted:
+            self_padded = self._int + '0'*(self._exp - other._exp)
+            other_padded = other._int + '0'*(other._exp - self._exp)
+            return cmp(self_padded, other_padded) * (-1)**self._sign
+        elif self_adjusted > other_adjusted:
+            return (-1)**self._sign
+        else: # self_adjusted < other_adjusted
+            return -((-1)**self._sign)
+
+    def __eq__(self, other):
+        if not isinstance(other, (Decimal, int, long)):
+            return NotImplemented
+        return self.__cmp__(other) == 0
+
+    def __ne__(self, other):
+        if not isinstance(other, (Decimal, int, long)):
+            return NotImplemented
+        return self.__cmp__(other) != 0
+
+    def compare(self, other, context=None):
+        """Compares one to another.
+
+        -1 => a < b
+        0  => a = b
+        1  => a > b
+        NaN => one is NaN
+        Like __cmp__, but returns Decimal instances.
+        """
+        other = _convert_other(other, raiseit=True)
+
+        # Compare(NaN, NaN) = NaN
+        if (self._is_special or other and other._is_special):
+            ans = self._check_nans(other, context)
+            if ans:
+                return ans
+
+        return Decimal(self.__cmp__(other))
+
+    def __hash__(self):
+        """x.__hash__() <==> hash(x)"""
+        # Decimal integers must hash the same as the ints
+        #
+        # The hash of a nonspecial noninteger Decimal must depend only
+        # on the value of that Decimal, and not on its representation.
+        # For example: hash(Decimal("100E-1")) == hash(Decimal("10")).
+        if self._is_special:
+            if self._isnan():
+                raise TypeError('Cannot hash a NaN value.')
+            return hash(str(self))
+        if not self:
+            return 0
+        if self._isinteger():
+            op = _WorkRep(self.to_integral_value())
+            return hash((-1)**op.sign*op.int*10**op.exp)
+        # The value of a nonzero nonspecial Decimal instance is
+        # faithfully represented by the triple consisting of its sign,
+        # its adjusted exponent, and its coefficient with trailing
+        # zeros removed.
+        return hash((self._sign,
+                     self._exp+len(self._int),
+                     self._int.rstrip('0')))
+
+    def as_tuple(self):
+        """Represents the number as a triple tuple.
+
+        To show the internals exactly as they are.
+        """
+        return (self._sign, tuple(map(int, self._int)), self._exp)
+
+    def __repr__(self):
+        """Represents the number as an instance of Decimal."""
+        # Invariant:  eval(repr(d)) == d
+        return 'Decimal("%s")' % str(self)
+
+    def __str__(self, eng=False, context=None):
+        """Return string representation of the number in scientific notation.
+
+        Captures all of the information in the underlying representation.
+        """
+
+        sign = ['', '-'][self._sign]
+        if self._is_special:
+            if self._exp == 'F':
+                return sign + 'Infinity'
+            elif self._exp == 'n':
+                return sign + 'NaN' + self._int
+            else: # self._exp == 'N'
+                return sign + 'sNaN' + self._int
+
+        # number of digits of self._int to left of decimal point
+        leftdigits = self._exp + len(self._int)
+
+        # dotplace is number of digits of self._int to the left of the
+        # decimal point in the mantissa of the output string (that is,
+        # after adjusting the exponent)
+        if self._exp <= 0 and leftdigits > -6:
+            # no exponent required
+            dotplace = leftdigits
+        elif not eng:
+            # usual scientific notation: 1 digit on left of the point
+            dotplace = 1
+        elif self._int == '0':
+            # engineering notation, zero
+            dotplace = (leftdigits + 1) % 3 - 1
+        else:
+            # engineering notation, nonzero
+            dotplace = (leftdigits - 1) % 3 + 1
+
+        if dotplace <= 0:
+            intpart = '0'
+            fracpart = '.' + '0'*(-dotplace) + self._int
+        elif dotplace >= len(self._int):
+            intpart = self._int+'0'*(dotplace-len(self._int))
+            fracpart = ''
+        else:
+            intpart = self._int[:dotplace]
+            fracpart = '.' + self._int[dotplace:]
+        if leftdigits == dotplace:
+            exp = ''
+        else:
+            if context is None:
+                context = getcontext()
+            exp = ['e', 'E'][context.capitals] + "%+d" % (leftdigits-dotplace)
+
+        return sign + intpart + fracpart + exp
+
+    def to_eng_string(self, context=None):
+        """Convert to engineering-type string.
+
+        Engineering notation has an exponent which is a multiple of 3, so there
+        are up to 3 digits left of the decimal place.
+
+        Same rules for when in exponential and when as a value as in __str__.
+        """
+        return self.__str__(eng=True, context=context)
+
+    def __neg__(self, context=None):
+        """Returns a copy with the sign switched.
+
+        Rounds, if it has reason.
+        """
+        if self._is_special:
+            ans = self._check_nans(context=context)
+            if ans:
+                return ans
+
+        if not self:
+            # -Decimal('0') is Decimal('0'), not Decimal('-0')
+            ans = self.copy_abs()
+        else:
+            ans = self.copy_negate()
+
+        if context is None:
+            context = getcontext()
+        return ans._fix(context)
+
+    def __pos__(self, context=None):
+        """Returns a copy, unless it is a sNaN.
+
+        Rounds the number (if more then precision digits)
+        """
+        if self._is_special:
+            ans = self._check_nans(context=context)
+            if ans:
+                return ans
+
+        if not self:
+            # + (-0) = 0
+            ans = self.copy_abs()
+        else:
+            ans = Decimal(self)
+
+        if context is None:
+            context = getcontext()
+        return ans._fix(context)
+
+    def __abs__(self, round=True, context=None):
+        """Returns the absolute value of self.
+
+        If the keyword argument 'round' is false, do not round.  The
+        expression self.__abs__(round=False) is equivalent to
+        self.copy_abs().
+        """
+        if not round:
+            return self.copy_abs()
+
+        if self._is_special:
+            ans = self._check_nans(context=context)
+            if ans:
+                return ans
+
+        if self._sign:
+            ans = self.__neg__(context=context)
+        else:
+            ans = self.__pos__(context=context)
+
+        return ans
+
+    def __add__(self, other, context=None):
+        """Returns self + other.
+
+        -INF + INF (or the reverse) cause InvalidOperation errors.
+        """
+        other = _convert_other(other)
+        if other is NotImplemented:
+            return other
+
+        if context is None:
+            context = getcontext()
+
+        if self._is_special or other._is_special:
+            ans = self._check_nans(other, context)
+            if ans:
+                return ans
+
+            if self._isinfinity():
+                # If both INF, same sign => same as both, opposite => error.
+                if self._sign != other._sign and other._isinfinity():
+                    return context._raise_error(InvalidOperation, '-INF + INF')
+                return Decimal(self)
+            if other._isinfinity():
+                return Decimal(other)  # Can't both be infinity here
+
+        exp = min(self._exp, other._exp)
+        negativezero = 0
+        if context.rounding == ROUND_FLOOR and self._sign != other._sign:
+            # If the answer is 0, the sign should be negative, in this case.
+            negativezero = 1
+
+        if not self and not other:
+            sign = min(self._sign, other._sign)
+            if negativezero:
+                sign = 1
+            ans = _dec_from_triple(sign, '0', exp)
+            ans = ans._fix(context)
+            return ans
+        if not self:
+            exp = max(exp, other._exp - context.prec-1)
+            ans = other._rescale(exp, context.rounding)
+            ans = ans._fix(context)
+            return ans
+        if not other:
+            exp = max(exp, self._exp - context.prec-1)
+            ans = self._rescale(exp, context.rounding)
+            ans = ans._fix(context)
+            return ans
+
+        op1 = _WorkRep(self)
+        op2 = _WorkRep(other)
+        op1, op2 = _normalize(op1, op2, context.prec)
+
+        result = _WorkRep()
+        if op1.sign != op2.sign:
+            # Equal and opposite
+            if op1.int == op2.int:
+                ans = _dec_from_triple(negativezero, '0', exp)
+                ans = ans._fix(context)
+                return ans
+            if op1.int < op2.int:
+                op1, op2 = op2, op1
+                # OK, now abs(op1) > abs(op2)
+            if op1.sign == 1:
+                result.sign = 1
+                op1.sign, op2.sign = op2.sign, op1.sign
+            else:
+                result.sign = 0
+                # So we know the sign, and op1 > 0.
+        elif op1.sign == 1:
+            result.sign = 1
+            op1.sign, op2.sign = (0, 0)
+        else:
+            result.sign = 0
+        # Now, op1 > abs(op2) > 0
+
+        if op2.sign == 0:
+            result.int = op1.int + op2.int
+        else:
+            result.int = op1.int - op2.int
+
+        result.exp = op1.exp
+        ans = Decimal(result)
+        ans = ans._fix(context)
+        return ans
+
+    __radd__ = __add__
+
+    def __sub__(self, other, context=None):
+        """Return self - other"""
+        other = _convert_other(other)
+        if other is NotImplemented:
+            return other
+
+        if self._is_special or other._is_special:
+            ans = self._check_nans(other, context=context)
+            if ans:
+                return ans
+
+        # self - other is computed as self + other.copy_negate()
+        return self.__add__(other.copy_negate(), context=context)
+
+    def __rsub__(self, other, context=None):
+        """Return other - self"""
+        other = _convert_other(other)
+        if other is NotImplemented:
+            return other
+
+        return other.__sub__(self, context=context)
+
+    def __mul__(self, other, context=None):
+        """Return self * other.
+
+        (+-) INF * 0 (or its reverse) raise InvalidOperation.
+        """
+        other = _convert_other(other)
+        if other is NotImplemented:
+            return other
+
+        if context is None:
+            context = getcontext()
+
+        resultsign = self._sign ^ other._sign
+
+        if self._is_special or other._is_special:
+            ans = self._check_nans(other, context)
+            if ans:
+                return ans
+
+            if self._isinfinity():
+                if not other:
+                    return context._raise_error(InvalidOperation, '(+-)INF * 0')
+                return Infsign[resultsign]
+
+            if other._isinfinity():
+                if not self:
+                    return context._raise_error(InvalidOperation, '0 * (+-)INF')
+                return Infsign[resultsign]
+
+        resultexp = self._exp + other._exp
+
+        # Special case for multiplying by zero
+        if not self or not other:
+            ans = _dec_from_triple(resultsign, '0', resultexp)
+            # Fixing in case the exponent is out of bounds
+            ans = ans._fix(context)
+            return ans
+
+        # Special case for multiplying by power of 10
+        if self._int == '1':
+            ans = _dec_from_triple(resultsign, other._int, resultexp)
+            ans = ans._fix(context)
+            return ans
+        if other._int == '1':
+            ans = _dec_from_triple(resultsign, self._int, resultexp)
+            ans = ans._fix(context)
+            return ans
+
+        op1 = _WorkRep(self)
+        op2 = _WorkRep(other)
+
+        ans = _dec_from_triple(resultsign, str(op1.int * op2.int), resultexp)
+        ans = ans._fix(context)
+
+        return ans
+    __rmul__ = __mul__
+
+    def __div__(self, other, context=None):
+        """Return self / other."""
+        other = _convert_other(other)
+        if other is NotImplemented:
+            return NotImplemented
+
+        if context is None:
+            context = getcontext()
+
+        sign = self._sign ^ other._sign
+
+        if self._is_special or other._is_special:
+            ans = self._check_nans(other, context)
+            if ans:
+                return ans
+
+            if self._isinfinity() and other._isinfinity():
+                return context._raise_error(InvalidOperation, '(+-)INF/(+-)INF')
+
+            if self._isinfinity():
+                return Infsign[sign]
+
+            if other._isinfinity():
+                context._raise_error(Clamped, 'Division by infinity')
+                return _dec_from_triple(sign, '0', context.Etiny())
+
+        # Special cases for zeroes
+        if not other:
+            if not self:
+                return context._raise_error(DivisionUndefined, '0 / 0')
+            return context._raise_error(DivisionByZero, 'x / 0', sign)
+
+        if not self:
+            exp = self._exp - other._exp
+            coeff = 0
+        else:
+            # OK, so neither = 0, INF or NaN
+            shift = len(other._int) - len(self._int) + context.prec + 1
+            exp = self._exp - other._exp - shift
+            op1 = _WorkRep(self)
+            op2 = _WorkRep(other)
+            if shift >= 0:
+                coeff, remainder = divmod(op1.int * 10**shift, op2.int)
+            else:
+                coeff, remainder = divmod(op1.int, op2.int * 10**-shift)
+            if remainder:
+                # result is not exact; adjust to ensure correct rounding
+                if coeff % 5 == 0:
+                    coeff += 1
+            else:
+                # result is exact; get as close to ideal exponent as possible
+                ideal_exp = self._exp - other._exp
+                while exp < ideal_exp and coeff % 10 == 0:
+                    coeff //= 10
+                    exp += 1
+
+        ans = _dec_from_triple(sign, str(coeff), exp)
+        return ans._fix(context)
+
+    __truediv__ = __div__
+
+    def _divide(self, other, context):
+        """Return (self // other, self % other), to context.prec precision.
+
+        Assumes that neither self nor other is a NaN, that self is not
+        infinite and that other is nonzero.
+        """
+        sign = self._sign ^ other._sign
+        if other._isinfinity():
+            ideal_exp = self._exp
+        else:
+            ideal_exp = min(self._exp, other._exp)
+
+        expdiff = self.adjusted() - other.adjusted()
+        if not self or other._isinfinity() or expdiff <= -2:
+            return (_dec_from_triple(sign, '0', 0),
+                    self._rescale(ideal_exp, context.rounding))
+        if expdiff <= context.prec:
+            op1 = _WorkRep(self)
+            op2 = _WorkRep(other)
+            if op1.exp >= op2.exp:
+                op1.int *= 10**(op1.exp - op2.exp)
+            else:
+                op2.int *= 10**(op2.exp - op1.exp)
+            q, r = divmod(op1.int, op2.int)
+            if q < 10**context.prec:
+                return (_dec_from_triple(sign, str(q), 0),
+                        _dec_from_triple(self._sign, str(r), ideal_exp))
+
+        # Here the quotient is too large to be representable
+        ans = context._raise_error(DivisionImpossible,
+                                   'quotient too large in //, % or divmod')
+        return ans, ans
+
+    def __rdiv__(self, other, context=None):
+        """Swaps self/other and returns __div__."""
+        other = _convert_other(other)
+        if other is NotImplemented:
+            return other
+        return other.__div__(self, context=context)
+    __rtruediv__ = __rdiv__
+
+    def __divmod__(self, other, context=None):
+        """
+        Return (self // other, self % other)
+        """
+        other = _convert_other(other)
+        if other is NotImplemented:
+            return other
+
+        if context is None:
+            context = getcontext()
+
+        ans = self._check_nans(other, context)
+        if ans:
+            return (ans, ans)
+
+        sign = self._sign ^ other._sign
+        if self._isinfinity():
+            if other._isinfinity():
+                ans = context._raise_error(InvalidOperation, 'divmod(INF, INF)')
+                return ans, ans
+            else:
+                return (Infsign[sign],
+                        context._raise_error(InvalidOperation, 'INF % x'))
+
+        if not other:
+            if not self:
+                ans = context._raise_error(DivisionUndefined, 'divmod(0, 0)')
+                return ans, ans
+            else:
+                return (context._raise_error(DivisionByZero, 'x // 0', sign),
+                        context._raise_error(InvalidOperation, 'x % 0'))
+
+        quotient, remainder = self._divide(other, context)
+        remainder = remainder._fix(context)
+        return quotient, remainder
+
+    def __rdivmod__(self, other, context=None):
+        """Swaps self/other and returns __divmod__."""
+        other = _convert_other(other)
+        if other is NotImplemented:
+            return other
+        return other.__divmod__(self, context=context)
+
+    def __mod__(self, other, context=None):
+        """
+        self % other
+        """
+        other = _convert_other(other)
+        if other is NotImplemented:
+            return other
+
+        if context is None:
+            context = getcontext()
+
+        ans = self._check_nans(other, context)
+        if ans:
+            return ans
+
+        if self._isinfinity():
+            return context._raise_error(InvalidOperation, 'INF % x')
+        elif not other:
+            if self:
+                return context._raise_error(InvalidOperation, 'x % 0')
+            else:
+                return context._raise_error(DivisionUndefined, '0 % 0')
+
+        remainder = self._divide(other, context)[1]
+        remainder = remainder._fix(context)
+        return remainder
+
+    def __rmod__(self, other, context=None):
+        """Swaps self/other and returns __mod__."""
+        other = _convert_other(other)
+        if other is NotImplemented:
+            return other
+        return other.__mod__(self, context=context)
+
+    def remainder_near(self, other, context=None):
+        """
+        Remainder nearest to 0-  abs(remainder-near) <= other/2
+        """
+        if context is None:
+            context = getcontext()
+
+        other = _convert_other(other, raiseit=True)
+
+        ans = self._check_nans(other, context)
+        if ans:
+            return ans
+
+        # self == +/-infinity -> InvalidOperation
+        if self._isinfinity():
+            return context._raise_error(InvalidOperation,
+                                        'remainder_near(infinity, x)')
+
+        # other == 0 -> either InvalidOperation or DivisionUndefined
+        if not other:
+            if self:
+                return context._raise_error(InvalidOperation,
+                                            'remainder_near(x, 0)')
+            else:
+                return context._raise_error(DivisionUndefined,
+                                            'remainder_near(0, 0)')
+
+        # other = +/-infinity -> remainder = self
+        if other._isinfinity():
+            ans = Decimal(self)
+            return ans._fix(context)
+
+        # self = 0 -> remainder = self, with ideal exponent
+        ideal_exponent = min(self._exp, other._exp)
+        if not self:
+            ans = _dec_from_triple(self._sign, '0', ideal_exponent)
+            return ans._fix(context)
+
+        # catch most cases of large or small quotient
+        expdiff = self.adjusted() - other.adjusted()
+        if expdiff >= context.prec + 1:
+            # expdiff >= prec+1 => abs(self/other) > 10**prec
+            return context._raise_error(DivisionImpossible)
+        if expdiff <= -2:
+            # expdiff <= -2 => abs(self/other) < 0.1
+            ans = self._rescale(ideal_exponent, context.rounding)
+            return ans._fix(context)
+
+        # adjust both arguments to have the same exponent, then divide
+        op1 = _WorkRep(self)
+        op2 = _WorkRep(other)
+        if op1.exp >= op2.exp:
+            op1.int *= 10**(op1.exp - op2.exp)
+        else:
+            op2.int *= 10**(op2.exp - op1.exp)
+        q, r = divmod(op1.int, op2.int)
+        # remainder is r*10**ideal_exponent; other is +/-op2.int *
+        # 10**ideal_exponent.   Apply correction to ensure that
+        # abs(remainder) <= abs(other)/2
+        if 2*r + (q&1) > op2.int:
+            r -= op2.int
+            q += 1
+
+        if q >= 10**context.prec:
+            return context._raise_error(DivisionImpossible)
+
+        # result has same sign as self unless r is negative
+        sign = self._sign
+        if r < 0:
+            sign = 1-sign
+            r = -r
+
+        ans = _dec_from_triple(sign, str(r), ideal_exponent)
+        return ans._fix(context)
+
+    def __floordiv__(self, other, context=None):
+        """self // other"""
+        other = _convert_other(other)
+        if other is NotImplemented:
+            return other
+
+        if context is None:
+            context = getcontext()
+
+        ans = self._check_nans(other, context)
+        if ans:
+            return ans
+
+        if self._isinfinity():
+            if other._isinfinity():
+                return context._raise_error(InvalidOperation, 'INF // INF')
+            else:
+                return Infsign[self._sign ^ other._sign]
+
+        if not other:
+            if self:
+                return context._raise_error(DivisionByZero, 'x // 0',
+                                            self._sign ^ other._sign)
+            else:
+                return context._raise_error(DivisionUndefined, '0 // 0')
+
+        return self._divide(other, context)[0]
+
+    def __rfloordiv__(self, other, context=None):
+        """Swaps self/other and returns __floordiv__."""
+        other = _convert_other(other)
+        if other is NotImplemented:
+            return other
+        return other.__floordiv__(self, context=context)
+
+    def __float__(self):
+        """Float representation."""
+        return float(str(self))
+
+    def __int__(self):
+        """Converts self to an int, truncating if necessary."""
+        if self._is_special:
+            if self._isnan():
+                context = getcontext()
+                return context._raise_error(InvalidContext)
+            elif self._isinfinity():
+                raise OverflowError("Cannot convert infinity to long")
+        s = (-1)**self._sign
+        if self._exp >= 0:
+            return s*int(self._int)*10**self._exp
+        else:
+            return s*int(self._int[:self._exp] or '0')
+
+    def __long__(self):
+        """Converts to a long.
+
+        Equivalent to long(int(self))
+        """
+        return long(self.__int__())
+
+    def _fix_nan(self, context):
+        """Decapitate the payload of a NaN to fit the context"""
+        payload = self._int
+
+        # maximum length of payload is precision if _clamp=0,
+        # precision-1 if _clamp=1.
+        max_payload_len = context.prec - context._clamp
+        if len(payload) > max_payload_len:
+            payload = payload[len(payload)-max_payload_len:].lstrip('0')
+            return _dec_from_triple(self._sign, payload, self._exp, True)
+        return Decimal(self)
+
+    def _fix(self, context):

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5212
          http://jython.svn.sourceforge.net/jython/?rev=5212&view=rev
Author:   pjenvey
Date:     2008-08-20 00:28:55 +0000 (Wed, 20 Aug 2008)

Log Message:
-----------
o rename unmarshalCode -> readCode, as it doesn't relate to Python's marshal
o zipimport shouldn't cacheCompiledSource (it's just been silently failing),
and use java enums

Modified Paths:
--------------
    trunk/jython/Lib/pkgutil.py
    trunk/jython/src/org/python/core/imp.java
    trunk/jython/src/org/python/modules/zipimport/zipimporter.java

Modified: trunk/jython/Lib/pkgutil.py
===================================================================
--- trunk/jython/Lib/pkgutil.py	2008-08-19 23:34:29 UTC (rev 5211)
+++ trunk/jython/Lib/pkgutil.py	2008-08-20 00:28:55 UTC (rev 5212)
@@ -22,7 +22,7 @@
 # accessed by _imp here
 
 def read_jython_code(fullname, file, filename):
-    data = _imp.unmarshalCode(filename, file, False)
+    data = _imp.readCode(filename, file, False)
     return BytecodeLoader.makeCode(fullname + "$py", data, filename)
 
 def simplegeneric(func):

Modified: trunk/jython/src/org/python/core/imp.java
===================================================================
--- trunk/jython/src/org/python/core/imp.java	2008-08-19 23:34:29 UTC (rev 5211)
+++ trunk/jython/src/org/python/core/imp.java	2008-08-20 00:28:55 UTC (rev 5212)
@@ -87,7 +87,7 @@
 
     static PyObject createFromPyClass(String name, InputStream fp,
             boolean testing, String fileName) {
-        byte[] data = unmarshalCode(name, fp, testing);
+        byte[] data = readCode(name, fp, testing);
         if (testing && data == null) {
             return null;
         }
@@ -107,8 +107,7 @@
         return createFromCode(name, code, fileName);
     }
     
-    public static byte[] unmarshalCode(String name, InputStream fp,
-            boolean testing) {
+    public static byte[] readCode(String name, InputStream fp, boolean testing) {
         byte[] data = readBytes(fp);
         int n = data.length;
 

Modified: trunk/jython/src/org/python/modules/zipimport/zipimporter.java
===================================================================
--- trunk/jython/src/org/python/modules/zipimport/zipimporter.java	2008-08-19 23:34:29 UTC (rev 5211)
+++ trunk/jython/src/org/python/modules/zipimport/zipimporter.java	2008-08-20 00:28:55 UTC (rev 5212)
@@ -6,6 +6,7 @@
 import java.io.InputStream;
 import java.util.Date;
 import java.util.Enumeration;
+import java.util.EnumSet;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -51,19 +52,22 @@
 
     /** zip_searchorder defines how we search for a module in the Zip
      * archive */
-    static final int IS_SOURCE = 0;
-    static final int IS_BYTECODE = 1;
-    static final int IS_PACKAGE = 2;
+    static enum EntryType {
+        IS_SOURCE, IS_BYTECODE, IS_PACKAGE
+    };
     static final SearchOrderEntry[] zip_searchorder = new SearchOrderEntry[] {
-        new SearchOrderEntry(File.separator + "__init__$py.class", IS_PACKAGE | IS_BYTECODE),
-        new SearchOrderEntry(File.separator + "__init__.py", IS_PACKAGE | IS_SOURCE),
-        new SearchOrderEntry("$py.class", IS_BYTECODE),
-        new SearchOrderEntry(".py", IS_SOURCE),
-        new SearchOrderEntry("", 0)
+        new SearchOrderEntry(File.separator + "__init__$py.class",
+                             EnumSet.of(EntryType.IS_PACKAGE, EntryType.IS_BYTECODE)),
+        new SearchOrderEntry(File.separator + "__init__.py",
+                             EnumSet.of(EntryType.IS_PACKAGE, EntryType.IS_SOURCE)),
+        new SearchOrderEntry("$py.class", EnumSet.of(EntryType.IS_BYTECODE)),
+        new SearchOrderEntry(".py", EnumSet.of(EntryType.IS_SOURCE)),
     };
 
     /** Module information */
-    static enum ModuleInfo {ERROR, NOT_FOUND, MODULE, PACKAGE};
+    static enum ModuleInfo {
+        ERROR, NOT_FOUND, MODULE, PACKAGE
+    };
 
     /** Pathname of the Zip archive */
     @ExposedGet
@@ -366,7 +370,7 @@
             if (tocEntry == null)
                 continue;
 
-            if ((entry.type & IS_PACKAGE) == IS_PACKAGE) {
+            if (entry.type.contains(EntryType.IS_PACKAGE)) {
                 return ModuleInfo.PACKAGE;
             }
             return ModuleInfo.MODULE;
@@ -399,8 +403,8 @@
                 continue;
             }
 
-            boolean ispackage = (entry.type & IS_PACKAGE) == IS_PACKAGE;
-            boolean isbytecode = (entry.type & IS_BYTECODE) == IS_BYTECODE;
+            boolean ispackage = entry.type.contains(EntryType.IS_PACKAGE);
+            boolean isbytecode = entry.type.contains(EntryType.IS_BYTECODE);
 
             if (isbytecode && isOutdatedBytecode(searchPath, tocEntry)) {
                 continue;
@@ -410,7 +414,7 @@
             ZipBundle zipBundle = getDataStream(searchPath);
             byte[] codeBytes;
             if (isbytecode) {
-                codeBytes = imp.unmarshalCode(fullname, zipBundle.inputStream, true);
+                codeBytes = imp.readCode(fullname, zipBundle.inputStream, true);
             }
             else {
                 codeBytes = imp.compileSource(fullname, zipBundle.inputStream, pathToEntry);
@@ -422,7 +426,6 @@
                 continue;
             }
 
-            imp.cacheCompiledSource(pathToEntry, null, codeBytes);
             PyCode code = BytecodeLoader.makeCode(fullname + "$py", codeBytes, pathToEntry);
             return new ModuleCodeData(code, ispackage, pathToEntry);
         }
@@ -661,9 +664,9 @@
      */
     protected static class SearchOrderEntry {
         public String suffix;
-        public int type;
+        public EnumSet type;
 
-        public SearchOrderEntry(String suffix, int type) {
+        public SearchOrderEntry(String suffix, EnumSet type) {
             this.suffix = suffix;
             this.type = type;
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5227
          http://jython.svn.sourceforge.net/jython/?rev=5227&view=rev
Author:   pjenvey
Date:     2008-08-20 23:01:42 +0000 (Wed, 20 Aug 2008)

Log Message:
-----------
rewrite the subx joiner yet again: this time exactly as CPython does it, with
__getslice__ and join. fixes a string subclass corner case

Modified Paths:
--------------
    trunk/jython/Lib/test/test_re_jy.py
    trunk/jython/src/org/python/modules/sre/PatternObject.java

Modified: trunk/jython/Lib/test/test_re_jy.py
===================================================================
--- trunk/jython/Lib/test/test_re_jy.py	2008-08-20 20:59:44 UTC (rev 5226)
+++ trunk/jython/Lib/test/test_re_jy.py	2008-08-20 23:01:42 UTC (rev 5227)
@@ -8,6 +8,23 @@
         result = re.sub('', lambda match : None, 'foo')
         self.assertEqual(result, 'foo')
         self.assert_(isinstance(result, str))
+
+    def test_sub_with_subclasses(self):
+        class Foo(unicode):
+            def join(self, items):
+                return Foo(unicode.join(self, items))
+        result = re.sub('bar', 'baz', Foo('bar'))
+        self.assertEqual(result, u'baz')
+        self.assertEqual(type(result), unicode)
+
+        class Foo2(unicode):
+            def join(self, items):
+                return Foo2(unicode.join(self, items))
+            def __getslice__(self, start, stop):
+                return Foo2(unicode.__getslice__(self, start, stop))
+        result = re.sub('bar', 'baz', Foo2('bar'))
+        self.assertEqual(result, Foo2('baz'))
+        self.assert_(isinstance(result, Foo2))
         
     def test_unkown_groupname(self):
         self.assertRaises(IndexError,

Modified: trunk/jython/src/org/python/modules/sre/PatternObject.java
===================================================================
--- trunk/jython/src/org/python/modules/sre/PatternObject.java	2008-08-20 20:59:44 UTC (rev 5226)
+++ trunk/jython/src/org/python/modules/sre/PatternObject.java	2008-08-20 23:01:42 UTC (rev 5227)
@@ -118,7 +118,7 @@
 
         SRE_STATE state = new SRE_STATE(string, 0, Integer.MAX_VALUE, flags);
 
-        StringBuilder buf = new StringBuilder();
+        PyList list = new PyList();
 
         int n = 0;
         int i = 0;
@@ -137,7 +137,7 @@
 
             if (i < b) {
                 /* get segment before this match */
-                buf.append(string.substring(i, b));
+                list.append(string.__getslice__(Py.newInteger(i), Py.newInteger(b)));
             }
             if (! (i == b && i == e && n > 0)) {
                 PyObject item;
@@ -150,7 +150,7 @@
                 }
     
                 if (item != Py.None) {
-                    buf.append(item.toString());
+                    list.append(item);
                 }
                 i = e;
                 n++;
@@ -163,25 +163,23 @@
                 state.start = state.ptr;
         }
         if (i < state.endpos) {
-            buf.append(string.substring(i, state.endpos));
+            list.append(string.__getslice__(Py.newInteger(i), Py.newInteger(state.endpos)));
         }
 
-        // Follows rules enumerated in test_re.test_bug_1140
-        PyString outstring;
-        if (buf.length() == 0) {
-            outstring = instring.createInstance(buf.toString());
-        } else if (template instanceof PyUnicode || instring instanceof PyUnicode) {
-            outstring = Py.newUnicode(buf.toString());
-        } else {
-            outstring = Py.newString(buf.toString());
-        }
-
+        PyObject outstring = join_list(list, string);
         if (subn) {
             return new PyTuple(outstring, Py.newInteger(n));
         }
         return outstring;
     }
 
+    private PyObject join_list(PyList list, PyString string) {
+        PyObject joiner = string.__getslice__(Py.Zero, Py.Zero);
+        if (list.size() == 0) {
+            return joiner;
+        }
+        return joiner.__getattr__("join").__call__(list);
+    }
 
     public PyObject split(PyObject[] args, String[] kws) {
         ArgParser ap = new ArgParser("split", args, kws,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5229
          http://jython.svn.sourceforge.net/jython/?rev=5229&view=rev
Author:   leosoto
Date:     2008-08-21 03:23:28 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
Fixing #1095 for old-style classes. Thanks to Anselm Kruls for the patch.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_descr_jy.py
    trunk/jython/src/org/python/core/PyInstance.java

Modified: trunk/jython/Lib/test/test_descr_jy.py
===================================================================
--- trunk/jython/Lib/test/test_descr_jy.py	2008-08-21 02:58:24 UTC (rev 5228)
+++ trunk/jython/Lib/test/test_descr_jy.py	2008-08-21 03:23:28 UTC (rev 5229)
@@ -326,16 +326,34 @@
             def __getattr__(self, name):
                 raise BarAttributeError
 
+        class BarClassic:
+            def __getattr__(self, name):
+                raise BarAttributeError
+
         class Foo(object):
             def __getattr__(self, name):
                 raise AttributeError("Custom message")
+
+        class FooClassic:
+            def __getattr__(self, name):
+                raise AttributeError("Custom message")
+
         self.assertRaises(BarAttributeError, lambda: Bar().x)
+        self.assertRaises(BarAttributeError, lambda: BarClassic().x)
+
         try:
             Foo().x
             self.assert_(False) # Previous line should raise AttributteError
         except AttributeError, e:
             self.assertEquals("Custom message", str(e))
 
+        try:
+            FooClassic().x
+            self.assert_(False) # Previous line should raise AttributteError
+        except AttributeError, e:
+            self.assertEquals("Custom message", str(e))
+
+
 def test_main():
     test_support.run_unittest(TestDescrTestCase,
                               SubclassDescrTestCase,

Modified: trunk/jython/src/org/python/core/PyInstance.java
===================================================================
--- trunk/jython/src/org/python/core/PyInstance.java	2008-08-21 02:58:24 UTC (rev 5228)
+++ trunk/jython/src/org/python/core/PyInstance.java	2008-08-21 03:23:28 UTC (rev 5229)
@@ -201,10 +201,19 @@
     }
 
     public PyObject __findattr_ex__(String name) {
-        return __findattr__(name, false);
+        return __findattr_ex__(name, false);
     }
 
     public PyObject __findattr__(String name, boolean stopAtJava) {
+        try {
+            return __findattr_ex__(name, stopAtJava);
+        } catch (PyException exc) {
+            if (Py.matchException(exc, Py.AttributeError)) return null;
+            throw exc;
+        }
+    }
+
+    protected PyObject __findattr_ex__(String name, boolean stopAtJava) {
         PyObject result = ifindlocal(name);
         if (result != null)
             return result;
@@ -234,12 +243,7 @@
         if (getter == null)
             return null;
 
-        try {
-            return getter.__call__(this, new PyString(name));
-        } catch (PyException exc) {
-            if (Py.matchException(exc, Py.AttributeError)) return null;
-            throw exc;
-        }
+        return getter.__call__(this, new PyString(name));
     }
 
     public boolean isCallable() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5234
          http://jython.svn.sourceforge.net/jython/?rev=5234&view=rev
Author:   pjenvey
Date:     2008-08-22 20:16:59 +0000 (Fri, 22 Aug 2008)

Log Message:
-----------
fix unicode __add__ and repeat always forcing the basic plane on the result --
can't optimize for strs when unicode also uses these methods

Modified Paths:
--------------
    trunk/jython/src/org/python/core/PyString.java

Added Paths:
-----------
    trunk/jython/Lib/test/test_unicode_jy.py

Added: trunk/jython/Lib/test/test_unicode_jy.py
===================================================================
--- trunk/jython/Lib/test/test_unicode_jy.py	                        (rev 0)
+++ trunk/jython/Lib/test/test_unicode_jy.py	2008-08-22 20:16:59 UTC (rev 5234)
@@ -0,0 +1,28 @@
+"""Misc unicode tests
+
+Made for Jython.
+"""
+import re
+import unittest
+from test import test_support
+
+class UnicodeTestCase(unittest.TestCase):
+
+    def test_simplejson_plane_bug(self):
+        # a bug exposed by simplejson: unicode __add__ was always
+        # forcing the basic plane
+        chunker = re.compile(r'(.*?)(["\\\x00-\x1f])', re.VERBOSE | re.MULTILINE | re.DOTALL)
+        orig = u'z\U0001d120x'
+        quoted1 = u'"z\U0001d120x"'
+        quoted2 = '"' + orig + '"'
+        # chunker re gives different results depending on the plane
+        self.assertEqual(chunker.match(quoted1, 1).groups(), (orig, u'"'))
+        self.assertEqual(chunker.match(quoted2, 1).groups(), (orig, u'"'))
+
+
+def test_main():
+    test_support.run_unittest(UnicodeTestCase)
+
+
+if __name__ == "__main__":
+    test_main()

Modified: trunk/jython/src/org/python/core/PyString.java
===================================================================
--- trunk/jython/src/org/python/core/PyString.java	2008-08-22 15:31:56 UTC (rev 5233)
+++ trunk/jython/src/org/python/core/PyString.java	2008-08-22 20:16:59 UTC (rev 5234)
@@ -670,7 +670,7 @@
         for(int i = 0; i < count; i++) {
             string.getChars(0, s, new_chars, i * s);
         }
-        return createInstance(new String(new_chars), true);
+        return createInstance(new String(new_chars));
     }
 
     @Override
@@ -711,7 +711,7 @@
             if (generic_other instanceof PyUnicode) {
                 return new PyUnicode(result);
             }
-            return createInstance(result, true);
+            return createInstance(result);
         }
         else return null;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5264
          http://jython.svn.sourceforge.net/jython/?rev=5264&view=rev
Author:   fwierzbicki
Date:     2008-08-29 13:47:16 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
Merged revisions 5210,5216-5220,5223-5226,5228,5230,5236-5261 via svnmerge from 
https://jython.svn.sourceforge.net/svnroot/jython/branches/nowalker

........
  r5210 | fwierzbicki | 2008-08-19 17:43:06 -0400 (Tue, 19 Aug 2008) | 5 lines
  
  Work to date on the one pass grammar.  Not ready for others to look at really.
  If you really want to try it note that you need to comment out parts of site.py
  and os.py to get things to work.  They *almost* parse and compile, but not
  quite, and they are basic dependencies for Jython to run.
........
  r5216 | fwierzbicki | 2008-08-20 08:10:26 -0400 (Wed, 20 Aug 2008) | 2 lines
  
  Much better BoolOp.
........
  r5217 | fwierzbicki | 2008-08-20 10:06:30 -0400 (Wed, 20 Aug 2008) | 2 lines
  
  Fix "del".
........
  r5218 | fwierzbicki | 2008-08-20 10:39:21 -0400 (Wed, 20 Aug 2008) | 2 lines
  
  Dict support.
........
  r5219 | fwierzbicki | 2008-08-20 11:23:14 -0400 (Wed, 20 Aug 2008) | 2 lines
  
  Conditional Expression support.
........
  r5220 | fwierzbicki | 2008-08-20 11:37:02 -0400 (Wed, 20 Aug 2008) | 2 lines
  
  repr support.
........
  r5223 | fwierzbicki | 2008-08-20 15:57:39 -0400 (Wed, 20 Aug 2008) | 2 lines
  
  Start of list comprehensions and generator expressions.
........
  r5224 | fwierzbicki | 2008-08-20 15:58:17 -0400 (Wed, 20 Aug 2008) | 2 lines
  
  oops revert build.xml
........
  r5225 | fwierzbicki | 2008-08-20 16:57:09 -0400 (Wed, 20 Aug 2008) | 2 lines
  
  re-remove PythonWalker.g from build
........
  r5226 | fwierzbicki | 2008-08-20 16:59:44 -0400 (Wed, 20 Aug 2008) | 2 lines
  
  gen expressions and list comps now actually work...
........
  r5228 | fwierzbicki | 2008-08-20 22:58:24 -0400 (Wed, 20 Aug 2008) | 2 lines
  
  debugging of some expr_contextType values.
........
  r5230 | fwierzbicki | 2008-08-20 23:47:32 -0400 (Wed, 20 Aug 2008) | 2 lines
  
  bugfix on exception and on assign value expr_contextType.
........
  r5236 | fwierzbicki | 2008-08-22 19:03:45 -0400 (Fri, 22 Aug 2008) | 2 lines
  
  Bugfix for expr_contextType on assign values.
........
  r5237 | fwierzbicki | 2008-08-22 22:33:48 -0400 (Fri, 22 Aug 2008) | 2 lines
  
  Add expr types to BaseTree children.
........
  r5238 | fwierzbicki | 2008-08-23 15:19:16 -0400 (Sat, 23 Aug 2008) | 2 lines
  
  BinOp now works in one pass.
........
  r5239 | fwierzbicki | 2008-08-23 15:43:19 -0400 (Sat, 23 Aug 2008) | 2 lines
  
  Fine tuning List and Assign col position.
........
  r5240 | fwierzbicki | 2008-08-23 19:03:59 -0400 (Sat, 23 Aug 2008) | 5 lines
  
  Make PythonTree's toStringTree more easily comparable with ast/astview.py
  output.  This will help with the walkerless Python.g, as it doesn't quite
  parse ast/astview.py yet.
........
  r5241 | fwierzbicki | 2008-08-23 22:04:43 -0400 (Sat, 23 Aug 2008) | 2 lines
  
  Fix lambda without args.
........
  r5242 | fwierzbicki | 2008-08-24 05:38:22 -0400 (Sun, 24 Aug 2008) | 2 lines
  
  check for PythonTree in makeStmts.
........
  r5243 | fwierzbicki | 2008-08-25 10:21:29 -0400 (Mon, 25 Aug 2008) | 2 lines
  
  Fix generator expressions, rename all "stmts" in Python.g to "stypes".
........
  r5244 | fwierzbicki | 2008-08-25 11:25:24 -0400 (Mon, 25 Aug 2008) | 2 lines
  
  Clean up creation of stmtType[] and exprType[].
........
  r5245 | fwierzbicki | 2008-08-25 14:44:46 -0400 (Mon, 25 Aug 2008) | 3 lines
  
  Fix build.xml (oops)
  Fix Generator Expression assignments and multi-statement simple_stmt.
........
  r5246 | fwierzbicki | 2008-08-25 16:36:04 -0400 (Mon, 25 Aug 2008) | 3 lines
  
  Fixed fplist, subscripts (especially extslice) and enable Interactive
  and Expression (single and eval).  regrtest.py is now running.
........
  r5247 | fwierzbicki | 2008-08-25 17:18:03 -0400 (Mon, 25 Aug 2008) | 2 lines
  
  Fix **
........
  r5248 | fwierzbicki | 2008-08-25 22:04:27 -0400 (Mon, 25 Aug 2008) | 3 lines
  
  Cleanup: removal of comments, re-format of Python.g and
  removal of PYNODE.
........
  r5249 | fwierzbicki | 2008-08-26 08:21:42 -0400 (Tue, 26 Aug 2008) | 3 lines
  
  Remove unnecessary constructor on BinOp (now it is just the generated version again)
  Remove some whitespace in Python.g
........
  r5250 | fwierzbicki | 2008-08-26 11:05:19 -0400 (Tue, 26 Aug 2008) | 2 lines
  
  Moved makeSliceType code to GrammarActions.
........
  r5251 | fwierzbicki | 2008-08-26 12:51:15 -0400 (Tue, 26 Aug 2008) | 2 lines
  
  Moved Subscript creation up a rule - fixed a bunch of unit tests.
........
  r5252 | fwierzbicki | 2008-08-26 15:37:34 -0400 (Tue, 26 Aug 2008) | 2 lines
  
  Another expr_contextType adjustment.
........
  r5253 | fwierzbicki | 2008-08-26 16:17:50 -0400 (Tue, 26 Aug 2008) | 2 lines
  
  checking for bad assignment statements.
........
  r5254 | fwierzbicki | 2008-08-26 20:44:35 -0400 (Tue, 26 Aug 2008) | 3 lines
  
  Fix illegal Lambda statements and more illegal assigns.  Also raise exceptions
  on illegal gen expression arguments.
........
  r5255 | fwierzbicki | 2008-08-26 22:38:35 -0400 (Tue, 26 Aug 2008) | 2 lines
  
  Fix for FunctionDef and Call problems.
........
  r5256 | fwierzbicki | 2008-08-26 22:47:56 -0400 (Tue, 26 Aug 2008) | 2 lines
  
  whitespace
........
  r5257 | fwierzbicki | 2008-08-27 12:07:35 -0400 (Wed, 27 Aug 2008) | 2 lines
  
  revert build.xml after accidently checking in my local copy.
........
  r5258 | fwierzbicki | 2008-08-27 15:51:16 -0400 (Wed, 27 Aug 2008) | 2 lines
  
  for not_test, replacing manual tree construction with ->.
........
  r5259 | fwierzbicki | 2008-08-27 16:09:39 -0400 (Wed, 27 Aug 2008) | 2 lines
  
  TODO comment.
........
  r5260 | fwierzbicki | 2008-08-27 16:35:54 -0400 (Wed, 27 Aug 2008) | 3 lines
  
  Removed XXX comments that no longer apply (special testlists don't
  seem to be needed).  Removed unused c1 and c2 alias.
........
  r5261 | fwierzbicki | 2008-08-27 16:51:19 -0400 (Wed, 27 Aug 2008) | 2 lines
  
  simplify testlist.
........

Modified Paths:
--------------
    trunk/jython/ast/asdl_antlr.py
    trunk/jython/build.xml
    trunk/jython/grammar/Python.g
    trunk/jython/src/org/python/antlr/ExpressionParser.java
    trunk/jython/src/org/python/antlr/GrammarActions.java
    trunk/jython/src/org/python/antlr/InteractiveParser.java
    trunk/jython/src/org/python/antlr/ModuleParser.java
    trunk/jython/src/org/python/antlr/ast/Assert.java
    trunk/jython/src/org/python/antlr/ast/Assign.java
    trunk/jython/src/org/python/antlr/ast/Attribute.java
    trunk/jython/src/org/python/antlr/ast/AugAssign.java
    trunk/jython/src/org/python/antlr/ast/BinOp.java
    trunk/jython/src/org/python/antlr/ast/Call.java
    trunk/jython/src/org/python/antlr/ast/Compare.java
    trunk/jython/src/org/python/antlr/ast/Exec.java
    trunk/jython/src/org/python/antlr/ast/Expr.java
    trunk/jython/src/org/python/antlr/ast/Expression.java
    trunk/jython/src/org/python/antlr/ast/For.java
    trunk/jython/src/org/python/antlr/ast/GeneratorExp.java
    trunk/jython/src/org/python/antlr/ast/If.java
    trunk/jython/src/org/python/antlr/ast/IfExp.java
    trunk/jython/src/org/python/antlr/ast/Index.java
    trunk/jython/src/org/python/antlr/ast/Lambda.java
    trunk/jython/src/org/python/antlr/ast/ListComp.java
    trunk/jython/src/org/python/antlr/ast/Print.java
    trunk/jython/src/org/python/antlr/ast/Raise.java
    trunk/jython/src/org/python/antlr/ast/Repr.java
    trunk/jython/src/org/python/antlr/ast/Return.java
    trunk/jython/src/org/python/antlr/ast/Slice.java
    trunk/jython/src/org/python/antlr/ast/Subscript.java
    trunk/jython/src/org/python/antlr/ast/UnaryOp.java
    trunk/jython/src/org/python/antlr/ast/While.java
    trunk/jython/src/org/python/antlr/ast/With.java
    trunk/jython/src/org/python/antlr/ast/Yield.java
    trunk/jython/src/org/python/antlr/ast/comprehensionType.java
    trunk/jython/src/org/python/antlr/ast/excepthandlerType.java
    trunk/jython/src/org/python/antlr/ast/keywordType.java
    trunk/jython/src/org/python/util/jython.java
    trunk/jython/tests/java/org/python/antlr/PythonTreeTester.java

Removed Paths:
-------------
    trunk/jython/grammar/PythonWalker.g

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/nowalker:1-5209
   + /branches/nowalker:1-5263

Modified: trunk/jython/ast/asdl_antlr.py
===================================================================
--- trunk/jython/ast/asdl_antlr.py	2008-08-29 12:14:12 UTC (rev 5263)
+++ trunk/jython/ast/asdl_antlr.py	2008-08-29 13:47:16 UTC (rev 5264)
@@ -260,12 +260,15 @@
             if f.typedef is not None and f.typedef.simple:
                 not_simple = False
             #For now ignoring String -- will want to revisit
-            if f.seq and  not_simple and not fparg.startswith("String"):
-                self.emit("if (%s != null) {" % f.name, depth+1);
-                self.emit("for(int i%(name)s=0;i%(name)s<%(name)s.length;i%(name)s++) {" % {"name":f.name}, depth+2)
-                self.emit("addChild(%s[i%s]);" % (f.name, f.name), depth+3)
-                self.emit("}", depth+2)
-                self.emit("}", depth+1)
+            if not_simple and not fparg.startswith("String"):
+                if f.seq:
+                    self.emit("if (%s != null) {" % f.name, depth+1);
+                    self.emit("for(int i%(name)s=0;i%(name)s<%(name)s.length;i%(name)s++) {" % {"name":f.name}, depth+2)
+                    self.emit("addChild(%s[i%s]);" % (f.name, f.name), depth+3)
+                    self.emit("}", depth+2)
+                    self.emit("}", depth+1)
+                elif str(f.type) == "expr":
+                    self.emit("addChild(%s);" % (f.name), depth+1)
 
     def javaMethods(self, type, clsname, ctorname, fields, depth):
         # The java ctors

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2008-08-29 12:14:12 UTC (rev 5263)
+++ trunk/jython/build.xml	2008-08-29 13:47:16 UTC (rev 5264)
@@ -434,7 +434,6 @@
             <arg value="-lib"/>
             <arg path="${work.dir}/build/gensrc/org/python/antlr"/>
             <arg file="${jython.base.dir}/grammar/Python.g"/>
-            <arg file="${jython.base.dir}/grammar/PythonWalker.g"/>
             <arg file="${jython.base.dir}/grammar/PythonPartial.g"/>
             <classpath refid="main.classpath"/>
         </java>

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2008-08-29 12:14:12 UTC (rev 5263)
+++ trunk/jython/grammar/Python.g	2008-08-29 13:47:16 UTC (rev 5264)
@@ -61,8 +61,7 @@
  *  grammar from Jim Baker.  The current parsing and compiling strategy looks
  *  like this:
  *
- *  Python source->Python.g->simple antlr AST->PythonWalker.g->
- *  decorated AST (org/python/parser/ast/*)->CodeCompiler(ASM)->.class
+ *  Python source->Python.g->AST (org/python/parser/ast/*)->CodeCompiler(ASM)->.class
  */
 
 grammar Python;
@@ -74,75 +73,6 @@
 tokens {
     INDENT;
     DEDENT;
-
-    Module;
-    Interactive;
-    Expression;
-    NameTok;
-    Test;
-    Msg;
-    Level;
-    Body;
-    Bases; 
-    Arguments;
-    Args;
-    Arg;
-    Keyword;
-    StarArgs;
-    KWArgs;
-    Assign;
-    AugAssign;
-    Tuple;
-    List;
-    Dict;
-    IfExp;
-    TryExcept;
-    TryFinally;
-    ExceptHandler;
-    StrTok;
-    NumTok;
-    IsNot;
-    NotIn;
-    Type;
-    Inst;
-    Tback;
-    Globals;
-    Locals;
-    Ellipsis;
-    ListComp;
-    Repr;
-    Subscript;
-    SubscriptList;
-    Index;
-    Target;
-    Value;
-    Lower;
-    Upper;
-    Step;
-    UAdd;
-    USub;
-    Invert;
-    Alias;
-    Asname;
-    Decorators;
-    GeneratorExp;
-    Ifs;
-    Elts;
-    Call;
-    Dest;
-    Values;
-    Newline;
-
-    FpList;
-    StepOp;
-    UpperOp;
-
-    GenFor;
-    GenIf;
-    ListFor;
-    ListIf;
-    Parens;
-    Brackets;
 }
 
 @header {
@@ -152,38 +82,82 @@
 
 import org.python.antlr.ParseException;
 import org.python.antlr.PythonTree;
+import org.python.antlr.ast.aliasType;
 import org.python.antlr.ast.argumentsType;
+import org.python.antlr.ast.Assert;
+import org.python.antlr.ast.Assign;
 import org.python.antlr.ast.Attribute;
+import org.python.antlr.ast.AugAssign;
+import org.python.antlr.ast.BinOp;
+import org.python.antlr.ast.BoolOp;
+import org.python.antlr.ast.boolopType;
 import org.python.antlr.ast.Break;
+import org.python.antlr.ast.Call;
+import org.python.antlr.ast.ClassDef;
+import org.python.antlr.ast.cmpopType;
+import org.python.antlr.ast.Compare;
+import org.python.antlr.ast.comprehensionType;
 import org.python.antlr.ast.Context;
 import org.python.antlr.ast.Continue;
+import org.python.antlr.ast.Delete;
+import org.python.antlr.ast.Dict;
+import org.python.antlr.ast.Ellipsis;
+import org.python.antlr.ast.excepthandlerType;
+import org.python.antlr.ast.Exec;
 import org.python.antlr.ast.Expr;
+import org.python.antlr.ast.Expression;
 import org.python.antlr.ast.exprType;
 import org.python.antlr.ast.expr_contextType;
+import org.python.antlr.ast.ExtSlice;
+import org.python.antlr.ast.For;
 import org.python.antlr.ast.FunctionDef;
+import org.python.antlr.ast.GeneratorExp;
+import org.python.antlr.ast.Global;
+import org.python.antlr.ast.If;
+import org.python.antlr.ast.IfExp;
+import org.python.antlr.ast.Import;
+import org.python.antlr.ast.ImportFrom;
+import org.python.antlr.ast.Index;
+import org.python.antlr.ast.Interactive;
+import org.python.antlr.ast.keywordType;
+import org.python.antlr.ast.ListComp;
+import org.python.antlr.ast.Lambda;
 import org.python.antlr.ast.modType;
 import org.python.antlr.ast.Module;
 import org.python.antlr.ast.Name;
 import org.python.antlr.ast.Num;
+import org.python.antlr.ast.operatorType;
 import org.python.antlr.ast.Pass;
 import org.python.antlr.ast.Print;
+import org.python.antlr.ast.Raise;
+import org.python.antlr.ast.Repr;
 import org.python.antlr.ast.Return;
+import org.python.antlr.ast.Slice;
+import org.python.antlr.ast.sliceType;
 import org.python.antlr.ast.stmtType;
 import org.python.antlr.ast.Str;
+import org.python.antlr.ast.Subscript;
+import org.python.antlr.ast.TryExcept;
+import org.python.antlr.ast.TryFinally;
+import org.python.antlr.ast.Tuple;
+import org.python.antlr.ast.unaryopType;
+import org.python.antlr.ast.UnaryOp;
+import org.python.antlr.ast.While;
+import org.python.antlr.ast.With;
+import org.python.antlr.ast.Yield;
 import org.python.core.Py;
 import org.python.core.PyString;
 import org.python.core.PyUnicode;
 
 import java.math.BigInteger;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.ListIterator;
 } 
 
 @members {
-    boolean debugOn = false;
-
     private ErrorHandler errorHandler;
 
-    private boolean seenSingleOuterSuite = false;
-
     private GrammarActions actions = new GrammarActions();
 
     public void setErrorHandler(ErrorHandler eh) {
@@ -191,12 +165,6 @@
         actions.setErrorHandler(eh);
     }
 
-    private void debug(String message) {
-        if (debugOn) {
-            System.out.println(message);
-        }
-    }
-
     protected void mismatch(IntStream input, int ttype, BitSet follow) throws RecognitionException {
         if (errorHandler.isRecoverable()) {
             super.mismatch(input, ttype, follow);
@@ -243,7 +211,7 @@
 int implicitLineJoiningLevel = 0;
 int startPos=-1;
 
-//If you want to use another error recovery mechanisms change this
+//If you want to use another error recovery mechanism change this
 //and the same one in the parser.
 private ErrorHandler errorHandler;
 
@@ -291,23 +259,59 @@
 }
 
 //single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
-single_input : NEWLINE* EOF -> ^(Interactive)
-             | simple_stmt NEWLINE* EOF -> ^(Interactive simple_stmt)
-             | compound_stmt NEWLINE+ EOF -> ^(Interactive compound_stmt)
-             ;
+single_input
+@init {
+    modType mtype = null;
+}
+@after {
+    $single_input.tree = mtype;
+}
+    : NEWLINE* EOF {
+        mtype = new Interactive($single_input.start, new stmtType[0]);
+    }
+    | simple_stmt NEWLINE* EOF {
+        mtype = new Interactive($single_input.start, actions.makeStmts($simple_stmt.stypes));
+    }
+    | compound_stmt NEWLINE+ EOF {
+        mtype = new Interactive($single_input.start, actions.makeStmts($compound_stmt.tree));
+    }
+    ;
 
 //file_input: (NEWLINE | stmt)* ENDMARKER
-file_input : (NEWLINE | stmt)* EOF
-          -> ^(Module stmt*)
-           ;
+file_input
+@init {
+    modType mtype = null;
+    List stypes = new ArrayList();
+}
+@after {
+    $file_input.tree = mtype;
+}
+    : (NEWLINE
+      | stmt {stypes.addAll($stmt.stypes);}
+      )* {
+        mtype = new Module($file_input.start, actions.makeStmts(stypes));
+    }
+    ;
 
 //eval_input: testlist NEWLINE* ENDMARKER
-eval_input : LEADING_WS? (NEWLINE)* testlist[expr_contextType.Load] (NEWLINE)* EOF -> ^(Expression testlist)
-           ;
+eval_input
+@init {
+    modType mtype = null;
+}
+@after {
+    $eval_input.tree = mtype;
+}
+    : LEADING_WS? (NEWLINE)* testlist[expr_contextType.Load] (NEWLINE)* EOF {
+        mtype = new Expression($eval_input.start, (exprType)$testlist.tree);
+    }
+    ;
 
 //not in CPython's Grammar file
-dotted_attr
-    : NAME (DOT^ attr)*
+dotted_attr returns [exprType etype]
+    : n1=NAME
+      ( (DOT n2+=dotted_attr)+ { $etype = actions.makeDottedAttr($n1, $n2); }
+      | { $etype = new Name($NAME, $NAME.text, expr_contextType.Load); }
+      )
     ;
 
 //attr is here for Java  compatibility.  A Java foo.getIf() can be called from Jython as foo.if
@@ -349,72 +353,145 @@
     ;
 
 //decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
-decorator: AT dotted_attr 
-           ( (LPAREN arglist? RPAREN) -> ^(AT dotted_attr ^(Call ^(Args arglist)?))
-           | -> ^(AT dotted_attr)
-           ) NEWLINE
-         ;
+decorator returns [exprType etype]
+@after {
+   $decorator.tree = $etype;
+}
+    : AT dotted_attr 
+    ( LPAREN
+      ( arglist
+        {
+            $etype = actions.makeCall($LPAREN, $dotted_attr.etype, $arglist.args, $arglist.keywords,
+                     $arglist.starargs, $arglist.kwargs);
+        }
+      | {
+            $etype = actions.makeCall($LPAREN, $dotted_attr.etype);
+        }
+      )
+      RPAREN
+    | {
+          $etype = $dotted_attr.etype;
+      }
+    ) NEWLINE
+    ;
 
 //decorators: decorator+
-decorators: decorator+
-          ;
+decorators returns [List etypes]
+    : d+=decorator+
+      {
+          $etypes = $d;
+      }
+    ;
 
 //funcdef: [decorators] 'def' NAME parameters ':' suite
-funcdef : decorators? DEF NAME parameters COLON suite
-       -> ^(DEF NAME parameters ^(Body suite) ^(Decorators decorators?))
-        ;
+funcdef
+@init { stmtType stype = null; }
+@after { $funcdef.tree = stype; }
+    : decorators? DEF NAME parameters COLON suite
+    {
+        Token t = $DEF;
+        if ($decorators.start != null) {
+            t = $decorators.start;
+        }
+        stype = actions.makeFuncdef(t, $NAME, $parameters.args, $suite.stypes, $decorators.etypes);
+    }
+    ;
 
 //parameters: '(' [varargslist] ')'
-parameters : LPAREN 
-                 (varargslist -> ^(Arguments varargslist)
-                 | -> ^(Arguments)
-                 )
-             RPAREN
-           ;
+parameters returns [argumentsType args]
+    : LPAREN 
+      (varargslist {$args = $varargslist.args;}
+      | { $args = new argumentsType($parameters.start, new exprType[0], null, null, new exprType[0]);
+        }
+      )
+      RPAREN
+    ;
 
 //not in CPython's Grammar file
-defparameter : fpdef (ASSIGN test[expr_contextType.Load])? {debug("parsed defparameter");}
-             ;
+defparameter[List defaults] returns [exprType etype]
+@after {
+   $defparameter.tree = $etype;
+}
+    : fpdef[expr_contextType.Param] (ASSIGN test[expr_contextType.Load])?
+      {
+          $etype = (exprType)$fpdef.tree;
+          if ($ASSIGN != null) {
+              defaults.add($test.tree);
+          } else if (!defaults.isEmpty()) {
+              throw new ParseException("non-default argument follows default argument", $fpdef.tree);
+          }
+      }
+    ;
 
 //varargslist: ((fpdef ['=' test] ',')*
 //              ('*' NAME [',' '**' NAME] | '**' NAME) |
 //              fpdef ['=' test] (',' fpdef ['=' test])* [','])
-varargslist : defparameter (options {greedy=true;}:COMMA defparameter)*
-              (COMMA
-                  ( STAR starargs=NAME (COMMA DOUBLESTAR kwargs=NAME)?
-                  | DOUBLESTAR kwargs=NAME
-                  )?
-              )? {debug("parsed varargslist");}
-           -> ^(Args defparameter+) ^(StarArgs $starargs)? ^(KWArgs $kwargs)?
-            | STAR starargs=NAME (COMMA DOUBLESTAR kwargs=NAME)?{debug("parsed varargslist STARARGS");}
-           -> ^(StarArgs $starargs) ^(KWArgs $kwargs)?
-            | DOUBLESTAR kwargs=NAME {debug("parsed varargslist KWS");}
-           -> ^(KWArgs $kwargs)
-            ;
+varargslist returns [argumentsType args]
+@init {
+    List defaults = new ArrayList();
+}
+    : d+=defparameter[defaults] (options {greedy=true;}:COMMA d+=defparameter[defaults])*
+      (COMMA
+          (STAR starargs=NAME (COMMA DOUBLESTAR kwargs=NAME)?
+          | DOUBLESTAR kwargs=NAME
+          )?
+      )?
+      {
+          $args = actions.makeArgumentsType($varargslist.start, $d, $starargs, $kwargs, defaults);
+      }
+    | STAR starargs=NAME (COMMA DOUBLESTAR kwargs=NAME)?
+      {
+          $args = actions.makeArgumentsType($varargslist.start, $d, $starargs, $kwargs, defaults);
+      }
+    | DOUBLESTAR kwargs=NAME
+      {
+          $args = actions.makeArgumentsType($varargslist.start, $d, null, $kwargs, defaults);
+      }
+    ;
 
 //fpdef: NAME | '(' fplist ')'
-fpdef : NAME {debug("parsed fpdef NAME");}
-      | (LPAREN fpdef COMMA) => LPAREN fplist RPAREN
-     -> ^(FpList fplist)
-      | LPAREN fplist RPAREN
-     -> fplist
-      ;
+fpdef[expr_contextType ctype]
+@after {
+    actions.checkAssign((exprType)$fpdef.tree);
+}
+    : NAME 
+   -> ^(NAME<Name>[$NAME, $NAME.text, ctype])
+    | (LPAREN fpdef[null] COMMA) => LPAREN fplist RPAREN
+   -> ^(LPAREN<Tuple>[$fplist.start, actions.makeExprs($fplist.etypes), expr_contextType.Store])
+    | LPAREN fplist RPAREN
+   -> fplist
+    ;
 
 //fplist: fpdef (',' fpdef)* [',']
-fplist : fpdef (options {greedy=true;}:COMMA fpdef)* (COMMA)?
-       {debug("parsed fplist");}
-      -> fpdef+
-       ;
+fplist returns [List etypes]
+    : f+=fpdef[expr_contextType.Store]
+      (options {greedy=true;}:COMMA f+=fpdef[expr_contextType.Store])* (COMMA)?
+      {
+          $etypes = $f;
+      }
+    ;
 
 //stmt: simple_stmt | compound_stmt
-stmt : simple_stmt
-     | compound_stmt
-     ;
+stmt returns [List stypes]
+    : simple_stmt
+      {
+          $stypes = $simple_stmt.stypes;
+      }
+    | compound_stmt
+      {
+          $stypes = new ArrayList();
+          $stypes.add($compound_stmt.tree);
+      }
+    ;
 
 //simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
-simple_stmt : small_stmt (options {greedy=true;}:SEMI small_stmt)* (SEMI)? NEWLINE
-           -> small_stmt+
-            ;
+simple_stmt returns [List stypes]
+    : s+=small_stmt (options {greedy=true;}:SEMI s+=small_stmt)* (SEMI)? NEWLINE
+      {
+          $stypes = $s;
+      }
+    ;
+
 //small_stmt: (expr_stmt | print_stmt  | del_stmt | pass_stmt | flow_stmt |
 //             import_stmt | global_stmt | exec_stmt | assert_stmt)
 small_stmt : expr_stmt
@@ -430,310 +507,481 @@
 
 //expr_stmt: testlist (augassign (yield_expr|testlist) |
 //                     ('=' (yield_expr|testlist))*)
-expr_stmt : lhs=testlist[expr_contextType.Store]
-            ( (augassign yield_expr -> ^(augassign $lhs yield_expr))
-            | (augassign rhs=testlist[expr_contextType.Load] -> ^(augassign $lhs $rhs))
-            | ((assigns) {debug("matched assigns");} -> ^(Assign ^(Target $lhs) assigns))
-            | -> $lhs
-            )
-          ;
-
-//not in CPython's Grammar file
-assigns
-    @after {
-        PythonTree pt = ((PythonTree)$assigns.tree);
-        int children = pt.getChildCount();
-        PythonTree child;
-        if (children == 1) {
-            child = pt;
-            pt.token = new CommonToken(Value, "Value");
-        } else {
-            child = (PythonTree)pt.getChild(children - 1);
-            child.token = new CommonToken(Value, "Value");
-        }
-        child.token = new CommonToken(Value, "Value");
-        PythonTree targ = (PythonTree)child.getChild(0);
-        if (targ instanceof Context) {
-            ((Context)targ).setContext(expr_contextType.Load);
-        }
+expr_stmt 
+@init {
+    stmtType stype = null;
 }
-    : assign_testlist+
-    | assign_yield+
+@after {
+    if (stype != null) {
+        $expr_stmt.tree = stype;
+    }
+}
+    : ((testlist[null] augassign) => lhs=testlist[expr_contextType.AugStore]
+        ( (aay=augassign y1=yield_expr 
+            {
+                actions.checkAssign((exprType)$lhs.tree);
+                stype = new AugAssign($lhs.tree, (exprType)$lhs.tree, $aay.op, (exprType)$y1.tree);
+            }
+          )
+        | (aat=augassign rhs=testlist[expr_contextType.Load]
+            {
+                actions.checkAssign((exprType)$lhs.tree);
+                stype = new AugAssign($lhs.tree, (exprType)$lhs.tree, $aat.op, (exprType)$rhs.tree);
+            }
+          )
+        )
+    | (testlist[null] ASSIGN) => lhs=testlist[expr_contextType.Store]
+        (
+        | ((at=ASSIGN t+=testlist[expr_contextType.Store])+
+       -> ^(ASSIGN<Assign>[$lhs.start, actions.makeAssignTargets((exprType)$lhs.tree, $t),
+            actions.makeAssignValue($t)])
+          )
+        | ((ay=ASSIGN y2+=yield_expr)+
+       -> ^(ASSIGN<Assign>[$lhs.start, actions.makeAssignTargets((exprType)$lhs.tree, $y2),
+            actions.makeAssignValue($y2)])
+          )
+        )
+    | lhs=testlist[expr_contextType.Load]
+      {
+          stype = new Expr($lhs.start, (exprType)$lhs.tree);
+      }
+    )
     ;
 
-//not in CPython's Grammar file
-assign_testlist
-       : ASSIGN testlist[expr_contextType.Store] -> ^(Target testlist)
-       ;
-
-//not in CPython's Grammar file
-assign_yield
-    : ASSIGN yield_expr -> ^(Value yield_expr)
-    ;
-
 //augassign: ('+=' | '-=' | '*=' | '/=' | '%=' | '&=' | '|=' | '^=' |
 //            '<<=' | '>>=' | '**=' | '//=')
-augassign : PLUSEQUAL
-          | MINUSEQUAL
-          | STAREQUAL
-          | SLASHEQUAL
-          | PERCENTEQUAL
-          | AMPEREQUAL
-          | VBAREQUAL
-          | CIRCUMFLEXEQUAL
-          | LEFTSHIFTEQUAL
-          | RIGHTSHIFTEQUAL
-          | DOUBLESTAREQUAL
-          | DOUBLESLASHEQUAL
-          ;
+augassign returns [operatorType op]
+    : PLUSEQUAL {$op = operatorType.Add;}
+    | MINUSEQUAL {$op = operatorType.Sub;}
+    | STAREQUAL {$op = operatorType.Mult;}
+    | SLASHEQUAL {$op = operatorType.Div;}
+    | PERCENTEQUAL {$op = operatorType.Mod;}
+    | AMPEREQUAL {$op = operatorType.BitAnd;}
+    | VBAREQUAL {$op = operatorType.BitOr;}
+    | CIRCUMFLEXEQUAL {$op = operatorType.BitXor;}
+    | LEFTSHIFTEQUAL {$op = operatorType.LShift;}
+    | RIGHTSHIFTEQUAL {$op = operatorType.RShift;}
+    | DOUBLESTAREQUAL {$op = operatorType.Pow;}
+    | DOUBLESLASHEQUAL {$op = operatorType.FloorDiv;}
+    ;
 
 //print_stmt: 'print' ( [ test (',' test)* [','] ] |
 //                      '>>' test [ (',' test)+ [','] ] )
-print_stmt : PRINT
-             ( t1=printlist -> {$t1.newline}? ^(PRINT ^(Values $t1) ^(Newline))
-                            -> ^(PRINT ^(Values $t1))
-             | RIGHTSHIFT t2=printlist2 -> {$t2.newline}? ^(PRINT ^(Dest RIGHTSHIFT) ^(Values $t2) ^(Newline))
-                                       -> ^(PRINT ^(Dest RIGHTSHIFT) ^(Values $t2))
-             | -> ^(PRINT ^(Newline))
-             )
+print_stmt
+    : PRINT 
+      (t1=printlist
+     -> ^(PRINT<Print>[$PRINT, null, actions.makeExprs($t1.elts), $t1.newline])
+      | RIGHTSHIFT t2=printlist2
+     -> ^(PRINT<Print>[$PRINT, (exprType)$t2.elts.get(0), actions.makeExprs($t2.elts, 1), $t2.newline])
+      |
+     -> ^(PRINT<Print>[$PRINT, null, new exprType[0\], false])
+      )
            ;
 
 //not in CPython's Grammar file
-printlist returns [boolean newline]
-    : (test[expr_contextType.Load] COMMA) => test[expr_contextType.Load] (options {k=2;}: COMMA test[expr_contextType.Load])* (trailcomma=COMMA)?
-    { if ($trailcomma == null) {
+printlist returns [boolean newline, List elts]
+    : (test[null] COMMA) =>
+       t+=test[expr_contextType.Load] (options {k=2;}: COMMA t+=test[expr_contextType.Load])*
+         (trailcomma=COMMA)?
+       {
+           $elts=$t;
+           if ($trailcomma == null) {
+               $newline = true;
+           } else {
+               $newline = false;
+           }
+       }
+    | t+=test[expr_contextType.Load]
+      {
+          $elts=$t;
           $newline = true;
-      } else {
-          $newline = false;
       }
-    }
-   -> ^(Elts test+)
-    | test[expr_contextType.Load] {$newline = true;}
-   -> ^(Elts test)
     ;
 
+//XXX: would be nice if printlist and printlist2 could be merged.
 //not in CPython's Grammar file
-printlist2 returns [boolean newline]
-    : (test[expr_contextType.Load] COMMA test[expr_contextType.Load]) => test[expr_contextType.Load] (options {k=2;}: COMMA test[expr_contextType.Load])* (trailcomma=COMMA)?
-    { if ($trailcomma == null) {
+printlist2 returns [boolean newline, List elts]
+    : (test[null] COMMA test[null]) =>
+       t+=test[expr_contextType.Load] (options {k=2;}: COMMA t+=test[expr_contextType.Load])*
+         (trailcomma=COMMA)?
+       { $elts=$t;
+           if ($trailcomma == null) {
+               $newline = true;
+           } else {
+               $newline = false;
+           }
+       }
+    | t+=test[expr_contextType.Load]
+      {
+          $elts=$t;
           $newline = true;
-      } else {
-          $newline = false;
       }
-    }
-   -> ^(Elts test+)
-    | test[expr_contextType.Load] {$newline = true;}
-   -> ^(Elts test)
     ;
 
 
 //del_stmt: 'del' exprlist
-del_stmt : DELETE exprlist2
-        -> ^(DELETE exprlist2)
-         ;
+del_stmt
+    : DELETE del_list
+   -> ^(DELETE<Delete>[$DELETE, actions.makeExprs($del_list.etypes)])
+    ;
 
 //pass_stmt: 'pass'
-pass_stmt : PASS 
-         -> ^(PASS)
-          ;
+pass_stmt
+    : PASS
+   -> ^(PASS<Pass>[$PASS])
+    ;
 
 //flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt | yield_stmt
-flow_stmt : break_stmt
-          | continue_stmt
-          | return_stmt
-          | raise_stmt
-          | yield_stmt
-          ;
+flow_stmt
+    : break_stmt
+    | continue_stmt
+    | return_stmt
+    | raise_stmt
+    | yield_stmt
+    ;
 
 //break_stmt: 'break'
-break_stmt : BREAK
-          -> ^(BREAK<Break>[$BREAK])
-           ;
+break_stmt
+    : BREAK
+   -> ^(BREAK<Break>[$BREAK])
+    ;
 
 //continue_stmt: 'continue'
-continue_stmt : CONTINUE
-             -> ^(CONTINUE<Continue>[$CONTINUE])
-              ;
+continue_stmt
+    : CONTINUE
+   -> ^(CONTINUE<Continue>[$CONTINUE])
+    ;
 
 //return_stmt: 'return' [testlist]
-return_stmt : RETURN (testlist[expr_contextType.Load])?
-          -> ^(RETURN ^(Value testlist)?)
-            ;
+return_stmt
+    : RETURN 
+      (testlist[expr_contextType.Load]
+     -> ^(RETURN<Return>[$RETURN, (exprType)$testlist.tree])
+      |
+     -> ^(RETURN<Return>[$RETURN, null])
+      )
+      ;
 
 //yield_stmt: yield_expr
-yield_stmt : yield_expr
-           ;
+yield_stmt
+    : yield_expr -> ^(YIELD<Expr>[$yield_expr.start, (exprType)$yield_expr.tree])
+    ;
 
 //raise_stmt: 'raise' [test [',' test [',' test]]]
-raise_stmt: RAISE (t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load] (COMMA t3=test[expr_contextType.Load])?)?)?
-          -> ^(RAISE ^(Type $t1)? ^(Inst $t2)? ^(Tback $t3)?)
-          ;
+raise_stmt
+    : RAISE (t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load]
+        (COMMA t3=test[expr_contextType.Load])?)?)?
+   -> ^(RAISE<Raise>[$RAISE, (exprType)$t1.tree, (exprType)$t2.tree, (exprType)$t3.tree])
+    ;
 
 //import_stmt: import_name | import_from
-import_stmt : import_name
-            | import_from
-            ;
+import_stmt
+    : import_name
+    | import_from
+    ;
 
 //import_name: 'import' dotted_as_names
-import_name : IMPORT dotted_as_names
-           -> ^(IMPORT dotted_as_names)
-            ;
+import_name
+    : IMPORT dotted_as_names
+   -> ^(IMPORT<Import>[$IMPORT, $dotted_as_names.atypes])
+    ;
 
 //import_from: ('from' ('.'* dotted_name | '.'+)
 //              'import' ('*' | '(' import_as_names ')' | import_as_names))
-import_from: FROM (DOT* dotted_name | DOT+) IMPORT 
-              (STAR
-             -> ^(FROM ^(Level DOT*)? ^(Value dotted_name)? ^(IMPORT STAR))
-              | import_as_names
-             -> ^(FROM ^(Level DOT*)? ^(Value dotted_name)? ^(IMPORT import_as_names))
-              | LPAREN import_as_names COMMA? RPAREN
-             -> ^(FROM ^(Level DOT*)? ^(Value dotted_name)? ^(IMPORT import_as_names))
-              )
-           ;
+import_from
+    : FROM (d+=DOT* dotted_name | d+=DOT+) IMPORT 
+        (STAR
+       -> ^(FROM<ImportFrom>[$FROM, actions.makeFromText($d, $dotted_name.text),
+             actions.makeStarAlias($STAR), actions.makeLevel($d)])
+        | i1=import_as_names
+       -> ^(FROM<ImportFrom>[$FROM, actions.makeFromText($d, $dotted_name.text),
+             actions.makeAliases($i1.atypes), actions.makeLevel($d)])
+        | LPAREN i2=import_as_names COMMA? RPAREN
+       -> ^(FROM<ImportFrom>[$FROM, actions.makeFromText($d, $dotted_name.text),
+             actions.makeAliases($i2.atypes), actions.makeLevel($d)])
+        )
+    ;
 
 //import_as_names: import_as_name (',' import_as_name)* [',']
-import_as_names : import_as_name (COMMA! import_as_name)*
-                ;
+import_as_names returns [aliasType[\] atypes]
+    : n+=import_as_name (COMMA! n+=import_as_name)*
+    {
+        $atypes = (aliasType[])$n.toArray(new aliasType[$n.size()]);
+    }
+    ;
 
 //import_as_name: NAME [('as' | NAME) NAME]
-import_as_name : name=NAME (AS asname=NAME)?
-              -> ^(Alias $name ^(Asname $asname)?)
-               ;
+import_as_name returns [aliasType atype]
+@after {
+    $import_as_name.tree = $atype;
+}
+    : name=NAME (AS asname=NAME)?
+    {
+        $atype = new aliasType($name, $name.text, $asname.text);
+    }
+    ;
 
 //XXX: when does CPython Grammar match "dotted_name NAME NAME"?
 //dotted_as_name: dotted_name [('as' | NAME) NAME]
-dotted_as_name : dotted_name (AS asname=NAME)?
-              -> ^(Alias dotted_name ^(Asname NAME)?)
-               ;
+dotted_as_name returns [aliasType atype]
+@after {
+    $dotted_as_name.tree = $atype;
+}
 
+    : dotted_name (AS NAME)?
+    {
+        $atype = new aliasType($NAME, $dotted_name.text, $NAME.text);
+    }
+    ;
+
 //dotted_as_names: dotted_as_name (',' dotted_as_name)*
-dotted_as_names : dotted_as_name (COMMA! dotted_as_name)*
-                ;
+dotted_as_names returns [aliasType[\] atypes]
+    : d+=dotted_as_name (COMMA! d+=dotted_as_name)*
+    {
+        $atypes = (aliasType[])$d.toArray(new aliasType[$d.size()]);
+    }
+    ;
+
 //dotted_name: NAME ('.' NAME)*
-dotted_name : NAME (DOT attr)*
-            ;
+dotted_name
+    : NAME (DOT attr)*
+    ;
 
 //global_stmt: 'global' NAME (',' NAME)*
-global_stmt : GLOBAL NAME (COMMA NAME)*
-           -> ^(GLOBAL NAME+)
-            ;
+global_stmt
+    : GLOBAL n+=NAME (COMMA n+=NAME)*
+   -> ^(GLOBAL<Global>[$GLOBAL, actions.makeNames($n)])
+    ;
 
 //exec_stmt: 'exec' expr ['in' test [',' test]]
-exec_stmt : EXEC expr[expr_contextType.Load] (IN t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load])?)?
-         -> ^(EXEC expr ^(Globals $t1)? ^(Locals $t2)?)
-          ;
+exec_stmt
+@init {
+    stmtType stype = null;
+}
+@after {
+   $exec_stmt.tree = stype;
+}
+    : EXEC expr[expr_contextType.Load] (IN t1=test[expr_contextType.Load]
+        (COMMA t2=test[expr_contextType.Load])?)?
+      {
+         stype = new Exec($EXEC, (exprType)$expr.tree, (exprType)$t1.tree, (exprType)$t2.tree);
+      }
+    ;
 
 //assert_stmt: 'assert' test [',' test]
-assert_stmt : ASSERT t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load])?
-           -> ^(ASSERT ^(Test $t1) ^(Msg $t2)?)
-            ;
+assert_stmt
+    : ASSERT t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load])?
+   -> ^(ASSERT<Assert>[$ASSERT, (exprType)$t1.tree, (exprType)$t2.tree])
+    ;
 
 //compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | funcdef | classdef
-compound_stmt : if_stmt
-              | while_stmt
-              | for_stmt
-              | try_stmt
-              | with_stmt
-              | funcdef
-              | classdef
-              ;
+compound_stmt
+    : if_stmt
+    | while_stmt
+    | for_stmt
+    | try_stmt
+    | with_stmt
+    | funcdef
+    | classdef
+    ;
 
 //if_stmt: 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
-if_stmt: IF test[expr_contextType.Load] COLON ifsuite=suite elif_clause*  (ORELSE COLON elsesuite=suite)?
-      -> ^(IF test $ifsuite elif_clause* ^(ORELSE $elsesuite)?)
-       ;
+if_stmt
+    : IF test[expr_contextType.Load] COLON ifsuite=suite elifs+=elif_clause*
+        (ORELSE COLON elsesuite=suite)?
+   -> ^(IF<If>[$IF, (exprType)$test.tree, actions.makeStmts($ifsuite.stypes),
+         actions.makeElses($elsesuite.stypes, $elifs)])
+    ;
 
 //not in CPython's Grammar file
-elif_clause : ELIF test[expr_contextType.Load] COLON suite
-           -> ^(ELIF test suite)
-            ;
+elif_clause
+    : ELIF test[expr_contextType.Load] COLON suite
+   -> ^(ELIF<If>[$ELIF, (exprType)$test.tree, actions.makeStmts($suite.stypes), new stmtType[0\]])
+    ;
 
 //while_stmt: 'while' test ':' suite ['else' ':' suite]
-while_stmt : WHILE test[expr_contextType.Load] COLON s1=suite (ORELSE COLON s2=suite)?
-          -> ^(WHILE test ^(Body $s1) ^(ORELSE $s2)?)
-           ;
+while_stmt
+@init {
+    stmtType stype = null;
+}
+@after {
+   $while_stmt.tree = stype;
+}
+    : WHILE test[expr_contextType.Load] COLON s1=suite (ORELSE COLON s2=suite)?
+    {
+        stype = actions.makeWhile($WHILE, (exprType)$test.tree, $s1.stypes, $s2.stypes);
+    }
+    ;
 
 //for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite]
-for_stmt : FOR exprlist[expr_contextType.Store] IN testlist[expr_contextType.Load] COLON s1=suite (ORELSE COLON s2=suite)?
-        -> ^(FOR ^(Target exprlist) ^(IN testlist) ^(Body $s1) ^(ORELSE $s2)?)
-         ;
+for_stmt
+@init {
+    stmtType stype = null;
+}
+@after {
+   $for_stmt.tree = stype;
+}
+    : FOR exprlist[expr_contextType.Store] IN testlist[expr_contextType.Load] COLON s1=suite
+        (ORELSE COLON s2=suite)?
+      {
+          stype = actions.makeFor($FOR, $exprlist.etype, (exprType)$testlist.tree, $s1.stypes, $s2.stypes);
+      }
+    ;
 
 //try_stmt: ('try' ':' suite
 //           ((except_clause ':' suite)+
 //           ['else' ':' suite]
 //           ['finally' ':' suite] |
 //           'finally' ':' suite))
-try_stmt : TRY COLON trysuite=suite
-           ( (except_clause+ (ORELSE COLON elsesuite=suite)? (FINALLY COLON finalsuite=suite)?
-          -> ^(TryExcept[$TRY] ^(Body $trysuite) except_clause+ ^(ORELSE $elsesuite)? ^(FINALLY $finalsuite)?))
-           | (FINALLY COLON finalsuite=suite
-          -> ^(TryFinally[$TRY] ^(Body $trysuite) ^(FINALLY $finalsuite)))
-           )
-         ;
+try_stmt
+@init {
+    stmtType stype = null;
+}
+@after {
+   $try_stmt.tree = stype;
+}
+    : TRY COLON trysuite=suite
+      ( e+=except_clause+ (ORELSE COLON elsesuite=suite)? (FINALLY COLON finalsuite=suite)?
+        {
+            stype = actions.makeTryExcept($TRY, $trysuite.stypes, $e, $elsesuite.stypes, $finalsuite.stypes);
+        }
+      | FINALLY COLON finalsuite=suite
+        {
+            stype = actions.makeTryFinally($TRY, $trysuite.stypes, $finalsuite.stypes);
+        }
+      )
+      ;
 
 //with_stmt: 'with' test [ with_var ] ':' suite
-with_stmt: WITH test[expr_contextType.Load] (with_var)? COLON suite
-        -> ^(WITH test with_var? ^(Body suite))
-         ;
+with_stmt
+@init {
+    stmtType stype = null;
+}
+@after {
+   $with_stmt.tree = stype;
+}
+    : WITH test[expr_contextType.Load] (with_var)? COLON suite
+      {
+          stype = new With($WITH, (exprType)$test.tree, $with_var.etype,
+              actions.makeStmts($suite.stypes));
+      }
+    ;
 
 //with_var: ('as' | NAME) expr
-with_var: (AS | NAME) expr[expr_contextType.Load]
-        ;
+with_var returns [exprType etype]
+    : (AS | NAME) expr[expr_contextType.Store]
+      {
+          $etype = (exprType)$expr.tree;
+      }
+    ;
 
 //except_clause: 'except' [test [',' test]]
-except_clause : EXCEPT (t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load])?)? COLON suite
-             //Note: passing the 'except' keyword on so we can pass the same offset
-             //      as CPython.
-             -> ^(EXCEPT ^(Type $t1)? ^(Value $t2)? ^(Body suite))
-              ;
+except_clause
+    : EXCEPT (t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Store])?)? COLON suite
+   -> ^(EXCEPT<excepthandlerType>[$EXCEPT, (exprType)$t1.tree, (exprType)$t2.tree,
+          actions.makeStmts($suite.stypes), $EXCEPT.getLine(), $EXCEPT.getCharPositionInLine()])
+    ;
 
 //suite: simple_stmt | NEWLINE INDENT stmt+ DEDENT
-suite
+suite returns [List stypes]
+@init {
+    $stypes = new ArrayList();
+}
     : simple_stmt
-    | NEWLINE! INDENT (stmt)+ DEDENT
+      {
+          $stypes = $simple_stmt.stypes;
+      }
+    | NEWLINE INDENT
+      (stmt
+          {
+              $stypes.addAll($stmt.stypes);
+          }
+      )+ DEDENT
     ;
 
 //test: or_test ['if' or_test 'else' test] | lambdef
 test[expr_contextType ctype]
     :o1=or_test[ctype]
-    ( (IF or_test[expr_contextType.Load] ORELSE) => IF o2=or_test[ctype] ORELSE test[expr_contextType.Load]
-      -> ^(IfExp ^(Test $o2) ^(Body $o1) ^(ORELSE test))
-    | -> or_test
-    )
-    | lambdef {debug("parsed lambdef");}
+      ( (IF or_test[null] ORELSE) => IF o2=or_test[ctype] ORELSE e=test[expr_contextType.Load]
+     -> ^(IF<IfExp>[$IF, (exprType)$o2.tree, (exprType)$o1.tree, (exprType)$e.tree])
+      |
+     -> or_test
+      )
+    | lambdef
     ;
 
 //or_test: and_test ('or' and_test)*
-or_test[expr_contextType ctype] : and_test[ctype] (OR^ and_test[ctype])*
-        ;
+or_test[expr_contextType ctype]
+@after {
+    if ($or != null) {
+        $or_test.tree = actions.makeBoolOp($left.tree, boolopType.Or, $right);
+    }
+}
+    : left=and_test[ctype]
+        ( (or=OR right+=and_test[ctype]
+          )+
+        |
+       -> $left
+        )
+    ;
 
 //and_test: not_test ('and' not_test)*
-and_test[expr_contextType ctype] : not_test[ctype] (AND^ not_test[ctype])*
-         ;
+and_test[expr_contextType ctype]
+@after {
+    if ($and != null) {
+        $and_test.tree = actions.makeBoolOp($left.tree, boolopType.And, $right); 
+    }
+}
+    : left=not_test[ctype]
+        ( (and=AND right+=not_test[ctype]
+          )+
+        |
+       -> $left
+        )
+    ;
 
 //not_test: 'not' not_test | comparison
-not_test[expr_contextType ctype] : NOT^ not_test[ctype]
-         | comparison[ctype]
-         ;
+not_test[expr_contextType ctype]
+    : NOT nt=not_test[ctype]
+   -> ^(NOT<UnaryOp>[$NOT, unaryopType.Not, (exprType)$nt.tree])
+    | comparison[ctype]
+    ;
 
 //comparison: expr (comp_op expr)*
-comparison[expr_contextType ctype]: expr[ctype] (comp_op^ expr[ctype])*
+comparison[expr_contextType ctype]
+@init {
+    List cmps = new ArrayList();
+}
+@after {
+    if (!cmps.isEmpty()) {
+        $comparison.tree = new Compare($left.tree, (exprType)$left.tree, actions.makeCmpOps(cmps),
+            actions.makeExprs($right));
+    }
+}
+    : left=expr[ctype]
+       ( ( comp_op right+=expr[ctype] {cmps.add($comp_op.op);}
+         )+
+       |
+      -> $left
+       )
     ;
 
 //comp_op: '<'|'>'|'=='|'>='|'<='|'<>'|'!='|'in'|'not' 'in'|'is'|'is' 'not'
-comp_op : LESS
-        | GREATER
-        | EQUAL
-        | GREATEREQUAL
-        | LESSEQUAL
-        | ALT_NOTEQUAL
-        | NOTEQUAL
-        | IN
-        | NOT IN -> NotIn
-        | IS
-        | IS NOT -> IsNot
-        ;
+comp_op returns [cmpopType op]
+    : LESS {$op = cmpopType.Lt;}
+    | GREATER {$op = cmpopType.Gt;}
+    | EQUAL {$op = cmpopType.Eq;}
+    | GREATEREQUAL {$op = cmpopType.GtE;}
+    | LESSEQUAL {$op = cmpopType.LtE;}
+    | ALT_NOTEQUAL {$op = cmpopType.NotEq;}
+    | NOTEQUAL {$op = cmpopType.NotEq;}
+    | IN {$op = cmpopType.In;}
+    | NOT IN {$op = cmpopType.NotIn;}
+    | IS {$op = cmpopType.Is;}
+    | IS NOT {$op = cmpopType.IsNot;}
+    ;
 
+
 //expr: xor_expr ('|' xor_expr)*
 expr[expr_contextType ect]
 scope {
@@ -742,219 +990,531 @@
 @init {
     $expr::ctype = ect;
 }
-
-    : xor_expr (VBAR^ xor_expr)*
+@after {
+    if ($op != null) {
+        $expr.tree = actions.makeBinOp($left.tree, operatorType.BitOr, $right); 
+    }
+}
+    : left=xor_expr
+        ( (op=VBAR right+=xor_expr
+          )+
+        |
+       -> $left
+        )
     ;
 
+
 //xor_expr: and_expr ('^' and_expr)*
-xor_expr : and_expr (CIRCUMFLEX^ and_expr)*
-         ;
+xor_expr
+@after {
+    if ($op != null) {
+        $xor_expr.tree = actions.makeBinOp($left.tree, operatorType.BitXor, $right); 
+    }
+}
+    : left=and_expr
+        ( (op=CIRCUMFLEX right+=and_expr
+          )+
+        |
+       -> $left
+        )
+    ;
 
 //and_expr: shift_expr ('&' shift_expr)*
-and_expr : shift_expr (AMPER^ shift_expr)*
-         ;
+and_expr
+@after {
+    if ($op != null) {
+        $and_expr.tree = actions.makeBinOp($left.tree, operatorType.BitAnd, $right); 
+    }
+}
+    : left=shift_expr
+        ( (op=AMPER right+=shift_expr
+          )+
+        |
+       -> $left
+        )
+    ;
 
 //shift_expr: arith_expr (('<<'|'>>') arith_expr)*
-shift_expr : arith_expr ((LEFTSHIFT^|RIGHTSHIFT^) arith_expr)*
-           ;
+shift_expr
+@init {
+    List ops = new ArrayList();
+}
+@after {
+    if (!ops.isEmpty()) {
+        $shift_expr.tree = actions.makeBinOp($left.tree, ops, $right); 
+    }
+}
+    : left=arith_expr
+        ( ( shift_op right+=arith_expr {ops.add($shift_op.op);}
+          )+
+        |
+       -> $left
+        )
+    ;
 
+shift_op returns [operatorType op]
+    : LEFTSHIFT {$op = operatorType.LShift;}
+    | RIGHTSHIFT {$op = operatorType.RShift;}
+    ;
+
 //arith_expr: term (('+'|'-') term)*
-arith_expr: term ((PLUS^|MINUS^) term)*
+arith_expr
+@init {
+    List ops = new ArrayList();
+}
+@after {
+    if (!ops.isEmpty()) {
+        $arith_expr.tree = actions.makeBinOp($left.tree, ops, $right);
+    }
+}
+    : left=term
+        ( (arith_op right+=term {ops.add($arith_op.op);}
+          )+
+        |
+       -> $left
+        )
     ;
 
+arith_op returns [operatorType op]
+    : PLUS {$op = operatorType.Add;}
+    | MINUS {$op = operatorType.Sub;}
+    ;
+
 //term: factor (('*'|'/'|'%'|'//') factor)*
-term : factor ((STAR^ | SLASH^ | PERCENT^ | DOUBLESLASH^ ) factor)*
-     ;
+term
+@init {
+    List ops = new ArrayList();
+}
+@after {
+    if (!ops.isEmpty()) {
+        $term.tree = actions.makeBinOp($left.tree, ops, $right);
+    }
+}
+    : left=factor
+        ( (term_op right+=factor {ops.add($term_op.op);}
+          )+
+        |
+       -> $left
+        )
+    ;
 
+term_op returns [operatorType op]
+    :STAR {$op = operatorType.Mult;}
+    |SLASH {$op = operatorType.Div;}
+    |PERCENT {$op = operatorType.Mod;}
+    |DOUBLESLASH {$op = operatorType.FloorDiv;}
+    ;
+
 //factor: ('+'|'-'|'~') factor | power
-factor : PLUS factor -> ^(UAdd PLUS factor)
-       | MINUS factor -> ^(USub MINUS factor)
-       | TILDE factor -> ^(Invert TILDE factor)
-       | power
-       ;
+factor returns [exprType etype]
+@after {
+    $factor.tree = $etype;
+}
+    : PLUS p=factor {$etype = new UnaryOp($PLUS, unaryopType.UAdd, $p.etype);}
+    | MINUS m=factor {$etype = actions.negate($MINUS, $m.etype);}
+    | TILDE t=factor {$etype = new UnaryOp($TILDE, unaryopType.Invert, $t.etype);}
+    | power {$etype = (exprType)$power.tree;}
+    ;
 
 //power: atom trailer* ['**' factor]
-power : atom (trailer^)* (options {greedy=true;}:DOUBLESTAR^ factor)?
-      ;
+power returns [exprType etype]
+@after {
+    $power.tree = $etype;
+}
+    : atom (t+=trailer[$atom.start, $atom.tree])* (options {greedy=true;}:d=DOUBLESTAR factor)?
+      {
+          //XXX: This could be better.
+          $etype = (exprType)$atom.tree;
+          if ($t != null) {
+              for(int i = 0; i < $t.size(); i++) {
+                  Object o = $t.get(i);
+                  if ($etype instanceof Context) {
+                      ((Context)$etype).setContext(expr_contextType.Load);
+                  }
+                  if (o instanceof Call) {
+                      Call c = (Call)o;
+                      c.func = $etype;
+                      $etype = c;
+                  } else if (o instanceof Subscript) {
+                      Subscript c = (Subscript)o;
+                      c.value = $etype;
+                      $etype = c;
+                  } else if (o instanceof Attribute) {
+                      Attribute c = (Attribute)o;
+                      c.value = $etype;
+                      $etype = c;
+                  }
+              }
+          }
+          if ($d != null) {
+              List right = new ArrayList();
+              right.add($factor.tree);
+              $etype = actions.makeBinOp($etype, operatorType.Pow, right);
+          }
+      }
+    ;
 
 //atom: ('(' [yield_expr|testlist_gexp] ')' |
 //       '[' [listmaker] ']' |
 //       '{' [dictmaker] '}' |
 //       '`' testlist1 '`' |
 //       NAME | NUMBER | STRING+)
-atom : LPAREN 
-       ( yield_expr    -> ^(Parens LPAREN yield_expr)
-       | testlist_gexp {debug("parsed testlist_gexp");} -> ^(Parens LPAREN testlist_gexp)
-       | -> ^(Tuple)
+atom
+    : LPAREN 
+      ( yield_expr
+     -> yield_expr
+      | testlist_gexp
+     -> testlist_gexp
+      |
+     -> ^(LPAREN<Tuple>[$LPAREN, new exprType[0\], $expr::ctype])
+      )
+      RPAREN
+    | LBRACK
+      (listmaker[$LBRACK]
+     -> listmaker
+      |
+     -> ^(LBRACK<org.python.antlr.ast.List>[$LBRACK, new exprType[0\], $expr::ctype])
+      )
+      RBRACK
+    | LCURLY 
+       (dictmaker
+      -> ^(LCURLY<Dict>[$LCURLY, actions.makeExprs($dictmaker.keys),
+              actions.makeExprs($dictmaker.values)])
+       |
+      -> ^(LCURLY<Dict>[$LCURLY, new exprType[0\], new exprType[0\]])
        )
-       RPAREN
-     | LBRACK
-       (listmaker -> ^(Brackets LBRACK listmaker)
-       | -> ^(Brackets LBRACK ^(List))
-       )
-       RBRACK
-     | LCURLY (dictmaker)? RCURLY -> ^(Dict LCURLY ^(Elts dictmaker)?)
-     | BACKQUOTE testlist[expr_contextType.Load] BACKQUOTE -> ^(Repr BACKQUOTE testlist)
-     | NAME -> ^(NameTok NAME)
-     | INT -> ^(NumTok<Num>[$INT, actions.makeInt($INT)])
-     | LONGINT -> ^(NumTok<Num>[$LONGINT, actions.makeInt($LONGINT)])
-     | FLOAT -> ^(NumTok<Num>[$FLOAT, actions.makeFloat($FLOAT)])
-     | COMPLEX -> ^(NumTok<Num>[$COMPLEX, actions.makeComplex($COMPLEX)])
+       RCURLY
+     | lb=BACKQUOTE testlist[expr_contextType.Load] rb=BACKQUOTE
+    -> ^(BACKQUOTE<Repr>[$lb, (exprType)$testlist.tree])
+     | NAME
+    -> ^(NAME<Name>[$NAME, $NAME.text, $expr::ctype])
+     | INT
+    -> ^(INT<Num>[$INT, actions.makeInt($INT)])
+     | LONGINT
+    -> ^(LONGINT<Num>[$LONGINT, actions.makeInt($LONGINT)])
+     | FLOAT
+    -> ^(FLOAT<Num>[$FLOAT, actions.makeFloat($FLOAT)])
+     | COMPLEX
+    -> ^(COMPLEX<Num>[$COMPLEX, actions.makeComplex($COMPLEX)])
      | (S+=STRING)+ 
-    -> ^(StrTok<Str>[actions.extractStringToken($S), actions.extractStrings($S)])
+    -> ^(STRING<Str>[actions.extractStringToken($S), actions.extractStrings($S)])
      ;
 
 //listmaker: test ( list_for | (',' test)* [','] )
-listmaker : test[expr_contextType.Load] 
-            ( list_for -> ^(ListComp test list_for)
-            | (options {greedy=true;}:COMMA test[expr_contextType.Load])* -> ^(List ^(Elts test+))
-            ) (COMMA)?
+listmaker[Token lbrack]
+@init {
+    List gens = new ArrayList();
+    exprType etype = null;
+}
+@after {
+   $listmaker.tree = etype;
+}
+    : t+=test[$expr::ctype] 
+        (list_for[gens]
+          {
+              Collections.reverse(gens);
+              comprehensionType[] c =
+                  (comprehensionType[])gens.toArray(new comprehensionType[gens.size()]);
+              etype = new ListComp($listmaker.start, (exprType)$t.get(0), c);
+          }
+        | (options {greedy=true;}:COMMA t+=test[$expr::ctype])*
+          {
+              etype = new org.python.antlr.ast.List($lbrack, actions.makeExprs($t), $expr::ctype);
+          }
+        ) (COMMA)?
           ;
 
 //testlist_gexp: test ( gen_for | (',' test)* [','] )
 testlist_gexp
-    : test[expr_contextType.Load] ( ((options {k=2;}: c1=COMMA test[expr_contextType.Load])* (c2=COMMA)? -> { $c1 != null || $c2 != null }? ^(Tuple ^(Elts test+))
-                                                           -> test
-             )
-           | ( gen_for -> ^(GeneratorExp test gen_for))
-           )
+@init {
+    exprType etype = null;
+    List gens = new ArrayList();
+}
+@after {
+    if (etype != null) {
+        $testlist_gexp.tree = etype;
+    }
+}
+    : t+=test[$expr::ctype]
+        ( ((options {k=2;}: c1=COMMA t+=test[$expr::ctype])* (c2=COMMA)?
+         -> { $c1 != null || $c2 != null }?
+                ^(COMMA<Tuple>[$testlist_gexp.start, actions.makeExprs($t), $expr::ctype])
+                -> test
+          )
+        | (gen_for[gens]
+           {
+               Collections.reverse(gens);
+               comprehensionType[] c = (comprehensionType[])gens.toArray(new comprehensionType[gens.size()]);
+               exprType e = (exprType)$t.get(0);
+               if (e instanceof Context) {
+                   ((Context)e).setContext(expr_contextType.Load);
+               }
+               etype = new GeneratorExp($testlist_gexp.start, (exprType)$t.get(0), c);
+           }
+          )
+        )
     ;
 
 //lambdef: 'lambda' [varargslist] ':' test
-lambdef: LAMBDA (varargslist)? COLON test[expr_contextType.Load] {debug("parsed lambda");}
-      -> ^(LAMBDA varargslist? ^(Body test))
-       ;
+lambdef
+@init {
+    exprType etype = null;
+}
+@after {
+    $lambdef.tree = etype;
+}
+    : LAMBDA (varargslist)? COLON test[expr_contextType.Load]
+      {
+          argumentsType a = $varargslist.args;
+          if (a == null) {
+              a = new argumentsType($LAMBDA, new exprType[0], null, null, new exprType[0]);
+          }
+          etype = new Lambda($LAMBDA, a, (exprType)$test.tree);
+      }
+    ;
 
 //trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME
-trailer : LPAREN (arglist)? RPAREN -> ^(Call ^(Args arglist)?)
-        | LBRACK subscriptlist RBRACK -> ^(SubscriptList subscriptlist)
-        | DOT^ attr {debug("motched DOT^ NAME");}
-        ;
+trailer [Token begin, PythonTree tree]
+    : LPAREN 
+        (arglist
+       -> ^(LPAREN<Call>[$begin, (exprType)$tree, actions.makeExprs($arglist.args),
+               actions.makeKeywords($arglist.keywords), $arglist.starargs, $arglist.kwargs])
+        |
+       -> ^(LPAREN<Call>[$LPAREN, (exprType)$tree, new exprType[0\], new keywordType[0\], null, null])
+        )
+      RPAREN
+    | LBRACK subscriptlist[$begin] RBRACK
+   -> ^(LBRACK<Subscript>[$begin, (exprType)$tree, (sliceType)$subscriptlist.tree, $expr::ctype])
+    | DOT attr
+   -> ^(DOT<Attribute>[$begin, (exprType)$tree, $attr.text, $expr::ctype])
+    ;
 
 //subscriptlist: subscript (',' subscript)* [',']
-subscriptlist : subscript (options {greedy=true;}:c1=COMMA subscript)* (c2=COMMA)?
-             -> { $c1 != null || $c2 != null }? ^(Tuple ^(Elts subscript+))
-             -> subscript
-              ;
+subscriptlist[Token begin]
+@init {
+    sliceType sltype = null;
+}
+@after {
+   $subscriptlist.tree = sltype;
+}
+    : sub+=subscript (options {greedy=true;}:c1=COMMA sub+=subscript)* (c2=COMMA)?
+      {
+          sltype = actions.makeSliceType($begin, $c1, $c2, $sub);
+      }
+    ;
 
 //subscript: '.' '.' '.' | test | [test] ':' [test] [sliceop]
-subscript : DOT DOT DOT -> Ellipsis
-          | (test[expr_contextType.Load] COLON) => t1=test[expr_contextType.Load] (COLON (t2=test[expr_contextType.Load])? (sliceop)?)? -> ^(Subscript ^(Lower $t1) ^(Upper COLON ^(UpperOp $t2)?)? sliceop?)
-          | (COLON) => COLON (test[expr_contextType.Load])? (sliceop)? -> ^(Subscript ^(Upper COLON ^(UpperOp test)?)? sliceop?)
-          | test[expr_contextType.Load] -> ^(Index test)
-          ;
+subscript returns [sliceType sltype]
+@after {
+    if ($sltype != null) {
+        $subscript.tree = $sltype;
+    }
+}
+    : d1=DOT DOT DOT
+   -> DOT<Ellipsis>[$d1]
+    | (test[null] COLON)
+   => lower=test[expr_contextType.Load] (c1=COLON (upper1=test[expr_contextType.Load])? (sliceop)?)?
+      {
+        $sltype = actions.makeSubscript($lower.tree, $c1, $upper1.tree, $sliceop.tree);
+      }
+    | (COLON)
+   => c2=COLON (upper2=test[expr_contextType.Load])? (sliceop)?
+      {
+          $sltype = actions.makeSubscript(null, $c2, $upper2.tree, $sliceop.tree);
+      }
+    | test[expr_contextType.Load]
+   -> ^(LPAREN<Index>[$test.start, (exprType)$test.tree])
+    ;
 
 //sliceop: ':' [test]
-sliceop : COLON (test[expr_contextType.Load])? -> ^(Step COLON ^(StepOp test)?)
-        ;
+sliceop
+    : COLON
+      (test[expr_contextType.Load]
+     -> test
+      )?
+    ;
 
 //exprlist: expr (',' expr)* [',']
-exprlist[expr_contextType ctype]: (expr[expr_contextType.Load] COMMA) => expr[ctype] (options {k=2;}: COMMA expr[ctype])* (COMMA)? -> ^(Tuple ^(Elts expr+))
-         | expr[ctype]
-         ;
+exprlist[expr_contextType ctype] returns [exprType etype]
+    : (expr[null] COMMA) => e+=expr[ctype] (options {k=2;}: COMMA e+=expr[ctype])* (COMMA)?
+      {
+          $etype = new Tuple($exprlist.start, actions.makeExprs($e), ctype);
+      }
+    | expr[ctype]
+      {
+        $etype = (exprType)$expr.tree;
+      }
+    ;
 
-//XXX: I'm hoping I can get rid of this -- but for now I need an exprlist that does not produce tuples
-//     at least for del_stmt
-exprlist2 : expr[expr_contextType.Load] (options {k=2;}: COMMA expr[expr_contextType.Load])* (COMMA)?
-         -> expr+
-          ;
+//not in CPython's Grammar file
+//Needed as an exprlist that does not produce tuples for del_stmt.
+del_list returns [List etypes]
+    : e+=expr[expr_contextType.Del] (options {k=2;}: COMMA e+=expr[expr_contextType.Del])* (COMMA)?
+      {
+          $etypes = $e;
+      }
+    ;
 
 //testlist: test (',' test)* [',']
 testlist[expr_contextType ctype]
-    : test[ctype] (options {k=2;}: c1=COMMA test[ctype])* (c2=COMMA)?
-     -> { $c1 != null || $c2 != null }? ^(Tuple ^(Elts test+))
-     -> test
+    : (test[null] COMMA)
+   => t+=test[ctype] (options {k=2;}: COMMA t+=test[ctype])* (COMMA)?
+   -> ^(COMMA<Tuple>[$testlist.start, actions.makeExprs($t), ctype])
+    | test[ctype]
     ;
 
-//XXX:
-//testlist_safe: test [(',' test)+ [',']]
-
 //dictmaker: test ':' test (',' test ':' test)* [',']
-dictmaker : test[expr_contextType.Load] COLON test[expr_contextType.Load]
-            (options {k=2;}:COMMA test[expr_contextType.Load] COLON test[expr_contextType.Load])* (COMMA)?
-         -> test+
-          ;
+dictmaker returns [List keys, List values]
+    : k+=test[expr_contextType.Load] COLON v+=test[expr_contextType.Load]
+        (options {k=2;}:COMMA k+=test[expr_contextType.Load] COLON v+=test[expr_contextType.Load])*
+        (COMMA)?
+      {
+          $keys = $k;
+          $values= $v;
+      }
+    ;
 
 //classdef: 'class' NAME ['(' [testlist] ')'] ':' suite
-classdef: CLASS NAME (LPAREN testlist[expr_contextType.Load]? RPAREN)? COLON suite
-    -> ^(CLASS NAME ^(Bases testlist)? ^(Body suite))
+classdef
+@init {
+    stmtType stype = null;
+}
+@after {
+   $classdef.tree = stype;
+}
+    : CLASS NAME (LPAREN testlist[expr_contextType.Load]? RPAREN)? COLON suite
+      {
+          stype = new ClassDef($CLASS, actions.cantBeNone($NAME), actions.makeBases((exprType)$testlist.tree),
+              actions.makeStmts($suite.stypes));
+      }
     ;
 
 //arglist: (argument ',')* (argument [',']| '*' test [',' '**' test] | '**' test)
-arglist : a1=argument[true] (COMMA a2+=argument[false])*
-          ( COMMA
-            ( STAR starargs=test[expr_contextType.Load] (COMMA DOUBLESTAR kwargs=test[expr_contextType.Load])?
-            | DOUBLESTAR kwargs=test[expr_contextType.Load]
-            )?
-          )? { if ($a2 != null) {
-                   if ($a1.tree.getType() == GenFor) {
-                       actions.errorGenExpNotSoleArg($a1.tree);
-                   }
-                   for (int i=0;i<$a2.size();i++) {
-                       if (((PythonTree)$a2.get(i)).getType() == GenFor) {
-                           actions.errorGenExpNotSoleArg(((argument_return)$a2.get(i)).tree);
-                       }
-                   }
-               }
-             }
-       -> ^(Args argument+) ^(StarArgs $starargs)? ^(KWArgs $kwargs)?
-        |   STAR starargs=test[expr_contextType.Load] (COMMA DOUBLESTAR kwargs=test[expr_contextType.Load])?
-       -> ^(StarArgs $starargs) ^(KWArgs $kwargs)?
-        |   DOUBLESTAR kwargs=test[expr_contextType.Load]
-       -> ^(KWArgs $kwargs)
-        ;
+arglist returns [List args, List keywords, exprType starargs, exprType kwargs]
+@init {
+    List arguments = new ArrayList();
+    List kws = new ArrayList();
+    List gens = new ArrayList();
+}
+    : argument[arguments, kws, gens, true] (COMMA argument[arguments, kws, gens, false])*
+          (COMMA
+              ( STAR s=test[expr_contextType.Load] (COMMA DOUBLESTAR k=test[expr_contextType.Load])?
+              | DOUBLESTAR k=test[expr_contextType.Load]
+              )?
+          )?
+      {
+          if (arguments.size() > 1 && gens.size() > 0) {
+              actions.errorGenExpNotSoleArg(new PythonTree($arglist.start));
+          }
+          $args=arguments;
+          $keywords=kws;
+          $starargs=(exprType)$s.tree;
+          $kwargs=(exprType)$k.tree;
+      }
+    | STAR s=test[expr_contextType.Load] (COMMA DOUBLESTAR k=test[expr_contextType.Load])?
+      {
+          $starargs=(exprType)$s.tree;
+            $kwargs=(exprType)$k.tree;
+      }
+    | DOUBLESTAR k=test[expr_contextType.Load]
+      {
+            $kwargs=(exprType)$k.tree;
+      }
+    ;
 
 //argument: test [gen_for] | test '=' test  # Really [keyword '='] test
-argument[boolean first]
+argument[List arguments, List kws, List gens, boolean first] returns [boolean genarg]
     : t1=test[expr_contextType.Load]
-         ( (ASSIGN t2=test[expr_contextType.Load]) -> ^(Keyword ^(Arg $t1) ^(Value $t2)?)
-         | gen_for { if (!first) {
-                           actions.errorGenExpNotSoleArg($gen_for.tree);
-                     }
-                   }
-        -> ^(GenFor $t1 gen_for)
-         | -> ^(Arg $t1)
-         )
-         ;
+        ((ASSIGN t2=test[expr_contextType.Load])
+          {
+              $kws.add(new exprType[]{(exprType)$t1.tree, (exprType)$t2.tree});
+          }
+        | gen_for[$gens]
+          {
+              if (!first) {
+                  actions.errorGenExpNotSoleArg($gen_for.tree);
+              }
+              $genarg = true;
+              Collections.reverse($gens);
+              comprehensionType[] c = (comprehensionType[])$gens.toArray(new comprehensionType[$gens.size()]);
+              arguments.add(new GeneratorExp($gen_for.start, (exprType)$t1.tree, c));
+          }
+        | {
+              if (kws.size() > 0) {
+                  errorHandler.error("non-keyword arg after keyword arg", $t1.tree);
+              }
+              $arguments.add($t1.tree);
+          }
+        )
+    ;
 
 //list_iter: list_for | list_if
-list_iter : list_for
-          | list_if
-          ;
+list_iter [List gens] returns [exprType etype]
+    : list_for[gens]
+    | list_if[gens] {
+        $etype = $list_if.etype;
+    }
+    ;
 
 //list_for: 'for' exprlist 'in' testlist_safe [list_iter]
-list_for : FOR exprlist[expr_contextType.Load] IN testlist[expr_contextType.Load] (list_iter)?
-        -> ^(ListFor ^(Target exprlist) ^(IN testlist) ^(Ifs list_iter)?)
-         ;
+list_for [List gens]
+    : FOR exprlist[expr_contextType.Store] IN testlist[expr_contextType.Load] (list_iter[gens])?
+      {
+          exprType[] e;
+          if ($list_iter.etype != null) {
+              e = new exprType[]{$list_iter.etype};
+          } else {
+              e = new exprType[0];
+          }
+          gens.add(new comprehensionType($FOR, $exprlist.etype, (exprType)$testlist.tree, e));
+      }
+    ;
 
 //list_if: 'if' test [list_iter]
-list_if : IF test[expr_contextType.Load] (list_iter)?
-       -> ^(ListIf ^(Target test) (Ifs list_iter)?)
-        ;
+list_if[List gens] returns [exprType etype]
+    : IF test[expr_contextType.Load] (list_iter[gens])?
+    {
+        $etype = (exprType)$test.tree;
+    }
+    ;
 
 //gen_iter: gen_for | gen_if
-gen_iter: gen_for
-        | gen_if
-        ;
+gen_iter [List gens] returns [exprType etype]
+    : gen_for[gens]
+    | gen_if[gens]
+      {
+          $etype = $gen_if.etype;
+      }
+    ;
 
 //gen_for: 'for' exprlist 'in' or_test [gen_iter]
-gen_for: FOR exprlist[expr_contextType.Load] IN or_test[expr_contextType.Load] gen_iter?
-      -> ^(GenFor ^(Target exprlist) ^(IN or_test) ^(Ifs gen_iter)?)
-       ;
+gen_for [List gens]
+    : FOR exprlist[expr_contextType.Store] IN or_test[expr_contextType.Load] gen_iter[gens]?
+      {
+          exprType[] e;
+          if ($gen_iter.etype != null) {
+              e = new exprType[]{$gen_iter.etype};
+          } else {
+              e = new exprType[0];
+          }
+          gens.add(new comprehensionType($FOR, $exprlist.etype, (exprType)$or_test.tree, e));
+      }
+    ;
 
 //gen_if: 'if' old_test [gen_iter]
-gen_if: IF test[expr_contextType.Load] gen_iter?
-     -> ^(GenIf ^(Target test) ^(Ifs gen_iter)?)
-      ;
+gen_if[List gens] returns [exprType etype]
+    : IF test[expr_contextType.Load] gen_iter[gens]?
+      {
+          $etype = (exprType)$test.tree;
+      }
+    ;
 
 //yield_expr: 'yield' [testlist]
-yield_expr : YIELD testlist[expr_contextType.Load]?
-          -> ^(YIELD ^(Value testlist)?)
-           ;
+yield_expr
+    : YIELD testlist[expr_contextType.Load]?
+   -> ^(YIELD<Yield>[$YIELD, (exprType)$testlist.tree])
+    ;
 
-//XXX:
-//testlist1: test (',' test)*
-
 AS        : 'as' ;
 ASSERT    : 'assert' ;
 BREAK     : 'break' ;

Deleted: trunk/jython/grammar/PythonWalker.g
===================================================================
--- trunk/jython/grammar/PythonWalker.g	2008-08-29 12:14:12 UTC (rev 5263)
+++ trunk/jython/grammar/PythonWalker.g	2008-08-29 13:47:16 UTC (rev 5264)
@@ -1,1286 +0,0 @@
-/*
-Copyright (c) 2007-2008 Frank Wierzbicki
-Licensed to PSF under a Contributor Agreement.
-*/
-tree grammar PythonWalker;
-
-options {
-    tokenVocab=Python;
-    ASTLabelType=PythonTree;
-}
-
-@... { 
-package org.python.antlr;
-
-import org.python.core.Py;
-import org.python.core.PyObject;
-import org.python.core.PyString;
-import org.python.antlr.ParseException;
-import org.python.antlr.ast.aliasType;
-import org.python.antlr.ast.argumentsType;
-import org.python.antlr.ast.boolopType;
-import org.python.antlr.ast.comprehensionType;
-import org.python.antlr.ast.cmpopType;
-import org.python.antlr.ast.excepthandlerType;
-import org.python.antlr.ast.exprType;
-import org.python.antlr.ast.expr_contextType;
-import org.python.antlr.ast.keywordType;
-import org.python.antlr.ast.modType;
-import org.python.antlr.ast.operatorType;
-import org.python.antlr.ast.sliceType;
-import org.python.antlr.ast.stmtType;
-import org.python.antlr.ast.unaryopType;
-import org.python.antlr.ast.Assert;
-import org.python.antlr.ast.Assign;
-import org.python.antlr.ast.Attribute;
-import org.python.antlr.ast.AugAssign;
-import org.python.antlr.ast.BinOp;
-import org.python.antlr.ast.BoolOp;
-import org.python.antlr.ast.Break;
-import org.python.antlr.ast.Call;
-import org.python.antlr.ast.ClassDef;
-import org.python.antlr.ast.Compare;
-import org.python.antlr.ast.Continue;
-import org.python.antlr.ast.Delete;
-import org.python.antlr.ast.Dict;
-import org.python.antlr.ast.Ellipsis;
-import org.python.antlr.ast.ErrorStmt;
-import org.python.antlr.ast.Exec;
-import org.python.antlr.ast.Expr;
-import org.python.antlr.ast.Expression;
-import org.python.antlr.ast.ExtSlice;
-import org.python.antlr.ast.For;
-import org.python.antlr.ast.FunctionDef;
-import org.python.antlr.ast.GeneratorExp;
-import org.python.antlr.ast.Global;
-import org.python.antlr.ast.If;
-import org.python.antlr.ast.IfExp;
-import org.python.antlr.ast.Index;
-import org.python.antlr.ast.Import;
-import org.python.antlr.ast.ImportFrom;
-import org.python.antlr.ast.Interactive;
-import org.python.antlr.ast.Lambda;
-import org.python.antlr.ast.ListComp;
-import org.python.antlr.ast.Module;
-import org.python.antlr.ast.Name;
-import org.python.antlr.ast.Num;
-import org.python.antlr.ast.Slice;
-import org.python.antlr.ast.Subscript;
-import org.python.antlr.ast.TryExcept;
-import org.python.antlr.ast.TryFinally;
-import org.python.antlr.ast.Tuple;
-import org.python.antlr.ast.Pass;
-import org.python.antlr.ast.Print;
-import org.python.antlr.ast.Raise;
-import org.python.antlr.ast.Repr;
-import org.python.antlr.ast.Return;
-import org.python.antlr.ast.Str;
-import org.python.antlr.ast.UnaryOp;
-import org.python.antlr.ast.With;
-import org.python.antlr.ast.While;
-import org.python.antlr.ast.Yield;
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-} 
-@... {
-    boolean debugOn = false;
-    private ErrorHandler errorHandler;
-    private GrammarActions actions = new GrammarActions();
-
-    public void setErrorHandler(ErrorHandler eh) {
-        this.errorHandler = eh;
-        actions.setErrorHandler(eh);
-    }
-
-    public void debug(String message) {
-        if (debugOn) {
-            System.out.println(message);
-        }
-    }
-
-    protected void mismatch(IntStream input, int ttype, BitSet follow) throws RecognitionException {
-        throw new MismatchedTokenException(ttype, input);
-    }
-
-    protected void mismatch(IntStream input, RecognitionException e, BitSet follow) throws RecognitionException {
-        throw e;
-    }
-
-    String name = "Test";
-
-    //XXX: Not sure I need any below...
-    String filename = "test.py";
-    boolean linenumbers = true;
-    boolean setFile = true;
-    boolean printResults = false;
-    //CompilerFlags cflags = Py.getCompilerFlags();
-
-}
-
-@... {
-catch (RecognitionException re) {
-    errorHandler.reportError(this, re);
-    errorHandler.recover(this, input,re);
-}
-}
-
-
-expression returns [modType mod]
-    : ^(Expression test[expr_contextType.Load]) { $mod = actions.makeExpression($Expression, $test.etype); }
-    ;
-
-interactive returns [modType mod]
-    : ^(Interactive stmts?) { $mod = actions.makeInteractive($Interactive, $stmts.stypes); }
-    ;
-
-module returns [modType mod]
-    : ^(Module
-        ( stmts {$mod = actions.makeMod($Module, $stmts.stypes); }
-        | {$mod = actions.makeMod($Module, null);}
-        )
-    )
-    ;
-
-funcdef
-    : ^(DEF NAME ^(Arguments varargslist?) ^(Body stmts) ^(Decorators decorators?)) {
-        $stmts::statements.add(actions.makeFunctionDef($DEF, $NAME, $varargslist.args, $stmts.stypes, $decorators.etypes));
-    }
-    ;
-
-varargslist returns [argumentsType args]
-@... {
-    List params = new ArrayList();
-    List defaults = new ArrayList();
-}
-    : ^(Args defparameter[params, defaults]+) (^(StarArgs sname=NAME))? (^(KWArgs kname=NAME))? {
-        $args = actions.makeArgumentsType($Args, params, $sname, $kname, defaults);
-    }
-    | ^(StarArgs sname=NAME) (^(KWArgs kname=NAME))? {
-        $args = actions.makeArgumentsType($StarArgs,params, $sname, $kname, defaults);
-    }
-    | ^(KWArgs NAME) {
-        $args = actions.makeArgumentsType($KWArgs, params, null, $NAME, defaults);
-    }
-    ;
-
-defparameter[List params, List defaults]
-    : fpdef[expr_contextType.Param, null] (ASSIGN test[expr_contextType.Load])? {
-        params.add($fpdef.etype);
-        if ($ASSIGN != null) {
-            defaults.add($test.etype);
-        } else if (!defaults.isEmpty()) {
-            throw new ParseException(
-                "non-default argument follows default argument",
-                $fpdef.start);
-        }
-    }
-    ;
-
-fpdef [expr_contextType ctype, List nms] returns [exprType etype]
-    : NAME {
-        exprType e = new Name($NAME, $NAME.text, ctype);
-        actions.checkAssign(e);
-        if (nms == null) {
-            $etype = e;
-        } else {
-            nms.add(e);
-        }
-    }
-    | ^(FpList fplist) {
-        exprType[] e = (exprType[])$fplist.etypes.toArray(new exprType[$fplist.etypes.size()]);
-        Tuple t = new Tuple($fplist.start, e, expr_contextType.Store);
-        if (nms == null) {
-            $etype = t;
-        } else {
-            nms.add(t);
-        }
-    }
-    ;
-
-fplist returns [List etypes]
-@... {
-    List nms = new ArrayList();
-}
-    : fpdef[expr_contextType.Store, nms]+ {
-        $etypes = nms;
-    }
-    ;
-
-decorators returns [List etypes]
-@... {
-    List decs = new ArrayList();
-}
-    : decorator[decs]+ {
-        $etypes = decs;
-    }
-    ;
-
-decorator [List decs]
-    : ^(AT dotted_attr (^(Call (^(Args arglist))?))?) {
-        if ($Call == null) {
-            decs.add($dotted_attr.etype);
-        } else {
-            exprType c;
-            if ($Args == null) {
-                c = actions.makeCall($Call, $dotted_attr.etype);
-            } else {
-                c = actions.makeCall($Call, $dotted_attr.etype, $arglist.args, $arglist.keywords, $arglist.starargs, $arglist.kwargs);
-            }
-            c.setCharStopIndex($Call.getCharStopIndex());
-            decs.add(c);
-        }
-    }
-    ;
-
-dotted_attr returns [exprType etype, PythonTree marker]
-    : attr {
-        $etype = new Name($attr.start, $attr.text, expr_contextType.Load);
-        $marker = $attr.start;
-        debug("matched NAME in dotted_attr");}
-    | ^(DOT n1=dotted_attr n2=dotted_attr) {
-        $etype = new Attribute($n1.marker, $n1.etype, $n2.text, expr_contextType.Load);
-        $marker = $n1.marker;
-    }
-    ;
-
-//attr is here for Java  compatibility.  A Java foo.getIf() can be called from Jython as foo.if
-//     so we need to support any keyword as an attribute.
-attr
-    : NAME
-    | AND
-    | AS
-    | ASSERT
-    | BREAK
-    | CLASS
-    | CONTINUE
-    | DEF
-    | DELETE
-    | ELIF
-    | EXCEPT
-    | EXEC
-    | FINALLY
-    | FROM
-    | FOR
-    | GLOBAL
-    | IF
-    | IMPORT
-    | IN
-    | IS
-    | LAMBDA
-    | NOT
-    | OR
-    | ORELSE
-    | PASS
-    | PRINT
-    | RAISE
-    | RETURN
-    | TRY
-    | WHILE
-    | WITH
-    | YIELD
-    ;
-
-stmts returns [List stypes]
-scope {
-    List statements;
-}
-@... {
-    $stmts::statements = new ArrayList();
-}
-    : stmt+ {
-        debug("Matched stmts");
-        $stypes = $stmts::statements;
-    }
-    | INDENT stmt+ DEDENT {
-        debug("Matched stmts");
-        $stypes = $stmts::statements;
-    }
-    ;
-
-stmt //combines simple_stmt and compound_stmt from Python.g
-    : expr_stmt
-    | print_stmt
-    | del_stmt
-    | pass_stmt
-    | flow_stmt
-    | import_stmt
-    | global_stmt
-    | exec_stmt
-    | assert_stmt
-    | if_stmt
-    | while_stmt
-    | for_stmt
-    | try_stmt
-    | with_stmt
-    | funcdef
-    | classdef
-    ;
-
-expr_stmt
-    : test[expr_contextType.Load] {
-        debug("matched expr_stmt:test " + $test.etype);
-        $stmts::statements.add(new Expr($test.marker, $test.etype));
-    }
-    | ^(augassign targ=test[expr_contextType.AugStore] value=test[expr_contextType.Load]) {
-        actions.checkAssign($targ.etype);
-        AugAssign a = new AugAssign($targ.marker, $targ.etype, $augassign.op, $value.etype);
-        $stmts::statements.add(a);
-    }
-    | ^(Assign targets ^(Value value=test[expr_contextType.Load])) {
-        debug("Matched Assign");
-        exprType[] e = new exprType[$targets.etypes.size()];
-        for(int i=0;i<$targets.etypes.size();i++) {
-            e[i] = (exprType)$targets.etypes.get(i);
-        }
-        debug("exprs: " + e.length);
-        Assign a = new Assign($Assign, e, $value.etype);
-        $stmts::statements.add(a);
-    }
-    ;
-
-call_expr returns [exprType etype, PythonTree marker]
-    : ^(Call (^(Args arglist))? test[expr_contextType.Load]) {
-        exprType c;
-        if ($Args == null) {
-            c = actions.makeCall($test.marker, $test.etype);
-        } else {
-            c = actions.makeCall($test.marker, $test.etype, $arglist.args, $arglist.keywords, $arglist.starargs, $arglist.kwargs);
-        }
-        c.setCharStopIndex($Call.getCharStopIndex());
-        $etype = c;
-    }
-    ;
-
-targets returns [List etypes]
-@... {
-    List targs = new ArrayList();
-}
-    : target[targs]+ {
-        $etypes = targs;
-    }
-    ;
-
-target[List etypes]
-    : ^(Target atom[expr_contextType.Store]) {
-        actions.checkAssign($atom.etype);
-        etypes.add($atom.etype);
-    }
-    ;
-
-augassign returns [operatorType op]
-    : PLUSEQUAL {$op = operatorType.Add;}
-    | MINUSEQUAL {$op = operatorType.Sub;}
-    | STAREQUAL {$op = operatorType.Mult;}
-    | SLASHEQUAL {$op = operatorType.Div;}
-    | PERCENTEQUAL {$op = operatorType.Mod;}
-    | AMPEREQUAL {$op = operatorType.BitAnd;}
-    | VBAREQUAL {$op = operatorType.BitOr;}
-    | CIRCUMFLEXEQUAL {$op = operatorType.BitXor;}
-    | LEFTSHIFTEQUAL {$op = operatorType.LShift;}
-    | RIGHTSHIFTEQUAL {$op = operatorType.RShift;}
-    | DOUBLESTAREQUAL {$op = operatorType.Pow;}
-    | DOUBLESLASHEQUAL {$op = operatorType.FloorDiv;}
-    ;
-
-binop returns [operatorType op]
-    : PLUS {$op = operatorType.Add;}
-    | MINUS {$op = operatorType.Sub;}
-    | STAR {$op = operatorType.Mult;}
-    | SLASH {$op = operatorType.Div;}
-    | PERCENT {$op = operatorType.Mod;}
-    | AMPER {$op = operatorType.BitAnd;}
-    | VBAR {$op = operatorType.BitOr;}
-    | CIRCUMFLEX {$op = operatorType.BitXor;}
-    | LEFTSHIFT {$op = operatorType.LShift;}
-    | RIGHTSHIFT {$op = operatorType.RShift;}
-    | DOUBLESTAR {$op = operatorType.Pow;}
-    | DOUBLESLASH {$op = operatorType.FloorDiv;}
-    ;
-
-
-print_stmt
-    : ^(PRINT (^(Dest RIGHTSHIFT))? (^(Values ^(Elts elts[expr_contextType.Load])))? (Newline)?) {
-        exprType[] values;
-
-        exprType dest = null;
-        boolean hasdest = false;
-
-        boolean newline = false;
-        if ($Newline != null) {
-            newline = true;
-        }
-
-        if ($Dest != null) {
-            hasdest = true;
-        }
-        if ($Values != null) {
-            exprType[] t = (exprType[])$elts.etypes.toArray(new exprType[$elts.etypes.size()]);
-            if (hasdest) {
-                dest = t[0];
-                values = new exprType[t.length - 1];
-                System.arraycopy(t, 1, values, 0, values.length);
-            } else {
-                values = t;
-            }
-        } else {
-            values = new exprType[0];
-        }
-        Print p = new Print($PRINT, dest, values, newline);
-        $stmts::statements.add(p);
-    }
-    ;
-
-del_stmt
-    : ^(DELETE elts[expr_contextType.Del]) {
-        exprType[] t = (exprType[])$elts.etypes.toArray(new exprType[$elts.etypes.size()]);
-        actions.checkDelete(t);
-        $stmts::statements.add(new Delete($DELETE, t));
-    }
-    ;
-
-pass_stmt
-    : PASS {
-        debug("Matched Pass");
-        $stmts::statements.add(new Pass($PASS));
-    }
-    ;
-
-flow_stmt
-    : break_stmt
-    | continue_stmt
-    | return_stmt
-    | raise_stmt
-    ;
-
-break_stmt
-    : BREAK {
-        $stmts::statements.add($BREAK);
-    }
-    ;
-
-continue_stmt
-    : CONTINUE {
-        $stmts::statements.add($CONTINUE);
-    }
-    ;
-
-return_stmt
-    : ^(RETURN (^(Value test[expr_contextType.Load]))?) {
-        exprType v = null;
-        if ($Value != null) {
-            v = $test.etype;
-        }
-        $stmts::statements.add(new Return($RETURN, v));
-    }
-    ;
-
-yield_expr returns [exprType etype]
-    : ^(YIELD (^(Value test[expr_contextType.Load]))?) {
-        exprType v = null;
-        if ($Value != null) {
-            v = $test.etype; 
-        }
-        $etype = new Yield($YIELD, v);
-    }
-    ;
-
-raise_stmt
-    : ^(RAISE (^(Type type=test[expr_contextType.Load]))? (^(Inst inst=test[expr_contextType.Load]))? (^(Tback tback=test[expr_contextType.Load]))?) {
-        exprType t = null;
-        if ($Type != null) {
-            t = $type.etype;
-        }
-        exprType i = null;
-        if ($Inst != null) {
-            i = $inst.etype;
-        }
-        exprType b = null;
-        if ($Tback != null) {
-            b = $tback.etype;
-        }
-
-        $stmts::statements.add(new Raise($RAISE, t, i, b));
-    }
-    ;
-
-import_stmt
-@... {
-    List nms = new ArrayList();
-}
-    : ^(IMPORT dotted_as_name[nms]+) {
-        aliasType[] n = (aliasType[])nms.toArray(new aliasType[nms.size()]);
-        $stmts::statements.add(new Import($IMPORT, n));
-    }
-    | ^(FROM (^(Level dots))? (^(Value dotted_name))? ^(IMPORT STAR)) {
-        String name = "";
-        if ($Value != null) {
-            name = $dotted_name.result;
-        }
-        int level = 0;
-        if ($Level != null) {
-            level = $dots.level;
-        }
-        aliasType[] n = (aliasType[])nms.toArray(new aliasType[nms.size()]);
-        $stmts::statements.add(new ImportFrom($FROM, name, new aliasType[]{new aliasType($STAR, "*", null)}, level));
-    }
-    | ^(FROM (^(Level dots))? (^(Value dotted_name))? ^(IMPORT import_as_name[nms]+)) {
-        String name = "";
-        if ($Value != null) {
-            name = $dotted_name.result;
-        }
-        int level = 0;
-        if ($Level != null) {
-            level = $dots.level;
-        }
-        aliasType[] n = (aliasType[])nms.toArray(new aliasType[nms.size()]);
-        $stmts::statements.add(new ImportFrom($FROM, name, n, level));
-    }
-    ;
-
-
-//XXX: surely there is a simler way to count these dots.
-dots returns [int level]
-@... {
-    StringBuffer buf = new StringBuffer();
-}
-    : dot[buf]+ {
-        $level = buf.length();
-    }
-    ;
-
-dot[StringBuffer buf]
-    : DOT{buf.append(".");}
-    ;
-
-import_as_name[List nms]
-    : ^(Alias name=NAME (^(Asname asname=NAME))?) {
-        String as = null;
-        if ($Asname != null) {
-            as = $asname.text;
-        }
-        aliasType a = new aliasType($Alias, $name.text, as);
-        nms.add(a);
-    }
-    ;
-
-dotted_as_name [List nms]
-    : ^(Alias dotted_name (^(Asname NAME))?) {
-        String as = null;
-        if ($Asname != null) {
-            as = $NAME.text;
-        }
-        aliasType a = new aliasType($Alias, $dotted_name.result, as);
-        nms.add(a);
-    }
-    ;
-
-dotted_name returns [String result]
-@... {
-    StringBuffer buf = new StringBuffer();
-}
-    : NAME dot_name[buf]* {
-        $result = $NAME.text + buf.toString();
-        debug("matched dotted_name " + $result);
-    }
-    ;
-
-dot_name [StringBuffer buf]
-    : DOT attr {
-        buf.append(".");
-        buf.append($attr.text);
-        debug("matched dot_name " + buf);
-    }
-    ;
-
-global_stmt
-@... {
-    List nms = new ArrayList();
-}
-    : ^(GLOBAL name_expr[nms]+) {
-        String[] n = (String[])nms.toArray(new String[nms.size()]);
-        $stmts::statements.add(new Global($GLOBAL, n));
-    }
-    ;
-
-name_expr[List nms]
-    : NAME {
-        nms.add($NAME.text);
-    }
-    ;
-
-//Using NAME instead of 'exec' for Java integration
-exec_stmt
-    : ^(EXEC exec=test[expr_contextType.Load] (^(Globals globals=test[expr_contextType.Load]))? (^(Locals locals=test[expr_contextType.Load]))?) {
-        exprType g = null;
-        if ($Globals != null) {
-            g = $globals.etype;
-        }
-        exprType loc = null;
-        if ($Locals != null) {
-            loc = $locals.etype;
-        }
-        $stmts::statements.add(new Exec($EXEC, $exec.etype, g, loc));
-    }
-    ;
-
-assert_stmt
-    : ^(ASSERT ^(Test tst=test[expr_contextType.Load]) (^(Msg msg=test[expr_contextType.Load]))?) {
-        exprType m = null;
-        if ($Msg != null) {
-            m = $msg.etype;
-        }
-        $stmts::statements.add(new Assert($ASSERT, $tst.etype, m));
-    }
-    ;
-
-if_stmt
-@... {
-    List elifs = new ArrayList();
-}
-
-    : ^(IF test[expr_contextType.Load] body=stmts elif_clause[elifs]* (^(ORELSE orelse=stmts))?) {
-        stmtType[] o;
-        if ($ORELSE != null) {
-            o = (stmtType[])$orelse.stypes.toArray(new stmtType[$orelse.stypes.size()]);
-        } else {
-            o = new stmtType[0];
-        }
-        stmtType[] b = (stmtType[])$body.stypes.toArray(new stmtType[$body.stypes.size()]);
-        ListIterator iter = elifs.listIterator(elifs.size());
-        while (iter.hasPrevious()) {
-            If elif = (If)iter.previous();
-            elif.orelse = o;
-            o = new stmtType[]{elif};
-        }
-        If i = new If($IF, $test.etype, b, o);
-        $stmts::statements.add(i);
-    }
-    ;
-
-elif_clause[List elifs]
-    : ^(ELIF test[expr_contextType.Load] stmts) {
-        debug("matched elif");
-        stmtType[] b = (stmtType[])$stmts.stypes.toArray(new stmtType[$stmts.stypes.size()]);
-        //the stmtType[0] is intended to be replaced in the iterator of the if_stmt rule.
-        //there is probably a better way to do this.
-        elifs.add(new If($test.etype, $test.etype, b, new stmtType[0]));
-    }
-    ;
-
-while_stmt
-    : ^(WHILE test[expr_contextType.Load] ^(Body body=stmts) (^(ORELSE orelse=stmts))?) {
-        List o = null;
-        if ($ORELSE != null) {
-            o = $orelse.stypes;
-        }
-        stmtType w = actions.makeWhile($WHILE, $test.etype, $body.stypes, o);
-        $stmts::statements.add(w);
-    }
-    ;
-
-for_stmt
-    : ^(FOR ^(Target targ=test[expr_contextType.Store]) ^(IN iter=test[expr_contextType.Load]) ^(Body body=stmts) (^(ORELSE orelse=stmts))?) {
-        List o = null;
-        if ($ORELSE != null) {
-            o = $orelse.stypes;
-        }
-        stmtType f = actions.makeFor($FOR, $targ.etype, $iter.etype, $body.stypes, o);
-        $stmts::statements.add(f);
-    }
-    ;
-
-try_stmt
-@... {
-    List handlers = new ArrayList();
-}
-    : ^(TryExcept ^(Body body=stmts) except_clause[handlers]+ (^(ORELSE orelse=stmts))? (^(FINALLY fin=stmts))?) {
-        List o = null;
-        List f = null;
-        if ($ORELSE != null) {
-            o = $orelse.stypes;
-        }
-        if ($FINALLY != null) {
-            f = $fin.stypes;
-        }
-        stmtType te = actions.makeTryExcept($TryExcept, $body.stypes, handlers, o, f);
-        $stmts::statements.add(te);
-    }
-    | ^(TryFinally ^(Body body=stmts) ^(FINALLY fin=stmts)) {
-        TryFinally tf = actions.makeTryFinally($TryFinally, $body.stypes, $fin.stypes);
-        $stmts::statements.add(tf);
-    }
-    ;
-
-except_clause[List handlers]
-    : ^(EXCEPT (^(Type type=test[expr_contextType.Load]))? (^(Value name=test[expr_contextType.Store]))? ^(Body stmts)) {
-        stmtType[] b;
-        if ($stmts.start != null) {
-            b = (stmtType[])$stmts.stypes.toArray(new stmtType[$stmts.stypes.size()]);
-        } else b = new stmtType[0];
-        exprType t = null;
-        if ($Type != null) {
-            t = $type.etype;
-        }
-        exprType n = null;
-        if ($Value != null) {
-            n = $name.etype;
-        }
-        handlers.add(new excepthandlerType($EXCEPT, t, n, b, $EXCEPT.getLine(), $EXCEPT.getCharPositionInLine()));
-    }
-    ;
-
-with_stmt
-    : ^(WITH test[expr_contextType.Load] with_var? ^(Body stmts)) {
-        stmtType[] b = (stmtType[])$stmts.stypes.toArray(new stmtType[$stmts.stypes.size()]);
-        $stmts::statements.add(new With($WITH, $test.etype, $with_var.etype, b));
-    }
-    ;
-
-//using NAME because of Java integration for 'as'
-with_var returns [exprType etype]
-    : (AS | NAME) test[expr_contextType.Store] {
-        $etype = $test.etype;
-    }
-    ;
-
-test[expr_contextType ctype] returns [exprType etype, PythonTree marker, boolean parens]
-    : ^(AND left=test[ctype] right=test[ctype]) {
-        List values = new ArrayList();
-        boolean leftIsAnd = false;
-        boolean rightIsAnd = false;
-        BoolOp leftB = null;
-        BoolOp rightB = null;
-        if (! $left.parens && $left.start.getType() == AND) {
-            leftIsAnd = true;
-            leftB = (BoolOp)$left.etype;
-        }
-        if (! $right.parens && $right.start.getType() == AND) {
-            rightIsAnd = true;
-            rightB = (BoolOp)$right.etype;
-        }
-        exprType[] e;
-        if (leftIsAnd && rightIsAnd) {
-            debug("matched And + L + R");
-            int lenL = leftB.values.length;
-            int lenR = rightB.values.length;
-            e = new exprType[lenL + lenR];
-            System.arraycopy(leftB.values, 0, e, 0, lenL - 1);
-            System.arraycopy(rightB.values, 0, e, lenL - 1, lenL + lenR);
-        } else if (leftIsAnd) {
-            debug("matched And + L");
-            e = new exprType[leftB.values.length + 1];
-            System.arraycopy(leftB.values, 0, e, 0, leftB.values.length);
-            e[e.length - 1] = $right.etype;
-        } else if (rightIsAnd) {
-            debug("matched And + R");
-            e = new exprType[rightB.values.length + 1];
-            System.arraycopy(rightB.values, 0, e, 0, rightB.values.length);
-            e[e.length - 1] = $left.etype;
-        } else {
-            debug("matched And");
-            e = new exprType[2];
-            e[0] = $left.etype;
-            e[1] = $right.etype;
-        }
-        //XXX: could re-use BoolOps discarded above in many cases.
-        $etype = new BoolOp($left.marker, boolopType.And, e);
-        $marker = $left.marker;
-    }
-    | ^(OR left=test[ctype] right=test[ctype]) {
-        //XXX: AND and OR could be factored into one method.
-        List values = new ArrayList();
-        boolean leftIsOr = false;
-        boolean rightIsOr = false;
-        BoolOp leftB = null;
-        BoolOp rightB = null;
-        if ($left.start.getType() == OR) {
-            leftIsOr = true;
-            leftB = (BoolOp)$left.etype;
-        }
-        if ($right.start.getType() == OR) {
-            rightIsOr = true;
-            rightB = (BoolOp)$right.etype;
-        }
-        exprType[] e;
-        if (leftIsOr && rightIsOr) {
-            debug("matched Or + L + R");
-            int lenL = leftB.values.length;
-            int lenR = rightB.values.length;
-            e = new exprType[lenL + lenR];
-            System.arraycopy(leftB.values, 0, e, 0, lenL - 1);
-            System.arraycopy(rightB.values, 0, e, lenL - 1, lenL + lenR);
-        } else if (leftIsOr) {
-            debug("matched Or + L");
-            e = new exprType[leftB.values.length + 1];
-            System.arraycopy(leftB.values, 0, e, 0, leftB.values.length);
-            e[e.length - 1] = $right.etype;
-        } else if (rightIsOr) {
-            debug("matched Or + R");
-            e = new exprType[rightB.values.length + 1];
-            System.arraycopy(rightB.values, 0, e, 0, rightB.values.length);
-            e[e.length - 1] = $left.etype;
-        } else {
-            debug("matched Or");
-            e = new exprType[2];
-            e[0] = $left.etype;
-            e[1] = $right.etype;
-        }
-        //XXX: could re-use BoolOps discarded above in many cases.
-        $etype = new BoolOp($left.marker, boolopType.Or, e);
-        $marker = $left.marker;
-    }
-    | ^(comp_op left=test[ctype] targs=test[ctype]) {
-        exprType[] comparators;
-        cmpopType[] ops;
-        exprType val;
-        //XXX: does right need to be checked for Compare?
-        if (! $left.parens && $left.etype instanceof Compare) {
-            Compare c = (Compare)$left.etype;
-            comparators = new exprType[c.comparators.length + 1];
-            ops = new cmpopType[c.ops.length + 1];
-            System.arraycopy(c.ops, 0, ops, 0, c.ops.length);
-            System.arraycopy(c.comparators, 0, comparators, 0, c.comparators.length);
-            comparators[c.comparators.length] = $targs.etype;
-            ops[c.ops.length] = $comp_op.op;
-            val = c.left;
-        } else {
-            comparators = new exprType[1];
-            ops = new cmpopType[1];
-            ops[0] = $comp_op.op;
-            comparators[0] = $targs.etype;
-            val = $left.etype;
-        }
-        $etype = new Compare($left.marker, val, ops, comparators);
-        $marker = $left.marker;
-        debug("COMP_OP: " + $comp_op.start + ":::" + $etype + ":::" + $parens);
-    }
-    | atom[ctype] {
-        debug("matched atom");
-        debug("***" + $atom.etype);
-        $parens = $atom.parens;
-        $etype = $atom.etype;
-        $marker = $atom.marker;
-    }
-    | ^(binop left=test[ctype] right=test[ctype]) {
-        debug("BinOp matched");
-        //XXX: BinOp's line/col info in CPython is subtle -- sometimes left.marker is correct
-        //        as I have it here, but sometimes $binop.start is more correct.
-        $etype = new BinOp($left.marker, left.etype, $binop.op, right.etype);
-        $marker = $left.marker;
-    }
-    | call_expr {
-        $etype = $call_expr.etype;
-        $marker = $call_expr.etype;
-    }
-    | lambdef {
-        $etype = $lambdef.etype;
-        $marker = $lambdef.start;
-    }
-    | ^(IfExp ^(Test t1=test[ctype]) ^(Body t2=test[ctype]) ^(ORELSE t3=test[ctype])) {
-        $etype = new IfExp($IfExp, $t1.etype, $t2.etype, $t3.etype);
-        $marker = $IfExp;
-    }
-    | yield_expr {
-        $etype = $yield_expr.etype;
-        $marker = $yield_expr.start;
-    }
-    | NumTok {
-        $etype = (Num)$NumTok;
-        $marker = (Num)$NumTok;
-    }
-    | StrTok {
-        $etype = (Str)$StrTok;
-        $marker = (Str)$StrTok;
-    }
-     ;
-
-comp_op returns [cmpopType op]
-    : LESS {$op = cmpopType.Lt;}
-    | GREATER {$op = cmpopType.Gt;}
-    | EQUAL {$op = cmpopType.Eq;}
-    | GREATEREQUAL {$op = cmpopType.GtE;}
-    | LESSEQUAL {$op = cmpopType.LtE;}
-    | ALT_NOTEQUAL {$op = cmpopType.NotEq;}
-    | NOTEQUAL {$op = cmpopType.NotEq;}
-    | IN {$op = cmpopType.In;}
-    | NotIn {$op = cmpopType.NotIn;}
-    | IS {$op = cmpopType.Is;}
-    | IsNot {$op = cmpopType.IsNot;}
-    ;
-
-elts[expr_contextType ctype] returns [List etypes]
-scope {
-    List elements;
-}
-@... {
-    $elts::elements = new ArrayList();
-}
-
-    : elt[ctype]+ {
-        $etypes = $elts::elements;
-    }
-    ;
-
-elt[expr_contextType ctype]
-    : test[ctype] {
-        $elts::elements.add($test.etype);
-    }
-    ;
-
-atom[expr_contextType ctype] returns [exprType etype, PythonTree marker, boolean parens]
-    : ^(Tuple (^(Elts elts[ctype]))?) {
-        debug("matched Tuple");
-        exprType[] e;
-        if ($Elts != null) {
-            e = (exprType[])$elts.etypes.toArray(new exprType[$elts.etypes.size()]);
-        } else {
-            e = new exprType[0];
-        }
-        $etype = new Tuple($Tuple, e, ctype);
-        $marker = $Tuple;
-    }
-    | comprehension[ctype] {
-        $etype = $comprehension.etype;
-        $marker = $comprehension.marker;
-    }
-    | ^(Dict LCURLY (^(Elts elts[ctype]))?) {
-        exprType[] keys;
-        exprType[] values;
-        if ($Elts != null) {
-            int size = $elts.etypes.size() / 2;
-            keys = new exprType[size];
-            values = new exprType[size];
-            for(int i=0;i<size;i++) {
-                keys[i] = (exprType)$elts.etypes.get(i*2);
-                values[i] = (exprType)$elts.etypes.get(i*2+1);
-            }
-        } else {
-            keys = new exprType[0];
-            values = new exprType[0];
-        }
-        $etype = new Dict($LCURLY, keys, values);
-        $marker = $LCURLY;
- 
-    }
-    | ^(Repr BACKQUOTE test[ctype]*) {
-        $etype = new Repr($BACKQUOTE, $test.etype);
-        $marker = $BACKQUOTE;
-    }
-    | ^(NameTok NAME) {
-         debug("matched Name " + $NAME.text);
-                 $etype = new Name($NAME, $NAME.text, ctype);
-                 $marker = $NAME;
-    }
-    | ^(DOT attr test[expr_contextType.Load]) {
-        debug("matched DOT in atom: " + $test.etype + "###" + $attr.text);
-        $etype = new Attribute($test.marker, $test.etype, $attr.text, ctype);
-        $marker = $test.marker;
-    }
-    | ^(SubscriptList subscriptlist test[expr_contextType.Load]) {
-        sliceType s = null;
-        List sltypes = $subscriptlist.sltypes;
-        boolean extslice = false;
-        if ($subscriptlist.isTuple) {
-            sliceType[] st;
-            List etypes = new ArrayList();
-            for (Object o : sltypes) {
-                if (o instanceof Index) {
-                    Index i = (Index)o;
-                    etypes.add(i.value);
-                } else {
-                    extslice = true;
-                    break;
-                }
-            }
-            if (!extslice) {
-                exprType[] es = (exprType[])etypes.toArray(new exprType[etypes.size()]);
-                exprType t = new Tuple($SubscriptList, es, expr_contextType.Load);
-                s = new Index($SubscriptList, t);
-            }
-        } else if (sltypes.size() == 1) {
-            s = (sliceType)sltypes.get(0);
-        } else if (sltypes.size() != 0) {
-            extslice = true;
-        }
-        if (extslice) {
-            sliceType[] st = (sliceType[])sltypes.toArray(new sliceType[sltypes.size()]);
-            s = new ExtSlice($SubscriptList, st);
-        }
-        $etype = new Subscript($test.marker, $test.etype, s, ctype);
-        $marker = $test.marker;
-    }
-    | ^(USub tok=MINUS test[ctype]) {
-        debug("USub matched " + $test.etype);
-        $etype = actions.negate($tok, $test.etype);
-        $marker = $tok;
-    }
-    | ^(UAdd tok=PLUS test[ctype]) {
-        $etype = new UnaryOp($tok, unaryopType.UAdd, $test.etype);
-        $marker = $tok;
-    }
-    | ^(Invert tok=TILDE test[ctype]) {
-        $etype = new UnaryOp($tok, unaryopType.Invert, $test.etype);
-        $marker = $tok;
-    }
-    | ^(NOT test[ctype]) {
-        $etype = new UnaryOp($NOT, unaryopType.Not, $test.etype);
-        $marker = $NOT;
-    }
-    | ^(Parens tok=LPAREN test[ctype]) {
-        debug("PARENS! " + $test.etype);
-        $parens = true;
-        $etype = $test.etype;
-        $marker = $tok;
-    }
-    ;
-
-comprehension[expr_contextType ctype] returns [exprType etype, PythonTree marker]
-@... {
-    List gens = new ArrayList();
-}
-    : ^(Brackets LBRACK
-          ( (^(List (^(Elts elts[ctype]))?) {
-                  debug("matched List");
-                  exprType[] e;
-                  if ($Elts != null) {
-                      e = (exprType[])$elts.etypes.toArray(new exprType[$elts.etypes.size()]);
-                  } else {
-                      e = new exprType[0];
-                  }
-                  $etype = new org.python.antlr.ast.List($LBRACK, e, ctype);
-                  $marker = $LBRACK;
-               })
-          | (^(ListComp test[ctype] list_for[gens]) {
-                debug("matched ListComp");
-                Collections.reverse(gens);
-                comprehensionType[] c = (comprehensionType[])gens.toArray(new comprehensionType[gens.size()]);
-                $etype = new ListComp($test.marker, $test.etype, c);
-                $marker = $LBRACK;
-               }
-            )
-          )
-       )
-    | ^(GeneratorExp test[ctype] gen_for[gens]) {
-        debug("matched GeneratorExp");
-        Collections.reverse(gens);
-        comprehensionType[] c = (comprehensionType[])gens.toArray(new comprehensionType[gens.size()]);
-        $etype = new GeneratorExp($test.marker, $test.etype, c);
-        $marker = $GeneratorExp;
-    }
-    ;
-
-lambdef returns [exprType etype]
-    : ^(LAMBDA varargslist? ^(Body test[expr_contextType.Load])) {
-        argumentsType a = $varargslist.args;
-        if (a == null) {
-            a = new argumentsType($LAMBDA, new exprType[0], null, null, new exprType[0]);
-        }
-        $etype = new Lambda($LAMBDA, a, $test.etype);
-    }
-    ;
-
-subscriptlist returns [List sltypes, boolean isTuple]
-@... {
-    List subs = new ArrayList();
-}
-    : subscript[subs] {
-        $sltypes = subs;
-        $isTuple = false;
-    }
-    | ^(Tuple ^(Elts subscript[subs]+)) {
-        $sltypes = subs;
-        $isTuple = true;
-    }
-    ;
-
-subscript [List subs]
-    : Ellipsis {
-        subs.add(new Ellipsis($Ellipsis));
-    }
-    | ^(Index test[expr_contextType.Load]) {
-        subs.add(new Index($Index, $test.etype));
-    }
-    | ^(Subscript (^(Lower start=test[expr_contextType.Load]))?
-          (^(Upper COLON (^(UpperOp end=test[expr_contextType.Load]))?))? (^(Step COLON (^(StepOp op=test[expr_contextType.Load]))?))?) {
-              boolean isSlice = false;
-              exprType s = null;
-              exprType e = null;
-              exprType o = null;
-              if ($Lower != null) {
-                  s = $start.etype;
-              }
-              if ($Upper != null) {
-                  isSlice = true;
-                  if ($UpperOp != null) {
-                      e = $end.etype;
-                  }
-              }
-              if ($Step != null) {
-                  isSlice = true;
-                  if ($StepOp != null) {
-                      o = $op.etype;
-                  } else {
-                      o = new Name($Step, "None", expr_contextType.Load);
-                  }
-              }
-
-              if (isSlice) {
-                 subs.add(new Slice($Subscript, s, e, o));
-              }
-              else {
-                 subs.add(new Index($Subscript, s));
-              }
-          }
-          ;
-
-classdef
-    : ^(CLASS classname=NAME (^(Bases bases))? ^(Body stmts)) {
-        List b;
-        if ($Bases != null) {
-            b = $bases.names;
-        } else {
-            b = new ArrayList();
-        }
-        $stmts::statements.add(actions.makeClassDef($CLASS, $classname, b, $stmts.stypes));
-    }
-    ;
-
-bases returns [List names]
-@... {
-    List nms = new ArrayList();
-}
-    : base[nms] {
-        //The instanceof and tuple unpack here is gross.  I *should* be able to detect
-        //"Tuple or Tuple DOWN or some such in a syntactic predicate in the "base" rule
-        //instead, but I haven't been able to get it to work.
-        if (nms.get(0) instanceof Tuple) {
-            debug("TUPLE");
-            Tuple t = (Tuple)nms.get(0);
-            $names = Arrays.asList(t.elts);
-        } else {
-            debug("NOT TUPLE");
-            $names = nms;
-        }
-    }
-    ;
-
-//FIXME: right now test matches a Tuple from Python.g output -- I'd rather
-//       unpack the tuple here instead of in bases, otherwise this rule
-//       should just get absorbed back into bases, since it is never matched
-//       more than once as it is now.
-base[List names]
-    : test[expr_contextType.Load] {
-        names.add($test.etype);
-    }
-    ;
-
-arglist returns [List args, List keywords, exprType starargs, exprType kwargs]
-@... {
-    List arguments = new ArrayList();
-    List kws = new ArrayList();
-}
-    : ^(Args argument[arguments]* keyword[kws]*) (^(StarArgs stest=test[expr_contextType.Load]))? (^(KWArgs ktest=test[expr_contextType.Load]))? {
-        $args=arguments;
-        $keywords=kws;
-        if ($StarArgs != null) {
-            $starargs=$stest.etype;
-        }
-        if ($KWArgs != null) {
-            $kwargs=$ktest.etype;
-        }
-    }
-    | ^(StarArgs stest=test[expr_contextType.Load]) (^(KWArgs ktest=test[expr_contextType.Load]))? {
-        $args=arguments;
-        $keywords=kws;
-        $starargs=$stest.etype;
-        if ($KWArgs != null) {
-            $kwargs=$ktest.etype;
-        }
-    }
-    | ^(KWArgs test[expr_contextType.Load]) {
-        $args=arguments;
-        $keywords=kws;
-        $kwargs=$test.etype;
-    }
-    ;
-
-argument[List arguments]
-@... {
-    List gens = new ArrayList();
-}
-    : ^(Arg test[expr_contextType.Load]) {
-        arguments.add($test.etype);
-    }
-    | ^(GenFor test[expr_contextType.Load] gen_for[gens]) {
-        Collections.reverse(gens);
-        comprehensionType[] c = (comprehensionType[])gens.toArray(new comprehensionType[gens.size()]);
-        arguments.add(new GeneratorExp($GenFor, $test.etype, c));
-    }
-    ;
-
-keyword[List kws]
-    : ^(Keyword ^(Arg arg=test[expr_contextType.Load]) ^(Value val=test[expr_contextType.Load])) {
-        actions.checkAssign($arg.etype);
-        kws.add(new keywordType($Keyword, $arg.text, $val.etype));
-    }
-    ;
-
-list_iter [List gens] returns [exprType etype]
-    : list_for[gens]
-    | list_if[gens] {
-        $etype = $list_if.etype;
-    }
-    ;
-
-list_for [List gens]
-    :
-    ^(ListFor ^(Target targ=test[expr_contextType.Store]) ^(IN iter=test[expr_contextType.Load]) (^(Ifs list_iter[gens]))?) {
-        debug("matched list_for");
-        exprType[] e;
-        if ($Ifs != null && $list_iter.etype != null) {
-            e = new exprType[]{$list_iter.etype};
-        } else {
-            e = new exprType[0];
-        }
-        gens.add(new comprehensionType($ListFor, $targ.etype, $iter.etype, e));
-    }
-    ;
-
-list_if[List gens] returns [exprType etype]
-    : ^(ListIf ^(Target test[expr_contextType.Load]) (Ifs list_iter[gens])?) {
-        $etype = $test.etype;
-    }
-    ;
-
-gen_iter [List gens] returns [exprType etype]
-    : gen_for[gens]
-    | gen_if[gens] {
-        $etype = $gen_if.etype;
-    }
-    ;
-
-gen_for [List gens]
-    : ^(GenFor ^(Target targ=test[expr_contextType.Store]+) ^(IN iter=test[expr_contextType.Load]) (^(Ifs gen_iter[gens]))?) {
-        debug("matched gen_for");
-        exprType[] e;
-        if ($Ifs != null && $gen_iter.etype != null) {
-            e = new exprType[]{$gen_iter.etype};
-        } else {
-            e = new exprType[0];
-        }
-        gens.add(new comprehensionType($GenFor, $targ.etype, $iter.etype, e));
-    }
-    ;
-
-gen_if[List gens] returns [exprType etype]
-    : ^(GenIf ^(Target test[expr_contextType.Load]) (^(Ifs gen_iter[gens]))?) {
-        $etype = $test.etype;
-    }
-    ;
-

Modified: trunk/jython/src/org/python/antlr/ExpressionParser.java
===================================================================
--- trunk/jython/src/org/python/antlr/ExpressionParser.java	2008-08-29 12:14:12 UTC (rev 5263)
+++ trunk/jython/src/org/python/antlr/ExpressionParser.java	2008-08-29 13:47:16 UTC (rev 5264)
@@ -34,11 +34,12 @@
 
         try {
             PythonParser.eval_input_return r = parser.eval_input();
-            CommonTreeNodeStream nodes = new CommonTreeNodeStream((Tree)r.tree);
-            nodes.setTokenStream(tokens);
-            PythonWalker walker = new PythonWalker(nodes);
-            walker.setErrorHandler(errorHandler);
-            tree = walker.expression();
+            tree = (modType)r.tree;
+            //CommonTreeNodeStream nodes = new CommonTreeNodeStream((Tree)r.tree);
+            //nodes.setTokenStream(tokens);
+            //PythonWalker walker = new PythonWalker(nodes);
+            //walker.setErrorHandler(errorHandler);
+            //tree = (modType)walker.expression();
         } catch (RecognitionException e) {
             //XXX: this can't happen.  Need to strip the throws from antlr
             //     generated code.

Modified: trunk/jython/src/org/python/antlr/GrammarActions.java
===================================================================
--- trunk/jython/src/org/python/antlr/GrammarActions.java	2008-08-29 12:14:12 UTC (rev 5263)
+++ trunk/jython/src/org/python/antlr/GrammarActions.java	2008-08-29 13:47:16 UTC (rev 5264)
@@ -2,6 +2,7 @@
 
 import org.antlr.runtime.CommonToken;
 import org.antlr.runtime.Token;
+import org.antlr.runtime.tree.Tree;
 
 import org.python.core.Py;
 import org.python.core.PyComplex;
@@ -16,6 +17,7 @@
 import org.python.antlr.ast.argumentsType;
 import org.python.antlr.ast.boolopType;
 import org.python.antlr.ast.comprehensionType;
+import org.python.antlr.ast.Context;
 import org.python.antlr.ast.cmpopType;
 import org.python.antlr.ast.excepthandlerType;
 import org.python.antlr.ast.exprType;
@@ -96,6 +98,55 @@
         this.errorHandler = eh;
     }
 
+    String makeFromText(List dots, String name) {
+        StringBuffer d = new StringBuffer();
+        if (dots != null) {
+            for (int i=0;i<dots.size();i++) {
+                d.append(".");
+            }
+        }
+        if (name != null) {
+            d.append(name);
+        }
+        return d.toString();
+    }
+
+    int makeLevel(List lev) {
+        if (lev == null) {
+            return 0;
+        }
+        return lev.size();
+    }
+
+    aliasType[] makeStarAlias(Token t) {
+        return new aliasType[]{new aliasType(t, "*", null)};
+    }
+
+    aliasType[] makeAliases(aliasType[] atypes) {
+        if (atypes == null) {
+            return new aliasType[0];
+        }
+        return atypes;
+    }
+
+    exprType[] makeBases(exprType etype) {
+        if (etype != null) {
+            if (etype instanceof Tuple) {
+                return ((Tuple)etype).elts;
+            }
+            return new exprType[]{etype};
+        }
+        return new exprType[0];
+    }
+
+    String[] makeNames(List names) {
+        List<String> s = new ArrayList<String>();
+        for(int i=0;i<names.size();i++) {
+            s.add(((Token)names.get(i)).getText());
+        }
+        return s.toArray(new String[s.size()]);
+    }
+
     void errorGenExpNotSoleArg(PythonTree t) {
         errorHandler.error("Generator expression must be parenthesized if not sole argument", t);
     }

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5266
          http://jython.svn.sourceforge.net/jython/?rev=5266&view=rev
Author:   nriley
Date:     2008-08-29 19:53:04 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
Close file immediately after comparing it.  Fixes test_filecmp on Windows.

Modified Paths:
--------------
    trunk/jython/CPythonLib.includes
    trunk/jython/Lib/filecmp.py

Modified: trunk/jython/CPythonLib.includes
===================================================================
--- trunk/jython/CPythonLib.includes	2008-08-29 19:51:57 UTC (rev 5265)
+++ trunk/jython/CPythonLib.includes	2008-08-29 19:53:04 UTC (rev 5266)
@@ -52,7 +52,6 @@
 dospath.py
 dumbdbm.py
 exceptions.py
-filecmp.py
 fileinput.py
 fnmatch.py
 formatter.py

Modified: trunk/jython/Lib/filecmp.py
===================================================================
--- trunk/jython/Lib/filecmp.py	2008-08-29 19:51:57 UTC (rev 5265)
+++ trunk/jython/Lib/filecmp.py	2008-08-29 19:53:04 UTC (rev 5266)
@@ -65,13 +65,17 @@
     bufsize = BUFSIZE
     fp1 = open(f1, 'rb')
     fp2 = open(f2, 'rb')
-    while True:
-        b1 = fp1.read(bufsize)
-        b2 = fp2.read(bufsize)
-        if b1 != b2:
-            return False
-        if not b1:
-            return True
+    try:
+        while True:
+            b1 = fp1.read(bufsize)
+            b2 = fp2.read(bufsize)
+            if b1 != b2:
+                return False
+            if not b1:
+                return True
+    finally:
+        fp1.close()
+        fp2.close()
 
 # Directory comparison class.
 #


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5274
          http://jython.svn.sourceforge.net/jython/?rev=5274&view=rev
Author:   zyasoft
Date:     2008-08-30 18:39:59 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
Exposed unicode_toString, str_toString so that Jython code can
directly access the underlying java.lang.String backing our unicode
and str types. This enables writing code like this:

   return Normalizer.normalize(unistr.toString(), normalizer_form)

without Jython automatically encoding the string on our behalf. That's
often what we want for CPython compatibility, but not when we are
calling methods like this. (Too bad we need to know.)

Added unicodedata.py and supporting data files UnicodeData.txt and
EastAsianWidth.txt, both from 4.10. (We may wish to update to be more
compliant with Java than Python 2.5.) Because the time it takes to
import, serious refactoring should be considered, including possibly
doing a codegen to Java approach. Currently does not pass MD5 hash
tests in test_unicodedata, which by their nature are highly sensitive.

Added collections.namedtuple. First 2.6 feature. (We should have a few
in Jython 2.5.)  This was originally added to support Python version of
unicodedata.py, but is now just included.

Modified Paths:
--------------
    trunk/jython/CoreExposed.includes
    trunk/jython/Lib/test/regrtest.py
    trunk/jython/src/org/python/core/PyString.java
    trunk/jython/src/org/python/core/PyUnicode.java
    trunk/jython/src/org/python/modules/Setup.java

Added Paths:
-----------
    trunk/jython/Lib/EastAsianWidth.txt
    trunk/jython/Lib/UnicodeData.txt
    trunk/jython/Lib/collections/
    trunk/jython/Lib/collections/__init__.py
    trunk/jython/Lib/unicodedata.py
    trunk/jython/src/org/python/modules/_collections/
    trunk/jython/src/org/python/modules/_collections/Collections.java
    trunk/jython/src/org/python/modules/_collections/PyDefaultDict.java
    trunk/jython/src/org/python/modules/_collections/PyDefaultDictDerived.java
    trunk/jython/src/org/python/modules/_collections/PyDeque.java
    trunk/jython/src/org/python/modules/_collections/PyDequeDerived.java

Removed Paths:
-------------
    trunk/jython/src/org/python/modules/_collections/Collections.java
    trunk/jython/src/org/python/modules/_collections/PyDefaultDict.java
    trunk/jython/src/org/python/modules/_collections/PyDefaultDictDerived.java
    trunk/jython/src/org/python/modules/_collections/PyDeque.java
    trunk/jython/src/org/python/modules/_collections/PyDequeDerived.java
    trunk/jython/src/org/python/modules/collections/

Modified: trunk/jython/CoreExposed.includes
===================================================================
--- trunk/jython/CoreExposed.includes	2008-08-29 23:45:59 UTC (rev 5273)
+++ trunk/jython/CoreExposed.includes	2008-08-30 18:39:59 UTC (rev 5274)
@@ -44,8 +44,8 @@
 org/python/modules/_weakref/ReferenceType.class
 org/python/modules/_weakref/ProxyType.class
 org/python/modules/_hashlib$Hash.class
-org/python/modules/collections/PyDefaultDict.class
-org/python/modules/collections/PyDeque.class
+org/python/modules/_collections/PyDefaultDict.class
+org/python/modules/_collections/PyDeque.class
 org/python/modules/operator$PyAttrGetter.class
 org/python/modules/operator$PyItemGetter.class
 org/python/modules/random/PyRandom.class

Added: trunk/jython/Lib/EastAsianWidth.txt
===================================================================
--- trunk/jython/Lib/EastAsianWidth.txt	                        (rev 0)
+++ trunk/jython/Lib/EastAsianWidth.txt	2008-08-30 18:39:59 UTC (rev 5274)
@@ -0,0 +1,16368 @@
+# EastAsianWidth-4.1.0.txt
+# Date: 2005-03-17, 15:21:00 PST [KW]
+#
+# East Asian Width Properties
+#
+# This file is an informative contributory data file in the
+# Unicode Character Database.
+#
+# Copyright (c) 1991-2005 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
+# The format is two fields separated by a semicolon.
+# Field 0: Unicode value
+# Field 1: East Asian Width property, consisting of one of the following values:
+#         "N", "A", "H", "W", "F", "Na"
+#  - All code points, assigned or unassigned, that are not listed 
+#         explicitly are given the value "N".
+#  - Characters ranges are specified as for other property files in
+#         the Unicode Character Database.
+#
+# The Unicode name of each character is provided in a comment for help
+# in identifying the characters.
+#
+# See UAX #11: East Asian Character Width, for more information.
+0000;N # <control>
+0001;N # <control>
+0002;N # <control>
+0003;N # <control>
+0004;N # <control>
+0005;N # <control>
+0006;N # <control>
+0007;N # <control>
+0008;N # <control>
+0009;N # <control>
+000A;N # <control>
+000B;N # <control>
+000C;N # <control>
+000D;N # <control>
+000E;N # <control>
+000F;N # <control>
+0010;N # <control>
+0011;N # <control>
+0012;N # <control>
+0013;N # <control>
+0014;N # <control>
+0015;N # <control>
+0016;N # <control>
+0017;N # <control>
+0018;N # <control>
+0019;N # <control>
+001A;N # <control>
+001B;N # <control>
+001C;N # <control>
+001D;N # <control>
+001E;N # <control>
+001F;N # <control>
+0020;Na # SPACE
+0021;Na # EXCLAMATION MARK
+0022;Na # QUOTATION MARK
+0023;Na # NUMBER SIGN
+0024;Na # DOLLAR SIGN
+0025;Na # PERCENT SIGN
+0026;Na # AMPERSAND
+0027;Na # APOSTROPHE
+0028;Na # LEFT PARENTHESIS
+0029;Na # RIGHT PARENTHESIS
+002A;Na # ASTERISK
+002B;Na # PLUS SIGN
+002C;Na # COMMA
+002D;Na # HYPHEN-MINUS
+002E;Na # FULL STOP
+002F;Na # SOLIDUS
+0030;Na # DIGIT ZERO
+0031;Na # DIGIT ONE
+0032;Na # DIGIT TWO
+0033;Na # DIGIT THREE
+0034;Na # DIGIT FOUR
+0035;Na # DIGIT FIVE
+0036;Na # DIGIT SIX
+0037;Na # DIGIT SEVEN
+0038;Na # DIGIT EIGHT
+0039;Na # DIGIT NINE
+003A;Na # COLON
+003B;Na # SEMICOLON
+003C;Na # LESS-THAN SIGN
+003D;Na # EQUALS SIGN
+003E;Na # GREATER-THAN SIGN
+003F;Na # QUESTION MARK
+0040;Na # COMMERCIAL AT
+0041;Na # LATIN CAPITAL LETTER A
+0042;Na # LATIN CAPITAL LETTER B
+0043;Na # LATIN CAPITAL LETTER C
+0044;Na # LATIN CAPITAL LETTER D
+0045;Na # LATIN CAPITAL LETTER E
+0046;Na # LATIN CAPITAL LETTER F
+0047;Na # LATIN CAPITAL LETTER G
+0048;Na # LATIN CAPITAL LETTER H
+0049;Na # LATIN CAPITAL LETTER I
+004A;Na # LATIN CAPITAL LETTER J
+004B;Na # LATIN CAPITAL LETTER K
+004C;Na # LATIN CAPITAL LETTER L
+004D;Na # LATIN CAPITAL LETTER M
+004E;Na # LATIN CAPITAL LETTER N
+004F;Na # LATIN CAPITAL LETTER O
+0050;Na # LATIN CAPITAL LETTER P
+0051;Na # LATIN CAPITAL LETTER Q
+0052;Na # LATIN CAPITAL LETTER R
+0053;Na # LATIN CAPITAL LETTER S
+0054;Na # LATIN CAPITAL LETTER T
+0055;Na # LATIN CAPITAL LETTER U
+0056;Na # LATIN CAPITAL LETTER V
+0057;Na # LATIN CAPITAL LETTER W
+0058;Na # LATIN CAPITAL LETTER X
+0059;Na # LATIN CAPITAL LETTER Y
+005A;Na # LATIN CAPITAL LETTER Z
+005B;Na # LEFT SQUARE BRACKET
+005C;Na # REVERSE SOLIDUS
+005D;Na # RIGHT SQUARE BRACKET
+005E;Na # CIRCUMFLEX ACCENT
+005F;Na # LOW LINE
+0060;Na # GRAVE ACCENT
+0061;Na # LATIN SMALL LETTER A
+0062;Na # LATIN SMALL LETTER B
+0063;Na # LATIN SMALL LETTER C
+0064;Na # LATIN SMALL LETTER D
+0065;Na # LATIN SMALL LETTER E
+0066;Na # LATIN SMALL LETTER F
+0067;Na # LATIN SMALL LETTER G
+0068;Na # LATIN SMALL LETTER H
+0069;Na # LATIN SMALL LETTER I
+006A;Na # LATIN SMALL LETTER J
+006B;Na # LATIN SMALL LETTER K
+006C;Na # LATIN SMALL LETTER L
+006D;Na # LATIN SMALL LETTER M
+006E;Na # LATIN SMALL LETTER N
+006F;Na # LATIN SMALL LETTER O
+0070;Na # LATIN SMALL LETTER P
+0071;Na # LATIN SMALL LETTER Q
+0072;Na # LATIN SMALL LETTER R
+0073;Na # LATIN SMALL LETTER S
+0074;Na # LATIN SMALL LETTER T
+0075;Na # LATIN SMALL LETTER U
+0076;Na # LATIN SMALL LETTER V
+0077;Na # LATIN SMALL LETTER W
+0078;Na # LATIN SMALL LETTER X
+0079;Na # LATIN SMALL LETTER Y
+007A;Na # LATIN SMALL LETTER Z
+007B;Na # LEFT CURLY BRACKET
+007C;Na # VERTICAL LINE
+007D;Na # RIGHT CURLY BRACKET
+007E;Na # TILDE
+007F;N # <control>
+0080;N # <control>
+0081;N # <control>
+0082;N # <control>
+0083;N # <control>
+0084;N # <control>
+0085;N # <control>
+0086;N # <control>
+0087;N # <control>
+0088;N # <control>
+0089;N # <control>
+008A;N # <control>
+008B;N # <control>
+008C;N # <control>
+008D;N # <control>
+008E;N # <control>
+008F;N # <control>
+0090;N # <control>
+0091;N # <control>
+0092;N # <control>
+0093;N # <control>
+0094;N # <control>
+0095;N # <control>
+0096;N # <control>
+0097;N # <control>
+0098;N # <control>
+0099;N # <control>
+009A;N # <control>
+009B;N # <control>
+009C;N # <control>
+009D;N # <control>
+009E;N # <control>
+009F;N # <control>
+00A0;N # NO-BREAK SPACE
+00A1;A # INVERTED EXCLAMATION MARK
+00A2;Na # CENT SIGN
+00A3;Na # POUND SIGN
+00A4;A # CURRENCY SIGN
+00A5;Na # YEN SIGN
+00A6;Na # BROKEN BAR
+00A7;A # SECTION SIGN
+00A8;A # DIAERESIS
+00A9;N # COPYRIGHT SIGN
+00AA;A # FEMININE ORDINAL INDICATOR
+00AB;N # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+00AC;Na # NOT SIGN
+00AD;A # SOFT HYPHEN
+00AE;A # REGISTERED SIGN
+00AF;Na # MACRON
+00B0;A # DEGREE SIGN
+00B1;A # PLUS-MINUS SIGN
+00B2;A # SUPERSCRIPT TWO
+00B3;A # SUPERSCRIPT THREE
+00B4;A # ACUTE ACCENT
+00B5;N # MICRO SIGN
+00B6;A # PILCROW SIGN
+00B7;A # MIDDLE DOT
+00B8;A # CEDILLA
+00B9;A # SUPERSCRIPT ONE
+00BA;A # MASCULINE ORDINAL INDICATOR
+00BB;N # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+00BC;A # VULGAR FRACTION ONE QUARTER
+00BD;A # VULGAR FRACTION ONE HALF
+00BE;A # VULGAR FRACTION THREE QUARTERS
+00BF;A # INVERTED QUESTION MARK
+00C0;N # LATIN CAPITAL LETTER A WITH GRAVE
+00C1;N # LATIN CAPITAL LETTER A WITH ACUTE
+00C2;N # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+00C3;N # LATIN CAPITAL LETTER A WITH TILDE
+00C4;N # LATIN CAPITAL LETTER A WITH DIAERESIS
+00C5;N # LATIN CAPITAL LETTER A WITH RING ABOVE
+00C6;A # LATIN CAPITAL LETTER AE
+00C7;N # LATIN CAPITAL LETTER C WITH CEDILLA
+00C8;N # LATIN CAPITAL LETTER E WITH GRAVE
+00C9;N # LATIN CAPITAL LETTER E WITH ACUTE
+00CA;N # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+00CB;N # LATIN CAPITAL LETTER E WITH DIAERESIS
+00CC;N # LATIN CAPITAL LETTER I WITH GRAVE
+00CD;N # LATIN CAPITAL LETTER I WITH ACUTE
+00CE;N # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+00CF;N # LATIN CAPITAL LETTER I WITH DIAERESIS
+00D0;A # LATIN CAPITAL LETTER ETH
+00D1;N # LATIN CAPITAL LETTER N WITH TILDE
+00D2;N # LATIN CAPITAL LETTER O WITH GRAVE
+00D3;N # LATIN CAPITAL LETTER O WITH ACUTE
+00D4;N # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+00D5;N # LATIN CAPITAL LETTER O WITH TILDE
+00D6;N # LATIN CAPITAL LETTER O WITH DIAERESIS
+00D7;A # MULTIPLICATION SIGN
+00D8;A # LATIN CAPITAL LETTER O WITH STROKE
+00D9;N # LATIN CAPITAL LETTER U WITH GRAVE
+00DA;N # LATIN CAPITAL LETTER U WITH ACUTE
+00DB;N # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+00DC;N # LATIN CAPITAL LETTER U WITH DIAERESIS
+00DD;N # LATIN CAPITAL LETTER Y WITH ACUTE
+00DE;A # LATIN CAPITAL LETTER THORN
+00DF;A # LATIN SMALL LETTER SHARP S
+00E0;A # LATIN SMALL LETTER A WITH GRAVE
+00E1;A # LATIN SMALL LETTER A WITH ACUTE
+00E2;N # LATIN SMALL LETTER A WITH CIRCUMFLEX
+00E3;N # LATIN SMALL LETTER A WITH TILDE
+00E4;N # LATIN SMALL LETTER A WITH DIAERESIS
+00E5;N # LATIN SMALL LETTER A WITH RING ABOVE
+00E6;A # LATIN SMALL LETTER AE
+00E7;N # LATIN SMALL LETTER C WITH CEDILLA
+00E8;A # LATIN SMALL LETTER E WITH GRAVE
+00E9;A # LATIN SMALL LETTER E WITH ACUTE
+00EA;A # LATIN SMALL LETTER E WITH CIRCUMFLEX
+00EB;N # LATIN SMALL LETTER E WITH DIAERESIS
+00EC;A # LATIN SMALL LETTER I WITH GRAVE
+00ED;A # LATIN SMALL LETTER I WITH ACUTE
+00EE;N # LATIN SMALL LETTER I WITH CIRCUMFLEX
+00EF;N # LATIN SMALL LETTER I WITH DIAERESIS
+00F0;A # LATIN SMALL LETTER ETH
+00F1;N # LATIN SMALL LETTER N WITH TILDE
+00F2;A # LATIN SMALL LETTER O WITH GRAVE
+00F3;A # LATIN SMALL LETTER O WITH ACUTE
+00F4;N # LATIN SMALL LETTER O WITH CIRCUMFLEX
+00F5;N # LATIN SMALL LETTER O WITH TILDE
+00F6;N # LATIN SMALL LETTER O WITH DIAERESIS
+00F7;A # DIVISION SIGN
+00F8;A # LATIN SMALL LETTER O WITH STROKE
+00F9;A # LATIN SMALL LETTER U WITH GRAVE
+00FA;A # LATIN SMALL LETTER U WITH ACUTE
+00FB;N # LATIN SMALL LETTER U WITH CIRCUMFLEX
+00FC;A # LATIN SMALL LETTER U WITH DIAERESIS
+00FD;N # LATIN SMALL LETTER Y WITH ACUTE
+00FE;A # LATIN SMALL LETTER THORN
+00FF;N # LATIN SMALL LETTER Y WITH DIAERESIS
+0100;N # LATIN CAPITAL LETTER A WITH MACRON
+0101;A # LATIN SMALL LETTER A WITH MACRON
+0102;N # LATIN CAPITAL LETTER A WITH BREVE
+0103;N # LATIN SMALL LETTER A WITH BREVE
+0104;N # LATIN CAPITAL LETTER A WITH OGONEK
+0105;N # LATIN SMALL LETTER A WITH OGONEK
+0106;N # LATIN CAPITAL LETTER C WITH ACUTE
+0107;N # LATIN SMALL LETTER C WITH ACUTE
+0108;N # LATIN CAPITAL LETTER C WITH CIRCUMFLEX
+0109;N # LATIN SMALL LETTER C WITH CIRCUMFLEX
+010A;N # LATIN CAPITAL LETTER C WITH DOT ABOVE
+010B;N # LATIN SMALL LETTER C WITH DOT ABOVE
+010C;N # LATIN CAPITAL LETTER C WITH CARON
+010D;N # LATIN SMALL LETTER C WITH CARON
+010E;N # LATIN CAPITAL LETTER D WITH CARON
+010F;N # LATIN SMALL LETTER D WITH CARON
+0110;N # LATIN CAPITAL LETTER D WITH STROKE
+0111;A # LATIN SMALL LETTER D WITH STROKE
+0112;N # LATIN CAPITAL LETTER E WITH MACRON
+0113;A # LATIN SMALL LETTER E WITH MACRON
+0114;N # LATIN CAPITAL LETTER E WITH BREVE
+0115;N # LATIN SMALL LETTER E WITH BREVE
+0116;N # LATIN CAPITAL LETTER E WITH DOT ABOVE
+0117;N # LATIN SMALL LETTER E WITH DOT ABOVE
+0118;N # LATIN CAPITAL LETTER E WITH OGONEK
+0119;N # LATIN SMALL LETTER E WITH OGONEK
+011A;N # LATIN CAPITAL LETTER E WITH CARON
+011B;A # LATIN SMALL LETTER E WITH CARON
+011C;N # LATIN CAPITAL LETTER G WITH CIRCUMFLEX
+011D;N # LATIN SMALL LETTER G WITH CIRCUMFLEX
+011E;N # LATIN CAPITAL LETTER G WITH BREVE
+011F;N # LATIN SMALL LETTER G WITH BREVE
+0120;N # LATIN CAPITAL LETTER G WITH DOT ABOVE
+0121;N # LATIN SMALL LETTER G WITH DOT ABOVE
+0122;N # LATIN CAPITAL LETTER G WITH CEDILLA
+0123;N # LATIN SMALL LETTER G WITH CEDILLA
+0124;N # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
+0125;N # LATIN SMALL LETTER H WITH CIRCUMFLEX
+0126;A # LATIN CAPITAL LETTER H WITH STROKE
+0127;A # LATIN SMALL LETTER H WITH STROKE
+0128;N # LATIN CAPITAL LETTER I WITH TILDE
+0129;N # LATIN SMALL LETTER I WITH TILDE
+012A;N # LATIN CAPITAL LETTER I WITH MACRON
+012B;A # LATIN SMALL LETTER I WITH MACRON
+012C;N # LATIN CAPITAL LETTER I WITH BREVE
+012D;N # LATIN SMALL LETTER I WITH BREVE
+012E;N # LATIN CAPITAL LETTER I WITH OGONEK
+012F;N # LATIN SMALL LETTER I WITH OGONEK
+0130;N # LATIN CAPITAL LETTER I WITH DOT ABOVE
+0131;A # LATIN SMALL LETTER DOTLESS I
+0132;A # LATIN CAPITAL LIGATURE IJ
+0133;A # LATIN SMALL LIGATURE IJ
+0134;N # LATIN CAPITAL LETTER J WITH CIRCUMFLEX
+0135;N # LATIN SMALL LETTER J WITH CIRCUMFLEX
+0136;N # LATIN CAPITAL LETTER K WITH CEDILLA
+0137;N # LATIN SMALL LETTER K WITH CEDILLA
+0138;A # LATIN SMALL LETTER KRA
+0139;N # LATIN CAPITAL LETTER L WITH ACUTE
+013A;N # LATIN SMALL LETTER L WITH ACUTE
+013B;N # LATIN CAPITAL LETTER L WITH CEDILLA
+013C;N # LATIN SMALL LETTER L WITH CEDILLA
+013D;N # LATIN CAPITAL LETTER L WITH CARON
+013E;N # LATIN SMALL LETTER L WITH CARON
+013F;A # LATIN CAPITAL LETTER L WITH MIDDLE DOT
+0140;A # LATIN SMALL LETTER L WITH MIDDLE DOT
+0141;A # LATIN CAPITAL LETTER L WITH STROKE
+0142;A # LATIN SMALL LETTER L WITH STROKE
+0143;N # LATIN CAPITAL LETTER N WITH ACUTE
+0144;A # LATIN SMALL LETTER N WITH ACUTE
+0145;N # LATIN CAPITAL LETTER N WITH CEDILLA
+0146;N # LATIN SMALL LETTER N WITH CEDILLA
+0147;N # LATIN CAPITAL LETTER N WITH CARON
+0148;A # LATIN SMALL LETTER N WITH CARON
+0149;A # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
+014A;A # LATIN CAPITAL LETTER ENG
+014B;A # LATIN SMALL LETTER ENG
+014C;N # LATIN CAPITAL LETTER O WITH MACRON
+014D;A # LATIN SMALL LETTER O WITH MACRON
+014E;N # LATIN CAPITAL LETTER O WITH BREVE
+014F;N # LATIN SMALL LETTER O WITH BREVE
+0150;N # LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+0151;N # LATIN SMALL LETTER O WITH DOUBLE ACUTE
+0152;A # LATIN CAPITAL LIGATURE OE
+0153;A # LATIN SMALL LIGATURE OE
+0154;N # LATIN CAPITAL LETTER R WITH ACUTE
+0155;N # LATIN SMALL LETTER R WITH ACUTE
+0156;N # LATIN CAPITAL LETTER R WITH CEDILLA
+0157;N # LATIN SMALL LETTER R WITH CEDILLA
+0158;N # LATIN CAPITAL LETTER R WITH CARON
+0159;N # LATIN SMALL LETTER R WITH CARON
+015A;N # LATIN CAPITAL LETTER S WITH ACUTE
+015B;N # LATIN SMALL LETTER S WITH ACUTE
+015C;N # LATIN CAPITAL LETTER S WITH CIRCUMFLEX
+015D;N # LATIN SMALL LETTER S WITH CIRCUMFLEX
+015E;N # LATIN CAPITAL LETTER S WITH CEDILLA
+015F;N # LATIN SMALL LETTER S WITH CEDILLA
+0160;N # LATIN CAPITAL LETTER S WITH CARON
+0161;N # LATIN SMALL LETTER S WITH CARON
+0162;N # LATIN CAPITAL LETTER T WITH CEDILLA
+0163;N # LATIN SMALL LETTER T WITH CEDILLA
+0164;N # LATIN CAPITAL LETTER T WITH CARON
+0165;N # LATIN SMALL LETTER T WITH CARON
+0166;A # LATIN CAPITAL LETTER T WITH STROKE
+0167;A # LATIN SMALL LETTER T WITH STROKE
+0168;N # LATIN CAPITAL LETTER U WITH TILDE
+0169;N # LATIN SMALL LETTER U WITH TILDE
+016A;N # LATIN CAPITAL LETTER U WITH MACRON
+016B;A # LATIN SMALL LETTER U WITH MACRON
+016C;N # LATIN CAPITAL LETTER U WITH BREVE
+016D;N # LATIN SMALL LETTER U WITH BREVE
+016E;N # LATIN CAPITAL LETTER U WITH RING ABOVE
+016F;N # LATIN SMALL LETTER U WITH RING ABOVE
+0170;N # LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+0171;N # LATIN SMALL LETTER U WITH DOUBLE ACUTE
+0172;N # LATIN CAPITAL LETTER U WITH OGONEK
+0173;N # LATIN SMALL LETTER U WITH OGONEK
+0174;N # LATIN CAPITAL LETTER W WITH CIRCUMFLEX
+0175;N # LATIN SMALL LETTER W WITH CIRCUMFLEX
+0176;N # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
+0177;N # LATIN SMALL LETTER Y WITH CIRCUMFLEX
+0178;N # LATIN CAPITAL LETTER Y WITH DIAERESIS
+0179;N # LATIN CAPITAL LETTER Z WITH ACUTE
+017A;N # LATIN SMALL LETTER Z WITH ACUTE
+017B;N # LATIN CAPITAL LETTER Z WITH DOT ABOVE
+017C;N # LATIN SMALL LETTER Z WITH DOT ABOVE
+017D;N # LATIN CAPITAL LETTER Z WITH CARON
+017E;N # LATIN SMALL LETTER Z WITH CARON
+017F;N # LATIN SMALL LETTER LONG S
+0180;N # LATIN SMALL LETTER B WITH STROKE
+0181;N # LATIN CAPITAL LETTER B WITH HOOK
+0182;N # LATIN CAPITAL LETTER B WITH TOPBAR
+0183;N # LATIN SMALL LETTER B WITH TOPBAR
+0184;N # LATIN CAPITAL LETTER TONE SIX
+0185;N # LATIN SMALL LETTER TONE SIX
+0186;N # LATIN CAPITAL LETTER OPEN O
+0187;N # LATIN CAPITAL LETTER C WITH HOOK
+0188;N # LATIN SMALL LETTER C WITH HOOK
+0189;N # LATIN CAPITAL LETTER AFRICAN D
+018A;N # LATIN CAPITAL LETTER D WITH HOOK
+018B;N # LATIN CAPITAL LETTER D WITH TOPBAR
+018C;N # LATIN SMALL LETTER D WITH TOPBAR
+018D;N # LATIN SMALL LETTER TURNED DELTA
+018E;N # LATIN CAPITAL LETTER REVERSED E
+018F;N # LATIN CAPITAL LETTER SCHWA
+0190;N # LATIN CAPITAL LETTER OPEN E
+0191;N # LATIN CAPITAL LETTER F WITH HOOK
+0192;N # LATIN SMALL LETTER F WITH HOOK
+0193;N # LATIN CAPITAL LETTER G WITH HOOK
+0194;N # LATIN CAPITAL LETTER GAMMA
+0195;N # LATIN SMALL LETTER HV
+0196;N # LATIN CAPITAL LETTER IOTA
+0197;N # LATIN CAPITAL LETTER I WITH STROKE
+0198;N # LATIN CAPITAL LETTER K WITH HOOK
+0199;N # LATIN SMALL LETTER K WITH HOOK
+019A;N # LATIN SMALL LETTER L WITH BAR
+019B;N # LATIN SMALL LETTER LAMBDA WITH STROKE
+019C;N # LATIN CAPITAL LETTER TURNED M
+019D;N # LATIN CAPITAL LETTER N WITH LEFT HOOK
+019E;N # LATIN SMALL LETTER N WITH LONG RIGHT LEG
+019F;N # LATIN CAPITAL LETTER O WITH MIDDLE TILDE
+01A0;N # LATIN CAPITAL LETTER O WITH HORN
+01A1;N # LATIN SMALL LETTER O WITH HORN
+01A2;N # LATIN CAPITAL LETTER OI
+01A3;N # LATIN SMALL LETTER OI
+01A4;N # LATIN CAPITAL LETTER P WITH HOOK
+01A5;N # LATIN SMALL LETTER P WITH HOOK
+01A6;N # LATIN LETTER YR
+01A7;N # LATIN CAPITAL LETTER TONE TWO
+01A8;N # LATIN SMALL LETTER TONE TWO
+01A9;N # LATIN CAPITAL LETTER ESH
+01AA;N # LATIN LETTER REVERSED ESH LOOP
+01AB;N # LATIN SMALL LETTER T WITH PALATAL HOOK
+01AC;N # LATIN CAPITAL LETTER T WITH HOOK
+01AD;N # LATIN SMALL LETTER T WITH HOOK
+01AE;N # LATIN CAPITAL LETTER T WITH RETROFLEX HOOK
+01AF;N # LATIN CAPITAL LETTER U WITH HORN
+01B0;N # LATIN SMALL LETTER U WITH HORN
+01B1;N # LATIN CAPITAL LETTER UPSILON
+01B2;N # LATIN CAPITAL LETTER V WITH HOOK
+01B3;N # LATIN CAPITAL LETTER Y WITH HOOK
+01B4;N # LATIN SMALL LETTER Y WITH HOOK
+01B5;N # LATIN CAPITAL LETTER Z WITH STROKE
+01B6;N # LATIN SMALL LETTER Z WITH STROKE
+01B7;N # LATIN CAPITAL LETTER EZH
+01B8;N # LATIN CAPITAL LETTER EZH REVERSED
+01B9;N # LATIN SMALL LETTER EZH REVERSED
+01BA;N # LATIN SMALL LETTER EZH WITH TAIL
+01BB;N # LATIN LETTER TWO WITH STROKE
+01BC;N # LATIN CAPITAL LETTER TONE FIVE
+01BD;N # LATIN SMALL LETTER TONE FIVE
+01BE;N # LATIN LETTER INVERTED GLOTTAL STOP WITH STROKE
+01BF;N # LATIN LETTER WYNN
+01C0;N # LATIN LETTER DENTAL CLICK
+01C1;N # LATIN LETTER LATERAL CLICK
+01C2;N # LATIN LETTER ALVEOLAR CLICK
+01C3;N # LATIN LETTER RETROFLEX CLICK
+01C4;N # LATIN CAPITAL LETTER DZ WITH CARON
+01C5;N # LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON
+01C6;N # LATIN SMALL LETTER DZ WITH CARON
+01C7;N # LATIN CAPITAL LETTER LJ
+01C8;N # LATIN CAPITAL LETTER L WITH SMALL LETTER J
+01C9;N # LATIN SMALL LETTER LJ
+01CA;N # LATIN CAPITAL LETTER NJ
+01CB;N # LATIN CAPITAL LETTER N WITH SMALL LETTER J
+01CC;N # LATIN SMALL LETTER NJ
+01CD;N # LATIN CAPITAL LETTER A WITH CARON
+01CE;A # LATIN SMALL LETTER A WITH CARON
+01CF;N # LATIN CAPITAL LETTER I WITH CARON
+01D0;A # LATIN SMALL LETTER I WITH CARON
+01D1;N # LATIN CAPITAL LETTER O WITH CARON
+01D2;A # LATIN SMALL LETTER O WITH CARON
+01D3;N # LATIN CAPITAL LETTER U WITH CARON
+01D4;A # LATIN SMALL LETTER U WITH CARON
+01D5;N # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+01D6;A # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
+01D7;N # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+01D8;A # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
+01D9;N # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
+01DA;A # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
+01DB;N # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+01DC;A # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
+01DD;N # LATIN SMALL LETTER TURNED E
+01DE;N # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
+01DF;N # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
+01E0;N # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
+01E1;N # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
+01E2;N # LATIN CAPITAL LETTER AE WITH MACRON
+01E3;N # LATIN SMALL LETTER AE WITH MACRON
+01E4;N # LATIN CAPITAL LETTER G WITH STROKE
+01E5;N # LATIN SMALL LETTER G WITH STROKE
+01E6;N # LATIN CAPITAL LETTER G WITH CARON
+01E7;N # LATIN SMALL LETTER G WITH CARON
+01E8;N # LATIN CAPITAL LETTER K WITH CARON
+01E9;N # LATIN SMALL LETTER K WITH CARON
+01EA;N # LATIN CAPITAL LETTER O WITH OGONEK
+01EB;N # LATIN SMALL LETTER O WITH OGONEK
+01EC;N # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
+01ED;N # LATIN SMALL LETTER O WITH OGONEK AND MACRON
+01EE;N # LATIN CAPITAL LETTER EZH WITH CARON
+01EF;N # LATIN SMALL LETTER EZH WITH CARON
+01F0;N # LATIN SMALL LETTER J WITH CARON
+01F1;N # LATIN CAPITAL LETTER DZ
+01F2;N # LATIN CAPITAL LETTER D WITH SMALL LETTER Z
+01F3;N # LATIN SMALL LETTER DZ
+01F4;N # LATIN CAPITAL LETTER G WITH ACUTE
+01F5;N # LATIN SMALL LETTER G WITH ACUTE
+01F6;N # LATIN CAPITAL LETTER HWAIR
+01F7;N # LATIN CAPITAL LETTER WYNN
+01F8;N # LATIN CAPITAL LETTER N WITH GRAVE
+01F9;N # LATIN SMALL LETTER N WITH GRAVE
+01FA;N # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
+01FB;N # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
+01FC;N # LATIN CAPITAL LETTER AE WITH ACUTE
+01FD;N # LATIN SMALL LETTER AE WITH ACUTE
+01FE;N # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
+01FF;N # LATIN SMALL LETTER O WITH STROKE AND ACUTE
+0200;N # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+0201;N # LATIN SMALL LETTER A WITH DOUBLE GRAVE
+0202;N # LATIN CAPITAL LETTER A WITH INVERTED BREVE
+0203;N # LATIN SMALL LETTER A WITH INVERTED BREVE
+0204;N # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+0205;N # LATIN SMALL LETTER E WITH DOUBLE GRAVE
+0206;N # LATIN CAPITAL LETTER E WITH INVERTED BREVE
+0207;N # LATIN SMALL LETTER E WITH INVERTED BREVE
+0208;N # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+0209;N # LATIN SMALL LETTER I WITH DOUBLE GRAVE
+020A;N # LATIN CAPITAL LETTER I WITH INVERTED BREVE
+020B;N # LATIN SMALL LETTER I WITH INVERTED BREVE
+020C;N # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+020D;N # LATIN SMALL LETTER O WITH DOUBLE GRAVE
+020E;N # LATIN CAPITAL LETTER O WITH INVERTED BREVE
+020F;N # LATIN SMALL LETTER O WITH INVERTED BREVE
+0210;N # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+0211;N # LATIN SMALL LETTER R WITH DOUBLE GRAVE
+0212;N # LATIN CAPITAL LETTER R WITH INVERTED BREVE
+0213;N # LATIN SMALL LETTER R WITH INVERTED BREVE
+0214;N # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+0215;N # LATIN SMALL LETTER U WITH DOUBLE GRAVE
+0216;N # LATIN CAPITAL LETTER U WITH INVERTED BREVE
+0217;N # LATIN SMALL LETTER U WITH INVERTED BREVE
+0218;N # LATIN CAPITAL LETTER S WITH COMMA BELOW
+0219;N # LATIN SMALL LETTER S WITH COMMA BELOW
+021A;N # LATIN CAPITAL LETTER T WITH COMMA BELOW
+021B;N # LATIN SMALL LETTER T WITH COMMA BELOW
+021C;N # LATIN CAPITAL LETTER YOGH
+021D;N # LATIN SMALL LETTER YOGH
+021E;N # LATIN CAPITAL LETTER H WITH CARON
+021F;N # LATIN SMALL LETTER H WITH CARON
+0220;N # LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
+0221;N # LATIN SMALL LETTER D WITH CURL
+0222;N # LATIN CAPITAL LETTER OU
+0223;N # LATIN SMALL LETTER OU
+0224;N # LATIN CAPITAL LETTER Z WITH HOOK
+0225;N # LATIN SMALL LETTER Z WITH HOOK
+0226;N # LATIN CAPITAL LETTER A WITH DOT ABOVE
+0227;N # LATIN SMALL LETTER A WITH DOT ABOVE
+0228;N # LATIN CAPITAL LETTER E WITH CEDILLA
+0229;N # LATIN SMALL LETTER E WITH CEDILLA
+022A;N # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
+022B;N # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
+022C;N # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
+022D;N # LATIN SMALL LETTER O WITH TILDE AND MACRON
+022E;N # LATIN CAPITAL LETTER O WITH DOT ABOVE
+022F;N # LATIN SMALL LETTER O WITH DOT ABOVE
+0230;N # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
+0231;N # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
+0232;N # LATIN CAPITAL LETTER Y WITH MACRON
+0233;N # LATIN SMALL LETTER Y WITH MACRON
+0234;N # LATIN SMALL LETTER L WITH CURL
+0235;N # LATIN SMALL LETTER N WITH CURL
+0236;N # LATIN SMALL LETTER T WITH CURL
+0237;N # LATIN SMALL LETTER DOTLESS J
+0238;N # LATIN SMALL LETTER DB DIGRAPH
+0239;N # LATIN SMALL LETTER QP DIGRAPH
+023A;N # LATIN CAPITAL LETTER A WITH STROKE
+023B;N # LATIN CAPITAL LETTER C WITH STROKE
+023C;N # LATIN SMALL LETTER C WITH STROKE
+023D;N # LATIN CAPITAL LETTER L WITH BAR
+023E;N # LATIN CAPITAL LETTER T WITH DIAGONAL STROKE
+023F;N # LATIN SMALL LETTER S WITH SWASH TAIL
+0240;N # LATIN SMALL LETTER Z WITH SWASH TAIL
+0241;N # LATIN CAPITAL LETTER GLOTTAL STOP
+0250;N # LATIN SMALL LETTER TURNED A
+0251;A # LATIN SMALL LETTER ALPHA
+0252;N # LATIN SMALL LETTER TURNED ALPHA
+0253;N # LATIN SMALL LETTER B WITH HOOK
+0254;N # LATIN SMALL LETTER OPEN O
+0255;N # LATIN SMALL LETTER C WITH CURL
+0256;N # LATIN SMALL LETTER D WITH TAIL
+0257;N # LATIN SMALL LETTER D WITH HOOK
+0258;N # LATIN SMALL LETTER REVERSED E
+0259;N # LATIN SMALL LETTER SCHWA
+025A;N # LATIN SMALL LETTER SCHWA WITH HOOK
+025B;N # LATIN SMALL LETTER OPEN E
+025C;N # LATIN SMALL LETTER REVERSED OPEN E
+025D;N # LATIN SMALL LETTER REVERSED OPEN E WITH HOOK
+025E;N # LATIN SMALL LETTER CLOSED REVERSED OPEN E
+025F;N # LATIN SMALL LETTER DOTLESS J WITH STROKE
+0260;N # LATIN SMALL LETTER G WITH HOOK
+0261;A # LATIN SMALL LETTER SCRIPT G
+0262;N # LATIN LETTER SMALL CAPITAL G
+0263;N # LATIN SMALL LETTER GAMMA
+0264;N # LATIN SMALL LETTER RAMS HORN
+0265;N # LATIN SMALL LETTER TURNED H
+0266;N # LATIN SMALL LETTER H WITH HOOK
+0267;N # LATIN SMALL LETTER HENG WITH HOOK
+0268;N # LATIN SMALL LETTER I WITH STROKE
+0269;N # LATIN SMALL LETTER IOTA
+026A;N # LATIN LETTER SMALL CAPITAL I
+026B;N # LATIN SMALL LETTER L WITH MIDDLE TILDE
+026C;N # LATIN SMALL LETTER L WITH BELT
+026D;N # LATIN SMALL LETTER L WITH RETROFLEX HOOK
+026E;N # LATIN SMALL LETTER LEZH
+026F;N # LATIN SMALL LETTER TURNED M
+0270;N # LATIN SMALL LETTER TURNED M WITH LONG LEG
+0271;N # LATIN SMALL LETTER M WITH HOOK
+0272;N # LATIN SMALL LETTER N WITH LEFT HOOK
+0273;N # LATIN SMALL LETTER N WITH RETROFLEX HOOK
+0274;N # LATIN LETTER SMALL CAPITAL N
+0275;N # LATIN SMALL LETTER BARRED O
+0276;N # LATIN LETTER SMALL CAPITAL OE
+0277;N # LATIN SMALL LETTER CLOSED OMEGA
+0278;N # LATIN SMALL LETTER PHI
+0279;N # LATIN SMALL LETTER TURNED R
+027A;N # LATIN SMALL LETTER TURNED R WITH LONG LEG
+027B;N # LATIN SMALL LETTER TURNED R WITH HOOK
+027C;N # LATIN SMALL LETTER R WITH LONG LEG
+027D;N # LATIN SMALL LETTER R WITH TAIL
+027E;N # LATIN SMALL LETTER R WITH FISHHOOK
+027F;N # LATIN SMALL LETTER REVERSED R WITH FISHHOOK
+0280;N # LATIN LETTER SMALL CAPITAL R
+0281;N # LATIN LETTER SMALL CAPITAL INVERTED R
+0282;N # LATIN SMALL LETTER S WITH HOOK
+0283;N # LATIN SMALL LETTER ESH
+0284;N # LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK
+0285;N # LATIN SMALL LETTER SQUAT REVERSED ESH
+0286;N # LATIN SMALL LETTER ESH WITH CURL
+0287;N # LATIN SMALL LETTER TURNED T
+0288;N # LATIN SMALL LETTER T WITH RETROFLEX HOOK
+0289;N # LATIN SMALL LETTER U BAR
+028A;N # LATIN SMALL LETTER UPSILON
+028B;N # LATIN SMALL LETTER V WITH HOOK
+028C;N # LATIN SMALL LETTER TURNED V
+028D;N # LATIN SMALL LETTER TURNED W
+028E;N # LATIN SMALL LETTER TURNED Y
+028F;N # LATIN LETTER SMALL CAPITAL Y
+0290;N # LATIN SMALL LETTER Z WITH RETROFLEX HOOK
+0291;N # LATIN SMALL LETTER Z WITH CURL
+0292;N # LATIN SMALL LETTER EZH
+0293;N # LATIN SMALL LETTER EZH WITH CURL
+0294;N # LATIN LETTER GLOTTAL STOP
+0295;N # LATIN LETTER PHARYNGEAL VOICED FRICATIVE
+0296;N # LATIN LETTER INVERTED GLOTTAL STOP
+0297;N # LATIN LETTER STRETCHED C
+0298;N # LATIN LETTER BILABIAL CLICK
+0299;N # LATIN LETTER SMALL CAPITAL B
+029A;N # LATIN SMALL LETTER CLOSED OPEN E
+029B;N # LATIN LETTER SMALL CAPITAL G WITH HOOK
+029C;N # LATIN LETTER SMALL CAPITAL H
+029D;N # LATIN SMALL LETTER J WITH CROSSED-TAIL
+029E;N # LATIN SMALL LETTER TURNED K
+029F;N # LATIN LETTER SMALL CAPITAL L
+02A0;N # LATIN SMALL LETTER Q WITH HOOK
+02A1;N # LATIN LETTER GLOTTAL STOP WITH STROKE
+02A2;N # LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE
+02A3;N # LATIN SMALL LETTER DZ DIGRAPH
+02A4;N # LATIN SMALL LETTER DEZH DIGRAPH
+02A5;N # LATIN SMALL LETTER DZ DIGRAPH WITH CURL
+02A6;N # LATIN SMALL LETTER TS DIGRAPH
+02A7;N # LATIN SMALL LETTER TESH DIGRAPH
+02A8;N # LATIN SMALL LETTER TC DIGRAPH WITH CURL
+02A9;N # LATIN SMALL LETTER FENG DIGRAPH
+02AA;N # LATIN SMALL LETTER LS DIGRAPH
+02AB;N # LATIN SMALL LETTER LZ DIGRAPH
+02AC;N # LATIN LETTER BILABIAL PERCUSSIVE
+02AD;N # LATIN LETTER BIDENTAL PERCUSSIVE
+02AE;N # LATIN SMALL LETTER TURNED H WITH FISHHOOK
+02AF;N # LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
+02B0;N # MODIFIER LETTER SMALL H
+02B1;N # MODIFIER LETTER SMALL H WITH HOOK
+02B2;N # MODIFIER LETTER SMALL J
+02B3;N # MODIFIER LETTER SMALL R
+02B4;N # MODIFIER LETTER SMALL TURNED R
+02B5;N # MODIFIER LETTER SMALL TURNED R WITH HOOK
+02B6;N # MODIFIER LETTER SMALL CAPITAL INVERTED R
+02B7;N # MODIFIER LETTER SMALL W
+02B8;N # MODIFIER LETTER SMALL Y
+02B9;N # MODIFIER LETTER PRIME
+02BA;N # MODIFIER LETTER DOUBLE PRIME
+02BB;N # MODIFIER LETTER TURNED COMMA
+02BC;N # MODIFIER LETTER APOSTROPHE
+02BD;N # MODIFIER LETTER REVERSED COMMA
+02BE;N # MODIFIER LETTER RIGHT HALF RING
+02BF;N # MODIFIER LETTER LEFT HALF RING
+02C0;N # MODIFIER LETTER GLOTTAL STOP
+02C1;N # MODIFIER LETTER REVERSED GLOTTAL STOP
+02C2;N # MODIFIER LETTER LEFT ARROWHEAD
+02C3;N # MODIFIER LETTER RIGHT ARROWHEAD
+02C4;A # MODIFIER LETTER UP ARROWHEAD
+02C5;N # MODIFIER LETTER DOWN ARROWHEAD
+02C6;N # MODIFIER LETTER CIRCUMFLEX ACCENT
+02C7;A # CARON
+02C8;N # MODIFIER LETTER VERTICAL LINE
+02C9;A # MODIFIER LETTER MACRON
+02CA;A # MODIFIER LETTER ACUTE ACCENT
+02CB;A # MODIFIER LETTER GRAVE ACCENT
+02CC;N # MODIFIER LETTER LOW VERTICAL LINE
+02CD;A # MODIFIER LETTER LOW MACRON
+02CE;N # MODIFIER LETTER LOW GRAVE ACCENT
+02CF;N # MODIFIER LETTER LOW ACUTE ACCENT
+02D0;A # MODIFIER LETTER TRIANGULAR COLON
+02D1;N # MODIFIER LETTER HALF TRIANGULAR COLON
+02D2;N # MODIFIER LETTER CENTRED RIGHT HALF RING
+02D3;N # MODIFIER LETTER CENTRED LEFT HALF RING
+02D4;N # MODIFIER LETTER UP TACK
+02D5;N # MODIFIER LETTER DOWN TACK
+02D6;N # MODIFIER LETTER PLUS SIGN
+02D7;N # MODIFIER LETTER MINUS SIGN
+02D8;A # BREVE
+02D9;A # DOT ABOVE
+02DA;A # RING ABOVE
+02DB;A # OGONEK
+02DC;N # SMALL TILDE
+02DD;A # DOUBLE ACUTE ACCENT
+02DE;N # MODIFIER LETTER RHOTIC HOOK
+02DF;A # MODIFIER LETTER CROSS ACCENT
+02E0;N # MODIFIER LETTER SMALL GAMMA
+02E1;N # MODIFIER LETTER SMALL L
+02E2;N # MODIFIER LETTER SMALL S
+02E3;N # MODIFIER LETTER SMALL X
+02E4;N # MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
+02E5;N # MODIFIER LETTER EXTRA-HIGH TONE BAR
+02E6;N # MODIFIER LETTER HIGH TONE BAR
+02E7;N # MODIFIER LETTER MID TONE BAR
+02E8;N # MODIFIER LETTER LOW TONE BAR
+02E9;N # MODIFIER LETTER EXTRA-LOW TONE BAR
+02EA;N # MODIFIER LETTER YIN DEPARTING TONE MARK
+02EB;N # MODIFIER LETTER YANG DEPARTING TONE MARK
+02EC;N # MODIFIER LETTER VOICING
+02ED;N # MODIFIER LETTER UNASPIRATED
+02EE;N # MODIFIER LETTER DOUBLE APOSTROPHE
+02EF;N # MODIFIER LETTER LOW DOWN ARROWHEAD
+02F0;N # MODIFIER LETTER LOW UP ARROWHEAD
+02F1;N # MODIFIER LETTER LOW LEFT ARROWHEAD
+02F2;N # MODIFIER LETTER LOW RIGHT ARROWHEAD
+02F3;N # MODIFIER LETTER LOW RING
+02F4;N # MODIFIER LETTER MIDDLE GRAVE ACCENT
+02F5;N # MODIFIER LETTER MIDDLE DOUBLE GRAVE ACCENT
+02F6;N # MODIFIER LETTER MIDDLE DOUBLE ACUTE ACCENT
+02F7;N # MODIFIER LETTER LOW TILDE
+02F8;N # MODIFIER LETTER RAISED COLON
+02F9;N # MODIFIER LETTER BEGIN HIGH TONE
+02FA;N # MODIFIER LETTER END HIGH TONE
+02FB;N # MODIFIER LETTER BEGIN LOW TONE
+02FC;N # MODIFIER LETTER END LOW TONE
+02FD;N # MODIFIER LETTER SHELF
+02FE;N # MODIFIER LETTER OPEN SHELF
+02FF;N # MODIFIER LETTER LOW LEFT ARROW
+0300;A # COMBINING GRAVE ACCENT
+0301;A # COMBINING ACUTE ACCENT
+0302;A # COMBINING CIRCUMFLEX ACCENT
+0303;A # COMBINING TILDE
+0304;A # COMBINING MACRON
+0305;A # COMBINING OVERLINE
+0306;A # COMBINING BREVE
+0307;A # COMBINING DOT ABOVE
+0308;A # COMBINING DIAERESIS
+0309;A # COMBINING HOOK ABOVE
+030A;A # COMBINING RING ABOVE
+030B;A # COMBINING DOUBLE ACUTE ACCENT
+030C;A # COMBINING CARON
+030D;A # COMBINING VERTICAL LINE ABOVE
+030E;A # COMBINING DOUBLE VERTICAL LINE ABOVE
+030F;A # COMBINING DOUBLE GRAVE ACCENT
+0310;A # COMBINING CANDRABINDU
+0311;A # COMBINING INVERTED BREVE
+0312;A # COMBINING TURNED COMMA ABOVE
+0313;A # COMBINING COMMA ABOVE
+0314;A # COMBINING REVERSED COMMA ABOVE
+0315;A # COMBINING COMMA ABOVE RIGHT
+0316;A # COMBINING GRAVE ACCENT BELOW
+0317;A # COMBINING ACUTE ACCENT BELOW
+0318;A # COMBINING LEFT TACK BELOW
+0319;A # COMBINING RIGHT TACK BELOW
+031A;A # COMBINING LEFT ANGLE ABOVE
+031B;A # COMBINING HORN
+031C;A # COMBINING LEFT HALF RING BELOW
+031D;A # COMBINING UP TACK BELOW
+031E;A # COMBINING DOWN TACK BELOW
+031F;A # COMBINING PLUS SIGN BELOW
+0320;A # COMBINING MINUS SIGN BELOW
+0321;A # COMBINING PALATALIZED HOOK BELOW
+0322;A # COMBINING RETROFLEX HOOK BELOW
+0323;A # COMBINING DOT BELOW
+0324;A # COMBINING DIAERESIS BELOW
+0325;A # COMBINING RING BELOW
+0326;A # COMBINING COMMA BELOW
+0327;A # COMBINING CEDILLA
+0328;A # COMBINING OGONEK
+0329;A # COMBINING VERTICAL LINE BELOW
+032A;A # COMBINING BRIDGE BELOW
+032B;A # COMBINING INVERTED DOUBLE ARCH BELOW
+032C;A # COMBINING CARON BELOW
+032D;A # COMBINING CIRCUMFLEX ACCENT BELOW
+032E;A # COMBINING BREVE BELOW
+032F;A # COMBINING INVERTED BREVE BELOW
+0330;A # COMBINING TILDE BELOW
+0331;A # COMBINING MACRON BELOW
+0332;A # COMBINING LOW LINE
+0333;A # COMBINING DOUBLE LOW LINE
+0334;A # COMBINING TILDE OVERLAY
+0335;A # COMBINING SHORT STROKE OVERLAY
+0336;A # COMBINING LONG STROKE OVERLAY
+0337;A # COMBINING SHORT SOLIDUS OVERLAY
+0338;A # COMBINING LONG SOLIDUS OVERLAY
+0339;A # COMBINING RIGHT HALF RING BELOW
+033A;A # COMBINING INVERTED BRIDGE BELOW
+033B;A # COMBINING SQUARE BELOW
+033C;A # COMBINING SEAGULL BELOW
+033D;A # COMBINING X ABOVE
+033E;A # COMBINING VERTICAL TILDE
+033F;A # COMBINING DOUBLE OVERLINE
+0340;A # COMBINING GRAVE TONE MARK
+0341;A # COMBINING ACUTE TONE MARK
+0342;A # COMBINING GREEK PERISPOMENI
+0343;A # COMBINING GREEK KORONIS
+0344;A # COMBINING GREEK DIALYTIKA TONOS
+0345;A # COMBINING GREEK YPOGEGRAMMENI
+0346;A # COMBINING BRIDGE ABOVE
+0347;A # COMBINING EQUALS SIGN BELOW
+0348;A # COMBINING DOUBLE VERTICAL LINE BELOW
+0349;A # COMBINING LEFT ANGLE BELOW
+034A;A # COMBINING NOT TILDE ABOVE
+034B;A # COMBINING HOMOTHETIC ABOVE
+034C;A # COMBINING ALMOST EQUAL TO ABOVE
+034D;A # COMBINING LEFT RIGHT ARROW BELOW
+034E;A # COMBINING UPWARDS ARROW BELOW
+034F;A # COMBINING GRAPHEME JOINER
+0350;A # COMBINING RIGHT ARROWHEAD ABOVE
+0351;A # COMBINING LEFT HALF RING ABOVE
+0352;A # COMBINING FERMATA
+0353;A # COMBINING X BELOW
+0354;A # COMBINING LEFT ARROWHEAD BELOW
+0355;A # COMBINING RIGHT ARROWHEAD BELOW
+0356;A # COMBINING RIGHT ARROWHEAD AND UP ARROWHEAD BELOW
+0357;A # COMBINING RIGHT HALF RING ABOVE
+0358;A # COMBINING DOT ABOVE RIGHT
+0359;A # COMBINING ASTERISK BELOW
+035A;A # COMBINING DOUBLE RING BELOW
+035B;A # COMBINING ZIGZAG ABOVE
+035C;A # COMBINING DOUBLE BREVE BELOW
+035D;A # COMBINING DOUBLE BREVE
+035E;A # COMBINING DOUBLE MACRON
+035F;A # COMBINING DOUBLE MACRON BELOW
+0360;A # COMBINING DOUBLE TILDE
+0361;A # COMBINING DOUBLE INVERTED BREVE
+0362;A # COMBINING DOUBLE RIGHTWARDS ARROW BELOW
+0363;A # COMBINING LATIN SMALL LETTER A
+0364;A # COMBINING LATIN SMALL LETTER E
+0365;A # COMBINING LATIN SMALL LETTER I
+0366;A # COMBINING LATIN SMALL LETTER O
+0367;A # COMBINING LATIN SMALL LETTER U
+0368;A # COMBINING LATIN SMALL LETTER C
+0369;A # COMBINING LATIN SMALL LETTER D
+036A;A # COMBINING LATIN SMALL LETTER H
+036B;A # COMBINING LATIN SMALL LETTER M
+036C;A # COMBINING LATIN SMALL LETTER R
+036D;A # COMBINING LATIN SMALL LETTER T
+036E;A # COMBINING LATIN SMALL LETTER V
+036F;A # COMBINING LATIN SMALL LETTER X
+0374;N # GREEK NUMERAL SIGN
+0375;N # GREEK LOWER NUMERAL SIGN
+037A;N # GREEK YPOGEGRAMMENI
+037E;N # GREEK QUESTION MARK
+0384;N # GREEK TONOS
+0385;N # GREEK DIALYTIKA TONOS
+0386;N # GREEK CAPITAL LETTER ALPHA WITH TONOS
+0387;N # GREEK ANO TELEIA
+0388;N # GREEK CAPITAL LETTER EPSILON WITH TONOS
+0389;N # GREEK CAPITAL LETTER ETA WITH TONOS
+038A;N # GREEK CAPITAL LETTER IOTA WITH TONOS
+038C;N # GREEK CAPITAL LETTER OMICRON WITH TONOS
+038E;N # GREEK CAPITAL LETTER UPSILON WITH TONOS
+038F;N # GREEK CAPITAL LETTER OMEGA WITH TONOS
+0390;N # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+0391;A # GREEK CAPITAL LETTER ALPHA
+0392;A # GREEK CAPITAL LETTER BETA
+0393;A # GREEK CAPITAL LETTER GAMMA
+0394;A # GREEK CAPITAL LETTER DELTA
+0395;A # GREEK CAPITAL LETTER EPSILON
+0396;A # GREEK CAPITAL LETTER ZETA
+0397;A # GREEK CAPITAL LETTER ETA
+0398;A # GREEK CAPITAL LETTER THETA
+0399;A # GREEK CAPITAL LETTER IOTA
+039A;A # GREEK CAPITAL LETTER KAPPA
+039B;A # GREEK CAPITAL LETTER LAMDA
+039C;A # GREEK CAPITAL LETTER MU
+039D;A # GREEK CAPITAL LETTER NU
+039E;A # GREEK CAPITAL LETTER XI
+039F;A # GREEK CAPITAL LETTER OMICRON
+03A0;A # GREEK CAPITAL LETTER PI
+03A1;A # GREEK CAPITAL LETTER RHO
+03A3;A # GREEK CAPITAL LETTER SIGMA
+03A4;A # GREEK CAPITAL LETTER TAU
+03A5;A # GREEK CAPITAL LETTER UPSILON
+03A6;A # GREEK CAPITAL LETTER PHI
+03A7;A # GREEK CAPITAL LETTER CHI
+03A8;A # GREEK CAPITAL LETTER PSI
+03A9;A # GREEK CAPITAL LETTER OMEGA
+03AA;N # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+03AB;N # GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+03AC;N # GREEK SMALL LETTER ALPHA WITH TONOS
+03AD;N # GREEK SMALL LETTER EPSILON WITH TONOS
+03AE;N # GREEK SMALL LETTER ETA WITH TONOS
+03AF;N # GREEK SMALL LETTER IOTA WITH TONOS
+03B0;N # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
+03B1;A # GREEK SMALL LETTER ALPHA
+03B2;A # GREEK SMALL LETTER BETA
+03B3;A # GREEK SMALL LETTER GAMMA
+03B4;A # GREEK SMALL LETTER DELTA
+03B5;A # GREEK SMALL LETTER EPSILON
+03B6;A # GREEK SMALL LETTER ZETA
+03B7;A # GREEK SMALL LETTER ETA
+03B8;A # GREEK SMALL LETTER THETA
+03B9;A # GREEK SMALL LETTER IOTA
+03BA;A # GREEK SMALL LETTER KAPPA
+03BB;A # GREEK SMALL LETTER LAMDA
+03BC;A # GREEK SMALL LETTER MU
+03BD;A # GREEK SMALL LETTER NU
+03BE;A # GREEK SMALL LETTER XI
+03BF;A # GREEK SMALL LETTER OMICRON
+03C0;A # GREEK SMALL LETTER PI
+03C1;A # GREEK SMALL LETTER RHO
+03C2;N # GREEK SMALL LETTER FINAL SIGMA
+03C3;A # GREEK SMALL LETTER SIGMA
+03C4;A # GREEK SMALL LETTER TAU
+03C5;A # GREEK SMALL LETTER UPSILON
+03C6;A # GREEK SMALL LETTER PHI
+03C7;A # GREEK SMALL LETTER CHI
+03C8;A # GREEK SMALL LETTER PSI
+03C9;A # GREEK SMALL LETTER OMEGA
+03CA;N # GREEK SMALL LETTER IOTA WITH DIALYTIKA
+03CB;N # GREEK SMALL LETTER UPSILON WITH DIALYTIKA
+03CC;N # GREEK SMALL LETTER OMICRON WITH TONOS
+03CD;N # GREEK SMALL LETTER UPSILON WITH TONOS
+03CE;N # GREEK SMALL LETTER OMEGA WITH TONOS
+03D0;N # GREEK BETA SYMBOL
+03D1;N # GREEK THETA SYMBOL
+03D2;N # GREEK UPSILON WITH HOOK SYMBOL
+03D3;N # GREEK UPSILON WITH ACUTE AND HOOK SYMBOL
+03D4;N # GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL
+03D5;N # GREEK PHI SYMBOL
+03D6;N # GREEK PI SYMBOL
+03D7;N # GREEK KAI SYMBOL
+03D8;N # GREEK LETTER ARCHAIC KOPPA
+03D9;N # GREEK SMALL LETTER ARCHAIC KOPPA
+03DA;N # GREEK LETTER STIGMA
+03DB;N # GREEK SMALL LETTER STIGMA
+03DC;N # GREEK LETTER DIGAMMA
+03DD;N # GREEK SMALL LETTER DIGAMMA
+03DE;N # GREEK LETTER KOPPA
+03DF;N # GREEK SMALL LETTER KOPPA
+03E0;N # GREEK LETTER SAMPI
+03E1;N # GREEK SMALL LETTER SAMPI
+03E2;N # COPTIC CAPITAL LETTER SHEI
+03E3;N # COPTIC SMALL LETTER SHEI
+03E4;N # COPTIC CAPITAL LETTER FEI
+03E5;N # COPTIC SMALL LETTER FEI
+03E6;N # COPTIC CAPITAL LETTER KHEI
+03E7;N # COPTIC SMALL LETTER KHEI
+03E8;N # COPTIC CAPITAL LETTER HORI
+03E9;N # COPTIC SMALL LETTER HORI
+03EA;N # COPTIC CAPITAL LETTER GANGIA
+03EB;N # COPTIC SMALL LETTER GANGIA
+03EC;N # COPTIC CAPITAL LETTER SHIMA
+03ED;N # COPTIC SMALL LETTER SHIMA
+03EE;N # COPTIC CAPITAL LETTER DEI
+03EF;N # COPTIC SMALL LETTER DEI
+03F0;N # GREEK KAPPA SYMBOL
+03F1;N # GREEK RHO SYMBOL
+03F2;N # GREEK LUNATE SIGMA SYMBOL
+03F3;N # GREEK LETTER YOT
+03F4;N # GREEK CAPITAL THETA SYMBOL
+03F5;N # GREEK LUNATE EPSILON SYMBOL
+03F6;N # GREEK REVERSED LUNATE EPSILON SYMBOL
+03F7;N # GREEK CAPITAL LETTER SHO
+03F8;N # GREEK SMALL LETTER SHO
+03F9;N # GREEK CAPITAL LUNATE SIGMA SYMBOL
+03FA;N # GREEK CAPITAL LETTER SAN
+03FB;N # GREEK SMALL LETTER SAN
+03FC;N # GREEK RHO WITH STROKE SYMBOL
+03FD;N # GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL
+03FE;N # GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL
+03FF;N # GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL
+0400;N # CYRILLIC CAPITAL LETTER IE WITH GRAVE
+0401;A # CYRILLIC CAPITAL LETTER IO
+0402;N # CYRILLIC CAPITAL LETTER DJE
+0403;N # CYRILLIC CAPITAL LETTER GJE
+0404;N # CYRILLIC CAPITAL LETTER UKRAINIAN IE
+0405;N # CYRILLIC CAPITAL LETTER DZE
+0406;N # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+0407;N # CYRILLIC CAPITAL LETTER YI
+0408;N # CYRILLIC CAPITAL LETTER JE
+0409;N # CYRILLIC CAPITAL LETTER LJE
+040A;N # CYRILLIC CAPITAL LETTER NJE
+040B;N # CYRILLIC CAPITAL LETTER TSHE
+040C;N # CYRILLIC CAPITAL LETTER KJE
+040D;N # CYRILLIC CAPITAL LETTER I WITH GRAVE
+040E;N # CYRILLIC CAPITAL LETTER SHORT U
+040F;N # CYRILLIC CAPITAL LETTER DZHE
+0410;A # CYRILLIC CAPITAL LETTER A
+0411;A # CYRILLIC CAPITAL LETTER BE
+0412;A # CYRILLIC CAPITAL LETTER VE
+0413;A # CYRILLIC CAPITAL LETTER GHE
+0414;A # CYRILLIC CAPITAL LETTER DE
+0415;A # CYRILLIC CAPITAL LETTER IE
+0416;A # CYRILLIC CAPITAL LETTER ZHE
+0417;A # CYRILLIC CAPITAL LETTER ZE
+0418;A # CYRILLIC CAPITAL LETTER I
+0419;A # CYRILLIC CAPITAL LETTER SHORT I
+041A;A # CYRILLIC CAPITAL LETTER KA
+041B;A # CYRILLIC CAPITAL LETTER EL
+041C;A # CYRILLIC CAPITAL LETTER EM
+041D;A # CYRILLIC CAPITAL LETTER EN
+041E;A # CYRILLIC CAPITAL LETTER O
+041F;A # CYRILLIC CAPITAL LETTER PE
+0420;A # CYRILLIC CAPITAL LETTER ER
+0421;A # CYRILLIC CAPITAL LETTER ES
+0422;A # CYRILLIC CAPITAL LETTER TE
+0423;A # CYRILLIC CAPITAL LETTER U
+0424;A # CYRILLIC CAPITAL LETTER EF
+0425;A # CYRILLIC CAPITAL LETTER HA
+0426;A # CYRILLIC CAPITAL LETTER TSE
+0427;A # CYRILLIC CAPITAL LETTER CHE
+0428;A # CYRILLIC CAPITAL LETTER SHA
+0429;A # CYRILLIC CAPITAL LETTER SHCHA
+042A;A # CYRILLIC CAPITAL LETTER HARD SIGN
+042B;A # CYRILLIC CAPITAL LETTER YERU
+042C;A # CYRILLIC CAPITAL LETTER SOFT SIGN
+042D;A # CYRILLIC CAPITAL LETTER E
+042E;A # CYRILLIC CAPITAL LETTER YU
+042F;A # CYRILLIC CAPITAL LETTER YA
+0430;A # CYRILLIC SMALL LETTER A
+0431;A # CYRILLIC SMALL LETTER BE
+0432;A # CYRILLIC SMALL LETTER VE
+0433;A # CYRILLIC SMALL LETTER GHE
+0434;A # CYRILLIC SMALL LETTER DE
+0435;A # CYRILLIC SMALL LETTER IE
+0436;A # CYRILLIC SMALL LETTER ZHE
+0437;A # CYRILLIC SMALL LETTER ZE
+0438;A # CYRILLIC SMALL LETTER I
+0439;A # CYRILLIC SMALL LETTER SHORT I
+043A;A # CYRILLIC SMALL LETTER KA
+043B;A # CYRILLIC SMALL LETTER EL
+043C;A # CYRILLIC SMALL LETTER EM
+043D;A # CYRILLIC SMALL LETTER EN
+043E;A # CYRILLIC SMALL LETTER O
+043F;A # CYRILLIC SMALL LETTER PE
+0440;A # CYRILLIC SMALL LETTER ER
+0441;A # CYRILLIC SMALL LETTER ES
+0442;A # CYRILLIC SMALL LETTER TE
+0443;A # CYRILLIC SMALL LETTER U
+0444;A # CYRILLIC SMALL LETTER EF
+0445;A # CYRILLIC SMALL LETTER HA
+0446;A # CYRILLIC SMALL LETTER TSE
+0447;A # CYRILLIC SMALL LETTER CHE
+0448;A # CYRILLIC SMALL LETTER SHA
+0449;A # CYRILLIC SMALL LETTER SHCHA
+044A;A # CYRILLIC SMALL LETTER HARD SIGN
+044B;A # CYRILLIC SMALL LETTER YERU
+044C;A # CYRILLIC SMALL LETTER SOFT SIGN
+044D;A # CYRILLIC SMALL LETTER E
+044E;A # CYRILLIC SMALL LETTER YU
+044F;A # CYRILLIC SMALL LETTER YA
+0450;N # CYRILLIC SMALL LETTER IE WITH GRAVE
+0451;A # CYRILLIC SMALL LETTER IO
+0452;N # CYRILLIC SMALL LETTER DJE
+0453;N # CYRILLIC SMALL LETTER GJE
+0454;N # CYRILLIC SMALL LETTER UKRAINIAN IE
+0455;N # CYRILLIC SMALL LETTER DZE
+0456;N # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+0457;N # CYRILLIC SMALL LETTER YI
+0458;N # CYRILLIC SMALL LETTER JE
+0459;N # CYRILLIC SMALL LETTER LJE
+045A;N # CYRILLIC SMALL LETTER NJE
+045B;N # CYRILLIC SMALL LETTER TSHE
+045C;N # CYRILLIC SMALL LETTER KJE
+045D;N # CYRILLIC SMALL LETTER I WITH GRAVE
+045E;N # CYRILLIC SMALL LETTER SHORT U
+045F;N # CYRILLIC SMALL LETTER DZHE
+0460;N # CYRILLIC CAPITAL LETTER OMEGA
+0461;N # CYRILLIC SMALL LETTER OMEGA
+0462;N # CYRILLIC CAPITAL LETTER YAT
+0463;N # CYRILLIC SMALL LETTER YAT
+0464;N # CYRILLIC CAPITAL LETTER IOTIFIED E
+0465;N # CYRILLIC SMALL LETTER IOTIFIED E
+0466;N # CYRILLIC CAPITAL LETTER LITTLE YUS
+0467;N # CYRILLIC SMALL LETTER LITTLE YUS
+0468;N # CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS
+0469;N # CYRILLIC SMALL LETTER IOTIFIED LITTLE YUS
+046A;N # CYRILLIC CAPITAL LETTER BIG YUS
+046B;N # CYRILLIC SMALL LETTER BIG YUS
+046C;N # CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS
+046D;N # CYRILLIC SMALL LETTER IOTIFIED BIG YUS
+046E;N # CYRILLIC CAPITAL LETTER KSI
+046F;N # CYRILLIC SMALL LETTER KSI
+0470;N # CYRILLIC CAPITAL LETTER PSI
+0471;N # CYRILLIC SMALL LETTER PSI
+0472;N # CYRILLIC CAPITAL LETTER FITA
+0473;N # CYRILLIC SMALL LETTER FITA
+0474;N # CYRILLIC CAPITAL LETTER IZHITSA
+0475;N # CYRILLIC SMALL LETTER IZHITSA
+0476;N # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+0477;N # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+0478;N # CYRILLIC CAPITAL LETTER UK
+0479;N # CYRILLIC SMALL LETTER UK
+047A;N # CYRILLIC CAPITAL LETTER ROUND OMEGA
+047B;N # CYRILLIC SMALL LETTER ROUND OMEGA
+047C;N # CYRILLIC CAPITAL LETTER OMEGA WITH TITLO
+047D;N # CYRILLIC SMALL LETTER OMEGA WITH TITLO
+047E;N # CYRILLIC CAPITAL LETTER OT
+047F;N # CYRILLIC SMALL LETTER OT
+0480;N # CYRILLIC CAPITAL LETTER KOPPA
+0481;N # CYRILLIC SMALL LETTER KOPPA
+0482;N # CYRILLIC THOUSANDS SIGN
+0483;N # COMBINING CYRILLIC TITLO
+0484;N # COMBINING CYRILLIC PALATALIZATION
+0485;N # COMBINING CYRILLIC DASIA PNEUMATA
+0486;N # COMBINING CYRILLIC PSILI PNEUMATA
+0488;N # COMBINING CYRILLIC HUNDRED THOUSANDS SIGN
+0489;N # COMBINING CYRILLIC MILLIONS SIGN
+048A;N # CYRILLIC CAPITAL LETTER SHORT I WITH TAIL
+048B;N # CYRILLIC SMALL LETTER SHORT I WITH TAIL
+048C;N # CYRILLIC CAPITAL LETTER SEMISOFT SIGN
+048D;N # CYRILLIC SMALL LETTER SEMISOFT SIGN
+048E;N # CYRILLIC CAPITAL LETTER ER WITH TICK
+048F;N # CYRILLIC SMALL LETTER ER WITH TICK
+0490;N # CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+0491;N # CYRILLIC SMALL LETTER GHE WITH UPTURN
+0492;N # CYRILLIC CAPITAL LETTER GHE WITH STROKE
+0493;N # CYRILLIC SMALL LETTER GHE WITH STROKE
+0494;N # CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK
+0495;N # CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK
+0496;N # CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
+0497;N # CYRILLIC SMALL LETTER ZHE WITH DESCENDER
+0498;N # CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
+0499;N # CYRILLIC SMALL LETTER ZE WITH DESCENDER
+049A;N # CYRILLIC CAPITAL LETTER KA WITH DESCENDER
+049B;N # CYRILLIC SMALL LETTER KA WITH DESCENDER
+049C;N # CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
+049D;N # CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE
+049E;N # CYRILLIC CAPITAL LETTER KA WITH STROKE
+049F;N # CYRILLIC SMALL LETTER KA WITH STROKE
+04A0;N # CYRILLIC CAPITAL LETTER BASHKIR KA
+04A1;N # CYRILLIC SMALL LETTER BASHKIR KA
+04A2;N # CYRILLIC CAPITAL LETTER EN WITH DESCENDER
+04A3;N # CYRILLIC SMALL LETTER EN WITH DESCENDER
+04A4;N # CYRILLIC CAPITAL LIGATURE EN GHE
+04A5;N # CYRILLIC SMALL LIGATURE EN GHE
+04A6;N # CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK
+04A7;N # CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK
+04A8;N # CYRILLIC CAPITAL LETTER ABKHASIAN HA
+04A9;N # CYRILLIC SMALL LETTER ABKHASIAN HA
+04AA;N # CYRILLIC CAPITAL LETTER ES WITH DESCENDER
+04AB;N # CYRILLIC SMALL LETTER ES WITH DESCENDER
+04AC;N # CYRILLIC CAPITAL LETTER TE WITH DESCENDER
+04AD;N # CYRILLIC SMALL LETTER TE WITH DESCENDER
+04AE;N # CYRILLIC CAPITAL LETTER STRAIGHT U
+04AF;N # CYRILLIC SMALL LETTER STRAIGHT U
+04B0;N # CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
+04B1;N # CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
+04B2;N # CYRILLIC CAPITAL LETTER HA WITH DESCENDER
+04B3;N # CYRILLIC SMALL LETTER HA WITH DESCENDER
+04B4;N # CYRILLIC CAPITAL LIGATURE TE TSE
+04B5;N # CYRILLIC SMALL LIGATURE TE TSE
+04B6;N # CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
+04B7;N # CYRILLIC SMALL LETTER CHE WITH DESCENDER
+04B8;N # CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
+04B9;N # CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE
+04BA;N # CYRILLIC CAPITAL LETTER SHHA
+04BB;N # CYRILLIC SMALL LETTER SHHA
+04BC;N # CYRILLIC CAPITAL LETTER ABKHASIAN CHE
+04BD;N # CYRILLIC SMALL LETTER ABKHASIAN CHE
+04BE;N # CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER
+04BF;N # CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DESCENDER
+04C0;N # CYRILLIC LETTER PALOCHKA
+04C1;N # CYRILLIC CAPITAL LETTER ZHE WITH BREVE
+04C2;N # CYRILLIC SMALL LETTER ZHE WITH BREVE
+04C3;N # CYRILLIC CAPITAL LETTER KA WITH HOOK
+04C4;N # CYRILLIC SMALL LETTER KA WITH HOOK
+04C5;N # CYRILLIC CAPITAL LETTER EL WITH TAIL
+04C6;N # CYRILLIC SMALL LETTER EL WITH TAIL
+04C7;N # CYRILLIC CAPITAL LETTER EN WITH HOOK
+04C8;N # CYRILLIC SMALL LETTER EN WITH HOOK
+04C9;N # CYRILLIC CAPITAL LETTER EN WITH TAIL
+04CA;N # CYRILLIC SMALL LETTER EN WITH TAIL
+04CB;N # CYRILLIC CAPITAL LETTER KHAKASSIAN CHE
+04CC;N # CYRILLIC SMALL LETTER KHAKASSIAN CHE
+04CD;N # CYRILLIC CAPITAL LETTER EM WITH TAIL
+04CE;N # CYRILLIC SMALL LETTER EM WITH TAIL
+04D0;N # CYRILLIC CAPITAL LETTER A WITH BREVE
+04D1;N # CYRILLIC SMALL LETTER A WITH BREVE
+04D2;N # CYRILLIC CAPITAL LETTER A WITH DIAERESIS
+04D3;N # CYRILLIC SMALL LETTER A WITH DIAERESIS
+04D4;N # CYRILLIC CAPITAL LIGATURE A IE
+04D5;N # CYRILLIC SMALL LIGATURE A IE
+04D6;N # CYRILLIC CAPITAL LETTER IE WITH BREVE
+04D7;N # CYRILLIC SMALL LETTER IE WITH BREVE
+04D8;N # CYRILLIC CAPITAL LETTER SCHWA
+04D9;N # CYRILLIC SMALL LETTER SCHWA
+04DA;N # CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
+04DB;N # CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS
+04DC;N # CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
+04DD;N # CYRILLIC SMALL LETTER ZHE WITH DIAERESIS
+04DE;N # CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
+04DF;N # CYRILLIC SMALL LETTER ZE WITH DIAERESIS
+04E0;N # CYRILLIC CAPITAL LETTER ABKHASIAN DZE
+04E1;N # CYRILLIC SMALL LETTER ABKHASIAN DZE
+04E2;N # CYRILLIC CAPITAL LETTER I WITH MACRON
+04E3;N # CYRILLIC SMALL LETTER I WITH MACRON
+04E4;N # CYRILLIC CAPITAL LETTER I WITH DIAERESIS
+04E5;N # CYRILLIC SMALL LETTER I WITH DIAERESIS
+04E6;N # CYRILLIC CAPITAL LETTER O WITH DIAERESIS
+04E7;N # CYRILLIC SMALL LETTER O WITH DIAERESIS
+04E8;N # CYRILLIC CAPITAL LETTER BARRED O
+04E9;N # CYRILLIC SMALL LETTER BARRED O
+04EA;N # CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
+04EB;N # CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS
+04EC;N # CYRILLIC CAPITAL LETTER E WITH DIAERESIS
+04ED;N # CYRILLIC SMALL LETTER E WITH DIAERESIS
+04EE;N # CYRILLIC CAPITAL LETTER U WITH MACRON
+04EF;N # CYRILLIC SMALL LETTER U WITH MACRON
+04F0;N # CYRILLIC CAPITAL LETTER U WITH DIAERESIS
+04F1;N # CYRILLIC SMALL LETTER U WITH DIAERESIS
+04F2;N # CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
+04F3;N # CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE
+04F4;N # CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
+04F5;N # CYRILLIC SMALL LETTER CHE WITH DIAERESIS
+04F6;N # CYRILLIC CAPITAL LETTER GHE WITH DESCENDER
+04F7;N # CYRILLIC SMALL LETTER GHE WITH DESCENDER
+04F8;N # CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
+04F9;N # CYRILLIC SMALL LETTER YERU WITH DIAERESIS
+0500;N # CYRILLIC CAPITAL LETTER KOMI DE
+0501;N # CYRILLIC SMALL LETTER KOMI DE
+0502;N # CYRILLIC CAPITAL LETTER KOMI DJE
+0503;N # CYRILLIC SMALL LETTER KOMI DJE
+0504;N # CYRILLIC CAPITAL LETTER KOMI ZJE
+0505;N # CYRILLIC SMALL LETTER KOMI ZJE
+0506;N # CYRILLIC CAPITAL LETTER KOMI DZJE
+0507;N # CYRILLIC SMALL LETTER KOMI DZJE
+0508;N # CYRILLIC CAPITAL LETTER KOMI LJE
+0509;N # CYRILLIC SMALL LETTER KOMI LJE
+050A;N # CYRILLIC CAPITAL LETTER KOMI NJE
+050B;N # CYRILLIC SMALL LETTER KOMI NJE
+050C;N # CYRILLIC CAPITAL LETTER KOMI SJE
+050D;N # CYRILLIC SMALL LETTER KOMI SJE
+050E;N # CYRILLIC CAPITAL LETTER KOMI TJE
+050F;N # CYRILLIC SMALL LETTER KOMI TJE
+0531;N # ARMENIAN CAPITAL LETTER AYB
+0532;N # ARMENIAN CAPITAL LETTER BEN
+0533;N # ARMENIAN CAPITAL LETTER GIM
+0534;N # ARMENIAN CAPITAL LETTER DA
+0535;N # ARMENIAN CAPITAL LETTER ECH
+0536;N # ARMENIAN CAPITAL LETTER ZA
+0537;N # ARMENIAN CAPITAL LETTER EH
+0538;N # ARMENIAN CAPITAL LETTER ET
+0539;N # ARMENIAN CAPITAL LETTER TO
+053A;N # ARMENIAN CAPITAL LETTER ZHE
+053B;N # ARMENIAN CAPITAL LETTER INI
+053C;N # ARMENIAN CAPITAL LETTER LIWN
+053D;N # ARMENIAN CAPITAL LETTER XEH
+053E;N # ARMENIAN CAPITAL LETTER CA
+053F;N # ARMENIAN CAPITAL LETTER KEN
+0540;N # ARMENIAN CAPITAL LETTER HO
+0541;N # ARMENIAN CAPITAL LETTER JA
+0542;N # ARMENIAN CAPITAL LETTER GHAD
+0543;N # ARMENIAN CAPITAL LETTER CHEH
+0544;N # ARMENIAN CAPITAL LETTER MEN
+0545;N # ARMENIAN CAPITAL LETTER YI
+0546;N # ARMENIAN CAPITAL LETTER NOW
+0547;N # ARMENIAN CAPITAL LETTER SHA
+0548;N # ARMENIAN CAPITAL LETTER VO
+0549;N # ARMENIAN CAPITAL LETTER CHA
+054A;N # ARMENIAN CAPITAL LETTER PEH
+054B;N # ARMENIAN CAPITAL LETTER JHEH
+054C;N # ARMENIAN CAPITAL LETTER RA
+054D;N # ARMENIAN CAPITAL LETTER SEH
+054E;N # ARMENIAN CAPITAL LETTER VEW
+054F;N # ARMENIAN CAPITAL LETTER TIWN
+0550;N # ARMENIAN CAPITAL LETTER REH
+0551;N # ARMENIAN CAPITAL LETTER CO
+0552;N # ARMENIAN CAPITAL LETTER YIWN
+0553;N # ARMENIAN CAPITAL LETTER PIWR
+0554;N # ARMENIAN CAPITAL LETTER KEH
+0555;N # ARMENIAN CAPITAL LETTER OH
+0556;N # ARMENIAN CAPITAL LETTER FEH
+0559;N # ARMENIAN MODIFIER LETTER LEFT HALF RING
+055A;N # ARMENIAN APOSTROPHE
+055B;N # ARMENIAN EMPHASIS MARK
+055C;N # ARMENIAN EXCLAMATION MARK
+055D;N # ARMENIAN COMMA
+055E;N # ARMENIAN QUESTION MARK
+055F;N # ARMENIAN ABBREVIATION MARK
+0561;N # ARMENIAN SMALL LETTER AYB
+0562;N # ARMENIAN SMALL LETTER BEN
+0563;N # ARMENIAN SMALL LETTER GIM
+0564;N # ARMENIAN SMALL LETTER DA
+0565;N # ARMENIAN SMALL LETTER ECH
+0566;N # ARMENIAN SMALL LETTER ZA
+0567;N # ARMENIAN SMALL LETTER EH
+0568;N # ARMENIAN SMALL LETTER ET
+0569;N # ARMENIAN SMALL LETTER TO
+056A;N # ARMENIAN SMALL LETTER ZHE
+056B;N # ARMENIAN SMALL LETTER INI
+056C;N # ARMENIAN SMALL LETTER LIWN
+056D;N # ARMENIAN SMALL LETTER XEH
+056E;N # ARMENIAN SMALL LETTER CA
+056F;N # ARMENIAN SMALL LETTER KEN
+0570;N # ARMENIAN SMALL LETTER HO
+0571;N # ARMENIAN SMALL LETTER JA
+0572;N # ARMENIAN SMALL LETTER GHAD
+0573;N # ARMENIAN SMALL LETTER CHEH
+0574;N # ARMENIAN SMALL LETTER MEN
+0575;N # ARMENIAN SMALL LETTER YI
+0576;N # ARMENIAN SMALL LETTER NOW
+0577;N # ARMENIAN SMALL LETTER SHA
+0578;N # ARMENIAN SMALL LETTER VO
+0579;N # ARMENIAN SMALL LETTER CHA
+057A;N # ARMENIAN SMALL LETTER PEH
+057B;N # ARMENIAN SMALL LETTER JHEH
+057C;N # ARMENIAN SMALL LETTER RA
+057D;N # ARMENIAN SMALL LETTER SEH
+057E;N # ARMENIAN SMALL LETTER VEW
+057F;N # ARMENIAN SMALL LETTER TIWN
+0580;N # ARMENIAN SMALL LETTER REH
+0581;N # ARMENIAN SMALL LETTER CO
+0582;N # ARMENIAN SMALL LETTER YIWN
+0583;N # ARMENIAN SMALL LETTER PIWR
+0584;N # ARMENIAN SMALL LETTER KEH
+0585;N # ARMENIAN SMALL LETTER OH
+0586;N # ARMENIAN SMALL LETTER FEH
+0587;N # ARMENIAN SMALL LIGATURE ECH YIWN
+0589;N # ARMENIAN FULL STOP
+058A;N # ARMENIAN HYPHEN
+0591;N # HEBREW ACCENT ETNAHTA
+0592;N # HEBREW ACCENT SEGOL
+0593;N # HEBREW ACCENT SHALSHELET
+0594;N # HEBREW ACCENT ZAQEF QATAN
+0595;N # HEBREW ACCENT ZAQEF GADOL
+0596;N # HEBREW ACCENT TIPEHA
+0597;N # HEBREW ACCENT REVIA
+0598;N # HEBREW ACCENT ZARQA
+0599;N # HEBREW ACCENT PASHTA
+059A;N # HEBREW ACCENT YETIV
+059B;N # HEBREW ACCENT TEVIR
+059C;N # HEBREW ACCENT GERESH
+059D;N # HEBREW ACCENT GERESH MUQDAM
+059E;N # HEBREW ACCENT GERSHAYIM
+059F;N # HEBREW ACCENT QARNEY PARA
+05A0;N # HEBREW ACCENT TELISHA GEDOLA
+05A1;N # HEBREW ACCENT PAZER
+05A2;N # HEBREW ACCENT ATNAH HAFUKH
+05A3;N # HEBREW ACCENT MUNAH
+05A4;N # HEBREW ACCENT MAHAPAKH
+05A5;N # HEBREW ACCENT MERKHA
+05A6;N # HEBREW ACCENT MERKHA KEFULA
+05A7;N # HEBREW ACCENT DARGA
+05A8;N # HEBREW ACCENT QADMA
+05A9;N # HEBREW ACCENT TELISHA QETANA
+05AA;N # HEBREW ACCENT YERAH BEN YOMO
+05AB;N # HEBREW ACCENT OLE
+05AC;N # HEBREW ACCENT ILUY
+05AD;N # HEBREW ACCENT DEHI
+05AE;N # HEBREW ACCENT ZINOR
+05AF;N # HEBREW MARK MASORA CIRCLE
+05B0;N # HEBREW POINT SHEVA
+05B1;N # HEBREW POINT HATAF SEGOL
+05B2;N # HEBREW POINT HATAF PATAH
+05B3;N # HEBREW POINT HATAF QAMATS
+05B4;N # HEBREW POINT HIRIQ
+05B5;N # HEBREW POINT TSERE
+05B6;N # HEBREW POINT SEGOL
+05B7;N # HEBREW POINT PATAH
+05B8;N # HEBREW POINT QAMATS
+05B9;N # HEBREW POINT HOLAM
+05BB;N # HEBREW POINT QUBUTS
+05BC;N # HEBREW POINT DAGESH OR MAPIQ
+05BD;N # HEBREW POINT METEG
+05BE;N # HEBREW PUNCTUATION MAQAF
+05BF;N # HEBREW POINT RAFE
+05C0;N # HEBREW PUNCTUATION PASEQ
+05C1;N # HEBREW POINT SHIN DOT
+05C2;N # HEBREW POINT SIN DOT
+05C3;N # HEBREW PUNCTUATION SOF PASUQ
+05C4;N # HEBREW MARK UPPER DOT
+05C5;N # HEBREW MARK LOWER DOT
+05C6;N # HEBREW PUNCTUATION NUN HAFUKHA
+05C7;N # HEBREW POINT QAMATS QATAN
+05D0;N # HEBREW LETTER ALEF
+05D1;N # HEBREW LETTER BET
+05D2;N # HEBREW LETTER GIMEL
+05D3;N # HEBREW LETTER DALET
+05D4;N # HEBREW LETTER HE
+05D5;N # HEBREW LETTER VAV
+05D6;N # HEBREW LETTER ZAYIN
+05D7;N # HEBREW LETTER HET
+05D8;N # HEBREW LETTER TET
+05D9;N # HEBREW LETTER YOD
+05DA;N # HEBREW LETTER FINAL KAF
+05DB;N # HEBREW LETTER KAF
+05DC;N # HEBREW LETTER LAMED
+05DD;N # HEBREW LETTER FINAL MEM
+05DE;N # HEBREW LETTER MEM
+05DF;N # HEBREW LETTER FINAL NUN
+05E0;N # HEBREW LETTER NUN
+05E1;N # HEBREW LETTER SAMEKH
+05E2;N # HEBREW LETTER AYIN
+05E3;N # HEBREW LETTER FINAL PE
+05E4;N # HEBREW LETTER PE
+05E5;N # HEBREW LETTER FINAL TSADI
+05E6;N # HEBREW LETTER TSADI
+05E7;N # HEBREW LETTER QOF
+05E8;N # HEBREW LETTER RESH
+05E9;N # HEBREW LETTER SHIN
+05EA;N # HEBREW LETTER TAV
+05F0;N # HEBREW LIGATURE YIDDISH DOUBLE VAV
+05F1;N # HEBREW LIGATURE YIDDISH VAV YOD
+05F2;N # HEBREW LIGATURE YIDDISH DOUBLE YOD
+05F3;N # HEBREW PUNCTUATION GERESH
+05F4;N # HEBREW PUNCTUATION GERSHAYIM
+0600;N # ARABIC NUMBER SIGN
+0601;N # ARABIC SIGN SANAH
+0602;N # ARABIC FOOTNOTE MARKER
+0603;N # ARABIC SIGN SAFHA
+060B;N # AFGHANI SIGN
+060C;N # ARABIC COMMA
+060D;N # ARABIC DATE SEPARATOR
+060E;N # ARABIC POETIC VERSE SIGN
+060F;N # ARABIC SIGN MISRA
+0610;N # ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM
+0611;N # ARABIC SIGN ALAYHE ASSALLAM
+0612;N # ARABIC SIGN RAHMATULLAH ALAYHE
+0613;N # ARABIC SIGN RADI ALLAHOU ANHU
+0614;N # ARABIC SIGN TAKHALLUS
+0615;N # ARABIC SMALL HIGH TAH
+061B;N # ARABIC SEMICOLON
+061E;N # ARABIC TRIPLE DOT PUNCTUATION MARK
+061F;N # ARABIC QUESTION MARK
+0621;N # ARABIC LETTER HAMZA
+0622;N # ARABIC LETTER ALEF WITH MADDA ABOVE
+0623;N # ARABIC LETTER ALEF WITH HAMZA ABOVE
+0624;N # ARABIC LETTER WAW WITH HAMZA ABOVE
+0625;N # ARABIC LETTER ALEF WITH HAMZA BELOW
+0626;N # ARABIC LETTER YEH WITH HAMZA ABOVE
+0627;N # ARABIC LETTER ALEF
+0628;N # ARABIC LETTER BEH
+0629;N # ARABIC LETTER TEH MARBUTA
+062A;N # ARABIC LETTER TEH
+062B;N # ARABIC LETTER THEH
+062C;N # ARABIC LETTER JEEM
+062D;N # ARABIC LETTER HAH
+062E;N # ARABIC LETTER KHAH
+062F;N # ARABIC LETTER DAL
+0630;N # ARABIC LETTER THAL
+0631;N # ARABIC LETTER REH
+0632;N # ARABIC LETTER ZAIN
+0633;N # ARABIC LETTER SEEN
+0634;N # ARABIC LETTER SHEEN
+0635;N # ARABIC LETTER SAD
+0636;N # ARABIC LETTER DAD
+0637;N # ARABIC LETTER TAH
+0638;N # ARABIC LETTER ZAH
+0639;N # ARABIC LETTER AIN
+063A;N # ARABIC LETTER GHAIN
+0640;N # ARABIC TATWEEL
+0641;N # ARABIC LETTER FEH
+0642;N # ARABIC LETTER QAF
+0643;N # ARABIC LETTER KAF
+0644;N # ARABIC LETTER LAM
+0645;N # ARABIC LETTER MEEM
+0646;N # ARABIC LETTER NOON
+0647;N # ARABIC LETTER HEH
+0648;N # ARABIC LETTER WAW
+0649;N # ARABIC LETTER ALEF MAKSURA
+064A;N # ARABIC LETTER YEH
+064B;N # ARABIC FATHATAN
+064C;N # ARABIC DAMMATAN
+064D;N # ARABIC KASRATAN
+064E;N # ARABIC FATHA
+064F;N # ARABIC DAMMA
+0650;N # ARABIC KASRA
+0651;N # ARABIC SHADDA
+0652;N # ARABIC SUKUN
+0653;N # ARABIC MADDAH ABOVE
+0654;N # ARABIC HAMZA ABOVE
+0655;N # ARABIC HAMZA BELOW
+0656;N # ARABIC SUBSCRIPT ALEF
+0657;N # ARABIC INVERTED DAMMA
+0658;N # ARABIC MARK NOON GHUNNA
+0659;N # ARABIC ZWARAKAY
+065A;N # ARABIC VOWEL SIGN SMALL V ABOVE
+065B;N # ARABIC VOWEL SIGN INVERTED SMALL V ABOVE
+065C;N # ARABIC VOWEL SIGN DOT BELOW
+065D;N # ARABIC REVERSED DAMMA
+065E;N # ARABIC FATHA WITH TWO DOTS
+0660;N # ARABIC-INDIC DIGIT ZERO
+0661;N # ARABIC-INDIC DIGIT ONE
+0662;N # ARABIC-INDIC DIGIT TWO
+0663;N # ARABIC-INDIC DIGIT THREE
+0664;N # ARABIC-INDIC DIGIT FOUR
+0665;N # ARABIC-INDIC DIGIT FIVE
+0666;N # ARABIC-INDIC DIGIT SIX
+0667;N # ARABIC-INDIC DIGIT SEVEN
+0668;N # ARABIC-INDIC DIGIT EIGHT
+0669;N # ARABIC-INDIC DIGIT NINE
+066A;N # ARABIC PERCENT SIGN
+066B;N # ARABIC DECIMAL SEPARATOR
+066C;N # ARABIC THOUSANDS SEPARATOR
+066D;N # ARABIC FIVE POINTED STAR
+066E;N # ARABIC LETTER DOTLESS BEH
+066F;N # ARABIC LETTER DOTLESS QAF
+0670;N # ARABIC LETTER SUPERSCRIPT ALEF
+0671;N # ARABIC LETTER ALEF WASLA
+0672;N # ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE
+0673;N # ARABIC LETTER ALEF WITH WAVY HAMZA BELOW
+0674;N # ARABIC LETTER HIGH HAMZA
+0675;N # ARABIC LETTER HIGH HAMZA ALEF
+0676;N # ARABIC LETTER HIGH HAMZA WAW
+0677;N # ARABIC LETTER U WITH HAMZA ABOVE
+0678;N # ARABIC LETTER HIGH HAMZA YEH
+0679;N # ARABIC LETTER TTEH
+067A;N # ARABIC LETTER TTEHEH
+067B;N # ARABIC LETTER BEEH
+067C;N # ARABIC LETTER TEH WITH RING
+067D;N # ARABIC LETTER TEH WITH THREE DOTS ABOVE DOWNWARDS
+067E;N # ARABIC LETTER PEH
+067F;N # ARABIC LETTER TEHEH
+0680;N # ARABIC LETTER BEHEH
+0681;N # ARABIC LETTER HAH WITH HAMZA ABOVE
+0682;N # ARABIC LETTER HAH WITH TWO DOTS VERTICAL ABOVE
+0683;N # ARABIC LETTER NYEH
+0684;N # ARABIC LETTER DYEH
+0685;N # ARABIC LETTER HAH WITH THREE DOTS ABOVE
+0686;N # ARABIC LETTER TCHEH
+0687;N # ARABIC LETTER TCHEHEH
+0688;N # ARABIC LETTER DDAL
+0689;N # ARABIC LETTER DAL WITH RING
+068A;N # ARABIC LETTER DAL WITH DOT BELOW
+068B;N # ARABIC LETTER DAL WITH DOT BELOW AND SMALL TAH
+068C;N # ARABIC LETTER DAHAL
+068D;N # ARABIC LETTER DDAHAL
+068E;N # ARABIC LETTER DUL
+068F;N # ARABIC LETTER DAL WITH THREE DOTS ABOVE DOWNWARDS
+0690;N # ARABIC LETTER DAL WITH FOUR DOTS ABOVE
+0691;N # ARABIC LETTER RREH
+0692;N # ARABIC LETTER REH WITH SMALL V
+0693;N # ARABIC LETTER REH WITH RING
+0694;N # ARABIC LETTER REH WITH DOT BELOW
+0695;N # ARABIC LETTER REH WITH SMALL V BELOW
+0696;N # ARABIC LETTER REH WITH DOT BELOW AND DOT ABOVE
+0697;N # ARABIC LETTER REH WITH TWO DOTS ABOVE
+0698;N # ARABIC LETTER JEH
+0699;N # ARABIC LETTER REH WITH FOUR DOTS ABOVE
+069A;N # ARABIC LETTER SEEN WITH DOT BELOW AND DOT ABOVE
+069B;N # ARABIC LETTER SEEN WITH THREE DOTS BELOW
+069C;N # ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE
+069D;N # ARABIC LETTER SAD WITH TWO DOTS BELOW
+069E;N # ARABIC LETTER SAD WITH THREE DOTS ABOVE
+069F;N # ARABIC LETTER TAH WITH THREE DOTS ABOVE
+06A0;N # ARABIC LETTER AIN WITH THREE DOTS ABOVE
+06A1;N # ARABIC LETTER DOTLESS FEH
+06A2;N # ARABIC LETTER FEH WITH DOT MOVED BELOW
+06A3;N # ARABIC LETTER FEH WITH DOT BELOW
+06A4;N # ARABIC LETTER VEH
+06A5;N # ARABIC LETTER FEH WITH THREE DOTS BELOW
+06A6;N # ARABIC LETTER PEHEH
+06A7;N # ARABIC LETTER QAF WITH DOT ABOVE
+06A8;N # ARABIC LETTER QAF WITH THREE DOTS ABOVE
+06A9;N # ARABIC LETTER KEHEH
+06AA;N # ARABIC LETTER SWASH KAF
+06AB;N # ARABIC LETTER KAF WITH RING
+06AC;N # ARABIC LETTER KAF WITH DOT ABOVE
+06AD;N # ARABIC LETTER NG
+06AE;N # ARABIC LETTER KAF WITH THREE DOTS BELOW
+06AF;N # ARABIC LETTER GAF
+06B0;N # ARABIC LETTER GAF WITH RING
+06B1;N # ARABIC LETTER NGOEH
+06B2;N # ARABIC LETTER GAF WITH TWO DOTS BELOW
+06B3;N # ARABIC LETTER GUEH
+06B4;N # ARABIC LETTER GAF WITH THREE DOTS ABOVE
+06B5;N # ARABIC LETTER LAM WITH SMALL V
+06B6;N # ARABIC LETTER LAM WITH DOT ABOVE
+06B7;N # ARABIC LETTER LAM WITH THREE DOTS ABOVE
+06B8;N # ARABIC LETTER LAM WITH THREE DOTS BELOW
+06B9;N # ARABIC LETTER NOON WITH DOT BELOW
+06BA;N # ARABIC LETTER NOON GHUNNA
+06BB;N # ARABIC LETTER RNOON
+06BC;N # ARABIC LETTER NOON WITH RING
+06BD;N # ARABIC LETTER NOON WITH THREE DOTS ABOVE
+06BE;N # ARABIC LETTER HEH DOACHASHMEE
+06BF;N # ARABIC LETTER TCHEH WITH DOT ABOVE
+06C0;N # ARABIC LETTER HEH WITH YEH ABOVE
+06C1;N # ARABIC LETTER HEH GOAL
+06C2;N # ARABIC LETTER HEH GOAL WITH HAMZA ABOVE
+06C3;N # ARABIC LETTER TEH MARBUTA GOAL
+06C4;N # ARABIC LETTER WAW WITH RING
+06C5;N # ARABIC LETTER KIRGHIZ OE
+06C6;N # ARABIC LETTER OE
+06C7;N # ARABIC LETTER U
+06C8;N # ARABIC LETTER YU
+06C9;N # ARABIC LETTER KIRGHIZ YU
+06CA;N # ARABIC LETTER WAW WITH TWO DOTS ABOVE
+06CB;N # ARABIC LETTER VE
+06CC;N # ARABIC LETTER FARSI YEH
+06CD;N # ARABIC LETTER YEH WITH TAIL
+06CE;N # ARABIC LETTER YEH WITH SMALL V
+06CF;N # ARABIC LETTER WAW WITH DOT ABOVE
+06D0;N # ARABIC LETTER E
+06D1;N # ARABIC LETTER YEH WITH THREE DOTS BELOW
+06D2;N # ARABIC LETTER YEH BARREE
+06D3;N # ARABIC LETTER YEH BARREE WITH HAMZA ABOVE
+06D4;N # ARABIC FULL STOP
+06D5;N # ARABIC LETTER AE
+06D6;N # ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA
+06D7;N # ARABIC SMALL HIGH LIGATURE QAF WITH LAM WITH ALEF MAKSURA
+06D8;N # ARABIC SMALL HIGH MEEM INITIAL FORM
+06D9;N # ARABIC SMALL HIGH LAM ALEF
+06DA;N # ARABIC SMALL HIGH JEEM
+06DB;N # ARABIC SMALL HIGH THREE DOTS
+06DC;N # ARABIC SMALL HIGH SEEN
+06DD;N # ARABIC END OF AYAH
+06DE;N # ARABIC START OF RUB EL HIZB
+06DF;N # ARABIC SMALL HIGH ROUNDED ZERO
+06E0;N # ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO
+06E1;N # ARABIC SMALL HIGH DOTLESS HEAD OF KHAH
+06E2;N # ARABIC SMALL HIGH MEEM ISOLATED FORM
+06E3;N # ARABIC SMALL LOW SEEN
+06E4;N # ARABIC SMALL HIGH MADDA
+06E5;N # ARABIC SMALL WAW
+06E6;N # ARABIC SMALL YEH
+06E7;N # ARABIC SMALL HIGH YEH
+06E8;N # ARABIC SMALL HIGH NOON
+06E9;N # ARABIC PLACE OF SAJDAH
+06EA;N # ARABIC EMPTY CENTRE LOW STOP
+06EB;N # ARABIC EMPTY CENTRE HIGH STOP
+06EC;N # ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE
+06ED;N # ARABIC SMALL LOW MEEM
+06EE;N # ARABIC LETTER DAL WITH INVERTED V
+06EF;N # ARABIC LETTER REH WITH INVERTED V
+06F0;N # EXTENDED ARABIC-INDIC DIGIT ZERO
+06F1;N # EXTENDED ARABIC-INDIC DIGIT ONE
+06F2;N # EXTENDED ARABIC-INDIC DIGIT TWO
+06F3;N # EXTENDED ARABIC-INDIC DIGIT THREE
+06F4;N # EXTENDED ARABIC-INDIC DIGIT FOUR
+06F5;N # EXTENDED ARABIC-INDIC DIGIT FIVE
+06F6;N # EXTENDED ARABIC-INDIC DIGIT SIX
+06F7;N # EXTENDED ARABIC-INDIC DIGIT SEVEN
+06F8;N # EXTENDED ARABIC-INDIC DIGIT EIGHT
+06F9;N # EXTENDED ARABIC-INDIC DIGIT NINE
+06FA;N # ARABIC LETTER SHEEN WITH DOT BELOW
+06FB;N # ARABIC LETTER DAD WITH DOT BELOW
+06FC;N # ARABIC LETTER GHAIN WITH DOT BELOW
+06FD;N # ARABIC SIGN SINDHI AMPERSAND
+06FE;N # ARABIC SIGN SINDHI POSTPOSITION MEN
+06FF;N # ARABIC LETTER HEH WITH INVERTED V
+0700;N # SYRIAC END OF PARAGRAPH
+0701;N # SYRIAC SUPRALINEAR FULL STOP
+0702;N # SYRIAC SUBLINEAR FULL STOP
+0703;N # SYRIAC SUPRALINEAR COLON
+0704;N # SYRIAC SUBLINEAR COLON
+0705;N # SYRIAC HORIZONTAL COLON
+0706;N # SYRIAC COLON SKEWED LEFT
+0707;N # SYRIAC COLON SKEWED RIGHT
+0708;N # SYRIAC SUPRALINEAR COLON SKEWED LEFT
+0709;N # SYRIAC SUBLINEAR COLON SKEWED RIGHT
+070A;N # SYRIAC CONTRACTION
+070B;N # SYRIAC HARKLEAN OBELUS
+070C;N # SYRIAC HARKLEAN METOBELUS
+070D;N # SYRIAC HARKLEAN ASTERISCUS
+070F;N # SYRIAC ABBREVIATION MARK
+0710;N # SYRIAC LETTER ALAPH
+0711;N # SYRIAC LETTER SUPERSCRIPT ALAPH
+0712;N # SYRIAC LETTER BETH
+0713;N # SYRIAC LETTER GAMAL
+0714;N # SYRIAC LETTER GAMAL GARSHUNI
+0715;N # SYRIAC LETTER DALATH
+0716;N # SYRIAC LETTER DOTLESS DALATH RISH
+0717;N # SYRIAC LETTER HE
+0718;N # SYRIAC LETTER WAW
+0719;N # SYRIAC LETTER ZAIN
+071A;N # SYRIAC LETTER HETH
+071B;N # SYRIAC LETTER TETH
+071C;N # SYRIAC LETTER TETH GARSHUNI
+071D;N # SYRIAC LETTER YUDH
+071E;N # SYRIAC LETTER YUDH HE
+071F;N # SYRIAC LETTER KAPH
+0720;N # SYRIAC LETTER LAMADH
+0721;N # SYRIAC LETTER MIM
+0722;N # SYRIAC LETTER NUN
+0723;N # SYRIAC LETTER SEMKATH
+0724;N # SYRIAC LETTER FINAL SEMKATH
+0725;N # SYRIAC LETTER E
+0726;N # SYRIAC LETTER PE
+0727;N # SYRIAC LETTER REVERSED PE
+0728;N # SYRIAC LETTER SADHE
+0729;N # SYRIAC LETTER QAPH
+072A;N # SYRIAC LETTER RISH
+072B;N # SYRIAC LETTER SHIN
+072C;N # SYRIAC LETTER TAW
+072D;N # SYRIAC LETTER PERSIAN BHETH
+072E;N # SYRIAC LETTER PERSIAN GHAMAL
+072F;N # SYRIAC LETTER PERSIAN DHALATH
+0730;N # SYRIAC PTHAHA ABOVE
+0731;N # SYRIAC PTHAHA BELOW
+0732;N # SYRIAC PTHAHA DOTTED
+0733;N # SYRIAC ZQAPHA ABOVE
+0734;N # SYRIAC ZQAPHA BELOW
+0735;N # SYRIAC ZQAPHA DOTTED
+0736;N # SYRIAC RBASA ABOVE
+0737;N # SYRIAC RBASA BELOW
+0738;N # SYRIAC DOTTED ZLAMA HORIZONTAL
+0739;N # SYRIAC DOTTED ZLAMA ANGULAR
+073A;N # SYRIAC HBASA ABOVE
+073B;N # SYRIAC HBASA BELOW
+073C;N # SYRIAC HBASA-ESASA DOTTED
+073D;N # SYRIAC ESASA ABOVE
+073E;N # SYRIAC ESASA BELOW
+073F;N # SYRIAC RWAHA
+0740;N # SYRIAC FEMININE DOT
+0741;N # SYRIAC QUSHSHAYA
+0742;N # SYRIAC RUKKAKHA
+0743;N # SYRIAC TWO VERTICAL DOTS ABOVE
+0744;N # SYRIAC TWO VERTICAL DOTS BELOW
+0745;N # SYRIAC THREE DOTS ABOVE
+0746;N # SYRIAC THREE DOTS BELOW
+0747;N # SYRIAC OBLIQUE LINE ABOVE
+0748;N # SYRIAC OBLIQUE LINE BELOW
+0749;N # SYRIAC MUSIC
+074A;N # SYRIAC BARREKH
+074D;N # SYRIAC LETTER SOGDIAN ZHAIN
+074E;N # SYRIAC LETTER SOGDIAN KHAPH
+074F;N # SYRIAC LETTER SOGDIAN FE
+0750;N # ARABIC LETTER BEH WITH THREE DOTS HORIZONTALLY BELOW
+0751;N # ARABIC LETTER BEH WITH DOT BELOW AND THREE DOTS ABOVE
+0752;N # ARABIC LETTER BEH WITH THREE DOTS POINTING UPWARDS BELOW
+0753;N # ARABIC LETTER BEH WITH THREE DOTS POINTING UPWARDS BELOW AND TWO DOTS ABOVE
+0754;N # ARABIC LETTER BEH WITH TWO DOTS BELOW AND DOT ABOVE
+0755;N # ARABIC LETTER BEH WITH INVERTED SMALL V BELOW
+0756;N # ARABIC LETTER BEH WITH SMALL V
+0757;N # ARABIC LETTER HAH WITH TWO DOTS ABOVE
+0758;N # ARABIC LETTER HAH WITH THREE DOTS POINTING UPWARDS BELOW
+0759;N # ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW AND SMALL TAH
+075A;N # ARABIC LETTER DAL WITH INVERTED SMALL V BELOW
+075B;N # ARABIC LETTER REH WITH STROKE
+075C;N # ARABIC LETTER SEEN WITH FOUR DOTS ABOVE
+075D;N # ARABIC LETTER AIN WITH TWO DOTS ABOVE
+075E;N # ARABIC LETTER AIN WITH THREE DOTS POINTING DOWNWARDS ABOVE
+075F;N # ARABIC LETTER AIN WITH TWO DOTS VERTICALLY ABOVE
+0760;N # ARABIC LETTER FEH WITH TWO DOTS BELOW
+0761;N # ARABIC LETTER FEH WITH THREE DOTS POINTING UPWARDS BELOW
+0762;N # ARABIC LETTER KEHEH WITH DOT ABOVE
+0763;N # ARABIC LETTER KEHEH WITH THREE DOTS ABOVE
+0764;N # ARABIC LETTER KEHEH WITH THREE DOTS POINTING UPWARDS BELOW
+0765;N # ARABIC LETTER MEEM WITH DOT ABOVE
+0766;N # ARABIC LETTER MEEM WITH DOT BELOW
+0767;N # ARABIC LETTER NOON WITH TWO DOTS BELOW
+0768;N # ARABIC LETTER NOON WITH SMALL TAH
+0769;N # ARABIC LETTER NOON WITH SMALL V
+076A;N # ARABIC LETTER LAM WITH BAR
+076B;N # ARABIC LETTER REH WITH TWO DOTS VERTICALLY ABOVE
+076C;N # ARABIC LETTER REH WITH HAMZA ABOVE
+076D;N # ARABIC LETTER SEEN WITH TWO DOTS VERTICALLY ABOVE
+0780;N # THAANA LETTER HAA
+0781;N # THAANA LETTER SHAVIYANI
+0782;N # THAANA LETTER NOONU
+0783;N # THAANA LETTER RAA
+0784;N # THAANA LETTER BAA
+0785;N # THAANA LETTER LHAVIYANI
+0786;N # THAANA LETTER KAAFU
+0787;N # THAANA LETTER ALIFU
+0788;N # THAANA LETTER VAAVU
+0789;N # THAANA LETTER MEEMU
+078A;N # THAANA LETTER FAAFU
+078B;N # THAANA LETTER DHAALU
+078C;N # THAANA LETTER THAA
+078D;N # THAANA LETTER LAAMU
+078E;N # THAANA LETTER GAAFU
+078F;N # THAANA LETTER GNAVIYANI
+0790;N # THAANA LETTER SEENU
+0791;N # THAANA LETTER DAVIYANI
+0792;N # THAANA LETTER ZAVIYANI
+0793;N # THAANA LETTER TAVIYANI
+0794;N # THAANA LETTER YAA
+0795;N # THAANA LETTER PAVIYANI
+0796;N # THAANA LETTER JAVIYANI
+0797;N # THAANA LETTER CHAVIYANI
+0798;N # THAANA LETTER TTAA
+0799;N # THAANA LETTER HHAA
+079A;N # THAANA LETTER KHAA
+079B;N # THAANA LETTER THAALU
+079C;N # THAANA LETTER ZAA
+079D;N # THAANA LETTER SHEENU
+079E;N # THAANA LETTER SAADHU
+079F;N # THAANA LETTER DAADHU
+07A0;N # THAANA LETTER TO
+07A1;N # THAANA LETTER ZO
+07A2;N # THAANA LETTER AINU
+07A3;N # THAANA LETTER GHAINU
+07A4;N # THAANA LETTER QAAFU
+07A5;N # THAANA LETTER WAAVU
+07A6;N # THAANA ABAFILI
+07A7;N # THAANA AABAAFILI
+07A8;N # THAANA IBIFILI
+07A9;N # THAANA EEBEEFILI
+07AA;N # THAANA UBUFILI
+07AB;N # THAANA OOBOOFILI
+07AC;N # THAANA EBEFILI
+07AD;N # THAANA EYBEYFILI
+07AE;N # THAANA OBOFILI
+07AF;N # THAANA OABOAFILI
+07B0;N # THAANA SUKUN
+07B1;N # THAANA LETTER NAA
+0901;N # DEVANAGARI SIGN CANDRABINDU
+0902;N # DEVANAGARI SIGN ANUSVARA
+0903;N # DEVANAGARI SIGN VISARGA
+0904;N # DEVANAGARI LETTER SHORT A
+0905;N # DEVANAGARI LETTER A
+0906;N # DEVANAGARI LETTER AA
+0907;N # DEVANAGARI LETTER I
+0908;N # DEVANAGARI LETTER II
+0909;N # DEVANAGARI LETTER U
+090A;N # DEVANAGARI LETTER UU
+090B;N # DEVANAGARI LETTER VOCALIC R
+090C;N # DEVANAGARI LETTER VOCALIC L
+090D;N # DEVANAGARI LETTER CANDRA E
+090E;N # DEVANAGARI LETTER SHORT E
+090F;N # DEVANAGARI LETTER E
+0910;N # DEVANAGARI LETTER AI
+0911;N # DEVANAGARI LETTER CANDRA O
+0912;N # DEVANAGARI LETTER SHORT O
+0913;N # DEVANAGARI LETTER O
+0914;N # DEVANAGARI LETTER AU
+0915;N # DEVANAGARI LETTER KA
+0916;N # DEVANAGARI LETTER KHA
+0917;N # DEVANAGARI LETTER GA
+0918;N # DEVANAGARI LETTER GHA
+0919;N # DEVANAGARI LETTER NGA
+091A;N # DEVANAGARI LETTER CA
+091B;N # DEVANAGARI LETTER CHA
+091C;N # DEVANAGARI LETTER JA
+091D;N # DEVANAGARI LETTER JHA
+091E;N # DEVANAGARI LETTER NYA
+091F;N # DEVANAGARI LETTER TTA
+0920;N # DEVANAGARI LETTER TTHA
+0921;N # DEVANAGARI LETTER DDA
+0922;N # DEVANAGARI LETTER DDHA
+0923;N # DEVANAGARI LETTER NNA
+0924;N # DEVANAGARI LETTER TA
+0925;N # DEVANAGARI LETTER THA
+0926;N # DEVANAGARI LETTER DA
+0927;N # DEVANAGARI LETTER DHA
+0928;N # DEVANAGARI LETTER NA
+0929;N # DEVANAGARI LETTER NNNA
+092A;N # DEVANAGARI LETTER PA
+092B;N # DEVANAGARI LETTER PHA
+092C;N # DEVANAGARI LETTER BA
+092D;N # DEVANAGARI LETTER BHA
+092E;N # DEVANAGARI LETTER MA
+092F;N # DEVANAGARI LETTER YA
+0930;N # DEVANAGARI LETTER RA
+0931;N # DEVANAGARI LETTER RRA
+0932;N # DEVANAGARI LETTER LA
+0933;N # DEVANAGARI LETTER LLA
+0934;N # DEVANAGARI LETTER LLLA
+0935;N # DEVANAGARI LETTER VA
+0936;N # DEVANAGARI LETTER SHA
+0937;N # DEVANAGARI LETTER SSA
+0938;N # DEVANAGARI LETTER SA
+0939;N # DEVANAGARI LETTER HA
+093C;N # DEVANAGARI SIGN NUKTA
+093D;N # DEVANAGARI SIGN AVAGRAHA
+093E;N # DEVANAGARI VOWEL SIGN AA
+093F;N # DEVANAGARI VOWEL SIGN I
+0940;N # DEVANAGARI VOWEL SIGN II
+0941;N # DEVANAGARI VOWEL SIGN U
+0942;N # DEVANAGARI VOWEL SIGN UU
+0943;N # DEVANAGARI VOWEL SIGN VOCALIC R
+0944;N # DEVANAGARI VOWEL SIGN VOCALIC RR
+0945;N # DEVANAGARI VOWEL SIGN CANDRA E
+0946;N # DEVANAGARI VOWEL SIGN SHORT E
+0947;N # DEVANAGARI VOWEL SIGN E
+0948;N # DEVANAGARI VOWEL SIGN AI
+0949;N # DEVANAGARI VOWEL SIGN CANDRA O
+094A;N # DEVANAGARI VOWEL SIGN SHORT O
+094B;N # DEVANAGARI VOWEL SIGN O
+094C;N # DEVANAGARI VOWEL SIGN AU
+094D;N # DEVANAGARI SIGN VIRAMA
+0950;N # DEVANAGARI OM
+0951;N # DEVANAGARI STRESS SIGN UDATTA
+0952;N # DEVANAGARI STRESS SIGN ANUDATTA
+0953;N # DEVANAGARI GRAVE ACCENT
+0954;N # DEVANAGARI ACUTE ACCENT
+0958;N # DEVANAGARI LETTER QA
+0959;N # DEVANAGARI LETTER KHHA
+095A;N # DEVANAGARI LETTER GHHA
+095B;N # DEVANAGARI LETTER ZA
+095C;N # DEVANAGARI LETTER DDDHA
+095D;N # DEVANAGARI LETTER RHA
+095E;N # DEVANAGARI LETTER FA
+095F;N # DEVANAGARI LETTER YYA
+0960;N # DEVANAGARI LETTER VOCALIC RR
+0961;N # DEVANAGARI LETTER VOCALIC LL
+0962;N # DEVANAGARI VOWEL SIGN VOCALIC L
+0963;N # DEVANAGARI VOWEL SIGN VOCALIC LL
+0964;N # DEVANAGARI DANDA
+0965;N # DEVANAGARI DOUBLE DANDA
+0966;N # DEVANAGARI DIGIT ZERO
+0967;N # DEVANAGARI DIGIT ONE
+0968;N # DEVANAGARI DIGIT TWO
+0969;N # DEVANAGARI DIGIT THREE
+096A;N # DEVANAGARI DIGIT FOUR
+096B;N # DEVANAGARI DIGIT FIVE
+096C;N # DEVANAGARI DIGIT SIX
+096D;N # DEVANAGARI DIGIT SEVEN
+096E;N # DEVANAGARI DIGIT EIGHT
+096F;N # DEVANAGARI DIGIT NINE
+0970;N # DEVANAGARI ABBREVIATION SIGN
+097D;N # DEVANAGARI LETTER GLOTTAL STOP
+0981;N # BENGALI SIGN CANDRABINDU
+0982;N # BENGALI SIGN ANUSVARA
+0983;N # BENGALI SIGN VISARGA
+0985;N # BENGALI LETTER A
+0986;N # BENGALI LETTER AA
+0987;N # BENGALI LETTER I
+0988;N # BENGALI LETTER II
+0989;N # BENGALI LETTER U
+098A;N # BENGALI LETTER UU
+098B;N # BENGALI LETTER VOCALIC R
+098C;N # BENGALI LETTER VOCALIC L
+098F;N # BENGALI LETTER E
+0990;N # BENGALI LETTER AI
+0993;N # BENGALI LETTER O
+0994;N # BENGALI LETTER AU
+0995;N # BENGALI LETTER KA
+0996;N # BENGALI LETTER KHA
+0997;N # BENGALI LETTER GA
+0998;N # BENGALI LETTER GHA
+0999;N # BENGALI LETTER NGA
+099A;N # BENGALI LETTER CA
+099B;N # BENGALI LETTER CHA
+099C;N # BENGALI LETTER JA
+099D;N # BENGALI LETTER JHA
+099E;N # BENGALI LETTER NYA
+099F;N # BENGALI LETTER TTA
+09A0;N # BENGALI LETTER TTHA
+09A1;N # BENGALI LETTER DDA
+09A2;N # BENGALI LETTER DDHA
+09A3;N # BENGALI LETTER NNA
+09A4;N # BENGALI LETTER TA
+09A5;N # BENGALI LETTER THA
+09A6;N # BENGALI LETTER DA
+09A7;N # BENGALI LETTER DHA
+09A8;N # BENGALI LETTER NA
+09AA;N # BENGALI LETTER PA
+09AB;N # BENGALI LETTER PHA
+09AC;N # BENGALI LETTER BA
+09AD;N # BENGALI LETTER BHA
+09AE;N # BENGALI LETTER MA
+09AF;N # BENGALI LETTER YA
+09B0;N # BENGALI LETTER RA
+09B2;N # BENGALI LETTER LA
+09B6;N # BENGALI LETTER SHA
+09B7;N # BENGALI LETTER SSA
+09B8;N # BENGALI LETTER SA
+09B9;N # BENGALI LETTER HA
+09BC;N # BENGALI SIGN NUKTA
+09BD;N # BENGALI SIGN AVAGRAHA
+09BE;N # BENGALI VOWEL SIGN AA
+09BF;N # BENGALI VOWEL SIGN I
+09C0;N # BENGALI VOWEL SIGN II
+09C1;N # BENGALI VOWEL SIGN U
+09C2;N # BENGALI VOWEL SIGN UU
+09C3;N # BENGALI VOWEL SIGN VOCALIC R
+09C4;N # BENGALI VOWEL SIGN VOCALIC RR
+09C7;N # BENGALI VOWEL SIGN E
+09C8;N # BENGALI VOWEL SIGN AI
+09CB;N # BENGALI VOWEL SIGN O
+09CC;N # BENGALI VOWEL SIGN AU
+09CD;N # BENGALI SIGN VIRAMA
+09CE;N # BENGALI LETTER KHANDA TA
+09D7;N # BENGALI AU LENGTH MARK
+09DC;N # BENGALI LETTER RRA
+09DD;N # BENGALI LETTER RHA
+09DF;N # BENGALI LETTER YYA
+09E0;N # BENGALI LETTER VOCALIC RR
+09E1;N # BENGALI LETTER VOCALIC LL
+09E2;N # BENGALI VOWEL SIGN VOCALIC L
+09E3;N # BENGALI VOWEL SIGN VOCALIC LL
+09E6;N # BENGALI DIGIT ZERO
+09E7;N # BENGALI DIGIT ONE
+09E8;N # BENGALI DIGIT TWO
+09E9;N # BENGALI DIGIT THREE
+09EA;N # BENGALI DIGIT FOUR
+09EB;N # BENGALI DIGIT FIVE
+09EC;N # BENGALI DIGIT SIX
+09ED;N # BENGALI DIGIT SEVEN
+09EE;N # BENGALI DIGIT EIGHT
+09EF;N # BENGALI DIGIT NINE
+09F0;N # BENGALI LETTER RA WITH MIDDLE DIAGONAL
+09F1;N # BENGALI LETTER RA WITH LOWER DIAGONAL
+09F2;N # BENGALI RUPEE MARK
+09F3;N # BENGALI RUPEE SIGN
+09F4;N # BENGALI CURRENCY NUMERATOR ONE
+09F5;N # BENGALI CURRENCY NUMERATOR TWO
+09F6;N # BENGALI CURRENCY NUMERATOR THREE
+09F7;N # BENGALI CURRENCY NUMERATOR FOUR
+09F8;N # BENGALI CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
+09F9;N # BENGALI CURRENCY DENOMINATOR SIXTEEN
+09FA;N # BENGALI ISSHAR
+0A01;N # GURMUKHI SIGN ADAK BINDI
+0A02;N # GURMUKHI SIGN BINDI
+0A03;N # GURMUKHI SIGN VISARGA
+0A05;N # GURMUKHI LETTER A
+0A06;N # GURMUKHI LETTER AA
+0A07;N # GURMUKHI LETTER I
+0A08;N # GURMUKHI LETTER II
+0A09;N # GURMUKHI LETTER U
+0A0A;N # GURMUKHI LETTER UU
+0A0F;N # GURMUKHI LETTER EE
+0A10;N # GURMUKHI LETTER AI
+0A13;N # GURMUKHI LETTER OO
+0A14;N # GURMUKHI LETTER AU
+0A15;N # GURMUKHI LETTER KA
+0A16;N # GURMUKHI LETTER KHA
+0A17;N # GURMUKHI LETTER GA
+0A18;N # GURMUKHI LETTER GHA
+0A19;N # GURMUKHI LETTER NGA
+0A1A;N # GURMUKHI LETTER CA
+0A1B;N # GURMUKHI LETTER CHA
+0A1C;N # GURMUKHI LETTER JA
+0A1D;N # GURMUKHI LETTER JHA
+0A1E;N # GURMUKHI LETTER NYA
+0A1F;N # GURMUKHI LETTER TTA
+0A20;N # GURMUKHI LETTER TTHA
+0A21;N # GURMUKHI LETTER DDA
+0A22;N # GURMUKHI LETTER DDHA
+0A23;N # GURMUKHI LETTER NNA
+0A24;N # GURMUKHI LETTER TA
+0A25;N # GURMUKHI LETTER THA
+0A26;N # GURMUKHI LETTER DA
+0A27;N # GURMUKHI LETTER DHA
+0A28;N # GURMUKHI LETTER NA
+0A2A;N # GURMUKHI LETTER PA
+0A2B;N # GURMUKHI LETTER PHA
+0A2C;N # GURMUKHI LETTER BA
+0A2D;N # GURMUKHI LETTER BHA
+0A2E;N # GURMUKHI LETTER MA
+0A2F;N # GURMUKHI LETTER YA
+0A30;N # GURMUKHI LETTER RA
+0A32;N # GURMUKHI LETTER LA
+0A33;N # GURMUKHI LETTER LLA
+0A35;N # GURMUKHI LETTER VA
+0A36;N # GURMUKHI LETTER SHA
+0A38;N # GURMUKHI LETTER SA
+0A39;N # GURMUKHI LETTER HA
+0A3C;N # GURMUKHI SIGN NUKTA
+0A3E;N # GURMUKHI VOWEL SIGN AA
+0A3F;N # GURMUKHI VOWEL SIGN I
+0A40;N # GURMUKHI VOWEL SIGN II
+0A41;N # GURMUKHI VOWEL SIGN U
+0A42;N # GURMUKHI VOWEL SIGN UU
+0A47;N # GURMUKHI VOWEL SIGN EE
+0A48;N # GURMUKHI VOWEL SIGN AI
+0A4B;N # GURMUKHI VOWEL SIGN OO
+0A4C;N # GURMUKHI VOWEL SIGN AU
+0A4D;N # GURMUKHI SIGN VIRAMA
+0A59;N # GURMUKHI LETTER KHHA
+0A5A;N # GURMUKHI LETTER GHHA
+0A5B;N # GURMUKHI LETTER ZA
+0A5C;N # GURMUKHI LETTER RRA
+0A5E;N # GURMUKHI LETTER FA
+0A66;N # GURMUKHI DIGIT ZERO
+0A67;N # GURMUKHI DIGIT ONE
+0A68;N # GURMUKHI DIGIT TWO
+0A69;N # GURMUKHI DIGIT THREE
+0A6A;N # GURMUKHI DIGIT FOUR
+0A6B;N # GURMUKHI DIGIT FIVE
+0A6C;N # GURMUKHI DIGIT SIX
+0A6D;N # GURMUKHI DIGIT SEVEN
+0A6E;N # GURMUKHI DIGIT EIGHT
+0A6F;N # GURMUKHI DIGIT NINE
+0A70;N # GURMUKHI TIPPI
+0A71;N # GURMUKHI ADDAK
+0A72;N # GURMUKHI IRI
+0A73;N # GURMUKHI URA
+0A74;N # GURMUKHI EK ONKAR
+0A81;N # GUJARATI SIGN CANDRABINDU
+0A82;N # GUJARATI SIGN ANUSVARA
+0A83;N # GUJARATI SIGN VISARGA
+0A85;N # GUJARATI LETTER A
+0A86;N # GUJARATI LETTER AA
+0A87;N # GUJARATI LETTER I
+0A88;N # GUJARATI LETTER II
+0A89;N # GUJARATI LETTER U
+0A8A;N # GUJARATI LETTER UU
+0A8B;N # GUJARATI LETTER VOCALIC R
+0A8C;N # GUJARATI LETTER VOCALIC L
+0A8D;N # GUJARATI VOWEL CANDRA E
+0A8F;N # GUJARATI LETTER E
+0A90;N # GUJARATI LETTER AI
+0A91;N # GUJARATI VOWEL CANDRA O
+0A93;N # GUJARATI LETTER O
+0A94;N # GUJARATI LETTER AU
+0A95;N # GUJARATI LETTER KA
+0A96;N # GUJARATI LETTER KHA
+0A97;N # GUJARATI LETTER GA
+0A98;N # GUJARATI LETTER GHA
+0A99;N # GUJARATI LETTER NGA
+0A9A;N # GUJARATI LETTER CA
+0A9B;N # GUJARATI LETTER CHA
+0A9C;N # GUJARATI LETTER JA
+0A9D;N # GUJARATI LETTER JHA
+0A9E;N # GUJARATI LETTER NYA
+0A9F;N # GUJARATI LETTER TTA
+0AA0;N # GUJARATI LETTER TTHA
+0AA1;N # GUJARATI LETTER DDA
+0AA2;N # GUJARATI LETTER DDHA
+0AA3;N # GUJARATI LETTER NNA
+0AA4;N # GUJARATI LETTER TA
+0AA5;N # GUJARATI LETTER THA
+0AA6;N # GUJARATI LETTER DA
+0AA7;N # GUJARATI LETTER DHA
+0AA8;N # GUJARATI LETTER NA
+0AAA;N # GUJARATI LETTER PA
+0AAB;N # GUJARATI LETTER PHA
+0AAC;N # GUJARATI LETTER BA
+0AAD;N # GUJARATI LETTER BHA
+0AAE;N # GUJARATI LETTER MA
+0AAF;N # GUJARATI LETTER YA
+0AB0;N # GUJARATI LETTER RA
+0AB2;N # GUJARATI LETTER LA
+0AB3;N # GUJARATI LETTER LLA
+0AB5;N # GUJARATI LETTER VA
+0AB6;N # GUJARATI LETTER SHA
+0AB7;N # GUJARATI LETTER SSA
+0AB8;N # GUJARATI LETTER SA
+0AB9;N # GUJARATI LETTER HA
+0ABC;N # GUJARATI SIGN NUKTA
+0ABD;N # GUJARATI SIGN AVAGRAHA
+0ABE;N # GUJARATI VOWEL SIGN AA
+0ABF;N # GUJARATI VOWEL SIGN I
+0AC0;N # GUJARATI VOWEL SIGN II
+0AC1;N # GUJARATI VOWEL SIGN U
+0AC2;N # GUJARATI VOWEL SIGN UU
+0AC3;N # GUJARATI VOWEL SIGN VOCALIC R
+0AC4;N # GUJARATI VOWEL SIGN VOCALIC RR
+0AC5;N # GUJARATI VOWEL SIGN CANDRA E
+0AC7;N # GUJARATI VOWEL SIGN E
+0AC8;N # GUJARATI VOWEL SIGN AI
+0AC9;N # GUJARATI VOWEL SIGN CANDRA O
+0ACB;N # GUJARATI VOWEL SIGN O
+0ACC;N # GUJARATI VOWEL SIGN AU
+0ACD;N # GUJARATI SIGN VIRAMA
+0AD0;N # GUJARATI OM
+0AE0;N # GUJARATI LETTER VOCALIC RR
+0AE1;N # GUJARATI LETTER VOCALIC LL
+0AE2;N # GUJARATI VOWEL SIGN VOCALIC L
+0AE3;N # GUJARATI VOWEL SIGN VOCALIC LL
+0AE6;N # GUJARATI DIGIT ZERO
+0AE7;N # GUJARATI DIGIT ONE
+0AE8;N # GUJARATI DIGIT TWO
+0AE9;N # GUJARATI DIGIT THREE
+0AEA;N # GUJARATI DIGIT FOUR
+0AEB;N # GUJARATI DIGIT FIVE
+0AEC;N # GUJARATI DIGIT SIX
+0AED;N # GUJARATI DIGIT SEVEN
+0AEE;N # GUJARATI DIGIT EIGHT
+0AEF;N # GUJARATI DIGIT NINE
+0AF1;N # GUJARATI RUPEE SIGN
+0B01;N # ORIYA SIGN CANDRABINDU
+0B02;N # ORIYA SIGN ANUSVARA
+0B03;N # ORIYA SIGN VISARGA
+0B05;N # ORIYA LETTER A
+0B06;N # ORIYA LETTER AA
+0B07;N # ORIYA LETTER I
+0B08;N # ORIYA LETTER II
+0B09;N # ORIYA LETTER U
+0B0A;N # ORIYA LETTER UU
+0B0B;N # ORIYA LETTER VOCALIC R
+0B0C;N # ORIYA LETTER VOCALIC L
+0B0F;N # ORIYA LETTER E
+0B10;N # ORIYA LETTER AI
+0B13;N # ORIYA LETTER O
+0B14;N # ORIYA LETTER AU
+0B15;N # ORIYA LETTER KA
+0B16;N # ORIYA LETTER KHA
+0B17;N # ORIYA LETTER GA
+0B18;N # ORIYA LETTER GHA
+0B19;N # ORIYA LETTER NGA
+0B1A;N # ORIYA LETTER CA
+0B1B;N # ORIYA LETTER CHA
+0B1C;N # ORIYA LETTER JA
+0B1D;N # ORIYA LETTER JHA
+0B1E;N # ORIYA LETTER NYA
+0B1F;N # ORIYA LETTER TTA
+0B20;N # ORIYA LETTER TTHA
+0B21;N # ORIYA LETTER DDA
+0B22;N # ORIYA LETTER DDHA
+0B23;N # ORIYA LETTER NNA
+0B24;N # ORIYA LETTER TA
+0B25;N # ORIYA LETTER THA
+0B26;N # ORIYA LETTER DA
+0B27;N # ORIYA LETTER DHA
+0B28;N # ORIYA LETTER NA
+0B2A;N # ORIYA LETTER PA
+0B2B;N # ORIYA LETTER PHA
+0B2C;N # ORIYA LETTER BA
+0B2D;N # ORIYA LETTER BHA
+0B2E;N # ORIYA LETTER MA
+0B2F;N # ORIYA LETTER YA
+0B30;N # ORIYA LETTER RA
+0B32;N # ORIYA LETTER LA
+0B33;N # ORIYA LETTER LLA
+0B35;N # ORIYA LETTER VA
+0B36;N # ORIYA LETTER SHA
+0B37;N # ORIYA LETTER SSA
+0B38;N # ORIYA LETTER SA
+0B39;N # ORIYA LETTER HA
+0B3C;N # ORIYA SIGN NUKTA
+0B3D;N # ORIYA SIGN AVAGRAHA
+0B3E;N # ORIYA VOWEL SIGN AA
+0B3F;N # ORIYA VOWEL SIGN I
+0B40;N # ORIYA VOWEL SIGN II
+0B41;N # ORIYA VOWEL SIGN U
+0B42;N # ORIYA VOWEL SIGN UU
+0B43;N # ORIYA VOWEL SIGN VOCALIC R
+0B47;N # ORIYA VOWEL SIGN E
+0B48;N # ORIYA VOWEL SIGN AI
+0B4B;N # ORIYA VOWEL SIGN O
+0B4C;N # ORIYA VOWEL SIGN AU
+0B4D;N # ORIYA SIGN VIRAMA
+0B56;N # ORIYA AI LENGTH MARK
+0B57;N # ORIYA AU LENGTH MARK
+0B5C;N # ORIYA LETTER RRA
+0B5D;N # ORIYA LETTER RHA
+0B5F;N # ORIYA LETTER YYA
+0B60;N # ORIYA LETTER VOCALIC RR
+0B61;N # ORIYA LETTER VOCALIC LL
+0B66;N # ORIYA DIGIT ZERO
+0B67;N # ORIYA DIGIT ONE
+0B68;N # ORIYA DIGIT TWO
+0B69;N # ORIYA DIGIT THREE
+0B6A;N # ORIYA DIGIT FOUR
+0B6B;N # ORIYA DIGIT FIVE
+0B6C;N # ORIYA DIGIT SIX
+0B6D;N # ORIYA DIGIT SEVEN
+0B6E;N # ORIYA DIGIT EIGHT
+0B6F;N # ORIYA DIGIT NINE
+0B70;N # ORIYA ISSHAR
+0B71;N # ORIYA LETTER WA
+0B82;N # TAMIL SIGN ANUSVARA
+0B83;N # TAMIL SIGN VISARGA
+0B85;N # TAMIL LETTER A
+0B86;N # TAMIL LETTER AA
+0B87;N # TAMIL LETTER I
+0B88;N # TAMIL LETTER II
+0B89;N # TAMIL LETTER U
+0B8A;N # TAMIL LETTER UU
+0B8E;N # TAMIL LETTER E
+0B8F;N # TAMIL LETTER EE
+0B90;N # TAMIL LETTER AI
+0B92;N # TAMIL LETTER O
+0B93;N # TAMIL LETTER OO
+0B94;N # TAMIL LETTER AU
+0B95;N # TAMIL LETTER KA
+0B99;N # TAMIL LETTER NGA
+0B9A;N # TAMIL LETTER CA
+0B9C;N # TAMIL LETTER JA
+0B9E;N # TAMIL LETTER NYA
+0B9F;N # TAMIL LETTER TTA
+0BA3;N # TAMIL LETTER NNA
+0BA4;N # TAMIL LETTER TA
+0BA8;N # TAMIL LETTER NA
+0BA9;N # TAMIL LETTER NNNA
+0BAA;N # TAMIL LETTER PA
+0BAE;N # TAMIL LETTER MA
+0BAF;N # TAMIL LETTER YA
+0BB0;N # TAMIL LETTER RA
+0BB1;N # TAMIL LETTER RRA
+0BB2;N # TAMIL LETTER LA
+0BB3;N # TAMIL LETTER LLA
+0BB4;N # TAMIL LETTER LLLA
+0BB5;N # TAMIL LETTER VA
+0BB6;N # TAMIL LETTER SHA
+0BB7;N # TAMIL LETTER SSA
+0BB8;N # TAMIL LETTER SA
+0BB9;N # TAMIL LETTER HA
+0BBE;N # TAMIL VOWEL SIGN AA
+0BBF;N # TAMIL VOWEL SIGN I
+0BC0;N # TAMIL VOWEL SIGN II
+0BC1;N # TAMIL VOWEL SIGN U
+0BC2;N # TAMIL VOWEL SIGN UU
+0BC6;N # TAMIL VOWEL SIGN E
+0BC7;N # TAMIL VOWEL SIGN EE
+0BC8;N # TAMIL VOWEL SIGN AI
+0BCA;N # TAMIL VOWEL SIGN O
+0BCB;N # TAMIL VOWEL SIGN OO
+0BCC;N # TAMIL VOWEL SIGN AU
+0BCD;N # TAMIL SIGN VIRAMA
+0BD7;N # TAMIL AU LENGTH MARK
+0BE6;N # TAMIL DIGIT ZERO
+0BE7;N # TAMIL DIGIT ONE
+0BE8;N # TAMIL DIGIT TWO
+0BE9;N # TAMIL DIGIT THREE
+0BEA;N # TAMIL DIGIT FOUR
+0BEB;N # TAMIL DIGIT FIVE
+0BEC;N # TAMIL DIGIT SIX
+0BED;N # TAMIL DIGIT SEVEN
+0BEE;N # TAMIL DIGIT EIGHT
+0BEF;N # TAMIL DIGIT NINE
+0BF0;N # TAMIL NUMBER TEN
+0BF1;N # TAMIL NUMBER ONE HUNDRED
+0BF2;N # TAMIL NUMBER ONE THOUSAND
+0BF3;N # TAMIL DAY SIGN
+0BF4;N # TAMIL MONTH SIGN
+0BF5;N # TAMIL YEAR SIGN
+0BF6;N # TAMIL DEBIT SIGN
+0BF7;N # TAMIL CREDIT SIGN
+0BF8;N # TAMIL AS ABOVE SIGN
+0BF9;N # TAMIL RUPEE SIGN
+0BFA;N # TAMIL NUMBER SIGN
+0C01;N # TELUGU SIGN CANDRABINDU
+0C02;N # TELUGU SIGN ANUSVARA
+0C03;N # TELUGU SIGN VISARGA
+0C05;N # TELUGU LETTER A
+0C06;N # TELUGU LETTER AA
+0C07;N # TELUGU LETTER I
+0C08;N # TELUGU LETTER II
+0C09;N # TELUGU LETTER U
+0C0A;N # TELUGU LETTER UU
+0C0B;N # TELUGU LETTER VOCALIC R
+0C0C;N # TELUGU LETTER VOCALIC L
+0C0E;N # TELUGU LETTER E
+0C0F;N # TELUGU LETTER EE
+0C10;N # TELUGU LETTER AI
+0C12;N # TELUGU LETTER O
+0C13;N # TELUGU LETTER OO
+0C14;N # TELUGU LETTER AU
+0C15;N # TELUGU LETTER KA
+0C16;N # TELUGU LETTER KHA
+0C17;N # TELUGU LETTER GA
+0C18;N # TELUGU LETTER GHA
+0C19;N # TELUGU LETTER NGA
+0C1A;N # TELUGU LETTER CA
+0C1B;N # TELUGU LETTER CHA
+0C1C;N # TELUGU LETTER JA
+0C1D;N # TELUGU LETTER JHA
+0C1E;N # TELUGU LETTER NYA
+0C1F;N # TELUGU LETTER TTA
+0C20;N # TELUGU LETTER TTHA
+0C21;N # TELUGU LETTER DDA
+0C22;N # TELUGU LETTER DDHA
+0C23;N # TELUGU LETTER NNA
+0C24;N # TELUGU LETTER TA
+0C25;N # TELUGU LETTER THA
+0C26;N # TELUGU LETTER DA
+0C27;N # TELUGU LETTER DHA
+0C28;N # TELUGU LETTER NA
+0C2A;N # TELUGU LETTER PA
+0C2B;N # TELUGU LETTER PHA
+0C2C;N # TELUGU LETTER BA
+0C2D;N # TELUGU LETTER BHA
+0C2E;N # TELUGU LETTER MA
+0C2F;N # TELUGU LETTER YA
+0C30;N # TELUGU LETTER RA
+0C31;N # TELUGU LETTER RRA
+0C32;N # TELUGU LETTER LA
+0C33;N # TELUGU LETTER LLA
+0C35;N # TELUGU LETTER VA
+0C36;N # TELUGU LETTER SHA
+0C37;N # TELUGU LETTER SSA
+0C38;N # TELUGU LETTER SA
+0C39;N # TELUGU LETTER HA
+0C3E;N # TELUGU VOWEL SIGN AA
+0C3F;N # TELUGU VOWEL SIGN I
+0C40;N # TELUGU VOWEL SIGN II
+0C41;N # TELUGU VOWEL SIGN U
+0C42;N # TELUGU VOWEL SIGN UU
+0C43;N # TELUGU VOWEL SIGN VOCALIC R
+0C44;N # TELUGU VOWEL SIGN VOCALIC RR
+0C46;N # TELUGU VOWEL SIGN E
+0C47;N # TELUGU VOWEL SIGN EE
+0C48;N # TELUGU VOWEL SIGN AI
+0C4A;N # TELUGU VOWEL SIGN O
+0C4B;N # TELUGU VOWEL SIGN OO
+0C4C;N # TELUGU VOWEL SIGN AU
+0C4D;N # TELUGU SIGN VIRAMA
+0C55;N # TELUGU LENGTH MARK
+0C56;N # TELUGU AI LENGTH MARK
+0C60;N # TELUGU LETTER VOCALIC RR
+0C61;N # TELUGU LETTER VOCALIC LL
+0C66;N # TELUGU DIGIT ZERO
+0C67;N # TELUGU DIGIT ONE
+0C68;N # TELUGU DIGIT TWO
+0C69;N # TELUGU DIGIT THREE
+0C6A;N # TELUGU DIGIT FOUR
+0C6B;N # TELUGU DIGIT FIVE
+0C6C;N # TELUGU DIGIT SIX
+0C6D;N # TELUGU DIGIT SEVEN
+0C6E;N # TELUGU DIGIT EIGHT
+0C6F;N # TELUGU DIGIT NINE
+0C82;N # KANNADA SIGN ANUSVARA
+0C83;N # KANNADA SIGN VISARGA
+0C85;N # KANNADA LETTER A
+0C86;N # KANNADA LETTER AA
+0C87;N # KANNADA LETTER I
+0C88;N # KANNADA LETTER II
+0C89;N # KANNADA LETTER U
+0C8A;N # KANNADA LETTER UU
+0C8B;N # KANNADA LETTER VOCALIC R
+0C8C;N # KANNADA LETTER VOCALIC L
+0C8E;N # KANNADA LETTER E
+0C8F;N # KANNADA LETTER EE
+0C90;N # KANNADA LETTER AI
+0C92;N # KANNADA LETTER O
+0C93;N # KANNADA LETTER OO
+0C94;N # KANNADA LETTER AU
+0C95;N # KANNADA LETTER KA
+0C96;N # KANNADA LETTER KHA
+0C97;N # KANNADA LETTER GA
+0C98;N # KANNADA LETTER GHA
+0C99;N # KANNADA LETTER NGA
+0C9A;N # KANNADA LETTER CA
+0C9B;N # KANNADA LETTER CHA
+0C9C;N # KANNADA LETTER JA
+0C9D;N # KANNADA LETTER JHA
+0C9E;N # KANNADA LETTER NYA
+0C9F;N # KANNADA LETTER TTA
+0CA0;N # KANNADA LETTER TTHA
+0CA1;N # KANNADA LETTER DDA
+0CA2;N # KANNADA LETTER DDHA
+0CA3;N # KANNADA LETTER NNA
+0CA4;N # KANNADA LETTER TA
+0CA5;N # KANNADA LETTER THA
+0CA6;N # KANNADA LETTER DA
+0CA7;N # KANNADA LETTER DHA
+0CA8;N # KANNADA LETTER NA
+0CAA;N # KANNADA LETTER PA
+0CAB;N # KANNADA LETTER PHA
+0CAC;N # KANNADA LETTER BA
+0CAD;N # KANNADA LETTER BHA
+0CAE;N # KANNADA LETTER MA
+0CAF;N # KANNADA LETTER YA
+0CB0;N # KANNADA LETTER RA
+0CB1;N # KANNADA LETTER RRA
+0CB2;N # KANNADA LETTER LA
+0CB3;N # KANNADA LETTER LLA
+0CB5;N # KANNADA LETTER VA
+0CB6;N # KANNADA LETTER SHA
+0CB7;N # KANNADA LETTER SSA
+0CB8;N # KANNADA LETTER SA
+0CB9;N # KANNADA LETTER HA
+0CBC;N # KANNADA SIGN NUKTA
+0CBD;N # KANNADA SIGN AVAGRAHA
+0CBE;N # KANNADA VOWEL SIGN AA
+0CBF;N # KANNADA VOWEL SIGN I
+0CC0;N # KANNADA VOWEL SIGN II
+0CC1;N # KANNADA VOWEL SIGN U
+0CC2;N # KANNADA VOWEL SIGN UU
+0CC3;N # KANNADA VOWEL SIGN VOCALIC R
+0CC4;N # KANNADA VOWEL SIGN VOCALIC RR
+0CC6;N # KANNADA VOWEL SIGN E
+0CC7;N # KANNADA VOWEL SIGN EE
+0CC8;N # KANNADA VOWEL SIGN AI
+0CCA;N # KANNADA VOWEL SIGN O
+0CCB;N # KANNADA VOWEL SIGN OO
+0CCC;N # KANNADA VOWEL SIGN AU
+0CCD;N # KANNADA SIGN VIRAMA
+0CD5;N # KANNADA LENGTH MARK
+0CD6;N # KANNADA AI LENGTH MARK
+0CDE;N # KANNADA LETTER FA
+0CE0;N # KANNADA LETTER VOCALIC RR
+0CE1;N # KANNADA LETTER VOCALIC LL
+0CE6;N # KANNADA DIGIT ZERO
+0CE7;N # KANNADA DIGIT ONE
+0CE8;N # KANNADA DIGIT TWO
+0CE9;N # KANNADA DIGIT THREE
+0CEA;N # KANNADA DIGIT FOUR
+0CEB;N # KANNADA DIGIT FIVE
+0CEC;N # KANNADA DIGIT SIX
+0CED;N # KANNADA DIGIT SEVEN
+0CEE;N # KANNADA DIGIT EIGHT
+0CEF;N # KANNADA DIGIT NINE
+0D02;N # MALAYALAM SIGN ANUSVARA
+0D03;N # MALAYALAM SIGN VISARGA
+0D05;N # MALAYALAM LETTER A
+0D06;N # MALAYALAM LETTER AA
+0D07;N # MALAYALAM LETTER I
+0D08;N # MALAYALAM LETTER II
+0D09;N # MALAYALAM LETTER U
+0D0A;N # MALAYALAM LETTER UU
+0D0B;N # MALAYALAM LETTER VOCALIC R
+0D0C;N # MALAYALAM LETTER VOCALIC L
+0D0E;N # MALAYALAM LETTER E
+0D0F;N # MALAYALAM LETTER EE
+0D10;N # MALAYALAM LETTER AI
+0D12;N # MALAYALAM LETTER O
+0D13;N # MALAYALAM LETTER OO
+0D14;N # MALAYALAM LETTER AU
+0D15;N # MALAYALAM LETTER KA
+0D16;N # MALAYALAM LETTER KHA
+0D17;N # MALAYALAM LETTER GA
+0D18;N # MALAYALAM LETTER GHA
+0D19;N # MALAYALAM LETTER NGA
+0D1A;N # MALAYALAM LETTER CA
+0D1B;N # MALAYALAM LETTER CHA
+0D1C;N # MALAYALAM LETTER JA
+0D1D;N # MALAYALAM LETTER JHA
+0D1E;N # MALAYALAM LETTER NYA
+0D1F;N # MALAYALAM LETTER TTA
+0D20;N # MALAYALAM LETTER TTHA
+0D21;N # MALAYALAM LETTER DDA
+0D22;N # MALAYALAM LETTER DDHA
+0D23;N # MALAYALAM LETTER NNA
+0D24;N # MALAYALAM LETTER TA
+0D25;N # MALAYALAM LETTER THA
+0D26;N # MALAYALAM LETTER DA
+0D27;N # MALAYALAM LETTER DHA
+0D28;N # MALAYALAM LETTER NA
+0D2A;N # MALAYALAM LETTER PA
+0D2B;N # MALAYALAM LETTER PHA
+0D2C;N # MALAYALAM LETTER BA
+0D2D;N # MALAYALAM LETTER BHA
+0D2E;N # MALAYALAM LETTER MA
+0D2F;N # MALAYALAM LETTER YA
+0D30;N # MALAYALAM LETTER RA
+0D31;N # MALAYALAM LETTER RRA
+0D32;N # MALAYALAM LETTER LA
+0D33;N # MALAYALAM LETTER LLA
+0D34;N # MALAYALAM LETTER LLLA
+0D35;N # MALAYALAM LETTER VA
+0D36;N # MALAYALAM LETTER SHA
+0D37;N # MALAYALAM LETTER SSA
+0D38;N # MALAYALAM LETTER SA
+0D39;N # MALAYALAM LETTER HA
+0D3E;N # MALAYALAM VOWEL SIGN AA
+0D3F;N # MALAYALAM VOWEL SIGN I
+0D40;N # MALAYALAM VOWEL SIGN II
+0D41;N # MALAYALAM VOWEL SIGN U
+0D42;N # MALAYALAM VOWEL SIGN UU
+0D43;N # MALAYALAM VOWEL SIGN VOCALIC R
+0D46;N # MALAYALAM VOWEL SIGN E
+0D47;N # MALAYALAM VOWEL SIGN EE
+0D48;N # MALAYALAM VOWEL SIGN AI
+0D4A;N # MALAYALAM VOWEL SIGN O
+0D4B;N # MALAYALAM VOWEL SIGN OO
+0D4C;N # MALAYALAM VOWEL SIGN AU
+0D4D;N # MALAYALAM SIGN VIRAMA
+0D57;N # MALAYALAM AU LENGTH MARK
+0D60;N # MALAYALAM LETTER VOCALIC RR
+0D61;N # MALAYALAM LETTER VOCALIC LL
+0D66;N # MALAYALAM DIGIT ZERO
+0D67;N # MALAYALAM DIGIT ONE
+0D68;N # MALAYALAM DIGIT TWO
+0D69;N # MALAYALAM DIGIT THREE
+0D6A;N # MALAYALAM DIGIT FOUR
+0D6B;N # MALAYALAM DIGIT FIVE
+0D6C;N # MALAYALAM DIGIT SIX
+0D6D;N # MALAYALAM DIGIT SEVEN
+0D6E;N # MALAYALAM DIGIT EIGHT
+0D6F;N # MALAYALAM DIGIT NINE
+0D82;N # SINHALA SIGN ANUSVARAYA
+0D83;N # SINHALA SIGN VISARGAYA
+0D85;N # SINHALA LETTER AYANNA
+0D86;N # SINHALA LETTER AAYANNA
+0D87;N # SINHALA LETTER AEYANNA
+0D88;N # SINHALA LETTER AEEYANNA
+0D89;N # SINHALA LETTER IYANNA
+0D8A;N # SINHALA LETTER IIYANNA
+0D8B;N # SINHALA LETTER UYANNA
+0D8C;N # SINHALA LETTER UUYANNA
+0D8D;N # SINHALA LETTER IRUYANNA
+0D8E;N # SINHALA LETTER IRUUYANNA
+0D8F;N # SINHALA LETTER ILUYANNA
+0D90;N # SINHALA LETTER ILUUYANNA
+0D91;N # SINHALA LETTER EYANNA
+0D92;N # SINHALA LETTER EEYANNA
+0D93;N # SINHALA LETTER AIYANNA
+0D94;N # SINHALA LETTER OYANNA
+0D95;N # SINHALA LETTER OOYANNA
+0D96;N # SINHALA LETTER AUYANNA
+0D9A;N # SINHALA LETTER ALPAPRAANA KAYANNA
+0D9B;N # SINHALA LETTER MAHAAPRAANA KAYANNA
+0D9C;N # SINHALA LETTER ALPAPRAANA GAYANNA
+0D9D;N # SINHALA LETTER MAHAAPRAANA GAYANNA
+0D9E;N # SINHALA LETTER KANTAJA NAASIKYAYA
+0D9F;N # SINHALA LETTER SANYAKA GAYANNA
+0DA0;N # SINHALA LETTER ALPAPRAANA CAYANNA
+0DA1;N # SINHALA LETTER MAHAAPRAANA CAYANNA
+0DA2;N # SINHALA LETTER ALPAPRAANA JAYANNA
+0DA3;N # SINHALA LETTER MAHAAPRAANA JAYANNA
+0DA4;N # SINHALA LETTER TAALUJA NAASIKYAYA
+0DA5;N # SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA
+0DA6;N # SINHALA LETTER SANYAKA JAYANNA
+0DA7;N # SINHALA LETTER ALPAPRAANA TTAYANNA
+0DA8;N # SINHALA LETTER MAHAAPRAANA TTAYANNA
+0DA9;N # SINHALA LETTER ALPAPRAANA DDAYANNA
+0DAA;N # SINHALA LETTER MAHAAPRAANA DDAYANNA
+0DAB;N # SINHALA LETTER MUURDHAJA NAYANNA
+0DAC;N # SINHALA LETTER SANYAKA DDAYANNA
+0DAD;N # SINHALA LETTER ALPAPRAANA TAYANNA
+0DAE;N # SINHALA LETTER MAHAAPRAANA TAYANNA
+0DAF;N # SINHALA LETTER ALPAPRAANA DAYANNA
+0DB0;N # SINHALA LETTER MAHAAPRAANA DAYANNA
+0DB1;N # SINHALA LETTER DANTAJA NAYANNA
+0DB3;N # SINHALA LETTER SANYAKA DAYANNA
+0DB4;N # SINHALA LETTER ALPAPRAANA PAYANNA
+0DB5;N # SINHALA LETTER MAHAAPRAANA PAYANNA
+0DB6;N # SINHALA LETTER ALPAPRAANA BAYANNA
+0DB7;N # SINHALA LETTER MAHAAPRAANA BAYANNA
+0DB8;N # SINHALA LETTER MAYANNA
+0DB9;N # SINHALA LETTER AMBA BAYANNA
+0DBA;N # SINHALA LETTER YAYANNA
+0DBB;N # SINHALA LETTER RAYANNA
+0DBD;N # SINHALA LETTER DANTAJA LAYANNA
+0DC0;N # SINHALA LETTER VAYANNA
+0DC1;N # SINHALA LETTER TAALUJA SAYANNA
+0DC2;N # SINHALA LETTER MUURDHAJA SAYANNA
+0DC3;N # SINHALA LETTER DANTAJA SAYANNA
+0DC4;N # SINHALA LETTER HAYANNA
+0DC5;N # SINHALA LETTER MUURDHAJA LAYANNA
+0DC6;N # SINHALA LETTER FAYANNA
+0DCA;N # SINHALA SIGN AL-LAKUNA
+0DCF;N # SINHALA VOWEL SIGN AELA-PILLA
+0DD0;N # SINHALA VOWEL SIGN KETTI AEDA-PILLA
+0DD1;N # SINHALA VOWEL SIGN DIGA AEDA-PILLA
+0DD2;N # SINHALA VOWEL SIGN KETTI IS-PILLA
+0DD3;N # SINHALA VOWEL SIGN DIGA IS-PILLA
+0DD4;N # SINHALA VOWEL SIGN KETTI PAA-PILLA
+0DD6;N # SINHALA VOWEL SIGN DIGA PAA-PILLA
+0DD8;N # SINHALA VOWEL SIGN GAETTA-PILLA
+0DD9;N # SINHALA VOWEL SIGN KOMBUVA
+0DDA;N # SINHALA VOWEL SIGN DIGA KOMBUVA
+0DDB;N # SINHALA VOWEL SIGN KOMBU DEKA
+0DDC;N # SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA
+0DDD;N # SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA
+0DDE;N # SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA
+0DDF;N # SINHALA VOWEL SIGN GAYANUKITTA
+0DF2;N # SINHALA VOWEL SIGN DIGA GAETTA-PILLA
+0DF3;N # SINHALA VOWEL SIGN DIGA GAYANUKITTA
+0DF4;N # SINHALA PUNCTUATION KUNDDALIYA
+0E01;N # THAI CHARACTER KO KAI
+0E02;N # THAI CHARACTER KHO KHAI
+0E03;N # THAI CHARACTER KHO KHUAT
+0E04;N # THAI CHARACTER KHO KHWAI
+0E05;N # THAI CHARACTER KHO KHON
+0E06;N # THAI CHARACTER KHO RAKHANG
+0E07;N # THAI CHARACTER NGO NGU
+0E08;N # THAI CHARACTER CHO CHAN
+0E09;N # THAI CHARACTER CHO CHING
+0E0A;N # THAI CHARACTER CHO CHANG
+0E0B;N # THAI CHARACTER SO SO
+0E0C;N # THAI CHARACTER CHO CHOE
+0E0D;N # THAI CHARACTER YO YING
+0E0E;N # THAI CHARACTER DO CHADA
+0E0F;N # THAI CHARACTER TO PATAK
+0E10;N # THAI CHARACTER THO THAN
+0E11;N # THAI CHARACTER THO NANGMONTHO
+0E12;N # THAI CHARACTER THO PHUTHAO
+0E13;N # THAI CHARACTER NO NEN
+0E14;N # THAI CHARACTER DO DEK
+0E15;N # THAI CHARACTER TO TAO
+0E16;N # THAI CHARACTER THO THUNG
+0E17;N # THAI CHARACTER THO THAHAN
+0E18;N # THAI CHARACTER THO THONG
+0E19;N # THAI CHARACTER NO NU
+0E1A;N # THAI CHARACTER BO BAIMAI
+0E1B;N # THAI CHARACTER PO PLA
+0E1C;N # THAI CHARACTER PHO PHUNG
+0E1D;N # THAI CHARACTER FO FA
+0E1E;N # THAI CHARACTER PHO PHAN
+0E1F;N # THAI CHARACTER FO FAN
+0E20;N # THAI CHARACTER PHO SAMPHAO
+0E21;N # THAI CHARACTER MO MA
+0E22;N # THAI CHARACTER YO YAK
+0E23;N # THAI CHARACTER RO RUA
+0E24;N # THAI CHARACTER RU
+0E25;N # THAI CHARACTER LO LING
+0E26;N # THAI CHARACTER LU
+0E27;N # THAI CHARACTER WO WAEN
+0E28;N # THAI CHARACTER SO SALA
+0E29;N # THAI CHARACTER SO RUSI
+0E2A;N # THAI CHARACTER SO SUA
+0E2B;N # THAI CHARACTER HO HIP
+0E2C;N # THAI CHARACTER LO CHULA
+0E2D;N # THAI CHARACTER O ANG
+0E2E;N # THAI CHARACTER HO NOKHUK
+0E2F;N # THAI CHARACTER PAIYANNOI
+0E30;N # THAI CHARACTER SARA A
+0E31;N # THAI CHARACTER MAI HAN-AKAT
+0E32;N # THAI CHARACTER SARA AA
+0E33;N # THAI CHARACTER SARA AM
+0E34;N # THAI CHARACTER SARA I
+0E35;N # THAI CHARACTER SARA II
+0E36;N # THAI CHARACTER SARA UE
+0E37;N # THAI CHARACTER SARA UEE
+0E38;N # THAI CHARACTER SARA U
+0E39;N # THAI CHARACTER SARA UU
+0E3A;N # THAI CHARACTER PHINTHU
+0E3F;N # THAI CURRENCY SYMBOL BAHT
+0E40;N # THAI CHARACTER SARA E
+0E41;N # THAI CHARACTER SARA AE
+0E42;N # THAI CHARACTER SARA O
+0E43;N # THAI CHARACTER SARA AI MAIMUAN
+0E44;N # THAI CHARACTER SARA AI MAIMALAI
+0E45;N # THAI CHARACTER LAKKHANGYAO
+0E46;N # THAI CHARACTER MAIYAMOK
+0E47;N # THAI CHARACTER MAITAIKHU
+0E48;N # THAI CHARACTER MAI EK
+0E49;N # THAI CHARACTER MAI THO
+0E4A;N # THAI CHARACTER MAI TRI
+0E4B;N # THAI CHARACTER MAI CHATTAWA
+0E4C;N # THAI CHARACTER THANTHAKHAT
+0E4D;N # THAI CHARACTER NIKHAHIT
+0E4E;N # THAI CHARACTER YAMAKKAN
+0E4F;N # THAI CHARACTER FONGMAN
+0E50;N # THAI DIGIT ZERO
+0E51;N # THAI DIGIT ONE
+0E52;N # THAI DIGIT TWO
+0E53;N # THAI DIGIT THREE
+0E54;N # THAI DIGIT FOUR
+0E55;N # THAI DIGIT FIVE
+0E56;N # THAI DIGIT SIX
+0E57;N # THAI DIGIT SEVEN
+0E58;N # THAI DIGIT EIGHT
+0E59;N # THAI DIGIT NINE
+0E5A;N # THAI CHARACTER ANGKHANKHU
+0E5B;N # THAI CHARACTER KHOMUT
+0E81;N # LAO LETTER KO
+0E82;N # LAO LETTER KHO SUNG
+0E84;N # LAO LETTER KHO TAM
+0E87;N # LAO LETTER NGO
+0E88;N # LAO LETTER CO
+0E8A;N # LAO LETTER SO TAM
+0E8D;N # LAO LETTER NYO
+0E94;N # LAO LETTER DO
+0E95;N # LAO LETTER TO
+0E96;N # LAO LETTER THO SUNG
+0E97;N # LAO LETTER THO TAM
+0E99;N # LAO LETTER NO
+0E9A;N # LAO LETTER BO
+0E9B;N # LAO LETTER PO
+0E9C;N # LAO LETTER PHO SUNG
+0E9D;N # LAO LETTER FO TAM
+0E9E;N # LAO LETTER PHO TAM
+0E9F;N # LAO LETTER FO SUNG
+0EA1;N # LAO LETTER MO
+0EA2;N # LAO LETTER YO
+0EA3;N # LAO LETTER LO LING
+0EA5;N # LAO LETTER LO LOOT
+0EA7;N # LAO LETTER WO
+0EAA;N # LAO LETTER SO SUNG
+0EAB;N # LAO LETTER HO SUNG
+0EAD;N # LAO LETTER O
+0EAE;N # LAO LETTER HO TAM
+0EAF;N # LAO ELLIPSIS
+0EB0;N # LAO VOWEL SIGN A
+0EB1;N # LAO VOWEL SIGN MAI KAN
+0EB2;N # LAO VOWEL SIGN AA
+0EB3;N # LAO VOWEL SIGN AM
+0EB4;N # LAO VOWEL SIGN I
+0EB5;N # LAO VOWEL SIGN II
+0EB6;N # LAO VOWEL SIGN Y
+0EB7;N # LAO VOWEL SIGN YY
+0EB8;N # LAO VOWEL SIGN U
+0EB9;N # LAO VOWEL SIGN UU
+0EBB;N # LAO VOWEL SIGN MAI KON
+0EBC;N # LAO SEMIVOWEL SIGN LO
+0EBD;N # LAO SEMIVOWEL SIGN NYO
+0EC0;N # LAO VOWEL SIGN E
+0EC1;N # LAO VOWEL SIGN EI
+0EC2;N # LAO VOWEL SIGN O
+0EC3;N # LAO VOWEL SIGN AY
+0EC4;N # LAO VOWEL SIGN AI
+0EC6;N # LAO KO LA
+0EC8;N # LAO TONE MAI EK
+0EC9;N # LAO TONE MAI THO
+0ECA;N # LAO TONE MAI TI
+0ECB;N # LAO TONE MAI CATAWA
+0ECC;N # LAO CANCELLATION MARK
+0ECD;N # LAO NIGGAHITA
+0ED0;N # LAO DIGIT ZERO
+0ED1;N # LAO DIGIT ONE
+0ED2;N # LAO DIGIT TWO
+0ED3;N # LAO DIGIT THREE
+0ED4;N # LAO DIGIT FOUR
+0ED5;N # LAO DIGIT FIVE
+0ED6;N # LAO DIGIT SIX
+0ED7;N # LAO DIGIT SEVEN
+0ED8;N # LAO DIGIT EIGHT
+0ED9;N # LAO DIGIT NINE
+0EDC;N # LAO HO NO
+0EDD;N # LAO HO MO
+0F00;N # TIBETAN SYLLABLE OM
+0F01;N # TIBETAN MARK GTER YIG MGO TRUNCATED A
+0F02;N # TIBETAN MARK GTER YIG MGO -UM RNAM BCAD MA
+0F03;N # TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA
+0F04;N # TIBETAN MARK INITIAL YIG MGO MDUN MA
+0F05;N # TIBETAN MARK CLOSING YIG MGO SGAB MA
+0F06;N # TIBETAN MARK CARET YIG MGO PHUR SHAD MA
+0F07;N # TIBETAN MARK YIG MGO TSHEG SHAD MA
+0F08;N # TIBETAN MARK SBRUL SHAD
+0F09;N # TIBETAN MARK BSKUR YIG MGO

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5275
          http://jython.svn.sourceforge.net/jython/?rev=5275&view=rev
Author:   fwierzbicki
Date:     2008-08-31 00:31:36 +0000 (Sun, 31 Aug 2008)

Log Message:
-----------
Fixes #1116 -- dotted_attr was calling itself, which does not make
sense with +=.

Modified Paths:
--------------
    trunk/jython/grammar/Python.g
    trunk/jython/src/org/python/antlr/GrammarActions.java

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2008-08-30 18:39:59 UTC (rev 5274)
+++ trunk/jython/grammar/Python.g	2008-08-31 00:31:36 UTC (rev 5275)
@@ -309,8 +309,8 @@
 //not in CPython's Grammar file
 dotted_attr returns [exprType etype]
     : n1=NAME
-      ( (DOT n2+=dotted_attr)+ { $etype = actions.makeDottedAttr($n1, $n2); }
-      | { $etype = new Name($NAME, $NAME.text, expr_contextType.Load); }
+      ( (DOT n2+=NAME)+ { $etype = actions.makeDottedAttr($n1, $n2); }
+      | { $etype = new Name($n1, $n1.text, expr_contextType.Load); }
       )
     ;
 

Modified: trunk/jython/src/org/python/antlr/GrammarActions.java
===================================================================
--- trunk/jython/src/org/python/antlr/GrammarActions.java	2008-08-30 18:39:59 UTC (rev 5274)
+++ trunk/jython/src/org/python/antlr/GrammarActions.java	2008-08-31 00:31:36 UTC (rev 5275)
@@ -212,8 +212,8 @@
 
     exprType makeDottedAttr(Token nameToken, List attrs) {
         exprType current = new Name(nameToken, nameToken.getText(), expr_contextType.Load);
-        for (int i=attrs.size() - 1; i > -1; i--) {
-            Token t = ((PythonTree)attrs.get(i)).token;
+        for (Object o: attrs) {
+            Token t = (Token)o;
             current = new Attribute(t, current, t.getText(),
                 expr_contextType.Load);
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5278
          http://jython.svn.sourceforge.net/jython/?rev=5278&view=rev
Author:   fwierzbicki
Date:     2008-09-01 04:21:27 +0000 (Mon, 01 Sep 2008)

Log Message:
-----------
Check for EOF in file_input.  Comment cleanup.

Modified Paths:
--------------
    trunk/jython/grammar/Python.g
    trunk/jython/src/org/python/antlr/PythonTokenSource.java

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2008-09-01 04:03:21 UTC (rev 5277)
+++ trunk/jython/grammar/Python.g	2008-09-01 04:21:27 UTC (rev 5278)
@@ -288,7 +288,7 @@
 }
     : (NEWLINE
       | stmt {stypes.addAll($stmt.stypes);}
-      )* {
+      )* EOF {
         mtype = new Module($file_input.start, actions.makeStmts(stypes));
     }
     ;

Modified: trunk/jython/src/org/python/antlr/PythonTokenSource.java
===================================================================
--- trunk/jython/src/org/python/antlr/PythonTokenSource.java	2008-09-01 04:03:21 UTC (rev 5277)
+++ trunk/jython/src/org/python/antlr/PythonTokenSource.java	2008-09-01 04:21:27 UTC (rev 5278)
@@ -324,7 +324,6 @@
         return buf.toString();
     }
 
-    //FIXME: needed this for the Antlr 3.1b interface change.
     public String getSourceName() {
         return filename;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5288
          http://jython.svn.sourceforge.net/jython/?rev=5288&view=rev
Author:   fwierzbicki
Date:     2008-09-04 16:57:30 +0000 (Thu, 04 Sep 2008)

Log Message:
-----------
Fix for some offset problems -- the biggest one being dedents now take on the
offset values of the previous token.

Modified Paths:
--------------
    trunk/jython/grammar/Python.g
    trunk/jython/src/org/python/antlr/PythonTokenSource.java
    trunk/jython/src/org/python/antlr/PythonTreeAdaptor.java

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2008-09-03 15:24:20 UTC (rev 5287)
+++ trunk/jython/grammar/Python.g	2008-09-04 16:57:30 UTC (rev 5288)
@@ -284,6 +284,12 @@
     List stypes = new ArrayList();
 }
 @after {
+    if (!stypes.isEmpty()) {
+        //The EOF token messes up the end offsets, so set them manually.
+        PythonTree stop = (PythonTree)stypes.get(stypes.size() -1);
+        mtype.setCharStopIndex(stop.getCharStopIndex());
+        mtype.setTokenStopIndex(stop.getTokenStopIndex());
+    }
     $file_input.tree = mtype;
 }
     : (NEWLINE

Modified: trunk/jython/src/org/python/antlr/PythonTokenSource.java
===================================================================
--- trunk/jython/src/org/python/antlr/PythonTokenSource.java	2008-09-03 15:24:20 UTC (rev 5287)
+++ trunk/jython/src/org/python/antlr/PythonTokenSource.java	2008-09-04 16:57:30 UTC (rev 5288)
@@ -157,14 +157,18 @@
         stream.consume();
 
         if (t.getType() == Token.EOF) {
+            Token prev = stream.LT(-1);
             if (!inSingle) {
-                Token prev = stream.LT(-1);
                 if (prev == null || prev.getType() != PythonLexer.NEWLINE) {
                     generateNewline(t);
                 }
             }
-
-            handleDedents(-1, (CommonToken)t);
+            if (prev != null) {
+                ((CommonToken)t).setStopIndex(((CommonToken)prev).getStopIndex());
+                handleDedents(-1, (CommonToken)prev);
+            } else {
+                handleDedents(-1, (CommonToken)t);
+            }
             enqueue(t);
         } else if (t.getType() == PythonLexer.NEWLINE) {
             // save NEWLINE in the queue
@@ -203,7 +207,12 @@
                 handleIndents(cpos, (CommonToken)t);
             }
             else if (cpos < lastIndent) { // they dedented
-                handleDedents(cpos, (CommonToken)t);
+                Token prev = stream.LT(-1);
+                if (prev != null) {
+                    handleDedents(cpos, (CommonToken)prev);
+                } else {
+                    handleDedents(cpos, (CommonToken)t);
+                }
             }
 
             if (t.getType() == Token.EOF && inSingle) {

Modified: trunk/jython/src/org/python/antlr/PythonTreeAdaptor.java
===================================================================
--- trunk/jython/src/org/python/antlr/PythonTreeAdaptor.java	2008-09-03 15:24:20 UTC (rev 5287)
+++ trunk/jython/src/org/python/antlr/PythonTreeAdaptor.java	2008-09-04 16:57:30 UTC (rev 5288)
@@ -12,6 +12,8 @@
         if (t==null) {
             return;
         }
+		//System.out.println("setting boundries on '"+t+"' with start: '" + startToken + "' and '" +
+        //        stopToken + "'");
         int start = 0;
         int stop = 0;
         int startChar = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5291
          http://jython.svn.sourceforge.net/jython/?rev=5291&view=rev
Author:   fwierzbicki
Date:     2008-09-05 16:30:36 +0000 (Fri, 05 Sep 2008)

Log Message:
-----------
Broke test_traceback.py in my last commit.  This fixes it again.

Modified Paths:
--------------
    trunk/jython/grammar/Python.g
    trunk/jython/src/org/python/antlr/PythonTokenSource.java

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2008-09-05 16:21:55 UTC (rev 5290)
+++ trunk/jython/grammar/Python.g	2008-09-05 16:30:36 UTC (rev 5291)
@@ -286,10 +286,14 @@
 @after {
     if (!stypes.isEmpty()) {
         //The EOF token messes up the end offsets, so set them manually.
+        //XXX: this may no longer be true now that PythonTokenSource is
+        //     adjusting EOF offsets -- but needs testing before I remove
+        //     this.
         PythonTree stop = (PythonTree)stypes.get(stypes.size() -1);
         mtype.setCharStopIndex(stop.getCharStopIndex());
         mtype.setTokenStopIndex(stop.getTokenStopIndex());
     }
+
     $file_input.tree = mtype;
 }
     : (NEWLINE
@@ -1778,6 +1782,8 @@
                        CommonToken c = new CommonToken(LEADING_WS,new String(indentation));
                        c.setLine(input.getLine());
                        c.setCharPositionInLine(input.getCharPositionInLine());
+                       c.setStartIndex(input.index() - 1);
+                       c.setStopIndex(input.index() - 1);
                        emit(c);
                        // kill trailing newline if present and then ignore
                        if (newlines != 0) {
@@ -1793,7 +1799,12 @@
                        for (int i=0; i<newlines; i++) {
                            nls[i] = '\n';
                        }
-                       emit(new CommonToken(NEWLINE,new String(nls)));
+                       CommonToken c = new CommonToken(NEWLINE,new String(nls));
+                       c.setLine(input.getLine());
+                       c.setCharPositionInLine(input.getCharPositionInLine());
+                       c.setStartIndex(input.index() - 1);
+                       c.setStopIndex(input.index() - 1);
+                       emit(c);
                    }
                 }
         )

Modified: trunk/jython/src/org/python/antlr/PythonTokenSource.java
===================================================================
--- trunk/jython/src/org/python/antlr/PythonTokenSource.java	2008-09-05 16:21:55 UTC (rev 5290)
+++ trunk/jython/src/org/python/antlr/PythonTokenSource.java	2008-09-05 16:30:36 UTC (rev 5291)
@@ -152,23 +152,25 @@
         tokens.addElement(newline);
     }
 
+    private void handleEOF(CommonToken eof, CommonToken prev) {
+        if (prev != null) {
+            eof.setStopIndex(prev.getStopIndex());
+        }
+    }
+
     protected void insertImaginaryIndentDedentTokens() {
         Token t = stream.LT(1);
         stream.consume();
 
         if (t.getType() == Token.EOF) {
             Token prev = stream.LT(-1);
+            handleEOF((CommonToken)t, (CommonToken)prev);
             if (!inSingle) {
                 if (prev == null || prev.getType() != PythonLexer.NEWLINE) {
                     generateNewline(t);
                 }
             }
-            if (prev != null) {
-                ((CommonToken)t).setStopIndex(((CommonToken)prev).getStopIndex());
-                handleDedents(-1, (CommonToken)prev);
-            } else {
-                handleDedents(-1, (CommonToken)t);
-            }
+            handleDedents(-1, (CommonToken)t);
             enqueue(t);
         } else if (t.getType() == PythonLexer.NEWLINE) {
             // save NEWLINE in the queue
@@ -186,6 +188,7 @@
             // compute cpos as the char pos of next non-WS token in line
             int cpos = t.getCharPositionInLine(); // column dictates indent/dedent
             if (t.getType() == Token.EOF) {
+                handleEOF((CommonToken)t, (CommonToken)newline);
                 cpos = -1; // pretend EOF always happens at left edge
             }
             else if (t.getType() == PythonLexer.LEADING_WS) {
@@ -207,8 +210,7 @@
                 handleIndents(cpos, (CommonToken)t);
             }
             else if (cpos < lastIndent) { // they dedented
-                Token prev = stream.LT(-1);
-                handleDedents(cpos, (CommonToken)newline);
+                handleDedents(cpos, (CommonToken)t);
             }
 
             if (t.getType() == Token.EOF && inSingle) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5292
          http://jython.svn.sourceforge.net/jython/?rev=5292&view=rev
Author:   fwierzbicki
Date:     2008-09-06 04:28:11 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------
Some tuning of node col and line positions to align better with CPython.

Modified Paths:
--------------
    trunk/jython/ast/astview.py
    trunk/jython/grammar/Python.g
    trunk/jython/src/org/python/antlr/GrammarActions.java

Modified: trunk/jython/ast/astview.py
===================================================================
--- trunk/jython/ast/astview.py	2008-09-05 16:30:36 UTC (rev 5291)
+++ trunk/jython/ast/astview.py	2008-09-06 04:28:11 UTC (rev 5292)
@@ -25,6 +25,10 @@
                 "org.python.antlr.ast.cmpopType",
                 "org.python.antlr.ast.operatorType"):
             result = str(t)
+            if result == "AugLoad":
+                result = "Load"
+            elif result == "AugStore":
+                result = "Store"
         else:
             result = result.split(".")[-1]
             if result.endswith("Type"):

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2008-09-05 16:30:36 UTC (rev 5291)
+++ trunk/jython/grammar/Python.g	2008-09-06 04:28:11 UTC (rev 5292)
@@ -806,7 +806,7 @@
 //not in CPython's Grammar file
 elif_clause
     : ELIF test[expr_contextType.Load] COLON suite
-   -> ^(ELIF<If>[$ELIF, (exprType)$test.tree, actions.makeStmts($suite.stypes), new stmtType[0\]])
+   -> ^(ELIF<If>[$test.start, (exprType)$test.tree, actions.makeStmts($suite.stypes), new stmtType[0\]])
     ;
 
 //while_stmt: 'while' test ':' suite ['else' ':' suite]
@@ -913,7 +913,7 @@
 test[expr_contextType ctype]
     :o1=or_test[ctype]
       ( (IF or_test[null] ORELSE) => IF o2=or_test[ctype] ORELSE e=test[expr_contextType.Load]
-     -> ^(IF<IfExp>[$IF, (exprType)$o2.tree, (exprType)$o1.tree, (exprType)$e.tree])
+     -> ^(IF<IfExp>[$o1.start, (exprType)$o2.tree, (exprType)$o1.tree, (exprType)$e.tree])
       |
      -> or_test
       )
@@ -964,7 +964,7 @@
 }
 @after {
     if (!cmps.isEmpty()) {
-        $comparison.tree = new Compare($left.tree, (exprType)$left.tree, actions.makeCmpOps(cmps),
+        $comparison.tree = new Compare($left.start, (exprType)$left.tree, actions.makeCmpOps(cmps),
             actions.makeExprs($right));
     }
 }
@@ -1136,8 +1136,7 @@
           //XXX: This could be better.
           $etype = (exprType)$atom.tree;
           if ($t != null) {
-              for(int i = 0; i < $t.size(); i++) {
-                  Object o = $t.get(i);
+              for(Object o : $t) {
                   if ($etype instanceof Context) {
                       ((Context)$etype).setContext(expr_contextType.Load);
                   }
@@ -1249,7 +1248,7 @@
         ( ((options {k=2;}: c1=COMMA t+=test[$expr::ctype])* (c2=COMMA)?
          -> { $c1 != null || $c2 != null }?
                 ^(COMMA<Tuple>[$testlist_gexp.start, actions.makeExprs($t), $expr::ctype])
-                -> test
+         -> test
           )
         | (gen_for[gens]
            {
@@ -1290,7 +1289,7 @@
        -> ^(LPAREN<Call>[$begin, (exprType)$tree, actions.makeExprs($arglist.args),
                actions.makeKeywords($arglist.keywords), $arglist.starargs, $arglist.kwargs])
         |
-       -> ^(LPAREN<Call>[$LPAREN, (exprType)$tree, new exprType[0\], new keywordType[0\], null, null])
+       -> ^(LPAREN<Call>[$begin, (exprType)$tree, new exprType[0\], new keywordType[0\], null, null])
         )
       RPAREN
     | LBRACK subscriptlist[$begin] RBRACK
@@ -1447,7 +1446,7 @@
               $genarg = true;
               Collections.reverse($gens);
               comprehensionType[] c = (comprehensionType[])$gens.toArray(new comprehensionType[$gens.size()]);
-              arguments.add(new GeneratorExp($gen_for.start, (exprType)$t1.tree, c));
+              arguments.add(new GeneratorExp($t1.start, (exprType)$t1.tree, c));
           }
         | {
               if (kws.size() > 0) {

Modified: trunk/jython/src/org/python/antlr/GrammarActions.java
===================================================================
--- trunk/jython/src/org/python/antlr/GrammarActions.java	2008-09-05 16:30:36 UTC (rev 5291)
+++ trunk/jython/src/org/python/antlr/GrammarActions.java	2008-09-06 04:28:11 UTC (rev 5292)
@@ -459,7 +459,8 @@
     }
 
     Token extractStringToken(List s) {
-        return (Token)s.get(s.size() - 1);
+        return (Token)s.get(0);
+        //return (Token)s.get(s.size() - 1);
     }
 
     //FROM Walker:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5301
          http://jython.svn.sourceforge.net/jython/?rev=5301&view=rev
Author:   fwierzbicki
Date:     2008-09-07 05:57:26 +0000 (Sun, 07 Sep 2008)

Log Message:
-----------
Committing Nicholas Riley's patch after getting test_ast.py to work.  See http://bugs.jython.org/issue1758279.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_ast.py
    trunk/jython/Lib/test/test_class_jy.py
    trunk/jython/src/org/python/core/PyJavaClass.java

Modified: trunk/jython/Lib/test/test_ast.py
===================================================================
--- trunk/jython/Lib/test/test_ast.py	2008-09-06 23:20:46 UTC (rev 5300)
+++ trunk/jython/Lib/test/test_ast.py	2008-09-07 05:57:26 UTC (rev 5301)
@@ -5,12 +5,12 @@
 def get_class_name(t):
     result = t.__class__.__name__
     if os.name.startswith('java'):
-        if result in ("org.python.antlr.ast.expr_contextType",
-                "org.python.antlr.ast.boolopType",
-                "org.python.antlr.ast.unaryopType",
-                "org.python.antlr.ast.cmpopType",
-                "org.python.antlr.ast.operatorType"):
-            result = str(t)
+        if result in ("expr_contextType",
+                "boolopType",
+                "unaryopType",
+                "cmpopType",
+                "operatorType"):
+            result = t.name()
         else:
             result = result.split(".")[-1]
             if result.endswith("Type"):

Modified: trunk/jython/Lib/test/test_class_jy.py
===================================================================
--- trunk/jython/Lib/test/test_class_jy.py	2008-09-06 23:20:46 UTC (rev 5300)
+++ trunk/jython/Lib/test/test_class_jy.py	2008-09-07 05:57:26 UTC (rev 5301)
@@ -273,12 +273,29 @@
         self.assert_(isinstance(retro, OldStyle))
 
 
+class JavaClassNamingTestCase(unittest.TestCase):
+    """
+    Tests for PyJavaClass naming.
+    """
+
+    def test_java_class_name(self):
+        """
+        The __name__ and __module__ attributes of Java classes should be set
+        according to the same convention that Python uses.
+        """
+        from java.lang import String
+        self.assertEqual(String.__name__, "String")
+        self.assertEqual(String.__module__, "java.lang")
+
+
+
 def test_main():
     test_support.run_unittest(ClassGeneralTestCase,
                               ClassNamelessModuleTestCase,
                               BrokenNameTestCase,
                               ClassLocalsTestCase,
-                              IsDescendentTestCase)
+                              IsDescendentTestCase,
+                              JavaClassNamingTestCase)
 
 
 if __name__ == "__main__":

Modified: trunk/jython/src/org/python/core/PyJavaClass.java
===================================================================
--- trunk/jython/src/org/python/core/PyJavaClass.java	2008-09-06 23:20:46 UTC (rev 5300)
+++ trunk/jython/src/org/python/core/PyJavaClass.java	2008-09-07 05:57:26 UTC (rev 5301)
@@ -75,8 +75,30 @@
         init(c);
     }
 
-    protected PyJavaClass(String name,PackageManager mgr) {
-        __name__ = name;
+    public String __module__;
+    /**
+     * Set the full name of this class.
+     */
+    private void setName(String name) {
+        int dotIndex = name.lastIndexOf(".");
+        if (dotIndex == -1) {
+            __name__ = name;
+            __module__ = "";
+        } else {
+            __name__ = name.substring(name.lastIndexOf(".")+1, name.length());
+            __module__ = name.substring(0, name.lastIndexOf("."));
+        }
+    }
+
+    private String fullName() {
+        if (__module__ == "")
+            return __name__;
+        else
+            return __module__ + "." + __name__;
+    }
+
+    protected PyJavaClass(String name, PackageManager mgr) {
+        setName(name);
         this.__mgr__ = mgr;
     }
 
@@ -97,7 +119,7 @@
     }
 
     private static final void initLazy(PyJavaClass jc) {
-        Class c = jc.__mgr__.findClass(null,jc.__name__,"lazy java class");
+        Class c = jc.__mgr__.findClass(null,jc.fullName(),"lazy java class");
         check_lazy_allowed(c); // xxx
         jc.init(c);
         tbl.putCanonical(jc.proxyClass,jc);
@@ -209,7 +231,7 @@
 
     private void init(Class c)  {
         proxyClass = c;
-        __name__ = c.getName();
+        setName(c.getName());
     }
 
     /**
@@ -761,6 +783,8 @@
         }
         if (name == "__name__")
             return new PyString(__name__);
+        if (name == "__module__")
+            return new PyString(__module__);
         if (name == "__bases__") {
             if (__bases__ == null)
                 initialize();
@@ -851,11 +875,11 @@
         if (PyObject.class.isAssignableFrom(proxyClass)) {
             if (Modifier.isAbstract(proxyClass.getModifiers())) {
                             throw Py.TypeError("can't instantiate abstract class ("+
-                                               __name__+")");
+                                               fullName()+")");
             }
             if (__init__ == null) {
                 throw Py.TypeError("no public constructors for "+
-                                   __name__);
+                                   fullName());
             }
             return __init__.make(args,keywords);
         }
@@ -871,7 +895,19 @@
         return super.__tojava__(c);
     }
 
+    public int __cmp__(PyObject other) {
+        if (!(other instanceof PyJavaClass)) {
+            return -2;
+        }
+        int c = fullName().compareTo(((PyJavaClass) other).fullName());
+        return c < 0 ? -1 : c > 0 ? 1 : 0;
+    }
+
+    public PyString __str__() {
+        return new PyString(fullName());
+    }
+
     public String toString()  {
-        return "<jclass "+__name__+" "+Py.idstr(this)+">";
+        return "<jclass "+fullName()+" "+Py.idstr(this)+">";
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5313
          http://jython.svn.sourceforge.net/jython/?rev=5313&view=rev
Author:   fwierzbicki
Date:     2008-09-10 18:36:16 +0000 (Wed, 10 Sep 2008)

Log Message:
-----------
Make it possible to get error nodes into the spots that are now
casting to exprType.

Modified Paths:
--------------
    trunk/jython/grammar/Python.g
    trunk/jython/src/org/python/antlr/GrammarActions.java

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2008-09-10 13:05:27 UTC (rev 5312)
+++ trunk/jython/grammar/Python.g	2008-09-10 18:36:16 UTC (rev 5313)
@@ -312,7 +312,7 @@
     $eval_input.tree = mtype;
 }
     : LEADING_WS? (NEWLINE)* testlist[expr_contextType.Load] (NEWLINE)* EOF {
-        mtype = new Expression($eval_input.start, (exprType)$testlist.tree);
+        mtype = new Expression($eval_input.start, actions.makeExpr($testlist.tree));
     }
     ;
 
@@ -424,7 +424,7 @@
 }
     : fpdef[expr_contextType.Param] (ASSIGN test[expr_contextType.Load])?
       {
-          $etype = (exprType)$fpdef.tree;
+          $etype = actions.makeExpr($fpdef.tree);
           if ($ASSIGN != null) {
               defaults.add($test.tree);
           } else if (!defaults.isEmpty()) {
@@ -462,7 +462,7 @@
 //fpdef: NAME | '(' fplist ')'
 fpdef[expr_contextType ctype]
 @after {
-    actions.checkAssign((exprType)$fpdef.tree);
+    actions.checkAssign(actions.makeExpr($fpdef.tree));
 }
     : NAME 
    -> ^(NAME<Name>[$NAME, $NAME.text, ctype])
@@ -529,31 +529,31 @@
     : ((testlist[null] augassign) => lhs=testlist[expr_contextType.AugStore]
         ( (aay=augassign y1=yield_expr 
             {
-                actions.checkAssign((exprType)$lhs.tree);
-                stype = new AugAssign($lhs.tree, (exprType)$lhs.tree, $aay.op, (exprType)$y1.tree);
+                actions.checkAssign(actions.makeExpr($lhs.tree));
+                stype = new AugAssign($lhs.tree, actions.makeExpr($lhs.tree), $aay.op, actions.makeExpr($y1.tree));
             }
           )
         | (aat=augassign rhs=testlist[expr_contextType.Load]
             {
-                actions.checkAssign((exprType)$lhs.tree);
-                stype = new AugAssign($lhs.tree, (exprType)$lhs.tree, $aat.op, (exprType)$rhs.tree);
+                actions.checkAssign(actions.makeExpr($lhs.tree));
+                stype = new AugAssign($lhs.tree, actions.makeExpr($lhs.tree), $aat.op, actions.makeExpr($rhs.tree));
             }
           )
         )
     | (testlist[null] ASSIGN) => lhs=testlist[expr_contextType.Store]
         (
         | ((at=ASSIGN t+=testlist[expr_contextType.Store])+
-       -> ^(ASSIGN<Assign>[$lhs.start, actions.makeAssignTargets((exprType)$lhs.tree, $t),
+       -> ^(ASSIGN<Assign>[$lhs.start, actions.makeAssignTargets(actions.makeExpr($lhs.tree), $t),
             actions.makeAssignValue($t)])
           )
         | ((ay=ASSIGN y2+=yield_expr)+
-       -> ^(ASSIGN<Assign>[$lhs.start, actions.makeAssignTargets((exprType)$lhs.tree, $y2),
+       -> ^(ASSIGN<Assign>[$lhs.start, actions.makeAssignTargets(actions.makeExpr($lhs.tree), $y2),
             actions.makeAssignValue($y2)])
           )
         )
     | lhs=testlist[expr_contextType.Load]
       {
-          stype = new Expr($lhs.start, (exprType)$lhs.tree);
+          stype = new Expr($lhs.start, actions.makeExpr($lhs.tree));
       }
     )
     ;
@@ -582,7 +582,7 @@
       (t1=printlist
      -> ^(PRINT<Print>[$PRINT, null, actions.makeExprs($t1.elts), $t1.newline])
       | RIGHTSHIFT t2=printlist2
-     -> ^(PRINT<Print>[$PRINT, (exprType)$t2.elts.get(0), actions.makeExprs($t2.elts, 1), $t2.newline])
+     -> ^(PRINT<Print>[$PRINT, actions.makeExpr($t2.elts.get(0)), actions.makeExprs($t2.elts, 1), $t2.newline])
       |
      -> ^(PRINT<Print>[$PRINT, null, new exprType[0\], false])
       )
@@ -666,7 +666,7 @@
 return_stmt
     : RETURN 
       (testlist[expr_contextType.Load]
-     -> ^(RETURN<Return>[$RETURN, (exprType)$testlist.tree])
+     -> ^(RETURN<Return>[$RETURN, actions.makeExpr($testlist.tree)])
       |
      -> ^(RETURN<Return>[$RETURN, null])
       )
@@ -674,14 +674,14 @@
 
 //yield_stmt: yield_expr
 yield_stmt
-    : yield_expr -> ^(YIELD<Expr>[$yield_expr.start, (exprType)$yield_expr.tree])
+    : yield_expr -> ^(YIELD<Expr>[$yield_expr.start, actions.makeExpr($yield_expr.tree)])
     ;
 
 //raise_stmt: 'raise' [test [',' test [',' test]]]
 raise_stmt
     : RAISE (t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load]
         (COMMA t3=test[expr_contextType.Load])?)?)?
-   -> ^(RAISE<Raise>[$RAISE, (exprType)$t1.tree, (exprType)$t2.tree, (exprType)$t3.tree])
+   -> ^(RAISE<Raise>[$RAISE, actions.makeExpr($t1.tree), actions.makeExpr($t2.tree), actions.makeExpr($t3.tree)])
     ;
 
 //import_stmt: import_name | import_from
@@ -774,14 +774,14 @@
     : EXEC expr[expr_contextType.Load] (IN t1=test[expr_contextType.Load]
         (COMMA t2=test[expr_contextType.Load])?)?
       {
-         stype = new Exec($EXEC, (exprType)$expr.tree, (exprType)$t1.tree, (exprType)$t2.tree);
+         stype = new Exec($EXEC, actions.makeExpr($expr.tree), actions.makeExpr($t1.tree), actions.makeExpr($t2.tree));
       }
     ;
 
 //assert_stmt: 'assert' test [',' test]
 assert_stmt
     : ASSERT t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load])?
-   -> ^(ASSERT<Assert>[$ASSERT, (exprType)$t1.tree, (exprType)$t2.tree])
+   -> ^(ASSERT<Assert>[$ASSERT, actions.makeExpr($t1.tree), actions.makeExpr($t2.tree)])
     ;
 
 //compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | funcdef | classdef
@@ -799,14 +799,14 @@
 if_stmt
     : IF test[expr_contextType.Load] COLON ifsuite=suite elifs+=elif_clause*
         (ORELSE COLON elsesuite=suite)?
-   -> ^(IF<If>[$IF, (exprType)$test.tree, actions.makeStmts($ifsuite.stypes),
+   -> ^(IF<If>[$IF, actions.makeExpr($test.tree), actions.makeStmts($ifsuite.stypes),
          actions.makeElses($elsesuite.stypes, $elifs)])
     ;
 
 //not in CPython's Grammar file
 elif_clause
     : ELIF test[expr_contextType.Load] COLON suite
-   -> ^(ELIF<If>[$test.start, (exprType)$test.tree, actions.makeStmts($suite.stypes), new stmtType[0\]])
+   -> ^(ELIF<If>[$test.start, actions.makeExpr($test.tree), actions.makeStmts($suite.stypes), new stmtType[0\]])
     ;
 
 //while_stmt: 'while' test ':' suite ['else' ':' suite]
@@ -819,7 +819,7 @@
 }
     : WHILE test[expr_contextType.Load] COLON s1=suite (ORELSE COLON s2=suite)?
     {
-        stype = actions.makeWhile($WHILE, (exprType)$test.tree, $s1.stypes, $s2.stypes);
+        stype = actions.makeWhile($WHILE, actions.makeExpr($test.tree), $s1.stypes, $s2.stypes);
     }
     ;
 
@@ -834,7 +834,7 @@
     : FOR exprlist[expr_contextType.Store] IN testlist[expr_contextType.Load] COLON s1=suite
         (ORELSE COLON s2=suite)?
       {
-          stype = actions.makeFor($FOR, $exprlist.etype, (exprType)$testlist.tree, $s1.stypes, $s2.stypes);
+          stype = actions.makeFor($FOR, $exprlist.etype, actions.makeExpr($testlist.tree), $s1.stypes, $s2.stypes);
       }
     ;
 
@@ -872,7 +872,7 @@
 }
     : WITH test[expr_contextType.Load] (with_var)? COLON suite
       {
-          stype = new With($WITH, (exprType)$test.tree, $with_var.etype,
+          stype = new With($WITH, actions.makeExpr($test.tree), $with_var.etype,
               actions.makeStmts($suite.stypes));
       }
     ;
@@ -881,14 +881,14 @@
 with_var returns [exprType etype]
     : (AS | NAME) expr[expr_contextType.Store]
       {
-          $etype = (exprType)$expr.tree;
+          $etype = actions.makeExpr($expr.tree);
       }
     ;
 
 //except_clause: 'except' [test [',' test]]
 except_clause
     : EXCEPT (t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Store])?)? COLON suite
-   -> ^(EXCEPT<excepthandlerType>[$EXCEPT, (exprType)$t1.tree, (exprType)$t2.tree,
+   -> ^(EXCEPT<excepthandlerType>[$EXCEPT, actions.makeExpr($t1.tree), actions.makeExpr($t2.tree),
           actions.makeStmts($suite.stypes), $EXCEPT.getLine(), $EXCEPT.getCharPositionInLine()])
     ;
 
@@ -913,7 +913,7 @@
 test[expr_contextType ctype]
     :o1=or_test[ctype]
       ( (IF or_test[null] ORELSE) => IF o2=or_test[ctype] ORELSE e=test[expr_contextType.Load]
-     -> ^(IF<IfExp>[$o1.start, (exprType)$o2.tree, (exprType)$o1.tree, (exprType)$e.tree])
+     -> ^(IF<IfExp>[$o1.start, actions.makeExpr($o2.tree), actions.makeExpr($o1.tree), actions.makeExpr($e.tree)])
       |
      -> or_test
       )
@@ -953,7 +953,7 @@
 //not_test: 'not' not_test | comparison
 not_test[expr_contextType ctype]
     : NOT nt=not_test[ctype]
-   -> ^(NOT<UnaryOp>[$NOT, unaryopType.Not, (exprType)$nt.tree])
+   -> ^(NOT<UnaryOp>[$NOT, unaryopType.Not, actions.makeExpr($nt.tree)])
     | comparison[ctype]
     ;
 
@@ -964,7 +964,7 @@
 }
 @after {
     if (!cmps.isEmpty()) {
-        $comparison.tree = new Compare($left.start, (exprType)$left.tree, actions.makeCmpOps(cmps),
+        $comparison.tree = new Compare($left.start, actions.makeExpr($left.tree), actions.makeCmpOps(cmps),
             actions.makeExprs($right));
     }
 }
@@ -1123,7 +1123,7 @@
     : PLUS p=factor {$etype = new UnaryOp($PLUS, unaryopType.UAdd, $p.etype);}
     | MINUS m=factor {$etype = actions.negate($MINUS, $m.etype);}
     | TILDE t=factor {$etype = new UnaryOp($TILDE, unaryopType.Invert, $t.etype);}
-    | power {$etype = (exprType)$power.tree;}
+    | power {$etype = actions.makeExpr($power.tree);}
     ;
 
 //power: atom trailer* ['**' factor]
@@ -1134,7 +1134,7 @@
     : atom (t+=trailer[$atom.start, $atom.tree])* (options {greedy=true;}:d=DOUBLESTAR factor)?
       {
           //XXX: This could be better.
-          $etype = (exprType)$atom.tree;
+          $etype = actions.makeExpr($atom.tree);
           if ($t != null) {
               for(Object o : $t) {
                   if ($etype instanceof Context) {
@@ -1194,7 +1194,7 @@
        )
        RCURLY
      | lb=BACKQUOTE testlist[expr_contextType.Load] rb=BACKQUOTE
-    -> ^(BACKQUOTE<Repr>[$lb, (exprType)$testlist.tree])
+    -> ^(BACKQUOTE<Repr>[$lb, actions.makeExpr($testlist.tree)])
      | NAME
     -> ^(NAME<Name>[$NAME, $NAME.text, $expr::ctype])
      | INT
@@ -1224,7 +1224,7 @@
               Collections.reverse(gens);
               comprehensionType[] c =
                   (comprehensionType[])gens.toArray(new comprehensionType[gens.size()]);
-              etype = new ListComp($listmaker.start, (exprType)$t.get(0), c);
+              etype = new ListComp($listmaker.start, actions.makeExpr($t.get(0)), c);
           }
         | (options {greedy=true;}:COMMA t+=test[$expr::ctype])*
           {
@@ -1254,11 +1254,11 @@
            {
                Collections.reverse(gens);
                comprehensionType[] c = (comprehensionType[])gens.toArray(new comprehensionType[gens.size()]);
-               exprType e = (exprType)$t.get(0);
+               exprType e = actions.makeExpr($t.get(0));
                if (e instanceof Context) {
                    ((Context)e).setContext(expr_contextType.Load);
                }
-               etype = new GeneratorExp($testlist_gexp.start, (exprType)$t.get(0), c);
+               etype = new GeneratorExp($testlist_gexp.start, actions.makeExpr($t.get(0)), c);
            }
           )
         )
@@ -1278,7 +1278,7 @@
           if (a == null) {
               a = new argumentsType($LAMBDA, new exprType[0], null, null, new exprType[0]);
           }
-          etype = new Lambda($LAMBDA, a, (exprType)$test.tree);
+          etype = new Lambda($LAMBDA, a, actions.makeExpr($test.tree));
       }
     ;
 
@@ -1286,16 +1286,16 @@
 trailer [Token begin, PythonTree tree]
     : LPAREN 
         (arglist
-       -> ^(LPAREN<Call>[$begin, (exprType)$tree, actions.makeExprs($arglist.args),
+       -> ^(LPAREN<Call>[$begin, actions.makeExpr($tree), actions.makeExprs($arglist.args),
                actions.makeKeywords($arglist.keywords), $arglist.starargs, $arglist.kwargs])
         |
-       -> ^(LPAREN<Call>[$begin, (exprType)$tree, new exprType[0\], new keywordType[0\], null, null])
+       -> ^(LPAREN<Call>[$begin, actions.makeExpr($tree), new exprType[0\], new keywordType[0\], null, null])
         )
       RPAREN
     | LBRACK subscriptlist[$begin] RBRACK
-   -> ^(LBRACK<Subscript>[$begin, (exprType)$tree, (sliceType)$subscriptlist.tree, $expr::ctype])
+   -> ^(LBRACK<Subscript>[$begin, actions.makeExpr($tree), (sliceType)$subscriptlist.tree, $expr::ctype])
     | DOT attr
-   -> ^(DOT<Attribute>[$begin, (exprType)$tree, $attr.text, $expr::ctype])
+   -> ^(DOT<Attribute>[$begin, actions.makeExpr($tree), $attr.text, $expr::ctype])
     ;
 
 //subscriptlist: subscript (',' subscript)* [',']
@@ -1332,7 +1332,7 @@
           $sltype = actions.makeSubscript(null, $c2, $upper2.tree, $sliceop.tree);
       }
     | test[expr_contextType.Load]
-   -> ^(LPAREN<Index>[$test.start, (exprType)$test.tree])
+   -> ^(LPAREN<Index>[$test.start, actions.makeExpr($test.tree)])
     ;
 
 //sliceop: ':' [test]
@@ -1351,7 +1351,7 @@
       }
     | expr[ctype]
       {
-        $etype = (exprType)$expr.tree;
+        $etype = actions.makeExpr($expr.tree);
       }
     ;
 
@@ -1393,7 +1393,7 @@
 }
     : CLASS NAME (LPAREN testlist[expr_contextType.Load]? RPAREN)? COLON suite
       {
-          stype = new ClassDef($CLASS, actions.cantBeNone($NAME), actions.makeBases((exprType)$testlist.tree),
+          stype = new ClassDef($CLASS, actions.cantBeNone($NAME), actions.makeBases(actions.makeExpr($testlist.tree)),
               actions.makeStmts($suite.stypes));
       }
     ;
@@ -1417,17 +1417,17 @@
           }
           $args=arguments;
           $keywords=kws;
-          $starargs=(exprType)$s.tree;
-          $kwargs=(exprType)$k.tree;
+          $starargs=actions.makeExpr($s.tree);
+          $kwargs=actions.makeExpr($k.tree);
       }
     | STAR s=test[expr_contextType.Load] (COMMA DOUBLESTAR k=test[expr_contextType.Load])?
       {
-          $starargs=(exprType)$s.tree;
-            $kwargs=(exprType)$k.tree;
+          $starargs=actions.makeExpr($s.tree);
+            $kwargs=actions.makeExpr($k.tree);
       }
     | DOUBLESTAR k=test[expr_contextType.Load]
       {
-            $kwargs=(exprType)$k.tree;
+            $kwargs=actions.makeExpr($k.tree);
       }
     ;
 
@@ -1436,7 +1436,7 @@
     : t1=test[expr_contextType.Load]
         ((ASSIGN t2=test[expr_contextType.Load])
           {
-              $kws.add(new exprType[]{(exprType)$t1.tree, (exprType)$t2.tree});
+              $kws.add(new exprType[]{actions.makeExpr($t1.tree), actions.makeExpr($t2.tree)});
           }
         | gen_for[$gens]
           {
@@ -1446,7 +1446,7 @@
               $genarg = true;
               Collections.reverse($gens);
               comprehensionType[] c = (comprehensionType[])$gens.toArray(new comprehensionType[$gens.size()]);
-              arguments.add(new GeneratorExp($t1.start, (exprType)$t1.tree, c));
+              arguments.add(new GeneratorExp($t1.start, actions.makeExpr($t1.tree), c));
           }
         | {
               if (kws.size() > 0) {
@@ -1475,7 +1475,7 @@
           } else {
               e = new exprType[0];
           }
-          gens.add(new comprehensionType($FOR, $exprlist.etype, (exprType)$testlist.tree, e));
+          gens.add(new comprehensionType($FOR, $exprlist.etype, actions.makeExpr($testlist.tree), e));
       }
     ;
 
@@ -1483,7 +1483,7 @@
 list_if[List gens] returns [exprType etype]
     : IF test[expr_contextType.Load] (list_iter[gens])?
     {
-        $etype = (exprType)$test.tree;
+        $etype = actions.makeExpr($test.tree);
     }
     ;
 
@@ -1506,7 +1506,7 @@
           } else {
               e = new exprType[0];
           }
-          gens.add(new comprehensionType($FOR, $exprlist.etype, (exprType)$or_test.tree, e));
+          gens.add(new comprehensionType($FOR, $exprlist.etype, actions.makeExpr($or_test.tree), e));
       }
     ;
 
@@ -1514,14 +1514,14 @@
 gen_if[List gens] returns [exprType etype]
     : IF test[expr_contextType.Load] gen_iter[gens]?
       {
-          $etype = (exprType)$test.tree;
+          $etype = actions.makeExpr($test.tree);
       }
     ;
 
 //yield_expr: 'yield' [testlist]
 yield_expr
     : YIELD testlist[expr_contextType.Load]?
-   -> ^(YIELD<Yield>[$YIELD, (exprType)$testlist.tree])
+   -> ^(YIELD<Yield>[$YIELD, actions.makeExpr($testlist.tree)])
     ;
 
 AS        : 'as' ;

Modified: trunk/jython/src/org/python/antlr/GrammarActions.java
===================================================================
--- trunk/jython/src/org/python/antlr/GrammarActions.java	2008-09-10 13:05:27 UTC (rev 5312)
+++ trunk/jython/src/org/python/antlr/GrammarActions.java	2008-09-10 18:36:16 UTC (rev 5313)
@@ -151,6 +151,17 @@
         errorHandler.error("Generator expression must be parenthesized if not sole argument", t);
     }
 
+    exprType makeExpr(Object o) {
+        if (o instanceof exprType) {
+            return (exprType)o;
+        }
+        if (o instanceof PythonTree) {
+            return errorHandler.errorExpr((PythonTree)o);
+        }
+        return null;
+    }
+
+
     exprType[] makeExprs(List exprs) {
         return makeExprs(exprs, 0);
     }
@@ -280,7 +291,7 @@
         checkAssign(lhs);
         e[0] = lhs;
         for(int i=0;i<rhs.size() - 1;i++) {
-            exprType r = (exprType)rhs.get(i);
+            exprType r = makeExpr(rhs.get(i));
             checkAssign(r);
             e[i + 1] = r;
         }
@@ -288,7 +299,7 @@
     }
 
     exprType makeAssignValue(List rhs) {
-        exprType value = (exprType)rhs.get(rhs.size() -1);
+        exprType value = makeExpr(rhs.get(rhs.size() -1));
         recurseSetContext(value, expr_contextType.Load);
         return value;
     }
@@ -654,18 +665,18 @@
         exprType e = null;
         exprType o = null;
         if (lower != null) {
-            s = (exprType)lower;
+            s = makeExpr(lower);
         }
         if (colon != null) {
             isSlice = true;
             if (upper != null) {
-                e = (exprType)upper;
+                e = makeExpr(upper);
             }
         }
         if (sliceop != null) {
             isSlice = true;
             if (sliceop != null) {
-                o = (exprType)sliceop;
+                o = makeExpr(sliceop);
             } else {
                 o = new Name(sliceop, "None", expr_contextType.Load);
             }
@@ -702,18 +713,18 @@
     }
 
     BinOp makeBinOp(PythonTree left, operatorType op, List rights) {
-        BinOp current = new BinOp(left, (exprType)left, op, (exprType)rights.get(0));
+        BinOp current = new BinOp(left, makeExpr(left), op, makeExpr(rights.get(0)));
         for (int i = 1; i< rights.size(); i++) {
-            exprType right = (exprType)rights.get(i);
+            exprType right = makeExpr(rights.get(i));
             current = new BinOp(left, current, op, right);
         }
         return current;
     }
 
     BinOp makeBinOp(PythonTree left, List ops, List rights) {
-        BinOp current = new BinOp(left, (exprType)left, (operatorType)ops.get(0), (exprType)rights.get(0));
+        BinOp current = new BinOp(left, makeExpr(left), (operatorType)ops.get(0), makeExpr(rights.get(0)));
         for (int i = 1; i< rights.size(); i++) {
-            exprType right = (exprType)rights.get(i);
+            exprType right = makeExpr(rights.get(i));
             operatorType op = (operatorType)ops.get(i);
             current = new BinOp(left, current, op, right);
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5320
          http://jython.svn.sourceforge.net/jython/?rev=5320&view=rev
Author:   fwierzbicki
Date:     2008-09-11 19:48:35 +0000 (Thu, 11 Sep 2008)

Log Message:
-----------
Transform if/elif/else into the correct If nodes in the grammar file
instead of as a code post-processing step.

Modified Paths:
--------------
    trunk/jython/grammar/Python.g
    trunk/jython/src/org/python/antlr/GrammarActions.java

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2008-09-11 01:33:39 UTC (rev 5319)
+++ trunk/jython/grammar/Python.g	2008-09-11 19:48:35 UTC (rev 5320)
@@ -797,18 +797,31 @@
 
 //if_stmt: 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
 if_stmt
-    : IF test[expr_contextType.Load] COLON ifsuite=suite elifs+=elif_clause*
-        (ORELSE COLON elsesuite=suite)?
+    : IF test[expr_contextType.Load] COLON ifsuite=suite elif_clause[$test.start]?
    -> ^(IF<If>[$IF, actions.makeExpr($test.tree), actions.makeStmts($ifsuite.stypes),
-         actions.makeElses($elsesuite.stypes, $elifs)])
+         actions.makeElse($elif_clause.stypes, $elif_clause.tree)])
     ;
 
 //not in CPython's Grammar file
-elif_clause
-    : ELIF test[expr_contextType.Load] COLON suite
-   -> ^(ELIF<If>[$test.start, actions.makeExpr($test.tree), actions.makeStmts($suite.stypes), new stmtType[0\]])
+elif_clause [Token iftest] returns [List stypes]
+    : else_clause {
+        $stypes = $else_clause.stypes;
+    }
+    | ELIF test[expr_contextType.Load] COLON suite
+        (e2=elif_clause[$iftest]
+       -> ^(ELIF<If>[$iftest, actions.makeExpr($test.tree), actions.makeStmts($suite.stypes), actions.makeElse($e2.stypes, $e2.tree)])
+        |
+       -> ^(ELIF<If>[$iftest, actions.makeExpr($test.tree), actions.makeStmts($suite.stypes), new stmtType[0\]])
+        )
     ;
 
+//not in CPython's Grammar file
+else_clause returns [List stypes]
+    : ORELSE COLON elsesuite=suite {
+        $stypes = $suite.stypes;
+    }
+    ;
+
 //while_stmt: 'while' test ':' suite ['else' ':' suite]
 while_stmt
 @init {

Modified: trunk/jython/src/org/python/antlr/GrammarActions.java
===================================================================
--- trunk/jython/src/org/python/antlr/GrammarActions.java	2008-09-11 01:33:39 UTC (rev 5319)
+++ trunk/jython/src/org/python/antlr/GrammarActions.java	2008-09-11 19:48:35 UTC (rev 5320)
@@ -182,18 +182,13 @@
         return new exprType[0];
     }
     
-    stmtType[] makeElses(List elseSuite, List elifs) {
-        stmtType[] o;
-        o = makeStmts(elseSuite);
-        if (elifs != null) {
-            ListIterator iter = elifs.listIterator(elifs.size());
-            while (iter.hasPrevious()) {
-                If elif = (If)iter.previous();
-                elif.orelse = o;
-                o = new stmtType[]{elif};
-            }
+    stmtType[] makeElse(List elseSuite, PythonTree elif) {
+        if (elseSuite != null) {
+            return makeStmts(elseSuite);
+        } else if (elif == null) {
+            return new stmtType[0];
         }
-        return o;
+        return new stmtType[]{(stmtType)elif};
     }
 
     stmtType[] makeStmts(PythonTree t) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5339
          http://jython.svn.sourceforge.net/jython/?rev=5339&view=rev
Author:   fwierzbicki
Date:     2008-09-18 19:07:35 +0000 (Thu, 18 Sep 2008)

Log Message:
-----------
Fixed another eof/whitespace parsing issue from Django.  Turned all of these
problems into a new test: test_eof_jy.py.

Modified Paths:
--------------
    trunk/jython/grammar/Python.g
    trunk/jython/src/org/python/antlr/PythonTokenSource.java

Added Paths:
-----------
    trunk/jython/Lib/test/eof_fodder1.py
    trunk/jython/Lib/test/eof_fodder2.py
    trunk/jython/Lib/test/eof_fodder3.py
    trunk/jython/Lib/test/eof_fodder4.py
    trunk/jython/Lib/test/eof_fodder5.py
    trunk/jython/Lib/test/eof_fodder6.py
    trunk/jython/Lib/test/test_eof_jy.py

Added: trunk/jython/Lib/test/eof_fodder1.py
===================================================================
--- trunk/jython/Lib/test/eof_fodder1.py	                        (rev 0)
+++ trunk/jython/Lib/test/eof_fodder1.py	2008-09-18 19:07:35 UTC (rev 5339)
@@ -0,0 +1,3 @@
+def d():
+    def e():
+        pass
\ No newline at end of file

Added: trunk/jython/Lib/test/eof_fodder2.py
===================================================================
--- trunk/jython/Lib/test/eof_fodder2.py	                        (rev 0)
+++ trunk/jython/Lib/test/eof_fodder2.py	2008-09-18 19:07:35 UTC (rev 5339)
@@ -0,0 +1,4 @@
+def f():
+    def g():
+        pass
+        
\ No newline at end of file

Added: trunk/jython/Lib/test/eof_fodder3.py
===================================================================
--- trunk/jython/Lib/test/eof_fodder3.py	                        (rev 0)
+++ trunk/jython/Lib/test/eof_fodder3.py	2008-09-18 19:07:35 UTC (rev 5339)
@@ -0,0 +1,4 @@
+def f():
+    def g():
+        pass
+        

Added: trunk/jython/Lib/test/eof_fodder5.py
===================================================================
--- trunk/jython/Lib/test/eof_fodder5.py	                        (rev 0)
+++ trunk/jython/Lib/test/eof_fodder5.py	2008-09-18 19:07:35 UTC (rev 5339)
@@ -0,0 +1,3 @@
+def f():
+    pass
+# just a comment
\ No newline at end of file

Added: trunk/jython/Lib/test/eof_fodder6.py
===================================================================
--- trunk/jython/Lib/test/eof_fodder6.py	                        (rev 0)
+++ trunk/jython/Lib/test/eof_fodder6.py	2008-09-18 19:07:35 UTC (rev 5339)
@@ -0,0 +1,5 @@
+def f():
+    def g():
+        pass
+          
+  
\ No newline at end of file

Added: trunk/jython/Lib/test/test_eof_jy.py
===================================================================
--- trunk/jython/Lib/test/test_eof_jy.py	                        (rev 0)
+++ trunk/jython/Lib/test/test_eof_jy.py	2008-09-18 19:07:35 UTC (rev 5339)
@@ -0,0 +1,55 @@
+import unittest
+from test import test_support
+
+class TestEof(unittest.TestCase):
+    """
+    Oddities originally found in Django involving whitespace and newlines or
+    lack thereof at the end of files.  I can't use __builtin__.compile()
+    because newlines get added and hide these problems, so I have opted to
+    import Python files containing these oddities.
+    """
+
+    def test_indented_no_newline(self):
+        try:
+            import eof_fodder1
+        except ImportError, cause:
+            self.fail(cause)
+
+    def test_trailing_ws_no_newline(self):
+        try:
+            import eof_fodder2
+        except ImportError, cause:
+            self.fail(cause)
+
+    def test_trailing_ws(self):
+        try:
+            import eof_fodder3
+        except ImportError, cause:
+            self.fail(cause)
+
+    def test_empty(self):
+        try:
+            import eof_fodder4
+        except ImportError, cause:
+            self.fail(cause)
+
+    def test_just_a_comment_no_newline(self):
+        try:
+            import eof_fodder5
+        except ImportError, cause:
+            self.fail(cause)
+
+    def test_junky_ws_after_indent(self):
+        try:
+            import eof_fodder6
+        except ImportError, cause:
+            self.fail(cause)
+
+#==============================================================================
+
+def test_main(verbose=None):
+    test_classes = [TestEof]
+    test_support.run_unittest(*test_classes)
+
+if __name__ == "__main__":
+    test_main(verbose=True)

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2008-09-17 22:37:23 UTC (rev 5338)
+++ trunk/jython/grammar/Python.g	2008-09-18 19:07:35 UTC (rev 5339)
@@ -1785,7 +1785,7 @@
              )+
              ( ('\r')? '\n' {newlines++; }
              )* {
-                   if (input.LA(1) != -1) {
+                   if (input.LA(1) != -1 || newlines == 0) {
                        // make a string of n spaces where n is column number - 1
                        char[] indentation = new char[spaces];
                        for (int i=0; i<spaces; i++) {

Modified: trunk/jython/src/org/python/antlr/PythonTokenSource.java
===================================================================
--- trunk/jython/src/org/python/antlr/PythonTokenSource.java	2008-09-17 22:37:23 UTC (rev 5338)
+++ trunk/jython/src/org/python/antlr/PythonTokenSource.java	2008-09-18 19:07:35 UTC (rev 5339)
@@ -167,11 +167,18 @@
             Token prev = stream.LT(-1);
             handleEOF((CommonToken)t, (CommonToken)prev);
             if (!inSingle) {
-                if (prev == null || prev.getType() != PythonLexer.NEWLINE) {
+                if (prev == null) {
                     generateNewline(t);
+                } else if (prev.getType() == PythonLexer.LEADING_WS) {
+                    handleDedents(-1, (CommonToken)t);
+                    generateNewline(t);
+                } else if (prev.getType() != PythonLexer.NEWLINE) {
+                    generateNewline(t);
+                    handleDedents(-1, (CommonToken)t);
                 }
+            } else {
+                handleDedents(-1, (CommonToken)t);
             }
-            handleDedents(-1, (CommonToken)t);
             enqueue(t);
         } else if (t.getType() == PythonLexer.NEWLINE) {
             // save NEWLINE in the queue


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5340
          http://jython.svn.sourceforge.net/jython/?rev=5340&view=rev
Author:   fwierzbicki
Date:     2008-09-18 19:37:19 +0000 (Thu, 18 Sep 2008)

Log Message:
-----------
Unicode ast node is a kludge from long ago whose time has passed.  I forgot to
remove it when I unified str node handling in the parser.

Modified Paths:
--------------
    trunk/jython/ast/Python.asdl
    trunk/jython/src/org/python/antlr/ast/VisitorBase.java
    trunk/jython/src/org/python/antlr/ast/VisitorIF.java

Removed Paths:
-------------
    trunk/jython/src/org/python/antlr/ast/Unicode.java

Modified: trunk/jython/ast/Python.asdl
===================================================================
--- trunk/jython/ast/Python.asdl	2008-09-18 19:07:35 UTC (rev 5339)
+++ trunk/jython/ast/Python.asdl	2008-09-18 19:37:19 UTC (rev 5340)
@@ -68,7 +68,6 @@
 	     | Repr(expr value)
 	     | Num(object n) -- a number as a PyObject.
 	     | Str(string s) -- need to specify raw, unicode, etc?
-	     | Unicode(string s) -- need to specify raw, unicode, etc?
 	     -- other literals? bools?
 
 	     -- the following expression can appear in assignment context

Deleted: trunk/jython/src/org/python/antlr/ast/Unicode.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Unicode.java	2008-09-18 19:07:35 UTC (rev 5339)
+++ trunk/jython/src/org/python/antlr/ast/Unicode.java	2008-09-18 19:37:19 UTC (rev 5340)
@@ -1,57 +0,0 @@
-// Autogenerated AST node
-package org.python.antlr.ast;
-import org.python.antlr.PythonTree;
-import org.antlr.runtime.CommonToken;
-import org.antlr.runtime.Token;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class Unicode extends exprType {
-    public Object s;
-
-    public static final String[] _fields = new String[] {"s"};
-
-    public Unicode(Token token, Object s) {
-        super(token);
-        this.s = s;
-    }
-
-    public Unicode(int ttype, Token token, Object s) {
-        super(ttype, token);
-        this.s = s;
-    }
-
-    public Unicode(PythonTree tree, Object s) {
-        super(tree);
-        this.s = s;
-    }
-
-    public String toString() {
-        return "Unicode";
-    }
-
-    public String toStringTree() {
-        StringBuffer sb = new StringBuffer("Unicode(");
-        sb.append("s=");
-        sb.append(dumpThis(s));
-        sb.append(",");
-        sb.append(")");
-        return sb.toString();
-    }
-
-    public <R> R accept(VisitorIF<R> visitor) throws Exception {
-        return visitor.visitUnicode(this);
-    }
-
-    public void traverse(VisitorIF visitor) throws Exception {
-    }
-
-    public int getLineno() {
-        return getLine();
-    }
-
-    public int getCol_offset() {
-        return getCharPositionInLine();
-    }
-
-}

Modified: trunk/jython/src/org/python/antlr/ast/VisitorBase.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/VisitorBase.java	2008-09-18 19:07:35 UTC (rev 5339)
+++ trunk/jython/src/org/python/antlr/ast/VisitorBase.java	2008-09-18 19:37:19 UTC (rev 5340)
@@ -251,12 +251,6 @@
         return ret;
     }
 
-    public R visitUnicode(Unicode node) throws Exception {
-        R ret = unhandled_node(node);
-        traverse(node);
-        return ret;
-    }
-
     public R visitAttribute(Attribute node) throws Exception {
         R ret = unhandled_node(node);
         traverse(node);

Modified: trunk/jython/src/org/python/antlr/ast/VisitorIF.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/VisitorIF.java	2008-09-18 19:07:35 UTC (rev 5339)
+++ trunk/jython/src/org/python/antlr/ast/VisitorIF.java	2008-09-18 19:37:19 UTC (rev 5340)
@@ -43,7 +43,6 @@
     public R visitRepr(Repr node) throws Exception;
     public R visitNum(Num node) throws Exception;
     public R visitStr(Str node) throws Exception;
-    public R visitUnicode(Unicode node) throws Exception;
     public R visitAttribute(Attribute node) throws Exception;
     public R visitSubscript(Subscript node) throws Exception;
     public R visitName(Name node) throws Exception;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5341
          http://jython.svn.sourceforge.net/jython/?rev=5341&view=rev
Author:   leosoto
Date:     2008-09-20 02:08:34 +0000 (Sat, 20 Sep 2008)

Log Message:
-----------
PyType now exposes __repr__ and __str__ as documented on <http://wiki.python.org/jython/JythonDeveloperGuide/ImplementingStrAndRepr>. This fixes #1131

Modified Paths:
--------------
    trunk/jython/Lib/test/test_class_jy.py
    trunk/jython/src/org/python/core/PyType.java

Modified: trunk/jython/Lib/test/test_class_jy.py
===================================================================
--- trunk/jython/Lib/test/test_class_jy.py	2008-09-18 19:37:19 UTC (rev 5340)
+++ trunk/jython/Lib/test/test_class_jy.py	2008-09-20 02:08:34 UTC (rev 5341)
@@ -298,7 +298,18 @@
         class Bar(object):
             self.assertEqual(__module__, module_name)
 
+class ClassMetaclassRepr(unittest.TestCase):
+    """Verifies #1131 is fixed"""
+    def test_repr_with_metaclass(self):
+        class FooMetaclass(type):
+            def __new__(cls, name, bases, attrs):
+                return super(FooMetaclass, cls).__new__(cls, name, bases, attrs)
 
+        class Foo(object):
+            __metaclass__ = FooMetaclass
+        self.assertEqual("<class '%s.Foo'>" % __name__, repr(Foo))
+
+
 def test_main():
     test_support.run_unittest(ClassGeneralTestCase,
                               ClassNamelessModuleTestCase,
@@ -307,6 +318,7 @@
                               IsDescendentTestCase,
                               JavaClassNamingTestCase,
                               ClassDefinesDunderModule,
+                              ClassMetaclassRepr,
                               )
 
 

Modified: trunk/jython/src/org/python/core/PyType.java
===================================================================
--- trunk/jython/src/org/python/core/PyType.java	2008-09-18 19:37:19 UTC (rev 5340)
+++ trunk/jython/src/org/python/core/PyType.java	2008-09-20 02:08:34 UTC (rev 5341)
@@ -1344,7 +1344,8 @@
         return numSlots;
     }
 
-    public String toString() {
+    @ExposedMethod(names = {"__repr__", "__str__"})
+    public String type_toString() {
         String kind;
         if (!builtin) {
             kind = "class";
@@ -1358,6 +1359,10 @@
         return String.format("<%s '%s'>", kind, getName());
     }
 
+    public String toString() {
+        return type_toString();
+    }
+
     /**
      * Raises AttributeError on type objects. The message differs from
      * PyObject#noAttributeError, to mimic CPython behaviour.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5345
          http://jython.svn.sourceforge.net/jython/?rev=5345&view=rev
Author:   fwierzbicki
Date:     2008-09-24 21:05:39 +0000 (Wed, 24 Sep 2008)

Log Message:
-----------
Switched PythonPartial.g from being a "grammar" to being a "parser grammar",
plus some additional related cleanup.  This fixes all of the missing Token
warnings.  Thanks to Terrance Parr for suggesting this fix.

Modified Paths:
--------------
    trunk/jython/grammar/PythonPartial.g
    trunk/jython/src/org/python/core/ParserFacade.java
    trunk/jython/tests/java/org/python/antlr/PythonPartialTester.java

Modified: trunk/jython/grammar/PythonPartial.g
===================================================================
--- trunk/jython/grammar/PythonPartial.g	2008-09-24 19:56:28 UTC (rev 5344)
+++ trunk/jython/grammar/PythonPartial.g	2008-09-24 21:05:39 UTC (rev 5345)
@@ -62,7 +62,7 @@
  *  an indent but no dedent.
  */
 
-grammar PythonPartial;
+parser grammar PythonPartial;
 
 options {
     tokenVocab=Python;
@@ -124,67 +124,6 @@
 }
 }
 
-
-@... { 
-package org.python.antlr;
-} 
-
-@... {
-/** Handles context-sensitive lexing of implicit line joining such as
- *  the case where newline is ignored in cases like this:
- *  a = [3,
- *       4]
- */
-int implicitLineJoiningLevel = 0;
-int startPos=-1;
-public boolean eofWhileNested = false;
-    public Token nextToken() {
-		while (true) {
-			state.token = null;
-			state.channel = Token.DEFAULT_CHANNEL;
-			state.tokenStartCharIndex = input.index();
-			state.tokenStartCharPositionInLine = input.getCharPositionInLine();
-			state.tokenStartLine = input.getLine();
-			state.text = null;
-			if ( input.LA(1)==CharStream.EOF ) {
-                if (implicitLineJoiningLevel > 0) {
-                    eofWhileNested = true;
-                }
-				return Token.EOF_TOKEN;
-			}
-			try {
-				mTokens();
-				if ( state.token==null ) {
-					emit();
-				}
-				else if ( state.token==Token.SKIP_TOKEN ) {
-					continue;
-				}
-				return state.token;
-			}
-            catch (RecognitionException re) {
-                throw new ParseException("failed partial", re);
-            }
-        }
-    }
-
-	public void reportError(RecognitionException e) {
-		System.err.print("[LEXER REPORTING] ");
-		// if we've already reported an error and have not matched a token
-		// yet successfully, don't report any errors.
-		if ( state.errorRecovery ) {
-			System.err.print("[SPURIOUS] ");
-			return;
-		}
-		state.syntaxErrors++; // don't count spurious
-		state.errorRecovery = true;
-
-		displayRecognitionError(this.getTokenNames(), e);
-	}
-
-
-}
-
 single_input : NEWLINE
              | simple_stmt
              | compound_stmt NEWLINE?

Modified: trunk/jython/src/org/python/core/ParserFacade.java
===================================================================
--- trunk/jython/src/org/python/core/ParserFacade.java	2008-09-24 19:56:28 UTC (rev 5344)
+++ trunk/jython/src/org/python/core/ParserFacade.java	2008-09-24 21:05:39 UTC (rev 5345)
@@ -26,7 +26,7 @@
 import org.python.antlr.PythonTree;
 import org.python.antlr.PythonTree;
 import org.python.antlr.PythonLexer;
-import org.python.antlr.PythonPartialParser;
+import org.python.antlr.PythonPartial;
 import org.python.antlr.PythonTokenSource;
 import org.python.antlr.ast.modType;
 import org.python.core.io.StreamIO;
@@ -172,7 +172,7 @@
             CommonTokenStream tokens = new CommonTokenStream(lexer);
             PythonTokenSource indentedSource = new PythonTokenSource(tokens, filename);
             tokens = new CommonTokenStream(indentedSource);
-            PythonPartialParser parser = new PythonPartialParser(tokens);
+            PythonPartial parser = new PythonPartial(tokens);
             if (kind.equals("single")) {
                 parser.single_input();
             } else if (kind.equals("eval")) {

Modified: trunk/jython/tests/java/org/python/antlr/PythonPartialTester.java
===================================================================
--- trunk/jython/tests/java/org/python/antlr/PythonPartialTester.java	2008-09-24 19:56:28 UTC (rev 5344)
+++ trunk/jython/tests/java/org/python/antlr/PythonPartialTester.java	2008-09-24 21:05:39 UTC (rev 5345)
@@ -19,7 +19,7 @@
             //PythonTokenSource indentedSource = new PythonTokenSource(tokens);
             PythonTokenSource indentedSource = new PythonTokenSource(tokens, "<test>");
             tokens = new CommonTokenStream(indentedSource);
-            PythonPartialParser parser = new PythonPartialParser(tokens);
+            PythonPartial parser = new PythonPartial(tokens);
             parser.single_input();
             System.out.println("SUCCEED");
         } catch (ParseException e) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5353
          http://jython.svn.sourceforge.net/jython/?rev=5353&view=rev
Author:   fwierzbicki
Date:     2008-10-01 02:01:33 +0000 (Wed, 01 Oct 2008)

Log Message:
-----------
Added castSlice and castSlices to allow optional error nodes for sliceType.
Also renamed makeExpr(s) and makeStmt(s) to castExpr(s) and castStmt(s).

Modified Paths:
--------------
    trunk/jython/grammar/Python.g
    trunk/jython/src/org/python/antlr/GrammarActions.java

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2008-09-26 17:01:58 UTC (rev 5352)
+++ trunk/jython/grammar/Python.g	2008-10-01 02:01:33 UTC (rev 5353)
@@ -251,7 +251,9 @@
                 errorHandler.reportError(this, nva);
                 errorHandler.recover(this, nva); // throw out current char and try again
             } catch (FailedPredicateException fp) {
-                //XXX: added this for failed STRINGPART
+                //XXX: added this for failed STRINGPART -- the FailedPredicateException
+                //     hides a NoViableAltException.  This should be the only
+                //     FailedPredicateException that gets thrown by the lexer.
                 errorHandler.reportError(this, fp);
                 errorHandler.recover(this, fp); // throw out current char and try again
             } catch (RecognitionException re) {
@@ -274,10 +276,10 @@
         mtype = new Interactive($single_input.start, new stmtType[0]);
     }
     | simple_stmt NEWLINE* EOF {
-        mtype = new Interactive($single_input.start, actions.makeStmts($simple_stmt.stypes));
+        mtype = new Interactive($single_input.start, actions.castStmts($simple_stmt.stypes));
     }
     | compound_stmt NEWLINE+ EOF {
-        mtype = new Interactive($single_input.start, actions.makeStmts($compound_stmt.tree));
+        mtype = new Interactive($single_input.start, actions.castStmts($compound_stmt.tree));
     }
     ;
 
@@ -303,7 +305,7 @@
     : (NEWLINE
       | stmt {stypes.addAll($stmt.stypes);}
       )* EOF {
-        mtype = new Module($file_input.start, actions.makeStmts(stypes));
+        mtype = new Module($file_input.start, actions.castStmts(stypes));
     }
     ;
 
@@ -316,7 +318,7 @@
     $eval_input.tree = mtype;
 }
     : LEADING_WS? (NEWLINE)* testlist[expr_contextType.Load] (NEWLINE)* EOF {
-        mtype = new Expression($eval_input.start, actions.makeExpr($testlist.tree));
+        mtype = new Expression($eval_input.start, actions.castExpr($testlist.tree));
     }
     ;
 
@@ -428,7 +430,7 @@
 }
     : fpdef[expr_contextType.Param] (ASSIGN test[expr_contextType.Load])?
       {
-          $etype = actions.makeExpr($fpdef.tree);
+          $etype = actions.castExpr($fpdef.tree);
           if ($ASSIGN != null) {
               defaults.add($test.tree);
           } else if (!defaults.isEmpty()) {
@@ -466,12 +468,12 @@
 //fpdef: NAME | '(' fplist ')'
 fpdef[expr_contextType ctype]
 @after {
-    actions.checkAssign(actions.makeExpr($fpdef.tree));
+    actions.checkAssign(actions.castExpr($fpdef.tree));
 }
     : NAME 
    -> ^(NAME<Name>[$NAME, $NAME.text, ctype])
     | (LPAREN fpdef[null] COMMA) => LPAREN fplist RPAREN
-   -> ^(LPAREN<Tuple>[$fplist.start, actions.makeExprs($fplist.etypes), expr_contextType.Store])
+   -> ^(LPAREN<Tuple>[$fplist.start, actions.castExprs($fplist.etypes), expr_contextType.Store])
     | LPAREN fplist RPAREN
    -> fplist
     ;
@@ -533,31 +535,31 @@
     : ((testlist[null] augassign) => lhs=testlist[expr_contextType.AugStore]
         ( (aay=augassign y1=yield_expr 
             {
-                actions.checkAssign(actions.makeExpr($lhs.tree));
-                stype = new AugAssign($lhs.tree, actions.makeExpr($lhs.tree), $aay.op, actions.makeExpr($y1.tree));
+                actions.checkAssign(actions.castExpr($lhs.tree));
+                stype = new AugAssign($lhs.tree, actions.castExpr($lhs.tree), $aay.op, actions.castExpr($y1.tree));
             }
           )
         | (aat=augassign rhs=testlist[expr_contextType.Load]
             {
-                actions.checkAssign(actions.makeExpr($lhs.tree));
-                stype = new AugAssign($lhs.tree, actions.makeExpr($lhs.tree), $aat.op, actions.makeExpr($rhs.tree));
+                actions.checkAssign(actions.castExpr($lhs.tree));
+                stype = new AugAssign($lhs.tree, actions.castExpr($lhs.tree), $aat.op, actions.castExpr($rhs.tree));
             }
           )
         )
     | (testlist[null] ASSIGN) => lhs=testlist[expr_contextType.Store]
         (
         | ((at=ASSIGN t+=testlist[expr_contextType.Store])+
-       -> ^(ASSIGN<Assign>[$lhs.start, actions.makeAssignTargets(actions.makeExpr($lhs.tree), $t),
+       -> ^(ASSIGN<Assign>[$lhs.start, actions.makeAssignTargets(actions.castExpr($lhs.tree), $t),
             actions.makeAssignValue($t)])
           )
         | ((ay=ASSIGN y2+=yield_expr)+
-       -> ^(ASSIGN<Assign>[$lhs.start, actions.makeAssignTargets(actions.makeExpr($lhs.tree), $y2),
+       -> ^(ASSIGN<Assign>[$lhs.start, actions.makeAssignTargets(actions.castExpr($lhs.tree), $y2),
             actions.makeAssignValue($y2)])
           )
         )
     | lhs=testlist[expr_contextType.Load]
       {
-          stype = new Expr($lhs.start, actions.makeExpr($lhs.tree));
+          stype = new Expr($lhs.start, actions.castExpr($lhs.tree));
       }
     )
     ;
@@ -584,9 +586,9 @@
 print_stmt
     : PRINT 
       (t1=printlist
-     -> ^(PRINT<Print>[$PRINT, null, actions.makeExprs($t1.elts), $t1.newline])
+     -> ^(PRINT<Print>[$PRINT, null, actions.castExprs($t1.elts), $t1.newline])
       | RIGHTSHIFT t2=printlist2
-     -> ^(PRINT<Print>[$PRINT, actions.makeExpr($t2.elts.get(0)), actions.makeExprs($t2.elts, 1), $t2.newline])
+     -> ^(PRINT<Print>[$PRINT, actions.castExpr($t2.elts.get(0)), actions.castExprs($t2.elts, 1), $t2.newline])
       |
      -> ^(PRINT<Print>[$PRINT, null, new exprType[0\], false])
       )
@@ -636,7 +638,7 @@
 //del_stmt: 'del' exprlist
 del_stmt
     : DELETE del_list
-   -> ^(DELETE<Delete>[$DELETE, actions.makeExprs($del_list.etypes)])
+   -> ^(DELETE<Delete>[$DELETE, actions.castExprs($del_list.etypes)])
     ;
 
 //pass_stmt: 'pass'
@@ -670,7 +672,7 @@
 return_stmt
     : RETURN 
       (testlist[expr_contextType.Load]
-     -> ^(RETURN<Return>[$RETURN, actions.makeExpr($testlist.tree)])
+     -> ^(RETURN<Return>[$RETURN, actions.castExpr($testlist.tree)])
       |
      -> ^(RETURN<Return>[$RETURN, null])
       )
@@ -678,14 +680,14 @@
 
 //yield_stmt: yield_expr
 yield_stmt
-    : yield_expr -> ^(YIELD<Expr>[$yield_expr.start, actions.makeExpr($yield_expr.tree)])
+    : yield_expr -> ^(YIELD<Expr>[$yield_expr.start, actions.castExpr($yield_expr.tree)])
     ;
 
 //raise_stmt: 'raise' [test [',' test [',' test]]]
 raise_stmt
     : RAISE (t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load]
         (COMMA t3=test[expr_contextType.Load])?)?)?
-   -> ^(RAISE<Raise>[$RAISE, actions.makeExpr($t1.tree), actions.makeExpr($t2.tree), actions.makeExpr($t3.tree)])
+   -> ^(RAISE<Raise>[$RAISE, actions.castExpr($t1.tree), actions.castExpr($t2.tree), actions.castExpr($t3.tree)])
     ;
 
 //import_stmt: import_name | import_from
@@ -778,14 +780,14 @@
     : EXEC expr[expr_contextType.Load] (IN t1=test[expr_contextType.Load]
         (COMMA t2=test[expr_contextType.Load])?)?
       {
-         stype = new Exec($EXEC, actions.makeExpr($expr.tree), actions.makeExpr($t1.tree), actions.makeExpr($t2.tree));
+         stype = new Exec($EXEC, actions.castExpr($expr.tree), actions.castExpr($t1.tree), actions.castExpr($t2.tree));
       }
     ;
 
 //assert_stmt: 'assert' test [',' test]
 assert_stmt
     : ASSERT t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load])?
-   -> ^(ASSERT<Assert>[$ASSERT, actions.makeExpr($t1.tree), actions.makeExpr($t2.tree)])
+   -> ^(ASSERT<Assert>[$ASSERT, actions.castExpr($t1.tree), actions.castExpr($t2.tree)])
     ;
 
 //compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | funcdef | classdef
@@ -802,7 +804,7 @@
 //if_stmt: 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
 if_stmt
     : IF test[expr_contextType.Load] COLON ifsuite=suite elif_clause[$test.start]?
-   -> ^(IF<If>[$IF, actions.makeExpr($test.tree), actions.makeStmts($ifsuite.stypes),
+   -> ^(IF<If>[$IF, actions.castExpr($test.tree), actions.castStmts($ifsuite.stypes),
          actions.makeElse($elif_clause.stypes, $elif_clause.tree)])
     ;
 
@@ -813,9 +815,9 @@
     }
     | ELIF test[expr_contextType.Load] COLON suite
         (e2=elif_clause[$iftest]
-       -> ^(ELIF<If>[$iftest, actions.makeExpr($test.tree), actions.makeStmts($suite.stypes), actions.makeElse($e2.stypes, $e2.tree)])
+       -> ^(ELIF<If>[$iftest, actions.castExpr($test.tree), actions.castStmts($suite.stypes), actions.makeElse($e2.stypes, $e2.tree)])
         |
-       -> ^(ELIF<If>[$iftest, actions.makeExpr($test.tree), actions.makeStmts($suite.stypes), new stmtType[0\]])
+       -> ^(ELIF<If>[$iftest, actions.castExpr($test.tree), actions.castStmts($suite.stypes), new stmtType[0\]])
         )
     ;
 
@@ -836,7 +838,7 @@
 }
     : WHILE test[expr_contextType.Load] COLON s1=suite (ORELSE COLON s2=suite)?
     {
-        stype = actions.makeWhile($WHILE, actions.makeExpr($test.tree), $s1.stypes, $s2.stypes);
+        stype = actions.makeWhile($WHILE, actions.castExpr($test.tree), $s1.stypes, $s2.stypes);
     }
     ;
 
@@ -851,7 +853,7 @@
     : FOR exprlist[expr_contextType.Store] IN testlist[expr_contextType.Load] COLON s1=suite
         (ORELSE COLON s2=suite)?
       {
-          stype = actions.makeFor($FOR, $exprlist.etype, actions.makeExpr($testlist.tree), $s1.stypes, $s2.stypes);
+          stype = actions.makeFor($FOR, $exprlist.etype, actions.castExpr($testlist.tree), $s1.stypes, $s2.stypes);
       }
     ;
 
@@ -889,8 +891,8 @@
 }
     : WITH test[expr_contextType.Load] (with_var)? COLON suite
       {
-          stype = new With($WITH, actions.makeExpr($test.tree), $with_var.etype,
-              actions.makeStmts($suite.stypes));
+          stype = new With($WITH, actions.castExpr($test.tree), $with_var.etype,
+              actions.castStmts($suite.stypes));
       }
     ;
 
@@ -898,15 +900,15 @@
 with_var returns [exprType etype]
     : (AS | NAME) expr[expr_contextType.Store]
       {
-          $etype = actions.makeExpr($expr.tree);
+          $etype = actions.castExpr($expr.tree);
       }
     ;
 
 //except_clause: 'except' [test [',' test]]
 except_clause
     : EXCEPT (t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Store])?)? COLON suite
-   -> ^(EXCEPT<excepthandlerType>[$EXCEPT, actions.makeExpr($t1.tree), actions.makeExpr($t2.tree),
-          actions.makeStmts($suite.stypes), $EXCEPT.getLine(), $EXCEPT.getCharPositionInLine()])
+   -> ^(EXCEPT<excepthandlerType>[$EXCEPT, actions.castExpr($t1.tree), actions.castExpr($t2.tree),
+          actions.castStmts($suite.stypes), $EXCEPT.getLine(), $EXCEPT.getCharPositionInLine()])
     ;
 
 //suite: simple_stmt | NEWLINE INDENT stmt+ DEDENT
@@ -930,7 +932,7 @@
 test[expr_contextType ctype]
     :o1=or_test[ctype]
       ( (IF or_test[null] ORELSE) => IF o2=or_test[ctype] ORELSE e=test[expr_contextType.Load]
-     -> ^(IF<IfExp>[$o1.start, actions.makeExpr($o2.tree), actions.makeExpr($o1.tree), actions.makeExpr($e.tree)])
+     -> ^(IF<IfExp>[$o1.start, actions.castExpr($o2.tree), actions.castExpr($o1.tree), actions.castExpr($e.tree)])
       |
      -> or_test
       )
@@ -970,7 +972,7 @@
 //not_test: 'not' not_test | comparison
 not_test[expr_contextType ctype]
     : NOT nt=not_test[ctype]
-   -> ^(NOT<UnaryOp>[$NOT, unaryopType.Not, actions.makeExpr($nt.tree)])
+   -> ^(NOT<UnaryOp>[$NOT, unaryopType.Not, actions.castExpr($nt.tree)])
     | comparison[ctype]
     ;
 
@@ -981,8 +983,8 @@
 }
 @after {
     if (!cmps.isEmpty()) {
-        $comparison.tree = new Compare($left.start, actions.makeExpr($left.tree), actions.makeCmpOps(cmps),
-            actions.makeExprs($right));
+        $comparison.tree = new Compare($left.start, actions.castExpr($left.tree), actions.makeCmpOps(cmps),
+            actions.castExprs($right));
     }
 }
     : left=expr[ctype]
@@ -1140,7 +1142,7 @@
     : PLUS p=factor {$etype = new UnaryOp($PLUS, unaryopType.UAdd, $p.etype);}
     | MINUS m=factor {$etype = actions.negate($MINUS, $m.etype);}
     | TILDE t=factor {$etype = new UnaryOp($TILDE, unaryopType.Invert, $t.etype);}
-    | power {$etype = actions.makeExpr($power.tree);}
+    | power {$etype = actions.castExpr($power.tree);}
     ;
 
 //power: atom trailer* ['**' factor]
@@ -1151,7 +1153,7 @@
     : atom (t+=trailer[$atom.start, $atom.tree])* (options {greedy=true;}:d=DOUBLESTAR factor)?
       {
           //XXX: This could be better.
-          $etype = actions.makeExpr($atom.tree);
+          $etype = actions.castExpr($atom.tree);
           if ($t != null) {
               for(Object o : $t) {
                   if ($etype instanceof Context) {
@@ -1204,14 +1206,14 @@
       RBRACK
     | LCURLY 
        (dictmaker
-      -> ^(LCURLY<Dict>[$LCURLY, actions.makeExprs($dictmaker.keys),
-              actions.makeExprs($dictmaker.values)])
+      -> ^(LCURLY<Dict>[$LCURLY, actions.castExprs($dictmaker.keys),
+              actions.castExprs($dictmaker.values)])
        |
       -> ^(LCURLY<Dict>[$LCURLY, new exprType[0\], new exprType[0\]])
        )
        RCURLY
      | lb=BACKQUOTE testlist[expr_contextType.Load] rb=BACKQUOTE
-    -> ^(BACKQUOTE<Repr>[$lb, actions.makeExpr($testlist.tree)])
+    -> ^(BACKQUOTE<Repr>[$lb, actions.castExpr($testlist.tree)])
      | NAME
     -> ^(NAME<Name>[$NAME, $NAME.text, $expr::ctype])
      | INT
@@ -1241,11 +1243,11 @@
               Collections.reverse(gens);
               comprehensionType[] c =
                   (comprehensionType[])gens.toArray(new comprehensionType[gens.size()]);
-              etype = new ListComp($listmaker.start, actions.makeExpr($t.get(0)), c);
+              etype = new ListComp($listmaker.start, actions.castExpr($t.get(0)), c);
           }
         | (options {greedy=true;}:COMMA t+=test[$expr::ctype])*
           {
-              etype = new org.python.antlr.ast.List($lbrack, actions.makeExprs($t), $expr::ctype);
+              etype = new org.python.antlr.ast.List($lbrack, actions.castExprs($t), $expr::ctype);
           }
         ) (COMMA)?
           ;
@@ -1264,18 +1266,18 @@
     : t+=test[$expr::ctype]
         ( ((options {k=2;}: c1=COMMA t+=test[$expr::ctype])* (c2=COMMA)?
          -> { $c1 != null || $c2 != null }?
-                ^(COMMA<Tuple>[$testlist_gexp.start, actions.makeExprs($t), $expr::ctype])
+                ^(COMMA<Tuple>[$testlist_gexp.start, actions.castExprs($t), $expr::ctype])
          -> test
           )
         | (gen_for[gens]
            {
                Collections.reverse(gens);
                comprehensionType[] c = (comprehensionType[])gens.toArray(new comprehensionType[gens.size()]);
-               exprType e = actions.makeExpr($t.get(0));
+               exprType e = actions.castExpr($t.get(0));
                if (e instanceof Context) {
                    ((Context)e).setContext(expr_contextType.Load);
                }
-               etype = new GeneratorExp($testlist_gexp.start, actions.makeExpr($t.get(0)), c);
+               etype = new GeneratorExp($testlist_gexp.start, actions.castExpr($t.get(0)), c);
            }
           )
         )
@@ -1295,7 +1297,7 @@
           if (a == null) {
               a = new argumentsType($LAMBDA, new exprType[0], null, null, new exprType[0]);
           }
-          etype = new Lambda($LAMBDA, a, actions.makeExpr($test.tree));
+          etype = new Lambda($LAMBDA, a, actions.castExpr($test.tree));
       }
     ;
 
@@ -1303,16 +1305,16 @@
 trailer [Token begin, PythonTree tree]
     : LPAREN 
         (arglist
-       -> ^(LPAREN<Call>[$begin, actions.makeExpr($tree), actions.makeExprs($arglist.args),
+       -> ^(LPAREN<Call>[$begin, actions.castExpr($tree), actions.castExprs($arglist.args),
                actions.makeKeywords($arglist.keywords), $arglist.starargs, $arglist.kwargs])
         |
-       -> ^(LPAREN<Call>[$begin, actions.makeExpr($tree), new exprType[0\], new keywordType[0\], null, null])
+       -> ^(LPAREN<Call>[$begin, actions.castExpr($tree), new exprType[0\], new keywordType[0\], null, null])
         )
       RPAREN
     | LBRACK subscriptlist[$begin] RBRACK
-   -> ^(LBRACK<Subscript>[$begin, actions.makeExpr($tree), (sliceType)$subscriptlist.tree, $expr::ctype])
+   -> ^(LBRACK<Subscript>[$begin, actions.castExpr($tree), actions.castSlice($subscriptlist.tree), $expr::ctype])
     | DOT attr
-   -> ^(DOT<Attribute>[$begin, actions.makeExpr($tree), $attr.text, $expr::ctype])
+   -> ^(DOT<Attribute>[$begin, actions.castExpr($tree), $attr.text, $expr::ctype])
     ;
 
 //subscriptlist: subscript (',' subscript)* [',']
@@ -1349,7 +1351,7 @@
           $sltype = actions.makeSubscript(null, $c2, $upper2.tree, $sliceop.tree);
       }
     | test[expr_contextType.Load]
-   -> ^(LPAREN<Index>[$test.start, actions.makeExpr($test.tree)])
+   -> ^(LPAREN<Index>[$test.start, actions.castExpr($test.tree)])
     ;
 
 //sliceop: ':' [test]
@@ -1364,11 +1366,11 @@
 exprlist[expr_contextType ctype] returns [exprType etype]
     : (expr[null] COMMA) => e+=expr[ctype] (options {k=2;}: COMMA e+=expr[ctype])* (COMMA)?
       {
-          $etype = new Tuple($exprlist.start, actions.makeExprs($e), ctype);
+          $etype = new Tuple($exprlist.start, actions.castExprs($e), ctype);
       }
     | expr[ctype]
       {
-        $etype = actions.makeExpr($expr.tree);
+        $etype = actions.castExpr($expr.tree);
       }
     ;
 
@@ -1385,7 +1387,7 @@
 testlist[expr_contextType ctype]
     : (test[null] COMMA)
    => t+=test[ctype] (options {k=2;}: COMMA t+=test[ctype])* (COMMA)?
-   -> ^(COMMA<Tuple>[$testlist.start, actions.makeExprs($t), ctype])
+   -> ^(COMMA<Tuple>[$testlist.start, actions.castExprs($t), ctype])
     | test[ctype]
     ;
 
@@ -1410,8 +1412,8 @@
 }
     : CLASS NAME (LPAREN testlist[expr_contextType.Load]? RPAREN)? COLON suite
       {
-          stype = new ClassDef($CLASS, actions.cantBeNone($NAME), actions.makeBases(actions.makeExpr($testlist.tree)),
-              actions.makeStmts($suite.stypes));
+          stype = new ClassDef($CLASS, actions.cantBeNone($NAME), actions.makeBases(actions.castExpr($testlist.tree)),
+              actions.castStmts($suite.stypes));
       }
     ;
 
@@ -1434,17 +1436,17 @@
           }
           $args=arguments;
           $keywords=kws;
-          $starargs=actions.makeExpr($s.tree);
-          $kwargs=actions.makeExpr($k.tree);
+          $starargs=actions.castExpr($s.tree);
+          $kwargs=actions.castExpr($k.tree);
       }
     | STAR s=test[expr_contextType.Load] (COMMA DOUBLESTAR k=test[expr_contextType.Load])?
       {
-          $starargs=actions.makeExpr($s.tree);
-            $kwargs=actions.makeExpr($k.tree);
+          $starargs=actions.castExpr($s.tree);
+            $kwargs=actions.castExpr($k.tree);
       }
     | DOUBLESTAR k=test[expr_contextType.Load]
       {
-            $kwargs=actions.makeExpr($k.tree);
+            $kwargs=actions.castExpr($k.tree);
       }
     ;
 
@@ -1453,7 +1455,7 @@
     : t1=test[expr_contextType.Load]
         ((ASSIGN t2=test[expr_contextType.Load])
           {
-              $kws.add(new exprType[]{actions.makeExpr($t1.tree), actions.makeExpr($t2.tree)});
+              $kws.add(new exprType[]{actions.castExpr($t1.tree), actions.castExpr($t2.tree)});
           }
         | gen_for[$gens]
           {
@@ -1463,7 +1465,7 @@
               $genarg = true;
               Collections.reverse($gens);
               comprehensionType[] c = (comprehensionType[])$gens.toArray(new comprehensionType[$gens.size()]);
-              arguments.add(new GeneratorExp($t1.start, actions.makeExpr($t1.tree), c));
+              arguments.add(new GeneratorExp($t1.start, actions.castExpr($t1.tree), c));
           }
         | {
               if (kws.size() > 0) {
@@ -1492,7 +1494,7 @@
           } else {
               e = new exprType[0];
           }
-          gens.add(new comprehensionType($FOR, $exprlist.etype, actions.makeExpr($testlist.tree), e));
+          gens.add(new comprehensionType($FOR, $exprlist.etype, actions.castExpr($testlist.tree), e));
       }
     ;
 
@@ -1500,7 +1502,7 @@
 list_if[List gens] returns [exprType etype]
     : IF test[expr_contextType.Load] (list_iter[gens])?
     {
-        $etype = actions.makeExpr($test.tree);
+        $etype = actions.castExpr($test.tree);
     }
     ;
 
@@ -1523,7 +1525,7 @@
           } else {
               e = new exprType[0];
           }
-          gens.add(new comprehensionType($FOR, $exprlist.etype, actions.makeExpr($or_test.tree), e));
+          gens.add(new comprehensionType($FOR, $exprlist.etype, actions.castExpr($or_test.tree), e));
       }
     ;
 
@@ -1531,14 +1533,14 @@
 gen_if[List gens] returns [exprType etype]
     : IF test[expr_contextType.Load] gen_iter[gens]?
       {
-          $etype = actions.makeExpr($test.tree);
+          $etype = actions.castExpr($test.tree);
       }
     ;
 
 //yield_expr: 'yield' [testlist]
 yield_expr
     : YIELD testlist[expr_contextType.Load]?
-   -> ^(YIELD<Yield>[$YIELD, actions.makeExpr($testlist.tree)])
+   -> ^(YIELD<Yield>[$YIELD, actions.castExpr($testlist.tree)])
     ;
 
 AS        : 'as' ;

Modified: trunk/jython/src/org/python/antlr/GrammarActions.java
===================================================================
--- trunk/jython/src/org/python/antlr/GrammarActions.java	2008-09-26 17:01:58 UTC (rev 5352)
+++ trunk/jython/src/org/python/antlr/GrammarActions.java	2008-10-01 02:01:33 UTC (rev 5353)
@@ -151,7 +151,7 @@
         errorHandler.error("Generator expression must be parenthesized if not sole argument", t);
     }
 
-    exprType makeExpr(Object o) {
+    exprType castExpr(Object o) {
         if (o instanceof exprType) {
             return (exprType)o;
         }
@@ -162,11 +162,11 @@
     }
 
 
-    exprType[] makeExprs(List exprs) {
-        return makeExprs(exprs, 0);
+    exprType[] castExprs(List exprs) {
+        return castExprs(exprs, 0);
     }
 
-    exprType[] makeExprs(List exprs, int start) {
+    exprType[] castExprs(List exprs, int start) {
         if (exprs != null) {
             List<exprType> result = new ArrayList<exprType>();
             for (int i=start; i<exprs.size(); i++) {
@@ -184,14 +184,14 @@
     
     stmtType[] makeElse(List elseSuite, PythonTree elif) {
         if (elseSuite != null) {
-            return makeStmts(elseSuite);
+            return castStmts(elseSuite);
         } else if (elif == null) {
             return new stmtType[0];
         }
         return new stmtType[]{(stmtType)elif};
     }
 
-    stmtType makeStmt(Object o) {
+    stmtType castStmt(Object o) {
         if (o instanceof stmtType) {
             return (stmtType)o;
         } else if (o instanceof PythonParser.stmt_return) {
@@ -202,15 +202,15 @@
         return null;
     }
 
-    stmtType[] makeStmts(PythonTree t) {
+    stmtType[] castStmts(PythonTree t) {
         return new stmtType[]{(stmtType)t};
     }
 
-    stmtType[] makeStmts(List stmts) {
+    stmtType[] castStmts(List stmts) {
         if (stmts != null) {
             List<stmtType> result = new ArrayList<stmtType>();
             for (Object o:stmts) {
-                result.add(makeStmt(o));
+                result.add(castStmt(o));
             }
             return (stmtType[])result.toArray(new stmtType[result.size()]);
         }
@@ -231,8 +231,8 @@
         if (test == null) {
             return errorHandler.errorStmt(new PythonTree(t));
         }
-        stmtType[] o = makeStmts(orelse);
-        stmtType[] b = makeStmts(body);
+        stmtType[] o = castStmts(orelse);
+        stmtType[] b = castStmts(body);
         return new While(t, test, b, o);
     }
 
@@ -242,27 +242,27 @@
         }
         cantBeNone(target);
 
-        stmtType[] o = makeStmts(orelse);
-        stmtType[] b = makeStmts(body);
+        stmtType[] o = castStmts(orelse);
+        stmtType[] b = castStmts(body);
         return new For(t, target, iter, b, o);
     }
 
     stmtType makeTryExcept(Token t, List body, List handlers, List orelse, List finBody) {
-        stmtType[] b = makeStmts(body);
+        stmtType[] b = castStmts(body);
         excepthandlerType[] e = (excepthandlerType[])handlers.toArray(new excepthandlerType[handlers.size()]);
-        stmtType[] o = makeStmts(orelse);
+        stmtType[] o = castStmts(orelse);
         stmtType te = new TryExcept(t, b, e, o);
         if (finBody == null) {
             return te;
         }
-        stmtType[] f = makeStmts(finBody);
+        stmtType[] f = castStmts(finBody);
         stmtType[] mainBody = new stmtType[]{te};
         return new TryFinally(t, mainBody, f);
     }
 
     TryFinally makeTryFinally(Token t,  List body, List finBody) {
-        stmtType[] b = makeStmts(body);
-        stmtType[] f = makeStmts(finBody);
+        stmtType[] b = castStmts(body);
+        stmtType[] f = castStmts(finBody);
         return new TryFinally(t, b, f);
     }
  
@@ -277,8 +277,8 @@
         } else {
             a = new argumentsType(t, new exprType[0], null, null, new exprType[0]); 
         }
-        stmtType[] s = makeStmts(funcStatements);
-        exprType[] d = makeExprs(decorators);
+        stmtType[] s = castStmts(funcStatements);
+        exprType[] d = castExprs(decorators);
         return new FunctionDef(t, nameToken.getText(), a, s, d);
     }
 
@@ -287,7 +287,7 @@
         checkAssign(lhs);
         e[0] = lhs;
         for(int i=0;i<rhs.size() - 1;i++) {
-            exprType r = makeExpr(rhs.get(i));
+            exprType r = castExpr(rhs.get(i));
             checkAssign(r);
             e[i + 1] = r;
         }
@@ -295,7 +295,7 @@
     }
 
     exprType makeAssignValue(List rhs) {
-        exprType value = makeExpr(rhs.get(rhs.size() -1));
+        exprType value = castExpr(rhs.get(rhs.size() -1));
         recurseSetContext(value, expr_contextType.Load);
         return value;
     }
@@ -320,8 +320,8 @@
     argumentsType makeArgumentsType(Token t, List params, Token snameToken,
         Token knameToken, List defaults) {
 
-        exprType[] p = makeExprs(params);
-        exprType[] d = makeExprs(defaults);
+        exprType[] p = castExprs(params);
+        exprType[] d = castExprs(defaults);
         String s;
         String k;
         if (snameToken == null) {
@@ -338,7 +338,7 @@
     }
 
     exprType[] extractArgs(List args) {
-        return makeExprs(args);
+        return castExprs(args);
     }
 
     keywordType[] makeKeywords(List args) {
@@ -472,7 +472,7 @@
 
     //FROM Walker:
     modType makeMod(PythonTree t, List stmts) {
-        stmtType[] s = makeStmts(stmts);
+        stmtType[] s = castStmts(stmts);
         return new Module(t, s);
     }
 
@@ -481,7 +481,7 @@
     }
 
     modType makeInteractive(PythonTree t, List stmts) {
-        stmtType[] s = makeStmts(stmts);
+        stmtType[] s = castStmts(stmts);
         return new Interactive(t, s);
     }
 
@@ -490,16 +490,16 @@
             return errorHandler.errorStmt(t);
         }
         cantBeNone(nameToken);
-        exprType[] b = makeExprs(bases);
-        stmtType[] s = makeStmts(body);
+        exprType[] b = castExprs(bases);
+        stmtType[] s = castStmts(body);
         return new ClassDef(t, nameToken.getText(), b, s);
     }
 
     argumentsType makeArgumentsType(PythonTree t, List params, PythonTree snameToken,
         PythonTree knameToken, List defaults) {
 
-        exprType[] p = makeExprs(params);
-        exprType[] d = makeExprs(defaults);
+        exprType[] p = castExprs(params);
+        exprType[] d = castExprs(defaults);
         String s;
         String k;
         if (snameToken == null) {
@@ -516,22 +516,22 @@
     }
 
     stmtType makeTryExcept(PythonTree t, List body, List handlers, List orelse, List finBody) {
-        stmtType[] b = makeStmts(body);
+        stmtType[] b = castStmts(body);
         excepthandlerType[] e = (excepthandlerType[])handlers.toArray(new excepthandlerType[handlers.size()]);
-        stmtType[] o = makeStmts(orelse);
+        stmtType[] o = castStmts(orelse);
  
         stmtType te = new TryExcept(t, b, e, o);
         if (finBody == null) {
             return te;
         }
-        stmtType[] f = makeStmts(finBody);
+        stmtType[] f = castStmts(finBody);
         stmtType[] mainBody = new stmtType[]{te};
         return new TryFinally(t, mainBody, f);
     }
 
     TryFinally makeTryFinally(PythonTree t,  List body, List finBody) {
-        stmtType[] b = makeStmts(body);
-        stmtType[] f = makeStmts(finBody);
+        stmtType[] b = castStmts(body);
+        stmtType[] f = castStmts(finBody);
         return new TryFinally(t, b, f);
     }
 
@@ -539,8 +539,8 @@
         if (test == null) {
             return errorHandler.errorStmt(t);
         }
-        stmtType[] o = makeStmts(orelse);
-        stmtType[] b = makeStmts(body);
+        stmtType[] o = castStmts(orelse);
+        stmtType[] b = castStmts(body);
         return new If(t, test, b, o);
     }
 
@@ -548,8 +548,8 @@
         if (test == null) {
             return errorHandler.errorStmt(t);
         }
-        stmtType[] o = makeStmts(orelse);
-        stmtType[] b = makeStmts(body);
+        stmtType[] o = castStmts(orelse);
+        stmtType[] b = castStmts(body);
         return new While(t, test, b, o);
     }
 
@@ -558,8 +558,8 @@
             return errorHandler.errorStmt(t);
         }
         cantBeNone(target);
-        stmtType[] o = makeStmts(orelse);
-        stmtType[] b = makeStmts(body);
+        stmtType[] o = castStmts(orelse);
+        stmtType[] b = castStmts(body);
         return new For(t, target, iter, b, o);
     }
     
@@ -572,7 +572,7 @@
             return errorHandler.errorExpr(new PythonTree(t));
         }
         keywordType[] k = makeKeywords(keywords);
-        exprType[] a = makeExprs(args);
+        exprType[] a = castExprs(args);
         return new Call(t, func, a, k, starargs, kwargs);
     }
 
@@ -661,18 +661,18 @@
         exprType e = null;
         exprType o = null;
         if (lower != null) {
-            s = makeExpr(lower);
+            s = castExpr(lower);
         }
         if (colon != null) {
             isSlice = true;
             if (upper != null) {
-                e = makeExpr(upper);
+                e = castExpr(upper);
             }
         }
         if (sliceop != null) {
             isSlice = true;
             if (sliceop != null) {
-                o = makeExpr(sliceop);
+                o = castExpr(sliceop);
             } else {
                 o = new Name(sliceop, "None", expr_contextType.Load);
             }
@@ -705,28 +705,46 @@
         List values = new ArrayList();
         values.add(left);
         values.addAll(right);
-        return new BoolOp(left, op, makeExprs(values));
+        return new BoolOp(left, op, castExprs(values));
     }
 
     BinOp makeBinOp(PythonTree left, operatorType op, List rights) {
-        BinOp current = new BinOp(left, makeExpr(left), op, makeExpr(rights.get(0)));
+        BinOp current = new BinOp(left, castExpr(left), op, castExpr(rights.get(0)));
         for (int i = 1; i< rights.size(); i++) {
-            exprType right = makeExpr(rights.get(i));
+            exprType right = castExpr(rights.get(i));
             current = new BinOp(left, current, op, right);
         }
         return current;
     }
 
     BinOp makeBinOp(PythonTree left, List ops, List rights) {
-        BinOp current = new BinOp(left, makeExpr(left), (operatorType)ops.get(0), makeExpr(rights.get(0)));
+        BinOp current = new BinOp(left, castExpr(left), (operatorType)ops.get(0), castExpr(rights.get(0)));
         for (int i = 1; i< rights.size(); i++) {
-            exprType right = makeExpr(rights.get(i));
+            exprType right = castExpr(rights.get(i));
             operatorType op = (operatorType)ops.get(i);
             current = new BinOp(left, current, op, right);
         }
         return current;
     }
 
+    sliceType[] castSlices(List slices) {
+        if (slices != null) {
+            List<sliceType> result = new ArrayList<sliceType>();
+            for (Object o:slices) {
+                result.add(castSlice(o));
+            }
+            return (sliceType[])result.toArray(new sliceType[result.size()]);
+        }
+        return new sliceType[0];
+    }
+ 
+    sliceType castSlice(Object o) {
+        if (o instanceof sliceType) {
+            return (sliceType)o;
+        }
+        return errorHandler.errorSlice((PythonTree)o);
+    }
+
     sliceType makeSliceType(Token begin, Token c1, Token c2, List sltypes) {
         boolean isTuple = false;
         if (c1 != null || c2 != null) {
@@ -753,12 +771,12 @@
                 s = new Index(begin, t);
             }
         } else if (sltypes.size() == 1) {
-            s = (sliceType)sltypes.get(0);
+            s = castSlice(sltypes.get(0));
         } else if (sltypes.size() != 0) {
             extslice = true;
         }
         if (extslice) {
-            sliceType[] st = (sliceType[])sltypes.toArray(new sliceType[sltypes.size()]);
+            sliceType[] st = castSlices(sltypes);//.toArray(new sliceType[sltypes.size()]);
             s = new ExtSlice(begin, st);
         }
         return s;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5360
          http://jython.svn.sourceforge.net/jython/?rev=5360&view=rev
Author:   zyasoft
Date:     2008-10-06 03:12:34 +0000 (Mon, 06 Oct 2008)

Log Message:
-----------
Removed older version of random.py in favor of CPythonLib's; added
_random.getrandbits (in PyRandom); modified test_random so that it
doesn't test implementation specific aspects of the random generator,
since we actually use java.util.Random, not the Mersenne Twister.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_random.py
    trunk/jython/src/org/python/modules/random/PyRandom.java

Removed Paths:
-------------
    trunk/jython/Lib/random.py

Deleted: trunk/jython/Lib/random.py
===================================================================
--- trunk/jython/Lib/random.py	2008-10-06 03:02:29 UTC (rev 5359)
+++ trunk/jython/Lib/random.py	2008-10-06 03:12:34 UTC (rev 5360)
@@ -1,880 +0,0 @@
-"""Random variable generators.
-
-    integers
-    --------
-           uniform within range
-
-    sequences
-    ---------
-           pick random element
-           pick random sample
-           generate random permutation
-
-    distributions on the real line:
-    ------------------------------
-           uniform
-           normal (Gaussian)
-           lognormal
-           negative exponential
-           gamma
-           beta
-           pareto
-           Weibull
-
-    distributions on the circle (angles 0 to 2pi)
-    ---------------------------------------------
-           circular uniform
-           von Mises
-
-General notes on the underlying Mersenne Twister core generator:
-
-* The period is 2**19937-1.
-* It is one of the most extensively tested generators in existence
-* Without a direct way to compute N steps forward, the
-  semantics of jumpahead(n) are weakened to simply jump
-  to another distant state and rely on the large period
-  to avoid overlapping sequences.
-* The random() method is implemented in C, executes in
-  a single Python step, and is, therefore, threadsafe.
-
-"""
-import time
-from types import BuiltinMethodType as _BuiltinMethodType
-from math import log as _log, exp as _exp, pi as _pi, e as _e
-from math import sqrt as _sqrt, acos as _acos, cos as _cos, sin as _sin
-from math import floor as _floor
-from os import urandom as _urandom
-from binascii import hexlify as _hexlify
-
-
-__all__ = ["Random","seed","random","uniform","randint","choice","sample",
-           "randrange","shuffle","normalvariate","lognormvariate",
-           "cunifvariate","expovariate","vonmisesvariate","gammavariate",
-           "stdgamma","gauss","betavariate","paretovariate","weibullvariate",
-           "getstate","setstate","jumpahead", "WichmannHill"]
-
-NV_MAGICCONST = 4 * _exp(-0.5)/_sqrt(2.0)
-TWOPI = 2.0*_pi
-LOG4 = _log(4.0)
-SG_MAGICCONST = 1.0 + _log(4.5)
-BPF = 53        # Number of bits in a float
-RECIP_BPF = 2**-BPF
-
-# Translated by Guido van Rossum from C source provided by
-# Adrian Baddeley.  Adapted by Raymond Hettinger for use with
-# the Mersenne Twister core generator.
-
-import _random
-
-class Random(_random.Random):
-    """Random number generator base class used by bound module functions.
-
-    Used to instantiate instances of Random to get generators that don't
-    share state.  Especially useful for multi-threaded programs, creating
-    a different instance of Random for each thread, and using the jumpahead()
-    method to ensure that the generated sequences seen by each thread don't
-    overlap.
-
-    Class Random can also be subclassed if you want to use a different basic
-    generator of your own devising: in that case, override the following
-    methods:  random(), seed(), getstate(), setstate() and jumpahead().
-
-    """
-
-    VERSION = 2     # used by getstate/setstate
-
-    def __init__(self, x=None):
-        """Initialize an instance.
-
-        Optional argument x controls seeding, as for Random.seed().
-        """
-
-        self.seed(x)
-        self.gauss_next = None
-
-    def seed(self, a=None):
-        """Initialize internal state from hashable object.
-
-        None or no argument seeds from current time.
-
-        If a is not None or an int or long, hash(a) is used instead.
-        """
-
-        if a is None:
-            a = long(time.time() * 256) # use fractional seconds
-        super(Random, self).seed(a)
-        self.gauss_next = None
-
-    def getstate(self):
-        """Return internal state; can be passed to setstate() later."""
-        return self.VERSION, super(Random, self).getstate(), self.gauss_next
-
-    def setstate(self, state):
-        """Restore internal state from object returned by getstate()."""
-        version = state[0]
-        if version == 2:
-            version, internalstate, self.gauss_next = state
-            super(Random, self).setstate(internalstate)
-        else:
-            raise ValueError("state with version %s passed to "
-                             "Random.setstate() of version %s" %
-                             (version, self.VERSION))
-
-## ---- Methods below this point do not need to be overridden when
-## ---- subclassing for the purpose of using a different core generator.
-
-## -------------------- pickle support  -------------------
-
-    def __getstate__(self): # for pickle
-        return self.getstate()
-
-    def __setstate__(self, state):  # for pickle
-        self.setstate(state)
-
-    def __reduce__(self):
-        return self.__class__, (), self.getstate()
-
-## -------------------- integer methods  -------------------
-
-    def randrange(self, start, stop=None, step=1, int=int, default=None,
-                  maxwidth=1L<<BPF, _BuiltinMethod=_BuiltinMethodType):
-        """Choose a random item from range(start, stop[, step]).
-
-        This fixes the problem with randint() which includes the
-        endpoint; in Python this is usually not what you want.
-        Do not supply the 'int', 'default', and 'maxwidth' arguments.
-        """
-
-        # This code is a bit messy to make it fast for the
-        # common case while still doing adequate error checking.
-        istart = int(start)
-        if istart != start:
-            raise ValueError, "non-integer arg 1 for randrange()"
-        if stop is default:
-            if istart > 0:
-                if istart >= maxwidth and type(self.random) is _BuiltinMethod:
-                    return self._randbelow(istart)
-                return int(self.random() * istart)
-            raise ValueError, "empty range for randrange()"
-
-        # stop argument supplied.
-        istop = int(stop)
-        if istop != stop:
-            raise ValueError, "non-integer stop for randrange()"
-        width = istop - istart
-        if step == 1 and width > 0:
-            # Note that
-            #     int(istart + self.random()*(istop - istart))
-            # instead would be incorrect.  For example, consider istart
-            # = -2 and istop = 0.  Then the guts would be in
-            # -2.0 to 0.0 exclusive on both ends (ignoring that random()
-            # might return 0.0), and because int() truncates toward 0, the
-            # final result would be -1 or 0 (instead of -2 or -1).
-            #     istart + int(self.random()*(istop - istart))
-            # would also be incorrect, for a subtler reason:  the RHS
-            # can return a long, and then randrange() would also return
-            # a long, but we're supposed to return an int (for backward
-            # compatibility).
-            if width >= maxwidth and type(self.random) is _BuiltinMethod:
-                return int(istart + self._randbelow(width))
-            return int(istart + int(self.random()*width))
-        if step == 1:
-            raise ValueError, "empty range for randrange()"
-
-        # Non-unit step argument supplied.
-        istep = int(step)
-        if istep != step:
-            raise ValueError, "non-integer step for randrange()"
-        if istep > 0:
-            n = (width + istep - 1) / istep
-        elif istep < 0:
-            n = (width + istep + 1) / istep
-        else:
-            raise ValueError, "zero step for randrange()"
-
-        if n <= 0:
-            raise ValueError, "empty range for randrange()"
-
-        if n >= maxwidth and type(self.random) is _BuiltinMethod:
-            return istart + self._randbelow(n)
-        return istart + istep*int(self.random() * n)
-
-    def randint(self, a, b):
-        """Return random integer in range [a, b], including both end points.
-        """
-
-        return self.randrange(a, b+1)
-
-    def _randbelow(self, n, bpf=BPF, maxwidth=1L<<BPF,
-                   long=long, _log=_log, int=int):
-        """Return a random int in the range [0,n)
-
-        Handles the case where n has more bits than returned
-        by a single call to the underlying generator.
-        """
-
-        # k is a sometimes over but never under estimate of the bits in n
-        k = int(1.00001 + _log(n-1, 2))     # 2**k > n-1 >= 2**(k-2)
-
-        random = self.random
-        r = n
-        while r >= n:
-            # In Py2.4, this section becomes:  r = self.getrandbits(k)
-            r = long(random() * maxwidth)
-            bits = bpf
-            while bits < k:
-                r = (r << bpf) | (long(random() * maxwidth))
-                bits += bpf
-            r >>= (bits - k)
-        return r
-
-## -------------------- sequence methods  -------------------
-
-    def choice(self, seq):
-        """Choose a random element from a non-empty sequence."""
-        return seq[int(self.random() * len(seq))]
-
-    def shuffle(self, x, random=None, int=int):
-        """x, random=random.random -> shuffle list x in place; return None.
-
-        Optional arg random is a 0-argument function returning a random
-        float in [0.0, 1.0); by default, the standard random.random.
-
-        Note that for even rather small len(x), the total number of
-        permutations of x is larger than the period of most random number
-        generators; this implies that "most" permutations of a long
-        sequence can never be generated.
-        """
-
-        if random is None:
-            random = self.random
-        for i in xrange(len(x)-1, 0, -1):
-            # pick an element in x[:i+1] with which to exchange x[i]
-            j = int(random() * (i+1))
-            x[i], x[j] = x[j], x[i]
-
-    def sample(self, population, k):
-        """Chooses k unique random elements from a population sequence.
-
-        Returns a new list containing elements from the population while
-        leaving the original population unchanged.  The resulting list is
-        in selection order so that all sub-slices will also be valid random
-        samples.  This allows raffle winners (the sample) to be partitioned
-        into grand prize and second place winners (the subslices).
-
-        Members of the population need not be hashable or unique.  If the
-        population contains repeats, then each occurrence is a possible
-        selection in the sample.
-
-        To choose a sample in a range of integers, use xrange as an argument.
-        This is especially fast and space efficient for sampling from a
-        large population:   sample(xrange(10000000), 60)
-        """
-
-        # Sampling without replacement entails tracking either potential
-        # selections (the pool) in a list or previous selections in a
-        # dictionary.
-
-        # When the number of selections is small compared to the population,
-        # then tracking selections is efficient, requiring only a small
-        # dictionary and an occasional reselection.  For a larger number of
-        # selections, the pool tracking method is preferred since the list takes
-        # less space than the dictionary and it doesn't suffer from frequent
-        # reselections.
-
-        n = len(population)
-        if not 0 <= k <= n:
-            raise ValueError, "sample larger than population"
-        random = self.random
-        _int = int
-        result = [None] * k
-        if n < 6 * k:     # if n len list takes less space than a k len dict
-            pool = list(population)
-            for i in xrange(k):         # invariant:  non-selected at [0,n-i)
-                j = _int(random() * (n-i))
-                result[i] = pool[j]
-                pool[j] = pool[n-i-1]   # move non-selected item into vacancy
-        else:
-            try:
-                n > 0 and (population[0], population[n//2], population[n-1])
-            except (TypeError, KeyError):   # handle sets and dictionaries
-                population = tuple(population)
-            selected = {}
-            for i in xrange(k):
-                j = _int(random() * n)
-                while j in selected:
-                    j = _int(random() * n)
-                result[i] = selected[j] = population[j]
-        return result
-
-## -------------------- real-valued distributions  -------------------
-
-## -------------------- uniform distribution -------------------
-
-    def uniform(self, a, b):
-        """Get a random number in the range [a, b)."""
-        return a + (b-a) * self.random()
-
-## -------------------- normal distribution --------------------
-
-    def normalvariate(self, mu, sigma):
-        """Normal distribution.
-
-        mu is the mean, and sigma is the standard deviation.
-
-        """
-        # mu = mean, sigma = standard deviation
-
-        # Uses Kinderman and Monahan method. Reference: Kinderman,
-        # A.J. and Monahan, J.F., "Computer generation of random
-        # variables using the ratio of uniform deviates", ACM Trans
-        # Math Software, 3, (1977), pp257-260.
-
-        random = self.random
-        while True:
-            u1 = random()
-            u2 = 1.0 - random()
-            z = NV_MAGICCONST*(u1-0.5)/u2
-            zz = z*z/4.0
-            if zz <= -_log(u2):
-                break
-        return mu + z*sigma
-
-## -------------------- lognormal distribution --------------------
-
-    def lognormvariate(self, mu, sigma):
-        """Log normal distribution.
-
-        If you take the natural logarithm of this distribution, you'll get a
-        normal distribution with mean mu and standard deviation sigma.
-        mu can have any value, and sigma must be greater than zero.
-
-        """
-        return _exp(self.normalvariate(mu, sigma))
-
-## -------------------- circular uniform --------------------
-
-    def cunifvariate(self, mean, arc):
-        """Circular uniform distribution.
-
-        mean is the mean angle, and arc is the range of the distribution,
-        centered around the mean angle.  Both values must be expressed in
-        radians.  Returned values range between mean - arc/2 and
-        mean + arc/2 and are normalized to between 0 and pi.
-
-        Deprecated in version 2.3.  Use:
-            (mean + arc * (Random.random() - 0.5)) % Math.pi
-
-        """
-        # mean: mean angle (in radians between 0 and pi)
-        # arc:  range of distribution (in radians between 0 and pi)
-        import warnings
-        warnings.warn("The cunifvariate function is deprecated; Use (mean "
-                      "+ arc * (Random.random() - 0.5)) % Math.pi instead.",
-                      DeprecationWarning, 2)
-
-        return (mean + arc * (self.random() - 0.5)) % _pi
-
-## -------------------- exponential distribution --------------------
-
-    def expovariate(self, lambd):
-        """Exponential distribution.
-
-        lambd is 1.0 divided by the desired mean.  (The parameter would be
-        called "lambda", but that is a reserved word in Python.)  Returned
-        values range from 0 to positive infinity.
-
-        """
-        # lambd: rate lambd = 1/mean
-        # ('lambda' is a Python reserved word)
-
-        random = self.random
-        u = random()
-        while u <= 1e-7:
-            u = random()
-        return -_log(u)/lambd
-
-## -------------------- von Mises distribution --------------------
-
-    def vonmisesvariate(self, mu, kappa):
-        """Circular data distribution.
-
-        mu is the mean angle, expressed in radians between 0 and 2*pi, and
-        kappa is the concentration parameter, which must be greater than or
-        equal to zero.  If kappa is equal to zero, this distribution reduces
-        to a uniform random angle over the range 0 to 2*pi.
-
-        """
-        # mu:    mean angle (in radians between 0 and 2*pi)
-        # kappa: concentration parameter kappa (>= 0)
-        # if kappa = 0 generate uniform random angle
-
-        # Based upon an algorithm published in: Fisher, N.I.,
-        # "Statistical Analysis of Circular Data", Cambridge
-        # University Press, 1993.
-
-        # Thanks to Magnus Kessler for a correction to the
-        # implementation of step 4.
-
-        random = self.random
-        if kappa <= 1e-6:
-            return TWOPI * random()
-
-        a = 1.0 + _sqrt(1.0 + 4.0 * kappa * kappa)
-        b = (a - _sqrt(2.0 * a))/(2.0 * kappa)
-        r = (1.0 + b * b)/(2.0 * b)
-
-        while True:
-            u1 = random()
-
-            z = _cos(_pi * u1)
-            f = (1.0 + r * z)/(r + z)
-            c = kappa * (r - f)
-
-            u2 = random()
-
-            if not (u2 >= c * (2.0 - c) and u2 > c * _exp(1.0 - c)):
-                break
-
-        u3 = random()
-        if u3 > 0.5:
-            theta = (mu % TWOPI) + _acos(f)
-        else:
-            theta = (mu % TWOPI) - _acos(f)
-
-        return theta
-
-## -------------------- gamma distribution --------------------
-
-    def gammavariate(self, alpha, beta):
-        """Gamma distribution.  Not the gamma function!
-
-        Conditions on the parameters are alpha > 0 and beta > 0.
-
-        """
-
-        # alpha > 0, beta > 0, mean is alpha*beta, variance is alpha*beta**2
-
-        # Warning: a few older sources define the gamma distribution in terms
-        # of alpha > -1.0
-        if alpha <= 0.0 or beta <= 0.0:
-            raise ValueError, 'gammavariate: alpha and beta must be > 0.0'
-
-        random = self.random
-        if alpha > 1.0:
-
-            # Uses R.C.H. Cheng, "The generation of Gamma
-            # variables with non-integral shape parameters",
-            # Applied Statistics, (1977), 26, No. 1, p71-74
-
-            ainv = _sqrt(2.0 * alpha - 1.0)
-            bbb = alpha - LOG4
-            ccc = alpha + ainv
-
-            while True:
-                u1 = random()
-                if not 1e-7 < u1 < .9999999:
-                    continue
-                u2 = 1.0 - random()
-                v = _log(u1/(1.0-u1))/ainv
-                x = alpha*_exp(v)
-                z = u1*u1*u2
-                r = bbb+ccc*v-x
-                if r + SG_MAGICCONST - 4.5*z >= 0.0 or r >= _log(z):
-                    return x * beta
-
-        elif alpha == 1.0:
-            # expovariate(1)
-            u = random()
-            while u <= 1e-7:
-                u = random()
-            return -_log(u) * beta
-
-        else:   # alpha is between 0 and 1 (exclusive)
-
-            # Uses ALGORITHM GS of Statistical Computing - Kennedy & Gentle
-
-            while True:
-                u = random()
-                b = (_e + alpha)/_e
-                p = b*u
-                if p <= 1.0:
-                    x = pow(p, 1.0/alpha)
-                else:
-                    # p > 1
-                    x = -_log((b-p)/alpha)
-                u1 = random()
-                if not (((p <= 1.0) and (u1 > _exp(-x))) or
-                          ((p > 1)  and  (u1 > pow(x, alpha - 1.0)))):
-                    break
-            return x * beta
-
-
-    def stdgamma(self, alpha, ainv, bbb, ccc):
-        # This method was (and shall remain) undocumented.
-        # This method is deprecated
-        # for the following reasons:
-        # 1. Returns same as .gammavariate(alpha, 1.0)
-        # 2. Requires caller to provide 3 extra arguments
-        #    that are functions of alpha anyway
-        # 3. Can't be used for alpha < 0.5
-
-        # ainv = sqrt(2 * alpha - 1)
-        # bbb = alpha - log(4)
-        # ccc = alpha + ainv
-        import warnings
-        warnings.warn("The stdgamma function is deprecated; "
-                      "use gammavariate() instead.",
-                      DeprecationWarning, 2)
-        return self.gammavariate(alpha, 1.0)
-
-
-
-## -------------------- Gauss (faster alternative) --------------------
-
-    def gauss(self, mu, sigma):
-        """Gaussian distribution.
-
-        mu is the mean, and sigma is the standard deviation.  This is
-        slightly faster than the normalvariate() function.
-
-        Not thread-safe without a lock around calls.
-
-        """
-
-        # When x and y are two variables from [0, 1), uniformly
-        # distributed, then
-        #
-        #    cos(2*pi*x)*sqrt(-2*log(1-y))
-        #    sin(2*pi*x)*sqrt(-2*log(1-y))
-        #
-        # are two *independent* variables with normal distribution
-        # (mu = 0, sigma = 1).
-        # (Lambert Meertens)
-        # (corrected version; bug discovered by Mike Miller, fixed by LM)
-
-        # Multithreading note: When two threads call this function
-        # simultaneously, it is possible that they will receive the
-        # same return value.  The window is very small though.  To
-        # avoid this, you have to use a lock around all calls.  (I
-        # didn't want to slow this down in the serial case by using a
-        # lock here.)
-
-        random = self.random
-        z = self.gauss_next
-        self.gauss_next = None
-        if z is None:
-            x2pi = random() * TWOPI
-            g2rad = _sqrt(-2.0 * _log(1.0 - random()))
-            z = _cos(x2pi) * g2rad
-            self.gauss_next = _sin(x2pi) * g2rad
-
-        return mu + z*sigma
-
-## -------------------- beta --------------------
-## See
-## http://sourceforge.net/bugs/?func=detailbug&bug_id=130030&group_id=5470
-## for Ivan Frohne's insightful analysis of why the original implementation:
-##
-##    def betavariate(self, alpha, beta):
-##        # Discrete Event Simulation in C, pp 87-88.
-##
-##        y = self.expovariate(alpha)
-##        z = self.expovariate(1.0/beta)
-##        return z/(y+z)
-##
-## was dead wrong, and how it probably got that way.
-
-    def betavariate(self, alpha, beta):
-        """Beta distribution.
-
-        Conditions on the parameters are alpha > -1 and beta} > -1.
-        Returned values range between 0 and 1.
-
-        """
-
-        # This version due to Janne Sinkkonen, and matches all the std
-        # texts (e.g., Knuth Vol 2 Ed 3 pg 134 "the beta distribution").
-        y = self.gammavariate(alpha, 1.)
-        if y == 0:
-            return 0.0
-        else:
-            return y / (y + self.gammavariate(beta, 1.))
-
-## -------------------- Pareto --------------------
-
-    def paretovariate(self, alpha):
-        """Pareto distribution.  alpha is the shape parameter."""
-        # Jain, pg. 495
-
-        u = 1.0 - self.random()
-        return 1.0 / pow(u, 1.0/alpha)
-
-## -------------------- Weibull --------------------
-
-    def weibullvariate(self, alpha, beta):
-        """Weibull distribution.
-
-        alpha is the scale parameter and beta is the shape parameter.
-
-        """
-        # Jain, pg. 499; bug fix courtesy Bill Arms
-
-        u = 1.0 - self.random()
-        return alpha * pow(-_log(u), 1.0/beta)
-
-## -------------------- Wichmann-Hill -------------------
-
-class WichmannHill(Random):
-
-    VERSION = 1     # used by getstate/setstate
-
-    def seed(self, a=None):
-        """Initialize internal state from hashable object.
-
-        None or no argument seeds from current time.
-
-        If a is not None or an int or long, hash(a) is used instead.
-
-        If a is an int or long, a is used directly.  Distinct values between
-        0 and 27814431486575L inclusive are guaranteed to yield distinct
-        internal states (this guarantee is specific to the default
-        Wichmann-Hill generator).
-        """
-
-        if a is None:
-            # Initialize from current time
-            import time
-            a = long(time.time() * 256)
-
-        if not isinstance(a, (int, long)):
-            a = hash(a)
-
-        a, x = divmod(a, 30268)
-        a, y = divmod(a, 30306)
-        a, z = divmod(a, 30322)
-        self._seed = int(x)+1, int(y)+1, int(z)+1
-
-        self.gauss_next = None
-
-    def random(self):
-        """Get the next random number in the range [0.0, 1.0)."""
-
-        # Wichman-Hill random number generator.
-        #
-        # Wichmann, B. A. & Hill, I. D. (1982)
-        # Algorithm AS 183:
-        # An efficient and portable pseudo-random number generator
-        # Applied Statistics 31 (1982) 188-190
-        #
-        # see also:
-        #        Correction to Algorithm AS 183
-        #        Applied Statistics 33 (1984) 123
-        #
-        #        McLeod, A. I. (1985)
-        #        A remark on Algorithm AS 183
-        #        Applied Statistics 34 (1985),198-200
-
-        # This part is thread-unsafe:
-        # BEGIN CRITICAL SECTION
-        x, y, z = self._seed
-        x = (171 * x) % 30269
-        y = (172 * y) % 30307
-        z = (170 * z) % 30323
-        self._seed = x, y, z
-        # END CRITICAL SECTION
-
-        # Note:  on a platform using IEEE-754 double arithmetic, this can
-        # never return 0.0 (asserted by Tim; proof too long for a comment).
-        return (x/30269.0 + y/30307.0 + z/30323.0) % 1.0
-
-    def getstate(self):
-        """Return internal state; can be passed to setstate() later."""
-        return self.VERSION, self._seed, self.gauss_next
-
-    def setstate(self, state):
-        """Restore internal state from object returned by getstate()."""
-        version = state[0]
-        if version == 1:
-            version, self._seed, self.gauss_next = state
-        else:
-            raise ValueError("state with version %s passed to "
-                             "Random.setstate() of version %s" %
-                             (version, self.VERSION))
-
-    def jumpahead(self, n):
-        """Act as if n calls to random() were made, but quickly.
-
-        n is an int, greater than or equal to 0.
-
-        Example use:  If you have 2 threads and know that each will
-        consume no more than a million random numbers, create two Random
-        objects r1 and r2, then do
-            r2.setstate(r1.getstate())
-            r2.jumpahead(1000000)
-        Then r1 and r2 will use guaranteed-disjoint segments of the full
-        period.
-        """
-
-        if not n >= 0:
-            raise ValueError("n must be >= 0")
-        x, y, z = self._seed
-        x = int(x * pow(171, n, 30269)) % 30269
-        y = int(y * pow(172, n, 30307)) % 30307
-        z = int(z * pow(170, n, 30323)) % 30323
-        self._seed = x, y, z
-
-    def __whseed(self, x=0, y=0, z=0):
-        """Set the Wichmann-Hill seed from (x, y, z).
-
-        These must be integers in the range [0, 256).
-        """
-
-        if not type(x) == type(y) == type(z) == int:
-            raise TypeError('seeds must be integers')
-        if not (0 <= x < 256 and 0 <= y < 256 and 0 <= z < 256):
-            raise ValueError('seeds must be in range(0, 256)')
-        if 0 == x == y == z:
-            # Initialize from current time
-            import time
-            t = long(time.time() * 256)
-            t = int((t&0xffffff) ^ (t>>24))
-            t, x = divmod(t, 256)
-            t, y = divmod(t, 256)
-            t, z = divmod(t, 256)
-        # Zero is a poor seed, so substitute 1
-        self._seed = (x or 1, y or 1, z or 1)
-
-        self.gauss_next = None
-
-    def whseed(self, a=None):
-        """Seed from hashable object's hash code.
-
-        None or no argument seeds from current time.  It is not guaranteed
-        that objects with distinct hash codes lead to distinct internal
-        states.
-
-        This is obsolete, provided for compatibility with the seed routine
-        used prior to Python 2.1.  Use the .seed() method instead.
-        """
-
-        if a is None:
-            self.__whseed()
-            return
-        a = hash(a)
-        a, x = divmod(a, 256)
-        a, y = divmod(a, 256)
-        a, z = divmod(a, 256)
-        x = (x + a) % 256 or 1
-        y = (y + a) % 256 or 1
-        z = (z + a) % 256 or 1
-        self.__whseed(x, y, z)
-## --------------- Operating System Random Source  ------------------
-
-class SystemRandom(Random):
-    """Alternate random number generator using sources provided
-    by the operating system (such as /dev/urandom on Unix or
-    CryptGenRandom on Windows).
-
-     Not available on all systems (see os.urandom() for details).
-    """
-
-    def random(self):
-        """Get the next random number in the range [0.0, 1.0)."""
-        return (long(_hexlify(_urandom(7)), 16) >> 3) * RECIP_BPF
-
-    def getrandbits(self, k):
-        """getrandbits(k) -> x.  Generates a long int with k random bits."""
-        if k <= 0:
-            raise ValueError('number of bits must be greater than zero')
-        if k != int(k):
-            raise TypeError('number of bits should be an integer')
-        bytes = (k + 7) // 8                    # bits / 8 and rounded up
-        x = long(_hexlify(_urandom(bytes)), 16)
-        return x >> (bytes * 8 - k)             # trim excess bits
-
-    def _stub(self, *args, **kwds):
-        "Stub method.  Not used for a system random number generator."
-        return None
-    seed = jumpahead = _stub
-
-    def _notimplemented(self, *args, **kwds):
-        "Method should not be called for a system random number generator."
-        raise NotImplementedError('System entropy source does not have state.')
-    getstate = setstate = _notimplemented
-
-## -------------------- test program --------------------
-
-def _test_generator(n, funccall):
-    import time
-    print n, 'times', funccall
-    code = compile(funccall, funccall, 'eval')
-    total = 0.0
-    sqsum = 0.0
-    smallest = 1e10
-    largest = -1e10
-    t0 = time.time()
-    for i in range(n):
-        x = eval(code)
-        total += x
-        sqsum = sqsum + x*x
-        smallest = min(x, smallest)
-        largest = max(x, largest)
-    t1 = time.time()
-    print round(t1-t0, 3), 'sec,',
-    avg = total/n
-    stddev = _sqrt(sqsum/n - avg*avg)
-    print 'avg %g, stddev %g, min %g, max %g' % \
-              (avg, stddev, smallest, largest)
-
-
-def _test(N=2000):
-    _test_generator(N, 'random()')
-    _test_generator(N, 'normalvariate(0.0, 1.0)')
-    _test_generator(N, 'lognormvariate(0.0, 1.0)')
-    _test_generator(N, 'cunifvariate(0.0, 1.0)')
-    _test_generator(N, 'vonmisesvariate(0.0, 1.0)')
-    _test_generator(N, 'gammavariate(0.01, 1.0)')
-    _test_generator(N, 'gammavariate(0.1, 1.0)')
-    _test_generator(N, 'gammavariate(0.1, 2.0)')
-    _test_generator(N, 'gammavariate(0.5, 1.0)')
-    _test_generator(N, 'gammavariate(0.9, 1.0)')
-    _test_generator(N, 'gammavariate(1.0, 1.0)')
-    _test_generator(N, 'gammavariate(2.0, 1.0)')
-    _test_generator(N, 'gammavariate(20.0, 1.0)')
-    _test_generator(N, 'gammavariate(200.0, 1.0)')
-    _test_generator(N, 'gauss(0.0, 1.0)')
-    _test_generator(N, 'betavariate(3.0, 3.0)')
-
-# Create one instance, seeded from current time, and export its methods
-# as module-level functions.  The functions share state across all uses
-#(both in the user's code and in the Python libraries), but that's fine
-# for most programs and is easier for the casual user than making them
-# instantiate their own Random() instance.
-
-_inst = Random()
-seed = _inst.seed
-random = _inst.random
-uniform = _inst.uniform
-randint = _inst.randint
-choice = _inst.choice
-randrange = _inst.randrange
-sample = _inst.sample
-shuffle = _inst.shuffle
-normalvariate = _inst.normalvariate
-lognormvariate = _inst.lognormvariate
-cunifvariate = _inst.cunifvariate
-expovariate = _inst.expovariate
-vonmisesvariate = _inst.vonmisesvariate
-gammavariate = _inst.gammavariate
-stdgamma = _inst.stdgamma
-gauss = _inst.gauss
-betavariate = _inst.betavariate
-paretovariate = _inst.paretovariate
-weibullvariate = _inst.weibullvariate
-getstate = _inst.getstate
-setstate = _inst.setstate
-jumpahead = _inst.jumpahead
-
-if __name__ == '__main__':
-    _test()

Modified: trunk/jython/Lib/test/test_random.py
===================================================================
--- trunk/jython/Lib/test/test_random.py	2008-10-06 03:02:29 UTC (rev 5359)
+++ trunk/jython/Lib/test/test_random.py	2008-10-06 03:12:34 UTC (rev 5360)
@@ -530,6 +530,12 @@
                       TestDistributions,
                       TestModule]
 
+    if test_support.is_jython:
+        del MersenneTwister_TestBasicOps.test_genrandbits
+        del MersenneTwister_TestBasicOps.test_referenceImplementation 
+        del MersenneTwister_TestBasicOps.test_setstate_middle_arg
+        del MersenneTwister_TestBasicOps.test_strong_reference_implementation
+
     try:
         random.SystemRandom().random()
     except NotImplementedError:

Modified: trunk/jython/src/org/python/modules/random/PyRandom.java
===================================================================
--- trunk/jython/src/org/python/modules/random/PyRandom.java	2008-10-06 03:02:29 UTC (rev 5359)
+++ trunk/jython/src/org/python/modules/random/PyRandom.java	2008-10-06 03:12:34 UTC (rev 5360)
@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.math.BigInteger;
 import java.util.Random;
 
 import org.python.core.Py;
@@ -45,7 +46,9 @@
             seed = new PyLong(System.currentTimeMillis());
         }
         if (seed instanceof PyLong) {
-            this.javaRandom.setSeed(((PyLong)seed).asLong(0));
+            PyLong max = new PyLong(Long.MAX_VALUE);
+            PyLong seed_modulus = (PyLong)(seed.__mod__(max));
+            this.javaRandom.setSeed(((PyLong)seed_modulus).asLong(0));
         } else if (seed instanceof PyInteger) {
             this.javaRandom.setSeed(((PyInteger)seed).getValue());
         } else {
@@ -137,4 +140,9 @@
         double ret=(a*67108864.0+b)*(1.0/9007199254740992.0);
         return new PyFloat(ret);
     }
+    
+    @ExposedMethod
+    public PyLong Random_getrandbits(int k) {
+        return new PyLong(new BigInteger(k, javaRandom));
+    }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5369
          http://jython.svn.sourceforge.net/jython/?rev=5369&view=rev
Author:   zyasoft
Date:     2008-10-11 02:38:55 +0000 (Sat, 11 Oct 2008)

Log Message:
-----------
Make "extended" builtin functions in __builtin__ (that is, functions
like max which use a class like MaxFunction for their definition)
copyable by copy.copy and return the correct type.

This fixes test_copy, along with enabling reflexive structures to be
compared, since we don't prohibit or otherwise detect them in the
copying anyway.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_copy.py
    trunk/jython/src/org/python/core/__builtin__.java

Modified: trunk/jython/Lib/test/test_copy.py
===================================================================
--- trunk/jython/Lib/test/test_copy.py	2008-10-11 02:24:42 UTC (rev 5368)
+++ trunk/jython/Lib/test/test_copy.py	2008-10-11 02:38:55 UTC (rev 5369)
@@ -268,11 +268,12 @@
         self.assert_(x is not y)
         self.assert_(x[0] is not y[0])
 
+    # modified for Jython
     def test_deepcopy_reflexive_list(self):
         x = []
         x.append(x)
         y = copy.deepcopy(x)
-        self.assertRaises(RuntimeError, cmp, y, x)
+        self.assertEqual(y, x)
         self.assert_(y is not x)
         self.assert_(y[0] is y)
         self.assertEqual(len(y), 1)
@@ -284,11 +285,12 @@
         self.assert_(x is not y)
         self.assert_(x[0] is not y[0])
 
+    # modified for Jython
     def test_deepcopy_reflexive_tuple(self):
         x = ([],)
         x[0].append(x)
         y = copy.deepcopy(x)
-        self.assertRaises(RuntimeError, cmp, y, x)
+        self.assertEqual(y, x)
         self.assert_(y is not x)
         self.assert_(y[0] is not x[0])
         self.assert_(y[0][0] is y)
@@ -300,11 +302,12 @@
         self.assert_(x is not y)
         self.assert_(x["foo"] is not y["foo"])
 
+    # modified for Jython
     def test_deepcopy_reflexive_dict(self):
         x = {}
         x['foo'] = x
         y = copy.deepcopy(x)
-        self.assertRaises(RuntimeError, cmp, y, x)
+        self.assertEqual(y, x)
         self.assert_(y is not x)
         self.assert_(y['foo'] is y)
         self.assertEqual(len(y), 1)

Modified: trunk/jython/src/org/python/core/__builtin__.java
===================================================================
--- trunk/jython/src/org/python/core/__builtin__.java	2008-10-11 02:24:42 UTC (rev 5368)
+++ trunk/jython/src/org/python/core/__builtin__.java	2008-10-11 02:38:55 UTC (rev 5369)
@@ -8,6 +8,8 @@
 import org.python.antlr.ast.modType;
 import org.python.core.util.RelativeFile;
 import org.python.expose.ExposedGet;
+import org.python.expose.ExposedNew;
+import org.python.expose.ExposedType;
 
 class BuiltinFunctions extends PyBuiltinFunctionSet {
 
@@ -371,23 +373,23 @@
         dict.__setitem__("iter", new BuiltinFunctions("iter", 27, 1, 2));
         dict.__setitem__("locals", new BuiltinFunctions("locals", 28, 0));
         dict.__setitem__("map", new BuiltinFunctions("map", 29, 2, -1));
-        dict.__setitem__("max", new MaxFunction());
-        dict.__setitem__("min", new MinFunction());
+        dict.__setitem__("max", MaxFunction.INSTANCE);
+        dict.__setitem__("min", MinFunction.INSTANCE);
         dict.__setitem__("oct", new BuiltinFunctions("oct", 32, 1));
         dict.__setitem__("pow", new BuiltinFunctions("pow", 33, 2, 3));
         dict.__setitem__("raw_input", new BuiltinFunctions("raw_input", 34, 0, 1));
         dict.__setitem__("reduce", new BuiltinFunctions("reduce", 35, 2, 3));
         dict.__setitem__("reload", new BuiltinFunctions("reload", 36, 1));
         dict.__setitem__("repr", new BuiltinFunctions("repr", 37, 1));
-        dict.__setitem__("round", new RoundFunction());
+        dict.__setitem__("round", RoundFunction.INSTANCE);
         dict.__setitem__("setattr", new BuiltinFunctions("setattr", 39, 3));
         dict.__setitem__("vars", new BuiltinFunctions("vars", 41, 0, 1));
         dict.__setitem__("zip", new BuiltinFunctions("zip", 43, 0, -1));
         dict.__setitem__("reversed", new BuiltinFunctions("reversed", 45, 1));
-        dict.__setitem__("__import__", new ImportFunction());
-        dict.__setitem__("sorted", new SortedFunction());
-        dict.__setitem__("all", new AllFunction());
-        dict.__setitem__("any", new AnyFunction());        
+        dict.__setitem__("__import__", ImportFunction.INSTANCE);
+        dict.__setitem__("sorted", SortedFunction.INSTANCE);
+        dict.__setitem__("all", AllFunction.INSTANCE);
+        dict.__setitem__("any", AnyFunction.INSTANCE);        
     }
 
     public static PyObject abs(PyObject o) {
@@ -1227,8 +1229,25 @@
     }
 }
 
-class ImportFunction extends PyObject {
+// simulates a PyBuiltinFunction for functions not using the PyBuiltinFunctionSet approach of above
+abstract class ExtendedBuiltinFunction extends PyObject {
+    public static final PyType TYPE = PyType.fromClass(PyBuiltinFunction.class);
+    @ExposedGet(name = "__class__")
+    public PyType getType() {
+        return TYPE;
+    }
+}
+
+class ImportFunction extends ExtendedBuiltinFunction {
+    static final ImportFunction INSTANCE = new ImportFunction();
+
+    private ImportFunction() {}
     
+    @ExposedNew
+    public static PyObject __new__(PyObject[] args, String[] keyword) {
+        return INSTANCE;
+    }   
+    
     @ExposedGet(name = "__doc__")
     public PyObject getDoc() {
         return new PyString("__import__(name, globals={}, locals={}, fromlist=[], level=-1) -> module\n\n" +
@@ -1276,8 +1295,16 @@
     
 }
 
-class SortedFunction extends PyObject {
+class SortedFunction extends ExtendedBuiltinFunction {
+    static final SortedFunction INSTANCE = new SortedFunction();
 
+    private SortedFunction() {}
+    
+    @ExposedNew
+    public static PyObject __new__(PyObject[] args, String[] keyword) {
+        return INSTANCE;
+    }   
+    
     @ExposedGet(name = "__doc__")
     @Override
     public PyObject getDoc() {
@@ -1317,8 +1344,16 @@
     }
 }
 
-class AllFunction extends PyObject {
+class AllFunction extends ExtendedBuiltinFunction {
+    static final AllFunction INSTANCE = new AllFunction();
 
+    private AllFunction() {}
+    
+    @ExposedNew
+    public static PyObject __new__(PyObject[] args, String[] keyword) {
+        return INSTANCE;
+    }   
+    
     @ExposedGet(name = "__doc__")
     @Override
     public PyObject getDoc() {
@@ -1348,8 +1383,16 @@
     }
 }
 
-class AnyFunction extends PyObject {
+class AnyFunction extends ExtendedBuiltinFunction {
+    static final AnyFunction INSTANCE = new AnyFunction();
 
+    private AnyFunction() {}
+    
+    @ExposedNew
+    public static PyObject __new__(PyObject[] args, String[] keyword) {
+        return INSTANCE;
+    }   
+    
     @ExposedGet(name = "__doc__")
     @Override
     public PyObject getDoc() {
@@ -1379,10 +1422,16 @@
     }
 }
 
+class MaxFunction extends ExtendedBuiltinFunction {
+    static final MaxFunction INSTANCE = new MaxFunction();
+   
+    private MaxFunction() {}
+  
+    @ExposedNew
+    public static PyObject __new__(PyObject[] args, String[] keyword) {
+        return INSTANCE;
+    }  
 
-
-class MaxFunction extends PyObject {
-
     @ExposedGet(name = "__doc__")
     @Override
     public PyObject getDoc() {
@@ -1418,7 +1467,7 @@
         else {
             return max(args[0], key);
         }
-    }
+    }    
     
     @Override
     public String toString() {
@@ -1446,10 +1495,20 @@
         }
         return max;
     }
+
 }
 
-class MinFunction extends PyObject {
-
+class MinFunction extends ExtendedBuiltinFunction {
+    static final MinFunction INSTANCE = new MinFunction();
+    
+    private MinFunction() {}
+   
+    @ExposedNew
+    public static PyObject __new__(PyObject[] args, String[] keyword) {
+        return INSTANCE;
+    }     
+    
+    
     @ExposedGet(name = "__doc__")
     @Override
     public PyObject getDoc() {
@@ -1515,9 +1574,15 @@
     }
 }
 
-
-class RoundFunction extends PyObject {
-
+class RoundFunction extends ExtendedBuiltinFunction {
+    static final RoundFunction INSTANCE = new RoundFunction();
+    private RoundFunction() {}
+    
+    @ExposedNew
+    public static PyObject __new__(PyObject[] args, String[] keyword) {
+        return INSTANCE;
+    }     
+    
     @ExposedGet(name = "__doc__")
     @Override
     public PyObject getDoc() {
@@ -1526,8 +1591,13 @@
                 "Round a number to a given precision in decimal digits (default 0 digits).\n" +
                 "This always returns a floating point number.  Precision may be negative.");
     }
-
+    
     @Override
+    public String toString() {
+        return "<built-in function round>";
+    }
+    
+    @Override
     public PyObject __call__(PyObject args[], String kwds[]) {
         ArgParser ap = new ArgParser("round", args, kwds, new String[]{"number", "ndigits"}, 0);
         PyObject number = ap.getPyObject(0);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5372
          http://jython.svn.sourceforge.net/jython/?rev=5372&view=rev
Author:   pjenvey
Date:     2008-10-11 06:42:35 +0000 (Sat, 11 Oct 2008)

Log Message:
-----------
fix solid_base potentially resolving the wrong type when called before the mro
was initialized. caused best_base to blowup with a TypeError

Modified Paths:
--------------
    trunk/jython/Lib/test/test_class_jy.py
    trunk/jython/src/org/python/core/PyType.java

Modified: trunk/jython/Lib/test/test_class_jy.py
===================================================================
--- trunk/jython/Lib/test/test_class_jy.py	2008-10-11 05:08:23 UTC (rev 5371)
+++ trunk/jython/Lib/test/test_class_jy.py	2008-10-11 06:42:35 UTC (rev 5372)
@@ -152,7 +152,17 @@
         keys.sort()
         self.assertEqual(str(keys), "['__doc__', '__module__', 'moo']")
 
+    def test_metaclass_and_slotted_base(self):
+        class Meta(type):
+            pass
+        class SlottedBase(object):
+            __slots__ = 'foo'
+        # A regression up until 2.5a3: Defining Bar would cause a
+        # TypeError "mro() returned base with unsuitable layout ('Bar')"
+        class Bar(SlottedBase):
+            __metaclass__ = Meta
 
+
 class ClassNamelessModuleTestCase(unittest.TestCase):
 
     def setUp(self):
@@ -298,6 +308,7 @@
         class Bar(object):
             self.assertEqual(__module__, module_name)
 
+
 class ClassMetaclassRepr(unittest.TestCase):
     """Verifies #1131 is fixed"""
     def test_repr_with_metaclass(self):

Modified: trunk/jython/src/org/python/core/PyType.java
===================================================================
--- trunk/jython/src/org/python/core/PyType.java	2008-10-11 05:08:23 UTC (rev 5371)
+++ trunk/jython/src/org/python/core/PyType.java	2008-10-11 06:42:35 UTC (rev 5372)
@@ -47,7 +47,7 @@
     private PyObject dict;
 
     /** __mro__, the method resolution. order */
-    private PyObject[] mro = new PyObject[0];
+    private PyObject[] mro = null;
 
     /** __flags__, the type's options. */
     private long tp_flags;
@@ -645,7 +645,7 @@
 
     @ExposedGet(name = "__mro__")
     public PyTuple getMro() {
-        return new PyTuple(mro);
+        return mro == null ? Py.EmptyTuple : new PyTuple(mro);
     }
 
     @ExposedGet(name = "__flags__")
@@ -929,11 +929,24 @@
 
     public boolean isSubType(PyType supertype) {
         PyObject[] mro = this.mro;
-        for (int i = 0; i < mro.length; i++) {
-            if (mro[i] == supertype)
+        if (mro != null) {
+            for (PyObject base : mro) {
+                if (base == supertype) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        // we're not completely initilized yet; follow tp_base
+        PyType type = this;
+        do {
+            if (type == supertype) {
                 return true;
-        }
-        return false;
+            }
+            type = type.base;
+        } while (type != null);
+        return supertype == PyObject.TYPE;
     }
 
     /**
@@ -945,6 +958,9 @@
      */
     public PyObject lookup(String name) {
         PyObject[] mro = this.mro;
+        if (mro == null) {
+            return null;
+        }
         for (int i = 0; i < mro.length; i++) {
             PyObject dict = mro[i].fastGetDict();
             if (dict != null) {
@@ -958,6 +974,9 @@
 
     public PyObject lookup_where(String name, PyObject[] where) {
         PyObject[] mro = this.mro;
+        if (mro == null) {
+            return null;
+        }
         for (int i = 0; i < mro.length; i++) {
             PyObject t = mro[i];
             PyObject dict = t.fastGetDict();
@@ -974,6 +993,9 @@
 
     public PyObject super_lookup(PyType ref, String name) {
         PyObject[] mro = this.mro;
+        if (mro == null) {
+            return null;
+        }
         int i;
         for (i = 0; i < mro.length; i++) {
             if (mro[i] == ref)
@@ -1235,6 +1257,9 @@
 
     protected void __rawdir__(PyDictionary accum) {
         PyObject[] mro = this.mro;
+        if (mro == null) {
+            return;
+        }
         for (int i = 0; i < mro.length; i++) {
             mro[i].addKeys(accum, "__dict__");
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5377
          http://jython.svn.sourceforge.net/jython/?rev=5377&view=rev
Author:   zyasoft
Date:     2008-10-12 00:24:30 +0000 (Sun, 12 Oct 2008)

Log Message:
-----------
Implemented struct.Struct as well as other updates in the struct module for 2.5

Modified Paths:
--------------
    trunk/jython/CoreExposed.includes
    trunk/jython/Lib/test/test_struct.py
    trunk/jython/src/org/python/core/PyArray.java
    trunk/jython/src/org/python/core/__builtin__.java
    trunk/jython/src/org/python/modules/struct.java

Modified: trunk/jython/CoreExposed.includes
===================================================================
--- trunk/jython/CoreExposed.includes	2008-10-12 00:18:38 UTC (rev 5376)
+++ trunk/jython/CoreExposed.includes	2008-10-12 00:24:30 UTC (rev 5377)
@@ -52,4 +52,5 @@
 org/python/modules/thread/PyLocal.class
 org/python/modules/time/PyTimeTuple.class
 org/python/modules/zipimport/zipimporter.class
+org/python/modules/PyStruct.class
 org/python/modules/PyTeeIterator.class

Modified: trunk/jython/Lib/test/test_struct.py
===================================================================
--- trunk/jython/Lib/test/test_struct.py	2008-10-12 00:18:38 UTC (rev 5376)
+++ trunk/jython/Lib/test/test_struct.py	2008-10-12 00:24:30 UTC (rev 5377)
@@ -1,9 +1,15 @@
-from test.test_support import TestFailed, verbose, verify, vereq
+from test.test_support import TestFailed, verbose, verify, vereq, is_jython
 import test.test_support
 import struct
 import array
 import warnings
 
+if is_jython:
+    # currently no buffer type, but this will work fine for this testing
+    def buffer(s):
+        return str(s)
+
+
 import sys
 ISBIGENDIAN = sys.byteorder == "big"
 del sys

Modified: trunk/jython/src/org/python/core/PyArray.java
===================================================================
--- trunk/jython/src/org/python/core/PyArray.java	2008-10-12 00:18:38 UTC (rev 5376)
+++ trunk/jython/src/org/python/core/PyArray.java	2008-10-12 00:24:30 UTC (rev 5377)
@@ -1393,6 +1393,23 @@
         Array.set(data, i, o);
     }
 
+    // xxx - add more efficient comparable typecode lookup via an enumset, and expand
+    public void set(int i, int value) {
+        if ("u".equals(typecode) || type == Integer.TYPE || type == Long.TYPE) {
+            Array.setInt(data, i, value);
+        } else {
+            throw Py.TypeError("Type not compatible with array type");
+        }
+    }
+    
+    public void set(int i, char value) {
+        if ("c".equals(typecode) || type == Integer.TYPE || type == Long.TYPE) {
+            Array.setChar(data, i, value);
+        } else {
+            throw Py.TypeError("Type not compatible with array type");
+        } 
+    }
+    
     private boolean isSigned() {
         return typecode.length() == 1 && typecode.equals(typecode.toUpperCase());
     }

Modified: trunk/jython/src/org/python/core/__builtin__.java
===================================================================
--- trunk/jython/src/org/python/core/__builtin__.java	2008-10-12 00:18:38 UTC (rev 5376)
+++ trunk/jython/src/org/python/core/__builtin__.java	2008-10-12 00:24:30 UTC (rev 5377)
@@ -1233,6 +1233,7 @@
 abstract class ExtendedBuiltinFunction extends PyObject {
     public static final PyType TYPE = PyType.fromClass(PyBuiltinFunction.class);
     @ExposedGet(name = "__class__")
+    @Override
     public PyType getType() {
         return TYPE;
     }

Modified: trunk/jython/src/org/python/modules/struct.java
===================================================================
--- trunk/jython/src/org/python/modules/struct.java	2008-10-12 00:18:38 UTC (rev 5376)
+++ trunk/jython/src/org/python/modules/struct.java	2008-10-12 00:24:30 UTC (rev 5377)
@@ -20,6 +20,13 @@
 import org.python.core.PyTuple;
 
 import java.math.BigInteger;
+import java.util.Arrays;
+import org.python.core.ClassDictInit;
+import org.python.core.PyArray;
+import org.python.core.PyType;
+import org.python.expose.ExposedGet;
+import org.python.expose.ExposedNew;
+import org.python.expose.ExposedType;
 
 /**
  * This module performs conversions between Python values and C
@@ -399,11 +406,17 @@
         }
 
         ByteStream(String s) {
-            int l = s.length();
+            this(s, 0);
+        }
+        
+        ByteStream(String s, int offset) {
+            int l = s.length() - offset;
             data = new char[l];
-            s.getChars(0, l, data, 0);
+            s.getChars(offset, s.length(), data, 0);
             len = l;
             pos = 0;
+            
+//            System.out.println("s.length()=" + s.length() + ",offset=" + offset + ",l=" + l + ",data=" + Arrays.toString(data));
         }
 
         int readByte() {
@@ -874,7 +887,7 @@
 
 
 
-    private static FormatDef[] whichtable(String pfmt) {
+    static FormatDef[] whichtable(String pfmt) {
         char c = pfmt.charAt(0);
         switch (c) {
         case '<' :
@@ -913,7 +926,7 @@
 
 
 
-    private static int calcsize(String format, FormatDef[] f) {
+    static int calcsize(String format, FormatDef[] f) {
         int size = 0;
 
         int len = format.length();
@@ -973,10 +986,43 @@
 
         FormatDef[] f = whichtable(format);
         int size = calcsize(format, f);
+        
+        return pack(format, f, size, 1, args).toString();
+    }
+    
+    // xxx - may need to consider doing a generic arg parser here
+    static public void pack_into(PyObject[] args) {
+        if (args.length < 3)
+            Py.TypeError("illegal argument type for built-in operation");
+        String format = args[0].toString();
+        FormatDef[] f = whichtable(format);
+        int size = calcsize(format, f);
+        pack_into(format, f, size, 1, args);
+    }
+    
+    static void pack_into(String format, FormatDef[] f, int size, int argstart, PyObject[] args) {
+        if (args.length - argstart < 2)
+            Py.TypeError("illegal argument type for built-in operation");
+        if (!(args[argstart] instanceof PyArray)) {
+            throw Py.TypeError("pack_into takes an array arg"); // as well as a buffer, what else?
+        }
+        PyArray buffer = (PyArray)args[argstart];
+        int offset = args[argstart + 1].__int__().asInt();
 
+        ByteStream res = pack(format, f, size, argstart + 2, args);
+        if (res.pos > buffer.__len__()) {
+            throw StructError("pack_into requires a buffer of at least " + res.pos + " bytes, got " + buffer.__len__());
+        }
+        for (int i = 0; i < res.pos; i++, offset++) {
+            char val = res.data[i];
+            buffer.set(offset, val);
+        }
+    }
+    
+    static ByteStream pack(String format, FormatDef[] f, int size, int start, PyObject[] args) {
         ByteStream res = new ByteStream();
 
-        int i = 1;
+        int i = start;
         int len = format.length();
         for (int j = 0; j < len; j++) {
             char c = format.charAt(j);
@@ -995,7 +1041,7 @@
 
             FormatDef e = getentry(c, f);
 
-            // Fill padd bytes with zeros
+            // Fill pad bytes with zeros
             int nres = align(res.size(), e) - res.size();
             while (nres-- > 0)
                 res.writeByte(0);
@@ -1005,7 +1051,7 @@
         if (i < args.length)
             throw StructError("too many arguments for pack format");
 
-        return res.toString();
+        return res;
     }
 
 
@@ -1017,19 +1063,41 @@
      * The string must contain exactly the amount of data required by
      * the format (i.e. len(string) must equal calcsize(fmt)).
      */
+   
     public static PyTuple unpack(String format, String string) {
+        FormatDef[] f = whichtable(format);
+        int size = calcsize(format, f);
         int len = string.length();
-
+        if (size != len) 
+            throw StructError("unpack str size does not match format");
+         return unpack(f, size, format, new ByteStream(string));
+    }
+    
+    public static PyTuple unpack(String format, PyArray buffer) {
+        String string = buffer.tostring();
         FormatDef[] f = whichtable(format);
         int size = calcsize(format, f);
-
-        if (size != len)
+        int len = string.length();
+        if (size != len) 
             throw StructError("unpack str size does not match format");
-
+         return unpack(f, size, format, new ByteStream(string));
+    }
+    
+    public static PyTuple unpack_from(String format, String string) {
+        return unpack_from(format, string, 0);   
+    }
+        
+    public static PyTuple unpack_from(String format, String string, int offset) {
+        FormatDef[] f = whichtable(format);
+        int size = calcsize(format, f);
+        int len = string.length();
+        if (size >= (len - offset + 1))
+            throw StructError("unpack_from str size does not match format");
+        return unpack(f, size, format, new ByteStream(string, offset));
+    }
+    
+    static PyTuple unpack(FormatDef[] f, int size, String format, ByteStream str) {
         PyList res = new PyList();
-
-        ByteStream str = new ByteStream(string);
-
         int flen = format.length();
         for (int j = 0; j < flen; j++) {
             char c = format.charAt(j);
@@ -1057,8 +1125,7 @@
     }
 
 
-
-    private static PyException StructError(String explanation) {
+    static PyException StructError(String explanation) {
         return new PyException(error, explanation);
     }
 
@@ -1067,4 +1134,9 @@
         dict.__setitem__("__module__", new PyString("struct"));
         return dict;
     }
+    
+    public static PyStruct Struct(PyObject[] args, String[] keywords) {
+        return new PyStruct(args, keywords);
+    }
 }
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5384
          http://jython.svn.sourceforge.net/jython/?rev=5384&view=rev
Author:   fwierzbicki
Date:     2008-10-13 17:19:47 +0000 (Mon, 13 Oct 2008)

Log Message:
-----------
Fixed issue http://bugs.jython.org/issue1111: keyword arguments not supported on __import__

Modified Paths:
--------------
    trunk/jython/NEWS
    trunk/jython/src/org/python/core/__builtin__.java

Modified: trunk/jython/NEWS
===================================================================
--- trunk/jython/NEWS	2008-10-12 23:00:34 UTC (rev 5383)
+++ trunk/jython/NEWS	2008-10-13 17:19:47 UTC (rev 5384)
@@ -1,6 +1,9 @@
 Jython NEWS
 
 Jython 2.5
+  Bugs fixed (new numbering due to move to Roundup)
+    - [ 1111 ] keyword arguments not supported on __import__
+
   Incompatible Changes
     - The python.prepath property has been removed; use python.path instead.
     - To implement the Java Map interface, PyDictionary.values now returns a

Modified: trunk/jython/src/org/python/core/__builtin__.java
===================================================================
--- trunk/jython/src/org/python/core/__builtin__.java	2008-10-12 23:00:34 UTC (rev 5383)
+++ trunk/jython/src/org/python/core/__builtin__.java	2008-10-13 17:19:47 UTC (rev 5384)
@@ -1268,24 +1268,14 @@
                 "is the number of parent directories to search relative to the current module.");
     }
 
-//    public ImportFunction() {
-//    }
-
     public PyObject __call__(PyObject args[], String keywords[]) {
-        if (!(args.length < 1 || args[0] instanceof PyString)) {
-            throw Py.TypeError("first argument must be a string");
-        }
-        if (keywords.length > 0) {
-            throw Py.TypeError("__import__() takes no keyword arguments");
-        }
+        ArgParser ap = new ArgParser("__import__", args, keywords, new String[]{"name", "globals", "locals", "fromlist", "level"}, 1);
 
-        int argc = args.length;
-        String module = args[0].__str__().toString();
+        String module = ap.getString(0);
+        PyObject globals = ap.getPyObject(1, null);
+        PyObject fromlist = ap.getPyObject(3, Py.EmptyTuple);
+        int level = ap.getInt(4, imp.DEFAULT_LEVEL);
 
-        PyObject globals = (argc > 1 && args[1] != null) ? args[1] : null;
-        PyObject fromlist = (argc > 3 && args[3] != null) ? args[3] : Py.EmptyTuple;
-        int level = (argc > 4 && args[4] != null) ? Py.py2int(args[4]) : imp.DEFAULT_LEVEL;
-
         return load(module, globals, fromlist, level);
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5390
          http://jython.svn.sourceforge.net/jython/?rev=5390&view=rev
Author:   leosoto
Date:     2008-10-14 03:20:10 +0000 (Tue, 14 Oct 2008)

Log Message:
-----------
Now String is mapped to PyUnicode on ClassicPyObjectAdapter (instead of mapping it to PyString). Thus, for APIs which really need to return bytestrings (such as PyFile) we now have to explicitely declare the return type as PyString (and on code written in Python, use StringUtil.asPyString(String)). Fixes #1128

Modified Paths:
--------------
    trunk/jython/Lib/javapath.py
    trunk/jython/Lib/os.py
    trunk/jython/Lib/zlib.py
    trunk/jython/src/com/ziclix/python/sql/DataHandler.java
    trunk/jython/src/com/ziclix/python/sql/JDBC20DataHandler.java
    trunk/jython/src/com/ziclix/python/sql/Jython22DataHandler.java
    trunk/jython/src/com/ziclix/python/sql/handler/MySQLDataHandler.java
    trunk/jython/src/com/ziclix/python/sql/handler/PostgresqlDataHandler.java
    trunk/jython/src/org/python/core/PyFile.java
    trunk/jython/src/org/python/core/PyFunction.java
    trunk/jython/src/org/python/core/PyStringMap.java
    trunk/jython/src/org/python/core/PySystemState.java
    trunk/jython/src/org/python/core/PyTraceback.java
    trunk/jython/src/org/python/core/__builtin__.java
    trunk/jython/src/org/python/core/adapter/ClassicPyObjectAdapter.java
    trunk/jython/src/org/python/core/util/StringUtil.java
    trunk/jython/src/org/python/modules/binascii.java
    trunk/jython/src/org/python/modules/cPickle.java
    trunk/jython/src/org/python/modules/cStringIO.java
    trunk/jython/src/org/python/modules/struct.java
    trunk/jython/src/org/python/modules/time/Time.java

Modified: trunk/jython/Lib/javapath.py
===================================================================
--- trunk/jython/Lib/javapath.py	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/Lib/javapath.py	2008-10-14 03:20:10 UTC (rev 5390)
@@ -20,7 +20,9 @@
 from java.lang import System
 import os
 
+from org.python.core.util.StringUtil import asPyString
 
+
 def _tostr(s, method):
     if isinstance(s, basestring):
         return s
@@ -40,7 +42,7 @@
 def dirname(path):
     """Return the directory component of a pathname"""
     path = _tostr(path, "dirname")
-    result = File(path).getParent()
+    result = asPyString(File(path).getParent())
     if not result:
         if isabs(path):
             result = path # Must be root
@@ -51,7 +53,7 @@
 def basename(path):
     """Return the final component of a pathname"""
     path = _tostr(path, "basename")
-    return File(path).getName()
+    return asPyString(File(path).getName())
 
 def split(path):
     """Split a pathname.
@@ -128,7 +130,7 @@
             if a == "":
                 a = os.sep
             f = File(f, a)
-    return f.getPath()
+    return asPyString(f.getPath())
 
 def normcase(path):
     """Normalize case of pathname.
@@ -137,7 +139,7 @@
 
     """
     path = _tostr(path, "normcase")
-    return File(path).getPath()
+    return asPyString(File(path).getPath())
 
 def commonprefix(m):
     "Given a list of pathnames, return the longest common leading component"
@@ -197,7 +199,7 @@
         if not c:
             return gethome()
         if c == os.sep:
-            return File(gethome(), path[2:]).getPath()
+            return asPyString(File(gethome(), path[2:]).getPath())
     return path
 
 def getuser():
@@ -252,7 +254,7 @@
 def _abspath(path):
     # Must use normpath separately because getAbsolutePath doesn't normalize
     # and getCanonicalPath would eliminate symlinks.
-    return normpath(File(sys.getPath(path)).getAbsolutePath())
+    return normpath(asPyString(File(sys.getPath(path)).getAbsolutePath()))
 
 def realpath(path):
     """Return an absolute path normalized and symbolic links eliminated"""
@@ -261,7 +263,7 @@
     
 def _realpath(path):
     try:
-        return File(sys.getPath(path)).getCanonicalPath()
+        return asPyString(File(sys.getPath(path)).getCanonicalPath())
     except java.io.IOException:
         return _abspath(path)
 

Modified: trunk/jython/Lib/os.py
===================================================================
--- trunk/jython/Lib/os.py	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/Lib/os.py	2008-10-14 03:20:10 UTC (rev 5390)
@@ -48,6 +48,7 @@
 from java.io import File
 from org.python.core import PyFile
 from org.python.core.io import FileDescriptors, FileIO, IOBase
+from org.python.core.util.StringUtil import asPyString
 
 # Mapping of: os._name: [name list, shell command list]
 _os_map = dict(nt=[
@@ -264,7 +265,7 @@
     l = File(sys.getPath(path)).list()
     if l is None:
         raise OSError(0, 'No such directory', path)
-    return list(l)
+    return [asPyString(entry) for entry in l]
 
 def chmod(path, mode):
     """chmod(path, mode)
@@ -629,7 +630,7 @@
     from org.python.core.util import StringUtil
     rawio = FileDescriptors.get(fd)
     buf = _handle_oserror(rawio.read, buffersize)
-    return str(StringUtil.fromBytes(buf))
+    return asPyString(StringUtil.fromBytes(buf))
 
 def write(fd, string):
     """write(fd, string) -> byteswritten

Modified: trunk/jython/Lib/zlib.py
===================================================================
--- trunk/jython/Lib/zlib.py	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/Lib/zlib.py	2008-10-14 03:20:10 UTC (rev 5390)
@@ -1,8 +1,10 @@
 import jarray, binascii
 
 from java.util.zip import Adler32, Deflater, Inflater
-from java.lang import Long, String, StringBuffer
+from java.lang import Long, String
 
+from cStringIO import StringIO
+
 class error(Exception):
     pass
 
@@ -132,18 +134,19 @@
 
 def _get_deflate_data(deflater):
     buf = jarray.zeros(1024, 'b')
-    sb = StringBuffer()
+    s = StringIO()
     while not deflater.finished():
         l = deflater.deflate(buf)
         if l == 0:
             break
-        sb.append(String(buf, 0, 0, l))
-    return sb.toString()
+        s.write(String(buf, 0, 0, l))
+    s.seek(0)
+    return s.read()
 
         
 def _get_inflate_data(inflater, max_length=0):
     buf = jarray.zeros(1024, 'b')
-    sb = StringBuffer()
+    s = StringIO()
     total = 0
     while not inflater.finished():
         if max_length:
@@ -154,7 +157,8 @@
             break
 
         total += l
-        sb.append(String(buf, 0, 0, l))
+        s.write(String(buf, 0, 0, l))
         if max_length and total == max_length:
             break
-    return sb.toString()
+    s.seek(0)
+    return s.read()

Modified: trunk/jython/src/com/ziclix/python/sql/DataHandler.java
===================================================================
--- trunk/jython/src/com/ziclix/python/sql/DataHandler.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/com/ziclix/python/sql/DataHandler.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -177,7 +177,7 @@
 
                 case Types.LONGVARCHAR:
                     if (object instanceof PyFile) {
-                        object = new PyString(((PyFile) object).read());
+                        object = ((PyFile) object).read();
                     }
 
                     String varchar = (String) object.__tojava__(String.class);
@@ -192,7 +192,7 @@
 
                 default :
                     if (object instanceof PyFile) {
-                        object = new PyString(((PyFile) object).read());
+                        object = ((PyFile) object).read();
                     }
 
                     stmt.setObject(index, object.__tojava__(Object.class), type);

Modified: trunk/jython/src/com/ziclix/python/sql/JDBC20DataHandler.java
===================================================================
--- trunk/jython/src/com/ziclix/python/sql/JDBC20DataHandler.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/com/ziclix/python/sql/JDBC20DataHandler.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -62,7 +62,7 @@
 
             case Types.CLOB:
                 if (object instanceof PyFile) {
-                    object = new PyString(((PyFile) object).read());
+                    object = ((PyFile) object).read();
                 }
 
                 String clob = (String) object.__tojava__(String.class);

Modified: trunk/jython/src/com/ziclix/python/sql/Jython22DataHandler.java
===================================================================
--- trunk/jython/src/com/ziclix/python/sql/Jython22DataHandler.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/com/ziclix/python/sql/Jython22DataHandler.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -163,7 +163,7 @@
 
                 case Types.LONGVARCHAR:
                     if (object instanceof PyFile) {
-                        object = new PyString(((PyFile) object).read());
+                        object = ((PyFile) object).read();
                     }
 
                     String varchar = (String) object.__tojava__(String.class);
@@ -178,7 +178,7 @@
 
                 default :
                     if (object instanceof PyFile) {
-                        object = new PyString(((PyFile) object).read());
+                        object = ((PyFile) object).read();
                     }
 
                     stmt.setObject(index, object.__tojava__(Object.class), type);

Modified: trunk/jython/src/com/ziclix/python/sql/handler/MySQLDataHandler.java
===================================================================
--- trunk/jython/src/com/ziclix/python/sql/handler/MySQLDataHandler.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/com/ziclix/python/sql/handler/MySQLDataHandler.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -54,17 +54,19 @@
     switch (type) {
 
       case Types.LONGVARCHAR:
-        String varchar;
+          // XXX: Only works with ASCII data!
+          byte[] bytes;
         if (object instanceof PyFile) {
-          varchar = ((PyFile) object).read();
+              bytes = ((PyFile) object).read().toBytes();
         } else {
-          varchar = (String) object.__tojava__(String.class);
+              String varchar = (String) object.__tojava__(String.class);
+              bytes = StringUtil.toBytes(varchar);
         }
-        InputStream stream = new ByteArrayInputStream(StringUtil.toBytes(varchar));
+          InputStream stream = new ByteArrayInputStream(bytes);
 
         stream = new BufferedInputStream(stream);
 
-        stmt.setAsciiStream(index, stream, varchar.length());
+          stmt.setAsciiStream(index, stream, bytes.length);
         break;
 
       default :

Modified: trunk/jython/src/com/ziclix/python/sql/handler/PostgresqlDataHandler.java
===================================================================
--- trunk/jython/src/com/ziclix/python/sql/handler/PostgresqlDataHandler.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/com/ziclix/python/sql/handler/PostgresqlDataHandler.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -111,7 +111,7 @@
         String varchar;
         // Postgresql driver can't handle the setCharacterStream() method so use setObject() instead
         if (object instanceof PyFile) {
-          varchar = ((PyFile) object).read();
+          varchar = ((PyFile) object).read().asString();
         } else {
           varchar = (String) object.__tojava__(String.class);
         }

Modified: trunk/jython/src/org/python/core/PyFile.java
===================================================================
--- trunk/jython/src/org/python/core/PyFile.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/org/python/core/PyFile.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -286,16 +286,16 @@
     }
 
     @ExposedMethod(defaults = {"-1"})
-    final synchronized String file_read(int n) {
+    final synchronized PyString file_read(int n) {
         checkClosed();
-        return file.read(n);
+        return new PyString(file.read(n));
     }
 
-    public String read(int n) {
+    public PyString read(int n) {
         return file_read(n);
     }
 
-    public String read() {
+    public PyString read() {
         return file_read(-1);
     }
 
@@ -310,16 +310,16 @@
     }
 
     @ExposedMethod(defaults = {"-1"})
-    final synchronized String file_readline(int max) {
+    final synchronized PyString file_readline(int max) {
         checkClosed();
-        return file.readline(max);
+        return new PyString(file.readline(max));
     }
 
-    public String readline(int max) {
+    public PyString readline(int max) {
         return file_readline(max);
     }
 
-    public String readline() {
+    public PyString readline() {
         return file_readline(-1);
     }
 

Modified: trunk/jython/src/org/python/core/PyFunction.java
===================================================================
--- trunk/jython/src/org/python/core/PyFunction.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/org/python/core/PyFunction.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -143,13 +143,13 @@
     }
 
     @ExposedGet(name = "func_name")
-    public String getFuncName() {
-        return __name__;
+    public PyString getFuncName() {
+        return new PyString(__name__);
     }
 
     @ExposedSet(name = "func_name")
-    public void setFuncName(String func_name) {
-        __name__ = func_name;
+    public void setFuncName(PyString func_name) {
+        __name__ = func_name.asString();
     }
 
     @ExposedGet(name = "func_doc")

Modified: trunk/jython/src/org/python/core/PyStringMap.java
===================================================================
--- trunk/jython/src/org/python/core/PyStringMap.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/org/python/core/PyStringMap.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -141,7 +141,9 @@
         for (Entry<Object, PyObject> entry : table.entrySet()) {
             Object key = entry.getKey();
             if (key instanceof String) {
-                buf.append(Py.java2py(key).__repr__().toString());
+                // This is a bit complicated, but prevents us to duplicate
+                // PyString#__repr__ logic here.
+                buf.append(new PyString((String)key).__repr__().toString());
             } else {
                 buf.append(((PyObject)key).__repr__().toString());
             }

Modified: trunk/jython/src/org/python/core/PySystemState.java
===================================================================
--- trunk/jython/src/org/python/core/PySystemState.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/org/python/core/PySystemState.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -41,7 +41,7 @@
     private static final String JAR_URL_PREFIX = "jar:file:";
     private static final String JAR_SEPARATOR = "!";
 
-    public static String version = Version.getVersion();
+    public static PyString version = new PyString(Version.getVersion());
     public static int hexversion = ((Version.PY_MAJOR_VERSION << 24) |
                                     (Version.PY_MINOR_VERSION << 16) |
                                     (Version.PY_MICRO_VERSION <<  8) |
@@ -101,8 +101,8 @@
     public PyList path_hooks;
     public PyObject path_importer_cache;
 
-    public static String platform = "java";
-    public static String byteorder = "big";
+    public static PyString platform = new PyString("java");
+    public static PyString byteorder = new PyString("big");
 
     public PyObject ps1 = new PyString(">>> ");
     public PyObject ps2 = new PyString("... ");
@@ -288,8 +288,8 @@
         }
     }
 
-    public String getdefaultencoding() {
-        return codecs.getDefaultEncoding();
+    public PyString getdefaultencoding() {
+        return new PyString(codecs.getDefaultEncoding());
     }
 
     public void setdefaultencoding(String encoding) {
@@ -431,7 +431,7 @@
         if (version.equals("12")) {
             version = "1.2";
         }
-        platform = "java" + version;
+        platform = new PyString("java" + version);
     }
 
     private static void initRegistry(Properties preProperties, Properties postProperties, 

Modified: trunk/jython/src/org/python/core/PyTraceback.java
===================================================================
--- trunk/jython/src/org/python/core/PyTraceback.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/org/python/core/PyTraceback.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -62,11 +62,12 @@
             return null;
         }
 
+
         String line = null;
         int i = 0;
         try {
             for (i = 0; i < tb_lineno; i++) {
-                line = pyFile.readline();
+                line = pyFile.readline().asString();
                 if (line.equals("")) {
                     break;
                 }

Modified: trunk/jython/src/org/python/core/__builtin__.java
===================================================================
--- trunk/jython/src/org/python/core/__builtin__.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/org/python/core/__builtin__.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -1028,7 +1028,7 @@
 
     private static PyString readline(PyObject file) {
         if (file instanceof PyFile) {
-            return new PyString(((PyFile) file).readline());
+            return ((PyFile) file).readline();
         } else {
             PyObject ret = file.invoke("readline");
             if (!(ret instanceof PyString)) {

Modified: trunk/jython/src/org/python/core/adapter/ClassicPyObjectAdapter.java
===================================================================
--- trunk/jython/src/org/python/core/adapter/ClassicPyObjectAdapter.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/org/python/core/adapter/ClassicPyObjectAdapter.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -9,8 +9,8 @@
 import org.python.core.PyLong;
 import org.python.core.PyObject;
 import org.python.core.PyProxy;
-import org.python.core.PyString;
 import org.python.core.PyType;
+import org.python.core.PyUnicode;
 
 /**
  * Implements the algorithm originally used in {@link Py#java2py} to adapt objects.
@@ -60,7 +60,7 @@
 		add(new ClassAdapter(String.class) {
 
 			public PyObject adapt(Object o) {
-				return new PyString((String) o);
+                return new PyUnicode((String) o);
 			}
 
 		});

Modified: trunk/jython/src/org/python/core/util/StringUtil.java
===================================================================
--- trunk/jython/src/org/python/core/util/StringUtil.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/org/python/core/util/StringUtil.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -5,6 +5,7 @@
 import java.nio.ByteBuffer;
 
 import org.python.core.Py;
+import org.python.core.PyString;
 
 /**
  * String Utility methods.
@@ -83,4 +84,8 @@
         chars[0] = Character.toLowerCase(c0);
         return new String(chars);
     }
+
+    public static PyString asPyString(String string) {
+        return new PyString(string);
 }
+}

Modified: trunk/jython/src/org/python/modules/binascii.java
===================================================================
--- trunk/jython/src/org/python/modules/binascii.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/org/python/modules/binascii.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -272,12 +272,12 @@
      * binary data. Lines normally contain 45 (binary) bytes, except for the
      * last line. Line data may be followed by whitespace.
      */
-    public static String a2b_uu(String ascii_data) {
+    public static PyString a2b_uu(String ascii_data) {
         int leftbits = 0;
         int leftchar = 0;
 
         if (ascii_data.length() == 0)
-            return "";
+            return new PyString("");
         
         StringBuffer bin_data = new StringBuffer();
 
@@ -331,7 +331,7 @@
         for (; i<bin_len; i++)
         	bin_data.append((char)0);
         
-        return bin_data.toString();
+        return new PyString(bin_data.toString());
     }
 
 
@@ -346,7 +346,7 @@
      * is the converted line, including a newline char. The length of
      * <i>data</i> should be at most 45.
      */
-    public static String b2a_uu(String bin_data) {
+    public static PyString b2a_uu(String bin_data) {
         int leftbits = 0;
         char this_ch;
         int leftchar = 0;
@@ -379,7 +379,7 @@
         }
         ascii_data.append('\n'); // Append a courtesy newline
 
-        return ascii_data.toString();
+        return new PyString(ascii_data.toString());
     }
 
 
@@ -417,7 +417,7 @@
      * Convert a block of base64 data back to binary and return the
      * binary data. More than one line may be passed at a time.
      */
-    public static String a2b_base64(String ascii_data) {
+    public static PyString a2b_base64(String ascii_data) {
         int leftbits = 0;
         char this_ch;
         int leftchar = 0;
@@ -468,7 +468,7 @@
         if (leftbits != 0) {
             throw new PyException(Error, "Incorrect padding");
         }
-        return bin_data.toString();
+        return new PyString(bin_data.toString());
     }
 
 
@@ -482,7 +482,7 @@
      * Convert binary data to a line of ASCII characters in base64 coding.
      * The return value is the converted line, including a newline char.
      */
-    public static String b2a_base64(String bin_data) {
+    public static PyString b2a_base64(String bin_data) {
         int leftbits = 0;
         char this_ch;
         int leftchar = 0;
@@ -516,7 +516,7 @@
         }
         ascii_data.append('\n');  // Append a courtesy newline
 
-        return ascii_data.toString();
+        return new PyString(ascii_data.toString());
     }
 
 
@@ -625,7 +625,7 @@
      * resulting string. The argument should already be RLE-coded, and have a
      * length divisible by 3 (except possibly the last fragment).
      */
-    public static String b2a_hqx(String bin_data) {
+    public static PyString b2a_hqx(String bin_data) {
         int leftbits = 0;
         char this_ch;
         int leftchar = 0;
@@ -649,7 +649,7 @@
             leftchar <<= (6-leftbits);
             ascii_data.append((char) table_b2a_hqx[leftchar & 0x3f]);
         }
-        return ascii_data.toString();
+        return new PyString(ascii_data.toString());
     }
 
 
@@ -834,7 +834,7 @@
         "This function is also available as \"hexlify()\"."
     );
 
-    public static String b2a_hex(String argbuf) {
+    public static PyString b2a_hex(String argbuf) {
         int arglen = argbuf.length();
 
         StringBuffer retbuf = new StringBuffer(arglen*2);
@@ -845,12 +845,12 @@
             retbuf.append(hexdigit[(ch >>> 4) & 0xF]);
             retbuf.append(hexdigit[ch & 0xF]);
         }
-        return retbuf.toString();
+        return new PyString(retbuf.toString());
 
     }
 
 
-    public static String hexlify(String argbuf) {
+    public static PyString hexlify(String argbuf) {
         return b2a_hex(argbuf);
     }
 
@@ -864,7 +864,7 @@
     );
 
 
-    public static String a2b_hex(String argbuf) {
+    public static PyString a2b_hex(String argbuf) {
         int arglen = argbuf.length();
 
         /* XXX What should we do about strings with an odd length?  Should
@@ -883,11 +883,11 @@
                 throw Py.TypeError("Non-hexadecimal digit found");
             retbuf.append((char) ((top << 4) + bot));
         }
-        return retbuf.toString();
+        return new PyString(retbuf.toString());
     }
 
 
-    public static String unhexlify(String argbuf) {
+    public static PyString unhexlify(String argbuf) {
         return a2b_hex(argbuf);
     }
 
@@ -917,7 +917,7 @@
         return val;
     }
 
-    public static String a2b_qp(PyObject[] arg, String[] kws)
+    public static PyString a2b_qp(PyObject[] arg, String[] kws)
     {
         ArgParser ap = new ArgParser("a2b_qp", arg, kws, new String[] {"s", "header"});
         String s = ap.getString(0);
@@ -951,8 +951,7 @@
         		sb.append(c);
         	}
         }
-
-        return sb.toString();
+        return new PyString(sb.toString());
     }
 
     final private static Pattern RN_TO_N = Pattern.compile("\r\n");
@@ -964,7 +963,7 @@
     		+ "space at end of lines is.  When istext is not set, \r and \n (CR/LF) are\n"
     		+ "both encoded.  When quotetabs is set, space and tabs are encoded.");
 
-    public static String b2a_qp(PyObject[] arg, String[] kws) {
+    public static PyString b2a_qp(PyObject[] arg, String[] kws) {
         ArgParser ap = new ArgParser("b2a_qp", arg, kws, new String[] {"s", "quotetabs", "istext", "header"});
         String s = ap.getString(0);
         boolean quotetabs = getIntFlagAsBool(ap, 1, 0, "an integer is required");
@@ -1034,7 +1033,7 @@
         		qpEscape(sb, c);
         	}
         }
-    	return sb.toString();
+        return new PyString(sb.toString());
     }
     
     private static boolean endOfLine(String s, String lineEnd, int i) {

Modified: trunk/jython/src/org/python/modules/cPickle.java
===================================================================
--- trunk/jython/src/org/python/modules/cPickle.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/org/python/modules/cPickle.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -614,7 +614,7 @@
      * @param object    a data object which should be pickled.
      * @returns         a string representing the pickled object.
      */
-    public static String dumps(PyObject object) {
+    public static PyString dumps(PyObject object) {
         return dumps(object, 0);
     }
 
@@ -625,7 +625,7 @@
      * @param protocol  pickle protocol version (0 - text, 1 - pre-2.3 binary, 2 - 2.3)
      * @returns         a string representing the pickled object.
      */
-    public static String dumps(PyObject object, int protocol) {
+    public static PyString dumps(PyObject object, int protocol) {
         cStringIO.StringIO file = cStringIO.StringIO();
         dump(object, file, protocol);
         return file.getvalue();
@@ -705,11 +705,11 @@
         public void flush() {}
 
         public String read(int len) {
-            return file.read(len);
+            return file.read(len).asString();
         }
 
         public String readlineNoNl() {
-            return file.readlineNoNl();
+            return file.readlineNoNl().asString();
         }
     }
 

Modified: trunk/jython/src/org/python/modules/cStringIO.java
===================================================================
--- trunk/jython/src/org/python/modules/cStringIO.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/org/python/modules/cStringIO.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -99,10 +99,10 @@
 
         public PyObject __iternext__() {
             _complain_ifclosed();
-            String r = readline();
-            if(r.equals(""))
+            PyString r = readline();
+            if (r.__len__() == 0)
                 return null;
-            return new PyString(r);
+            return r;
         }
 
         /**
@@ -176,7 +176,7 @@
          * An empty string is returned when EOF is encountered immediately.
          * @returns     A string containing the data.
          */
-        public String read() {
+        public PyString read() {
             return read(-1);
         }
 
@@ -190,7 +190,7 @@
          * @returns     A string containing the data read.
          */
                
-        public synchronized String read(long size) {
+        public synchronized PyString read(long size) {
             _complain_ifclosed();
             int size_int = _convert_to_int(size);
             int len = buf.length();
@@ -204,10 +204,9 @@
                 substr = buf.substring(pos, newpos);
                 pos = newpos;
             }
-            return substr;
+            return new PyString(substr);
         }
 
-
         /**
          * Read one entire line from the file. A trailing newline character
          * is kept in the string (but may be absent when a file ends with
@@ -215,7 +214,7 @@
          * An empty string is returned when EOF is hit immediately.
          * @returns data from the file up to and including the newline.
          */
-        public String readline() {
+        public PyString readline() {
             return readline(-1);
         }
 
@@ -229,12 +228,12 @@
          * returned.
          * @returns data from the file up to and including the newline.
          */
-        public synchronized String readline(long size) {
+        public synchronized PyString readline(long size) {
             _complain_ifclosed();
             int size_int = _convert_to_int(size);
             int len = buf.length();
             if (pos == len) {
-                return "";
+                return new PyString("");
             }
             int i = buf.indexOf("\n", pos);
             int newpos = (i < 0) ? len : i + 1;
@@ -243,7 +242,7 @@
             }
             String r = buf.substring(pos, newpos);
             pos = newpos;
-            return r;
+            return new PyString(r);
         }
 
 
@@ -251,7 +250,7 @@
          * Read and return a line without the trailing newline.
          * Usind by cPickle as an optimization.
          */
-        public synchronized String readlineNoNl() {
+        public synchronized PyString readlineNoNl() {
             _complain_ifclosed();
             int len = buf.length();
             int i = buf.indexOf("\n", pos);
@@ -260,7 +259,7 @@
             pos = newpos;
             if (pos  < len) // Skip the newline
                 pos++;
-            return r;
+            return new PyString(r);
         }
 
 
@@ -286,10 +285,10 @@
             int sizehint_int = (int)sizehint;
             int total = 0;
             PyList lines = new PyList();
-            String line = readline();
-            while (line.length() > 0) {
-                lines.append(new PyString(line));
-                total += line.length();
+            PyString line = readline();
+            while (line.__len__() > 0) {
+                lines.append(line);
+                total += line.__len__();
                 if (0 < sizehint_int  && sizehint_int <= total)
                     break;
                 line = readline();
@@ -367,8 +366,8 @@
          * before the StringIO object's close() method is called.
          * @return      the contents of the StringIO.
          */
-        public synchronized String getvalue() {
-            return buf.toString();
+        public synchronized PyString getvalue() {
+            return new PyString(buf.toString());
         }
 
     }

Modified: trunk/jython/src/org/python/modules/struct.java
===================================================================
--- trunk/jython/src/org/python/modules/struct.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/org/python/modules/struct.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -978,7 +978,7 @@
      * to the given format. The arguments must match the
      * values required by the format exactly.
      */
-    static public String pack(PyObject[] args) {
+    static public PyString pack(PyObject[] args) {
         if (args.length < 1)
             Py.TypeError("illegal argument type for built-in operation");
 
@@ -987,7 +987,7 @@
         FormatDef[] f = whichtable(format);
         int size = calcsize(format, f);
         
-        return pack(format, f, size, 1, args).toString();
+        return new PyString(pack(format, f, size, 1, args).toString());
     }
     
     // xxx - may need to consider doing a generic arg parser here

Modified: trunk/jython/src/org/python/modules/time/Time.java
===================================================================
--- trunk/jython/src/org/python/modules/time/Time.java	2008-10-14 01:47:30 UTC (rev 5389)
+++ trunk/jython/src/org/python/modules/time/Time.java	2008-10-14 03:20:10 UTC (rev 5390)
@@ -308,11 +308,11 @@
         return _timefields(parseTimeDoubleArg(arg), TimeZone.getTimeZone("GMT"));
     }
 
-    public static String ctime() {
+    public static PyString ctime() {
         return ctime(Py.None);
     }
 
-    public static String ctime(PyObject secs) {
+    public static PyString ctime(PyObject secs) {
         return asctime(localtime(secs));
     }
 
@@ -405,11 +405,11 @@
         return yearstr.substring(yearstr.length()-2, yearstr.length());
     }
 
-    public static String asctime() {
+    public static PyString asctime() {
         return asctime(localtime());
     }
 
-    public static String asctime(PyTuple tup) {
+    public static PyString asctime(PyTuple tup) {
         StringBuffer buf = new StringBuffer(25);
         buf.append(enshortdays[item(tup, 6)]).append(' ');
         buf.append(enshortmonths[item(tup, 1)]).append(' ');
@@ -421,7 +421,7 @@
         buf.append(_twodigit(item(tup, 3))).append(':');
         buf.append(_twodigit(item(tup, 4))).append(':');
         buf.append(_twodigit(item(tup, 5))).append(' ');
-        return buf.append(item(tup, 0)).toString();
+        return new PyString(buf.append(item(tup, 0)).toString());
     }
 
     public static String locale_asctime(PyTuple tup) {
@@ -454,11 +454,11 @@
     // writable but ignore its value?
     public static final int accept2dyear = 0;
 
-    public static String strftime(String format) {
+    public static PyString strftime(String format) {
         return strftime(format, localtime());
     }
 
-    public static String strftime(String format, PyTuple tup) {
+    public static PyString strftime(String format, PyTuple tup) {
         checkLocale();
 
         // Immediately validate the tuple
@@ -651,7 +651,18 @@
             lastc = i+1;
             i++;
         }
-        return s;
+        // FIXME: This have problems with localized data:
+        //        $ LANG=es_ES.UTF-8 jythont -c "import time; print time.strftime('%A')"
+        //        s?bado
+        //
+        //        On the other hand, returning unicode would break some doctests
+        //        and will give problems when the return value of strftime is
+        //        mixed with other strings and then the final result is stored
+        //        on places which only support str and not unicode (such as
+        //        os.environ)
+        //
+        // TODO:  Check how CPython deals with this problem.
+        return new PyString(s);
     }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5391
          http://jython.svn.sourceforge.net/jython/?rev=5391&view=rev
Author:   fwierzbicki
Date:     2008-10-14 16:43:46 +0000 (Tue, 14 Oct 2008)

Log Message:
-----------
Fix or skips for most remaining problems in test_syntax.py.  All remaining
problems are due to the lack of enforcement on continuations not being
permitted in finally.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_syntax.py
    trunk/jython/grammar/Python.g
    trunk/jython/src/org/python/antlr/GrammarActions.java

Modified: trunk/jython/Lib/test/test_syntax.py
===================================================================
--- trunk/jython/Lib/test/test_syntax.py	2008-10-14 03:20:10 UTC (rev 5390)
+++ trunk/jython/Lib/test/test_syntax.py	2008-10-14 16:43:46 UTC (rev 5391)
@@ -61,7 +61,7 @@
 Traceback (most recent call last):
 SyntaxError: can't assign to operator (<doctest test.test_syntax[6]>, line 1)
 
->>> (x for x in x) = 1
+>>> (x for x in x) = 1 #doctest: +IGNORE_EXCEPTION_DETAIL
 Traceback (most recent call last):
 SyntaxError: can't assign to generator expression (<doctest test.test_syntax[7]>, line 1)
 
@@ -146,69 +146,71 @@
 >>> f((x for x in L), 1)
 [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
 
->>> f(i0,  i1,  i2,  i3,  i4,  i5,  i6,  i7,  i8,  i9,  i10,  i11,
-...   i12,  i13,  i14,  i15,  i16,  i17,  i18,  i19,  i20,  i21,  i22,
-...   i23,  i24,  i25,  i26,  i27,  i28,  i29,  i30,  i31,  i32,  i33,
-...   i34,  i35,  i36,  i37,  i38,  i39,  i40,  i41,  i42,  i43,  i44,
-...   i45,  i46,  i47,  i48,  i49,  i50,  i51,  i52,  i53,  i54,  i55,
-...   i56,  i57,  i58,  i59,  i60,  i61,  i62,  i63,  i64,  i65,  i66,
-...   i67,  i68,  i69,  i70,  i71,  i72,  i73,  i74,  i75,  i76,  i77,
-...   i78,  i79,  i80,  i81,  i82,  i83,  i84,  i85,  i86,  i87,  i88,
-...   i89,  i90,  i91,  i92,  i93,  i94,  i95,  i96,  i97,  i98,  i99,
-...   i100,  i101,  i102,  i103,  i104,  i105,  i106,  i107,  i108,
-...   i109,  i110,  i111,  i112,  i113,  i114,  i115,  i116,  i117,
-...   i118,  i119,  i120,  i121,  i122,  i123,  i124,  i125,  i126,
-...   i127,  i128,  i129,  i130,  i131,  i132,  i133,  i134,  i135,
-...   i136,  i137,  i138,  i139,  i140,  i141,  i142,  i143,  i144,
-...   i145,  i146,  i147,  i148,  i149,  i150,  i151,  i152,  i153,
-...   i154,  i155,  i156,  i157,  i158,  i159,  i160,  i161,  i162,
-...   i163,  i164,  i165,  i166,  i167,  i168,  i169,  i170,  i171,
-...   i172,  i173,  i174,  i175,  i176,  i177,  i178,  i179,  i180,
-...   i181,  i182,  i183,  i184,  i185,  i186,  i187,  i188,  i189,
-...   i190,  i191,  i192,  i193,  i194,  i195,  i196,  i197,  i198,
-...   i199,  i200,  i201,  i202,  i203,  i204,  i205,  i206,  i207,
-...   i208,  i209,  i210,  i211,  i212,  i213,  i214,  i215,  i216,
-...   i217,  i218,  i219,  i220,  i221,  i222,  i223,  i224,  i225,
-...   i226,  i227,  i228,  i229,  i230,  i231,  i232,  i233,  i234,
-...   i235,  i236,  i237,  i238,  i239,  i240,  i241,  i242,  i243,
-...   i244,  i245,  i246,  i247,  i248,  i249,  i250,  i251,  i252,
-...   i253,  i254,  i255)
-Traceback (most recent call last): #doctest: +IGNORE_EXCEPTION_DETAIL
-SyntaxError: more than 255 arguments (<doctest test.test_syntax[25]>, line 1)
+### XXX: commented out -- jython lacks this limit -- should it have it?
+#>>> f(i0,  i1,  i2,  i3,  i4,  i5,  i6,  i7,  i8,  i9,  i10,  i11,
+#...   i12,  i13,  i14,  i15,  i16,  i17,  i18,  i19,  i20,  i21,  i22,
+#...   i23,  i24,  i25,  i26,  i27,  i28,  i29,  i30,  i31,  i32,  i33,
+#...   i34,  i35,  i36,  i37,  i38,  i39,  i40,  i41,  i42,  i43,  i44,
+#...   i45,  i46,  i47,  i48,  i49,  i50,  i51,  i52,  i53,  i54,  i55,
+#...   i56,  i57,  i58,  i59,  i60,  i61,  i62,  i63,  i64,  i65,  i66,
+#...   i67,  i68,  i69,  i70,  i71,  i72,  i73,  i74,  i75,  i76,  i77,
+#...   i78,  i79,  i80,  i81,  i82,  i83,  i84,  i85,  i86,  i87,  i88,
+#...   i89,  i90,  i91,  i92,  i93,  i94,  i95,  i96,  i97,  i98,  i99,
+#...   i100,  i101,  i102,  i103,  i104,  i105,  i106,  i107,  i108,
+#...   i109,  i110,  i111,  i112,  i113,  i114,  i115,  i116,  i117,
+#...   i118,  i119,  i120,  i121,  i122,  i123,  i124,  i125,  i126,
+#...   i127,  i128,  i129,  i130,  i131,  i132,  i133,  i134,  i135,
+#...   i136,  i137,  i138,  i139,  i140,  i141,  i142,  i143,  i144,
+#...   i145,  i146,  i147,  i148,  i149,  i150,  i151,  i152,  i153,
+#...   i154,  i155,  i156,  i157,  i158,  i159,  i160,  i161,  i162,
+#...   i163,  i164,  i165,  i166,  i167,  i168,  i169,  i170,  i171,
+#...   i172,  i173,  i174,  i175,  i176,  i177,  i178,  i179,  i180,
+#...   i181,  i182,  i183,  i184,  i185,  i186,  i187,  i188,  i189,
+#...   i190,  i191,  i192,  i193,  i194,  i195,  i196,  i197,  i198,
+#...   i199,  i200,  i201,  i202,  i203,  i204,  i205,  i206,  i207,
+#...   i208,  i209,  i210,  i211,  i212,  i213,  i214,  i215,  i216,
+#...   i217,  i218,  i219,  i220,  i221,  i222,  i223,  i224,  i225,
+#...   i226,  i227,  i228,  i229,  i230,  i231,  i232,  i233,  i234,
+#...   i235,  i236,  i237,  i238,  i239,  i240,  i241,  i242,  i243,
+#...   i244,  i245,  i246,  i247,  i248,  i249,  i250,  i251,  i252,
+#...   i253,  i254,  i255)
+#Traceback (most recent call last):
+#SyntaxError: more than 255 arguments (<doctest test.test_syntax[25]>, line 1)
 
 The actual error cases counts positional arguments, keyword arguments,
 and generator expression arguments separately.  This test combines the
 three.
 
->>> f(i0,  i1,  i2,  i3,  i4,  i5,  i6,  i7,  i8,  i9,  i10,  i11,
-...   i12,  i13,  i14,  i15,  i16,  i17,  i18,  i19,  i20,  i21,  i22,
-...   i23,  i24,  i25,  i26,  i27,  i28,  i29,  i30,  i31,  i32,  i33,
-...   i34,  i35,  i36,  i37,  i38,  i39,  i40,  i41,  i42,  i43,  i44,
-...   i45,  i46,  i47,  i48,  i49,  i50,  i51,  i52,  i53,  i54,  i55,
-...   i56,  i57,  i58,  i59,  i60,  i61,  i62,  i63,  i64,  i65,  i66,
-...   i67,  i68,  i69,  i70,  i71,  i72,  i73,  i74,  i75,  i76,  i77,
-...   i78,  i79,  i80,  i81,  i82,  i83,  i84,  i85,  i86,  i87,  i88,
-...   i89,  i90,  i91,  i92,  i93,  i94,  i95,  i96,  i97,  i98,  i99,
-...   i100,  i101,  i102,  i103,  i104,  i105,  i106,  i107,  i108,
-...   i109,  i110,  i111,  i112,  i113,  i114,  i115,  i116,  i117,
-...   i118,  i119,  i120,  i121,  i122,  i123,  i124,  i125,  i126,
-...   i127,  i128,  i129,  i130,  i131,  i132,  i133,  i134,  i135,
-...   i136,  i137,  i138,  i139,  i140,  i141,  i142,  i143,  i144,
-...   i145,  i146,  i147,  i148,  i149,  i150,  i151,  i152,  i153,
-...   i154,  i155,  i156,  i157,  i158,  i159,  i160,  i161,  i162,
-...   i163,  i164,  i165,  i166,  i167,  i168,  i169,  i170,  i171,
-...   i172,  i173,  i174,  i175,  i176,  i177,  i178,  i179,  i180,
-...   i181,  i182,  i183,  i184,  i185,  i186,  i187,  i188,  i189,
-...   i190,  i191,  i192,  i193,  i194,  i195,  i196,  i197,  i198,
-...   i199,  i200,  i201,  i202,  i203,  i204,  i205,  i206,  i207,
-...   i208,  i209,  i210,  i211,  i212,  i213,  i214,  i215,  i216,
-...   i217,  i218,  i219,  i220,  i221,  i222,  i223,  i224,  i225,
-...   i226,  i227,  i228,  i229,  i230,  i231,  i232,  i233,  i234,
-...   i235, i236,  i237,  i238,  i239,  i240,  i241,  i242,  i243,
-...   (x for x in i244),  i245,  i246,  i247,  i248,  i249,  i250,  i251,
-...    i252=1, i253=1,  i254=1,  i255=1)
-Traceback (most recent call last): #doctest: +IGNORE_EXCEPTION_DETAIL
-SyntaxError: more than 255 arguments (<doctest test.test_syntax[26]>, line 1)
+### XXX: commented out -- jython lacks this limit -- should it have it?
+#>>> f(i0,  i1,  i2,  i3,  i4,  i5,  i6,  i7,  i8,  i9,  i10,  i11,
+#...   i12,  i13,  i14,  i15,  i16,  i17,  i18,  i19,  i20,  i21,  i22,
+#...   i23,  i24,  i25,  i26,  i27,  i28,  i29,  i30,  i31,  i32,  i33,
+#...   i34,  i35,  i36,  i37,  i38,  i39,  i40,  i41,  i42,  i43,  i44,
+#...   i45,  i46,  i47,  i48,  i49,  i50,  i51,  i52,  i53,  i54,  i55,
+#...   i56,  i57,  i58,  i59,  i60,  i61,  i62,  i63,  i64,  i65,  i66,
+#...   i67,  i68,  i69,  i70,  i71,  i72,  i73,  i74,  i75,  i76,  i77,
+#...   i78,  i79,  i80,  i81,  i82,  i83,  i84,  i85,  i86,  i87,  i88,
+#...   i89,  i90,  i91,  i92,  i93,  i94,  i95,  i96,  i97,  i98,  i99,
+#...   i100,  i101,  i102,  i103,  i104,  i105,  i106,  i107,  i108,
+#...   i109,  i110,  i111,  i112,  i113,  i114,  i115,  i116,  i117,
+#...   i118,  i119,  i120,  i121,  i122,  i123,  i124,  i125,  i126,
+#...   i127,  i128,  i129,  i130,  i131,  i132,  i133,  i134,  i135,
+#...   i136,  i137,  i138,  i139,  i140,  i141,  i142,  i143,  i144,
+#...   i145,  i146,  i147,  i148,  i149,  i150,  i151,  i152,  i153,
+#...   i154,  i155,  i156,  i157,  i158,  i159,  i160,  i161,  i162,
+#...   i163,  i164,  i165,  i166,  i167,  i168,  i169,  i170,  i171,
+#...   i172,  i173,  i174,  i175,  i176,  i177,  i178,  i179,  i180,
+#...   i181,  i182,  i183,  i184,  i185,  i186,  i187,  i188,  i189,
+#...   i190,  i191,  i192,  i193,  i194,  i195,  i196,  i197,  i198,
+#...   i199,  i200,  i201,  i202,  i203,  i204,  i205,  i206,  i207,
+#...   i208,  i209,  i210,  i211,  i212,  i213,  i214,  i215,  i216,
+#...   i217,  i218,  i219,  i220,  i221,  i222,  i223,  i224,  i225,
+#...   i226,  i227,  i228,  i229,  i230,  i231,  i232,  i233,  i234,
+#...   i235, i236,  i237,  i238,  i239,  i240,  i241,  i242,  i243,
+#...   (x for x in i244),  i245,  i246,  i247,  i248,  i249,  i250,  i251,
+#...    i252=1, i253=1,  i254=1,  i255=1)
+#Traceback (most recent call last):
+#SyntaxError: more than 255 arguments (<doctest test.test_syntax[26]>, line 1)
 
 >>> f(lambda x: x[0] = 3) #doctest: +IGNORE_EXCEPTION_DETAIL
 Traceback (most recent call last):
@@ -453,10 +455,7 @@
             self.fail("compile() did not raise SyntaxError")
 
     def test_assign_call(self):
-        if test_support.is_jython:
-            self._check_error("f() = 1")
-        else:
-            self._check_error("f() = 1", "assign")
+        self._check_error("f() = 1", "assign")
 
     def test_assign_del(self):
         self._check_error("del f()", "delete")

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2008-10-14 03:20:10 UTC (rev 5390)
+++ trunk/jython/grammar/Python.g	2008-10-14 16:43:46 UTC (rev 5391)
@@ -110,7 +110,6 @@
 import org.python.antlr.ast.expr_contextType;
 import org.python.antlr.ast.ExtSlice;
 import org.python.antlr.ast.For;
-import org.python.antlr.ast.FunctionDef;
 import org.python.antlr.ast.GeneratorExp;
 import org.python.antlr.ast.Global;
 import org.python.antlr.ast.If;
@@ -638,7 +637,7 @@
 //del_stmt: 'del' exprlist
 del_stmt
     : DELETE del_list
-   -> ^(DELETE<Delete>[$DELETE, actions.castExprs($del_list.etypes)])
+   -> ^(DELETE<Delete>[$DELETE, $del_list.etypes])
     ;
 
 //pass_stmt: 'pass'
@@ -1376,10 +1375,10 @@
 
 //not in CPython's Grammar file
 //Needed as an exprlist that does not produce tuples for del_stmt.
-del_list returns [List etypes]
+del_list returns [exprType[\] etypes]
     : e+=expr[expr_contextType.Del] (options {k=2;}: COMMA e+=expr[expr_contextType.Del])* (COMMA)?
       {
-          $etypes = $e;
+          $etypes = actions.makeDeleteList($e);
       }
     ;
 

Modified: trunk/jython/src/org/python/antlr/GrammarActions.java
===================================================================
--- trunk/jython/src/org/python/antlr/GrammarActions.java	2008-10-14 03:20:10 UTC (rev 5390)
+++ trunk/jython/src/org/python/antlr/GrammarActions.java	2008-10-14 16:43:46 UTC (rev 5391)
@@ -327,12 +327,12 @@
         if (snameToken == null) {
             s = null;
         } else {
-            s = snameToken.getText();
+            s = cantBeNone(snameToken);
         }
         if (knameToken == null) {
             k = null;
         } else {
-            k = knameToken.getText();
+            k = cantBeNone(knameToken);
         }
         return new argumentsType(t, p, s, k, d);
     }
@@ -347,8 +347,12 @@
             for(int i=0;i<args.size();i++) {
                 exprType[] e = (exprType[])args.get(i);
                 checkAssign(e[0]);
-                Name arg = (Name)e[0];
-                k.add(new keywordType(arg, arg.id, e[1]));
+                if (e[0] instanceof Name) {
+                    Name arg = (Name)e[0];
+                    k.add(new keywordType(arg, arg.id, e[1]));
+                } else {
+                    errorHandler.error("keyword must be a name", e[0]);
+                }
             }
             return k.toArray(new keywordType[k.size()]);
         }
@@ -495,26 +499,6 @@
         return new ClassDef(t, nameToken.getText(), b, s);
     }
 
-    argumentsType makeArgumentsType(PythonTree t, List params, PythonTree snameToken,
-        PythonTree knameToken, List defaults) {
-
-        exprType[] p = castExprs(params);
-        exprType[] d = castExprs(defaults);
-        String s;
-        String k;
-        if (snameToken == null) {
-            s = null;
-        } else {
-            s = snameToken.getText();
-        }
-        if (knameToken == null) {
-            k = null;
-        } else {
-            k = knameToken.getText();
-        }
-        return new argumentsType(t, p, s, k, d);
-    }
-
     stmtType makeTryExcept(PythonTree t, List body, List handlers, List orelse, List finBody) {
         stmtType[] b = castStmts(body);
         excepthandlerType[] e = (excepthandlerType[])handlers.toArray(new excepthandlerType[handlers.size()]);
@@ -632,27 +616,46 @@
             errorHandler.error("can't assign to generator expression", e);
         } else if (e instanceof Num) {
             errorHandler.error("can't assign to number", e);
+        } else if (e instanceof Str) {
+            errorHandler.error("can't assign to string", e);
         } else if (e instanceof Yield) {
             errorHandler.error("can't assign to yield expression", e);
         } else if (e instanceof BinOp) {
             errorHandler.error("can't assign to operator", e);
         } else if (e instanceof Lambda) {
             errorHandler.error("can't assign to lambda", e);
+        } else if (e instanceof Call) {
+            errorHandler.error("can't assign to function call", e);
+        } else if (e instanceof Repr) {
+            errorHandler.error("can't assign to repr", e);
+        } else if (e instanceof IfExp) {
+            errorHandler.error("can't assign to conditional expression", e);
         } else if (e instanceof Tuple) {
             //XXX: performance problem?  Any way to do this better?
             exprType[] elts = ((Tuple)e).elts;
+            if (elts.length == 0) {
+                errorHandler.error("can't assign to ()", e);
+            }
             for (int i=0;i<elts.length;i++) {
                 checkAssign(elts[i]);
             }
+        } else if (e instanceof org.python.antlr.ast.List) {
+            //XXX: performance problem?  Any way to do this better?
+            exprType[] elts = ((org.python.antlr.ast.List)e).elts;
+            for (int i=0;i<elts.length;i++) {
+                checkAssign(elts[i]);
+            }
         }
     }
 
-    void checkDelete(exprType[] exprs) {
+    exprType[] makeDeleteList(List e) {
+        exprType[] exprs = castExprs(e);
         for(int i=0;i<exprs.length;i++) {
             if (exprs[i] instanceof Call) {
                 errorHandler.error("can't delete function call", exprs[i]);
             }
         }
+        return exprs;
     }
 
     sliceType makeSubscript(PythonTree lower, Token colon, PythonTree upper, PythonTree sliceop) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5394
          http://jython.svn.sourceforge.net/jython/?rev=5394&view=rev
Author:   pjenvey
Date:     2008-10-15 00:46:02 +0000 (Wed, 15 Oct 2008)

Log Message:
-----------
fix solid_base considering slotted objects with a __dict__ as solid

Modified Paths:
--------------
    trunk/jython/Lib/test/test_class_jy.py
    trunk/jython/src/org/python/core/PyType.java

Modified: trunk/jython/Lib/test/test_class_jy.py
===================================================================
--- trunk/jython/Lib/test/test_class_jy.py	2008-10-14 23:08:45 UTC (rev 5393)
+++ trunk/jython/Lib/test/test_class_jy.py	2008-10-15 00:46:02 UTC (rev 5394)
@@ -162,6 +162,18 @@
         class Bar(SlottedBase):
             __metaclass__ = Meta
 
+    def test_slotted_diamond_problem_bug(self):
+        class A(object):
+            __slots__ = 'foo'
+        class B(A):
+            pass
+        class C(A):
+            pass
+        # used to raise TypeError: multiple bases have instance lay-out
+        # conflict
+        class D(B, C):
+            pass
+        
 
 class ClassNamelessModuleTestCase(unittest.TestCase):
 

Modified: trunk/jython/src/org/python/core/PyType.java
===================================================================
--- trunk/jython/src/org/python/core/PyType.java	2008-10-14 23:08:45 UTC (rev 5393)
+++ trunk/jython/src/org/python/core/PyType.java	2008-10-15 00:46:02 UTC (rev 5394)
@@ -823,7 +823,8 @@
     }
 
     /**
-     * Finds the parent of type with an underlying_class or with slots.
+     * Finds the parent of type with an underlying_class or with slots sans a __dict__
+     * slot.
      */
     private static PyType solid_base(PyType type) {
         do {
@@ -836,7 +837,7 @@
     }
 
     private static boolean isSolidBase(PyType type) {
-        return type.underlying_class != null || type.numSlots != 0;
+        return type.underlying_class != null || (type.numSlots != 0 && !type.needs_userdict);
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5402
          http://jython.svn.sourceforge.net/jython/?rev=5402&view=rev
Author:   fwierzbicki
Date:     2008-10-15 20:22:02 +0000 (Wed, 15 Oct 2008)

Log Message:
-----------
Move bugtests/test076.py into regrtest.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_exceptions_jy.py

Removed Paths:
-------------
    trunk/jython/bugtests/test076.py

Modified: trunk/jython/Lib/test/test_exceptions_jy.py
===================================================================
--- trunk/jython/Lib/test/test_exceptions_jy.py	2008-10-15 20:16:53 UTC (rev 5401)
+++ trunk/jython/Lib/test/test_exceptions_jy.py	2008-10-15 20:22:02 UTC (rev 5402)
@@ -13,7 +13,19 @@
         self.assertEquals(str(KeyError('')), "''")
         self.assertEquals(str(KeyError('', '')), "('', '')")
 
+    #From bugtests/test076.py
+    def test_raise_no_arg(self):
+        r = None
+        try:
+            try:
+                raise RuntimeError("dummy")
+            except RuntimeError:
+                raise
+        except RuntimeError, e:
+            r = str(e)
 
+        self.assertEquals(r, "dummy")
+
 def test_main():
     test_support.run_unittest(ExceptionsTestCase)
 

Deleted: trunk/jython/bugtests/test076.py
===================================================================
--- trunk/jython/bugtests/test076.py	2008-10-15 20:16:53 UTC (rev 5401)
+++ trunk/jython/bugtests/test076.py	2008-10-15 20:22:02 UTC (rev 5402)
@@ -1,20 +0,0 @@
-"""
-raise with no arguments throws SyntaxError
-"""
-
-import support
-
-r = None
-try:
-    try:
-        raise support.TestError("dummy")
-    except support.TestError:
-	raise
-except support.TestError, e:
-    r = str(e)
-
-
-if r != "dummy":
-    raise support.TestError("Error not reraised")
-
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5414
          http://jython.svn.sourceforge.net/jython/?rev=5414&view=rev
Author:   fwierzbicki
Date:     2008-10-16 02:21:51 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
Moved unique id test to test_jy_internals

Modified Paths:
--------------
    trunk/jython/Lib/test/test_jy_internals.py

Removed Paths:
-------------
    trunk/jython/bugtests/test099.py

Modified: trunk/jython/Lib/test/test_jy_internals.py
===================================================================
--- trunk/jython/Lib/test/test_jy_internals.py	2008-10-16 01:53:49 UTC (rev 5413)
+++ trunk/jython/Lib/test/test_jy_internals.py	2008-10-16 02:21:51 UTC (rev 5414)
@@ -141,7 +141,20 @@
         self.assertEquals(datetime.datetime(2008, 5, 29, 16, 50, 1, 1),
                           Py.newDatetime(Timestamp(108, 4, 29, 16, 50, 1, 1000)))
 
+class IdTest(unittest.TestCase):
+    def test_unique_ids(self):
+        d = {}
+        cnt = 0
 
+        for i in xrange(100000):
+            s = "test" + repr(i)
+            j = id(s)
+            if d.has_key(j):
+                cnt = cnt + 1
+            d[j] = s
+
+        self.assertEquals(cnt, 0)
+
 def test_main():
     test_suite = unittest.TestSuite()
     test_loader = unittest.TestLoader()
@@ -151,6 +164,7 @@
     suite_add(LongAsScaledDoubleValueTests)
     suite_add(ExtraMathTests)
     suite_add(DatetimeTypeMappingTest)
+    suite_add(IdTest)
     run_suite(test_suite)
 
 if __name__ == "__main__":

Deleted: trunk/jython/bugtests/test099.py
===================================================================
--- trunk/jython/bugtests/test099.py	2008-10-16 01:53:49 UTC (rev 5413)
+++ trunk/jython/bugtests/test099.py	2008-10-16 02:21:51 UTC (rev 5414)
@@ -1,18 +0,0 @@
-"""
-Check if id() returns unique values for different objects.
-"""
-
-import support
-
-d = {}
-cnt = 0
-
-for i in xrange(100000):
-    s = "test" + `i`
-    j = id(s)
-    if d.has_key(j):
-        cnt = cnt + 1
-    d[j] = s
-
-if cnt != 0:
-   raise support.TestError("%d id() value conflicts" % cnt)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5416
          http://jython.svn.sourceforge.net/jython/?rev=5416&view=rev
Author:   fwierzbicki
Date:     2008-10-16 03:11:28 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
test102 moved to test_jy_internals.py

Modified Paths:
--------------
    trunk/jython/Lib/test/test_jy_internals.py

Removed Paths:
-------------
    trunk/jython/bugtests/test102.py

Modified: trunk/jython/Lib/test/test_jy_internals.py
===================================================================
--- trunk/jython/Lib/test/test_jy_internals.py	2008-10-16 02:56:10 UTC (rev 5415)
+++ trunk/jython/Lib/test/test_jy_internals.py	2008-10-16 03:11:28 UTC (rev 5416)
@@ -155,6 +155,23 @@
 
         self.assertEquals(cnt, 0)
 
+class FrameTest(unittest.TestCase):
+    def test_stack_frame_locals(self):
+        def h():
+            a = 1
+            b = 2
+            raise AttributeError("spam")
+
+        try:
+            h()
+        except:
+            import sys
+            tb = sys.exc_info()[2]
+            while tb.tb_next is not None:
+                tb = tb.tb_next
+            vars = tb.tb_frame.f_locals
+            self.assertEquals(sorted(vars.items()), [('a',1), ('b',2)])
+
 def test_main():
     test_suite = unittest.TestSuite()
     test_loader = unittest.TestLoader()
@@ -165,6 +182,7 @@
     suite_add(ExtraMathTests)
     suite_add(DatetimeTypeMappingTest)
     suite_add(IdTest)
+    suite_add(FrameTest)
     run_suite(test_suite)
 
 if __name__ == "__main__":

Deleted: trunk/jython/bugtests/test102.py
===================================================================
--- trunk/jython/bugtests/test102.py	2008-10-16 02:56:10 UTC (rev 5415)
+++ trunk/jython/bugtests/test102.py	2008-10-16 03:11:28 UTC (rev 5416)
@@ -1,23 +0,0 @@
-"""
-Check stack frame locals.
-"""
-
-import sys
-
-
-def vars():
-    tb = sys.exc_info()[2]
-    while tb.tb_next is not None:
-        tb = tb.tb_next
-    return tb.tb_frame.f_locals
-
-def h():
-    a = 1
-    b = 2
-    raise AttributeError("spam")
-
-try:
-    h()
-except:
-    assert(vars() == {'a':1, 'b':2 })
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5421
          http://jython.svn.sourceforge.net/jython/?rev=5421&view=rev
Author:   fwierzbicki
Date:     2008-10-16 12:07:24 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
Move essential part of test106 to test_jy_compile.py (bare return not permitted
in exec).

Modified Paths:
--------------
    trunk/jython/Lib/test/test_jy_compile.py

Removed Paths:
-------------
    trunk/jython/bugtests/test106.py

Modified: trunk/jython/Lib/test/test_jy_compile.py
===================================================================
--- trunk/jython/Lib/test/test_jy_compile.py	2008-10-16 06:38:43 UTC (rev 5420)
+++ trunk/jython/Lib/test/test_jy_compile.py	2008-10-16 12:07:24 UTC (rev 5421)
@@ -159,6 +159,7 @@
         ai("9+","eval")
         ai("lambda z:","eval")
         ai("a b","eval")
+        ai("return 2.3")
 
     def test_filename(self):
         self.assertEquals(compile_("a = 1\n", "abc").co_filename,

Deleted: trunk/jython/bugtests/test106.py
===================================================================
--- trunk/jython/bugtests/test106.py	2008-10-16 06:38:43 UTC (rev 5420)
+++ trunk/jython/bugtests/test106.py	2008-10-16 12:07:24 UTC (rev 5421)
@@ -1,18 +0,0 @@
-"""
-Check the return in exec is illegal.
-"""
-
-import support
-
-cmd = """print 'hi' 
-return 2.3 
-print 'fred'"""
-
-try:
-   co = compile(cmd, "<string>", "exec") 
-except SyntaxError, e:
-   pass
-else:
-   raise support.TestError("Should cause SyntaxError")
-
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5423
          http://jython.svn.sourceforge.net/jython/?rev=5423&view=rev
Author:   fwierzbicki
Date:     2008-10-16 12:42:06 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
move test107 to test_jy_internals.py

Modified Paths:
--------------
    trunk/jython/Lib/test/test_jy_internals.py

Removed Paths:
-------------
    trunk/jython/bugtests/test107.py

Modified: trunk/jython/Lib/test/test_jy_internals.py
===================================================================
--- trunk/jython/Lib/test/test_jy_internals.py	2008-10-16 12:15:26 UTC (rev 5422)
+++ trunk/jython/Lib/test/test_jy_internals.py	2008-10-16 12:42:06 UTC (rev 5423)
@@ -172,6 +172,60 @@
             vars = tb.tb_frame.f_locals
             self.assertEquals(sorted(vars.items()), [('a',1), ('b',2)])
 
+    def test_frame_info(self):
+        import sys
+        from types import ClassType
+
+        def getinfo():
+            """ Returns a tuple consisting of:
+                the name of the current module
+                the name of the current class or None
+                the name of the current function
+                the current line number
+            """
+            try:
+                1/0
+            except:
+                tb = sys.exc_info()[-1]
+                frame = tb.tb_frame.f_back
+                modulename = frame.f_globals['__name__']
+                funcname = frame.f_code.co_name
+                lineno = frame.f_lineno
+
+                if len(frame.f_code.co_varnames) == 0:
+                    classname = None
+                else:
+                    self = frame.f_locals[frame.f_code.co_varnames[0]]
+                    myclass = self.__class__
+                    if type(myclass) == ClassType:
+                       classname = myclass.__name__
+                    else:
+                        classname = None
+
+                return modulename, classname, funcname, lineno
+
+        def foo():
+            x = 99
+            g = getinfo()
+            assert (g[0] == "__main__" or g[0] == "test.test_jy_internals")
+            self.assertEquals(g[1], None)
+            self.assertEquals(g[2], "foo")
+        
+        class Bar:
+            def baz(self):
+                g = getinfo()
+                assert (g[0] == "__main__" or g[0] == "test.test_jy_internals")
+                assert (g[1] == "Bar")
+                assert (g[2] == "baz")
+        
+        g = getinfo()
+        assert (g[0] == "__main__" or g[0] == "test.test_jy_internals")
+        self.assertEquals(g[1], None)
+        self.assertEquals(g[2], "test_frame_info")
+
+        foo()
+        Bar().baz()
+
 def test_main():
     test_suite = unittest.TestSuite()
     test_loader = unittest.TestLoader()

Deleted: trunk/jython/bugtests/test107.py
===================================================================
--- trunk/jython/bugtests/test107.py	2008-10-16 12:15:26 UTC (rev 5422)
+++ trunk/jython/bugtests/test107.py	2008-10-16 12:42:06 UTC (rev 5423)
@@ -1,55 +0,0 @@
-"""
-Check some internal frame info
-"""
-import sys
-from types import ClassType
-
-def getinfo():
-    """ Returns a tuple consisting of:
-        the name of the current module
-        the name of the current class or None
-        the name of the current function
-        the current line number
-    """
-    try:
-        1/0
-    except:
-        tb = sys.exc_info()[-1]
-        frame = tb.tb_frame.f_back
-        modulename = frame.f_globals['__name__']
-        funcname = frame.f_code.co_name
-        lineno = frame.f_lineno
-
-        if len(frame.f_code.co_varnames) == 0:
-            classname = None
-        else:
-            self = frame.f_locals[frame.f_code.co_varnames[0]]
-            myclass = self.__class__
-            if type(myclass) == ClassType:
-               classname = myclass.__name__
-            else:
-                classname = None
-
-        return modulename, classname, funcname, lineno
-
-def foo():
-    x = 99
-    g = getinfo()
-    assert (g[0] == "__main__" or g[0] == "test107")
-    assert (g[1] == None)
-    assert (g[2] == "foo")
-        
-class Bar:
-    def baz(self):
-        g = getinfo()
-        assert (g[0] == "__main__" or g[0] == "test107")
-        assert (g[1] == "Bar")
-        assert (g[2] == "baz")
-        
-g = getinfo()
-assert (g[0] == "__main__" or g[0] == "test107")
-assert (g[1] == None)
-assert (g[2] == "<module>")
-
-foo()
-Bar().baz()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5424
          http://jython.svn.sourceforge.net/jython/?rev=5424&view=rev
Author:   fwierzbicki
Date:     2008-10-16 14:26:23 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
Moved test108 to test_dict_jy

Modified Paths:
--------------
    trunk/jython/Lib/test/test_dict_jy.py

Removed Paths:
-------------
    trunk/jython/bugtests/test108.py

Modified: trunk/jython/Lib/test/test_dict_jy.py
===================================================================
--- trunk/jython/Lib/test/test_dict_jy.py	2008-10-16 12:42:06 UTC (rev 5423)
+++ trunk/jython/Lib/test/test_dict_jy.py	2008-10-16 14:26:23 UTC (rev 5424)
@@ -23,6 +23,21 @@
         s[7] = 'called'
         self.assertEquals('called', s.createdInInit)
 
+    def testUnhashableKeys(self):
+        try:
+            a = {1:2}
+        except TypeError:
+            pass
+        else:
+            self.fail("list as dict key should raise TypeError")
+
+        try:
+            a = {{1:2}:3}
+        except TypeError:
+            pass
+        else:
+            self.fail("dict as dict key should raise TypeError")
+
 class DictCmpTest(unittest.TestCase):
     "Test for http://bugs.jython.org/issue1031"
     def testDictCmp(self):

Deleted: trunk/jython/bugtests/test108.py
===================================================================
--- trunk/jython/bugtests/test108.py	2008-10-16 12:42:06 UTC (rev 5423)
+++ trunk/jython/bugtests/test108.py	2008-10-16 14:26:23 UTC (rev 5424)
@@ -1,13 +0,0 @@
-"""
-Check for lists and dicts as key in a dict.
-"""
-
-import support
-
-try:
-    a = {[1]:2}
-    a = {{1:2}:3}
-except TypeError, e:
-    pass
-else:
-    raise support.TestError("Should fail, lists and dicts not allowed as key")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5432
          http://jython.svn.sourceforge.net/jython/?rev=5432&view=rev
Author:   fwierzbicki
Date:     2008-10-16 16:18:04 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
move test124 to test_jy_internals.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_jy_internals.py

Removed Paths:
-------------
    trunk/jython/bugtests/test124.py

Modified: trunk/jython/Lib/test/test_jy_internals.py
===================================================================
--- trunk/jython/Lib/test/test_jy_internals.py	2008-10-16 16:13:52 UTC (rev 5431)
+++ trunk/jython/Lib/test/test_jy_internals.py	2008-10-16 16:18:04 UTC (rev 5432)
@@ -226,6 +226,17 @@
         foo()
         Bar().baz()
 
+class ModuleTest(unittest.TestCase):
+    def test_create_module(self):
+        from org.python.core import PyModule, PyInstance
+        test = PyModule("test", {})
+        exec "a = 2" in test.__dict__
+        self.assertEquals(len(test.__dict__), 3)
+
+        #test = PyInstance.__tojava__(test, PyModule)
+        exec "b = 3" in test.__dict__
+        self.assertEquals(len(test.__dict__), 4)
+
 def test_main():
     test_suite = unittest.TestSuite()
     test_loader = unittest.TestLoader()
@@ -237,6 +248,7 @@
     suite_add(DatetimeTypeMappingTest)
     suite_add(IdTest)
     suite_add(FrameTest)
+    suite_add(ModuleTest)
     run_suite(test_suite)
 
 if __name__ == "__main__":

Deleted: trunk/jython/bugtests/test124.py
===================================================================
--- trunk/jython/bugtests/test124.py	2008-10-16 16:13:52 UTC (rev 5431)
+++ trunk/jython/bugtests/test124.py	2008-10-16 16:18:04 UTC (rev 5432)
@@ -1,14 +0,0 @@
-"""
-Create a new Module.
-"""
-
-import support
-
-from org.python.core import PyModule, PyInstance
-test = PyModule("test", {})
-exec "a = 2" in test.__dict__
-support.compare(len(test.__dict__), "3")
-
-#test = PyInstance.__tojava__(test, PyModule)
-exec "b = 3" in test.__dict__
-support.compare(len(test.__dict__), "4")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5438
          http://jython.svn.sourceforge.net/jython/?rev=5438&view=rev
Author:   fwierzbicki
Date:     2008-10-16 18:56:04 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
moved test130 to test_cmp_jy.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_cmp_jy.py

Removed Paths:
-------------
    trunk/jython/bugtests/test130.py

Modified: trunk/jython/Lib/test/test_cmp_jy.py
===================================================================
--- trunk/jython/Lib/test/test_cmp_jy.py	2008-10-16 17:51:59 UTC (rev 5437)
+++ trunk/jython/Lib/test/test_cmp_jy.py	2008-10-16 18:56:04 UTC (rev 5438)
@@ -21,8 +21,23 @@
         self.assertNotEqual(Test(0), 'foo')
         self.assertTrue('foo' in [Test(12), 'foo'])
 
+class IntStrCmp(unittest.TestCase):
+    def testIntStrCompares(self):
+        assert not (-1 > 'a')
+        assert (-1 < 'a')
+        assert not (4 > 'a')
+        assert (4 < 'a')
+        assert not (-2 > 'a')
+        assert (-2 < 'a')
+        assert not (-1 == 'a')
+
+
 def test_main():
-    test_support.run_unittest(UnicodeDerivedCmp, LongDerivedCmp)
+    test_support.run_unittest(
+            UnicodeDerivedCmp,
+            LongDerivedCmp,
+            IntStrCmp,
+            )
 
 if __name__ == '__main__':
     test_main()

Deleted: trunk/jython/bugtests/test130.py
===================================================================
--- trunk/jython/bugtests/test130.py	2008-10-16 17:51:59 UTC (rev 5437)
+++ trunk/jython/bugtests/test130.py	2008-10-16 18:56:04 UTC (rev 5438)
@@ -1,22 +0,0 @@
-"""
-Comparing ints and strings
-"""
-
-import support
-
-if -1 > 'a':
-    raise support.TestError("-1 > 'a'")
-if not -1 < 'a':
-    raise support.TestError("-1 < 'a'")
-if 4 > 'a':
-    raise support.TestError("4 > 'a'")
-if not 4 < 'a':
-    raise support.TestError("4 < 'a'")
-if -2 > 'a':
-    raise support.TestError("-2 > 'a'")
-if not -2 < 'a':
-    raise support.TestError("-2 < 'a'")
-if -1 == 'a':
-    raise support.TestError("-1 == 'a'")
-
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5440
          http://jython.svn.sourceforge.net/jython/?rev=5440&view=rev
Author:   fwierzbicki
Date:     2008-10-16 20:19:50 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
moved test131 into test_java_integration

Modified Paths:
--------------
    trunk/jython/Lib/test/test_java_integration.py

Removed Paths:
-------------
    trunk/jython/bugtests/test131.py

Modified: trunk/jython/Lib/test/test_java_integration.py
===================================================================
--- trunk/jython/Lib/test/test_java_integration.py	2008-10-16 18:58:39 UTC (rev 5439)
+++ trunk/jython/Lib/test/test_java_integration.py	2008-10-16 20:19:50 UTC (rev 5440)
@@ -7,8 +7,8 @@
 from java.awt import (Dimension, Component, Rectangle, Button, Color,
                       HeadlessException)
 from java.util import Vector, Hashtable
-from java.io import (FileOutputStream, FileWriter, OutputStreamWriter,
-                     UnsupportedEncodingException)
+from java.io import FileOutputStream, FileWriter, OutputStreamWriter
+                     
 from java.lang import Runnable, Thread, ThreadGroup, System, Runtime, Math, Byte
 from javax.swing.tree import TreePath
 from java.math import BigDecimal
@@ -149,12 +149,22 @@
 
     def test_io_errors(self):
         "Check that IOException isn't mangled into an IOError"
+        from java.io import UnsupportedEncodingException
         try:
-           x = OutputStreamWriter(System.out, "garbage")
+            x = OutputStreamWriter(System.out, "garbage")
         except UnsupportedEncodingException:
-           pass
+            pass
         else:
-           raise self.fail("Should have raised java.io.UnsupportedEncodingException")
+            self.fail("Should have raised java.io.UnsupportedEncodingException")
+    
+    def test_fileio_error(self):
+        from java.io import FileInputStream, IOException
+        try:
+            stream = FileInputStream("garbage")
+        except IOException:
+            pass
+        else:
+            self.fail("Should raise java.io.IOException")
 
 class VectorTest(unittest.TestCase):
 

Deleted: trunk/jython/bugtests/test131.py
===================================================================
--- trunk/jython/bugtests/test131.py	2008-10-16 18:58:39 UTC (rev 5439)
+++ trunk/jython/bugtests/test131.py	2008-10-16 20:19:50 UTC (rev 5440)
@@ -1,14 +0,0 @@
-"""
-"""
-
-import java 
-import support
-
-try:
-  stream = java.io.FileInputStream("missing")
-except java.io.IOException, ioexc:
-  #support.compare(ioexc.message, "cannot find")
-  # this message is not portable across underlying operating systems
-  pass
-else:
-  raise support.TestError("Should raise a IOException")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5443
          http://jython.svn.sourceforge.net/jython/?rev=5443&view=rev
Author:   fwierzbicki
Date:     2008-10-16 20:32:40 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
moved test136 to test_java_integration.py

Modified Paths:
--------------
    trunk/jython/Lib/test/test_java_integration.py

Removed Paths:
-------------
    trunk/jython/bugtests/test136.py

Modified: trunk/jython/Lib/test/test_java_integration.py
===================================================================
--- trunk/jython/Lib/test/test_java_integration.py	2008-10-16 20:24:04 UTC (rev 5442)
+++ trunk/jython/Lib/test/test_java_integration.py	2008-10-16 20:32:40 UTC (rev 5443)
@@ -397,6 +397,17 @@
 
         self.assertEquals(s, "Foo!!!", "toString not overridden in interface")
 
+class JavaStringTest(unittest.TestCase):
+    
+    def test_override(self):
+        from java import lang
+        x = lang.String('test')
+        try:
+            list(x)
+        except TypeError:
+            pass
+        else:
+            self.fail("Should have raised TypeError")
 
 def test_main():
     test_support.run_unittest(AbstractOnSyspathTest,
@@ -416,7 +427,9 @@
                               TreePathTest,
                               BigDecimalTest,
                               MethodInvTest,
-                              InterfaceTest)
+                              InterfaceTest,
+                              JavaStringTest,
+                              )
 
 if __name__ == "__main__":
     test_main()

Deleted: trunk/jython/bugtests/test136.py
===================================================================
--- trunk/jython/bugtests/test136.py	2008-10-16 20:24:04 UTC (rev 5442)
+++ trunk/jython/bugtests/test136.py	2008-10-16 20:32:40 UTC (rev 5443)
@@ -1,19 +0,0 @@
-"""
-
-"""
-
-import support
-
-import java 
-
-x = java.lang.String('test')
-
-try:
-    list(x)
-except AttributeError, e:
-    support.compare(e, "__len__")
-except TypeError, e:
-    # Changed to a TypeError in 2.2
-    support.compare(e, "iteration over non-sequence")
-else:
-    raise support.TestError("Should raise a AttributeError on __len__")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5465
          http://jython.svn.sourceforge.net/jython/?rev=5465&view=rev
Author:   cgroves
Date:     2008-10-19 05:14:22 +0000 (Sun, 19 Oct 2008)

Log Message:
-----------
Rename PyBuiltinFunction to PyBuiltinCallable, and remake PyBuiltinFunction as
a base for functions with the basic function stuff from PyBuiltinFunctionSet.
Extend that with PyBuiltinFunctionNarrow for functions with a fixed set of args
to match PyBuiltinMethodNarrow.  Use the new function stuff to implement the
builtin functions that were using ExtendedBuiltinFunction as real functions
instead of PyObjects.

Modified Paths:
--------------
    trunk/jython/src/org/python/core/ArgParser.java
    trunk/jython/src/org/python/core/Py.java
    trunk/jython/src/org/python/core/PyBuiltinFunction.java
    trunk/jython/src/org/python/core/PyBuiltinFunctionSet.java
    trunk/jython/src/org/python/core/PyBuiltinMethod.java
    trunk/jython/src/org/python/core/PyBuiltinMethodNarrow.java
    trunk/jython/src/org/python/core/PyBuiltinMethodSet.java
    trunk/jython/src/org/python/core/PyClassMethodDescr.java
    trunk/jython/src/org/python/core/PyDictionary.java
    trunk/jython/src/org/python/core/PyEnumerate.java
    trunk/jython/src/org/python/core/PyInstance.java
    trunk/jython/src/org/python/core/PyMethodDescr.java
    trunk/jython/src/org/python/core/PyNewWrapper.java
    trunk/jython/src/org/python/core/PyObject.java
    trunk/jython/src/org/python/core/PySet.java
    trunk/jython/src/org/python/core/PyStringMap.java
    trunk/jython/src/org/python/core/PySuper.java
    trunk/jython/src/org/python/core/PyType.java
    trunk/jython/src/org/python/core/__builtin__.java
    trunk/jython/src/org/python/core/exceptions.java
    trunk/jython/src/org/python/expose/generate/PyTypes.java
    trunk/jython/src/org/python/modules/_collections/PyDeque.java
    trunk/jython/src/org/python/modules/_jython.java
    trunk/jython/src/org/python/modules/_weakref/ReferenceType.java
    trunk/jython/src/org/python/modules/cPickle.java
    trunk/jython/tests/java/org/python/expose/generate/ExposedTypeProcessorTest.java
    trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java

Added Paths:
-----------
    trunk/jython/src/org/python/core/PyBuiltinCallable.java
    trunk/jython/src/org/python/core/PyBuiltinFunctionNarrow.java

Modified: trunk/jython/src/org/python/core/ArgParser.java
===================================================================
--- trunk/jython/src/org/python/core/ArgParser.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/ArgParser.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -112,9 +112,9 @@
         this(funcname, args, kws);
         this.params = paramnames;
         check();
-        if (!PyBuiltinFunction.DefaultInfo.check(args.length, minargs,
+        if (!PyBuiltinCallable.DefaultInfo.check(args.length, minargs,
                 this.params.length)) {
-            throw PyBuiltinFunction.DefaultInfo.unexpectedCall(args.length,
+            throw PyBuiltinCallable.DefaultInfo.unexpectedCall(args.length,
                     false, funcname, minargs, this.params.length);
         }
     }

Modified: trunk/jython/src/org/python/core/Py.java
===================================================================
--- trunk/jython/src/org/python/core/Py.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/Py.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -86,7 +86,7 @@
     static {
         BOOTSTRAP_TYPES.add(PyObject.class);
         BOOTSTRAP_TYPES.add(PyType.class);
-        BOOTSTRAP_TYPES.add(PyBuiltinFunction.class);
+        BOOTSTRAP_TYPES.add(PyBuiltinCallable.class);
         BOOTSTRAP_TYPES.add(PyDataDescr.class);
     }
 

Added: trunk/jython/src/org/python/core/PyBuiltinCallable.java
===================================================================
--- trunk/jython/src/org/python/core/PyBuiltinCallable.java	                        (rev 0)
+++ trunk/jython/src/org/python/core/PyBuiltinCallable.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -0,0 +1,144 @@
+package org.python.core;
+
+import org.python.expose.ExposedGet;
+import org.python.expose.ExposedType;
+
+// XXX: not subclassable
+@ExposedType(name = "builtin_function_or_method")
+public abstract class PyBuiltinCallable extends PyObject {
+
+    protected Info info;
+
+    protected PyBuiltinCallable(PyType type, Info info) {
+        super(type);
+        this.info = info;
+    }
+
+    protected PyBuiltinCallable(Info info) {
+        this.info = info;
+    }
+
+    /**
+     * @return a new instance of this type of PyBuiltinFunction bound to self
+     */
+    abstract public PyBuiltinCallable bind(PyObject self);
+
+    @ExposedGet(name = "__name__")
+    public PyObject fastGetName() {
+        return Py.newString(this.info.getName());
+    }
+
+    @ExposedGet(name = "__doc__")
+    public PyObject fastGetDoc() {
+        return Py.None;
+    }
+
+    @ExposedGet(name = "__module__")
+    public PyObject getModule() {
+        return Py.None;
+    }
+
+    @ExposedGet(name = "__call__")
+    public PyObject makeCall() {
+        return this;
+    }
+
+    @ExposedGet(name = "__self__")
+    public PyObject getSelf() {
+        return Py.None;
+    }
+
+    public void setInfo(Info info) {
+        this.info = info;
+    }
+
+    public String toString() {
+        PyObject self = getSelf();
+        if (self == null) {
+            return String.format("<built-in function %s>", info.getName());
+        } else {
+            return String.format("<built-in method %s of %s object at %s>", info.getName(),
+                                 self.getType().fastGetName(), Py.idstr(self));
+        }
+    }
+
+    public interface Info {
+
+        String getName();
+
+        int getMaxargs();
+
+        int getMinargs();
+
+        PyException unexpectedCall(int nargs, boolean keywords);
+    }
+
+    public static class DefaultInfo implements Info {
+
+        public DefaultInfo(String name, int minargs, int maxargs) {
+            this.name = name;
+            this.minargs = minargs;
+            this.maxargs = maxargs;
+        }
+
+        public DefaultInfo(String name) {
+            this(name, -1, -1);
+        }
+
+        private String name;
+
+        private int maxargs, minargs;
+
+        public String getName() {
+            return name;
+        }
+
+        public int getMaxargs() {
+            return maxargs;
+        }
+
+        public int getMinargs() {
+            return minargs;
+        }
+
+        public static boolean check(int nargs, int minargs, int maxargs) {
+            if(nargs < minargs)
+                return false;
+            if(maxargs != -1 && nargs > maxargs)
+                return false;
+            return true;
+        }
+
+        public static PyException unexpectedCall(int nargs,
+                                                 boolean keywords,
+                                                 String name,
+                                                 int minargs,
+                                                 int maxargs) {
+            if(keywords)
+                return Py.TypeError(name + "() takes no keyword arguments");
+            String argsblurb;
+            if(minargs == maxargs) {
+                if(minargs == 0)
+                    argsblurb = "no arguments";
+                else if(minargs == 1)
+                    argsblurb = "exactly one argument";
+                else
+                    argsblurb = minargs + " arguments";
+            } else if(maxargs == -1) {
+                return Py.TypeError(name + "() requires at least " + minargs
+                        + " (" + nargs + " given)");
+            } else {
+                if(minargs <= 0)
+                    argsblurb = "at most " + maxargs + " arguments";
+                else
+                    argsblurb = minargs + "-" + maxargs + " arguments";
+            }
+            return Py.TypeError(name + "() takes " + argsblurb + " (" + nargs
+                    + " given)");
+        }
+
+        public PyException unexpectedCall(int nargs, boolean keywords) {
+            return unexpectedCall(nargs, keywords, name, minargs, maxargs);
+        }
+    }
+}

Modified: trunk/jython/src/org/python/core/PyBuiltinFunction.java
===================================================================
--- trunk/jython/src/org/python/core/PyBuiltinFunction.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PyBuiltinFunction.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -1,144 +1,41 @@
 package org.python.core;
 
-import org.python.expose.ExposedGet;
-import org.python.expose.ExposedType;
+import org.python.expose.ExposeAsSuperclass;
 
-// XXX: not subclassable
-@... = "builtin_function_or_method")
-public abstract class PyBuiltinFunction extends PyObject {
+public class PyBuiltinFunction extends PyBuiltinCallable implements ExposeAsSuperclass {
 
-    protected Info info;
+    private PyString doc;
 
-    protected PyBuiltinFunction(PyType type, Info info) {
-        super(type);
-        this.info = info;
+    protected PyBuiltinFunction(String name, String doc) {
+        this(name, -1, -1, doc);
     }
 
-    protected PyBuiltinFunction(Info info) {
-        this.info = info;
+    protected PyBuiltinFunction(String name, int minargs, int maxargs, String doc) {
+        super(new DefaultInfo(name, minargs, maxargs));
+        this.doc = doc == null ? null : Py.newString(doc);
     }
 
-    /**
-     * @return a new instance of this type of PyBuiltinFunction bound to self
-     */
-    abstract public PyBuiltinFunction bind(PyObject self);
-
-    @ExposedGet(name = "__name__")
-    public PyObject fastGetName() {
-        return Py.newString(this.info.getName());
-    }
-
-    @ExposedGet(name = "__doc__")
     public PyObject fastGetDoc() {
-        return Py.None;
+        return doc;
     }
 
-    @ExposedGet(name = "__module__")
-    public PyObject getModule() {
-        return Py.None;
+    public boolean isMappingType() {
+        return false;
     }
 
-    @ExposedGet(name = "__call__")
-    public PyObject makeCall() {
-        return this;
+    public boolean isNumberType() {
+        return false;
     }
 
-    @ExposedGet(name = "__self__")
-    public PyObject getSelf() {
-        return Py.None;
+    public boolean isSequenceType() {
+        return false;
     }
 
-    public void setInfo(Info info) {
-        this.info = info;
+    public PyBuiltinCallable bind(PyObject self) {
+        throw Py.TypeError("Can't bind a builtin function");
     }
 
     public String toString() {
-        PyObject self = getSelf();
-        if (self == null) {
-            return String.format("<built-in function %s>", info.getName());
-        } else {
-            return String.format("<built-in method %s of %s object at %s>", info.getName(),
-                                 self.getType().fastGetName(), Py.idstr(self));
-        }
+        return "<built-in function " + info.getName() + ">";
     }
-
-    public interface Info {
-
-        String getName();
-
-        int getMaxargs();
-
-        int getMinargs();
-
-        PyException unexpectedCall(int nargs, boolean keywords);
-    }
-
-    public static class DefaultInfo implements Info {
-
-        public DefaultInfo(String name, int minargs, int maxargs) {
-            this.name = name;
-            this.minargs = minargs;
-            this.maxargs = maxargs;
-        }
-        
-        public DefaultInfo(String name) {
-            this(name, -1, -1);
-        }
-
-        private String name;
-
-        private int maxargs, minargs;
-
-        public String getName() {
-            return name;
-        }
-
-        public int getMaxargs() {
-            return maxargs;
-        }
-
-        public int getMinargs() {
-            return minargs;
-        }
-
-        public static boolean check(int nargs, int minargs, int maxargs) {
-            if(nargs < minargs)
-                return false;
-            if(maxargs != -1 && nargs > maxargs)
-                return false;
-            return true;
-        }
-
-        public static PyException unexpectedCall(int nargs,
-                                                 boolean keywords,
-                                                 String name,
-                                                 int minargs,
-                                                 int maxargs) {
-            if(keywords)
-                return Py.TypeError(name + "() takes no keyword arguments");
-            String argsblurb;
-            if(minargs == maxargs) {
-                if(minargs == 0)
-                    argsblurb = "no arguments";
-                else if(minargs == 1)
-                    argsblurb = "exactly one argument";
-                else
-                    argsblurb = minargs + " arguments";
-            } else if(maxargs == -1) {
-                return Py.TypeError(name + "() requires at least " + minargs
-                        + " (" + nargs + " given)");
-            } else {
-                if(minargs <= 0)
-                    argsblurb = "at most " + maxargs + " arguments";
-                else
-                    argsblurb = minargs + "-" + maxargs + " arguments";
-            }
-            return Py.TypeError(name + "() takes " + argsblurb + " (" + nargs
-                    + " given)");
-        }
-
-        public PyException unexpectedCall(int nargs, boolean keywords) {
-            return unexpectedCall(nargs, keywords, name, minargs, maxargs);
-        }
-    }
 }

Added: trunk/jython/src/org/python/core/PyBuiltinFunctionNarrow.java
===================================================================
--- trunk/jython/src/org/python/core/PyBuiltinFunctionNarrow.java	                        (rev 0)
+++ trunk/jython/src/org/python/core/PyBuiltinFunctionNarrow.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -0,0 +1,58 @@
+package org.python.core;
+
+public class PyBuiltinFunctionNarrow extends PyBuiltinFunction {
+
+    protected PyBuiltinFunctionNarrow(String name, int minargs, int maxargs, String doc) {
+        super(name, minargs, maxargs, doc);
+    }
+
+    public PyObject fancyCall(PyObject[] args) {
+        throw info.unexpectedCall(args.length, false);
+    }
+
+    public PyObject __call__(PyObject[] args) {
+        int nargs = args.length;
+        switch(nargs){
+            case 0:
+                return __call__();
+            case 1:
+                return __call__(args[0]);
+            case 2:
+                return __call__(args[0], args[1]);
+            case 3:
+                return __call__(args[0], args[1], args[2]);
+            case 4:
+                return __call__(args[0], args[1], args[2], args[3]);
+            default:
+                return fancyCall(args);
+        }
+    }
+
+    public PyObject __call__(PyObject[] args, String[] kws) {
+        if (kws.length != 0) {
+            throw Py.TypeError(fastGetName() + "() takes no keyword arguments");
+        }
+        return __call__(args);
+    }
+
+
+    public PyObject __call__() {
+        throw info.unexpectedCall(0, false);
+    }
+
+    public PyObject __call__(PyObject arg1) {
+        throw info.unexpectedCall(1, false);
+    }
+
+    public PyObject __call__(PyObject arg1, PyObject arg2) {
+        throw info.unexpectedCall(2, false);
+    }
+
+    public PyObject __call__(PyObject arg1, PyObject arg2, PyObject arg3) {
+        throw info.unexpectedCall(3, false);
+    }
+
+    public PyObject __call__(PyObject arg1, PyObject arg2, PyObject arg3, PyObject arg4) {
+        throw info.unexpectedCall(4, false);
+    }
+}

Modified: trunk/jython/src/org/python/core/PyBuiltinFunctionSet.java
===================================================================
--- trunk/jython/src/org/python/core/PyBuiltinFunctionSet.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PyBuiltinFunctionSet.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -1,34 +1,30 @@
 // Copyright (c) Corporation for National Research Initiatives
 package org.python.core;
 
-import org.python.expose.ExposeAsSuperclass;
-
 /**
  * A helper class for faster implementations of commonly called methods.
  * <p>
  * Subclasses of PyBuiltinFunctionSet will implement some or all of the __call__
  * method with a switch on the index number.
- * 
+ *
  */
-public class PyBuiltinFunctionSet extends PyBuiltinFunction implements ExposeAsSuperclass {
+public class PyBuiltinFunctionSet extends PyBuiltinFunctionNarrow {
 
     // used as an index into a big switch statement in the various derived
     // class's __call__() methods.
-    protected int index;
+    protected final int index;
 
-    private PyObject doc = Py.None;
-    
     /**
      * Creates a PyBuiltinFunctionSet that expects 1 argument.
      */
     public PyBuiltinFunctionSet(String name, int index){
         this(name, index, 1);
     }
-    
+
     public PyBuiltinFunctionSet(String name, int index, int numargs){
         this(name, index, numargs, numargs);
     }
-    
+
     public PyBuiltinFunctionSet(String name, int index, int minargs, int maxargs){
         this(name, index, minargs, maxargs, null);
     }
@@ -39,87 +35,8 @@
                                 int minargs,
                                 int maxargs,
                                 String doc) {
-        super(new DefaultInfo(name, minargs, maxargs));
+        super(name, minargs, maxargs, doc);
         this.index = index;
-        if(doc != null) {
-            this.doc = Py.newString(doc);
-        }
     }
 
-    public PyObject fastGetDoc() {
-        return doc;
-    }
-
-    public boolean isMappingType() {
-        return false;
-    }
-
-    public boolean isNumberType() {
-        return false;
-    }
-
-    public boolean isSequenceType() {
-        return false;
-    }
-
-    public PyObject fancyCall(PyObject[] args) {
-        throw info.unexpectedCall(args.length, false);
-    }
-
-    public PyObject __call__(PyObject[] args) {
-        int nargs = args.length;
-        switch(nargs){
-            case 0:
-                return __call__();
-            case 1:
-                return __call__(args[0]);
-            case 2:
-                return __call__(args[0], args[1]);
-            case 3:
-                return __call__(args[0], args[1], args[2]);
-            case 4:
-                return __call__(args[0], args[1], args[2], args[3]);
-            default:
-                return fancyCall(args);
-        }
-    }
-
-    public PyObject __call__(PyObject[] args, String[] kws) {
-        if (kws.length != 0) {
-            throw Py.TypeError(fastGetName() + "() takes no keyword arguments");
-        }
-        return __call__(args);
-    }
-
-    public PyObject __call__() {
-        throw info.unexpectedCall(0, false);
-    }
-
-    public PyObject __call__(PyObject arg1) {
-        throw info.unexpectedCall(1, false);
-    }
-
-    public PyObject __call__(PyObject arg1, PyObject arg2) {
-        throw info.unexpectedCall(2, false);
-    }
-
-    public PyObject __call__(PyObject arg1, PyObject arg2, PyObject arg3) {
-        throw info.unexpectedCall(3, false);
-    }
-
-    public PyObject __call__(PyObject arg1,
-                             PyObject arg2,
-                             PyObject arg3,
-                             PyObject arg4) {
-        throw info.unexpectedCall(4, false);
-    }
-
-    public PyBuiltinFunction bind(PyObject self) {
-        throw Py.TypeError("Can't bind a builtin function");
-    }
-    
-    public String toString(){ 
-        return "<built-in function "+info.getName()+">";
-    }
-    
 }

Modified: trunk/jython/src/org/python/core/PyBuiltinMethod.java
===================================================================
--- trunk/jython/src/org/python/core/PyBuiltinMethod.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PyBuiltinMethod.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -2,7 +2,7 @@
 
 import org.python.expose.ExposeAsSuperclass;
 
-public abstract class PyBuiltinMethod extends PyBuiltinFunction implements ExposeAsSuperclass  {
+public abstract class PyBuiltinMethod extends PyBuiltinCallable implements ExposeAsSuperclass  {
 
     protected PyObject self;
 

Modified: trunk/jython/src/org/python/core/PyBuiltinMethodNarrow.java
===================================================================
--- trunk/jython/src/org/python/core/PyBuiltinMethodNarrow.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PyBuiltinMethodNarrow.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -1,7 +1,5 @@
 package org.python.core;
 
-import org.python.core.PyBuiltinFunction.DefaultInfo;
-
 public abstract class PyBuiltinMethodNarrow extends PyBuiltinMethod {
 
     protected PyBuiltinMethodNarrow(String name, int minArgs, int maxArgs) {

Modified: trunk/jython/src/org/python/core/PyBuiltinMethodSet.java
===================================================================
--- trunk/jython/src/org/python/core/PyBuiltinMethodSet.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PyBuiltinMethodSet.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -25,7 +25,7 @@
         return this;
     }
 
-    public PyBuiltinFunction bind(PyObject bindTo) {
+    public PyBuiltinCallable bind(PyObject bindTo) {
         if(__self__ == Py.None) {
             PyBuiltinMethodSet bindable;
             try {

Modified: trunk/jython/src/org/python/core/PyClassMethodDescr.java
===================================================================
--- trunk/jython/src/org/python/core/PyClassMethodDescr.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PyClassMethodDescr.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -8,7 +8,7 @@
 
     public static final PyType TYPE = PyType.fromClass(PyClassMethodDescr.class);
 
-    PyClassMethodDescr(PyType t, PyBuiltinFunction meth) {
+    PyClassMethodDescr(PyType t, PyBuiltinCallable meth) {
         super(t, meth);
     }
 

Modified: trunk/jython/src/org/python/core/PyDictionary.java
===================================================================
--- trunk/jython/src/org/python/core/PyDictionary.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PyDictionary.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -422,7 +422,7 @@
     private void updateCommon(PyObject[] args, String[] keywords, String methName) {
         int nargs = args.length - keywords.length;
         if (nargs > 1) {
-            throw PyBuiltinFunction.DefaultInfo.unexpectedCall(nargs, false, methName, 0, 1);
+            throw PyBuiltinCallable.DefaultInfo.unexpectedCall(nargs, false, methName, 0, 1);
         }
         if (nargs == 1) {
             PyObject arg = args[0];

Modified: trunk/jython/src/org/python/core/PyEnumerate.java
===================================================================
--- trunk/jython/src/org/python/core/PyEnumerate.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PyEnumerate.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -51,7 +51,7 @@
     public final static PyObject enumerate_new(PyNewWrapper new_, boolean init, PyType subtype,
                                                PyObject[] args, String[] keywords) {
         if (args.length != 1) {
-            throw PyBuiltinFunction.DefaultInfo.unexpectedCall(args.length, false, "enumerate", 0,
+            throw PyBuiltinCallable.DefaultInfo.unexpectedCall(args.length, false, "enumerate", 0,
                                                                1);
         }
         if (new_.for_type == subtype) {

Modified: trunk/jython/src/org/python/core/PyInstance.java
===================================================================
--- trunk/jython/src/org/python/core/PyInstance.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PyInstance.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -12,12 +12,12 @@
 {
     // xxx doc, final name
     public transient PyClass instclass;
-    
+
     // xxx
     public PyObject fastGetClass() {
         return instclass;
     }
-    
+
     //This field is only used by Python subclasses of Java classes
     Object javaProxy;
 
@@ -31,7 +31,7 @@
         throws java.io.IOException, ClassNotFoundException
     {
         in.defaultReadObject();
-        
+
         String module = in.readUTF();
         String name = in.readUTF();
 
@@ -153,9 +153,8 @@
             return javaProxy;
 
         if (instclass.__tojava__ != null) {
-            //try {
-            PyObject ret =
-                instclass.__tojava__.__call__(this, PyJavaClass.lookup(c));
+            // try {
+            PyObject ret = instclass.__tojava__.__call__(this, PyJavaClass.lookup(c));
 
             if (ret == Py.None)
                 return Py.NoConversion;
@@ -221,8 +220,8 @@
         PyObject[] result2 = instclass.lookupGivingClass(name, stopAtJava);
         if (result2[0] != null)
             // xxx do we need to use result2[1] (wherefound) for java cases for backw comp?
-            return result2[0].__get__(this, instclass); 
-            // xxx do we need to use 
+            return result2[0].__get__(this, instclass);
+            // xxx do we need to use
         return ifindfunction(name);
     }
 
@@ -429,7 +428,7 @@
                 smod = ((PyString)mod).toString() + '.';
             }
         }
-        return new PyString("<" + smod + instclass.__name__ + " instance at " + 
+        return new PyString("<" + smod + instclass.__name__ + " instance at " +
                             Py.idstr(this) + ">");
     }
 
@@ -483,8 +482,8 @@
         if (coerced != null) {
             v = coerced[0];
             w = coerced[1];
-            if (!(v instanceof PyInstance) && 
-                !(w instanceof PyInstance)) 
+            if (!(v instanceof PyInstance) &&
+                !(w instanceof PyInstance))
                 return v._cmp(w);
         } else {
             v = this;
@@ -497,8 +496,8 @@
                     int result = ((PyInteger)ret).getValue();
                     return result < 0 ? -1 : result > 0 ? 1 : 0;
                 }
-                throw Py.TypeError("__cmp__() must return int");                
-            }           
+                throw Py.TypeError("__cmp__() must return int");
+            }
         }
         if (w instanceof PyInstance) {
             ret = ((PyInstance)w).invoke_ex("__cmp__",v);
@@ -507,9 +506,9 @@
                     int result = ((PyInteger)ret).getValue();
                     return -(result < 0 ? -1 : result > 0 ? 1 : 0);
                 }
-                throw Py.TypeError("__cmp__() must return int");                
-            }           
-            
+                throw Py.TypeError("__cmp__() must return int");
+            }
+
         }
         return -2;
     }

Modified: trunk/jython/src/org/python/core/PyMethodDescr.java
===================================================================
--- trunk/jython/src/org/python/core/PyMethodDescr.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PyMethodDescr.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -5,13 +5,13 @@
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "method_descriptor", base = PyObject.class)
-public class PyMethodDescr extends PyDescriptor implements PyBuiltinFunction.Info {
+public class PyMethodDescr extends PyDescriptor implements PyBuiltinCallable.Info {
 
     protected int minargs, maxargs;
 
-    protected PyBuiltinFunction meth;
+    protected PyBuiltinCallable meth;
 
-    public PyMethodDescr(PyType t, PyBuiltinFunction func) {
+    public PyMethodDescr(PyType t, PyBuiltinCallable func) {
         name = func.info.getName();
         dtype = t;
         minargs = func.info.getMinargs();
@@ -50,7 +50,7 @@
     }
 
     public PyException unexpectedCall(int nargs, boolean keywords) {
-        return PyBuiltinFunction.DefaultInfo.unexpectedCall(nargs, keywords, name, minargs,
+        return PyBuiltinCallable.DefaultInfo.unexpectedCall(nargs, keywords, name, minargs,
                                                             maxargs);
     }
 

Modified: trunk/jython/src/org/python/core/PyNewWrapper.java
===================================================================
--- trunk/jython/src/org/python/core/PyNewWrapper.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PyNewWrapper.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -29,7 +29,7 @@
                                       PyObject[] args,
                                       String[] keywords);
     
-    public PyBuiltinFunction bind(PyObject self) {
+    public PyBuiltinCallable bind(PyObject self) {
         throw Py.SystemError("__new__ wrappers are already bound");
     }
     

Modified: trunk/jython/src/org/python/core/PyObject.java
===================================================================
--- trunk/jython/src/org/python/core/PyObject.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PyObject.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -332,8 +332,8 @@
         String name;
         if (this instanceof PyFunction) {
             name = ((PyFunction) this).__name__ + "() ";
-        } else if (this instanceof PyBuiltinFunction) {
-            name = ((PyBuiltinFunction)this).fastGetName().toString() + "() ";
+        } else if (this instanceof PyBuiltinCallable) {
+            name = ((PyBuiltinCallable)this).fastGetName().toString() + "() ";
         } else {
             name = getType().fastGetName() + " ";
         }

Modified: trunk/jython/src/org/python/core/PySet.java
===================================================================
--- trunk/jython/src/org/python/core/PySet.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PySet.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -30,7 +30,7 @@
     final void set___init__(PyObject[] args, String[] kwds) {
         int nargs = args.length - kwds.length;
         if (nargs > 1) {
-            throw PyBuiltinFunction.DefaultInfo.unexpectedCall(nargs, false, "Set", 0, 1);
+            throw PyBuiltinCallable.DefaultInfo.unexpectedCall(nargs, false, "Set", 0, 1);
         }
         if (nargs == 0) {
             return;

Modified: trunk/jython/src/org/python/core/PyStringMap.java
===================================================================
--- trunk/jython/src/org/python/core/PyStringMap.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PyStringMap.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -242,7 +242,7 @@
     public void update(PyObject[] args, String[] keywords) {
         int nargs = args.length - keywords.length;
         if (nargs > 1) {
-            throw PyBuiltinFunction.DefaultInfo.unexpectedCall(nargs, false, "update", 0, 1);
+            throw PyBuiltinCallable.DefaultInfo.unexpectedCall(nargs, false, "update", 0, 1);
         }
         if (nargs == 1) {
             PyObject arg = args[0];

Modified: trunk/jython/src/org/python/core/PySuper.java
===================================================================
--- trunk/jython/src/org/python/core/PySuper.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PySuper.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -34,8 +34,8 @@
     @ExposedMethod
     @ExposedNew
     public void super___init__(PyObject[] args, String[] keywords) {
-        if (keywords.length != 0 || !PyBuiltinFunction.DefaultInfo.check(args.length, 1, 2)) {
-            throw PyBuiltinFunction.DefaultInfo.unexpectedCall(args.length, keywords.length != 0,
+        if (keywords.length != 0 || !PyBuiltinCallable.DefaultInfo.check(args.length, 1, 2)) {
+            throw PyBuiltinCallable.DefaultInfo.unexpectedCall(args.length, keywords.length != 0,
                                                                "super", 1, 2);
         }
         if (!(args[0] instanceof PyType)) {

Modified: trunk/jython/src/org/python/core/PyType.java
===================================================================
--- trunk/jython/src/org/python/core/PyType.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/PyType.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -13,6 +13,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import org.python.core.util.StringUtil;
 import org.python.expose.ExposeAsSuperclass;
@@ -260,8 +261,7 @@
         newtype.has_delete = newtype.lookup("__delete__") != null;
         newtype.needs_finalizer = newtype.lookup("__del__") != null;
 
-        for (int i = 0; i < bases_list.length; i++) {
-            PyObject cur = bases_list[i];
+        for (PyObject cur : bases_list) {
             if (cur instanceof PyType)
                 ((PyType)cur).attachSubclass(newtype);
         }
@@ -338,10 +338,9 @@
             // BOOTSTRAP_TYPES will be filled in by addBuilder later
             return;
         }
-        HashMap<String, Object> propnames = new HashMap<String, Object>();
+        Map<String, Object> propnames = new HashMap<String, Object>();
         Method[] methods = c.getMethods();
-        for (int i = 0; i < methods.length; i++) {
-            Method meth = methods[i];
+        for (Method meth : methods) {
             Class declaring = meth.getDeclaringClass();
             if (declaring != base && base.isAssignableFrom(declaring) && !ignore(meth)) {
                 String methname = meth.getName();
@@ -369,8 +368,7 @@
                 }
             }
         }
-        for (int i = 0; i < methods.length; i++) {
-            Method meth = methods[i];
+        for (Method meth : methods) {
             String nmethname = normalize_name(meth.getName());
             PyReflectedFunction reflfunc = (PyReflectedFunction)dict.__finditem__(nmethname);
             if (reflfunc != null) {
@@ -378,8 +376,7 @@
             }
         }
         Field[] fields = c.getFields();
-        for (int i = 0; i < fields.length; i++) {
-            Field field = fields[i];
+        for (Field field : fields) {
             Class declaring = field.getDeclaringClass();
             if (declaring != base && base.isAssignableFrom(declaring)) {
                 String fldname = field.getName();
@@ -404,8 +401,7 @@
                 dict.__setitem__(normalize_name(fldname), new PyReflectedField(field));
             }
         }
-        for (Iterator iter = propnames.keySet().iterator(); iter.hasNext();) {
-            String propname = (String)iter.next();
+        for (String propname : propnames.keySet()) {
             String npropname = normalize_name(StringUtil.decapitalize(propname));
             PyObject prev = dict.__finditem__(npropname);
             if (prev != null && prev instanceof PyReflectedFunction) {
@@ -437,8 +433,8 @@
         Constructor[] ctrs = c.getConstructors();
         if (ctrs.length != 0) {
             final PyReflectedConstructor reflctr = new PyReflectedConstructor("_new_impl");
-            for (int i = 0; i < ctrs.length; i++) {
-                reflctr.addConstructor(ctrs[i]);
+            for (Constructor ctr : ctrs) {
+                reflctr.addConstructor(ctr);
             }
             PyObject new_ = new PyNewWrapper(c, "__new__", -1, -1) {
                 public PyObject new_impl(boolean init, PyType subtype, PyObject[] args,
@@ -557,14 +553,14 @@
             base = newBase;
             mro_internal();
             mro_subclasses(savedSubMros);
-            for (int i = 0; i < savedBases.length; i++) {
-                if (savedBases[i] instanceof PyType) {
-                    ((PyType)savedBases[i]).detachSubclass(this);
+            for (PyObject saved : savedBases) {
+                if (saved instanceof PyType) {
+                    ((PyType)saved).detachSubclass(this);
                 }
             }
-            for (int i = 0; i < newBases.length; i++) {
-                if (newBases[i] instanceof PyType) {
-                    ((PyType)newBases[i]).attachSubclass(this);
+            for (PyObject newb : newBases) {
+                if (newb instanceof PyType) {
+                    ((PyType)newb).attachSubclass(this);
                 }
             }
         } catch (PyException t) {
@@ -703,8 +699,8 @@
             acc.add(classic_cl);
         }
         PyObject[] bases = classic_cl.__bases__.getArray();
-        for (int i = 0; i < bases.length; i++) {
-            fill_classic_mro(acc,(PyClass)bases[i]);
+        for (PyObject base : bases) {
+            fill_classic_mro(acc,(PyClass)base);
         }
     }
 
@@ -850,24 +846,22 @@
         PyType winner = null;
         PyType candidate = null;
         PyType best = null;
-        for (int i = 0; i < bases.length; i++) {
-            PyObject base_proto = bases[i];
-            if (base_proto instanceof PyClass) {
+        for (PyObject base : bases) {
+            if (base instanceof PyClass) {
                 continue;
             }
-            if (!(base_proto instanceof PyType)) {
+            if (!(base instanceof PyType)) {
                 throw Py.TypeError("bases must be types");
             }
-            PyType base = (PyType)base_proto;
-            candidate = solid_base(base);
+            candidate = solid_base((PyType)base);
             if (winner == null) {
                 winner = candidate;
-                best = base;
+                best = (PyType)base;
             } else if (winner.isSubType(candidate)) {
                 ;
             } else if (candidate.isSubType(winner)) {
                 winner = candidate;
-                best = base;
+                best = (PyType)base;
             } else {
                 throw Py.TypeError("multiple bases have instance lay-out conflict");
             }
@@ -889,18 +883,17 @@
      */
     private static PyType findMostDerivedMetatype(PyObject[] bases_list, PyType initialMetatype) {
         PyType winner = initialMetatype;
-        for (int i = 0; i < bases_list.length; i++) {
-            PyObject bases_i = bases_list[i];
-            if (bases_i instanceof PyJavaClass) {
+        for (PyObject base : bases_list) {
+            if (base instanceof PyJavaClass) {
                 throw Py.TypeError("can't mix new-style and java classes");
             }
-            if (bases_i instanceof PyClass) {
-                if (((PyClass)bases_i).proxyClass != null) {
+            if (base instanceof PyClass) {
+                if (((PyClass)base).proxyClass != null) {
                     throw Py.TypeError("can't mix new-style and java classes");
                 }
                 continue;
             }
-            PyType curtype = bases_i.getType();
+            PyType curtype = base.getType();
             if (winner.isSubType(curtype)) {
                 continue;
             }
@@ -962,8 +955,8 @@
         if (mro == null) {
             return null;
         }
-        for (int i = 0; i < mro.length; i++) {
-            PyObject dict = mro[i].fastGetDict();
+        for (PyObject element : mro) {
+            PyObject dict = element.fastGetDict();
             if (dict != null) {
                 PyObject obj = dict.__finditem__(name);
                 if (obj != null)
@@ -978,8 +971,7 @@
         if (mro == null) {
             return null;
         }
-        for (int i = 0; i < mro.length; i++) {
-            PyObject t = mro[i];
+        for (PyObject t : mro) {
             PyObject dict = t.fastGetDict();
             if (dict != null) {
                 PyObject obj = dict.__finditem__(name);
@@ -1047,8 +1039,8 @@
 
     private static boolean ignore(Method meth) {
         Class[] exceptions = meth.getExceptionTypes();
-        for (int j = 0; j < exceptions.length; j++) {
-            if (exceptions[j] == PyIgnoreMethodTag.class) {
+        for (Class exception : exceptions) {
+            if (exception == PyIgnoreMethodTag.class) {
                 return true;
             }
         }
@@ -1261,8 +1253,8 @@
         if (mro == null) {
             return;
         }
-        for (int i = 0; i < mro.length; i++) {
-            mro[i].addKeys(accum, "__dict__");
+        for (PyObject element : mro) {
+            element.addKeys(accum, "__dict__");
         }
     }
 

Modified: trunk/jython/src/org/python/core/__builtin__.java
===================================================================
--- trunk/jython/src/org/python/core/__builtin__.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/__builtin__.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -1,15 +1,11 @@
 // Copyright (c) Corporation for National Research Initiatives
 package org.python.core;
 
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Map;
 
 import org.python.antlr.ast.modType;
 import org.python.core.util.RelativeFile;
-import org.python.expose.ExposedGet;
-import org.python.expose.ExposedNew;
-import org.python.expose.ExposedType;
 
 class BuiltinFunctions extends PyBuiltinFunctionSet {
 
@@ -236,7 +232,7 @@
 
     /**
      * @param intern - should the resulting string be interned
-     * @return arg as a String, or throws TypeError with message if asString throws a ConversionException.  
+     * @return arg as a String, or throws TypeError with message if asString throws a ConversionException.
      */
     private String asString(PyObject arg, String message, boolean intern) {
 
@@ -280,7 +276,7 @@
                 }
 
                 if (args[0] instanceof PyUnicode) {
-                    flags += PyTableCode.PyCF_SOURCE_IS_UTF8;   
+                    flags += PyTableCode.PyCF_SOURCE_IS_UTF8;
                 }
                 return __builtin__.compile(args[0].toString(), args[1].toString(), args[2].toString(), flags, dont_inherit);
             case 29:
@@ -373,23 +369,23 @@
         dict.__setitem__("iter", new BuiltinFunctions("iter", 27, 1, 2));
         dict.__setitem__("locals", new BuiltinFunctions("locals", 28, 0));
         dict.__setitem__("map", new BuiltinFunctions("map", 29, 2, -1));
-        dict.__setitem__("max", MaxFunction.INSTANCE);
-        dict.__setitem__("min", MinFunction.INSTANCE);
+        dict.__setitem__("max", new MaxFunction());
+        dict.__setitem__("min", new MinFunction());
         dict.__setitem__("oct", new BuiltinFunctions("oct", 32, 1));
         dict.__setitem__("pow", new BuiltinFunctions("pow", 33, 2, 3));
         dict.__setitem__("raw_input", new BuiltinFunctions("raw_input", 34, 0, 1));
         dict.__setitem__("reduce", new BuiltinFunctions("reduce", 35, 2, 3));
         dict.__setitem__("reload", new BuiltinFunctions("reload", 36, 1));
         dict.__setitem__("repr", new BuiltinFunctions("repr", 37, 1));
-        dict.__setitem__("round", RoundFunction.INSTANCE);
+        dict.__setitem__("round", new RoundFunction());
         dict.__setitem__("setattr", new BuiltinFunctions("setattr", 39, 3));
         dict.__setitem__("vars", new BuiltinFunctions("vars", 41, 0, 1));
         dict.__setitem__("zip", new BuiltinFunctions("zip", 43, 0, -1));
         dict.__setitem__("reversed", new BuiltinFunctions("reversed", 45, 1));
-        dict.__setitem__("__import__", ImportFunction.INSTANCE);
-        dict.__setitem__("sorted", SortedFunction.INSTANCE);
-        dict.__setitem__("all", AllFunction.INSTANCE);
-        dict.__setitem__("any", AnyFunction.INSTANCE);        
+        dict.__setitem__("__import__", new ImportFunction());
+        dict.__setitem__("sorted", new SortedFunction());
+        dict.__setitem__("all", new AllFunction());
+        dict.__setitem__("any", new AnyFunction());
     }
 
     public static PyObject abs(PyObject o) {
@@ -399,7 +395,7 @@
     public static PyObject apply(PyObject o) {
 	return o.__call__();
     }
-    
+
     public static PyObject apply(PyObject o, PyObject args) {
         return o.__call__(Py.make_array(args));
     }
@@ -465,7 +461,7 @@
     public static PyObject compile(modType node, String filename, String kind) {
         return Py.compile_flags(node, filename, kind, Py.getCompilerFlags());
     }
-            
+
     public static PyObject compile(String data, String filename, String kind, int flags, boolean dont_inherit) {
         if ((flags & ~PyTableCode.CO_ALL_FEATURES) != 0) {
             throw Py.ValueError("compile(): unrecognised flags");
@@ -518,16 +514,16 @@
                (o.__findattr__("__getitem__") != null &&
                 (!rw || o.__findattr__("__setitem__") != null));
     }
-    
+
     private static void verify_mappings(PyObject globals, PyObject locals, boolean rw) {
         if (!PyMapping_check(globals, rw)) {
             throw Py.TypeError("globals must be a mapping");
-        } 
+        }
         if (!PyMapping_check(locals, rw)) {
             throw Py.TypeError("locals must be a mapping");
         }
     }
-    
+
     public static PyObject eval(PyObject o, PyObject globals, PyObject locals) {
         verify_mappings(globals, locals, false);
         PyCode code;
@@ -900,7 +896,7 @@
         throw Py.TypeError("ord() expected a character, but string of length " +
                 length + " found");
     }
-    
+
     public static PyObject pow(PyObject x, PyObject y) {
         return x._pow(y);
     }
@@ -1037,7 +1033,7 @@
             return (PyString) ret;
         }
     }
-    
+
     public static String raw_input(PyObject prompt, PyObject file) {
         PyObject stdout = Py.getSystemState().stdout;
         if (stdout instanceof PyAttributeDeleted) {
@@ -1157,7 +1153,7 @@
     public static PyObject zip() {
         return new PyList();
     }
-    
+
     public static PyObject zip(PyObject[] argstar) {
         int itemsize = argstar.length;
 
@@ -1233,81 +1229,40 @@
     }
 }
 
-// simulates a PyBuiltinFunction for functions not using the PyBuiltinFunctionSet approach of above
-abstract class ExtendedBuiltinFunction extends PyObject {
-    public static final PyType TYPE = PyType.fromClass(PyBuiltinFunction.class);
-    @ExposedGet(name = "__class__")
-    @Override
-    public PyType getType() {
-        return TYPE;
+class ImportFunction extends PyBuiltinFunction {
+    ImportFunction() {
+        super("__import__",
+              "__import__(name, globals={}, locals={}, fromlist=[], level=-1) -> module\n\n" +
+              "Import a module.  The globals are only used to determine the context;\n" +
+              "they are not modified.  The locals are currently unused.  The fromlist\n" +
+              "should be a list of names to emulate ``from name import ...'', or an\n" +
+              "empty list to emulate ``import name''.\n" +
+              "When importing a module from a package, note that __import__('A.B', ...)\n" +
+              "returns package A when fromlist is empty, but its submodule B when\n" +
+              "fromlist is not empty.  Level is used to determine whether to perform \n" +
+              "absolute or relative imports.  -1 is the original strategy of attempting\n" +
+              "both absolute and relative imports, 0 is absolute, a positive number\n" +
+              "is the number of parent directories to search relative to the current module.");
     }
-}
 
-class ImportFunction extends ExtendedBuiltinFunction {
-    static final ImportFunction INSTANCE = new ImportFunction();
-
-    private ImportFunction() {}
-    
-    @ExposedNew
-    public static PyObject __new__(PyObject[] args, String[] keyword) {
-        return INSTANCE;
-    }   
-    
-    @ExposedGet(name = "__doc__")
-    public PyObject getDoc() {
-        return new PyString("__import__(name, globals={}, locals={}, fromlist=[], level=-1) -> module\n\n" +
-                "Import a module.  The globals are only used to determine the context;\n" +
-                "they are not modified.  The locals are currently unused.  The fromlist\n" +
-                "should be a list of names to emulate ``from name import ...'', or an\n" +
-                "empty list to emulate ``import name''.\n" +
-                "When importing a module from a package, note that __import__('A.B', ...)\n" + 
-                "returns package A when fromlist is empty, but its submodule B when\n" +
-                "fromlist is not empty.  Level is used to determine whether to perform \n" +
-                "absolute or relative imports.  -1 is the original strategy of attempting\n" +
-                "both absolute and relative imports, 0 is absolute, a positive number\n" +
-                "is the number of parent directories to search relative to the current module.");
-    }
-
     public PyObject __call__(PyObject args[], String keywords[]) {
-        ArgParser ap = new ArgParser("__import__", args, keywords, new String[]{"name", "globals", "locals", "fromlist", "level"}, 1);
-
+        ArgParser ap = new ArgParser("__import__", args, keywords,
+                                     new String[]{"name", "globals", "locals", "fromlist", "level"},
+                                     1);
         String module = ap.getString(0);
         PyObject globals = ap.getPyObject(1, null);
         PyObject fromlist = ap.getPyObject(3, Py.EmptyTuple);
         int level = ap.getInt(4, imp.DEFAULT_LEVEL);
-
-        return load(module, globals, fromlist, level);
+        return imp.importName(module.intern(), fromlist.__len__() == 0, globals, fromlist, level);
     }
+}
 
-    private PyObject load(String module, PyObject globals, PyObject fromlist, int level) {
-        PyObject mod = imp.importName(module.intern(), fromlist.__len__() == 0, globals, fromlist, level);
-        return mod;
+class SortedFunction extends PyBuiltinFunction {
+    SortedFunction() {
+        super("sorted", "sorted(iterable, cmp=None, key=None, reverse=False) --> new sorted list");
     }
 
-    public String toString() {
-        return "<built-in function __import__>";
-    }
-    
-    
-}
-
-class SortedFunction extends ExtendedBuiltinFunction {
-    static final SortedFunction INSTANCE = new SortedFunction();
-
-    private SortedFunction() {}
-    
-    @ExposedNew
-    public static PyObject __new__(PyObject[] args, String[] keyword) {
-        return INSTANCE;
-    }   
-    
-    @ExposedGet(name = "__doc__")
     @Override
-    public PyObject getDoc() {
-        return new PyString("sorted(iterable, cmp=None, key=None, reverse=False) --> new sorted list");
-    }
-    
-    @Override
     public PyObject __call__(PyObject args[], String kwds[]) {
         if (args.length == 0) {
             throw Py.TypeError(" sorted() takes at least 1 argument (0 given)");
@@ -1333,37 +1288,20 @@
         seq.sort(cmp, key, reverse);
         return seq;
     }
-
-    @Override
-    public String toString() {
-        return "<built-in function sorted>";
-    }
 }
 
-class AllFunction extends ExtendedBuiltinFunction {
-    static final AllFunction INSTANCE = new AllFunction();
-
-    private AllFunction() {}
-    
-    @ExposedNew
-    public static PyObject __new__(PyObject[] args, String[] keyword) {
-        return INSTANCE;
-    }   
-    
-    @ExposedGet(name = "__doc__")
-    @Override
-    public PyObject getDoc() {
-        return new PyString("all(iterable) -> bool\n\nReturn True if bool(x) is True for all values x in the iterable.");
+class AllFunction extends PyBuiltinFunctionNarrow {
+    AllFunction() {
+        super("all", 1, 1,
+              "all(iterable) -> bool\n\n" +
+              "Return True if bool(x) is True for all values x in the iterable.");
     }
 
     @Override
-    public PyObject __call__(PyObject args[], String kwds[]) {
-        if (args.length !=1) {
-            throw Py.TypeError(" all() takes exactly one argument (" + args.length + " given)");
-        }
-        PyObject iter = args[0].__iter__();
+    public PyObject __call__(PyObject arg) {
+        PyObject iter = arg.__iter__();
         if (iter == null) {
-            throw Py.TypeError("'" + args[0].getType().fastGetName() + "' object is not iterable");
+            throw Py.TypeError("'" + arg.getType().fastGetName() + "' object is not iterable");
         }
         for (PyObject item : iter.asIterable()) {
             if (!item.__nonzero__()) {
@@ -1372,78 +1310,44 @@
         }
         return Py.True;
     }
-    
-    @Override
-    public String toString() {
-        return "<built-in function all>";
-    }
 }
 
-class AnyFunction extends ExtendedBuiltinFunction {
-    static final AnyFunction INSTANCE = new AnyFunction();
-
-    private AnyFunction() {}
-    
-    @ExposedNew
-    public static PyObject __new__(PyObject[] args, String[] keyword) {
-        return INSTANCE;
-    }   
-    
-    @ExposedGet(name = "__doc__")
-    @Override
-    public PyObject getDoc() {
-        return new PyString("any(iterable) -> bool\n\nReturn True if bool(x) is True for any x in the iterable.");
+class AnyFunction extends PyBuiltinFunctionNarrow {
+    AnyFunction() {
+        super("any", 1, 1,
+              "any(iterable) -> bool\n\nReturn True if bool(x) is True for any x in the iterable.");
     }
 
     @Override
-    public PyObject __call__(PyObject args[], String kwds[]) {
-        if (args.length !=1) {
-            throw Py.TypeError(" any() takes exactly one argument (" + args.length + " given)");
-        }
-        PyObject iter = args[0].__iter__();
+    public PyObject __call__(PyObject arg) {
+        PyObject iter = arg.__iter__();
         if (iter == null) {
-            throw Py.TypeError("'" + args[0].getType().fastGetName() + "' object is not iterable");
+            throw Py.TypeError("'" + arg.getType().fastGetName() + "' object is not iterable");
         }
         for (PyObject item : iter.asIterable()) {
             if (item.__nonzero__()) {
                 return Py.True;
             }
         }
-        return Py.False;     
+        return Py.False;
     }
-    
-    @Override
-    public String toString() {
-        return "<built-in function any>";
-    }
 }
 
-class MaxFunction extends ExtendedBuiltinFunction {
-    static final MaxFunction INSTANCE = new MaxFunction();
-   
-    private MaxFunction() {}
-  
-    @ExposedNew
-    public static PyObject __new__(PyObject[] args, String[] keyword) {
-        return INSTANCE;
-    }  
-
-    @ExposedGet(name = "__doc__")
-    @Override
-    public PyObject getDoc() {
-        return new PyString(
-                "max(iterable[, key=func]) -> value\nmax(a, b, c, ...[, key=func]) -> value\n\n" +
-                "With a single iterable argument, return its largest item.\n" + 
-                "With two or more arguments, return the largest argument.");
+class MaxFunction extends PyBuiltinFunction {
+    MaxFunction() {
+        super("max",
+              "max(iterable[, key=func]) -> value\nmax(a, b, c, ...[, key=func]) -> value\n\n" +
+              "With a single iterable argument, return its largest item.\n" +
+              "With two or more arguments, return the largest argument.");
     }
 
     @Override
     public PyObject __call__(PyObject args[], String kwds[]) {
         int argslen = args.length;
         PyObject key = null;
-        
+
         if (args.length - kwds.length == 0) {
-            throw Py.TypeError(" max() expected 1 arguments, got 0");
+            throw Py.TypeError("max() expected 1 arguments, got 0");
         }
         if (kwds.length > 0) {
             if (kwds[0].equals("key")) {
@@ -1453,23 +1357,18 @@
                 args = newargs;
             }
             else {
-                throw Py.TypeError(" max() got an unexpected keyword argument");
+                throw Py.TypeError("max() got an unexpected keyword argument");
             }
         }
-        
+
         if (args.length > 1) {
             return max(new PyTuple(args), key);
         }
         else {
             return max(args[0], key);
         }
-    }    
-    
-    @Override
-    public String toString() {
-        return "<built-in function max>";
     }
-    
+
     private static PyObject max(PyObject o, PyObject key) {
         PyObject max = null;
         PyObject maxKey = null;
@@ -1494,31 +1393,19 @@
 
 }
 
-class MinFunction extends ExtendedBuiltinFunction {
-    static final MinFunction INSTANCE = new MinFunction();
-    
-    private MinFunction() {}
-   
-    @ExposedNew
-    public static PyObject __new__(PyObject[] args, String[] keyword) {
-        return INSTANCE;
-    }     
-    
-    
-    @ExposedGet(name = "__doc__")
-    @Override
-    public PyObject getDoc() {
-        return new PyString(
-                "min(iterable[, key=func]) -> value\nmin(a, b, c, ...[, key=func]) -> value\n\n" +
-                "With a single iterable argument, return its smallest item.\n" +
-                "With two or more arguments, return the smallest argument.'");
+class MinFunction extends PyBuiltinFunction {
+    MinFunction() {
+        super("min",
+              "min(iterable[, key=func]) -> value\nmin(a, b, c, ...[, key=func]) -> value\n\n" +
+              "With a single iterable argument, return its smallest item.\n" +
+              "With two or more arguments, return the smallest argument.'");
     }
 
     @Override
     public PyObject __call__(PyObject args[], String kwds[]) {
         int argslen = args.length;
         PyObject key = null;
-        
+
         if (args.length - kwds.length == 0) {
             throw Py.TypeError(" min() expected 1 arguments, got 0");
         }
@@ -1530,10 +1417,10 @@
                 args = newargs;
             }
             else {
-                throw Py.TypeError(" min() got an unexpected keyword argument");
+                throw Py.TypeError("min() got an unexpected keyword argument");
             }
         }
-        
+
         if (args.length > 1) {
             return min(new PyTuple(args), key);
         }
@@ -1541,12 +1428,7 @@
             return min(args[0], key);
         }
     }
-    
-    @Override
-    public String toString() {
-        return "<built-in function min>";
-    }
-    
+
     private static PyObject min(PyObject o, PyObject key) {
         PyObject min = null;
         PyObject minKey = null;
@@ -1570,37 +1452,20 @@
     }
 }
 
-class RoundFunction extends ExtendedBuiltinFunction {
-    static final RoundFunction INSTANCE = new RoundFunction();
-    private RoundFunction() {}
-    
-    @ExposedNew
-    public static PyObject __new__(PyObject[] args, String[] keyword) {
-        return INSTANCE;
-    }     
-    
-    @ExposedGet(name = "__doc__")
-    @Override
-    public PyObject getDoc() {
-        return new PyString(
-                "round(number[, ndigits]) -> floating point number\n\n" +
-                "Round a number to a given precision in decimal digits (default 0 digits).\n" +
-                "This always returns a floating point number.  Precision may be negative.");
+class RoundFunction extends PyBuiltinFunction {
+    RoundFunction() {
+        super("round", "round(number[, ndigits]) -> floating point number\n\n" +
+              "Round a number to a given precision in decimal digits (default 0 digits).\n" +
+              "This always returns a floating point number.  Precision may be negative.");
     }
-    
-    @Override
-    public String toString() {
-        return "<built-in function round>";
-    }
-    
-    @Override
+
     public PyObject __call__(PyObject args[], String kwds[]) {
-        ArgParser ap = new ArgParser("round", args, kwds, new String[]{"number", "ndigits"}, 0);
+        ArgParser ap = new ArgParser("round", args, kwds, new String[] {"number", "ndigits"}, 0);
         PyObject number = ap.getPyObject(0);
         int ndigits = ap.getInt(1, 0);
         return round(Py.py2double(number), ndigits);
     }
-    
+
     private static PyFloat round(double f, int digits) {
         boolean neg = f < 0;
         double multiple = Math.pow(10., digits);

Modified: trunk/jython/src/org/python/core/exceptions.java
===================================================================
--- trunk/jython/src/org/python/core/exceptions.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/core/exceptions.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -661,7 +661,7 @@
             this.javaMethod = javaMethod;
         }
 
-        public PyBuiltinFunction bind(PyObject self) {
+        public PyBuiltinCallable bind(PyObject self) {
             return new BoundStaticJavaMethod(getType(), self, info, javaMethod);
         }
 

Modified: trunk/jython/src/org/python/expose/generate/PyTypes.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/PyTypes.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/expose/generate/PyTypes.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -3,7 +3,7 @@
 import org.python.objectweb.asm.Type;
 import org.python.core.Py;
 import org.python.core.PyBoolean;
-import org.python.core.PyBuiltinFunction;
+import org.python.core.PyBuiltinCallable;
 import org.python.core.PyBuiltinMethod;
 import org.python.core.PyBuiltinMethodNarrow;
 import org.python.core.PyDataDescr;
@@ -61,15 +61,15 @@
 
     public static final Type BUILTIN_METHOD_NARROW = Type.getType(PyBuiltinMethodNarrow.class);
 
-    public static final Type BUILTIN_FUNCTION = Type.getType(PyBuiltinFunction.class);
+    public static final Type BUILTIN_FUNCTION = Type.getType(PyBuiltinCallable.class);
 
-    public static final Type ABUILTIN_FUNCTION = Type.getType(PyBuiltinFunction[].class);
+    public static final Type ABUILTIN_FUNCTION = Type.getType(PyBuiltinCallable[].class);
 
     public static final Type DATA_DESCR = Type.getType(PyDataDescr.class);
 
     public static final Type ADATA_DESCR = Type.getType(PyDataDescr[].class);
 
-    public static final Type BUILTIN_INFO = Type.getType(PyBuiltinFunction.Info.class);
+    public static final Type BUILTIN_INFO = Type.getType(PyBuiltinCallable.Info.class);
 
     // Exposer Jython types
     public static final Type EXPOSED_TYPE = Type.getType(ExposedType.class);

Modified: trunk/jython/src/org/python/modules/_collections/PyDeque.java
===================================================================
--- trunk/jython/src/org/python/modules/_collections/PyDeque.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/modules/_collections/PyDeque.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -11,7 +11,7 @@
 import org.python.core.PyLong;
 import org.python.core.PyNewWrapper;
 import org.python.core.PyMethodDescr;
-import org.python.core.PyBuiltinFunction;
+import org.python.core.PyBuiltinCallable;
 import org.python.core.PyBuiltinMethod;
 import org.python.core.PyBuiltinMethodNarrow;
 import org.python.core.PyString;
@@ -60,7 +60,7 @@
         }
         int nargs = args.length;
         if (nargs > 1) {
-            throw PyBuiltinFunction.DefaultInfo.unexpectedCall(nargs, false, "deque", 0, 1);
+            throw PyBuiltinCallable.DefaultInfo.unexpectedCall(nargs, false, "deque", 0, 1);
         } 
         if (nargs == 0) {
             return;

Modified: trunk/jython/src/org/python/modules/_jython.java
===================================================================
--- trunk/jython/src/org/python/modules/_jython.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/modules/_jython.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -1,7 +1,11 @@
 
 package org.python.modules;
 
-import org.python.core.*;
+import org.python.core.ClassDictInit;
+import org.python.core.Py;
+import org.python.core.PyBuiltinFunctionSet;
+import org.python.core.PyJavaClass;
+import org.python.core.PyObject;
 
 class JythonInternalFunctions extends PyBuiltinFunctionSet
 {

Modified: trunk/jython/src/org/python/modules/_weakref/ReferenceType.java
===================================================================
--- trunk/jython/src/org/python/modules/_weakref/ReferenceType.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/modules/_weakref/ReferenceType.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -3,7 +3,7 @@
 
 import org.python.core.ArgParser;
 import org.python.core.Py;
-import org.python.core.PyBuiltinFunction;
+import org.python.core.PyBuiltinCallable;
 import org.python.core.PyNewWrapper;
 import org.python.core.PyObject;
 import org.python.core.PyType;

Modified: trunk/jython/src/org/python/modules/cPickle.java
===================================================================
--- trunk/jython/src/org/python/modules/cPickle.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/src/org/python/modules/cPickle.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -15,11 +15,10 @@
 import java.math.BigInteger;
 import java.util.Hashtable;
 
-import org.python.core.ArgParser;
 import org.python.core.ClassDictInit;
 import org.python.core.Py;
 import org.python.core.PyBoolean;
-import org.python.core.PyBuiltinFunction;
+import org.python.core.PyBuiltinCallable;
 import org.python.core.PyClass;
 import org.python.core.PyDictionary;
 import org.python.core.PyException;
@@ -450,7 +449,7 @@
     private static PyDictionary inverted_registry;
 
 
-    private static PyType BuiltinFunctionType = PyType.fromClass(PyBuiltinFunction.class);
+    private static PyType BuiltinCallableType = PyType.fromClass(PyBuiltinCallable.class);
 
     private static PyType ReflectedFunctionType = PyType.fromClass(PyReflectedFunction.class);
 
@@ -1068,7 +1067,7 @@
                 save_global(object);
             else if (type == FunctionType)
                 save_global(object);
-            else if (type == BuiltinFunctionType)
+            else if (type == BuiltinCallableType)
                 save_global(object);
             else if (type == ReflectedFunctionType)
                 save_global(object);
@@ -2298,7 +2297,7 @@
                     value = temp.__getitem__(0);
                     slotstate = temp.__getitem__(1);
                 }
-                
+
                 PyObject dict;
                 if(inst instanceof PyInstance) {
                     dict = ((PyInstance)inst).__dict__;

Modified: trunk/jython/tests/java/org/python/expose/generate/ExposedTypeProcessorTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/ExposedTypeProcessorTest.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/tests/java/org/python/expose/generate/ExposedTypeProcessorTest.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -6,7 +6,7 @@
 import junit.framework.TestCase;
 
 import org.python.core.BytecodeLoader;
-import org.python.core.PyBuiltinFunction;
+import org.python.core.PyBuiltinCallable;
 import org.python.core.PyDataDescr;
 import org.python.core.PyObject;
 import org.python.core.PyType;
@@ -37,8 +37,8 @@
         Class doctoredSimple = loader.loadClassFromBytes("org.python.expose.generate.SimpleExposed",
                                                          ice.getBytecode());
         PyObject simp = (PyObject)doctoredSimple.newInstance();
-        PyBuiltinFunction func = MethodExposerTest.instantiate(simple_method, "invisible");
-        PyBuiltinFunction bound = func.bind(simp);
+        PyBuiltinCallable func = MethodExposerTest.instantiate(simple_method, "invisible");
+        PyBuiltinCallable bound = func.bind(simp);
         bound.__call__();
         PyDataDescr desc = (PyDataDescr)tostringDesc.newInstance();
         assertEquals(doctoredSimple.getField("toStringVal").get(simp),

Modified: trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java	2008-10-19 03:04:44 UTC (rev 5464)
+++ trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java	2008-10-19 05:14:22 UTC (rev 5465)
@@ -4,7 +4,7 @@
 import org.python.objectweb.asm.Type;
 import org.python.core.BytecodeLoader;
 import org.python.core.Py;
-import org.python.core.PyBuiltinFunction;
+import org.python.core.PyBuiltinCallable;
 import org.python.core.PyException;
 import org.python.core.PyObject;
 import org.python.expose.MethodType;
@@ -21,22 +21,22 @@
                                          "simpleexposed");
     }
 
-    public static PyBuiltinFunction createBound(String methodName, Type returnType, Type... args)
+    public static PyBuiltinCallable createBound(String methodName, Type returnType, Type... args)
             throws Exception {
         return createBound(createExposer(methodName, returnType, args));
     }
 
-    public static PyBuiltinFunction createBound(MethodExposer me) throws Exception {
+    public static PyBuiltinCallable createBound(MethodExposer me) throws Exception {
         Class<?> descriptor = me.load(new BytecodeLoader.Loader());
-        PyBuiltinFunction func = instantiate(descriptor, me.getNames()[0]);
+        PyBuiltinCallable func = instantiate(descriptor, me.getNames()[0]);
         if (me instanceof ClassMethodExposer) {
             return func.bind(new SimpleExposed().getType());
         }
         return func.bind(new SimpleExposed());
     }
 
-    public static PyBuiltinFunction instantiate(Class<?> descriptor, String name) throws Exception {
-        return (PyBuiltinFunction)descriptor.getConstructor(String.class).newInstance(name);
+    public static PyBuiltinCallable instantiate(Class<?> descriptor, String name) throws Exception {
+        return (PyBuiltinCallable)descriptor.getConstructor(String.class).newInstance(name);
     }
 
     public void testSimpleMethod() throws Exception {
@@ -47,10 +47,10 @@
         assertEquals("org.python.expose.generate.SimpleExposed$simple_method_exposer",
                      mp.getClassName());
         Class descriptor = mp.load(new BytecodeLoader.Loader());
-        PyBuiltinFunction instance = instantiate(descriptor, "simple_method");
+        PyBuiltinCallable instance = instantiate(descriptor, "simple_method");
         assertSame("simple_method", instance.__getattr__("__name__").toString());
         SimpleExposed simpleExposed = new SimpleExposed();
-        PyBuiltinFunction bound = instance.bind(simpleExposed);
+        PyBuiltinCallable bound = instance.bind(simpleExposed);
         assertEquals(instance.getClass(), bound.getClass());
         assertEquals(Py.None, bound.__call__());
         assertEquals(1, simpleExposed.timesCalled);
@@ -70,7 +70,7 @@
     }
 
     public void testArgumentPassing() throws Exception {
-        PyBuiltinFunction bound = createBound("takesArgument", Type.DOUBLE_TYPE, PYOBJ);
+        PyBuiltinCallable bound = createBound("takesArgument", Type.DOUBLE_TYPE, PYOBJ);
         assertEquals(1.0, Py.py2double(bound.__call__(Py.One)));
         try {
             bound.__call__();
@@ -81,7 +81,7 @@
     public void testBinary() throws Exception {
         InstanceMethodExposer exposer = createExposer("__add__", PYOBJ, PYOBJ);
         exposer.type = MethodType.BINARY;
-        PyBuiltinFunction bound = createBound(exposer);
+        PyBuiltinCallable bound = createBound(exposer);
         assertEquals(Py.NotImplemented, bound.__call__(Py.None));
         assertEquals(Py.One, bound.__call__(Py.False));
     }
@@ -89,7 +89,7 @@
     public void testCmp() throws Exception {
         InstanceMethodExposer exp = createExposer("__cmp__", INT, PYOBJ);
         exp.type = MethodType.CMP;
-        PyBuiltinFunction bound = createBound(exp);
+        PyBuiltinCallable bound = createBound(exp);
         try {
             bound.__call__(Py.None);
             fail("Returning -2 from __cmp__ should yield a type error");
@@ -104,7 +104,7 @@
     public void testNoneDefault() throws Exception {
         InstanceMethodExposer exp = createExposer("defaultToNone", PYOBJ, PYOBJ);
         exp.defaults = new String[] {"Py.None"};
-        PyBuiltinFunction bound = createBound(exp);
+        PyBuiltinCallable bound = createBound(exp);
         assertEquals(Py.One, bound.__call__(Py.One));
         assertEquals(Py.None, bound.__call__());
     }
@@ -112,7 +112,7 @@
     public void testNullDefault() throws Exception {
         InstanceMethodExposer exp = createExposer("defaultToNull", PYOBJ, PYOBJ);
         exp.defaults = new String[] {"null"};
-        PyBuiltinFunction bound = createBound(exp);
+        PyBuiltinCallable bound = createBound(exp);
         assertEquals(Py.One, bound.__call__(Py.One));
         assertEquals(null, bound.__call__());
     }
@@ -120,7 +120,7 @@
     public void testIntDefault() throws Exception {
         InstanceMethodExposer exp = createExposer("defaultToOne", PYOBJ, INT);
         exp.defaults = new String[] {"1"};
-        PyBuiltinFunction bound = createBound(exp);
+        PyBuiltinCallable bound = createBound(exp);
         assertEquals(Py.Zero, bound.__call__(Py.Zero));
         assertEquals(Py.One, bound.__call__());
         exp.defaults = new String[] {"X"};
@@ -138,7 +138,7 @@
                                                   Type.DOUBLE_TYPE,
                                                   BYTE);
         exp.defaults = new String[] {"a", "1", "2", "3"};
-        PyBuiltinFunction bound = createBound(exp);
+        PyBuiltinCallable bound = createBound(exp);
         assertEquals("a12.03", bound.__call__().toString());
         assertEquals("b12.03", bound.__call__(Py.newString('b')).toString());
         exp.defaults = new String[] {"ab", "1", "2", "3"};
@@ -156,7 +156,7 @@
                                                                                        new Type[] {APYOBJ,
                                                                                                    ASTRING}),
                                                               "simpleexposed");
-        PyBuiltinFunction bound = createBound(exp);
+        PyBuiltinCallable bound = createBound(exp);
         assertEquals(Py.Zero, bound.__call__());
         assertEquals(Py.One, bound.__call__(Py.One));
         try {
@@ -198,7 +198,7 @@
                                                         "simpleexposed",
                                                         new String[0],
                                                         new String[0]);
-        PyBuiltinFunction bound = createBound(exp);
+        PyBuiltinCallable bound = createBound(exp);
         assertEquals("a", bound.__call__().toString());
     }
 
@@ -213,7 +213,7 @@
                                                         "simpleexposed",
                                                         new String[0],
                                                         new String[] {"null", "Py.None"});
-        PyBuiltinFunction bound = createBound(exp);
+        PyBuiltinCallable bound = createBound(exp);
         assertEquals(0, bound.__call__().asInt());
         assertEquals(1, bound.__call__(Py.newString("hello")).asInt());
         assertEquals(2, bound.__call__(Py.newString("nothello"), Py.None).asInt());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5470
          http://jython.svn.sourceforge.net/jython/?rev=5470&view=rev
Author:   zyasoft
Date:     2008-10-19 22:04:51 +0000 (Sun, 19 Oct 2008)

Log Message:
-----------
Make error handling in codecs so that it is also surrogate-aware.
Fixes test_codeccallbacks

Skip tests from test_threading not applicable to Jython.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_codeccallbacks.py
    trunk/jython/Lib/test/test_threading.py
    trunk/jython/Lib/unicodedata.py
    trunk/jython/src/org/python/core/codecs.java
    trunk/jython/src/org/python/core/exceptions.java

Modified: trunk/jython/Lib/test/test_codeccallbacks.py
===================================================================
--- trunk/jython/Lib/test/test_codeccallbacks.py	2008-10-19 20:51:56 UTC (rev 5469)
+++ trunk/jython/Lib/test/test_codeccallbacks.py	2008-10-19 22:04:51 UTC (rev 5470)
@@ -589,7 +589,7 @@
                 ("ascii", "\xff"),
                 ("utf-8", "\xff"),
                 ("utf-7", "+x-"),
-                ("unicode-internal", "\x00"),
+                # ("unicode-internal", "\x00"), - not valid for Jython because PyUnicode/PyString share internal representation
             ):
                 self.assertRaises(
                     TypeError,
@@ -794,6 +794,9 @@
             text.translate(charmap)
 
 def test_main():
+    if test.test_support.is_jython:
+        del CodecCallbackTest.test_decodeunicodeinternal # PyUnicode/PyString share the same internal rep, so n/a
+
     test.test_support.run_unittest(CodecCallbackTest)
 
 if __name__ == "__main__":

Modified: trunk/jython/Lib/test/test_threading.py
===================================================================
--- trunk/jython/Lib/test/test_threading.py	2008-10-19 20:51:56 UTC (rev 5469)
+++ trunk/jython/Lib/test/test_threading.py	2008-10-19 22:04:51 UTC (rev 5470)
@@ -1,7 +1,7 @@
 # Very rudimentary test of threading module
 
 import test.test_support
-from test.test_support import verbose
+from test.test_support import verbose, is_jython
 import random
 import sys
 import threading
@@ -118,7 +118,7 @@
     # 3. This behavior doesn't make sense for Jython since any foreign
     #    Java threads can use the same underlying locks, etc
 
-    def na_for_jython_test_foreign_thread(self):
+    def test_foreign_thread(self):
         # Check that a "foreign" thread can use the threading module.
         def f(mutex):
             # Acquiring an RLock forces an entry for the foreign
@@ -208,7 +208,7 @@
             t.join()
         # else the thread is still running, and we have no way to kill it
 
-    def na_for_jython_test_enumerate_after_join(self):
+    def test_enumerate_after_join(self):
         # Try hard to trigger #1703448: a thread is still returned in
         # threading.enumerate() after it has been join()ed.
         enum = threading.enumerate
@@ -225,6 +225,10 @@
         finally:
             sys.setcheckinterval(old_interval)
 
+if is_jython:
+    del ThreadTests.test_enumerate_after_join
+    del ThreadTests.test_foreign_thread
+    del ThreadTests.test_PyThreadState_SetAsyncExc
 
 def test_main():
     test.test_support.run_unittest(ThreadTests)

Modified: trunk/jython/Lib/unicodedata.py
===================================================================
--- trunk/jython/Lib/unicodedata.py	2008-10-19 20:51:56 UTC (rev 5469)
+++ trunk/jython/Lib/unicodedata.py	2008-10-19 22:04:51 UTC (rev 5470)
@@ -41,6 +41,10 @@
             cols = row.split(';')
             codepoint = int(cols[0], 16)
             name = cols[1]
+            if name == '<CJK Ideograph, Last>':
+                lookup_name = 'CJK UNIFIED IDEOGRAPH'
+            else:
+                lookup_name = name
             data = (
                 cols[2],
                 get_int(cols[3]),
@@ -49,7 +53,9 @@
                 get_int(cols[6]),
                 get_int(cols[7]),
                 get_numeric(cols[8]),
-                get_yn(cols[9]))
+                get_yn(cols[9]),
+                lookup_name,
+                )
 
             if name.find('First') >= 0:
                 start = codepoint
@@ -86,15 +92,27 @@
 init(my_path)
 init_east_asian_width(my_path)
 
+# xxx - need to normalize the segments, so
+# <CJK Ideograph, Last> ==> CJK UNIFIED IDEOGRAPH;
+# may need to do some sort of analysis against CPython for the normalization!
+
 def name(unichr, default=None):
-    try:
-        return _codepoints[ord(unichr)].name
-    except KeyError:
-        if default is not None:
+    codepoint = get_codepoint(unichr, "name")
+    v = _codepoints.get(codepoint, None)
+    if v is None:
+        v = check_segments(codepoint, _segments)
+        if v is not None:
+            return "%s-%X" % (v[8], codepoint) 
+
+    if v is None:
+        if default is not Nonesuch:
             return default
-        else:
-            raise ValueError()
+        raise ValueError()
+    return v[8]
 
+# xxx - also need to add logic here so that if it's CJK UNIFIED
+# IDEOGRAPH-8000, we go against the segment to verify the prefix
+
 def lookup(name):
     return _names[name]
 

Modified: trunk/jython/src/org/python/core/codecs.java
===================================================================
--- trunk/jython/src/org/python/core/codecs.java	2008-10-19 20:51:56 UTC (rev 5469)
+++ trunk/jython/src/org/python/core/codecs.java	2008-10-19 22:04:51 UTC (rev 5470)
@@ -243,9 +243,17 @@
         ArgParser ap = new ArgParser("replace_errors", args, kws, "exc");
         PyObject exc = ap.getPyObject(0);
         if (Py.isInstance(exc, Py.UnicodeDecodeError)) {
+            PyObject object = exc.__getattr__("object");
+            if (!Py.isInstance(object, PyString.TYPE) || Py.isInstance(object, PyUnicode.TYPE)) {
+                throw Py.TypeError("object attribute must be str");        
+            }
             PyObject end = exc.__getattr__("end");
             return new PyTuple(new PyUnicode(Py_UNICODE_REPLACEMENT_CHARACTER), end);
         } else if (Py.isInstance(exc, Py.UnicodeEncodeError)) {
+            PyObject object = exc.__getattr__("object");
+            if (!Py.isInstance(object, PyUnicode.TYPE)) {
+                throw Py.TypeError("object attribute must be unicode");        
+            }
             PyObject end = exc.__getattr__("end");
             return new PyTuple(Py.java2py("?"), end);
         } else if (Py.isInstance(exc, Py.UnicodeTranslateError)) {
@@ -343,9 +351,9 @@
     }
 
     private static void backslashreplace_internal(int start, int end, String object, StringBuilder replacement) {
-        for (int i = start; i < end; i++) {
+        for (Iterator<Integer> iter = new StringSubsequenceIterator(object, start, end, 1); iter.hasNext();) {
+            int c = iter.next();
             replacement.append('\\');
-            char c = object.charAt(i);
             if (c >= 0x00010000) {
                 replacement.append('U');
                 replacement.append(hexdigits[(c >> 28) & 0xf]);
@@ -1257,3 +1265,75 @@
         }
     }
 }
+
+
+class StringSubsequenceIterator implements Iterator {
+
+    private final String s;
+    private int current,  k,  start,  stop,  step;
+
+    StringSubsequenceIterator(String s, int start, int stop, int step) {
+//        System.out.println("s=" + s.length() + ",start=" + start + ",stop=" + stop);
+        this.s = s;
+        k = 0;
+        current = start;
+        this.start = start;
+        this.stop = stop;
+        this.step = step;
+      
+        // this bounds checking is necessary to convert between use of code units elsewhere, and codepoints here
+        // it would be nice if it were unnecessary!
+        int count = getCodePointCount(s);
+        if (start >= count) {
+            this.stop = -1;
+        }
+        else if (stop >= count) {
+            this.stop = count;
+        }
+        
+        for (int i = 0; i < start; i++) {
+            nextCodePoint();
+        }
+    }
+
+    StringSubsequenceIterator(String s) {
+        this(s, 0, getCodePointCount(s), 1);
+    }
+
+    private static int getCodePointCount(String s) {
+        return s.codePointCount(0, s.length());
+    }
+    
+    public boolean hasNext() {
+        return current < stop;
+    }
+
+    public Object next() {
+        int codePoint = nextCodePoint();
+        current += 1;
+        for (int j = 1; j < step && hasNext(); j++) {
+            nextCodePoint();
+            current += 1;
+        }
+        return codePoint;
+    }
+
+    private int nextCodePoint() {
+        int U;
+//        System.out.println("k=" + k);
+        int W1 = s.charAt(k);
+        if (W1 >= 0xD800 && W1 < 0xDC00) {
+            int W2 = s.charAt(k + 1);
+            U = (((W1 & 0x3FF) << 10) | (W2 & 0x3FF)) + 0x10000;
+            k += 2;
+        } else {
+            U = W1;
+            k += 1;
+        }
+        return U;
+    }
+
+    public void remove() {
+        throw new UnsupportedOperationException("Not supported on String objects (immutable)");
+    }
+}

Modified: trunk/jython/src/org/python/core/exceptions.java
===================================================================
--- trunk/jython/src/org/python/core/exceptions.java	2008-10-19 20:51:56 UTC (rev 5469)
+++ trunk/jython/src/org/python/core/exceptions.java	2008-10-19 22:04:51 UTC (rev 5470)
@@ -381,7 +381,7 @@
         if (end == (start + 1)) {
             PyObject object = self.__getattr__("object");
             int badByte = (object.toString().charAt(start)) & 0xff;
-            result = String.format("'%.400s' codec can't decode byte 0x%s in position %d: %.400s",
+            result = String.format("'%.400s' codec can't decode byte 0x%x in position %d: %.400s",
                                    encoding, badByte, start, reason);
         } else {
             result = String.format("'%.400s' codec can't decode bytes in position %d-%d: %.400s",
@@ -413,7 +413,7 @@
         String result;
         if (end == (start + 1)) {
             PyObject object = self.__getattr__("object");
-            int badchar = object.toString().charAt(start);
+            int badchar = object.toString().codePointAt(start);
             String badcharStr;
             if (badchar <= 0xff) {
                 badcharStr = String.format("x%02x", badchar);
@@ -460,7 +460,7 @@
 
         String result;
         if (end == (start + 1)) {
-            int badchar = (self.__getattr__("object").toString().charAt(start));
+            int badchar = (self.__getattr__("object").toString().codePointAt(start));
             String badCharStr;
             if (badchar <= 0xff) {
                 badCharStr = String.format("x%02x", badchar);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5471
          http://jython.svn.sourceforge.net/jython/?rev=5471&view=rev
Author:   cgroves
Date:     2008-10-19 23:17:44 +0000 (Sun, 19 Oct 2008)

Log Message:
-----------
Add a couple tests for subclass constructor visibility

Modified Paths:
--------------
    trunk/jython/Lib/test/test_java_visibility.py
    trunk/jython/tests/java/org/python/tests/VisibilityResults.java
    trunk/jython/tests/java/org/python/tests/Visible.java

Modified: trunk/jython/Lib/test/test_java_visibility.py
===================================================================
--- trunk/jython/Lib/test/test_java_visibility.py	2008-10-19 22:04:51 UTC (rev 5470)
+++ trunk/jython/Lib/test/test_java_visibility.py	2008-10-19 23:17:44 UTC (rev 5471)
@@ -8,15 +8,21 @@
         self.assertEquals([], dir(Invisible))
 
     def test_protected_from_python_subclass(self):
-        class SubInvisible(Invisible):
-            pass
+        class SubVisible(Visible):
+            def __init__(self, publicValue=None):
+                if publicValue is not None:
+                    Visible.__init__(self, publicValue)
+                else:
+                    Visible.__init__(self)
         # TODO - protectedStaticMethod, protectedStaticField, and protectedField should
         # be here
-        s = SubInvisible()
+        s = SubVisible()
         self.assertEquals(Results.PROTECTED_METHOD, s.protectedMethod(0))
+        self.assertEquals(Results.OVERLOADED_PROTECTED_METHOD, s.protectedMethod('foo'))
+        self.assertEquals(Results.UNUSED, SubVisible(Results.UNUSED).visibleField)
 
     def test_visible(self):
-        self.assertEquals(4, len(dir(Visible)))
+        self.assertEquals(5, len(dir(Visible)))
 
         v = Visible()
         self.assertEquals(Results.PUBLIC_FIELD, v.visibleField)

Modified: trunk/jython/tests/java/org/python/tests/VisibilityResults.java
===================================================================
--- trunk/jython/tests/java/org/python/tests/VisibilityResults.java	2008-10-19 22:04:51 UTC (rev 5470)
+++ trunk/jython/tests/java/org/python/tests/VisibilityResults.java	2008-10-19 23:17:44 UTC (rev 5471)
@@ -1,9 +1,9 @@
 package org.python.tests;
 
-/**
- * 
- */
 public interface VisibilityResults {
+    // Value not used by default by any of the visible classes
+    public static final int UNUSED = -1;
+
     // Returns for Invisible.java
     public static final int PROTECTED_STATIC_FIELD = 1;
     public static final int PROTECTED_FIELD = 2;
@@ -15,7 +15,7 @@
     public static final int OVERLOADED_PROTECTED_METHOD = 8;
     public static final int PACKAGE_STATIC_METHOD = 9;
     public static final int PACKAGE_METHOD = 10;
-    
+
     // Returns for Visible.java
     public static final int PUBLIC_FIELD = 101;
     public static final int PUBLIC_STATIC_FIELD = 102;
@@ -28,7 +28,7 @@
     public static final int EXTRA_ARG_PUBLIC_STATIC_METHOD = 109;
     public static final int PUBLIC_METHOD_FIELD = 110;
     public static final int PUBLIC_STATIC_METHOD_FIELD = 111;
-    
+
     // Returns for SubVisible.java
     public static final int SUBCLASS_OVERRIDE = 201;
     public static final int SUBCLASS_OVERLOAD = 202;

Modified: trunk/jython/tests/java/org/python/tests/Visible.java
===================================================================
--- trunk/jython/tests/java/org/python/tests/Visible.java	2008-10-19 22:04:51 UTC (rev 5470)
+++ trunk/jython/tests/java/org/python/tests/Visible.java	2008-10-19 23:17:44 UTC (rev 5471)
@@ -1,17 +1,25 @@
 package org.python.tests;
 
-/** 
+/**
  * Exposes several methods that should be visible statically and on instances in Python.
  */
 public class Visible extends Invisible {
-    public int visibleField = PUBLIC_FIELD;
-    
+    public int visibleField;
+
     public static int visibleStaticField = PUBLIC_STATIC_FIELD;
 
     public int visibleInstance = PUBLIC_METHOD_FIELD;
 
     public static int visibleStatic = PUBLIC_STATIC_METHOD_FIELD;
 
+    public Visible() {
+        this(PUBLIC_FIELD);
+    }
+
+    public Visible(int visibileFieldValue) {
+        visibleField = visibileFieldValue;
+    }
+
     public int visibleInstance(int input) {
         return PUBLIC_METHOD;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5472
          http://jython.svn.sourceforge.net/jython/?rev=5472&view=rev
Author:   zyasoft
Date:     2008-10-19 23:18:22 +0000 (Sun, 19 Oct 2008)

Log Message:
-----------
PEP 342 specifies that an exception raised by close during
finalization should be output to stderr, so we now do that.

Fixed a minor doctest output formatting issue so that the desired
syntax error is properly seen.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_generators.py
    trunk/jython/src/org/python/core/PyGenerator.java

Modified: trunk/jython/Lib/test/test_generators.py
===================================================================
--- trunk/jython/Lib/test/test_generators.py	2008-10-19 23:17:44 UTC (rev 5471)
+++ trunk/jython/Lib/test/test_generators.py	2008-10-19 23:18:22 UTC (rev 5472)
@@ -867,7 +867,7 @@
 <type 'generator'>
 
 
->>> def f():
+>>> def f(): #doctest: +IGNORE_EXCEPTION_DETAIL, +NORMALIZE_WHITESPACE
 ...     if 0:
 ...         lambda x:  x        # shouldn't trigger here
 ...         return              # or here
@@ -1646,8 +1646,6 @@
 >>> g.close()           # close normally
 
 And finalization. But we have to force the timing of GC here, since we are running on Jython:
->>> import gc
->>> from time import sleep
 >>> def f():
 ...     try: yield
 ...     finally:
@@ -1655,7 +1653,7 @@
 
 >>> g = f()
 >>> g.next()
->>> del g; gc.collect(); sleep(1); gc.collect()
+>>> del g; extra_collect()
 exiting
 
 
@@ -1680,7 +1678,7 @@
 >>> old, sys.stderr = sys.stderr, StringIO.StringIO()
 >>> g = f()
 >>> g.next()
->>> del g; gc.collect(); sleep(1); gc.collect()
+>>> del g; extra_collect()
 >>> sys.stderr.getvalue().startswith(
 ...     "Exception RuntimeError"
 ... )
@@ -1789,7 +1787,6 @@
 
 >>> import sys, StringIO
 >>> from time import sleep
->>> import gc
 >>> old = sys.stderr
 >>> try:
 ...     sys.stderr = StringIO.StringIO()
@@ -1798,7 +1795,7 @@
 ...             raise RuntimeError
 ...
 ...     l = Leaker()
-...     del l; gc.collect(); sleep(1); gc.collect()
+...     del l; extra_collect()
 ...     err = sys.stderr.getvalue().strip()
 ...     err.startswith(
 ...         "Exception RuntimeError in <"
@@ -1837,6 +1834,13 @@
     from test import test_support, test_generators
     test_support.run_doctest(test_generators, verbose)
 
+def extra_collect():
+    import gc
+    from time import sleep
+
+    gc.collect(); sleep(1); gc.collect(); sleep(0.1); gc.collect()
+
+
 # This part isn't needed for regrtest, but for running the test directly.
 if __name__ == "__main__":
     test_main(1)

Modified: trunk/jython/src/org/python/core/PyGenerator.java
===================================================================
--- trunk/jython/src/org/python/core/PyGenerator.java	2008-10-19 23:17:44 UTC (rev 5471)
+++ trunk/jython/src/org/python/core/PyGenerator.java	2008-10-19 23:18:22 UTC (rev 5472)
@@ -82,7 +82,23 @@
             return;
         try {
             close();
+        } catch (PyException e) {
+            // PEP 342 specifies that if an exception is raised by close,
+            // we output to stderr and then forget about it;           
+            String className =  PyException.exceptionClassName(e.type);
+            int lastDot = className.lastIndexOf('.');
+            if (lastDot != -1) {
+                className = className.substring(lastDot + 1);
+            }
+            PyString m = Py.newString(
+                    String.format("Exception %s: %s in %s",
+                    className,
+                    e.value.__repr__().toString(),
+                    this.__repr__().toString()));
+            Py.println(Py.getSystemState().stderr, m);
         } catch (Throwable e) {
+            // but we currently ignore any Java exception completely. perhaps we
+            // can also output something meaningful too?
         } finally {
             super.finalize();
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5473
          http://jython.svn.sourceforge.net/jython/?rev=5473&view=rev
Author:   cgroves
Date:     2008-10-19 23:30:32 +0000 (Sun, 19 Oct 2008)

Log Message:
-----------
Replace StringUtil.asPyString with Py.newString

Modified Paths:
--------------
    trunk/jython/Lib/javapath.py
    trunk/jython/Lib/os.py
    trunk/jython/Lib/socket.py
    trunk/jython/src/org/python/core/util/StringUtil.java

Modified: trunk/jython/Lib/javapath.py
===================================================================
--- trunk/jython/Lib/javapath.py	2008-10-19 23:18:22 UTC (rev 5472)
+++ trunk/jython/Lib/javapath.py	2008-10-19 23:30:32 UTC (rev 5473)
@@ -20,7 +20,7 @@
 from java.lang import System
 import os
 
-from org.python.core.util.StringUtil import asPyString
+from org.python.core.Py import newString as asPyString
 
 
 def _tostr(s, method):

Modified: trunk/jython/Lib/os.py
===================================================================
--- trunk/jython/Lib/os.py	2008-10-19 23:18:22 UTC (rev 5472)
+++ trunk/jython/Lib/os.py	2008-10-19 23:30:32 UTC (rev 5473)
@@ -48,7 +48,7 @@
 from java.io import File
 from org.python.core import PyFile
 from org.python.core.io import FileDescriptors, FileIO, IOBase
-from org.python.core.util.StringUtil import asPyString
+from org.python.core.Py import newString as asPyString
 
 # Mapping of: os._name: [name list, shell command list]
 _os_map = dict(nt=[

Modified: trunk/jython/Lib/socket.py
===================================================================
--- trunk/jython/Lib/socket.py	2008-10-19 23:18:22 UTC (rev 5472)
+++ trunk/jython/Lib/socket.py	2008-10-19 23:30:32 UTC (rev 5473)
@@ -81,7 +81,7 @@
 import org.python.core.io.DatagramSocketIO
 import org.python.core.io.ServerSocketIO
 import org.python.core.io.SocketIO
-from org.python.core.util.StringUtil import asPyString
+from org.python.core.Py import newString as asPyString
 
 class error(Exception): pass
 class herror(error): pass

Modified: trunk/jython/src/org/python/core/util/StringUtil.java
===================================================================
--- trunk/jython/src/org/python/core/util/StringUtil.java	2008-10-19 23:18:22 UTC (rev 5472)
+++ trunk/jython/src/org/python/core/util/StringUtil.java	2008-10-19 23:30:32 UTC (rev 5473)
@@ -5,7 +5,6 @@
 import java.nio.ByteBuffer;
 
 import org.python.core.Py;
-import org.python.core.PyString;
 
 /**
  * String Utility methods.
@@ -84,8 +83,4 @@
         chars[0] = Character.toLowerCase(c0);
         return new String(chars);
     }
-
-    public static PyString asPyString(String string) {
-        return new PyString(string);
 }
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5475
          http://jython.svn.sourceforge.net/jython/?rev=5475&view=rev
Author:   cgroves
Date:     2008-10-20 01:01:39 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
Add an ant resource collection that's like union except it combines based on
the name of the resource instead of its full path.  Use this to exclude the
unexposed version of classes from jython.jar to keep it quiet.

Resource collections didn't appear until Ant 1.7, but that came out nearly 2
years ago, so I'm hoping most people already have it.

Modified Paths:
--------------
    trunk/jython/build.xml

Added Paths:
-----------
    trunk/jython/src/org/python/util/NameUnionAntType.java

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2008-10-20 00:44:52 UTC (rev 5474)
+++ trunk/jython/build.xml	2008-10-20 01:01:39 UTC (rev 5475)
@@ -549,9 +549,17 @@
     </target>
 
     <target name="jar" depends="compile,expose,jarjar">
-       <jar destfile="${dist.dir}/jython.jar" duplicate="preserve">
-          <fileset dir="${exposed.dir}"/>
-          <fileset dir="${compile.dir}"/>   
+       <typedef name="nameunion" classname="org.python.util.NameUnionAntType">
+           <classpath>
+               <path refid="main.classpath" />
+               <pathelement path="${compile.dir}" />
+           </classpath>
+       </typedef>
+       <jar destfile="${dist.dir}/jython.jar" duplicate="fail">
+          <nameunion>
+             <fileset dir="${exposed.dir}"/>
+             <fileset dir="${compile.dir}"/>   
+          </nameunion>
           <fileset dir="${jarjar.dir}">
               <include name="org/python/objectweb/asm/ClassReader.class" />
           </fileset>

Added: trunk/jython/src/org/python/util/NameUnionAntType.java
===================================================================
--- trunk/jython/src/org/python/util/NameUnionAntType.java	                        (rev 0)
+++ trunk/jython/src/org/python/util/NameUnionAntType.java	2008-10-20 01:01:39 UTC (rev 5475)
@@ -0,0 +1,35 @@
+package org.python.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.tools.ant.types.Resource;
+import org.apache.tools.ant.types.ResourceCollection;
+import org.apache.tools.ant.types.resources.BaseResourceCollectionContainer;
+
+/**
+ * Unions several resource collections by the name of their contained resources.
+ */
+public class NameUnionAntType extends BaseResourceCollectionContainer {
+    @SuppressWarnings("unchecked")
+    @Override
+    protected Collection<Resource> getCollection() {
+        List<ResourceCollection> collections = getResourceCollections();
+        // preserve order-encountered using a list; keep track of the items with a set
+        Set<String> seenNames = new HashSet<String>();
+        List<Resource> union = new ArrayList();
+        for (ResourceCollection rc : collections) {
+            for (Iterator<Resource> resources = rc.iterator(); resources.hasNext();) {
+                Resource r = resources.next();
+                if (seenNames.add(r.getName())) {
+                    union.add(r);
+                }
+            }
+        }
+        return union;
+    }
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5477
          http://jython.svn.sourceforge.net/jython/?rev=5477&view=rev
Author:   cgroves
Date:     2008-10-20 01:41:32 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
Move BaseTypeBuilder out of TypeExposer so the compile time bits of the exposing system can be excluded from jython.jar

Modified Paths:
--------------
    trunk/jython/build.xml
    trunk/jython/src/org/python/expose/generate/TypeExposer.java

Added Paths:
-----------
    trunk/jython/src/org/python/expose/BaseTypeBuilder.java

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2008-10-20 01:40:25 UTC (rev 5476)
+++ trunk/jython/build.xml	2008-10-20 01:41:32 UTC (rev 5477)
@@ -558,7 +558,7 @@
        <jar destfile="${dist.dir}/jython.jar" duplicate="fail">
           <nameunion>
              <fileset dir="${exposed.dir}"/>
-             <fileset dir="${compile.dir}"/>   
+             <fileset dir="${compile.dir}" excludes="org/python/expose/generate/**"/>   
           </nameunion>
           <fileset dir="${jarjar.dir}">
               <include name="org/python/objectweb/asm/ClassReader.class" />

Added: trunk/jython/src/org/python/expose/BaseTypeBuilder.java
===================================================================
--- trunk/jython/src/org/python/expose/BaseTypeBuilder.java	                        (rev 0)
+++ trunk/jython/src/org/python/expose/BaseTypeBuilder.java	2008-10-20 01:41:32 UTC (rev 5477)
@@ -0,0 +1,67 @@
+package org.python.expose;
+
+import org.python.core.PyBuiltinMethod;
+import org.python.core.PyDataDescr;
+import org.python.core.PyMethodDescr;
+import org.python.core.PyNewWrapper;
+import org.python.core.PyObject;
+import org.python.core.PyStringMap;
+import org.python.core.PyType;
+
+public class BaseTypeBuilder implements TypeBuilder {
+
+    private PyNewWrapper newWrapper;
+
+    private PyBuiltinMethod[] meths;
+
+    private PyDataDescr[] descrs;
+
+    private Class typeClass;
+
+    private Class baseClass;
+
+    private String name;
+
+    public BaseTypeBuilder(String name,
+                           Class typeClass,
+                           Class baseClass,
+                           PyBuiltinMethod[] meths,
+                           PyDataDescr[] descrs,
+                           PyNewWrapper newWrapper) {
+        this.typeClass = typeClass;
+        this.baseClass = baseClass;
+        this.name = name;
+        this.descrs = descrs;
+        this.meths = meths;
+        this.newWrapper = newWrapper;
+    }
+
+    public PyObject getDict(PyType type) {
+        PyObject dict = new PyStringMap();
+        for(PyBuiltinMethod func : meths) {
+            PyMethodDescr pmd = func.makeDescriptor(type);
+            dict.__setitem__(pmd.getName(), pmd);
+        }
+        for(PyDataDescr descr : descrs) {
+            descr.setType(type);
+            dict.__setitem__(descr.getName(), descr);
+        }
+        if(newWrapper != null) {
+            dict.__setitem__("__new__", newWrapper);
+            newWrapper.setWrappedType(type);
+        }
+        return dict;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Class getTypeClass() {
+        return typeClass;
+    }
+
+    public Class getBase() {
+        return baseClass;
+    }
+}
\ No newline at end of file

Modified: trunk/jython/src/org/python/expose/generate/TypeExposer.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/TypeExposer.java	2008-10-20 01:40:25 UTC (rev 5476)
+++ trunk/jython/src/org/python/expose/generate/TypeExposer.java	2008-10-20 01:41:32 UTC (rev 5477)
@@ -6,13 +6,7 @@
 
 import org.python.objectweb.asm.Type;
 import org.python.core.BytecodeLoader;
-import org.python.core.PyBuiltinMethod;
-import org.python.core.PyDataDescr;
-import org.python.core.PyMethodDescr;
-import org.python.core.PyNewWrapper;
-import org.python.core.PyObject;
-import org.python.core.PyStringMap;
-import org.python.core.PyType;
+import org.python.expose.BaseTypeBuilder;
 import org.python.expose.ExposedType;
 import org.python.expose.TypeBuilder;
 
@@ -144,62 +138,4 @@
         superConstructor(STRING, CLASS, CLASS, ABUILTIN_METHOD, ADATA_DESCR, PYNEWWRAPPER);
         endConstructor();
     }
-
-    protected static class BaseTypeBuilder implements TypeBuilder {
-
-        private PyNewWrapper newWrapper;
-
-        private PyBuiltinMethod[] meths;
-
-        private PyDataDescr[] descrs;
-
-        private Class typeClass;
-
-        private Class baseClass;
-
-        private String name;
-
-        public BaseTypeBuilder(String name,
-                               Class typeClass,
-                               Class baseClass,
-                               PyBuiltinMethod[] meths,
-                               PyDataDescr[] descrs,
-                               PyNewWrapper newWrapper) {
-            this.typeClass = typeClass;
-            this.baseClass = baseClass;
-            this.name = name;
-            this.descrs = descrs;
-            this.meths = meths;
-            this.newWrapper = newWrapper;
-        }
-
-        public PyObject getDict(PyType type) {
-            PyObject dict = new PyStringMap();
-            for(PyBuiltinMethod func : meths) {
-                PyMethodDescr pmd = func.makeDescriptor(type);
-                dict.__setitem__(pmd.getName(), pmd);
-            }
-            for(PyDataDescr descr : descrs) {
-                descr.setType(type);
-                dict.__setitem__(descr.getName(), descr);
-            }
-            if(newWrapper != null) {
-                dict.__setitem__("__new__", newWrapper);
-                newWrapper.setWrappedType(type);
-            }
-            return dict;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public Class getTypeClass() {
-            return typeClass;
-        }
-
-        public Class getBase() {
-            return baseClass;
-        }
-    }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5480
          http://jython.svn.sourceforge.net/jython/?rev=5480&view=rev
Author:   thobes
Date:     2008-10-20 11:13:38 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
Fixed the evaluation order bug made visual by test_generators.
Added a test file for evaluation order tests.

Modified Paths:
--------------
    trunk/jython/src/org/python/compiler/CodeCompiler.java

Added Paths:
-----------
    trunk/jython/Lib/test/test_evalorder.py

Added: trunk/jython/Lib/test/test_evalorder.py
===================================================================
--- trunk/jython/Lib/test/test_evalorder.py	                        (rev 0)
+++ trunk/jython/Lib/test/test_evalorder.py	2008-10-20 11:13:38 UTC (rev 5480)
@@ -0,0 +1,65 @@
+from unittest import TestCase
+from test import test_support
+
+class Bucket(object):
+    def __init__(self, value):
+        self.__value = value
+    def _get(self):
+        return self.__value
+    def _set(self, value):
+        assert self.__value == value, "Value changed!"
+    value = property(_get,_set)
+
+class PropBucket(object):
+    def __init__(self):
+        self.__dict__['_d'] = {}
+    def __getattr__(self, attr):
+        value = self._d.setdefault(attr, 0)
+        self._d[attr] = value + 1
+        return Bucket(value)
+    def __setattr__(self, attr, value):
+        value.append(attr)
+
+class EvaluationOrder(TestCase):
+    def test_TestFunctionality(self):
+        bucket = PropBucket()
+        try:
+            bucket.prop.value = bucket.prop.value + 0
+        except AssertionError:
+            pass
+        else:
+            assert False, "PropBucket is not working"
+    def test_augassign(self):
+        bucket = PropBucket()
+        bucket.prop.value += 0
+    def test_AssignOrder(self):
+        bucket = PropBucket()
+        expected = ['one','two','three']
+        result = []
+        bucket.one = bucket.two = bucket.three = result
+        assert result == expected, "expected %s, got %s" % (expected, result)
+    def test_operands(self):
+        m = [(2,), (1,)].pop
+        assert m() + m() == (1,2), "faulty operand order"
+    def test_arguments(self):
+        def one(a,b,c,d,*extra):
+            return reduce(lambda r,x: r+x,extra,a+b+c+d)
+        m = list((x,) for x in xrange(100,0,-1)).pop
+        value = one(m(),m(),m(),m())
+        assert value == (1,2,3,4), "simple call, got: %s " % (value,)
+        value = one(m(),m(),d=m(),c=m())
+        assert value == (5,6,8,7), "call with keywords, got: %s" % (value,)
+        value = one(m(),m(),m(),m(),m(),m())
+        assert value == (9,10,11,12,13,14), "long call, got: %s" % (value,)
+        value = one(m(),m(),*[m(),m(),m(),m()])
+        assert value == (15,16,17,18,19,20), "varcalls, got: %s" % (value,)
+        value = one(m(),m(),**dict(c=m(),d=m()))
+        assert value == (21,22,23,24), "varkeywordcall, got: %s" % (value,)
+        value = one(*[m(),m()],**dict(c=m(),d=m()))
+        assert value == (25,26,27,28), "bothvarcalls, got: %s" % (value,)
+
+def test_main():
+    test_support.run_unittest(EvaluationOrder)
+
+if __name__ == '__main__':
+    test_main()

Modified: trunk/jython/src/org/python/compiler/CodeCompiler.java
===================================================================
--- trunk/jython/src/org/python/compiler/CodeCompiler.java	2008-10-20 06:29:50 UTC (rev 5479)
+++ trunk/jython/src/org/python/compiler/CodeCompiler.java	2008-10-20 11:13:38 UTC (rev 5480)
@@ -457,13 +457,13 @@
         visit(node.value);
         if (node.targets.length == 1) {
             set(node.targets[0]);
-            return null;
+        } else {
+            int tmp = storeTop();
+            for (exprType target : node.targets) {
+                set(target, tmp);
+            }
+            code.freeLocal(tmp);
         }
-        int tmp = storeTop();
-        for (int i=node.targets.length-1; i>=0; i--) {
-            set(node.targets[i], tmp);
-        }
-        code.freeLocal(tmp);
         return null;
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5482
          http://jython.svn.sourceforge.net/jython/?rev=5482&view=rev
Author:   thobes
Date:     2008-10-20 17:19:57 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
Added support for class decorators.
The test file added for this (test_classdecorators) should be removed when we
import test_decorators from CPython 3.x, because that is where the caes come
from. This is also documented in that file.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_ast.py
    trunk/jython/ast/Python.asdl
    trunk/jython/grammar/Python.g
    trunk/jython/grammar/PythonPartial.g
    trunk/jython/src/org/python/antlr/GrammarActions.java
    trunk/jython/src/org/python/antlr/ast/ClassDef.java
    trunk/jython/src/org/python/compiler/CodeCompiler.java

Added Paths:
-----------
    trunk/jython/Lib/test/test_classdecorators.py

Modified: trunk/jython/Lib/test/test_ast.py
===================================================================
--- trunk/jython/Lib/test/test_ast.py	2008-10-20 11:50:13 UTC (rev 5481)
+++ trunk/jython/Lib/test/test_ast.py	2008-10-20 17:19:57 UTC (rev 5482)
@@ -168,14 +168,15 @@
                                 (eval_tests, eval_results, "eval")):
         for i, o in itertools.izip(input, output):
             ast_tree = compile(i, "?", kind, 0x400)
-            assert to_tuple(ast_tree) == o
+            assert to_tuple(ast_tree) == o, "expected %s, got %s" % (
+                o, to_tuple(ast_tree))
             test_order(ast_tree, (0, 0))
 
 # XXX: AugStore added for Jython.  Short term it is too hard to emit just "Store" as CPython does.
 #### EVERYTHING BELOW IS GENERATED #####
 exec_results = [
 ('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [], None, None, []), [('Pass', (1, 9))], [])]),
-('Module', [('ClassDef', (1, 0), 'C', [], [('Pass', (1, 8))])]),
+('Module', [('ClassDef', (1, 0), 'C', [], [('Pass', (1, 8))],[])]),
 ('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [], None, None, []), [('Return', (1, 8), ('Num', (1, 15), 1))], [])]),
 ('Module', [('Delete', (1, 0), [('Name', (1, 4), 'v', ('Del',))])]),
 ('Module', [('Assign', (1, 0), [('Name', (1, 0), 'v', ('Store',))], ('Num', (1, 4), 1))]),

Added: trunk/jython/Lib/test/test_classdecorators.py
===================================================================
--- trunk/jython/Lib/test/test_classdecorators.py	                        (rev 0)
+++ trunk/jython/Lib/test/test_classdecorators.py	2008-10-20 17:19:57 UTC (rev 5482)
@@ -0,0 +1,46 @@
+# This test is temporary until we can import test_decorators from CPython 3.x
+# The reason for not doing that already is that in Python 3.x the name of a
+# function is stored in func.__name__, in 2.x it's func.func_name
+import unittest
+from test import test_support
+
+class TestClassDecorators(unittest.TestCase):
+
+    def test_simple(self):
+        def plain(x):
+            x.extra = 'Hello'
+            return x
+        @plain
+        class C(object): pass
+        self.assertEqual(C.extra, 'Hello')
+
+    def test_double(self):
+        def ten(x):
+            x.extra = 10
+            return x
+        def add_five(x):
+            x.extra += 5
+            return x
+
+        @add_five
+        @ten
+        class C(object): pass
+        self.assertEqual(C.extra, 15)
+
+    def test_order(self):
+        def applied_first(x):
+            x.extra = 'first'
+            return x
+        def applied_second(x):
+            x.extra = 'second'
+            return x
+        @applied_second
+        @applied_first
+        class C(object): pass
+        self.assertEqual(C.extra, 'second')
+
+def test_main():
+    test_support.run_unittest(TestClassDecorators)
+
+if __name__ == '__main__':
+    test_main()

Modified: trunk/jython/ast/Python.asdl
===================================================================
--- trunk/jython/ast/Python.asdl	2008-10-20 11:50:13 UTC (rev 5481)
+++ trunk/jython/ast/Python.asdl	2008-10-20 17:19:57 UTC (rev 5482)
@@ -11,7 +11,8 @@
 
 	stmt = FunctionDef(identifier name, arguments args, 
                            stmt* body, expr* decorators)
-	      | ClassDef(identifier name, expr* bases, stmt* body)
+	      | ClassDef(identifier name, expr* bases,
+                         stmt* body, expr* decorators)
 	      | Return(expr? value)
 
 	      | Delete(expr* targets)

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2008-10-20 11:50:13 UTC (rev 5481)
+++ trunk/jython/grammar/Python.g	2008-10-20 17:19:57 UTC (rev 5482)
@@ -800,7 +800,7 @@
     | for_stmt
     | try_stmt
     | with_stmt
-    | funcdef
+    | (decorators? DEF) => funcdef
     | classdef
     ;
 
@@ -1421,10 +1421,16 @@
 @after {
    $classdef.tree = stype;
 }
-    : CLASS NAME (LPAREN testlist[expr_contextType.Load]? RPAREN)? COLON suite[false]
+    : decorators? CLASS NAME (LPAREN testlist[expr_contextType.Load]? RPAREN)? COLON suite[false]
       {
-          stype = new ClassDef($CLASS, actions.cantBeNone($NAME), actions.makeBases(actions.castExpr($testlist.tree)),
-              actions.castStmts($suite.stypes));
+          Token t = $CLASS;
+          if ($decorators.start != null) {
+              t = $decorators.start;
+          }
+          stype = new ClassDef(t, actions.cantBeNone($NAME),
+              actions.makeBases(actions.castExpr($testlist.tree)),
+              actions.castStmts($suite.stypes),
+              actions.castExprs($decorators.etypes));
       }
     ;
 

Modified: trunk/jython/grammar/PythonPartial.g
===================================================================
--- trunk/jython/grammar/PythonPartial.g	2008-10-20 11:50:13 UTC (rev 5481)
+++ trunk/jython/grammar/PythonPartial.g	2008-10-20 17:19:57 UTC (rev 5482)
@@ -298,7 +298,7 @@
               | for_stmt
               | try_stmt
               | with_stmt
-              | funcdef
+              | (decorators? DEF) => funcdef
               | classdef
               ;
 
@@ -455,7 +455,7 @@
 dictmaker : test COLON test (options {k=2;}:COMMA test COLON test)* (COMMA)?
           ;
 
-classdef: CLASS NAME (LPAREN testlist? RPAREN)? COLON suite
+classdef: decorators? CLASS NAME (LPAREN testlist? RPAREN)? COLON suite
         ;
 
 arglist : argument (COMMA argument)*

Modified: trunk/jython/src/org/python/antlr/GrammarActions.java
===================================================================
--- trunk/jython/src/org/python/antlr/GrammarActions.java	2008-10-20 11:50:13 UTC (rev 5481)
+++ trunk/jython/src/org/python/antlr/GrammarActions.java	2008-10-20 17:19:57 UTC (rev 5482)
@@ -489,14 +489,15 @@
         return new Interactive(t, s);
     }
 
-    stmtType makeClassDef(PythonTree t, PythonTree nameToken, List bases, List body) {
+    stmtType makeClassDef(PythonTree t, PythonTree nameToken, List bases, List body, List decorators) {
         if (nameToken == null) {
             return errorHandler.errorStmt(t);
         }
         cantBeNone(nameToken);
         exprType[] b = castExprs(bases);
         stmtType[] s = castStmts(body);
-        return new ClassDef(t, nameToken.getText(), b, s);
+	exprType[] d = castExprs(decorators);
+        return new ClassDef(t, nameToken.getText(), b, s, d);
     }
 
     stmtType makeTryExcept(PythonTree t, List body, List handlers, List orelse, List finBody) {

Modified: trunk/jython/src/org/python/antlr/ast/ClassDef.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ClassDef.java	2008-10-20 11:50:13 UTC (rev 5481)
+++ trunk/jython/src/org/python/antlr/ast/ClassDef.java	2008-10-20 17:19:57 UTC (rev 5482)
@@ -10,11 +10,13 @@
     public String name;
     public exprType[] bases;
     public stmtType[] body;
+    public exprType[] decorators;
 
-    public static final String[] _fields = new String[] {"name","bases","body"};
+    public static final String[] _fields = new String[]
+    {"name","bases","body","decorators"};
 
     public ClassDef(Token token, String name, exprType[] bases, stmtType[]
-    body) {
+    body, exprType[] decorators) {
         super(token);
         this.name = name;
         this.bases = bases;
@@ -29,10 +31,16 @@
                 addChild(body[ibody]);
             }
         }
+        this.decorators = decorators;
+        if (decorators != null) {
+            for(int idecorators=0;idecorators<decorators.length;idecorators++) {
+                addChild(decorators[idecorators]);
+            }
+        }
     }
 
     public ClassDef(int ttype, Token token, String name, exprType[] bases,
-    stmtType[] body) {
+    stmtType[] body, exprType[] decorators) {
         super(ttype, token);
         this.name = name;
         this.bases = bases;
@@ -47,10 +55,16 @@
                 addChild(body[ibody]);
             }
         }
+        this.decorators = decorators;
+        if (decorators != null) {
+            for(int idecorators=0;idecorators<decorators.length;idecorators++) {
+                addChild(decorators[idecorators]);
+            }
+        }
     }
 
     public ClassDef(PythonTree tree, String name, exprType[] bases, stmtType[]
-    body) {
+    body, exprType[] decorators) {
         super(tree);
         this.name = name;
         this.bases = bases;
@@ -65,6 +79,12 @@
                 addChild(body[ibody]);
             }
         }
+        this.decorators = decorators;
+        if (decorators != null) {
+            for(int idecorators=0;idecorators<decorators.length;idecorators++) {
+                addChild(decorators[idecorators]);
+            }
+        }
     }
 
     public String toString() {
@@ -82,6 +102,9 @@
         sb.append("body=");
         sb.append(dumpThis(body));
         sb.append(",");
+        sb.append("decorators=");
+        sb.append(dumpThis(decorators));
+        sb.append(",");
         sb.append(")");
         return sb.toString();
     }
@@ -103,6 +126,12 @@
                     body[i].accept(visitor);
             }
         }
+        if (decorators != null) {
+            for (int i = 0; i < decorators.length; i++) {
+                if (decorators[i] != null)
+                    decorators[i].accept(visitor);
+            }
+        }
     }
 
     public int getLineno() {

Modified: trunk/jython/src/org/python/compiler/CodeCompiler.java
===================================================================
--- trunk/jython/src/org/python/compiler/CodeCompiler.java	2008-10-20 11:50:13 UTC (rev 5481)
+++ trunk/jython/src/org/python/compiler/CodeCompiler.java	2008-10-20 17:19:57 UTC (rev 5482)
@@ -422,19 +422,18 @@
         }
 
         set(new Name(node, node.name, expr_contextType.Store));
-        doDecorators(node);
+        doDecorators(node, node.decorators, node.name);
         return null;
     }
 
-    private void doDecorators(FunctionDef func) throws Exception {
-        if (func.decorators.length > 0) {
-            exprType currentExpr = new Name(func, func.name, expr_contextType.Load);
-            exprType[] decs = func.decorators;
+    private void doDecorators(stmtType node, exprType[] decs, String name) throws Exception {
+        if (decs.length > 0) {
+            exprType currentExpr = new Name(node, name, expr_contextType.Load);
             for (int i=decs.length - 1;i > -1;i--) {
-                currentExpr = new Call(func, decs[i], new exprType[]{currentExpr}, new keywordType[0], null, null);
+                currentExpr = new Call(node, decs[i], new exprType[]{currentExpr}, new keywordType[0], null, null);
             }
             visit(currentExpr);
-            set(new Name(func, func.name, expr_contextType.Store));
+            set(new Name(node, name, expr_contextType.Store));
         }
     }
 
@@ -2007,6 +2006,7 @@
 
         //Assign this new class to the given name
         set(new Name(node, node.name, expr_contextType.Store));
+        doDecorators(node, node.decorators, node.name);
         return null;
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5485
          http://jython.svn.sourceforge.net/jython/?rev=5485&view=rev
Author:   pjenvey
Date:     2008-10-20 21:18:08 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
o delete references to test.test_ modules in the test package after running
them to conserve memory
o bump ant regrtest's heap to 144m which is about the minimum needed for
Apple's 64 bit Java 6 (server VM)

Modified Paths:
--------------
    trunk/jython/Lib/test/regrtest.py
    trunk/jython/build.xml

Modified: trunk/jython/Lib/test/regrtest.py
===================================================================
--- trunk/jython/Lib/test/regrtest.py	2008-10-20 20:05:02 UTC (rev 5484)
+++ trunk/jython/Lib/test/regrtest.py	2008-10-20 21:18:08 UTC (rev 5485)
@@ -168,6 +168,7 @@
         newsoft = min(hard, max(soft, 1024*2048))
         resource.setrlimit(resource.RLIMIT_STACK, (newsoft, hard))
 
+import test as _test
 from test import test_support
 
 RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network', 'bsddb',
@@ -416,6 +417,9 @@
         for module in sys.modules.keys():
             if module not in save_modules and module.startswith("test."):
                 test_support.unload(module)
+                module = module[5:]
+                if hasattr(_test, module):
+                    delattr(_test, module)
 
     # The lists won't be sorted if running with -r
     good.sort()

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2008-10-20 20:05:02 UTC (rev 5484)
+++ trunk/jython/build.xml	2008-10-20 21:18:08 UTC (rev 5485)
@@ -171,7 +171,9 @@
             <pathelement path="${exposed.dir}" />
             <pathelement path="${compile.dir}" />
         </path>
-        <property name="regrtest.Xmx" value="-Xmx96m" />
+        <!-- 64 bit Java 6 needs about 96m for regrtest on most platforms, but Apple's needs
+         144m -->
+        <property name="regrtest.Xmx" value="-Xmx144m" />
     </target>
 
     <target name="version-init">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5489
          http://jython.svn.sourceforge.net/jython/?rev=5489&view=rev
Author:   fwierzbicki
Date:     2008-10-21 00:21:45 +0000 (Tue, 21 Oct 2008)

Log Message:
-----------
moved test138 to test_str_jy.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_str_jy.py

Removed Paths:
-------------
    trunk/jython/bugtests/test138.py

Modified: trunk/jython/Lib/test/test_str_jy.py
===================================================================
--- trunk/jython/Lib/test/test_str_jy.py	2008-10-20 23:54:14 UTC (rev 5488)
+++ trunk/jython/Lib/test/test_str_jy.py	2008-10-21 00:21:45 UTC (rev 5489)
@@ -130,6 +130,12 @@
         self.assertEqual(repr(test2), '"\'bar"')
         self.assertEqual(repr(unicode(test2)), 'u"\'bar"')
 
+    def test_startswith(self):
+        #from bugtests -- maybe making sure methods are case sensative?
+        msg = 'This is a test.'
+        self.assertRaises(AttributeError, getattr, msg, "startsWith")
+        assert msg.startswith('This')
+
 def test_main():
     test_support.run_unittest(WrappedStrCmpTest,
         IntToStrTest,

Deleted: trunk/jython/bugtests/test138.py
===================================================================
--- trunk/jython/bugtests/test138.py	2008-10-20 23:54:14 UTC (rev 5488)
+++ trunk/jython/bugtests/test138.py	2008-10-21 00:21:45 UTC (rev 5489)
@@ -1,17 +0,0 @@
-"""
-
-"""
-
-import support
-
-msg = 'This is a test.'
-
-try:
-    msg.startsWith('This')
-except AttributeError, e:
-    pass
-else:
-    raise support.TestError("startsWith should not be defined")
-
-if not msg.startswith('This'):
-    raise support.TestError("startswith error")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5498
          http://jython.svn.sourceforge.net/jython/?rev=5498&view=rev
Author:   pjenvey
Date:     2008-10-21 18:44:08 +0000 (Tue, 21 Oct 2008)

Log Message:
-----------
IOErrors are expected for unsupported file operations, instead of TypeErrors

Modified Paths:
--------------
    trunk/jython/Lib/test/test_java_integration.py
    trunk/jython/src/org/python/core/io/IOBase.java

Modified: trunk/jython/Lib/test/test_java_integration.py
===================================================================
--- trunk/jython/Lib/test/test_java_integration.py	2008-10-21 10:53:16 UTC (rev 5497)
+++ trunk/jython/Lib/test/test_java_integration.py	2008-10-21 18:44:08 UTC (rev 5498)
@@ -154,6 +154,10 @@
         from java.io import FileInputStream, FileNotFoundException
         self.assertRaises(FileNotFoundException, FileInputStream, "garbage")
 
+    def test_unsupported(self):
+        fp = open(System.out)
+        self.assertRaises(IOError, fp.tell)
+
 class VectorTest(unittest.TestCase):
 
     def test_looping(self):

Modified: trunk/jython/src/org/python/core/io/IOBase.java
===================================================================
--- trunk/jython/src/org/python/core/io/IOBase.java	2008-10-21 10:53:16 UTC (rev 5497)
+++ trunk/jython/src/org/python/core/io/IOBase.java	2008-10-21 18:44:08 UTC (rev 5498)
@@ -210,6 +210,6 @@
     protected void unsupported(String methodName) {
         String qualifiedName = getClass().getName();
         String className = qualifiedName.substring(qualifiedName.lastIndexOf('.') + 1);
-        throw Py.TypeError(String.format("%s.%s() not supported", className, methodName));
+        throw Py.IOError(String.format("%s.%s() not supported", className, methodName));
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5499
          http://jython.svn.sourceforge.net/jython/?rev=5499&view=rev
Author:   fwierzbicki
Date:     2008-10-21 20:02:03 +0000 (Tue, 21 Oct 2008)

Log Message:
-----------
Allow error handling to be customized in the case of token mismatch calls
during parsing.

Modified Paths:
--------------
    trunk/jython/grammar/Python.g
    trunk/jython/src/org/python/antlr/ErrorHandler.java
    trunk/jython/src/org/python/antlr/FailFastHandler.java
    trunk/jython/src/org/python/antlr/ListErrorHandler.java

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2008-10-21 18:44:08 UTC (rev 5498)
+++ trunk/jython/grammar/Python.g	2008-10-21 20:02:03 UTC (rev 5499)
@@ -165,21 +165,19 @@
     }
 
     protected void mismatch(IntStream input, int ttype, BitSet follow) throws RecognitionException {
-        if (errorHandler.isRecoverable()) {
+        if (errorHandler.mismatch(this, input, ttype, follow)) {
             super.mismatch(input, ttype, follow);
-        } else {
-            throw new MismatchedTokenException(ttype, input);
         }
     }
 
     protected Object recoverFromMismatchedToken(IntStream input, int ttype, BitSet follow)
-        throws RecognitionException
-    {
-        if (errorHandler.isRecoverable()) {
-            return super.recoverFromMismatchedToken(input, ttype, follow);
+        throws RecognitionException {
+
+        Object o = errorHandler.recoverFromMismatchedToken(this, input, ttype, follow);
+        if (o != null) {
+            return o;
         }
-        mismatch(input, ttype, follow);
-        return null;
+        return super.recoverFromMismatchedToken(input, ttype, follow);
     }
 
 }

Modified: trunk/jython/src/org/python/antlr/ErrorHandler.java
===================================================================
--- trunk/jython/src/org/python/antlr/ErrorHandler.java	2008-10-21 18:44:08 UTC (rev 5498)
+++ trunk/jython/src/org/python/antlr/ErrorHandler.java	2008-10-21 20:02:03 UTC (rev 5499)
@@ -1,6 +1,7 @@
 package org.python.antlr;
 
 import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.BitSet;
 import org.antlr.runtime.IntStream;
 import org.antlr.runtime.Lexer;
 import org.antlr.runtime.RecognitionException;
@@ -13,7 +14,19 @@
     void reportError(BaseRecognizer br, RecognitionException re);
     void recover(BaseRecognizer br, IntStream input, RecognitionException re);
     void recover(Lexer lex, RecognitionException re);
-    boolean isRecoverable();
+
+    /**
+     * @return True if the caller should handle the mismatch
+     */
+    boolean mismatch(BaseRecognizer br, IntStream input, int ttype, BitSet follow)
+        throws RecognitionException;
+
+    /**
+     * @return null if the caller should handle the mismatch
+     */
+    Object recoverFromMismatchedToken(BaseRecognizer br, IntStream input, int ttype, BitSet follow)
+        throws RecognitionException;
+
     //exprType, modType, sliceType, stmtType
     exprType errorExpr(PythonTree t);
     modType errorMod(PythonTree t);

Modified: trunk/jython/src/org/python/antlr/FailFastHandler.java
===================================================================
--- trunk/jython/src/org/python/antlr/FailFastHandler.java	2008-10-21 18:44:08 UTC (rev 5498)
+++ trunk/jython/src/org/python/antlr/FailFastHandler.java	2008-10-21 20:02:03 UTC (rev 5499)
@@ -1,8 +1,10 @@
 package org.python.antlr;
 
 import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.BitSet;
 import org.antlr.runtime.IntStream;
 import org.antlr.runtime.Lexer;
+import org.antlr.runtime.MismatchedTokenException;
 import org.antlr.runtime.RecognitionException;
 import org.python.antlr.ast.ErrorMod;
 import org.python.antlr.ast.exprType;
@@ -27,10 +29,17 @@
         throw new ParseException(message(br,re), re);
     }
 
-    public boolean isRecoverable() {
-        return false;
+    public boolean mismatch(BaseRecognizer br, IntStream input, int ttype, BitSet follow)
+        throws RecognitionException {
+
+        throw new MismatchedTokenException(ttype, input);
     }
 
+    public Object recoverFromMismatchedToken(BaseRecognizer br, IntStream input, int ttype,
+            BitSet follow) throws RecognitionException {
+        throw new MismatchedTokenException(ttype, input);
+    }
+
     public exprType errorExpr(PythonTree t) {
         throw new ParseException("Bad Expr Node", t);
     }

Modified: trunk/jython/src/org/python/antlr/ListErrorHandler.java
===================================================================
--- trunk/jython/src/org/python/antlr/ListErrorHandler.java	2008-10-21 18:44:08 UTC (rev 5498)
+++ trunk/jython/src/org/python/antlr/ListErrorHandler.java	2008-10-21 20:02:03 UTC (rev 5499)
@@ -1,6 +1,7 @@
 package org.python.antlr;
 
 import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.BitSet;
 import org.antlr.runtime.IntStream;
 import org.antlr.runtime.Lexer;
 import org.antlr.runtime.RecognitionException;
@@ -27,10 +28,14 @@
         br.recover(input, re);
     }
 
-    public boolean isRecoverable() {
+    public boolean mismatch(BaseRecognizer br, IntStream input, int ttype, BitSet follow) {
         return true;
     }
 
+    public Object recoverFromMismatchedToken(BaseRecognizer br, IntStream input, int ttype, BitSet follow) {
+        return null;
+    }
+
     public exprType errorExpr(PythonTree t) {
         return new ErrorExpr(t);
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5504
          http://jython.svn.sourceforge.net/jython/?rev=5504&view=rev
Author:   cgroves
Date:     2008-10-22 08:27:42 +0000 (Wed, 22 Oct 2008)

Log Message:
-----------
Expose PyGenerator so we can control the visibility of gi_running.
test_generators checks on __doc__ from next on generators, so this commit adds
docstrings to exposed methods to satisfy that requirement.

Modified Paths:
--------------
    trunk/jython/CoreExposed.includes
    trunk/jython/src/org/python/core/PyBuiltinCallable.java
    trunk/jython/src/org/python/core/PyBuiltinFunction.java
    trunk/jython/src/org/python/core/PyGenerator.java
    trunk/jython/src/org/python/core/PyIterator.java
    trunk/jython/src/org/python/core/PyObject.java
    trunk/jython/src/org/python/expose/ExposedMethod.java
    trunk/jython/src/org/python/expose/generate/ClassMethodExposer.java
    trunk/jython/src/org/python/expose/generate/ExposedMethodFinder.java
    trunk/jython/src/org/python/expose/generate/InstanceMethodExposer.java
    trunk/jython/src/org/python/expose/generate/MethodExposer.java
    trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java

Modified: trunk/jython/CoreExposed.includes
===================================================================
--- trunk/jython/CoreExposed.includes	2008-10-22 04:53:59 UTC (rev 5503)
+++ trunk/jython/CoreExposed.includes	2008-10-22 08:27:42 UTC (rev 5504)
@@ -16,6 +16,7 @@
 org/python/core/PyFloat.class
 org/python/core/PyFrozenSet.class
 org/python/core/PyFunction.class
+org/python/core/PyGenerator.class
 org/python/core/PyInteger.class
 org/python/core/PyList.class
 org/python/core/PyLong.class

Modified: trunk/jython/src/org/python/core/PyBuiltinCallable.java
===================================================================
--- trunk/jython/src/org/python/core/PyBuiltinCallable.java	2008-10-22 04:53:59 UTC (rev 5503)
+++ trunk/jython/src/org/python/core/PyBuiltinCallable.java	2008-10-22 08:27:42 UTC (rev 5504)
@@ -9,6 +9,8 @@
 
     protected Info info;
 
+    protected String doc;
+
     protected PyBuiltinCallable(PyType type, Info info) {
         super(type);
         this.info = info;
@@ -29,8 +31,8 @@
     }
 
     @ExposedGet(name = "__doc__")
-    public PyObject fastGetDoc() {
-        return Py.None;
+    public String fastGetDoc() {
+        return doc;
     }
 
     @ExposedGet(name = "__module__")

Modified: trunk/jython/src/org/python/core/PyBuiltinFunction.java
===================================================================
--- trunk/jython/src/org/python/core/PyBuiltinFunction.java	2008-10-22 04:53:59 UTC (rev 5503)
+++ trunk/jython/src/org/python/core/PyBuiltinFunction.java	2008-10-22 08:27:42 UTC (rev 5504)
@@ -4,21 +4,15 @@
 
 public class PyBuiltinFunction extends PyBuiltinCallable implements ExposeAsSuperclass {
 
-    private PyString doc;
-
     protected PyBuiltinFunction(String name, String doc) {
         this(name, -1, -1, doc);
     }
 
     protected PyBuiltinFunction(String name, int minargs, int maxargs, String doc) {
         super(new DefaultInfo(name, minargs, maxargs));
-        this.doc = doc == null ? null : Py.newString(doc);
+        this.doc = doc == null ? null : doc;
     }
 
-    public PyObject fastGetDoc() {
-        return doc;
-    }
-
     public boolean isMappingType() {
         return false;
     }

Modified: trunk/jython/src/org/python/core/PyGenerator.java
===================================================================
--- trunk/jython/src/org/python/core/PyGenerator.java	2008-10-22 04:53:59 UTC (rev 5503)
+++ trunk/jython/src/org/python/core/PyGenerator.java	2008-10-22 08:27:42 UTC (rev 5504)
@@ -1,39 +1,33 @@
-// Copyright 2002 Finn Bock
-
 package org.python.core;
 
+import org.python.expose.ExposedGet;
+import org.python.expose.ExposedMethod;
+import org.python.expose.ExposedType;
+
+@ExposedType(name="generator", base=PyObject.class)
 public class PyGenerator extends PyIterator {
-    public PyFrame gi_frame;
-    PyObject closure;
-    public boolean gi_running;
+
+    @ExposedGet
+    protected PyFrame gi_frame;
+
+    @ExposedGet
+    protected boolean gi_running;
+
     private PyException generatorExit;
 
+    private PyObject closure;
+
     public PyGenerator(PyFrame frame, PyObject closure) {
-        this.gi_frame = frame;
+        gi_frame = frame;
         this.closure = closure;
-        this.gi_running = false;
-        // Create an exception instance while we have a frame to create it from.
-        // When the GC runs it doesn't have any associated thread state.
-        // this is necessary for finalize calling close on the generator
-        this.generatorExit = Py.makeException(Py.GeneratorExit);
-    }
 
-    private static final String[] __members__ = {
-        "close", "gi_frame", "gi_running", "next", "send", "throw"
-    };
-
-    public PyObject __dir__() {
-        PyString members[] = new PyString[__members__.length];
-        for (int i = 0; i < __members__.length; i++)
-            members[i] = new PyString(__members__[i]);
-        PyList ret = new PyList(members);
-        PyDictionary accum = new PyDictionary();
-        addKeys(accum, "__dict__");
-        ret.extend(accum.keys());
-        ret.sort();
-        return ret;
+        // Create an exception instance while we have a frame to create it from. When the GC runs it
+        // doesn't have any associated thread state. this is necessary for finalize calling close on
+        // the generator
+        generatorExit = Py.makeException(Py.GeneratorExit);
     }
 
+    @ExposedMethod
     public PyObject send(PyObject value) {
         if (gi_frame == null) {
             throw Py.StopIteration("");
@@ -45,26 +39,12 @@
         return next();
     }
 
-    private PyObject raiseException(PyException ex) {
-        if (gi_frame == null || gi_frame.f_lasti == 0) {
-            throw ex;
-        }
-        gi_frame.setGeneratorInput(ex);
-        return next();
-    }
-
-    public PyObject throw$(PyObject type) {
-        return raiseException(Py.makeException(type));
-    }
-
-    public PyObject throw$(PyObject type, PyObject value) {
-        return raiseException(Py.makeException(type, value));
-    }
-
+    @ExposedMethod(names="throw", defaults={"null", "null"})
     public PyObject throw$(PyObject type, PyObject value, PyTraceback tb) {
         return raiseException(Py.makeException(type, value, tb));
     }
 
+    @ExposedMethod
     public PyObject close() {
         try {
             raiseException(generatorExit);
@@ -77,25 +57,43 @@
         return Py.None;
     }
 
+    @Override
+    @ExposedMethod(doc="x.next() -> the next value, or raise StopIteration")
+    public PyObject next() {
+        return super.next();
+    }
+
+    @Override
+    @ExposedMethod
+    public PyObject __iter__() {
+        return this;
+    }
+
+    private PyObject raiseException(PyException ex) {
+        if (gi_frame == null || gi_frame.f_lasti == 0) {
+            throw ex;
+        }
+        gi_frame.setGeneratorInput(ex);
+        return next();
+    }
+
+    @Override
     protected void finalize() throws Throwable {
-        if (gi_frame == null || gi_frame.f_lasti == -1) 
+        if (gi_frame == null || gi_frame.f_lasti == -1)
             return;
         try {
             close();
         } catch (PyException e) {
             // PEP 342 specifies that if an exception is raised by close,
-            // we output to stderr and then forget about it;           
+            // we output to stderr and then forget about it;
             String className =  PyException.exceptionClassName(e.type);
             int lastDot = className.lastIndexOf('.');
             if (lastDot != -1) {
                 className = className.substring(lastDot + 1);
             }
-            PyString m = Py.newString(
-                    String.format("Exception %s: %s in %s",
-                    className,
-                    e.value.__repr__().toString(),
-                    this.__repr__().toString()));
-            Py.println(Py.getSystemState().stderr, m);
+            String msg = String.format("Exception %s: %s in %s", className, e.value.__repr__()
+                    .toString(), __repr__().toString());
+            Py.println(Py.getSystemState().stderr, Py.newString(msg));
         } catch (Throwable e) {
             // but we currently ignore any Java exception completely. perhaps we
             // can also output something meaningful too?
@@ -110,7 +108,7 @@
         if (gi_frame == null) {
             return null;
         }
-            
+
         if (gi_frame.f_lasti == -1) {
             gi_frame = null;
             return null;

Modified: trunk/jython/src/org/python/core/PyIterator.java
===================================================================
--- trunk/jython/src/org/python/core/PyIterator.java	2008-10-22 04:53:59 UTC (rev 5503)
+++ trunk/jython/src/org/python/core/PyIterator.java	2008-10-22 08:27:42 UTC (rev 5504)
@@ -28,9 +28,8 @@
         return this;
     }
 
-    public static PyString __doc__next = new PyString(
-        "x.next() -> the next value, or raise StopIteration"
-    );
+    public static PyString __doc__next =
+        new PyString("x.next() -> the next value, or raise StopIteration");
 
     /**
      * The exposed next method.

Modified: trunk/jython/src/org/python/core/PyObject.java
===================================================================
--- trunk/jython/src/org/python/core/PyObject.java	2008-10-22 04:53:59 UTC (rev 5503)
+++ trunk/jython/src/org/python/core/PyObject.java	2008-10-22 08:27:42 UTC (rev 5504)
@@ -3539,7 +3539,9 @@
     }
 
     public void __set__(PyObject obj, PyObject value) {
-        throw Py.AttributeError("object internal __set__ impl is abstract");
+        if (!_doset(obj, value)) {
+            throw Py.AttributeError("object internal __set__ impl is abstract");
+        }
     }
 
     public void __delete__(PyObject obj) {

Modified: trunk/jython/src/org/python/expose/ExposedMethod.java
===================================================================
--- trunk/jython/src/org/python/expose/ExposedMethod.java	2008-10-22 04:53:59 UTC (rev 5503)
+++ trunk/jython/src/org/python/expose/ExposedMethod.java	2008-10-22 08:27:42 UTC (rev 5504)
@@ -7,24 +7,29 @@
 
 /**
  * Indicates a method should be exposed to Python code.
- * 
+ *
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface ExposedMethod {
 
     /**
-     * @return the names to expose this method as. Defaults to just actual name of the method.
+     * Returns the names to expose this method as. Defaults to the name of the method.
      */
     String[] names() default {};
 
     /**
-     * @return default arguments. Starts at the number of arguments - defaults.length.
+     * Returns default arguments. Starts at the number of arguments - defaults.length.
      */
     String[] defaults() default {};
 
     /**
-     * @return - how to expose this method. See {@link MethodType} for the options.
+     * Returns how to expose this method. See {@link MethodType} for the options.
      */
     MethodType type() default MethodType.DEFAULT;
-}
+
+    /**
+     * Returns the __doc__ String for this method.
+     */
+    String doc() default "";
+}
\ No newline at end of file

Modified: trunk/jython/src/org/python/expose/generate/ClassMethodExposer.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/ClassMethodExposer.java	2008-10-22 04:53:59 UTC (rev 5503)
+++ trunk/jython/src/org/python/expose/generate/ClassMethodExposer.java	2008-10-22 08:27:42 UTC (rev 5504)
@@ -2,7 +2,6 @@
 
 import org.python.objectweb.asm.Type;
 import org.python.core.PyBuiltinClassMethodNarrow;
-import org.python.core.PyBuiltinMethodNarrow;
 
 public class ClassMethodExposer extends MethodExposer {
 
@@ -14,7 +13,8 @@
                               String desc,
                               String typeName,
                               String[] asNames,
-                              String[] defaults) {
+                              String[] defaults,
+                              String doc) {
         super(onType,
               methodName,
               getArgs(onType, methodName, desc),
@@ -22,7 +22,8 @@
               typeName,
               asNames,
               defaults,
-              PyBuiltinClassMethodNarrow.class);
+              PyBuiltinClassMethodNarrow.class,
+              doc);
         actualArgs = Type.getArgumentTypes(desc);
     }
 

Modified: trunk/jython/src/org/python/expose/generate/ExposedMethodFinder.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/ExposedMethodFinder.java	2008-10-22 04:53:59 UTC (rev 5503)
+++ trunk/jython/src/org/python/expose/generate/ExposedMethodFinder.java	2008-10-22 08:27:42 UTC (rev 5504)
@@ -137,6 +137,15 @@
     class ExposedMethodVisitor extends RestrictiveAnnotationVisitor {
 
         @Override
+        public void visit(String name, Object value) {
+            if (name.equals("doc")) {
+                doc = (String)value;
+            } else {
+                super.visit(name, value);
+            }
+        }
+
+        @Override
         public AnnotationVisitor visitArray(String name) {
             if(name.equals("names")) {
                 return new StringArrayBuilder() {
@@ -173,6 +182,8 @@
         private String[] defaults = new String[0];
 
         private MethodType type = MethodType.DEFAULT;
+
+        private String doc = "";
     }
 
     @Override
@@ -185,7 +196,8 @@
                                            typeName,
                                            methVisitor.names,
                                            methVisitor.defaults,
-                                           methVisitor.type));
+                                           methVisitor.type,
+                                           methVisitor.doc));
         }
         if(newExp != null) {
             handleNewExposer(newExp);
@@ -197,7 +209,8 @@
                                                 methodDesc,
                                                 typeName,
                                                 classMethVisitor.names,
-                                                classMethVisitor.defaults));
+                                                classMethVisitor.defaults,
+                                                classMethVisitor.doc));
         }
         super.visitEnd();
     }

Modified: trunk/jython/src/org/python/expose/generate/InstanceMethodExposer.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/InstanceMethodExposer.java	2008-10-22 04:53:59 UTC (rev 5503)
+++ trunk/jython/src/org/python/expose/generate/InstanceMethodExposer.java	2008-10-22 08:27:42 UTC (rev 5504)
@@ -27,7 +27,8 @@
              typeName,
              new String[0],
              new String[0],
-             MethodType.DEFAULT);
+             MethodType.DEFAULT,
+             null);
     }
 
     public InstanceMethodExposer(Type onType,
@@ -37,7 +38,8 @@
                                  String typeName,
                                  String[] asNames,
                                  String[] defaults,
-                                 MethodType type) {
+                                 MethodType type,
+                                 String doc) {
         super(onType,
               methodName,
               Type.getArgumentTypes(desc),
@@ -45,7 +47,8 @@
               typeName,
               asNames,
               defaults,
-              isWide(desc) ? PyBuiltinMethod.class : PyBuiltinMethodNarrow.class);
+              isWide(desc) ? PyBuiltinMethod.class : PyBuiltinMethodNarrow.class,
+              doc);
         if ((access & ACC_STATIC) != 0) {
             throwInvalid("@ExposedMethod can't be applied to static methods");
         }

Modified: trunk/jython/src/org/python/expose/generate/MethodExposer.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/MethodExposer.java	2008-10-22 04:53:59 UTC (rev 5503)
+++ trunk/jython/src/org/python/expose/generate/MethodExposer.java	2008-10-22 08:27:42 UTC (rev 5504)
@@ -1,12 +1,11 @@
 package org.python.expose.generate;
 
 import org.python.objectweb.asm.Type;
-import org.python.expose.MethodType;
 
 public abstract class MethodExposer extends Exposer {
 
     protected String[] defaults;
-    
+
     protected final String[] asNames;
 
     protected final String prefix, typeName;
@@ -17,6 +16,8 @@
 
     protected final Type onType, returnType;
 
+    protected final String doc;
+
     public MethodExposer(Type onType,
                          String methodName,
                          Type[] args,
@@ -24,12 +25,14 @@
                          String typeName,
                          String[] asNames,
                          String[] defaults,
-                         Class superClass) {
+                         Class superClass,
+                         String doc) {
         super(superClass, onType.getClassName() + "$" + methodName + "_exposer");
         this.onType = onType;
         this.methodName = methodName;
         this.args = args;
         this.typeName = typeName;
+        this.doc = doc;
         String prefix = typeName;
         int lastDot = prefix.lastIndexOf('.');
         if (lastDot != -1) {
@@ -64,7 +67,7 @@
         }
         return asNames;
     }
-    
+
     protected void generate() {
         generateNamedConstructor();
         generateFullConstructor();
@@ -85,6 +88,12 @@
         mv.visitVarInsn(ALOAD, 2);
         mv.visitVarInsn(ALOAD, 3);
         superConstructor(PYTYPE, PYOBJ, BUILTIN_INFO);
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitLdcInsn(doc);
+        mv.visitFieldInsn(PUTFIELD,
+                          BUILTIN_FUNCTION.getInternalName(),
+                          "doc",
+                          STRING.getDescriptor());
         endConstructor();
     }
 
@@ -99,6 +108,12 @@
             mv.visitLdcInsn(args.length + 1);
             superConstructor(STRING, INT, INT);
         }
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitLdcInsn(doc);
+        mv.visitFieldInsn(PUTFIELD,
+                          BUILTIN_FUNCTION.getInternalName(),
+                          "doc",
+                          STRING.getDescriptor());
         endConstructor();
     }
 
@@ -126,7 +141,7 @@
         toPy(returnType);
         endMethod(ARETURN);
     }
-    
+
     private boolean hasDefault(int argIndex) {
         return defaults.length - args.length + argIndex >= 0;
     }

Modified: trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java	2008-10-22 04:53:59 UTC (rev 5503)
+++ trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java	2008-10-22 08:27:42 UTC (rev 5504)
@@ -6,7 +6,6 @@
 import org.python.core.Py;
 import org.python.core.PyBuiltinCallable;
 import org.python.core.PyException;
-import org.python.core.PyObject;
 import org.python.expose.MethodType;
 
 public class MethodExposerTest extends InterpTestCase implements Opcodes, PyTypes {
@@ -167,7 +166,8 @@
                                       "simpleexposed",
                                       new String[0],
                                       new String[] {"X"},
-                                      MethodType.DEFAULT);
+                                      MethodType.DEFAULT,
+                                      "");
             fail("Shouldn't be able to create the exposer with a default value");
         } catch (InvalidExposingException ite) {}
     }
@@ -197,7 +197,8 @@
                                                                                  new Type[] {PYTYPE}),
                                                         "simpleexposed",
                                                         new String[0],
-                                                        new String[0]);
+                                                        new String[0],
+                                                        "");
         PyBuiltinCallable bound = createBound(exp);
         assertEquals("a", bound.__call__().toString());
     }
@@ -212,7 +213,8 @@
                                                                                              PYOBJ}),
                                                         "simpleexposed",
                                                         new String[0],
-                                                        new String[] {"null", "Py.None"});
+                                                        new String[] {"null", "Py.None"},
+                                                        "");
         PyBuiltinCallable bound = createBound(exp);
         assertEquals(0, bound.__call__().asInt());
         assertEquals(1, bound.__call__(Py.newString("hello")).asInt());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5508
          http://jython.svn.sourceforge.net/jython/?rev=5508&view=rev
Author:   pjenvey
Date:     2008-10-25 23:03:38 +0000 (Sat, 25 Oct 2008)

Log Message:
-----------
on SystemRestart:
o shutdown all active sockets
o hide InterruptedExceptions in threads
for better SystemRestart support in PasteScript

Modified Paths:
--------------
    trunk/jython/Lib/socket.py
    trunk/jython/Lib/threading.py
    trunk/jython/src/org/python/util/jython.java

Modified: trunk/jython/Lib/socket.py
===================================================================
--- trunk/jython/Lib/socket.py	2008-10-25 21:53:49 UTC (rev 5507)
+++ trunk/jython/Lib/socket.py	2008-10-25 23:03:38 UTC (rev 5508)
@@ -988,6 +988,16 @@
     send = recv = recv_into = sendto = recvfrom = recvfrom_into = _dummy
     __getattr__ = _dummy
 
+_active_sockets = set()
+
+def _closeActiveSockets():
+    for socket in _active_sockets.copy():
+        try:
+            socket.close()
+        except error:
+            msg = 'Problem closing socket: %s: %r' % (socket, sys.exc_info())
+            print >> sys.stderr, msg
+
 class _socketobject(object):
 
     __doc__ = _realsocket.__doc__
@@ -1005,8 +1015,13 @@
             meth = getattr(_sock, method, None)
             if meth:
                 setattr(self, method, meth)
+        _active_sockets.add(self)
 
     def close(self):
+        try:
+            _active_sockets.remove(self)
+        except KeyError:
+            pass
         _sock = self._sock
         if isinstance(_sock, _nonblocking_api_mixin):
             _sock.close_lock.acquire()

Modified: trunk/jython/Lib/threading.py
===================================================================
--- trunk/jython/Lib/threading.py	2008-10-25 21:53:49 UTC (rev 5507)
+++ trunk/jython/Lib/threading.py	2008-10-25 23:03:38 UTC (rev 5508)
@@ -1,6 +1,8 @@
+from java.lang import InterruptedException
 from java.util import Collections, WeakHashMap
 from java.util.concurrent import Semaphore, CyclicBarrier
 from java.util.concurrent.locks import ReentrantLock
+from org.python.util import jython
 from thread import _newFunctionThread
 from thread import _local as local
 import java.lang.Thread
@@ -245,6 +247,11 @@
                 self.run()
             except SystemExit:
                 pass
+            except InterruptedException:
+                # Quiet InterruptedExceptions if they're caused by
+                # _systemrestart
+                if not jython.shouldRestart:
+                    raise
             except:
                 # If sys.stderr is no more (most likely from interpreter
                 # shutdown) use self.__stderr.  Otherwise still use sys (as in

Modified: trunk/jython/src/org/python/util/jython.java
===================================================================
--- trunk/jython/src/org/python/util/jython.java	2008-10-25 21:53:49 UTC (rev 5507)
+++ trunk/jython/src/org/python/util/jython.java	2008-10-25 23:03:38 UTC (rev 5508)
@@ -63,7 +63,7 @@
         "JYTHONPATH: '" + java.io.File.pathSeparator + "'-separated list of directories prefixed to the default module\n" +
         "            search path.  The result is sys.path.";
 
-    private static boolean shouldRestart;
+    public static boolean shouldRestart;
 
     public static void runJar(String filename) {
         // TBD: this is kind of gross because a local called `zipfile' just
@@ -228,12 +228,12 @@
                 } catch(Throwable t) {
                     if (t instanceof PyException &&
                             Py.matchException((PyException)t, _systemrestart.SystemRestart)) {
-                        // Stop current threads...
-                        thread.interruptAllThreads();
+                        // Shutdown this instance...
+                        shouldRestart = true;
+                        shutdownInterpreter();
                         // ..reset the state...
                         Py.setSystemState(new PySystemState());
                         // ...and start again
-                        shouldRestart = true;
                     } else {
                         Py.printException(t);
                         if (!opts.interactive) {
@@ -323,6 +323,21 @@
         //System.err.println("imp");
         return interp;
     }
+
+    /**
+     * Run any finalizations on the current interpreter in preparation for a SytemRestart.
+     */
+    public static void shutdownInterpreter() {
+        // Stop all the active threads
+        thread.interruptAllThreads();
+        // Close all sockets -- not all of their operations are stopped by
+        // Thread.interrupt (in particular pre-nio sockets)
+        try {
+            imp.load("socket").__findattr__("_closeActiveSockets").__call__();
+        } catch (PyException pye) {
+            // continue
+        }
+    }
 }
 
 class CommandLineOptions


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5514
          http://jython.svn.sourceforge.net/jython/?rev=5514&view=rev
Author:   cgroves
Date:     2008-10-26 22:13:05 +0000 (Sun, 26 Oct 2008)

Log Message:
-----------
Move Java Stream wrapping off into FileUtil so PyFile doesn't have to be exposed as the type file and as the PyJavaClass PyFile

Modified Paths:
--------------
    trunk/jython/Lib/os.py
    trunk/jython/Lib/popen2.py
    trunk/jython/Lib/test/test_java_integration.py
    trunk/jython/Lib/test/test_javashell.py
    trunk/jython/src/org/python/core/Options.java
    trunk/jython/src/org/python/core/Py.java
    trunk/jython/src/org/python/core/PyFile.java
    trunk/jython/src/org/python/core/StdoutWrapper.java
    trunk/jython/src/org/python/core/io/FileDescriptors.java
    trunk/jython/src/org/python/core/util/FileUtil.java

Modified: trunk/jython/Lib/os.py
===================================================================
--- trunk/jython/Lib/os.py	2008-10-26 21:13:51 UTC (rev 5513)
+++ trunk/jython/Lib/os.py	2008-10-26 22:13:05 UTC (rev 5514)
@@ -46,7 +46,6 @@
 import stat as _stat
 import sys
 from java.io import File
-from org.python.core import PyFile
 from org.python.core.io import FileDescriptors, FileIO, IOBase
 from org.python.core.Py import newString as asPyString
 
@@ -554,7 +553,7 @@
         raise OSError(errno.EBADF, errno.strerror(errno.EBADF))
 
     try:
-        fp = PyFile(rawio, '<fdopen>', mode, bufsize)
+        fp = FileDescriptors.wrap(rawio, mode, bufsize)
     except IOError:
         raise OSError(errno.EINVAL, errno.strerror(errno.EINVAL))
     return fp

Modified: trunk/jython/Lib/popen2.py
===================================================================
--- trunk/jython/Lib/popen2.py	2008-10-26 21:13:51 UTC (rev 5513)
+++ trunk/jython/Lib/popen2.py	2008-10-26 22:13:05 UTC (rev 5514)
@@ -27,9 +27,10 @@
 from java.io import BufferedInputStream
 from java.io import PipedOutputStream
 from java.io import PipedInputStream
-from org.python.core import PyFile
 from javashell import shellexecute
+from org.python.core.util import FileUtil
 
+
 __all__ = ["popen", "popen2", "popen3", "popen4", "Popen3", "Popen4"]
 
 _active = []
@@ -43,7 +44,7 @@
     the close method.
     """
     def __init__(self, stream, process, name):
-        self._file = PyFile(stream, "'%s'" % name)
+        self._file = FileUtil.wrap(stream)
         self._process = process
 
     def __getattr__(self, name):
@@ -92,10 +93,10 @@
                     bufsize
                     )
                 
-        self.tochild = PyFile( self._tochild )
-        self.fromchild = PyFile( self._fromchild )
+        self.tochild = FileUtil.wrap(self._tochild)
+        self.fromchild = FileUtil.wrap(self._fromchild)
         if self._childerr:
-            self.childerr = PyFile( self._childerr )
+            self.childerr = FileUtil.wrap(self._childerr)
 
     def _startChildWaiter(self):
         """Start a subthread that waits for the child process to exit."""
@@ -197,7 +198,7 @@
             "%s-stderr" % self.process,
             self._close
             )
-        return PyFile( joinedStream )
+        return FileUtil.wrap(joinedStream)
 
     def _close( self ):
         """Must be closed twice (once for each of the two joined pipes)"""

Modified: trunk/jython/Lib/test/test_java_integration.py
===================================================================
--- trunk/jython/Lib/test/test_java_integration.py	2008-10-26 21:13:51 UTC (rev 5513)
+++ trunk/jython/Lib/test/test_java_integration.py	2008-10-26 22:13:05 UTC (rev 5514)
@@ -155,7 +155,8 @@
         self.assertRaises(FileNotFoundException, FileInputStream, "garbage")
 
     def test_unsupported(self):
-        fp = open(System.out)
+        from org.python.core.util import FileUtil
+        fp = FileUtil.wrap(System.out)
         self.assertRaises(IOError, fp.tell)
 
 class VectorTest(unittest.TestCase):

Modified: trunk/jython/Lib/test/test_javashell.py
===================================================================
--- trunk/jython/Lib/test/test_javashell.py	2008-10-26 21:13:51 UTC (rev 5513)
+++ trunk/jython/Lib/test/test_javashell.py	2008-10-26 22:13:05 UTC (rev 5514)
@@ -1,11 +1,11 @@
 import unittest
 from test import test_support
 
-from org.python.core import PyFile
 import re
 
 import os
 import javashell
+from org.python.core.util import FileUtil
 
 # testCmds is a list of (command, expectedOutput)
 # each command is executed twice, once in unitialized environment and
@@ -73,7 +73,7 @@
         for cmd, pattern in testCmds:
             dprint( "\nExecuting '%s' with %s environment" % (cmd, whichEnv))
             p = javashell.shellexecute(cmd)
-            line = PyFile( p.getInputStream() ).readlines()[0]
+            line = FileUtil.wrap(p.getInputStream()).readlines()[0]
             assert re.match( pattern, line ), \
                     "expected match for %s, got %s" % ( pattern, line )
             dprint( "waiting for", cmd, "to complete")

Modified: trunk/jython/src/org/python/core/Options.java
===================================================================
--- trunk/jython/src/org/python/core/Options.java	2008-10-26 21:13:51 UTC (rev 5513)
+++ trunk/jython/src/org/python/core/Options.java	2008-10-26 22:13:05 UTC (rev 5514)
@@ -22,7 +22,7 @@
      * considerably.
      */
     public static boolean includeJavaStackInExceptions = false;
-    
+
     /**
      * When true, python exception raised in overriden methods will be shown on
      * stderr. This option is remarkably useful when python is used for
@@ -123,7 +123,7 @@
         // Set the more unusual options
         Options.showJavaExceptions = getBooleanOption(
                 "options.showJavaExceptions", Options.showJavaExceptions);
-        
+
         Options.includeJavaStackInExceptions = getBooleanOption(
         	"options.includeJavaStackInExceptions", Options.includeJavaStackInExceptions);
 

Modified: trunk/jython/src/org/python/core/Py.java
===================================================================
--- trunk/jython/src/org/python/core/Py.java	2008-10-26 21:13:51 UTC (rev 5513)
+++ trunk/jython/src/org/python/core/Py.java	2008-10-26 22:13:05 UTC (rev 5514)
@@ -455,13 +455,13 @@
     @param o the <code>PyObject</code> to convert.
     @param c the class to convert it to.
      **/
-    public static Object tojava(PyObject o, Class c) {
+    public static <T> T tojava(PyObject o, Class<T> c) {
         Object obj = o.__tojava__(c);
         if (obj == Py.NoConversion) {
             throw Py.TypeError("can't convert " + o.__repr__() + " to " +
                     c.getName());
         }
-        return obj;
+        return (T)obj;
     }
 
     // ??pending: was @deprecated but is actually used by proxie code.
@@ -1963,7 +1963,7 @@
         if (file instanceof PyJavaInstance) {
             Object tojava = file.__tojava__(OutputStream.class);
             if (tojava != null && tojava != Py.NoConversion) {
-                this.file = new PyFile((OutputStream) tojava, "<java OutputStream>");
+                this.file = new PyFile((OutputStream) tojava);
             }
         }
     }

Modified: trunk/jython/src/org/python/core/PyFile.java
===================================================================
--- trunk/jython/src/org/python/core/PyFile.java	2008-10-26 21:13:51 UTC (rev 5513)
+++ trunk/jython/src/org/python/core/PyFile.java	2008-10-26 22:13:05 UTC (rev 5514)
@@ -3,7 +3,6 @@
 
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.RandomAccessFile;
 import java.util.LinkedList;
 
 import org.python.core.io.BinaryIOWrapper;
@@ -20,13 +19,13 @@
 import org.python.core.io.TextIOBase;
 import org.python.core.io.TextIOWrapper;
 import org.python.core.io.UniversalIOWrapper;
+import org.python.core.util.FileUtil;
 import org.python.expose.ExposedDelete;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import org.python.expose.MethodType;
 
 /**
  * A python file wrapper around a java stream, reader/writer or file.
@@ -35,7 +34,7 @@
 public class PyFile extends PyObject {
 
     public static final PyType TYPE = PyType.fromClass(PyFile.class);
-    
+
     /** The filename */
     @ExposedGet
     public PyObject name;
@@ -75,14 +74,13 @@
     private Closer closer;
 
     /** All PyFiles' closers */
-    private static LinkedList closers = new LinkedList();
+    private static LinkedList<Closer> closers = new LinkedList<Closer>();
 
     static {
         initCloser();
     }
 
-    public PyFile() {
-    }
+    public PyFile() {}
 
     public PyFile(PyType subType) {
         super(subType);
@@ -93,100 +91,41 @@
         file___init__(raw, name, mode, bufsize);
     }
 
-    public PyFile(InputStream istream, String name, String mode, int bufsize,
-                  boolean closefd) {
+    PyFile(InputStream istream, String name, String mode, int bufsize, boolean closefd) {
         parseMode(mode);
         file___init__(new StreamIO(istream, closefd), name, mode, bufsize);
     }
 
-    public PyFile(InputStream istream, String name, String mode, int bufsize) {
-        this(istream, name, mode, -1, true);
-    }
-
-    public PyFile(InputStream istream, String name, String mode) {
-        this(istream, name, mode, -1);
-    }
-
-    public PyFile(InputStream istream, String name) {
-        this(istream, name, "r");
-    }
-
+    /**
+     * Creates a file object wrapping the given <code>InputStream</code>. The builtin methods
+     * <code>file</code> and <code>open</code> don't expose this functionality as it isn't available
+     * to regular Python code. To wrap an InputStream in a file from Python, use
+     * {@link FileUtil#wrap(InputStream)}
+     */
     public PyFile(InputStream istream) {
-        this(istream, "<???>", "r");
+        this(istream, "<Java InputStream '" + istream + "' as file>", "r", -1, true);
     }
 
-    public PyFile(OutputStream ostream, String name, String mode, int bufsize, boolean closefd) {
+    PyFile(OutputStream ostream, String name, String mode, int bufsize, boolean closefd) {
         parseMode(mode);
         file___init__(new StreamIO(ostream, closefd), name, mode, bufsize);
     }
 
-    public PyFile(OutputStream ostream, String name, String mode, int bufsize) {
-        this(ostream, name, mode, -1, true);
-    }
-
-    public PyFile(OutputStream ostream, String name, String mode) {
-        this(ostream, name, mode, -1);
-    }
-
-    public PyFile(OutputStream ostream, String name) {
-        this(ostream, name, "w");
-    }
-
+    /**
+     * Creates a file object wrapping the given <code>OutputStream</code>. The builtin methods
+     * <code>file</code> and <code>open</code> don't expose this functionality as it isn't available
+     * to regular Python code. To wrap an OutputStream in a file from Python, use
+     * {@link FileUtil#wrap(OutputStream)}
+     */
     public PyFile(OutputStream ostream) {
-        this(ostream, "<???>", "w");
+        this(ostream, "<Java OutputStream '" + ostream + "' as file>", "w", -1, true);
     }
 
-    public PyFile(RandomAccessFile file, String name, String mode, int bufsize) {
-        file___init__(new FileIO(file.getChannel(), parseMode(mode)), name, mode, bufsize);
-    }
-
-    public PyFile(RandomAccessFile file, String name, String mode) {
-        this(file, name, mode, -1);
-    }
-
-    public PyFile(RandomAccessFile file, String name) {
-        this(file, name, "r+");
-    }
-
-    public PyFile(RandomAccessFile file) {
-        this(file, "<???>", "r+");
-    }
-
     public PyFile(String name, String mode, int bufsize) {
         file___init__(new FileIO(name, parseMode(mode)), name, mode, bufsize);
     }
 
     @ExposedNew
-    static final PyObject file_new(PyNewWrapper new_, boolean init, PyType subtype,
-                                   PyObject[] args, String[] keywords) {
-        PyFile newFile;
-        if (new_.for_type == subtype) {
-            if (init) {
-                if (args.length - keywords.length == 0) {
-                    newFile = new PyFile();
-                    newFile.file___init__(args, keywords);
-                } else if (args[0] instanceof PyString ||
-                           (args[0] instanceof PyJavaInstance &&
-                            ((PyJavaInstance)args[0]).javaProxy == String.class)) {
-                    // If first arg is a PyString or String, assume
-                    // its being called as a builtin.
-                    newFile = new PyFile();
-                    newFile.file___init__(args, keywords);
-                    newFile.closer = new Closer(newFile.file);
-                } else {
-                    // assume it's being called as a java class
-                    PyJavaClass pjc = new PyJavaClass(PyFile.class);
-                    newFile = (PyFile)pjc.__call__(args, keywords);
-                }
-            } else {
-                newFile = new PyFile();
-            }
-        } else {
-            newFile = new PyFileDerived(subtype);
-        }
-        return newFile;
-    }
-
     @ExposedMethod
     final void file___init__(PyObject[] args, String[] kwds) {
         ArgParser ap = new ArgParser("file", args, kwds, new String[] {"name", "mode", "bufsize"},
@@ -199,6 +138,7 @@
         String mode = ap.getString(1, "r");
         int bufsize = ap.getInt(2, -1);
         file___init__(new FileIO(name.toString(), parseMode(mode)), name, mode, bufsize);
+        closer = new Closer(file);
     }
 
     private void file___init__(RawIOBase raw, String name, String mode, int bufsize) {
@@ -613,18 +553,15 @@
     }
 
     /**
-     * A mechanism to make sure PyFiles are closed on exit. On
-     * creation Closer adds itself to a list of Closers that will be
-     * run by PyFileCloser on JVM shutdown. When a PyFile's close or
-     * finalize methods are called, PyFile calls its Closer.close
-     * which clears Closer out of the shutdown queue.
+     * A mechanism to make sure PyFiles are closed on exit. On creation Closer adds itself to a list
+     * of Closers that will be run by PyFileCloser on JVM shutdown. When a PyFile's close or
+     * finalize methods are called, PyFile calls its Closer.close which clears Closer out of the
+     * shutdown queue.
      *
-     * We use a regular object here rather than WeakReferences and
-     * their ilk as they may be collected before the shutdown hook
-     * runs. There's no guarantee that finalize will be called during
-     * shutdown, so we can't use it. It's vital that this Closer has
-     * no reference to the PyFile it's closing so the PyFile remains
-     * garbage collectable.
+     * We use a regular object here rather than WeakReferences and their ilk as they may be
+     * collected before the shutdown hook runs. There's no guarantee that finalize will be called
+     * during shutdown, so we can't use it. It's vital that this Closer has no reference to the
+     * PyFile it's closing so the PyFile remains garbage collectable.
      */
     private static class Closer {
 
@@ -667,7 +604,7 @@
             synchronized (closers) {
                 while (closers.size() > 0) {
                     try {
-                        ((Closer)closers.removeFirst()).doClose();
+                        closers.removeFirst().doClose();
                     } catch (PyException e) {
                         // continue
                     }

Modified: trunk/jython/src/org/python/core/StdoutWrapper.java
===================================================================
--- trunk/jython/src/org/python/core/StdoutWrapper.java	2008-10-26 21:13:51 UTC (rev 5513)
+++ trunk/jython/src/org/python/core/StdoutWrapper.java	2008-10-26 22:13:05 UTC (rev 5514)
@@ -31,7 +31,7 @@
 
             Object tojava = obj.__tojava__(OutputStream.class);
             if (tojava != null && tojava != Py.NoConversion) {
-                f = new PyFile((OutputStream)tojava, "<java OutputStream>");
+                f = new PyFile((OutputStream)tojava);
             }
             if (f != null) {
                 setObject(ss, f);

Modified: trunk/jython/src/org/python/core/io/FileDescriptors.java
===================================================================
--- trunk/jython/src/org/python/core/io/FileDescriptors.java	2008-10-26 21:13:51 UTC (rev 5513)
+++ trunk/jython/src/org/python/core/io/FileDescriptors.java	2008-10-26 22:13:05 UTC (rev 5514)
@@ -2,7 +2,7 @@
 package org.python.core.io;
 
 import org.python.core.Py;
-import org.python.core.PyJavaInstance;
+import org.python.core.PyFile;
 import org.python.core.PyObject;
 
 /**
@@ -14,22 +14,20 @@
  */
 public class FileDescriptors {
 
+    public static PyFile wrap(RawIOBase raw, String mode, int bufsize) {
+        return new PyFile(raw, "<fdopen>", mode, bufsize);
+    }
+
     /**
-     * Return the RawIOBase associated with the specified file
-     * descriptor.
+     * Return the RawIOBase associated with the specified file descriptor.
      *
      * Raises a Python exception is the file descriptor is invalid
      *
-     * @param fd a Jython file descriptor object
+     * @param fd
+     *            a Jython file descriptor object
      * @return the RawIOBase associated with the file descriptor
      */
     public static RawIOBase get(PyObject fd) {
-        if (fd instanceof PyJavaInstance) {
-            Object tojava = ((PyJavaInstance)fd).__tojava__(RawIOBase.class);
-            if (tojava instanceof RawIOBase) {
-                return (RawIOBase)tojava;
-            }
-        }
-        throw Py.TypeError("a fileno is required");
+        return Py.tojava(fd, RawIOBase.class);
     }
 }

Modified: trunk/jython/src/org/python/core/util/FileUtil.java
===================================================================
--- trunk/jython/src/org/python/core/util/FileUtil.java	2008-10-26 21:13:51 UTC (rev 5513)
+++ trunk/jython/src/org/python/core/util/FileUtil.java	2008-10-26 22:13:05 UTC (rev 5514)
@@ -2,14 +2,32 @@
 package org.python.core.util;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.IOException;
+import java.io.OutputStream;
 
+import org.python.core.PyFile;
+
 /**
  * Utility methods for Java file handling.
  */
 public class FileUtil {
+
     /**
+     * Creates a PyFile that reads from the given <code>InputStream</code>.
+     */
+    public static PyFile wrap(InputStream is) {
+        return new PyFile(is);
+    }
+
+    /**
+     * Creates a PyFile that writes to the given <code>OutputStream</code>.
+     */
+    public static PyFile wrap(OutputStream os) {
+        return new PyFile(os);
+    }
+
+    /**
      * Read all bytes from the input stream. <p/> Note that using this method to
      * read very large streams could cause out-of-memory exceptions and/or block
      * for large periods of time.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5523
          http://jython.svn.sourceforge.net/jython/?rev=5523&view=rev
Author:   cgroves
Date:     2008-10-28 07:58:42 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
Make Java static inner classes visible from Java subclasses.  From garyh's patch.  Resolves issue 1147.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_java_visibility.py
    trunk/jython/src/org/python/core/Py.java
    trunk/jython/src/org/python/core/PyJavaClass.java
    trunk/jython/tests/java/org/python/tests/Visible.java

Modified: trunk/jython/Lib/test/test_java_visibility.py
===================================================================
--- trunk/jython/Lib/test/test_java_visibility.py	2008-10-27 21:15:22 UTC (rev 5522)
+++ trunk/jython/Lib/test/test_java_visibility.py	2008-10-28 07:58:42 UTC (rev 5523)
@@ -14,7 +14,7 @@
                     Visible.__init__(self, publicValue)
                 else:
                     Visible.__init__(self)
-        # TODO - protectedStaticMethod, protectedStaticField, and protectedField should
+        # TODO - protectedStaticMethod, protectedStaticField, StaticInner, and protectedField should
         # be here
         s = SubVisible()
         self.assertEquals(Results.PROTECTED_METHOD, s.protectedMethod(0))
@@ -37,6 +37,7 @@
                 v.visibleStatic('a'))
         self.assertEquals(Results.EXTRA_ARG_PUBLIC_STATIC_METHOD,
                 v.visibleStatic(0, 'a'))
+        self.assertEquals(Results.PUBLIC_STATIC_FIELD, Visible.StaticInner.visibleStaticField)
 
         # Ensure that the visibleInstance method from SubVisible that takes a double doesn't
         # leak through to the parent
@@ -57,7 +58,9 @@
         # Java methods don't allow direct calling of the superclass method, so it should 
         # return the subclass value here.
         self.assertEquals(Results.SUBCLASS_OVERRIDE, Visible.visibleInstance(s, 3))
+        self.assertEquals(Results.PUBLIC_STATIC_FIELD, SubVisible.StaticInner.visibleStaticField)
 
+
     def test_in_dict(self):
         for c in Visible, SubVisible, VisibleOverride:
             self.failUnless('visibleInstance' in c.__dict__,

Modified: trunk/jython/src/org/python/core/Py.java
===================================================================
--- trunk/jython/src/org/python/core/Py.java	2008-10-27 21:15:22 UTC (rev 5522)
+++ trunk/jython/src/org/python/core/Py.java	2008-10-28 07:58:42 UTC (rev 5523)
@@ -762,20 +762,6 @@
         return true;
     }
 
-    public static Class relFindClass(Class home, String name) {
-        try {
-            ClassLoader loader = home.getClassLoader();
-            if (loader != null) {
-                return loader.loadClass(name);
-            } else {
-                return Class.forName(name);
-            }
-        } catch (ClassNotFoundException exc) {
-            return null;
-        } catch (Throwable t) {
-            throw Py.JavaError(t);
-        }
-    }
     private static boolean secEnv = false;
 
     public static Class findClass(String name) {

Modified: trunk/jython/src/org/python/core/PyJavaClass.java
===================================================================
--- trunk/jython/src/org/python/core/PyJavaClass.java	2008-10-27 21:15:22 UTC (rev 5522)
+++ trunk/jython/src/org/python/core/PyJavaClass.java	2008-10-28 07:58:42 UTC (rev 5523)
@@ -709,10 +709,16 @@
     }
 
     private PyObject findInnerClass(String name) {
-        Class p = getProxyClass();
-        Class innerClass = Py.relFindClass(p, p.getName() + "$" + name);
-        if (innerClass == null)
+        Class<?> innerClass = null;
+        for (Class<?> inner : getProxyClass().getClasses()) {
+            if(inner.getSimpleName().equals(name)) {
+                innerClass = inner;
+                break;
+            }
+        }
+        if (innerClass == null) {
             return null;
+        }
         PyObject jinner = Py.java2py(innerClass); // xxx lookup(innerClass);
         __dict__.__setitem__(name, jinner);
         return jinner;

Modified: trunk/jython/tests/java/org/python/tests/Visible.java
===================================================================
--- trunk/jython/tests/java/org/python/tests/Visible.java	2008-10-27 21:15:22 UTC (rev 5522)
+++ trunk/jython/tests/java/org/python/tests/Visible.java	2008-10-28 07:58:42 UTC (rev 5523)
@@ -12,6 +12,11 @@
 
     public static int visibleStatic = PUBLIC_STATIC_METHOD_FIELD;
 
+    public static class StaticInner {
+
+        public static int visibleStaticField = PUBLIC_STATIC_FIELD;
+    }
+
     public Visible() {
         this(PUBLIC_FIELD);
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5524
          http://jython.svn.sourceforge.net/jython/?rev=5524&view=rev
Author:   pjenvey
Date:     2008-10-28 21:47:35 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
fix float and complex's __pow__ not being exposed as binary ops

Modified Paths:
--------------
    trunk/jython/Lib/test/test_complex_jy.py
    trunk/jython/Lib/test/test_float_jy.py
    trunk/jython/src/org/python/core/PyComplex.java
    trunk/jython/src/org/python/core/PyFloat.java

Modified: trunk/jython/Lib/test/test_complex_jy.py
===================================================================
--- trunk/jython/Lib/test/test_complex_jy.py	2008-10-28 07:58:42 UTC (rev 5523)
+++ trunk/jython/Lib/test/test_complex_jy.py	2008-10-28 21:47:35 UTC (rev 5524)
@@ -11,7 +11,14 @@
         self.assertEqual(complex.__coerce__(1+1j, None), NotImplemented)
         self.assertRaises(TypeError, complex.__coerce__, None, 1+2j)
 
+    def test_pow(self):
+        class Foo(object):
+            def __rpow__(self, other):
+                return other ** 2
+        # regression in 2.5 alphas
+        self.assertEqual((4+0j) ** Foo(), (16+0j))
 
+
 def test_main():
     test_support.run_unittest(ComplexTest)
 

Modified: trunk/jython/Lib/test/test_float_jy.py
===================================================================
--- trunk/jython/Lib/test/test_float_jy.py	2008-10-28 07:58:42 UTC (rev 5523)
+++ trunk/jython/Lib/test/test_float_jy.py	2008-10-28 21:47:35 UTC (rev 5524)
@@ -78,7 +78,14 @@
     def test_float_none(self):
         self.assertRaises(TypeError, float, None)
 
+    def test_pow(self):
+        class Foo(object):
+            def __rpow__(self, other):
+                return other ** 2
+        # regression in 2.5 alphas
+        self.assertEqual(4.0 ** Foo(), 16.0)
 
+
 def test_main():
     test_support.run_unittest(FloatTestCase)
 

Modified: trunk/jython/src/org/python/core/PyComplex.java
===================================================================
--- trunk/jython/src/org/python/core/PyComplex.java	2008-10-28 07:58:42 UTC (rev 5523)
+++ trunk/jython/src/org/python/core/PyComplex.java	2008-10-28 21:47:35 UTC (rev 5524)
@@ -569,7 +569,7 @@
         return complex___pow__(right, modulo);
     }
 
-    @ExposedMethod(defaults = "null")
+    @ExposedMethod(type = MethodType.BINARY, defaults = "null")
     final PyObject complex___pow__(PyObject right, PyObject modulo) {
         if (modulo != null) {
             throw Py.ValueError("complex modulo");

Modified: trunk/jython/src/org/python/core/PyFloat.java
===================================================================
--- trunk/jython/src/org/python/core/PyFloat.java	2008-10-28 07:58:42 UTC (rev 5523)
+++ trunk/jython/src/org/python/core/PyFloat.java	2008-10-28 21:47:35 UTC (rev 5524)
@@ -468,7 +468,7 @@
         return float___pow__(right, modulo);
     }
 
-    @ExposedMethod(defaults = "null")
+    @ExposedMethod(type = MethodType.BINARY, defaults = "null")
     final PyObject float___pow__(PyObject right, PyObject modulo) {
         if (!canCoerce(right))
             return null;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5525
          http://jython.svn.sourceforge.net/jython/?rev=5525&view=rev
Author:   pjenvey
Date:     2008-10-29 02:38:55 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
o fix assert not nan == nan and nan != nan, and cmp on nans
o fix math.frexp(nan) causing an endless loop

Modified Paths:
--------------
    trunk/jython/Lib/test/test_float_jy.py
    trunk/jython/src/org/python/core/PyFloat.java
    trunk/jython/src/org/python/modules/math.java

Added Paths:
-----------
    trunk/jython/Lib/test/test_math_jy.py

Modified: trunk/jython/Lib/test/test_float_jy.py
===================================================================
--- trunk/jython/Lib/test/test_float_jy.py	2008-10-28 21:47:35 UTC (rev 5524)
+++ trunk/jython/Lib/test/test_float_jy.py	2008-10-29 02:38:55 UTC (rev 5525)
@@ -66,10 +66,23 @@
         self.assertNotEqual(0.1, shuge_int)
 
     def test_nan(self):
-        self.assert_(type(float('NaN')), float)
-        self.assert_(type(float('nan')), float)
-        self.assertEqual(long(float('NaN')), 0)
+        nan = float('nan')
+        self.assert_(type(nan), float)
+        if jython:
+            # support Java syntax
+            self.assert_(type(float('NaN')), float)
 
+        # CPython 2.4/2.5 allow this
+        self.assertEqual(long(nan), 0)
+
+        self.assertNotEqual(nan, float('nan'))
+        self.assertNotEqual(nan, nan)
+        self.assertEqual(cmp(nan, float('nan')), 1)
+        self.assertEqual(cmp(nan, nan), 0)
+        for i in (-1, 1, -1.0, 1.0):
+            self.assertEqual(cmp(nan, i), -1)
+            self.assertEqual(cmp(i, nan), 1)
+
     def test_infinity(self):
         self.assert_(type(float('Infinity')), float)
         self.assert_(type(float('inf')), float)

Added: trunk/jython/Lib/