From 35fd1c70bd72551a5d9c3f404e1554f9abde6495 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Thu, 30 Mar 2017 01:57:48 +0200 Subject: [PATCH] Rename parser.utils to parser.cache. --- jedi/api/classes.py | 4 ++-- jedi/cache.py | 2 +- jedi/evaluate/imports.py | 2 +- jedi/parser/{utils.py => cache.py} | 0 jedi/parser/python/__init__.py | 10 +++++----- jedi/parser/python/diff.py | 2 +- test/test_api/test_api.py | 8 ++++---- test/test_cache.py | 2 +- test/test_parser/test_diff_parser.py | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) rename jedi/parser/{utils.py => cache.py} (100%) diff --git a/jedi/api/classes.py b/jedi/api/classes.py index 886850cf..74592d9d 100644 --- a/jedi/api/classes.py +++ b/jedi/api/classes.py @@ -9,7 +9,7 @@ import re from jedi._compatibility import u from jedi import settings from jedi import common -from jedi.parser import utils as parser_utils +from jedi.parser.cache import parser_cache from jedi.cache import memoize_method from jedi.evaluate import representation as er from jedi.evaluate import instance @@ -391,7 +391,7 @@ class BaseDefinition(object): return '' path = self._name.get_root_context().py__file__() - lines = parser_utils.parser_cache[path].lines + lines = parser_cache[path].lines line_nr = self._name.start_pos[0] start_line_nr = line_nr - before diff --git a/jedi/cache.py b/jedi/cache.py index 4b5dac5e..6fb463b5 100644 --- a/jedi/cache.py +++ b/jedi/cache.py @@ -15,7 +15,7 @@ import time import inspect from jedi import settings -from jedi.parser.utils import parser_cache +from jedi.parser.cache import parser_cache _time_caches = {} diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py index b885bd9e..cdb1c0bf 100644 --- a/jedi/evaluate/imports.py +++ b/jedi/evaluate/imports.py @@ -22,7 +22,7 @@ from jedi import settings from jedi.common import source_to_unicode, unite from jedi.parser.python import parse from jedi.parser.python import tree -from jedi.parser.utils import parser_cache +from jedi.parser.cache import parser_cache from jedi.evaluate import sys_path from jedi.evaluate import helpers from jedi.evaluate import compiled diff --git a/jedi/parser/utils.py b/jedi/parser/cache.py similarity index 100% rename from jedi/parser/utils.py rename to jedi/parser/cache.py diff --git a/jedi/parser/python/__init__.py b/jedi/parser/python/__init__.py index 80062b9b..6b5fa739 100644 --- a/jedi/parser/python/__init__.py +++ b/jedi/parser/python/__init__.py @@ -8,7 +8,7 @@ from jedi.parser.pgen2.pgen import generate_grammar from jedi.parser.python.parser import Parser, _remove_last_newline from jedi.parser.python.diff import DiffParser from jedi.parser.tokenize import generate_tokens -from jedi.parser import utils +from jedi.parser.cache import parser_cache, load_module, save_module from jedi.common import splitlines, source_to_unicode @@ -78,7 +78,7 @@ def parse(code=None, path=None, grammar=None, error_recovery=True, use_cache = cache and path is not None and not code if use_cache: # In this case we do actual caching. We just try to load it. - module_node = utils.load_module(grammar, path) + module_node = load_module(grammar, path) if module_node is not None: return module_node @@ -88,7 +88,7 @@ def parse(code=None, path=None, grammar=None, error_recovery=True, if diff_cache: try: - module_cache_item = utils.parser_cache[path] + module_cache_item = parser_cache[path] except KeyError: pass else: @@ -98,7 +98,7 @@ def parse(code=None, path=None, grammar=None, error_recovery=True, old_lines=module_cache_item.lines, new_lines=lines ) - utils.save_module(grammar, path, module_node, lines, pickling=False) + save_module(grammar, path, module_node, lines, pickling=False) return new_node added_newline = not code.endswith('\n') @@ -117,5 +117,5 @@ def parse(code=None, path=None, grammar=None, error_recovery=True, _remove_last_newline(root_node) if use_cache or diff_cache: - utils.save_module(grammar, path, root_node, lines) + save_module(grammar, path, root_node, lines) return root_node diff --git a/jedi/parser/python/diff.py b/jedi/parser/python/diff.py index 4975cf8e..13fb0a14 100644 --- a/jedi/parser/python/diff.py +++ b/jedi/parser/python/diff.py @@ -14,7 +14,7 @@ from jedi import settings from jedi.common import splitlines from jedi.parser.python.parser import Parser, _remove_last_newline from jedi.parser.python.tree import EndMarker -from jedi.parser.utils import parser_cache +from jedi.parser.cache import parser_cache from jedi import debug from jedi.parser.tokenize import (generate_tokens, NEWLINE, TokenInfo, ENDMARKER, INDENT, DEDENT) diff --git a/test/test_api/test_api.py b/test/test_api/test_api.py index 079c7dd5..3c8ea89d 100644 --- a/test/test_api/test_api.py +++ b/test/test_api/test_api.py @@ -7,7 +7,7 @@ from textwrap import dedent from jedi import api from jedi._compatibility import is_py3 from pytest import raises -from jedi.parser import utils +from jedi.parser import cache def test_preload_modules(): @@ -17,15 +17,15 @@ def test_preload_modules(): for i in modules: assert [i in k for k in parser_cache.keys() if k is not None] - temp_cache, utils.parser_cache = utils.parser_cache, {} - parser_cache = utils.parser_cache + temp_cache, cache.parser_cache = cache.parser_cache, {} + parser_cache = cache.parser_cache api.preload_module('sys') check_loaded() # compiled (c_builtin) modules shouldn't be in the cache. api.preload_module('types', 'token') check_loaded('types', 'token') - utils.parser_cache = temp_cache + cache.parser_cache = temp_cache def test_empty_script(): diff --git a/test/test_cache.py b/test/test_cache.py index 753ced76..a2116107 100644 --- a/test/test_cache.py +++ b/test/test_cache.py @@ -9,7 +9,7 @@ import pytest import jedi from jedi import settings, cache -from jedi.parser.utils import _NodeCacheItem +from jedi.parser.cache import _NodeCacheItem from jedi.parser.python import load_grammar diff --git a/test/test_parser/test_diff_parser.py b/test/test_parser/test_diff_parser.py index 2003deba..8231a9ee 100644 --- a/test/test_parser/test_diff_parser.py +++ b/test/test_parser/test_diff_parser.py @@ -6,7 +6,7 @@ import jedi from jedi import debug from jedi.common import splitlines from jedi import cache -from jedi.parser.utils import parser_cache +from jedi.parser.cache import parser_cache from jedi.parser.python import load_grammar from jedi.parser.python.diff import DiffParser from jedi.parser.python import parse