[Jython-checkins] SF.net SVN: jython:[6181] trunk/jython/src/org/python/core

[<pj...@us...>]

Revision: 6181
          http://jython.svn.sourceforge.net/jython/?rev=6181&view=rev
Author:   pjenvey
Date:     2009-04-07 01:52:46 +0000 (Tue, 07 Apr 2009)

Log Message:
-----------
str/unicode don't need __unicode__, and having it actually confuses some code

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

Modified: trunk/jython/src/org/python/core/PyString.java
===================================================================
--- trunk/jython/src/org/python/core/PyString.java	2009-04-07 01:49:15 UTC (rev 6180)
+++ trunk/jython/src/org/python/core/PyString.java	2009-04-07 01:52:46 UTC (rev 6181)
@@ -101,12 +101,6 @@
     }
 
     public PyUnicode __unicode__() {
-        return str___unicode__();
-    }
-
-    //XXX: need doc
-    @ExposedMethod
-    final PyUnicode str___unicode__() {
         return new PyUnicode(this);
     }
 

Modified: trunk/jython/src/org/python/core/PyUnicode.java
===================================================================
--- trunk/jython/src/org/python/core/PyUnicode.java	2009-04-07 01:49:15 UTC (rev 6180)
+++ trunk/jython/src/org/python/core/PyUnicode.java	2009-04-07 01:52:46 UTC (rev 6181)
@@ -213,10 +213,8 @@
         return fmt.format(other);
     }
 
-    //XXX: needs doc
-    @ExposedMethod/*(doc = BuiltinDocs.unicode___unicode___doc)*/
-    final PyUnicode unicode___unicode__() {
-        return str___unicode__();
+    public PyUnicode __unicode__() {
+        return this;
     }
 
     @Override


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