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

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

Revision: 6927
          http://jython.svn.sourceforge.net/jython/?rev=6927&view=rev
Author:   pjenvey
Date:     2009-10-29 02:53:00 +0000 (Thu, 29 Oct 2009)

Log Message:
-----------
dict doesn't need __nonzero__ exposed, doc setdefault

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

Modified: trunk/jython/src/org/python/core/PyDictionary.java
===================================================================
--- trunk/jython/src/org/python/core/PyDictionary.java	2009-10-28 23:41:45 UTC (rev 6926)
+++ trunk/jython/src/org/python/core/PyDictionary.java	2009-10-29 02:53:00 UTC (rev 6927)
@@ -116,12 +116,6 @@
 
     @Override
     public boolean __nonzero__() {
-        return dict___nonzero__();
-    }
-
-    //XXX: CPython's dict does not define __nonzero__
-    @ExposedMethod
-    final boolean dict___nonzero__() {
         return table.size() != 0;
     }
 
@@ -549,14 +543,13 @@
         return dict_setdefault(key, failobj);
     }
 
-    //XXX: needs __doc__ but CPython does not define setdefault
-    @ExposedMethod(defaults = "Py.None")
+    @ExposedMethod(defaults = "Py.None", doc = BuiltinDocs.dict_setdefault_doc)
     final PyObject dict_setdefault(PyObject key, PyObject failobj) {
         PyObject oldValue = table.putIfAbsent(key, failobj);
         return oldValue == null ? failobj : oldValue;
     }
 
-    //XXX: needs __doc__ but CPython does not define setifabsent
+    // XXX: needs __doc__ but CPython does not define setifabsent
     @ExposedMethod(defaults = "Py.None")
     final PyObject dict_setifabsent(PyObject key, PyObject failobj) {
         PyObject oldValue = table.putIfAbsent(key, failobj);


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