From jython-checkins at python.org  Sun Feb  5 01:10:56 2012
From: jython-checkins at python.org (philip.jenvey)
Date: Sun, 05 Feb 2012 01:10:56 +0100
Subject: [Jython-checkins] =?utf8?q?jython_=28merge_2=2E5_-=3E_default=29?=
	=?utf8?q?=3A_merge_w/_2=2E5?=
Message-ID: <E1Rtph2-0004z3-NU@dinsdale.python.org>

http://hg.python.org/jython/rev/86ebf89770e5
changeset:   6300:86ebf89770e5
parent:      6298:2b4f725d4d29
parent:      6299:763f01096d4f
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Sat Feb 04 16:10:32 2012 -0800
summary:
  merge w/ 2.5

files:
  Lib/test/test_java_integration.py       |  22 ++++++++++++-
  NEWS                                    |   1 +
  src/org/python/core/PyBeanProperty.java |   2 +-
  tests/java/javatests/Issue1833.java     |  10 +++++
  4 files changed, 33 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_java_integration.py b/Lib/test/test_java_integration.py
--- a/Lib/test/test_java_integration.py
+++ b/Lib/test/test_java_integration.py
@@ -25,6 +25,7 @@
 from org.python.tests import (BeanImplementation, Child, Child2,
                               CustomizableMapHolder, Listenable, ToUnicode)
 from org.python.tests.mro import (ConfusedOnGetitemAdd, FirstPredefinedGetitem, GetitemAdder)
+from javatests import Issue1833
 from javatests.ProxyTests import NullToString, Person
 
 
@@ -592,6 +593,24 @@
         self.assertEqual(type(test), unicode)
         self.assertEqual(test, u"Circle is 360\u00B0")
 
+
+class BeanPropertyTest(unittest.TestCase):
+
+    def test_issue1833(self):
+        class TargetClass(object):
+            def _getattribute(self):
+                return self.__attribute
+            def _setattribute(self, value):
+                self.__attribute = value
+            attribute = property(_getattribute, _setattribute)
+
+        target = TargetClass()
+        test = Issue1833(target=target)
+        value = ('bleh', 'blah')
+        test.value = value
+        self.assertEqual(target.attribute, value)
+
+
 def test_main():
     test_support.run_unittest(InstantiationTest,
                               BeanTest,
@@ -609,7 +628,8 @@
                               JavaWrapperCustomizationTest,
                               SerializationTest,
                               CopyTest,
-                              UnicodeTest)
+                              UnicodeTest,
+                              BeanPropertyTest)
 
 if __name__ == "__main__":
     test_main()
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@
     - [ 1824 ] os.link() can silently fail
     - [ 1825 ] EnvironmentError.filename is `str` even if original name is `unicode`
     - [ 1828 ] Problems inheriting from long
+    - [ 1833 ] Trouble passing Python objects through a Java class back to Python
 
 Jython 2.5.2
   same as 2.5.2rc4
diff --git a/src/org/python/core/PyBeanProperty.java b/src/org/python/core/PyBeanProperty.java
--- a/src/org/python/core/PyBeanProperty.java
+++ b/src/org/python/core/PyBeanProperty.java
@@ -53,7 +53,7 @@
         Object iself = Py.tojava(self, setMethod.getDeclaringClass());
 
         // Special handling of tuples - try to call a class constructor
