[Jython-checkins] SF.net SVN: jython:[6694] trunk/jython/src/com/ziclix/python/sql/ PyStatement.java

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

Revision: 6694
          http://jython.svn.sourceforge.net/jython/?rev=6694&view=rev
Author:   pjenvey
Date:     2009-08-18 02:44:03 +0000 (Tue, 18 Aug 2009)

Log Message:
-----------
add __unicode__

Modified Paths:
--------------
    trunk/jython/src/com/ziclix/python/sql/PyStatement.java

Modified: trunk/jython/src/com/ziclix/python/sql/PyStatement.java
===================================================================
--- trunk/jython/src/com/ziclix/python/sql/PyStatement.java	2009-08-18 02:19:12 UTC (rev 6693)
+++ trunk/jython/src/com/ziclix/python/sql/PyStatement.java	2009-08-18 02:44:03 UTC (rev 6694)
@@ -8,11 +8,13 @@
  */
 package com.ziclix.python.sql;
 
+import org.python.core.codecs;
 import org.python.core.Py;
 import org.python.core.PyException;
 import org.python.core.PyList;
 import org.python.core.PyObject;
 import org.python.core.PyString;
+import org.python.core.PyUnicode;
 
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
@@ -92,22 +94,27 @@
     }
 
     @Override
-    public PyString __str__() {
+    public PyUnicode __unicode__() {
         if (sql instanceof String) {
-            return Py.newString((String) sql);
+            return Py.newUnicode((String) sql);
         } else if (sql instanceof Procedure) {
             try {
-                return Py.newString(((Procedure) sql).toSql());
+                return Py.newUnicode(((Procedure) sql).toSql());
             } catch (SQLException e) {
                 throw zxJDBC.makeException(e);
             }
         }
-        return super.__str__();
+        return super.__unicode__();
     }
 
     @Override
+    public PyString __str__() {
+        return Py.newString(__unicode__().encode(codecs.getDefaultEncoding(), "replace"));
+    }
+
+    @Override
     public String toString() {
-        return String.format("<PyStatement object at %s for [%s]", Py.idstr(this), __str__());
+        return String.format("<PyStatement object at %s for [%s]", Py.idstr(this), __unicode__());
     }
 
     /**
@@ -178,7 +185,6 @@
 
         Fetch fetch = cursor.fetch;
         switch (style) {
-
             case STATEMENT_STATIC:
                 if (statement.execute((String) sql)) {
                     fetch.add(statement.getResultSet());
@@ -203,7 +209,7 @@
                 fetch.add(callableStatement, (Procedure) sql, params);
                 break;
 
-            default :
+            default:
                 throw zxJDBC.makeException(zxJDBC.ProgrammingError,
                                            zxJDBC.getString("invalidStyle"));
         }


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