FunctionContext should be created from a unified interface

jedi/evaluate/context/function.py

@@ -44,6 +44,13 @@ class FunctionContext(use_metaclass(CachedMetaClass, TreeContext)):
     """
     api_type = u'function'
 
+    @classmethod
+    def from_context(cls, context, tree_node):
+        while context.is_class():
+            context = context.parent_context
+
+        return cls(context.evaluator, parent_context=context, tree_node=tree_node)
+
     def get_filters(self, search_global, until_position=None, origin_scope=None):
         if search_global:
             yield ParserTreeFilter(

jedi/evaluate/context/instance.py

@@ -28,7 +28,6 @@ class InstanceFunctionExecution(BaseInstanceFunctionExecution):
 
         super(InstanceFunctionExecution, self).__init__(
             instance, parent_context, function_context, var_args)
-        print(parent_context, self.parent_context, function_context)
 
 
 class AnonymousInstanceFunctionExecution(BaseInstanceFunctionExecution):
@@ -355,9 +354,6 @@ class LazyInstanceClassName(SelfName):
                 # functions. Only other functions and modules will resolve
                 # those things.
                 parent_context = result_context.parent_context
-                while parent_context.is_class():
-                    parent_context = parent_context.parent_context
-
                 yield BoundMethod(
                     result_context.evaluator, self._instance, self.class_context,
                     parent_context, result_context.tree_node