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

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

Revision: 6558
          http://jython.svn.sourceforge.net/jython/?rev=6558&view=rev
Author:   pjenvey
Date:     2009-07-22 02:18:24 +0000 (Wed, 22 Jul 2009)

Log Message:
-----------
better repr

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

Modified: trunk/jython/src/com/ziclix/python/sql/PyConnection.java
===================================================================
--- trunk/jython/src/com/ziclix/python/sql/PyConnection.java	2009-07-21 23:06:14 UTC (rev 6557)
+++ trunk/jython/src/com/ziclix/python/sql/PyConnection.java	2009-07-22 02:18:24 UTC (rev 6558)
@@ -118,12 +118,15 @@
      *
      * @return string representation of the object.
      */
+    @Override
     public String toString() {
 
         try {
-            return "<PyConnection user='" + this.connection.getMetaData().getUserName() + "', url='" + this.connection.getMetaData().getURL() + "'>";
+            return String.format("<PyConnection object at %s user='%s', url='%s'>", Py.idstr(this),
+                                 connection.getMetaData().getUserName(),
+                                 connection.getMetaData().getURL());
         } catch (SQLException e) {
-            return "<PyConnection at " + hashCode() + ">";
+            return String.format("<PyConnection object at %s", Py.idstr(this));
         }
     }
 

Modified: trunk/jython/src/com/ziclix/python/sql/PyCursor.java
===================================================================
--- trunk/jython/src/com/ziclix/python/sql/PyCursor.java	2009-07-21 23:06:14 UTC (rev 6557)
+++ trunk/jython/src/com/ziclix/python/sql/PyCursor.java	2009-07-22 02:18:24 UTC (rev 6558)
@@ -166,7 +166,7 @@
      */
     @Override
     public String toString() {
-        return "<PyCursor object instance at " + Py.id(this) + ">";
+        return String.format("<PyCursor object at %s>", Py.idstr(this));
     }
 
     /**

Modified: trunk/jython/src/com/ziclix/python/sql/PyStatement.java
===================================================================
--- trunk/jython/src/com/ziclix/python/sql/PyStatement.java	2009-07-21 23:06:14 UTC (rev 6557)
+++ trunk/jython/src/com/ziclix/python/sql/PyStatement.java	2009-07-22 02:18:24 UTC (rev 6558)
@@ -130,20 +130,10 @@
         return super.__str__();
     }
 
-    /**
-     * Method __repr__
-     *
-     * @return PyString
-     */
+    @Override
     public PyString __repr__() {
-
-        // care is taken not to display a rounded second value
-        StringBuffer buf = new StringBuffer("<PyStatement object for [");
-
-        buf.append(__str__().toString());
-        buf.append("] at ").append(Py.id(this)).append(">");
-
-        return Py.newString(buf.toString());
+        return Py.newString(String.format("<PyStatement object at %s for [%s]", Py.idstr(this),
+                                          __str__()));
     }
 
     /**


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