From 526af7ccbe5f0e1afb2e6ecdda44f3f0f6db9cda Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Mon, 11 Aug 2014 17:27:40 +0200
Subject: [PATCH] settings should not be affected by exceptions.

---
 jedi/api/__init__.py | 48 ++++++++++++++++++++++++--------------------
 jedi/common.py       |  8 +++++---
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py
index 5ed63794..3cdc3508 100644
--- a/jedi/api/__init__.py
+++ b/jedi/api/__init__.py
@@ -511,31 +511,35 @@ class Script(object):
         """
         temp, settings.dynamic_flow_information = \
             settings.dynamic_flow_information, False
-        user_stmt = self._parser.user_stmt()
-        definitions, search_name = self._goto(add_import_name=True)
-        if isinstance(user_stmt, pr.Statement):
-            c = user_stmt.expression_list()[0]
-            if not isinstance(c, unicode) and self._pos < c.start_pos:
-                # the search_name might be before `=`
-                definitions = [v for v in user_stmt.get_defined_names()
-                               if unicode(v.names[-1]) == search_name]
-        if not isinstance(user_stmt, pr.Import):
-            # import case is looked at with add_import_name option
-            definitions = usages.usages_add_import_modules(self._evaluator, definitions, search_name)
+        try:
+            user_stmt = self._parser.user_stmt()
+            definitions, search_name = self._goto(add_import_name=True)
+            if isinstance(user_stmt, pr.Statement):
+                c = user_stmt.expression_list()[0]
+                if not isinstance(c, unicode) and self._pos < c.start_pos:
+                    # the search_name might be before `=`
+                    definitions = [v for v in user_stmt.get_defined_names()
+                                   if unicode(v.names[-1]) == search_name]
+            if not isinstance(user_stmt, pr.Import):
+                # import case is looked at with add_import_name option
+                definitions = usages.usages_add_import_modules(self._evaluator,
+                                                               definitions,
+                                                               search_name)
 
-        module = set([d.get_parent_until() for d in definitions])
-        module.add(self._parser.module())
-        names = usages.usages(self._evaluator, definitions, search_name, module)
+            module = set([d.get_parent_until() for d in definitions])
+            module.add(self._parser.module())
+            names = usages.usages(self._evaluator, definitions, search_name, module)
 
-        for d in set(definitions):
-            try:
-                name_part = d.names[-1]
-            except AttributeError:
-                names.append(classes.Definition(self._evaluator, d))
-            else:
-                names.append(classes.Definition(self._evaluator, name_part))
+            for d in set(definitions):
+                try:
+                    name_part = d.names[-1]
+                except AttributeError:
+                    names.append(classes.Definition(self._evaluator, d))
+                else:
+                    names.append(classes.Definition(self._evaluator, name_part))
+        finally:
+            settings.dynamic_flow_information = temp
 
-        settings.dynamic_flow_information = temp
         return helpers.sorted_definitions(set(names))
 
     def call_signatures(self):
diff --git a/jedi/common.py b/jedi/common.py
index e15d2211..426bc0aa 100644
--- a/jedi/common.py
+++ b/jedi/common.py
@@ -92,9 +92,11 @@ def scale_speed_settings(factor):
     b = settings.max_until_execution_unique
     settings.max_executions *= factor
     settings.max_until_execution_unique *= factor
-    yield
-    settings.max_executions = a
-    settings.max_until_execution_unique = b
+    try:
+        yield
+    finally:
+        settings.max_executions = a
+        settings.max_until_execution_unique = b
 
 
 def indent_block(text, indention='    '):