Fixed JavaImportHelper#getFromListAsStrings, which was assuming that

jimbaker · jimbaker · commit 49308c735a43 · 2009-04-16T06:18:40.000Z
the PyTuple it was iterating over would contain String, not
PyString. Now allow both, just in case, since either should be
applicable anyway.
diff --git a/src/org/python/core/JavaImportHelper.java b/src/org/python/core/JavaImportHelper.java
@@ -120,6 +120,9 @@ private static final List getFromListAsStrings(PyObject fromlist) {
             Iterator iterator = ((PyTuple) fromlist).iterator();
             while (iterator.hasNext()) {
                 Object obj = iterator.next();
+                if (obj instanceof PyString) {
+                    obj = ((PyString)obj).string;
+                }
                 if (obj instanceof String) {
                     String fromName = (String) obj;
                     if (!"*".equals(fromName)) {
diff --git a/src/org/python/core/PyList.java b/src/org/python/core/PyList.java
@@ -142,7 +142,7 @@ protected void setslice(int start, int stop, int step, PyObject value) {
             value = new PyList(value);
             setsliceIterator(start, stop, step, value.asIterable().iterator());
         } else {
-            System.err.println("List");
+//            System.err.println("List");
             List valueList = (List) value.__tojava__(List.class);
             if (valueList != null && valueList != Py.NoConversion) {
                 setsliceList(start, stop, step, valueList);
diff --git a/src/org/python/core/packagecache/PackageManager.java b/src/org/python/core/packagecache/PackageManager.java
@@ -88,11 +88,9 @@ protected PyList basicDoDir(PyJavaPackage jpkg, boolean instantiate,
 
         if (!instantiate) {
             PyList ret = cls.keys();
-
             PyList dictKeys = dict.keys();
 
-            for (int i = 0; i < dictKeys.__len__(); i++) {
-                PyObject name = dictKeys.pyget(i);
+            for (PyObject name : dictKeys.asIterable()) {
                 if (!cls.has_key(name)) {
                     if (exclpkgs && dict.get(name) instanceof PyJavaPackage)
                         continue;
@@ -103,7 +101,6 @@ protected PyList basicDoDir(PyJavaPackage jpkg, boolean instantiate,
             return ret;
         }
 
-
         for (PyObject pyname : cls.keys().asIterable()) {
             if (!dict.has_key(pyname)) {
                 String name = pyname.toString();
@@ -118,8 +115,7 @@ protected PyList basicDoDir(PyJavaPackage jpkg, boolean instantiate,
      * Helper merging list2 into list1. Returns list1.
      */
     protected PyList merge(PyList list1, PyList list2) {
-        for (int i = 0; i < list2.__len__(); i++) {
-            PyObject name = list2.pyget(i);
+        for (PyObject name : list2.asIterable()) {
             list1.append(name);
         }
 