-        if (value instanceof PyTuple) {
+        if (value instanceof PyTuple && myType != PyObject.class) {
             try {
                 value = Py.java2py(myType).__call__(((PyTuple)value).getArray());
             } catch (Throwable t) {
diff --git a/tests/java/javatests/Issue1833.java b/tests/java/javatests/Issue1833.java
new file mode 100644
--- /dev/null
+++ b/tests/java/javatests/Issue1833.java
@@ -0,0 +1,10 @@
+package javatests;
+import org.python.core.PyObject;
+
+public class Issue1833 {
+    public PyObject target;
+
+    public void setValue(PyObject value) {
+        target.__setattr__("attribute", value);
+    }
+}

-- 
Repository URL: http://hg.python.org/jython

From jython-checkins at python.org  Sun Feb  5 01:10:56 2012
From: jython-checkins at python.org (philip.jenvey)
Date: Sun, 05 Feb 2012 01:10:56 +0100
Subject: [Jython-checkins] =?utf8?q?jython_=282=2E5=29=3A_fix_bean_propert?=
 =?utf8?q?ies_munging_tuples_when_a_PyObject_was_requested?=
Message-ID: <E1Rtph2-0004yt-M4@dinsdale.python.org>

http://hg.python.org/jython/rev/763f01096d4f
changeset:   6299:763f01096d4f
branch:      2.5
parent:      6297:edadd4f115f1
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Sat Feb 04 15:57:58 2012 -0800
summary:
  fix bean properties munging tuples when a PyObject was requested
fixes #1833

files:
  Lib/test/test_java_integration.py       |  22 ++++++++++++-
  NEWS                                    |   1 +
  src/org/python/core/PyBeanProperty.java |   2 +-
  tests/java/javatests/Issue1833.java     |  10 +++++
  4 files changed, 33 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_java_integration.py b/Lib/test/test_java_integration.py
--- a/Lib/test/test_java_integration.py
+++ b/Lib/test/test_java_integration.py
@@ -25,6 +25,7 @@
 from org.python.tests import (BeanImplementation, Child, Child2,
                               CustomizableMapHolder, Listenable, ToUnicode)
 from org.python.tests.mro import (ConfusedOnGetitemAdd, FirstPredefinedGetitem, GetitemAdder)
+from javatests import Issue1833
 from javatests.ProxyTests import NullToString, Person
 
 
@@ -592,6 +593,24 @@
         self.assertEqual(type(test), unicode)
         self.assertEqual(test, u"Circle is 360\u00B0")
 
+
+class BeanPropertyTest(unittest.TestCase):
+
+    def test_issue1833(self):
+        class TargetClass(object):
+            def _getattribute(self):
+                return self.__attribute
+            def _setattribute(self, value):
+                self.__attribute = value
+            attribute = property(_getattribute, _setattribute)
+
+        target = TargetClass()
+        test = Issue1833(target=target)
+        value = ('bleh', 'blah')
+        test.value = value
+        self.assertEqual(target.attribute, value)
+
+
 def test_main():
     test_support.run_unittest(InstantiationTest,
                               BeanTest,
@@ -609,7 +628,8 @@
                               JavaWrapperCustomizationTest,
                               SerializationTest,
                               CopyTest,
-                              UnicodeTest)
+                              UnicodeTest,
+                              BeanPropertyTest)
 
 if __name__ == "__main__":
     test_main()
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@
     - [ 1824 ] os.link() can silently fail
     - [ 1825 ] EnvironmentError.filename is `str` even if original name is `unicode`
     - [ 1828 ] Problems inheriting from long
+    - [ 1833 ] Trouble passing Python objects through a Java class back to Python
 
 Jython 2.5.2
   same as 2.5.2rc4
diff --git a/src/org/python/core/PyBeanProperty.java b/src/org/python/core/PyBeanProperty.java
--- a/src/org/python/core/PyBeanProperty.java
+++ b/src/org/python/core/PyBeanProperty.java
@@ -53,7 +53,7 @@
         Object iself = Py.tojava(self, setMethod.getDeclaringClass());
 
         // Special handling of tuples - try to call a class constructor
-        if (value instanceof PyTuple) {
+        if (value instanceof PyTuple && myType != PyObject.class) {
             try {
                 value = Py.java2py(myType).__call__(((PyTuple)value).getArray());
             } catch (Throwable t) {
diff --git a/tests/java/javatests/Issue1833.java b/tests/java/javatests/Issue1833.java
new file mode 100644
--- /dev/null
+++ b/tests/java/javatests/Issue1833.java
@@ -0,0 +1,10 @@
+package javatests;
+import org.python.core.PyObject;
+
+public class Issue1833 {
+    public PyObject target;
+
+    public void setValue(PyObject value) {
+        target.__setattr__("attribute", value);
+    }
+}

-- 
Repository URL: http://hg.python.org/jython

From jython-checkins at python.org  Mon Feb  6 18:41:42 2012
From: jython-checkins at python.org (frank.wierzbicki)
Date: Mon, 06 Feb 2012 18:41:42 +0100
Subject: [Jython-checkins] =?utf8?b?anl0aG9uOiBGaXggcGFyc2luZyBiIi4uLiIg?=
	=?utf8?q?literals=2E?=
Message-ID: <E1RuSZS-0005lu-Qy@dinsdale.python.org>

http://hg.python.org/jython/rev/332b2490f53e
changeset:   6301:332b2490f53e
parent:      6298:2b4f725d4d29
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Fri Feb 03 09:48:50 2012 -0800
summary:
  Fix parsing b"..." literals.

files:
  src/org/python/antlr/GrammarActions.java |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/src/org/python/antlr/GrammarActions.java b/src/org/python/antlr/GrammarActions.java
--- a/src/org/python/antlr/GrammarActions.java
+++ b/src/org/python/antlr/GrammarActions.java
@@ -459,6 +459,11 @@
             ustring = true;
             start++;
         }
+        if (quoteChar == 'b' || quoteChar == 'B') {
+            // In 2.x this is just a str, and the parser prevents a 'u' and a
+            // 'b' in the same identifier, so just advance start.
+            start++;
+        }
         quoteChar = string.charAt(start);
         boolean raw = false;
         if (quoteChar == 'r' || quoteChar == 'R') {

-- 
Repository URL: http://hg.python.org/jython

From jython-checkins at python.org  Mon Feb  6 18:41:42 2012
From: jython-checkins at python.org (frank.wierzbicki)
Date: Mon, 06 Feb 2012 18:41:42 +0100
Subject: [Jython-checkins] =?utf8?q?jython_=28merge_default_-=3E_default?=
	=?utf8?b?KTogTWVyZ2Uu?=
Message-ID: <E1RuSZS-0005m4-Tg@dinsdale.python.org>

http://hg.python.org/jython/rev/2f2b7b889246
changeset:   6302:2f2b7b889246
parent:      6301:332b2490f53e
parent:      6300:86ebf89770e5
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Mon Feb 06 09:39:57 2012 -0800
summary:
  Merge.

files:
  Lib/test/test_java_integration.py       |  22 ++++++++++++-
  NEWS                                    |   1 +
  src/org/python/core/PyBeanProperty.java |   2 +-
  tests/java/javatests/Issue1833.java     |  10 +++++
  4 files changed, 33 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_java_integration.py b/Lib/test/test_java_integration.py
--- a/Lib/test/test_java_integration.py
+++ b/Lib/test/test_java_integration.py
@@ -25,6 +25,7 @@
 from org.python.tests import (BeanImplementation, Child, Child2,
                               CustomizableMapHolder, Listenable, ToUnicode)
 from org.python.tests.mro import (ConfusedOnGetitemAdd, FirstPredefinedGetitem, GetitemAdder)
+from javatests import Issue1833
 from javatests.ProxyTests import NullToString, Person
 
 
@@ -592,6 +593,24 @@
         self.assertEqual(type(test), unicode)
         self.assertEqual(test, u"Circle is 360\u00B0")
 
+
+class BeanPropertyTest(unittest.TestCase):
+
+    def test_issue1833(self):
+        class TargetClass(object):
+            def _getattribute(self):
+                return self.__attribute
+            def _setattribute(self, value):
+                self.__attribute = value
+            attribute = property(_getattribute, _setattribute)
+
+        target = TargetClass()
+        test = Issue1833(target=target)
+        value = ('bleh', 'blah')
+        test.value = value
+        self.assertEqual(target.attribute, value)
+
+
 def test_main():
     test_support.run_unittest(InstantiationTest,
                               BeanTest,
@@ -609,7 +628,8 @@
                               JavaWrapperCustomizationTest,
                               SerializationTest,
                               CopyTest,
-                              UnicodeTest)
+                              UnicodeTest,
+                              BeanPropertyTest)
 
 if __name__ == "__main__":
     test_main()
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@
     - [ 1824 ] os.link() can silently fail
     - [ 1825 ] EnvironmentError.filename is `str` even if original name is `unicode`
     - [ 1828 ] Problems inheriting from long
+    - [ 1833 ] Trouble passing Python objects through a Java class back to Python
 
 Jython 2.5.2
   same as 2.5.2rc4
diff --git a/src/org/python/core/PyBeanProperty.java b/src/org/python/core/PyBeanProperty.java
--- a/src/org/python/core/PyBeanProperty.java
+++ b/src/org/python/core/PyBeanProperty.java
@@ -53,7 +53,7 @@
         Object iself = Py.tojava(self, setMethod.getDeclaringClass());
 
         // Special handling of tuples - try to call a class constructor
-        if (value instanceof PyTuple) {
+        if (value instanceof PyTuple && myType != PyObject.class) {
             try {
                 value = Py.java2py(myType).__call__(((PyTuple)value).getArray());
             } catch (Throwable t) {
diff --git a/tests/java/javatests/Issue1833.java b/tests/java/javatests/Issue1833.java
new file mode 100644
--- /dev/null
+++ b/tests/java/javatests/Issue1833.java
@@ -0,0 +1,10 @@
+package javatests;
+import org.python.core.PyObject;
+
+public class Issue1833 {
+    public PyObject target;
+
+    public void setValue(PyObject value) {
+        target.__setattr__("attribute", value);
+    }
+}

-- 
Repository URL: http://hg.python.org/jython

From jython-checkins at python.org  Fri Feb 10 19:40:09 2012
From: jython-checkins at python.org (frank.wierzbicki)
Date: Fri, 10 Feb 2012 19:40:09 +0100
Subject: [Jython-checkins] =?utf8?q?jython=3A_=231835_s/occured/occurred/?=
Message-ID: <E1RvvOD-00008Y-A1@dinsdale.python.org>

http://hg.python.org/jython/rev/9c9c311c201b
changeset:   6303:9c9c311c201b
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Fri Feb 10 10:29:16 2012 -0800
summary:
  #1835 s/occured/occurred/

files:
  NEWS                                          |  1 +
  src/org/python/core/AbstractArray.java        |  2 +-
  src/org/python/core/PyBaseCode.java           |  2 +-
  src/org/python/core/PyTableCode.java          |  2 +-
  src/org/python/modules/posix/PosixModule.java |  4 ++--
  5 files changed, 6 insertions(+), 5 deletions(-)


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
 
 Jython 2.6a1
   Bugs Fixed
+    - [ 1835 ] s/occured/occurred/ :)
     - [ 1727 ] Error in Jython 2.5.2 with os.stat and varargs
     - [ 1735 ] return type of os.read is unicode, not str
     - [ 1755 ] os.utime('/tmp/nonexistent-file', None) fails to raise OSError
diff --git a/src/org/python/core/AbstractArray.java b/src/org/python/core/AbstractArray.java
--- a/src/org/python/core/AbstractArray.java
+++ b/src/org/python/core/AbstractArray.java
@@ -51,7 +51,7 @@
 
     /**
      * The modification count increment indicates if a structural change
-     * occured as a result of an operation that would make concurrent iteration
+     * occurred as a result of an operation that would make concurrent iteration
      * over the array invalid.  It is typically used by subclasses that
      * extend <CODE>AbstractList</CODE>, by adding the value to
      * <CODE>AbstractList.modCount</CODE> after performing a potentially
diff --git a/src/org/python/core/PyBaseCode.java b/src/org/python/core/PyBaseCode.java
--- a/src/org/python/core/PyBaseCode.java
+++ b/src/org/python/core/PyBaseCode.java
@@ -67,7 +67,7 @@
         try {
             ret = interpret(frame, ts);
         } catch (Throwable t) {
-            // Convert exceptions that occured in Java code to PyExceptions
+            // Convert exceptions that occurred in Java code to PyExceptions
             PyException pye = Py.JavaError(t);
             pye.tracebackHere(frame);
 
diff --git a/src/org/python/core/PyTableCode.java b/src/org/python/core/PyTableCode.java
--- a/src/org/python/core/PyTableCode.java
+++ b/src/org/python/core/PyTableCode.java
@@ -164,7 +164,7 @@
         try {
             ret = funcs.call_function(func_id, frame, ts);
         } catch (Throwable t) {
-            // Convert exceptions that occured in Java code to PyExceptions
+            // Convert exceptions that occurred in Java code to PyExceptions
             PyException pye = Py.JavaError(t);
             pye.tracebackHere(frame);
 
diff --git a/src/org/python/modules/posix/PosixModule.java b/src/org/python/modules/posix/PosixModule.java
--- a/src/org/python/modules/posix/PosixModule.java
+++ b/src/org/python/modules/posix/PosixModule.java
@@ -485,7 +485,7 @@
             if (!file.canRead()) {
                 throw Py.OSError(Errno.EACCES, path);
             }
-            throw Py.OSError("listdir(): an unknown error occured: " + path);
+            throw Py.OSError("listdir(): an unknown error occurred: " + path);
         }
 
         PyList list = new PyList();
@@ -738,7 +738,7 @@
             if (!file.canWrite()) {
                 throw Py.OSError(Errno.EPERM, path);
             }
-            throw Py.OSError("unlink(): an unknown error occured" + absolutePath);
+            throw Py.OSError("unlink(): an unknown error occurred" + absolutePath);
         }
     }
 

-- 
Repository URL: http://hg.python.org/jython

From jython-checkins at python.org  Tue Feb 14 03:04:38 2012
From: jython-checkins at python.org (frank.wierzbicki)
Date: Tue, 14 Feb 2012 03:04:38 +0100
Subject: [Jython-checkins] =?utf8?q?jython=3A_Add_bytes_type=2E?=
Message-ID: <E1Rx7l0-0007nq-JJ@dinsdale.python.org>

http://hg.python.org/jython/rev/aba11643405e
changeset:   6304:aba11643405e
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Mon Feb 13 18:04:23 2012 -0800
summary:
  Add bytes type.

files:
  src/org/python/core/__builtin__.java |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/src/org/python/core/__builtin__.java b/src/org/python/core/__builtin__.java
--- a/src/org/python/core/__builtin__.java
+++ b/src/org/python/core/__builtin__.java
@@ -305,6 +305,7 @@
         dict.__setitem__("Ellipsis", Py.Ellipsis);
         dict.__setitem__("True", Py.True);
         dict.__setitem__("False", Py.False);
+        dict.__setitem__("bytes", PyString.TYPE);
 
         // Work in debug mode by default
         // Hopefully add -O option in the future to change this

-- 
Repository URL: http://hg.python.org/jython

From jython-checkins at python.org  Wed Feb 22 23:38:25 2012
From: jython-checkins at python.org (frank.wierzbicki)
Date: Wed, 22 Feb 2012 23:38:25 +0100
Subject: [Jython-checkins] =?utf8?q?jython_=282=2E5=29=3A_Update_for_2=2E5?=
	=?utf8?b?LjNiMS4=?=
Message-ID: <E1S0KpN-000788-Am@dinsdale.python.org>

http://hg.python.org/jython/rev/c5567b7757e7
changeset:   6305:c5567b7757e7
branch:      2.5
tag:         v2.5.3b1
parent:      6299:763f01096d4f
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Wed Feb 22 12:33:06 2012 -0800
summary:
  Update for 2.5.3b1.

files:
  NEWS       |   2 +-
  README.txt |  43 ++++-------------------------------------
  build.xml  |  39 +++++++++++++++++++++----------------
  3 files changed, 28 insertions(+), 56 deletions(-)


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 Jython NEWS
 
-Jython 2.5.3a1
+Jython 2.5.3b1
   Bugs Fixed
     - [ 1727 ] Error in Jython 2.5.2 with os.stat and varargs
     - [ 1735 ] return type of os.read is unicode, not str
diff --git a/README.txt b/README.txt
--- a/README.txt
+++ b/README.txt
@@ -1,42 +1,9 @@
-Welcome to Jython 2.5.2
+Welcome to Jython 2.5.3b1
 =======================
 
-This is the final 2.5.2 release of Jython.
-It contains the fixes of the blocker bugs since 2.5.2 release candidate 3.
+This is the first beta release of the 2.5.3 version of Jython
+Please see the NEWS file for detailed release notes.
 
-This release fixes bugs related to resource leaks, Java integration,
-and a number of other issues. See the NEWS file for more details. In
-particular, we did not completely fix #1327, "Classloaders cannot GC,
-which exhausts permgen." Jython uses instances of ThreadLocal-managed
-class, ThreadState, to manage its execution state, including frames,
-exceptions, and the global namespace. The ThreadState also indirectly
-refers to the ClassLoaders used by Jython. Such usage can cause
-resource leaks when a Jython application is restarted under certain
-app containers, because the ThreadState often may not cleaned up by
-the app server's thread pool.
+The release was compiled on Ubuntu with JDK 6 and requires JDK 5 to run.
 
-Fixing this problem without a backwards breaking API change appears
-to be difficult. Therefore we recommend exploring workarounds, such as
-the one published in this blog post,
-http://weblogs.java.net/blog/jjviana/archive/2010/06/09/dealing-glassfish-301-memory-leak-or-threadlocal-thread-pool-bad-ide
-
-Jython 2.6 will introduce limited backwards breaking API changes, so
-it will be possible to fully resolve this bug, and related issues, in
-that version instead.
-
-And -- last but not least -- please help spread the word:
-
-Organizations using Jython 2.2.1, or earlier, should test their code
-against 2.5.2 beta 2 now so that bug fixes and/or workarounds may be
-identified. In particular, please note the following:
-
-  * No additional work is anticipated on Jython 2.2.
-
-  * Jython 2.5.2 is the last release in Jython 2.5.x series that will
-    address non-severe issues, including Java integration issues.
-
-  * Jython 2.6 development will begin immediately following the 2.5.2
-    release. Jython 2.6 will require the use of JDK 6.
-
-The release was compiled on Mac OS X with JDK 5 and requires JDK 5 to
-run. Please try it out and report any bugs at http://bugs.jython.org.
+Please try this out and report any bugs at http://bugs.jython.org.
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -52,7 +52,7 @@
 oracle.jar=C:/workspace/HEAD/for_development/bisdevsrv28/jboss/server/infra/lib/ojdbc14.jar
 #informix.jar=${basedir}/../externals/external-jars/ifxjdbc.jar
 
-# - option for javac (build.compiler=modern is a global option to use standard jdk 1.3/1.4/1.5)
+# - option for javac (build.compiler=modern is a global option to use standard jdk 1.5/1.6/1.7)
 #build.compiler=modern
 #jdk.target.version=1.5
 #debug=false
@@ -123,12 +123,12 @@
         <property name="PY_RELEASE_LEVEL_SNAPSHOT" value="170"/> <!-- 0xAA -->
 
         <!-- The current version info -->
-        <property name="jython.version" value="2.5.2+"/>
-        <property name="jython.version.noplus" value="2.5.2"/>
+        <property name="jython.version" value="2.5.3+"/>
+        <property name="jython.version.noplus" value="2.5.3"/>
         <property name="jython.major_version" value="2"/>
         <property name="jython.minor_version" value="5"/>
-        <property name="jython.micro_version" value="2"/>
-        <property name="jython.release_level" value="${PY_RELEASE_LEVEL_FINAL}"/>
+        <property name="jython.micro_version" value="3"/>
+        <property name="jython.release_level" value="${PY_RELEASE_LEVEL_BETA}"/>
         <property name="jython.release_serial" value="0"/>
 
         <condition property="do.snapshot.build">
@@ -240,7 +240,7 @@
 
         <!-- predefined main directory for checkout -->
         <property name="svn.main.dir" value="trunk" />
-        <property name="svn.code.dir" value="jython" />
+        <property name="hg.code.dir" value="jython" />
         <property name="svn.installer.dir" value="installer" />
         <!-- predefined revision for checkout (this works for both trunk and release branches -->
         <property name="svn.revision" value="HEAD" />
@@ -248,8 +248,8 @@
         <!-- properties work.dir and jython.base.dir are also definied in init, 
              so full-preinit must run first to work -->
         <property name="work.dir" value="${basedir}/../full_build/work" />
-        <property name="svn.checkout.dir" value="${work.dir}/checkout" />
-        <property name="jython.base.dir" value="${svn.checkout.dir}/${svn.code.dir}" />
+        <property name="checkout.dir" value="${work.dir}/checkout" />
+        <property name="jython.base.dir" value="${checkout.dir}/${hg.code.dir}" />
     	<!-- set has.repositories.connection to false in ant.properties if you want to skip checkout -->
         <property name="has.repositories.connection" value="true" />
         <condition property="do.checkout" value="true">
@@ -276,6 +276,8 @@
         <echo>Build environment for ${ant.project.name}</echo>
         <echo>(Note: if ${propertyname} is displayed, then the property is not set)</echo>
         <echo>--- optional libraries ---</echo>
+        <echo>oracle location    = '${oracle.jar}'</echo>
+        <echo>informix location  = '${informix.jar}'</echo>
         <echo>oracle             = '${oracle.present}'</echo>
         <echo>informix           = '${informix.present}'</echo>
         <echo>--- properties ---</echo>
@@ -299,7 +301,7 @@
         <echo>--- properties (used for full-build only) ---</echo>
         <echo>svn.main.dir       = '${svn.main.dir}'</echo>
         <echo>svn.revision       = '${svn.revision}'</echo>
-        <echo>svn.checkout.dir   = '${svn.checkout.dir}'</echo>
+        <echo>checkout.dir   = '${checkout.dir}'</echo>
         <echo>javahl.dir         = '${javahl.dir}'</echo>
         <echo>svnant.jar.dir     = '${svnant.jar.dir}'</echo>
         <echo>do.snapshot.build  = '${do.snapshot.build}'</echo>
@@ -343,10 +345,10 @@
     </target>
 
 
-    <!-- clean svn.checkout.dir if we really checkout -->
+    <!-- clean checkout.dir if we really checkout -->
     <target name="clean-checkout-dir" if="do.checkout">
         <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="${svn.checkout.dir}" includes="**/*" defaultexcludes="no" />
+            <fileset dir="${checkout.dir}" includes="**/*" defaultexcludes="no" />
         </delete>
     </target>
 
@@ -378,18 +380,21 @@
 
     <!-- create checkout directory if necessary -->
     <target name="prepare-checkout" if="do.checkout">
-        <mkdir dir="${svn.checkout.dir}" />
+        <mkdir dir="${checkout.dir}" />
     </target>
 
     <target name="checkout" depends="prepare" if="do.checkout">
+        <exec executable="hg">
+            <arg line="clone http://hg.python.org/jython-releasing/2.5.3 -b 2.5 ${checkout.dir}/${hg.code.dir}"/>
+        </exec>
+
         <svn javahl="${javahl.dir}" >
-            <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.installer.dir}" revision="${svn.revision}" destPath="${svn.checkout.dir}/${svn.installer.dir}" />
-            <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.code.dir}" revision="${svn.revision}" destPath="${svn.checkout.dir}/${svn.code.dir}" />
+            <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.installer.dir}" revision="${svn.revision}" destPath="${checkout.dir}/${svn.installer.dir}" />
         </svn> 
 
         <!-- checkout cpython license from the correct python maintenance branch -->
         <svn javahl="${javahl.dir}" >
-               <checkout url="http://svn.python.org/projects/python/branches/release25-maint/" destPath="${svn.checkout.dir}/python" recurse="false" />
+               <checkout url="http://svn.python.org/projects/python/branches/release25-maint/" destPath="${checkout.dir}/python" recurse="false" />
         </svn> 
     </target>
 
@@ -725,8 +730,8 @@
     </target>
 
     <target name="copy-license" if="do.checkout">
-        <echo>copy CPython LICENSE from ${svn.checkout.dir}/python</echo>
-        <copy file="${svn.checkout.dir}/python/LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
+        <echo>copy CPython LICENSE from ${checkout.dir}/python</echo>
+        <copy file="${checkout.dir}/python/LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
     </target>
 
     <target name="copy-full" depends="copy-lib, copy-license" if="full-build">

-- 
Repository URL: http://hg.python.org/jython

From jython-checkins at python.org  Wed Feb 22 23:38:25 2012
From: jython-checkins at python.org (frank.wierzbicki)
Date: Wed, 22 Feb 2012 23:38:25 +0100
Subject: [Jython-checkins] =?utf8?q?jython_=282=2E5=29=3A_Added_tag_v2=2E5?=
 =?utf8?q?=2E3b1_for_changeset_c5567b7757e7?=
Message-ID: <E1S0KpN-00078I-Bk@dinsdale.python.org>

http://hg.python.org/jython/rev/5fa0a5810b25
changeset:   6306:5fa0a5810b25
branch:      2.5
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Wed Feb 22 12:33:56 2012 -0800
summary:
  Added tag v2.5.3b1 for changeset c5567b7757e7

files:
  .hgtags |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -57,3 +57,4 @@
 98e52a9f6db0f795db1a17b3126039d75443f662 v2.5.2rc4
 c72d5c5c968abac480c0841057797abf2d7f0018 v2.5.2
 91332231a44804192e47ca25be334bab8ac8ea7c v2.5.2
+c5567b7757e7ff086bdb10006ddbd513a727a803 v2.5.3b1

-- 
Repository URL: http://hg.python.org/jython

From jython-checkins at python.org  Thu Feb 23 01:08:21 2012
From: jython-checkins at python.org (frank.wierzbicki)
Date: Thu, 23 Feb 2012 01:08:21 +0100
Subject: [Jython-checkins] =?utf8?q?jython_=28merge_2=2E5_-=3E_default=29?=
	=?utf8?q?=3A_Merge_with_2=2E5=2E?=
Message-ID: <E1S0MEP-0007j8-Gg@dinsdale.python.org>

http://hg.python.org/jython/rev/facfa85de028
changeset:   6307:facfa85de028
parent:      6304:aba11643405e
parent:      6306:5fa0a5810b25
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Wed Feb 22 16:07:33 2012 -0800
summary:
  Merge with 2.5.

files:
  .hgtags    |   1 +
  NEWS       |   2 +-
  README.txt |  43 ++++-------------------------------------
  build.xml  |  39 +++++++++++++++++++++----------------
  4 files changed, 29 insertions(+), 56 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -57,3 +57,4 @@
 98e52a9f6db0f795db1a17b3126039d75443f662 v2.5.2rc4
 c72d5c5c968abac480c0841057797abf2d7f0018 v2.5.2
 91332231a44804192e47ca25be334bab8ac8ea7c v2.5.2
+c5567b7757e7ff086bdb10006ddbd513a727a803 v2.5.3b1
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 Jython NEWS
 
-Jython 2.6a1
+Jython 2.5b1
   Bugs Fixed
     - [ 1835 ] s/occured/occurred/ :)
     - [ 1727 ] Error in Jython 2.5.2 with os.stat and varargs
diff --git a/README.txt b/README.txt
--- a/README.txt
+++ b/README.txt
@@ -1,42 +1,9 @@
-Welcome to Jython 2.5.2
+Welcome to Jython 2.5.3b1
 =======================
 
-This is the final 2.5.2 release of Jython.
-It contains the fixes of the blocker bugs since 2.5.2 release candidate 3.
+This is the first beta release of the 2.5.3 version of Jython
+Please see the NEWS file for detailed release notes.
 
-This release fixes bugs related to resource leaks, Java integration,
-and a number of other issues. See the NEWS file for more details. In
-particular, we did not completely fix #1327, "Classloaders cannot GC,
-which exhausts permgen." Jython uses instances of ThreadLocal-managed
-class, ThreadState, to manage its execution state, including frames,
-exceptions, and the global namespace. The ThreadState also indirectly
-refers to the ClassLoaders used by Jython. Such usage can cause
-resource leaks when a Jython application is restarted under certain
-app containers, because the ThreadState often may not cleaned up by
-the app server's thread pool.
+The release was compiled on Ubuntu with JDK 6 and requires JDK 5 to run.
 
-Fixing this problem without a backwards breaking API change appears
-to be difficult. Therefore we recommend exploring workarounds, such as
-the one published in this blog post,
-http://weblogs.java.net/blog/jjviana/archive/2010/06/09/dealing-glassfish-301-memory-leak-or-threadlocal-thread-pool-bad-ide
-
-Jython 2.6 will introduce limited backwards breaking API changes, so
-it will be possible to fully resolve this bug, and related issues, in
-that version instead.
-
-And -- last but not least -- please help spread the word:
-
-Organizations using Jython 2.2.1, or earlier, should test their code
-against 2.5.2 beta 2 now so that bug fixes and/or workarounds may be
-identified. In particular, please note the following:
-
-  * No additional work is anticipated on Jython 2.2.
-
-  * Jython 2.5.2 is the last release in Jython 2.5.x series that will
-    address non-severe issues, including Java integration issues.
-
-  * Jython 2.6 development will begin immediately following the 2.5.2
-    release. Jython 2.6 will require the use of JDK 6.
-
-The release was compiled on Mac OS X with JDK 5 and requires JDK 5 to
-run. Please try it out and report any bugs at http://bugs.jython.org.
+Please try this out and report any bugs at http://bugs.jython.org.
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -52,9 +52,9 @@
 oracle.jar=C:/workspace/HEAD/for_development/bisdevsrv28/jboss/server/infra/lib/ojdbc14.jar
 #informix.jar=${basedir}/../externals/external-jars/ifxjdbc.jar
 
-# - option for javac (build.compiler=modern is a global option to use standard jdk 1.3/1.4/1.5)
+# - option for javac (build.compiler=modern is a global option to use standard jdk 1.5/1.6/1.7)
 #build.compiler=modern
-#jdk.target.version=1.5
+#jdk.target.version=1.6
 #debug=false
 #deprecation=off
 
@@ -145,8 +145,8 @@
             <os family="windows"/>
         </condition>
         <property name="build.compiler" value="modern" />
-        <property name="jdk.target.version" value="1.5" />
-        <property name="jdk.source.version" value="1.5" />
+        <property name="jdk.target.version" value="1.6" />
+        <property name="jdk.source.version" value="1.6" />
         <property name="deprecation" value="true" />
         <property name="debug" value="true" />
         <property name="nowarn" value="false" />
@@ -242,7 +242,7 @@
 
         <!-- predefined main directory for checkout -->
         <property name="svn.main.dir" value="trunk" />
-        <property name="svn.code.dir" value="jython" />
+        <property name="hg.code.dir" value="jython" />
         <property name="svn.installer.dir" value="installer" />
         <!-- predefined revision for checkout (this works for both trunk and release branches -->
         <property name="svn.revision" value="HEAD" />
@@ -250,8 +250,8 @@
         <!-- properties work.dir and jython.base.dir are also definied in init, 
              so full-preinit must run first to work -->
         <property name="work.dir" value="${basedir}/../full_build/work" />
-        <property name="svn.checkout.dir" value="${work.dir}/checkout" />
-        <property name="jython.base.dir" value="${svn.checkout.dir}/${svn.code.dir}" />
+        <property name="checkout.dir" value="${work.dir}/checkout" />
+        <property name="jython.base.dir" value="${checkout.dir}/${hg.code.dir}" />
     	<!-- set has.repositories.connection to false in ant.properties if you want to skip checkout -->
         <property name="has.repositories.connection" value="true" />
         <condition property="do.checkout" value="true">
@@ -278,6 +278,8 @@
         <echo>Build environment for ${ant.project.name}</echo>
         <echo>(Note: if ${propertyname} is displayed, then the property is not set)</echo>
         <echo>--- optional libraries ---</echo>
+        <echo>oracle location    = '${oracle.jar}'</echo>
+        <echo>informix location  = '${informix.jar}'</echo>
         <echo>oracle             = '${oracle.present}'</echo>
         <echo>informix           = '${informix.present}'</echo>
         <echo>--- properties ---</echo>
@@ -301,7 +303,7 @@
         <echo>--- properties (used for full-build only) ---</echo>
         <echo>svn.main.dir       = '${svn.main.dir}'</echo>
         <echo>svn.revision       = '${svn.revision}'</echo>
-        <echo>svn.checkout.dir   = '${svn.checkout.dir}'</echo>
+        <echo>checkout.dir   = '${checkout.dir}'</echo>
         <echo>javahl.dir         = '${javahl.dir}'</echo>
         <echo>svnant.jar.dir     = '${svnant.jar.dir}'</echo>
         <echo>do.snapshot.build  = '${do.snapshot.build}'</echo>
@@ -345,10 +347,10 @@
     </target>
 
 
-    <!-- clean svn.checkout.dir if we really checkout -->
+    <!-- clean checkout.dir if we really checkout -->
     <target name="clean-checkout-dir" if="do.checkout">
         <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="${svn.checkout.dir}" includes="**/*" defaultexcludes="no" />
+            <fileset dir="${checkout.dir}" includes="**/*" defaultexcludes="no" />
         </delete>
     </target>
 
@@ -380,18 +382,21 @@
 
     <!-- create checkout directory if necessary -->
     <target name="prepare-checkout" if="do.checkout">
-        <mkdir dir="${svn.checkout.dir}" />
+        <mkdir dir="${checkout.dir}" />
     </target>
 
     <target name="checkout" depends="prepare" if="do.checkout">
+        <exec executable="hg">
+            <arg line="clone http://hg.python.org/jython-releasing/2.5.3 -b 2.5 ${checkout.dir}/${hg.code.dir}"/>
+        </exec>
+
         <svn javahl="${javahl.dir}" >
             <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.installer.dir}" revision="${svn.revision}" destPath="${svn.checkout.dir}/${svn.installer.dir}" />
-            <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.code.dir}" revision="${svn.revision}" destPath="${svn.checkout.dir}/${svn.code.dir}" />
         </svn> 
 
         <!-- checkout cpython license from the correct python maintenance branch -->
         <svn javahl="${javahl.dir}" >
-               <checkout url="http://svn.python.org/projects/python/branches/release25-maint/" destPath="${svn.checkout.dir}/python" recurse="false" />
+               <checkout url="http://svn.python.org/projects/python/branches/release26-maint/" destPath="${checkout.dir}/python" recurse="false" />
         </svn> 
     </target>
 
@@ -451,7 +456,7 @@
     <target name="brand-readme-version" depends="checkout" if="do.snapshot.build">
         <!-- change README.txt version string, if so defined: used for
         snapshot builds. XXX: a bit broken for now-->
-        <replace file="${jython.base.dir}/README.txt" token='2.5a3+'
+        <replace file="${jython.base.dir}/README.txt" token='2.6a1+'
         value='2.5a${svn.revision}' />
         <replace file="${jython.base.dir}/README.txt">
             <replacetoken>=======================</replacetoken>
@@ -721,14 +726,14 @@
                  windowtitle="Jython API documentation"
                  bottom="&lt;a href='http://www.jython.org' target='_top'>Jython homepage&lt;/a>"
         >
-            <link href="http://java.sun.com/j2se/1.5.0/docs/api/" />
+            <link href="http://java.sun.com/j2se/1.6.0/docs/api/" />
             <classpath refid="javadoc.classpath" />
         </javadoc>
     </target>
 
     <target name="copy-license" if="do.checkout">
-        <echo>copy CPython LICENSE from ${svn.checkout.dir}/python</echo>
-        <copy file="${svn.checkout.dir}/python/LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
+        <echo>copy CPython LICENSE from ${checkout.dir}/python</echo>
+        <copy file="${checkout.dir}/python/LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
     </target>
 
     <target name="copy-full" depends="copy-lib, copy-license" if="full-build">

-- 
Repository URL: http://hg.python.org/jython

From jython-checkins at python.org  Thu Feb 23 01:08:21 2012
From: jython-checkins at python.org (frank.wierzbicki)
Date: Thu, 23 Feb 2012 01:08:21 +0100
Subject: [Jython-checkins] =?utf8?q?jython=3A_Fix_typo=2E?=
Message-ID: <E1S0MEP-0007jI-ID@dinsdale.python.org>

http://hg.python.org/jython/rev/e49a734162b9
changeset:   6308:e49a734162b9
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Wed Feb 22 16:08:10 2012 -0800
summary:
  Fix typo.

files:
  NEWS |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 Jython NEWS
 
-Jython 2.5b1
+Jython 2.5.3b1
   Bugs Fixed
     - [ 1835 ] s/occured/occurred/ :)
     - [ 1727 ] Error in Jython 2.5.2 with os.stat and varargs

-- 
Repository URL: http://hg.python.org/jython