[Jython-checkins] SF.net SVN: jython:[4982] branches/asm/src/org/python/core

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

Revision: 4982
          http://jython.svn.sourceforge.net/jython/?rev=4982&view=rev
Author:   pjenvey
Date:     2008-07-21 19:11:48 +0000 (Mon, 21 Jul 2008)

Log Message:
-----------
fix exposed __getitem__ possibly returning null

Modified Paths:
--------------
    branches/asm/src/org/python/core/PyString.java
    branches/asm/src/org/python/core/PyUnicode.java

Modified: branches/asm/src/org/python/core/PyString.java
===================================================================
--- branches/asm/src/org/python/core/PyString.java	2008-07-21 19:10:02 UTC (rev 4981)
+++ branches/asm/src/org/python/core/PyString.java	2008-07-21 19:11:48 UTC (rev 4982)
@@ -468,7 +468,11 @@
 
     @ExposedMethod
     final PyObject str___getitem__(PyObject index) {
-        return seq___finditem__(index);
+        PyObject ret = seq___finditem__(index);
+        if (ret == null) {
+            throw Py.IndexError("string index out of range");
+        }
+        return ret;
     }
     
     @ExposedMethod(defaults = "null")

Modified: branches/asm/src/org/python/core/PyUnicode.java
===================================================================
--- branches/asm/src/org/python/core/PyUnicode.java	2008-07-21 19:10:02 UTC (rev 4981)
+++ branches/asm/src/org/python/core/PyUnicode.java	2008-07-21 19:11:48 UTC (rev 4982)
@@ -245,12 +245,12 @@
     }
 
     @ExposedMethod
-    public PyObject unicode___getitem__(PyObject index) {
-        return seq___finditem__(index);
+    final PyObject unicode___getitem__(PyObject index) {
+        return str___getitem__(index);
     }
 
     @ExposedMethod(defaults = "null")
-    public PyObject unicode___getslice__(PyObject start, PyObject stop, PyObject step) {
+    final PyObject unicode___getslice__(PyObject start, PyObject stop, PyObject step) {
         return seq___getslice__(start, stop, step);
     }
 


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