enable attribute completion within function call

thomasballinger · thomasballinger · commit 9b6aa7bf2969 · 2015-12-06T15:58:35.000-05:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -471,7 +471,7 @@ def matches(self, cursor_offset, line, **kwargs):
                 if (self.method_match(word, n, r.word) and
                         word != "__builtins__"):
                     matches.add(_callable_postfix(val, word))
-        return matches
+        return matches if matches else None
 
     def locate(self, current_offset, line):
         return lineparts.current_single_word(current_offset, line)
@@ -496,7 +496,7 @@ def matches(self, cursor_offset, line, **kwargs):
             if py3:
                 matches.update(name + '=' for name in argspec[1][4]
                                if name.startswith(r.word))
-        return matches
+        return matches if matches else None
 
     def locate(self, current_offset, line):
         return lineparts.current_word(current_offset, line)
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -383,16 +383,16 @@ def test_completions_are_unicode(self):
 
     @unittest.skipIf(py3, "in Python 3 invalid identifiers are passed through")
     def test_ignores_nonascii_encodable(self):
-        self.assertSetEqual(self.com.matches(3, 'abc', locals_={'abcß': 10}),
-                            set())
+        self.assertEqual(self.com.matches(3, 'abc', locals_={'abcß': 10}),
+                            None)
 
     def test_mock_kwlist(self):
         with mock.patch.object(keyword, 'kwlist', new=['abcd']):
-            self.assertSetEqual(self.com.matches(3, 'abc', locals_={}), set())
+            self.assertEqual(self.com.matches(3, 'abc', locals_={}), None)
 
     def test_mock_kwlist_non_ascii(self):
         with mock.patch.object(keyword, 'kwlist', new=['abcß']):
-            self.assertSetEqual(self.com.matches(3, 'abc', locals_={}), set())
+            self.assertEqual(self.com.matches(3, 'abc', locals_={}), None)
 
 
 class TestParameterNameCompletion(unittest.TestCase):
