[Jython-checkins] SF.net SVN: jython: [3547] trunk/jython/src

[<cg...@us...>]

Revision: 3547
          http://jython.svn.sourceforge.net/jython/?rev=3547&view=rev
Author:   cgroves
Date:     2007-09-26 23:22:01 -0700 (Wed, 26 Sep 2007)

Log Message:
-----------
decode str going in to unicode objects and don't put the results from unicode_join into a PyUnicode object since it already is one

Modified Paths:
--------------
    trunk/jython/src/org/python/core/PyString.java
    trunk/jython/src/org/python/core/PyUnicode.java
    trunk/jython/src/templates/unicode.expose

Modified: trunk/jython/src/org/python/core/PyString.java
===================================================================
--- trunk/jython/src/org/python/core/PyString.java	2007-09-27 04:57:24 UTC (rev 3546)
+++ trunk/jython/src/org/python/core/PyString.java	2007-09-27 06:22:01 UTC (rev 3547)
@@ -1624,7 +1624,7 @@
     }
 
     final PyUnicode str___unicode__() {
-        return new PyUnicode(this.toString());
+        return new PyUnicode(this);
     }
 
     public int __len__() {

Modified: trunk/jython/src/org/python/core/PyUnicode.java
===================================================================
--- trunk/jython/src/org/python/core/PyUnicode.java	2007-09-27 04:57:24 UTC (rev 3546)
+++ trunk/jython/src/org/python/core/PyUnicode.java	2007-09-27 06:22:01 UTC (rev 3547)
@@ -878,7 +878,7 @@
             }
 
             public PyObject __call__(PyObject arg0) {
-                return new PyUnicode(((PyUnicode)self).unicode_join(arg0));
+                return((PyUnicode)self).unicode_join(arg0);
             }
 
         }
@@ -1482,7 +1482,7 @@
     }
     
     public PyUnicode(PyType subtype, PyString pystring) {
-        this(subtype, (String)pystring.__tojava__(String.class));
+        this(subtype, pystring.decode().toString());
     }
 
 

Modified: trunk/jython/src/templates/unicode.expose
===================================================================
--- trunk/jython/src/templates/unicode.expose	2007-09-27 04:57:24 UTC (rev 3546)
+++ trunk/jython/src/templates/unicode.expose	2007-09-27 06:22:01 UTC (rev 3547)
@@ -33,7 +33,7 @@
 expose_meth: :b istitle
 expose_meth: :b isunicode
 expose_meth: :b isupper
-expose_meth: :u join o
+expose_meth: join o
 expose_meth: :u ljust i
 expose_meth: :u lower
 expose_meth: :u lstrip S?


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