initialize.py: handle reloading of the plugin (#659)

Do not keep adding jedi_vim_path to sys.path.
This commit is contained in:
Daniel Hahler
2017-04-13 22:47:31 +02:00
committed by GitHub
parent c1e279cab7
commit 8e34a59045

View File

@@ -9,8 +9,10 @@ try:
import os, sys, vim
jedi_path = os.path.join(vim.eval('expand(s:script_path)'), 'jedi')
sys.path.insert(0, jedi_path)
jedi_vim_path = vim.eval('expand(s:script_path)')
sys.path.insert(0, jedi_vim_path)
if jedi_vim_path not in sys.path: # Might happen when reloading.
sys.path.insert(0, jedi_vim_path)
except Exception as excinfo:
raise Exception('Failed to add to sys.path: {0}\n{1}'.format(
excinfo, traceback.format_exc()))
@@ -21,4 +23,4 @@ except Exception as excinfo:
raise Exception('Failed to import jedi_vim: {0}\n{1}'.format(
excinfo, traceback.format_exc()))
finally:
sys.path.pop(1)
sys.path.remove(jedi_path)