bpython
diff --git a/Collapse file
‎bpython/cli.py‎
Copy file name to clipboardExpand all lines: bpython/cli.py
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎bpython/cli.py‎
Copy file name to clipboardExpand all lines: bpython/cli.py
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file
‎bpython/importcompletion.py‎
Copy file name to clipboardExpand all lines: bpython/importcompletion.py
+3-3Lines changed: 3 additions & 3 deletions b/Collapse file
‎bpython/importcompletion.py‎
Copy file name to clipboardExpand all lines: bpython/importcompletion.py
+3-3Lines changed: 3 additions & 3 deletions
@@ -608,12 +608,12 @@ def _complete(self, unused_tab=False):
         # Check for import completion
         e = False
         matches = importcompletion.complete(self.s, cw)
-        if matches is None:
+        if matches is not None and not matches:
             self.matches = []
             self.scr.redrawwin()
             return False
 
-        if not matches:
+        if matches is None:
             # Nope, no import, continue with normal completion
             try:
                 self.completer.complete(cw, 0)
 
@@ -37,15 +37,15 @@ def complete(line, cw):
 
     tokens = line.split()
     if tokens[0] not in ['from', 'import']:
-        return list()
+        return None
 
     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()
+                return None
             completing_from = True
             cw = '%s.%s' % (tokens[1], cw)
         elif len(tokens) == 3:
@@ -59,7 +59,7 @@ def complete(line, cw):
             name = name[len(tokens[1]) + 1:]
         matches.append(name)
     if not matches:
-        return None
+        return []
     return matches