Merge branch 'darkryder-Dict_methods'

italomaia · Oct 2, 2016 · 992ba01 · 992ba01
2 parents 73c3ed7 + a39c695
commit 992ba01
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/python/common/org/python/types/Dict.java b/python/common/org/python/types/Dict.java
@@ -309,10 +309,18 @@ public org.python.Object fromkeys(org.python.Object other) {
     }
 
     @org.python.Method(
-        __doc__ = ""
+        __doc__ = "",
+        default_args = {"other", "default_value"}
     )
-    public org.python.Object get(org.python.Object other) {
-        throw new org.python.exceptions.NotImplementedError("dict.get() has not been implemented.");
+    public org.python.Object get(org.python.Object other, org.python.Object default_value) {
+        try {
+            return this.__getitem__(other);
+        } catch (org.python.exceptions.KeyError e){ // allow unhashable type error to be percolated up.
+            if (default_value == null) {
+                return org.python.types.NoneType.NONE;
+            }
+            return default_value;
+        }
     }
 
     @org.python.Method(

diff --git a/tests/datatypes/test_dict.py b/tests/datatypes/test_dict.py
@@ -141,6 +141,21 @@ def test_method_setdefault(self):
             x.setdefault([], 42)
             """)
 
+    def test_method_get(self):
+        self.assertCodeExecution("""
+            x = {1: 2}
+            print(x.get(1))
+            print(x.get(2))
+            print(x.get(3,4))
+            """)
+
+        # check for unhashable type errors
+        self.assertCodeExecution("""
+            x = {1: 2}
+            print(x.get([]))
+            print(x.get([], 1))
+            """)
+
 
 class UnaryDictOperationTests(UnaryOperationTestCase, TranspileTestCase):
     data_type = 'dict'