Merge branch 'autocomplete-test'

thomasballinger · thomasballinger · commit 9a792310fdce · 2015-01-23T10:57:03.000-05:00
Conflicts:
	bpython/autocomplete.py
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -219,8 +219,8 @@ def matches(self, cursor_offset, line, locals_, **kwargs):
             obj = safe_eval(dexpr, locals_)
         except EvaluationError:
             return set()
-        if obj and isinstance(obj, type({})) and obj.keys():
-            return set("{!r}]".format(k) for k in obj.keys()
+        if isinstance(obj, dict) and obj.keys():
+            return set("{0!r}]".format(k) for k in obj.keys()
                        if repr(k).startswith(orig))
         else:
             return set()
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -145,3 +145,33 @@ def test_formatting_takes_just_last_part(self):
         self.assertEqual(self.completer.format('/hello/there/'), 'there/')
         self.assertEqual(self.completer.format('/hello/there'), 'there')
 
+class MockNumPy(object):
+    """
+        This is a mock numpy object that raises an error when there is an atempt to convert it to a boolean.
+    """
+    def __nonzero__(self):
+        raise ValueError("The truth value of an array with more than one element is ambiguous. Use a.any() or a.all()")
+
+
+class TestDictKeyCompletion(unittest.TestCase):
+
+    def test_set_of_keys_returned_when_matches_found(self):
+        com = autocomplete.DictKeyCompletion()
+        local={'d':{"ab":1, "cd":2},}
+        com.matches(2,"d[" , local)
+        self.assertSetEqual(com.matches(2,"d[" , local),set(["'ab']","'cd']"]))
+
+    def test_empty_set_returned_when_eval_error(self):
+        com = autocomplete.DictKeyCompletion()
+        local={'e':{"ab":1, "cd":2},}
+        self.assertSetEqual(com.matches(2,"d[" , local),set())
+
+    def test_empty_set_returned_when_not_dict_type(self):
+        com = autocomplete.DictKeyCompletion()
+        local={'l':["ab", "cd"],}
+        self.assertSetEqual(com.matches(2,"l[" , local),set())
+
+    def test_obj_that_does_not_allow_conversion_to_bool(self):
+        com = autocomplete.DictKeyCompletion()
+        local={'mNumPy':MockNumPy(),}
+        self.assertSetEqual(com.matches(7,"mNumPy[" , local), set())
