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

Fix some errors when vim is compiled with +python3.

Browse Source 
When vim is compiled with `-python` and `+python3`, jedi-vim generates
errors because of two points in the code which are not compatible with
Python 3 (because of the `str`/`unicode` vs. `bytes`/`str` thing).
This commit is contained in:
Matthew Moses
2013-05-19 03:18:23 -04:00
parent b9fef7b969
commit d56bf264e7
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugin/jedi_vim.py
View File

@@ -30,7 +30,10 @@ class PythonToVimStr(unicode):
# support is pretty bad. don't ask how I came up with this... It just # support is pretty bad. don't ask how I came up with this... It just
# works... # works...
# It seems to be related to that bug: http://bugs.python.org/issue5876 # It seems to be related to that bug: http://bugs.python.org/issue5876
s = self.encode('UTF-8') if unicode is str:
s = self
else:
s = self.encode('UTF-8')
return '"%s"' % s.replace('\\', '\\\\').replace('"', r'\"') return '"%s"' % s.replace('\\', '\\\\').replace('"', r'\"')
@@ -232,7 +235,9 @@ def show_func_def(call_def=None, completion_lines=0):
# Need to decode it with utf8, because vim returns always a python 2 # Need to decode it with utf8, because vim returns always a python 2
# string even if it is unicode. # string even if it is unicode.
e = vim.eval('g:jedi#function_definition_escape').decode('UTF-8') e = vim.eval('g:jedi#function_definition_escape')
if hasattr(e, 'decode'):
e = e.decode('UTF-8')
# replace line before with cursor # replace line before with cursor
regex = "xjedi=%sx%sxjedix".replace('x', e) regex = "xjedi=%sx%sxjedix".replace('x', e)