From jython-checkins at python.org  Tue Apr 19 03:11:23 2011
From: jython-checkins at python.org (philip.jenvey)
Date: Tue, 19 Apr 2011 03:11:23 +0200
Subject: [Jython-checkins] jython: a test commit
Message-ID: <E1QBzTP-0005LB-6E@dinsdale.python.org>

http://hg.python.org/jython/rev/8b7b114498af
changeset:   6192:8b7b114498af
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Mon Apr 18 18:11:06 2011 -0700
summary:
  a test commit

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


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@
 Jython 2.6a1
   Bugs Fixed
     - [ 1727 ] Error in Jython 2.5.2 with os.stat and varargs
+  New Features
+    - The Jython development repository has been converted from
+      Subversion to Mercurial (almost)! A test repository is now
+      hosted @ http://hg.python.org/jython
 
 Jython 2.5.2
   same as 2.5.2rc4

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

From jython-checkins at python.org  Tue Apr 19 04:21:17 2011
From: jython-checkins at python.org (philip.jenvey)
Date: Tue, 19 Apr 2011 04:21:17 +0200
Subject: [Jython-checkins] jython: re-add tags that became missing due to
	the dummy merges
Message-ID: <E1QC0Z3-0001H3-Cy@dinsdale.python.org>

http://hg.python.org/jython/rev/ea5559c8b75b
changeset:   6193:ea5559c8b75b
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Mon Apr 18 19:20:00 2011 -0700
summary:
  re-add tags that became missing due to the dummy merges

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


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -25,6 +25,11 @@
 d6a94a105d50d06dbfcef3f44ebbdc6f47b54b2b v2.2rc1
 935c8b21d122bf93b511b7e919fc3a8f4264063b v2.2rc2
 88cba73e1aa3faa17d6bb2c869da13799cdf1f41 v2.2rc3
+24b8eadf28e017cd5f103fc6adcdd577221452c8 v2.2
+923e3ab29e2937ce760b34fc49b5c6f46d1400d7 v2.2.1rc1
+c586e9b20932a2162946567599a011c6732bb79d v2.2.1rc2
+3aa4e4c5fa541fe008f28ec517c7f15dddb4ec9e v2.2.1rc2
+17d08bf3f1f5c7bf0ef62f231cafdb2ee2879805 v2.2.1
 969b9f5a6700ffd7e3cb495f55aa74bf3b91b637 v2.5a0
 4b2ecf743e5ecff824995121db413b5b8ec5edcd v2.5a3
 08874c526b19df8dc05b46908f8df8c1b239d5c8 v2.5b0

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

From jython-checkins at python.org  Sat Apr 23 02:10:43 2011
From: jython-checkins at python.org (philip.jenvey)
Date: Sat, 23 Apr 2011 02:10:43 +0200
Subject: [Jython-checkins] jython (2.5): fix os.read returning unicode
	instead of str
Message-ID: <E1QDQQt-00063M-Lb@dinsdale.python.org>

http://hg.python.org/jython/rev/9a7527827dbf
changeset:   6194:9a7527827dbf
branch:      2.5
parent:      6190:edceb24ce9d9
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Fri Apr 22 17:03:50 2011 -0700
summary:
  fix os.read returning unicode instead of str
fixes #1735

files:
  Lib/test/test_fileno.py                       |  4 +++-
  src/org/python/modules/posix/PosixModule.java |  4 ++--
  2 files changed, 5 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_fileno.py b/Lib/test/test_fileno.py
--- a/Lib/test/test_fileno.py
+++ b/Lib/test/test_fileno.py
@@ -46,7 +46,9 @@
         self.fp.write('jython filenos')
         self.fp.flush()
         self.fp.seek(0)
-        self.assertEqual(os.read(self.fd, 7), 'jython ')
+        result = os.read(self.fd, 7)
+        self.assertTrue(isinstance(result, str))
+        self.assertEqual(result, 'jython ')
         self.assertEqual(os.read(self.fd, 99), 'filenos')
         self.fp.close()
         raises(OSError, 9, os.read, self.fd, 1)
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
@@ -609,9 +609,9 @@
     public static PyString __doc__read = new PyString(
         "read(fd, buffersize) -> string\n\n" +
         "Read a file descriptor.");
