Use sets everywhere

sebastinas · sebastinas · commit 64dd9de15de8 · 2015-01-21T20:06:27.000+01:00
… and make sure autocompletion results are sorted

Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -152,15 +152,15 @@ def matches(self, cursor_offset, line, **kwargs):
         if cs is None:
             return None
         start, end, text = cs
-        matches = []
+        matches = set()
         username = text.split(os.path.sep, 1)[0]
         user_dir = os.path.expanduser(username)
         for filename in glob(os.path.expanduser(text + '*')):
             if os.path.isdir(filename):
                 filename += os.path.sep
             if text.startswith('~'):
                 filename = username + filename[len(user_dir):]
-            matches.append(filename)
+            matches.add(filename)
         return matches
 
     def locate(self, current_offset, line):
@@ -191,14 +191,14 @@ def matches(self, cursor_offset, line, locals_, **kwargs):
                 i -= 1
                 break
         methodtext = text[-i:]
-        matches = [''.join([text[:-i], m]) for m in
-                            attr_matches(methodtext, locals_)]
+        matches = set(''.join([text[:-i], m])
+                      for m in attr_matches(methodtext, locals_))
 
         #TODO add open paren for methods via _callable_prefix (or decide not to)
         # unless the first character is a _ filter out all attributes starting with a _
         if not text.split('.')[-1].startswith('_'):
-            matches = [match for match in matches
-                       if not match.split('.')[-1].startswith('_')]
+            matches = set(match for match in matches
+                          if not match.split('.')[-1].startswith('_'))
         return matches
 
     def locate(self, current_offset, line):
@@ -218,11 +218,12 @@ def matches(self, cursor_offset, line, locals_, **kwargs):
         try:
             obj = safe_eval(dexpr, locals_)
         except EvaluationError:
-            return []
+            return set()
         if obj and isinstance(obj, type({})) and obj.keys():
-            return ["{!r}]".format(k) for k in obj.keys() if repr(k).startswith(orig)]
+            return set("{!r}".format(k) for k in obj.keys()
+                       if repr(k).startswith(orig))
         else:
-            return []
+            return set()
 
     def locate(self, current_offset, line):
         return lineparts.current_dict_key(current_offset, line)
@@ -239,7 +240,7 @@ def matches(self, cursor_offset, line, current_block, **kwargs):
         if 'class' not in current_block:
             return None
         start, end, word = r
-        return [name for name in MAGIC_METHODS if name.startswith(word)]
+        return set(name for name in MAGIC_METHODS if name.startswith(word))
 
     def locate(self, current_offset, line):
         return lineparts.current_method_definition_name(current_offset, line)
@@ -256,17 +257,15 @@ def matches(self, cursor_offset, line, locals_, **kwargs):
             return None
         start, end, text = r
 
-        hash = {}
+        matches = set()
         n = len(text)
         for word in keyword.kwlist:
             if method_match(word, n, text):
-                hash[word] = 1
+                matches.add(word)
         for nspace in [__builtin__.__dict__, locals_]:
             for word, val in nspace.items():
                 if method_match(word, len(text), text) and word != "__builtins__":
-                    hash[_callable_postfix(val, word)] = 1
-        matches = hash.keys()
-        matches.sort()
+                    matches.add(_callable_postfix(val, word))
         return matches
 
     def locate(self, current_offset, line):
@@ -282,10 +281,11 @@ def matches(self, cursor_offset, line, argspec, **kwargs):
             return None
         start, end, word = r
         if argspec:
-            matches = [name + '=' for name in argspec[1][0]
-                       if isinstance(name, basestring) and name.startswith(word)]
+            matches = set(name + '=' for name in argspec[1][0]
+                          if isinstance(name, basestring) and
+                          name.startswith(word))
             if py3:
-                matches.extend(name + '=' for name in argspec[1][4]
+                matches.update(name + '=' for name in argspec[1][4]
                                if name.startswith(word))
         return matches
 
@@ -300,9 +300,9 @@ def matches(self, cursor_offset, line, **kwargs):
             return None
         start, end, word = r
         attrs = dir('')
-        matches = [att for att in attrs if att.startswith(word)]
+        matches = set(att for att in attrs if att.startswith(word))
         if not word.startswith('_'):
-            return [match for match in matches if not match.startswith('_')]
+            return set(match for match in matches if not match.startswith('_'))
         return matches
 
     def locate(self, current_offset, line):
@@ -329,7 +329,7 @@ def get_completer(completers, cursor_offset, line, **kwargs):
     for completer in completers:
         matches = completer.matches(cursor_offset, line, **kwargs)
         if matches is not None:
-            return matches, (completer if matches else None)
+            return sorted(matches), (completer if matches else None)
     return [], None
 
 BPYTHON_COMPLETER = (
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -114,28 +114,31 @@ def test_match_returns_none_if_not_in_string(self):
 
     @mock.patch('bpython.autocomplete.glob', new=lambda text: [])
     def test_match_returns_empty_list_when_no_files(self):
-        self.assertEqual(self.completer.matches(2, '"a'), [])
+        self.assertEqual(self.completer.matches(2, '"a'), set())
 
     @mock.patch('bpython.autocomplete.glob', new=lambda text: ['abcde', 'aaaaa'])
     @mock.patch('os.path.expanduser', new=lambda text: text)
     @mock.patch('os.path.isdir', new=lambda text: False)
     @mock.patch('os.path.sep', new='/')
     def test_match_returns_files_when_files_exist(self):
-        self.assertEqual(self.completer.matches(2, '"x'), ['abcde', 'aaaaa'])
+        self.assertEqual(sorted(self.completer.matches(2, '"x')),
+                         ['aaaaa', 'abcde'])
 
     @mock.patch('bpython.autocomplete.glob', new=lambda text: ['abcde', 'aaaaa'])
     @mock.patch('os.path.expanduser', new=lambda text: text)
     @mock.patch('os.path.isdir', new=lambda text: True)
     @mock.patch('os.path.sep', new='/')
     def test_match_returns_dirs_when_dirs_exist(self):
-        self.assertEqual(self.completer.matches(2, '"x'), ['abcde/', 'aaaaa/'])
+        self.assertEqual(sorted(self.completer.matches(2, '"x')),
+                         ['aaaaa/', 'abcde/'])
 
     @mock.patch('bpython.autocomplete.glob', new=lambda text: ['/expand/ed/abcde', '/expand/ed/aaaaa'])
     @mock.patch('os.path.expanduser', new=lambda text: text.replace('~', '/expand/ed'))
     @mock.patch('os.path.isdir', new=lambda text: False)
     @mock.patch('os.path.sep', new='/')
     def test_tilde_stays_pretty(self):
-        self.assertEqual(self.completer.matches(4, '"~/a'), ['~/abcde', '~/aaaaa'])
+        self.assertEqual(sorted(self.completer.matches(4, '"~/a')),
+                         ['~/aaaaa', '~/abcde'])
 
     @mock.patch('os.path.sep', new='/')
     def test_formatting_takes_just_last_part(self):
