VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-07 22:44:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into project

Browse Source
This commit is contained in:
Dave Halter
2020-02-04 23:56:47 +01:00
parent 670d6e8639 7a55484b79
commit b7919bd3e6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jedi/api/__init__.py
View File

@@ -277,12 +277,12 @@ class Script(object):
""" """
Return the first definition found, while optionally following imports. Return the first definition found, while optionally following imports.
Multiple objects may be returned, because Python itself is a Multiple objects may be returned, because Python itself is a
dynamic language, which means depending on an option you can have two dynamic language, which means you can have two different versions of a
different versions of a function. function.
:param follow_imports: The goto call will follow imports. :param follow_imports: The goto call will follow imports.
:param follow_builtin_imports: If follow_imports is True will decide if :param follow_builtin_imports: If follow_imports is True will try to
it follow builtin imports. look up names in builtins (i.e. compiled or extension modules).
:param only_stubs: Only return stubs for this goto call. :param only_stubs: Only return stubs for this goto call.
:param prefer_stubs: Prefer stubs to Python objects for this goto call. :param prefer_stubs: Prefer stubs to Python objects for this goto call.
:rtype: list of :class:`classes.Definition` :rtype: list of :class:`classes.Definition`
@@ -316,7 +316,7 @@ class Script(object):
names = list(name.goto()) names = list(name.goto())
if follow_imports: if follow_imports:
names = helpers.filter_follow_imports(names) names = helpers.filter_follow_imports(names, follow_builtin_imports)
names = convert_names( names = convert_names(
names, names,
only_stubs=only_stubs, only_stubs=only_stubs,

2
jedi/inference/gradual/annotation.py
View File

@@ -285,7 +285,7 @@ def infer_return_for_callable(arguments, param_values, result_values):
all_type_vars.update(type_var_dict) all_type_vars.update(type_var_dict)
return ValueSet.from_sets( return ValueSet.from_sets(
v.define_generics(type_var_dict) v.define_generics(all_type_vars)
if isinstance(v, (DefineGenericBase, TypeVar)) else ValueSet({v}) if isinstance(v, (DefineGenericBase, TypeVar)) else ValueSet({v})
for v in result_values for v in result_values
).execute_annotation() ).execute_annotation()