1
0
forked from VimPlug/jedi

Param is now the parent of its names and not just a helper class.

This commit is contained in:
Dave Halter
2014-10-28 02:05:44 +01:00
parent 1a6ff3e8e6
commit fe7c750c2c
4 changed files with 34 additions and 17 deletions
+5 -7
View File
@@ -443,13 +443,11 @@ builtin = Builtin(_builtins)
magic_function_class = CompiledObject(type(load_module), parent=builtin)
generator_obj = CompiledObject(_a_generator(1.0))
type_names = [] # Need this, because it's return in get_defined_names.
#type_names = builtin.get_by_name('type').get_defined_names()
#none_obj = builtin.get_by_name('None')
#false_obj = builtin.get_by_name('False')
#true_obj = builtin.get_by_name('True')
#object_obj = builtin.get_by_name('object')
true_obj = object()
false_obj = object()
type_names = builtin.get_by_name('type').get_defined_names()
none_obj = builtin.get_by_name('None')
false_obj = builtin.get_by_name('False')
true_obj = builtin.get_by_name('True')
object_obj = builtin.get_by_name('object')
def keyword_from_value(obj):
+4
View File
@@ -167,6 +167,10 @@ def get_params(evaluator, func, var_args):
# There may be calls, which don't fit all the params, this just ignores it.
#unpacked_va = _unpack_var_args(evaluator, var_args, func)
unpacked_va = list(var_args.unpack())
from jedi.evaluate.representation import InstanceElement
if isinstance(func, InstanceElement):
# Include self at this place.
unpacked_va.insert(0, (None, [func.instance]))
var_arg_iterator = common.PushBackIterator(iter(unpacked_va))
non_matching_keys = defaultdict(lambda: [])
+2 -1
View File
@@ -162,7 +162,8 @@ class Instance(use_metaclass(CachedMetaClass, Executed)):
if pr.is_node(trailer, 'trailer') \
and len(trailer.children) == 2:
name = trailer.children[1] # After dot.
names.append(get_instance_el(self._evaluator, self, name))
if name.is_definition():
names.append(get_instance_el(self._evaluator, self, name))
for s in self.base.py__bases__(self._evaluator):
if not isinstance(s, compiled.CompiledObject):