-    public static String read(PyObject fd, int buffersize) {
+    public static PyObject read(PyObject fd, int buffersize) {
         try {
-            return StringUtil.fromBytes(FileDescriptors.get(fd).read(buffersize));
+            return new PyString(StringUtil.fromBytes(FileDescriptors.get(fd).read(buffersize)));
         } catch (PyException pye) {
             throw badFD();
         }

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

From jython-checkins at python.org  Sat Apr 23 02:10:43 2011
From: jython-checkins at python.org (philip.jenvey)
Date: Sat, 23 Apr 2011 02:10:43 +0200
Subject: [Jython-checkins] jython (2.5): changelog 9a7527827dbf
Message-ID: <E1QDQQt-00063W-MV@dinsdale.python.org>

http://hg.python.org/jython/rev/196a5e66a7bd
changeset:   6195:196a5e66a7bd
branch:      2.5
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Fri Apr 22 17:07:20 2011 -0700
summary:
  changelog 9a7527827dbf

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


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
 Jython 2.5.3a1
   Bugs Fixed
     - [ 1727 ] Error in Jython 2.5.2 with os.stat and varargs
+    - [ 1735 ] return type of os.read is unicode, not str
 
 Jython 2.5.2
   same as 2.5.2rc4

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

From jython-checkins at python.org  Sat Apr 23 02:10:43 2011
From: jython-checkins at python.org (philip.jenvey)
Date: Sat, 23 Apr 2011 02:10:43 +0200
Subject: [Jython-checkins] jython (merge 2.5 -> default): merge with 2.5
Message-ID: <E1QDQQt-00063a-Nv@dinsdale.python.org>

http://hg.python.org/jython/rev/40e1d584f319
changeset:   6196:40e1d584f319
parent:      6193:ea5559c8b75b
parent:      6195:196a5e66a7bd
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Fri Apr 22 17:08:27 2011 -0700
summary:
  merge with 2.5

files:
  Lib/test/test_fileno.py                       |  4 +++-
  NEWS                                          |  1 +
  src/org/python/modules/posix/PosixModule.java |  4 ++--
  3 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_fileno.py b/Lib/test/test_fileno.py
--- a/Lib/test/test_fileno.py
+++ b/Lib/test/test_fileno.py
@@ -46,7 +46,9 @@
         self.fp.write('jython filenos')
         self.fp.flush()
         self.fp.seek(0)
-        self.assertEqual(os.read(self.fd, 7), 'jython ')
+        result = os.read(self.fd, 7)
+        self.assertTrue(isinstance(result, str))
+        self.assertEqual(result, 'jython ')
         self.assertEqual(os.read(self.fd, 99), 'filenos')
         self.fp.close()
         raises(OSError, 9, os.read, self.fd, 1)
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
 Jython 2.6a1
   Bugs Fixed
     - [ 1727 ] Error in Jython 2.5.2 with os.stat and varargs
+    - [ 1735 ] return type of os.read is unicode, not str
   New Features
     - The Jython development repository has been converted from
       Subversion to Mercurial (almost)! A test repository is now
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
@@ -609,9 +609,9 @@
     public static PyString __doc__read = new PyString(
         "read(fd, buffersize) -> string\n\n" +
         "Read a file descriptor.");
-    public static String read(PyObject fd, int buffersize) {
+    public static PyObject read(PyObject fd, int buffersize) {
         try {
-            return StringUtil.fromBytes(FileDescriptors.get(fd).read(buffersize));
+            return new PyString(StringUtil.fromBytes(FileDescriptors.get(fd).read(buffersize)));
         } catch (PyException pye) {
             throw badFD();
         }

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

From jython-checkins at python.org  Wed Apr 27 13:19:11 2011
From: jython-checkins at python.org (josh.juneau)
Date: Wed, 27 Apr 2011 13:19:11 +0200
Subject: [Jython-checkins] jython: Test commit
Message-ID: <E1QF2lz-0001jy-76@dinsdale.python.org>

http://hg.python.org/jython/rev/21b0a84bbcf4
changeset:   6197:21b0a84bbcf4
user:        juneau001 at gmail.com
date:        Wed Apr 27 06:17:39 2011 -0500
summary:
  Test commit

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


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@
     - The Jython development repository has been converted from
       Subversion to Mercurial (almost)! A test repository is now
       hosted @ http://hg.python.org/jython
+    - Tests on the new hg repository are positive so far
 
 Jython 2.5.2
   same as 2.5.2rc4

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

From jython-checkins at python.org  Thu Apr 28 18:06:40 2011
From: jython-checkins at python.org (frank.wierzbicki)
Date: Thu, 28 Apr 2011 18:06:40 +0200
Subject: [Jython-checkins] jython (merge default -> default): Merge with tip.
Message-ID: <E1QFTjk-0007T2-5g@dinsdale.python.org>

http://hg.python.org/jython/rev/3b893248b9e1
changeset:   6199:3b893248b9e1
parent:      6198:061fda1cd269
parent:      6197:21b0a84bbcf4
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Thu Apr 28 09:05:30 2011 -0700
summary:
  Merge with tip.

files:
  Lib/test/test_fileno.py                       |  4 +++-
  NEWS                                          |  4 +++-
  src/org/python/modules/posix/PosixModule.java |  4 ++--
  3 files changed, 8 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_fileno.py b/Lib/test/test_fileno.py
--- a/Lib/test/test_fileno.py
+++ b/Lib/test/test_fileno.py
@@ -46,7 +46,9 @@
         self.fp.write('jython filenos')
         self.fp.flush()
         self.fp.seek(0)
-        self.assertEqual(os.read(self.fd, 7), 'jython ')
+        result = os.read(self.fd, 7)
+        self.assertTrue(isinstance(result, str))
+        self.assertEqual(result, 'jython ')
         self.assertEqual(os.read(self.fd, 99), 'filenos')
         self.fp.close()
         raises(OSError, 9, os.read, self.fd, 1)
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -3,10 +3,12 @@
 Jython 2.6a1
   Bugs Fixed
     - [ 1727 ] Error in Jython 2.5.2 with os.stat and varargs
+    - [ 1735 ] return type of os.read is unicode, not str
   New Features
     - The Jython development repository has been converted from
       Subversion to Mercurial (almost)! A test repository is now
-      hosted @ http://hg.python.org/jython WOOHOO!
+      hosted @ http://hg.python.org/jython
+    - Tests on the new hg repository are positive so far
 
 Jython 2.5.2
   same as 2.5.2rc4
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
@@ -609,9 +609,9 @@
     public static PyString __doc__read = new PyString(
         "read(fd, buffersize) -> string\n\n" +
         "Read a file descriptor.");
-    public static String read(PyObject fd, int buffersize) {
+    public static PyObject read(PyObject fd, int buffersize) {
         try {
-            return StringUtil.fromBytes(FileDescriptors.get(fd).read(buffersize));
+            return new PyString(StringUtil.fromBytes(FileDescriptors.get(fd).read(buffersize)));
         } catch (PyException pye) {
             throw badFD();
         }

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

From jython-checkins at python.org  Thu Apr 28 18:06:40 2011
From: jython-checkins at python.org (frank.wierzbicki)
Date: Thu, 28 Apr 2011 18:06:40 +0200
Subject: [Jython-checkins] jython: Add "WOOHOO" to hg news.
Message-ID: <E1QFTjk-0007Ss-4G@dinsdale.python.org>

http://hg.python.org/jython/rev/061fda1cd269
changeset:   6198:061fda1cd269
parent:      6193:ea5559c8b75b
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Thu Apr 28 09:00:14 2011 -0700
summary:
  Add "WOOHOO" to hg news.

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


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@
   New Features
     - The Jython development repository has been converted from
       Subversion to Mercurial (almost)! A test repository is now
-      hosted @ http://hg.python.org/jython
+      hosted @ http://hg.python.org/jython WOOHOO!
 
 Jython 2.5.2
   same as 2.5.2rc4

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

From jython-checkins at python.org  Thu Apr 28 18:06:40 2011
From: jython-checkins at python.org (frank.wierzbicki)
Date: Thu, 28 Apr 2011 18:06:40 +0200
Subject: [Jython-checkins] jython: Added WOHOO to the hg announcement.
Message-ID: <E1QFTjk-0007T6-6i@dinsdale.python.org>

http://hg.python.org/jython/rev/df613e507ac4
changeset:   6200:df613e507ac4
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Thu Apr 28 09:06:07 2011 -0700
summary:
  Added WOHOO to the hg announcement.

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


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@
   New Features
     - The Jython development repository has been converted from
       Subversion to Mercurial (almost)! A test repository is now
-      hosted @ http://hg.python.org/jython
+      hosted @ http://hg.python.org/jython. WOOHOO!
     - Tests on the new hg repository are positive so far
 
 Jython 2.5.2

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

From jython-checkins at python.org  Sat Apr 30 10:05:12 2011
From: jython-checkins at python.org (oti.humbel)
Date: Sat, 30 Apr 2011 10:05:12 +0200
Subject: [Jython-checkins] jython: Test commit
Message-ID: <E1QG5Au-0002QY-IC@dinsdale.python.org>

http://hg.python.org/jython/rev/bf70b676a062
changeset:   6201:bf70b676a062
user:        Oti Humbel <ohumbel at gmail.com>
date:        Sat Apr 30 10:02:39 2011 +0200
summary:
  Test commit

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


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@
       Subversion to Mercurial (almost)! A test repository is now
       hosted @ http://hg.python.org/jython. WOOHOO!
     - Tests on the new hg repository are positive so far
+    - chiming in: great!
 
 Jython 2.5.2
   same as 2.5.2rc4

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