diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py index dd316196..c1e13002 100644 --- a/jedi/evaluate/imports.py +++ b/jedi/evaluate/imports.py @@ -143,15 +143,6 @@ class NestedImportModule(pr.Module): debug.dbg('Generated a nested import: %s', new) return helpers.FakeName(str(i.namespace_names[1]), new) - def _get_defined_names(self): - """ - NesteImportModule don't seem to be actively used, right now. - However, they might in the future. If we do more sophisticated static - analysis checks. - """ - nested = self._get_nested_import_name() - return self._module.get_defined_names() + [nested] - def __getattr__(self, name): return getattr(self._module, name) diff --git a/jedi/evaluate/iterable.py b/jedi/evaluate/iterable.py index 493bf3b3..e464bfd8 100644 --- a/jedi/evaluate/iterable.py +++ b/jedi/evaluate/iterable.py @@ -30,7 +30,6 @@ from jedi.parser import tree as pr from jedi.evaluate import compiled from jedi.evaluate import helpers from jedi.evaluate.cache import CachedMetaClass, memoize_default, NO_DEFAULT -from jedi.cache import underscore_memoization from jedi.evaluate import analysis @@ -45,20 +44,6 @@ class IterableWrapper(pr.Base): class GeneratorMixin(object): - @underscore_memoization - def _get_defined_names(self): - """ - Returns a list of names that define a generator, which can return the - content of a generator. - """ - executes_generator = '__next__', 'send', 'next' - for name in compiled.generator_obj.get_defined_names(): - if name.name in executes_generator: - parent = GeneratorMethod(self, name.parent) - yield helpers.FakeName(name.name, parent) - else: - yield name - @memoize_default() def names_dicts(self, search_global=False): # is always False dct = {} diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py index 318f4661..fe25c5cd 100644 --- a/jedi/evaluate/representation.py +++ b/jedi/evaluate/representation.py @@ -674,19 +674,6 @@ class FunctionExecution(Executed): break return types - """ - @common.safe_property - @underscore_memoization - def names_dict(self): - self.children - d = {} - for key, values in self.base.names_dict.items(): - d[key] = self._copy_list(values) - return d - self.base.names_dict - return LazyDict(self.base.names_dict, self._copy_list) -""" - def names_dicts(self, search_global): self.children yield dict((k, [self._copy_dict[v] for v in values]) @@ -708,13 +695,6 @@ class FunctionExecution(Executed): def name_for_position(self, position): return pr.Function.name_for_position(self, position) - def get_defined_names(self): - """ - Call the default method with the own instance (self implements all - the necessary functions). Add also the params. - """ - return self._get_params() + pr.Scope.get_defined_names(self) - def _copy_list(self, lst): """ Copies a list attribute of a parser Function. Copying is very