Merge with master.

2017-01-02 13:00:58 +01:00
parent 96bb9e3c1a f05c0714c7
commit 5b9e5f96aa
12 changed files with 211 additions and 34 deletions
--- a/jedi/parser/utils.py
+++ b/jedi/parser/utils.py
@@ -159,7 +159,6 @@ class ParserPickling(object):
                # 0 means version is not defined (= always delete cache):
                if data.get('version', 0) != self.version:
                    self.clear_cache()
-                    self.__index = {}
                else:
                    self.__index = data['index']
        return self.__index
@@ -179,6 +178,7 @@ class ParserPickling(object):

    def clear_cache(self):
        shutil.rmtree(self._cache_directory())
+        self.__index = {}

    def _get_hashed_path(self, path):
        return self._get_path('%s.pkl' % hashlib.md5(path.encode("utf-8")).hexdigest())