From 442a1a1d0835b4bcc8aa432c5aaaab3d974d1fbd Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Wed, 20 Aug 2014 13:52:49 +0200 Subject: [PATCH] wrap some more values with er.wrap --- jedi/evaluate/finder.py | 7 +------ jedi/evaluate/representation.py | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/jedi/evaluate/finder.py b/jedi/evaluate/finder.py index d97ee5bc..32a596ec 100644 --- a/jedi/evaluate/finder.py +++ b/jedi/evaluate/finder.py @@ -231,12 +231,7 @@ class NameFinder(object): else: types += self._remove_statements(typ, name) else: - if isinstance(typ, pr.Class): - typ = er.Class(evaluator, typ) - elif isinstance(typ, pr.Function): - typ = er.Function(evaluator, typ) - elif isinstance(typ, pr.Module): - typ = er.ModuleWrapper(evaluator, typ) + typ = er.wrap(evaluator, typ) if typ.isinstance(er.Function) and resolve_decorator: typ = typ.get_decorated_func() diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py index be13c8b8..b41fa574 100644 --- a/jedi/evaluate/representation.py +++ b/jedi/evaluate/representation.py @@ -236,11 +236,7 @@ def get_instance_el(evaluator, instance, var, is_class_var=False): pr.Module, FunctionExecution)): return var - if isinstance(var, pr.Function): - var = Function(evaluator, var) - elif isinstance(var, pr.Class): - var = Class(evaluator, var) - + var = wrap(evaluator, var) return InstanceElement(evaluator, instance, var, is_class_var)