Some refactoring in the stdlib plugin

jedi/plugins/stdlib.py

@@ -50,35 +50,19 @@ _NAMEDTUPLE_INIT = """
 class StdlibPlugin(BasePlugin):
     def execute(self, callback):
         def wrapper(context, arguments):
-            debug.dbg('execute: %s %s', context, arguments)
+            if isinstance(context, BoundMethod):
-            try:
-                # Some stdlib functions like super(), namedtuple(), etc. have been
-                # hard-coded in Jedi to support them.
-                return execute(self._evaluator, context, arguments)
-            except _NotInStdLib:
-                pass
                 return callback(context, arguments)
 
-        return wrapper
+            debug.dbg('execute: %s %s', context, arguments)
-
-
-class _NotInStdLib(LookupError):
-    pass
-
-
-def execute(evaluator, obj, arguments):
-    if isinstance(obj, BoundMethod):
-        raise _NotInStdLib()
-
             try:
-        obj_name = obj.name.string_name
+                obj_name = context.name.string_name
             except AttributeError:
                 pass
             else:
-        if obj.parent_context == evaluator.builtins_module:
+                if context.parent_context == self._evaluator.builtins_module:
                     module_name = 'builtins'
-        elif isinstance(obj.parent_context, ModuleContext):
+                elif isinstance(context.parent_context, ModuleContext):
-            module_name = obj.parent_context.name.string_name
+                    module_name = context.parent_context.name.string_name
                 else:
                     module_name = ''
 
@@ -88,8 +72,10 @@ def execute(evaluator, obj, arguments):
                 except KeyError:
                     pass
                 else:
-            return func(evaluator, obj, arguments)
+                    return func(self._evaluator, context, arguments)
-    raise _NotInStdLib()
+            return callback(context, arguments)
+
+        return wrapper
 
 
 def _follow_param(evaluator, arguments, index):