make import completion not fall back to regular completion on no matches

bobf · bobf · commit 5bece9dba2da · 2009-06-05T20:36:42.000+01:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -561,6 +561,10 @@ def _complete(self, unused_tab=False):
         # Check for import completion
         e = False
         matches = importcompletion.complete(self.s, cw)
+        if matches is None:
+            self.scr.redrawwin()
+            return False
+
         if not matches:
             # Nope, no import, continue with normal completion
             try:
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -33,30 +33,32 @@
 def complete(line, cw):
     """Construct a full list of possibly completions for imports."""
     tokens = line.split()
-    if tokens[0] in ['from', 'import']:
-        completing_from = False
-        if tokens[0] == 'from':
-            if len(tokens) > 3:
-                if '.' in cw:
-                    # This will result in a SyntaxError, so do not return
-                    # any matches
-                    return list()
-                completing_from = True
-                cw = '%s.%s' % (tokens[1], cw)
-            elif len(tokens) == 3:
-                return ['import']
-        
-        matches = list()
-        for name in modules:
-            if not (name.startswith(cw) and name.find('.', len(cw)) == -1):
-                continue
-            if completing_from:
-                name = name[len(tokens[1]) + 1:]
-            matches.append(name)
-        return matches
-    else:
+    if tokens[0] not in ['from', 'import']:
         return list()
 
+    completing_from = False
+    if tokens[0] == 'from':
+        if len(tokens) > 3:
+            if '.' in cw:
+                # This will result in a SyntaxError, so do not return
+                # any matches
+                return list()
+            completing_from = True
+            cw = '%s.%s' % (tokens[1], cw)
+        elif len(tokens) == 3:
+            return ['import']
+    
+    matches = list()
+    for name in modules:
+        if not (name.startswith(cw) and name.find('.', len(cw)) == -1):
+            continue
+        if completing_from:
+            name = name[len(tokens[1]) + 1:]
+        matches.append(name)
+    if not matches:
+        return None
+    return matches
+
 
 def find_modules(path):
     """Find all modules (and packages) for a given directory."""
