Merge with master again

Some bugs were still present in master
2018-01-20 21:45:55 +01:00
parent d986c44b94 20d64cf2b3
commit 94ce54e776
6 changed files with 19 additions and 6 deletions
--- a/jedi/evaluate/syntax_tree.py
+++ b/jedi/evaluate/syntax_tree.py
@@ -490,7 +490,7 @@ def tree_name_to_contexts(evaluator, context, tree_name):
        exceptions = context.eval_node(tree_name.get_previous_sibling().get_previous_sibling())
        types = exceptions.execute_evaluated()
    else:
-        raise ValueError("Should not happen.")
+        raise ValueError("Should not happen. type: %s" % typ)
    return types