Catch jedi errors

sebastinas · sebastinas · commit 8ff8678a6b83 · 2015-01-30T01:41:03.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -347,6 +347,7 @@ def matches(self, cursor_offset, line, **kwargs):
             return None
 else:
     class JediCompletion(BaseCompletionType):
+
         def matches(self, cursor_offset, line, **kwargs):
             if 'history' not in kwargs:
                 return None
@@ -355,9 +356,13 @@ def matches(self, cursor_offset, line, **kwargs):
             if not lineparts.current_word(cursor_offset, line):
                 return None
             history = '\n'.join(history) + '\n' + line
-            script = jedi.Script(history, len(history.splitlines()),
-                                 cursor_offset, 'fake.py')
-            completions = script.completions()
+            try:
+                script = jedi.Script(history, len(history.splitlines()),
+                                     cursor_offset, 'fake.py')
+                completions = script.completions()
+            except jedi.NotFoundError:
+                self._orig_start = None
+                return None
             if completions:
                 diff = len(completions[0].name) - len(completions[0].complete)
                 self._orig_start = cursor_offset - diff
@@ -381,6 +386,7 @@ def locate(self, cursor_offset, line):
             end = cursor_offset
             return start, end, line[start:end]
 
+
     class MultilineJediCompletion(JediCompletion):
         def matches(self, cursor_offset, line, **kwargs):
             if 'current_block' not in kwargs or 'history' not in kwargs:
