globals are more or less ready.

jedi/evaluate/__init__.py

@@ -130,6 +130,7 @@ class Evaluator(object):
         if isinstance(stmt, FakeStatement):
             return stmt.children  # Already contains the results.
 
+        print('X', stmt.get_rhs())
         result = self.eval_element(stmt.get_rhs())
 
         ass_details = stmt.assignment_details

jedi/evaluate/finder.py

@@ -179,7 +179,7 @@ class NameFinder(object):
         defined.
         """
         if isinstance(scope, pr.Flow) \
-                or isinstance(scope, pr.KeywordStatement) and scope.name == 'global':
+                or isinstance(scope, pr.GlobalStmt):
 
             if isinstance(name_list_scope, er.Class):
                 name_list_scope = name_list_scope.base