1
0
forked from VimPlug/jedi

DOn't check the parser cache, that's parso's responsibility

This commit is contained in:
Dave Halter
2018-02-13 19:19:00 +01:00
parent a52b6edd01
commit 36699b77b2
2 changed files with 1 additions and 17 deletions

View File

@@ -210,5 +210,3 @@ class ModuleContext(use_metaclass(CachedMetaClass, TreeContext)):
return "<%s: %s@%s-%s>" % ( return "<%s: %s@%s-%s>" % (
self.__class__.__name__, self._string_name, self.__class__.__name__, self._string_name,
self.tree_node.start_pos[0], self.tree_node.end_pos[0]) self.tree_node.start_pos[0], self.tree_node.end_pos[0])

View File

@@ -15,7 +15,6 @@ import os
from parso.python import tree from parso.python import tree
from parso.tree import search_ancestor from parso.tree import search_ancestor
from parso.cache import parser_cache
from parso import python_bytes_to_unicode from parso import python_bytes_to_unicode
from jedi._compatibility import unicode, ImplicitNSInfo, force_unicode from jedi._compatibility import unicode, ImplicitNSInfo, force_unicode
@@ -523,19 +522,6 @@ def get_modules_containing_name(evaluator, modules, name):
if file_name.endswith('.py'): if file_name.endswith('.py'):
yield path yield path
def check_python_file(path):
try:
# TODO I don't think we should use the cache here?!
node_cache_item = parser_cache[evaluator.grammar._hashed][path]
except KeyError:
try:
return check_fs(path)
except IOError:
return None
else:
module_node = node_cache_item.node
return ModuleContext(evaluator, module_node, path=path)
def check_fs(path): def check_fs(path):
with open(path, 'rb') as f: with open(path, 'rb') as f:
code = python_bytes_to_unicode(f.read(), errors='replace') code = python_bytes_to_unicode(f.read(), errors='replace')
@@ -570,6 +556,6 @@ def get_modules_containing_name(evaluator, modules, name):
# Sort here to make issues less random. # Sort here to make issues less random.
for p in sorted(paths): for p in sorted(paths):
# make testing easier, sort it - same results on every interpreter # make testing easier, sort it - same results on every interpreter
m = check_python_file(p) m = check_fs(p)
if m is not None and not isinstance(m, compiled.CompiledObject): if m is not None and not isinstance(m, compiled.CompiledObject):
yield m yield m