Added itervalues and iterkeys to map proxy. Fixes #2443

dougclayton · dougclayton · commit caddc5b1c50f · 2016-08-31T08:09:49.000+01:00
diff --git a/Lib/test/test_dict_jy.py b/Lib/test/test_dict_jy.py
@@ -137,6 +137,8 @@ def test_hashmap_builtin_pymethods(self):
         x['a'] = 1
         x[(1, 2)] = 'xyz'
         self.assertEqual({tup for tup in x.iteritems()}, {('a', 1), ((1, 2), 'xyz')})
+        self.assertEqual({tup for tup in x.itervalues()}, {1, 'xyz'})
+        self.assertEqual({tup for tup in x.iterkeys()}, {'a', (1, 2)})
         self.assertEqual(str(x), repr(x))
         self.assertEqual(type(str(x)), type(repr(x)))
 
diff --git a/NEWS b/NEWS
@@ -18,6 +18,7 @@ Jython 2.7.1rc
     - [ 2112 ] time.strptime() has different default year in Jython and CPython
     - [ 1767 ] Rich comparisons
     - [ 2314 ] Failures in test_shutil on Windows
+    - [ 2443 ] java.util.Map derived classes lack iterkeys, itervalues methods
 
   New Features
     - Added uname function to posix module. The mostly Java-based implementation even
diff --git a/src/org/python/core/JavaProxyMap.java b/src/org/python/core/JavaProxyMap.java
@@ -223,6 +223,40 @@ public PyObject __iternext__() {
             };
         }
     };
+    private static final PyBuiltinMethodNarrow mapIterKeysProxy = new MapMethod("iterkeys", 0) {
+        @Override
+        public PyObject __call__() {
+            final Iterator<Object> keyIterator = asMap().keySet().iterator();
+            return new PyIterator() {
+                @Override
+                public PyObject __iternext__() {
+                    if (keyIterator.hasNext()) {
+                        Object nextKey = keyIterator.next();
+                        // yield a Python key
+                        return Py.java2py(nextKey);
+                    }
+                    return null;
+                }
+            };
+        }
+    };
+    private static final PyBuiltinMethodNarrow mapIterValuesProxy = new MapMethod("itervalues", 0) {
+        @Override
+        public PyObject __call__() {
+            final Iterator<Object> valueIterator = asMap().values().iterator();
+            return new PyIterator() {
+                @Override
+                public PyObject __iternext__() {
+                    if (valueIterator.hasNext()) {
+                        Object nextValue = valueIterator.next();
+                        // yield a Python value
+                        return Py.java2py(nextValue);
+                    }
+                    return null;
+                }
+            };
+        }
+    };
     private static final PyBuiltinMethodNarrow mapHasKeyProxy = new MapMethod("has_key", 1) {
         @Override
         public PyObject __call__(PyObject key) {
@@ -456,6 +490,8 @@ static PyBuiltinMethod[] getProxyMethods() {
                 mapPutProxy,
                 mapRemoveProxy,
                 mapIterItemsProxy,
+                mapIterKeysProxy,
+                mapIterValuesProxy,
                 mapHasKeyProxy,
                 mapKeysProxy,
                 mapSetDefaultProxy,
