VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Separate directory for each Python version

Browse Source
This commit is contained in:
Takafumi Arakaki
2013-03-19 21:55:57 +01:00
parent f8d3339f2f
commit 942b66ba5b
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jedi/cache.py
View File

@@ -240,7 +240,7 @@ class _ModulePickling(object):
def load_module(self, path, original_changed_time): def load_module(self, path, original_changed_time):
try: try:
pickle_changed_time = self._index[self.py_version][path] pickle_changed_time = self._index[path]
except KeyError: except KeyError:
return None return None
if original_changed_time is not None \ if original_changed_time is not None \
@@ -258,10 +258,10 @@ class _ModulePickling(object):
def save_module(self, path, parser_cache_item): def save_module(self, path, parser_cache_item):
self.__index = None self.__index = None
try: try:
files = self._index[self.py_version] files = self._index
except KeyError: except KeyError:
files = {} files = {}
self._index[self.py_version] = files self._index = files
with open(self._get_hashed_path(path), 'wb') as f: with open(self._get_hashed_path(path), 'wb') as f:
pickle.dump(parser_cache_item, f, pickle.HIGHEST_PROTOCOL) pickle.dump(parser_cache_item, f, pickle.HIGHEST_PROTOCOL)
@@ -300,16 +300,19 @@ class _ModulePickling(object):
self.__index = None self.__index = None
def delete_cache(self): def delete_cache(self):
shutil.rmtree(settings.cache_directory) shutil.rmtree(self._cache_directory())
def _get_hashed_path(self, path): def _get_hashed_path(self, path):
return self._get_path('%s_%s.pkl' % (self.py_version, hash(path))) return self._get_path('%s.pkl' % hash(path))
def _get_path(self, file): def _get_path(self, file):
dir = settings.cache_directory dir = self._cache_directory()
if not os.path.exists(dir): if not os.path.exists(dir):
os.makedirs(dir) os.makedirs(dir)
return dir + os.path.sep + file return os.path.join(dir, file)
def _cache_directory(self):
return os.path.join(settings.cache_directory, self.py_version)
# is a singleton # is a singleton